The Unified and Autonomous Development Platform
Use nav list to display ci job specs
robin shen49445de53f0c
diff --git a/core/src/main/java/io/onedev/server/ci/Dependency.java b/core/src/main/java/io/onedev/server/ci/Dependency.javaindex 060c2554c6..a2f185fc6a 100644--- a/core/src/main/java/io/onedev/server/ci/Dependency.java+++ b/core/src/main/java/io/onedev/server/ci/Dependency.java@@ -61,7 +61,7 @@ public class Dependency implements Serializable {DependencyEditPanel editor = OneContext.get().getComponent().findParent(DependencyEditPanel.class);List<String> choices = new ArrayList<>();Job belongingJob = editor.getBelongingJob();- for (Job job: editor.getCISpec().getJobs()) {+ for (Job job: editor.getEditingCISpec().getJobs()) {choices.add(job.getName());}choices.remove(belongingJob.getName());diff --git a/core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.javaindex cc529056b3..c3ce96073a 100644--- a/core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java@@ -13,7 +13,7 @@ import org.apache.wicket.markup.html.form.FormComponent;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;@SuppressWarnings("serial")-public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehavior{+public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehavior {private int timeout;@@ -36,7 +36,7 @@ public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehaString script = String.format(""+ "var $input = $('#%s');"+ "$input.doneEvents('input', function() {"- + " $input.trigger('donetyping');"+ + " $(this).trigger('donetyping');"+ "}, %s);",component.getMarkupId(true), timeout);response.render(OnDomReadyHeaderItem.forScript(script));diff --git a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.javaindex 23267af2b6..22adeeb1c3 100644--- a/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java+++ b/core/src/main/java/io/onedev/server/web/component/tabbable/Tabbable.java@@ -69,6 +69,10 @@ public class Tabbable extends Panel {Tab tab = item.getModelObject();if (tab.isSelected())item.add(AttributeModifier.append("class", "active"));+ if (item.getIndex() == 0)+ item.add(AttributeModifier.append("class", "first"));+ if (item.getIndex() == tabs.size()-1)+ item.add(AttributeModifier.append("class", "last"));item.add(tab.render("tab"));}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java b/core/src/main/java/io/onedev/server/web/editable/BeanContext.javaindex 7a8341e0db..8236d27c07 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanContext.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanContext.java@@ -31,6 +31,10 @@ public class BeanContext implements Serializable {this.descriptor = descriptor;}+ public BeanDescriptor getDescriptor() {+ return descriptor;+ }+public BeanViewer renderForView(String componentId, IModel<Serializable> model) {checkBeanEditable();return new BeanViewer(componentId, descriptor, model);diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.javaindex c169cd7798..bb5a018736 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanEditor.java@@ -200,7 +200,7 @@ public class BeanEditor extends ValueEditor<Serializable> {@Overridepublic Object getInputValue(String name) {/*- * Field will be be display name of the property when the bean class being edited is+ * Field will be display name of the property when the bean class being edited is* generated via groovy script*/String propertyName = beanDescriptor.getPropertyName(name);diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.javaindex c4664da235..98ece91e30 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/edit/BlobEditPanel.java@@ -160,7 +160,7 @@ public abstract class BlobEditPanel extends Panel {@Overrideprotected void onError() {super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ BlobEditPanel.this.onFormError(RequestCycle.get().find(AjaxRequestTarget.class), this);}});@@ -221,6 +221,10 @@ public abstract class BlobEditPanel extends Panel {@Nullableprotected abstract PlainEditSupport getPlainEditSupport();++ protected void onFormError(AjaxRequestTarget target, Form<?> form) {+ target.add(form);+ }@Overridepublic void renderHead(IHeaderResponse response) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.javaindex 6b2d48d77c..a582eeb5b4 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobEditPanel.java@@ -1,11 +1,13 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;import org.apache.wicket.ajax.attributes.IAjaxCallListener;import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;-import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.JavaScriptHeaderItem;+import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponentPanel;import io.onedev.server.ci.CISpec;@@ -17,6 +19,8 @@ import io.onedev.server.web.page.project.blob.render.edit.plain.PlainEditSupport@SuppressWarnings("serial")public class CISpecBlobEditPanel extends BlobEditPanel {+ private CISpecEditPanel editor;+private PlainEditPanel plainEditor;public CISpecBlobEditPanel(String id, BlobRenderContext context) {@@ -26,12 +30,12 @@ public class CISpecBlobEditPanel extends BlobEditPanel {@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new CISpecCssResourceReference()));+ response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));}@Overrideprotected FormComponentPanel<byte[]> newEditor(String componentId, byte[] initialContent) {- return new CISpecEditPanel(componentId, context, initialContent);+ return editor = new CISpecEditPanel(componentId, context, initialContent);}@Override@@ -106,4 +110,9 @@ public class CISpecBlobEditPanel extends BlobEditPanel {};}+ @Override+ protected void onFormError(AjaxRequestTarget target, Form<?> form) {+ editor.onFormError(target, form);+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.htmlindex 92efd069a6..616b950cff 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.html@@ -6,9 +6,7 @@<div class="head">Jobs</div>- <div class="body">- <div wicket:id="jobs" class="job"></div>- </div>+ <div wicket:id="body" class="body"></div></div></div></wicket:fragment>@@ -18,7 +16,8 @@<div wicket:id="errorMessage" class="error-message"></div></div></wicket:fragment>- <wicket:fragment wicket:id="emptyFrag">- <div class="empty">Build spec not defined</div>+ <wicket:fragment wicket:id="hasJobsFrag">+ <ul wicket:id="navs" class="navs list-unstyled"></ul>+ <div wicket:id="content" class="content"></div></wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.javaindex 097da0bd6e..5bde9a988e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java@@ -1,10 +1,16 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;+import java.util.ArrayList;+import java.util.List;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.markup.repeater.RepeatingView;+import org.apache.wicket.model.Model;import com.google.common.base.Throwables;@@ -13,6 +19,9 @@ import io.onedev.server.ci.Job;import io.onedev.server.git.Blob;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.web.component.MultilineLabel;+import io.onedev.server.web.component.tabbable.AjaxActionTab;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;@@ -33,27 +42,47 @@ public class CISpecBlobViewPanel extends BlobViewPanel {if (StringUtils.isNotBlank(ciSpecString)) {try {CISpec ciSpec = (CISpec) VersionedDocument.fromXML(ciSpecString).toBean();- Fragment fragment = new Fragment("content", "validFrag", this);- RepeatingView jobsView = new RepeatingView("jobs");- for (Job job: ciSpec.getJobs()) {- jobsView.add(BeanContext.viewBean(jobsView.newChildId(), job));+ Fragment validFrag = new Fragment("content", "validFrag", this);+ if (!ciSpec.getJobs().isEmpty()) {+ Fragment hasJobsFrag = new Fragment("body", "hasJobsFrag", this);+ List<Tab> tabs = new ArrayList<>();++ for (Job job: ciSpec.getJobs()) {+ tabs.add(new AjaxActionTab(Model.of(job.getName()) ) {++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component content = BeanContext.viewBean("content", job);+ hasJobsFrag.replace(content.setOutputMarkupId(true));+ target.add(content);+ }++ });+ }++ hasJobsFrag.add(new Tabbable("navs", tabs));++ Component content = BeanContext.viewBean("content", ciSpec.getJobs().iterator().next());+ hasJobsFrag.add(content.setOutputMarkupId(true));+ validFrag.add(hasJobsFrag);+ } else {+ validFrag.add(new Label("body", "No jobs defined"));}- fragment.add(jobsView);- add(fragment);+ add(validFrag);} catch (Exception e) {- Fragment fragment = new Fragment("content", "invalidFrag", this);- fragment.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));- add(fragment);+ Fragment invalidFrag = new Fragment("content", "invalidFrag", this);+ invalidFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString(e)));+ add(invalidFrag);}} else {- add(new Fragment("content", "emptyFrag", this));+ add(new Label("content", "Build spec not defined"));}}@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);- response.render(CssHeaderItem.forReference(new CISpecCssResourceReference()));+ response.render(CssHeaderItem.forReference(new CISpecResourceReference()));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecCssResourceReference.javadeleted file mode 100644index 63ed665295..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecCssResourceReference.java+++ /dev/null@@ -1,13 +0,0 @@-package io.onedev.server.web.page.project.blob.render.renderers.cispec;--import io.onedev.server.web.page.base.BaseDependentCssResourceReference;--public class CISpecCssResourceReference extends BaseDependentCssResourceReference {-- private static final long serialVersionUID = 1L;-- public CISpecCssResourceReference() {- super(CISpecCssResourceReference.class, "ci-spec.css");- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.htmlindex 18133dba13..68c54bb7ea 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html@@ -7,11 +7,23 @@Jobs</div><div class="body">- <div wicket:id="jobs" class="job">- <div wicket:id="editor"></div>- <a wicket:id="delete" class="delete btn btn-danger"><i class="fa fa-trash"></i> Delete</a>+ <div class="side">+ <div class="navs">+ <div wicket:id="navs" class="nav">+ <a wicket:id="select" class="select">+ <span class="drag-indicator"><i class="fa fa-reorder"></i></span>+ <span wicket:id="label" class="name"></span>+ </a>+ <a wicket:id="delete" title="Delete job" class="delete"><i class="fa fa-trash"></i></a>+ </div>+ </div>+ <a wicket:id="add" class="add btn btn-success btn-block">+ <i class="fa fa-plus"></i> Add New+ </a>+ </div>+ <div class="contents">+ <div wicket:id="contents" class="content"></div></div>- <a wicket:id="addJob" class="add btn btn-block btn-success"><i class="fa fa-plus"></i> Add Job</a></div></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.javaindex d7963b3f99..5ae4859a53 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java@@ -1,7 +1,5 @@package io.onedev.server.web.page.project.blob.render.renderers.cispec;-import static de.agilecoders.wicket.jquery.JQuery.$;-import java.io.Serializable;import java.nio.charset.Charset;@@ -10,7 +8,12 @@ import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.Behavior;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;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.panel.Fragment;import org.apache.wicket.markup.repeater.RepeatingView;@@ -24,18 +27,23 @@ import io.onedev.server.ci.CISpec;import io.onedev.server.ci.Job;import io.onedev.server.migration.VersionedDocument;import io.onedev.server.util.ContentDetector;+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.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;+import io.onedev.server.web.util.WicketUtils;@SuppressWarnings("serial")public class CISpecEditPanel extends FormComponentPanel<byte[]> {- private RepeatingView jobsView;-private Serializable parseResult;+ private RepeatingView jobNavs;++ private RepeatingView jobContents;+public CISpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) {super(id, Model.of(initialContent));@@ -53,61 +61,140 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {}}- private WebMarkupContainer newJobContainer(String componentId, Job job) {- WebMarkupContainer container = new WebMarkupContainer(jobsView.newChildId());- container.add(BeanContext.editBean("editor", job));- container.add(new AjaxLink<Void>("delete") {+ private Component newJobNav(Job job) {+ WebMarkupContainer nav = new WebMarkupContainer(jobNavs.newChildId());++ AjaxLink<Void> selectLink = new AjaxLink<Void>("select") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ int index = WicketUtils.getChildIndex(jobNavs, nav);+ target.appendJavaScript(String.format("onedev.ciSpec.edit.showJob(%d);", index));+ }++ };+ if (StringUtils.isNotBlank(job.getName()))+ selectLink.add(new Label("label", job.getName()));+ else+ selectLink.add(new Label("label", "<i>Adding new</i>").setEscapeModelStrings(false));+ nav.add(selectLink);++ nav.add(new AjaxLink<Void>("delete") {+ @SuppressWarnings("deprecation")@Overridepublic void onClick(AjaxRequestTarget target) {- target.appendJavaScript($(container).chain("remove").get());- jobsView.remove(container);+ int index = WicketUtils.getChildIndex(jobNavs, nav);+ jobNavs.remove(nav);+ jobContents.remove(jobContents.get(index));+ target.appendJavaScript(String.format("onedev.ciSpec.edit.deleteJob(%d);", index));+ }++ });+ jobNavs.add(nav.setOutputMarkupId(true));+ return nav;+ }++ private Component newJobContent(Job job) {+ BeanEditor content = BeanContext.editBean(jobContents.newChildId(), job);+ content.add(new Behavior() {++ @Override+ public void renderHead(Component component, IHeaderResponse response) {+ super.renderHead(component, response);+ int index = WicketUtils.getChildIndex(jobContents, content);+ String script = String.format("onedev.ciSpec.edit.trackJobNameChange(%d);", index);+ response.render(OnDomReadyHeaderItem.forScript(script));}});- container.setOutputMarkupId(true);- return container;+ jobContents.add(content.setOutputMarkupId(true));+ return content;}@Overrideprotected void onInitialize() {super.onInitialize();- Fragment fragment;+ Fragment validFrag;if (parseResult instanceof CISpec) {- fragment = new Fragment("content", "validFrag", this);CISpec ciSpec = (CISpec) parseResult;- jobsView = new RepeatingView("jobs");- fragment.add(jobsView);++ validFrag = new Fragment("content", "validFrag", this) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ if (!ciSpec.getJobs().isEmpty())+ response.render(OnDomReadyHeaderItem.forScript("onedev.ciSpec.edit.showJob(0);"));+ }++ };+ jobNavs = new RepeatingView("navs");+ jobContents = new RepeatingView("contents");for (Job job: ciSpec.getJobs()) {- jobsView.add(newJobContainer(jobsView.newChildId(), job));+ newJobNav(job);+ newJobContent(job);}- fragment.add(new AjaxLink<Void>("addJob") {+ validFrag.add(jobNavs);+ validFrag.add(jobContents);++ validFrag.add(new AjaxLink<Void>("add") {@Overridepublic void onClick(AjaxRequestTarget target) {Job job = new Job();- WebMarkupContainer jobContainer = newJobContainer(jobsView.newChildId(), job);- jobsView.add(jobContainer);- String script = String.format("$(\"#%s\").before(\"<div id='%s'></div>\");",- getMarkupId(), jobContainer.getMarkupId());++ Component nav = newJobNav(job);+ String script = String.format("$(\"#%s\").prev().append(\"<div id='%s'></div>\");",+ getMarkupId(), nav.getMarkupId());+ target.prependJavaScript(script);+ target.add(nav);++ Component content = newJobContent(job);+ script = String.format("$(\"#%s\").parent().next().append(\"<div id='%s'></div>\");",+ getMarkupId(), content.getMarkupId());target.prependJavaScript(script);- target.add(jobContainer);+ target.add(content);++ target.appendJavaScript(String.format("onedev.ciSpec.edit.showJob(%d);", jobNavs.size()-1));}- }.setOutputMarkupId(true));+ });+ validFrag.add(new SortBehavior() {++ @SuppressWarnings("deprecation")+ @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++) {+ jobNavs.swap(fromIndex+i, fromIndex+i+1);+ jobContents.swap(fromIndex+i, fromIndex+i+1);+ }+ } else {+ for (int i=0; i<fromIndex-toIndex; i++) {+ jobNavs.swap(fromIndex-i, fromIndex-i-1);+ jobContents.swap(fromIndex-i, fromIndex-i-1);+ }+ }+ target.appendJavaScript(String.format("onedev.ciSpec.edit.swapJobs(%d, %d)", fromIndex, toIndex));+ }++ }.sortable(".jobs>.body>.side>.navs"));} else {- fragment = new Fragment("content", "invalidFrag", this);- fragment.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString((Throwable) parseResult)));+ validFrag = new Fragment("content", "invalidFrag", this);+ validFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString((Throwable) parseResult)));}- add(fragment);+ add(validFrag);}@Overridepublic void convertInput() {- CISpec editingCISpec = getCISpec();+ CISpec editingCISpec = getEditingCISpec();if (editingCISpec != null) {setConvertedInput(VersionedDocument.fromBean(editingCISpec).toXML().getBytes(Charsets.UTF_8));} else {@@ -116,12 +203,12 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {}@Nullable- public CISpec getCISpec() {+ public CISpec getEditingCISpec() {if (parseResult instanceof CISpec) {CISpec ciSpec = new CISpec();- for (Component child: jobsView) {- BeanEditor jobEditor = (BeanEditor) child.get("editor");- ciSpec.getJobs().add((Job) jobEditor.getConvertedInput());+ for (Component child: jobContents) {+ BeanEditor jobContent = (BeanEditor) child;+ ciSpec.getJobs().add((Job) jobContent.getConvertedInput());}return ciSpec;} else {@@ -129,4 +216,16 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> {}}+ public void onFormError(AjaxRequestTarget target, Form<?> form) {+ for (Component child: jobContents) {+ BeanEditor editor = (BeanEditor) child;+ if (editor.hasErrors(true)) {+ target.add(editor);+ target.appendJavaScript(String.format("onedev.ciSpec.edit.showJob(%d);",+ WicketUtils.getChildIndex(jobContents, child)));+ break;+ }+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.javanew file mode 100644index 0000000000..5cf3f7b42c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecResourceReference.java@@ -0,0 +1,27 @@+package io.onedev.server.web.page.project.blob.render.renderers.cispec;++import java.util.List;++import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.HeaderItem;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;+import io.onedev.server.web.page.base.BaseDependentResourceReference;++public class CISpecResourceReference extends BaseDependentResourceReference {++ private static final long serialVersionUID = 1L;++ public CISpecResourceReference() {+ super(CISpecResourceReference.class, "ci-spec.js");+ }++ @Override+ public List<HeaderItem> getDependencies() {+ List<HeaderItem> dependencies = super.getDependencies();+ dependencies.add(CssHeaderItem.forReference(new BaseDependentCssResourceReference(+ CISpecResourceReference.class, "ci-spec.css")));+ return dependencies;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.cssindex bc8c8bd26a..cdad042b41 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css@@ -12,10 +12,6 @@font-size: 13px;font-family: Consolas, "Liberation Mono", Menlo, Courier, monospace;}-.ci-spec>.empty {- font-size: 20px;-}-.ci-spec>.valid>div {border-radius: 4px;}@@ -24,12 +20,84 @@font-size: 18px;margin-bottom: 20px;}-.ci-spec>.valid>div>.body>div {- margin-bottom: 20px;+.ci-spec>.valid>div>.body {+ position: relative;+}++.ci-spec>.valid>div>.body>:first-child {+ position: absolute;+ left: 0;+ top: 0;+ width: 220px;+}+.ci-spec>.valid>div>.body>:last-child {+ margin-left: 240px;+}++.ci-spec-view>.valid>div>.body>.navs li,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav {+ position: relative;+ background: #444;+}+.ci-spec-view>.valid>div>.body>.navs li a,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav a {+ color: #BBB;+}+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav .drag-indicator {+ color: inherit;+ margin-right: 4px;+}+.ci-spec-view>.valid>div>.body>.navs>li:hover a,+.ci-spec-view>.valid>div>.body>.navs>li.active a,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:hover a,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav.active a {+ color: white;+ font-weight: bold;+}+.ci-spec-view>.valid>div>.body>.navs>li.active,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav.active {+ background: #080808;+}+.ci-spec-view>.valid>div>.body>.navs>li.first,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:first-child {+ border-radius: 4px 4px 0 0;+}+.ci-spec-view>.valid>div>.body>.navs>li.last,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:last-child {+ border-radius: 0 0 4px 4px;+}+.ci-spec-view>.valid>div>.body>.navs>li.first.last,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav:first-child:last-child {+ border-radius: 4px;+}++.ci-spec-edit>.valid>div>.body>.side>.add {+ margin-top: 20px;+}+.ci-spec-view>.valid>div>.body>.navs>li>a,+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav>.select {+ padding: 8px 28px 8px 8px;+ text-decoration: none;+ display: block;+ overflow: hidden;+ text-overflow: ellipsis;+ white-space: nowrap;+}+.ci-spec-edit>.valid>div>.body>.side>.navs>.nav>.delete {+ right: 0;+ top: 0;+ position: absolute;+ border-left: 1px solid #EEE;+ padding: 8px 8px;+ display: block;+}+.ci-spec-view>.valid>div>.body>.content,+.ci-spec-edit>.valid>div>.body>.contents>.content {border-radius: 4px;- border: 2px solid #BBB;+ border: 2px solid #333;padding: 20px;}+.ci-spec>.valid .bean-properties>table>tbody>tr>td.name {width: 200px;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.jsnew file mode 100644index 0000000000..d927fad847--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js@@ -0,0 +1,57 @@+onedev.ciSpec = {+ edit: {+ showJob: function(index) {+ var $body = $(".ci-spec-edit .jobs>.body");+ var $navs = $body.find(">.side>.navs");+ $navs.children().removeClass("active");+ $navs.children().eq(index).addClass("active");+ var $contents = $body.children(".contents");+ $contents.children().hide();+ $contents.children().eq(index).show();+ },+ deleteJob: function(index) {+ var $body = $(".ci-spec-edit .jobs>.body");+ var $navs = $body.find(">.side>.navs");+ var $contents = $body.children(".contents");+ var $nav = $navs.children().eq(index);+ $nav.remove();+ $contents.children().eq(index).remove();++ if ($nav.hasClass("active")) {+ var $nextNav = $navs.children().eq(index);+ if ($nextNav.hasClass("nav")) {+ $nextNav.addClass("active");+ $contents.children().eq(index).show();+ }+ }+ },+ swapJobs: function(index1, index2) {+ var $contents = $(".ci-spec-edit .jobs>.body>.contents");++ if (index1 < index2) {+ for (var i = 0; i < index2-index1; i++)+ $contents.children().eq(index1+i).before($contents.children().eq(index1+i+1));+ } else {+ for (var i = 0; i < index1-index2; i++)+ $contents.children().eq(index1-i).after($contents.children().eq(index1-i-1));+ }+ },+ trackJobNameChange: function(index) {+ var $body = $(".ci-spec-edit .jobs>.body");+ var $navs = $body.find(">.side>.navs");+ var $nav = $navs.children().eq(index);+ var $contents = $body.children(".contents");+ var $content = $contents.children().eq(index);++ var $input = $content.find(">div>table>tbody>tr>td.property-name input");+ $input.on("input", function() {+ var name = $input.val().trim();+ var $name = $nav.find("a.select>.name");+ if (name.length != 0)+ $name.text(name);+ else+ $name.html("<i>Adding new</i>");+ });+ }+ }+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.javaindex f9c0ad1d92..edb1b5b68d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java@@ -131,7 +131,7 @@ public abstract class DependencyEditPanel extends Panel {protected abstract void onCancel(AjaxRequestTarget target);- public abstract CISpec getCISpec();+ public abstract CISpec getEditingCISpec();public abstract Job getBelongingJob();diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.javaindex 61f828dff6..3f582aaac7 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java@@ -76,8 +76,8 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>}@Override- public CISpec getCISpec() {- return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getCISpec();+ public CISpec getEditingCISpec() {+ return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getEditingCISpec();}@Override@@ -115,8 +115,8 @@ public class DependencyListEditPanel extends PropertyEditor<List<Serializable>>}@Override- public CISpec getCISpec() {- return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getCISpec();+ public CISpec getEditingCISpec() {+ return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getEditingCISpec();}@Overridediff --git a/core/src/main/java/io/onedev/server/web/util/WicketUtils.java b/core/src/main/java/io/onedev/server/web/util/WicketUtils.javaindex e78b5584f5..01317676d8 100644--- a/core/src/main/java/io/onedev/server/web/util/WicketUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/WicketUtils.java@@ -112,7 +112,17 @@ public class WicketUtils {if (lastVisible != null)lastVisible.add(new LastVisibleAppender("class", "last-visible").setSeparator(" "));}-++ public static int getChildIndex(WebMarkupContainer parent, Component child) {+ int index = 0;+ for (Component each: parent) {+ if (each == child)+ return index;+ index++;+ }+ return -1;+ }+public static class LastVisibleAppender extends AttributeAppender {private static final long serialVersionUID = 1L;