From 10c26a8061e4c30b65d3afb715ac35b88239df1b Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Mon, 21 Oct 2024 14:57:14 -0400 Subject: [PATCH 01/15] Require 2.440.3 as minimum Jenkins version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 339c7e7..b80ec02 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 999999-SNAPSHOT jenkinsci/cloudbees-disk-usage-simple-plugin - 2.361.4 + 2.440.3 From 34437e523afffb7518bf9c8b942cff5d56a7d7ee Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:41:29 -0400 Subject: [PATCH 02/15] extract JS in sidepanel.jelly - use updated --- .../QuickDiskUsagePlugin/refresh.js | 10 ++++++++++ .../QuickDiskUsagePlugin/sidepanel.jelly | 17 ++++------------- 2 files changed, 14 insertions(+), 13 deletions(-) create mode 100644 src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js new file mode 100644 index 0000000..31f2c9b --- /dev/null +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js @@ -0,0 +1,10 @@ +function refresh(link) { + + fetch(link.href, { + method: "POST", + headers: crumb.wrap({}) + }).catch(() => {}); + + hoverNotification('${%Refresh scheduled}', link); + return true; +} diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly index c29f454..8562c68 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly @@ -27,25 +27,16 @@ Side panel for the build view. --> - + - - - + + + From b39c027b1c0358a775f73eed5eade4776ec0a10b Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Mon, 21 Oct 2024 15:46:48 -0400 Subject: [PATCH 03/15] extract JS in sidepanel.jelly - use updated --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index b80ec02..f833a7e 100644 --- a/pom.xml +++ b/pom.xml @@ -44,7 +44,7 @@ 999999-SNAPSHOT jenkinsci/cloudbees-disk-usage-simple-plugin - 2.440.3 + 2.452.4 From b60607876cc7d4a9794b95c4ccbd3ef330286e56 Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:33:26 -0400 Subject: [PATCH 04/15] address comments --- .../QuickDiskUsagePlugin/refresh-disk-usage.js | 10 ++++++++++ .../simplediskusage/QuickDiskUsagePlugin/refresh.js | 10 ---------- .../QuickDiskUsagePlugin/sidepanel.jelly | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js delete mode 100644 src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js new file mode 100644 index 0000000..2cabd29 --- /dev/null +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -0,0 +1,10 @@ +function refreshDiskUsage(a) { + + fetch("refresh", { + method: "POST", + headers: crumb.wrap({}) + }).catch(() => {}); + + hoverNotification('Refresh scheduled', a.parentNode); + return true; +} diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js deleted file mode 100644 index 31f2c9b..0000000 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh.js +++ /dev/null @@ -1,10 +0,0 @@ -function refresh(link) { - - fetch(link.href, { - method: "POST", - headers: crumb.wrap({}) - }).catch(() => {}); - - hoverNotification('${%Refresh scheduled}', link); - return true; -} diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly index 8562c68..c37496c 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly @@ -34,9 +34,9 @@ - - + + From 61137eb8e88adfadc3348d570140de4c8b2cfb8b Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Tue, 22 Oct 2024 11:34:47 -0400 Subject: [PATCH 05/15] address comments --- .../simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly index c37496c..5e3d650 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly @@ -34,9 +34,9 @@ - - - + + + From d2e4208b6bfdfa5041611c1d42a9c28f0bd60619 Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Tue, 22 Oct 2024 17:40:11 -0400 Subject: [PATCH 06/15] use xhr instead of fetch --- .../QuickDiskUsagePlugin/refresh-disk-usage.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index 2cabd29..e68a0af 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -1,10 +1,13 @@ function refreshDiskUsage(a) { - fetch("refresh", { - method: "POST", - headers: crumb.wrap({}) - }).catch(() => {}); + var xhr = new XMLHttpRequest(); + xhr.open("POST", "refresh", true); // true means asynchronous + xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); + + var headers = crumb.wrap({}); + xhr.setRequestHeader("Jenkins-Crumb", headers['Jenkins-Crumb']); + + xhr.send(); hoverNotification('Refresh scheduled', a.parentNode); - return true; } From 513ab4f6a8fbfa6351709527e7d975d8b1e6abd9 Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Tue, 22 Oct 2024 19:39:33 -0400 Subject: [PATCH 07/15] remove comments --- .../refresh-disk-usage.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index e68a0af..c693c22 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -1,7 +1,7 @@ function refreshDiskUsage(a) { var xhr = new XMLHttpRequest(); - xhr.open("POST", "refresh", true); // true means asynchronous + xhr.open("POST", "refresh", true); xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); var headers = crumb.wrap({}); @@ -11,3 +11,20 @@ function refreshDiskUsage(a) { hoverNotification('Refresh scheduled', a.parentNode); } + +// +// function refreshDiskUsage(a, event) { +// +// console.log("Refreshing disk usage"); +// +// fetch("refresh", { +// method: "POST", +// headers: crumb.wrap({ +// "Content-Type": "application/x-www-form-urlencoded", +// }), +// }); +// event.preventDefault(); +// +// hoverNotification('Refresh scheduled', a.parentNode); +// // return true; +// } From 1d465539df56b034fdc421155e950c5ea3e94f8f Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Tue, 22 Oct 2024 19:39:55 -0400 Subject: [PATCH 08/15] remove comments --- .../QuickDiskUsagePlugin/refresh-disk-usage.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index c693c22..da09a1a 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -11,20 +11,3 @@ function refreshDiskUsage(a) { hoverNotification('Refresh scheduled', a.parentNode); } - -// -// function refreshDiskUsage(a, event) { -// -// console.log("Refreshing disk usage"); -// -// fetch("refresh", { -// method: "POST", -// headers: crumb.wrap({ -// "Content-Type": "application/x-www-form-urlencoded", -// }), -// }); -// event.preventDefault(); -// -// hoverNotification('Refresh scheduled', a.parentNode); -// // return true; -// } From 1e53003748e8b854f835a6bcd7ae48466d48d45c Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Sat, 26 Oct 2024 21:37:49 -0400 Subject: [PATCH 09/15] use fetch api --- .../QuickDiskUsagePlugin/refresh-disk-usage.js | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index da09a1a..047d277 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -1,13 +1,12 @@ -function refreshDiskUsage(a) { +function refreshDiskUsage(a, event) { - var xhr = new XMLHttpRequest(); - xhr.open("POST", "refresh", true); - xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded"); - - var headers = crumb.wrap({}); - xhr.setRequestHeader("Jenkins-Crumb", headers['Jenkins-Crumb']); - - xhr.send(); + fetch("refresh", { + method: "POST", + headers: crumb.wrap({ + "Content-Type": "application/x-www-form-urlencoded", + }), + }); hoverNotification('Refresh scheduled', a.parentNode); + console.log("event"); } From 1c171fadd848cf341a863c96327f047507409466 Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Sat, 26 Oct 2024 22:08:41 -0400 Subject: [PATCH 10/15] use fetch api --- .../simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index 047d277..8f07fbc 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -8,5 +8,4 @@ function refreshDiskUsage(a, event) { }); hoverNotification('Refresh scheduled', a.parentNode); - console.log("event"); -} +} \ No newline at end of file From 44f6c00ad6afdb8eed9a3d927a3cdb975c42580f Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Sat, 26 Oct 2024 22:16:51 -0400 Subject: [PATCH 11/15] use fetch api --- .../simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index 8f07fbc..ee54a30 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -8,4 +8,4 @@ function refreshDiskUsage(a, event) { }); hoverNotification('Refresh scheduled', a.parentNode); -} \ No newline at end of file +} From cf981c931bfde1dc62eceb5d02781065acb76713 Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Sat, 26 Oct 2024 22:22:46 -0400 Subject: [PATCH 12/15] use fetch api --- .../simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index ee54a30..da7d7f3 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -1,4 +1,4 @@ -function refreshDiskUsage(a, event) { +function refreshDiskUsage(a) { fetch("refresh", { method: "POST", From 161b4fd777ae0fb7a7a91e09b21d6a1bf6f673fb Mon Sep 17 00:00:00 2001 From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com> Date: Mon, 28 Oct 2024 08:47:45 -0400 Subject: [PATCH 13/15] use fetch api - remove explicit header --- .../QuickDiskUsagePlugin/refresh-disk-usage.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index da7d7f3..46a936d 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -2,9 +2,7 @@ function refreshDiskUsage(a) { fetch("refresh", { method: "POST", - headers: crumb.wrap({ - "Content-Type": "application/x-www-form-urlencoded", - }), + headers: crumb.wrap({}), }); hoverNotification('Refresh scheduled', a.parentNode); From c33593b99db5055600cd5cda96a113d10d096190 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 29 Oct 2024 11:36:44 -0700 Subject: [PATCH 14/15] Fix functionality --- .../QuickDiskUsagePlugin/refresh-disk-usage.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index 46a936d..5ded47e 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -1,9 +1,13 @@ -function refreshDiskUsage(a) { - +function refreshDiskUsage(a, ev) { fetch("refresh", { - method: "POST", + method: "post", headers: crumb.wrap({}), + }).then((rsp) => { + if (rsp.ok) { + hoverNotification("Refresh scheduled", a.parentNode); + } else { + hoverNotification("Failed to schedule refresh", a.parentNode); + } }); - - hoverNotification('Refresh scheduled', a.parentNode); + ev.preventDefault(); } From a08412eb5f2b2656d7c1dd86e21a683e768f8e21 Mon Sep 17 00:00:00 2001 From: Basil Crow Date: Tue, 29 Oct 2024 11:45:19 -0700 Subject: [PATCH 15/15] Use notification bar to show proper colors --- .../QuickDiskUsagePlugin/refresh-disk-usage.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js index 5ded47e..d1eb8e8 100644 --- a/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js +++ b/src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js @@ -4,9 +4,9 @@ function refreshDiskUsage(a, ev) { headers: crumb.wrap({}), }).then((rsp) => { if (rsp.ok) { - hoverNotification("Refresh scheduled", a.parentNode); + notificationBar.show("Refresh scheduled", notificationBar.SUCCESS); } else { - hoverNotification("Failed to schedule refresh", a.parentNode); + notificationBar.show("Failed to schedule refresh", notificationBar.ERROR); } }); ev.preventDefault();