Skip to content

The Unified and Autonomous Development Platform

fix: error attaching this container for rendering: [IssueStatsPanel (#1493)

Robin Shenbbe4327e8d16
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index c2c3561fa5..6729f9bc57 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -1053,21 +1053,22 @@ public class ProjectListPanel extends Panel {
}
if (project.isIssueManagement()) {
- fragment.add(new IssueStatsPanel("issueStats", rowModel, new LoadableDetachableModel<Map<Integer, Long>>() {
-
+ fragment.add(new IssueStatsPanel("issueStats", rowModel, new LoadableDetachableModel<>() {
+
@Override
protected Map<Integer, Long> load() {
Map<Integer, Long> stateCounts = new LinkedHashMap<>();
GlobalIssueSetting issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
- for (ProjectIssueStats stats: issueStatsModel.getObject()) {
- if (stats.getProjectId().equals(projectId)
+ for (ProjectIssueStats stats : issueStatsModel.getObject()) {
+ if (stats.getProjectId().equals(projectId)
+ && stats.getStateOrdinal() >= 0
&& stats.getStateOrdinal() < issueSetting.getStateSpecs().size()) {
stateCounts.put(stats.getStateOrdinal(), stats.getStateCount());
}
}
return stateCounts;
}
-
+
}));
} else {
fragment.add(new WebMarkupContainer("issueStats").setVisible(false));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java
index a20a07314f..df6d6335b6 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/issue/IssueStatsPanel.java
@@ -70,13 +70,13 @@ public class IssueStatsPanel extends Panel {
}));
add(issuesLink);
- add(new ListView<Map.Entry<Integer, Long>>("states", new LoadableDetachableModel<List<Map.Entry<Integer, Long>>>() {
+ add(new ListView<>("states", new LoadableDetachableModel<List<Map.Entry<Integer, Long>>>() {
@Override
protected List<Map.Entry<Integer, Long>> load() {
return new ArrayList<>(getStats().entrySet());
}
-
+
}) {
@Override
@@ -93,7 +93,7 @@ public class IssueStatsPanel extends Panel {
stateLink.add(AttributeAppender.append("style", "color:" + stateSpec.getColor()));
item.add(stateLink);
}
-
+
});
}
diff --git a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
index 4d39d3ba06..f09218b216 100644
--- a/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
+++ b/server-core/src/main/java/io/onedev/server/web/mapper/BaseUrlMapper.java
@@ -23,6 +23,7 @@ import io.onedev.server.web.page.admin.groupmanagement.profile.GroupProfilePage;
import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;
import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.integritycheck.CheckIssueIntegrityPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
@@ -293,6 +294,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {
add(new BasePageMapper("~administration/settings/issue-links", LinkSpecListPage.class));
add(new BasePageMapper("~administration/settings/issue-templates", IssueTemplateListPage.class));
add(new BasePageMapper("~administration/settings/commit-message-fix-patterns", CommitMessageFixPatternsPage.class));
+ add(new BasePageMapper("~administration/settings/check-issue-integrity", CheckIssueIntegrityPage.class));
add(new BasePageMapper("~administration/settings/branding", BrandingSettingPage.class));
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/integritycheck/CheckIssueIntegrityPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/integritycheck/CheckIssueIntegrityPage.html
new file mode 100644
index 0000000000..fa2aba62e0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/integritycheck/CheckIssueIntegrityPage.html
@@ -0,0 +1,7 @@
+<wicket:extend>
+ <div class="alert alert-notice alert-light">
+ In rare cases, your issues might be out of sync with workflow settings (undefined state/field etc.).
+ Run integrity check below to find problems and get them fixed.
+ </div>
+ <a wicket:id="run" class="btn btn-primary mt-2">Run Integrity Check</a>
+</wicket:extend>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/integritycheck/CheckIssueIntegrityPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/integritycheck/CheckIssueIntegrityPage.java
new file mode 100644
index 0000000000..5f3f4acdfc
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/issuesetting/integritycheck/CheckIssueIntegrityPage.java
@@ -0,0 +1,46 @@
+package io.onedev.server.web.page.admin.issuesetting.integritycheck;
+
+import io.onedev.server.web.component.issue.workflowreconcile.WorkflowReconcilePanel;
+import io.onedev.server.web.component.modal.ModalLink;
+import io.onedev.server.web.component.modal.ModalPanel;
+import io.onedev.server.web.page.admin.issuesetting.IssueSettingPage;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+public class CheckIssueIntegrityPage extends IssueSettingPage {
+ public CheckIssueIntegrityPage(PageParameters params) {
+ super(params);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(new ModalLink("run") {
+
+ @Override
+ protected Component newContent(String id, ModalPanel modal) {
+ return new WorkflowReconcilePanel(id) {
+
+ @Override
+ protected void onCancel(AjaxRequestTarget target) {
+ modal.close();
+ }
+
+ @Override
+ protected void onCompleted(AjaxRequestTarget target) {
+ setResponsePage(CheckIssueIntegrityPage.class);
+ }
+
+ };
+ }
+
+ });
+ }
+
+ @Override
+ protected Component newTopbarTitle(String componentId) {
+ return new Label(componentId, "Check Issue Integrity");
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
index 3f2b199175..fb38026997 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.java
@@ -44,6 +44,7 @@ import io.onedev.server.web.page.admin.groupmanagement.create.NewGroupPage;
import io.onedev.server.web.page.admin.issuesetting.commitmessagefixpatterns.CommitMessageFixPatternsPage;
import io.onedev.server.web.page.admin.issuesetting.defaultboard.DefaultBoardListPage;
import io.onedev.server.web.page.admin.issuesetting.fieldspec.IssueFieldListPage;
+import io.onedev.server.web.page.admin.issuesetting.integritycheck.CheckIssueIntegrityPage;
import io.onedev.server.web.page.admin.issuesetting.issuetemplate.IssueTemplateListPage;
import io.onedev.server.web.page.admin.issuesetting.linkspec.LinkSpecListPage;
import io.onedev.server.web.page.admin.issuesetting.statespec.IssueStateListPage;
@@ -222,6 +223,8 @@ public abstract class LayoutPage extends BasePage {
IssueTemplateListPage.class, new PageParameters()));
issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Commit Message Fix Patterns",
CommitMessageFixPatternsPage.class, new PageParameters()));
+ issueSettingMenuItems.add(new SidebarMenuItem.Page(null, "Check Workflow Integrity",
+ CheckIssueIntegrityPage.class, new PageParameters()));
administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, "Issue Settings", issueSettingMenuItems));