The Unified and Autonomous Development Platform
chore: refactor alert settings
Robin Shene5efd2dbfa21
diff --git a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.javaindex 87c5a7ee43..c9e13047c5 100644--- a/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java+++ b/server-core/src/main/java/io/onedev/server/data/DefaultDataManager.java@@ -816,9 +816,9 @@ public class DefaultDataManager implements DataManager, Serializable {if (setting == null) {settingManager.saveProjectSetting(new GlobalProjectSetting());}- setting = settingManager.getSetting(Key.SUBSCRIPTION_DATA);+ setting = settingManager.getSetting(Key.LICENSE_DATA);if (setting == null) {- settingManager.saveSubscriptionData(null);+ settingManager.saveLicenseData(null);}setting = settingManager.getSetting(Key.ALERT);if (setting == null) {diff --git a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.javaindex 30a4b69a34..5d2a3a1c63 100644--- a/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java+++ b/server-core/src/main/java/io/onedev/server/data/migration/DataMigrator.java@@ -5581,4 +5581,29 @@ public class DataMigrator {}}}++ private void migrate132(File dataDir, Stack<Integer> versions) {+ for (File file: dataDir.listFiles()) {+ if (file.getName().startsWith("Settings.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements()) {+ var keyElement = element.element("key");+ if (keyElement.getTextTrim().equals("ALERT")) {+ var valueElement = element.element("value");+ valueElement.element("trialExpireInOneWeekAlerted").setName("trialEnterpriseLicenseExpireInOneWeekAlerted");+ valueElement.element("trialExpiredAlerted").setName("trialEnterpriseLicenseExpiredAlerted");+ valueElement.element("subscriptionExpireInOneMonthAlerted").setName("enterpriseLicenseExpireInOneMonthAlerted");+ valueElement.element("subscriptionExpireInOneWeekAlerted").setName("enterpriseLicenseExpireInOneWeekAlerted");+ valueElement.element("subscriptionExpiredAlerted").setName("enterpriseLicenseExpiredAlerted");+ valueElement.element("subscriptionExpiredBeforeReleaseDateAlerted").detach();+ valueElement.element("userLimitApproachingAlerted").setName("enterpriseLicenseUserLimitApproachingAlerted");+ valueElement.element("userLimitExceededAlerted").setName("enterpriseLicenseUserLimitExceededAlerted");+ } else if (keyElement.getTextTrim().equals("SUBSCRIPTION_DATA")) {+ keyElement.setText("LICENSE_DATA");+ }+ }+ dom.writeToFile(file, false);+ }+ }+ }}diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.javaindex e228e9da2a..ae85fe1203 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/SettingManager.java@@ -40,7 +40,7 @@ public interface SettingManager extends EntityManager<Setting> {AlertSetting getAlertSetting();@Nullable- String getSubscriptionData();+ String getLicenseData();/*** Save specified system setting.@@ -52,7 +52,7 @@ public interface SettingManager extends EntityManager<Setting> {void saveAlertSetting(AlertSetting alertSetting);- void saveSubscriptionData(@Nullable String subscriptionData);+ void saveLicenseData(@Nullable String licenseData);/*** Get mail setting.diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.javaindex b0d6f809ae..210045f077 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultSettingManager.java@@ -77,8 +77,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements}@Override- public String getSubscriptionData() {- return (String) getSettingValue(Key.SUBSCRIPTION_DATA);+ public String getLicenseData() {+ return (String) getSettingValue(Key.LICENSE_DATA);}@Transactional@@ -204,8 +204,8 @@ public class DefaultSettingManager extends BaseEntityManager<Setting> implements@Transactional@Override- public void saveSubscriptionData(String subscriptionData) {- saveSetting(Key.SUBSCRIPTION_DATA, subscriptionData);+ public void saveLicenseData(String licenseData) {+ saveSetting(Key.LICENSE_DATA, licenseData);}@Transactionaldiff --git a/server-core/src/main/java/io/onedev/server/model/Setting.java b/server-core/src/main/java/io/onedev/server/model/Setting.javaindex 70f052bcef..da2dfdf48c 100644--- a/server-core/src/main/java/io/onedev/server/model/Setting.java+++ b/server-core/src/main/java/io/onedev/server/model/Setting.java@@ -20,7 +20,7 @@ public class Setting extends AbstractEntity {public enum Key {SYSTEM, MAIL, BACKUP, SECURITY, AUTHENTICATOR, ISSUE, JOB_EXECUTORS,GROOVY_SCRIPTS, PULL_REQUEST, BUILD, PROJECT, SSH, GPG, SSO_CONNECTORS,EMAIL_TEMPLATES, CONTRIBUTED_SETTINGS, SERVICE_DESK_SETTING,- AGENT, PERFORMANCE, BRANDING, CLUSTER_SETTING, SUBSCRIPTION_DATA, ALERT+ AGENT, PERFORMANCE, BRANDING, CLUSTER_SETTING, LICENSE_DATA, ALERT};@Column(nullable=false, unique=true)diff --git a/server-core/src/main/java/io/onedev/server/model/support/administration/AlertSetting.java b/server-core/src/main/java/io/onedev/server/model/support/administration/AlertSetting.javaindex 61ae02be4a..5700054240 100644--- a/server-core/src/main/java/io/onedev/server/model/support/administration/AlertSetting.java+++ b/server-core/src/main/java/io/onedev/server/model/support/administration/AlertSetting.java@@ -13,21 +13,19 @@ public class AlertSetting implements Serializable {private static final long serialVersionUID = 1L;- private boolean trialExpireInOneWeekAlerted;+ private boolean trialEnterpriseLicenseExpireInOneWeekAlerted;- private boolean trialExpiredAlerted;+ private boolean trialEnterpriseLicenseExpiredAlerted;- private boolean subscriptionExpireInOneMonthAlerted;+ private boolean enterpriseLicenseExpireInOneMonthAlerted;- private boolean subscriptionExpireInOneWeekAlerted;+ private boolean enterpriseLicenseExpireInOneWeekAlerted;- private boolean subscriptionExpiredAlerted;-- private boolean subscriptionExpiredBeforeReleaseDateAlerted;+ private boolean enterpriseLicenseExpiredAlerted;- private boolean userLimitApproachingAlerted;+ private boolean enterpriseLicenseUserLimitApproachingAlerted;- private boolean userLimitExceededAlerted;+ private boolean enterpriseLicenseUserLimitExceededAlerted;private List<String> notifyUsers = new ArrayList<>();@@ -42,79 +40,70 @@ public class AlertSetting implements Serializable {this.notifyUsers = notifyUsers;}- public boolean isTrialExpireInOneWeekAlerted() {- return trialExpireInOneWeekAlerted;- }-- public void setTrialExpireInOneWeekAlerted(boolean trialExpireInOneWeekAlerted) {- this.trialExpireInOneWeekAlerted = trialExpireInOneWeekAlerted;- }-- public boolean isTrialExpiredAlerted() {- return trialExpiredAlerted;+ public boolean isTrialEnterpriseLicenseExpireInOneWeekAlerted() {+ return trialEnterpriseLicenseExpireInOneWeekAlerted;}- public void setTrialExpiredAlerted(boolean trialExpiredAlerted) {- this.trialExpiredAlerted = trialExpiredAlerted;+ public void setTrialEnterpriseLicenseExpireInOneWeekAlerted(boolean trialEnterpriseLicenseExpireInOneWeekAlerted) {+ this.trialEnterpriseLicenseExpireInOneWeekAlerted = trialEnterpriseLicenseExpireInOneWeekAlerted;}- public boolean isSubscriptionExpireInOneMonthAlerted() {- return subscriptionExpireInOneMonthAlerted;+ public boolean isTrialEnterpriseLicenseExpiredAlerted() {+ return trialEnterpriseLicenseExpiredAlerted;}- public void setSubscriptionExpireInOneMonthAlerted(boolean subscriptionExpireInOneMonthAlerted) {- this.subscriptionExpireInOneMonthAlerted = subscriptionExpireInOneMonthAlerted;+ public void setTrialEnterpriseLicenseExpiredAlerted(boolean trialEnterpriseLicenseExpiredAlerted) {+ this.trialEnterpriseLicenseExpiredAlerted = trialEnterpriseLicenseExpiredAlerted;}- public boolean isSubscriptionExpireInOneWeekAlerted() {- return subscriptionExpireInOneWeekAlerted;+ public boolean isEnterpriseLicenseExpireInOneMonthAlerted() {+ return enterpriseLicenseExpireInOneMonthAlerted;}- public void setSubscriptionExpireInOneWeekAlerted(boolean subscriptionExpireInOneWeekAlerted) {- this.subscriptionExpireInOneWeekAlerted = subscriptionExpireInOneWeekAlerted;+ public void setEnterpriseLicenseExpireInOneMonthAlerted(boolean enterpriseLicenseExpireInOneMonthAlerted) {+ this.enterpriseLicenseExpireInOneMonthAlerted = enterpriseLicenseExpireInOneMonthAlerted;}- public boolean isSubscriptionExpiredAlerted() {- return subscriptionExpiredAlerted;+ public boolean isEnterpriseLicenseExpireInOneWeekAlerted() {+ return enterpriseLicenseExpireInOneWeekAlerted;}- public void setSubscriptionExpiredAlerted(boolean subscriptionExpiredAlerted) {- this.subscriptionExpiredAlerted = subscriptionExpiredAlerted;+ public void setEnterpriseLicenseExpireInOneWeekAlerted(boolean enterpriseLicenseExpireInOneWeekAlerted) {+ this.enterpriseLicenseExpireInOneWeekAlerted = enterpriseLicenseExpireInOneWeekAlerted;}- public boolean isSubscriptionExpiredBeforeReleaseDateAlerted() {- return subscriptionExpiredBeforeReleaseDateAlerted;+ public boolean isEnterpriseLicenseExpiredAlerted() {+ return enterpriseLicenseExpiredAlerted;}- public void setSubscriptionExpiredBeforeReleaseDateAlerted(boolean subscriptionExpiredBeforeReleaseDateAlerted) {- this.subscriptionExpiredBeforeReleaseDateAlerted = subscriptionExpiredBeforeReleaseDateAlerted;+ public void setEnterpriseLicenseExpiredAlerted(boolean enterpriseLicenseExpiredAlerted) {+ this.enterpriseLicenseExpiredAlerted = enterpriseLicenseExpiredAlerted;}- public boolean isUserLimitApproachingAlerted() {- return userLimitApproachingAlerted;+ public boolean isEnterpriseLicenseUserLimitApproachingAlerted() {+ return enterpriseLicenseUserLimitApproachingAlerted;}- public void setUserLimitApproachingAlerted(boolean userLimitApproachingAlerted) {- this.userLimitApproachingAlerted = userLimitApproachingAlerted;+ public void setEnterpriseLicenseUserLimitApproachingAlerted(boolean enterpriseLicenseUserLimitApproachingAlerted) {+ this.enterpriseLicenseUserLimitApproachingAlerted = enterpriseLicenseUserLimitApproachingAlerted;}- public boolean isUserLimitExceededAlerted() {- return userLimitExceededAlerted;+ public boolean isEnterpriseLicenseUserLimitExceededAlerted() {+ return enterpriseLicenseUserLimitExceededAlerted;}- public void setUserLimitExceededAlerted(boolean userLimitExceededAlerted) {- this.userLimitExceededAlerted = userLimitExceededAlerted;+ public void setEnterpriseLicenseUserLimitExceededAlerted(boolean enterpriseLicenseUserLimitExceededAlerted) {+ this.enterpriseLicenseUserLimitExceededAlerted = enterpriseLicenseUserLimitExceededAlerted;}public void setAlerted(boolean alerted) {- trialExpireInOneWeekAlerted = alerted;- trialExpiredAlerted = alerted;- subscriptionExpireInOneMonthAlerted = alerted;- subscriptionExpireInOneWeekAlerted = alerted;- subscriptionExpiredAlerted = alerted;- subscriptionExpiredBeforeReleaseDateAlerted = alerted;- userLimitApproachingAlerted = alerted;- userLimitExceededAlerted = alerted;+ trialEnterpriseLicenseExpireInOneWeekAlerted = alerted;+ trialEnterpriseLicenseExpiredAlerted = alerted;+ enterpriseLicenseExpireInOneMonthAlerted = alerted;+ enterpriseLicenseExpireInOneWeekAlerted = alerted;+ enterpriseLicenseExpiredAlerted = alerted;+ enterpriseLicenseUserLimitApproachingAlerted = alerted;+ enterpriseLicenseUserLimitExceededAlerted = alerted;}public Usage onDeleteUser(String userName) {diff --git a/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorkManager.java b/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorkManager.javaindex cf3bd8d4d3..8774bf3f83 100644--- a/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorkManager.java+++ b/server-core/src/main/java/io/onedev/server/util/concurrent/BatchWorkManager.java@@ -3,5 +3,5 @@ package io.onedev.server.util.concurrent;public interface BatchWorkManager {void submit(BatchWorker worker, Prioritized work);-+}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.htmlindex 353ce7ae3d..ec1f45ff47 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/list/ProjectIssueListPage.html@@ -15,7 +15,7 @@<wicket:svg href="copy" class="icon"/></a><span wicket:id="links" class="links ml-3"/>- <a wicket:id="unpin" class="unpin btn btn-icon btn-xs btn-light btn-hover-primary"><wicket:svg href="unpin" class="icon flip-x"/></a>+ <a wicket:id="unpin" title="Unpin this issue" class="unpin btn btn-icon btn-xs btn-light btn-hover-primary"><wicket:svg href="unpin" class="icon flip-x"/></a></div><div class="secondary d-flex flex-wrap"><div wicket:id="transit" class="state">