The Unified and Autonomous Development Platform
Improved pipeline view in build detail page
Robin Shen2debdd8fd7ed
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobIndex.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobIndex.javaindex 8f0b538268..122ad01ab1 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobIndex.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobIndex.java@@ -3,11 +3,10 @@ package io.onedev.server.web.component.pipeline;import java.io.Serializable;import java.util.List;-import javax.annotation.Nullable;-import com.fasterxml.jackson.core.JsonProcessingException;import com.fasterxml.jackson.databind.ObjectMapper;+import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;import io.onedev.server.buildspec.job.Job;@@ -32,8 +31,7 @@ public class JobIndex implements Serializable {return row;}- @Nullable- public static JobIndex of(List<List<Job>> pipeline, @Nullable Job job) {+ public static JobIndex of(List<List<Job>> pipeline, Job job) {for (int columnIndex = 0; columnIndex < pipeline.size(); columnIndex++) {List<Job> column = pipeline.get(columnIndex);for (int rowIndex = 0; rowIndex < column.size(); rowIndex++) {@@ -41,7 +39,7 @@ public class JobIndex implements Serializable {return new JobIndex(columnIndex, rowIndex);}}- return null;+ throw new ExplicitException("Unable to find job: " + job.getName());}public Job getJob(List<List<Job>> pipeline) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobSelectionChange.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobSelectionChange.javaindex d1c30a3fb0..d40ed562db 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobSelectionChange.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/JobSelectionChange.java@@ -1,7 +1,5 @@package io.onedev.server.web.component.pipeline;-import javax.annotation.Nullable;-import org.apache.wicket.ajax.AjaxRequestTarget;import io.onedev.server.buildspec.job.Job;@@ -11,12 +9,11 @@ public class JobSelectionChange extends AjaxPayload {private final Job job;- public JobSelectionChange(AjaxRequestTarget target, @Nullable Job job) {+ public JobSelectionChange(AjaxRequestTarget target, Job job) {super(target);this.job = job;}- @Nullablepublic Job getJob() {return job;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.javaindex 2e60057499..009d65bdf2 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelinePanel.java@@ -122,9 +122,8 @@ public abstract class PipelinePanel extends Panel {if (event.getPayload() instanceof JobSelectionChange) {JobSelectionChange jobSelectionChange = (JobSelectionChange) event.getPayload();- JobIndex activeJobIndex = JobIndex.of(getPipeline(), jobSelectionChange.getJob());String script = String.format("onedev.server.pipeline.markJobActive($(\"#%s>.pipeline\"), %s);",- getMarkupId(), activeJobIndex!=null?activeJobIndex.toJson():"undefined");+ getMarkupId(), JobIndex.of(getPipeline(), jobSelectionChange.getJob()).toJson());jobSelectionChange.getHandler().appendJavaScript(script);event.stop();@@ -194,23 +193,16 @@ public abstract class PipelinePanel extends Panel {super.renderHead(response);response.render(JavaScriptHeaderItem.forReference(new PipelineResourceReference()));- String activePipelineJobIndex;- int activeJobIndex = getActiveJobIndex();- if (activeJobIndex != -1)- activePipelineJobIndex = JobIndex.of(getPipeline(), getJobs().get(activeJobIndex)).toJson();- else- activePipelineJobIndex = "undefined";-// Run script via OnLoad in order for icons to be fully loaded before drawing// dependency lineString script = String.format("onedev.server.pipeline.onWindowLoad('%s', %s, %s);",- getMarkupId(), buildDependencyMap(), activePipelineJobIndex);+ getMarkupId(), buildDependencyMap(),+ JobIndex.of(getPipeline(), getJobs().get(getActiveJobIndex())).toJson());response.render(OnLoadHeaderItem.forScript(script));}protected abstract List<Job> getJobs();- @Nullableprotected abstract int getActiveJobIndex();protected abstract Component renderJob(String componentId, int jobIndex);diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.jsindex b7cf5abdca..6558528065 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.js@@ -9,9 +9,9 @@ onedev.server.pipeline = {row: parseInt(splitted[1])}}-- var $pipeline = $("#" + containerId + ">.pipeline");+ var $pipeline = $("#" + containerId + ">.pipeline");+for (var jobIndexString in dependencies) {var jobIndex = getJobIndex(jobIndexString);for (var i in dependencies[jobIndexString]) {@@ -21,8 +21,7 @@ onedev.server.pipeline = {}}- if (activeJobIndex)- onedev.server.pipeline.markJobActive($pipeline, activeJobIndex);+ onedev.server.pipeline.markJobActive($pipeline, activeJobIndex);},drawDependencyLine: function($pipeline, dependencyJobIndex, jobIndex) {var dependencyJobIndexString = dependencyJobIndex.column + "-" + dependencyJobIndex.row;@@ -197,17 +196,15 @@ onedev.server.pipeline = {stroke: onedev.server.pipeline.lineColor});});- if (jobIndex) {- onedev.server.pipeline.getJob($pipeline, jobIndex).addClass("active");- var jobIndexString = jobIndex.column + "-" + jobIndex.row;- paper.selectAll("[from='" + jobIndexString + "'], [to='" + jobIndexString + "']").forEach(function(e) {- e.attr({- stroke: "#3699FF"- });- paper.append(e);+ onedev.server.pipeline.getJob($pipeline, jobIndex).addClass("active");+ var jobIndexString = jobIndex.column + "-" + jobIndex.row;+ paper.selectAll("[from='" + jobIndexString + "'], [to='" + jobIndexString + "']").forEach(function(e) {+ e.attr({+ stroke: "#3699FF"});- $pipeline.find(".active").scrollIntoView();- }+ paper.append(e);+ });+ $pipeline.find(".active").scrollIntoView();},onSortStart: function($uiItem) {var $pipeline = $uiItem.closest(".pipeline");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 abb48a0d85..319bbfbc9c 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@@ -197,7 +197,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {if (!jobs.isEmpty()) {jobsViewer = new Fragment("content", "jobsFrag", BuildSpecBlobViewPanel.this) {- private void notifyJobSelectionChange(AjaxRequestTarget target, @Nullable Job job) {+ private void notifyJobSelectionChange(AjaxRequestTarget target, Job job) {send(this, Broadcast.BREADTH, new JobSelectionChange(target, job));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.javaindex 3313b88e6f..3d7c75f6a9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecEditPanel.java@@ -118,7 +118,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Buprivate void setupJobsEditor(@Nullable AjaxRequestTarget target) {Fragment jobsEditor = new Fragment("content", "jobsFrag", BuildSpecEditPanel.this) {- private void notifyJobSelectionChange(AjaxRequestTarget target, @Nullable Job job) {+ private void notifyJobSelectionChange(AjaxRequestTarget target, Job job) {send(this, Broadcast.BREADTH, new JobSelectionChange(target, job));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.cssindex 7ba74adb09..b3a854417b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/build-detail.css@@ -9,6 +9,9 @@max-height: 100px;}+.build-pipeline .pipeline-column {+ flex-grow: 0 !important;+}.build-pipeline .pipeline-row>.btn-group {width: 100%;}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.htmlindex 9b4590e977..c1f8eeb7ba 100644--- 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.html@@ -1,6 +1,6 @@<wicket:extend>- <div wicket:id="pipeline" class="build-pipeline"></div>- <div class="font-size-sm text-muted">+ <div wicket:id="pipeline" class="build-pipeline overflow-auto autofit"></div>+ <div class="font-size-sm text-muted mt-3"><wicket:svg href="bulb" class="icon"/>This tab shows the pipeline current build is part of. The job in blue represents job of current build</div>