The Unified and Autonomous Development Platform
Remove scenario from Input
robin shenbe237a4786db
diff --git a/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.javaindex be5d49f1b9..fbd2e23e5e 100644--- a/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issueworkflow/IssueWorkflow.java@@ -2,9 +2,7 @@ package io.onedev.server.model.support.issueworkflow;import java.io.Serializable;import java.util.ArrayList;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;import io.onedev.server.util.input.Input;import io.onedev.server.util.input.InputContext;@@ -34,19 +32,19 @@ public class IssueWorkflow implements Serializable, InputContext {}@Override- public List<String> getScenarios() {- List<String> scenarios = new ArrayList<>();- for (StateSpec state: getStateSpecs())- scenarios.add(state.getName());- return scenarios;- }-- @Override- public Map<String, Input> getInputs() {- Map<String, Input> inputs = new LinkedHashMap<>();+ public List<String> getInputNames() {+ List<String> inputNames = new ArrayList<>();for (Input field: getFieldSpecs())- inputs.put(field.getName(), field);- return inputs;+ inputNames.add(field.getName());+ return inputNames;}+ @Override+ public Input getInput(String inputName) {+ for (Input field: getFieldSpecs()) {+ if (field.getName().equals(inputName))+ return field;+ }+ throw new RuntimeException("Unable to find input with name: " + inputName);+ }}diff --git a/core/src/main/java/io/onedev/server/util/input/Input.java b/core/src/main/java/io/onedev/server/util/input/Input.javaindex 2fd93d7fc4..4e904494ac 100644--- a/core/src/main/java/io/onedev/server/util/input/Input.java+++ b/core/src/main/java/io/onedev/server/util/input/Input.java@@ -6,7 +6,6 @@ import java.util.List;import java.util.Map;import javax.annotation.Nullable;-import javax.validation.constraints.Size;import org.apache.commons.lang.SerializationUtils;import org.hibernate.validator.constraints.NotEmpty;@@ -18,7 +17,6 @@ import com.google.common.collect.Lists;import io.onedev.server.util.GroovyUtils;import io.onedev.server.util.OneContext;-import io.onedev.server.util.editable.annotation.ChoiceProvider;import io.onedev.server.util.editable.annotation.Editable;import io.onedev.server.util.editable.annotation.NameOfEmptyValue;import io.onedev.server.util.input.showcondition.ShowCondition;@@ -54,8 +52,6 @@ public abstract class Input implements Serializable {private String name;- private List<String> scenarios;-private String description;private boolean allowEmpty;@@ -74,17 +70,6 @@ public abstract class Input implements Serializable {this.name = name;}- @Editable(name="resource.input.scenariosName", order=20, description="resource.input.scenariosDescription")- @ChoiceProvider("getScenarioChoices")- @Size(min=1, max=100)- public List<String> getScenarios() {- return scenarios;- }-- public void setScenarios(List<String> scenarios) {- this.scenarios = scenarios;- }-@Editable(order=30, description="resource.input.description")public String getDescription() {return description;@@ -227,11 +212,6 @@ public abstract class Input implements Serializable {}}- @SuppressWarnings("unused")- private static List<String> getScenarioChoices() {- return OneContext.get().getInputContext().getScenarios();- }-public static Class<?> defineClass(String className, List<Input> inputs) {StringBuffer buffer = new StringBuffer();buffer.append("import org.apache.commons.lang3.SerializationUtils;\n");diff --git a/core/src/main/java/io/onedev/server/util/input/InputContext.java b/core/src/main/java/io/onedev/server/util/input/InputContext.javaindex e96ef2daa4..2be4cefd93 100644--- a/core/src/main/java/io/onedev/server/util/input/InputContext.java+++ b/core/src/main/java/io/onedev/server/util/input/InputContext.java@@ -1,12 +1,11 @@package io.onedev.server.util.input;import java.util.List;-import java.util.Map;public interface InputContext {- List<String> getScenarios();+ List<String> getInputNames();- Map<String, Input> getInputs();+ Input getInput(String inputName);}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ShowCondition.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ShowCondition.javaindex ebf145bd1f..0b72cf93fa 100644--- a/core/src/main/java/io/onedev/server/util/input/showcondition/ShowCondition.java+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ShowCondition.java@@ -47,11 +47,11 @@ public class ShowCondition implements Serializable {@SuppressWarnings("unused")private static List<String> getNameChoices() {- return new ArrayList<>(OneContext.get().getInputContext().getInputs().keySet());+ return new ArrayList<>(OneContext.get().getInputContext().getInputNames());}public boolean isVisible() {- Input input = OneContext.get().getInputContext().getInputs().get(getInputName());+ Input input = OneContext.get().getInputContext().getInput(getInputName());String inputValue = input.toString(OneContext.get().getEditContext().getOnScreenValue(getInputName()));return getValueMatcher().matches(inputValue);}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotAnyOf.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotAnyOf.javaindex 0f685c63d5..37c72a8b9c 100644--- a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotAnyOf.java+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsNotAnyOf.java@@ -35,7 +35,7 @@ public class ValueIsNotAnyOf implements ValueMatcher {// Access on-screen value of ShowCondition.fiedNameString inputName = (String) OneContext.get().getEditContext(1).getOnScreenValue("inputName");if (inputName != null)- return OneContext.get().getInputContext().getInputs().get(inputName).getPossibleValues();+ return OneContext.get().getInputContext().getInput(inputName).getPossibleValues();elsereturn Lists.newArrayList();}diff --git a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsOneOf.java b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsOneOf.javaindex bf835d4408..1364fad72e 100644--- a/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsOneOf.java+++ b/core/src/main/java/io/onedev/server/util/input/showcondition/ValueIsOneOf.java@@ -35,7 +35,7 @@ public class ValueIsOneOf implements ValueMatcher {// Access on-screen value of ShowCondition.fiedNameString inputName = (String) OneContext.get().getEditContext(1).getOnScreenValue("inputName");if (inputName != null)- return OneContext.get().getInputContext().getInputs().get(inputName).getPossibleValues();+ return OneContext.get().getInputContext().getInput(inputName).getPossibleValues();elsereturn Lists.newArrayList();}diff --git a/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.javaindex 0fc42dbc39..a7d7a89afd 100644--- a/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/issues/newissue/NewIssuePage.java@@ -2,7 +2,6 @@ package io.onedev.server.web.page.project.issues.newissue;import java.io.Serializable;import java.util.List;-import java.util.Map;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;@@ -57,13 +56,13 @@ public class NewIssuePage extends ProjectPage implements InputContext {}@Override- public List<String> getScenarios() {- return getProject().getIssueWorkflow().getScenarios();+ public List<String> getInputNames() {+ return getProject().getIssueWorkflow().getInputNames();}@Override- public Map<String, Input> getInputs() {- return getProject().getIssueWorkflow().getInputs();+ public Input getInput(String inputName) {+ return getProject().getIssueWorkflow().getInput(inputName);}}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.java b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.javaindex 6b60d1d080..3c43a2deac 100644--- a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.java+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/FieldEditPanel.java@@ -1,8 +1,7 @@package io.onedev.server.web.page.project.setting.issuecustomfields;-import java.util.LinkedHashMap;+import java.util.ArrayList;import java.util.List;-import java.util.Map;import javax.annotation.Nullable;@@ -153,20 +152,19 @@ abstract class FieldEditPanel extends Panel implements InputContext {protected abstract void onCancel(AjaxRequestTarget target);@Override- public Map<String, Input> getInputs() {- Map<String, Input> inputs = new LinkedHashMap<>();+ public List<String> getInputNames() {+ List<String> inputNames = new ArrayList<>();int currentIndex = 0;for (Input field: getFields()) {if (currentIndex != fieldIndex)- inputs.put(field.getName(), field);+ inputNames.add(field.getName());currentIndex++;}- return inputs;+ return inputNames;}@Override- public List<String> getScenarios() {- return getProject().getIssueWorkflow().getScenarios();+ public Input getInput(String inputName) {+ return getField(inputName);}-}diff --git a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.java b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.javaindex d243e48c57..4d85625a4e 100644--- a/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.java+++ b/web/src/main/java/io/onedev/server/web/page/project/setting/issuecustomfields/IssueCustomFieldsPage.java@@ -39,7 +39,6 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.layout.SideFloating;import io.onedev.server.web.page.project.setting.ProjectSettingPage;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;-import io.onedev.utils.StringUtils;import jersey.repackaged.com.google.common.collect.Sets;@SuppressWarnings("serial")@@ -105,15 +104,6 @@ public class IssueCustomFieldsPage extends ProjectSettingPage {}});- columns.add(new AbstractColumn<Input, Void>(Model.of("Applicable Issue States")) {-- @Override- public void populateItem(Item<ICellPopulator<Input>> cellItem, String componentId, IModel<Input> rowModel) {- Input field = rowModel.getObject();- cellItem.add(new ColumnFragment(componentId, rowModel, StringUtils.join(field.getScenarios(), ", "), false));- }- });-columns.add(new AbstractColumn<Input, Void>(Model.of("Description")) {@Override