Skip to content

The Unified and Autonomous Development Platform

feat: Able to copy build spec jobs and steps (#1743)

Robin Shendbc79c3359c3
diff --git a/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java b/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java
index 827960be8d..f83a1f5dfa 100644
--- a/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java
+++ b/server-core/src/main/java/io/onedev/server/buildspec/NamedElement.java
@@ -9,4 +9,6 @@ public interface NamedElement extends Serializable {
String getName();
+ void setName(String name);
+
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/add-above.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/add-above.svg
deleted file mode 100644
index cb09f76d40..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/add-above.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1707701960862" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4246" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M291.446154 315.076923a31.507692 31.507692 0 0 0 31.507692 31.507692h378.092308a31.507692 31.507692 0 1 0 0-63.015384H322.953846a31.507692 31.507692 0 0 0-31.507692 31.507692z" p-id="4247"></path><path d="M512 94.523077a31.507692 31.507692 0 0 0-31.507692 31.507692v378.092308a31.507692 31.507692 0 1 0 63.015384 0V126.030769a31.507692 31.507692 0 0 0-31.507692-31.507692zM118.153846 834.953846a94.523077 94.523077 0 0 0 94.523077 94.523077h598.646154a94.523077 94.523077 0 0 0 94.523077-94.523077v-126.030769a94.523077 94.523077 0 0 0-94.523077-94.523077H212.676923a94.523077 94.523077 0 0 0-94.523077 94.523077v126.030769z m94.523077 31.507692a31.507692 31.507692 0 0 1-31.507692-31.507692v-126.030769a31.507692 31.507692 0 0 1 31.507692-31.507692h598.646154a31.507692 31.507692 0 0 1 31.507692 31.507692v126.030769a31.507692 31.507692 0 0 1-31.507692 31.507692H212.676923z" p-id="4248"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/add-below.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/add-below.svg
deleted file mode 100644
index abc8611824..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/add-below.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1707701972917" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5225" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M291.446154 708.923077a31.507692 31.507692 0 0 1 31.507692-31.507692h378.092308a31.507692 31.507692 0 1 1 0 63.015384H322.953846a31.507692 31.507692 0 0 1-31.507692-31.507692z" p-id="5226"></path><path d="M512 929.476923a31.507692 31.507692 0 0 1-31.507692-31.507692V519.876923a31.507692 31.507692 0 1 1 63.015384 0v378.092308a31.507692 31.507692 0 0 1-31.507692 31.507692zM118.153846 189.046154a94.523077 94.523077 0 0 1 94.523077-94.523077h598.646154a94.523077 94.523077 0 0 1 94.523077 94.523077v126.030769a94.523077 94.523077 0 0 1-94.523077 94.523077H212.676923a94.523077 94.523077 0 0 1-94.523077-94.523077v-126.030769z m94.523077-31.507692a31.507692 31.507692 0 0 0-31.507692 31.507692v126.030769a31.507692 31.507692 0 0 0 31.507692 31.507692h598.646154a31.507692 31.507692 0 0 0 31.507692-31.507692v-126.030769a31.507692 31.507692 0 0 0-31.507692-31.507692H212.676923z" p-id="5227"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html
index 3f6a34adfb..0665719dab 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.html
@@ -6,9 +6,7 @@
</div>
</div>
<wicket:fragment wicket:id="actionColumnFrag">
- <a wicket:id="addAbove" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Add new step above this"><wicket:svg href="add-above" class="icon"></wicket:svg></a>
- <a wicket:id="addBelow" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Add new step below this"><wicket:svg href="add-below" class="icon"></wicket:svg></a>
- <a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
- <a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="more" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
+ <a wicket:id="actions" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="Add new step above this"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>
</wicket:fragment>
</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
index 1a2cd41e94..3b93a5fcfe 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListEditPanel.java
@@ -12,11 +12,14 @@ import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.floating.FloatingPanel;
import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.typeselect.TypeSelectPanel;
import io.onedev.server.web.editable.PropertyDescriptor;
import io.onedev.server.web.editable.PropertyEditor;
import io.onedev.server.web.editable.PropertyUpdating;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
@@ -27,6 +30,7 @@ import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
import org.apache.wicket.markup.ComponentTag;
import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.Item;
@@ -58,66 +62,17 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
}
}
- private DropdownLink newAddStepLink(String componentId, @Nullable Component alignTarget, int index) {
- return new DropdownLink(componentId, alignTarget, bottom(0), true, true) {
-
- @Override
- protected Component newContent(String id, FloatingPanel dropdown) {
- return new TypeSelectPanel<Step>(id) {
-
- @Override
- protected void onSelect(AjaxRequestTarget target, Class<? extends Step> type) {
- dropdown.close();
-
- Step step;
- try {
- step = type.getDeclaredConstructor().newInstance();
- } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
- | InvocationTargetException | NoSuchMethodException | SecurityException e) {
- throw new RuntimeException(e);
- }
-
- new StepEditModalPanel(target, step) {
-
- @Override
- protected void onSave(AjaxRequestTarget target, Step step) {
- steps.add(index, step);
- markFormDirty(target);
- close();
- onPropertyUpdating(target);
- target.add(StepListEditPanel.this);
- }
-
- @Override
- public BuildSpec getBuildSpec() {
- return StepListEditPanel.this.getBuildSpec();
- }
-
- @Override
- public List<ParamSpec> getParamSpecs() {
- return StepListEditPanel.this.getParamSpecs();
- }
-
- };
- }
-
- };
- }
-
- };
- }
-
@Override
protected void onBeforeRender() {
super.onBeforeRender();
- replace(newAddStepLink("addNew", null, steps.size()));
+ replace(new AddStepLink("addNew", null, steps.size()));
}
@Override
protected void onInitialize() {
super.onInitialize();
- add(newAddStepLink("addNew", null, steps.size()));
+ add(new AddStepLink("addNew", null, steps.size()));
List<IColumn<Step, Void>> columns = new ArrayList<>();
@@ -163,16 +118,14 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
});
columns.add(new AbstractColumn<>(Model.of("")) {
-
+
@Override
public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
Fragment fragment = new Fragment(componentId, "actionColumnFrag", StepListEditPanel.this);
Item<?> row = cellItem.findParent(Item.class);
var index = row.getIndex();
row.setOutputMarkupId(true);
- fragment.add(newAddStepLink("addAbove", row, index));
- fragment.add(newAddStepLink("addBelow", row, index + 1));
- fragment.add(new AjaxLink<Void>("edit") {
+ fragment.add(new AjaxLink<Void>("more") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -202,22 +155,118 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
}
});
- fragment.add(new AjaxLink<Void>("delete") {
+ fragment.add(new MenuLink("actions") {
@Override
- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
- super.updateAjaxAttributes(attributes);
- attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this step?"));
- }
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ var menuItems = new ArrayList<MenuItem>();
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return "Add before";
+ }
- @Override
- public void onClick(AjaxRequestTarget target) {
- markFormDirty(target);
- steps.remove(rowModel.getObject());
- onPropertyUpdating(target);
- target.add(StepListEditPanel.this);
- }
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AddStepLink(id, row, index) {
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+ };
+ }
+ });
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return "Add after";
+ }
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AddStepLink(id, row, index+1) {
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ super.onClick(target);
+ dropdown.close();
+ }
+ };
+ }
+ });
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return "Copy";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ Step step = SerializationUtils.clone(steps.get(index));
+ new StepEditModalPanel(target, step) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Step step) {
+ steps.add(step);
+ markFormDirty(target);
+ close();
+ onPropertyUpdating(target);
+ target.add(StepListEditPanel.this);
+ }
+
+ @Override
+ public BuildSpec getBuildSpec() {
+ return StepListEditPanel.this.getBuildSpec();
+ }
+
+ @Override
+ public List<ParamSpec> getParamSpecs() {
+ return StepListEditPanel.this.getParamSpecs();
+ }
+
+ };
+ }
+
+ };
+ }
+ });
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return "Delete";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmClickListener("Do you really want to delete this step?"));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+ markFormDirty(target);
+ steps.remove(rowModel.getObject());
+ onPropertyUpdating(target);
+ target.add(StepListEditPanel.this);
+ }
+
+ };
+ }
+
+ });
+ return menuItems;
+ }
+
});
cellItem.add(fragment);
}
@@ -301,4 +350,58 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
return true;
}
+ private class AddStepLink extends DropdownLink {
+
+ private final int index;
+
+ AddStepLink(String componentId, @Nullable Component alignTarget, int index) {
+ super(componentId, alignTarget, bottom(0), true, true);
+ this.index = index;
+ }
+
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new TypeSelectPanel<Step>(id) {
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Class<? extends Step> type) {
+ dropdown.close();
+
+ Step step;
+ try {
+ step = type.getDeclaredConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+
+ new StepEditModalPanel(target, step) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target, Step step) {
+ steps.add(index, step);
+ markFormDirty(target);
+ close();
+ onPropertyUpdating(target);
+ target.add(StepListEditPanel.this);
+ }
+
+ @Override
+ public BuildSpec getBuildSpec() {
+ return StepListEditPanel.this.getBuildSpec();
+ }
+
+ @Override
+ public List<ParamSpec> getParamSpecs() {
+ return StepListEditPanel.this.getParamSpecs();
+ }
+
+ };
+ }
+
+ };
+ }
+
+ }
+
}
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 76bc217c0e..b45ea78d25 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
@@ -30,7 +30,7 @@
<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-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="actions" title="Actions" class="actions btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>
</div></div>
<div class="add btn-group btn-block">
<a wicket:id="create" class="create btn btn-primary justify-content-start no-suggestions">
@@ -48,7 +48,7 @@
<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-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="trash" class="icon"></wicket:svg></a>
+ <a wicket:id="actions" title="Actions" class="actions btn btn-outline-secondary btn-icon flex-grow-0 flex-shrink-0"><wicket:svg href="arrow" class="icon rotate-90"></wicket:svg></a>
</wicket:fragment>
<wicket:fragment wicket:id="addJobFrag">
<a wicket:id="create" class="create btn btn-primary justify-content-start text-nowrap">
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 5eb347ace0..8b89e1f0a6 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
@@ -31,6 +31,7 @@ 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;
+import org.apache.commons.lang3.SerializationUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -240,31 +241,82 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
});
- jobNav.add(new AjaxLink<Void>("delete") {
+ var form = findParent(Form.class);
+ jobNav.add(new MenuLink("actions") {
@Override
- public void onClick(AjaxRequestTarget target) {
- getJobs().remove(jobIndex);
-
- Component jobDetail = jobsEditor.get("detail");
-
- int activeJobIndex = (int) jobDetail.getDefaultModelObject();
- if (jobIndex == activeJobIndex) {
- if (getJobs().isEmpty()) {
- replaceState(target, "jobs");
- setupJobDetail(target, -1);
- } else {
- replaceState(target, "jobs/" + getJobs().get(0).getName());
- setupJobDetail(target, 0);
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ var menuItems = new ArrayList<MenuItem>();
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return "Copy";
}
- } 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);
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxSubmitLink(id, form) {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ dropdown.close();
+ var newJob = SerializationUtils.clone(getJobs().get(jobIndex));
+ newJob.setName(null);
+ addJob(target, newJob);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(jobsEditor);
+ resizeWindow(target);
+ }
+
+ };
+ }
+
+ });
+ menuItems.add(new MenuItem() {
+ @Override
+ public String getLabel() {
+ return "Delete";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ getJobs().remove(jobIndex);
+ Component jobDetail = jobsEditor.get("detail");
+
+ int activeJobIndex = (int) jobDetail.getDefaultModelObject();
+ if (jobIndex == activeJobIndex) {
+ if (getJobs().isEmpty()) {
+ replaceState(target, "jobs");
+ setupJobDetail(target, -1);
+ } else {
+ replaceState(target, "jobs/" + getJobs().get(0).getName());
+ setupJobDetail(target, 0);
+ }
+ } 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);
+ }
+
+ };
+ }
+
+ });
+ return menuItems;
}
-
});
jobNav.add(AttributeAppender.append("class", "nav btn-group flex-nowrap"));
@@ -918,6 +970,15 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
}
}
+ private void addElement(AjaxRequestTarget target, T element) {
+ getElements().add(element);
+ pushState(target, "new-" + getUrlSegment(elementClass));
+ int elementIndex = getElements().size()-1;
+ setupElementDetail(target, elementIndex);
+ target.add(ElementsEditor.this);
+ resizeWindow(target);
+ }
+
@Override
protected void onInitialize() {
super.onInitialize();
@@ -984,29 +1045,82 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
});
- item.add(new AjaxLink<Void>("delete") {
+ var form = findParent(Form.class);
+ item.add(new MenuLink("actions") {
@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);
+ protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {
+ var menuItems = new ArrayList<MenuItem>();
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Copy";
}
- } 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);
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxSubmitLink(id, form) {
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ dropdown.close();
+ var newElement = SerializationUtils.clone(getElements().get(item.getIndex()));
+ newElement.setName(null);
+ addElement(target, newElement);
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target, Form<?> form) {
+ super.onError(target, form);
+ target.add(ElementsEditor.this);
+ resizeWindow(target);
+ }
+
+ };
+ }
+
+ });
+ menuItems.add(new MenuItem() {
+
+ @Override
+ public String getLabel() {
+ return "Delete";
+ }
+
+ @Override
+ public WebMarkupContainer newLink(String id) {
+ return new AjaxLink<Void>(id) {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ dropdown.close();
+
+ 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);
+ }
+
+ };
+ }
+
+ });
+ return menuItems;
}
});
@@ -1063,13 +1177,7 @@ public class BuildSpecEditPanel extends FormComponentPanel<byte[]> implements Bu
| InvocationTargetException | NoSuchMethodException | SecurityException e) {
throw new RuntimeException(e);
}
-
- getElements().add(newElement);
- pushState(target, "new-" + getUrlSegment(elementClass));
- int elementIndex = getElements().size()-1;
- setupElementDetail(target, elementIndex);
- target.add(ElementsEditor.this);
- resizeWindow(target);
+ addElement(target, newElement);
}
@Override