Skip to content

Commit 2e65734

Browse files
committed
Clean-up rebuild code to include even non parameterized job
We don't need to distinguish between parameterized and non parameterized job We can drop some variables Suggested-by: Tim Jacomb <timjacomb1@gmail.com> Signed-off-by: Michael Trimarchi <michael@amarulasolutions.com>
1 parent 87b084e commit 2e65734

File tree

5 files changed

+11
-39
lines changed

5 files changed

+11
-39
lines changed

src/main/java/io/jenkins/plugins/pipelinegraphview/utils/AbstractPipelineViewAction.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import com.fasterxml.jackson.databind.ObjectMapper;
55
import hudson.model.Action;
66
import hudson.model.BallColor;
7-
import hudson.model.ParametersAction;
8-
import hudson.model.ParametersDefinitionProperty;
97
import hudson.model.Item;
108
import hudson.model.Queue;
119
import hudson.security.Permission;
@@ -53,16 +51,6 @@ public String getBuildDisplayName() {
5351
return run.getDisplayName();
5452
}
5553

56-
public boolean isParameterized() {
57-
ParametersAction paramAction = run.getAction(ParametersAction.class);
58-
if (paramAction != null && !paramAction.getAllParameters().isEmpty()) {
59-
return true;
60-
}
61-
62-
ParametersDefinitionProperty property = run.getParent().getProperty(ParametersDefinitionProperty.class);
63-
return property != null && !property.getParameterDefinitions().isEmpty();
64-
}
65-
6654
/**
6755
* Handles the rebuild request using ReplayAction feature
6856
*/

src/main/resources/io/jenkins/plugins/pipelinegraphview/PipelineGraphViewAction/index.jelly

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828
<l:hasPermission permission="${it.permission}">
2929
<j:set var="proxyId" value="${h.generateId()}" />
3030
<st:bind value="${it}" var="rebuildAction${proxyId}"/>
31-
<button id="pgv-rebuild" data-success-message="${%Build scheduled}" data-build-path="../../build"
32-
data-parameterized="${it.parameterized}" data-proxy-name="rebuildAction${proxyId}"
31+
<button id="pgv-rebuild" data-success-message="${%Build scheduled}"
32+
data-proxy-name="rebuildAction${proxyId}"
3333
class="jenkins-button jenkins-!-build-color">
3434
<l:icon src="symbol-play-outline plugin-ionicons-api"/>
3535
${%Rebuild}

src/main/resources/io/jenkins/plugins/pipelinegraphview/consoleview/PipelineConsoleViewAction/index.jelly

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
<j:set var="proxyId" value="${h.generateId()}" />
2828
<st:bind value="${it}" var="rebuildAction${proxyId}"/>
2929
<button id="pgv-rebuild" data-success-message="${%Build scheduled}"
30-
data-build-path="../../build" data-parameterized="${it.parameterized}"
3130
data-proxy-name="rebuildAction${proxyId}"
3231
class="jenkins-button jenkins-!-build-color">
3332
<l:icon src="symbol-play-outline plugin-ionicons-api"/>

src/main/resources/io/jenkins/plugins/pipelinegraphview/multipipelinegraphview/MultiPipelineGraphViewAction/index.jelly

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<l:hasPermission permission="${it.permission}">
1010
<j:set var="proxyId" value="${h.generateId()}" />
1111
<st:bind value="${it}" var="rebuildAction${proxyId}"/>
12-
<button id="pgv-rebuild" data-success-message="${%Build scheduled}" data-build-path="../build"
13-
data-parameterized="${it.parameterized}" data-proxy-name="rebuildAction${proxyId}"
12+
<button id="pgv-rebuild" data-success-message="${%Build scheduled}"
13+
data-proxy-name="rebuildAction${proxyId}"
1414
class="jenkins-button jenkins-!-build-color">
1515
<l:icon src="symbol-play-outline plugin-ionicons-api"/>
1616
${%Build}

src/main/webapp/js/build.js

Lines changed: 7 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,12 @@ const rebuildButton = document.getElementById('pgv-rebuild');
33
if (rebuildButton) {
44
rebuildButton.addEventListener('click', event => {
55
event.preventDefault();
6-
const buildUrl = `${rebuildButton.dataset.buildPath}?delay=0sec`
7-
if (rebuildButton.dataset.parameterized === 'true') {
8-
const rebuildAction = window[`${rebuildButton.dataset.proxyName}`];
9-
rebuildAction.doRebuild(function (success) {
10-
const result = success.responseJSON;
11-
if (result) {
12-
window.hoverNotification(rebuildButton.dataset.successMessage, rebuildButton);
13-
}
14-
});
15-
} else {
16-
fetch(buildUrl, {
17-
method: 'post',
18-
headers: crumb.wrap({})
19-
})
20-
.then(res => {
21-
if (!res.ok) {
22-
console.error('Build failed', res);
23-
} else {
24-
window.hoverNotification(rebuildButton.dataset.successMessage, rebuildButton);
25-
}
26-
})
27-
}
6+
const rebuildAction = window[`${rebuildButton.dataset.proxyName}`];
7+
rebuildAction.doRebuild(function (success) {
8+
const result = success.responseJSON;
9+
if (result) {
10+
window.hoverNotification(rebuildButton.dataset.successMessage, rebuildButton);
11+
}
12+
});
2813
})
2914
}

0 commit comments

Comments
 (0)