The Unified and Autonomous Development Platform
GUI to edit dependency spec inside ci spec
robin shen23c0527e336c
diff --git a/core/src/main/java/io/onedev/server/ci/DependencySpec.java b/core/src/main/java/io/onedev/server/ci/DependencySpec.javaindex 448a72594a..e6f0ecbd1b 100644--- a/core/src/main/java/io/onedev/server/ci/DependencySpec.java+++ b/core/src/main/java/io/onedev/server/ci/DependencySpec.java@@ -1,25 +1,46 @@package io.onedev.server.ci;import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;+import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.ci.jobparam.JobParam;+import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.annotation.ChoiceProvider;import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies.DependencyEditPanel;@Editablepublic class DependencySpec implements Serializable {private static final long serialVersionUID = 1L;- private String jobSpec;+ private String job;++ private List<JobParam> params = new ArrayList<>();private String artifacts;- @Editable(name="Job", order=100)- public String getJobSpec() {- return jobSpec;+ @Editable(order=100)+ @ChoiceProvider("getJobChoices")+ @NotEmpty+ public String getJob() {+ return job;}- public void setJobSpec(String jobSpec) {- this.jobSpec = jobSpec;+ public void setJob(String job) {+ this.job = job;+ }++ @Editable(order=200)+ public List<JobParam> getParams() {+ return params;+ }++ public void setParams(List<JobParam> params) {+ this.params = params;}@Editable(order=200)@@ -31,4 +52,16 @@ public class DependencySpec implements Serializable {this.artifacts = artifacts;}+ @SuppressWarnings("unused")+ private static List<String> getJobChoices() {+ DependencyEditPanel editor = OneContext.get().getComponent().findParent(DependencyEditPanel.class);+ List<String> choices = new ArrayList<>();+ JobSpec belongingJob = editor.getBelongingJob();+ for (JobSpec job: editor.getEditingCISpec().getJobs()) {+ choices.add(job.getName());+ }+ choices.remove(belongingJob.getName());+ return choices;+ }+}diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java b/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.javanew file mode 100644index 0000000000..255c98bfc9--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/jobparam/JobParam.java@@ -0,0 +1,40 @@+package io.onedev.server.ci.jobparam;++import java.io.Serializable;++import javax.validation.constraints.NotNull;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public class JobParam implements Serializable {++ private static final long serialVersionUID = 1L;++ private String name;++ private ValueProvider valueProvider = new SpecifiedValues();++ @Editable(order=100)+ @NotEmpty+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable(order=200, name="Values")+ @NotNull+ public ValueProvider getValueProvider() {+ return valueProvider;+ }++ public void setValueProvider(ValueProvider valueProvider) {+ this.valueProvider = valueProvider;+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java b/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.javanew file mode 100644index 0000000000..09f3a5875e--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/jobparam/ScriptingValues.java@@ -0,0 +1,41 @@+package io.onedev.server.ci.jobparam;++import java.util.HashMap;+import java.util.List;+import java.util.Map;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.util.GroovyUtils;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.editable.annotation.Script;++@Editable(order=200, name="Evaluate script to get choices")+public class ScriptingValues implements ValueProvider {++ private static final long serialVersionUID = 1L;++ private String script;++ @Editable(description="Groovy script to be evaluated. The return value should be a list of string to "+ + "be used as param values")+ @NotEmpty+ @Script+ @OmitName+ public String getScript() {+ return script;+ }++ public void setScript(String script) {+ this.script = script;+ }++ @SuppressWarnings("unchecked")+ @Override+ public List<String> getValues() {+ Map<String, Object> variables = new HashMap<>();+ return (List<String>) GroovyUtils.evalScript(getScript(), variables);+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.java b/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.javanew file mode 100644index 0000000000..bf6e89efa8--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/jobparam/SpecifiedValues.java@@ -0,0 +1,36 @@+package io.onedev.server.ci.jobparam;++import java.util.List;++import org.hibernate.validator.constraints.NotEmpty;++import com.google.common.base.Splitter;++import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.Multiline;+import io.onedev.server.web.editable.annotation.OmitName;++@Editable(order=100, name="Use specified values")+public class SpecifiedValues implements ValueProvider {++ private static final long serialVersionUID = 1L;++ private String value;++ @Editable(name="Values", description="Specify values of the parameter, with each line representing a separate value")+ @OmitName+ @NotEmpty+ @Multiline+ public String getValue() {+ return value;+ }++ public void setValue(String value) {+ this.value = value;+ }++ public List<String> getValues() {+ return Splitter.on("\n").trimResults().omitEmptyStrings().splitToList(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/ci/jobparam/ValueProvider.java b/core/src/main/java/io/onedev/server/ci/jobparam/ValueProvider.javanew file mode 100644index 0000000000..ecc9a8f6e3--- /dev/null+++ b/core/src/main/java/io/onedev/server/ci/jobparam/ValueProvider.java@@ -0,0 +1,13 @@+package io.onedev.server.ci.jobparam;++import java.io.Serializable;+import java.util.List;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public interface ValueProvider extends Serializable {++ List<String> getValues();++}diff --git a/core/src/main/java/io/onedev/server/util/OneContext.java b/core/src/main/java/io/onedev/server/util/OneContext.javaindex 47f81ecc54..d5d6745aac 100644--- a/core/src/main/java/io/onedev/server/util/OneContext.java+++ b/core/src/main/java/io/onedev/server/util/OneContext.java@@ -4,12 +4,18 @@ import java.util.Stack;import javax.annotation.Nullable;+import org.apache.wicket.Component;++import com.google.common.base.Preconditions;+import io.onedev.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.model.Project;import io.onedev.server.util.inputspec.InputContext;+import io.onedev.server.web.util.ProjectAware;+import io.onedev.server.web.util.WicketUtils;-public abstract class OneContext {+public class OneContext {private static ThreadLocal<Stack<OneContext>> stack = new ThreadLocal<Stack<OneContext>>() {@@ -20,6 +26,12 @@ public abstract class OneContext {};+ private Component component;++ public OneContext(Component component) {+ this.component = component;+ }+public static void push(OneContext context) {stack.get().push(context);}@@ -48,11 +60,25 @@ public abstract class OneContext {return getEditContext(0);}- public abstract Project getProject();+ public Project getProject() {+ ProjectAware projectAware = component.findParent(ProjectAware.class);+ if (projectAware != null)+ return projectAware.getProject();+ else+ return null;+ }- public abstract EditContext getEditContext(int level);+ public EditContext getEditContext(int level) {+ return WicketUtils.findParents(getComponent(), EditContext.class).get(level);+ }- public abstract InputContext getInputContext();+ public InputContext getInputContext() {+ return Preconditions.checkNotNull(WicketUtils.findInnermost(component, InputContext.class));+ }++ public Component getComponent() {+ return component;+ }@Nullablepublic OneContext getPropertyContext(String propertyName) {diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.javaindex 9cdf1d5f2a..cb97a526fd 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/ScriptingChoices.java@@ -9,7 +9,6 @@ import org.slf4j.LoggerFactory;import io.onedev.server.util.GroovyUtils;import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.Script;@@ -29,7 +28,6 @@ public class ScriptingChoices extends ChoiceProvider {@NotEmpty@Script@OmitName- @Multilinepublic String getScript() {return script;}diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex c4393e0da5..ae56681a41 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -212,7 +212,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {}private OneContext newOneContext() {- return new OneContext() {+ return new OneContext(IssueQueryBehavior.this.getComponent()) {@Overridepublic Project getProject() {@@ -235,7 +235,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {public InputContext getInputContext() {throw new UnsupportedOperationException();}-+};}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.javaindex 5454f69282..612e6e5e6a 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/fieldvalues/FieldValuesPanel.java@@ -34,14 +34,13 @@ import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.choiceinput.choiceprovider.ChoiceProvider;+import io.onedev.server.util.userident.UserIdent;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.editable.EditableUtils;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;-import io.onedev.server.web.util.ComponentContext;-import io.onedev.server.util.userident.UserIdent;import io.onedev.utils.ColorUtils;@SuppressWarnings("serial")@@ -111,7 +110,7 @@ public abstract class FieldValuesPanel extends Panel implements EditContext {InputSpec fieldSpec = getIssueSetting().getFieldSpec(getField().getName());if (fieldSpec != null && fieldSpec instanceof ChoiceInput) {ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();- OneContext.push(new ComponentContext(this));+ OneContext.push(new OneContext(this));try {String backgroundColor = choiceProvider.getChoices(false).get(value);if (backgroundColor != null) {diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.javaindex 8c1b0f0465..8759cc7c0a 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/StateTransitionListPanel.java@@ -103,8 +103,14 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- String label = StringUtils.join(rowModel.getObject().getFromStates());- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label, "firstColumnFrag"));+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), true) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, StringUtils.join(rowModel.getObject().getFromStates()));+ }++ });}});@@ -112,7 +118,14 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), rowModel.getObject().getToState(), "otherColumnsFrag"));+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), false) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getToState());+ }++ });}});@@ -121,8 +134,14 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- String label = EditableUtils.getDisplayName(rowModel.getObject().getTrigger().getClass());- cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), label, "otherColumnsFrag"));+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), false) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, EditableUtils.getDisplayName(rowModel.getObject().getTrigger().getClass()));+ }++ });}});@@ -131,7 +150,14 @@ public abstract class StateTransitionListPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {- cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ cellItem.add(new ColumnFragment(componentId, rowModel.getObject(), false) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);+ }++ });}@Override@@ -191,17 +217,14 @@ public abstract class StateTransitionListPanel extends Panel {return -1;}- private class ColumnFragment extends Fragment {+ private abstract class ColumnFragment extends Fragment {private final int index;- private final String label;-- public ColumnFragment(String id, TransitionSpec transition, String label, String columnFrag) {- super(id, columnFrag, StateTransitionListPanel.this);+ public ColumnFragment(String id, TransitionSpec transition, boolean firstColumn) {+ super(id, firstColumn?"firstColumnFrag":"otherColumnsFrag", StateTransitionListPanel.this);this.index = getTransitionSpecIndex(transition);Preconditions.checkState(this.index != -1);- this.label = label;}private TransitionSpec getTransition() {@@ -284,13 +307,12 @@ public abstract class StateTransitionListPanel extends Panel {}};- if (label != null)- link.add(new Label("label", label));- else- link.add(new Label("label", " ").setEscapeModelStrings(false));+ link.add(newLabel("label"));add(link);}+ protected abstract Component newLabel(String componentId);+}protected abstract void onChanged(AjaxRequestTarget target);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 4f52b42d88..f4ec83bac3 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@@ -37,7 +37,6 @@ import io.onedev.server.web.editable.PathSegment.Property;import io.onedev.server.web.editable.annotation.Horizontal;import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.Vertical;-import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")@@ -162,7 +161,7 @@ public class BeanEditor extends ValueEditor<Serializable> {Serializable propertyValue;- OneContext context = new ComponentContext(this);+ OneContext context = new OneContext(this);OneContext.push(context);try {@@ -228,7 +227,7 @@ public class BeanEditor extends ValueEditor<Serializable> {protected void onConfigure() {super.onConfigure();setVisible(!propertyContext.getDescriptor().isPropertyExcluded()- && propertyContext.getDescriptor().isPropertyVisible(new ComponentContext(this), beanDescriptor));+ && propertyContext.getDescriptor().isPropertyVisible(new OneContext(this), beanDescriptor));}};@@ -282,7 +281,7 @@ public class BeanEditor extends ValueEditor<Serializable> {int propertyIndex = (int) item.getDefaultModelObject();PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);if (propertyContext.getPropertyName().equals(property.getName())- && propertyContext.getDescriptor().isPropertyVisible(new ComponentContext(item), beanDescriptor)+ && propertyContext.getDescriptor().isPropertyVisible(new OneContext(item), beanDescriptor)&& !propertyContext.getDescriptor().isPropertyExcluded()) {found = true;break;@@ -349,7 +348,7 @@ public class BeanEditor extends ValueEditor<Serializable> {}public OneContext getOneContext() {- return new ComponentContext(this) {+ return new OneContext(this) {@Overridepublic OneContext getPropertyContext(String propertyName) {@@ -357,7 +356,7 @@ public class BeanEditor extends ValueEditor<Serializable> {int propertyIndex = (int) item.getDefaultModelObject();PropertyContext<Serializable> propertyContext = propertyContexts.get(propertyIndex);if (propertyContext.getPropertyName().equals(propertyName))- return new ComponentContext(item);+ return new OneContext(item);}return null;}diff --git a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.javaindex 1d75bea3d5..2eb9fb515c 100644--- a/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java+++ b/core/src/main/java/io/onedev/server/web/editable/BeanViewer.java@@ -16,8 +16,8 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import io.onedev.server.util.EditContext;+import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.OmitName;-import io.onedev.server.web.util.ComponentContext;@SuppressWarnings("serial")public class BeanViewer extends Panel implements EditContext {@@ -67,7 +67,7 @@ public class BeanViewer extends Panel implements EditContext {Serializable propertyValue = (Serializable) propertyContext.getPropertyValue(bean);valueTd.add(propertyContext.renderForView("content", Model.of(propertyValue)));- item.setVisible(propertyContext.isPropertyVisible(new ComponentContext(BeanViewer.this), beanDescriptor)+ item.setVisible(propertyContext.isPropertyVisible(new OneContext(BeanViewer.this), beanDescriptor)&& !propertyContext.isPropertyExcluded());item.add(AttributeAppender.append("class", "property-" + propertyContext.getPropertyName()));diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.javaindex ae79e7ad32..31b846f0a8 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyDescriptor.java@@ -18,7 +18,6 @@ import io.onedev.server.OneDev;import io.onedev.server.util.OneContext;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.editable.annotation.ShowCondition;-import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.BeanUtils;import io.onedev.utils.HtmlUtils;import io.onedev.utils.ReflectionUtils;@@ -154,7 +153,7 @@ public class PropertyDescriptor implements Serializable {public String getDescription(Component component) {String description = getDescription();if (description != null) {- OneContext.push(new ComponentContext(component));+ OneContext.push(new OneContext(component));try {description = Application.get().getResourceSettings().getLocalizer().getString(description, component, description);description = StringUtils.replace(description, "$docRoot", OneDev.getInstance().getDocRoot());diff --git a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.javaindex 6152f7b682..8eb46ebdf8 100644--- a/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/PropertyEditor.java@@ -16,7 +16,6 @@ import org.apache.wicket.validation.IValidatable;import io.onedev.launcher.loader.AppLoader;import io.onedev.server.util.OneContext;-import io.onedev.server.web.util.ComponentContext;@SuppressWarnings("serial")public abstract class PropertyEditor<T> extends ValueEditor<T> {@@ -37,7 +36,7 @@ public abstract class PropertyEditor<T> extends ValueEditor<T> {@Overridepublic void validate(IValidatable<T> validatable) {- OneContext.push(new ComponentContext(PropertyEditor.this));+ OneContext.push(new OneContext(PropertyEditor.this));try {Validator validator = AppLoader.getInstance(Validator.class);Set<?> violations = validator.validateValue(diff --git a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.javaindex 72be75b714..e192a2b07b 100644--- a/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/beanlist/BeanListPropertyEditor.java@@ -243,12 +243,6 @@ public class BeanListPropertyEditor extends PropertyEditor<List<Serializable>> {row.add(new AjaxButton("deleteElement") {- @Override- protected void onInitialize() {- super.onInitialize();- add(AttributeAppender.replace("title", "Delete this " + EditableUtils.getDisplayName(elementClass).toLowerCase()));- }-@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.javaindex 223398a9e1..d3e01d0c56 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/MultiChoiceEditor.java@@ -21,7 +21,6 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -40,7 +39,7 @@ public class MultiChoiceEditor extends PropertyEditor<List<String>> {Map<String, String> choices;- OneContext oneContext = new ComponentContext(this);+ OneContext oneContext = new OneContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.javaindex e80a83fe7b..88ec911e71 100644--- a/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/choice/SingleChoiceEditor.java@@ -19,7 +19,6 @@ import io.onedev.server.web.editable.ErrorContext;import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;-import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -38,7 +37,7 @@ public class SingleChoiceEditor extends PropertyEditor<String> {Map<String, String> choices;- OneContext oneContext = new ComponentContext(this);+ OneContext oneContext = new OneContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.javaindex a3096a86eb..c2be05ee6c 100644--- a/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/polymorphiclist/PolymorphicListPropertyEditor.java@@ -12,7 +12,6 @@ import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;import org.apache.wicket.ajax.markup.html.form.AjaxButton;-import org.apache.wicket.behavior.AttributeAppender;import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.html.WebMarkupContainer;@@ -248,12 +247,6 @@ public class PolymorphicListPropertyEditor extends PropertyEditor<List<Serializarow.add(new AjaxButton("deleteElement") {- @Override- protected void onInitialize() {- super.onInitialize();- add(AttributeAppender.replace("title", "Delete this " + EditableUtils.getDisplayName(baseClass).toLowerCase()));- }-@Overrideprotected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);diff --git a/core/src/main/java/io/onedev/server/web/editable/script/script-support.css b/core/src/main/java/io/onedev/server/web/editable/script/script-support.cssindex 8f0b186186..3a5929f937 100644--- a/core/src/main/java/io/onedev/server/web/editable/script/script-support.css+++ b/core/src/main/java/io/onedev/server/web/editable/script/script-support.css@@ -7,11 +7,11 @@border-color: #a94442;}.script-support .CodeMirror {- height: 500px;-}-.property.viewer .script-support .CodeMirror {height: auto;}+.script-support .CodeMirror-scroll {+ min-height: 120px;+}.property.viewer .CodeMirror .CodeMirror-cursor {border-left: none;}diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.javaindex a0ab75ab26..7e714043eb 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserMultiChoiceEditor.java@@ -26,7 +26,6 @@ import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.UserChoice;-import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -46,7 +45,7 @@ public class UserMultiChoiceEditor extends PropertyEditor<List<String>> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new ComponentContext(this);+ OneContext oneContext = new OneContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.javaindex a3d035d710..a2026505bd 100644--- a/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java+++ b/core/src/main/java/io/onedev/server/web/editable/userchoice/UserSingleChoiceEditor.java@@ -24,7 +24,6 @@ import io.onedev.server.web.editable.PathSegment;import io.onedev.server.web.editable.PropertyDescriptor;import io.onedev.server.web.editable.PropertyEditor;import io.onedev.server.web.editable.annotation.UserChoice;-import io.onedev.server.web.util.ComponentContext;import io.onedev.utils.ReflectionUtils;@SuppressWarnings("serial")@@ -44,7 +43,7 @@ public class UserSingleChoiceEditor extends PropertyEditor<String> {protected void onInitialize() {super.onInitialize();- OneContext oneContext = new ComponentContext(this);+ OneContext oneContext = new OneContext(this);OneContext.push(oneContext);try {diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.javaindex ab3a0533e0..c93e396a16 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueFieldListPage.java@@ -87,7 +87,14 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getName(), true));+ cellItem.add(new ColumnFragment(componentId, rowModel, true) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getName());+ }++ });}});@@ -96,7 +103,14 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {InputSpec field = rowModel.getObject();- cellItem.add(new ColumnFragment(componentId, rowModel, EditableUtils.getDisplayName(field.getClass()), false));+ cellItem.add(new ColumnFragment(componentId, rowModel, false) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, EditableUtils.getDisplayName(field.getClass()));+ }++ });}});@@ -104,9 +118,15 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- InputSpec field = rowModel.getObject();- String label = StringUtils.describe(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(field.getName()));- cellItem.add(new ColumnFragment(componentId, rowModel, label, false));+ cellItem.add(new ColumnFragment(componentId, rowModel, false) {++ @Override+ protected Component newLabel(String componentId) {+ InputSpec field = rowModel.getObject();+ return new Label(componentId, StringUtils.describe(getSetting().getDefaultPromptFieldsUponIssueOpen().contains(field.getName())));+ }++ });}});@@ -114,9 +134,15 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- InputSpec field = rowModel.getObject();- String label = StringUtils.describe(getSetting().getDefaultListFields().contains(field.getName()));- cellItem.add(new ColumnFragment(componentId, rowModel, label, false));+ cellItem.add(new ColumnFragment(componentId, rowModel, false) {++ @Override+ protected Component newLabel(String componentId) {+ InputSpec field = rowModel.getObject();+ return new Label(componentId, StringUtils.describe(getSetting().getDefaultListFields().contains(field.getName())));+ }++ });}@Override@@ -130,7 +156,14 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ cellItem.add(new ColumnFragment(componentId, rowModel, false) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);+ }++ });}@Override@@ -183,22 +216,21 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {return -1;}- private class ColumnFragment extends Fragment {+ private abstract class ColumnFragment extends Fragment {private final int index;- private final String label;-- public ColumnFragment(String id, IModel<InputSpec> model, String label, boolean nameColumn) {+ public ColumnFragment(String id, IModel<InputSpec> model, boolean nameColumn) {super(id, nameColumn?"nameColumnFrag":"otherColumnFrag", IssueFieldListPage.this, model);this.index = getFieldSpecIndex(getField().getName());Preconditions.checkState(this.index != -1);- this.label = label;}private InputSpec getField() {return (InputSpec) getDefaultModelObject();}++ protected abstract Component newLabel(String componentId);@Overrideprotected void onInitialize() {@@ -287,10 +319,6 @@ public class IssueFieldListPage extends GlobalIssueSettingPage {}};- if (label != null)- link.add(new Label("label", label));- else- link.add(new Label("label", " ").setEscapeModelStrings(false));add(link);}diff --git a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.javaindex ff88b050e9..486ac3c5c9 100644--- a/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/admin/issuesetting/IssueStateListPage.java@@ -166,7 +166,22 @@ public class IssueStateListPage extends GlobalIssueSettingPage {@Overridepublic void populateItem(Item<ICellPopulator<StateSpec>> cellItem, String componentId, IModel<StateSpec> rowModel) {- cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ Fragment fragment = new Fragment(componentId, "otherColumnFrag", IssueStateListPage.this);+ StateSpec state = rowModel.getObject();+ int index = getStateSpecIndex(state.getName());+ Preconditions.checkState(index != -1);+ AjaxLink<Void> link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ newStateDetail(target, index);+ }++ };+ link.add(new Label("label", "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false));+ fragment.add(link);+ cellItem.add(fragment);+}@Overridediff --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 9d7a67357b..d5360bafd6 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@@ -5,6 +5,8 @@ import static de.agilecoders.wicket.jquery.JQuery.$;import java.io.Serializable;import java.nio.charset.Charset;+import javax.annotation.Nullable;+import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -28,7 +30,7 @@ import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")-class CISpecEditPanel extends FormComponentPanel<byte[]> {+public class CISpecEditPanel extends FormComponentPanel<byte[]> {private RepeatingView jobsView;@@ -105,17 +107,26 @@ class CISpecEditPanel extends FormComponentPanel<byte[]> {@Overridepublic void convertInput() {+ CISpec editingCISpec = getEditingCISpec();+ if (editingCISpec != null) {+ setConvertedInput(VersionedDocument.fromBean(editingCISpec).toXML().getBytes(Charsets.UTF_8));+ } else {+ setConvertedInput(getModelObject());+ }+ }++ @Nullable+ public CISpec getEditingCISpec() {if (parseResult instanceof CISpec) {- CISpec ciSpec = (CISpec) parseResult;- ciSpec.getJobs().clear();+ CISpec ciSpec = new CISpec();for (Component child: jobsView) {BeanEditor jobEditor = (BeanEditor) child.get("editor");ciSpec.getJobs().add((JobSpec) jobEditor.getConvertedInput());}- setConvertedInput(VersionedDocument.fromBean(ciSpec).toXML().getBytes(Charsets.UTF_8));+ return ciSpec;} else {- setConvertedInput(getModelObject());+ return null;}}-+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.htmlnew file mode 100644index 0000000000..ff29f91a1d--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.html@@ -0,0 +1,17 @@+<wicket:panel>+ <form wicket:id="form" class="dependency-edit leave-confirm">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Dependency+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Update">+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+</wicket:panel>\ 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.javanew file mode 100644index 0000000000..75fc76a491--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyEditPanel.java@@ -0,0 +1,138 @@+package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies;++import java.util.List;++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.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.DependencySpec;+import io.onedev.server.ci.JobSpec;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;++@SuppressWarnings("serial")+public abstract class DependencyEditPanel extends Panel {++ private final List<DependencySpec> dependencies;++ private final int dependencyIndex;++ public DependencyEditPanel(String id, List<DependencySpec> dependencies, int dependencyIndex) {+ super(id);++ this.dependencies = dependencies;+ this.dependencyIndex = dependencyIndex;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ DependencySpec dependency;+ if (dependencyIndex != -1)+ dependency = dependencies.get(dependencyIndex);+ else+ dependency = new DependencySpec();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };++ form.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(DependencyEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });++ BeanEditor editor = BeanContext.editBean("editor", dependency);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (dependencyIndex != -1) {+ DependencySpec oldDependency = dependencies.get(dependencyIndex);+ if (!dependency.getJob().equals(oldDependency.getJob()) && getDependency(dependency.getJob()) != null) {+ editor.getErrorContext(new PathSegment.Property("job"))+ .addError("Dependency to this job is already defined");+ }+ } else if (getDependency(dependency.getJob()) != null) {+ editor.getErrorContext(new PathSegment.Property("job"))+ .addError("Dependency to this job is already defined");+ }++ if (!editor.hasErrors(true)) {+ if (dependencyIndex != -1) {+ dependencies.set(dependencyIndex, dependency);+ } else {+ dependencies.add(dependency);+ }+ onSave(target);+ } else {+ target.add(form);+ }+ }++ });++ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener(DependencyEditPanel.this));+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);++ add(form);+ }++ private DependencySpec getDependency(String job) {+ for (DependencySpec dependency: dependencies) {+ if (job.equals(dependency.getJob()))+ return dependency;+ }+ return null;+ }++ protected abstract void onSave(AjaxRequestTarget target);++ protected abstract void onCancel(AjaxRequestTarget target);++ public abstract CISpec getEditingCISpec();++ public abstract JobSpec getBelongingJob();++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.htmlnew file mode 100644index 0000000000..894c4a6116--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.html@@ -0,0 +1,15 @@+<wicket:panel>+ <div class="dependency-list list">+ <div class="head">+ <a wicket:id="addNew" title="Add new" class="btn btn-default btn-xs"><i class="fa fa-plus"></i></a>+ </div>+ <table wicket:id="dependencies" class="table table-condensed table-hover"></table>+ </div>+ <wicket:fragment wicket:id="jobColumnFrag">+ <span class="drag-indicator fa fa-reorder"></span>+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+ <wicket:fragment wicket:id="actionColumnFrag">+ <a wicket:id="delete" title="Delete"><i class="fa fa-trash"></i></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --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.javanew file mode 100644index 0000000000..26a3f6aa87--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditPanel.java@@ -0,0 +1,244 @@+package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collections;+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.ajax.markup.html.AjaxLink;+import org.apache.wicket.event.IEvent;+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.html.basic.Label;+import org.apache.wicket.markup.html.panel.Fragment;+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 org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.ci.CISpec;+import io.onedev.server.ci.DependencySpec;+import io.onedev.server.ci.JobSpec;+import io.onedev.server.web.behavior.sortable.SortBehavior;+import io.onedev.server.web.behavior.sortable.SortPosition;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyUpdating;+import io.onedev.server.web.page.project.blob.render.renderers.cispec.CISpecEditPanel;++@SuppressWarnings("serial")+public class DependencyListEditPanel extends PropertyEditor<List<Serializable>> {++ private final List<DependencySpec> dependencies;++ public DependencyListEditPanel(String id, PropertyDescriptor propertyDescriptor, IModel<List<Serializable>> model) {+ super(id, propertyDescriptor, model);++ dependencies = new ArrayList<>();+ for (Serializable each: model.getObject()) {+ dependencies.add((DependencySpec) each);+ }+ }++ private int getDependencyIndex(String jobSpec) {+ for (int i=0; i<dependencies.size(); i++) {+ if (dependencies.get(i).getJob().equals(jobSpec))+ return i;+ }+ return -1;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new ModalLink("addNew") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new DependencyEditPanel(id, dependencies, -1) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ modal.close();+ target.add(DependencyListEditPanel.this);+ }++ @Override+ public CISpec getEditingCISpec() {+ return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getEditingCISpec();+ }++ @Override+ public JobSpec getBelongingJob() {+ return (JobSpec) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();+ }++ };+ }++ });++ List<IColumn<DependencySpec, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Job")) {++ @Override+ public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {+ Fragment fragment = new Fragment(componentId, "jobColumnFrag", DependencyListEditPanel.this);+ ModalLink link = new ModalLink("link") {++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ return new DependencyEditPanel(id, dependencies, getDependencyIndex(rowModel.getObject().getJob())) {++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ @Override+ protected void onSave(AjaxRequestTarget target) {+ modal.close();+ target.add(DependencyListEditPanel.this);+ }++ @Override+ public CISpec getEditingCISpec() {+ return DependencyListEditPanel.this.findParent(CISpecEditPanel.class).getEditingCISpec();+ }++ @Override+ public JobSpec getBelongingJob() {+ return (JobSpec) DependencyListEditPanel.this.findParent(BeanEditor.class).getConvertedInput();+ }++ };+ }++ };+ link.add(new Label("label", rowModel.getObject().getJob()));+ fragment.add(link);++ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Artifacts")) {++ @Override+ public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {+ if (StringUtils.isNotBlank(rowModel.getObject().getArtifacts()))+ cellItem.add(new Label(componentId, rowModel.getObject().getArtifacts()));+ else+ cellItem.add(new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false));+ }++ });++ columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {+ Fragment fragment = new Fragment(componentId, "actionColumnFrag", DependencyListEditPanel.this);+ fragment.add(new AjaxLink<Void>("delete") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ dependencies.remove(rowModel.getObject());+ target.add(DependencyListEditPanel.this);+ }++ });+ cellItem.add(fragment);+ }++ @Override+ public String getCssClass() {+ return "actions";+ }++ });++ IDataProvider<DependencySpec> dataProvider = new ListDataProvider<DependencySpec>() {++ @Override+ protected List<DependencySpec> getData() {+ return dependencies;+ }++ };++ DataTable<DependencySpec, Void> dataTable;+ add(dataTable = new DataTable<DependencySpec, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE));+ dataTable.addTopToolbar(new HeadersToolbar<Void>(dataTable, null));+ dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));++ dataTable.add(new SortBehavior() {++ @Override+ protected void onSort(AjaxRequestTarget target, SortPosition from, SortPosition to) {+ int fromIndex = from.getItemIndex();+ int toIndex = to.getItemIndex();+ if (fromIndex < toIndex) {+ for (int i=0; i<toIndex-fromIndex; i++)+ Collections.swap(dependencies, fromIndex+i, fromIndex+i+1);+ } else {+ for (int i=0; i<fromIndex-toIndex; i++)+ Collections.swap(dependencies, fromIndex-i, fromIndex-i-1);+ }+ target.add(DependencyListEditPanel.this);+ }++ }.sortable("tbody"));++ setOutputMarkupId(true);+ }++ @Override+ protected String getErrorClass() {+ return null;+ }++ @Override+ public void onEvent(IEvent<?> event) {+ super.onEvent(event);++ if (event.getPayload() instanceof PropertyUpdating) {+ event.stop();+ onPropertyUpdating(((PropertyUpdating)event.getPayload()).getHandler());+ }+ }++ @Override+ protected List<Serializable> convertInputToValue() throws ConversionException {+ List<Serializable> value = new ArrayList<>();+ for (DependencySpec each: dependencies)+ value.add(each);+ return value;+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.javanew file mode 100644index 0000000000..da3b60003b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListEditSupport.java@@ -0,0 +1,61 @@+package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies;++import java.io.Serializable;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import io.onedev.server.ci.DependencySpec;+import io.onedev.server.ci.JobSpec;+import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EditableUtils;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;++@SuppressWarnings("serial")+public class DependencyListEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ if (descriptor.getBeanClass() == JobSpec.class && List.class.isAssignableFrom(descriptor.getPropertyClass())) {+ final Class<?> elementClass = EditableUtils.getElementClass(descriptor.getPropertyGetter().getGenericReturnType());+ if (elementClass == DependencySpec.class) {+ return new PropertyContext<List<Serializable>>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<List<Serializable>> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ if (model.getObject() != null) {+ return new DependencyListViewPanel(id, elementClass, model.getObject());+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<List<Serializable>> renderForEdit(String componentId, IModel<List<Serializable>> model) {+ return new DependencyListEditPanel(componentId, descriptor, model);+ }++ };+ }+ }+ return null;+ }++ @Override+ public int getPriority() {+ return 0;+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.html b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.htmlnew file mode 100644index 0000000000..5487f68dbe--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.html@@ -0,0 +1,10 @@+<wicket:panel>+ <div class="def-list dependency-list">+ <div class="body">+ <table wicket:id="dependencies" class="table table-condensed table-hover"></table>+ </div>+ </div>+ <wicket:fragment wicket:id="columnFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.javanew file mode 100644index 0000000000..ae5f848db2--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/dependencies/DependencyListViewPanel.java@@ -0,0 +1,186 @@+package io.onedev.server.web.page.project.blob.render.renderers.cispec.dependencies;++import java.io.Serializable;+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.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.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 com.google.common.base.Preconditions;++import io.onedev.server.ci.DependencySpec;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.layout.SideFloating;+import jersey.repackaged.com.google.common.collect.Sets;++@SuppressWarnings("serial")+public class DependencyListViewPanel extends Panel {++ private final List<DependencySpec> dependencies = new ArrayList<>();++ public DependencyListViewPanel(String id, Class<?> elementClass, List<Serializable> elements) {+ super(id);++ for (Serializable each: elements)+ dependencies.add((DependencySpec) each);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<IColumn<DependencySpec, Void>> columns = new ArrayList<>();++ columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Job")) {++ @Override+ public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {+ cellItem.add(new ColumnFragment(componentId, rowModel) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getJob());+ }++ });+ }+ });++ columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("Artifacts")) {++ @Override+ public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {+ cellItem.add(new ColumnFragment(componentId, rowModel) {++ @Override+ protected Component newLabel(String componentId) {+ String artifacts = rowModel.getObject().getArtifacts();+ if (StringUtils.isNotBlank(artifacts))+ return new Label(componentId, artifacts);+ else+ return new Label(componentId, "<i>Not specified</i>").setEscapeModelStrings(false);+ }++ });+ }+ });++ columns.add(new AbstractColumn<DependencySpec, Void>(Model.of("")) {++ @Override+ public void populateItem(Item<ICellPopulator<DependencySpec>> cellItem, String componentId, IModel<DependencySpec> rowModel) {+ cellItem.add(new ColumnFragment(componentId, rowModel) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);+ }++ });+ }++ @Override+ public String getCssClass() {+ return "ellipsis";+ }++ });++ IDataProvider<DependencySpec> dataProvider = new ListDataProvider<DependencySpec>() {++ @Override+ protected List<DependencySpec> getData() {+ return dependencies;+ }++ };++ add(new DataTable<DependencySpec, Void>("dependencies", columns, dataProvider, Integer.MAX_VALUE) {++ @Override+ protected void onInitialize() {+ super.onInitialize();+ addTopToolbar(new HeadersToolbar<Void>(this, null));+ addBottomToolbar(new NoRecordsToolbar(this));+ }++ });+ }++ private int getDependencyIndex(String job) {+ for (int i=0; i<dependencies.size(); i++) {+ if (dependencies.get(i).getJob().equals(job))+ return i;+ }+ return -1;+ }++ private abstract class ColumnFragment extends Fragment {++ private final int index;++ public ColumnFragment(String id, IModel<DependencySpec> model) {+ super(id, "columnFrag", DependencyListViewPanel.this, model);+ this.index = getDependencyIndex(getDependency().getJob());+ Preconditions.checkState(this.index != -1);+ }++ private DependencySpec getDependency() {+ return (DependencySpec) getDefaultModelObject();+ }++ protected abstract Component newLabel(String componentId);++ @Override+ protected void onInitialize() {+ super.onInitialize();+ AjaxLink<Void> link = new AjaxLink<Void>("link") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ new SideFloating(target, SideFloating.Placement.RIGHT) {++ @Override+ protected String getTitle() {+ return getDependency().getJob();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(AttributeAppender.append("class", "dependency def-detail"));+ }++ @Override+ protected Component newBody(String id) {+ return BeanContext.viewBean(id, getDependency(), Sets.newHashSet("job"), true);+ }++ };+ }++ };+ link.add(newLabel("label"));+ add(link);+ }++ }+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.javaindex 8063405ce8..7a20227596 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/jobparams/JobParamListViewPanel.java@@ -54,7 +54,14 @@ public class JobParamListViewPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new ColumnFragment(componentId, rowModel, rowModel.getObject().getName()));+ cellItem.add(new ColumnFragment(componentId, rowModel) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, rowModel.getObject().getName());+ }++ });}});@@ -63,7 +70,14 @@ public class JobParamListViewPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {InputSpec param = rowModel.getObject();- cellItem.add(new ColumnFragment(componentId, rowModel, EditableUtils.getDisplayName(param.getClass())));+ cellItem.add(new ColumnFragment(componentId, rowModel) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, EditableUtils.getDisplayName(param.getClass()));+ }++ });}});@@ -71,8 +85,14 @@ public class JobParamListViewPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- InputSpec param = rowModel.getObject();- cellItem.add(new ColumnFragment(componentId, rowModel, StringUtils.describe(param.isAllowEmpty())));+ cellItem.add(new ColumnFragment(componentId, rowModel) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, StringUtils.describe(rowModel.getObject().isAllowEmpty()));+ }++ });}});@@ -80,7 +100,15 @@ public class JobParamListViewPanel extends Panel {@Overridepublic void populateItem(Item<ICellPopulator<InputSpec>> cellItem, String componentId, IModel<InputSpec> rowModel) {- cellItem.add(new Label(componentId, "<a title='Click the row for more info'><i class='fa fa-ellipsis-h'></i></a>").setEscapeModelStrings(false));+ cellItem.add(new ColumnFragment(componentId, rowModel) {++ @Override+ protected Component newLabel(String componentId) {+ return new Label(componentId, "<i class='fa fa-ellipsis-h'></i>").setEscapeModelStrings(false);+ }++ });+}@Override@@ -119,23 +147,22 @@ public class JobParamListViewPanel extends Panel {return -1;}- private class ColumnFragment extends Fragment {+ private abstract class ColumnFragment extends Fragment {private final int index;- private final String label;-- public ColumnFragment(String id, IModel<InputSpec> model, String label) {+ public ColumnFragment(String id, IModel<InputSpec> model) {super(id, "columnFrag", JobParamListViewPanel.this, model);this.index = getParamIndex(getParam().getName());Preconditions.checkState(this.index != -1);- this.label = label;}private InputSpec getParam() {return (InputSpec) getDefaultModelObject();}+ protected abstract Component newLabel(String componentId);+@Overrideprotected void onInitialize() {super.onInitialize();@@ -165,7 +192,7 @@ public class JobParamListViewPanel extends Panel {}};- link.add(new Label("label", label));+ link.add(newLabel("label"));add(link);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.javaindex b903ae8424..80e4d7e540 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardColumnPanel.java@@ -68,7 +68,6 @@ import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.component.user.ident.UserIdentPanel.Mode;import io.onedev.server.web.page.project.issues.list.IssueListPage;-import io.onedev.server.web.util.ComponentContext;@SuppressWarnings("serial")abstract class BoardColumnPanel extends Panel implements EditContext {@@ -231,7 +230,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {InputSpec fieldSpec = getIssueSetting().getFieldSpec(identifyField);if (fieldSpec instanceof ChoiceInput) {ChoiceProvider choiceProvider = ((ChoiceInput)fieldSpec).getChoiceProvider();- OneContext.push(new ComponentContext(this));+ OneContext.push(new OneContext(this));try {color = choiceProvider.getChoices(true).get(getColumn());} finally {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.javaindex 01e4b356f8..6dc56ab548 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issueworkflowreconcile/UndefinedFieldValueResolution.java@@ -25,7 +25,6 @@ import io.onedev.server.web.editable.annotation.OmitName;import io.onedev.server.web.editable.annotation.ShowCondition;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.issueworkflowreconcile.WorkflowReconcilePanel.UndefinedFieldValueContainer;-import io.onedev.server.web.util.ComponentContext;import io.onedev.server.web.util.WicketUtils;@Editable@@ -70,12 +69,11 @@ public class UndefinedFieldValueResolution implements Serializable {@SuppressWarnings("unused")private static List<String> getValueChoices() {- UndefinedFieldValueContainer container = ((ComponentContext)OneContext.get())- .getComponent()+ UndefinedFieldValueContainer container = OneContext.get().getComponent().findParent(UndefinedFieldValueContainer.class);GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();InputSpec fieldSpec = Preconditions.checkNotNull(issueSetting.getFieldSpec(container.getFieldName()));- OneContext.push(new OneContext() {+ OneContext.push(new OneContext(container) {@Overridepublic Project getProject() {@@ -99,7 +97,7 @@ public class UndefinedFieldValueResolution implements Serializable {public InputContext getInputContext() {throw new UnsupportedOperationException();}-+});try {return new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());diff --git a/core/src/main/java/io/onedev/server/web/util/ComponentContext.java b/core/src/main/java/io/onedev/server/web/util/ComponentContext.javadeleted file mode 100644index c122b2da8c..0000000000--- a/core/src/main/java/io/onedev/server/web/util/ComponentContext.java+++ /dev/null@@ -1,43 +0,0 @@-package io.onedev.server.web.util;--import org.apache.wicket.Component;--import com.google.common.base.Preconditions;--import io.onedev.server.model.Project;-import io.onedev.server.util.EditContext;-import io.onedev.server.util.OneContext;-import io.onedev.server.util.inputspec.InputContext;--public class ComponentContext extends OneContext {-- private final Component component;-- public ComponentContext(Component component) {- this.component = component;- }-- @Override- public Project getProject() {- ProjectAware projectAware = component.findParent(ProjectAware.class);- if (projectAware != null)- return projectAware.getProject();- else- return null;- }-- @Override- public EditContext getEditContext(int level) {- return WicketUtils.findParents(component, EditContext.class).get(level);- }-- @Override- public InputContext getInputContext() {- return Preconditions.checkNotNull(WicketUtils.findInnermost(component, InputContext.class));- }-- public Component getComponent() {- return component;- }--}