Skip to content

The Unified and Autonomous Development Platform

fix issue #159 - Able to run downstream builds from build detail page

Robin Shene67331db06ba
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index af68d6afb4..d9b13daacb 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -32,6 +32,7 @@ import java.util.Map;
import java.util.Set;
import java.util.Stack;
import java.util.concurrent.Callable;
+import java.util.concurrent.atomic.AtomicBoolean;
import javax.annotation.Nullable;
import javax.persistence.CascadeType;
@@ -52,6 +53,7 @@ import org.eclipse.jgit.revwalk.RevWalk;
import org.hibernate.annotations.Cache;
import org.hibernate.annotations.CacheConcurrencyStrategy;
+import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -65,6 +67,7 @@ import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
import io.onedev.server.buildspec.job.VariableInterpolator;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
+import io.onedev.server.buildspec.job.paramspec.SecretParam;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.git.GitUtils;
@@ -79,6 +82,7 @@ import io.onedev.server.util.CollectionUtils;
import io.onedev.server.util.ComponentContext;
import io.onedev.server.util.Input;
import io.onedev.server.util.IssueUtils;
+import io.onedev.server.util.MatrixRunner;
import io.onedev.server.util.ProjectScopedNumber;
import io.onedev.server.util.Referenceable;
import io.onedev.server.util.facade.BuildFacade;
@@ -992,4 +996,40 @@ public class Build extends AbstractEntity implements Referenceable {
}
}
+ public boolean matchParams(List<ParamSupply> paramSupplies) {
+ AtomicBoolean matches = new AtomicBoolean(false);
+ new MatrixRunner<List<String>>(ParamSupply.getParamMatrix(paramSupplies, null)) {
+
+ @Override
+ public void run(Map<String, List<String>> params) {
+ if (!matches.get()) {
+ boolean matching = true;
+ for (Map.Entry<String, List<String>> entry: params.entrySet()) {
+ if (!(getJob().getParamSpecMap().get(entry.getKey()) instanceof SecretParam)) {
+ List<String> paramValues = getParamMap().get(entry.getKey());
+ if (paramValues != null) {
+ if (!entry.getValue().isEmpty()) {
+ if (!Objects.equal(new HashSet<>(entry.getValue()), new HashSet<>(paramValues))) {
+ matching = false;
+ break;
+ }
+ } else if (paramValues.size() != 1 || paramValues.iterator().next() != null) {
+ matching = false;
+ break;
+ }
+ } else {
+ matching = false;
+ break;
+ }
+ }
+ }
+ if (matching)
+ matches.set(true);
+ }
+ }
+
+ }.run();
+
+ return matches.get();
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
index 204f826bca..6b0e67c4e6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/status/CommitStatusPanel.html
@@ -1,18 +1,3 @@
<wicket:panel>
<a wicket:id="status" class="commit-status"><span wicket:id="icon"></span> <i class="fa fa-angle-down"></i></a>
- <wicket:fragment wicket:id="detailFrag">
- <div class="commit-status-detail">
- <div wicket:id="jobs" class="job">
- <div class="head">
- <a wicket:id="name" class="name"><b wicket:id="label"></b></a>
- <a wicket:id="showInList" class="show-in-list" title="Show in build list"><i class="fa fa-list-ul"></i></a>
- <a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play"></i></a>
- </div>
- <div class="body">
- <div wicket:id="detail"></div>
- </div>
- </div>
- <div wicket:id="note" class="note"><i class="fa fa-info-circle"></i> Some jobs are hidden due to permission policy</div>
- </div>
- </wicket:fragment>
</wicket:panel>
\ No newline at end of file
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.java
index 0b3957d0e8..2946705d6c 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
@@ -2,24 +2,16 @@ package io.onedev.server.web.component.commit.status;
import java.util.ArrayList;
import java.util.Collection;
-import java.util.Comparator;
import java.util.List;
import javax.annotation.Nullable;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.eclipse.jgit.lib.ObjectId;
@@ -28,22 +20,15 @@ import org.slf4j.LoggerFactory;
import com.google.common.collect.Sets;
-import io.onedev.server.OneDev;
import io.onedev.server.buildspec.BuildSpec;
import io.onedev.server.buildspec.job.Job;
-import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
-import io.onedev.server.security.SecurityUtils;
import io.onedev.server.model.Project;
-import io.onedev.server.web.behavior.WebSocketObserver;
-import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.job.JobDefLink;
-import io.onedev.server.web.component.job.RunJobLink;
+import io.onedev.server.web.component.job.joblist.JobListPanel;
import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
@SuppressWarnings("serial")
public abstract class CommitStatusPanel extends Panel {
@@ -52,38 +37,25 @@ public abstract class CommitStatusPanel extends Panel {
private final ObjectId commitId;
- private final IModel<List<Job>> allJobsModel = new LoadableDetachableModel<List<Job>>() {
+ private final IModel<List<Job>> jobsModel = new LoadableDetachableModel<List<Job>>() {
@Override
protected List<Job> load() {
+ List<Job> jobs = new ArrayList<>();
try {
BuildSpec buildSpec = getProject().getBuildSpec(commitId);
if (buildSpec != null)
- return buildSpec.getJobs();
+ jobs.addAll(buildSpec.getJobs());
} catch (Exception e) {
logger.error("Error retrieving build spec (project: {}, commit: {})",
getProject().getName(), commitId.name(), e);
}
- return new ArrayList<>();
- }
-
- };
-
- private final IModel<List<Job>> accessibleJobsModel = new LoadableDetachableModel<List<Job>>() {
-
- @Override
- protected List<Job> load() {
- List<Job> jobs = new ArrayList<>();
- for (Job job: allJobsModel.getObject()) {
- if (SecurityUtils.canAccess(getProject(), job.getName()))
- jobs.add(job);
- }
return jobs;
}
};
- private IModel<Status> statusModel = new LoadableDetachableModel<Status>() {
+ private final IModel<Status> statusModel = new LoadableDetachableModel<Status>() {
@Override
protected Status load() {
@@ -107,93 +79,19 @@ public abstract class CommitStatusPanel extends Panel {
@Override
protected Component newContent(String id, FloatingPanel dropdown) {
- Fragment fragment = new Fragment(id, "detailFrag", CommitStatusPanel.this);
-
- fragment.add(new WebMarkupContainer("note") {
+ return new JobListPanel(id, commitId, jobsModel.getObject()) {
@Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(accessibleJobsModel.getObject().size() != allJobsModel.getObject().size());
+ protected Project getProject() {
+ return CommitStatusPanel.this.getProject();
}
-
- });
-
- RepeatingView jobsView = new RepeatingView("jobs");
- fragment.add(jobsView);
- for (Job job: accessibleJobsModel.getObject()) {
- WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());
- Status status = getProject().getCommitStatus(commitId).get(job.getName());
-
- Link<Void> defLink = new JobDefLink("name", commitId, job.getName()) {
- @Override
- protected Project getProject() {
- return CommitStatusPanel.this.getProject();
- }
-
- };
- defLink.add(new Label("label", job.getName()));
- jobItem.add(defLink);
-
- jobItem.add(new RunJobLink("run", commitId, job.getName()) {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- super.onClick(target);
- dropdown.close();
- }
-
- @Override
- protected Project getProject() {
- return CommitStatusPanel.this.getProject();
- }
-
- });
-
- jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,
- ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName()), 0)) {
-
- @Override
- protected void onConfigure() {
- super.onConfigure();
- setVisible(status != null);
- }
-
- });
-
- IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {
-
- @Override
- protected List<Build> load() {
- BuildManager buildManager = OneDev.getInstance(BuildManager.class);
- List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId, job.getName()));
- builds.sort(Comparator.comparing(Build::getNumber));
- return builds;
- }
-
- };
- jobItem.add(new SimpleBuildListPanel("detail", buildsModel));
-
- jobItem.setOutputMarkupId(true);
- jobsView.add(jobItem);
- }
-
- fragment.add(new WebSocketObserver() {
-
@Override
- public void onObservableChanged(IPartialPageRequestHandler handler) {
- handler.add(component);
+ protected void onRunJob(AjaxRequestTarget target) {
+ dropdown.close();
}
- @Override
- public Collection<String> getObservables() {
- return getWebSocketObservables();
- }
-
- });
-
- return fragment;
+ };
}
@Override
@@ -236,8 +134,7 @@ public abstract class CommitStatusPanel extends Panel {
@Override
protected void onDetach() {
- allJobsModel.detach();
- accessibleJobsModel.detach();
+ jobsModel.detach();
statusModel.detach();
super.onDetach();
}
@@ -245,7 +142,7 @@ public abstract class CommitStatusPanel extends Panel {
@Override
protected void onConfigure() {
super.onConfigure();
- setVisible(!allJobsModel.getObject().isEmpty());
+ setVisible(!jobsModel.getObject().isEmpty());
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListCssResourceReference.java
new file mode 100644
index 0000000000..02ef198f58
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListCssResourceReference.java
@@ -0,0 +1,13 @@
+package io.onedev.server.web.component.job.joblist;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class JobListCssResourceReference extends BaseDependentCssResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public JobListCssResourceReference() {
+ super(JobListCssResourceReference.class, "job-list.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html
new file mode 100644
index 0000000000..288091f4bb
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.html
@@ -0,0 +1,15 @@
+<wicket:panel>
+ <div class="job-list">
+ <div wicket:id="jobs" class="job">
+ <div class="head">
+ <a wicket:id="name" class="name"><b wicket:id="label"></b></a>
+ <a wicket:id="showInList" class="show-in-list" title="Show in build list"><i class="fa fa-list-ul"></i></a>
+ <a wicket:id="run" class="run" title="Run this job"><i class="fa fa-play"></i></a>
+ </div>
+ <div class="body">
+ <div wicket:id="detail"></div>
+ </div>
+ </div>
+ <div wicket:id="note" class="note"><i class="fa fa-info-circle"></i> Some jobs are hidden due to permission policy</div>
+ </div>
+</wicket:panel>
\ No newline at end of file
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.java
new file mode 100644
index 0000000000..fc44ca9042
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/JobListPanel.java
@@ -0,0 +1,179 @@
+package io.onedev.server.web.component.job.joblist;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.List;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.eclipse.jgit.lib.ObjectId;
+
+import com.google.common.collect.Sets;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
+import io.onedev.server.model.Project;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.behavior.WebSocketObserver;
+import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;
+import io.onedev.server.web.component.job.JobDefLink;
+import io.onedev.server.web.component.job.RunJobLink;
+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
+
+@SuppressWarnings("serial")
+public abstract class JobListPanel extends Panel {
+
+ private final ObjectId commitId;
+
+ private final List<Job> jobs;
+
+ private final IModel<List<Job>> accessibleJobsModel = new LoadableDetachableModel<List<Job>>() {
+
+ @Override
+ protected List<Job> load() {
+ List<Job> accessibleJobs = new ArrayList<>();
+ for (Job job: jobs) {
+ if (SecurityUtils.canAccess(getProject(), job.getName()))
+ accessibleJobs.add(job);
+ }
+ return accessibleJobs;
+ }
+
+ };
+
+ public JobListPanel(String id, ObjectId commitId, List<Job> jobs) {
+ super(id);
+ this.commitId = commitId;
+ this.jobs = jobs;
+ }
+
+ protected abstract Project getProject();
+
+ protected abstract void onRunJob(AjaxRequestTarget target);
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ add(new WebMarkupContainer("note") {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(accessibleJobsModel.getObject().size() != jobs.size());
+ }
+
+ });
+
+ RepeatingView jobsView = new RepeatingView("jobs");
+ add(jobsView);
+ for (Job job: accessibleJobsModel.getObject()) {
+ WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());
+ Status status = getProject().getCommitStatus(commitId).get(job.getName());
+
+ Link<Void> defLink = new JobDefLink("name", commitId, job.getName()) {
+
+ @Override
+ protected Project getProject() {
+ return JobListPanel.this.getProject();
+ }
+
+ };
+ defLink.add(new Label("label", job.getName()));
+ jobItem.add(defLink);
+
+ jobItem.add(new RunJobLink("run", commitId, job.getName()) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ onRunJob(target);
+ }
+
+ @Override
+ protected Project getProject() {
+ return JobListPanel.this.getProject();
+ }
+
+ });
+
+ jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,
+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName()), 0)) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(status != null);
+ }
+
+ });
+
+ IModel<List<Build>> buildsModel = new LoadableDetachableModel<List<Build>>() {
+
+ @Override
+ protected List<Build> load() {
+ BuildManager buildManager = OneDev.getInstance(BuildManager.class);
+ List<Build> builds = new ArrayList<>(buildManager.query(getProject(), commitId, job.getName()));
+ builds.sort(Comparator.comparing(Build::getNumber));
+ return builds;
+ }
+
+ };
+ jobItem.add(new SimpleBuildListPanel("detail", buildsModel));
+
+ jobItem.setOutputMarkupId(true);
+ jobsView.add(jobItem);
+ }
+
+ add(new WebSocketObserver() {
+
+ @Override
+ public void onObservableChanged(IPartialPageRequestHandler handler) {
+ handler.add(component);
+ }
+
+ @Override
+ public Collection<String> getObservables() {
+ return getWebSocketObservables();
+ }
+
+ });
+ }
+
+ private Collection<String> getWebSocketObservables() {
+ return Sets.newHashSet("commit-status:" + getProject().getId() + ":" + commitId.name());
+ }
+
+ @Override
+ protected void onDetach() {
+ accessibleJobsModel.detach();
+ super.onDetach();
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!jobs.isEmpty());
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new JobListCssResourceReference()));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
new file mode 100644
index 0000000000..45bd77b847
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/job/joblist/job-list.css
@@ -0,0 +1,33 @@
+.job-list {
+ padding: 12px;
+}
+.job-list>.note {
+ font-size: 12px;
+ color: #666;
+}
+.job-list>.job {
+ margin-bottom: 8px;
+}
+.job-list>.job>.head {
+ padding: 4px 0;
+ white-space: nowrap;
+}
+.job-list>.job>.head .show-in-list {
+ color: #666;
+ margin-left: 8px;
+}
+.job-list>.job>.head .run {
+ color: #666;
+ margin-left: 4px;
+}
+
+.job-list>.job>.body {
+ border-top: 1px solid #D8D8D8;
+ padding-top: 8px;
+}
+.job-list>.job>.body .simple-build-list {
+ padding: 0;
+}
+.job-list>.job>.body .no-builds {
+ padding: 0;
+}
\ No newline at end of file
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.html
index a0977a1cfb..966dd9e771 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
@@ -1,15 +1,18 @@
<wicket:extend>
<div id="build-detail">
<div class="main">
- <div wicket:id="summary" class="summary clearfix">
+ <div class="summary clearfix">
<div wicket:id="title" class="title pull-left"></div>
- <div class="status pull-left">
+ <div wicket:id="status" class="status pull-left">
<span wicket:id="statusIcon"></span>
<span wicket:id="statusLabel"></span>
</div>
- <div class="actions pull-left">
+ <div wicket:id="actions" class="actions pull-left">
<a wicket:id="rebuild" class="btn btn-warning btn-sm"><i class="fa fa-undo"></i> Rebuild</a>
<a wicket:id="cancel" class="btn btn-danger btn-sm"><i class="fa fa-ban"></i> Cancel</a>
+ </div>
+ <div class="pull-left down-stream">
+ <a wicket:id="downstream" class="btn btn-default btn-sm">Downstream <i class="fa fa-caret-down"></i></a>
</div>
<a wicket:id="moreInfo" class="more-info pull-right" title="More info"><span class="fa fa-ellipsis-h"></span></a>
</div>
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.java
index 0b0bf951af..5800fcc9d1 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
@@ -35,12 +35,16 @@ import com.google.common.collect.Sets;
import io.onedev.commons.utils.LockUtils;
import io.onedev.server.OneDev;
+import io.onedev.server.buildspec.BuildSpec;
+import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobDependency;
import io.onedev.server.buildspec.job.JobManager;
import io.onedev.server.buildspec.job.paramspec.ParamSpec;
import io.onedev.server.buildspec.job.paramsupply.ParamSupply;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
+import io.onedev.server.model.Project;
import io.onedev.server.model.support.inputspec.InputContext;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScopedNumber;
@@ -52,6 +56,9 @@ import io.onedev.server.web.behavior.WebSocketObserver;
import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
import io.onedev.server.web.component.build.side.BuildSidePanel;
import io.onedev.server.web.component.build.status.BuildStatusIcon;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.job.joblist.JobListPanel;
+import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.link.ViewStateAwarePageLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
import io.onedev.server.web.component.sideinfo.SideInfoLink;
@@ -84,6 +91,26 @@ public abstract class BuildDetailPage extends ProjectPage
protected final IModel<Build> buildModel;
+ private final IModel<List<Job>> downstreamJobsModel = new LoadableDetachableModel<List<Job>>() {
+
+ @Override
+ protected List<Job> load() {
+ BuildSpec buildSpec = getProject().getBuildSpec(getBuild().getCommitId());
+
+ List<Job> downstreamJobs = new ArrayList<>();
+ for (Job job: buildSpec.getJobs()) {
+ for (JobDependency dependency: job.getJobDependencies()) {
+ if (dependency.getJobName().equals(getBuild().getJobName())
+ && getBuild().matchParams(dependency.getJobParams())) {
+ downstreamJobs.add(job);
+ }
+ }
+ }
+ return downstreamJobs;
+ }
+
+ };
+
public BuildDetailPage(PageParameters params) {
super(params);
@@ -142,12 +169,7 @@ public abstract class BuildDetailPage extends ProjectPage
protected void onInitialize() {
super.onInitialize();
- WebMarkupContainer summary = new WebMarkupContainer("summary");
- summary.add(newBuildObserver(getBuild().getId()));
- summary.setOutputMarkupId(true);
- add(summary);
-
- summary.add(new Label("title", new AbstractReadOnlyModel<String>() {
+ add(new Label("title", new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
@@ -158,9 +180,22 @@ public abstract class BuildDetailPage extends ProjectPage
}
- }));
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(newBuildObserver(getBuild().getId()));
+ setOutputMarkupId(true);
+ }
+
+ });
- summary.add(new BuildStatusIcon("statusIcon", new AbstractReadOnlyModel<Status>() {
+ WebMarkupContainer statusContainer = new WebMarkupContainer("status");
+ add(statusContainer);
+ statusContainer.add(newBuildObserver(getBuild().getId()));
+ statusContainer.setOutputMarkupId(true);
+ statusContainer.add(new BuildStatusIcon("statusIcon", new AbstractReadOnlyModel<Status>() {
@Override
public Status getObject() {
@@ -175,7 +210,7 @@ public abstract class BuildDetailPage extends ProjectPage
}
});
- summary.add(new Label("statusLabel", new AbstractReadOnlyModel<String>() {
+ statusContainer.add(new Label("statusLabel", new AbstractReadOnlyModel<String>() {
@Override
public String getObject() {
@@ -184,7 +219,13 @@ public abstract class BuildDetailPage extends ProjectPage
}));
- summary.add(new AjaxLink<Void>("rebuild") {
+ WebMarkupContainer actionsContainer = new WebMarkupContainer("actions");
+ actionsContainer.setOutputMarkupId(true);
+ add(actionsContainer);
+
+ actionsContainer.add(newBuildObserver(getBuild().getId()));
+
+ actionsContainer.add(new AjaxLink<Void>("rebuild") {
private void resubmit(Serializable paramBean) {
Map<String, List<String>> paramMap = ParamSupply.getParamMap(getBuild().getJob(), paramBean,
@@ -250,7 +291,7 @@ public abstract class BuildDetailPage extends ProjectPage
});
- summary.add(new Link<Void>("cancel") {
+ actionsContainer.add(new Link<Void>("cancel") {
@Override
public void onClick() {
@@ -266,7 +307,34 @@ public abstract class BuildDetailPage extends ProjectPage
}.add(new ConfirmClickModifier("Do you really want to cancel this build?")));
- summary.add(new SideInfoLink("moreInfo"));
+ add(new DropdownLink("downstream") {
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new JobListPanel(id, getBuild().getCommitId(), downstreamJobsModel.getObject()) {
+
+ @Override
+ protected Project getProject() {
+ return BuildDetailPage.this.getProject();
+ }
+
+ @Override
+ protected void onRunJob(AjaxRequestTarget target) {
+ dropdown.close();
+ }
+
+ };
+ }
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(!downstreamJobsModel.getObject().isEmpty());
+ }
+
+ });
+
+ add(new SideInfoLink("moreInfo"));
add(new Label("errorMessage", new AbstractReadOnlyModel<String>() {