The Unified and Autonomous Development Platform
Transition states are not updated upon state update. Allow to transit to same state
Robin Shen53bfb57cd3cb
diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.javaindex f3c0bdcd64..6ab857af87 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueChangeManager.java@@ -159,21 +159,19 @@ public class DefaultIssueChangeManager extends AbstractEntityManager<IssueChange@Overridepublic void changeState(Issue issue, String state, Map<String, Object> fieldValues, @Nullable String comment, @Nullable User user) {String prevState = issue.getState();- if (!prevState.equals(state)) {- Map<String, IssueField> prevFields = issue.getFields();- issue.setState(state);+ Map<String, IssueField> prevFields = issue.getFields();+ issue.setState(state);- issue.setFieldValues(fieldValues);-- issueFieldUnaryManager.saveFields(issue);-- IssueChange change = new IssueChange();- change.setIssue(issue);- change.setDate(new Date());- change.setUser(user);- change.setData(new IssueStateChangeData(prevState, issue.getState(), prevFields, issue.getFields(), comment));- save(change);- }+ issue.setFieldValues(fieldValues);++ issueFieldUnaryManager.saveFields(issue);++ IssueChange change = new IssueChange();+ change.setIssue(issue);+ change.setDate(new Date());+ change.setUser(user);+ change.setData(new IssueStateChangeData(prevState, issue.getState(), prevFields, issue.getFields(), comment));+ save(change);}@Transactionaldiff --git a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.javaindex 562b342dbe..6f37ff4a91 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/BoardSpec.java@@ -203,8 +203,12 @@ public class BoardSpec implements Serializable {if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {int index = getColumns().indexOf(entry.getKey());- if (index != -1)- getColumns().set(index, entry.getValue().getNewState());+ if (index != -1) {+ if (getColumns().contains(entry.getValue().getNewState()))+ getColumns().remove(index);+ else+ getColumns().set(index, entry.getValue().getNewState());+ }}}}@@ -261,8 +265,12 @@ public class BoardSpec implements Serializable {if (getIdentifyField().equals(entry.getKey()))setIdentifyField(resolution.getNewField());int index = getDisplayFields().indexOf(entry.getKey());- if (index != -1)- getDisplayFields().set(index, resolution.getNewField());+ if (index != -1) {+ if (getDisplayFields().contains(resolution.getNewField()))+ getDisplayFields().remove(index);+ else+ getDisplayFields().set(index, resolution.getNewField());+ }} else {getDisplayFields().remove(entry.getKey());if (getIdentifyField().equals(entry.getKey()))@@ -327,9 +335,12 @@ public class BoardSpec implements Serializable {public void onRenameField(GlobalIssueSetting issueSetting, String oldName, String newName) {if (getIdentifyField().equals(oldName))setIdentifyField(newName);- if (getDisplayFields().contains(oldName)) {- getDisplayFields().remove(oldName);- getDisplayFields().add(newName);+ int index = getDisplayFields().indexOf(oldName);+ if (index != -1) {+ if (getDisplayFields().contains(newName))+ getDisplayFields().remove(index);+ else+ getDisplayFields().set(index, newName);}if (getBaseQuery() != null) {try {@@ -353,9 +364,12 @@ public class BoardSpec implements Serializable {public void onRenameState(String oldName, String newName) {if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {- for (int i=0; i<getColumns().size(); i++) {- if (getColumns().get(i).equals(oldName))- getColumns().set(i, newName);+ int index = getColumns().indexOf(oldName);+ if (index != -1) {+ if (getColumns().contains(newName))+ getColumns().remove(index);+ else+ getColumns().set(index, newName);}}@@ -409,12 +423,8 @@ public class BoardSpec implements Serializable {}public boolean onDeleteState(String stateName) {- if (getIdentifyField().equals(IssueConstants.FIELD_STATE)) {- for (Iterator<String> it = getColumns().iterator(); it.hasNext();) {- if (it.next().equals(stateName))- it.remove();- }- }+ if (getIdentifyField().equals(IssueConstants.FIELD_STATE))+ getColumns().remove(stateName);if (getBaseQuery() != null) {try {io.onedev.server.search.entity.issue.IssueQuery query =@@ -444,10 +454,14 @@ public class BoardSpec implements Serializable {public boolean onEditFieldValues(String fieldName, ValueSetEdit valueSetEdit) {if (fieldName.equals(getIdentifyField())) {getColumns().removeAll(valueSetEdit.getDeletions());- for (int i=0; i<getColumns().size(); i++) {- String newValue = valueSetEdit.getRenames().get(getColumns().get(i));- if (newValue != null)- getColumns().set(i, newValue);+ for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {+ int index = getColumns().indexOf(entry.getKey());+ if (index != -1) {+ if (getColumns().contains(entry.getValue()))+ getColumns().remove(index);+ else+ getColumns().set(index, entry.getValue());+ }}}if (getBaseQuery() != null) {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.javaindex 4a0ac5bf68..32433e3a1b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueSetting.java@@ -272,6 +272,11 @@ public class IssueSetting implements Serializable {for (BoardSpec board: boardSpecs)undefinedStates.addAll(board.getUndefinedStates(project));}++ if (transitionSpecs != null) {+ for (TransitionSpec transition: transitionSpecs)+ undefinedStates.addAll(transition.getUndefinedStates());+ }return undefinedStates;}@@ -293,6 +298,11 @@ public class IssueSetting implements Serializable {for (BoardSpec board: boardSpecs)board.fixUndefinedStates(project, resolutions);}++ if (transitionSpecs != null) {+ for (TransitionSpec transition: transitionSpecs)+ transition.fixUndefinedStates(resolutions);+ }}public Collection<UndefinedFieldValue> getUndefinedFieldValues(Project project) {diff --git a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.javaindex 3d361376d4..3ee7d23d2c 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/TransitionSpec.java@@ -36,8 +36,9 @@ import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.Multiline;import io.onedev.server.web.editable.annotation.NameOfEmptyValue;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution;-import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldResolution.FixType;+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedFieldValue;+import io.onedev.server.web.page.project.issueworkflowreconcile.UndefinedStateResolution;import io.onedev.utils.StringUtils;@Editable@@ -125,8 +126,7 @@ public class TransitionSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldChoices() {List<String> fields = new ArrayList<>();- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- for (InputSpec field: issueSetting.getFieldSpecs())+ for (InputSpec field: getGlobalIssueSetting().getFieldSpecs())fields.add(field.getName());return fields;}@@ -200,19 +200,37 @@ public class TransitionSpec implements Serializable {return false;}+ public void onRenameState(String oldName, String newName) {+ int index = fromStates.indexOf(oldName);+ if (index != -1) {+ if (fromStates.contains(newName))+ fromStates.remove(index);+ else+ fromStates.set(index, newName);+ }+ if (toState.equals(oldName))+ toState = newName;+ }+public void onRenameField(String oldName, String newName) {if (getPrerequisite() != null && getPrerequisite().getInputName().equals(oldName))getPrerequisite().setInputName(newName);if (getTrigger() instanceof PressButtonTrigger) {PressButtonTrigger trigger = (PressButtonTrigger) getTrigger();- for (int i=0; i<trigger.getPromptFields().size(); i++) {- if (trigger.getPromptFields().get(i).equals(oldName))- trigger.getPromptFields().set(i, newName);+ int index = trigger.getPromptFields().indexOf(oldName);+ if (index != -1) {+ if (trigger.getPromptFields().contains(newName))+ trigger.getPromptFields().remove(index);+ else+ trigger.getPromptFields().set(index, newName);}}- for (int i=0; i<getRemoveFields().size(); i++) {- if (getRemoveFields().get(i).equals(oldName))- getRemoveFields().set(i, newName);+ int index = getRemoveFields().indexOf(oldName);+ if (index != -1) {+ if (getRemoveFields().contains(newName))+ getRemoveFields().remove(index);+ else+ getRemoveFields().set(index, newName);}}@@ -233,6 +251,11 @@ public class TransitionSpec implements Serializable {return false;}++ public boolean onDeleteState(String stateName) {+ fromStates.remove(stateName);+ return fromStates.isEmpty() || toState.equals(stateName);+ }public Collection<String> getUndefinedFields(GlobalIssueSetting globalSetting) {Collection<String> undefinedFields = new HashSet<>();@@ -267,20 +290,28 @@ public class TransitionSpec implements Serializable {if (getPrerequisite().getValueMatcher() instanceof ValueIsOneOf) {ValueIsOneOf valueIsOneOf = (ValueIsOneOf) getPrerequisite().getValueMatcher();valueIsOneOf.getValues().removeAll(valueSetEdit.getDeletions());- for (int i=0; i<valueIsOneOf.getValues().size(); i++) {- String newValue = valueSetEdit.getRenames().get(valueIsOneOf.getValues().get(i));- if (newValue != null)- valueIsOneOf.getValues().set(i, newValue);+ for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {+ int index = valueIsOneOf.getValues().indexOf(entry.getKey());+ if (index != -1) {+ if (valueIsOneOf.getValues().contains(entry.getValue()))+ valueIsOneOf.getValues().remove(index);+ else+ valueIsOneOf.getValues().set(index, entry.getValue());+ }}if (valueIsOneOf.getValues().isEmpty())setPrerequisite(null);} else if (getPrerequisite().getValueMatcher() instanceof ValueIsNotAnyOf) {ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) getPrerequisite().getValueMatcher();valueIsNotAnyOf.getValues().removeAll(valueSetEdit.getDeletions());- for (int i=0; i<valueIsNotAnyOf.getValues().size(); i++) {- String newValue = valueSetEdit.getRenames().get(valueIsNotAnyOf.getValues().get(i));- if (newValue != null)- valueIsNotAnyOf.getValues().set(i, newValue);+ for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {+ int index = valueIsNotAnyOf.getValues().indexOf(entry.getKey());+ if (index != -1) {+ if (valueIsNotAnyOf.getValues().contains(entry.getValue()))+ valueIsNotAnyOf.getValues().remove(index);+ else+ valueIsNotAnyOf.getValues().set(index, entry.getValue());+ }}if (valueIsNotAnyOf.getValues().isEmpty())setPrerequisite(null);@@ -299,9 +330,8 @@ public class TransitionSpec implements Serializable {@SuppressWarnings("unused")private static List<String> getStateChoices() {- GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();List<String> stateNames = new ArrayList<>();- for (StateSpec state: issueSetting.getStateSpecs())+ for (StateSpec state: getGlobalIssueSetting().getStateSpecs())stateNames.add(state.getName());return stateNames;}@@ -328,13 +358,16 @@ public class TransitionSpec implements Serializable {}return false;}++ private static GlobalIssueSetting getGlobalIssueSetting() {+ return OneDev.getInstance(SettingManager.class).getIssueSetting();+ }public Collection<UndefinedFieldValue> getUndefinedFieldValues() {Collection<UndefinedFieldValue> undefinedFieldValues = new HashSet<>();if (prerequisite != null) {ValueMatcher valueMatcher = prerequisite.getValueMatcher();- GlobalIssueSetting globalIssueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();- SpecifiedChoices specifiedChoices = SpecifiedChoices.of(globalIssueSetting.getFieldSpec(prerequisite.getInputName()));+ SpecifiedChoices specifiedChoices = SpecifiedChoices.of(getGlobalIssueSetting().getFieldSpec(prerequisite.getInputName()));if (specifiedChoices != null) {if (valueMatcher instanceof ValueIsOneOf) {ValueIsOneOf valueIsOneOf = (ValueIsOneOf) valueMatcher;@@ -353,5 +386,30 @@ public class TransitionSpec implements Serializable {}return undefinedFieldValues;}-++ public Collection<? extends String> getUndefinedStates() {+ Collection<String> undefinedStates = new HashSet<>();+ if (getGlobalIssueSetting().getStateSpec(toState) == null)+ undefinedStates.add(toState);+ for (String fromState: fromStates) {+ if (getGlobalIssueSetting().getStateSpec(fromState) == null)+ undefinedStates.add(fromState);+ }+ return undefinedStates;+ }++ public void fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {+ for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {+ if (toState.equals(entry.getKey()))+ toState = entry.getValue().getNewState();+ int index = fromStates.indexOf(entry.getKey());+ if (index != -1) {+ if (fromStates.contains(entry.getValue().getNewState()))+ fromStates.remove(index);+ else+ fromStates.set(index, entry.getValue().getNewState());+ }+ }+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.javaindex 85dea62c85..5de3383963 100644--- a/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java+++ b/core/src/main/java/io/onedev/server/model/support/setting/GlobalIssueSetting.java@@ -315,9 +315,7 @@ public class GlobalIssueSetting implements Serializable {public void onDeleteState(String stateName) {for (Iterator<TransitionSpec> it = getDefaultTransitionSpecs().iterator(); it.hasNext();) {- TransitionSpec transition = it.next();- transition.getFromStates().remove(stateName);- if (transition.getFromStates().isEmpty() || transition.getToState().equals(stateName))+ if (it.next().onDeleteState(stateName))it.remove();}for (Iterator<BoardSpec> it = getDefaultBoardSpecs().iterator(); it.hasNext();) {@@ -339,13 +337,8 @@ public class GlobalIssueSetting implements Serializable {}public void onRenameState(String oldName, String newName) {- for (TransitionSpec transition: getDefaultTransitionSpecs()) {- int index = transition.getFromStates().indexOf(oldName);- if (index != -1)- transition.getFromStates().set(index, newName);- if (transition.getToState().equals(oldName))- transition.setToState(newName);- }+ for (TransitionSpec transition: getDefaultTransitionSpecs())+ transition.onRenameState(oldName, newName);for (BoardSpec board: getDefaultBoardSpecs())board.onRenameState(oldName, newName);for (NamedIssueQuery namedQuery: getDefaultQueries()) {diff --git a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.javaindex 5360d8e139..e97d9102aa 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/InputSpec.java@@ -344,20 +344,28 @@ public abstract class InputSpec implements Serializable {if (showCondition.getValueMatcher() instanceof ValueIsOneOf) {ValueIsOneOf valueIsOneOf = (ValueIsOneOf) showCondition.getValueMatcher();valueIsOneOf.getValues().removeAll(valueSetEdit.getDeletions());- for (int i=0; i<valueIsOneOf.getValues().size(); i++) {- String newValue = valueSetEdit.getRenames().get(valueIsOneOf.getValues().get(i));- if (newValue != null)- valueIsOneOf.getValues().set(i, newValue);+ for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {+ int index = valueIsOneOf.getValues().indexOf(entry.getKey());+ if (index != -1) {+ if (valueIsOneOf.getValues().contains(entry.getValue()))+ valueIsOneOf.getValues().remove(index);+ else+ valueIsOneOf.getValues().set(index, entry.getValue());+ }}if (valueIsOneOf.getValues().isEmpty())showCondition = null;} else if (showCondition.getValueMatcher() instanceof ValueIsNotAnyOf) {ValueIsNotAnyOf valueIsNotAnyOf = (ValueIsNotAnyOf) showCondition.getValueMatcher();valueIsNotAnyOf.getValues().removeAll(valueSetEdit.getDeletions());- for (int i=0; i<valueIsNotAnyOf.getValues().size(); i++) {- String newValue = valueSetEdit.getRenames().get(valueIsNotAnyOf.getValues().get(i));- if (newValue != null)- valueIsNotAnyOf.getValues().set(i, newValue);+ for (Map.Entry<String, String> entry: valueSetEdit.getRenames().entrySet()) {+ int index = valueIsNotAnyOf.getValues().indexOf(entry.getKey());+ if (index != -1) {+ if (valueIsNotAnyOf.getValues().contains(entry.getValue()))+ valueIsNotAnyOf.getValues().remove(index);+ else+ valueIsNotAnyOf.getValues().set(index, entry.getValue());+ }}if (valueIsNotAnyOf.getValues().isEmpty())showCondition = null;diff --git a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.javaindex da5eb31fe4..c3ea8e0fdd 100644--- a/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java+++ b/core/src/main/java/io/onedev/server/util/inputspec/choiceinput/choiceprovider/SpecifiedChoices.java@@ -1,21 +1,27 @@package io.onedev.server.util.inputspec.choiceinput.choiceprovider;import java.util.ArrayList;+import java.util.HashSet;import java.util.LinkedHashMap;import java.util.List;import java.util.Map;+import java.util.Set;import java.util.stream.Collectors;import javax.annotation.Nullable;+import javax.validation.ConstraintValidatorContext;import javax.validation.constraints.Size;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.util.validation.Validatable;+import io.onedev.server.util.validation.annotation.ClassValidating;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;@Editable(order=100, name="Use specified choices")-public class SpecifiedChoices extends ChoiceProvider {+@ClassValidating+public class SpecifiedChoices extends ChoiceProvider implements Validatable {private static final long serialVersionUID = 1L;@@ -53,5 +59,20 @@ public class SpecifiedChoices extends ChoiceProvider {}return null;}++ @Override+ public boolean isValid(ConstraintValidatorContext context) {+ Set<String> existing = new HashSet<>();+ for (Choice choice: choices) {+ if (existing.contains(choice.getValue())) {+ context.disableDefaultConstraintViolation();+ context.buildConstraintViolationWithTemplate("Duplicate choice: " + choice.getValue()).addConstraintViolation();+ return false;+ } else {+ existing.add(choice.getValue());+ }+ }+ return true;+ }}diff --git a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.javaindex b412129e9a..b275456f03 100644--- a/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issue/statetransition/TransitionEditPanel.java@@ -19,7 +19,6 @@ import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;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")@@ -78,18 +77,11 @@ abstract class TransitionEditPanel extends Panel implements InputContext {protected void onSubmit(AjaxRequestTarget target, Form<?> form) {super.onSubmit(target, form);- if (transition.getFromStates().contains(transition.getToState())) {- String error = "Can not do transition between same state";- editor.getErrorContext(new PathSegment.Property("fromStates")).addError(error);- editor.getErrorContext(new PathSegment.Property("toState")).addError(error);- target.add(form);- } else {- if (transitionIndex != -1)- transitions.set(transitionIndex, transition);- else- transitions.add(transition);- onChanged(target);- }+ if (transitionIndex != -1)+ transitions.set(transitionIndex, transition);+ else+ transitions.add(transition);+ onChanged(target);}});diff --git a/core/src/main/java/io/onedev/server/web/page/base/base.js b/core/src/main/java/io/onedev/server/web/page/base/base.jsindex 512dd05413..162adb8595 100644--- a/core/src/main/java/io/onedev/server/web/page/base/base.js+++ b/core/src/main/java/io/onedev/server/web/page/base/base.js@@ -282,7 +282,11 @@ onedev.server = {var focusibleSelector = "input[type=text]:visible, input:not([type]):visible, textarea:visible, .CodeMirror:visible";var inErrorSelector = ".has-error:visible:first";- var $inError = $containers.find(inErrorSelector).addBack(inErrorSelector);+ var $inError = $containers.find(inErrorSelector).addBack(inErrorSelector);+ if ($inError.length == 0) {+ inErrorSelector = ".feedbackPanelERROR:visible:first";+ $inError = $containers.find(inErrorSelector).addBack(inErrorSelector);+ }if ($inError.length != 0) {var $focusable = $inError.find(focusibleSelector).addBack(focusibleSelector);if ($focusable.hasClass("CodeMirror") && $this[0].CodeMirror.options.readOnly == false) {