The Unified and Autonomous Development Platform
feat: Able to add job step before/after current step (#1741)
Robin Shend9148305916c
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.svgnew file mode 100644index 0000000000..cb09f76d40--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/add-above.svg@@ -0,0 +1 @@+<?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 filediff --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.svgnew file mode 100644index 0000000000..abc8611824--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/add-below.svg@@ -0,0 +1 @@+<?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 filediff --git a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.javaindex 7ce745a0a2..41090fa780 100644--- a/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java+++ b/server-core/src/main/java/io/onedev/server/web/component/job/jobinfo/JobInfoButton.java@@ -43,7 +43,7 @@ public abstract class JobInfoButton extends Panel {protected void onInitialize() {super.onInitialize();- DropdownLink detailLink = new DropdownLink("detail", false, AlignPlacement.bottom(0), true, false) {+ DropdownLink detailLink = new DropdownLink("detail", AlignPlacement.bottom(0), true, false) {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {diff --git a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.javaindex a9be9f2e04..4bae8368eb 100644--- a/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/link/DropdownLink.java@@ -1,5 +1,9 @@package io.onedev.server.web.component.link;+import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.Alignment;+import io.onedev.server.web.component.floating.ComponentTarget;+import io.onedev.server.web.component.floating.FloatingPanel;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;@@ -10,19 +14,14 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.head.OnDomReadyHeaderItem;import org.apache.wicket.request.cycle.RequestCycle;-import io.onedev.server.web.component.floating.AlignPlacement;-import io.onedev.server.web.component.floating.AlignTarget;-import io.onedev.server.web.component.floating.Alignment;-import io.onedev.server.web.component.floating.ComponentTarget;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.floating.RectTarget;+import javax.annotation.Nullable;@SuppressWarnings("serial")public abstract class DropdownLink extends AjaxLink<Void> {- private final boolean alignTargetMouse;+ private final Component alignTarget;- private final AlignPlacement placement;+ private final AlignPlacement alignPlacement;private final boolean noNarrowThanTarget;@@ -34,20 +33,19 @@ public abstract class DropdownLink extends AjaxLink<Void> {this(id, AlignPlacement.bottom(0));}- public DropdownLink(String id, AlignPlacement placement) {- this(id, false, placement, false, false);+ public DropdownLink(String id, AlignPlacement alignPlacement) {+ this(id, alignPlacement, false, false);}- public DropdownLink(String id, boolean alignTargetMouse) {- this(id, alignTargetMouse, AlignPlacement.bottom(0), false, false);+ public DropdownLink(String id, AlignPlacement alignPlacement, boolean noNarrowThanTarget, boolean neverShrink) {+ this(id, null, alignPlacement, noNarrowThanTarget, neverShrink);}- public DropdownLink(String id, boolean alignTargetMouse, AlignPlacement placement,- boolean noNarrowThanTarget, boolean neverShrink) {+ public DropdownLink(String id, @Nullable Component alignTarget, AlignPlacement alignPlacement,+ boolean noNarrowThanTarget, boolean neverShrink) {super(id);-- this.alignTargetMouse = alignTargetMouse;- this.placement = placement;+ this.alignTarget = alignTarget;+ this.alignPlacement = alignPlacement;this.noNarrowThanTarget = noNarrowThanTarget;this.neverShrink = neverShrink;}@@ -81,18 +79,8 @@ public abstract class DropdownLink extends AjaxLink<Void> {// if dropdown has not been created, or has been removed from page// when the same page instance is refreshedif (dropdown == null || dropdown.getParent() == null) {- AlignTarget alignFloatingWith;- if (alignTargetMouse) {- int mouseX = RequestCycle.get().getRequest().getPostParameters()- .getParameterValue("mouseX").toInt();- int mouseY = RequestCycle.get().getRequest().getPostParameters()- .getParameterValue("mouseY").toInt();- alignFloatingWith = RectTarget.ofMouse(mouseX, mouseY);- } else {- alignFloatingWith = new ComponentTarget(this);- }-- dropdown = new FloatingPanel(target, new Alignment(alignFloatingWith, placement), noNarrowThanTarget, neverShrink, null) {+ var alignment = new Alignment(new ComponentTarget(alignTarget!=null? alignTarget: this), alignPlacement);+ dropdown = new FloatingPanel(target, alignment, noNarrowThanTarget, neverShrink, null) {@Overrideprotected void onInitialize() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.javaindex 32ecc86b1c..ce3e82b7ea 100644--- a/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/menu/MenuLink.java@@ -1,17 +1,15 @@package io.onedev.server.web.component.menu;-import java.util.List;--import javax.annotation.Nullable;-+import io.onedev.server.web.component.floating.AlignPlacement;+import io.onedev.server.web.component.floating.FloatingPanel;+import io.onedev.server.web.component.link.DropdownLink;import org.apache.wicket.Component;import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import io.onedev.server.web.component.floating.AlignPlacement;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.DropdownLink;+import javax.annotation.Nullable;+import java.util.List;@SuppressWarnings("serial")public abstract class MenuLink extends DropdownLink {@@ -24,14 +22,6 @@ public abstract class MenuLink extends DropdownLink {super(id, placement);}- public MenuLink(String id, boolean alignTargetMouse) {- super(id, alignTargetMouse);- }-- public MenuLink(String id, boolean alignTargetMouse, AlignPlacement placement, boolean noNarrowThanTarget) {- super(id, alignTargetMouse, placement, noNarrowThanTarget, false);- }-@Overrideprotected void onInitialize(FloatingPanel dropdown) {super.onInitialize(dropdown);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.htmlindex 1add1ef9d3..3f6a34adfb 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@@ -1,12 +1,14 @@-<wicket:panel>- <div class="step-list">- <table wicket:id="steps" class="table-hover"></table>- <div class="foot">- <a wicket:id="addNew" title="Add new step" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>- </div>- </div>- <wicket:fragment wicket:id="actionColumnFrag">- <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>- </wicket:fragment>+<wicket:panel>+ <div class="step-list">+ <table wicket:id="steps" class="table-hover"></table>+ <div class="foot">+ <a wicket:id="addNew" title="Add new step" class="btn btn-light btn-hover-primary btn-block"><wicket:svg href="plus" class="icon"></wicket:svg></a>+ </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>+ </wicket:fragment></wicket:panel>\ No newline at end of filediff --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.javaindex 9cb91eaeb2..1d6feaa572 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@@ -31,17 +31,21 @@ 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.Item;+import org.apache.wicket.markup.repeater.OddEvenItem;import org.apache.wicket.markup.repeater.data.IDataProvider;import org.apache.wicket.markup.repeater.data.ListDataProvider;import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.util.convert.ConversionException;+import javax.annotation.Nullable;import java.io.Serializable;import java.lang.reflect.InvocationTargetException;import java.util.ArrayList;import java.util.List;+import static io.onedev.server.web.component.floating.AlignPlacement.bottom;+@SuppressWarnings("serial")class StepListEditPanel extends PropertyEditor<List<Serializable>> {@@ -56,11 +60,8 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {}}- @Override- protected void onInitialize() {- super.onInitialize();-- add(new DropdownLink("addNew", false, AlignPlacement.bottom(0), true, true) {+ private DropdownLink newAddStepLink(String componentId, @Nullable Component alignTarget, int index) {+ return new DropdownLink(componentId, alignTarget, bottom(0), true, true) {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {@@ -69,20 +70,20 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {@Overrideprotected 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) {+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {throw new RuntimeException(e);}-+new StepEditPanel(target, step) {@Overrideprotected void onSave(AjaxRequestTarget target, Step bean) {- steps.add(bean);+ steps.add(index, bean);markFormDirty(target);close();onPropertyUpdating(target);@@ -98,18 +99,31 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {public List<ParamSpec> getParamSpecs() {return StepListEditPanel.this.getParamSpecs();}-+};}-+};}-- });++ };+ }++ @Override+ protected void onBeforeRender() {+ super.onBeforeRender();+ replace(newAddStepLink("addNew", null, steps.size()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(newAddStepLink("addNew", null, steps.size()));List<IColumn<Step, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<Step, Void>(Model.of("")) {+ columns.add(new AbstractColumn<>(Model.of("")) {@Overridepublic void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {@@ -121,40 +135,44 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {tag.setName("svg");tag.put("class", "icon drag-indicator");}-+});}-+@Overridepublic String getCssClass() {return "minimum actions";}-+});- columns.add(new AbstractColumn<Step, Void>(Model.of("Name")) {+ columns.add(new AbstractColumn<>(Model.of("Name")) {@Overridepublic void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {cellItem.add(new Label(componentId, rowModel.getObject().getName()));}-+});- columns.add(new AbstractColumn<Step, Void>(Model.of("Condition")) {+ columns.add(new AbstractColumn<>(Model.of("Condition")) {@Overridepublic void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {cellItem.add(new Label(componentId, rowModel.getObject().getCondition().getDisplayName()));}-+});- columns.add(new AbstractColumn<Step, Void>(Model.of("")) {+ columns.add(new AbstractColumn<>(Model.of("")) {@Overridepublic 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);+ row.setOutputMarkupId(true);+ fragment.add(newAddStepLink("addAbove", row, row.getIndex()));+ fragment.add(newAddStepLink("addBelow", row, row.getIndex() + 1));fragment.add(new AjaxLink<Void>("edit") {@Override@@ -179,10 +197,10 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {public List<ParamSpec> getParamSpecs() {return StepListEditPanel.this.getParamSpecs();}-+};}-+});fragment.add(new AjaxLink<Void>("delete") {@@ -199,7 +217,7 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {onPropertyUpdating(target);target.add(StepListEditPanel.this);}-+});cellItem.add(fragment);}@@ -208,21 +226,21 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {public String getCssClass() {return "minimum actions";}-+});- IDataProvider<Step> dataProvider = new ListDataProvider<Step>() {+ IDataProvider<Step> dataProvider = new ListDataProvider<>() {@Overrideprotected List<Step> getData() {- return steps;+ return steps;}};DataTable<Step, Void> dataTable;- add(dataTable = new DataTable<Step, Void>("steps", columns, dataProvider, Integer.MAX_VALUE));- dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));+ add(dataTable = new DataTable<>("steps", columns, dataProvider, Integer.MAX_VALUE));+ dataTable.addTopToolbar(new HeadersToolbar<>(dataTable, null));dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable, Model.of("Not defined")));dataTable.add(new NoRecordsBehavior());diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 9158d65d29..5776b78f3a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -362,7 +362,7 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements Rev});- DropdownLink selectedCommitsLink = new DropdownLink("comparingCommits", false, new AlignPlacement(50, 100, 50, 0), true, false) {+ DropdownLink selectedCommitsLink = new DropdownLink("comparingCommits", new AlignPlacement(50, 100, 50, 0), true, false) {@Overrideprotected Component newContent(String id, FloatingPanel dropdown) {