The Unified and Autonomous Development Platform
refactor(email-addresses): enhance email management UI for ordinary and service/AI users
Robin Shen4f086299fe7a
diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.htmlindex 6dc5c7eaa4..c9483b9455 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.html@@ -1,5 +1,5 @@<wicket:panel>- <div class="email-addresses">+ <div wicket:id="ordinary" class="email-addresses"><section class="mb-5 border-bottom pb-5"><h6 class="mb-3"><wicket:t>Primary Email Address</wicket:t></h6><p class="text-muted font-size-sm"><wicket:t>The primary email address is used to receive notifications and show your gravatar (if enabled). It is also used for web-based Git operations unless email addresses are kept private.</wicket:t></p>@@ -52,13 +52,19 @@<wicket:t>Keep my email addresses private</wicket:t></label></div>- <div wicket:id="privateNote">+ <div wicket:id="privateNote" class="alert alert-notice alert-light"><wicket:svg href="bulb" class="icon"/>- <wicket:t>If private, use the auto-generated email address</wicket:t>+ <wicket:t>Use the auto-generated email address</wicket:t><strong wicket:id="generatedEmailAddress"></strong><wicket:t>for Git operations. All Git operations performed from the web UI will also use this address.</wicket:t></div></form></section></div>+ <div wicket:id="serviceOrAi" class="alert alert-notice alert-light">+ <wicket:svg href="bulb" class="icon"/>+ <wicket:t>Service or AI user can not specify email addresses. However the auto-generated address</wicket:t>+ <strong wicket:id="generatedEmailAddress"></strong>+ <wicket:t>can be used to associate Git commits with the user.</wicket:t>+ </div></wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.javaindex be67dd3d42..8b6929e814 100644--- a/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/user/emailaddresses/EmailAddressesPanel.java@@ -1,5 +1,6 @@package io.onedev.server.web.component.user.emailaddresses;+import static io.onedev.server.model.User.Type.ORDINARY;import static io.onedev.server.web.translation.Translation._T;import java.io.Serializable;@@ -72,6 +73,17 @@ public class EmailAddressesPanel extends GenericPanel<User> {protected void onInitialize() {super.onInitialize();+ var ordinaryContainer = new WebMarkupContainer("ordinary") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUser().getType() == ORDINARY);+ }++ };+ add(ordinaryContainer);+var backupEmailAddressesSection = new WebMarkupContainer("backupEmailAddresses") {@Override@@ -218,7 +230,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {primaryForm.add(unverifiedNoteContainer);primaryForm.setOutputMarkupId(true);- add(primaryForm);+ ordinaryContainer.add(primaryForm);backupEmailAddressesSection.add(new ListView<EmailAddress>("list", new AbstractReadOnlyModel<>() {@@ -278,7 +290,7 @@ public class EmailAddressesPanel extends GenericPanel<User> {}});- add(backupEmailAddressesSection);+ ordinaryContainer.add(backupEmailAddressesSection);Form<Void> backupForm = new Form<>("form");@@ -346,7 +358,20 @@ public class EmailAddressesPanel extends GenericPanel<User> {Model.of(getUser().getName() + "@" + User.getNoreplyEmailDomain())));privacyForm.add(privateNote);- add(privacyForm);+ ordinaryContainer.add(privacyForm);++ var serviceOrAiContainer = new WebMarkupContainer("serviceOrAi") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getUser().getType() != ORDINARY);+ }++ };+ serviceOrAiContainer.add(new Label("generatedEmailAddress",+ Model.of(getUser().getName() + "@" + User.getNoreplyEmailDomain())));+ add(serviceOrAiContainer);}private IValidator<String> newEmailAddressValidator() {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.javaindex afdabc87a6..570b262193 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@@ -1135,7 +1135,7 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof MyBasicSettingPage)item.add(AttributeAppender.append("class", "active"));- if (getLoginUser() != null && getLoginUser().getType() == ORDINARY) {+ if (getLoginUser() != null) {userInfo.add(item = new ViewStateAwarePageLink<Void>("myEmailSetting", MyEmailAddressesPage.class));if (getPage() instanceof MyEmailAddressesPage)item.add(AttributeAppender.append("class", "active"));diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.htmlindex d93f935cce..3c7d14f84d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.html@@ -1,3 +1,3 @@<wicket:extend><div wicket:id="content"></div>-</wicket:extend>\ No newline at end of file+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.javaindex d6a3017125..32ef9bb580 100644--- a/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/my/emailaddresses/MyEmailAddressesPage.java@@ -1,6 +1,5 @@package io.onedev.server.web.page.my.emailaddresses;-import static io.onedev.server.model.User.Type.ORDINARY;import static io.onedev.server.web.translation.Translation._T;import org.apache.wicket.Component;@@ -16,13 +15,12 @@ public class MyEmailAddressesPage extends MyPage {public MyEmailAddressesPage(PageParameters params) {super(params);- if (getUser().getType() != ORDINARY)- throw new IllegalStateException();}@Overrideprotected void onInitialize() {super.onInitialize();+add(new EmailAddressesPanel("content", new AbstractReadOnlyModel<User>() {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.javaindex 80a034b27d..f63dc2456a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/UserPage.java@@ -91,8 +91,7 @@ public abstract class UserPage extends LayoutPage implements UserAware {var params = paramsOf(getUser());tabs.add(new PageTab(Model.of(_T("Profile")), Model.of("profile"), UserProfilePage.class, params));tabs.add(new PageTab(Model.of(_T("Basic Settings")), Model.of("info"), UserBasicSettingPage.class, params));- if (getUser().getType() == ORDINARY)- tabs.add(new PageTab(Model.of(_T("Email Addresses")), Model.of("mail"), UserEmailAddressesPage.class, params));+ tabs.add(new PageTab(Model.of(_T("Email Addresses")), Model.of("mail"), UserEmailAddressesPage.class, params));tabs.add(new PageTab(Model.of(_T("Edit Avatar")), Model.of("avatar"), UserAvatarPage.class, params));if (!getUser().isDisabled()) {if (getUser().getType() == ORDINARY)diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.html b/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.htmlindex d93f935cce..3c7d14f84d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.html@@ -1,3 +1,3 @@<wicket:extend><div wicket:id="content"></div>-</wicket:extend>\ No newline at end of file+</wicket:extend>diff --git a/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.java b/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.javaindex 64bf6fe838..1d309fb427 100644--- a/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/user/emailaddresses/UserEmailAddressesPage.java@@ -1,7 +1,5 @@package io.onedev.server.web.page.user.emailaddresses;-import static io.onedev.server.model.User.Type.ORDINARY;-import org.apache.wicket.model.AbstractReadOnlyModel;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -13,13 +11,12 @@ public class UserEmailAddressesPage extends UserPage {public UserEmailAddressesPage(PageParameters params) {super(params);- if (getUser().getType() != ORDINARY)- throw new IllegalStateException();}@Overrideprotected void onInitialize() {super.onInitialize();+add(new EmailAddressesPanel("content", new AbstractReadOnlyModel<User>() {@Override