The Unified and Autonomous Development Platform
feat: Able to define issue transion rules at project level (OD-2732)
Robin Shen5452dfca4467
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.javaindex 305eff6841..664e75733e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/CommandPalettePanel.java@@ -69,7 +69,7 @@ public abstract class CommandPalettePanel extends Panel {"~administration/cluster ~administration/audits ~administration/settings/time-tracking ${project}/~timesheets " +"${project}/~stats/pull-request/duration ${project}/~stats/pull-request/frequency ${project}/~stats/build/duration " +"${project}/~stats/build/frequency ${project}/~stats/issue/state-frequency ${project}/~stats/issue/state-duration " +- "${project}/~stats/issue/state-trend ${project}/~audits");+ "${project}/~stats/issue/state-trend ${project}/~audits ${project}/~settings/issue/state-transitions");static {for (IRequestMapper mapper: OneDev.getInstance(WebApplication.class).getRequestMappers())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.htmlindex 522204c03f..d81251550e 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@@ -1,8 +1,17 @@<wicket:extend><div class="text-muted mb-4">- <wicket:svg href="bulb" class="icon"/> <wicket:t>Define how issue states should be transited from one to another, either manually- or automatically when some events happen. And the rule can be configured to apply to certain projects and issues- via the applicable issues setting</wicket:t>+ <wicket:svg href="bulb" class="icon"/>+ <wicket:t>+ Define how issues move between states: manually by users, or automatically in response to events.+ The first matching rule applies.+ </wicket:t>++ <span wicket:id="ceNote"><wicket:t>+ <b>NOTE: </b> Transition rules can also be configured and overridden at project level in enterprise edition+ </wicket:t></span>+ <span wicket:id="eeNote"><wicket:t>+ <b>NOTE: </b> Transition rules can also be configured and overridden at project level+ </wicket:t></span></div><div wicket:id="transitions"></div></wicket:extend>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.javaindex 423b69a982..82addfa547 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@@ -6,6 +6,7 @@ import java.util.List;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -16,6 +17,7 @@ import io.onedev.server.service.SettingService;import io.onedev.server.util.CollectionUtils;import io.onedev.server.web.component.issue.transitionspec.StateTransitionListPanel;import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;+import io.onedev.server.web.util.WicketUtils;public class StateTransitionListPage extends IssueSettingPage {@@ -67,6 +69,9 @@ public class StateTransitionListPage extends IssueSettingPage {}});++ add(new WebMarkupContainer("ceNote").setVisible(!WicketUtils.isSubscriptionActive()));+ add(new WebMarkupContainer("eeNote").setVisible(WicketUtils.isSubscriptionActive()));}@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 68f731e07b..656f4a73c8 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -105,7 +105,6 @@ import io.onedev.server.web.page.project.setting.code.git.GitPackConfigPage;import io.onedev.server.web.page.project.setting.code.pullrequest.PullRequestSettingPage;import io.onedev.server.web.page.project.setting.code.tagprotection.TagProtectionsPage;import io.onedev.server.web.page.project.setting.general.GeneralProjectSettingPage;-import io.onedev.server.web.page.project.setting.issuesetting.ProjectStateTransitionListPage;import io.onedev.server.web.page.project.setting.pluginsettings.ContributedProjectSettingPage;import io.onedev.server.web.page.project.setting.servicedesk.ServiceDeskSettingPage;import io.onedev.server.web.page.project.setting.webhook.WebHooksPage;@@ -309,7 +308,10 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {settingMenuItems.add(new SidebarMenuItem.SubMenu(null, _T("Code"), codeSettingMenuItems));settingMenuItems.add(new SidebarMenuItem.Page(null, _T("Pull Request"),PullRequestSettingPage.class, PullRequestSettingPage.paramsOf(getProject())));-++ if (getProject().isIssueManagement() && WicketUtils.isSubscriptionActive())+ settingMenuItems.add(new SidebarMenuItem.SubMenu(null, _T("Issue"), new ArrayList<>()));+List<SidebarMenuItem> buildSettingMenuItems = new ArrayList<>();buildSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("Job Secrets"),@@ -328,13 +330,6 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {settingMenuItems.add(new SidebarMenuItem.Page(null, _T("Cache Management"),CacheManagementPage.class, CacheManagementPage.paramsOf(getProject())));- if (getProject().isIssueManagement()) {- List<SidebarMenuItem> issueSettingMenuItems = new ArrayList<>();- issueSettingMenuItems.add(new SidebarMenuItem.Page(null, _T("State Transitions"),- ProjectStateTransitionListPage.class, ProjectStateTransitionListPage.paramsOf(getProject())));- settingMenuItems.add(new SidebarMenuItem.SubMenu(null, _T("Issue"), issueSettingMenuItems));- }-if (getSettingService().getServiceDeskSetting() != null && getProject().isIssueManagement()) {settingMenuItems.add(new SidebarMenuItem.Page(null, _T("Service Desk"),ServiceDeskSettingPage.class, ServiceDeskSettingPage.paramsOf(getProject())));diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.htmlindex 5836cd9213..7bc9d5a257 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.html@@ -1,9 +1,13 @@<wicket:extend><div class="alert alert-notice bg-white shadow mb-5 text-gray"><wicket:svg href="bulb" class="icon mr-2"/>- <wicket:t>Define how issue states should be transited from one to another in this project. The effective rule list- when transiting issues is constructed by combining rules from this project, all parent projects, and the global- rules defined in administration.</wicket:t>+ <wicket:t>+ Define how issues may move from one state to another in this project. At evaluation time,+ rules from this project, each ancestor project up to the root, and the global rules are+ merged in that order; the first matching rule applies.+ </wicket:t>+ </div>+ <div class="card">+ <div wicket:id="transitions" class="card-body"></div></div>- <div wicket:id="transitions"></div></wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.javaindex af34dbeafc..6738ecf620 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/setting/issuesetting/ProjectStateTransitionListPage.java@@ -11,15 +11,21 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;import io.onedev.server.data.migration.VersionedXmlDoc;+import io.onedev.server.exception.NoSubscriptionException;import io.onedev.server.model.support.issue.transitionspec.TransitionSpec;import io.onedev.server.service.ProjectService;import io.onedev.server.util.CollectionUtils;import io.onedev.server.web.component.issue.transitionspec.StateTransitionListPanel;+import io.onedev.server.web.util.WicketUtils;public class ProjectStateTransitionListPage extends ProjectIssueSettingPage {public ProjectStateTransitionListPage(PageParameters params) {super(params);++ if (!WicketUtils.isSubscriptionActive()) {+ throw new NoSubscriptionException("Project level issue state transition rule definition");+ }}@Overridediff --git a/server-ee b/server-eeindex 2e2dcb43bb..879e65e186 160000--- a/server-ee+++ b/server-ee@@ -1 +1 @@-Subproject commit 2e2dcb43bbce759d57b4eb6e5af429b46bed5839+Subproject commit 879e65e18636f537d072e29fb45d09b268834303