Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[JENKINS-73968] Extract event handler in QuickDiskUsagePlugin/sidepanel.jelly #113

Merged
merged 17 commits into from
Nov 6, 2024
Merged

[JENKINS-73968] Extract event handler in QuickDiskUsagePlugin/sidepanel.jelly #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
10c26a8
Require 2.440.3 as minimum Jenkins version
shlomomdahan Oct 21, 2024
34437e5
extract JS in sidepanel.jelly - use updated <l:task>
shlomomdahan Oct 21, 2024
b39c027
extract JS in sidepanel.jelly - use updated <l:task>
shlomomdahan Oct 21, 2024
b606078
address comments
shlomomdahan Oct 22, 2024
61137eb
address comments
shlomomdahan Oct 22, 2024
d2e4208
use xhr instead of fetch
shlomomdahan Oct 22, 2024
513ab4f
remove comments
shlomomdahan Oct 22, 2024
1d46553
remove comments
shlomomdahan Oct 22, 2024
449a69b
Merge branch 'master' into JENKINS-73968
PierreBtz Oct 25, 2024
1e53003
use fetch api
shlomomdahan Oct 27, 2024
1c171fa
use fetch api
shlomomdahan Oct 27, 2024
3aee937
Merge remote-tracking branch 'origin/JENKINS-73968' into JENKINS-73968
shlomomdahan Oct 27, 2024
44f6c00
use fetch api
shlomomdahan Oct 27, 2024
cf981c9
use fetch api
shlomomdahan Oct 27, 2024
161b4fd
use fetch api - remove explicit header
shlomomdahan Oct 28, 2024
c33593b
Fix functionality
basil Oct 29, 2024
a08412e
Use notification bar to show proper colors
basil Oct 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/refresh-disk-usage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
function refreshDiskUsage(a, ev) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This code was broken before this PR (presumably due to some previous Jenkins core changes) so I fixed the existing code and retested. The new code works like jenkinsci/jenkins#9787 where the callback takes two elements, the element and the event. The element isn't actually used, but it could be used to fetch data attributes for example. When the callback is executed, the POST request is made, and then we call ev.preventDefault() to prevent link navigation from taking place. When the POST response is received, we display a notification on the notification bar for either success or failure, using the appropriate color.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great stuff, thanks!

fetch("refresh", {
method: "post",
headers: crumb.wrap({}),
}).then((rsp) => {
if (rsp.ok) {
notificationBar.show("Refresh scheduled", notificationBar.SUCCESS);
} else {
notificationBar.show("Failed to schedule refresh", notificationBar.ERROR);
}
});
ev.preventDefault();
}
15 changes: 3 additions & 12 deletions src/main/resources/com/cloudbees/simplediskusage/QuickDiskUsagePlugin/sidepanel.jelly
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,25 +27,16 @@
Side panel for the build view.
-->
<?jelly escape-by-default='true'?>
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout">
<j:jelly xmlns:j="jelly:core" xmlns:l="/lib/layout" xmlns:st="jelly:stapler">
<l:header />
<l:side-panel>
<l:tasks>
<l:task href="${rootURL}/" icon="icon-up icon-md" title="${%Back to Dashboard}"/>
<l:task href="${rootURL}/manage" icon="icon-setting icon-md" title="${%Manage Jenkins}"/>
<l:task href="." icon="/plugin/cloudbees-disk-usage-simple/images/disk.png" title="${%Disk usage}"/>
<j:if test="${not it.running}">
<l:task href="." onclick="return refresh(this)" icon="icon-refresh icon-md" title="${%Refresh disk usage}" post="true"/>
<script>
function refresh(a) {
fetch("refresh", {
method: "post",
headers: crumb.wrap({}),
});
hoverNotification('${%Refresh scheduled}',a.parentNode);
return true;
}
</script>
<st:adjunct includes="com.cloudbees.simplediskusage.QuickDiskUsagePlugin.refresh-disk-usage"/>
<l:task href="." data-callback="refreshDiskUsage" icon="icon-refresh icon-md" title="${%Refresh disk usage}" post="true"/>
</j:if>
</l:tasks>
</l:side-panel>
Expand Down