Skip to content

The Unified and Autonomous Development Platform

Fix issue #813 - State transition UI can become very confusing

Robin Shen9df7795d1fb6
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
index 446b37eab6..19ee00c09f 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BranchUpdateTrigger.java
@@ -59,9 +59,9 @@ public class BranchUpdateTrigger extends TransitionTrigger {
@Override
public String getDescription() {
if (branches != null)
- return "Committed to branches '" + branches + "'";
+ return "code is committed to branches '" + branches + "'";
else
- return "Committed to any branch";
+ return "code is committed to any branch";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
index 0cfa491468..22c832f107 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/BuildSuccessfulTrigger.java
@@ -94,14 +94,14 @@ public class BuildSuccessfulTrigger extends TransitionTrigger {
public String getDescription() {
if (jobNames != null) {
if (branches != null)
- return "Build is successful for jobs '" + jobNames + "' on branches '" + branches + "'";
+ return "build is successful for jobs '" + jobNames + "' on branches '" + branches + "'";
else
- return "Build is successful for jobs '" + jobNames + "' on any branch";
+ return "build is successful for jobs '" + jobNames + "' on any branch";
} else {
if (branches != null)
- return "Build is successful for any job on branches '" + branches + "'";
+ return "build is successful for any job on branches '" + branches + "'";
else
- return "Build is successful for any job and branch";
+ return "build is successful for any job and branch";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequestTrigger.java
index dffacc7876..e3b176ad4b 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/DiscardPullRequestTrigger.java
@@ -10,9 +10,9 @@ public class DiscardPullRequestTrigger extends PullRequestTrigger {
@Override
public String getDescription() {
if (getBranches() != null)
- return "Pull request to branches '" + getBranches() + "' is discarded";
+ return "pull request to branches '" + getBranches() + "' is discarded";
else
- return "Pull request to any branch is discarded";
+ return "pull request to any branch is discarded";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequestTrigger.java
index 108cc723f8..1762e51047 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/MergePullRequestTrigger.java
@@ -10,9 +10,9 @@ public class MergePullRequestTrigger extends PullRequestTrigger {
@Override
public String getDescription() {
if (getBranches() != null)
- return "Pull request to branches '" + getBranches() + "' is merged";
+ return "pull request to branches '" + getBranches() + "' is merged";
else
- return "Pull request to any branch is merged";
+ return "pull request to any branch is merged";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/NoActivityTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/NoActivityTrigger.java
index 34f00ed498..aaf560c522 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/NoActivityTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/NoActivityTrigger.java
@@ -23,7 +23,7 @@ public class NoActivityTrigger extends TransitionTrigger {
@Override
public String getDescription() {
- return "No activity for " + days + " days";
+ return "no activity for " + days + " days";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequestTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequestTrigger.java
index 805e2f8c9d..201f0e89cd 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequestTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/OpenPullRequestTrigger.java
@@ -10,9 +10,9 @@ public class OpenPullRequestTrigger extends PullRequestTrigger {
@Override
public String getDescription() {
if (getBranches() != null)
- return "Pull request to branches '" + getBranches() + "' is opened";
+ return "pull request to branches '" + getBranches() + "' is opened";
else
- return "Pull request to any branch is opened";
+ return "pull request to any branch is opened";
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
index 61ff9713a5..1a5b34a61c 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/PressButtonTrigger.java
@@ -214,9 +214,9 @@ public class PressButtonTrigger extends TransitionTrigger {
@Override
public String getDescription() {
if (authorizedRoles.isEmpty())
- return "Button '" + buttonLabel + "' is pressed by any user";
+ return "button '" + buttonLabel + "' is pressed by any user";
else
- return "Button '" + buttonLabel + "' is pressed by any user of roles " + authorizedRoles;
+ return "button '" + buttonLabel + "' is pressed by any user of roles " + authorizedRoles;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
index 6e83b2921b..0660832d39 100644
--- a/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
+++ b/server-core/src/main/java/io/onedev/server/model/support/issue/transitiontrigger/StateTransitionTrigger.java
@@ -54,7 +54,7 @@ public class StateTransitionTrigger extends TransitionTrigger {
@Override
public String getDescription() {
- return "State of an issue is transited to " + states;
+ return "state of an issue is transited to " + states;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
index a27b792572..95d788cb48 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.html
@@ -8,6 +8,15 @@
<a wicket:id="addNew" class="btn btn-icon btn-primary mb-4" title="Add issue state transition"><wicket:svg href="plus" class="icon"></wicket:svg></a>
<table wicket:id="stateTransitions" class="table table-hover"></table>
</div>
+ <wicket:fragment wicket:id="descriptionFrag">
+ <div class="font-weight-bolder text-nowrap mb-2">
+ <span wicket:id="fromStates"></span>
+ <wicket:svg href="arrow3" class="icon"/>
+ <span wicket:id="toState"></span>
+ </div>
+ <div wicket:id="when" class="mb-2"></div>
+ <div wicket:id="applicable"></div>
+ </wicket:fragment>
<wicket:fragment wicket:id="actionColumnFrag">
<a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary mr-1" title="More"><wicket:svg href="ellipsis" class="icon"></wicket:svg></a>
<a wicket:id="delete" class="btn btn-xs btn-icon btn-light btn-hover-danger" title="Delete"><wicket:svg href="trash" class="icon"></wicket:svg></a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
index 7dbf759645..4f05b46aa2 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/transitionspec/StateTransitionListPage.java
@@ -109,37 +109,27 @@ public class StateTransitionListPage extends IssueSettingPage {
});
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("From States")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- TransitionSpec transition = rowModel.getObject();
- cellItem.add(new Label(componentId, StringUtils.join(transition.getFromStates())));
- }
-
- });
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("To State")) {
-
- @Override
- public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
- TransitionSpec transition = rowModel.getObject();
- cellItem.add(new Label(componentId, transition.getToState()));
- }
-
- });
-
- columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("Do Transition When")) {
+ columns.add(new AbstractColumn<TransitionSpec, Void>(Model.of("")) {
@Override
public void populateItem(Item<ICellPopulator<TransitionSpec>> cellItem, String componentId, IModel<TransitionSpec> rowModel) {
TransitionSpec transition = rowModel.getObject();
- cellItem.add(new Label(componentId, transition.getTrigger().getDescription()));
- }
-
- @Override
- public String getCssClass() {
- return "d-none d-lg-table-cell";
+ Fragment fragment = new Fragment(componentId, "descriptionFrag", StateTransitionListPage.this);
+ if (transition.getFromStates().size() > 1)
+ fragment.add(new Label("fromStates", "[" + StringUtils.join(transition.getFromStates(), ",") + "]"));
+ else
+ fragment.add(new Label("fromStates", transition.getFromStates().iterator().next()));
+
+ fragment.add(new Label("toState", transition.getToState()));
+
+ fragment.add(new Label("when", "When " + transition.getTrigger().getDescription()));
+
+ if (transition.getTrigger().getIssueQuery() != null)
+ fragment.add(new Label("applicable", "For issues matching: " + transition.getTrigger().getIssueQuery()));
+ else
+ fragment.add(new Label("applicable", "For all issues"));
+
+ cellItem.add(fragment);
}
});