The Unified and Autonomous Development Platform
feat: User able to review/remove watched queries from a central place (OD-2320)
Robin Shen4bc40659e843
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 a0a21bc096..2ebdcbcc67 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@@ -1,7 +1,6 @@package io.onedev.server.data;import static com.google.common.base.Throwables.getStackTraceAsString;-import static io.onedev.server.model.User.PROP_DISABLE_WATCH_NOTIFICATIONS;import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;import static io.onedev.server.model.support.administration.SystemSetting.PROP_CURL_LOCATION;import static io.onedev.server.model.support.administration.SystemSetting.PROP_DISABLE_AUTO_UPDATE_CHECK;@@ -681,7 +680,7 @@ public class DefaultDataManager implements DataManager, Serializable {if (validator.validate(bean).isEmpty()) {createRoot(bean);} else {- manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS)) {+ manualConfigs.add(new ManualConfig("Create Administrator Account", null, bean, Sets.newHashSet(PROP_NOTIFY_OWN_EVENTS)) {@Overridepublic void complete() {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 ccae17696c..bb86e82880 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@@ -7691,4 +7691,15 @@ public class DataMigrator {}}+ private void migrate193(File dataDir, Stack<Integer> versions) {+ for (File file : dataDir.listFiles()) {+ if (file.getName().startsWith("Users.xml")) {+ VersionedXmlDoc dom = VersionedXmlDoc.fromFile(file);+ for (Element element : dom.getRootElement().elements())+ element.element("disableWatchNotifications").detach();+ dom.writeToFile(file, false);+ }+ }+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.javaindex dddae2aa8a..c06ebc1677 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultIssueWatchManager.java@@ -61,7 +61,7 @@ public class DefaultIssueWatchManager extends BaseEntityManager<IssueWatch>if (watch != null) {if (watchStatus == WatchStatus.WATCH)watch.setWatching(true);- else if (watchStatus == WatchStatus.DO_NOT_WATCH)+ else if (watchStatus == WatchStatus.IGNORE)watch.setWatching(false);elsedelete(watch);diff --git a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.javaindex 5b0659f3cf..82e701e5ac 100644--- a/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java+++ b/server-core/src/main/java/io/onedev/server/entitymanager/impl/DefaultPullRequestWatchManager.java@@ -61,7 +61,7 @@ public class DefaultPullRequestWatchManager extends BaseEntityManager<PullRequesif (watch != null) {if (watchStatus == WatchStatus.WATCH)watch.setWatching(true);- else if (watchStatus == WatchStatus.DO_NOT_WATCH)+ else if (watchStatus == WatchStatus.IGNORE)watch.setWatching(false);elsedelete(watch);diff --git a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.javaindex 855d29035e..563578f860 100644--- a/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/BuildQueryPersonalization.java@@ -1,5 +1,19 @@package io.onedev.server.model;+import java.util.ArrayList;+import java.util.LinkedHashSet;++import javax.annotation.Nullable;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;import io.onedev.server.model.support.QueryPersonalization;@@ -7,10 +21,6 @@ import io.onedev.server.model.support.build.NamedBuildQuery;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;-import javax.persistence.*;-import java.util.ArrayList;-import java.util.LinkedHashSet;-@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},@@ -64,7 +74,23 @@ public class BuildQueryPersonalization extends AbstractEntity implements QueryPethis.queries = queries;}- @Override+ @Nullable+ public NamedBuildQuery getQuery(String name) {+ for (NamedBuildQuery query: getQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }++ public LinkedHashSet<String> getQuerySubscriptions() {+ return querySubscriptions;+ }++ public void setQuerySubscriptions(LinkedHashSet<String> querySubscriptions) {+ this.querySubscriptions = querySubscriptions;+ }+public QueryWatchSupport<NamedBuildQuery> getQueryWatchSupport() {return null;}diff --git a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.javaindex 9c38970a7b..ba75db8f52 100644--- a/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/CommitQueryPersonalization.java@@ -1,5 +1,19 @@package io.onedev.server.model;+import java.util.ArrayList;+import java.util.LinkedHashSet;++import javax.annotation.Nullable;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;import io.onedev.server.model.support.NamedCommitQuery;@@ -7,10 +21,6 @@ import io.onedev.server.model.support.QueryPersonalization;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;-import javax.persistence.*;-import java.util.ArrayList;-import java.util.LinkedHashSet;-@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},@@ -64,6 +74,19 @@ public class CommitQueryPersonalization extends AbstractEntity implements QueryPthis.queries = queries;}+ @Nullable+ public NamedCommitQuery getQuery(String name) {+ for (NamedCommitQuery query: getQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }++ public LinkedHashSet<String> getQuerySubscriptions() {+ return querySubscriptions;+ }+public void setQuerySubscriptions(LinkedHashSet<String> querySubscriptions) {this.querySubscriptions = querySubscriptions;}diff --git a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.javaindex c4d0c5edd9..a0e9e65d79 100644--- a/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/IssueQueryPersonalization.java@@ -1,5 +1,19 @@package io.onedev.server.model;+import java.util.ArrayList;+import java.util.LinkedHashMap;++import javax.annotation.Nullable;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;import io.onedev.server.model.support.QueryPersonalization;@@ -7,10 +21,6 @@ import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;-import javax.persistence.*;-import java.util.ArrayList;-import java.util.LinkedHashMap;-@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},@@ -65,7 +75,19 @@ public class IssueQueryPersonalization extends AbstractEntity implements QueryPepublic void setQueries(ArrayList<NamedIssueQuery> queries) {this.queries = queries;}++ @Nullable+ public NamedIssueQuery getQuery(String name) {+ for (NamedIssueQuery query: getQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }+ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return queryWatches;+ }public void setQueryWatches(LinkedHashMap<String, Boolean> queryWatches) {this.queryWatches = queryWatches;diff --git a/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.javaindex 9586233b2a..02f68d9e2e 100644--- a/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/PackQueryPersonalization.java@@ -1,5 +1,19 @@package io.onedev.server.model;+import java.util.ArrayList;+import java.util.LinkedHashSet;++import javax.annotation.Nullable;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PackQueryPersonalizationManager;import io.onedev.server.model.support.QueryPersonalization;@@ -7,10 +21,6 @@ import io.onedev.server.model.support.pack.NamedPackQuery;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;-import javax.persistence.*;-import java.util.ArrayList;-import java.util.LinkedHashSet;-@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},@@ -64,6 +74,23 @@ public class PackQueryPersonalization extends AbstractEntity implements QueryPerthis.queries = queries;}+ @Nullable+ public NamedPackQuery getQuery(String name) {+ for (NamedPackQuery query: getQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }++ public LinkedHashSet<String> getQuerySubscriptions() {+ return querySubscriptions;+ }++ public void setQuerySubscriptions(LinkedHashSet<String> querySubscriptions) {+ this.querySubscriptions = querySubscriptions;+ }+@Overridepublic QueryWatchSupport<NamedPackQuery> getQueryWatchSupport() {return null;diff --git a/server-core/src/main/java/io/onedev/server/model/Project.java b/server-core/src/main/java/io/onedev/server/model/Project.javaindex 1ebaee5871..4391930b0d 100644--- a/server-core/src/main/java/io/onedev/server/model/Project.java+++ b/server-core/src/main/java/io/onedev/server/model/Project.java@@ -1825,6 +1825,15 @@ public class Project extends AbstractEntity implements LabelSupport<ProjectLabelreturn null;}+ @Nullable+ public NamedCommitQuery getNamedCommitQuery(String name) {+ for (NamedCommitQuery namedQuery: getNamedCommitQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }+public List<NamedIssueQuery> getNamedIssueQueries() {Project current = this;do {diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.javaindex 47bfa9c659..77a76696ce 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequestQueryPersonalization.java@@ -1,5 +1,19 @@package io.onedev.server.model;+import java.util.ArrayList;+import java.util.LinkedHashMap;++import javax.annotation.Nullable;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.FetchType;+import javax.persistence.Index;+import javax.persistence.JoinColumn;+import javax.persistence.Lob;+import javax.persistence.ManyToOne;+import javax.persistence.Table;+import javax.persistence.UniqueConstraint;+import io.onedev.server.OneDev;import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;import io.onedev.server.model.support.QueryPersonalization;@@ -7,10 +21,6 @@ import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;-import javax.persistence.*;-import java.util.ArrayList;-import java.util.LinkedHashMap;-@Entity@Table(indexes={@Index(columnList="o_project_id"), @Index(columnList="o_user_id")},@@ -64,8 +74,21 @@ public class PullRequestQueryPersonalization extends AbstractEntity implements Qthis.queries = queries;}- public void setQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {- this.queryWatches = projectQueryWatches;+ @Nullable+ public NamedPullRequestQuery getQuery(String name) {+ for (NamedPullRequestQuery query: getQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }++ public LinkedHashMap<String, Boolean> getQueryWatches() {+ return queryWatches;+ }++ public void setQueryWatches(LinkedHashMap<String, Boolean> queryWatches) {+ this.queryWatches = queryWatches;}@Overridediff --git a/server-core/src/main/java/io/onedev/server/model/User.java b/server-core/src/main/java/io/onedev/server/model/User.javaindex c0deba634d..a165a4e176 100644--- a/server-core/src/main/java/io/onedev/server/model/User.java+++ b/server-core/src/main/java/io/onedev/server/model/User.java@@ -1,7 +1,39 @@package io.onedev.server.model;+import static io.onedev.server.model.User.PROP_FULL_NAME;+import static io.onedev.server.model.User.PROP_NAME;+import static io.onedev.server.security.SecurityUtils.asPrincipals;+import static io.onedev.server.security.SecurityUtils.asUserPrincipal;++import java.util.ArrayList;+import java.util.Collection;+import java.util.LinkedHashMap;+import java.util.LinkedHashSet;+import java.util.List;+import java.util.Optional;+import java.util.Stack;+import java.util.stream.Collectors;++import javax.annotation.Nullable;+import javax.persistence.CascadeType;+import javax.persistence.Column;+import javax.persistence.Entity;+import javax.persistence.Index;+import javax.persistence.Lob;+import javax.persistence.OneToMany;+import javax.persistence.Table;+import javax.validation.constraints.NotEmpty;++import org.apache.shiro.authc.AuthenticationInfo;+import org.apache.shiro.subject.PrincipalCollection;+import org.apache.shiro.subject.Subject;+import org.eclipse.jgit.lib.PersonIdent;+import org.hibernate.annotations.Cache;+import org.hibernate.annotations.CacheConcurrencyStrategy;+import com.fasterxml.jackson.annotation.JsonIgnore;import com.google.common.base.MoreObjects;+import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.OneDev;@@ -22,23 +54,6 @@ import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.util.watch.QuerySubscriptionSupport;import io.onedev.server.util.watch.QueryWatchSupport;-import org.apache.shiro.authc.AuthenticationInfo;-import org.apache.shiro.subject.PrincipalCollection;-import org.apache.shiro.subject.Subject;-import org.eclipse.jgit.lib.PersonIdent;-import org.hibernate.annotations.Cache;-import org.hibernate.annotations.CacheConcurrencyStrategy;--import javax.annotation.Nullable;-import javax.persistence.*;-import javax.validation.constraints.NotEmpty;-import java.util.*;-import java.util.stream.Collectors;--import static io.onedev.server.model.User.PROP_FULL_NAME;-import static io.onedev.server.model.User.PROP_NAME;-import static io.onedev.server.security.SecurityUtils.asPrincipals;-import static io.onedev.server.security.SecurityUtils.asUserPrincipal;@Entity@Table(indexes={@Index(columnList=PROP_NAME), @Index(columnList=PROP_FULL_NAME)})@@ -63,9 +78,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {public static final String PROP_NAME = "name";public static final String PROP_FULL_NAME = "fullName";-- public static final String PROP_DISABLE_WATCH_NOTIFICATIONS = "disableWatchNotifications";-+public static final String PROP_NOTIFY_OWN_EVENTS = "notifyOwnEvents";private static ThreadLocal<Stack<User>> stack = ThreadLocal.withInitial(() -> new Stack<>());@@ -80,9 +93,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {private String password;private String fullName;-- private boolean disableWatchNotifications;-+private boolean notifyOwnEvents;@JsonIgnore@@ -536,17 +547,6 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.fullName = fullName;}- @Editable(order=350, description = "Whether or not to disable email notifications for watched " +- "events. Note that forced notifications such as mention notification, review invitation, " +- "and build failure notification will still be sent")- public boolean isDisableWatchNotifications() {- return disableWatchNotifications;- }-- public void setDisableWatchNotifications(boolean disableWatchNotifications) {- this.disableWatchNotifications = disableWatchNotifications;- }-@Editable(order=400, name="Notify Own Events", description = "Whether or not to send notifications for events generated by yourself")public boolean isNotifyOwnEvents() {return notifyOwnEvents;@@ -843,22 +843,40 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.codeCommentQueryPersonalizations = codeCommentQueryPersonalizations;}- public ArrayList<NamedProjectQuery> getUserProjectQueries() {+ public ArrayList<NamedProjectQuery> getProjectQueries() {return projectQueries;}- public void setProjectQueries(ArrayList<NamedProjectQuery> userProjectQueries) {- this.projectQueries = userProjectQueries;+ public void setProjectQueries(ArrayList<NamedProjectQuery> projectQueries) {+ this.projectQueries = projectQueries;}- public ArrayList<NamedIssueQuery> getUserIssueQueries() {+ @Nullable+ public NamedProjectQuery getProjectQuery(String name) {+ for (var query: getProjectQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }++ public ArrayList<NamedIssueQuery> getIssueQueries() {return issueQueries;}- public void setIssueQueries(ArrayList<NamedIssueQuery> userIssueQueries) {- this.issueQueries = userIssueQueries;+ public void setIssueQueries(ArrayList<NamedIssueQuery> issueQueries) {+ this.issueQueries = issueQueries;}+ @Nullable+ public NamedIssueQuery getIssueQuery(String name) {+ for (var query: getIssueQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }+public LinkedHashMap<String, Boolean> getIssueQueryWatches() {return issueQueryWatches;}@@ -867,14 +885,23 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.issueQueryWatches = issueQueryWatches;}- public ArrayList<NamedPullRequestQuery> getUserPullRequestQueries() {+ public ArrayList<NamedPullRequestQuery> getPullRequestQueries() {return pullRequestQueries;}- public void setPullRequestQueries(ArrayList<NamedPullRequestQuery> userPullRequestQueries) {- this.pullRequestQueries = userPullRequestQueries;+ public void setPullRequestQueries(ArrayList<NamedPullRequestQuery> pullRequestQueries) {+ this.pullRequestQueries = pullRequestQueries;}+ @Nullable+ public NamedPullRequestQuery getPullRequestQuery(String name) {+ for (var query: getPullRequestQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }+public LinkedHashMap<String, Boolean> getPullRequestQueryWatches() {return pullRequestQueryWatches;}@@ -883,7 +910,7 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.pullRequestQueryWatches = pullRequestQueryWatches;}- public ArrayList<NamedBuildQuery> getUserBuildQueries() {+ public ArrayList<NamedBuildQuery> getBuildQueries() {return buildQueries;}@@ -891,6 +918,32 @@ public class User extends AbstractEntity implements AuthenticationInfo {this.buildQueries = buildQueries;}+ @Nullable+ public NamedBuildQuery getBuildQuery(String name) {+ for (var query: getBuildQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }++ public ArrayList<NamedPackQuery> getPackQueries() {+ return packQueries;+ }++ public void setPackQueries(ArrayList<NamedPackQuery> packQueries) {+ this.packQueries = packQueries;+ }++ @Nullable+ public NamedPackQuery getPackQuery(String name) {+ for (var query: getPackQueries()) {+ if (query.getName().equals(name))+ return query;+ }+ return null;+ }+public LinkedHashSet<String> getBuildQuerySubscriptions() {return buildQuerySubscriptions;}diff --git a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.javaindex d4e0c5b5ca..b6e6abfef3 100644--- a/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/BuildNotificationManager.java@@ -117,18 +117,16 @@ public class BuildNotificationManager {Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();for (BuildQueryPersonalization personalization: project.getBuildQueryPersonalizations()) {var user = personalization.getUser();- if (!user.isDisableWatchNotifications()) {- for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {- String commonName = NamedQuery.getCommonName(name);- if (commonName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(project.getNamedBuildQueries(), commonName));- }- String personalName = NamedQuery.getPersonalName(name);- if (personalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(personalization.getQueries(), personalName));- }+ for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ String commonName = NamedQuery.getCommonName(name);+ if (commonName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(project.getNamedBuildQueries(), commonName));+ }+ String personalName = NamedQuery.getPersonalName(name);+ if (personalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(personalization.getQueries(), personalName));}}}diff --git a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.javaindex ed5666af99..eb28a9e617 100644--- a/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/CommitNotificationManager.java@@ -68,18 +68,16 @@ public class CommitNotificationManager {Map<User, Collection<String>> subscribedQueryStrings = new HashMap<>();for (CommitQueryPersonalization personalization: project.getCommitQueryPersonalizations()) {var user = personalization.getUser();- if (!user.isDisableWatchNotifications()) {- for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {- String globalName = NamedQuery.getCommonName(name);- if (globalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(project.getNamedCommitQueries(), globalName));- }- String personalName = NamedQuery.getPersonalName(name);- if (personalName != null) {- fillSubscribedQueryStrings(subscribedQueryStrings, user,- NamedQuery.find(personalization.getQueries(), personalName));- }+ for (String name : personalization.getQuerySubscriptionSupport().getQuerySubscriptions()) {+ String globalName = NamedQuery.getCommonName(name);+ if (globalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(project.getNamedCommitQueries(), globalName));+ }+ String personalName = NamedQuery.getPersonalName(name);+ if (personalName != null) {+ fillSubscribedQueryStrings(subscribedQueryStrings, user,+ NamedQuery.find(personalization.getQueries(), personalName));}}}diff --git a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.javaindex f225f2cf63..7f4417a0b8 100644--- a/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/IssueNotificationManager.java@@ -290,7 +290,6 @@ public class IssueNotificationManager {for (IssueWatch watch: issue.getWatches()) {Date visitDate = userInfoManager.getIssueVisitDate(watch.getUser(), issue);if (watch.isWatching()- && !watch.getUser().isDisableWatchNotifications()&& (visitDate == null || visitDate.before(event.getDate()))&& !notifiedUsers.contains(watch.getUser())&& !isNotified(notifiedEmailAddresses, watch.getUser())diff --git a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.javaindex 42b3b8677e..a8b6b19969 100644--- a/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java+++ b/server-core/src/main/java/io/onedev/server/notification/PullRequestNotificationManager.java@@ -301,7 +301,6 @@ public class PullRequestNotificationManager {Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);Permission permission = new ProjectPermission(request.getProject(), new ReadCode());if (watch.isWatching()- && !watch.getUser().isDisableWatchNotifications()&& (visitDate == null || visitDate.before(event.getDate()))&& (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))&& !notifiedUsers.contains(watch.getUser())diff --git a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.javaindex e779edf22e..80185c1a90 100644--- a/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java+++ b/server-core/src/main/java/io/onedev/server/rest/resource/UserResource.java@@ -232,10 +232,10 @@ public class UserResource {queriesAndWatches.buildQuerySubscriptions = user.getBuildQuerySubscriptions();queriesAndWatches.issueQueryWatches = user.getIssueQueryWatches();queriesAndWatches.pullRequestQueryWatches = user.getPullRequestQueryWatches();- queriesAndWatches.buildQueries = user.getUserBuildQueries();- queriesAndWatches.issueQueries = user.getUserIssueQueries();- queriesAndWatches.projectQueries = user.getUserProjectQueries();- queriesAndWatches.pullRequestQueries = user.getUserPullRequestQueries();+ queriesAndWatches.buildQueries = user.getBuildQueries();+ queriesAndWatches.issueQueries = user.getIssueQueries();+ queriesAndWatches.projectQueries = user.getProjectQueries();+ queriesAndWatches.pullRequestQueries = user.getPullRequestQueries();return queriesAndWatches;}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByCriteria.javanew file mode 100644index 0000000000..f9b42807c8--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByCriteria.java@@ -0,0 +1,49 @@+package io.onedev.server.search.entity.issue;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;+import javax.persistence.criteria.Subquery;++import io.onedev.server.model.Issue;+import io.onedev.server.model.IssueWatch;+import io.onedev.server.model.User;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;++public class IgnoredByCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public IgnoredByCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ Subquery<IssueWatch> watchQuery = query.subquery(IssueWatch.class);+ Root<IssueWatch> watch = watchQuery.from(IssueWatch.class);+ watchQuery.select(watch);+ watchQuery.where(builder.and(+ builder.equal(watch.get(IssueWatch.PROP_ISSUE), from),+ builder.equal(watch.get(IssueWatch.PROP_USER), user)),+ builder.equal(watch.get(IssueWatch.PROP_WATCHING), false));+ return builder.exists(watchQuery);+ }++ @Override+ public boolean matches(Issue issue) {+ return issue.getWatches().stream().anyMatch(it -> !it.isWatching() && it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return IssueQuery.getRuleName(IssueQueryLexer.IgnoredBy) + " " + quote(user.getName());+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.javanew file mode 100644index 0000000000..82e6fe65e3--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java@@ -0,0 +1,48 @@+package io.onedev.server.search.entity.issue;++import static io.onedev.server.search.entity.issue.IssueQueryLexer.IgnoredByMe;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.Issue;+import io.onedev.server.model.User;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;++public class IgnoredByMeCriteria extends Criteria<Issue> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {+ var user = User.get();+ if (user != null)+ return getCriteria(user).getPredicate(projectScope, query, from, builder);+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public boolean matches(Issue issue) {+ var user = User.get();+ if (user != null)+ return getCriteria(user).matches(issue);+ else+ throw new ExplicitException("Please login to perform this query");+ }++ private Criteria<Issue> getCriteria(User user) {+ return new IgnoredByCriteria(user);+ }++ @Override+ public String toStringWithoutParens() {+ return IssueQuery.getRuleName(IgnoredByMe);+ }++}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4index 99f5f4343e..e886d68567 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(Confidential|SubmittedByMe|WatchedByMe|CommentedByMe|MentionedMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria- | operator=(SubmittedBy|WatchedBy|CommentedBy|Mentioned|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ : operator=(Confidential|SubmittedByMe|WatchedByMe|IgnoredByMe|CommentedByMe|MentionedMe|FixedInCurrentCommit|FixedInCurrentBuild|FixedInCurrentPullRequest|CurrentIssue) #OperatorCriteria+ | operator=(SubmittedBy|WatchedBy|IgnoredBy|CommentedBy|Mentioned|FixedInCommit|FixedInBuild|FixedInPullRequest|HasAny) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria| FixedBetween WS+ revisionCriteria WS+ And WS+ revisionCriteria #FixedBetweenCriteria| criteriaField=Quoted WS+ operator=(IsMe|IsNotMe|IsEmpty|IsNotEmpty|IsCurrent|IsPrevious) #FieldOperatorCriteria| criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince|IsAfter|IsBefore|Contains) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria@@ -45,6 +45,10 @@ WatchedBy: 'watched' WS+ 'by';+IgnoredBy+ : 'ignored' WS+ 'by'+ ;+CommentedBy: 'commented' WS+ 'by';@@ -97,6 +101,10 @@ WatchedByMe: 'watched' WS+ 'by' WS+ 'me';+IgnoredByMe+ : 'ignored' WS+ 'by' WS+ 'me'+ ;+CommentedByMe: 'commented' WS+ 'by' WS+ 'me';diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.javaindex f618d575ec..68557352c5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java@@ -2,19 +2,28 @@ package io.onedev.server.search.entity.issue;import static io.onedev.server.model.Issue.NAME_COMMENT;import static io.onedev.server.model.Issue.NAME_COMMENT_COUNT;+import static io.onedev.server.model.Issue.NAME_CONFUSED_COUNT;import static io.onedev.server.model.Issue.NAME_DESCRIPTION;import static io.onedev.server.model.Issue.NAME_ESTIMATED_TIME;+import static io.onedev.server.model.Issue.NAME_EYES_COUNT;+import static io.onedev.server.model.Issue.NAME_HEART_COUNT;import static io.onedev.server.model.Issue.NAME_LAST_ACTIVITY_DATE;import static io.onedev.server.model.Issue.NAME_PROGRESS;import static io.onedev.server.model.Issue.NAME_PROJECT;+import static io.onedev.server.model.Issue.NAME_ROCKET_COUNT;+import static io.onedev.server.model.Issue.NAME_SMILE_COUNT;import static io.onedev.server.model.Issue.NAME_SPENT_TIME;import static io.onedev.server.model.Issue.NAME_STATE;import static io.onedev.server.model.Issue.NAME_SUBMIT_DATE;+import static io.onedev.server.model.Issue.NAME_TADA_COUNT;+import static io.onedev.server.model.Issue.NAME_THUMBS_DOWN_COUNT;+import static io.onedev.server.model.Issue.NAME_THUMBS_UP_COUNT;import static io.onedev.server.model.Issue.NAME_TITLE;import static io.onedev.server.model.Issue.NAME_VOTE_COUNT;import static io.onedev.server.model.Issue.SORT_FIELDS;import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IgnoredByMe;import static io.onedev.server.search.entity.issue.IssueQueryParser.CommentedByMe;import static io.onedev.server.search.entity.issue.IssueQueryParser.Confidential;import static io.onedev.server.search.entity.issue.IssueQueryParser.Contains;@@ -38,14 +47,6 @@ import static io.onedev.server.search.entity.issue.IssueQueryParser.IsUntil;import static io.onedev.server.search.entity.issue.IssueQueryParser.MentionedMe;import static io.onedev.server.search.entity.issue.IssueQueryParser.SubmittedByMe;import static io.onedev.server.search.entity.issue.IssueQueryParser.WatchedByMe;-import static io.onedev.server.model.Issue.NAME_THUMBS_UP_COUNT;-import static io.onedev.server.model.Issue.NAME_THUMBS_DOWN_COUNT;-import static io.onedev.server.model.Issue.NAME_SMILE_COUNT;-import static io.onedev.server.model.Issue.NAME_TADA_COUNT;-import static io.onedev.server.model.Issue.NAME_CONFUSED_COUNT;-import static io.onedev.server.model.Issue.NAME_HEART_COUNT;-import static io.onedev.server.model.Issue.NAME_ROCKET_COUNT;-import static io.onedev.server.model.Issue.NAME_EYES_COUNT;import java.util.ArrayList;import java.util.Collection;@@ -206,6 +207,10 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>if (!option.withCurrentUserCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new WatchedByMeCriteria();+ case IgnoredByMe:+ if (!option.withCurrentUserCriteria())+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new IgnoredByMeCriteria();case CommentedByMe:if (!option.withCurrentUserCriteria())throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");@@ -268,6 +273,8 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>criterias.add(new SubmittedByCriteria(getUser(value)));else if (ctx.WatchedBy() != null)criterias.add(new WatchedByCriteria(getUser(value)));+ else if (ctx.IgnoredBy() != null)+ criterias.add(new IgnoredByCriteria(getUser(value)));else if (ctx.CommentedBy() != null)criterias.add(new CommentedByCriteria(getUser(value)));else if (ctx.FixedInBuild() != null)diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.javaindex de54368ac3..1872a809c5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java@@ -1,16 +1,15 @@package io.onedev.server.search.entity.issue;+import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.From;import javax.persistence.criteria.Predicate;-import javax.persistence.criteria.Root;-import javax.persistence.criteria.Subquery;import io.onedev.commons.utils.ExplicitException;import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueWatch;import io.onedev.server.model.User;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;@@ -21,31 +20,29 @@ public class WatchedByMeCriteria extends Criteria<Issue> {@Overridepublic Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {- if (User.get() != null) {- Subquery<IssueWatch> watchQuery = query.subquery(IssueWatch.class);- Root<IssueWatch> watch = watchQuery.from(IssueWatch.class);- watchQuery.select(watch);- watchQuery.where(builder.and(- builder.equal(watch.get(IssueWatch.PROP_ISSUE), from),- builder.equal(watch.get(IssueWatch.PROP_USER), User.get()),- builder.equal(watch.get(IssueWatch.PROP_WATCHING), true)));- return builder.exists(watchQuery);- } else {+ var user = User.get();+ if (user != null)+ return getCriteria(user).getPredicate(projectScope, query, from, builder);+ elsethrow new ExplicitException("Please login to perform this query");- }}@Overridepublic boolean matches(Issue issue) {- if (User.get() != null)- return issue.getWatches().stream().anyMatch(it -> it.isWatching() && it.getUser().equals(User.get()));+ var user = User.get();+ if (user != null)+ return getCriteria(user).matches(issue);elsethrow new ExplicitException("Please login to perform this query");}++ private Criteria<Issue> getCriteria(User user) {+ return new WatchedByCriteria(user);+ }@Overridepublic String toStringWithoutParens() {- return IssueQuery.getRuleName(IssueQueryLexer.WatchedByMe);+ return IssueQuery.getRuleName(WatchedByMe);}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByCriteria.javanew file mode 100644index 0000000000..7058723cfd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByCriteria.java@@ -0,0 +1,51 @@+package io.onedev.server.search.entity.pullrequest;++import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredBy;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;+import javax.persistence.criteria.Subquery;++import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestWatch;+import io.onedev.server.model.User;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;++public class IgnoredByCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final User user;++ public IgnoredByCriteria(User user) {+ this.user = user;+ }++ @Override+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ Subquery<PullRequestWatch> watchQuery = query.subquery(PullRequestWatch.class);+ Root<PullRequestWatch> watch = watchQuery.from(PullRequestWatch.class);+ watchQuery.select(watch);+ watchQuery.where(builder.and(+ builder.equal(watch.get(PullRequestWatch.PROP_REQUEST), from),+ builder.equal(watch.get(PullRequestWatch.PROP_USER), user)),+ builder.equal(watch.get(PullRequestWatch.PROP_WATCHING), false));+ return builder.exists(watchQuery);+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getWatches().stream().anyMatch(it -> !it.isWatching() && it.getUser().equals(user));+ }++ @Override+ public String toStringWithoutParens() {+ return PullRequestQuery.getRuleName(IgnoredBy) + " " + quote(user.getName());+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.javanew file mode 100644index 0000000000..e260c23679--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java@@ -0,0 +1,48 @@+package io.onedev.server.search.entity.pullrequest;++import javax.annotation.Nullable;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.From;+import javax.persistence.criteria.Predicate;++import io.onedev.commons.utils.ExplicitException;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.util.ProjectScope;+import io.onedev.server.util.criteria.Criteria;++import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IgnoredByMe;++public class IgnoredByMeCriteria extends Criteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {+ var user = User.get();+ if (user != null)+ return getCriteria(user).getPredicate(projectScope, query, from, builder);+ else+ throw new ExplicitException("Please login to perform this query");+ }++ @Override+ public boolean matches(PullRequest request) {+ var user = User.get();+ if (user != null)+ return getCriteria(user).matches(request);+ else+ throw new ExplicitException("Please login to perform this query");+ }++ private Criteria<PullRequest> getCriteria(User user) {+ return new IgnoredByCriteria(user);+ }++ @Override+ public String toStringWithoutParens() {+ return PullRequestQuery.getRuleName(IgnoredByMe);+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4index a05b295ec9..1dc59b07fb 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4@@ -7,8 +7,8 @@ query;criteria- : operator=(Open|Merged|Discarded|NeedMyAction|AssignedToMe|SubmittedByMe|WatchedByMe|CommentedByMe|ToBeReviewedByMe|ToBeChangedByMe|ToBeMergedByMe|RequestedForChangesByMe|ApprovedByMe|MentionedMe|ReadyToMerge|SomeoneRequestedForChanges|HasPendingReviews|HasUnsuccessfulBuilds|HasUnfinishedBuilds|HasMergeConflicts) #OperatorCriteria- | operator=(NeedActionOf|ToBeReviewedBy|ToBeChangedBy|ToBeMergedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|WatchedBy|CommentedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria+ : operator=(Open|Merged|Discarded|NeedMyAction|AssignedToMe|SubmittedByMe|WatchedByMe|IgnoredByMe|CommentedByMe|ToBeReviewedByMe|ToBeChangedByMe|ToBeMergedByMe|RequestedForChangesByMe|ApprovedByMe|MentionedMe|ReadyToMerge|SomeoneRequestedForChanges|HasPendingReviews|HasUnsuccessfulBuilds|HasUnfinishedBuilds|HasMergeConflicts) #OperatorCriteria+ | operator=(NeedActionOf|ToBeReviewedBy|ToBeChangedBy|ToBeMergedBy|AssignedTo|ApprovedBy|RequestedForChangesBy|SubmittedBy|WatchedBy|IgnoredBy|CommentedBy|Mentioned|IncludesCommit|IncludesIssue) WS+ criteriaValue=multipleQuoted #OperatorValueCriteria| criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsUntil|IsSince|Contains) WS+ criteriaValue=multipleQuoted #FieldOperatorValueCriteria| Reference #ReferenceCriteria| criteria WS+ And WS+ criteria #AndCriteria@@ -74,6 +74,10 @@ WatchedByMe: 'watched' WS+ 'by' WS+ 'me';+IgnoredByMe+ : 'ignored' WS+ 'by' WS+ 'me'+ ;+CommentedByMe: 'commented' WS+ 'by' WS+ 'me';@@ -136,15 +140,19 @@ ApprovedBySubmittedBy: 'submitted' WS+ 'by'- ;+ ;WatchedBy: 'watched' WS+ 'by';+IgnoredBy+ : 'ignored' WS+ 'by'+ ;+CommentedBy: 'commented' WS+ 'by'- ;+ ;Mentioned: 'mentioned'@@ -152,11 +160,11 @@ MentionedIncludesCommit: 'includes' WS+ 'commit'- ;+ ;IncludesIssue: 'includes' WS+ 'issue'- ;+ ;OrderBy: 'order' WS+ 'by'@@ -164,7 +172,7 @@ OrderByIs: 'is'- ;+ ;IsNot: 'is' WS+ 'not'@@ -172,51 +180,51 @@ IsNotContains: 'contains'- ;+ ;IsGreaterThan: 'is' WS+ 'greater' WS+ 'than'- ;+ ;IsLessThan: 'is' WS+ 'less' WS+ 'than'- ;+ ;IsSince: 'is' WS+ 'since'- ;+ ;IsUntil: 'is' WS+ 'until'- ;+ ;And: 'and'- ;+ ;Or: 'or'- ;+ ;Not: 'not'- ;+ ;Asc: 'asc'- ;+ ;Desc: 'desc'- ;+ ;LParens: '('- ;+ ;RParens: ')'- ;+ ;Quoted: '"' ('\\'.|~[\\"])+? '"'@@ -236,4 +244,4 @@ FuzzyIdentifier: [a-zA-Z0-9:_/\\+\-;]+- ;+ ;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.javaindex 767e181e1a..c71375baa6 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java@@ -114,6 +114,10 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");return new WatchedByMeCriteria();+ case IgnoredByMe:+ if (!withCurrentUserCriteria)+ throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");+ return new IgnoredByMeCriteria();case CommentedByMe:if (!withCurrentUserCriteria)throw new ExplicitException("Criteria '" + ctx.operator.getText() + "' is not supported here");@@ -182,6 +186,9 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {case WatchedBy:criterias.add(new WatchedByCriteria(getUser(value)));break;+ case IgnoredBy:+ criterias.add(new IgnoredByCriteria(getUser(value)));+ break;case NeedActionOf:criterias.add(new NeedActionOfCriteria(getUser(value)));break;diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.javaindex 65f6462738..0021f2075e 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java@@ -1,5 +1,7 @@package io.onedev.server.search.entity.pullrequest;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedBy;+import javax.annotation.Nullable;import javax.persistence.criteria.CriteriaBuilder;import javax.persistence.criteria.CriteriaQuery;@@ -43,7 +45,7 @@ public class WatchedByCriteria extends Criteria<PullRequest> {@Overridepublic String toStringWithoutParens() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.WatchedBy) + " " + quote(user.getName());+ return PullRequestQuery.getRuleName(WatchedBy) + " " + quote(user.getName());}}diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.javaindex ea9ac38311..67d51384f5 100644--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java@@ -12,6 +12,8 @@ import io.onedev.server.model.User;import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.WatchedByMe;+public class WatchedByMeCriteria extends Criteria<PullRequest> {private static final long serialVersionUID = 1L;@@ -40,7 +42,7 @@ public class WatchedByMeCriteria extends Criteria<PullRequest> {@Overridepublic String toStringWithoutParens() {- return PullRequestQuery.getRuleName(PullRequestQueryLexer.WatchedByMe);+ return PullRequestQuery.getRuleName(WatchedByMe);}}diff --git a/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java b/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.javaindex 2b5ecd7d85..34eab756fa 100644--- a/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java+++ b/server-core/src/main/java/io/onedev/server/util/watch/QueryWatchSupport.java@@ -14,7 +14,7 @@ public abstract class QueryWatchSupport<T extends NamedQuery> {if (Boolean.TRUE.equals(watching))return WatchStatus.WATCH;else if (Boolean.FALSE.equals(watching))- return WatchStatus.DO_NOT_WATCH;+ return WatchStatus.IGNORE;elsereturn WatchStatus.DEFAULT;}diff --git a/server-core/src/main/java/io/onedev/server/util/watch/WatchStatus.java b/server-core/src/main/java/io/onedev/server/util/watch/WatchStatus.javaindex f509bee2f3..b8e1a07132 100644--- a/server-core/src/main/java/io/onedev/server/util/watch/WatchStatus.java+++ b/server-core/src/main/java/io/onedev/server/util/watch/WatchStatus.java@@ -3,7 +3,7 @@ package io.onedev.server.util.watch;public enum WatchStatus {DEFAULT("Default"),WATCH("Watch"),- DO_NOT_WATCH("Do not watch");+ IGNORE("Ignore");private final String displayName;diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex 995a25a15f..46275cea45 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -45,6 +45,8 @@ import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedBy;import static io.onedev.server.search.entity.issue.IssueQueryLexer.SubmittedByMe;import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedBy;import static io.onedev.server.search.entity.issue.IssueQueryLexer.WatchedByMe;+import static io.onedev.server.search.entity.issue.IssueQueryParser.IgnoredBy;+import static io.onedev.server.search.entity.issue.IssueQueryParser.IgnoredByMe;import static java.util.stream.Collectors.toList;import java.util.ArrayList;@@ -224,7 +226,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());int operator = getOperator(operatorName);if (fieldElements.isEmpty()) {- if (operator == Mentioned || operator == SubmittedBy || operator == CommentedBy || operator == WatchedBy)+ if (operator == Mentioned || operator == SubmittedBy || operator == CommentedBy || operator == WatchedBy || operator == IgnoredBy)return SuggestionUtils.suggestUsers(matchWith);else if (operator == FixedInBuild)return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);@@ -359,7 +361,7 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!option.withOrder() && suggestedLiteral.equals(getRuleName(OrderBy))- || !option.withCurrentUserCriteria() && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(CommentedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)) || suggestedLiteral.equals(getRuleName(WatchedByMe)))+ || !option.withCurrentUserCriteria() && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(CommentedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)) || suggestedLiteral.equals(getRuleName(WatchedByMe)) || suggestedLiteral.equals(getRuleName(IgnoredByMe)))|| !option.withCurrentBuildCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentBuild))|| !option.withCurrentPullRequestCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentPullRequest))|| !option.withCurrentCommitCriteria() && suggestedLiteral.equals(getRuleName(FixedInCurrentCommit))diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javaindex 3adc97b523..0200243ce2 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -194,7 +194,7 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {@Overrideprotected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {if (!withOrder && suggestedLiteral.equals(getRuleName(OrderBy))- || !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(WatchedByMe)) || suggestedLiteral.equals(getRuleName(NeedMyAction)) || suggestedLiteral.equals(getRuleName(CommentedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)) || suggestedLiteral.equals(getRuleName(ToBeReviewedByMe)) || suggestedLiteral.equals(getRuleName(RequestedForChangesByMe)) || suggestedLiteral.equals(getRuleName(ApprovedByMe)) || suggestedLiteral.equals(getRuleName(AssignedToMe)) || suggestedLiteral.equals(getRuleName(ToBeChangedByMe)) || suggestedLiteral.equals(getRuleName(ToBeMergedByMe)))) {+ || !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(WatchedByMe)) || suggestedLiteral.equals(getRuleName(IgnoredByMe)) || suggestedLiteral.equals(getRuleName(NeedMyAction)) || suggestedLiteral.equals(getRuleName(CommentedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)) || suggestedLiteral.equals(getRuleName(ToBeReviewedByMe)) || suggestedLiteral.equals(getRuleName(RequestedForChangesByMe)) || suggestedLiteral.equals(getRuleName(ApprovedByMe)) || suggestedLiteral.equals(getRuleName(AssignedToMe)) || suggestedLiteral.equals(getRuleName(ToBeChangedByMe)) || suggestedLiteral.equals(getRuleName(ToBeMergedByMe)))) {return null;} else if (suggestedLiteral.equals(",")) {return Optional.of("add another value");diff --git a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.javaindex bd6ea6f7d4..64bd0cf014 100644--- a/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/entity/watches/EntityWatchesPanel.java@@ -114,7 +114,7 @@ public abstract class EntityWatchesPanel extends Panel {protected WatchStatus getWatchStatus() {EntityWatch watch = getEntity().getWatch(SecurityUtils.getAuthUser(), false);if (watch != null && !watch.isWatching())- return WatchStatus.DO_NOT_WATCH;+ return WatchStatus.IGNORE;else if (watch != null && watch.isWatching())return WatchStatus.WATCH;else@@ -123,7 +123,7 @@ public abstract class EntityWatchesPanel extends Panel {@Overrideprotected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {- if (watchStatus == WatchStatus.DO_NOT_WATCH) {+ if (watchStatus == WatchStatus.IGNORE) {EntityWatch watch = getEntity().getWatch(SecurityUtils.getAuthUser(), true);watch.setWatching(false);onSaveWatch(watch);diff --git a/server-core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.javaindex 2463e72dca..a06aeef400 100644--- a/server-core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/subscriptionstatus/SubscriptionStatusLink.java@@ -35,10 +35,10 @@ public abstract class SubscriptionStatusLink extends AjaxLink<Void> {classes = "";if (isSubscribed()) {tag.put("class", classes + " subscription-status subscribed");- tag.put("title", "Subscribed. Click to unsubscribe");+ tag.put("title", "Watched. Click to unwatch");} else {tag.put("class", classes + " subscription-status unsubscribed");- tag.put("title", "Unsubscribed. Click to subscribe");+ tag.put("title", "Unwatched. Click to watch");}}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.htmldeleted file mode 100644index db1b09a00b..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.html+++ /dev/null@@ -1,9 +0,0 @@-<wicket:panel>- <form wicket:id="form" class="leave-confirm">- <div wicket:id="feedback" class="mb-4"></div>- <div wicket:id="editor"></div>- <div class="d-flex mt-5">- <input class="btn btn-primary dirty-aware" value="Save" type="submit">- </div>- </form>-</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.javadeleted file mode 100644index 10ea179a05..0000000000--- a/server-core/src/main/java/io/onedev/server/web/component/user/preferences/PreferencesEditPanel.java+++ /dev/null@@ -1,73 +0,0 @@-package io.onedev.server.web.component.user.preferences;--import com.google.common.collect.Sets;-import io.onedev.server.OneDev;-import io.onedev.server.entitymanager.UserManager;-import io.onedev.server.model.User;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;-import org.apache.wicket.Session;-import org.apache.wicket.feedback.FencedFeedbackPanel;-import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.panel.GenericPanel;-import org.apache.wicket.model.IModel;--import java.io.Serializable;--import static io.onedev.server.model.User.PROP_DISABLE_WATCH_NOTIFICATIONS;-import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;--public class PreferencesEditPanel extends GenericPanel<User> {-- private BeanEditor editor;-- public PreferencesEditPanel(String id, IModel<User> model) {- super(id, model);- }-- private User getUser() {- return getModelObject();- }-- @Override- protected void onInitialize() {- super.onInitialize();-- editor = BeanContext.editModel("editor", new IModel<>() {-- @Override- public void detach() {- }-- @Override- public Serializable getObject() {- return getUser();- }-- @Override- public void setObject(Serializable object) {- editor.getDescriptor().copyProperties(object, getUser());- }-- }, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), false);-- Form<?> form = new Form<Void>("form") {-- @Override- protected void onSubmit() {- super.onSubmit();-- User user = getUser();-- UserManager userManager = OneDev.getInstance(UserManager.class);- userManager.update(user, null);- Session.get().success("Preferences updated");- setResponsePage(getPage().getClass(), getPage().getPageParameters());- }-- };- form.add(editor);- form.add(new FencedFeedbackPanel("feedback", form).setEscapeModelStrings(false));- add(form);- }-}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.htmlnew file mode 100644index 0000000000..b67e849b6f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="mb-3">+ <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>+ </div>+ <table wicket:id="queries" class="table table-condensed"></table>+ <wicket:fragment wicket:id="linkFrag">+ <a wicket:id="link">+ <span wicket:id="label"></span>+ </a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.javanew file mode 100644index 0000000000..af8684ee87--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/BuildQueryWatchesPanel.java@@ -0,0 +1,253 @@+package io.onedev.server.web.component.user.querywatch;++import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;+import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.BuildQueryPersonalizationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.page.builds.BuildListPage;+import io.onedev.server.web.page.project.builds.ProjectBuildsPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.util.ConfirmClickModifier;++class BuildQueryWatchesPanel extends GenericPanel<User> {++ private static final long serialVersionUID = 1L;++ private SelectionColumn<QueryInfo, Void> selectionColumn;++ private final IModel<List<QueryInfo>> queryInfosModel = new LoadableDetachableModel<>() {++ @Override+ protected List<QueryInfo> load() {+ List<QueryInfo> queryInfos = new ArrayList<>();+ var buildSetting = getSettingManager().getBuildSetting();+ for (var name: getUser().getBuildQuerySubscriptions()) {+ NamedQuery query;+ if (name.startsWith(COMMON_NAME_PREFIX))+ query = buildSetting.getNamedQuery(name.substring(COMMON_NAME_PREFIX.length()));+ else+ query = getUser().getBuildQuery(name.substring(PERSONAL_NAME_PREFIX.length()));++ if (query != null)+ queryInfos.add(new QueryInfo(name, query.getQuery(), null));+ }+ for (var personalization: getUser().getBuildQueryPersonalizations()) {+ for (var name: personalization.getQuerySubscriptions()) {+ NamedQuery query;+ if (name.startsWith(COMMON_NAME_PREFIX))+ query = personalization.getProject().getNamedBuildQuery(name.substring(COMMON_NAME_PREFIX.length()));+ else+ query = personalization.getQuery(name.substring(PERSONAL_NAME_PREFIX.length()));+ if (query != null)+ queryInfos.add(new QueryInfo(name, query.getQuery(), personalization.getProject().getId()));+ }+ }+ return queryInfos;+ }+ };++ public BuildQueryWatchesPanel(String id, IModel<User> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var deleteSelected = new Link<Void>("deleteSelected") {++ @Override+ public void onClick() {+ for (IModel<QueryInfo> each: selectionColumn.getSelections()) {+ var queryInfo = each.getObject();+ if (queryInfo.projectId == null) {+ getUser().getBuildQuerySubscriptions().remove(queryInfo.name);+ } else {+ for (var personalization: getUser().getBuildQueryPersonalizations()) {+ if (personalization.getProject().getId().equals(queryInfo.projectId)) {+ personalization.getQuerySubscriptions().remove(queryInfo.name);+ getBuildQueryPersonalizationManager().createOrUpdate(personalization);+ }+ }+ }+ }+ getUserManager().update(getUser(), null);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!selectionColumn.getSelections().isEmpty());+ setVisible(!queryInfosModel.getObject().isEmpty());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Please select query watches to delete");+ }+ }++ }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);++ add(deleteSelected);++ List<IColumn<QueryInfo, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<QueryInfo, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var name = rowModel.getObject().name;+ if (name.startsWith(COMMON_NAME_PREFIX))+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";+ else+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";++ var fragment = new Fragment(componentId, "linkFrag", BuildQueryWatchesPanel.this);+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var link = new BookmarkablePageLink<Void>("link", ProjectBuildsPage.class, ProjectBuildsPage.paramsOf(project, rowModel.getObject().query, 1));+ link.add(new Label("label", name));+ fragment.add(link);+ } else {+ var link = new BookmarkablePageLink<Void>("link", BuildListPage.class, BuildListPage.paramsOf(rowModel.getObject().query, 1, 0));+ link.add(new Label("label", name));+ fragment.add(link);+ }+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var fragment = new Fragment(componentId, "linkFrag", BuildQueryWatchesPanel.this);+ var link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project));+ link.add(new Label("label", project.getPath()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));+ }+ }+ });++ var dataProvider = new SortableDataProvider<QueryInfo, Void>() {++ @Override+ public Iterator<? extends QueryInfo> iterator(long first, long count) {+ List<QueryInfo> queryInfos = queryInfosModel.getObject();+ if (first + count > queryInfos.size())+ return queryInfos.subList((int) first, queryInfos.size()).iterator();+ else+ return queryInfos.subList((int) first, (int) (first + count)).iterator();+ }++ @Override+ public long size() {+ return queryInfosModel.getObject().size();+ }++ @Override+ public IModel<QueryInfo> model(QueryInfo object) {+ return Model.of(object);+ }++ };++ add(new DefaultDataTable<>("queries", columns, dataProvider, Integer.MAX_VALUE, null));+ }++ @Override+ protected void onDetach() {+ queryInfosModel.detach();+ super.onDetach();+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ private SettingManager getSettingManager() {+ return OneDev.getInstance(SettingManager.class);+ }++ private BuildQueryPersonalizationManager getBuildQueryPersonalizationManager() {+ return OneDev.getInstance(BuildQueryPersonalizationManager.class);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ private User getUser() {+ return getModelObject();+ }++ private static class QueryInfo implements Serializable {++ final String name;++ final String query;++ final Long projectId;++ QueryInfo(String name, String query, @Nullable Long projectId) {+ this.name = name;+ this.query = query;+ this.projectId = projectId;+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.htmlnew file mode 100644index 0000000000..b67e849b6f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="mb-3">+ <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>+ </div>+ <table wicket:id="queries" class="table table-condensed"></table>+ <wicket:fragment wicket:id="linkFrag">+ <a wicket:id="link">+ <span wicket:id="label"></span>+ </a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.javanew file mode 100644index 0000000000..bf1c21c339--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/CommitQueryWatchesPanel.java@@ -0,0 +1,220 @@+package io.onedev.server.web.component.user.querywatch;++import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;+import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.CommitQueryPersonalizationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.page.project.commits.ProjectCommitsPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.util.ConfirmClickModifier;++class CommitQueryWatchesPanel extends GenericPanel<User> {++ private static final long serialVersionUID = 1L;++ private SelectionColumn<QueryInfo, Void> selectionColumn;++ private final IModel<List<QueryInfo>> queryInfosModel = new LoadableDetachableModel<>() {++ @Override+ protected List<QueryInfo> load() {+ List<QueryInfo> queryInfos = new ArrayList<>();+ for (var personalization: getUser().getCommitQueryPersonalizations()) {+ for (var name: personalization.getQuerySubscriptions()) {+ NamedQuery query;+ if (name.startsWith(COMMON_NAME_PREFIX))+ query = personalization.getProject().getNamedCommitQuery(name.substring(COMMON_NAME_PREFIX.length()));+ else+ query = personalization.getQuery(name.substring(PERSONAL_NAME_PREFIX.length()));+ if (query != null)+ queryInfos.add(new QueryInfo(name, query.getQuery(), personalization.getProject().getId()));+ }+ }+ return queryInfos;+ }+ };++ public CommitQueryWatchesPanel(String id, IModel<User> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var deleteSelected = new Link<Void>("deleteSelected") {++ @Override+ public void onClick() {+ for (IModel<QueryInfo> each: selectionColumn.getSelections()) {+ var queryInfo = each.getObject();+ for (var personalization: getUser().getCommitQueryPersonalizations()) {+ if (personalization.getProject().getId().equals(queryInfo.projectId)) {+ personalization.getQuerySubscriptions().remove(queryInfo.name);+ getCommitQueryPersonalizationManager().createOrUpdate(personalization);+ }+ }+ }+ getUserManager().update(getUser(), null);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!selectionColumn.getSelections().isEmpty());+ setVisible(!queryInfosModel.getObject().isEmpty());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Please select query watches to delete");+ }+ }++ }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);++ add(deleteSelected);++ List<IColumn<QueryInfo, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<QueryInfo, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var name = rowModel.getObject().name;+ if (name.startsWith(COMMON_NAME_PREFIX))+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";+ else+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";++ var fragment = new Fragment(componentId, "linkFrag", CommitQueryWatchesPanel.this);+ var project = getProjectManager().load(rowModel.getObject().projectId);+ var link = new BookmarkablePageLink<Void>("link", ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(project, rowModel.getObject().query, null));+ link.add(new Label("label", name));+ fragment.add(link);+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var project = getProjectManager().load(rowModel.getObject().projectId);+ var fragment = new Fragment(componentId, "linkFrag", CommitQueryWatchesPanel.this);+ var link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project));+ link.add(new Label("label", project.getPath()));+ fragment.add(link);+ cellItem.add(fragment);+ }+ });++ var dataProvider = new SortableDataProvider<QueryInfo, Void>() {++ @Override+ public Iterator<? extends QueryInfo> iterator(long first, long count) {+ List<QueryInfo> queryInfos = queryInfosModel.getObject();+ if (first + count > queryInfos.size())+ return queryInfos.subList((int) first, queryInfos.size()).iterator();+ else+ return queryInfos.subList((int) first, (int) (first + count)).iterator();+ }++ @Override+ public long size() {+ return queryInfosModel.getObject().size();+ }++ @Override+ public IModel<QueryInfo> model(QueryInfo object) {+ return Model.of(object);+ }++ };++ add(new DefaultDataTable<>("queries", columns, dataProvider, Integer.MAX_VALUE, null));+ }++ @Override+ protected void onDetach() {+ queryInfosModel.detach();+ super.onDetach();+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ private CommitQueryPersonalizationManager getCommitQueryPersonalizationManager() {+ return OneDev.getInstance(CommitQueryPersonalizationManager.class);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ private User getUser() {+ return getModelObject();+ }++ private static class QueryInfo implements Serializable {++ final String name;++ final String query;++ final Long projectId;++ QueryInfo(String name, String query, @Nullable Long projectId) {+ this.name = name;+ this.query = query;+ this.projectId = projectId;+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.htmlnew file mode 100644index 0000000000..a2087cb3e5--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.html@@ -0,0 +1,15 @@+<wicket:panel>+ <div class="alert alert-notice alert-light mb-4">+ Issue query watch only affects new issues. To manage watch status of existing issues+ in batch, filter issues by watch status in issues page, and then take appropriate action+ </div>+ <div class="mb-3">+ <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>+ </div>+ <table wicket:id="queries" class="table table-condensed"></table>+ <wicket:fragment wicket:id="linkFrag">+ <a wicket:id="link">+ <span wicket:id="label"></span>+ </a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.javanew file mode 100644index 0000000000..89df8a534a--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/IssueQueryWatchesPanel.java@@ -0,0 +1,269 @@+package io.onedev.server.web.component.user.querywatch;++import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;+import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.IssueQueryPersonalizationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.page.issues.IssueListPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;+import io.onedev.server.web.util.ConfirmClickModifier;++class IssueQueryWatchesPanel extends GenericPanel<User> {++ private static final long serialVersionUID = 1L;++ private SelectionColumn<QueryInfo, Void> selectionColumn;++ private final IModel<List<QueryInfo>> queryInfosModel = new LoadableDetachableModel<>() {++ @Override+ protected List<QueryInfo> load() {+ List<QueryInfo> queryInfos = new ArrayList<>();+ var issueSetting = getSettingManager().getIssueSetting();+ for (var entry: getUser().getIssueQueryWatches().entrySet()) {+ NamedQuery query;+ if (entry.getKey().startsWith(COMMON_NAME_PREFIX))+ query = issueSetting.getNamedQuery(entry.getKey().substring(COMMON_NAME_PREFIX.length()));+ else+ query = getUser().getIssueQuery(entry.getKey().substring(PERSONAL_NAME_PREFIX.length()));++ if (query != null)+ queryInfos.add(new QueryInfo(entry.getKey(), query.getQuery(), null, entry.getValue()));+ }+ for (var personalization: getUser().getIssueQueryPersonalizations()) {+ for (var entry: personalization.getQueryWatches().entrySet()) {+ NamedQuery query;+ if (entry.getKey().startsWith(COMMON_NAME_PREFIX))+ query = personalization.getProject().getNamedIssueQuery(entry.getKey().substring(COMMON_NAME_PREFIX.length()));+ else+ query = personalization.getQuery(entry.getKey().substring(PERSONAL_NAME_PREFIX.length()));+ if (query != null)+ queryInfos.add(new QueryInfo(entry.getKey(), query.getQuery(), personalization.getProject().getId(), entry.getValue()));+ }+ }+ return queryInfos;+ }+ };++ public IssueQueryWatchesPanel(String id, IModel<User> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var deleteSelected = new Link<Void>("deleteSelected") {++ @Override+ public void onClick() {+ for (IModel<QueryInfo> each: selectionColumn.getSelections()) {+ var queryInfo = each.getObject();+ if (queryInfo.projectId == null) {+ getUser().getIssueQueryWatches().remove(queryInfo.name);+ } else {+ for (var personalization: getUser().getIssueQueryPersonalizations()) {+ if (personalization.getProject().getId().equals(queryInfo.projectId)) {+ personalization.getQueryWatches().remove(queryInfo.name);+ getIssueQueryPersonalizationManager().createOrUpdate(personalization);+ }+ }+ }+ }+ getUserManager().update(getUser(), null);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!selectionColumn.getSelections().isEmpty());+ setVisible(!queryInfosModel.getObject().isEmpty());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Please select query watches to delete");+ }+ }++ }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);++ add(deleteSelected);++ List<IColumn<QueryInfo, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<QueryInfo, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var name = rowModel.getObject().name;+ if (name.startsWith(COMMON_NAME_PREFIX))+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";+ else+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";++ var fragment = new Fragment(componentId, "linkFrag", IssueQueryWatchesPanel.this);+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var link = new BookmarkablePageLink<Void>("link", ProjectIssueListPage.class, ProjectIssueListPage.paramsOf(project, rowModel.getObject().query, 1));+ link.add(new Label("label", name));+ fragment.add(link);+ } else {+ var link = new BookmarkablePageLink<Void>("link", IssueListPage.class, IssueListPage.paramsOf(rowModel.getObject().query, 1));+ link.add(new Label("label", name));+ fragment.add(link);+ }+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var fragment = new Fragment(componentId, "linkFrag", IssueQueryWatchesPanel.this);+ var link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project));+ link.add(new Label("label", project.getPath()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));+ }+ }+ });++ columns.add(new AbstractColumn<>(Model.of("Watch Status")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ if (rowModel.getObject().watching) {+ cellItem.add(new Label(componentId, "Watch"));+ } else {+ cellItem.add(new Label(componentId, "Ignore"));+ }+ }+ });++ var dataProvider = new SortableDataProvider<QueryInfo, Void>() {++ @Override+ public Iterator<? extends QueryInfo> iterator(long first, long count) {+ List<QueryInfo> queryInfos = queryInfosModel.getObject();+ if (first + count > queryInfos.size())+ return queryInfos.subList((int) first, queryInfos.size()).iterator();+ else+ return queryInfos.subList((int) first, (int) (first + count)).iterator();+ }++ @Override+ public long size() {+ return queryInfosModel.getObject().size();+ }++ @Override+ public IModel<QueryInfo> model(QueryInfo object) {+ return Model.of(object);+ }++ };++ add(new DefaultDataTable<>("queries", columns, dataProvider, Integer.MAX_VALUE, null));+ }++ @Override+ protected void onDetach() {+ queryInfosModel.detach();+ super.onDetach();+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ private SettingManager getSettingManager() {+ return OneDev.getInstance(SettingManager.class);+ }++ private IssueQueryPersonalizationManager getIssueQueryPersonalizationManager() {+ return OneDev.getInstance(IssueQueryPersonalizationManager.class);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ private User getUser() {+ return getModelObject();+ }++ private static class QueryInfo implements Serializable {++ final String name;++ final String query;++ final Long projectId;++ final boolean watching;++ QueryInfo(String name, String query, @Nullable Long projectId, boolean watching) {+ this.name = name;+ this.query = query;+ this.projectId = projectId;+ this.watching = watching;+ }++ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.htmlnew file mode 100644index 0000000000..b67e849b6f--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.html@@ -0,0 +1,11 @@+<wicket:panel>+ <div class="mb-3">+ <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>+ </div>+ <table wicket:id="queries" class="table table-condensed"></table>+ <wicket:fragment wicket:id="linkFrag">+ <a wicket:id="link">+ <span wicket:id="label"></span>+ </a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.javanew file mode 100644index 0000000000..8bfa158e0c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PackQueryWatchesPanel.java@@ -0,0 +1,252 @@+package io.onedev.server.web.component.user.querywatch;++import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;+import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PackQueryPersonalizationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.page.packs.PackListPage;+import io.onedev.server.web.page.project.packs.ProjectPacksPage;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.util.ConfirmClickModifier;++class PackQueryWatchesPanel extends GenericPanel<User> {++ private static final long serialVersionUID = 1L;++ private SelectionColumn<QueryInfo, Void> selectionColumn;++ private final IModel<List<QueryInfo>> queryInfosModel = new LoadableDetachableModel<>() {++ @Override+ protected List<QueryInfo> load() {+ List<QueryInfo> queryInfos = new ArrayList<>();+ var packSetting = getSettingManager().getPackSetting();+ for (var name: getUser().getPackQuerySubscriptions()) {+ NamedQuery query;+ if (name.startsWith(COMMON_NAME_PREFIX))+ query = packSetting.getNamedQuery(name.substring(COMMON_NAME_PREFIX.length()));+ else+ query = getUser().getPackQuery(name.substring(PERSONAL_NAME_PREFIX.length()));++ if (query != null)+ queryInfos.add(new QueryInfo(name, query.getQuery(), null));+ }+ for (var personalization: getUser().getPackQueryPersonalizations()) {+ for (var name: personalization.getQuerySubscriptions()) {+ NamedQuery query;+ if (name.startsWith(COMMON_NAME_PREFIX))+ query = personalization.getProject().getNamedPackQuery(name.substring(COMMON_NAME_PREFIX.length()));+ else+ query = personalization.getQuery(name.substring(PERSONAL_NAME_PREFIX.length()));+ if (query != null)+ queryInfos.add(new QueryInfo(name, query.getQuery(), personalization.getProject().getId()));+ }+ }+ return queryInfos;+ }+ };++ public PackQueryWatchesPanel(String id, IModel<User> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var deleteSelected = new Link<Void>("deleteSelected") {++ @Override+ public void onClick() {+ for (IModel<QueryInfo> each: selectionColumn.getSelections()) {+ var queryInfo = each.getObject();+ if (queryInfo.projectId == null) {+ getUser().getPackQuerySubscriptions().remove(queryInfo.name);+ } else {+ for (var personalization: getUser().getPackQueryPersonalizations()) {+ if (personalization.getProject().getId().equals(queryInfo.projectId)) {+ personalization.getQuerySubscriptions().remove(queryInfo.name);+ getPackQueryPersonalizationManager().createOrUpdate(personalization);+ }+ }+ }+ }+ getUserManager().update(getUser(), null);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!selectionColumn.getSelections().isEmpty());+ setVisible(!queryInfosModel.getObject().isEmpty());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Please select query watches to delete");+ }+ }++ }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);++ add(deleteSelected);++ List<IColumn<QueryInfo, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<QueryInfo, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var name = rowModel.getObject().name;+ if (name.startsWith(COMMON_NAME_PREFIX))+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";+ else+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";++ var fragment = new Fragment(componentId, "linkFrag", PackQueryWatchesPanel.this);+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var link = new BookmarkablePageLink<Void>("link", ProjectPacksPage.class, ProjectPacksPage.paramsOf(project, rowModel.getObject().query, 1));+ link.add(new Label("label", name));+ fragment.add(link);+ } else {+ var link = new BookmarkablePageLink<Void>("link", PackListPage.class, PackListPage.paramsOf(rowModel.getObject().query, 1));+ link.add(new Label("label", name));+ fragment.add(link);+ }+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var fragment = new Fragment(componentId, "linkFrag", PackQueryWatchesPanel.this);+ var link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class, ProjectDashboardPage.paramsOf(project));+ link.add(new Label("label", project.getPath()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));+ }+ }+ });++ var dataProvider = new SortableDataProvider<QueryInfo, Void>() {++ @Override+ public Iterator<? extends QueryInfo> iterator(long first, long count) {+ List<QueryInfo> queryInfos = queryInfosModel.getObject();+ if (first + count > queryInfos.size())+ return queryInfos.subList((int) first, queryInfos.size()).iterator();+ else+ return queryInfos.subList((int) first, (int) (first + count)).iterator();+ }++ @Override+ public long size() {+ return queryInfosModel.getObject().size();+ }++ @Override+ public IModel<QueryInfo> model(QueryInfo object) {+ return Model.of(object);+ }++ };++ add(new DefaultDataTable<>("queries", columns, dataProvider, Integer.MAX_VALUE, null));+ }++ @Override+ protected void onDetach() {+ queryInfosModel.detach();+ super.onDetach();+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ private SettingManager getSettingManager() {+ return OneDev.getInstance(SettingManager.class);+ }++ private PackQueryPersonalizationManager getPackQueryPersonalizationManager() {+ return OneDev.getInstance(PackQueryPersonalizationManager.class);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ private User getUser() {+ return getModelObject();+ }++ private static class QueryInfo implements Serializable {++ final String name;++ final String query;++ final Long projectId;++ QueryInfo(String name, String query, @Nullable Long projectId) {+ this.name = name;+ this.query = query;+ this.projectId = projectId;+ }+ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.htmlnew file mode 100644index 0000000000..bee6e6976c--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.html@@ -0,0 +1,13 @@+<wicket:panel>+ <div class="alert alert-notice alert-light mb-4">+ Pull request query watch only affects new pull requests. To manage watch status of existing pull requests+ in batch, filter pull requests by watch status in pull requests page, and then take appropriate action+ </div>+ <div class="mb-4">+ <a wicket:id="deleteSelected" class="btn btn-danger">Delete Selected</a>+ </div>+ <table wicket:id="queries" class="table"></table>+ <wicket:fragment wicket:id="linkFrag">+ <a wicket:id="link"><span wicket:id="label"></span></a>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.javanew file mode 100644index 0000000000..4802ceeb86--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/PullRequestQueryWatchesPanel.java@@ -0,0 +1,273 @@+package io.onedev.server.web.component.user.querywatch;++import static io.onedev.server.model.support.NamedQuery.COMMON_NAME_PREFIX;+import static io.onedev.server.model.support.NamedQuery.PERSONAL_NAME_PREFIX;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.Iterator;+import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Fragment;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.markup.repeater.Item;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import io.onedev.server.OneDev;+import io.onedev.server.entitymanager.PullRequestQueryPersonalizationManager;+import io.onedev.server.entitymanager.ProjectManager;+import io.onedev.server.entitymanager.SettingManager;+import io.onedev.server.entitymanager.UserManager;+import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.web.component.datatable.DefaultDataTable;+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;+import io.onedev.server.web.page.project.dashboard.ProjectDashboardPage;+import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;+import io.onedev.server.web.page.pullrequests.PullRequestListPage;+import io.onedev.server.web.util.ConfirmClickModifier;++class PullRequestQueryWatchesPanel extends GenericPanel<User> {++ private static final long serialVersionUID = 1L;++ private SelectionColumn<QueryInfo, Void> selectionColumn;++ private final IModel<List<QueryInfo>> queryInfosModel = new LoadableDetachableModel<>() {++ @Override+ protected List<QueryInfo> load() {+ List<QueryInfo> queryInfos = new ArrayList<>();+ var pullRequestSetting = getSettingManager().getPullRequestSetting();+ for (var entry: getUser().getPullRequestQueryWatches().entrySet()) {+ NamedQuery query;+ if (entry.getKey().startsWith(COMMON_NAME_PREFIX))+ query = pullRequestSetting.getNamedQuery(entry.getKey().substring(COMMON_NAME_PREFIX.length()));+ else+ query = getUser().getPullRequestQuery(entry.getKey().substring(PERSONAL_NAME_PREFIX.length()));++ if (query != null)+ queryInfos.add(new QueryInfo(entry.getKey(), query.getQuery(), null, entry.getValue()));+ }+ for (var personalization: getUser().getPullRequestQueryPersonalizations()) {+ for (var entry: personalization.getQueryWatches().entrySet()) {+ NamedQuery query;+ if (entry.getKey().startsWith(COMMON_NAME_PREFIX))+ query = personalization.getProject().getNamedPullRequestQuery(entry.getKey().substring(COMMON_NAME_PREFIX.length()));+ else+ query = personalization.getQuery(entry.getKey().substring(PERSONAL_NAME_PREFIX.length()));+ if (query != null)+ queryInfos.add(new QueryInfo(entry.getKey(), query.getQuery(), personalization.getProject().getId(), entry.getValue()));+ }+ }+ return queryInfos;+ }+ };++ public PullRequestQueryWatchesPanel(String id, IModel<User> model) {+ super(id, model);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ var deleteSelected = new Link<Void>("deleteSelected") {++ @Override+ public void onClick() {+ for (IModel<QueryInfo> each: selectionColumn.getSelections()) {+ var queryInfo = each.getObject();+ if (queryInfo.projectId == null) {+ getUser().getPullRequestQueryWatches().remove(queryInfo.name);+ } else {+ for (var personalization: getUser().getPullRequestQueryPersonalizations()) {+ if (personalization.getProject().getId().equals(queryInfo.projectId)) {+ personalization.getQueryWatches().remove(queryInfo.name);+ getPullRequestQueryPersonalizationManager().createOrUpdate(personalization);+ }+ }+ }+ }+ getUserManager().update(getUser(), null);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(!selectionColumn.getSelections().isEmpty());+ setVisible(!queryInfosModel.getObject().isEmpty());+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ configure();+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Please select query watches to delete");+ }+ }++ }.add(new ConfirmClickModifier("Do you really want to delete selected query watches?")).setOutputMarkupId(true);++ add(deleteSelected);++ List<IColumn<QueryInfo, Void>> columns = new ArrayList<>();++ selectionColumn = new SelectionColumn<QueryInfo, Void>() {++ @Override+ protected void onSelectionChange(AjaxRequestTarget target) {+ target.add(deleteSelected);+ }++ };+ columns.add(selectionColumn);++ columns.add(new AbstractColumn<>(Model.of("Name")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var name = rowModel.getObject().name;+ if (name.startsWith(COMMON_NAME_PREFIX))+ name = name.substring(COMMON_NAME_PREFIX.length()) + " (common)";+ else+ name = name.substring(PERSONAL_NAME_PREFIX.length()) + " (personal)";++ var fragment = new Fragment(componentId, "linkFrag", PullRequestQueryWatchesPanel.this);+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var link = new BookmarkablePageLink<Void>("link", ProjectPullRequestsPage.class,+ ProjectPullRequestsPage.paramsOf(project, rowModel.getObject().query, 1));+ link.add(new Label("label", name));+ fragment.add(link);+ } else {+ var link = new BookmarkablePageLink<Void>("link", PullRequestListPage.class,+ PullRequestListPage.paramsOf(rowModel.getObject().query, 1));+ link.add(new Label("label", name));+ fragment.add(link);+ }+ cellItem.add(fragment);+ }+ });++ columns.add(new AbstractColumn<>(Model.of("Project")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ var projectId = rowModel.getObject().projectId;+ if (projectId != null) {+ var project = getProjectManager().load(projectId);+ var fragment = new Fragment(componentId, "linkFrag", PullRequestQueryWatchesPanel.this);+ var link = new BookmarkablePageLink<Void>("link", ProjectDashboardPage.class,+ ProjectDashboardPage.paramsOf(project));+ link.add(new Label("label", project.getPath()));+ fragment.add(link);+ cellItem.add(fragment);+ } else {+ cellItem.add(new Label(componentId, "<i>Global</i>").setEscapeModelStrings(false));+ }+ }+ });++ columns.add(new AbstractColumn<>(Model.of("Watch Status")) {++ @Override+ public void populateItem(Item<ICellPopulator<QueryInfo>> cellItem, String componentId,+ IModel<QueryInfo> rowModel) {+ if (rowModel.getObject().watching) {+ cellItem.add(new Label(componentId, "Watch"));+ } else {+ cellItem.add(new Label(componentId, "Ignore"));+ }+ }+ });++ var dataProvider = new SortableDataProvider<QueryInfo, Void>() {++ @Override+ public Iterator<? extends QueryInfo> iterator(long first, long count) {+ List<QueryInfo> queryInfos = queryInfosModel.getObject();+ if (first + count > queryInfos.size())+ return queryInfos.subList((int) first, queryInfos.size()).iterator();+ else+ return queryInfos.subList((int) first, (int) (first + count)).iterator();+ }++ @Override+ public long size() {+ return queryInfosModel.getObject().size();+ }++ @Override+ public IModel<QueryInfo> model(QueryInfo object) {+ return Model.of(object);+ }++ };++ add(new DefaultDataTable<>("queries", columns, dataProvider, Integer.MAX_VALUE, null));+ }++ @Override+ protected void onDetach() {+ queryInfosModel.detach();+ super.onDetach();+ }++ private ProjectManager getProjectManager() {+ return OneDev.getInstance(ProjectManager.class);+ }++ private SettingManager getSettingManager() {+ return OneDev.getInstance(SettingManager.class);+ }++ private PullRequestQueryPersonalizationManager getPullRequestQueryPersonalizationManager() {+ return OneDev.getInstance(PullRequestQueryPersonalizationManager.class);+ }++ private UserManager getUserManager() {+ return OneDev.getInstance(UserManager.class);+ }++ private User getUser() {+ return getModelObject();+ }++ private static class QueryInfo implements Serializable {++ final String name;++ final String query;++ final Long projectId;++ final boolean watching;++ QueryInfo(String name, String query, @Nullable Long projectId, boolean watching) {+ this.name = name;+ this.query = query;+ this.projectId = projectId;+ this.watching = watching;+ }++ }+}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.html b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.htmlnew file mode 100644index 0000000000..3e68556ec0--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.html@@ -0,0 +1,4 @@+<wicket:panel>+ <ul wicket:id="tabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5"></ul>+ <div wicket:id="content"></div>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.java b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.javanew file mode 100644index 0000000000..862b99d3bd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/user/querywatch/QueryWatchesPanel.java@@ -0,0 +1,105 @@+package io.onedev.server.web.component.user.querywatch;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.panel.GenericPanel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;++import io.onedev.server.model.User;+import io.onedev.server.web.component.tabbable.AjaxActionTab;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;++public abstract class QueryWatchesPanel extends GenericPanel<User> {++ public static final String TAB_ISSUE = "issue";++ public static final String TAB_PULL_REQUEST = "pull-request";++ public static final String TAB_BUILD = "build";++ public static final String TAB_PACK = "pack";++ public static final String TAB_COMMIT = "commit";++ private final String tabName;++ public QueryWatchesPanel(String id, IModel<User> model, String tabName) {+ super(id, model);+ this.tabName = tabName;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ List<Tab> tabs = new ArrayList<>();++ var issueTab = new AjaxActionTab(Model.of("Issue"), null) {+ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ onTabSelected(target, TAB_ISSUE);+ }+ };+ tabs.add(issueTab);++ var pullRequestTab = new AjaxActionTab(Model.of("Pull Request"), null) {+ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ onTabSelected(target, TAB_PULL_REQUEST);+ }+ };+ tabs.add(pullRequestTab);++ var buildTab = new AjaxActionTab(Model.of("Build"), null) {+ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ onTabSelected(target, TAB_BUILD);+ }+ };+ tabs.add(buildTab);++ var packTab = new AjaxActionTab(Model.of("Pack"), null) {+ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ onTabSelected(target, TAB_PACK);+ }+ };+ tabs.add(packTab);++ var commitTab = new AjaxActionTab(Model.of("Commit"), null) {+ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ onTabSelected(target, TAB_COMMIT);+ }+ };+ tabs.add(commitTab);++ if (tabName.equals(TAB_ISSUE)) {+ issueTab.setSelected(true);+ add(new IssueQueryWatchesPanel("content", getModel()));+ } else if (tabName.equals(TAB_PULL_REQUEST)) {+ pullRequestTab.setSelected(true);+ add(new PullRequestQueryWatchesPanel("content", getModel()));+ } else if (tabName.equals(TAB_BUILD)) {+ buildTab.setSelected(true);+ add(new BuildQueryWatchesPanel("content", getModel()));+ } else if (tabName.equals(TAB_PACK)) {+ packTab.setSelected(true);+ add(new PackQueryWatchesPanel("content", getModel()));+ } else if (tabName.equals(TAB_COMMIT)) {+ commitTab.setSelected(true);+ add(new CommitQueryWatchesPanel("content", getModel()));+ } else {+ throw new RuntimeException("Unexpected tab name: " + tabName);+ }+ add(new Tabbable("tabs", tabs));+ }++ protected abstract void onTabSelected(AjaxRequestTarget target, String tabName);++}diff --git a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.javaindex bcc338a733..51b284cda3 100644--- a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java+++ b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java@@ -30,7 +30,7 @@ public abstract class WatchStatusLink extends DropdownLink {@Overrideprotected String load() {WatchStatus status = getWatchStatus();- if (status == WatchStatus.DO_NOT_WATCH)+ if (status == WatchStatus.IGNORE)return "do-not-watch";else if (status == WatchStatus.WATCH)return "watch";diff --git a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.html b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.htmlindex 5ab90ed836..366efb09fd 100644--- a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.html@@ -14,10 +14,10 @@<div class="text-muted font-size-sm mt-1">You will be notified of any activities</div></div></a>- <a wicket:id="doNotWatch" class="d-flex px-3 py-2 text-hover-gray-dark">+ <a wicket:id="ignore" class="d-flex px-3 py-2 text-hover-gray-dark"><wicket:svg href="tick" class="icon mr-2 mt-1"/><div>- <div class="font-weight-bold">Do not watch</div>+ <div class="font-weight-bold">Ignore</div><div class="text-muted font-size-sm mt-1">Ignore activities irrelevant to me</div></div></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.javaindex 223ee41360..b97cd4b8b5 100644--- a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java@@ -51,17 +51,17 @@ public abstract class WatchStatusPanel extends Panel {}});- add(new AjaxLink<Void>("doNotWatch") {+ add(new AjaxLink<Void>("ignore") {@Overridepublic void onClick(AjaxRequestTarget target) {- onWatchStatusChange(target, WatchStatus.DO_NOT_WATCH);+ onWatchStatusChange(target, WatchStatus.IGNORE);}@Overrideprotected void onInitialize() {super.onInitialize();- if (getWatchStatus() == WatchStatus.DO_NOT_WATCH)+ if (getWatchStatus() == WatchStatus.IGNORE)add(AttributeAppender.append("class", "active"));}diff --git a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.cssindex aa2390a97f..90ef851768 100644--- a/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css+++ b/server-core/src/main/java/io/onedev/server/web/component/watchstatus/watch-status.css@@ -8,7 +8,7 @@content: "Watch";}.watch-status.do-not-watch:AFTER {- content: "Do not watch";+ content: "Ignore";}.watch-status .icon {display: none;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.javaindex dc64e7ed5b..543a51f6cb 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@@ -72,8 +72,8 @@ import io.onedev.server.web.page.admin.usermanagement.emailaddresses.UserEmailAdimport io.onedev.server.web.page.admin.usermanagement.gpgkeys.UserGpgKeysPage;import io.onedev.server.web.page.admin.usermanagement.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.usermanagement.password.UserPasswordPage;-import io.onedev.server.web.page.admin.usermanagement.preferences.UserPreferencesPage;import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;+import io.onedev.server.web.page.admin.usermanagement.querywatch.UserQueryWatchesPage;import io.onedev.server.web.page.admin.usermanagement.sshkeys.UserSshKeysPage;import io.onedev.server.web.page.admin.usermanagement.twofactorauthentication.UserTwoFactorAuthenticationPage;import io.onedev.server.web.page.builds.BuildListPage;@@ -87,8 +87,8 @@ import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;import io.onedev.server.web.page.my.password.MyPasswordPage;-import io.onedev.server.web.page.my.preferences.MyPreferencesPage;import io.onedev.server.web.page.my.profile.MyProfilePage;+import io.onedev.server.web.page.my.querywatch.MyQueryWatchesPage;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthenticationPage;import io.onedev.server.web.page.packs.PackListPage;@@ -219,7 +219,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new BasePageMapper("~my/gpg-keys", MyGpgKeysPage.class));add(new BasePageMapper("~my/access-tokens", MyAccessTokensPage.class));add(new BasePageMapper("~my/two-factor-authentication", MyTwoFactorAuthenticationPage.class));- add(new BasePageMapper("~my/preferences", MyPreferencesPage.class));+ add(new BasePageMapper("~my/query-watches/#{tab}", MyQueryWatchesPage.class));}private void addResources() {@@ -279,7 +279,7 @@ public class BaseUrlMapper extends CompoundRequestMapper {add(new BasePageMapper("~administration/users/${user}/gpg-keys", UserGpgKeysPage.class));add(new BasePageMapper("~administration/users/${user}/access-tokens", UserAccessTokensPage.class));add(new BasePageMapper("~administration/users/${user}/two-factor-authentication", UserTwoFactorAuthenticationPage.class));- add(new BasePageMapper("~administration/users/${user}/preferences", UserPreferencesPage.class));+ add(new BasePageMapper("~administration/users/${user}/query-watches/#{tab}", UserQueryWatchesPage.class));add(new BasePageMapper("~administration/invitations", InvitationListPage.class));add(new BasePageMapper("~administration/invitations/new", NewInvitationPage.class));diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.javaindex 1b2b466ca5..0e7d8395b6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/NewUserPage.java@@ -26,7 +26,6 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.admin.AdministrationPage;import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;-import static io.onedev.server.model.User.PROP_DISABLE_WATCH_NOTIFICATIONS;import static io.onedev.server.model.User.PROP_NOTIFY_OWN_EVENTS;public class NewUserPage extends AdministrationPage {@@ -43,7 +42,7 @@ public class NewUserPage extends AdministrationPage {protected void onInitialize() {super.onInitialize();- var editor = BeanContext.edit("editor", bean, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), true);+ var editor = BeanContext.edit("editor", bean, Sets.newHashSet(PROP_NOTIFY_OWN_EVENTS), true);Form<?> form = new Form<Void>("form") {diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.javaindex 1efac15eff..43395a11d9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/UserPage.java@@ -32,8 +32,8 @@ import io.onedev.server.web.page.admin.usermanagement.emailaddresses.UserEmailAdimport io.onedev.server.web.page.admin.usermanagement.gpgkeys.UserGpgKeysPage;import io.onedev.server.web.page.admin.usermanagement.membership.UserMembershipsPage;import io.onedev.server.web.page.admin.usermanagement.password.UserPasswordPage;-import io.onedev.server.web.page.admin.usermanagement.preferences.UserPreferencesPage;import io.onedev.server.web.page.admin.usermanagement.profile.UserProfilePage;+import io.onedev.server.web.page.admin.usermanagement.querywatch.UserQueryWatchesPage;import io.onedev.server.web.page.admin.usermanagement.sshkeys.UserSshKeysPage;import io.onedev.server.web.page.admin.usermanagement.twofactorauthentication.UserTwoFactorAuthenticationPage;import io.onedev.server.web.util.UserAware;@@ -84,7 +84,7 @@ public abstract class UserPage extends AdministrationPage implements UserAware {tabs.add(new PageTab(Model.of("Access Tokens"), Model.of("token"), UserAccessTokensPage.class, params));if (getUser().isEnforce2FA())tabs.add(new PageTab(Model.of("Two-factor Authentication"), Model.of("shield"), UserTwoFactorAuthenticationPage.class, params));- tabs.add(new PageTab(Model.of("Preferences"), Model.of("sliders"), UserPreferencesPage.class, params));+ tabs.add(new PageTab(Model.of("Query Watches"), Model.of("bell"), UserQueryWatchesPage.class, params));add(new Tabbable("userTabs", tabs));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.htmldeleted file mode 100644index d93f935cce..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="content"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.javadeleted file mode 100644index 11382f289a..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/preferences/UserPreferencesPage.java+++ /dev/null@@ -1,20 +0,0 @@-package io.onedev.server.web.page.admin.usermanagement.preferences;--import io.onedev.server.web.component.user.preferences.PreferencesEditPanel;-import io.onedev.server.web.page.admin.usermanagement.UserPage;-import org.apache.wicket.request.mapper.parameter.PageParameters;--public class UserPreferencesPage extends UserPage {-- public UserPreferencesPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new PreferencesEditPanel("content", userModel));- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/querywatch/UserQueryWatchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/querywatch/UserQueryWatchesPage.htmlnew file mode 100644index 0000000000..b64fe0ea46--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/querywatch/UserQueryWatchesPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/querywatch/UserQueryWatchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/querywatch/UserQueryWatchesPage.javanew file mode 100644index 0000000000..7aab903690--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/usermanagement/querywatch/UserQueryWatchesPage.java@@ -0,0 +1,36 @@+package io.onedev.server.web.page.admin.usermanagement.querywatch;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.web.component.user.querywatch.QueryWatchesPanel;+import io.onedev.server.web.page.admin.usermanagement.UserPage;++public class UserQueryWatchesPage extends UserPage {++ private static final String PARAM_TAB = "tab";++ private final String tabName;++ public UserQueryWatchesPage(PageParameters params) {+ super(params);+ tabName = params.get(PARAM_TAB).toString(QueryWatchesPanel.TAB_ISSUE);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new QueryWatchesPanel("content", userModel, tabName) {++ @Override+ protected void onTabSelected(AjaxRequestTarget target, String tabName) {+ var params = paramsOf(userModel.getObject());+ params.add(PARAM_TAB, tabName);+ setResponsePage(UserQueryWatchesPage.class, params);+ }++ });+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.htmlindex 558591013b..28e8986658 100644--- a/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/layout/LayoutPage.html@@ -98,9 +98,9 @@<wicket:svg href="shield" class="icon mr-2"></wicket:svg>Two-factor Authentication</a>- <a wicket:id="myPreferences" class="dropdown-item">- <wicket:svg href="sliders" class="icon mr-2"></wicket:svg>- Preferences+ <a wicket:id="myQueryWatches" class="dropdown-item">+ <wicket:svg href="bell" class="icon mr-2"></wicket:svg>+ Query Watches</a><a wicket:id="signOut" class="dropdown-item"><wicket:svg href="logout" class="icon mr-2"></wicket:svg>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 8a8c6f49a9..7b1790a18b 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,7 +1,63 @@package io.onedev.server.web.page.layout;+import static io.onedev.server.model.Alert.PROP_DATE;+import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;++import java.io.File;+import java.io.FileInputStream;+import java.io.IOException;+import java.util.ArrayList;+import java.util.Collection;+import java.util.Comparator;+import java.util.HashMap;+import java.util.Iterator;+import java.util.List;+import java.util.Map;+import java.util.Properties;++import javax.servlet.http.Cookie;++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.ajax.markup.html.AjaxLink;+import org.apache.wicket.behavior.AttributeAppender;+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;+import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;+import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;+import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;+import org.apache.wicket.markup.ComponentTag;+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.markup.repeater.Item;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;+import org.apache.wicket.request.flow.RedirectToUrlException;+import org.apache.wicket.request.http.WebRequest;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import org.hibernate.criterion.Order;+import com.google.common.collect.Lists;import com.google.common.collect.Sets;+import io.onedev.commons.bootstrap.Bootstrap;import io.onedev.commons.loader.AppLoader;import io.onedev.server.OneDev;@@ -39,7 +95,20 @@ import io.onedev.server.web.page.admin.buildsetting.agent.AgentDetailPage;import io.onedev.server.web.page.admin.buildsetting.agent.AgentListPage;import io.onedev.server.web.page.admin.buildsetting.jobexecutor.JobExecutorsPage;import io.onedev.server.web.page.admin.databasebackup.DatabaseBackupPage;-import io.onedev.server.web.page.admin.emailtemplates.*;+import io.onedev.server.web.page.admin.emailtemplates.AlertTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.BuildNotificationTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.CommitNotificationTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.EmailVerificationTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.IssueNotificationTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.IssueNotificationUnsubscribedTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.PackNotificationTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.PasswordResetTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.PullRequestNotificationTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.PullRequestNotificationUnsubscribedTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.ServiceDeskIssueOpenFailedTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.ServiceDeskIssueOpenedTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.StopwatchOverdueTemplatePage;+import io.onedev.server.web.page.admin.emailtemplates.UserInvitationTemplatePage;import io.onedev.server.web.page.admin.gpgsigningkey.GpgSigningKeyPage;import io.onedev.server.web.page.admin.gpgtrustedkeys.GpgTrustedKeysPage;import io.onedev.server.web.page.admin.groovyscript.GroovyScriptListPage;@@ -69,7 +138,11 @@ 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.*;+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.base.BasePage;import io.onedev.server.web.page.help.IncompatibilitiesPage;import io.onedev.server.web.page.my.MyPage;@@ -78,59 +151,13 @@ import io.onedev.server.web.page.my.avatar.MyAvatarPage;import io.onedev.server.web.page.my.emailaddresses.MyEmailAddressesPage;import io.onedev.server.web.page.my.gpgkeys.MyGpgKeysPage;import io.onedev.server.web.page.my.password.MyPasswordPage;-import io.onedev.server.web.page.my.preferences.MyPreferencesPage;import io.onedev.server.web.page.my.profile.MyProfilePage;+import io.onedev.server.web.page.my.querywatch.MyQueryWatchesPage;import io.onedev.server.web.page.my.sshkeys.MySshKeysPage;import io.onedev.server.web.page.my.twofactorauthentication.MyTwoFactorAuthenticationPage;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.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.ajax.markup.html.AjaxLink;-import org.apache.wicket.behavior.AttributeAppender;-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;-import org.apache.wicket.extensions.markup.html.repeater.data.table.AbstractColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;-import org.apache.wicket.markup.ComponentTag;-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.markup.repeater.Item;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;-import org.apache.wicket.request.cycle.RequestCycle;-import org.apache.wicket.request.flow.RedirectToUrlException;-import org.apache.wicket.request.http.WebRequest;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.Order;--import javax.servlet.http.Cookie;-import java.io.File;-import java.io.FileInputStream;-import java.io.IOException;-import java.util.*;--import static io.onedev.server.model.Alert.PROP_DATE;-import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;public abstract class LayoutPage extends BasePage {@@ -838,8 +865,9 @@ public abstract class LayoutPage extends BasePage {if (getPage() instanceof MyTwoFactorAuthenticationPage)item.add(AttributeAppender.append("class", "active"));- userInfo.add(item = new ViewStateAwarePageLink<Void>("myPreferences", MyPreferencesPage.class));- if (getPage() instanceof MyPreferencesPage)++ userInfo.add(item = new ViewStateAwarePageLink<Void>("myQueryWatches", MyQueryWatchesPage.class));+ if (getPage() instanceof MyQueryWatchesPage)item.add(AttributeAppender.append("class", "active"));if (!SecurityUtils.isAnonymous(SecurityUtils.getPrevPrincipal())) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.htmldeleted file mode 100644index d93f935cce..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.html+++ /dev/null@@ -1,3 +0,0 @@-<wicket:extend>- <div wicket:id="content"></div>-</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.javadeleted file mode 100644index f104158fbe..0000000000--- a/server-core/src/main/java/io/onedev/server/web/page/my/preferences/MyPreferencesPage.java+++ /dev/null@@ -1,36 +0,0 @@-package io.onedev.server.web.page.my.preferences;--import io.onedev.server.model.User;-import io.onedev.server.web.component.user.preferences.PreferencesEditPanel;-import io.onedev.server.web.page.my.MyPage;-import org.apache.wicket.Component;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.model.AbstractReadOnlyModel;-import org.apache.wicket.request.mapper.parameter.PageParameters;--public class MyPreferencesPage extends MyPage {-- public MyPreferencesPage(PageParameters params) {- super(params);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(new PreferencesEditPanel("content", new AbstractReadOnlyModel<>() {-- @Override- public User getObject() {- return getLoginUser();- }-- }));- }-- @Override- protected Component newTopbarTitle(String componentId) {- return new Label(componentId, "My Preferences");- }--}diff --git a/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.html b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.htmlnew file mode 100644index 0000000000..b64fe0ea46--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.html@@ -0,0 +1,3 @@+<wicket:extend>+ <div wicket:id="content"></div>+</wicket:extend>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.javanew file mode 100644index 0000000000..1917787cdd--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/page/my/querywatch/MyQueryWatchesPage.java@@ -0,0 +1,52 @@+package io.onedev.server.web.page.my.querywatch;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.User;+import io.onedev.server.web.component.user.querywatch.QueryWatchesPanel;+import io.onedev.server.web.page.my.MyPage;++public class MyQueryWatchesPage extends MyPage {++ private static final String PARAM_TAB = "tab";++ private final String tabName;++ public MyQueryWatchesPage(PageParameters params) {+ super(params);+ tabName = params.get(PARAM_TAB).toString(QueryWatchesPanel.TAB_ISSUE);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new QueryWatchesPanel("content", new AbstractReadOnlyModel<>() {++ @Override+ public User getObject() {+ return getLoginUser();+ }++ }, tabName) {++ @Override+ protected void onTabSelected(AjaxRequestTarget target, String tabName) {+ var params = new PageParameters();+ params.add(PARAM_TAB, tabName);+ setResponsePage(MyQueryWatchesPage.class, params);+ }++ });+ }++ @Override+ protected Component newTopbarTitle(String componentId) {+ return new Label(componentId, "Query Watches");+ }++}\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.javaindex e73d1e598a..d68042f3e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/simple/security/SignUpPage.java@@ -52,7 +52,7 @@ public class SignUpPage extends SimplePage {super.onInitialize();SignUpBean bean = new SignUpBean();- BeanEditor editor = BeanContext.edit("editor", bean, Sets.newHashSet(PROP_DISABLE_WATCH_NOTIFICATIONS, PROP_NOTIFY_OWN_EVENTS), true);+ BeanEditor editor = BeanContext.edit("editor", bean, Sets.newHashSet(PROP_NOTIFY_OWN_EVENTS), true);Form<?> form = new Form<Void>("form") {