Skip to content

The Unified and Autonomous Development Platform

Group slack/discord notification in project setting

Robin Shen58e48ce4930d
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 7875b8a1c9..3f480d71d8 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
@@ -1,40 +1,6 @@
package io.onedev.server.web.page.layout;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.servlet.http.Cookie;
-
-import org.apache.shiro.subject.PrincipalCollection;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.RestartResponseException;
-import org.apache.wicket.Session;
-import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.markup.head.IHeaderResponse;
-import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
-import org.apache.wicket.markup.head.OnLoadHeaderItem;
-import org.apache.wicket.markup.html.WebMarkupContainer;
-import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.image.ExternalImage;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.http.WebRequest;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
import com.google.common.collect.Lists;
-
import io.onedev.commons.loader.AppLoader;
import io.onedev.commons.loader.Plugin;
import io.onedev.server.OneDev;
@@ -86,11 +52,7 @@ import io.onedev.server.web.page.admin.servicedesk.ServiceDeskSettingPage;
import io.onedev.server.web.page.admin.sshserverkey.SshServerKeyPage;
import io.onedev.server.web.page.admin.ssosetting.SsoConnectorListPage;
import io.onedev.server.web.page.admin.systemsetting.SystemSettingPage;
-import io.onedev.server.web.page.admin.usermanagement.InvitationListPage;
-import io.onedev.server.web.page.admin.usermanagement.NewInvitationPage;
-import io.onedev.server.web.page.admin.usermanagement.NewUserPage;
-import io.onedev.server.web.page.admin.usermanagement.UserListPage;
-import io.onedev.server.web.page.admin.usermanagement.UserPage;
+import io.onedev.server.web.page.admin.usermanagement.*;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.help.IncompatibilitiesPage;
import io.onedev.server.web.page.my.MyPage;
@@ -105,6 +67,35 @@ import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthentic
import io.onedev.server.web.page.simple.security.LoginPage;
import io.onedev.server.web.page.simple.security.LogoutPage;
import io.onedev.server.web.util.WicketUtils;
+import org.apache.shiro.subject.PrincipalCollection;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.RestartResponseException;
+import org.apache.wicket.Session;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.apache.wicket.markup.head.OnLoadHeaderItem;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.image.ExternalImage;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.http.WebRequest;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+import javax.servlet.http.Cookie;
+import java.util.*;
@SuppressWarnings("serial")
public abstract class LayoutPage extends BasePage {
@@ -232,18 +223,38 @@ public abstract class LayoutPage extends BasePage {
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Groovy Scripts",
GroovyScriptListPage.class, new PageParameters()));
-
- for (AdministrationSettingContribution contribution:
- OneDev.getExtensions(AdministrationSettingContribution.class)) {
- for (Class<? extends Serializable> settingClass: contribution.getSettingClasses()) {
- administrationMenuItems.add(new SidebarMenuItem.Page(
- null,
- EditableUtils.getDisplayName(settingClass),
- ContributedAdministrationSettingPage.class,
- ContributedAdministrationSettingPage.paramsOf(settingClass)));
+
+ List<Class<? extends ContributedAdministrationSetting>> contributedSettingClasses = new ArrayList<>();
+ for (AdministrationSettingContribution contribution:OneDev.getExtensions(AdministrationSettingContribution.class)) {
+ for (Class<? extends ContributedAdministrationSetting> settingClass: contribution.getSettingClasses())
+ contributedSettingClasses.add(settingClass);
+ }
+ contributedSettingClasses.sort(Comparator.comparingInt(EditableUtils::getOrder));
+
+ Map<String, List<SidebarMenuItem>> contributedMenuItems = new HashMap<>();
+ for (var contributedSettingClass: contributedSettingClasses) {
+ var group = EditableUtils.getGroup(contributedSettingClass);
+ if (group == null)
+ group = "";
+ var contributedMenuItemsOfGroup = contributedMenuItems.get(group);
+ if (contributedMenuItemsOfGroup == null) {
+ contributedMenuItemsOfGroup = new ArrayList<>();
+ contributedMenuItems.put(group, contributedMenuItemsOfGroup);
}
+ contributedMenuItemsOfGroup.add(new SidebarMenuItem.Page(
+ null,
+ EditableUtils.getDisplayName(contributedSettingClass),
+ ContributedAdministrationSettingPage.class,
+ ContributedAdministrationSettingPage.paramsOf(contributedSettingClass)));
}
-
+ for (var entry: contributedMenuItems.entrySet()) {
+ if (entry.getKey().length() == 0) {
+ administrationMenuItems.addAll(entry.getValue());
+ } else {
+ administrationMenuItems.add(new SidebarMenuItem.SubMenu(null, entry.getKey(), entry.getValue()));
+ }
+ }
+
administrationMenuItems.add(new SidebarMenuItem.Page(null, "Branding",
BrandingSettingPage.class, new PageParameters()));
diff --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.java
index 39e7fd3522..4e134220af 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
@@ -276,8 +276,11 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
TagProtectionsPage.class, TagProtectionsPage.paramsOf(getProject())));
codeSettingMenuItems.add(new SidebarMenuItem.Page(null, "Code Analysis",
CodeAnalysisSettingPage.class, CodeAnalysisSettingPage.paramsOf(getProject())));
- codeSettingMenuItems.add(new SidebarMenuItem.Page(null, "Git Pack Config",
- GitPackConfigPage.class, GitPackConfigPage.paramsOf(getProject())));
+
+ if (getProject().isCodeManagement()) {
+ codeSettingMenuItems.add(new SidebarMenuItem.Page(null, "Git Pack Config",
+ GitPackConfigPage.class, GitPackConfigPage.paramsOf(getProject())));
+ }
settingMenuItems.add(new SidebarMenuItem.SubMenu(null, "Code", codeSettingMenuItems));
@@ -302,13 +305,34 @@ public abstract class ProjectPage extends LayoutPage implements ProjectAware {
settingMenuItems.add(new SidebarMenuItem.Page(null, "Web Hooks",
WebHooksPage.class, WebHooksPage.paramsOf(getProject())));
+ List<Class<? extends ContributedProjectSetting>> contributedSettingClasses = new ArrayList<>();
for (ProjectSettingContribution contribution:OneDev.getExtensions(ProjectSettingContribution.class)) {
- for (Class<? extends ContributedProjectSetting> settingClass: contribution.getSettingClasses()) {
- settingMenuItems.add(new SidebarMenuItem.Page(
- null,
- EditableUtils.getDisplayName(settingClass),
- ContributedProjectSettingPage.class,
- ContributedProjectSettingPage.paramsOf(getProject(), settingClass)));
+ for (Class<? extends ContributedProjectSetting> settingClass: contribution.getSettingClasses())
+ contributedSettingClasses.add(settingClass);
+ }
+ contributedSettingClasses.sort(Comparator.comparingInt(EditableUtils::getOrder));
+
+ Map<String, List<SidebarMenuItem>> contributedSettingMenuItems = new HashMap<>();
+ for (var contributedSettingClass: contributedSettingClasses) {
+ var group = EditableUtils.getGroup(contributedSettingClass);
+ if (group == null)
+ group = "";
+ var contributedSettingMenuItemsOfGroup = contributedSettingMenuItems.get(group);
+ if (contributedSettingMenuItemsOfGroup == null) {
+ contributedSettingMenuItemsOfGroup = new ArrayList<>();
+ contributedSettingMenuItems.put(group, contributedSettingMenuItemsOfGroup);
+ }
+ contributedSettingMenuItemsOfGroup.add(new SidebarMenuItem.Page(
+ null,
+ EditableUtils.getDisplayName(contributedSettingClass),
+ ContributedProjectSettingPage.class,
+ ContributedProjectSettingPage.paramsOf(getProject(), contributedSettingClass)));
+ }
+ for (var entry: contributedSettingMenuItems.entrySet()) {
+ if (entry.getKey().length() == 0) {
+ settingMenuItems.addAll(entry.getValue());
+ } else {
+ settingMenuItems.add(new SidebarMenuItem.SubMenu(null, entry.getKey(), entry.getValue()));
}
}
diff --git a/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationSetting.java b/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationSetting.java
index e7eaec8a9e..90ab3c0ba8 100644
--- a/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationSetting.java
+++ b/server-plugin/server-plugin-notification-discord/src/main/java/io/onedev/server/plugin/notification/discord/DiscordNotificationSetting.java
@@ -3,8 +3,9 @@ package io.onedev.server.plugin.notification.discord;
import io.onedev.server.util.channelnotification.ChannelNotificationSetting;
import io.onedev.server.web.editable.annotation.Editable;
-@Editable(name="Discord Notifications", order=200, description="Set up discord notification settings. Settings will be inherited by "
- + "child projects, and can be overriden by defining setting with same webhook url")
+@Editable(name="Discord Notifications", group="Notification", order=200, description="Set up discord notification " +
+ "settings. Settings will be inherited by child projects, and can be overriden by defining setting with " +
+ "same webhook url")
public class DiscordNotificationSetting extends ChannelNotificationSetting {
private static final long serialVersionUID = 1L;
diff --git a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationSetting.java b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationSetting.java
index bd03e0e38c..d123d7a363 100644
--- a/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationSetting.java
+++ b/server-plugin/server-plugin-notification-slack/src/main/java/io/onedev/server/plugin/notification/slack/SlackNotificationSetting.java
@@ -3,8 +3,9 @@ package io.onedev.server.plugin.notification.slack;
import io.onedev.server.util.channelnotification.ChannelNotificationSetting;
import io.onedev.server.web.editable.annotation.Editable;
-@Editable(name="Slack Notifications", order=100, description="Set up slack notification settings. Settings will be "
- + "inherited by child projects, and can be overriden by defining setting with same webhook url")
+@Editable(name="Slack Notifications", group="Notification", order=100, description="Set up slack notification " +
+ "settings. Settings will be inherited by child projects, and can be overriden by defining setting with " +
+ "same webhook url")
public class SlackNotificationSetting extends ChannelNotificationSetting {
private static final long serialVersionUID = 1L;