Skip to content

The Unified and Autonomous Development Platform

feat: Able to change type of existing step (#1742)

Robin Shen17a74ed41911
diff --git a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
index e765a9aedf..6be5f52e15 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/polymorphiceditor/PolymorphicEditor.java
@@ -95,16 +95,8 @@ public class PolymorphicEditor extends ValueEditor<Serializable> {
try {
bean = (Serializable) each.getDeclaredConstructor().newInstance();
Serializable prevBean = PolymorphicEditor.this.getConvertedInput();
- if (prevBean != null) {
- BeanDescriptor prevDescriptor = new BeanDescriptor(prevBean.getClass());
- for (List<PropertyDescriptor> prevGroupProperties : prevDescriptor.getProperties().values()) {
- for (PropertyDescriptor prevProperty : prevGroupProperties) {
- Class<?> declaringClass = prevProperty.getPropertyGetter().getDeclaringClass();
- if (!prevProperty.isPropertyExcluded() && declaringClass.isAssignableFrom(baseClass))
- prevProperty.copyProperty(prevBean, bean);
- }
- }
- }
+ if (prevBean != null)
+ new BeanDescriptor(baseClass).copyProperties(prevBean, bean);
} catch (InstantiationException | IllegalAccessException | IllegalArgumentException
| InvocationTargetException | NoSuchMethodException | SecurityException e) {
throw new RuntimeException(e);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
index 75f5e6e558..e7b53f1145 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/BeanDescriptor.java
@@ -1,22 +1,15 @@
package io.onedev.server.web.editable;
-import java.io.Serializable;
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.Nullable;
-
import com.google.common.collect.Sets;
-
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.util.BeanUtils;
import io.onedev.server.annotation.Editable;
+import io.onedev.server.util.BeanUtils;
+
+import javax.annotation.Nullable;
+import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.*;
@SuppressWarnings("serial")
public class BeanDescriptor implements Serializable {
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html
new file mode 100644
index 0000000000..d04d5f2864
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.html
@@ -0,0 +1,22 @@
+<wicket:panel>
+ <form wicket:id="form" class="bean-edit leave-confirm">
+ <div wicket:id="head" class="modal-header">
+ <h5 class="modal-title">
+ <a wicket:id="typeSelector">
+ <span wicket:id="title"></span>
+ <wicket:svg href="arrow" class="icon rotate-90"></wicket:svg>
+ </a>
+ </h5>
+ <button wicket:id="close" type="button" class="close"><wicket:svg href="times" class="icon"/></button>
+ </div>
+ <div class="modal-body">
+ <div wicket:id="description" class="alert alert-light alert-notice"></div>
+ <div wicket:id="feedback"></div>
+ <div wicket:id="editor"></div>
+ </div>
+ <div class="modal-footer">
+ <button wicket:id="ok" class="btn btn-primary">Ok</button>
+ <button wicket:id="cancel" class="btn btn-secondary">Cancel</button>
+ </div>
+ </form>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java
new file mode 100644
index 0000000000..b4f33302e7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditContentPanel.java
@@ -0,0 +1,143 @@
+package io.onedev.server.web.editable.buildspec.step;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.web.ajaxlistener.ConfirmLeaveListener;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.typeselect.TypeSelectPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.EditableUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.panel.Panel;
+import org.apache.wicket.request.cycle.RequestCycle;
+
+import static io.onedev.server.web.component.floating.AlignPlacement.bottom;
+
+@SuppressWarnings("serial")
+abstract class StepEditContentPanel extends Panel {
+
+ private final Step step;
+
+ public StepEditContentPanel(String id, Step step) {
+ super(id);
+ this.step = step;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ Form<?> form = new Form<Void>("form") {
+
+ @Override
+ protected void onError() {
+ super.onError();
+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);
+ }
+
+ };
+ form.setOutputMarkupId(true);
+
+ var head = new WebMarkupContainer("head");
+ head.setOutputMarkupId(true);
+ form.add(head);
+
+ head.add(new DropdownLink("typeSelector", head, bottom(0), true, true) {
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new Label("title", EditableUtils.getGroupedType(step.getClass())));
+ }
+
+ @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();
+ StepEditContentPanel.this.onSelect(target, type);
+ }
+
+ };
+ }
+ });
+
+ String description = StringUtils.trimToNull(StringUtils.stripStart(
+ EditableUtils.getDescription(step.getClass()), "."));
+ if (description != null)
+ form.add(new Label("description", description).setEscapeModelStrings(false));
+ else
+ form.add(new WebMarkupContainer("description").setVisible(false));
+
+ form.add(new FencedFeedbackPanel("feedback", form));
+
+ BeanEditor editor = BeanContext.edit("editor", step);
+ form.add(editor);
+
+ form.add(new AjaxButton("ok") {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "dirty-aware"));
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
+ super.onSubmit(target, form);
+ onSave(target);
+ }
+
+ });
+ form.add(new AjaxLink<Void>("cancel") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(StepEditContentPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ StepEditContentPanel.this.onCancel(target);
+ }
+
+ });
+ head.add(new AjaxLink<Void>("close") {
+
+ @Override
+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {
+ super.updateAjaxAttributes(attributes);
+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(StepEditContentPanel.this));
+ }
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ StepEditContentPanel.this.onCancel(target);
+ }
+
+ });
+ add(form);
+
+ setOutputMarkupId(true);
+ }
+
+ protected abstract void onSelect(AjaxRequestTarget target, Class<? extends Step> stepType);
+
+ protected abstract void onSave(AjaxRequestTarget target);
+
+ protected abstract void onCancel(AjaxRequestTarget target);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditModalPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditModalPanel.java
new file mode 100644
index 0000000000..62145f0012
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditModalPanel.java
@@ -0,0 +1,62 @@
+package io.onedev.server.web.editable.buildspec.step;
+
+import io.onedev.server.buildspec.BuildSpecAware;
+import io.onedev.server.buildspec.ParamSpecAware;
+import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.editable.BeanDescriptor;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+
+import java.lang.reflect.InvocationTargetException;
+
+@SuppressWarnings("serial")
+abstract class StepEditModalPanel extends ModalPanel implements BuildSpecAware, ParamSpecAware {
+
+ private Step step;
+
+ public StepEditModalPanel(AjaxRequestTarget target, Step step) {
+ super(target);
+ this.step = step;
+ }
+
+ @Override
+ protected Component newContent(String id) {
+ return new StepEditContentPanel(id, step) {
+
+ @Override
+ protected void onSave(AjaxRequestTarget target) {
+ StepEditModalPanel.this.onSave(target, step);
+ }
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ close();
+ }
+
+ @Override
+ protected void onSelect(AjaxRequestTarget target, Class<? extends Step> stepType) {
+ Step newStep;
+ try {
+ newStep = stepType.getDeclaredConstructor().newInstance();
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ new BeanDescriptor(Step.class).copyProperties(step, newStep);
+ step = newStep;
+
+ var content = newContent(id);
+ replaceWith(content);
+ target.add(content);
+ target.appendJavaScript(String.format(
+ "onedev.server.form.markDirty($('#%s').find('form'));",
+ StepEditModalPanel.this.getMarkupId()));
+ }
+
+ }.setOutputMarkupId(true);
+ }
+
+ protected abstract void onSave(AjaxRequestTarget target, Step step);
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
deleted file mode 100644
index 00e4a06c42..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepEditPanel.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package io.onedev.server.web.editable.buildspec.step;
-
-import java.util.List;
-
-import javax.annotation.Nullable;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-
-import com.google.common.collect.Sets;
-
-import io.onedev.server.buildspec.BuildSpecAware;
-import io.onedev.server.buildspec.ParamSpecAware;
-import io.onedev.server.buildspec.step.Step;
-import io.onedev.server.web.component.beaneditmodal.BeanEditModalPanel;
-import io.onedev.server.web.editable.EditableUtils;
-
-@SuppressWarnings("serial")
-abstract class StepEditPanel extends BeanEditModalPanel<Step> implements BuildSpecAware, ParamSpecAware {
-
- public StepEditPanel(AjaxRequestTarget target, Step step) {
- super(target, step, Sets.newHashSet(), true, EditableUtils.getGroupedType(step.getClass()));
- }
-
- @Nullable
- private static Step getStep(List<Step> steps, int stepIndex) {
- if (stepIndex != -1)
- return steps.get(stepIndex);
- else
- return null;
- }
-
- @Override
- protected void onCancel(AjaxRequestTarget target) {
- }
-
-}
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 1d6feaa572..1a2cd41e94 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
@@ -10,7 +10,6 @@ import io.onedev.server.web.ajaxlistener.ConfirmClickListener;
import io.onedev.server.web.behavior.NoRecordsBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
-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 io.onedev.server.web.component.svg.SpriteImage;
@@ -31,7 +30,6 @@ 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;
@@ -79,11 +77,11 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
throw new RuntimeException(e);
}
- new StepEditPanel(target, step) {
+ new StepEditModalPanel(target, step) {
@Override
- protected void onSave(AjaxRequestTarget target, Step bean) {
- steps.add(index, bean);
+ protected void onSave(AjaxRequestTarget target, Step step) {
+ steps.add(index, step);
markFormDirty(target);
close();
onPropertyUpdating(target);
@@ -170,18 +168,20 @@ class StepListEditPanel extends PropertyEditor<List<Serializable>> {
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, row.getIndex()));
- fragment.add(newAddStepLink("addBelow", row, row.getIndex() + 1));
+ fragment.add(newAddStepLink("addAbove", row, index));
+ fragment.add(newAddStepLink("addBelow", row, index + 1));
fragment.add(new AjaxLink<Void>("edit") {
@Override
public void onClick(AjaxRequestTarget target) {
- Step step = steps.get(cellItem.findParent(Item.class).getIndex());
- new StepEditPanel(target, step) {
+ Step step = steps.get(index);
+ new StepEditModalPanel(target, step) {
@Override
- protected void onSave(AjaxRequestTarget target, Step bean) {
+ protected void onSave(AjaxRequestTarget target, Step step) {
+ steps.set(index, step);
markFormDirty(target);
close();
onPropertyUpdating(target);
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
index c8e7d9fae8..1ca2a07f88 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/buildspec/step/StepListViewPanel.java
@@ -1,142 +1,137 @@
-package io.onedev.server.web.editable.buildspec.step;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.HeadersToolbar;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;
-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.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-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 io.onedev.server.buildspec.step.Step;
-import io.onedev.server.web.behavior.NoRecordsBehavior;
-import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
-import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
-import io.onedev.server.web.editable.BeanContext;
-import io.onedev.server.web.editable.EditableUtils;
-
-@SuppressWarnings("serial")
-class StepListViewPanel extends Panel {
-
- private final List<Step> steps = new ArrayList<>();
-
- public StepListViewPanel(String id, List<Serializable> elements) {
- super(id);
-
- for (Serializable each: elements)
- steps.add((Step) each);
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- List<IColumn<Step, Void>> columns = new ArrayList<>();
-
- columns.add(new AbstractColumn<Step, Void>(Model.of("Name")) {
-
- @Override
- public 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")) {
-
- @Override
- public 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("")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
- int stepIndex = cellItem.findParent(Item.class).getIndex();
- Fragment fragment = new Fragment(componentId, "showDetailFrag", StepListViewPanel.this);
- fragment.add(new AjaxLink<Void>("link") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
-
- @Override
- protected Component newTitle(String componentId) {
- String stepType = EditableUtils.getDisplayName(steps.get(stepIndex).getClass());
- return new Label(componentId, "Step (type: " + stepType + ")");
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- add(AttributeAppender.append("class", "step"));
- }
-
- @Override
- protected Component newBody(String id) {
- return BeanContext.view(id, steps.get(stepIndex));
- }
-
- };
- }
-
- });
-
- cellItem.add(fragment);
- }
-
- @Override
- public String getCssClass() {
- return "ellipsis text-right";
- }
-
- });
-
- IDataProvider<Step> dataProvider = new ListDataProvider<Step>() {
-
- @Override
- protected List<Step> getData() {
- return steps;
- }
-
- };
-
- add(new DataTable<Step, Void>("steps", columns, dataProvider, Integer.MAX_VALUE) {
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
- addTopToolbar(new HeadersToolbar<Void>(this, null));
- addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
- add(new NoRecordsBehavior());
- }
-
- });
- }
-
- @Override
- public void renderHead(IHeaderResponse response) {
- super.renderHead(response);
- response.render(CssHeaderItem.forReference(new StepCssResourceReference()));
- }
-
-}
+package io.onedev.server.web.editable.buildspec.step;
+
+import io.onedev.server.buildspec.step.Step;
+import io.onedev.server.web.behavior.NoRecordsBehavior;
+import io.onedev.server.web.component.offcanvas.OffCanvasCardPanel;
+import io.onedev.server.web.component.offcanvas.OffCanvasPanel;
+import io.onedev.server.web.editable.BeanContext;
+import io.onedev.server.web.editable.EditableUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
+import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
+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.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+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 java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+@SuppressWarnings("serial")
+class StepListViewPanel extends Panel {
+
+ private final List<Step> steps = new ArrayList<>();
+
+ public StepListViewPanel(String id, List<Serializable> elements) {
+ super(id);
+
+ for (Serializable each: elements)
+ steps.add((Step) each);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ List<IColumn<Step, Void>> columns = new ArrayList<>();
+
+ columns.add(new AbstractColumn<Step, Void>(Model.of("Name")) {
+
+ @Override
+ public 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")) {
+
+ @Override
+ public 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("")) {
+
+ @Override
+ public void populateItem(Item<ICellPopulator<Step>> cellItem, String componentId, IModel<Step> rowModel) {
+ int stepIndex = cellItem.findParent(Item.class).getIndex();
+ Fragment fragment = new Fragment(componentId, "showDetailFrag", StepListViewPanel.this);
+ fragment.add(new AjaxLink<Void>("link") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ new OffCanvasCardPanel(target, OffCanvasPanel.Placement.RIGHT, null) {
+
+ @Override
+ protected Component newTitle(String componentId) {
+ String stepType = EditableUtils.getGroupedType(steps.get(stepIndex).getClass());
+ return new Label(componentId, stepType);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(AttributeAppender.append("class", "step"));
+ }
+
+ @Override
+ protected Component newBody(String id) {
+ return BeanContext.view(id, steps.get(stepIndex));
+ }
+
+ };
+ }
+
+ });
+
+ cellItem.add(fragment);
+ }
+
+ @Override
+ public String getCssClass() {
+ return "ellipsis text-right";
+ }
+
+ });
+
+ IDataProvider<Step> dataProvider = new ListDataProvider<Step>() {
+
+ @Override
+ protected List<Step> getData() {
+ return steps;
+ }
+
+ };
+
+ add(new DataTable<Step, Void>("steps", columns, dataProvider, Integer.MAX_VALUE) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ addTopToolbar(new HeadersToolbar<Void>(this, null));
+ addBottomToolbar(new NoRecordsToolbar(this, Model.of("Not defined")));
+ add(new NoRecordsBehavior());
+ }
+
+ });
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new StepCssResourceReference()));
+ }
+
+}