The Unified and Autonomous Development Platform
Fix issue #483 - Pipeline View for related jobs
Robin Shendcd29816028c
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.javaindex 86dc882c67..d7c84a1be5 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/DefaultJobManager.java@@ -217,7 +217,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Transactional@Overridepublic Build submit(Project project, ObjectId commitId, String jobName,- Map<String, List<String>> paramMap, String triggerChain, SubmitReason reason) {+ Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {Lock lock = LockUtils.getLock("job-manager: " + project.getId() + "-" + commitId.name());transactionManager.mustRunAfterTransaction(new Runnable() {@@ -248,7 +248,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizproject.getPath(), commitId.name(), jobName));}- return doSubmit(project, commitId, jobName, paramMap, triggerChain, reason);+ return doSubmit(project, commitId, jobName, paramMap, pipeline, reason);} catch (Throwable e) {throw ExceptionUtils.unchecked(e);} finally {@@ -257,7 +257,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz}private Build doSubmit(Project project, ObjectId commitId, String jobName,- Map<String, List<String>> paramMap, String triggerChain, SubmitReason reason) {+ Map<String, List<String>> paramMap, String pipeline, SubmitReason reason) {ScriptIdentity.push(new JobIdentity(project, commitId));try {Build build = new Build();@@ -270,7 +270,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizbuild.setSubmitter(SecurityUtils.getUser());build.setRefName(reason.getRefName());build.setRequest(reason.getPullRequest());- build.setTriggerChain(triggerChain);+ build.setPipeline(pipeline);ParamUtils.validateParamMap(build.getJob().getParamSpecs(), paramMap);@@ -282,7 +282,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizCollection<Build> builds = buildManager.query(project, commitId, jobName,reason.getRefName(), Optional.ofNullable(reason.getPullRequest()),- paramMapToQuery, triggerChain);+ paramMapToQuery, pipeline);if (builds.isEmpty()) {Long projectId = project.getId();@@ -340,7 +340,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run(Map<String, List<String>> paramMap) {Build dependencyBuild = doSubmit(project, commitId,- interpolated.getJobName(), paramMap, triggerChain, reason);+ interpolated.getJobName(), paramMap, pipeline, reason);BuildDependence dependence = new BuildDependence();dependence.setDependency(dependencyBuild);dependence.setDependent(build);@@ -801,11 +801,11 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizif (event instanceof CommitAware) {ObjectId commitId = ((CommitAware) event).getCommit().getCommitId();if (!commitId.equals(ObjectId.zeroId())) {- String triggerChain;+ String pipeline;if (event instanceof BuildEvent)- triggerChain = ((BuildEvent) event).getBuild().getTriggerChain();+ pipeline = ((BuildEvent) event).getBuild().getPipeline();else- triggerChain = UUID.randomUUID().toString();+ pipeline = UUID.randomUUID().toString();PullRequest request = null;if (event instanceof PullRequestEvent)request = ((PullRequestEvent) event).getRequest();@@ -839,7 +839,7 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthoriz@Overridepublic void run(Map<String, List<String>> paramMap) {submit(project, commitId, job.getName(), paramMap,- triggerChain, match.getReason());+ pipeline, match.getReason());}}.run();@@ -1092,12 +1092,12 @@ public class DefaultJobManager implements JobManager, Runnable, CodePullAuthorizpublic void run() {SecurityUtils.bindAsSystem();Project project = projectManager.load(projectId);- String triggerChain = UUID.randomUUID().toString();+ String pipeline = UUID.randomUUID().toString();new MatrixRunner<List<String>>(ParamUtils.getParamMatrix(null, null, trigger.getParams())) {@Overridepublic void run(Map<String, List<String>> paramMap) {- Build build = submit(project, commitId, job.getName(), paramMap, triggerChain, reason);+ Build build = submit(project, commitId, job.getName(), paramMap, pipeline, reason);if (build.isFinished())resubmit(build, paramMap, "Resubmitted by schedule");}diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.javaindex fcbc959715..d24d230d09 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/Job.java@@ -8,6 +8,7 @@ import static io.onedev.server.model.Build.NAME_TAG;import static io.onedev.server.search.entity.build.BuildQuery.getRuleName;import static io.onedev.server.search.entity.build.BuildQueryLexer.And;import static io.onedev.server.search.entity.build.BuildQueryLexer.Is;+import static io.onedev.server.search.entity.build.BuildQueryLexer.InPipelineOf;import java.io.Serializable;import java.util.ArrayList;@@ -48,6 +49,7 @@ import io.onedev.server.entitymanager.SettingManager;import io.onedev.server.event.ProjectEvent;import io.onedev.server.git.GitUtils;import io.onedev.server.job.requirement.JobRequirement;+import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.administration.jobexecutor.JobExecutor;import io.onedev.server.util.ComponentContext;@@ -437,11 +439,13 @@ public class Job implements NamedElement, Serializable, Validatable {}public static String getBuildQuery(ObjectId commitId, String jobName,- @Nullable String refName, @Nullable PullRequest request) {+ @Nullable Build pipelineOf, @Nullable String refName, @Nullable PullRequest request) {String query = ""+ Criteria.quote(NAME_COMMIT) + " " + getRuleName(Is) + " " + Criteria.quote(commitId.name())+ " " + getRuleName(And) + " "+ Criteria.quote(NAME_JOB) + " " + getRuleName(Is) + " " + Criteria.quote(jobName);+ if (pipelineOf != null)+ query = query + " " + getRuleName(And) + " " + getRuleName(InPipelineOf) + " " + Criteria.quote("#" + pipelineOf.getNumber());if (request != null) {query = query+ " " + getRuleName(And) + " "diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.javaindex 3f2392bab0..19c6b68cb1 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/JobManager.java@@ -19,7 +19,7 @@ public interface JobManager {void schedule(Project project);Build submit(Project project, ObjectId commitId, String jobName,- Map<String, List<String>> paramMap, String triggerChain, SubmitReason reason);+ Map<String, List<String>> paramMap, String pipeline, SubmitReason reason);void resubmit(Build build, Map<String, List<String>> paramMap, String reason);diff --git a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.javaindex 3840cd3f2d..979a587f3f 100644--- a/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java+++ b/server-core/src/main/java/io/onedev/server/buildspec/job/action/RunJobAction.java@@ -115,7 +115,7 @@ public class RunJobAction extends PostBuildAction {};JobManager jobManager = OneDev.getInstance(JobManager.class);jobManager.submit(build.getProject(), build.getCommitId(), getJobName(),- paramMap, build.getTriggerChain(), reason);+ paramMap, build.getPipeline(), reason);}}.run();diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.javaindex bb2deddbf0..9a2e1e392c 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/BuildManager.java@@ -41,12 +41,12 @@ public interface BuildManager extends EntityManager<Build> {Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,@Nullable String refName, @Nullable Optional<PullRequest> request,- Map<String, List<String>> params, @Nullable String triggerChain);+ Map<String, List<String>> params, @Nullable String pipeline);Collection<Build> query(Project project, ObjectId commitId, @Nullable String jobName,- @Nullable String triggerChain);+ @Nullable String pipeline);- Collection<Build> query(Project project, ObjectId commitId, @Nullable String triggerChain);+ Collection<Build> query(Project project, ObjectId commitId, @Nullable String pipeline);Map<ObjectId, Map<String, Collection<StatusInfo>>> queryStatus(Project project, Collection<ObjectId> commitIds);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.javaindex 844a7b9fac..3e05feb061 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultBuildManager.java@@ -263,21 +263,21 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@Sessional@Override- public Collection<Build> query(Project project, ObjectId commitId, String triggerChain) {- return query(project, commitId, null, triggerChain);+ public Collection<Build> query(Project project, ObjectId commitId, String pipeline) {+ return query(project, commitId, null, pipeline);}@Sessional@Override- public Collection<Build> query(Project project, ObjectId commitId, String jobName, String triggerChain) {- return query(project, commitId, jobName, null, null, new HashMap<>(), triggerChain);+ public Collection<Build> query(Project project, ObjectId commitId, String jobName, String pipeline) {+ return query(project, commitId, jobName, null, null, new HashMap<>(), pipeline);}@Sessional@Overridepublic Collection<Build> query(Project project, ObjectId commitId, String jobName,String refName, Optional<PullRequest> request, Map<String, List<String>> params,- String triggerChain) {+ String pipeline) {CriteriaBuilder builder = getSession().getCriteriaBuilder();CriteriaQuery<Build> query = builder.createQuery(Build.class);Root<Build> root = query.from(Build.class);@@ -285,8 +285,8 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuiList<Predicate> predicates = new ArrayList<>();predicates.add(builder.equal(root.get(Build.PROP_PROJECT), project));predicates.add(builder.equal(root.get(Build.PROP_COMMIT), commitId.name()));- if (triggerChain != null)- predicates.add(builder.equal(root.get(Build.PROP_TRIGGER_CHAIN), triggerChain));+ if (pipeline != null)+ predicates.add(builder.equal(root.get(Build.PROP_PIPELINE), pipeline));if (jobName != null)predicates.add(builder.equal(root.get(Build.PROP_JOB), jobName));if (refName != null)@@ -637,16 +637,17 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements Bui@SuppressWarnings("unchecked")private void fillStatus(Project project, Collection<ObjectId> commitIds,Map<ObjectId, Map<String, Collection<StatusInfo>>> commitStatuses) {- Query<?> query = getSession().createQuery("select commitHash, jobName, status, refName, request.id from Build "+ Query<?> query = getSession().createQuery("select commitHash, pipeline, jobName, status, refName, request.id from Build "+ "where project=:project and commitHash in :commitHashes");query.setParameter("project", project);query.setParameter("commitHashes", commitIds.stream().map(it->it.name()).collect(Collectors.toList()));for (Object[] row: (List<Object[]>)query.list()) {ObjectId commitId = ObjectId.fromString((String) row[0]);- String jobName = (String) row[1];- Status status = (Status) row[2];- String refName = (String) row[3];- Long requestId = (Long) row[4];+ String pipeline = (String) row[1];+ String jobName = (String) row[2];+ Status status = (Status) row[3];+ String refName = (String) row[4];+ Long requestId = (Long) row[5];Map<String, Collection<StatusInfo>> commitStatus = commitStatuses.get(commitId);if (commitStatus == null) {@@ -658,7 +659,7 @@ public class DefaultBuildManager extends BaseEntityManager<Build> implements BuijobStatus = new HashSet<>();commitStatus.put(jobName, jobStatus);}- jobStatus.add(new StatusInfo(status, requestId, refName));+ jobStatus.add(new StatusInfo(status, pipeline, requestId, refName));}}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.javaindex 772042f678..64a98a11f0 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@@ -5,7 +5,7 @@ import static io.onedev.server.model.Build.PROP_FINISH_DATE;import static io.onedev.server.model.Build.PROP_FINISH_DAY;import static io.onedev.server.model.Build.PROP_JOB;import static io.onedev.server.model.Build.PROP_NUMBER;-import static io.onedev.server.model.Build.PROP_TRIGGER_CHAIN;+import static io.onedev.server.model.Build.PROP_PIPELINE;import static io.onedev.server.model.Build.PROP_PENDING_DATE;import static io.onedev.server.model.Build.PROP_REF_NAME;import static io.onedev.server.model.Build.PROP_RUNNING_DATE;@@ -101,7 +101,7 @@ import io.onedev.server.web.util.WicketUtils;@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_submitter_id"), @Index(columnList="o_canceller_id"),@Index(columnList="o_request_id"),- @Index(columnList=PROP_COMMIT), @Index(columnList=PROP_TRIGGER_CHAIN),+ @Index(columnList=PROP_COMMIT), @Index(columnList=PROP_PIPELINE),@Index(columnList=PROP_NUMBER), @Index(columnList=PROP_JOB),@Index(columnList=PROP_STATUS), @Index(columnList=PROP_REF_NAME),@Index(columnList=PROP_SUBMIT_DATE), @Index(columnList=PROP_PENDING_DATE),@@ -138,7 +138,7 @@ public class Build extends AbstractEntity implements Referenceable {public static final String PROP_STATUS = "status";- public static final String PROP_TRIGGER_CHAIN = "triggerChain";+ public static final String PROP_PIPELINE = "pipeline";public static final String NAME_SUBMITTER = "Submitter";@@ -306,7 +306,7 @@ public class Build extends AbstractEntity implements Referenceable {private Date retryDate;@Column(nullable=false)- private String triggerChain;+ private String pipeline;@JsonIgnoreprivate Integer finishDay;@@ -454,12 +454,12 @@ public class Build extends AbstractEntity implements Referenceable {this.status = status;}- public String getTriggerChain() {- return triggerChain;+ public String getPipeline() {+ return pipeline;}- public void setTriggerChain(String triggerChain) {- this.triggerChain = triggerChain;+ public void setPipeline(String pipeline) {+ this.pipeline = pipeline;}public Date getStatusDate() {diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex d8970cf75d..2de6a23445 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -785,7 +785,7 @@ public class Project extends AbstractEntity {}public Map<String, Status> getCommitStatus(ObjectId commitId,- @Nullable PullRequest request, @Nullable String refName) {+ @Nullable String pipeline, @Nullable PullRequest request, @Nullable String refName) {Map<String, Collection<StatusInfo>> commitStatusInfos = getCommitStatusCache().get(commitId);if (commitStatusInfos == null) {BuildManager buildManager = OneDev.getInstance(BuildManager.class);@@ -796,7 +796,8 @@ public class Project extends AbstractEntity {for (Map.Entry<String, Collection<StatusInfo>> entry: commitStatusInfos.entrySet()) {Collection<Status> statuses = new ArrayList<>();for (StatusInfo statusInfo: entry.getValue()) {- if ((refName == null || refName.equals(statusInfo.getRefName()))+ if ((pipeline == null || pipeline.equals(statusInfo.getPipeline()))+ && (refName == null || refName.equals(statusInfo.getRefName()))&& Objects.equals(PullRequest.idOf(request), statusInfo.getRequestId())) {statuses.add(statusInfo.getStatus());}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4index cbe40c1c7a..1fe9799969 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4@@ -9,7 +9,7 @@ querycriteria: operator=(Successful|Failed|Cancelled|Running|Waiting|Pending|TimedOut|SubmittedByMe|CancelledByMe) #OperatorCriteria| criteriaField=Quoted WS+ operator=IsEmpty #FieldOperatorCriteria- | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria+ | operator=(FixedIssue|SubmittedBy|CancelledBy|DependsOn|DependenciesOf|InPipelineOf|RanOn) WS+ criteriaValue=Quoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria| criteria WS+ And WS+ criteria #AndCriteria| criteria WS+ Or WS+ criteria #OrCriteria@@ -73,6 +73,10 @@ DependenciesOf: 'dependencies' WS+ 'of';+InPipelineOf+ : 'in' WS+ 'pipeline' WS+ 'of'+ ;+RanOn: 'ran' WS+ 'on';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.javaindex 1576ad8e35..1c69fd8c64 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java@@ -151,6 +151,8 @@ public class BuildQuery extends EntityQuery<Build> {return new DependsOnCriteria(project, value);else if (ctx.DependenciesOf() != null)return new DependenciesOfCriteria(project, value);+ else if (ctx.InPipelineOf() != null)+ return new InPipelineOfCriteria(project, value);else if (ctx.RanOn() != null)return new RanOnCriteria(value);elsediff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/InPipelineOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/InPipelineOfCriteria.javanew file mode 100644index 0000000000..85bc0e7d46--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/InPipelineOfCriteria.java@@ -0,0 +1,42 @@+package io.onedev.server.search.entity.build;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.search.entity.EntityQuery;+import io.onedev.server.util.criteria.Criteria;++public class InPipelineOfCriteria extends Criteria<Build> {++ private static final long serialVersionUID = 1L;++ private final Build build;++ private final String value;++ public InPipelineOfCriteria(@Nullable Project project, String value) {+ build = EntityQuery.getBuild(project, value);+ this.value = value;+ }++ @Override+ public Predicate getPredicate(CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {+ return builder.equal(from.get(Build.PROP_PIPELINE), build.getPipeline());+ }++ @Override+ public boolean matches(Build build) {+ return build.getPipeline().equals(this.build.getPipeline());+ }++ @Override+ public String toStringWithoutParens() {+ return BuildQuery.getRuleName(BuildQueryLexer.InPipelineOf) + " " + quote(value);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/util/StatusInfo.java b/server-core/src/main/java/io/onedev/server/util/StatusInfo.javaindex 1b15046904..58bcba7877 100644--- a/server-core/src/main/java/io/onedev/server/util/StatusInfo.java+++ b/server-core/src/main/java/io/onedev/server/util/StatusInfo.java@@ -10,18 +10,26 @@ public class StatusInfo implements Serializable {private static final long serialVersionUID = 1L;+ private final String pipeline;+private final Long requestId;private final String refName;private final Build.Status status;- public StatusInfo(Build.Status status, @Nullable Long requestId, @Nullable String refName) {+ public StatusInfo(Build.Status status, @Nullable String pipeline, @Nullable Long requestId, @Nullable String refName) {this.status = status;+ this.pipeline = pipeline;this.requestId = requestId;this.refName = refName;}+ @Nullable+ public String getPipeline() {+ return pipeline;+ }+@Nullablepublic Long getRequestId() {return requestId;diff --git a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javasimilarity index 98%rename from server-core/src/main/java/io/onedev/server/web/OneUrlMapper.javarename to server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.javaindex 4b22eff407..7ec88ca3bf 100644--- a/server-core/src/main/java/io/onedev/server/web/OneUrlMapper.java+++ b/server-core/src/main/java/io/onedev/server/web/BaseUrlMapper.java@@ -77,6 +77,7 @@ import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.pipeline.BuildPipelinePage;import io.onedev.server.web.page.project.children.ProjectChildrenPage;import io.onedev.server.web.page.project.codecomments.InvalidCodeCommentPage;import io.onedev.server.web.page.project.codecomments.ProjectCodeCommentsPage;@@ -138,7 +139,7 @@ import io.onedev.server.web.resource.RawBlobResourceReference;import io.onedev.server.web.resource.ServerLogResourceReference;import io.onedev.server.web.resource.SvgSpriteResourceReference;-public class OneUrlMapper extends CompoundRequestMapper {+public class BaseUrlMapper extends CompoundRequestMapper {@Overridepublic CompoundRequestMapper add(IRequestMapper mapper) {@@ -147,7 +148,7 @@ public class OneUrlMapper extends CompoundRequestMapper {return super.add(mapper);}- public OneUrlMapper(WebApplication app) {+ public BaseUrlMapper(WebApplication app) {add(new DynamicPathPageMapper("init", ServerInitPage.class));add(new DynamicPathPageMapper("loading", BrowserInfoPage.class));add(new DynamicPathPageMapper("issues", IssueListPage.class));@@ -311,6 +312,7 @@ public class OneUrlMapper extends CompoundRequestMapper {add(new DynamicPathPageMapper("projects/${project}/builds", ProjectBuildsPage.class));add(new DynamicPathPageMapper("projects/${project}/builds/${build}", BuildDashboardPage.class));+ add(new DynamicPathPageMapper("projects/${project}/builds/${build}/pipeline", BuildPipelinePage.class));add(new DynamicPathPageMapper("projects/${project}/builds/${build}/log", BuildLogPage.class));add(new DynamicPathPageMapper("projects/${project}/builds/${build}/changes", BuildChangesPage.class));add(new DynamicPathPageMapper("projects/${project}/builds/${build}/fixed-issues", FixedIssuesPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/WebApplication.java b/server-core/src/main/java/io/onedev/server/web/WebApplication.javaindex d206650b5e..156c9f8763 100644--- a/server-core/src/main/java/io/onedev/server/web/WebApplication.java+++ b/server-core/src/main/java/io/onedev/server/web/WebApplication.java@@ -229,7 +229,7 @@ public class WebApplication extends org.apache.wicket.protocol.http.WebApplicati});- mount(new OneUrlMapper(this));+ mount(new BaseUrlMapper(this));for (WebApplicationConfigurator configurator: applicationConfigurators)configurator.configure(this);diff --git a/server-core/src/main/java/io/onedev/server/web/asset/pipelinebutton/PipelineButtonCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/pipelinebutton/PipelineButtonCssResourceReference.javanew file mode 100644index 0000000000..595713c5f9--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/pipelinebutton/PipelineButtonCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.asset.pipelinebutton;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class PipelineButtonCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public PipelineButtonCssResourceReference() {+ super(PipelineButtonCssResourceReference.class, "pipeline-button.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/asset/pipelinebutton/pipeline-button.css b/server-core/src/main/java/io/onedev/server/web/asset/pipelinebutton/pipeline-button.cssnew file mode 100644index 0000000000..c9deb92eb4--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/pipelinebutton/pipeline-button.css@@ -0,0 +1,26 @@+.active .btn.btn-outline-secondary {+ color: var(--primary);+ background-color: transparent;+ border-color: var(--primary) !important;+}+.active .btn.btn-outline-secondary:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.active .btn.btn-outline-secondary:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.active .btn.btn-outline-secondary:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.active .btn.btn-outline-secondary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.active .show>.btn.btn-outline-secondary.dropdown-toggle, .show .btn.btn-outline-secondary.btn-dropdown {+ color: var(--primary);+ background-color: var(--light-primary);+}+.active .btn.btn-outline-secondary .drag-indicator {+ color: var(--primary);+}+.dark-mode .active .btn.btn-outline-secondary:hover:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.dark-mode .active .btn.btn-outline-secondary:focus:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.dark-mode .active .btn.btn-outline-secondary:active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.dark-mode .active .btn.btn-outline-secondary.active:not(.disabled):not(:disabled):not([disabled]):not(.btn-text),+.dark-mode .active .show>.btn.btn-outline-secondary.dropdown-toggle,+.dark-mode .active .show .btn.btn-outline-secondary.btn-dropdown {+ color: var(--primary);+ background-color: var(--dark-mode-light-primary);+}+diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.javaindex bd6501a584..52d278e54a 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java@@ -94,16 +94,18 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = BuildQuery.getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == BuildQueryLexer.SubmittedBy || operator == BuildQueryLexer.CancelledBy)+ if (operator == BuildQueryLexer.SubmittedBy || operator == BuildQueryLexer.CancelledBy) {return SuggestionUtils.suggestUsers(matchWith);- else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf)+ } else if (operator == BuildQueryLexer.DependsOn || operator == BuildQueryLexer.DependenciesOf+ || operator == BuildQueryLexer.InPipelineOf) {return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- else if (operator == BuildQueryLexer.FixedIssue)+ } else if (operator == BuildQueryLexer.FixedIssue) {return SuggestionUtils.suggestIssues(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);- else if (operator == BuildQueryLexer.RanOn)+ } else if (operator == BuildQueryLexer.RanOn) {return SuggestionUtils.suggestAgents(matchWith);- else+ } else {return SuggestionUtils.suggestPullRequests(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ }} else {String fieldName = BuildQuery.getValue(fieldElements.get(0).getMatchedText());try {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListCssResourceReference.javanew file mode 100644index 0000000000..7e1d5219f1--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.build.minilist;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class MiniBuildListCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public MiniBuildListCssResourceReference() {+ super(MiniBuildListCssResourceReference.class, "mini-build-list.css");+ }++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.javasimilarity index 78%rename from server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.javarename to server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.javaindex d6a85f0d32..f423ef6df9 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/simplelist/SimpleBuildListPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/MiniBuildListPanel.java@@ -1,9 +1,13 @@-package io.onedev.server.web.component.build.simplelist;+package io.onedev.server.web.component.build.minilist;import java.util.List;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;+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;@@ -23,9 +27,9 @@ import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;@SuppressWarnings("serial")-public class SimpleBuildListPanel extends GenericPanel<List<Build>> {+public class MiniBuildListPanel extends GenericPanel<List<Build>> {- public SimpleBuildListPanel(String id, IModel<List<Build>> model) {+ public MiniBuildListPanel(String id, IModel<List<Build>> model) {super(id, model);}@@ -65,6 +69,9 @@ public class SimpleBuildListPanel extends GenericPanel<List<Build>> {builder.append(" (" + build.getVersion() + ")");buildLink.add(new Label("title", builder.toString()));item.add(buildLink);++ if (build.equals(getActiveBuild()))+ item.add(AttributeAppender.append("class", "active"));}});@@ -74,8 +81,19 @@ public class SimpleBuildListPanel extends GenericPanel<List<Build>> {}}+ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new MiniBuildListCssResourceReference()));+ }+protected Component newListLink(String componentId) {return new WebMarkupContainer(componentId).setVisible(false);}+ @Nullable+ protected Build getActiveBuild() {+ return null;+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/minilist/mini-build-list.css b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/mini-build-list.cssnew file mode 100644index 0000000000..6e30cd8f24--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/build/minilist/mini-build-list.css@@ -0,0 +1,12 @@+.active a.build {+ background-color: var(--light-primary);+}+.active a.build:hover {+ background-color: var(--light-primary) !important;+}+.dark-mode .active a.build {+ background-color: var(--dark-mode-light-primary);+}+.dark-mode .active a.build:hover {+ background-color: var(--dark-mode-light-primary) !important;+}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 d59ed82ac8..6ca2472cac 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@@ -68,7 +68,7 @@ public abstract class CommitStatusPanel extends Panel {@Overrideprotected Status load() {- return Status.getOverallStatus(getProject().getCommitStatus(commitId, getPullRequest(), refName).values());+ return Status.getOverallStatus(getProject().getCommitStatus(commitId, null, getPullRequest(), refName).values());}};@@ -110,7 +110,7 @@ public abstract class CommitStatusPanel extends Panel {}@Override- protected String getTriggerChain() {+ protected String getPipeline() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.javaindex 769dda788d..83d5b03024 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/RunJobLink.java@@ -11,6 +11,7 @@ import java.util.stream.Collectors;import javax.annotation.Nullable;import org.apache.wicket.Component;+import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.markup.html.basic.Label;@@ -37,7 +38,6 @@ import io.onedev.server.util.script.identity.JobIdentity;import io.onedev.server.util.script.identity.ScriptIdentity;import io.onedev.server.web.component.modal.message.MessageModal;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;-import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;@SuppressWarnings("serial")public abstract class RunJobLink extends AjaxLink<Void> {@@ -58,7 +58,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {protected abstract Project getProject();- protected abstract String getTriggerChain();+ protected abstract String getPipeline();@Nullableprotected abstract PullRequest getPullRequest();@@ -105,7 +105,7 @@ public abstract class RunJobLink extends AjaxLink<Void> {Serializable populatedParamBean) {Map<String, List<String>> paramMap = ParamUtils.getParamMap(job, populatedParamBean, job.getParamSpecMap().keySet());- String triggerChain = getTriggerChain();+ String pipeline = getPipeline();List<Build> builds = new ArrayList<>();for (String refName: selectedRefNames) {SubmitReason reason = new SubmitReason() {@@ -127,12 +127,14 @@ public abstract class RunJobLink extends AjaxLink<Void> {};builds.add(getJobManager().submit(getProject(), commitId, job.getName(),- paramMap, triggerChain, reason));+ paramMap, pipeline, reason));}if (builds.size() == 1)setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(builds.iterator().next()));elseclose();+ if (builds.stream().allMatch(it->it.isFinished()))+ Session.get().warn("Build already fired in current pipeline");}@Override@@ -171,9 +173,10 @@ public abstract class RunJobLink extends AjaxLink<Void> {};Build build = getJobManager().submit(getProject(), commitId, job.getName(),- new HashMap<>(), getTriggerChain(), reason);-- setResponsePage(BuildLogPage.class, BuildLogPage.paramsOf(build));+ new HashMap<>(), getPipeline(), reason);+ setResponsePage(BuildDashboardPage.class, BuildDashboardPage.paramsOf(build));+ if (build.isFinished())+ Session.get().warn("Build already fired in current pipeline");}} else {new MessageModal(target) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.html b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.htmlnew file mode 100644index 0000000000..78fe02756a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.html@@ -0,0 +1,10 @@+<wicket:panel>+ <span class="btn-group">+ <a wicket:id="detail" class="btn btn-outline-secondary">+ <svg wicket:id="status" class="status mr-2"></svg>+ <b wicket:id="name" class="name"></b>+ <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>+ </a>+ <a wicket:id="run" class="run btn btn-outline-secondary btn-icon" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>+ </span>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.javanew file mode 100644index 0000000000..1fb3a1695c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java@@ -0,0 +1,188 @@+package io.onedev.server.web.component.job.jobinfo;++import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.List;+import java.util.UUID;++import javax.annotation.Nullable;++import org.apache.wicket.Component;+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.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.eclipse.jgit.lib.ObjectId;++import com.google.common.collect.Lists;++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.model.PullRequest;+import io.onedev.server.web.asset.pipelinebutton.PipelineButtonCssResourceReference;+import io.onedev.server.web.behavior.WebSocketObserver;+import io.onedev.server.web.component.build.minilist.MiniBuildListPanel;+import io.onedev.server.web.component.build.status.BuildStatusIcon;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.job.RunJobLink;+import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;++@SuppressWarnings("serial")+public abstract class JobInfoButton extends Panel {++ public JobInfoButton(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ DropdownLink detailLink = new DropdownLink("detail") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ 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(), getCommitId(), getJobName(), getPipelineOf().getPipeline()));+ builds.sort(Comparator.comparing(Build::getNumber));+ return builds;+ }++ };++ return new MiniBuildListPanel(id, buildsModel) {++ @Override+ protected Component newListLink(String componentId) {+ return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(getCommitId(), getJobName(), getPipelineOf(), null, null), 0)) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getBuilds().isEmpty());+ }++ };+ }++ @Override+ protected Build getActiveBuild() {+ return JobInfoButton.this.getActiveBuild();+ }++ };+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);++ String cssClasses = "btn btn-outline-secondary";+ Build.Status status = getProject().getCommitStatus(getCommitId(), getPipelineOf().getPipeline(), null, null).get(getJobName());+ String title;+ if (status != null) {+ if (status != Status.SUCCESSFUL)+ title = "Some builds are ";+ else+ title = "Builds are ";+ title += status.toString().toLowerCase() + ", click for details";+ } else {+ title = "No builds";+ cssClasses += " no-builds";+ }+ tag.put("class", cssClasses);+ tag.put("title", title);+ }++ };+ detailLink.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {++ @Override+ protected Status load() {+ return getProject().getCommitStatus(getCommitId(), getPipelineOf().getPipeline(), null, null).get(getJobName());+ }++ }));++ detailLink.add(new Label("name", getJobName()));++ detailLink.add(new WebSocketObserver() {++ @Override+ public void onObservableChanged(IPartialPageRequestHandler handler) {+ handler.add(component);+ }++ @Override+ public Collection<String> getObservables() {+ return Lists.newArrayList("job-status:" + getProject().getId() + ":" + getCommitId().name() + ":" + getJobName());+ }++ });++ detailLink.setOutputMarkupId(true);+ add(detailLink);++ add(new RunJobLink("run", getCommitId(), getJobName(), null) {++ @Override+ protected Project getProject() {+ return JobInfoButton.this.getProject();+ }++ @Override+ protected PullRequest getPullRequest() {+ return null;+ }++ @Override+ protected String getPipeline() {+ if (getPipelineOf() != null)+ return getPipelineOf().getPipeline();+ else+ return UUID.randomUUID().toString();+ }++ });+ }+++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new PipelineButtonCssResourceReference()));+ }++ protected abstract Project getProject();++ protected abstract ObjectId getCommitId();++ protected abstract String getJobName();++ @Nullable+ protected Build getActiveBuild() {+ return null;+ }++ @Nullable+ protected Build getPipelineOf() {+ 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 1eba70fd75..b604c97edd 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@@ -35,7 +35,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;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.build.minilist.MiniBuildListPanel;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;@@ -73,7 +73,7 @@ public abstract class JobListPanel extends Panel {protected abstract Project getProject();@Nullable- protected abstract String getTriggerChain();+ protected abstract String getPipeline();@Nullableprotected abstract PullRequest getPullRequest();@@ -98,7 +98,7 @@ public abstract class JobListPanel extends Panel {add(jobsView);for (Job job: accessibleJobsModel.getObject()) {WebMarkupContainer jobItem = new WebMarkupContainer(jobsView.newChildId());- Status status = getProject().getCommitStatus(commitId, getPullRequest(), refName).get(job.getName());+ Status status = getProject().getCommitStatus(commitId, null, getPullRequest(), refName).get(job.getName());Link<Void> defLink = new JobDefLink("name", commitId, job.getName()) {@@ -130,17 +130,17 @@ public abstract class JobListPanel extends Panel {}@Override- protected String getTriggerChain() {- String triggerChain = JobListPanel.this.getTriggerChain();- if (triggerChain == null)- triggerChain = UUID.randomUUID().toString();- return triggerChain;+ protected String getPipeline() {+ String pipeline = JobListPanel.this.getPipeline();+ if (pipeline == null)+ pipeline = UUID.randomUUID().toString();+ return pipeline;}});jobItem.add(new BookmarkablePageLink<Void>("showInList", ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName(), refName, getPullRequest()), 0)) {+ ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName(), null, refName, getPullRequest()), 0)) {@Overrideprotected void onConfigure() {@@ -157,13 +157,13 @@ 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<>(), getTriggerChain()));+ new HashMap<>(), getPipeline()));builds.sort(Comparator.comparing(Build::getNumber));return builds;}};- jobItem.add(new SimpleBuildListPanel("detail", buildsModel));+ jobItem.add(new MiniBuildListPanel("detail", buildsModel));jobItem.setOutputMarkupId(true);jobsView.add(jobItem);diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.javaindex 22ab056fe0..db79f88f25 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/build/PullRequestJobsPanel.java@@ -40,7 +40,7 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.MergePreview;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.build.minilist.MiniBuildListPanel;import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;@@ -110,7 +110,7 @@ public abstract class PullRequestJobsPanel extends GenericPanel<List<JobBuildInf@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {- return new SimpleBuildListPanel(id, new LoadableDetachableModel<List<Build>>() {+ return new MiniBuildListPanel(id, new LoadableDetachableModel<List<Build>>() {@Overrideprotected List<Build> load() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.htmlindex 96bd1a5827..6499049597 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.html@@ -61,8 +61,8 @@</table></wicket:fragment><wicket:fragment wicket:id="jobFrag">- <a wicket:id="select" class="select btn btn-secondary text-nowrap"><span wicket:id="label"></span></a>- <a wicket:id="run" class="run btn btn-secondary btn-icon flex-grow-0 flex-shrink-0" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>+ <a wicket:id="select" class="select btn btn-outline-secondary text-nowrap"><span wicket:id="label"></span></a>+ <a wicket:id="run" class="run btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a></wicket:fragment><wicket:fragment wicket:id="jobDetailFrag"><div class="head">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.javaindex 6e9f3bc176..880d812814 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecBlobViewPanel.java@@ -252,7 +252,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {}@Override- protected String getTriggerChain() {+ protected String getPipeline() {return UUID.randomUUID().toString();}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.htmlindex 4a153b6431..ba68c51216 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.html@@ -47,11 +47,11 @@<div wicket:id="body" class="body autofit flex-grow-1"></div></wicket:fragment><wicket:fragment wicket:id="jobFrag">- <a wicket:id="select" class="select btn btn-secondary justify-content-start">+ <a wicket:id="select" class="select btn btn-outline-secondary justify-content-start"><wicket:svg href="grip" class="icon drag-indicator flex-shrink-0 mr-1"/><span wicket:id="label" class="label"></span></a>- <a wicket:id="delete" title="Delete" class="delete btn btn-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>+ <a wicket:id="delete" title="Delete" class="delete btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a></wicket:fragment><wicket:fragment wicket:id="jobDetailFrag"><div class="head">@@ -61,7 +61,7 @@<div wicket:id="body" class="body autofit flex-grow-1"></div></wicket:fragment><wicket:fragment wicket:id="addJobFrag">- <a wicket:id="create" class="create btn btn-success justify-content-start">+ <a wicket:id="create" class="create btn btn-outline-success justify-content-start"><wicket:svg href="plus" class="icon flex-shrink-0 mr-1"></wicket:svg> Add New</a><a wicket:id="suggestions" class="suggestions btn btn-success flex-grow-0 flex-shrink-0 btn-icon" title="Suggestions">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecResourceReference.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecResourceReference.javaindex a336fda353..c48a8b18ac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecResourceReference.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecResourceReference.java@@ -7,6 +7,7 @@ import org.apache.wicket.markup.head.HeaderItem;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;+import io.onedev.server.web.asset.pipelinebutton.PipelineButtonCssResourceReference;import io.onedev.server.web.asset.snapsvg.SnapSvgResourceReference;import io.onedev.server.web.page.base.BaseDependentCssResourceReference;import io.onedev.server.web.page.base.BaseDependentResourceReference;@@ -24,6 +25,7 @@ public class BuildSpecResourceReference extends BaseDependentResourceReference {List<HeaderItem> dependencies = super.getDependencies();dependencies.add(JavaScriptHeaderItem.forReference(new SnapSvgResourceReference()));dependencies.add(JavaScriptHeaderItem.forReference(new DoneEventsResourceReference()));+ dependencies.add(CssHeaderItem.forReference(new PipelineButtonCssResourceReference()));dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(BuildSpecResourceReference.class, "build-spec.css")));return dependencies;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.cssindex 8d14d26390..64bc6d6501 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.css@@ -49,21 +49,6 @@.build-spec.parseable>.body>.content>.side>.navs:not(:empty) {margin-bottom: 1.5rem;}-.build-spec.parseable>.body>.content>.side .nav.active a {- background: var(--primary);- border-color: var(--primary);- color: var(--white) !important;-}-.dark-mode .build-spec.parseable>.body>.content>.side .nav.active a {- background: var(--primary);- border-color: var(--primary);-}--.build-spec.parseable>.body>.content>.side .nav.active a.run:hover,-.build-spec.parseable>.body>.content>.side .nav.active a.delete:hover {- background: #187DE4;- border-color: #187DE4;-}.build-spec.parseable>.body>.content>.main {border-radius: 0.42rem;border: 1px solid var(--light-gray);@@ -90,7 +75,3 @@transform: rotate(135deg);margin-left: 0.5rem;}--.build-spec .active .drag-indicator {- color: var(--light-primary);-}\ No newline at end of filediff --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 1089f6a258..74490b8422 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@@ -84,6 +84,7 @@ import io.onedev.server.web.page.project.builds.detail.changes.BuildChangesPage;import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardPage;import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.pipeline.BuildPipelinePage;import io.onedev.server.web.util.BuildAware;import io.onedev.server.web.util.ConfirmClickModifier;import io.onedev.server.web.util.Cursor;@@ -325,8 +326,8 @@ public abstract class BuildDetailPage extends ProjectPage}@Override- protected String getTriggerChain() {- return getBuild().getTriggerChain();+ protected String getPipeline() {+ return getBuild().getPipeline();}};@@ -375,6 +376,9 @@ public abstract class BuildDetailPage extends ProjectPageprotected List<Tab> load() {List<Tab> tabs = new ArrayList<>();+ if (SecurityUtils.canReadCode(getProject()))+ tabs.add(new BuildTab("In Pipeline", BuildPipelinePage.class));+if (SecurityUtils.canAccessLog(getBuild())) {tabs.add(new BuildTab("Log", BuildLogPage.class) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.javaindex 51e57873db..dba650d609 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/dashboard/BuildDashboardPage.java@@ -10,6 +10,7 @@ import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;import io.onedev.server.web.page.project.builds.detail.artifacts.BuildArtifactsPage;import io.onedev.server.web.page.project.builds.detail.issues.FixedIssuesPage;import io.onedev.server.web.page.project.builds.detail.log.BuildLogPage;+import io.onedev.server.web.page.project.builds.detail.pipeline.BuildPipelinePage;@SuppressWarnings("serial")public class BuildDashboardPage extends BuildDetailPage {@@ -18,7 +19,9 @@ public class BuildDashboardPage extends BuildDetailPage {super(params);PageProvider pageProvider;- if (SecurityUtils.canAccessLog(getBuild()))+ if (SecurityUtils.canReadCode(getProject()))+ pageProvider = new PageProvider(BuildPipelinePage.class, BuildPipelinePage.paramsOf(getBuild()));+ else if (SecurityUtils.canAccessLog(getBuild()))pageProvider = new PageProvider(BuildLogPage.class, BuildLogPage.paramsOf(getBuild()));else if (getBuild().getArtifactsDir().exists())pageProvider = new PageProvider(BuildArtifactsPage.class, BuildArtifactsPage.paramsOf(getBuild()));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.htmlnew file mode 100644index 0000000000..c3dee225f8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.html@@ -0,0 +1,7 @@+<wicket:extend>+ <div wicket:id="pipeline" class="build-pipeline"></div>+ <div class="font-size-sm text-muted">+ <wicket:svg href="bulb" class="icon"/>+ This tab shows the pipeline current build is part of. The job in blue represents current job+ </div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.javanew file mode 100644index 0000000000..e96550ca95--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pipeline/BuildPipelinePage.java@@ -0,0 +1,77 @@+package io.onedev.server.web.page.project.builds.detail.pipeline;++import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.buildspec.job.Job;+import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.web.component.job.jobinfo.JobInfoButton;+import io.onedev.server.web.component.pipeline.PipelinePanel;+import io.onedev.server.web.page.project.builds.detail.BuildDetailPage;++@SuppressWarnings("serial")+public class BuildPipelinePage extends BuildDetailPage {++ public BuildPipelinePage(PageParameters params) {+ super(params);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new PipelinePanel("pipeline") {++ @Override+ protected List<Job> getJobs() {+ return getBuild().getProject().getBuildSpec(getBuild().getCommitId()).getJobs();+ }++ @Override+ protected int getActiveJobIndex() {+ for (int i=0; i<getJobs().size(); i++) {+ if (getBuild().getJobName().equals(getJobs().get(i).getName()))+ return i;+ }+ return -1;+ }++ @Override+ protected Component renderJob(String componentId, int jobIndex) {+ return new JobInfoButton(componentId) {++ @Override+ protected Project getProject() {+ return BuildPipelinePage.this.getProject();+ }++ @Override+ protected ObjectId getCommitId() {+ return getBuild().getCommitId();+ }++ @Override+ protected String getJobName() {+ return getJobs().get(jobIndex).getName();+ }++ @Override+ protected Build getActiveBuild() {+ return getBuild();+ }++ @Override+ protected Build getPipelineOf() {+ return getBuild();+ }++ };+ }++ });+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.htmlindex 2fd3fbc825..9270558e62 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/commits/CommitDetailPage.html@@ -28,14 +28,7 @@<wicket:enclosure child="jobs"><li class="list-group-item refs d-flex flex-wrap"><div wicket:id="jobs" class="job mr-3">- <span class="btn-group">- <a wicket:id="detail" class="btn btn-outline-secondary">- <svg wicket:id="status" class="status mr-2"></svg>- <b wicket:id="name" class="name"></b>- <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>- </a>- <a wicket:id="run" class="run btn btn-outline-secondary btn-icon" title="Run this job"><wicket:svg href="play" class="icon"></wicket:svg></a>- </span>+ <span wicket:id="jobInfo"></span></div></li></wicket:enclosure>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 cf445d8954..95f48d805c 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@@ -3,13 +3,11 @@ package io.onedev.server.web.page.project.commits;import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;-import java.util.Comparator;import java.util.HashMap;import java.util.HashSet;import java.util.List;import java.util.Map;import java.util.Set;-import java.util.UUID;import java.util.stream.Collectors;import javax.annotation.Nullable;@@ -19,9 +17,7 @@ import org.apache.wicket.RestartResponseException;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;-import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.JavaScriptHeaderItem;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;@@ -45,7 +41,6 @@ import org.slf4j.LoggerFactory;import com.google.common.base.Joiner;import com.google.common.base.Preconditions;-import com.google.common.collect.Lists;import com.google.common.collect.Sets;import io.onedev.commons.utils.PlanarRange;@@ -56,7 +51,6 @@ import io.onedev.server.codequality.CodeProblem;import io.onedev.server.codequality.CodeProblemContribution;import io.onedev.server.codequality.CoverageStatus;import io.onedev.server.codequality.LineCoverageContribution;-import io.onedev.server.entitymanager.BuildManager;import io.onedev.server.entitymanager.CodeCommentManager;import io.onedev.server.entitymanager.CodeCommentReplyManager;import io.onedev.server.entitymanager.PullRequestManager;@@ -65,7 +59,6 @@ import io.onedev.server.git.GitUtils;import io.onedev.server.git.RefInfo;import io.onedev.server.infomanager.CommitInfoManager;import io.onedev.server.model.Build;-import io.onedev.server.model.Build.Status;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;@@ -77,23 +70,17 @@ import io.onedev.server.util.JobSecretAuthorizationContext;import io.onedev.server.util.JobSecretAuthorizationContextAware;import io.onedev.server.util.diff.WhitespaceOption;import io.onedev.server.web.asset.emoji.Emojis;-import io.onedev.server.web.behavior.WebSocketObserver;import io.onedev.server.web.component.branch.create.CreateBranchLink;-import io.onedev.server.web.component.build.simplelist.SimpleBuildListPanel;-import io.onedev.server.web.component.build.status.BuildStatusIcon;import io.onedev.server.web.component.contributorpanel.ContributorPanel;import io.onedev.server.web.component.createtag.CreateTagLink;import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.job.RunJobLink;-import io.onedev.server.web.component.link.DropdownLink;+import io.onedev.server.web.component.job.jobinfo.JobInfoButton;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;-import io.onedev.server.web.page.project.builds.ProjectBuildsPage;import io.onedev.server.web.util.ReferenceTransformer;import io.onedev.server.web.util.RevisionDiff;@@ -328,92 +315,7 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.AnnotaObjectId commitId = getCommit().copy();Job job = item.getModelObject();- DropdownLink detailLink = new DropdownLink("detail") {-- @Override- protected Component newContent(String id, FloatingPanel dropdown) {- 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(), null));- builds.sort(Comparator.comparing(Build::getNumber));- return builds;- }-- };-- return new SimpleBuildListPanel(id, buildsModel) {-- @Override- protected Component newListLink(String componentId) {- return new BookmarkablePageLink<Void>(componentId, ProjectBuildsPage.class,- ProjectBuildsPage.paramsOf(getProject(), Job.getBuildQuery(commitId, job.getName(), null, null), 0)) {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getBuilds().isEmpty());- }-- };- }-- };- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);-- String cssClasses = "btn btn-outline-secondary";- Build.Status status = getProject().getCommitStatus(commitId, null, null).get(job.getName());- String title;- if (status != null) {- if (status != Status.SUCCESSFUL)- title = "Some builds are ";- else- title = "Builds are ";- title += status.toString().toLowerCase() + ", click for details";- } else {- title = "No builds";- cssClasses += " no-builds";- }- tag.put("class", cssClasses);- tag.put("title", title);- }-- };- detailLink.add(new BuildStatusIcon("status", new LoadableDetachableModel<Status>() {-- @Override- protected Status load() {- return getProject().getCommitStatus(commitId, null, null).get(job.getName());- }-- }));-- detailLink.add(new Label("name", job.getName()));-- detailLink.add(new WebSocketObserver() {-- @Override- public void onObservableChanged(IPartialPageRequestHandler handler) {- handler.add(component);- }-- @Override- public Collection<String> getObservables() {- return Lists.newArrayList("job-status:" + getProject().getId() + ":" + commitId.name() + ":" + job.getName());- }-- });-- detailLink.setOutputMarkupId(true);- item.add(detailLink);-- item.add(new RunJobLink("run", commitId, job.getName(), null) {+ item.add(new JobInfoButton("jobInfo") {@Overrideprotected Project getProject() {@@ -421,15 +323,15 @@ public class CommitDetailPage extends ProjectPage implements RevisionDiff.Annota}@Override- protected PullRequest getPullRequest() {- return null;+ protected ObjectId getCommitId() {+ return commitId;}@Override- protected String getTriggerChain() {- return UUID.randomUUID().toString();+ protected String getJobName() {+ return job.getName();}-+});}