diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/pipeline-column-headers.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/pipeline-column-headers.js
new file mode 100644
index 00000000..7c8bfa65
--- /dev/null
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/pipeline-column-headers.js
@@ -0,0 +1,13 @@
+window.addEventListener("DOMContentLoaded", () => {
+ const projectDataHolders = document.querySelectorAll(".ch-project-data-holder");
+
+ projectDataHolders.forEach(dataHolder => {
+ const { projectId, proxyName, projectJson } = dataHolder.dataset;
+
+ buildPipeline.projectProxies[projectId] = window[proxyName];
+
+ const projectElement = document.getElementById("project-" + projectId);
+ const projectData = JSON.parse(projectJson);
+ projectElement.innerHTML = buildPipeline.projectCardTemplate(projectData);
+ });
+});
From ccdfa1dc1a77f5b838d987666be4d23ddd4a5293 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Thu, 31 Oct 2024 14:46:14 -0400
Subject: [PATCH 29/59] Extract JS in columnHeaders.jelly
---
.../extension/PipelineHeaderExtension/columnHeader.jelly | 5 -----
1 file changed, 5 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly
index 472c545c..a9b7209b 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly
@@ -30,11 +30,6 @@
-
-
-
-
-
From c35d193e0637dbb2c0e4aa8ff1aba5aacd84c3cc Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Thu, 31 Oct 2024 18:08:43 -0400
Subject: [PATCH 30/59] test
---
.../buildpipeline/BuildPipelineView/main_dashboard.jelly | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly
index 79262ca2..f038580f 100755
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/main_dashboard.jelly
@@ -3,10 +3,11 @@
+
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/toggle-build-details.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/toggle-build-details.js
new file mode 100644
index 00000000..b8c6e241
--- /dev/null
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/toggle-build-details.js
@@ -0,0 +1,10 @@
+// show/hide build details
+jQuery(function() {
+ jQuery(".header").click(function() {
+ var parent = jQuery(this).parent();
+ var ba = parent.find(".build-actions");
+ var bb = parent.find(".build-body");
+
+ ba.add(bb).toggle('slow');
+ });
+});
From 7316cdd19e42ba0128f25e8761d402dfcd142a6c Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Sun, 3 Nov 2024 17:01:40 -0500
Subject: [PATCH 33/59] extract inline script bpp.jelly
---
.../buildpipeline/BuildPipelineView/bpp.jelly | 55 ++++++++----------
.../BuildPipelineView/build-pipeline-init.js | 56 +++++++++++++++++++
src/main/webapp/js/build-pipeline.js | 2 +-
3 files changed, 80 insertions(+), 33 deletions(-)
create mode 100644 src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index f349bfc8..e7b1ea91 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -19,24 +19,26 @@
-
+
-
+
-
+
+
+
+
+
+
+
- |
-
+
+
+
+
+
+ |
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
new file mode 100644
index 00000000..aa785481
--- /dev/null
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
@@ -0,0 +1,56 @@
+const buildCardTemplateSource = jQuery("#build-card-template").html();
+const projectCardTemplateSource = jQuery("#project-card-template").html();
+const refreshFrequency = parseInt(document.querySelector(".pipeline-refresh-frequency").dataset.refreshFrequency, 10);
+
+var buildPipeline = new BuildPipeline(
+buildPipelineViewProxy,
+Handlebars.compile(buildCardTemplateSource),
+Handlebars.compile(projectCardTemplateSource),
+refreshFrequency
+);
+
+
+function initializeBuildCards() {
+ // Find all build data elements
+ document.querySelectorAll('.build-data').forEach(buildElement => {
+
+ const buildId = buildElement.dataset.buildId;
+ const buildData = JSON.parse(buildElement.dataset.buildInfo);
+ const buildStatus = buildElement.dataset.buildStatus;
+ const isManualTrigger = buildElement.dataset.isManualTrigger === 'true';
+ const nextBuildNumber = parseInt(buildElement.dataset.nextBuildNumber, 10);
+ console.log(nextBuildNumber);
+ const dependencyIds = buildElement.dataset.dependencyIds
+ .split(',')
+ .filter(Boolean)
+ .map(id => parseInt(id, 10));
+
+
+ // Generate build card
+ jQuery(buildElement).append(buildPipeline.buildCardTemplate(buildData));
+
+ // add build proxy to proxies for future use-->
+ buildPipeline.buildProxies[buildId] = window[`buildProxy_${buildId}`];
+
+ if (buildStatus === 'BUILDING') {
+ buildPipeline.showProgress(buildId, dependencyIds, nextBuildNumber);
+ }
+
+ if (buildStatus === 'PENDING') {
+ jQuery("table.pipelines").on(`show-status-${buildId}`, function() {
+ if (isManualTrigger) {
+ buildPipeline.updateBuildCard(buildId);
+ } else {
+ buildPipeline.updateNextBuildAndShowProgress(
+ buildId,
+ nextBuildNumber,
+ dependencyIds
+ );
+ }
+ });
+ }
+
+ });
+}
+
+document.addEventListener('DOMContentLoaded', initializeBuildCards);
\ No newline at end of file
diff --git a/src/main/webapp/js/build-pipeline.js b/src/main/webapp/js/build-pipeline.js
index 6ce69423..3d650c9d 100644
--- a/src/main/webapp/js/build-pipeline.js
+++ b/src/main/webapp/js/build-pipeline.js
@@ -26,7 +26,7 @@ BuildPipeline.prototype = {
buildPipeline.updateAllBuildCards(dependencies);
// trigger all dependency tracking
jQuery.each(dependencies, function(){
- jQuery("#pipelines").trigger("show-status-" + this);
+ jQuery("table.pipelines").trigger("show-status-" + this);
});
}
});
From 86b17503e71710c2a0aa8f7127909f7c291ec839 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Sun, 3 Nov 2024 17:04:09 -0500
Subject: [PATCH 34/59] extract inline script bpp.jelly
---
.../hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly | 5 -----
.../buildpipeline/BuildPipelineView/build-pipeline-init.js | 2 +-
2 files changed, 1 insertion(+), 6 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index e7b1ea91..267e61ee 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -34,11 +34,6 @@
-
-
-
-
-
Date: Mon, 4 Nov 2024 16:48:30 -0500
Subject: [PATCH 35/59] fix existing functionality - extract JS
---
.../buildpipeline/BuildPipelineView/bpp.jelly | 5 ++---
.../BuildPipelineView/build-pipeline-init.js | 17 ++++++-----------
2 files changed, 8 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index 267e61ee..f3e42b9e 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -130,14 +130,13 @@
-
-
+ data-dependency-ids="${build.getDependencyIds()}"/>
|
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
index 734d2cf1..268da39b 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
@@ -3,10 +3,10 @@ const projectCardTemplateSource = jQuery("#project-card-template").html();
const refreshFrequency = parseInt(document.querySelector(".pipeline-refresh-frequency").dataset.refreshFrequency, 10);
var buildPipeline = new BuildPipeline(
-buildPipelineViewProxy,
-Handlebars.compile(buildCardTemplateSource),
-Handlebars.compile(projectCardTemplateSource),
-refreshFrequency
+ buildPipelineViewProxy,
+ Handlebars.compile(buildCardTemplateSource),
+ Handlebars.compile(projectCardTemplateSource),
+ refreshFrequency
);
@@ -19,12 +19,7 @@ function initializeBuildCards() {
const buildStatus = buildElement.dataset.buildStatus;
const isManualTrigger = buildElement.dataset.isManualTrigger === 'true';
const nextBuildNumber = parseInt(buildElement.dataset.nextBuildNumber, 10);
- console.log(nextBuildNumber);
- const dependencyIds = buildElement.dataset.dependencyIds
- .split(',')
- .filter(Boolean)
- .map(id => parseInt(id, 10));
-
+ const dependencyIds = JSON.parse(buildElement.dataset.dependencyIds);
// Generate build card
jQuery(buildElement).append(buildPipeline.buildCardTemplate(buildData));
@@ -33,7 +28,7 @@ function initializeBuildCards() {
buildPipeline.buildProxies[buildId] = window[`buildProxy_${buildId}`];
if (buildStatus === 'BUILDING') {
- buildPipeline.showProgress(buildId, dependencyIds, nextBuildNumber);
+ buildPipeline.showProgress(buildId, dependencyIds);
}
if (buildStatus === 'PENDING') {
From 08c66cab0458dc5693da6db178c99140823e64f8 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Mon, 4 Nov 2024 16:49:30 -0500
Subject: [PATCH 36/59] fix existing functionality - extract JS
---
.../buildpipeline/BuildPipelineView/build-pipeline-init.js | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
index 268da39b..2987cde3 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
@@ -11,7 +11,6 @@ var buildPipeline = new BuildPipeline(
function initializeBuildCards() {
- // Find all build data elements
document.querySelectorAll('.build-data').forEach(buildElement => {
const buildId = buildElement.dataset.buildId;
From 3239f8112ff480235ace25bc791c6890e2b58612 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Mon, 4 Nov 2024 17:45:33 -0500
Subject: [PATCH 37/59] test all tickets
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index a32c92ea..7adf3e8a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
2.0.3
-SNAPSHOT
- 2.414.3
+ 2.426.3
jenkinsci/${project.artifactId}
50
4.25.0
@@ -85,6 +85,7 @@
io.jenkins.plugins
jquery3-api
+ 3.7.1-2
From 0ef7e3ccf6d9bfbe86899d75769572c1dfbd69a2 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Mon, 4 Nov 2024 17:56:20 -0500
Subject: [PATCH 38/59] bump jenkins to 2.426.3 (to update jQuery3 plugin)
---
pom.xml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index a32c92ea..786dba94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
2.0.3
-SNAPSHOT
- 2.414.3
+ 2.426.3
jenkinsci/${project.artifactId}
50
4.25.0
@@ -85,6 +85,7 @@
io.jenkins.plugins
jquery3-api
+ 3.7.1-2
@@ -291,8 +292,8 @@
https://repo.jenkins-ci.org/releases
- maven.jenkins-ci.org
- https://repo.jenkins-ci.org/snapshots
+ maven.jenkins-ci.org
+ https://repo.jenkins-ci.org/snapshots
From edabfbf8637c51118bb153be83a9d6d68009cbf6 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:02:33 -0500
Subject: [PATCH 39/59] Bump jenkins version to 2.452.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 786dba94..3b369426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@
2.0.3
-SNAPSHOT
- 2.426.3
+ 2.452.3
jenkinsci/${project.artifactId}
50
4.25.0
From c9ad9c0e6c745bf79f80327354c8de60c61d4094 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:04:00 -0500
Subject: [PATCH 40/59] Bump jenkins version to 2.452.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 3b369426..37b12772 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,7 +292,7 @@
https://repo.jenkins-ci.org/releases
- maven.jenkins-ci.org
+ maven.jenkins-ci.org
https://repo.jenkins-ci.org/snapshots
From f4900668f542290d3882bb637ab30131573b7fce Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:04:26 -0500
Subject: [PATCH 41/59] Bump jenkins version to 2.452.3
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 37b12772..76c868c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -293,7 +293,7 @@
maven.jenkins-ci.org
- https://repo.jenkins-ci.org/snapshots
+ https://repo.jenkins-ci.org/snapshots
From f49351245247287b63685ad217bdb9f51cdbae41 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 5 Nov 2024 18:27:36 -0500
Subject: [PATCH 42/59] simplify proxy
---
.../extension/PipelineHeaderExtension/columnHeader.jelly | 2 +-
.../PipelineHeaderExtension/pipeline-column-headers.js | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly
index a9b7209b..6140ccbc 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/columnHeader.jelly
@@ -29,7 +29,7 @@
-
+
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/pipeline-column-headers.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/pipeline-column-headers.js
index 7c8bfa65..2d024927 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/pipeline-column-headers.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/PipelineHeaderExtension/pipeline-column-headers.js
@@ -2,9 +2,9 @@ window.addEventListener("DOMContentLoaded", () => {
const projectDataHolders = document.querySelectorAll(".ch-project-data-holder");
projectDataHolders.forEach(dataHolder => {
- const { projectId, proxyName, projectJson } = dataHolder.dataset;
+ const { projectId, projectJson } = dataHolder.dataset;
- buildPipeline.projectProxies[projectId] = window[proxyName];
+ buildPipeline.projectProxies[projectId] = window["projectProxy" + projectId];
const projectElement = document.getElementById("project-" + projectId);
const projectData = JSON.parse(projectJson);
From 0a4c4fe01a7872b193fa3bb872240079f777b669 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:22:15 -0500
Subject: [PATCH 43/59] return positive ids
---
.../hudson/plugin/buildpipeline/BuildForm.java | 7 ++++---
.../hudson/plugin/buildpipeline/ProjectForm.java | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
index 25a65a87..8faa0d72 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
@@ -129,11 +129,11 @@ public List getDependencyIds() {
*/
@JavaScriptMethod
public String asJSON() {
- return BuildJSONBuilder.asJSON(context, pipelineBuild, id, projectId, getDependencyIds(), getParameterList());
+ return BuildJSONBuilder.asJSON(context, pipelineBuild, getId(), getProjectId(), getDependencyIds(), getParameterList());
}
public int getId() {
- return id;
+ return Math.abs(id);
}
/**
@@ -171,7 +171,8 @@ public ArrayList getParameterList() {
}
public Integer getProjectId() {
- return projectId;
+
+ return Math.abs(projectId);
}
public AbstractBuild, ?> getCurrentBuild() {
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
index e8c8bb30..3cc7c30f 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
@@ -240,7 +240,7 @@ public boolean equals(final Object obj) {
}
public int getId() {
- return name.hashCode();
+ return Math.abs(name.hashCode());
}
/**
From dbbcc7dfee1de158910b77fa8fdce36f571e01c9 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Tue, 5 Nov 2024 20:22:51 -0500
Subject: [PATCH 44/59] return positive ids
---
.../centrumsystems/hudson/plugin/buildpipeline/BuildForm.java | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
index 8faa0d72..e5b04a4c 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
@@ -171,7 +171,6 @@ public ArrayList getParameterList() {
}
public Integer getProjectId() {
-
return Math.abs(projectId);
}
From 8fedd289dbf478dddce5851d457033a8eb0a86e0 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Wed, 6 Nov 2024 08:07:19 -0500
Subject: [PATCH 45/59] Bad attempt to compute absolute value of signed 32-bit
hashcode in
au.com.centrumsystems.hudson.plugin.buildpipeline.ProjectForm.getId()
---
.../hudson/plugin/buildpipeline/BuildForm.java | 6 +++---
.../hudson/plugin/buildpipeline/ProjectForm.java | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
index e5b04a4c..25a65a87 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
@@ -129,11 +129,11 @@ public List getDependencyIds() {
*/
@JavaScriptMethod
public String asJSON() {
- return BuildJSONBuilder.asJSON(context, pipelineBuild, getId(), getProjectId(), getDependencyIds(), getParameterList());
+ return BuildJSONBuilder.asJSON(context, pipelineBuild, id, projectId, getDependencyIds(), getParameterList());
}
public int getId() {
- return Math.abs(id);
+ return id;
}
/**
@@ -171,7 +171,7 @@ public ArrayList getParameterList() {
}
public Integer getProjectId() {
- return Math.abs(projectId);
+ return projectId;
}
public AbstractBuild, ?> getCurrentBuild() {
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
index 3cc7c30f..e8c8bb30 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
@@ -240,7 +240,7 @@ public boolean equals(final Object obj) {
}
public int getId() {
- return Math.abs(name.hashCode());
+ return name.hashCode();
}
/**
From 874f74e9817b41c7aa56105c00ac07fe72f20444 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Wed, 6 Nov 2024 08:45:55 -0500
Subject: [PATCH 46/59] mask negative bit in project id
---
.../centrumsystems/hudson/plugin/buildpipeline/BuildForm.java | 2 +-
.../centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
index 25a65a87..32ee6882 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildForm.java
@@ -94,7 +94,7 @@ private BuildForm(ItemGroup context, final PipelineBuild pipelineBuild, final Co
}
id = hashCode();
final AbstractProject, ?> project = pipelineBuild.getProject();
- projectId = project.getFullName().hashCode();
+ projectId = project.getFullName().hashCode() & 0x7FFFFFFF;
final ParametersDefinitionProperty params = project.getProperty(ParametersDefinitionProperty.class);
final ArrayList paramList = new ArrayList();
if (params != null && params.getParameterDefinitionNames() != null) {
diff --git a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
index e8c8bb30..8fbda5f2 100644
--- a/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
+++ b/src/main/java/au/com/centrumsystems/hudson/plugin/buildpipeline/ProjectForm.java
@@ -240,7 +240,7 @@ public boolean equals(final Object obj) {
}
public int getId() {
- return name.hashCode();
+ return name.hashCode() & 0x7FFFFFFF;
}
/**
From 7beca3498797419ec4a44d997929f08fdc1d2b0a Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Thu, 7 Nov 2024 14:35:19 -0500
Subject: [PATCH 47/59] specify pipeline wrapper - fixes onclick issues
---
.../hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly | 2 +-
.../BuildCardExtension/build-card-template-onclicks.js | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index 546e01fb..d50bd9e3 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -124,7 +124,7 @@
-
+
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
index 8233a9b8..78d6e594 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
@@ -83,7 +83,7 @@ const onclickElements = {
};
document.addEventListener("DOMContentLoaded", function () {
- const parentElement = document.querySelector(".pipelines");
+ const parentElement = document.querySelector(".main-pipeline-selector");
if (!parentElement) return;
Object.entries(onclickElements).forEach(function(entry) {
From 188bc434af1b93072432686871834aba63173cdd Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Thu, 7 Nov 2024 14:48:15 -0500
Subject: [PATCH 48/59] select all pipeline wrappers - incase multiple builds
selected
---
.../buildpipeline/BuildPipelineView/bpp.jelly | 2 +-
.../build-card-template-onclicks.js | 15 +++++++++------
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index d50bd9e3..546e01fb 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -124,7 +124,7 @@
-
+
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
index 78d6e594..ccad37db 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
@@ -83,12 +83,15 @@ const onclickElements = {
};
document.addEventListener("DOMContentLoaded", function () {
- const parentElement = document.querySelector(".main-pipeline-selector");
- if (!parentElement) return;
+ const pipelineWrappers = document.querySelectorAll(".pipeline-wrapper");
- Object.entries(onclickElements).forEach(function(entry) {
- const selector = entry[0];
- const handlerConfig = entry[1];
- createClickHandler(parentElement, selector, handlerConfig.handler);
+ if (!pipelineWrappers.length) return;
+
+ pipelineWrappers.forEach(wrapper => {
+ Object.entries(onclickElements).forEach(function(entry) {
+ const selector = entry[0];
+ const handlerConfig = entry[1];
+ createClickHandler(wrapper, selector, handlerConfig.handler);
+ });
});
});
From da580f07ae03fbf3127a52f12fb8783fb7083428 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:57:29 -0500
Subject: [PATCH 49/59] fix card update logic
---
.../BuildPipelineView/build-pipeline-init.js | 25 ++++++++-----------
1 file changed, 11 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
index 2987cde3..6b925b0b 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/build-pipeline-init.js
@@ -30,20 +30,17 @@ function initializeBuildCards() {
buildPipeline.showProgress(buildId, dependencyIds);
}
- if (buildStatus === 'PENDING') {
- jQuery("table.pipelines").on(`show-status-${buildId}`, function() {
- if (isManualTrigger) {
- buildPipeline.updateBuildCard(buildId);
- } else {
- buildPipeline.updateNextBuildAndShowProgress(
- buildId,
- nextBuildNumber,
- dependencyIds
- );
- }
- });
- }
-
+ jQuery("table.pipelines").on(`show-status-${buildId}`, function() {
+ if (isManualTrigger) {
+ buildPipeline.updateBuildCard(buildId);
+ } else {
+ buildPipeline.updateNextBuildAndShowProgress(
+ buildId,
+ nextBuildNumber,
+ dependencyIds
+ );
+ }
+ });
});
}
From 2805d64d973264a273564b9e4092779338558e4d Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 10:47:51 -0500
Subject: [PATCH 50/59] restore pom
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 76c868c7..3b369426 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,8 +292,8 @@
https://repo.jenkins-ci.org/releases
- maven.jenkins-ci.org
- https://repo.jenkins-ci.org/snapshots
+ maven.jenkins-ci.org
+ https://repo.jenkins-ci.org/snapshots
From 95aba1e07acb3aaeef9a626502256b786dbb4046 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 10:56:15 -0500
Subject: [PATCH 51/59] restore pom
---
pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 3b369426..bc23a330 100644
--- a/pom.xml
+++ b/pom.xml
@@ -292,8 +292,8 @@
https://repo.jenkins-ci.org/releases
- maven.jenkins-ci.org
- https://repo.jenkins-ci.org/snapshots
+ maven.jenkins-ci.org
+ https://repo.jenkins-ci.org/snapshots
From 8a4cab4a1581ad09e5afef49652a50703a9aca59 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 11:33:16 -0500
Subject: [PATCH 52/59] update BOM to support 2.452.3 and jQuery 3.7.1-2
---
pom.xml | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pom.xml b/pom.xml
index bc23a330..2bfb85ed 100644
--- a/pom.xml
+++ b/pom.xml
@@ -52,8 +52,8 @@
io.jenkins.tools.bom
- bom-2.414.x
- 2982.vdce2153031a_0
+ bom-2.452.x
+ 3010.vec758b_8e7da_3
pom
import
@@ -85,7 +85,6 @@
io.jenkins.plugins
jquery3-api
- 3.7.1-2
From fdfa404e3109a8561719155db9aa5e31dcca77de Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:14:25 -0500
Subject: [PATCH 53/59] delete unused handlebar helpers
---
.../BuildCardExtension/build-card-script-helpers.js | 7 -------
.../extension/BuildCardExtension/buildCardHelpers.jelly | 4 ----
2 files changed, 11 deletions(-)
delete mode 100644 src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-script-helpers.js
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-script-helpers.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-script-helpers.js
deleted file mode 100644
index 2d48ffaa..00000000
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-script-helpers.js
+++ /dev/null
@@ -1,7 +0,0 @@
-Handlebars.registerHelper('startScript', function() {
- return new Handlebars.SafeString("");
-});
-
-Handlebars.registerHelper('endScript', function() {
- return new Handlebars.SafeString("");
-});
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly
index e71a4ee4..cd5f1d99 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly
@@ -8,9 +8,5 @@
By default we just include helpers to append script tags to your build card
-->
-
\ No newline at end of file
From b58990c3988570f992a5705bca01cc8d33438f23 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:16:14 -0500
Subject: [PATCH 54/59] delete unused handlebar helpers
---
.../extension/BuildCardExtension/buildCardHelpers.jelly | 1 -
1 file changed, 1 deletion(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly
index cd5f1d99..5cd58cab 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardHelpers.jelly
@@ -7,6 +7,5 @@
By default we just include helpers to append script tags to your build card
-->
-
\ No newline at end of file
From bacdf4979b99084e6e8c73bbd94437e6830587e9 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:40:12 -0500
Subject: [PATCH 55/59] remove redundant class
---
.../buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js | 2 +-
.../hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js
index 5fc5c577..97580dab 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js
@@ -7,7 +7,7 @@ Behaviour.specify(".bpp-trigger-pipeline-parameterized", 'BuildPipelineView.Trig
});
});
-Behaviour.specify(".bpp-trigger-pipeline-button", 'BuildPipelineView.TriggerPipeline', 0, function(element) {
+Behaviour.specify("#trigger-pipeline-button", 'BuildPipelineView.TriggerPipeline', 0, function(element) {
element.addEventListener('click', function(e) {
document.getElementById('triggerPipelineForm').submit();
});
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index 6198d6ad..3e5a7479 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -70,7 +70,7 @@
-
+
Run
From e369dafc246e9038b27512122ed96a3a70967af1 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:56:25 -0500
Subject: [PATCH 56/59] remove redundant class
---
.../build-parameters-tooltip.js | 14 ++++++--------
.../AbstractNameValueHeader/rowHeader.jelly | 3 +--
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/build-parameters-tooltip.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/build-parameters-tooltip.js
index 5d478607..fc866b44 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/build-parameters-tooltip.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/build-parameters-tooltip.js
@@ -1,8 +1,6 @@
-document.addEventListener('DOMContentLoaded', function() {
- const buildId = document.querySelector('.build-parameters-trigger-id').dataset.buildId;
- jQuery('#build-parameters-trigger-' + buildId).tooltip({
- bodyHandler: function() {
- return jQuery('#build-parameters-' + buildId).html();
- },
- });
-});
+const buildId = document.querySelector('.pipeline-info .revision .title').dataset.buildId;
+jQuery('#build-parameters-trigger-' + buildId).tooltip({
+ bodyHandler: function() {
+ return jQuery('#build-parameters-' + buildId).html();
+ },
+});
\ No newline at end of file
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly
index 27201b0b..a4cfd541 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly
@@ -8,7 +8,7 @@
- Pipeline ${buildGrid.get(0,0).getRevision()}
+ Pipeline ${buildGrid.get(0,0).getRevision()}
No parameters
@@ -29,4 +29,3 @@
-
From f3408d897cadbcbc736667ac419eb9a49b4d54c6 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 12:57:16 -0500
Subject: [PATCH 57/59] remove redundant class
---
.../extension/AbstractNameValueHeader/rowHeader.jelly | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly
index a4cfd541..4c339988 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/AbstractNameValueHeader/rowHeader.jelly
@@ -29,3 +29,4 @@
+
From cfae875a09d00e0eca79747ca3853f865bd066c0 Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Fri, 8 Nov 2024 15:45:26 -0500
Subject: [PATCH 58/59] remove redundant span, add attributes to trigger span
---
.../buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js | 5 ++---
.../hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly | 3 +--
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js
index 97580dab..16dbaa11 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp-trigger-pipeline.js
@@ -1,8 +1,7 @@
Behaviour.specify(".bpp-trigger-pipeline-parameterized", 'BuildPipelineView.TriggerPipelineParameterized', 0, function(element) {
element.addEventListener('click', function() {
- const paramsElement = document.querySelector('.bpp-trigger-pipeline-parameterized-params');
- const href = paramsElement.dataset.fillDialogHref;
- const title = paramsElement.dataset.fillDialogTitle;
+ const href = element.dataset.fillDialogHref;
+ const title = element.dataset.fillDialogTitle;
buildPipeline.fillDialog(href, title);
});
});
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
index 3e5a7479..6ab50783 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/BuildPipelineView/bpp.jelly
@@ -63,8 +63,7 @@
-
-
+
Run
From b3e23dada97dcf15e0b6c3a94721e041a49af71a Mon Sep 17 00:00:00 2001
From: shlomomdahan <64103471+shlomomdahan@users.noreply.github.com>
Date: Sun, 10 Nov 2024 09:29:14 -0500
Subject: [PATCH 59/59] remove redundant parameters span
---
.../build-card-template-onclicks.js | 12 +++-------
.../buildCardTemplate.jelly | 24 +++++++------------
2 files changed, 11 insertions(+), 25 deletions(-)
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
index ccad37db..d100030c 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/build-card-template-onclicks.js
@@ -45,11 +45,7 @@ function createClickHandler(parentElement, targetSelector, handlerFn) {
const clickTarget = event.target.closest(targetSelector);
if (!clickTarget || !parentElement.contains(clickTarget)) return;
- const buildCard = clickTarget.closest(".build-card");
- if (!buildCard) return;
-
- const dataContainer = buildCard.querySelector(targetSelector + "-params");
- handlerFn(dataContainer);
+ handlerFn(clickTarget);
};
parentElement.addEventListener("click", newHandler);
@@ -88,10 +84,8 @@ document.addEventListener("DOMContentLoaded", function () {
if (!pipelineWrappers.length) return;
pipelineWrappers.forEach(wrapper => {
- Object.entries(onclickElements).forEach(function(entry) {
- const selector = entry[0];
- const handlerConfig = entry[1];
- createClickHandler(wrapper, selector, handlerConfig.handler);
+ Object.entries(onclickElements).forEach(function([selector, { handler }]) {
+ createClickHandler(wrapper, selector, handler);
});
});
});
diff --git a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly
index dbe53222..e41192b8 100644
--- a/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly
+++ b/src/main/resources/au/com/centrumsystems/hudson/plugin/buildpipeline/extension/BuildCardExtension/buildCardTemplate.jelly
@@ -61,8 +61,7 @@
{{#unless project.disabled}}
{{#if build.isBuilding}}
-
-
+
@@ -95,8 +94,7 @@
-
-
+
@@ -108,8 +106,7 @@
{{#if build.isSuccess}}
{{#if ${!it.triggerOnlyLatestJob}}}
-
-
+
@@ -118,21 +115,18 @@
{{#if ${it.triggerOnlyLatestJob}}}
{{#if build.isLatestBuild}}
{{#if build.isUpstreamBuildLatest}}
-
-
+
{{/if}}
{{/if}}
{{else}}
{{#if build.isManualTrigger}}
-
-
+
{{else}}
-
-
+
{{/if}}
@@ -143,14 +137,12 @@
{{#if build.isReadyToBeManuallyBuilt}}
{{#if ${it.triggerOnlyLatestJob}}}
{{#if build.isUpstreamBuildLatestSuccess}}
-
-
+
{{/if}}
{{else}}
-
-
+
{{/if}}
| | | |