The Unified and Autonomous Development Platform
Fix issue #534 - Only show promoted builds in build detail downstream builds
Robin Shen139e81aa9ece
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.javaindex ed31ceb020..d59ed82ac8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.java@@ -4,7 +4,6 @@ import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;import java.util.List;-import java.util.UUID;import javax.annotation.Nullable;@@ -112,7 +111,7 @@ public abstract class CommitStatusPanel extends Panel {@Overrideprotected String getTriggerChain() {- return UUID.randomUUID().toString();+ return null;}};diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.javaindex 9d42107b7f..1eba70fd75 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java@@ -6,6 +6,7 @@ import java.util.Comparator;import java.util.HashMap;import java.util.List;import java.util.Optional;+import java.util.UUID;import javax.annotation.Nullable;@@ -71,6 +72,7 @@ public abstract class JobListPanel extends Panel {protected abstract Project getProject();+ @Nullableprotected abstract String getTriggerChain();@Nullable@@ -129,7 +131,10 @@ public abstract class JobListPanel extends Panel {@Overrideprotected String getTriggerChain() {- return JobListPanel.this.getTriggerChain();+ String triggerChain = JobListPanel.this.getTriggerChain();+ if (triggerChain == null)+ triggerChain = UUID.randomUUID().toString();+ return triggerChain;}});@@ -152,7 +157,7 @@ public abstract class JobListPanel extends Panel {BuildManager buildManager = OneDev.getInstance(BuildManager.class);List<Build> builds = new ArrayList<>(buildManager.query(getProject(),commitId, job.getName(), refName, Optional.ofNullable(getPullRequest()),- new HashMap<>(), null));+ new HashMap<>(), getTriggerChain()));builds.sort(Comparator.comparing(Build::getNumber));return builds;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex 110b7ddfd5..a6629b12eb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -11,7 +11,7 @@<a wicket:id="rebuild" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-3" title="Re-run this build"><wicket:svg href="re-run" class="icon"/></a><a wicket:id="cancel" class="btn btn-icon btn-light btn-hover-danger btn-xs mr-3" title="Cancel this build"><wicket:svg href="cancel" class="icon"/></a></div>- <a wicket:id="downstream" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-4" title="Downstream jobs"><wicket:svg href="next" class="icon ml-1"/></a>+ <a wicket:id="promotions" class="btn btn-icon btn-light btn-hover-primary btn-xs mr-4" title="Promotions"><wicket:svg href="next" class="icon ml-1"/></a></div><div class="card-toolbar"><a wicket:id="moreInfo" class="more-info side-info ml-auto" title="More info"><wicket:svg href="ellipsis" class="icon"/></a>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 48cb59e41b..1089f6a258 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -97,21 +97,21 @@ public abstract class BuildDetailPage extends ProjectPageprotected final IModel<Build> buildModel;- private final IModel<List<Job>> downstreamJobsModel = new LoadableDetachableModel<List<Job>>() {+ private final IModel<List<Job>> promotionsModel = new LoadableDetachableModel<List<Job>>() {@Overrideprotected List<Job> load() {- List<Job> downstreamJobs = new ArrayList<>();+ List<Job> promoteJobs = new ArrayList<>();BuildSpec buildSpec = getProject().getBuildSpec(getBuild().getCommitId());for (Job job: buildSpec.getJobMap().values()) {for (JobDependency dependency: job.getJobDependencies()) {if (dependency.getJobName().equals(getBuild().getJobName())&& getBuild().matchParams(dependency.getJobParams())) {- downstreamJobs.add(job);+ promoteJobs.add(job);}}}- return downstreamJobs;+ return promoteJobs;}};@@ -302,12 +302,12 @@ public abstract class BuildDetailPage extends ProjectPage}.add(new ConfirmClickModifier("Do you really want to cancel this build?")));- add(new DropdownLink("downstream") {+ add(new DropdownLink("promotions") {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {return new JobListPanel(id, getBuild().getCommitId(),- getBuild().getRefName(), downstreamJobsModel.getObject()) {+ getBuild().getRefName(), promotionsModel.getObject()) {@Overrideprotected Project getProject() {@@ -335,7 +335,7 @@ public abstract class BuildDetailPage extends ProjectPage@Overrideprotected void onConfigure() {super.onConfigure();- setVisible(!downstreamJobsModel.getObject().isEmpty());+ setVisible(!promotionsModel.getObject().isEmpty());}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.javaindex 08514172f4..cf445d8954 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.java@@ -337,7 +337,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota@Overrideprotected List<Build> load() {BuildManager buildManager = OneDev.getInstance(BuildManager.class);- List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId, job.getName()));+ List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId, job.getName(), null));builds.sort(Comparator.comparing(Build::getNumber));return builds;}