Skip to content

The Unified and Autonomous Development Platform

Show pipeline while editing build spec

Robin Sheneacf4267494a
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.java
index 5e4a2385f4..fcbc959715 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
@@ -73,6 +73,8 @@ public class Job implements NamedElement, Serializable, Validatable {
public static final String SELECTION_PREFIX = "jobs/";
+ public static final String PROP_NAME = "name";
+
public static final String PROP_JOB_DEPENDENCIES = "jobDependencies";
public static final String PROP_REQUIRED_SERVICES = "requiredServices";
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
index 4e428687ff..22f9f13b9b 100644
--- a/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
+++ b/server-core/src/main/java/io/onedev/server/web/asset/scrollintoview/jquery.scrollintoview.js
@@ -47,6 +47,45 @@
}
}
}
+
+ var scrollParentLeft, scrollParentRight, thisLeft, thisRight;
+ if ($scrollParent[0] == document) {
+ scrollParentLeft = 0;
+ scrollParentRight = $(window).width();
+ thisLeft = $this.offset().left - $(window).scrollLeft();
+ } else {
+ scrollParentLeft = $scrollParent.offset().left;
+ scrollParentRight = scrollParentLeft + $scrollParent.width();
+ thisLeft = $this.offset().left;
+ }
+ var thisWidth = $this.outerWidth();
+ thisRight = thisLeft + thisWidth;
+
+ if (thisWidth > scrollParentRight - scrollParentLeft) {
+ var scrollOffset = Math.floor(thisLeft - scrollParentLeft);
+ if (animation)
+ $scrollParent.animate({scrollLeft: $scrollParent.scrollLeft() + scrollOffset});
+ else
+ $scrollParent.scrollLeft($scrollParent.scrollLeft() + scrollOffset);
+ } else {
+ var beyondLeft = scrollParentLeft - thisLeft;
+ if (beyondLeft > 0) {
+ beyondLeft = Math.ceil(beyondLeft);
+ if (animation)
+ $scrollParent.animate({scrollLeft: $scrollParent.scrollLeft() - beyondLeft});
+ else
+ $scrollParent.scrollLeft($scrollParent.scrollLeft() - beyondLeft);
+ } else {
+ var beyondRight = thisRight - scrollParentRight;
+ if (beyondRight > 0) {
+ beyondRight = Math.ceil(beyondRight);
+ if (animation)
+ $scrollParent.animate({scrollLeft: $scrollParent.scrollLeft() + beyondRight});
+ else
+ $scrollParent.scrollLeft($scrollParent.scrollLeft() + beyondRight);
+ }
+ }
+ }
}
return this;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java
index c3ce96073a..3414bc88a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java
@@ -25,7 +25,7 @@ public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBeha
}
public OnTypingDoneBehavior() {
- this(250);
+ this(350);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java
index 011681ad09..88ee6e97b0 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/sortable/SortBehavior.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.behavior.sortable;
+import javax.annotation.Nullable;
+
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -29,9 +31,13 @@ public abstract class SortBehavior extends AbstractPostAjaxBehavior {
private int distance = 5;
- private String change;
+ private String startScript;
+
+ private String changeFunction;
+
+ private String updateFunction;
- private String update;
+ private String stopScript;
private String helperClass;
@@ -59,13 +65,23 @@ public abstract class SortBehavior extends AbstractPostAjaxBehavior {
return this;
}
- public SortBehavior change(String change) {
- this.change = change;
+ public SortBehavior startScript(String startScript) {
+ this.startScript = startScript;
+ return this;
+ }
+
+ public SortBehavior changeFunction(String changeFunction) {
+ this.changeFunction = changeFunction;
return this;
}
- public SortBehavior update(String update) {
- this.update = update;
+ public SortBehavior updateFunction(String updateFunction) {
+ this.updateFunction = updateFunction;
+ return this;
+ }
+
+ public SortBehavior stopScript(String stopScript) {
+ this.stopScript = stopScript;
return this;
}
@@ -84,11 +100,15 @@ public abstract class SortBehavior extends AbstractPostAjaxBehavior {
return this;
}
- public SortBehavior sortable(String sortable) {
+ public SortBehavior sortable(@Nullable String sortable) {
this.sortable = sortable;
return this;
}
+ public SortBehavior sortable() {
+ return sortable(null);
+ }
+
public SortBehavior distance(int distance) {
this.distance = distance;
return this;
@@ -170,19 +190,27 @@ public abstract class SortBehavior extends AbstractPostAjaxBehavior {
script.append("placeholder:'" + placeholder + "',");
if (helperClass != null)
script.append("helper:function(event,item){return item.addClass('" + helperClass + "');},");
- script.append("start:function(event,ui){" +
+ script.append("start:function(event,ui) {" +
"ui.item.fromList=" + listIndex + ";" +
- "ui.item.fromItem=" + itemIndex + ";},");
- if (change != null)
- script.append("change:" + change + ",");
- if (update != null)
- script.append("update:" + update + ",");
- script.append("stop:function(event, ui){");
+ "ui.item.fromItem=" + itemIndex + ";");
+ if (startScript != null)
+ script.append(startScript);
+ script.append("},");
+ if (changeFunction != null)
+ script.append("change:" + changeFunction + ",");
+ if (updateFunction != null)
+ script.append("update:" + updateFunction + ",");
+ script.append("stop:function(event, ui) {");
if (helperClass != null)
script.append("ui.item.removeClass('" + helperClass + "');");
script.append("var fromList=ui.item.fromList; var fromItem=ui.item.fromItem;" +
"var toList=" + listIndex + "; var toItem=" + itemIndex + ";" +
- getCallbackScript() + ";}});");
+ "ui.item.toList = toList; ui.item.toItem = toItem;" +
+ getCallbackScript() + ";");
+ if (stopScript != null)
+ script.append(stopScript);
+ script.append("}});");
+
return script.toString();
}
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.java
index c08bda0102..8f0b538268 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
@@ -24,6 +24,14 @@ public class JobIndex implements Serializable {
this.row = row;
}
+ public int getColumn() {
+ return column;
+ }
+
+ public int getRow() {
+ return row;
+ }
+
@Nullable
public static JobIndex of(List<List<Job>> pipeline, @Nullable Job job) {
for (int columnIndex = 0; columnIndex < pipeline.size(); columnIndex++) {
@@ -36,6 +44,10 @@ public class JobIndex implements Serializable {
return null;
}
+ public Job getJob(List<List<Job>> pipeline) {
+ return pipeline.get(column).get(row);
+ }
+
public String toJson() {
try {
return OneDev.getInstance(ObjectMapper.class).writeValueAsString(this);
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.java
index 16a7650e8d..8e228d5952 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
@@ -11,48 +11,113 @@ import java.util.stream.Collectors;
import javax.annotation.Nullable;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
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 com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.base.Preconditions;
import io.onedev.server.OneDev;
import io.onedev.server.buildspec.job.Job;
+import io.onedev.server.buildspec.job.JobDependency;
+import io.onedev.server.web.behavior.sortable.SortBehavior;
+import io.onedev.server.web.behavior.sortable.SortPosition;
@SuppressWarnings("serial")
public abstract class PipelinePanel extends Panel {
- private final List<List<Job>> pipeline;
-
- private final Job activeJob;
+ private final IModel<List<List<Job>>> pipelineModel = new LoadableDetachableModel<List<List<Job>>>() {
+
+ @Override
+ protected List<List<Job>> load() {
+ if (!getJobs().isEmpty()) {
+ return buildPipeline(new ArrayList<>(getJobs()));
+ } else {
+ // add an empty column as job add action is rendered in first column
+ List<List<Job>> pipeline = new ArrayList<>();
+ pipeline.add(new ArrayList<>());
+ return pipeline;
+ }
+ }
+
+ };
- public PipelinePanel(String id, List<Job> jobs, @Nullable Job activeJob) {
+ public PipelinePanel(String id) {
super(id);
- pipeline = buildPipeline(jobs);
- this.activeJob = activeJob;
+ }
+
+ @Override
+ protected void onDetach() {
+ pipelineModel.detach();
+ super.onDetach();
+ }
+
+ private List<List<Job>> getPipeline() {
+ return pipelineModel.getObject();
}
@Override
protected void onInitialize() {
super.onInitialize();
+
+ Sortable sortable = getSortable();
+ if (sortable != null) {
+ String startScript = String.format(""
+ + "onedev.server.pipeline.showConnections('%s', false);",
+ getMarkupId());
+ String stopScript = String.format(""
+ + "if (ui.item.fromList == ui.item.toList && ui.item.fromItem == ui.item.toItem)"
+ + " onedev.server.pipeline.showConnections('%s', true);",
+ getMarkupId());
+ add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = getJobs().indexOf(new JobIndex(from.getListIndex(), from.getItemIndex()).getJob(getPipeline()));
+ int toIndex = getJobs().indexOf(new JobIndex(to.getListIndex(), to.getItemIndex()).getJob(getPipeline()));
+ pipelineModel.detach();
+ sortable.onSort(target, fromIndex, toIndex);
+ }
+
+ }.sortable(".pipeline>.pipeline-column")
+ .startScript(startScript)
+ .stopScript(stopScript)
+ .items(".pipeline-row:not(.pipeline-action)"));
+ }
+ }
+
+ @Override
+ protected void onBeforeRender() {
+ super.onBeforeRender();
RepeatingView columnsView = new RepeatingView("columns");
- for (List<Job> column: pipeline) {
+ int columnIndex = 0;
+ for (List<Job> column: getPipeline()) {
WebMarkupContainer columnContainer = new WebMarkupContainer(columnsView.newChildId());
RepeatingView rowsView = new RepeatingView("rows");
for (Job job: column)
- rowsView.add(renderJob(rowsView.newChildId(), job));
+ rowsView.add(renderJob(rowsView.newChildId(), getJobs().indexOf(job)));
+ if (columnIndex == 0) {
+ Component action = renderAction(rowsView.newChildId());
+ if (action != null) {
+ action.add(AttributeAppender.append("class", "pipeline-action"));
+ rowsView.add(action);
+ }
+ }
columnContainer.add(rowsView);
columnsView.add(columnContainer);
+ columnIndex++;
}
- add(columnsView);
+ addOrReplace(columnsView);
}
@Override
@@ -60,7 +125,7 @@ public abstract class PipelinePanel extends Panel {
if (event.getPayload() instanceof JobSelectionChange) {
JobSelectionChange jobSelectionChange = (JobSelectionChange) event.getPayload();
- JobIndex activeJobIndex = JobIndex.of(pipeline, jobSelectionChange.getJob());
+ JobIndex activeJobIndex = JobIndex.of(getPipeline(), jobSelectionChange.getJob());
String script = String.format("onedev.server.pipeline.markJobActive($(\"#%s>.pipeline\"), %s);",
getMarkupId(), activeJobIndex!=null?activeJobIndex.toJson():"undefined");
jobSelectionChange.getHandler().appendJavaScript(script);
@@ -80,7 +145,9 @@ public abstract class PipelinePanel extends Panel {
leafJobs.add(job);
}
}
- Preconditions.checkState(!leafJobs.isEmpty());
+
+ if (leafJobs.isEmpty())
+ leafJobs.add(jobs.remove(0));
pipeline.add(leafJobs);
if (!jobs.isEmpty())
@@ -92,23 +159,30 @@ public abstract class PipelinePanel extends Panel {
private String buildDependencyMap() {
Map<String, List<String>> dependencyMap = new HashMap<>();
- Map<String, String> jobIndexMap = new HashMap<>();
+ Map<String, JobIndex> jobIndexMap = new HashMap<>();
int columnIndex = 0;
- for (List<Job> column: pipeline) {
+ for (List<Job> column: getPipeline()) {
int rowIndex = 0;
for (Job job: column) {
- jobIndexMap.put(job.getName(), new JobIndex(columnIndex, rowIndex).toString());
+ jobIndexMap.put(job.getName(), new JobIndex(columnIndex, rowIndex));
rowIndex++;
}
columnIndex++;
}
- for (List<Job> column: pipeline) {
+ for (List<Job> column: getPipeline()) {
for (Job job: column) {
- dependencyMap.put(
- jobIndexMap.get(job.getName()),
- job.getJobDependencies().stream().map(it->jobIndexMap.get(it.getJobName())).collect(Collectors.toList()));
+ JobIndex jobIndex = jobIndexMap.get(job.getName());
+ if (jobIndex != null) {
+ List<String> dependencyJobIndexStrings = new ArrayList<>();
+ for (JobDependency dependency: job.getJobDependencies()) {
+ JobIndex dependencyJobIndex = jobIndexMap.get(dependency.getJobName());
+ if (dependencyJobIndex != null && dependencyJobIndex.getColumn() < jobIndex.getColumn())
+ dependencyJobIndexStrings.add(dependencyJobIndex.toString());
+ }
+ dependencyMap.put(jobIndex.toString(), dependencyJobIndexStrings);
+ }
}
}
try {
@@ -122,13 +196,35 @@ public abstract class PipelinePanel extends Panel {
public void renderHead(IHeaderResponse response) {
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";
- JobIndex activeJobIndex = JobIndex.of(pipeline, activeJob);
- String script = String.format("onedev.server.pipeline.onDomReady('%s', %s, %s);",
- getMarkupId(), buildDependencyMap(), activeJobIndex!=null?activeJobIndex.toJson():"undefined");
- response.render(OnDomReadyHeaderItem.forScript(script));
+ // Run script via OnLoad in order for icons to be fully loaded before drawing
+ // dependency line
+ String script = String.format("onedev.server.pipeline.onWindowLoad('%s', %s, %s);",
+ getMarkupId(), buildDependencyMap(), activePipelineJobIndex);
+ response.render(OnLoadHeaderItem.forScript(script));
}
+
+ protected abstract List<Job> getJobs();
+
+ @Nullable
+ protected abstract int getActiveJobIndex();
- protected abstract Component renderJob(String componentId, Job job);
+ protected abstract Component renderJob(String componentId, int jobIndex);
+ @Nullable
+ protected Component renderAction(String componentId) {
+ return null;
+ }
+
+ @Nullable
+ protected Sortable getSortable() {
+ return null;
+ }
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java
index 23f41d0da7..7b42426440 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/PipelineResourceReference.java
@@ -6,6 +6,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import io.onedev.server.web.asset.scrollintoview.ScrollIntoViewResourceReference;
import io.onedev.server.web.asset.snapsvg.SnapSvgResourceReference;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
@@ -22,6 +23,7 @@ public class PipelineResourceReference extends BaseDependentResourceReference {
public List<HeaderItem> getDependencies() {
List<HeaderItem> dependencies = super.getDependencies();
dependencies.add(JavaScriptHeaderItem.forReference(new SnapSvgResourceReference()));
+ dependencies.add(JavaScriptHeaderItem.forReference(new ScrollIntoViewResourceReference()));
dependencies.add(CssHeaderItem.forReference(
new BaseDependentCssResourceReference(getClass(), "pipeline.css")));
return dependencies;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/Sortable.java b/server-core/src/main/java/io/onedev/server/web/component/pipeline/Sortable.java
new file mode 100644
index 0000000000..a0c31641ce
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/Sortable.java
@@ -0,0 +1,11 @@
+package io.onedev.server.web.component.pipeline;
+
+import java.io.Serializable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+public interface Sortable extends Serializable {
+
+ void onSort(AjaxRequestTarget target, int fromIndex, int toIndex);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.css b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.css
index 86cbdce012..baf18181f7 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/pipeline/pipeline.css
@@ -13,10 +13,13 @@
.pipeline .pipeline-row {
margin-bottom: 3rem;
}
+.pipeline .pipeline-row.pipeline-actions {
+ margin-bottom: 0;
+}
.pipeline>.dependencies {
position: absolute;
left: 0;
top: 0;
width: 100%;
height: 100%;
-}
\ No newline at end of file
+}
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.js
index 13af137bc9..86a21eac6d 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
@@ -1,7 +1,7 @@
onedev.server.pipeline = {
lineWidth: 2,
lineColor: onedev.server.isDarkMode()?"#535370":"#D1D3E0",
- onDomReady: function(containerId, dependencies, activeJobIndex) {
+ onWindowLoad: function(containerId, dependencies, activeJobIndex) {
function getJobIndex(jobIndexString) {
var splitted = jobIndexString.split("-");
return {
@@ -206,6 +206,16 @@ onedev.server.pipeline = {
});
paper.append(e);
});
- }
+ $pipeline.find(".active").scrollIntoView();
+ }
+ },
+ showConnections: function(containerId, show) {
+ var $pipeline = $("#" + containerId + ">.pipeline");
+ var paper = Snap($pipeline.children(".dependencies")[0]);
+ paper.selectAll("path, line").forEach(function(e) {
+ e.attr({
+ strokeWidth: show?onedev.server.pipeline.lineWidth:0
+ });
+ });
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
index 96db799f29..59f2460924 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanEditor.java
@@ -120,7 +120,7 @@ public class BeanEditor extends ValueEditor<Serializable> {
* Bump up event even if some properties are invalid as we may need to do something with
* partial properties of the bean. For instance to update issue description template
*/
- send(this, Broadcast.BUBBLE, new BeanUpdating(propertyUpdating.getHandler()));
+ send(this, Broadcast.BUBBLE, new BeanUpdating(propertyUpdating.getHandler(), propertyUpdating));
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanUpdating.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanUpdating.java
index 9c9d694ce0..c80ded8acb 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanUpdating.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanUpdating.java
@@ -5,9 +5,16 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import io.onedev.server.web.util.AjaxPayload;
public class BeanUpdating extends AjaxPayload {
-
- public BeanUpdating(IPartialPageRequestHandler target) {
+
+ private final PropertyUpdating source;
+
+ public BeanUpdating(IPartialPageRequestHandler target, PropertyUpdating source) {
super(target);
+ this.source = source;
+ }
+
+ public PropertyUpdating getSource() {
+ return source;
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
index 35ba7a21b1..9a82925d21 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css
@@ -14,7 +14,7 @@ html {
}
.is-invalid .form-control, .is-invalid.form-control {
- border-color: var(--danger);
+ border-color: var(--danger) !important;
background: none;
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java
index d0e6c6f30d..5ce70ba687 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/plain/PlainEditPanel.java
@@ -9,6 +9,8 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.model.Model;
+import io.onedev.commons.utils.StringUtils;
+
@SuppressWarnings("serial")
public class PlainEditPanel extends FormComponentPanel<byte[]> {
@@ -37,10 +39,13 @@ public class PlainEditPanel extends FormComponentPanel<byte[]> {
@Override
public void convertInput() {
- if (input.getConvertedInput() != null)
- setConvertedInput(input.getConvertedInput().getBytes(StandardCharsets.UTF_8));
- else
+ String value = input.getConvertedInput();
+ if (value != null) {
+ value = StringUtils.replace(value, "\r\n", "\n");
+ setConvertedInput(value.getBytes(StandardCharsets.UTF_8));
+ } else {
setConvertedInput(new byte[0]);
+ }
}
@Override
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.html
index 9ca9cf3f8d..96bd1a5827 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
@@ -19,17 +19,17 @@
</wicket:fragment>
<wicket:fragment wicket:id="jobsFrag">
<div wicket:id="pipeline" class="side autofit flex-grow-1"></div>
- <div wicket:id="detail" class="main d-flex flex-column flex-grow-1 ml-4"></div>
+ <div wicket:id="detail" class="main d-flex flex-column ml-4"></div>
</wicket:fragment>
- <wicket:fragment wicket:id="servicesFrag">
+ <wicket:fragment wicket:id="elementsFrag">
<div class="side autofit flex-shrink-0">
<div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
- <a wicket:id="service" class="select btn btn-secondary justify-content-start"><span wicket:id="label"></span></a>
+ <a wicket:id="select" class="select btn btn-secondary justify-content-start"><span wicket:id="label"></span></a>
</div></div>
</div>
- <div wicket:id="service" class="main d-flex flex-column ml-4 flex-grow-1">
+ <div wicket:id="detail" class="main d-flex flex-column ml-4 flex-grow-1">
<div class="head">
- <h6 class="mb-0">Service Detail</h6>
+ <h6 wicket:id="title" class="mb-0"></h6>
</div>
<div class="body flex-grow-1 autofit">
<div wicket:id="notice"></div>
@@ -37,50 +37,32 @@
</div>
</div>
</wicket:fragment>
- <wicket:fragment wicket:id="stepTemplatesFrag">
- <div class="side autofit flex-shrink-0">
- <div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
- <a wicket:id="template" class="select btn btn-secondary justify-content-start"><span wicket:id="label"></span></a>
- </div></div>
- </div>
- <div wicket:id="template" class="main d-flex flex-column ml-4 flex-grow-1">
- <div class="head">
- <h6 class="mb-0">Step Template Detail</h6>
- </div>
- <div class="body flex-grow-1 autofit">
- <div wicket:id="notice"></div>
- <div wicket:id="content" class="content"></div>
- </div>
- </div>
- </wicket:fragment>
- <wicket:fragment wicket:id="namedElementImportNoticeFrag">
+ <wicket:fragment wicket:id="elementImportNoticeFrag">
<div class="alert alert-light-info">
This <span wicket:id="elementTypeName"></span> is imported from <a wicket:id="link" class="alert-link"><span wicket:id="label"></span></a>
</div>
</wicket:fragment>
<wicket:fragment wicket:id="propertiesFrag">
- <div class="autofit">
- <table class="table">
- <thead>
- <th>Name</th>
- <th>Value</th>
- </thead>
- <tbody>
- <tr wicket:id="properties">
- <td>
- <div><span wicket:id="name"></span> <a wicket:id="imported"><wicket:svg href="arrow2" class="icon imported"></wicket:svg></a></div>
- </td>
- <td>
- <div wicket:id="value"></div>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
+ <table class="table">
+ <thead>
+ <th>Name</th>
+ <th>Value</th>
+ </thead>
+ <tbody>
+ <tr wicket:id="properties">
+ <td>
+ <div><span wicket:id="name"></span> <a wicket:id="imported"><wicket:svg href="arrow2" class="icon imported"></wicket:svg></a></div>
+ </td>
+ <td>
+ <div wicket:id="value"></div>
+ </td>
+ </tr>
+ </tbody>
+ </table>
</wicket:fragment>
<wicket:fragment wicket:id="jobFrag">
- <a wicket:id="job" class="select btn btn-secondary text-nowrap"><span wicket:id="label"></span></a>
- <a wicket:id="runJob" 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-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>
</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.java
index 9191298537..6e9f3bc176 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
@@ -1,8 +1,9 @@
package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getActiveNamedElementIndex;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getActiveElementIndex;
import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getPosition;
import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getSelection;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getUrlSegment;
import java.io.Serializable;
import java.util.ArrayList;
@@ -157,7 +158,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
}
};
- propertiesViewer.add(AttributeAppender.append("class", "d-flex flex-column properties"));
+ propertiesViewer.add(AttributeAppender.append("class", "properties autofit pr-3"));
} else {
propertiesViewer = new Label("content", "No properties defined");
String cssClasses = "properties not-defined alert alert-notice alert-light-warning d-flex";
@@ -181,18 +182,18 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
}
}
- private <T extends NamedElement> List<T> getNamedElementsToShow(List<T> elements, Map<String, T> elementMap) {
- List<T> elementsToShow = new ArrayList<>(elements);
+ private <T extends NamedElement> List<T> getAllElements(List<T> elements, Map<String, T> elementMap) {
+ List<T> allElements = new ArrayList<>(elements);
for (T element: elementMap.values()) {
if (!elements.contains(element))
- elementsToShow.add(element);
+ allElements.add(element);
}
- return elementsToShow;
+ return allElements;
}
private void setupJobsViewer(@Nullable AjaxRequestTarget target) {
Component jobsViewer;
- List<Job> jobs = getNamedElementsToShow(buildSpec.getJobs(), buildSpec.getJobMap());
+ List<Job> jobs = getAllElements(buildSpec.getJobs(), buildSpec.getJobMap());
if (!jobs.isEmpty()) {
jobsViewer = new Fragment("content", "jobsFrag", BuildSpecBlobViewPanel.this) {
@@ -204,29 +205,29 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
protected void onInitialize() {
super.onInitialize();
- Job activeJob = null;
- int jobIndex = getActiveNamedElementIndex(context, Job.class, jobs, -1);
- if (jobIndex != -1)
- activeJob = jobs.get(jobIndex);
+ int activeJobIndex = getActiveElementIndex(context, Job.class, jobs, -1);
- add(new PipelinePanel("pipeline", jobs, activeJob) {
+ add(new PipelinePanel("pipeline") {
@Override
- protected Component renderJob(String componentId, Job job) {
- Fragment fragment = new Fragment(componentId, "jobFrag", BuildSpecBlobViewPanel.this);
- AjaxLink<Void> jobLink = new AjaxLink<Void>("job") {
+ protected Component renderJob(String componentId, int jobIndex) {
+ Fragment jobNav = new Fragment(componentId, "jobFrag", BuildSpecBlobViewPanel.this);
+
+ AjaxLink<Void> jobLink = new AjaxLink<Void>("select") {
@Override
public void onClick(AjaxRequestTarget target) {
+ Job job = getJobs().get(jobIndex);
String position = getPosition("jobs/" + job.getName());
context.pushState(target, context.getBlobIdent(), position);
- newJobDetail(target, job);
+ setupJobDetail(target, jobIndex);
notifyJobSelectionChange(target, job);
resizeWindow(target);
}
};
+ Job job = getJobs().get(jobIndex);
String label = HtmlEscape.escapeHtml5(job.getName());
if (!buildSpec.getJobs().contains(job)) {
String iconHtml = String.format(
@@ -236,9 +237,9 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
}
jobLink.add(new Label("label", label).setEscapeModelStrings(false));
- fragment.add(jobLink);
+ jobNav.add(jobLink);
- fragment.add(new RunJobLink("runJob", context.getCommit().copy(), job.getName(), getContext().getRefName()) {
+ jobNav.add(new RunJobLink("run", context.getCommit().copy(), job.getName(), getContext().getRefName()) {
@Override
protected Project getProject() {
@@ -256,25 +257,36 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
}
});
- fragment.add(AttributeAppender.append("class", "nav btn-group flex-nowrap"));
- return fragment;
+ jobNav.add(AttributeAppender.append("class", "nav btn-group flex-nowrap"));
+ return jobNav;
+ }
+
+ @Override
+ protected List<Job> getJobs() {
+ return jobs;
+ }
+
+ @Override
+ protected int getActiveJobIndex() {
+ return activeJobIndex;
}
});
- newJobDetail(null, activeJob);
+ setupJobDetail(null, activeJobIndex);
add(AttributeAppender.append("class", "elements jobs d-flex flex-nowrap"));
}
- private void newJobDetail(@Nullable AjaxRequestTarget target, @Nullable Job job) {
+ private void setupJobDetail(@Nullable AjaxRequestTarget target, int jobIndex) {
WebMarkupContainer jobDetail;
- if (job != null) {
+ if (jobIndex != -1) {
+ Job job = buildSpec.getJobs().get(jobIndex);
jobDetail = new Fragment("detail", "jobDetailFrag", BuildSpecBlobViewPanel.this);
- jobDetail.add(new NamedElementImportNoticePanel<Job>(buildSpec, job.getName()) {
+ jobDetail.add(new ElementImportNoticePanel(buildSpec, Job.class, job.getName()) {
@Override
- protected Map<String, Job> getElementMap(BuildSpec buildSpec) {
+ protected Map<String, ? extends NamedElement> getElementMap(BuildSpec buildSpec) {
return buildSpec.getJobMap();
}
@@ -285,7 +297,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
public void onClick(AjaxRequestTarget target) {
String position = getPosition("jobs");
context.pushState(target, context.getBlobIdent(), position);
- newJobDetail(target, null);
+ setupJobDetail(target, -1);
notifyJobSelectionChange(target, null);
}
@@ -330,83 +342,21 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
private void setupServicesViewer(@Nullable AjaxRequestTarget target) {
Component servicesViewer;
- List<Service> services = getNamedElementsToShow(buildSpec.getServices(), buildSpec.getServiceMap());
+ List<Service> services = getAllElements(buildSpec.getServices(), buildSpec.getServiceMap());
if (!services.isEmpty()) {
- servicesViewer = new Fragment("content", "servicesFrag", BuildSpecBlobViewPanel.this) {
-
+ servicesViewer = new ElementsViewer<Service>(buildSpec) {
+
@Override
- protected void onInitialize() {
- super.onInitialize();
-
- RepeatingView navsView = new RepeatingView("navs");
- for (int i=0; i<services.size(); i++) {
- int serviceIndex = i;
- Service service = services.get(serviceIndex);
- WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());
- AjaxLink<Void> serviceLink = new AjaxLink<Void>("service") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- String position = getPosition("services/" + service.getName());
- context.pushState(target, context.getBlobIdent(), position);
- newServiceViewer(target, serviceIndex);
- }
-
- };
-
- String label = HtmlEscape.escapeHtml5(service.getName());
- if (!buildSpec.getServices().contains(service)) {
- String iconHtml = String.format(
- "<svg class='icon imported'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref(IconScope.class, "arrow2"));
- label += iconHtml;
- }
- serviceLink.add(new Label("label", label).setEscapeModelStrings(false));
-
- nav.add(serviceLink);
-
- navsView.add(nav);
- }
- add(navsView);
-
- newServiceViewer(null, getActiveNamedElementIndex(context, Service.class, services, 0));
-
- add(AttributeAppender.append("class", "services elements d-flex flex-nowrap"));
+ protected List<Service> getElements(boolean includeImported) {
+ if (includeImported)
+ return services;
+ else
+ return buildSpec.getServices();
}
-
- private void newServiceViewer(@Nullable AjaxRequestTarget target, int serviceIndex) {
- WebMarkupContainer serviceContainer = new WebMarkupContainer("service") {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d);", serviceIndex);
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- };
-
- Service service = services.get(serviceIndex);
-
- serviceContainer.add(new NamedElementImportNoticePanel<Service>(buildSpec, service.getName()) {
- @Override
- protected Map<String, Service> getElementMap(BuildSpec buildSpec) {
- return buildSpec.getServiceMap();
- }
-
- });
-
- serviceContainer.add(BeanContext.view("content", service));
- serviceContainer.setOutputMarkupId(true);
-
- if (target != null) {
- replace(serviceContainer);
- target.add(serviceContainer);
- } else {
- add(serviceContainer);
- }
+ @Override
+ protected Map<String, Service> getElementMap(BuildSpec buildSpec) {
+ return buildSpec.getServiceMap();
}
};
@@ -434,83 +384,21 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
private void setupStepTemplatesViewer(@Nullable AjaxRequestTarget target) {
Component templatesViewer;
- List<StepTemplate> templates = getNamedElementsToShow(buildSpec.getStepTemplates(), buildSpec.getStepTemplateMap());
+ List<StepTemplate> templates = getAllElements(buildSpec.getStepTemplates(), buildSpec.getStepTemplateMap());
if (!templates.isEmpty()) {
- templatesViewer = new Fragment("content", "stepTemplatesFrag", BuildSpecBlobViewPanel.this) {
-
+ templatesViewer = new ElementsViewer<StepTemplate>(buildSpec) {
+
@Override
- protected void onInitialize() {
- super.onInitialize();
-
- RepeatingView navsView = new RepeatingView("navs");
- for (int i=0; i<templates.size(); i++) {
- int templateIndex = i;
- StepTemplate template = templates.get(templateIndex);
- WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());
- AjaxLink<Void> templateLink = new AjaxLink<Void>("template") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- String position = getPosition("step-templates/" + template.getName());
- context.pushState(target, context.getBlobIdent(), position);
- newTemplateViewer(target, templateIndex);
- }
-
- };
-
- String label = HtmlEscape.escapeHtml5(template.getName());
- if (!buildSpec.getStepTemplates().contains(template)) {
- String iconHtml = String.format(
- "<svg class='icon imported'><use xlink:href='%s'/></svg>",
- SpriteImage.getVersionedHref(IconScope.class, "arrow2"));
- label += iconHtml;
- }
- templateLink.add(new Label("label", label).setEscapeModelStrings(false));
-
- nav.add(templateLink);
-
- navsView.add(nav);
- }
- add(navsView);
-
- newTemplateViewer(null, getActiveNamedElementIndex(context, StepTemplate.class, templates, 0));
-
- add(AttributeAppender.append("class", "step-templates elements d-flex flex-nowrap"));
+ protected List<StepTemplate> getElements(boolean includeImported) {
+ if (includeImported)
+ return templates;
+ else
+ return buildSpec.getStepTemplates();
}
-
- private void newTemplateViewer(@Nullable AjaxRequestTarget target, int templateIndex) {
- WebMarkupContainer templateContainer = new WebMarkupContainer("template") {
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
-
- String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d);", templateIndex);
- response.render(OnDomReadyHeaderItem.forScript(script));
- }
-
- };
-
- StepTemplate template = templates.get(templateIndex);
-
- templateContainer.add(new NamedElementImportNoticePanel<StepTemplate>(buildSpec, template.getName()) {
- @Override
- protected Map<String, StepTemplate> getElementMap(BuildSpec buildSpec) {
- return buildSpec.getStepTemplateMap();
- }
-
- });
-
- templateContainer.add(BeanContext.view("content", template));
- templateContainer.setOutputMarkupId(true);
-
- if (target != null) {
- replace(templateContainer);
- target.add(templateContainer);
- } else {
- add(templateContainer);
- }
+ @Override
+ protected Map<String, StepTemplate> getElementMap(BuildSpec buildSpec) {
+ return buildSpec.getStepTemplateMap();
}
};
@@ -540,7 +428,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
Component importsViewer;
if (!buildSpec.getImports().isEmpty()) {
importsViewer = PropertyContext.view("content", buildSpec, "imports");
- importsViewer.add(AttributeAppender.append("class", "imports autofit pr-2"));
+ importsViewer.add(AttributeAppender.append("class", "imports autofit pr-3"));
} else {
importsViewer = new Label("content", "No imports defined");
String cssClasses = "imports not-defined alert alert-notice alert-light-warning d-flex";
@@ -680,25 +568,124 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
protected boolean isViewPlainSupported() {
return true;
}
+
+ private abstract class ElementsViewer<T extends NamedElement> extends Fragment {
+
+ private final BuildSpec buildSpec;
+
+ private final Class<T> elementClass;
+
+ @SuppressWarnings("unchecked")
+ public ElementsViewer(BuildSpec buildSpec) {
+ super("content", "elementsFrag", BuildSpecBlobViewPanel.this);
+
+ this.buildSpec = buildSpec;
+
+ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(ElementsViewer.class, getClass());
+ elementClass = (Class<T>) typeArguments.get(0);
+ }
- private abstract class NamedElementImportNoticePanel<T extends NamedElement> extends Fragment {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ RepeatingView navsView = new RepeatingView("navs");
+
+ String urlSegment = getUrlSegment(elementClass);
+ for (int i=0; i<getElements(true).size(); i++) {
+ int elementIndex = i;
+ NamedElement element = getElements(true).get(elementIndex);
+ WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId());
+ AjaxLink<Void> elementLink = new AjaxLink<Void>("select") {
- private final Class<T> elementClass;
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ String position = getPosition(urlSegment + "s/" + element.getName());
+ context.pushState(target, context.getBlobIdent(), position);
+ setupElementViewer(target, elementIndex);
+ }
+
+ };
+
+ String label = HtmlEscape.escapeHtml5(element.getName());
+ if (!getElements(false).contains(element)) {
+ String iconHtml = String.format(
+ "<svg class='icon imported'><use xlink:href='%s'/></svg>",
+ SpriteImage.getVersionedHref(IconScope.class, "arrow2"));
+ label += iconHtml;
+ }
+ elementLink.add(new Label("label", label).setEscapeModelStrings(false));
+
+ nav.add(elementLink);
+
+ navsView.add(nav);
+ }
+ add(navsView);
+
+ setupElementViewer(null, getActiveElementIndex(context, elementClass, getElements(true), 0));
+
+ add(AttributeAppender.append("class", "elements d-flex flex-nowrap " + urlSegment + "s"));
+ }
+
+ private void setupElementViewer(@Nullable AjaxRequestTarget target, int elementIndex) {
+ WebMarkupContainer detailContainer = new WebMarkupContainer("detail") {
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+
+ String script = String.format("onedev.server.buildSpec.markElementActive(%d);", elementIndex);
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+ };
+
+ T element = getElements(true).get(elementIndex);
+
+ detailContainer.add(new ElementImportNoticePanel(buildSpec, elementClass, element.getName()) {
+
+ @Override
+ protected Map<String, ? extends NamedElement> getElementMap(BuildSpec buildSpec) {
+ return ElementsViewer.this.getElementMap(buildSpec);
+ }
+
+ });
+
+ detailContainer.add(new Label("title", EditableUtils.getDisplayName(elementClass) + " Detail"));
+
+ detailContainer.add(BeanContext.view("content", element));
+ detailContainer.setOutputMarkupId(true);
+
+ if (target != null) {
+ replace(detailContainer);
+ target.add(detailContainer);
+ } else {
+ add(detailContainer);
+ }
+ }
+
+ protected abstract Map<String, T> getElementMap(BuildSpec buildSpec);
+
+ protected abstract List<T> getElements(boolean includeImported);
+
+ }
+
+ private abstract class ElementImportNoticePanel extends Fragment {
+
+ private final Class<? extends NamedElement> elementClass;
private final String elementName;
private Import aImport;
- @SuppressWarnings("unchecked")
- public NamedElementImportNoticePanel(BuildSpec buildSpec, String elementName) {
- super("notice", "namedElementImportNoticeFrag", BuildSpecBlobViewPanel.this);
-
- List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(
- NamedElementImportNoticePanel.class, getClass());
- elementClass = (Class<T>) typeArguments.get(0);
+ public ElementImportNoticePanel(BuildSpec buildSpec,
+ Class<? extends NamedElement> elementClass, String elementName) {
+ super("notice", "elementImportNoticeFrag", BuildSpecBlobViewPanel.this);
+
+ this.elementClass = elementClass;
this.elementName = elementName;
- T element = getElementMap(buildSpec).get(elementName);
+ NamedElement element = getElementMap(buildSpec).get(elementName);
for (Import aImport: buildSpec.getImports()) {
try {
if (getElementMap(aImport.getBuildSpec()).get(elementName) == element) {
@@ -745,7 +732,7 @@ public class BuildSpecBlobViewPanel extends BlobViewPanel {
}
}
- protected abstract Map<String, T> getElementMap(BuildSpec buildSpec);
+ protected abstract Map<String, ? extends NamedElement> getElementMap(BuildSpec buildSpec);
@Override
protected void onConfigure() {
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.html
index 0c15d09c55..4a153b6431 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
@@ -1,5 +1,5 @@
<wicket:panel>
- <div wicket:id="content" class="build-spec build-spec-edit"></div>
+ <div wicket:id="content" class="build-spec build-spec-edit d-flex flex-column flex-grow-1"></div>
<wicket:fragment wicket:id="parseableFrag">
<div class="head">
<a wicket:id="jobs" class="jobs">Jobs</a>
@@ -8,7 +8,7 @@
<a wicket:id="properties" class="properties">Properties</a>
<a wicket:id="imports" class="imports">Imports</a>
</div>
- <div wicket:id="body" class="body">
+ <div wicket:id="body" class="body d-flex flex-column flex-grow-1">
<div wicket:id="feedback"></div>
<div wicket:id="content" class="content"></div>
</div>
@@ -17,28 +17,55 @@
<div class="title">Error parsing build spec</div>
<div wicket:id="errorMessage" class="error-message"></div>
</wicket:fragment>
- <wicket:fragment wicket:id="namedElementsFrag">
- <div class="side flex-shrink-0">
+ <wicket:fragment wicket:id="jobsFrag">
+ <div wicket:id="pipeline" class="side flex-grow-1 autofit"></div>
+ <div wicket:id="detail" class="main d-flex flex-column ml-4"></div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="elementsFrag">
+ <div class="side autofit flex-shrink-0">
<!-- do not leave white space between navs and nav element as we are using .navs:not(:empty)
in css -->
- <div class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
- <a wicket:id="element" class="select btn btn-secondary justify-content-start">
+ <div wicket:id="navs" class="navs"><div wicket:id="navs" class="nav btn-group btn-block mb-3">
+ <a wicket:id="select" class="select btn btn-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>
</div></div>
<div class="add btn-group btn-block">
- <a wicket:id="create" class="create btn btn-success justify-content-start">
+ <a wicket:id="create" class="create btn btn-success justify-content-start no-suggestions">
<wicket:svg href="plus" class="icon flex-shrink-0 mr-1"></wicket:svg> Add New
</a>
- <a wicket:id="suggestions" class="suggestions btn btn-primary flex-grow-0 flex-shrink-0 btn-icon" title="Suggestions">
- <wicket:svg href="wand" class="icon"/>
- </a>
</div>
</div>
- <div class="main flex-grow-1 ml-4">
- <div wicket:id="element" class="content"></div>
+ <div wicket:id="detail" class="main autofit d-flex flex-column flex-grow-1 ml-4"></div>
+ </wicket:fragment>
+ <wicket:fragment wicket:id="elementDetailFrag">
+ <div class="head">
+ <h6 wicket:id="title" class="mb-0"></h6>
</div>
+ <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">
+ <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>
</wicket:fragment>
+ <wicket:fragment wicket:id="jobDetailFrag">
+ <div class="head">
+ <a wicket:id="close" class="close"><wicket:svg href="times" class="icon"/></a>
+ <h6 class="mb-0">Job Detail</h6>
+ </div>
+ <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">
+ <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">
+ <wicket:svg href="wand" class="icon"/>
+ </a>
+ </wicket:fragment>
</wicket:panel>
\ No newline at end of file
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.java
index b6fcfe2547..1ed72deb80 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
@@ -1,6 +1,6 @@
package io.onedev.server.web.page.project.blob.render.renderers.buildspec;
-import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getActiveNamedElementIndex;
+import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getActiveElementIndex;
import static io.onedev.server.web.page.project.blob.render.renderers.buildspec.BuildSpecRenderer.getUrlSegment;
import java.io.Serializable;
@@ -8,7 +8,6 @@ import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
-import java.util.Iterator;
import java.util.List;
import javax.annotation.Nullable;
@@ -18,7 +17,6 @@ import javax.validation.Validator;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
import org.apache.wicket.behavior.AttributeAppender;
@@ -33,12 +31,14 @@ import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.FormComponentPanel;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
-import org.apache.wicket.request.IRequestParameters;
import org.apache.wicket.request.cycle.RequestCycle;
+import org.unbescape.html.HtmlEscape;
import com.google.common.base.Throwables;
@@ -62,17 +62,23 @@ import io.onedev.server.util.PathNode;
import io.onedev.server.util.PathNode.Indexed;
import io.onedev.server.util.PathNode.Named;
import io.onedev.server.util.ReflectionUtils;
-import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
+import io.onedev.server.web.component.pipeline.JobSelectionChange;
+import io.onedev.server.web.component.pipeline.PipelinePanel;
+import io.onedev.server.web.component.pipeline.Sortable;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.BeanUpdating;
+import io.onedev.server.web.editable.EditableUtils;
import io.onedev.server.web.editable.PropertyContext;
import io.onedev.server.web.editable.PropertyEditor;
+import io.onedev.server.web.editable.PropertyUpdating;
+import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.page.project.blob.render.edit.EditCompleteAware;
import io.onedev.server.web.util.AjaxPayload;
@@ -96,6 +102,10 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
}
+ private void resizeWindow(AjaxRequestTarget target) {
+ ((BasePage)getPage()).resizeWindow(target);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -107,58 +117,328 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
private WebMarkupContainer body;
private void setupJobsEditor(@Nullable AjaxRequestTarget target) {
- Fragment jobsEditor = new NamedElementsEditor<Job>() {
+ Fragment jobsEditor = new Fragment("content", "jobsFrag", BuildSpecEditPanel.this) {
- @Override
- protected List<Job> getElements() {
- return buildSpec.getJobs();
+ private void notifyJobSelectionChange(AjaxRequestTarget target, @Nullable Job job) {
+ send(this, Broadcast.BREADTH, new JobSelectionChange(target, job));
}
-
- @Override
- protected List<Job> getSuggestedElements() {
- List<Job> suggestedJobs = new ArrayList<>();
+
+ private void setupJobDetail(@Nullable AjaxRequestTarget target, int jobIndex) {
+ Fragment jobsEditor = this;
- if (context.getBlobIdent().revision != null) {
- for (JobSuggestion suggestion: OneDev.getExtensions(JobSuggestion.class))
- suggestedJobs.addAll(suggestion.suggestJobs(context.getProject(), context.getCommit()));
+ WebMarkupContainer jobDetail;
+ if (jobIndex != -1) {
+ jobDetail = new Fragment("detail", "jobDetailFrag", BuildSpecEditPanel.this);
+
+ jobDetail.add(new AjaxSubmitLink("close") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ pushState(target, "jobs");
+ setupJobDetail(target, -1);
+ notifyJobSelectionChange(target, null);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(jobsEditor);
+ resizeWindow(target);
+ }
+
+ });
+
+ class JobEditor extends BeanEditor implements JobAware {
+
+ public JobEditor(String id, Job job) {
+ super(id, new BeanDescriptor(Job.class), Model.of(job));
+ }
+
+ @Override
+ public Job getJob() {
+ return (Job) getConvertedInput();
+ }
+
+ @Override
+ public List<ParamSpec> getParamSpecs() {
+ return ((Job) getConvertedInput()).getParamSpecs();
+ }
+
+ }
+
+ BeanEditor jobEditor = new JobEditor("body", buildSpec.getJobs().get(jobIndex)) {
+
+ @Override
+ public void onEvent(IEvent<?> event) {
+ super.onEvent(event);
+ if (event.getPayload() instanceof BeanUpdating) {
+ PropertyUpdating propertyUpdating = ((BeanUpdating) event.getPayload()).getSource();
+ if (propertyUpdating.getPropertyName().equals(Job.PROP_NAME)
+ || propertyUpdating.getPropertyName().equals(Job.PROP_JOB_DEPENDENCIES)) {
+ Job job = (Job) getConvertedInput();
+ String selection = "jobs";
+ if (StringUtils.isNotBlank(job.getName()))
+ selection += "/" + job.getName();
+ int jobIndex = (int) jobDetail.getDefaultModelObject();
+ buildSpec.getJobs().set(jobIndex, job);
+
+ AjaxRequestTarget target = (AjaxRequestTarget) propertyUpdating.getHandler();
+ replaceState(target, selection);
+ target.add(jobsEditor.get("pipeline"));
+ resizeWindow(target);
+ }
+ } else if (event.getPayload() instanceof FormSubmitted) {
+ int jobIndex = (int) jobDetail.getDefaultModelObject();
+ buildSpec.getJobs().set(jobIndex, (Job) getConvertedInput());
+ }
+ }
+
+ };
+
+ jobDetail.add(jobEditor);
+ } else {
+ jobDetail = new WebMarkupContainer("detail");
+ jobDetail.setVisible(false);
+ }
+ jobDetail.setDefaultModel(Model.of(jobIndex));
+ jobDetail.setOutputMarkupPlaceholderTag(true);
+
+ if (target != null) {
+ replace(jobDetail);
+ target.add(jobDetail);
+ } else {
+ add(jobDetail);
}
- return suggestedJobs;
- }
-
- @Override
- protected int getActiveElementIndex() {
- return getActiveNamedElementIndex(context, Job.class, buildSpec.getJobs(), 0);
}
-
+
@Override
- protected BeanEditor newElementEditor(String componentId, Job element) {
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Fragment jobsEditor = this;
- class JobEditor extends BeanEditor implements JobAware {
+ add(new PipelinePanel("pipeline") {
+
+ private void addJob(AjaxRequestTarget target, Job job) {
+ getJobs().add(job);
+ pushState(target, "new-job");
+ int jobIndex = getJobs().size()-1;
+ setupJobDetail(target, jobIndex);
+ target.add(jobsEditor);
+ resizeWindow(target);
+ }
+
+ @Override
+ protected Component renderJob(String componentId, int jobIndex) {
+ WebMarkupContainer jobNav = new Fragment(componentId, "jobFrag", BuildSpecEditPanel.this);
+
+ jobNav.add(new AjaxSubmitLink("select") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", new LoadableDetachableModel<String>() {
+
+ @Override
+ protected String load() {
+ Job job = getJobs().get(jobIndex);
+ if (job.getName() != null)
+ return HtmlEscape.escapeHtml5(job.getName());
+ else
+ return "<i>Name not specified</i>";
+ }
+
+ }).setEscapeModelStrings(false));
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ Job job = getJobs().get(jobIndex);
+ pushState(target, "jobs/" + job.getName());
+ setupJobDetail(target, buildSpec.getJobs().indexOf(job));
+
+ notifyJobSelectionChange(target, job);
+ resizeWindow(target);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(jobsEditor);
+ resizeWindow(target);
+ }
+
+ });
+
+ jobNav.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getJobs().remove(jobIndex);
+
+ Component jobDetail = jobsEditor.get("detail");
+
+ int activeJobIndex = (int) jobDetail.getDefaultModelObject();
+ if (jobIndex == activeJobIndex) {
+ replaceState(target, "jobs");
+ setupJobDetail(target, -1);
+ } else if (jobIndex < activeJobIndex) {
+ jobDetail.setDefaultModelObject(activeJobIndex-1);
+ }
+ target.appendJavaScript("onedev.server.form.markDirty($('.build-spec').closest('form'));");
+ target.add(jobsEditor.get("pipeline"));
+ resizeWindow(target);
+ }
+
+ });
+
+ jobNav.add(AttributeAppender.append("class", "nav btn-group flex-nowrap"));
+
+ return jobNav;
+ }
+
+ @Override
+ protected Component renderAction(String componentId) {
+ Fragment fragment = new Fragment(componentId, "addJobFrag", BuildSpecEditPanel.this);
+
+ AjaxSubmitLink createLink = new AjaxSubmitLink("create") {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ addJob(target, new Job());
+ }
- public JobEditor(String id, NamedElement element) {
- super(id, new BeanDescriptor(Job.class), Model.of(element));
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(jobsEditor);
+ resizeWindow(target);
+ }
+
+ };
+
+ fragment.add(createLink);
+
+ List<Job> suggestedJobs = new ArrayList<>();
+
+ if (context.getBlobIdent().revision != null) {
+ for (JobSuggestion suggestion: OneDev.getExtensions(JobSuggestion.class))
+ suggestedJobs.addAll(suggestion.suggestJobs(context.getProject(), context.getCommit()));
+ }
+
+ if (!suggestedJobs.isEmpty()) {
+ fragment.add(new MenuLink("suggestions") {
+
+ @Override
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ List<MenuItem> menuItems = new ArrayList<>();
+ for (Job job: suggestedJobs) {
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return job.getName();
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxSubmitLink(id, createLink.findParent(Form.class)) {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ addJob(target, job);
+ dropdown.close();
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(jobsEditor.get("pipeline"));
+ resizeWindow(target);
+ }
+
+ };
+ }
+
+ });
+ }
+ return menuItems;
+ }
+
+ });
+ } else {
+ fragment.add(new WebMarkupContainer("suggestions").setVisible(false));
+ }
+
+ fragment.add(AttributeAppender.append("class", "add-job nav btn-group"));
+ return fragment;
}
@Override
- public Job getJob() {
- return (Job) getConvertedInput();
+ protected List<Job> getJobs() {
+ return buildSpec.getJobs();
}
@Override
- public List<ParamSpec> getParamSpecs() {
- return getJob().getParamSpecs();
+ protected int getActiveJobIndex() {
+ return (int) jobsEditor.get("detail").getDefaultModelObject();
+ }
+
+ @Override
+ protected Sortable getSortable() {
+ return new Sortable() {
+
+ @Override
+ public void onSort(AjaxRequestTarget target, int fromIndex, int toIndex) {
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(getJobs(), fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(getJobs(), fromIndex-i, fromIndex-i-1);
+ }
+
+ Component jobDetail = jobsEditor.get("detail");
+
+ int activeIndex = (int) jobDetail.getDefaultModelObject();
+
+ if (fromIndex < activeIndex) {
+ if (toIndex >= activeIndex)
+ jobDetail.setDefaultModelObject(activeIndex-1);
+ } else if (fromIndex == activeIndex) {
+ jobDetail.setDefaultModelObject(toIndex);
+ } else {
+ if (toIndex <= activeIndex)
+ jobDetail.setDefaultModelObject(activeIndex+1);
+ }
+
+ target.add(jobsEditor.get("pipeline"));
+ resizeWindow(target);
+ }
+
+ };
}
- }
+ }.setOutputMarkupId(true));
+
+ setupJobDetail(null, getActiveElementIndex(context, Job.class, buildSpec.getJobs(), -1));
- return new JobEditor(componentId, element);
+ add(AttributeAppender.append("class", "elements d-flex flex-nowrap jobs"));
+
+ setOutputMarkupId(true);
}
-
+
@Override
- protected void setElements(List<Job> elements) {
- buildSpec.setJobs(elements);
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(OnDomReadyHeaderItem.forScript(
+ String.format("onedev.server.buildSpec.onTabDomReady('.jobs');")));
}
-
+
};
if (target != null) {
@@ -170,23 +450,13 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
private void setupStepTemplatesEditor(@Nullable AjaxRequestTarget target) {
- Fragment stepTemplatesEditor = new NamedElementsEditor<StepTemplate>() {
+ Fragment stepTemplatesEditor = new ElementsEditor<StepTemplate>() {
@Override
protected List<StepTemplate> getElements() {
return buildSpec.getStepTemplates();
}
- @Override
- protected List<StepTemplate> getSuggestedElements() {
- return new ArrayList<>();
- }
-
- @Override
- protected int getActiveElementIndex() {
- return getActiveNamedElementIndex(context, StepTemplate.class, buildSpec.getStepTemplates(), 0);
- }
-
@Override
protected BeanEditor newElementEditor(String componentId, StepTemplate element) {
@@ -206,11 +476,6 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
return new StepTemplateEditor(componentId, element);
}
- @Override
- protected void setElements(List<StepTemplate> elements) {
- buildSpec.setStepTemplates(elements);
- }
-
};
if (target != null) {
@@ -222,28 +487,13 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
private void setupServicesEditor(@Nullable AjaxRequestTarget target) {
- Fragment servicesEditor = new NamedElementsEditor<Service>() {
+ Fragment servicesEditor = new ElementsEditor<Service>() {
@Override
protected List<Service> getElements() {
return buildSpec.getServices();
}
- @Override
- protected void setElements(List<Service> elements) {
- buildSpec.setServices(elements);
- }
-
- @Override
- protected List<Service> getSuggestedElements() {
- return new ArrayList<>();
- }
-
- @Override
- protected int getActiveElementIndex() {
- return getActiveNamedElementIndex(context, Service.class, buildSpec.getServices(), 0);
- }
-
@Override
protected BeanEditor newElementEditor(String componentId, Service element) {
return new BeanEditor(componentId, new BeanDescriptor(Service.class), Model.of(element));
@@ -278,7 +528,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
});
- propertiesEditor.add(AttributeAppender.append("class", "properties"));
+ propertiesEditor.add(AttributeAppender.append("class", "properties pr-3"));
propertiesEditor.setOutputMarkupId(true);
if (target != null) {
body.replace(propertiesEditor);
@@ -307,7 +557,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
});
- importsEditor.add(AttributeAppender.append("class", "imports"));
+ importsEditor.add(AttributeAppender.append("class", "imports pr-3"));
importsEditor.setOutputMarkupId(true);
if (target != null) {
body.replace(importsEditor);
@@ -328,12 +578,14 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
super.onSubmit(target, form);
pushState(target, "jobs");
setupJobsEditor(target);
+ resizeWindow(target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
target.add(getParent());
+ resizeWindow(target);
}
});
@@ -345,12 +597,14 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
super.onSubmit(target, form);
pushState(target, "services");
setupServicesEditor(target);
+ resizeWindow(target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
target.add(getParent());
+ resizeWindow(target);
}
});
@@ -362,12 +616,14 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
super.onSubmit(target, form);
pushState(target, "step-templates");
setupStepTemplatesEditor(target);
+ resizeWindow(target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
target.add(getParent());
+ resizeWindow(target);
}
});
@@ -379,12 +635,14 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
super.onSubmit(target, form);
pushState(target, "properties");
setupPropertiesEditor(target);
+ resizeWindow(target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
target.add(getParent());
+ resizeWindow(target);
}
});
@@ -396,12 +654,14 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
super.onSubmit(target, form);
pushState(target, "imports");
setupImportsEditor(target);
+ resizeWindow(target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
target.add(getParent());
+ resizeWindow(target);
}
});
@@ -452,7 +712,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
String selection = "jobs/" + buildSpec.getJobs().get(indexed.getIndex()).getName();
replaceState(target, selection);
setupJobsEditor(target);
- ((BeanEditor)body.get("content:element")).error(path, violation.getMessage());
+ ((BeanEditor)body.get("content:detail:body")).error(path, violation.getMessage());
}
break;
case "services":
@@ -467,7 +727,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
String selection = "services/" + buildSpec.getServices().get(indexed.getIndex()).getName();
replaceState(target, selection);
setupServicesEditor(target);
- ((BeanEditor)body.get("content:element")).error(path, violation.getMessage());
+ ((BeanEditor)body.get("content:detail:body")).error(path, violation.getMessage());
}
break;
case "stepTemplates":
@@ -482,7 +742,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
String selection = "step-templates/" + buildSpec.getStepTemplates().get(indexed.getIndex()).getName();
replaceState(target, selection);
setupStepTemplatesEditor(target);
- ((BeanEditor)body.get("content:element")).error(path, violation.getMessage());
+ ((BeanEditor)body.get("content:detail:body")).error(path, violation.getMessage());
}
break;
case "properties":
@@ -516,15 +776,15 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
private void fixState(AjaxRequestTarget target) {
String selection = getSelection();
if (selection == null || selection.startsWith("jobs")) {
- int jobIndex = getActiveNamedElementIndex(context, Job.class, buildSpec.getJobs(), 0);
- if (jobIndex < buildSpec.getJobs().size())
+ int jobIndex = getActiveElementIndex(context, Job.class, buildSpec.getJobs(), -1);
+ if (jobIndex >= 0 && jobIndex < buildSpec.getJobs().size())
replaceState(target, "jobs/" + buildSpec.getJobs().get(jobIndex).getName());
} else if (selection.startsWith("services")) {
- int serviceIndex = getActiveNamedElementIndex(context, Service.class, buildSpec.getServices(), 0);
+ int serviceIndex = getActiveElementIndex(context, Service.class, buildSpec.getServices(), 0);
if (serviceIndex < buildSpec.getServices().size())
replaceState(target, "services/" + buildSpec.getServices().get(serviceIndex).getName());
} else if (selection.startsWith("step-templates")) {
- int stepTemplateIndex = getActiveNamedElementIndex(context, StepTemplate.class, buildSpec.getStepTemplates(), 0);
+ int stepTemplateIndex = getActiveElementIndex(context, StepTemplate.class, buildSpec.getStepTemplates(), 0);
if (stepTemplateIndex < buildSpec.getStepTemplates().size())
replaceState(target, "step-templates/" + buildSpec.getStepTemplates().get(stepTemplateIndex).getName());
} else if (selection.equals("new-job")) {
@@ -619,298 +879,248 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
- private abstract class NamedElementsEditor<T extends NamedElement> extends Fragment {
+ private abstract class ElementsEditor<T extends NamedElement> extends Fragment {
private final Class<T> elementClass;
@SuppressWarnings("unchecked")
- public NamedElementsEditor() {
- super("content", "namedElementsFrag", BuildSpecEditPanel.this);
+ public ElementsEditor() {
+ super("content", "elementsFrag", BuildSpecEditPanel.this);
- List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(NamedElementsEditor.class, getClass());
+ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(ElementsEditor.class, getClass());
elementClass = (Class<T>) typeArguments.get(0);
}
protected abstract List<T> getElements();
- protected abstract void setElements(List<T> elements);
-
- protected abstract List<T> getSuggestedElements();
-
- protected abstract int getActiveElementIndex();
-
protected abstract BeanEditor newElementEditor(String componentId, T element);
- private void newElementNav(@Nullable AjaxRequestTarget target, RepeatingView navsView, int elementIndex) {
- WebMarkupContainer nav = new WebMarkupContainer(navsView.newChildId(), Model.of(elementIndex));
+ private void setupElementDetail(@Nullable AjaxRequestTarget target, int elementIndex) {
+ WebMarkupContainer elementDetail;
- Fragment elementsEdit = this;
-
- nav.add(new AjaxSubmitLink("element") {
-
- private int getElementIndex() {
- return (int) nav.getDefaultModelObject();
- }
+ if (elementIndex != -1) {
+ elementDetail = new Fragment("detail", "elementDetailFrag", BuildSpecEditPanel.this);
+ elementDetail.setDefaultModel(Model.of(elementIndex));
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(new Label("label", new AbstractReadOnlyModel<String>() {
-
- @Override
- public String getObject() {
- return getElement().getName();
- }
-
- }));
- }
-
- private NamedElement getElement() {
- return getElements().get(getElementIndex());
- }
+ elementDetail.add(new Label("title", EditableUtils.getDisplayName(elementClass) + " Detail"));
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- pushState(target, getUrlSegment(elementClass) + "s/" + getElement().getName());
- setupElementEditor(target, nav);
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- target.add(elementsEdit);
- }
+ BeanEditor elementEditor = newElementEditor("body", getElements().get(elementIndex));
- });
-
- nav.add(new AjaxLink<Void>("delete") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- int elementIndex = (int) nav.getDefaultModelObject();
- Component elementEdit = elementsEdit.get("element");
- boolean found = false;
- for (Iterator<Component> it = navsView.iterator(); it.hasNext();) {
- Component child = it.next();
- if (child == nav) {
- it.remove();
- found = true;
- } else if (found) {
- child.setDefaultModelObject((int)child.getDefaultModelObject()-1);
- }
- }
- target.appendJavaScript(String.format(
- "$('.build-spec>.body>.elements>.side>.navs>.nav:eq(%d)').remove();",
- elementIndex));
- getElements().remove(elementIndex);
- int activeElementIndex = getElements().indexOf(elementEdit.getDefaultModelObject());
- if (activeElementIndex == -1) {
- replaceState(target, getUrlSegment(elementClass) + "s");
- if (!getElements().isEmpty()) {
- setupElementEditor(target, navsView.iterator().next());
- } else {
- elementEdit = new WebMarkupContainer("element");
- elementEdit.setOutputMarkupId(true);
- elementsEdit.replace(elementEdit);
- target.add(elementEdit);
+ elementEditor.add(new Behavior() {
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public void onEvent(Component component, IEvent<?> event) {
+ super.onEvent(component, event);
+ if (event.getPayload() instanceof BeanUpdating) {
+ PropertyUpdating propertyUpdating = ((BeanUpdating) event.getPayload()).getSource();
+ if (propertyUpdating.getPropertyName().equals(Job.PROP_NAME)) {
+ T element = (T) elementEditor.getConvertedInput();
+ String selection = getUrlSegment(elementClass) + "s";
+ if (StringUtils.isNotBlank(element.getName()))
+ selection += "/" + element.getName();
+ int elementIndex = (int) elementDetail.getDefaultModelObject();
+ getElements().set(elementIndex, element);
+
+ AjaxRequestTarget target = (AjaxRequestTarget) propertyUpdating.getHandler();
+ replaceState(target, selection);
+ target.add(ElementsEditor.this.get("navs"));
+ resizeWindow(target);
+ }
+ } else if (event.getPayload() instanceof FormSubmitted) {
+ int elementIndex = (int) elementDetail.getDefaultModelObject();
+ getElements().set(elementIndex, (T) elementEditor.getConvertedInput());
}
}
- target.appendJavaScript("onedev.server.form.markDirty($('.build-spec').closest('form'));");
- }
-
- });
-
- navsView.add(nav);
+
+ });
+ elementDetail.add(elementEditor);
+ elementDetail.setOutputMarkupId(true);
+ } else {
+ elementDetail = new WebMarkupContainer("detail");
+ elementDetail.setOutputMarkupPlaceholderTag(true).setVisible(false);
+ }
+ elementDetail.setDefaultModel(Model.of(elementIndex));
if (target != null) {
- String script = String.format(
- "$('.build-spec>.body>.elements>.side>.navs').append(\"<div id='%s'></div>\");",
- nav.getMarkupId(true));
- target.prependJavaScript(script);
- target.add(nav);
+ replace(elementDetail);
+ target.add(elementDetail);
+ } else {
+ add(elementDetail);
}
}
- private void setupElementEditor(@Nullable AjaxRequestTarget target, Component nav) {
- AbstractPostAjaxBehavior nameChangeBehavior = new AbstractPostAjaxBehavior() {
-
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ WebMarkupContainer navs = new WebMarkupContainer("navs") {
+
@Override
- protected void respond(AjaxRequestTarget target) {
- IRequestParameters params = RequestCycle.get().getRequest().getRequestParameters();
- String name = params.getParameterValue("name").toOptionalString();
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
- String selection = getUrlSegment(elementClass) + "s";
- if (StringUtils.isNotBlank(name))
- selection += "/" + name;
- replaceState(target, selection);
+ int elementIndex = (int) ElementsEditor.this.get("detail").getDefaultModelObject();
+ String script = String.format("onedev.server.buildSpec.markElementActive(%d);", elementIndex);
+ response.render(OnDomReadyHeaderItem.forScript(script));
}
};
- int elementIndex = (int) nav.getDefaultModelObject();
- BeanEditor elementEditor = newElementEditor("element", getElements().get(elementIndex));
-
- elementEditor.add(new Behavior() {
-
- @SuppressWarnings("unchecked")
+ navs.add(new ListView<T>("navs", new AbstractReadOnlyModel<List<T>>() {
+
@Override
- public void onEvent(Component component, IEvent<?> event) {
- super.onEvent(component, event);
- if (event.getPayload() instanceof FormSubmitted) {
- int elementIndex = (int) nav.getDefaultModelObject();
- List<T> elements = new ArrayList<>(getElements());
- elements.set(elementIndex, (T) elementEditor.getConvertedInput());
- setElements(elements);
- }
+ public List<T> getObject() {
+ return getElements();
}
+ }) {
+
@Override
- public void renderHead(Component component, IHeaderResponse response) {
- super.renderHead(component, response);
+ protected void populateItem(ListItem<T> item) {
+ item.add(new AjaxSubmitLink("select") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("label", new AbstractReadOnlyModel<String>() {
+
+ @Override
+ public String getObject() {
+ T element = getElements().get(item.getIndex());
+ if (element.getName() != null)
+ return HtmlEscape.escapeHtml5(element.getName());
+ else
+ return "<i>Name not specified</i>";
+ }
+
+ }).setEscapeModelStrings(false));
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ pushState(target, getUrlSegment(elementClass) + "s/" + item.getModelObject().getName());
+ setupElementDetail(target, item.getIndex());
+ target.appendJavaScript(String.format(
+ "onedev.server.buildSpec.markElementActive(%d);", item.getIndex()));
+ resizeWindow(target);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(ElementsEditor.this);
+ resizeWindow(target);
+ }
+
+ });
- int elementIndex = (int) nav.getDefaultModelObject();
- CharSequence callback = nameChangeBehavior.getCallbackFunction(CallbackParameter.explicit("name"));
- String script = String.format("onedev.server.buildSpec.onNamedElementDomReady(%d, %s);", elementIndex, callback);
- response.render(OnDomReadyHeaderItem.forScript(script));
+ item.add(new AjaxLink<Void>("delete") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ getElements().remove(item.getIndex());
+
+ Component elementDetail = ElementsEditor.this.get("detail");
+
+ int activeElementIndex = (int) elementDetail.getDefaultModelObject();
+ if (item.getIndex() == activeElementIndex) {
+ if (getElements().isEmpty()) {
+ replaceState(target, getUrlSegment(elementClass) + "s");
+ setupElementDetail(target, -1);
+ } else {
+ replaceState(target, getUrlSegment(elementClass) + "s/" + getElements().get(0).getName());
+ setupElementDetail(target, 0);
+ }
+ } else if (item.getIndex() < activeElementIndex) {
+ elementDetail.setDefaultModelObject(activeElementIndex-1);
+ }
+ target.appendJavaScript("onedev.server.form.markDirty($('.build-spec').closest('form'));");
+ target.add(ElementsEditor.this.get("navs"));
+ resizeWindow(target);
+ }
+
+ });
}
});
- elementEditor.add(nameChangeBehavior);
-
- elementEditor.setOutputMarkupId(true);
- if (target != null) {
- replace(elementEditor);
- target.add(elementEditor);
- } else {
- add(elementEditor);
- }
- }
-
- @SuppressWarnings("deprecation")
- private void addElement(AjaxRequestTarget target, RepeatingView elementNavs) {
- pushState(target, "new-" + getUrlSegment(elementClass));
- int elementIndex = getElements().size()-1;
- newElementNav(target, elementNavs, elementIndex);
- setupElementEditor(target, elementNavs.get(elementNavs.size()-1));
- }
-
- @SuppressWarnings("deprecation")
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- RepeatingView elementNavs = new RepeatingView("navs");
-
- for (int i=0; i<getElements().size(); i++)
- newElementNav(null, elementNavs, i);
-
- add(elementNavs);
if (!getElements().isEmpty()) {
- int elementIndex = getActiveElementIndex();
- setupElementEditor(null, elementNavs.get(elementIndex));
+ int elementIndex = getActiveElementIndex(context, elementClass, getElements(), 0);
+ setupElementDetail(null, elementIndex);
} else {
- add(new WebMarkupContainer("element").setOutputMarkupId(true));
+ setupElementDetail(null, -1);
}
+ navs.add(new SortBehavior() {
+
+ @Override
+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
+ int fromIndex = from.getItemIndex();
+ int toIndex = to.getItemIndex();
+
+ if (fromIndex < toIndex) {
+ for (int i=0; i<toIndex-fromIndex; i++)
+ Collections.swap(getElements(), fromIndex+i, fromIndex+i+1);
+ } else {
+ for (int i=0; i<fromIndex-toIndex; i++)
+ Collections.swap(getElements(), fromIndex-i, fromIndex-i-1);
+ }
+
+ Component jobDetail = get("detail");
+
+ int activeIndex = (int) jobDetail.getDefaultModelObject();
+
+ if (fromIndex < activeIndex) {
+ if (toIndex >= activeIndex)
+ jobDetail.setDefaultModelObject(activeIndex-1);
+ } else if (fromIndex == activeIndex) {
+ jobDetail.setDefaultModelObject(toIndex);
+ } else {
+ if (toIndex <= activeIndex)
+ jobDetail.setDefaultModelObject(activeIndex+1);
+ }
+
+ target.add(get("navs"));
+ resizeWindow(target);
+ }
+
+ }.sortable(null));
+
+ add(navs.setOutputMarkupId(true));
+
AjaxSubmitLink createLink = new AjaxSubmitLink("create") {
@Override
protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
super.onSubmit(target, form);
+ T newElement;
try {
- getElements().add(elementClass.newInstance());
+ newElement = elementClass.newInstance();
} catch (InstantiationException | IllegalAccessException e) {
throw new RuntimeException(e);
}
- addElement(target, elementNavs);
+
+ getElements().add(newElement);
+ pushState(target, "new-" + getUrlSegment(elementClass));
+ int elementIndex = getElements().size()-1;
+ setupElementDetail(target, elementIndex);
+ target.add(ElementsEditor.this);
+ resizeWindow(target);
}
@Override
protected void onError(AjaxRequestTarget target, Form<?> form) {
super.onError(target, form);
- target.add(NamedElementsEditor.this);
+ target.add(ElementsEditor.this);
+ resizeWindow(target);
}
};
- List<T> suggestedElements = getSuggestedElements();
-
- if (suggestedElements.isEmpty())
- createLink.add(AttributeAppender.append("class", "no-suggestions"));
-
add(createLink);
- if (!suggestedElements.isEmpty()) {
- add(new MenuLink("suggestions") {
-
- @Override
- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
- List<MenuItem> menuItems = new ArrayList<>();
- for (T element: suggestedElements) {
- menuItems.add(new MenuItem() {
-
- @Override
- public String getLabel() {
- return element.getName();
- }
-
- @Override
- public WebMarkupContainer newLink(String id) {
- return new AjaxSubmitLink(id, createLink.findParent(Form.class)) {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
- getElements().add(element);
- addElement(target, elementNavs);
- dropdown.close();
- }
-
- @Override
- protected void onError(AjaxRequestTarget target, Form<?> form) {
- super.onError(target, form);
- dropdown.close();
- target.add(NamedElementsEditor.this);
- }
-
- };
- }
-
- });
- }
- return menuItems;
- }
-
- });
- } else {
- add(new WebMarkupContainer("suggestions").setVisible(false));
- }
-
- add(new SortBehavior() {
-
- @Override
- protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {
- int fromIndex = from.getItemIndex();
- int toIndex = to.getItemIndex();
- if (fromIndex < toIndex) {
- for (int i=0; i<toIndex-fromIndex; i++) {
- elementNavs.swap(fromIndex+i, fromIndex+i+1);
- Collections.swap(getElements(), fromIndex+i, fromIndex+i+1);
- }
- } else {
- for (int i=0; i<fromIndex-toIndex; i++) {
- elementNavs.swap(fromIndex-i, fromIndex-i-1);
- Collections.swap(getElements(), fromIndex-i, fromIndex-i-1);
- }
- }
- for (int i=0; i<elementNavs.size(); i++)
- elementNavs.get(i).setDefaultModelObject(i);
- }
-
- }.sortable(".side>.navs"));
-
add(AttributeAppender.append("class", "elements d-flex flex-nowrap " + getUrlSegment(elementClass) + "s"));
setOutputMarkupId(true);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
index f2fb502802..5b34b8689f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/BuildSpecRenderer.java
@@ -43,7 +43,7 @@ public class BuildSpecRenderer implements BlobRendererer {
return EditableUtils.getDisplayName(namedElementClass).replace(' ', '-').toLowerCase();
}
- public static <T extends NamedElement> int getActiveNamedElementIndex(BlobRenderContext context,
+ public static <T extends NamedElement> int getActiveElementIndex(BlobRenderContext context,
Class<T> namedElementClass, List<T> elements, int defaultIndex) {
String selection = getSelection(context.getPosition());
String urlSegment = getUrlSegment(namedElementClass) + "s/";
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.css
index ba62961549..8d14d26390 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
@@ -1,6 +1,9 @@
.build-spec {
padding: 1.5rem;
}
+.build-spec.not-defined {
+ flex-grow: 0 !important;
+}
.build-spec.parseable>.body>.content {
min-width: 800px;
}
@@ -42,9 +45,6 @@
min-width: 220px;
padding-right: 1rem;
}
-.build-spec.parseable>.body>.jobs.content>.side {
- min-width: 360px;
-}
.build-spec.parseable>.body>.content>.side>.navs:not(:empty) {
margin-bottom: 1.5rem;
@@ -67,11 +67,10 @@
.build-spec.parseable>.body>.content>.main {
border-radius: 0.42rem;
border: 1px solid var(--light-gray);
- padding: 1.5rem;
}
-.build-spec.parseable>.body>.content>.main {
- padding: 0;
- min-width: 360px;
+.build-spec.parseable>.body>.jobs.content>.main {
+ width: 600px;
+ min-width: 600px;
}
.build-spec.parseable>.body>.content>.main>.head {
padding: 1.5rem;
@@ -91,3 +90,7 @@
transform: rotate(135deg);
margin-left: 0.5rem;
}
+
+.build-spec .active .drag-indicator {
+ color: var(--light-primary);
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
index eda2bde230..4ec4cc927b 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/buildspec/build-spec.js
@@ -2,33 +2,8 @@ onedev.server.buildSpec = {
onTabDomReady: function(tabClass) {
$(".build-spec>.head>a").removeClass("active").filter(tabClass).addClass("active");
},
- onNamedElementDomReady: function(elementIndex, nameChangeCallback) {
- var $elements = $(".build-spec>.body>.elements");
- var $navs = $elements.find(">.side>.navs");
+ markElementActive: function(elementIndex) {
+ var $navs = $(".build-spec>.body>.elements>.side>.navs");
$navs.children().removeClass("active").eq(elementIndex).addClass("active");
-
- if (nameChangeCallback) {
- var $main = $elements.children(".main");
-
- var $input = $main.find(">div>div>div>.property-name input");
-
- function syncName() {
- var name = $input.val().trim();
- var $name = $navs.find(".active").find("a.select>.label");
- if (name.length != 0)
- $name.text(name);
- else
- $name.html("<i>Name not specified</i>");
- $name.closest(".nav").data("name", name);
- }
-
- $input.on("input", syncName);
-
- $input.doneEvents("input", function() {
- nameChangeCallback($input.val());
- }, 250);
-
- syncName();
- }
- }
+ }
}
\ No newline at end of file