The Unified and Autonomous Development Platform
Refactor pull request pages and add pull request query language
robin shen5cd07ce27de4
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex 9816dcfcf9..fea2bb0845 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -111,6 +111,7 @@ import io.onedev.server.manager.PullRequestActionManager;import io.onedev.server.manager.PullRequestBuildManager;import io.onedev.server.manager.PullRequestCommentManager;import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.manager.PullRequestQuerySettingManager;import io.onedev.server.manager.PullRequestReviewManager;import io.onedev.server.manager.PullRequestUpdateManager;import io.onedev.server.manager.PullRequestWatchManager;@@ -120,7 +121,6 @@ import io.onedev.server.manager.UrlManager;import io.onedev.server.manager.UserAuthorizationManager;import io.onedev.server.manager.UserInfoManager;import io.onedev.server.manager.UserManager;-import io.onedev.server.manager.VisitManager;import io.onedev.server.manager.WorkExecutor;import io.onedev.server.manager.impl.DefaultAttachmentManager;import io.onedev.server.manager.impl.DefaultBatchWorkManager;@@ -154,6 +154,7 @@ import io.onedev.server.manager.impl.DefaultPullRequestBuildManager;import io.onedev.server.manager.impl.DefaultPullRequestCommentManager;import io.onedev.server.manager.impl.DefaultPullRequestManager;import io.onedev.server.manager.impl.DefaultPullRequestNotificationManager;+import io.onedev.server.manager.impl.DefaultPullRequestQuerySettingManager;import io.onedev.server.manager.impl.DefaultPullRequestReviewManager;import io.onedev.server.manager.impl.DefaultPullRequestUpdateManager;import io.onedev.server.manager.impl.DefaultPullRequestWatchManager;@@ -162,7 +163,6 @@ import io.onedev.server.manager.impl.DefaultStorageManager;import io.onedev.server.manager.impl.DefaultUserAuthorizationManager;import io.onedev.server.manager.impl.DefaultUserInfoManager;import io.onedev.server.manager.impl.DefaultUserManager;-import io.onedev.server.manager.impl.DefaultVisitManager;import io.onedev.server.manager.impl.DefaultWorkExecutor;import io.onedev.server.migration.JpaConverter;import io.onedev.server.migration.PersistentBagConverter;@@ -301,7 +301,6 @@ public class CoreModule extends AbstractPluginModule {bind(IssueFieldUnaryManager.class).to(DefaultIssueFieldUnaryManager.class);bind(PullRequestWatchManager.class).to(DefaultPullRequestWatchManager.class);bind(CommitInfoManager.class).to(DefaultCommitInfoManager.class);- bind(VisitManager.class).to(DefaultVisitManager.class);bind(UserInfoManager.class).to(DefaultUserInfoManager.class);bind(BatchWorkManager.class).to(DefaultBatchWorkManager.class);bind(GroupManager.class).to(DefaultGroupManager.class);@@ -329,6 +328,7 @@ public class CoreModule extends AbstractPluginModule {bind(EntityManagerFactory.class).toProvider(SessionFactoryProvider.class);bind(IssueCommentManager.class).to(DefaultIssueCommentManager.class);bind(IssueQuerySettingManager.class).to(DefaultIssueQuerySettingManager.class);+ bind(PullRequestQuerySettingManager.class).to(DefaultPullRequestQuerySettingManager.class);contribute(ObjectMapperConfigurator.class, GitObjectMapperConfigurator.class);contribute(ObjectMapperConfigurator.class, HibernateObjectMapperConfigurator.class);diff --git a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.javaindex b6ddf938ac..b3a532e204 100644--- a/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/CodeCommentRelationInfoManager.java@@ -1,4 +1,13 @@package io.onedev.server.manager;+import java.util.Set;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.model.Project;+public interface CodeCommentRelationInfoManager {++ public Set<String> getPullRequestUUIDs(Project project, ObjectId commitId);+}diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javaindex b2a6e7e132..370566d7c5 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -10,9 +10,9 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.query.IssueCriteria;-import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.dao.EntityManager;+import io.onedev.server.util.query.EntityQuery;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;@@ -25,7 +25,7 @@ public interface IssueManager extends EntityManager<Issue> {void open(Issue issue);- List<Issue> query(Project project, IssueQuery issueQuery, int firstResult, int maxResults);+ List<Issue> query(Project project, EntityQuery<Issue> issueQuery, int firstResult, int maxResults);int count(Project project, @Nullable IssueCriteria issueCriteria);diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestManager.javaindex ca0530cac3..dbdadb9ac2 100644--- a/core/src/main/java/io/onedev/server/manager/PullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/PullRequestManager.java@@ -1,6 +1,7 @@package io.onedev.server.manager;import java.util.Collection;+import java.util.List;import javax.annotation.Nullable;@@ -10,6 +11,8 @@ import io.onedev.server.model.User;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.persistence.dao.EntityManager;+import io.onedev.server.util.query.EntityCriteria;+import io.onedev.server.util.query.EntityQuery;public interface PullRequestManager extends EntityManager<PullRequest> {@@ -67,4 +70,7 @@ public interface PullRequestManager extends EntityManager<PullRequest> {void checkQuality(PullRequest request);+ List<PullRequest> query(Project project, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults);++ int count(Project project, EntityCriteria<PullRequest> requestCriteria);}diff --git a/core/src/main/java/io/onedev/server/manager/PullRequestQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/PullRequestQuerySettingManager.javanew file mode 100644index 0000000000..7dc1b4ca3e--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/PullRequestQuerySettingManager.java@@ -0,0 +1,12 @@+package io.onedev.server.manager;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequestQuerySetting;+import io.onedev.server.model.User;+import io.onedev.server.persistence.dao.EntityManager;++public interface PullRequestQuerySettingManager extends EntityManager<PullRequestQuerySetting> {++ PullRequestQuerySetting find(Project project, User user);++}diff --git a/core/src/main/java/io/onedev/server/manager/UserInfoManager.java b/core/src/main/java/io/onedev/server/manager/UserInfoManager.javaindex 01d38f30a8..c7bd50eeb7 100644--- a/core/src/main/java/io/onedev/server/manager/UserInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/UserInfoManager.java@@ -4,7 +4,10 @@ import java.util.Date;import javax.annotation.Nullable;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;@@ -16,4 +19,32 @@ public interface UserInfoManager {@NullableDate getVisitDate(UserFacade user, ProjectFacade project);+ void visitPullRequest(User user, PullRequest request);++ void visitPullRequestCodeComments(User user, PullRequest request);++ void visitIssue(User user, Issue issue);++ void visitCodeComment(User user, CodeComment comment);++ boolean isNotified(User user, PullRequest request);++ boolean isNotified(User user, Issue issue);++ void setPullRequestNotified(User user, PullRequest request, boolean notified);++ void setIssueNotified(User user, Issue issue, boolean notified);++ @Nullable+ Date getIssueVisitDate(User user, Issue issue);++ @Nullable+ Date getPullRequestVisitDate(User user, PullRequest request);++ @Nullable+ Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request);++ @Nullable+ Date getCodeCommentVisitDate(User user, CodeComment comment);+}diff --git a/core/src/main/java/io/onedev/server/manager/VisitManager.java b/core/src/main/java/io/onedev/server/manager/VisitManager.javadeleted file mode 100644index bbde93df2b..0000000000--- a/core/src/main/java/io/onedev/server/manager/VisitManager.java+++ /dev/null@@ -1,42 +0,0 @@-package io.onedev.server.manager;--import java.util.Date;--import javax.annotation.Nullable;--import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Issue;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;--public interface VisitManager {-- void visitPullRequest(User user, PullRequest request);-- void visitPullRequest(User user, PullRequest request, Date date);-- void visitPullRequestCodeComments(User user, PullRequest request);-- void visitPullRequestCodeComments(User user, PullRequest request, Date date);-- void visitIssue(User user, Issue issue);-- void visitIssue(User user, Issue issue, Date date);-- void visitCodeComment(User user, CodeComment comment);-- void visitCodeComment(User user, CodeComment comment, Date date);-- @Nullable- Date getIssueVisitDate(User user, Issue issue);-- @Nullable- Date getPullRequestVisitDate(User user, PullRequest request);-- @Nullable- Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request);-- @Nullable- Date getCodeCommentVisitDate(User user, CodeComment comment);--}diff --git a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.javaindex cd5b5f6a38..e7b3bf510b 100644--- a/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/AbstractEnvironmentManager.java@@ -126,6 +126,14 @@ public abstract class AbstractEnvironmentManager {return defaultValue;}+ protected boolean readBoolean(Store store, Transaction txn, ByteIterable key, boolean defaultValue) {+ byte[] bytes = readBytes(store, txn, key);+ if (bytes != null)+ return bytes[0] == 1;+ else+ return defaultValue;+ }+protected void writeInt(Store store, Transaction txn, ByteIterable key, int value) {byte[] bytes = ByteBuffer.allocate(Integer.BYTES).putInt(value).array();store.put(txn, key, new ArrayByteIterable(bytes));@@ -144,6 +152,11 @@ public abstract class AbstractEnvironmentManager {store.put(txn, key, new ArrayByteIterable(bytes));}+ protected void writeBoolean(Store store, Transaction txn, ByteIterable key, boolean value) {+ byte[] bytes = new byte[] {(byte)(value?1:0)};+ store.put(txn, key, new ArrayByteIterable(bytes));+ }+static class IntByteIterable extends ArrayByteIterable {IntByteIterable(int value) {super(new ArrayByteIterable(ByteBuffer.allocate(Integer.BYTES).putInt(value).array()));diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.javaindex dc7fd8f98f..e2f09889fa 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultCodeCommentRelationInfoManager.java@@ -287,6 +287,25 @@ public class DefaultCodeCommentRelationInfoManager extends AbstractEnvironmentMa}}+ @Override+ public Set<String> getPullRequestUUIDs(Project project, ObjectId commitId) {+ byte[] commitKey = new byte[20];+ commitId.copyRawTo(commitKey, 0);++ Environment env = getEnv(project.getId().toString());+ Store store = getStore(env, PULL_REQUEST_STORE);++ return env.computeInTransaction(new TransactionalComputable<Set<String>>() {++ @Override+ public Set<String> compute(Transaction txn) {+ return getPullRequestUUIDs(store, txn, new ArrayByteIterable(commitKey));+ }++ });++ }+@SuppressWarnings("unchecked")private Map<String, ComparingInfo> getCodeCommentComparingInfos(Store store, Transaction txn, ByteIterable commitKey) {byte[] valueBytes = readBytes(store, txn, commitKey);diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.javaindex dfd9991ea0..c78e308978 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueCommentManager.java@@ -37,7 +37,7 @@ public class DefaultIssueCommentManager extends AbstractEntityManager<IssueCommelastActivity.setDate(comment.getDate());lastActivity.setDescription("commented");comment.getIssue().setLastActivity(lastActivity);- comment.getIssue().setNumOfComments(comment.getIssue().getNumOfComments()+1);+ comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()+1);}}@@ -45,7 +45,7 @@ public class DefaultIssueCommentManager extends AbstractEntityManager<IssueComme@Overridepublic void delete(IssueComment comment) {super.delete(comment);- comment.getIssue().setNumOfComments(comment.getIssue().getNumOfComments()-1);+ comment.getIssue().setCommentCount(comment.getIssue().getCommentCount()-1);}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex 4cde073205..796fde668b 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -40,15 +40,12 @@ import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.issue.IssueBoard;-import io.onedev.server.model.support.issue.NamedQuery;+import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.query.AndCriteria;import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.IssueQueryLexer;-import io.onedev.server.model.support.issue.query.IssueSort;-import io.onedev.server.model.support.issue.query.IssueSort.Direction;+import io.onedev.server.model.support.issue.query.IssueQueryBuildContext;import io.onedev.server.model.support.issue.query.MilestoneCriteria;-import io.onedev.server.model.support.issue.query.QueryBuildContext;import io.onedev.server.model.support.issue.workflow.StateSpec;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -60,6 +57,10 @@ import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.EntitySort;+import io.onedev.server.util.query.EntitySort.Direction;+import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldResolution;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValueResolution;@@ -141,7 +142,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn nextNumber.getAndIncrement();}- private Predicate[] getPredicates(IssueCriteria criteria, Project project, QueryBuildContext context) {+ private Predicate[] getPredicates(io.onedev.server.util.query.EntityCriteria<Issue> criteria, Project project, QueryBuildContext<Issue> context) {List<Predicate> predicates = new ArrayList<>();predicates.add(context.getBuilder().equal(context.getRoot().get("project"), project));if (criteria != null)@@ -149,21 +150,21 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsreturn predicates.toArray(new Predicate[0]);}- public CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, IssueQuery issueQuery) {+ private CriteriaQuery<Issue> buildCriteriaQuery(Session session, Project project, EntityQuery<Issue> issueQuery) {CriteriaBuilder builder = session.getCriteriaBuilder();CriteriaQuery<Issue> query = builder.createQuery(Issue.class);Root<Issue> root = query.from(Issue.class);- QueryBuildContext context = new QueryBuildContext(root, builder);+ QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);query.where(getPredicates(issueQuery.getCriteria(), project, context));List<javax.persistence.criteria.Order> orders = new ArrayList<>();- for (IssueSort sort: issueQuery.getSorts()) {- if (Issue.BUILTIN_FIELDS.containsKey(sort.getField())) {+ for (EntitySort sort: issueQuery.getSorts()) {+ if (Issue.FIELD_PATHS.containsKey(sort.getField())) {if (sort.getDirection() == Direction.ASCENDING)- orders.add(builder.asc(IssueQuery.getPath(root, Issue.BUILTIN_FIELDS.get(sort.getField()))));+ orders.add(builder.asc(IssueQuery.getPath(root, Issue.FIELD_PATHS.get(sort.getField()))));else- orders.add(builder.desc(IssueQuery.getPath(root, Issue.BUILTIN_FIELDS.get(sort.getField()))));+ orders.add(builder.desc(IssueQuery.getPath(root, Issue.FIELD_PATHS.get(sort.getField()))));} else {Join<Issue, IssueFieldUnary> join = root.join("fieldUnaries", JoinType.LEFT);join.on(builder.equal(join.get(IssueFieldUnary.NAME), sort.getField()));@@ -184,7 +185,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Sessional@Override- public List<Issue> query(Project project, IssueQuery issueQuery, int firstResult, int maxResults) {+ public List<Issue> query(Project project, io.onedev.server.util.query.EntityQuery<Issue> issueQuery, int firstResult, int maxResults) {CriteriaQuery<Issue> criteriaQuery = buildCriteriaQuery(getSession(), project, issueQuery);Query<Issue> query = getSession().createQuery(criteriaQuery);query.setFirstResult(firstResult);@@ -203,7 +204,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsCriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);Root<Issue> root = criteriaQuery.from(Issue.class);- QueryBuildContext context = new QueryBuildContext(root, builder);+ QueryBuildContext<Issue> context = new IssueQueryBuildContext(root, builder);criteriaQuery.where(getPredicates(issueCriteria, project, context));criteriaQuery.select(builder.count(root));@@ -216,14 +217,14 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsIssueCriteria criteria = milestone.getProject().getIssueWorkflow().getCategoryCriteria(category);if (criteria != null) {List<IssueCriteria> criterias = new ArrayList<>();- criterias.add(new MilestoneCriteria(milestone.getName(), IssueQueryLexer.Is));+ criterias.add(new MilestoneCriteria(milestone.getName()));criterias.add(criteria);return count(milestone.getProject(), new AndCriteria(criterias));} else {return 0;}} else {- IssueCriteria criteria = new MilestoneCriteria(milestone.getName(), IssueQueryLexer.Is);+ IssueCriteria criteria = new MilestoneCriteria(milestone.getName());return count(milestone.getProject(), criteria);}}@@ -241,7 +242,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsit.remove();}- for (NamedQuery namedQuery: project.getSavedIssueQueries()) {+ for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {try {states.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates(project));} catch (Exception e) {@@ -249,7 +250,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}for (IssueQuerySetting setting: project.getIssueQuerySettings()) {- for (NamedQuery namedQuery: setting.getUserQueries()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {try {states.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedStates(project));} catch (Exception e) {@@ -274,7 +275,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsquery.executeUpdate();}- for (NamedQuery namedQuery: project.getSavedIssueQueries()) {+ for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())@@ -285,7 +286,7 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}for (IssueQuerySetting setting: project.getIssueQuerySettings()) {- for (NamedQuery namedQuery: setting.getUserQueries()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);for (Map.Entry<String, UndefinedStateResolution> resolutionEntry: resolutions.entrySet())@@ -355,19 +356,19 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsundefinedFields.add(name);}for (String fieldName: project.getIssueListFields()) {- if (!Issue.BUILTIN_FIELDS.containsKey(fieldName)) {+ if (!Issue.FIELD_PATHS.containsKey(fieldName)) {if (project.getIssueWorkflow().getFieldSpec(fieldName) == null)undefinedFields.add(fieldName);}}- for (NamedQuery namedQuery: project.getSavedIssueQueries()) {+ for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {try {undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields(project));} catch (Exception e) {}}for (IssueQuerySetting setting: project.getIssueQuerySettings()) {- for (NamedQuery namedQuery: setting.getUserQueries()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {try {undefinedFields.addAll(IssueQuery.parse(project, namedQuery.getQuery(), false).getUndefinedFields(project));} catch (Exception e) {@@ -402,8 +403,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsquery.executeUpdate();}- for (Iterator<NamedQuery> it = project.getSavedIssueQueries().iterator(); it.hasNext();) {- NamedQuery namedQuery = it.next();+ for (Iterator<NamedIssueQuery> it = project.getSavedIssueQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);boolean remove = false;@@ -424,8 +425,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}}for (IssueQuerySetting setting: project.getIssueQuerySettings()) {- for (Iterator<NamedQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {- NamedQuery namedQuery = it.next();+ for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), false);boolean remove = false;@@ -500,14 +501,14 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}}- for (NamedQuery namedQuery: project.getSavedIssueQueries()) {+ for (NamedIssueQuery namedQuery: project.getSavedIssueQueries()) {try {undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), true).getUndefinedFieldValues(project));} catch (Exception e) {}}for (IssueQuerySetting setting: project.getIssueQuerySettings()) {- for (NamedQuery namedQuery: setting.getUserQueries()) {+ for (NamedIssueQuery namedQuery: setting.getUserQueries()) {try {undefinedFieldValues.addAll(IssueQuery.parse(project, namedQuery.getQuery(), true).getUndefinedFieldValues(project));} catch (Exception e) {@@ -543,8 +544,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsquery.executeUpdate();}- for (Iterator<NamedQuery> it = project.getSavedIssueQueries().iterator(); it.hasNext();) {- NamedQuery namedQuery = it.next();+ for (Iterator<NamedIssueQuery> it = project.getSavedIssueQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), true);boolean remove = false;@@ -566,8 +567,8 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements}}for (IssueQuerySetting setting: project.getIssueQuerySettings()) {- for (Iterator<NamedQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {- NamedQuery namedQuery = it.next();+ for (Iterator<NamedIssueQuery> it = setting.getUserQueries().iterator(); it.hasNext();) {+ NamedIssueQuery namedQuery = it.next();try {IssueQuery query = IssueQuery.parse(project, namedQuery.getQuery(), true);boolean remove = false;diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.javaindex 7d0e8267e3..e0b71c7f5a 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueNotificationManager.java@@ -1,42 +1,34 @@package io.onedev.server.manager.impl;import java.util.Collection;-import java.util.Date;-import java.util.HashMap;import java.util.HashSet;import java.util.Map;-import java.util.Optional;-import javax.annotation.Nullable;import javax.inject.Inject;import javax.inject.Singleton;import io.onedev.launcher.loader.Listen;-import io.onedev.server.OneDev;import io.onedev.server.event.MarkdownAware;import io.onedev.server.event.issue.IssueActionEvent;import io.onedev.server.event.issue.IssueCommented;import io.onedev.server.event.issue.IssueEvent;import io.onedev.server.event.issue.IssueOpened;-import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueWatchManager;import io.onedev.server.manager.MailManager;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.manager.UrlManager;-import io.onedev.server.manager.UserManager;-import io.onedev.server.manager.VisitManager;import io.onedev.server.model.Group;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueAction;-import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.IssueWatch;import io.onedev.server.model.User;-import io.onedev.server.model.support.issue.NamedQuery;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.util.markdown.MentionParser;-import io.onedev.server.util.readcallback.ReadCallback;-import io.onedev.server.util.readcallback.ReadCallbackServlet;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryWatchBuilder;import jersey.repackaged.com.google.common.collect.Lists;@Singleton@@ -86,28 +78,6 @@ public class DefaultIssueNotificationManager {builder.append("</div>");}- private void appendReadCallback(StringBuilder builder, User user, IssueEvent event) {- EmailReadCallback callback = new EmailReadCallback(user.getId(), event.getIssue().getId(), event.getDate().getTime()+1000L);- builder.append("<img src='").append(ReadCallbackServlet.getUrl(callback)).append("' alt='read track'>");- }-- private boolean matches(Map<String, Optional<IssueQuery>> parsedQueries, Issue issue, @Nullable NamedQuery namedQuery) {- if (namedQuery != null) {- Optional<IssueQuery> issueQuery = parsedQueries.get(namedQuery.getQuery());- if (issueQuery == null) {- try {- issueQuery = Optional.of(IssueQuery.parse(issue.getProject(), namedQuery.getQuery(), true));- } catch (Exception e) {- issueQuery = Optional.empty();- }- parsedQueries.put(namedQuery.getQuery(), issueQuery);- }- return issueQuery.isPresent() && issueQuery.get().matches(issue);- } else {- return false;- }- }-@Transactional@Listenpublic void on(IssueEvent event) {@@ -118,42 +88,43 @@ public class DefaultIssueNotificationManager {Issue issue = event.getIssue();- OneDev.getInstance(VisitManager.class).visitIssue(event.getUser(), issue);-- Map<String, Optional<IssueQuery>> parsedQueries = new HashMap<>();-- for (IssueQuerySetting setting: issue.getProject().getIssueQuerySettings()) {- boolean watched = false;- for (Map.Entry<String, Boolean> entry: setting.getUserQueryWatches().entrySet()) {- if (matches(parsedQueries, issue, setting.getUserQuery(entry.getKey()))) {- watch(issue, setting.getUser(), entry.getValue());- watched = true;- break;- }+ for (Map.Entry<User, Boolean> entry: new QueryWatchBuilder<Issue>() {++ @Override+ protected Issue getEntity() {+ return issue;}- if (!watched) {- for (Map.Entry<String, Boolean> entry: setting.getProjectQueryWatches().entrySet()) {- if (matches(parsedQueries, issue, issue.getProject().getSavedIssueQuery(entry.getKey()))) {- watch(issue, setting.getUser(), entry.getValue());- watched = true;- break;- }- }++ @Override+ protected Collection<? extends QuerySetting<?>> getQuerySettings() {+ return issue.getProject().getIssueQuerySettings();+ }++ @Override+ protected EntityQuery<Issue> parse(String queryString) {+ return IssueQuery.parse(issue.getProject(), queryString, true);+ }++ @Override+ protected NamedQuery getSavedProjectQuery(String name) {+ return issue.getProject().getSavedIssueQuery(name);}++ }.getWatches().entrySet()) {+ watch(issue, entry.getKey(), entry.getValue());}if (event instanceof IssueActionEvent) {- IssueAction issueChange = ((IssueActionEvent) event).getAction();- for (Group group: issueChange.getData().getNewGroups().values())+ IssueAction issueAction = ((IssueActionEvent) event).getAction();+ for (Group group: issueAction.getData().getNewGroups().values())involvedUsers.addAll(group.getMembers());- for (Map.Entry<String, User> entry: issueChange.getData().getNewUsers().entrySet()) {+ for (Map.Entry<String, User> entry: issueAction.getData().getNewUsers().entrySet()) {String subject = String.format("You are designated as \"%s\" of issue #%d: %s",entry.getKey(), issue.getNumber(), issue.getTitle());StringBuilder body = new StringBuilder();body.append(event.describeAsHtml());appendParagraph(body);appendIssueInfo(body, event);- appendReadCallback(body, entry.getValue(), event);mailManager.sendMailAsync(Lists.newArrayList(entry.getValue().getEmail()), subject, body.toString());notifiedUsers.add(entry.getValue());}@@ -173,7 +144,6 @@ public class DefaultIssueNotificationManager {body.append(event.describeAsHtml());appendParagraph(body);appendIssueInfo(body, event);- appendReadCallback(body, user, event);mailManager.sendMailAsync(Lists.newArrayList(user.getEmail()), subject, body.toString());notifiedUsers.add(user);}@@ -197,47 +167,16 @@ public class DefaultIssueNotificationManager {body.append(event.describeAsHtml());appendParagraph(body);appendIssueInfo(body, event);- appendReadCallback(body, user, event);mailManager.sendMailAsync(Lists.newArrayList(user.getEmail()), event.getTitle(), body.toString());}}private void watch(Issue issue, User user, boolean watching) {- IssueWatch watch = issue.getWatch(user);- if (watch == null) {- watch = new IssueWatch();- watch.setIssue(issue);- watch.setUser(user);+ IssueWatch watch = (IssueWatch) issue.getWatch(user, true);+ if (watch.isNew()) {watch.setWatching(watching);- issue.getWatches().add(watch);issueWatchManager.save(watch);}}- public static class EmailReadCallback implements ReadCallback {-- private Long userId;-- private Long issueId;-- private Long eventTime;-- public EmailReadCallback() {- }-- public EmailReadCallback(Long userId, Long issueId, Long eventTime) {- this.userId = userId;- this.issueId = issueId;- this.eventTime = eventTime;- }-- @Override- public void onRead() {- User user = OneDev.getInstance(UserManager.class).get(userId);- Issue issue = OneDev.getInstance(IssueManager.class).get(issueId);- if (user != null && issue != null)- OneDev.getInstance(VisitManager.class).visitIssue(user, issue, new Date(eventTime));- }-- }}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.javaindex e210101421..810ab87e8f 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueVoteManager.java@@ -21,7 +21,7 @@ public class DefaultIssueVoteManager extends AbstractEntityManager<IssueVote>@Transactionalpublic void save(IssueVote vote) {if (vote.isNew())- vote.getIssue().setNumOfVotes(vote.getIssue().getNumOfVotes()+1);+ vote.getIssue().setVoteCount(vote.getIssue().getVoteCount()+1);super.save(vote);}@@ -29,7 +29,7 @@ public class DefaultIssueVoteManager extends AbstractEntityManager<IssueVote>@Overridepublic void delete(IssueVote vote) {super.delete(vote);- vote.getIssue().setNumOfVotes(vote.getIssue().getNumOfVotes()-1);+ vote.getIssue().setVoteCount(vote.getIssue().getVoteCount()-1);}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.javaindex 774b602a53..a3d435f474 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestManager.java@@ -25,6 +25,11 @@ import java.util.concurrent.atomic.AtomicLong;import javax.inject.Inject;import javax.inject.Singleton;+import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.CriteriaQuery;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;+import javax.persistence.criteria.Root;import org.apache.commons.lang3.StringUtils;import org.apache.shiro.authz.Permission;@@ -38,6 +43,7 @@ import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.RefUpdate;import org.eclipse.jgit.revwalk.RevCommit;import org.eclipse.jgit.revwalk.RevWalk;+import org.hibernate.Session;import org.hibernate.criterion.Criterion;import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;@@ -98,6 +104,8 @@ import io.onedev.server.model.support.pullrequest.actiondata.MergedData;import io.onedev.server.model.support.pullrequest.actiondata.RemovedReviewerData;import io.onedev.server.model.support.pullrequest.actiondata.ReopenedData;import io.onedev.server.model.support.pullrequest.actiondata.RestoredSourceBranchData;+import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryBuildContext;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;@@ -111,6 +119,10 @@ import io.onedev.server.security.permission.ProjectPermission;import io.onedev.server.util.BatchWorker;import io.onedev.server.util.facade.ProjectFacade;import io.onedev.server.util.facade.UserFacade;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.EntitySort;+import io.onedev.server.util.query.EntitySort.Direction;+import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.util.reviewrequirement.InvalidReviewRuleException;import io.onedev.server.util.reviewrequirement.ReviewRequirement;import io.onedev.utils.concurrent.Prioritized;@@ -246,9 +258,9 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestDate date = new Date();CloseInfo closeInfo = new CloseInfo();- closeInfo.setCloseDate(date);- closeInfo.setClosedBy(user);- closeInfo.setCloseStatus(CloseInfo.Status.DISCARDED);+ closeInfo.setDate(date);+ closeInfo.setUser(user);+ closeInfo.setStatus(CloseInfo.Status.DISCARDED);request.setCloseInfo(closeInfo);PullRequestAction action = new PullRequestAction();@@ -399,8 +411,8 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestrequest.setLastMergePreview(null);CloseInfo closeInfo = new CloseInfo();- closeInfo.setCloseDate(date);- closeInfo.setCloseStatus(CloseInfo.Status.MERGED);+ closeInfo.setDate(date);+ closeInfo.setStatus(CloseInfo.Status.MERGED);request.setCloseInfo(closeInfo);String reason = null;@@ -588,7 +600,7 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestpublic PullRequest findEffective(ProjectAndBranch target, ProjectAndBranch source) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);Criterion merged = Restrictions.and(- Restrictions.eq("closeInfo.closeStatus", CloseInfo.Status.MERGED),+ Restrictions.eq("closeInfo.status", CloseInfo.Status.MERGED),Restrictions.eq("lastMergePreview.requestHead", source.getObjectName()));criteria.add(ofTarget(target)).add(ofSource(source)).add(Restrictions.or(ofOpen(), merged));@@ -964,5 +976,62 @@ public class DefaultPullRequestManager extends AbstractEntityManager<PullRequestcriteria.add(verifyCommitCriterion);return findAll(criteria);}++ private Predicate[] getPredicates(io.onedev.server.util.query.EntityCriteria<PullRequest> criteria, Project project, QueryBuildContext<PullRequest> context) {+ List<Predicate> predicates = new ArrayList<>();+ predicates.add(context.getBuilder().equal(context.getRoot().get("targetProject"), project));+ if (criteria != null)+ predicates.add(criteria.getPredicate(project, context));+ return predicates.toArray(new Predicate[0]);+ }++ private CriteriaQuery<PullRequest> buildCriteriaQuery(Session session, Project project, EntityQuery<PullRequest> requestQuery) {+ CriteriaBuilder builder = session.getCriteriaBuilder();+ CriteriaQuery<PullRequest> query = builder.createQuery(PullRequest.class);+ Root<PullRequest> root = query.from(PullRequest.class);+ query.select(root).distinct(true);++ QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);+ query.where(getPredicates(requestQuery.getCriteria(), project, context));++ List<javax.persistence.criteria.Order> orders = new ArrayList<>();+ for (EntitySort sort: requestQuery.getSorts()) {+ if (sort.getDirection() == Direction.ASCENDING)+ orders.add(builder.asc(PullRequestQuery.getPath(root, PullRequest.FIELD_PATHS.get(sort.getField()))));+ else+ orders.add(builder.desc(PullRequestQuery.getPath(root, PullRequest.FIELD_PATHS.get(sort.getField()))));+ }+ Path<String> idPath = root.get("id");+ if (orders.isEmpty())+ orders.add(builder.desc(idPath));+ query.orderBy(orders);++ return query;+ }++ @Sessional+ @Override+ public List<PullRequest> query(Project project, EntityQuery<PullRequest> requestQuery, int firstResult, int maxResults) {+ CriteriaQuery<PullRequest> criteriaQuery = buildCriteriaQuery(getSession(), project, requestQuery);+ Query<PullRequest> query = getSession().createQuery(criteriaQuery);+ query.setFirstResult(firstResult);+ query.setMaxResults(maxResults);+ return query.getResultList();+ }++ @Sessional+ @Override+ public int count(Project project, io.onedev.server.util.query.EntityCriteria<PullRequest> requestCriteria) {+ CriteriaBuilder builder = getSession().getCriteriaBuilder();+ CriteriaQuery<Long> criteriaQuery = builder.createQuery(Long.class);+ Root<PullRequest> root = criteriaQuery.from(PullRequest.class);++ QueryBuildContext<PullRequest> context = new PullRequestQueryBuildContext(root, builder);+ criteriaQuery.where(getPredicates(requestCriteria, project, context));++ criteriaQuery.select(builder.countDistinct(root));+ return getSession().createQuery(criteriaQuery).uniqueResult().intValue();+ }+}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.javaindex 2052888424..6c917aff2c 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestNotificationManager.java@@ -4,6 +4,7 @@ import java.io.Serializable;import java.util.Collection;import java.util.Date;import java.util.HashSet;+import java.util.Map;import java.util.stream.Collectors;import javax.inject.Inject;@@ -24,27 +25,31 @@ import io.onedev.server.event.pullrequest.PullRequestCodeCommentReplied;import io.onedev.server.event.pullrequest.PullRequestCommentAdded;import io.onedev.server.event.pullrequest.PullRequestEvent;import io.onedev.server.event.pullrequest.PullRequestMergePreviewCalculated;-import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.event.pullrequest.PullRequestUpdated;import io.onedev.server.manager.MailManager;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.manager.PullRequestWatchManager;import io.onedev.server.manager.UrlManager;-import io.onedev.server.manager.VisitManager;+import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.Build;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestReview;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.model.support.QuerySetting;import io.onedev.server.model.support.pullrequest.actiondata.ActionData;import io.onedev.server.model.support.pullrequest.actiondata.ApprovedData;import io.onedev.server.model.support.pullrequest.actiondata.DiscardedData;import io.onedev.server.model.support.pullrequest.actiondata.MergedData;import io.onedev.server.model.support.pullrequest.actiondata.ReopenedData;import io.onedev.server.model.support.pullrequest.actiondata.RequestedForChangesData;+import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;import io.onedev.server.persistence.PersistListener;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.util.markdown.MentionParser;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryWatchBuilder;@Singletonpublic class DefaultPullRequestNotificationManager implements PersistListener {@@ -57,17 +62,17 @@ public class DefaultPullRequestNotificationManager implements PersistListener {private final PullRequestWatchManager pullRequestWatchManager;- private final VisitManager visitManager;+ private final UserInfoManager userInfoManager;@Injectpublic DefaultPullRequestNotificationManager(MailManager mailManager, UrlManager urlManager,MarkdownManager markdownManager, PullRequestWatchManager pullRequestWatchManager,- VisitManager visitManager) {+ UserInfoManager userInfoManager) {this.mailManager = mailManager;this.urlManager = urlManager;this.markdownManager = markdownManager;this.pullRequestWatchManager = pullRequestWatchManager;- this.visitManager = visitManager;+ this.userInfoManager = userInfoManager;}@Transactional@@ -76,6 +81,32 @@ public class DefaultPullRequestNotificationManager implements PersistListener {PullRequest request = event.getRequest();User user = event.getUser();+ for(Map.Entry<User, Boolean> entry: new QueryWatchBuilder<PullRequest>() {++ @Override+ protected PullRequest getEntity() {+ return request;+ }++ @Override+ protected Collection<? extends QuerySetting<?>> getQuerySettings() {+ return request.getTargetProject().getPullRequestQuerySettings();+ }++ @Override+ protected EntityQuery<PullRequest> parse(String queryString) {+ return PullRequestQuery.parse(request.getTargetProject(), queryString, true);+ }++ @Override+ protected NamedQuery getSavedProjectQuery(String name) {+ return request.getTargetProject().getSavedPullRequestQuery(name);+ }++ }.getWatches().entrySet()) {+ watch(request, entry.getKey(), entry.getValue());+ };+if (user != null)watch(request, user, true);@@ -166,29 +197,22 @@ public class DefaultPullRequestNotificationManager implements PersistListener {Collection<User> usersToNotify = new HashSet<>();for (PullRequestWatch watch: request.getWatches()) {- Date visitDate = visitManager.getPullRequestVisitDate(watch.getUser(), request);+ Date visitDate = userInfoManager.getPullRequestVisitDate(watch.getUser(), request);if (watch.isWatching()- && !watch.isNotified()+ && !userInfoManager.isNotified(watch.getUser(), watch.getRequest())&& !watch.getUser().equals(event.getUser())&& (visitDate == null || visitDate.getTime()<event.getDate().getTime())&& (!(event instanceof PullRequestUpdated) || !watch.getUser().equals(request.getSubmitter()))&& !notifiedUsers.contains(watch.getUser())) {usersToNotify.add(watch.getUser());- watch.setNotified(true);+ userInfoManager.setPullRequestNotified(watch.getUser(), watch.getRequest(), true);pullRequestWatchManager.save(watch);}}if (!usersToNotify.isEmpty()) {String url = urlManager.urlFor(request);- String subject;- if (event instanceof PullRequestOpened) {- subject = String.format("%s opened pull request #%d - %s",- request.getSubmitter().getDisplayName(), request.getNumber(), request.getTitle());- } else {- subject = String.format("New activities in pull request #%d - %s", request.getNumber(), request.getTitle());- }-+ String subject = String.format("New activities in pull request #%d - %s", request.getNumber(), request.getTitle());String body = String.format("Visit <a href='%s'>%s</a> for details", url, url);mailManager.sendMailAsync(usersToNotify.stream().map(User::getEmail).collect(Collectors.toList()), subject, body);}@@ -209,7 +233,7 @@ public class DefaultPullRequestNotificationManager implements PersistListener {PullRequestReview review = (PullRequestReview) entity;if (review.getExcludeDate() == null && review.getResult() == null) {for (int i=0; i<propertyNames.length; i++) {- if (propertyNames[i].equals(PullRequestReview.RESULT) && previousState[i] != null) {+ if (propertyNames[i].equals(PullRequestReview.PATH_RESULT) && previousState[i] != null) {inviteToReview(review);break;}@@ -220,13 +244,9 @@ public class DefaultPullRequestNotificationManager implements PersistListener {}private void watch(PullRequest request, User user, boolean watching) {- PullRequestWatch watch = request.getWatch(user);- if (watch == null) {- watch = new PullRequestWatch();- watch.setRequest(request);- watch.setUser(user);+ PullRequestWatch watch = (PullRequestWatch) request.getWatch(user, true);+ if (watch.isNew()) {watch.setWatching(watching);- request.getWatches().add(watch);pullRequestWatchManager.save(watch);}}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.javanew file mode 100644index 0000000000..ea0f9987e5--- /dev/null+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestQuerySettingManager.java@@ -0,0 +1,52 @@+package io.onedev.server.manager.impl;++import java.util.stream.Collectors;++import javax.inject.Inject;+import javax.inject.Singleton;++import org.hibernate.criterion.Restrictions;++import io.onedev.server.manager.PullRequestQuerySettingManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequestQuerySetting;+import io.onedev.server.model.User;+import io.onedev.server.persistence.annotation.Sessional;+import io.onedev.server.persistence.annotation.Transactional;+import io.onedev.server.persistence.dao.AbstractEntityManager;+import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;++@Singleton+public class DefaultPullRequestQuerySettingManager extends AbstractEntityManager<PullRequestQuerySetting>+ implements PullRequestQuerySettingManager {++ @Inject+ public DefaultPullRequestQuerySettingManager(Dao dao) {+ super(dao);+ }++ @Sessional+ @Override+ public PullRequestQuerySetting find(Project project, User user) {+ EntityCriteria<PullRequestQuerySetting> criteria = newCriteria();+ criteria.add(Restrictions.and(Restrictions.eq("project", project), Restrictions.eq("user", user)));+ return find(criteria);+ }++ @Transactional+ @Override+ public void save(PullRequestQuerySetting setting) {+ setting.getUserQueryWatches().keySet().retainAll(+ setting.getUserQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));+ setting.getProjectQueryWatches().keySet().retainAll(+ setting.getProject().getSavedIssueQueries().stream().map(it->it.getName()).collect(Collectors.toSet()));+ if (setting.getProjectQueryWatches().isEmpty() && setting.getUserQueries().isEmpty()) {+ if (!setting.isNew())+ delete(setting);+ } else {+ super.save(setting);+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.javaindex 79ca32e487..fda51a5938 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserInfoManager.java@@ -6,10 +6,21 @@ import java.util.Date;import javax.inject.Inject;import javax.inject.Singleton;+import org.joda.time.DateTime;+import io.onedev.launcher.loader.Listen;+import io.onedev.server.event.codecomment.CodeCommentEvent;+import io.onedev.server.event.issue.IssueEvent;+import io.onedev.server.event.pullrequest.PullRequestActionEvent;+import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;+import io.onedev.server.event.pullrequest.PullRequestCommentAdded;+import io.onedev.server.event.pullrequest.PullRequestOpened;import io.onedev.server.manager.StorageManager;import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.model.CodeComment;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;import io.onedev.server.model.User;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.EntityRemoved;@@ -31,9 +42,21 @@ import jetbrains.exodus.env.TransactionalExecutable;@Singletonpublic class DefaultUserInfoManager extends AbstractEnvironmentManager implements UserInfoManager {- private static final int INFO_VERSION = 4;+ private static final int INFO_VERSION = 5;++ private static final String PROJECT_VISIT_STORE = "projectVisit";++ private static final String PULL_REQUEST_VISIT_STORE = "pullRequestVisit";++ private static final String PULL_REQUEST_NOTIFICATION_STORE = "pullRequestNotification";++ private static final String PULL_REQUEST_CODE_COMMENTS_VISIT_STORE = "pullRequestCodeCommentsVisit";++ private static final String CODE_COMMENT_VISIT_STORE = "codeCommentVisit";++ private static final String ISSUE_VISIT_STORE = "issueVisit";- private static final String VISIT_STORE = "visit";+ private static final String ISSUE_NOTIFICATION_STORE = "issueNotification";private final StorageManager storageManager;@@ -45,7 +68,7 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implement@Overridepublic void visit(User user, Project project) {Environment env = getEnv(user.getId().toString());- Store store = getStore(env, VISIT_STORE);+ Store store = getStore(env, PROJECT_VISIT_STORE);env.executeInTransaction(new TransactionalExecutable() {@Override@@ -59,7 +82,7 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implement@Overridepublic Date getVisitDate(UserFacade user, ProjectFacade project) {Environment env = getEnv(user.getId().toString());- Store store = getStore(env, VISIT_STORE);+ Store store = getStore(env, PROJECT_VISIT_STORE);return env.computeInTransaction(new TransactionalComputable<Date>() {@Override@@ -90,5 +113,234 @@ public class DefaultUserInfoManager extends AbstractEnvironmentManager implementprotected int getEnvVersion() {return INFO_VERSION;}++ @Override+ public void visitIssue(User user, Issue issue) {+ Environment env = getEnv(issue.getProject().getId().toString());+ Store store = getStore(env, ISSUE_VISIT_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ long time = new DateTime().plusSeconds(1).getMillis();+ writeLong(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), time);+ }++ });++ setIssueNotified(user, issue, false);+ }++ @Override+ public void visitPullRequest(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, PULL_REQUEST_VISIT_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ long time = new DateTime().plusSeconds(1).getMillis();+ writeLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), time);+ }++ });++ setPullRequestNotified(user, request, false);+ }++ @Override+ public void visitPullRequestCodeComments(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_VISIT_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ long time = new DateTime().plusSeconds(1).getMillis();+ writeLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), time);+ }++ });+ }++ @Override+ public void visitCodeComment(User user, CodeComment comment) {+ Environment env = getEnv(comment.getProject().getId().toString());+ Store store = getStore(env, CODE_COMMENT_VISIT_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ long time = new DateTime().plusSeconds(1).getMillis();+ writeLong(store, txn, new StringPairByteIterable(user.getUUID(), comment.getUUID()), time);+ }++ });+ }++ @Override+ public Date getPullRequestVisitDate(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, PULL_REQUEST_VISIT_STORE);+ return env.computeInTransaction(new TransactionalComputable<Date>() {++ @Override+ public Date compute(Transaction txn) {+ long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), -1);+ if (millis != -1)+ return new Date(millis);+ else+ return null;+ }++ });+ }++ @Override+ public Date getIssueVisitDate(User user, Issue issue) {+ Environment env = getEnv(issue.getProject().getId().toString());+ Store store = getStore(env, ISSUE_VISIT_STORE);+ return env.computeInTransaction(new TransactionalComputable<Date>() {++ @Override+ public Date compute(Transaction txn) {+ long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), -1);+ if (millis != -1)+ return new Date(millis);+ else+ return null;+ }++ });+ }++ @Override+ public Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_VISIT_STORE);+ return env.computeInTransaction(new TransactionalComputable<Date>() {++ @Override+ public Date compute(Transaction txn) {+ long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), -1);+ if (millis != -1)+ return new Date(millis);+ else+ return null;+ }++ });+ }++ @Override+ public Date getCodeCommentVisitDate(User user, CodeComment comment) {+ Environment env = getEnv(comment.getProject().getId().toString());+ Store store = getStore(env, CODE_COMMENT_VISIT_STORE);+ return env.computeInTransaction(new TransactionalComputable<Date>() {++ @Override+ public Date compute(Transaction txn) {+ long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), comment.getUUID()), -1);+ if (millis != -1)+ return new Date(millis);+ else+ return null;+ }++ });+ }++ @Listen+ public void on(IssueEvent event) {+ visitIssue(event.getUser(), event.getIssue());+ }++ @Listen+ public void on(CodeCommentEvent event) {+ visitCodeComment(event.getUser(), event.getComment());+ }++ @Listen+ public void on(PullRequestCommentAdded event) {+ visitPullRequest(event.getUser(), event.getRequest());+ }++ @Listen+ public void on(PullRequestCodeCommentEvent event) {+ if (!event.isDerived()) {+ visitPullRequest(event.getUser(), event.getRequest());+ visitPullRequestCodeComments(event.getUser(), event.getRequest());+ }+ }++ @Listen+ public void on(PullRequestOpened event) {+ if (event.getRequest().getSubmitter() != null)+ visitPullRequest(event.getRequest().getSubmitter(), event.getRequest());+ }++ @Listen+ public void on(PullRequestActionEvent event) {+ if (event.getUser() != null)+ visitPullRequest(event.getUser(), event.getRequest());+ }++ @Override+ public boolean isNotified(User user, PullRequest request) {+ Environment env = getEnv(request.getTargetProject().getId().toString());+ Store store = getStore(env, PULL_REQUEST_NOTIFICATION_STORE);+ return env.computeInTransaction(new TransactionalComputable<Boolean>() {++ @Override+ public Boolean compute(Transaction txn) {+ return readBoolean(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), false);+ }++ });+ }++ @Override+ public boolean isNotified(User user, Issue issue) {+ Environment env = getEnv(issue.getProject().getId().toString());+ Store store = getStore(env, ISSUE_NOTIFICATION_STORE);+ return env.computeInTransaction(new TransactionalComputable<Boolean>() {++ @Override+ public Boolean compute(Transaction txn) {+ return readBoolean(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), false);+ }++ });+ }++ @Override+ public void setPullRequestNotified(User user, PullRequest request, boolean notified) {+ Environment env = getEnv(request.getTargetProject().getId().toString());++ Store store = getStore(env, PULL_REQUEST_NOTIFICATION_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ writeBoolean(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), notified);+ }++ });+ }++ @Override+ public void setIssueNotified(User user, Issue issue, boolean notified) {+ Environment env = getEnv(issue.getProject().getId().toString());++ Store store = getStore(env, ISSUE_NOTIFICATION_STORE);+ env.executeInTransaction(new TransactionalExecutable() {++ @Override+ public void execute(Transaction txn) {+ writeBoolean(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), notified);+ }++ });+ }}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.javaindex 991ce4ab7f..32b30fc929 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultUserManager.java@@ -103,29 +103,18 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uquery.setParameter("reporterName", user.getDisplayName());query.executeUpdate();- query = getSession().createQuery("update PullRequest set closeInfo.closedBy=null, "- + "closeInfo.closedByName=:closedByName where closeInfo.closedBy=:closedBy");- query.setParameter("closedBy", user);- query.setParameter("closedByName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update PullRequest set lastActivity.user=null, "- + "lastActivity.userName=:lastActivityUserName where lastActivity.user=:lastActivityUser");- query.setParameter("lastActivityUser", user);- query.setParameter("lastActivityUserName", user.getDisplayName());- query.executeUpdate();-- query = getSession().createQuery("update PullRequestStatusChange set user=null, userName=:userName where user=:user");+ query = getSession().createQuery("update PullRequest set closeInfo.user=null, "+ + "closeInfo.userName=:closedByName where closeInfo.user=:user");query.setParameter("user", user);query.setParameter("userName", user.getDisplayName());query.executeUpdate();- query = getSession().createQuery("update PullRequestComment set user=null, userName=:userName where user=:user");+ query = getSession().createQuery("update PullRequestAction set user=null, userName=:userName where user=:user");query.setParameter("user", user);query.setParameter("userName", user.getDisplayName());query.executeUpdate();- query = getSession().createQuery("update PullRequestReference set user=null, userName=:userName where user=:user");+ query = getSession().createQuery("update PullRequestComment set user=null, userName=:userName where user=:user");query.setParameter("user", user);query.setParameter("userName", user.getDisplayName());query.executeUpdate();@@ -135,12 +124,6 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uquery.setParameter("userName", user.getDisplayName());query.executeUpdate();- query = getSession().createQuery("update CodeComment set lastActivity.user=null, "- + "lastActivity.userName=:lastActivityUserName where lastActivity.user=:lastActivityUser");- query.setParameter("lastActivityUser", user);- query.setParameter("lastActivityUserName", user.getDisplayName());- query.executeUpdate();-query = getSession().createQuery("update CodeCommentReply set user=null, userName=:userName where user=:user");query.setParameter("user", user);query.setParameter("userName", user.getDisplayName());@@ -156,7 +139,7 @@ public class DefaultUserManager extends AbstractEntityManager<User> implements Uquery.setParameter("userName", user.getDisplayName());query.executeUpdate();- query = getSession().createQuery("update IssueChange set user=null, userName=:userName where user=:user");+ query = getSession().createQuery("update IssueAction set user=null, userName=:userName where user=:user");query.setParameter("user", user);query.setParameter("userName", user.getDisplayName());query.executeUpdate();diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.javadeleted file mode 100644index de44f3fcbc..0000000000--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultVisitManager.java+++ /dev/null@@ -1,283 +0,0 @@-package io.onedev.server.manager.impl;--import java.io.File;-import java.util.Date;--import javax.inject.Inject;-import javax.inject.Singleton;--import io.onedev.launcher.loader.Listen;-import io.onedev.server.event.codecomment.CodeCommentEvent;-import io.onedev.server.event.pullrequest.PullRequestActionEvent;-import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;-import io.onedev.server.event.pullrequest.PullRequestCommentAdded;-import io.onedev.server.event.pullrequest.PullRequestOpened;-import io.onedev.server.manager.IssueWatchManager;-import io.onedev.server.manager.PullRequestWatchManager;-import io.onedev.server.manager.StorageManager;-import io.onedev.server.manager.VisitManager;-import io.onedev.server.model.CodeComment;-import io.onedev.server.model.Issue;-import io.onedev.server.model.IssueWatch;-import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.PullRequestWatch;-import io.onedev.server.model.User;-import io.onedev.server.persistence.annotation.Transactional;-import io.onedev.server.persistence.dao.EntityRemoved;-import io.onedev.utils.FileUtils;-import jetbrains.exodus.env.Environment;-import jetbrains.exodus.env.Store;-import jetbrains.exodus.env.Transaction;-import jetbrains.exodus.env.TransactionalComputable;-import jetbrains.exodus.env.TransactionalExecutable;--@Singleton-public class DefaultVisitManager extends AbstractEnvironmentManager implements VisitManager {-- private static final int INFO_VERSION = 5;-- private static final String INFO_DIR = "visit";-- private static final String PULL_REQUEST_STORE = "pullRequest";-- private static final String PULL_REQUEST_CODE_COMMENTS_STORE = "pullRequestCodeComments";-- private static final String CODE_COMMENT_STORE = "codeComment";-- private static final String ISSUE_STORE = "issue";-- private final StorageManager storageManager;-- private final PullRequestWatchManager pullRequestWatchManager;-- private final IssueWatchManager issueWatchManager;-- @Inject- public DefaultVisitManager(StorageManager storageManager, PullRequestWatchManager pullRequestWatchManager,- IssueWatchManager issueWatchManager) {- this.storageManager = storageManager;- this.pullRequestWatchManager = pullRequestWatchManager;- this.issueWatchManager = issueWatchManager;- }-- @Override- public void visitIssue(User user, Issue issue) {- visitIssue(user, issue, new Date(System.currentTimeMillis()+1000L));- }-- @Transactional- @Override- public void visitIssue(User user, Issue issue, Date date) {- IssueWatch watch = issueWatchManager.find(issue, user);- if (watch != null) {- watch.setNotified(false);- issueWatchManager.save(watch);- }- Environment env = getEnv(issue.getProject().getId().toString());- Store store = getStore(env, ISSUE_STORE);- env.executeInTransaction(new TransactionalExecutable() {-- @Override- public void execute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), -1);- if (millis < date.getTime())- writeLong(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), date.getTime());- }-- });- }-- @Override- public void visitPullRequest(User user, PullRequest request) {- visitPullRequest(user, request, new Date(System.currentTimeMillis()+1000L));- }-- @Transactional- @Override- public void visitPullRequest(User user, PullRequest request, Date date) {- PullRequestWatch watch = pullRequestWatchManager.find(request, user);- if (watch != null) {- watch.setNotified(false);- pullRequestWatchManager.save(watch);- }-- Environment env = getEnv(request.getTargetProject().getId().toString());- Store store = getStore(env, PULL_REQUEST_STORE);- env.executeInTransaction(new TransactionalExecutable() {-- @Override- public void execute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), -1);- if (millis < date.getTime())- writeLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), date.getTime());- }-- });--- }-- @Override- public void visitPullRequestCodeComments(User user, PullRequest request) {- visitPullRequestCodeComments(user, request, new Date(System.currentTimeMillis()+1000L));- }-- @Override- public void visitPullRequestCodeComments(User user, PullRequest request, Date date) {- Environment env = getEnv(request.getTargetProject().getId().toString());- Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_STORE);- env.executeInTransaction(new TransactionalExecutable() {-- @Override- public void execute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), -1);- if (millis < date.getTime())- writeLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), date.getTime());- }-- });- }-- @Override- public void visitCodeComment(User user, CodeComment comment) {- visitCodeComment(user, comment, new Date(System.currentTimeMillis()+1000L));- }-- @Override- public void visitCodeComment(User user, CodeComment comment, Date date) {- Environment env = getEnv(comment.getProject().getId().toString());- Store store = getStore(env, CODE_COMMENT_STORE);- env.executeInTransaction(new TransactionalExecutable() {-- @Override- public void execute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), comment.getUUID()), -1);- if (millis < date.getTime())- writeLong(store, txn, new StringPairByteIterable(user.getUUID(), comment.getUUID()), date.getTime());- }-- });- }-- @Override- public Date getPullRequestVisitDate(User user, PullRequest request) {- Environment env = getEnv(request.getTargetProject().getId().toString());- Store store = getStore(env, PULL_REQUEST_STORE);- return env.computeInTransaction(new TransactionalComputable<Date>() {-- @Override- public Date compute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), -1);- if (millis != -1)- return new Date(millis);- else- return null;- }-- });- }-- @Override- public Date getIssueVisitDate(User user, Issue issue) {- Environment env = getEnv(issue.getProject().getId().toString());- Store store = getStore(env, ISSUE_STORE);- return env.computeInTransaction(new TransactionalComputable<Date>() {-- @Override- public Date compute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), issue.getUUID()), -1);- if (millis != -1)- return new Date(millis);- else- return null;- }-- });- }-- @Override- public Date getPullRequestCodeCommentsVisitDate(User user, PullRequest request) {- Environment env = getEnv(request.getTargetProject().getId().toString());- Store store = getStore(env, PULL_REQUEST_CODE_COMMENTS_STORE);- return env.computeInTransaction(new TransactionalComputable<Date>() {-- @Override- public Date compute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), request.getUUID()), -1);- if (millis != -1)- return new Date(millis);- else- return null;- }-- });- }-- @Override- public Date getCodeCommentVisitDate(User user, CodeComment comment) {- Environment env = getEnv(comment.getProject().getId().toString());- Store store = getStore(env, CODE_COMMENT_STORE);- return env.computeInTransaction(new TransactionalComputable<Date>() {-- @Override- public Date compute(Transaction txn) {- long millis = readLong(store, txn, new StringPairByteIterable(user.getUUID(), comment.getUUID()), -1);- if (millis != -1)- return new Date(millis);- else- return null;- }-- });- }-- @Listen- public void on(CodeCommentEvent event) {- visitCodeComment(event.getUser(), event.getComment());- }-- @Listen- public void on(PullRequestCommentAdded event) {- visitPullRequest(event.getUser(), event.getRequest());- }-- @Listen- public void on(PullRequestCodeCommentEvent event) {- if (!event.isDerived())- visitPullRequest(event.getUser(), event.getRequest());- }-- @Listen- public void on(PullRequestOpened event) {- if (event.getRequest().getSubmitter() != null)- visitPullRequest(event.getRequest().getSubmitter(), event.getRequest());- }-- @Listen- public void on(PullRequestActionEvent event) {- if (event.getUser() != null)- visitPullRequest(event.getUser(), event.getRequest());- }-- @Transactional- @Listen- public void on(EntityRemoved event) {- if (event.getEntity() instanceof Project)- removeEnv(event.getEntity().getId().toString());- }-- @Override- protected File getEnvDir(String envKey) {- File infoDir = new File(storageManager.getProjectInfoDir(Long.valueOf(envKey)), INFO_DIR);- if (!infoDir.exists())- FileUtils.createDir(infoDir);- return infoDir;- }-- @Override- protected int getEnvVersion() {- return INFO_VERSION;- }--}diff --git a/core/src/main/java/io/onedev/server/model/AbstractEntity.java b/core/src/main/java/io/onedev/server/model/AbstractEntity.javaindex 258ae2426c..090643fd81 100644--- a/core/src/main/java/io/onedev/server/model/AbstractEntity.java+++ b/core/src/main/java/io/onedev/server/model/AbstractEntity.java@@ -1,6 +1,8 @@package io.onedev.server.model;import java.io.Serializable;+import java.util.ArrayList;+import java.util.Collection;import javax.annotation.Nullable;import javax.persistence.GeneratedValue;@@ -14,6 +16,8 @@ import org.hibernate.proxy.HibernateProxy;import com.fasterxml.jackson.annotation.JsonIgnoreProperties;+import io.onedev.server.model.support.EntityWatch;+@MappedSuperclass@JsonIgnoreProperties("handler")public abstract class AbstractEntity implements Serializable, Comparable<AbstractEntity> {@@ -32,6 +36,23 @@ public abstract class AbstractEntity implements Serializable, Comparable<Abstracpublic void setId(Long id) {this.id = id;}++ public Collection<? extends EntityWatch> getWatches() {+ return new ArrayList<>();+ }++ @Nullable+ public EntityWatch getWatch(User user, boolean createIfNotExist) {+ if (createIfNotExist) {+ throw new UnsupportedOperationException();+ } else {+ for (EntityWatch watch: getWatches()) {+ if (watch.getUser().equals(user))+ return watch;+ }+ return null;+ }+ }@Overridepublic boolean equals(Object other) {diff --git a/core/src/main/java/io/onedev/server/model/Build.java b/core/src/main/java/io/onedev/server/model/Build.javaindex 8d8ae2d58f..2a13e76dce 100644--- a/core/src/main/java/io/onedev/server/model/Build.java+++ b/core/src/main/java/io/onedev/server/model/Build.java@@ -20,6 +20,8 @@ public class Build extends AbstractEntity {private static final long serialVersionUID = 1L;+ public static final String STATUS = "status";+public enum Status {SUCCESS("successful"),FAILURE("failed"),diff --git a/core/src/main/java/io/onedev/server/model/CodeComment.java b/core/src/main/java/io/onedev/server/model/CodeComment.javaindex 740cf85e4f..9155a0c953 100644--- a/core/src/main/java/io/onedev/server/model/CodeComment.java+++ b/core/src/main/java/io/onedev/server/model/CodeComment.java@@ -36,7 +36,7 @@ import io.onedev.server.event.codecomment.CodeCommentEvent;import io.onedev.server.git.Blob;import io.onedev.server.git.BlobIdent;import io.onedev.server.git.GitUtils;-import io.onedev.server.manager.VisitManager;+import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.MarkPos;@@ -198,7 +198,7 @@ public class CodeComment extends AbstractEntity {public boolean isVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {- Date visitDate = OneDev.getInstance(VisitManager.class).getCodeCommentVisitDate(user, this);+ Date visitDate = OneDev.getInstance(UserInfoManager.class).getCodeCommentVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();} else {return true;diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 4e6199ee6f..44c0a76fd9 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -34,7 +34,8 @@ import com.google.common.collect.Lists;import edu.emory.mathcs.backport.java.util.Collections;import io.onedev.server.OneDev;-import io.onedev.server.manager.VisitManager;+import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.Referenceable;import io.onedev.server.model.support.issue.IssueField;@@ -57,7 +58,7 @@ import io.onedev.server.web.editable.annotation.Editable;@Index(columnList="title"), @Index(columnList="noSpaceTitle"),@Index(columnList="number"), @Index(columnList="numberStr"),@Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),- @Index(columnList="numOfVotes"), @Index(columnList="numOfComments"),+ @Index(columnList="voteCount"), @Index(columnList="commentCount"),@Index(columnList="g_milestone_id"), @Index(columnList="LAST_ACT_DATE")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editable@@ -65,39 +66,39 @@ public class Issue extends AbstractEntity implements Referenceable {private static final long serialVersionUID = 1L;- public static final Map<String, String> BUILTIN_FIELDS = new LinkedHashMap<>();+ public static final Map<String, String> FIELD_PATHS = new LinkedHashMap<>();- public static final String NUMBER = "Number";+ public static final String FIELD_NUMBER = "Number";- public static final String STATE = "State";+ public static final String FIELD_STATE = "State";- public static final String TITLE = "Title";+ public static final String FIELD_TITLE = "Title";- public static final String DESCRIPTION = "Description";+ public static final String FIELD_DESCRIPTION = "Description";- public static final String SUBMITTER = "Submitter";+ public static final String FIELD_SUBMITTER = "Submitter";- public static final String SUBMIT_DATE = "Submit Date";+ public static final String FIELD_SUBMIT_DATE = "Submit Date";- public static final String VOTES = "Votes";+ public static final String FIELD_VOTE_COUNT = "Vote Count";- public static final String COMMENTS = "Comments";+ public static final String FIELD_COMMENT_COUNT = "Comment Count";- public static final String UPDATE_DATE = "Update Date";+ public static final String FIELD_UPDATE_DATE = "Update Date";- public static final String MILESTONE = "Milestone";+ public static final String FIELD_MILESTONE = "Milestone";static {- BUILTIN_FIELDS.put(NUMBER, "number");- BUILTIN_FIELDS.put(STATE, "state");- BUILTIN_FIELDS.put(TITLE, "title");- BUILTIN_FIELDS.put(DESCRIPTION, "description");- BUILTIN_FIELDS.put(SUBMITTER, "submitter");- BUILTIN_FIELDS.put(SUBMIT_DATE, "submitDate");- BUILTIN_FIELDS.put(UPDATE_DATE, "lastActivity.date");- BUILTIN_FIELDS.put(VOTES, "numOfVotes");- BUILTIN_FIELDS.put(COMMENTS, "numOfComments");- BUILTIN_FIELDS.put(MILESTONE, "milestone");+ FIELD_PATHS.put(FIELD_NUMBER, "number");+ FIELD_PATHS.put(FIELD_STATE, "state");+ FIELD_PATHS.put(FIELD_TITLE, "title");+ FIELD_PATHS.put(FIELD_DESCRIPTION, "description");+ FIELD_PATHS.put(FIELD_SUBMITTER, "submitter");+ FIELD_PATHS.put(FIELD_SUBMIT_DATE, "submitDate");+ FIELD_PATHS.put(FIELD_UPDATE_DATE, "lastActivity.date");+ FIELD_PATHS.put(FIELD_VOTE_COUNT, "voteCount");+ FIELD_PATHS.put(FIELD_COMMENT_COUNT, "commentCount");+ FIELD_PATHS.put(FIELD_MILESTONE, "milestone");}@Version@@ -128,9 +129,9 @@ public class Issue extends AbstractEntity implements Referenceable {@Column(nullable=false)private long submitDate;- private int numOfVotes;+ private int voteCount;- private int numOfComments;+ private int commentCount;@Column(nullable=false)private String uuid = UUID.randomUUID().toString();@@ -279,6 +280,7 @@ public class Issue extends AbstractEntity implements Referenceable {this.votes = votes;}+ @Overridepublic Collection<IssueWatch> getWatches() {return watches;}@@ -286,21 +288,37 @@ public class Issue extends AbstractEntity implements Referenceable {public void setWatches(Collection<IssueWatch> watches) {this.watches = watches;}++ @Override+ public EntityWatch getWatch(User user, boolean createIfNotExist) {+ if (createIfNotExist) {+ IssueWatch watch = (IssueWatch) super.getWatch(user, false);+ if (watch == null) {+ watch = new IssueWatch();+ watch.setIssue(this);+ watch.setUser(user);+ getWatches().add(watch);+ }+ return watch;+ } else {+ return super.getWatch(user, false);+ }+ }- public int getNumOfVotes() {- return numOfVotes;+ public int getVoteCount() {+ return voteCount;}- public void setNumOfVotes(int numOfVotes) {- this.numOfVotes = numOfVotes;+ public void setVoteCount(int voteCount) {+ this.voteCount = voteCount;}- public int getNumOfComments() {- return numOfComments;+ public int getCommentCount() {+ return commentCount;}- public void setNumOfComments(int numOfComments) {- this.numOfComments = numOfComments;+ public void setCommentCount(int commentCount) {+ this.commentCount = commentCount;}public Collection<IssueFieldUnary> getFieldUnaries() {@@ -322,7 +340,7 @@ public class Issue extends AbstractEntity implements Referenceable {public boolean isVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {- Date visitDate = OneDev.getInstance(VisitManager.class).getIssueVisitDate(user, this);+ Date visitDate = OneDev.getInstance(UserInfoManager.class).getIssueVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();} else {return true;@@ -365,15 +383,6 @@ public class Issue extends AbstractEntity implements Referenceable {return Issue.class.getName() + ":" + issueId;}- @Nullable- public IssueWatch getWatch(User user) {- for (IssueWatch watch: getWatches()) {- if (user.equals(watch.getUser()))- return watch;- }- return null;- }-@Nullablepublic String getMilestoneName() {return getMilestone()!=null? getMilestone().getName():null;@@ -402,7 +411,7 @@ public class Issue extends AbstractEntity implements Referenceable {Serializable fieldBean = (Serializable) beanDescriptor.newBeanInstance();for (PropertyDescriptor property: beanDescriptor.getPropertyDescriptors()) {- if (property.getDisplayName().equals(Issue.STATE)) {+ if (property.getDisplayName().equals(Issue.FIELD_STATE)) {property.setPropertyValue(fieldBean, getState());} else {IssueField field = getFields().get(property.getDisplayName());@@ -460,7 +469,7 @@ public class Issue extends AbstractEntity implements Referenceable {if (fieldSpec != null) {if (fieldSpec.getShowConditions() != null) {for (ShowCondition condition: fieldSpec.getShowConditions()) {- if (condition.getInputName().equals(Issue.STATE)) {+ if (condition.getInputName().equals(Issue.FIELD_STATE)) {if (!condition.getValueMatcher().matches(state))return false;} else {@@ -486,5 +495,5 @@ public class Issue extends AbstractEntity implements Referenceable {return false;}}-+}diff --git a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.javaindex fa1a2586be..db20c4d54d 100644--- a/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java+++ b/core/src/main/java/io/onedev/server/model/IssueQuerySetting.java@@ -3,7 +3,6 @@ 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;@@ -14,14 +13,15 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;-import io.onedev.server.model.support.issue.NamedQuery;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.issue.NamedIssueQuery;@Entity@Table(indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})})-public class IssueQuerySetting extends AbstractEntity {+public class IssueQuerySetting extends QuerySetting<NamedIssueQuery> {private static final long serialVersionUID = 1L;@@ -35,7 +35,7 @@ public class IssueQuerySetting extends AbstractEntity {@Lob@Column(nullable=false, length=65535)- private ArrayList<NamedQuery> userQueries = new ArrayList<>();+ private ArrayList<NamedIssueQuery> userQueries = new ArrayList<>();@Lob@Column(nullable=false, length=65535)@@ -44,6 +44,7 @@ public class IssueQuerySetting extends AbstractEntity {@Column(nullable=false, length=65535)private LinkedHashMap<String, Boolean> projectQueryWatches = new LinkedHashMap<>();+ @Overridepublic Project getProject() {return project;}@@ -52,6 +53,7 @@ public class IssueQuerySetting extends AbstractEntity {this.project = project;}+ @Overridepublic User getUser() {return user;}@@ -60,23 +62,17 @@ public class IssueQuerySetting extends AbstractEntity {this.user = user;}- public ArrayList<NamedQuery> getUserQueries() {+ @Override+ public ArrayList<NamedIssueQuery> getUserQueries() {return userQueries;}- public void setUserQueries(ArrayList<NamedQuery> userQueries) {+ @Override+ public void setUserQueries(ArrayList<NamedIssueQuery> userQueries) {this.userQueries = userQueries;}- @Nullable- public NamedQuery getUserQuery(String name) {- for (NamedQuery namedQuery: getUserQueries()) {- if (namedQuery.getName().equals(name))- return namedQuery;- }- return null;- }-+ @Overridepublic LinkedHashMap<String, Boolean> getUserQueryWatches() {return userQueryWatches;}@@ -85,6 +81,7 @@ public class IssueQuerySetting extends AbstractEntity {this.userQueryWatches = userQueryWatches;}+ @Overridepublic LinkedHashMap<String, Boolean> getProjectQueryWatches() {return projectQueryWatches;}diff --git a/core/src/main/java/io/onedev/server/model/IssueWatch.java b/core/src/main/java/io/onedev/server/model/IssueWatch.javaindex 5259074647..093c5bbcc8 100644--- a/core/src/main/java/io/onedev/server/model/IssueWatch.java+++ b/core/src/main/java/io/onedev/server/model/IssueWatch.java@@ -8,12 +8,14 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import io.onedev.server.model.support.EntityWatch;+@Entity@Table(indexes={@Index(columnList="g_issue_id"), @Index(columnList="g_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"g_issue_id", "g_user_id"})})-public class IssueWatch extends AbstractEntity {+public class IssueWatch extends EntityWatch {private static final long serialVersionUID = 1L;@@ -27,8 +29,6 @@ public class IssueWatch extends AbstractEntity {private boolean watching;- private boolean notified;-public Issue getIssue() {return issue;}@@ -36,7 +36,13 @@ public class IssueWatch extends AbstractEntity {public void setIssue(Issue issue) {this.issue = issue;}++ @Override+ public Issue getEntity() {+ return getIssue();+ }+ @Overridepublic User getUser() {return user;}@@ -45,20 +51,14 @@ public class IssueWatch extends AbstractEntity {this.user = user;}+ @Overridepublic boolean isWatching() {return watching;}+ @Overridepublic void setWatching(boolean watching) {this.watching = watching;}- public boolean isNotified() {- return notified;- }-- public void setNotified(boolean notified) {- this.notified = notified;- }-}diff --git a/core/src/main/java/io/onedev/server/model/Project.java b/core/src/main/java/io/onedev/server/model/Project.javaindex 31a5705134..0f06d10295 100644--- a/core/src/main/java/io/onedev/server/model/Project.java+++ b/core/src/main/java/io/onedev/server/model/Project.java@@ -77,6 +77,7 @@ import io.onedev.server.git.exception.NotFileException;import io.onedev.server.git.exception.ObjectNotFoundException;import io.onedev.server.manager.IssueQuerySettingManager;import io.onedev.server.manager.ProjectManager;+import io.onedev.server.manager.PullRequestQuerySettingManager;import io.onedev.server.manager.SettingManager;import io.onedev.server.manager.StorageManager;import io.onedev.server.manager.UserManager;@@ -84,8 +85,9 @@ import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.CommitMessageTransformSetting;import io.onedev.server.model.support.TagProtection;import io.onedev.server.model.support.issue.IssueBoard;-import io.onedev.server.model.support.issue.NamedQuery;+import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;import io.onedev.server.persistence.UnitOfWork;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.ProjectFacade;@@ -176,6 +178,9 @@ public class Project extends AbstractEntity {@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<IssueQuerySetting> issueQuerySettings = new ArrayList<>();+ @OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)+ private Collection<PullRequestQuerySetting> pullRequestQuerySettings = new ArrayList<>();+@OneToMany(mappedBy="project", cascade=CascadeType.REMOVE)private Collection<Milestone> milestones = new ArrayList<>();@@ -185,8 +190,12 @@ public class Project extends AbstractEntity {@Lob@Column(nullable=false, length=65535)- private ArrayList<NamedQuery> savedIssueQueries = new ArrayList<>();+ private ArrayList<NamedIssueQuery> savedIssueQueries = new ArrayList<>();+ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedPullRequestQuery> savedPullRequestQueries = new ArrayList<>();+@Lob@Column(nullable=false, length=65535)private ArrayList<String> issueListFields = new ArrayList<>();@@ -209,27 +218,40 @@ public class Project extends AbstractEntity {private transient Optional<RevCommit> lastCommitOptional;- private transient Optional<IssueQuerySetting> issueQuerySettingOfCurrentUser;+ private transient Optional<IssueQuerySetting> issueQuerySettingOfCurrentUserHolder;++ private transient Optional<PullRequestQuerySetting> pullRequestQuerySettingOfCurrentUserHolder;public Project() {- issueListFields.add(Issue.NUMBER);- issueListFields.add(Issue.STATE);- issueListFields.add(Issue.TITLE);+ issueListFields.add(Issue.FIELD_NUMBER);+ issueListFields.add(Issue.FIELD_STATE);+ issueListFields.add(Issue.FIELD_TITLE);issueListFields.add("Type");issueListFields.add("Priority");- issueListFields.add(Issue.SUBMITTER);+ issueListFields.add(Issue.FIELD_SUBMITTER);issueListFields.add("Assignee");- issueListFields.add(Issue.VOTES);+ issueListFields.add(Issue.FIELD_VOTE_COUNT);- savedIssueQueries.add(new NamedQuery("All", "all"));- savedIssueQueries.add(new NamedQuery("Open", "open"));- savedIssueQueries.add(new NamedQuery("My open", "open and mine"));- savedIssueQueries.add(new NamedQuery("Closed", "closed"));- savedIssueQueries.add(new NamedQuery("Added recently", "\"Submit Date\" is after \"last week\""));- savedIssueQueries.add(new NamedQuery("Updated recently", "\"Update Date\" is after \"last week\""));- savedIssueQueries.add(new NamedQuery("Submitted by me", "\"Submitter\" is me"));- savedIssueQueries.add(new NamedQuery("Assigned to me", "\"Assignee\" is me"));- savedIssueQueries.add(new NamedQuery("High Priority", "\"Priority\" is \"High\""));+ savedIssueQueries.add(new NamedIssueQuery("Open", "open"));+ savedIssueQueries.add(new NamedIssueQuery("My open", "open and mine"));+ savedIssueQueries.add(new NamedIssueQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));+ savedIssueQueries.add(new NamedIssueQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ savedIssueQueries.add(new NamedIssueQuery("Submitted by me", "\"Submitter\" is me"));+ savedIssueQueries.add(new NamedIssueQuery("Assigned to me", "\"Assignee\" is me"));+ savedIssueQueries.add(new NamedIssueQuery("High Priority", "\"Priority\" is \"High\""));+ savedIssueQueries.add(new NamedIssueQuery("Closed", "closed"));+ savedIssueQueries.add(new NamedIssueQuery("All", "all"));++ savedPullRequestQueries.add(new NamedPullRequestQuery("Open", "open"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Need to be reviewed by me", "to be reviewed by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Need to be changed by me", "submitted by me and someone requested for changes"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Request for changes by me", "requested for changes by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Approved by me", "approved by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted by me", "submitted by me"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Submitted recently", "\"Submit Date\" is after \"last week\""));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Updated recently", "\"Update Date\" is after \"last week\""));+ savedPullRequestQueries.add(new NamedPullRequestQuery("Closed", "merged or discarded"));+ savedPullRequestQueries.add(new NamedPullRequestQuery("All", "all"));}@Editable(order=100)@@ -852,23 +874,40 @@ public class Project extends AbstractEntity {this.issueWorkflow = issueWorkflow;}- public ArrayList<NamedQuery> getSavedIssueQueries() {+ public ArrayList<NamedIssueQuery> getSavedIssueQueries() {return savedIssueQueries;}- public void setSavedIssueQueries(ArrayList<NamedQuery> savedIssueQueries) {+ public void setSavedIssueQueries(ArrayList<NamedIssueQuery> savedIssueQueries) {this.savedIssueQueries = savedIssueQueries;}+ public ArrayList<NamedPullRequestQuery> getSavedPullRequestQueries() {+ return savedPullRequestQueries;+ }++ public void setSavedPullRequestQueries(ArrayList<NamedPullRequestQuery> savedPullRequestQueries) {+ this.savedPullRequestQueries = savedPullRequestQueries;+ }+@Nullable- public NamedQuery getSavedIssueQuery(String name) {- for (NamedQuery namedQuery: getSavedIssueQueries()) {+ public NamedIssueQuery getSavedIssueQuery(String name) {+ for (NamedIssueQuery namedQuery: getSavedIssueQueries()) {if (namedQuery.getName().equals(name))return namedQuery;}return null;}+ @Nullable+ public NamedPullRequestQuery getSavedPullRequestQuery(String name) {+ for (NamedPullRequestQuery namedQuery: getSavedPullRequestQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }+public ArrayList<String> getIssueListFields() {return issueListFields;}@@ -885,6 +924,14 @@ public class Project extends AbstractEntity {this.issueQuerySettings = issueQuerySettings;}+ public Collection<PullRequestQuerySetting> getPullRequestQuerySettings() {+ return pullRequestQuerySettings;+ }++ public void setPullRequestQuerySettings(Collection<PullRequestQuerySetting> pullRequestQuerySettings) {+ this.pullRequestQuerySettings = pullRequestQuerySettings;+ }+public long getVersion() {return version;}@@ -1028,20 +1075,41 @@ public class Project extends AbstractEntity {return authors;}- @Nullablepublic IssueQuerySetting getIssueQuerySettingOfCurrentUser() {- if (issueQuerySettingOfCurrentUser == null) {- User currentUser = SecurityUtils.getUser();- if (currentUser != null)- issueQuerySettingOfCurrentUser = Optional.fromNullable(OneDev.getInstance(IssueQuerySettingManager.class).find(this, currentUser));- else- issueQuerySettingOfCurrentUser = Optional.absent();+ if (issueQuerySettingOfCurrentUserHolder == null) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ IssueQuerySetting setting = OneDev.getInstance(IssueQuerySettingManager.class).find(this, user);+ if (setting == null) {+ setting = new IssueQuerySetting();+ setting.setProject(this);+ setting.setUser(user);+ }+ issueQuerySettingOfCurrentUserHolder = Optional.of(setting);+ } else {+ issueQuerySettingOfCurrentUserHolder = Optional.absent();+ }}- return issueQuerySettingOfCurrentUser.orNull();+ return issueQuerySettingOfCurrentUserHolder.orNull();}- public void setIssueQuerySettingOfCurrentUser(IssueQuerySetting setting) {- issueQuerySettingOfCurrentUser = Optional.fromNullable(setting);+ @Nullable+ public PullRequestQuerySetting getPullRequestQuerySettingOfCurrentUser() {+ if (pullRequestQuerySettingOfCurrentUserHolder == null) {+ User user = SecurityUtils.getUser();+ if (user != null) {+ PullRequestQuerySetting setting = OneDev.getInstance(PullRequestQuerySettingManager.class).find(this, user);+ if (setting == null) {+ setting = new PullRequestQuerySetting();+ setting.setProject(this);+ setting.setUser(user);+ }+ pullRequestQuerySettingOfCurrentUserHolder = Optional.of(setting);+ } else {+ pullRequestQuerySettingOfCurrentUserHolder = Optional.absent();+ }+ }+ return pullRequestQuerySettingOfCurrentUserHolder.orNull();}@Nullablediff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex a622ff493a..b71d5ca88f 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -7,7 +7,9 @@ import java.util.Collection;import java.util.Collections;import java.util.Date;import java.util.HashSet;+import java.util.LinkedHashMap;import java.util.List;+import java.util.Map;import java.util.Optional;import java.util.UUID;import java.util.stream.Collectors;@@ -46,8 +48,9 @@ import io.onedev.server.event.pullrequest.PullRequestCodeCommentAdded;import io.onedev.server.event.pullrequest.PullRequestCodeCommentEvent;import io.onedev.server.git.GitUtils;import io.onedev.server.manager.PullRequestManager;-import io.onedev.server.manager.VisitManager;+import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.support.CompareContext;+import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.LastActivity;import io.onedev.server.model.support.ProjectAndBranch;import io.onedev.server.model.support.Referenceable;@@ -72,8 +75,8 @@ import io.onedev.server.util.jackson.RestView;@Index(columnList="number"), @Index(columnList="g_targetProject_id"),@Index(columnList="g_sourceProject_id"), @Index(columnList="g_submitter_id"),@Index(columnList="headCommitHash"), @Index(columnList="PREVIEW_REQUEST_HEAD"),- @Index(columnList="closeDate"), @Index(columnList="closeStatus"),- @Index(columnList="g_closedBy_id"), @Index(columnList="closedByName")},+ @Index(columnList="CLOSE_DATE"), @Index(columnList="CLOSE_STATUS"),+ @Index(columnList="CLOSE_USER"), @Index(columnList="CLOSE_USER_NAME")},uniqueConstraints={@UniqueConstraint(columnNames={"g_targetProject_id", "number"})})public class PullRequest extends AbstractEntity implements Referenceable {@@ -83,6 +86,62 @@ public class PullRequest extends AbstractEntity implements Referenceable {public static final int MAX_CODE_COMMENTS = 1000;+ public static final Map<String, String> FIELD_PATHS = new LinkedHashMap<>();++ public static final String FIELD_NUMBER = "Number";++ public static final String FIELD_STATE = "State";++ public static final String FIELD_TARGET_BRANCH = "Target Branch";++ public static final String FIELD_SOURCE_PROJECT = "Source Project";++ public static final String FIELD_SOURCE_BRANCH = "Source Branch";++ public static final String FIELD_TITLE = "Title";++ public static final String FIELD_DESCRIPTION = "Description";++ public static final String FIELD_SUBMITTER = "Submitter";++ public static final String FIELD_SUBMIT_DATE = "Submit Date";++ public static final String FIELD_UPDATE_DATE = "Update Date";++ public static final String FIELD_CLOSE_DATE = "Close Date";++ public static final String FIELD_MERGE_STRATEGY = "Merge Strategy";++ public static final String PATH_CLOSE_STATUS = "closeInfo.status";++ public static final String PATH_CLOSE_USER = "closeInfo.user";++ public static final String PATH_LAST_MERGE_PREVIEW_MERGED = "lastMergePreview.merged";++ public static final String PATH_LAST_MERGE_PREVIEW_REQUEST_HEAD = "lastMergePreview.requestHead";++ public static final String PATH_ID = "id";++ public static final String STATE_OPEN = "Open";++ public static final String PATH_REVIEWS = "reviews";++ public static final String PATH_BUILDS = "builds";++ static {+ FIELD_PATHS.put(FIELD_NUMBER, "number");+ FIELD_PATHS.put(FIELD_TITLE, "title");+ FIELD_PATHS.put(FIELD_SUBMITTER, "submitter");+ FIELD_PATHS.put(FIELD_TARGET_BRANCH, "targetBranch");+ FIELD_PATHS.put(FIELD_SOURCE_PROJECT, "sourceProject");+ FIELD_PATHS.put(FIELD_SOURCE_BRANCH, "sourceBranch");+ FIELD_PATHS.put(FIELD_DESCRIPTION, "description");+ FIELD_PATHS.put(FIELD_SUBMIT_DATE, "submitDate");+ FIELD_PATHS.put(FIELD_UPDATE_DATE, "lastActivity.date");+ FIELD_PATHS.put(FIELD_CLOSE_DATE, "closeInfo.date");+ FIELD_PATHS.put(FIELD_MERGE_STRATEGY, "mergeStrategy");+ }+@Embeddedprivate CloseInfo closeInfo;@@ -149,7 +208,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {private String uuid = UUID.randomUUID().toString();private long number;-+@OneToMany(mappedBy="request", cascade=CascadeType.REMOVE)private Collection<PullRequestUpdate> updates = new ArrayList<>();@@ -366,6 +425,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {this.actions = actions;}+ @Overridepublic Collection<PullRequestWatch> getWatches() {return watches;}@@ -374,6 +434,22 @@ public class PullRequest extends AbstractEntity implements Referenceable {this.watches = watches;}+ @Override+ public EntityWatch getWatch(User user, boolean createIfNotExist) {+ if (createIfNotExist) {+ PullRequestWatch watch = (PullRequestWatch) super.getWatch(user, false);+ if (watch == null) {+ watch = new PullRequestWatch();+ watch.setRequest(this);+ watch.setUser(user);+ getWatches().add(watch);+ }+ return watch;+ } else {+ return super.getWatch(user, false);+ }+ }+public Collection<CodeCommentRelation> getCodeCommentRelations() {return codeCommentRelations;}@@ -397,7 +473,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {/*** Get last merge preview of this pull request. Note that this method may return an- * out dated merge preview. Refer to {@link this#getIntegrationPreview()}+ * outdated merge preview. Refer to {@link this#getIntegrationPreview()}* if you'd like to get an update-to-date merge preview** @return@@ -418,7 +494,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {** @return* update to date merge preview of this pull request, or <tt>null</tt> if- * the merge preview has not been calculated or out dated. In both cases,+ * the merge preview has not been calculated or outdated. In both cases,* it will trigger a re-calculation, and client should call this method later* to get the calculated result*/@@ -577,15 +653,6 @@ public class PullRequest extends AbstractEntity implements Referenceable {public void setReviews(Collection<PullRequestReview> reviews) {this.reviews = reviews;}-- @Nullable- public PullRequestWatch getWatch(User user) {- for (PullRequestWatch watch: getWatches()) {- if (watch.getUser().equals(user))- return watch;- }- return null;- }public String getNumberStr() {return numberStr;@@ -658,7 +725,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {public boolean isVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {- Date visitDate = OneDev.getInstance(VisitManager.class).getPullRequestVisitDate(user, this);+ Date visitDate = OneDev.getInstance(UserInfoManager.class).getPullRequestVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();} else {return true;@@ -668,7 +735,7 @@ public class PullRequest extends AbstractEntity implements Referenceable {public boolean isCodeCommentsVisitedAfter(Date date) {User user = SecurityUtils.getUser();if (user != null) {- Date visitDate = OneDev.getInstance(VisitManager.class).getPullRequestCodeCommentsVisitDate(user, this);+ Date visitDate = OneDev.getInstance(UserInfoManager.class).getPullRequestCodeCommentsVisitDate(user, this);return visitDate != null && visitDate.getTime()>date.getTime();} else {return true;@@ -676,11 +743,11 @@ public class PullRequest extends AbstractEntity implements Referenceable {}public boolean isMerged() {- return closeInfo != null && closeInfo.getCloseStatus() == CloseInfo.Status.MERGED;+ return closeInfo != null && closeInfo.getStatus() == CloseInfo.Status.MERGED;}public boolean isDiscarded() {- return closeInfo != null && closeInfo.getCloseStatus() == CloseInfo.Status.DISCARDED;+ return closeInfo != null && closeInfo.getStatus() == CloseInfo.Status.DISCARDED;}public boolean isMergeIntoTarget() {diff --git a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java b/core/src/main/java/io/onedev/server/model/PullRequestBuild.javaindex b904aa0f9b..f4e2227b2d 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestBuild.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestBuild.java@@ -17,6 +17,8 @@ public class PullRequestBuild extends AbstractEntity {private static final long serialVersionUID = 1L;+ public static final String PATH_BUILD = "build";+@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)private Configuration configuration;diff --git a/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.javanew file mode 100644index 0000000000..a533749164--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/PullRequestQuerySetting.java@@ -0,0 +1,93 @@+package io.onedev.server.model;++import java.util.ArrayList;+import java.util.LinkedHashMap;++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.model.support.QuerySetting;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;++@Entity+@Table(+ indexes={@Index(columnList="g_project_id"), @Index(columnList="g_user_id")},+ uniqueConstraints={@UniqueConstraint(columnNames={"g_project_id", "g_user_id"})}+)+public class PullRequestQuerySetting extends QuerySetting<NamedPullRequestQuery> {++ private static final long serialVersionUID = 1L;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private Project project;++ @ManyToOne(fetch=FetchType.LAZY)+ @JoinColumn(nullable=false)+ private User user;++ @Lob+ @Column(nullable=false, length=65535)+ private ArrayList<NamedPullRequestQuery> userQueries = new ArrayList<>();++ @Lob+ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> userQueryWatches = new LinkedHashMap<>();++ @Column(nullable=false, length=65535)+ private LinkedHashMap<String, Boolean> projectQueryWatches = new LinkedHashMap<>();++ @Override+ public Project getProject() {+ return project;+ }++ public void setProject(Project project) {+ this.project = project;+ }++ @Override+ public User getUser() {+ return user;+ }++ public void setUser(User user) {+ this.user = user;+ }++ @Override+ public ArrayList<NamedPullRequestQuery> getUserQueries() {+ return userQueries;+ }++ @Override+ public void setUserQueries(ArrayList<NamedPullRequestQuery> userQueries) {+ this.userQueries = userQueries;+ }++ @Override+ public LinkedHashMap<String, Boolean> getUserQueryWatches() {+ return userQueryWatches;+ }++ public void setUserQueryWatches(LinkedHashMap<String, Boolean> userQueryWatches) {+ this.userQueryWatches = userQueryWatches;+ }++ @Override+ public LinkedHashMap<String, Boolean> getProjectQueryWatches() {+ return projectQueryWatches;+ }++ public void setProjectQueryWatches(LinkedHashMap<String, Boolean> projectQueryWatches) {+ this.projectQueryWatches = projectQueryWatches;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/PullRequestReview.java b/core/src/main/java/io/onedev/server/model/PullRequestReview.javaindex 6f2051db39..69b3abad7c 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestReview.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestReview.java@@ -25,7 +25,13 @@ public class PullRequestReview extends AbstractEntity {private static final long serialVersionUID = 1L;- public static final String RESULT = "result";+ public static final String PATH_USER = "user";++ public static final String PATH_RESULT = "result";++ public static final String PATH_RESULT_APPROVED = "result.approved";++ public static final String PATH_EXCLUDE_DATE = "excludeDate";@ManyToOne(fetch=FetchType.LAZY)@JoinColumn(nullable=false)diff --git a/core/src/main/java/io/onedev/server/model/PullRequestWatch.java b/core/src/main/java/io/onedev/server/model/PullRequestWatch.javaindex f6bc0d9da6..94eff6a78b 100644--- a/core/src/main/java/io/onedev/server/model/PullRequestWatch.java+++ b/core/src/main/java/io/onedev/server/model/PullRequestWatch.java@@ -8,12 +8,14 @@ import javax.persistence.ManyToOne;import javax.persistence.Table;import javax.persistence.UniqueConstraint;+import io.onedev.server.model.support.EntityWatch;+@Entity@Table(indexes={@Index(columnList="g_request_id"), @Index(columnList="g_user_id")},uniqueConstraints={@UniqueConstraint(columnNames={"g_request_id", "g_user_id"})})-public class PullRequestWatch extends AbstractEntity {+public class PullRequestWatch extends EntityWatch {private static final long serialVersionUID = 1L;@@ -27,8 +29,6 @@ public class PullRequestWatch extends AbstractEntity {private boolean watching;- private boolean notified;-public PullRequest getRequest() {return request;}@@ -37,14 +37,7 @@ public class PullRequestWatch extends AbstractEntity {this.request = request;}- public boolean isNotified() {- return notified;- }-- public void setNotified(boolean notified) {- this.notified = notified;- }-+ @Overridepublic User getUser() {return user;}@@ -53,12 +46,19 @@ public class PullRequestWatch extends AbstractEntity {this.user = user;}+ @Overridepublic boolean isWatching() {return watching;}+ @Overridepublic void setWatching(boolean watching) {this.watching = watching;}+ @Override+ public AbstractEntity getEntity() {+ return request;+ }+}diff --git a/core/src/main/java/io/onedev/server/model/support/EntityWatch.java b/core/src/main/java/io/onedev/server/model/support/EntityWatch.javanew file mode 100644index 0000000000..5a3038a301--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/EntityWatch.java@@ -0,0 +1,21 @@+package io.onedev.server.model.support;++import javax.persistence.MappedSuperclass;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.User;++@MappedSuperclass+public abstract class EntityWatch extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public abstract AbstractEntity getEntity();++ public abstract User getUser();++ public abstract boolean isWatching();++ public abstract void setWatching(boolean watching);++}diff --git a/core/src/main/java/io/onedev/server/model/support/LastActivity.java b/core/src/main/java/io/onedev/server/model/support/LastActivity.javaindex 097849c6df..28618c3fbe 100644--- a/core/src/main/java/io/onedev/server/model/support/LastActivity.java+++ b/core/src/main/java/io/onedev/server/model/support/LastActivity.java@@ -6,9 +6,6 @@ import java.util.Date;import javax.annotation.Nullable;import javax.persistence.Column;import javax.persistence.Embeddable;-import javax.persistence.FetchType;-import javax.persistence.JoinColumn;-import javax.persistence.ManyToOne;import io.onedev.server.model.User;@@ -17,11 +14,7 @@ public class LastActivity implements Serializable {private static final long serialVersionUID = 1L;- @ManyToOne(fetch=FetchType.LAZY)- @JoinColumn(name="LAST_ACT_USER")- private User user;-- @Column(name="LAST_ACT_USER_NAME")+ @Column(name="LAST_ACT_USER")private String userName;@Column(name="LAST_ACT_ACTION")@@ -46,22 +39,17 @@ public class LastActivity implements Serializable {this.date = date.getTime();}- @Nullable- public User getUser() {- return user;- }-- public void setUser(User user) {- this.user = user;- }-@Nullablepublic String getUserName() {return userName;}- public void setUserName(String userName) {+ public void setUserName(@Nullable String userName) {this.userName = userName;}++ public void setUser(@Nullable User user) {+ userName = user!=null?user.getDisplayName():null;+ }}diff --git a/core/src/main/java/io/onedev/server/model/support/NamedQuery.java b/core/src/main/java/io/onedev/server/model/support/NamedQuery.javanew file mode 100644index 0000000000..3baf92a612--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/NamedQuery.java@@ -0,0 +1,14 @@+package io.onedev.server.model.support;++import java.io.Serializable;++import io.onedev.server.web.editable.annotation.Editable;++@Editable+public interface NamedQuery extends Serializable {++ String getName();++ String getQuery();++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/model/support/QuerySetting.java b/core/src/main/java/io/onedev/server/model/support/QuerySetting.javanew file mode 100644index 0000000000..a66b38937e--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/QuerySetting.java@@ -0,0 +1,73 @@+package io.onedev.server.model.support;++import java.util.ArrayList;+import java.util.LinkedHashMap;+import java.util.Map;++import javax.annotation.Nullable;+import javax.persistence.MappedSuperclass;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;++@MappedSuperclass+public abstract class QuerySetting<T extends NamedQuery> extends AbstractEntity {++ private static final long serialVersionUID = 1L;++ public abstract Project getProject();++ public abstract User getUser();++ public abstract ArrayList<T> getUserQueries();++ public abstract void setUserQueries(ArrayList<T> userQueries);++ public abstract LinkedHashMap<String, Boolean> getUserQueryWatches();++ public abstract LinkedHashMap<String, Boolean> getProjectQueryWatches();++ private WatchStatus getWatchStatus(Map<String, Boolean> watches, String name) {+ Boolean watching = watches.get(name);+ if (Boolean.TRUE.equals(watching))+ return WatchStatus.WATCH;+ else if (Boolean.FALSE.equals(watching))+ return WatchStatus.DO_NOT_WATCH;+ else+ return WatchStatus.DEFAULT;+ }++ private void setWatchStatus(Map<String, Boolean> watches, String name, WatchStatus watchStatus) {+ if (watchStatus != WatchStatus.DEFAULT)+ watches.put(name, watchStatus == WatchStatus.WATCH);+ else+ watches.remove(name);+ }++ public WatchStatus getProjectWatchStatus(T namedQuery) {+ return getWatchStatus(getProjectQueryWatches(), namedQuery.getName());+ }++ public WatchStatus getUserWatchStatus(T namedQuery) {+ return getWatchStatus(getUserQueryWatches(), namedQuery.getName());+ }++ public void setProjectWatchStatus(T namedQuery, WatchStatus watchStatus) {+ setWatchStatus(getProjectQueryWatches(), namedQuery.getName(), watchStatus);+ }++ public void setUserWatchStatus(T namedQuery, WatchStatus watchStatus) {+ setWatchStatus(getUserQueryWatches(), namedQuery.getName(), watchStatus);+ }++ @Nullable+ public T getUserQuery(String name) {+ for (T namedQuery: getUserQueries()) {+ if (namedQuery.getName().equals(name))+ return namedQuery;+ }+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/WatchStatus.java b/core/src/main/java/io/onedev/server/model/support/WatchStatus.javasimilarity index 85%rename from core/src/main/java/io/onedev/server/model/support/issue/WatchStatus.javarename to core/src/main/java/io/onedev/server/model/support/WatchStatus.javaindex e07591af3b..c4a98d07ad 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/WatchStatus.java+++ b/core/src/main/java/io/onedev/server/model/support/WatchStatus.java@@ -1,4 +1,4 @@-package io.onedev.server.model.support.issue;+package io.onedev.server.model.support;public enum WatchStatus {DEFAULT("Default"),diff --git a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.javaindex b6df36cb6f..c05e14882e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/IssueBoard.java@@ -107,7 +107,7 @@ public class IssueBoard implements Serializable {private static List<String> getIdentifyFieldChoices() {List<String> choices = new ArrayList<>();Project project = OneContext.get().getProject();- choices.add(Issue.STATE);+ choices.add(Issue.FIELD_STATE);for (InputSpec fieldSpec: project.getIssueWorkflow().getFieldSpecs()) {if (!fieldSpec.isAllowMultiple() && (fieldSpec instanceof ChoiceInput || fieldSpec instanceof UserChoiceInput || fieldSpec instanceof GroupChoiceInput))choices.add(fieldSpec.getName());@@ -120,7 +120,7 @@ public class IssueBoard implements Serializable {Map<String, String> choices = new LinkedHashMap<>();Project project = OneContext.get().getProject();String fieldName = (String) OneContext.get().getEditContext().getInputValue("identifyField");- if (Issue.STATE.equals(fieldName)) {+ if (Issue.FIELD_STATE.equals(fieldName)) {for (StateSpec state: project.getIssueWorkflow().getStateSpecs())choices.put(state.getName(), state.getName());} else if (fieldName != null) {@@ -149,7 +149,7 @@ public class IssueBoard implements Serializable {} catch (Exception e) {}}- if (getIdentifyField().equals(Issue.STATE)) {+ if (getIdentifyField().equals(Issue.FIELD_STATE)) {for (String column: getColumns()) {if (project.getIssueWorkflow().getStateSpec(column) == null)undefinedStates.add(column);@@ -169,7 +169,7 @@ public class IssueBoard implements Serializable {} catch (Exception e) {}}- if (getIdentifyField().equals(Issue.STATE)) {+ if (getIdentifyField().equals(Issue.FIELD_STATE)) {for (Map.Entry<String, UndefinedStateResolution> entry: resolutions.entrySet()) {int index = getColumns().indexOf(entry.getKey());if (index != -1)@@ -186,7 +186,7 @@ public class IssueBoard implements Serializable {} catch (Exception e) {}}- if (!Issue.STATE.equals(getIdentifyField())) {+ if (!Issue.FIELD_STATE.equals(getIdentifyField())) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(getIdentifyField());if (fieldSpec == null)undefinedFields.add(getIdentifyField());@@ -264,7 +264,7 @@ public class IssueBoard implements Serializable {}}- if (!getIdentifyField().equals(Issue.STATE)) {+ if (!getIdentifyField().equals(Issue.FIELD_STATE)) {for (String column: getColumns()) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(getIdentifyField());List<String> choices = fieldSpec.getPossibleValues();diff --git a/core/src/main/java/io/onedev/server/model/support/issue/NamedQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javasimilarity index 76%rename from core/src/main/java/io/onedev/server/model/support/issue/NamedQuery.javarename to core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.javaindex 10f149940e..696e1d6ca2 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/NamedQuery.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/NamedIssueQuery.java@@ -1,14 +1,13 @@package io.onedev.server.model.support.issue;-import java.io.Serializable;-import org.hibernate.validator.constraints.NotEmpty;+import io.onedev.server.model.support.NamedQuery;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.IssueQuery;@Editable-public class NamedQuery implements Serializable {+public class NamedIssueQuery implements NamedQuery {private static final long serialVersionUID = 1L;@@ -16,16 +15,17 @@ public class NamedQuery implements Serializable {private String query;- public NamedQuery(String name, String query) {+ public NamedIssueQuery(String name, String query) {this.name = name;this.query = query;}- public NamedQuery() {+ public NamedIssueQuery() {}@Editable@NotEmpty+ @Overridepublic String getName() {return name;}@@ -37,6 +37,7 @@ public class NamedQuery implements Serializable {@Editable@IssueQuery@NotEmpty+ @Overridepublic String getQuery() {return query;}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.javaindex e22c734d19..b5eafd2c57 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/AndCriteria.java@@ -11,9 +11,12 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.AndCriteriaHelper;+import io.onedev.server.util.query.ParensAware;+import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;-public class AndCriteria extends IssueCriteria {+public class AndCriteria extends IssueCriteria implements ParensAware {private static final long serialVersionUID = 1L;@@ -24,47 +27,23 @@ public class AndCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- List<Predicate> predicates = new ArrayList<>();- for (IssueCriteria criteria: criterias)- predicates.add(criteria.getPredicate(project, context));- return context.getBuilder().and(predicates.toArray(new Predicate[0]));+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ return new AndCriteriaHelper<Issue>(criterias).getPredicate(project, context);}@Overridepublic boolean matches(Issue issue) {- for (IssueCriteria criteria: criterias) {- if (!criteria.matches(issue))- return false;- }- return true;+ return new AndCriteriaHelper<Issue>(criterias).matches(issue);}@Overridepublic boolean needsLogin() {- for (IssueCriteria criteria: criterias) {- if (criteria.needsLogin())- return true;- }- return false;+ return new AndCriteriaHelper<Issue>(criterias).needsLogin();}@Overridepublic String toString() {- StringBuilder builder = new StringBuilder();- for (int i=0; i<criterias.size(); i++) {- IssueCriteria criteria = criterias.get(i);- if (i != 0)- builder.append(" and ");- if (criteria instanceof AndCriteria || criteria instanceof OrCriteria) {- builder.append("(");- builder.append(criteria.toString());- builder.append(")");- } else {- builder.append(criteria.toString());- }- }- return builder.toString().trim();+ return new AndCriteriaHelper<Issue>(criterias).toString();}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.javaindex 81f2a084ce..f8eea62b42 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/BooleanFieldCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class BooleanFieldCriteria extends FieldCriteria {@@ -16,29 +17,20 @@ public class BooleanFieldCriteria extends FieldCriteria {private final boolean value;- private final int operator;-- public BooleanFieldCriteria(String name, boolean value, int operator) {+ public BooleanFieldCriteria(String name, boolean value) {super(name);this.value = value;- this.operator = operator;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);- if (operator == IssueQueryLexer.Is)- return context.getBuilder().equal(attribute, String.valueOf(value));- else- return context.getBuilder().notEqual(attribute, String.valueOf(value));+ return context.getBuilder().equal(attribute, String.valueOf(value));}@Overridepublic boolean matches(Issue issue) {- if (operator == IssueQueryLexer.Is)- return Objects.equals(value, issue.getFieldValue(getFieldName()));- else- return !Objects.equals(value, issue.getFieldValue(getFieldName()));+ return Objects.equals(value, issue.getFieldValue(getFieldName()));}@Override@@ -48,13 +40,12 @@ public class BooleanFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(String.valueOf(value));}@Overridepublic void fill(Issue issue, Set<String> initedLists) {- if (operator == IssueQueryLexer.Is)- issue.setFieldValue(getFieldName(), value);+ issue.setFieldValue(getFieldName(), value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.javaindex 2898164e77..cc146d4ba3 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/ChoiceFieldCriteria.java@@ -14,6 +14,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;import io.onedev.server.util.inputspec.InputSpec;+import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;public class ChoiceFieldCriteria extends FieldCriteria {@@ -37,18 +38,13 @@ public class ChoiceFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Join<Issue, ?> join = context.getJoin(getFieldName());+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Join<?, ?> join = context.getJoin(getFieldName());if (allowMultiple) {- if (operator == IssueQueryLexer.Contains)- return context.getBuilder().equal(join.get(IssueFieldUnary.VALUE), value);- else- return context.getBuilder().notEqual(join.get(IssueFieldUnary.VALUE), value);+ return context.getBuilder().equal(join.get(IssueFieldUnary.VALUE), value);} else {if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(join.get(IssueFieldUnary.VALUE), value);- else if (operator == IssueQueryLexer.IsNot)- return context.getBuilder().notEqual(join.get(IssueFieldUnary.VALUE), value);else if (operator == IssueQueryLexer.IsGreaterThan)return context.getBuilder().greaterThan(join.get(IssueFieldUnary.ORDINAL), ordinal);else@@ -61,15 +57,10 @@ public class ChoiceFieldCriteria extends FieldCriteria {public boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());if (allowMultiple) {- if (operator == IssueQueryLexer.Contains)- return ((List<String>)fieldValue).contains(value);- else- return !((List<String>)fieldValue).contains(value);+ return ((List<String>)fieldValue).contains(value);} else {if (operator == IssueQueryLexer.Is)return Objects.equals(fieldValue, value);- else if (operator == IssueQueryLexer.IsNot)- return !Objects.equals(fieldValue, value);else if (operator == IssueQueryLexer.IsGreaterThan)return issue.getFieldOrdinal(getFieldName(), fieldValue) > ordinal;else@@ -112,22 +103,20 @@ public class ChoiceFieldCriteria extends FieldCriteria {@Overridepublic void fill(Issue issue, Set<String> initedLists) {if (allowMultiple) {- if (operator == IssueQueryLexer.Contains) {- List list;- if (!initedLists.contains(getFieldName())) {+ List list;+ if (!initedLists.contains(getFieldName())) {+ list = new ArrayList();+ issue.setFieldValue(getFieldName(), list);+ initedLists.add(getFieldName());+ } else {+ list = (List) issue.getFieldValue(getFieldName());+ if (list == null) {list = new ArrayList();issue.setFieldValue(getFieldName(), list);- initedLists.add(getFieldName());- } else {- list = (List) issue.getFieldValue(getFieldName());- if (list == null) {- list = new ArrayList();- issue.setFieldValue(getFieldName(), list);- }}- list.add(value);}- } else if (operator == IssueQueryLexer.Is) {+ list.add(value);+ } else {issue.setFieldValue(getFieldName(), value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.javaindex 8608aa7ba6..58fb7740e3 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/ClosedCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.workflow.StateSpec;+import io.onedev.server.util.query.QueryBuildContext;public class ClosedCriteria extends IssueCriteria {@@ -15,7 +16,7 @@ public class ClosedCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {return getCriteria(project).getPredicate(project, context);}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/CommentCountCriteria.javasimilarity index 60%rename from core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.javarename to core/src/main/java/io/onedev/server/model/support/issue/query/CommentCountCriteria.javaindex 97cff214da..effddff911 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/VotesCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/CommentCountCriteria.java@@ -5,8 +5,9 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;-public class VotesCriteria extends IssueCriteria {+public class CommentCountCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@@ -14,18 +15,16 @@ public class VotesCriteria extends IssueCriteria {private final int value;- public VotesCriteria(int value, int operator) {+ public CommentCountCriteria(int value, int operator) {this.operator = operator;this.value = value;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<Integer> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.VOTES));+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<Integer> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_COMMENT_COUNT));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);- else if (operator == IssueQueryLexer.IsNot)- return context.getBuilder().notEqual(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)return context.getBuilder().greaterThan(attribute, value);else@@ -35,13 +34,11 @@ public class VotesCriteria extends IssueCriteria {@Overridepublic boolean matches(Issue issue) {if (operator == IssueQueryLexer.Is)- return issue.getNumOfVotes() == value;- else if (operator == IssueQueryLexer.IsNot)- return issue.getNumOfVotes() != value;+ return issue.getCommentCount() == value;else if (operator == IssueQueryLexer.IsGreaterThan)- return issue.getNumOfVotes() > value;+ return issue.getCommentCount() > value;else- return issue.getNumOfVotes() < value;+ return issue.getCommentCount() < value;}@Override@@ -51,7 +48,7 @@ public class VotesCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.VOTES) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(Issue.FIELD_COMMENT_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.javaindex 2ded990633..7fb2e249a5 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/DateFieldCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class DateFieldCriteria extends FieldCriteria {@@ -27,8 +28,8 @@ public class DateFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Join<Issue, ?> join = context.getJoin(getFieldName());+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Join<?, ?> join = context.getJoin(getFieldName());if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(join.get(IssueFieldUnary.ORDINAL), value.getTime());elsediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.javaindex 142504a078..0f52ecca98 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionCriteria.java@@ -1,10 +1,12 @@package io.onedev.server.model.support.issue.query;+import javax.annotation.Nullable;import javax.persistence.criteria.Expression;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class DescriptionCriteria extends IssueCriteria {@@ -12,28 +14,25 @@ public class DescriptionCriteria extends IssueCriteria {private final String value;- private final int operator;-- public DescriptionCriteria(String value, int operator) {+ public DescriptionCriteria(@Nullable String value) {this.value = value;- this.operator = operator;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Expression<String> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.DESCRIPTION));- if (operator == IssueQueryLexer.Contains)+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Expression<String> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_DESCRIPTION));+ if (value != null)return context.getBuilder().like(attribute, "%" + value + "%");else- return context.getBuilder().notLike(attribute, "%" + value + "%");+ return context.getBuilder().isNull(attribute);}@Overridepublic boolean matches(Issue issue) {- if (operator == IssueQueryLexer.Contains)+ if (value != null)return issue.getDescription() != null && issue.getDescription().toLowerCase().contains(value.toLowerCase());else- return issue.getDescription() == null || !issue.getDescription().toLowerCase().contains(value.toLowerCase());+ return issue.getDescription() == null;}@Override@@ -43,7 +42,10 @@ public class DescriptionCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ if (value != null)+ return IssueQuery.quote(Issue.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.Contains) + " " + IssueQuery.quote(value);+ else+ return IssueQuery.quote(Issue.FIELD_DESCRIPTION) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.javadeleted file mode 100644index 177d80cec8..0000000000--- a/core/src/main/java/io/onedev/server/model/support/issue/query/DescriptionUnaryCriteria.java+++ /dev/null@@ -1,46 +0,0 @@-package io.onedev.server.model.support.issue.query;--import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;--import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;--public class DescriptionUnaryCriteria extends IssueCriteria {-- private static final long serialVersionUID = 1L;-- private final int operator;-- public DescriptionUnaryCriteria(int operator) {- this.operator = operator;- }-- @Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<?> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.DESCRIPTION));- if (operator == IssueQueryLexer.IsEmpty)- return context.getBuilder().isNull(attribute);- else- return context.getBuilder().isNotNull(attribute);- }-- @Override- public boolean matches(Issue issue) {- if (operator == IssueQueryLexer.IsEmpty)- return issue.getDescription() == null;- else- return issue.getDescription() != null;- }-- @Override- public boolean needsLogin() {- return true;- }-- @Override- public String toString() {- return IssueQuery.quote(Issue.DESCRIPTION) + " " + IssueQuery.getRuleName(operator);- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.javaindex a197c69790..728475dae0 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldCriteria.java@@ -24,7 +24,7 @@ public abstract class FieldCriteria extends IssueCriteria {@Overridepublic Collection<String> getUndefinedFields(Project project) {Set<String> undefinedFields = new HashSet<>();- if (!Issue.BUILTIN_FIELDS.containsKey(fieldName)+ if (!Issue.FIELD_PATHS.containsKey(fieldName)&& project.getIssueWorkflow().getFieldSpec(fieldName) == null) {undefinedFields.add(fieldName);}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldOperatorCriteria.javasimilarity index 70%rename from core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.javarename to core/src/main/java/io/onedev/server/model/support/issue/query/FieldOperatorCriteria.javaindex e8d860ee13..87f3c31778 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/FieldUnaryCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/FieldOperatorCriteria.java@@ -10,29 +10,26 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.query.QueryBuildContext;-public class FieldUnaryCriteria extends FieldCriteria {+public class FieldOperatorCriteria extends FieldCriteria {private static final long serialVersionUID = 1L;private final int operator;- public FieldUnaryCriteria(String name, int operator) {+ public FieldOperatorCriteria(String name, int operator) {super(name);this.operator = operator;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {Path<?> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.IsEmpty)return context.getBuilder().isNull(attribute);- else if (operator == IssueQueryLexer.IsNotEmpty)- return context.getBuilder().isNotNull(attribute);- else if (operator == IssueQueryLexer.IsMe)+ elsereturn context.getBuilder().equal(attribute, SecurityUtils.getUser().getName());- else- return context.getBuilder().notEqual(attribute, SecurityUtils.getUser().getName());}@Override@@ -40,17 +37,13 @@ public class FieldUnaryCriteria extends FieldCriteria {Object fieldValue = issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.IsEmpty)return fieldValue == null;- else if (operator == IssueQueryLexer.IsNotEmpty)- return fieldValue != null;- else if (operator == IssueQueryLexer.IsMe)- return Objects.equals(fieldValue, SecurityUtils.getUser().getName());else- return !Objects.equals(fieldValue, SecurityUtils.getUser().getName());+ return Objects.equals(fieldValue, SecurityUtils.getUser().getName());}@Overridepublic boolean needsLogin() {- return operator == IssueQueryLexer.IsMe || operator == IssueQueryLexer.IsNotMe;+ return operator == IssueQueryLexer.IsMe;}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.javaindex 47dad3a609..2f225d1d3f 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueCriteria.java@@ -1,6 +1,5 @@package io.onedev.server.model.support.issue.query;-import java.io.Serializable;import java.util.Collection;import java.util.HashSet;import java.util.List;@@ -11,13 +10,15 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.EntityCriteria;+import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;-public abstract class IssueCriteria implements Serializable {+public abstract class IssueCriteria extends EntityCriteria<Issue> {private static final long serialVersionUID = 1L;- public abstract Predicate getPredicate(Project project, QueryBuildContext context);+ public abstract Predicate getPredicate(Project project, QueryBuildContext<Issue> context);public final void fill(Issue issue) {fill(issue, new HashSet<>());@@ -26,12 +27,6 @@ public abstract class IssueCriteria implements Serializable {public void fill(Issue issue, Set<String> initedLists) {}- public abstract boolean matches(Issue issue);-- public abstract boolean needsLogin();-- public abstract String toString();-public Collection<String> getUndefinedStates(Project project) {return new HashSet<>();}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.javaindex 718efe86b2..6421636e03 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueFieldCriteria.java@@ -8,6 +8,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class IssueFieldCriteria extends FieldCriteria {@@ -15,30 +16,21 @@ public class IssueFieldCriteria extends FieldCriteria {private final long value;- private final int operator;-- public IssueFieldCriteria(String name, long value, int operator) {+ public IssueFieldCriteria(String name, long value) {super(name);this.value = value;- this.operator = operator;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {Path<Long> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);- if (operator == IssueQueryLexer.Is)- return context.getBuilder().equal(attribute, value);- else- return context.getBuilder().notEqual(attribute, value);+ return context.getBuilder().equal(attribute, value);}@Overridepublic boolean matches(Issue issue) {Object fieldValue = issue.getFieldValue(getFieldName());- if (operator == IssueQueryLexer.Is)- return Objects.equals(fieldValue, value);- else- return !Objects.equals(fieldValue, value);+ return Objects.equals(fieldValue, value);}@Override@@ -48,7 +40,7 @@ public class IssueFieldCriteria extends FieldCriteria {@Overridepublic String toString() {- return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(getFieldName()) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4 b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4index df2a679013..85c1aa7e3c 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.g4@@ -8,14 +8,14 @@ query;criteria- : Mine #MineCriteria- | Open #OpenCriteria- | Closed #ClosedCriteria- | criteriaField=Quoted WS+ operator=(IsMe|IsNotMe|IsEmpty|IsNotEmpty) #UnaryCriteria- | criteriaField=Quoted WS+ operator=(Is|IsNot|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains|DoesNotContain) WS+ criteriaValue=Quoted #ValueCriteria- | criteria WS+ And WS+ criteria #AndCriteria- | criteria WS+ Or WS+ criteria #OrCriteria- | LParens WS* criteria WS* RParens #BracedCriteria+ : operator=(Mine|Open|Closed|SubmittedByMe) #OperatorCriteria+ | SubmittedBy WS+ criteriaValue=Quoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(IsMe|IsEmpty) #FieldOperatorCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | criteria WS+ And WS+ criteria #AndCriteria+ | criteria WS+ Or WS+ criteria #OrCriteria+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria+ | LParens WS* criteria WS* RParens #ParensCriteria;order@@ -42,30 +42,26 @@ OrderBy: 'order' WS+ 'by';+SubmittedBy+ : 'submitted' WS+ 'by'+ ;++SubmittedByMe+ : 'submitted' WS+ 'by' WS+ 'me'+ ;+Is: 'is';-IsNot- : 'is' WS+ 'not'- ;-IsMe: 'is' WS+ 'me';-IsNotMe- : 'is' WS+ 'not' WS+ 'me'- ;-Contains: 'contains';-DoesNotContain- : 'does' WS+ 'not' WS+ 'contain'- ;-IsGreaterThan: 'is' WS+ 'greater' WS+ 'than';@@ -86,10 +82,6 @@ IsEmpty: 'is' WS+ 'empty';-IsNotEmpty- : 'is' WS+ 'not' WS+ 'empty'- ;-And: 'and';@@ -98,6 +90,10 @@ Or: 'or';+Not+ : 'not'+ ;+Asc: 'asc';diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.javaindex cb8a965869..a1c31a7805 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQuery.java@@ -1,6 +1,5 @@package io.onedev.server.model.support.issue.query;-import java.io.Serializable;import java.util.ArrayList;import java.util.Collection;import java.util.Date;@@ -10,8 +9,6 @@ import java.util.List;import java.util.Set;import javax.annotation.Nullable;-import javax.persistence.criteria.Path;-import javax.persistence.criteria.Root;import org.antlr.v4.runtime.ANTLRInputStream;import org.antlr.v4.runtime.BailErrorStrategy;@@ -19,9 +16,6 @@ import org.antlr.v4.runtime.BaseErrorListener;import org.antlr.v4.runtime.CommonTokenStream;import org.antlr.v4.runtime.RecognitionException;import org.antlr.v4.runtime.Recognizer;-import org.unbescape.java.JavaEscape;--import com.google.common.base.Splitter;import io.onedev.server.OneDev;import io.onedev.server.exception.OneException;@@ -30,17 +24,16 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.query.IssueQueryParser.AndCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.BracedCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.ClosedCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.CriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.MineCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.OpenCriteriaContext;+import io.onedev.server.model.support.issue.query.IssueQueryParser.FieldOperatorCriteriaContext;+import io.onedev.server.model.support.issue.query.IssueQueryParser.FieldOperatorValueCriteriaContext;+import io.onedev.server.model.support.issue.query.IssueQueryParser.NotCriteriaContext;+import io.onedev.server.model.support.issue.query.IssueQueryParser.OperatorCriteriaContext;+import io.onedev.server.model.support.issue.query.IssueQueryParser.OperatorValueCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.OrCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.OrderContext;+import io.onedev.server.model.support.issue.query.IssueQueryParser.ParensCriteriaContext;import io.onedev.server.model.support.issue.query.IssueQueryParser.QueryContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.UnaryCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueQueryParser.ValueCriteriaContext;-import io.onedev.server.model.support.issue.query.IssueSort.Direction;import io.onedev.server.util.DateUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;@@ -54,18 +47,20 @@ import io.onedev.server.util.inputspec.issuechoiceinput.IssueChoiceInput;import io.onedev.server.util.inputspec.numberinput.NumberInput;import io.onedev.server.util.inputspec.textinput.TextInput;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.EntitySort;+import io.onedev.server.util.query.EntitySort.Direction;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;-import io.onedev.utils.WordUtils;-public class IssueQuery implements Serializable {+public class IssueQuery extends EntityQuery<Issue> {private static final long serialVersionUID = 1L;private final IssueCriteria criteria;- private final List<IssueSort> sorts;+ private final List<EntitySort> sorts;- public IssueQuery(@Nullable IssueCriteria criteria, List<IssueSort> sorts) {+ public IssueQuery(@Nullable IssueCriteria criteria, List<EntitySort> sorts) {this.criteria = criteria;this.sorts = sorts;}@@ -79,32 +74,10 @@ public class IssueQuery implements Serializable {return criteria;}- public List<IssueSort> getSorts() {+ public List<EntitySort> getSorts() {return sorts;}- public static String getValue(String tokenText) {- String value = tokenText.substring(1);- return JavaEscape.unescapeJava(value.substring(0, value.length()-1));- }-- public static int getIntValue(String value) {- try {- return Integer.parseInt(value);- } catch (NumberFormatException e) {- throw new OneException("Invalid number: " + value);- }- }-- public static boolean getBooleanValue(String value) {- if (value.equals("true"))- return true;- else if (value.equals("false"))- return false;- else- throw new OneException("Invalid boolean: " + value);- }-public static IssueQuery parse(Project project, @Nullable String queryString, boolean validate) {if (queryString != null) {ANTLRInputStream is = new ANTLRInputStream(queryString);@@ -172,43 +145,52 @@ public class IssueQuery implements Serializable {}@Override- public IssueCriteria visitMineCriteria(MineCriteriaContext ctx) {- return new MineCriteria();- }-- @Override- public IssueCriteria visitOpenCriteria(OpenCriteriaContext ctx) {- return new OpenCriteria();- }-- @Override- public IssueCriteria visitClosedCriteria(ClosedCriteriaContext ctx) {- return new ClosedCriteria();+ public IssueCriteria visitOperatorCriteria(OperatorCriteriaContext ctx) {+ switch (ctx.operator.getType()) {+ case IssueQueryLexer.Mine:+ return new MineCriteria();+ case IssueQueryLexer.Open:+ return new OpenCriteria();+ case IssueQueryLexer.Closed:+ return new ClosedCriteria();+ case IssueQueryLexer.SubmittedByMe:+ return new SubmittedByMeCriteria();+ default:+ throw new OneException("Unexpected operator: " + ctx.operator.getText());+ }}@Override- public IssueCriteria visitUnaryCriteria(UnaryCriteriaContext ctx) {+ public IssueCriteria visitFieldOperatorCriteria(FieldOperatorCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted().getText());int operator = ctx.operator.getType();if (validate)checkField(project, fieldName, operator);- if (fieldName.equals(Issue.MILESTONE))- return new MilestoneUnaryCriteria(operator);- else if (fieldName.equals(Issue.DESCRIPTION))- return new DescriptionUnaryCriteria(operator);- else if (fieldName.equals(Issue.SUBMITTER))- return new SubmitterUnaryCriteria(operator);+ if (fieldName.equals(Issue.FIELD_MILESTONE))+ return new MilestoneCriteria(null);+ else if (fieldName.equals(Issue.FIELD_DESCRIPTION))+ return new DescriptionCriteria(null);+ else if (fieldName.equals(Issue.FIELD_SUBMITTER))+ return new SubmittedByMeCriteria();else- return new FieldUnaryCriteria(fieldName, operator);+ return new FieldOperatorCriteria(fieldName, operator);+ }++ public IssueCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {+ String value = getValue(ctx.Quoted().getText());+ User user = OneDev.getInstance(UserManager.class).findByName(value);+ if (user == null)+ throw new OneException("Unable to find user with login: " + value);+ return new SubmittedByCriteria(user);}@Override- public IssueCriteria visitBracedCriteria(BracedCriteriaContext ctx) {+ public IssueCriteria visitParensCriteria(ParensCriteriaContext ctx) {return visit(ctx.criteria());}@Override- public IssueCriteria visitValueCriteria(ValueCriteriaContext ctx) {+ public IssueCriteria visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {String fieldName = getValue(ctx.Quoted(0).getText());String value = getValue(ctx.Quoted(1).getText());int operator = ctx.operator.getType();@@ -221,18 +203,17 @@ public class IssueQuery implements Serializable {Date dateValue = DateUtils.parseRelaxed(value);if (dateValue == null)throw new OneException("Unrecognized date: " + value);- if (fieldName.equals(Issue.SUBMIT_DATE))+ if (fieldName.equals(Issue.FIELD_SUBMIT_DATE))return new SubmitDateCriteria(dateValue, value, operator);- else if (fieldName.equals(Issue.UPDATE_DATE))+ else if (fieldName.equals(Issue.FIELD_UPDATE_DATE))return new UpdateDateCriteria(dateValue, value, operator);elsereturn new DateFieldCriteria(fieldName, dateValue, value, operator);case IssueQueryLexer.Contains:- case IssueQueryLexer.DoesNotContain:- if (fieldName.equals(Issue.TITLE)) {- return new TitleCriteria(value, operator);- } else if (fieldName.equals(Issue.DESCRIPTION)) {- return new DescriptionCriteria(value, operator);+ if (fieldName.equals(Issue.FIELD_TITLE)) {+ return new TitleCriteria(value);+ } else if (fieldName.equals(Issue.FIELD_DESCRIPTION)) {+ return new DescriptionCriteria(value);} else {if (validate) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);@@ -247,31 +228,25 @@ public class IssueQuery implements Serializable {}}case IssueQueryLexer.Is:- case IssueQueryLexer.IsNot:- if (fieldName.equals(Issue.MILESTONE)) {- return new MilestoneCriteria(value, operator);- } else if (fieldName.equals(Issue.STATE)) {- return new StateCriteria(value, operator);- } else if (fieldName.equals(Issue.VOTES)) {- return new VotesCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.COMMENTS)) {- return new CommentsCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NUMBER)) {+ if (fieldName.equals(Issue.FIELD_MILESTONE)) {+ return new MilestoneCriteria(value);+ } else if (fieldName.equals(Issue.FIELD_STATE)) {+ return new StateCriteria(value);+ } else if (fieldName.equals(Issue.FIELD_VOTE_COUNT)) {+ return new VoteCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.FIELD_COMMENT_COUNT)) {+ return new CommentCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.FIELD_NUMBER)) {return new NumberCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.SUBMITTER)) {- User user = OneDev.getInstance(UserManager.class).findByName(value);- if (user == null)- throw new OneException("Unable to find user with login: " + value);- return new SubmitterCriteria(user, operator);} else {InputSpec field = project.getIssueWorkflow().getFieldSpec(fieldName);if (field instanceof IssueChoiceInput) {value = value.trim();if (value.startsWith("#"))value = value.substring(1);- return new IssueFieldCriteria(fieldName, getIntValue(value), operator);+ return new IssueFieldCriteria(fieldName, getIntValue(value));} else if (field instanceof BooleanInput) {- return new BooleanFieldCriteria(fieldName, getBooleanValue(value), operator);+ return new BooleanFieldCriteria(fieldName, getBooleanValue(value));} else if (field instanceof NumberInput) {return new NumberFieldCriteria(fieldName, getIntValue(value), operator);} else if (field instanceof ChoiceInput) {@@ -286,11 +261,11 @@ public class IssueQuery implements Serializable {}case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (fieldName.equals(Issue.VOTES)) {- return new VotesCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.COMMENTS)) {- return new CommentsCriteria(getIntValue(value), operator);- } else if (fieldName.equals(Issue.NUMBER)) {+ if (fieldName.equals(Issue.FIELD_VOTE_COUNT)) {+ return new VoteCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.FIELD_COMMENT_COUNT)) {+ return new CommentCountCriteria(getIntValue(value), operator);+ } else if (fieldName.equals(Issue.FIELD_NUMBER)) {return new NumberCriteria(getIntValue(value), operator);} else {if (validate) {@@ -326,20 +301,25 @@ public class IssueQuery implements Serializable {return new AndCriteria(childCriterias);}+ @Override+ public IssueCriteria visitNotCriteria(NotCriteriaContext ctx) {+ return new NotCriteria(visit(ctx.criteria()));+ }+}.visit(criteriaContext);} else {issueCriteria = null;}- List<IssueSort> issueSorts = new ArrayList<>();+ List<EntitySort> issueSorts = new ArrayList<>();for (OrderContext order: queryContext.order()) {String fieldName = getValue(order.Quoted().getText());if (validate- && !fieldName.equals(Issue.SUBMIT_DATE)- && !fieldName.equals(Issue.UPDATE_DATE)- && !fieldName.equals(Issue.VOTES)- && !fieldName.equals(Issue.COMMENTS)- && !fieldName.equals(Issue.NUMBER)) {+ && !fieldName.equals(Issue.FIELD_SUBMIT_DATE)+ && !fieldName.equals(Issue.FIELD_UPDATE_DATE)+ && !fieldName.equals(Issue.FIELD_VOTE_COUNT)+ && !fieldName.equals(Issue.FIELD_COMMENT_COUNT)+ && !fieldName.equals(Issue.FIELD_NUMBER)) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);if (!(fieldSpec instanceof ChoiceInput) && !(fieldSpec instanceof DateInput)&& !(fieldSpec instanceof NumberInput)) {@@ -347,7 +327,7 @@ public class IssueQuery implements Serializable {}}- IssueSort issueSort = new IssueSort();+ EntitySort issueSort = new EntitySort();issueSort.setField(fieldName);if (order.direction != null && order.direction.getText().equals("asc"))issueSort.setDirection(Direction.ASCENDING);@@ -368,43 +348,38 @@ public class IssueQuery implements Serializable {public static void checkField(Project project, String fieldName, int operator) {InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);- if (fieldSpec == null && !Issue.BUILTIN_FIELDS.containsKey(fieldName))+ if (fieldSpec == null && !Issue.FIELD_PATHS.containsKey(fieldName))throw new OneException("Field not found: " + fieldName);switch (operator) {case IssueQueryLexer.IsEmpty:- case IssueQueryLexer.IsNotEmpty:- if (Issue.BUILTIN_FIELDS.containsKey(fieldName) && !fieldName.equals(Issue.DESCRIPTION)- && !fieldName.equals(Issue.MILESTONE)) {+ if (Issue.FIELD_PATHS.containsKey(fieldName) && !fieldName.equals(Issue.FIELD_DESCRIPTION)+ && !fieldName.equals(Issue.FIELD_MILESTONE)) {throw newOperatorException(fieldName, operator);}break;case IssueQueryLexer.IsMe:- case IssueQueryLexer.IsNotMe:- if (!fieldName.equals(Issue.SUBMITTER) && !(fieldSpec instanceof UserChoiceInput))+ if (!(fieldSpec instanceof UserChoiceInput))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.IsBefore:case IssueQueryLexer.IsAfter:- if (!fieldName.equals(Issue.SUBMIT_DATE) && !fieldName.equals(Issue.UPDATE_DATE) && !(fieldSpec instanceof DateInput))+ if (!fieldName.equals(Issue.FIELD_SUBMIT_DATE) && !fieldName.equals(Issue.FIELD_UPDATE_DATE) && !(fieldSpec instanceof DateInput))throw newOperatorException(fieldName, operator);break;case IssueQueryLexer.Contains:- case IssueQueryLexer.DoesNotContain:- if (!fieldName.equals(Issue.TITLE)- && !fieldName.equals(Issue.DESCRIPTION)+ if (!fieldName.equals(Issue.FIELD_TITLE)+ && !fieldName.equals(Issue.FIELD_DESCRIPTION)&& !(fieldSpec instanceof TextInput)&& !(fieldSpec != null && fieldSpec.isAllowMultiple())) {throw newOperatorException(fieldName, operator);}break;case IssueQueryLexer.Is:- case IssueQueryLexer.IsNot:- if (!fieldName.equals(Issue.STATE)- && !fieldName.equals(Issue.VOTES)- && !fieldName.equals(Issue.COMMENTS)- && !fieldName.equals(Issue.SUBMITTER)- && !fieldName.equals(Issue.NUMBER)- && !fieldName.equals(Issue.MILESTONE)+ if (!fieldName.equals(Issue.FIELD_STATE)+ && !fieldName.equals(Issue.FIELD_VOTE_COUNT)+ && !fieldName.equals(Issue.FIELD_COMMENT_COUNT)+ && !fieldName.equals(Issue.FIELD_NUMBER)+ && !fieldName.equals(Issue.FIELD_MILESTONE)&& !(fieldSpec instanceof IssueChoiceInput)&& !(fieldSpec instanceof BooleanInput)&& !(fieldSpec instanceof NumberInput)@@ -417,9 +392,9 @@ public class IssueQuery implements Serializable {break;case IssueQueryLexer.IsLessThan:case IssueQueryLexer.IsGreaterThan:- if (!fieldName.equals(Issue.VOTES)- && !fieldName.equals(Issue.COMMENTS)- && !fieldName.equals(Issue.NUMBER)+ if (!fieldName.equals(Issue.FIELD_VOTE_COUNT)+ && !fieldName.equals(Issue.FIELD_COMMENT_COUNT)+ && !fieldName.equals(Issue.FIELD_NUMBER)&& !(fieldSpec instanceof NumberInput)&& !(fieldSpec instanceof ChoiceInput))throw newOperatorException(fieldName, operator);@@ -436,16 +411,11 @@ public class IssueQuery implements Serializable {}public static String getRuleName(int rule) {- return WordUtils.uncamel(IssueQueryLexer.ruleNames[rule-1]).toLowerCase();+ return getRuleName(IssueQueryLexer.ruleNames, rule);}public static int getOperator(String operatorName) {- for (int i=0; i<IssueQueryLexer.ruleNames.length; i++) {- String ruleName = IssueQueryLexer.ruleNames[i];- if (WordUtils.uncamel(ruleName).toLowerCase().equals(operatorName))- return i+1;- }- throw new OneException("Unable to find operator: " + operatorName);+ return getOperator(IssueQueryLexer.ruleNames, operatorName);}@Override@@ -457,7 +427,7 @@ public class IssueQuery implements Serializable {builder.append("all");if (!sorts.isEmpty()) {builder.append("order by ");- for (IssueSort sort: sorts)+ for (EntitySort sort: sorts)builder.append(sort.toString()).append(" ");}return builder.toString().trim();@@ -479,8 +449,8 @@ public class IssueQuery implements Serializable {Set<String> undefinedFields = new HashSet<>();if (criteria != null)undefinedFields.addAll(criteria.getUndefinedFields(project));- for (IssueSort sort: sorts) {- if (!Issue.BUILTIN_FIELDS.containsKey(sort.getField())+ for (EntitySort sort: sorts) {+ if (!Issue.FIELD_PATHS.containsKey(sort.getField())&& project.getIssueWorkflow().getFieldSpec(sort.getField()) == null) {undefinedFields.add(sort.getField());}@@ -491,7 +461,7 @@ public class IssueQuery implements Serializable {public void onRenameField(String oldField, String newField) {if (criteria != null)criteria.onRenameField(oldField, newField);- for (IssueSort sort: sorts) {+ for (EntitySort sort: sorts) {if (sort.getField().equals(oldField))sort.setField(newField);}@@ -500,7 +470,7 @@ public class IssueQuery implements Serializable {public boolean onDeleteField(String fieldName) {if (criteria != null && criteria.onDeleteField(fieldName))return true;- for (Iterator<IssueSort> it = sorts.iterator(); it.hasNext();) {+ for (Iterator<EntitySort> it = sorts.iterator(); it.hasNext();) {if (it.next().getField().equals(fieldName))it.remove();}@@ -523,29 +493,13 @@ public class IssueQuery implements Serializable {return criteria != null && criteria.onDeleteFieldValue(fieldName, fieldValue);}- public static String quote(String value) {- return "\"" + JavaEscape.escapeJava(value) + "\"";- }-- public static <T> Path<T> getPath(Root<Issue> root, String pathName) {- int index = pathName.indexOf('.');- if (index != -1) {- Path<T> path = root.get(pathName.substring(0, index));- for (String field: Splitter.on(".").split(pathName.substring(index+1)))- path = path.get(field);- return path;- } else {- return root.get(pathName);- }- }-public static IssueQuery merge(IssueQuery query1, IssueQuery query2) {List<IssueCriteria> criterias = new ArrayList<>();if (query1.getCriteria() != null)criterias.add(query1.getCriteria());if (query2.getCriteria() != null)criterias.add(query2.getCriteria());- List<IssueSort> sorts = new ArrayList<>();+ List<EntitySort> sorts = new ArrayList<>();sorts.addAll(query1.getSorts());sorts.addAll(query2.getSorts());return new IssueQuery(IssueCriteria.of(criterias), sorts);diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQueryBuildContext.java b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQueryBuildContext.javanew file mode 100644index 0000000000..62ed83983d--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/IssueQueryBuildContext.java@@ -0,0 +1,28 @@+package io.onedev.server.model.support.issue.query;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Root;++import io.onedev.server.model.Issue;+import io.onedev.server.util.query.QueryBuildContext;++public class IssueQueryBuildContext extends QueryBuildContext<Issue> {++ public IssueQueryBuildContext(Root<Issue> root, CriteriaBuilder builder) {+ super(root, builder);+ }++ @Override+ public Join<?, ?> newJoin(String joinPath) {+ if (joinPath.equals(Issue.FIELD_MILESTONE)) {+ return getRoot().join("milestone", JoinType.LEFT);+ } else {+ Join<Issue, ?> join = getRoot().join("fieldUnaries", JoinType.LEFT);+ join.on(getBuilder().equal(join.get("name"), joinPath));+ return join;+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.javaindex f21076ab49..51fbab4143 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneCriteria.java@@ -2,64 +2,59 @@ package io.onedev.server.model.support.issue.query;import java.util.Set;+import javax.annotation.Nullable;import javax.persistence.criteria.Path;import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class MilestoneCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;- private final int operator;-private final String value;- public MilestoneCriteria(String value, int operator) {- this.operator = operator;+ public MilestoneCriteria(@Nullable String value) {this.value = value;}- public int getOperator() {- return operator;- }-public String getValue() {return value;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<?> attribute = context.getJoin(Issue.MILESTONE).get(Milestone.NAME);- if (operator == IssueQueryLexer.Is)+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<?> attribute = context.getJoin(Issue.FIELD_MILESTONE).get(Milestone.NAME);+ if (value != null)return context.getBuilder().equal(attribute, value);- else- return context.getBuilder().notEqual(attribute, value);+ else+ return context.getBuilder().isNull(attribute);}@Overridepublic boolean matches(Issue issue) {- if (operator == IssueQueryLexer.Is)- return issue.getMilestone() != null && issue.getMilestone().getName().equals(value);- else- return issue.getMilestone() == null || !issue.getMilestone().getName().equals(value);+ return issue.getMilestone() != null && issue.getMilestone().getName().equals(value);}@Overridepublic boolean needsLogin() {- return operator == IssueQueryLexer.IsMe || operator == IssueQueryLexer.IsNotMe;+ return false;}@Overridepublic String toString() {- return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ if (value != null)+ return IssueQuery.quote(Issue.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);+ else+ return IssueQuery.quote(Issue.FIELD_MILESTONE) + " " + IssueQuery.getRuleName(IssueQueryLexer.IsEmpty);}@Overridepublic void fill(Issue issue, Set<String> initedLists) {- if (operator == IssueQueryLexer.Is)+ if (value != null)issue.setMilestone(issue.getProject().getMilestone(value));}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.javadeleted file mode 100644index e83d05355b..0000000000--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MilestoneUnaryCriteria.java+++ /dev/null@@ -1,47 +0,0 @@-package io.onedev.server.model.support.issue.query;--import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;--import io.onedev.server.model.Issue;-import io.onedev.server.model.Milestone;-import io.onedev.server.model.Project;--public class MilestoneUnaryCriteria extends IssueCriteria {-- private static final long serialVersionUID = 1L;-- private final int operator;-- public MilestoneUnaryCriteria(int operator) {- this.operator = operator;- }-- @Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<?> attribute = context.getJoin(Issue.MILESTONE).get(Milestone.NAME);- if (operator == IssueQueryLexer.IsEmpty)- return context.getBuilder().isNull(attribute);- else- return context.getBuilder().isNotNull(attribute);- }-- @Override- public boolean matches(Issue issue) {- if (operator == IssueQueryLexer.IsEmpty)- return issue.getMilestone() == null;- else- return issue.getMilestone() != null;- }-- @Override- public boolean needsLogin() {- return operator == IssueQueryLexer.IsMe || operator == IssueQueryLexer.IsNotMe;- }-- @Override- public String toString() {- return IssueQuery.quote(Issue.MILESTONE) + " " + IssueQuery.getRuleName(operator);- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.javaindex 6c41741e6c..198f900665 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/MineCriteria.java@@ -10,17 +10,18 @@ import io.onedev.server.model.Project;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.userchoiceinput.UserChoiceInput;+import io.onedev.server.util.query.QueryBuildContext;public class MineCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;private IssueCriteria getCriteria(Project project) {- IssueCriteria submitterCriteria = new SubmitterCriteria(SecurityUtils.getUser(), IssueQueryLexer.Is);+ IssueCriteria submitterCriteria = new SubmittedByCriteria(SecurityUtils.getUser());List<IssueCriteria> fieldCriterias = new ArrayList<>();for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {if (field instanceof UserChoiceInput) {- IssueCriteria fieldCriteria = new FieldUnaryCriteria(field.getName(), IssueQueryLexer.IsMe);+ IssueCriteria fieldCriteria = new FieldOperatorCriteria(field.getName(), IssueQueryLexer.IsMe);fieldCriterias.add(fieldCriteria);}}@@ -33,7 +34,7 @@ public class MineCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {return getCriteria(project).getPredicate(project, context);}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NotCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/NotCriteria.javanew file mode 100644index 0000000000..f5509a4477--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/NotCriteria.java@@ -0,0 +1,40 @@+package io.onedev.server.model.support.issue.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.util.query.NotCriteriaHelper;+import io.onedev.server.util.query.QueryBuildContext;++public class NotCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final IssueCriteria criteria;++ public NotCriteria(IssueCriteria criteria) {+ this.criteria = criteria;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ return new NotCriteriaHelper<Issue>(criteria).getPredicate(project, context);+ }++ @Override+ public boolean matches(Issue issue) {+ return new NotCriteriaHelper<Issue>(criteria).matches(issue);+ }++ @Override+ public boolean needsLogin() {+ return new NotCriteriaHelper<Issue>(criteria).needsLogin();+ }++ @Override+ public String toString() {+ return new NotCriteriaHelper<Issue>(criteria).toString();+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.javaindex e54a4b9f0e..eb37fca12d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class NumberCriteria extends IssueCriteria {@@ -20,12 +21,10 @@ public class NumberCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<Long> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.NUMBER));+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<Long> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_NUMBER));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);- else if (operator == IssueQueryLexer.IsNot)- return context.getBuilder().notEqual(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)return context.getBuilder().greaterThan(attribute, value);else@@ -36,8 +35,6 @@ public class NumberCriteria extends IssueCriteria {public boolean matches(Issue issue) {if (operator == IssueQueryLexer.Is)return issue.getNumber() == value;- else if (operator == IssueQueryLexer.IsNot)- return issue.getNumber() != value;else if (operator == IssueQueryLexer.IsGreaterThan)return issue.getNumber() > value;else@@ -51,7 +48,7 @@ public class NumberCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.NUMBER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(Issue.FIELD_NUMBER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.javaindex eaa9effcfb..7e21e76c40 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/NumberFieldCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class NumberFieldCriteria extends FieldCriteria {@@ -25,12 +26,10 @@ public class NumberFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {Path<Integer> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.ORDINAL);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);- else if (operator == IssueQueryLexer.IsNot)- return context.getBuilder().notEqual(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)return context.getBuilder().greaterThan(attribute, value);else@@ -42,8 +41,6 @@ public class NumberFieldCriteria extends FieldCriteria {Integer fieldValue = (Integer) issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.Is)return Objects.equals(fieldValue, value);- else if (operator == IssueQueryLexer.IsNot)- return !Objects.equals(fieldValue, value);else if (operator == IssueQueryLexer.IsGreaterThan)return fieldValue != null && fieldValue > value;else@@ -62,8 +59,7 @@ public class NumberFieldCriteria extends FieldCriteria {@Overridepublic void fill(Issue issue, Set<String> initedLists) {- if (operator == IssueQueryLexer.Is)- issue.setFieldValue(getFieldName(), value);+ issue.setFieldValue(getFieldName(), value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.javaindex 59f98b4ff3..37b391a6c2 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/OpenCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.workflow.StateSpec;+import io.onedev.server.util.query.QueryBuildContext;public class OpenCriteria extends IssueCriteria {@@ -15,7 +16,7 @@ public class OpenCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {return getCriteria(project).getPredicate(project, context);}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.javaindex c5f40a3fcb..60417a173b 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/OrCriteria.java@@ -11,9 +11,12 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.OrCriteriaHelper;+import io.onedev.server.util.query.ParensAware;+import io.onedev.server.util.query.QueryBuildContext;import io.onedev.server.web.page.project.issues.workflowreconcile.UndefinedFieldValue;-public class OrCriteria extends IssueCriteria {+public class OrCriteria extends IssueCriteria implements ParensAware {private static final long serialVersionUID = 1L;@@ -24,47 +27,23 @@ public class OrCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- List<Predicate> predicates = new ArrayList<>();- for (IssueCriteria criteria: criterias)- predicates.add(criteria.getPredicate(project, context));- return context.getBuilder().or(predicates.toArray(new Predicate[0]));+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ return new OrCriteriaHelper<Issue>(criterias).getPredicate(project, context);}@Overridepublic boolean matches(Issue issue) {- for (IssueCriteria criteria: criterias) {- if (criteria.matches(issue))- return true;- }- return false;+ return new OrCriteriaHelper<Issue>(criterias).matches(issue);}@Overridepublic boolean needsLogin() {- for (IssueCriteria criteria: criterias) {- if (criteria.needsLogin())- return true;- }- return false;+ return new OrCriteriaHelper<Issue>(criterias).needsLogin();}@Overridepublic String toString() {- StringBuilder builder = new StringBuilder();- for (int i=0; i<criterias.size(); i++) {- IssueCriteria criteria = criterias.get(i);- if (i != 0)- builder.append(" or ");- if (criteria instanceof AndCriteria || criteria instanceof OrCriteria) {- builder.append("(");- builder.append(criteria.toString());- builder.append(")");- } else {- builder.append(criteria.toString());- }- }- return builder.toString().trim();+ return new OrCriteriaHelper<Issue>(criterias).toString();}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java b/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.javadeleted file mode 100644index 482573dafb..0000000000--- a/core/src/main/java/io/onedev/server/model/support/issue/query/QueryBuildContext.java+++ /dev/null@@ -1,49 +0,0 @@-package io.onedev.server.model.support.issue.query;--import java.util.HashMap;-import java.util.Map;--import javax.persistence.criteria.CriteriaBuilder;-import javax.persistence.criteria.Join;-import javax.persistence.criteria.JoinType;-import javax.persistence.criteria.Root;--import io.onedev.server.model.Issue;--public class QueryBuildContext {-- private final Root<Issue> root;-- private final CriteriaBuilder builder;-- private Map<String, Join<Issue, ?>> joins = new HashMap<>();-- public QueryBuildContext(Root<Issue> root, CriteriaBuilder builder) {- this.root = root;- this.builder = builder;- }-- public Join<Issue, ?> getJoin(String fieldName) {- Join<Issue, ?> join = joins.get(fieldName);- if (join == null) {- if (fieldName.equals(Issue.MILESTONE)) {- join = root.join("milestone", JoinType.LEFT);- joins.put(fieldName, join);- } else {- join = root.join("fieldUnaries", JoinType.LEFT);- join.on(builder.equal(join.get("name"), fieldName));- joins.put(fieldName, join);- }- }- return join;- }-- public Root<Issue> getRoot() {- return root;- }-- public CriteriaBuilder getBuilder() {- return builder;- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.javaindex b4bc56aab7..a219c8aaad 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/StateCriteria.java@@ -10,6 +10,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class StateCriteria extends IssueCriteria {@@ -17,28 +18,19 @@ public class StateCriteria extends IssueCriteria {private String value;- private int operator;-- public StateCriteria(String value, int operator) {+ public StateCriteria(String value) {this.value = value;- this.operator = operator;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<?> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.STATE));- if (operator == IssueQueryLexer.Is)- return context.getBuilder().equal(attribute, value);- else- return context.getBuilder().notEqual(attribute, value);+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<?> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_STATE));+ return context.getBuilder().equal(attribute, value);}@Overridepublic boolean matches(Issue issue) {- if (operator == IssueQueryLexer.Is)- return issue.getState().equals(value);- else- return !issue.getState().equals(value);+ return issue.getState().equals(value);}@Override@@ -48,13 +40,12 @@ public class StateCriteria extends IssueCriteria {@Overridepublic void fill(Issue issue, Set<String> initedLists) {- if (operator == IssueQueryLexer.Is)- issue.setState(value);+ issue.setState(value);}@Overridepublic String toString() {- return IssueQuery.quote(Issue.STATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(Issue.FIELD_STATE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.javaindex 76697633a8..0baff5b11e 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/StringFieldCriteria.java@@ -9,6 +9,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueFieldUnary;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class StringFieldCriteria extends FieldCriteria {@@ -29,16 +30,12 @@ public class StringFieldCriteria extends FieldCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {Path<String> attribute = context.getJoin(getFieldName()).get(IssueFieldUnary.VALUE);if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);- else if (operator == IssueQueryLexer.IsNot)- return context.getBuilder().notEqual(attribute, value);- else if (operator == IssueQueryLexer.Contains)+ elsereturn context.getBuilder().like(attribute, "%" + value + "%");- else- return context.getBuilder().notLike(attribute, "%" + value + "%");}@Override@@ -46,12 +43,8 @@ public class StringFieldCriteria extends FieldCriteria {String fieldValue = (String) issue.getFieldValue(getFieldName());if (operator == IssueQueryLexer.Is)return Objects.equals(fieldValue, value);- else if (operator == IssueQueryLexer.IsNot)- return !Objects.equals(fieldValue, value);- else if (operator == IssueQueryLexer.Contains)+ elsereturn fieldValue != null && fieldValue.toLowerCase().contains(value.toLowerCase());- else- return fieldValue == null || !fieldValue.toLowerCase().contains(value.toLowerCase());}@Override@@ -66,8 +59,7 @@ public class StringFieldCriteria extends FieldCriteria {@Overridepublic void fill(Issue issue, Set<String> initedLists) {- if (operator == IssueQueryLexer.Is)- issue.setFieldValue(getFieldName(), value);+ issue.setFieldValue(getFieldName(), value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.javaindex bd5f902837..43e8b34a4d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitDateCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class SubmitDateCriteria extends IssueCriteria {@@ -25,8 +26,8 @@ public class SubmitDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<Long> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.SUBMIT_DATE));+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<Long> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMIT_DATE));if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value.getTime());else@@ -48,7 +49,7 @@ public class SubmitDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.SUBMIT_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(Issue.FIELD_SUBMIT_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByCriteria.javanew file mode 100644index 0000000000..60333fa956--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.model.support.issue.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.util.query.QueryBuildContext;++public class SubmittedByCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ private final User value;++ public SubmittedByCriteria(User value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<User> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMITTER));+ return context.getBuilder().equal(attribute, value);+ }++ @Override+ public boolean matches(Issue issue) {+ return Objects.equals(issue.getSubmitter(), value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + IssueQuery.quote(value.getName());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByMeCriteria.javanew file mode 100644index 0000000000..db901d00ee--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmittedByMeCriteria.java@@ -0,0 +1,39 @@+package io.onedev.server.model.support.issue.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.query.QueryBuildContext;++public class SubmittedByMeCriteria extends IssueCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<User> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_SUBMITTER));+ return context.getBuilder().equal(attribute, SecurityUtils.getUser());+ }++ @Override+ public boolean matches(Issue issue) {+ return Objects.equals(issue.getSubmitter(), SecurityUtils.getUser());+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return IssueQuery.getRuleName(IssueQueryLexer.SubmittedByMe);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterCriteria.javadeleted file mode 100644index c0602ac821..0000000000--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterCriteria.java+++ /dev/null@@ -1,52 +0,0 @@-package io.onedev.server.model.support.issue.query;--import java.util.Objects;--import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;--import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.model.User;--public class SubmitterCriteria extends IssueCriteria {-- private static final long serialVersionUID = 1L;-- private final User value;-- private final int operator;-- public SubmitterCriteria(User value, int operator) {- this.value = value;- this.operator = operator;- }-- @Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<User> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.SUBMITTER));- if (operator == IssueQueryLexer.Is)- return context.getBuilder().equal(attribute, value);- else- return context.getBuilder().notEqual(attribute, value);- }-- @Override- public boolean matches(Issue issue) {- if (operator == IssueQueryLexer.Is)- return Objects.equals(issue.getSubmitter(), value);- else- return !Objects.equals(issue.getSubmitter(), value);- }-- @Override- public boolean needsLogin() {- return false;- }-- @Override- public String toString() {- return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value.getName());- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterUnaryCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterUnaryCriteria.javadeleted file mode 100644index 6cbec4cd2e..0000000000--- a/core/src/main/java/io/onedev/server/model/support/issue/query/SubmitterUnaryCriteria.java+++ /dev/null@@ -1,49 +0,0 @@-package io.onedev.server.model.support.issue.query;--import java.util.Objects;--import javax.persistence.criteria.Path;-import javax.persistence.criteria.Predicate;--import io.onedev.server.model.Issue;-import io.onedev.server.model.Project;-import io.onedev.server.security.SecurityUtils;--public class SubmitterUnaryCriteria extends IssueCriteria {-- private static final long serialVersionUID = 1L;-- private final int operator;-- public SubmitterUnaryCriteria(int operator) {- this.operator = operator;- }-- @Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<?> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.SUBMITTER));- if (operator == IssueQueryLexer.IsMe)- return context.getBuilder().equal(attribute, SecurityUtils.getUser());- else- return context.getBuilder().notEqual(attribute, SecurityUtils.getUser());- }-- @Override- public boolean matches(Issue issue) {- if (operator == IssueQueryLexer.IsMe)- return Objects.equals(issue.getSubmitter(), SecurityUtils.getUser());- else- return !Objects.equals(issue.getSubmitter(), SecurityUtils.getUser());- }-- @Override- public boolean needsLogin() {- return true;- }-- @Override- public String toString() {- return IssueQuery.quote(Issue.SUBMITTER) + " " + IssueQuery.getRuleName(operator);- }--}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.javaindex c70cbaa73f..86b84b6624 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/TitleCriteria.java@@ -5,6 +5,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class TitleCriteria extends IssueCriteria {@@ -12,28 +13,19 @@ public class TitleCriteria extends IssueCriteria {private final String value;- private final int operator;-- public TitleCriteria(String value, int operator) {+ public TitleCriteria(String value) {this.value = value;- this.operator = operator;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<String> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.TITLE));- if (operator == IssueQueryLexer.Contains)- return context.getBuilder().like(attribute, "%" + value + "%");- else- return context.getBuilder().notLike(attribute, "%" + value + "%");+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<String> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_TITLE));+ return context.getBuilder().like(attribute, "%" + value + "%");}@Overridepublic boolean matches(Issue issue) {- if (operator == IssueQueryLexer.Contains)- return issue.getTitle().toLowerCase().contains(value);- else- return !issue.getTitle().toLowerCase().contains(value);+ return issue.getTitle().toLowerCase().contains(value);}@Override@@ -43,7 +35,7 @@ public class TitleCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.TITLE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(value);+ return IssueQuery.quote(Issue.FIELD_TITLE) + " " + IssueQuery.getRuleName(IssueQueryLexer.Is) + " " + IssueQuery.quote(value);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.javaindex 19e6c18d26..6296bafaa7 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/UpdateDateCriteria.java@@ -7,6 +7,7 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;public class UpdateDateCriteria extends IssueCriteria {@@ -25,8 +26,8 @@ public class UpdateDateCriteria extends IssueCriteria {}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<Long> attribute = IssueQuery.getPath(context.getRoot(), Issue.BUILTIN_FIELDS.get(Issue.UPDATE_DATE));+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<Long> attribute = IssueQuery.getPath(context.getRoot(), Issue.FIELD_PATHS.get(Issue.FIELD_UPDATE_DATE));if (operator == IssueQueryLexer.IsBefore)return context.getBuilder().lessThan(attribute, value.getTime());else@@ -48,7 +49,7 @@ public class UpdateDateCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.UPDATE_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);+ return IssueQuery.quote(Issue.FIELD_UPDATE_DATE) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(rawValue);}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java b/core/src/main/java/io/onedev/server/model/support/issue/query/VoteCountCriteria.javasimilarity index 59%rename from core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.javarename to core/src/main/java/io/onedev/server/model/support/issue/query/VoteCountCriteria.javaindex b526b218ee..5246527fa0 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/CommentsCriteria.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/query/VoteCountCriteria.java@@ -5,8 +5,9 @@ import javax.persistence.criteria.Predicate;import io.onedev.server.model.Issue;import io.onedev.server.model.Project;+import io.onedev.server.util.query.QueryBuildContext;-public class CommentsCriteria extends IssueCriteria {+public class VoteCountCriteria extends IssueCriteria {private static final long serialVersionUID = 1L;@@ -14,18 +15,16 @@ public class CommentsCriteria extends IssueCriteria {private final int value;- public CommentsCriteria(int value, int operator) {+ public VoteCountCriteria(int value, int operator) {this.operator = operator;this.value = value;}@Override- public Predicate getPredicate(Project project, QueryBuildContext context) {- Path<Integer> attribute = context.getRoot().get(Issue.BUILTIN_FIELDS.get(Issue.COMMENTS));+ public Predicate getPredicate(Project project, QueryBuildContext<Issue> context) {+ Path<Integer> attribute = context.getRoot().get(Issue.FIELD_PATHS.get(Issue.FIELD_VOTE_COUNT));if (operator == IssueQueryLexer.Is)return context.getBuilder().equal(attribute, value);- else if (operator == IssueQueryLexer.IsNot)- return context.getBuilder().notEqual(attribute, value);else if (operator == IssueQueryLexer.IsGreaterThan)return context.getBuilder().greaterThan(attribute, value);else@@ -35,13 +34,11 @@ public class CommentsCriteria extends IssueCriteria {@Overridepublic boolean matches(Issue issue) {if (operator == IssueQueryLexer.Is)- return issue.getNumOfComments() == value;- else if (operator == IssueQueryLexer.IsNot)- return issue.getNumOfComments() != value;+ return issue.getVoteCount() == value;else if (operator == IssueQueryLexer.IsGreaterThan)- return issue.getNumOfComments() > value;+ return issue.getVoteCount() > value;else- return issue.getNumOfComments() < value;+ return issue.getVoteCount() < value;}@Override@@ -51,7 +48,7 @@ public class CommentsCriteria extends IssueCriteria {@Overridepublic String toString() {- return IssueQuery.quote(Issue.COMMENTS) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));+ return IssueQuery.quote(Issue.FIELD_VOTE_COUNT) + " " + IssueQuery.getRuleName(operator) + " " + IssueQuery.quote(String.valueOf(value));}}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.javaindex 519d0b5ad5..440e4ff54d 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java+++ b/core/src/main/java/io/onedev/server/model/support/issue/workflow/IssueWorkflow.java@@ -17,7 +17,6 @@ import io.onedev.server.exception.OneException;import io.onedev.server.model.Issue;import io.onedev.server.model.support.authorized.ProjectWriters;import io.onedev.server.model.support.issue.query.IssueCriteria;-import io.onedev.server.model.support.issue.query.IssueQueryLexer;import io.onedev.server.model.support.issue.query.OrCriteria;import io.onedev.server.model.support.issue.query.StateCriteria;import io.onedev.server.model.support.issue.workflow.action.PressButton;@@ -306,7 +305,7 @@ public class IssueWorkflow implements Serializable {@Nullablepublic InputSpec getFieldSpec(String fieldName) {- if (fieldName.equals(Issue.STATE))+ if (fieldName.equals(Issue.FIELD_STATE))return getFieldSpecOfState();elsereturn getFieldSpecMap().get(fieldName);@@ -406,7 +405,7 @@ public class IssueWorkflow implements Serializable {public InputSpec getFieldSpecOfState() {ChoiceInput inputSpec = new ChoiceInput();- inputSpec.setName(Issue.STATE);+ inputSpec.setName(Issue.FIELD_STATE);inputSpec.setAllowEmpty(false);SpecifiedChoices choicesProvider = new SpecifiedChoices();for (StateSpec stateSpec: getStateSpecs()) {@@ -423,7 +422,7 @@ public class IssueWorkflow implements Serializable {List<IssueCriteria> criterias = new ArrayList<>();for (StateSpec state: getStateSpecs()) {if (category == state.getCategory())- criterias.add(new StateCriteria(state.getName(), IssueQueryLexer.Is));+ criterias.add(new StateCriteria(state.getName()));}return new OrCriteria(criterias);}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.javaindex da2ee41999..6559693f7b 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/CloseInfo.java@@ -3,10 +3,13 @@ package io.onedev.server.model.support.pullrequest;import java.io.Serializable;import java.util.Date;+import javax.persistence.Column;import javax.persistence.Embeddable;import javax.persistence.FetchType;+import javax.persistence.JoinColumn;import javax.persistence.ManyToOne;+import org.apache.commons.lang3.text.WordUtils;import org.hibernate.annotations.OptimisticLock;import io.onedev.server.model.User;@@ -16,51 +19,63 @@ public class CloseInfo implements Serializable {private static final long serialVersionUID = 1L;- public enum Status {MERGED, DISCARDED};+ public enum Status {+ MERGED, DISCARDED;++ @Override+ public String toString() {+ return WordUtils.capitalize(name().toLowerCase());+ }++ };@OptimisticLock(excluded=true)@ManyToOne(fetch=FetchType.LAZY)- private User closedBy;+ @JoinColumn(name="CLOSE_USER")+ private User user;@OptimisticLock(excluded=true)- private String closedByName;+ @Column(name="CLOSE_USER_NAME")+ private String userName;@OptimisticLock(excluded=true)- private Date closeDate;+ @Column(name="CLOSE_DATE")+ private Date date;@OptimisticLock(excluded=true)- private Status closeStatus;+ @Column(name="CLOSE_STATUS")+ private Status status;- public User getClosedBy() {- return closedBy;+ public User getUser() {+ return user;}- public void setClosedBy(User closedBy) {- this.closedBy = closedBy;+ public void setUser(User user) {+ this.user = user;}- public String getClosedByName() {- return closedByName;+ public String getUserName() {+ return userName;}- public void setClosedByName(String closedByName) {- this.closedByName = closedByName;+ public void setUserName(String userName) {+ this.userName = userName;}- public Date getCloseDate() {- return closeDate;+ public Date getDate() {+ return date;}- public void setCloseDate(Date closeDate) {- this.closeDate = closeDate;+ public void setDate(Date date) {+ this.date = date;}- public Status getCloseStatus() {- return closeStatus;+ public Status getStatus() {+ return status;}- public void setCloseStatus(Status closeStatus) {- this.closeStatus = closeStatus;+ public void setStatus(Status status) {+ this.status = status;}}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.javaindex e62dbae02b..a62a0f65e7 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/MergeStrategy.java@@ -7,12 +7,17 @@ import org.eclipse.jgit.lib.PersonIdent;import org.eclipse.jgit.lib.Repository;import io.onedev.server.OneDev;+import io.onedev.server.exception.OneException;import io.onedev.server.git.GitUtils;import io.onedev.server.model.PullRequest;public enum MergeStrategy {- ALWAYS_MERGE("Create Merge Commit",- "Add all commits from source branch to target branch with a merge commit.") {+ ALWAYS_MERGE("Add all commits from source branch to target branch with a merge commit.") {++ @Override+ public String toString() {+ return "Create Merge Commit";+ }@Overridepublic ObjectId merge(PullRequest request) {@@ -25,8 +30,12 @@ public enum MergeStrategy {}},- MERGE_IF_NECESSARY("Create Merge Commit If Necessary",- "Only create merge commit if target branch can not be fast-forwarded to source branch") {+ MERGE_IF_NECESSARY("Only create merge commit if target branch can not be fast-forwarded to source branch") {++ @Override+ public String toString() {+ return "Create Merge Commit If Necessary";+ }@Overridepublic ObjectId merge(PullRequest request) {@@ -43,8 +52,12 @@ public enum MergeStrategy {}},- SQUASH_MERGE("Squash Source Branch Commits",- "Squash all commits from source branch into a single commit in target branch") {+ SQUASH_MERGE("Squash all commits from source branch into a single commit in target branch") {++ @Override+ public String toString() {+ return "Squash Source Branch Commits";+ }@Overridepublic ObjectId merge(PullRequest request) {@@ -57,7 +70,12 @@ public enum MergeStrategy {}},- REBASE_MERGE("Rebase Source Branch Commits", "Rebase all commits from source branch onto target branch") {+ REBASE_MERGE("Rebase all commits from source branch onto target branch") {++ @Override+ public String toString() {+ return "Rebase Source Branch Commits";+ }@Overridepublic ObjectId merge(PullRequest request) {@@ -69,7 +87,12 @@ public enum MergeStrategy {}},- DO_NOT_MERGE("Do Not Merge", "Do not merge now, only for review") {+ DO_NOT_MERGE("Do not merge now, only for review") {++ @Override+ public String toString() {+ return "Do Not Merge";+ }@Overridepublic ObjectId merge(PullRequest request) {@@ -78,28 +101,24 @@ public enum MergeStrategy {};- private final String displayName;-private final String description;- MergeStrategy(String displayName, String description) {- this.displayName = displayName;+ MergeStrategy(String description) {this.description = description;}- public String getDisplayName() {- return displayName;- }-public String getDescription() {return description;}-- @Override- public String toString() {- return displayName;- }+ public static MergeStrategy from(String displayName) {+ for (MergeStrategy each: MergeStrategy.values()) {+ if (each.toString().equals(displayName))+ return each;+ }+ throw new OneException("Unable to find merge strategy with display name: " + displayName);+ }+@Nullablepublic abstract ObjectId merge(PullRequest request);diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.javanew file mode 100644index 0000000000..7aa605db27--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/NamedPullRequestQuery.java@@ -0,0 +1,49 @@+package io.onedev.server.model.support.pullrequest;++import org.hibernate.validator.constraints.NotEmpty;++import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.PullRequestQuery;++@Editable+public class NamedPullRequestQuery implements NamedQuery {++ private static final long serialVersionUID = 1L;++ private String name;++ private String query;++ public NamedPullRequestQuery(String name, String query) {+ this.name = name;+ this.query = query;+ }++ public NamedPullRequestQuery() {+ }++ @Editable+ @NotEmpty+ @Override+ public String getName() {+ return name;+ }++ public void setName(String name) {+ this.name = name;+ }++ @Editable+ @PullRequestQuery+ @NotEmpty+ @Override+ public String getQuery() {+ return query;+ }++ public void setQuery(String query) {+ this.query = query;+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedMergeStrategyData.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedMergeStrategyData.javaindex e21262c5db..8f7986341a 100644--- a/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedMergeStrategyData.java+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/actiondata/ChangedMergeStrategyData.java@@ -33,12 +33,12 @@ public class ChangedMergeStrategyData extends ActionData {@Overridepublic List<String> getOldLines() {- return Lists.newArrayList(oldStrategy.getDisplayName());+ return Lists.newArrayList(oldStrategy.toString());}@Overridepublic List<String> getNewLines() {- return Lists.newArrayList(newStrategy.getDisplayName());+ return Lists.newArrayList(newStrategy.toString());}@Overridediff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/AndCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/AndCriteria.javanew file mode 100644index 0000000000..1e869418f4--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/AndCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.List;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.AndCriteriaHelper;+import io.onedev.server.util.query.ParensAware;+import io.onedev.server.util.query.QueryBuildContext;++public class AndCriteria extends PullRequestCriteria implements ParensAware {++ private static final long serialVersionUID = 1L;++ private final List<PullRequestCriteria> criterias;++ public AndCriteria(List<PullRequestCriteria> criterias) {+ this.criterias = criterias;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ return new AndCriteriaHelper<PullRequest>(criterias).getPredicate(project, context);+ }++ @Override+ public boolean matches(PullRequest request) {+ return new AndCriteriaHelper<PullRequest>(criterias).matches(request);+ }++ @Override+ public boolean needsLogin() {+ return new AndCriteriaHelper<PullRequest>(criterias).needsLogin();+ }++ @Override+ public String toString() {+ return new AndCriteriaHelper<PullRequest>(criterias).toString();+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByCriteria.javanew file mode 100644index 0000000000..d6b206c444--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByCriteria.java@@ -0,0 +1,53 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.User;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class ApprovedByCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final User value;++ public ApprovedByCriteria(User value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().equal(user, value),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().equal(approved, true));+ }++ @Override+ public boolean matches(PullRequest request) {+ PullRequestReview review = request.getReview(value);+ return review != null && review.getExcludeDate() == null && review.getResult() != null+ && review.getResult().isApproved();+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " " + PullRequestQuery.quote(value.getName());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByMeCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByMeCriteria.javanew file mode 100644index 0000000000..26d78a4320--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ApprovedByMeCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class ApprovedByMeCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().equal(user, SecurityUtils.getUser()),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().equal(approved, true));+ }++ @Override+ public boolean matches(PullRequest request) {+ PullRequestReview review = request.getReview(SecurityUtils.getUser());+ return review != null && review.getExcludeDate() == null && review.getResult() != null && review.getResult().isApproved();+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedByMe);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/CloseDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/CloseDateCriteria.javanew file mode 100644index 0000000000..531b4c3846--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/CloseDateCriteria.java@@ -0,0 +1,55 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Date;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class CloseDateCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final Date value;++ private final String rawValue;++ public CloseDateCriteria(Date value, String rawValue, int operator) {+ this.operator = operator;+ this.value = value;+ this.rawValue = rawValue;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<Long> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_CLOSE_DATE));+ if (operator == PullRequestQueryLexer.IsBefore)+ return context.getBuilder().lessThan(attribute, value.getTime());+ else+ return context.getBuilder().greaterThan(attribute, value.getTime());+ }++ @Override+ public boolean matches(PullRequest request) {+ if (operator == PullRequestQueryLexer.IsBefore)+ return request.getLastActivity().getDate().before(value);+ else+ return request.getLastActivity().getDate().after(value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_CLOSE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ContainsCommitCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ContainsCommitCriteria.javanew file mode 100644index 0000000000..df5ab9ec2c--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ContainsCommitCriteria.java@@ -0,0 +1,61 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Collection;+import java.util.HashSet;+import java.util.Set;++import javax.persistence.criteria.Predicate;++import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.OneDev;+import io.onedev.server.manager.CodeCommentRelationInfoManager;+import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class ContainsCommitCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final ObjectId commitId;++ public ContainsCommitCriteria(ObjectId commitId) {+ this.commitId = commitId;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Collection<Long> ids = new HashSet<>();+ for (String uuid: getUUIDs(project, commitId)) {+ PullRequest request = OneDev.getInstance(PullRequestManager.class).find(uuid);+ if (request != null)+ ids.add(request.getId());+ }+ if (!ids.isEmpty())+ return context.getRoot().get(PullRequest.PATH_ID).in(ids);+ else+ return context.getBuilder().disjunction();+ }++ private Set<String> getUUIDs(Project project, ObjectId commitId) {+ return OneDev.getInstance(CodeCommentRelationInfoManager.class).getPullRequestUUIDs(project, commitId);+ }++ @Override+ public boolean matches(PullRequest request) {+ return getUUIDs(request.getTargetProject(), commitId).contains(request.getUUID());+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ContainsCommit) + " " + PullRequestQuery.quote(commitId.name());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DescriptionCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DescriptionCriteria.javanew file mode 100644index 0000000000..296964b4a2--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DescriptionCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class DescriptionCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final String value;++ public DescriptionCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<String> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_DESCRIPTION));+ return context.getBuilder().like(attribute, "%" + value + "%");+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getDescription().toLowerCase().contains(value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_DESCRIPTION) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByCriteria.javanew file mode 100644index 0000000000..38d703010c--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.util.query.QueryBuildContext;++public class DiscardedByCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final User value;++ public DiscardedByCriteria(User value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_CLOSE_USER);+ return context.getBuilder().equal(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSubmitter(), value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedBy) + " " + PullRequestQuery.quote(value.getName());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByMeCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByMeCriteria.javanew file mode 100644index 0000000000..7bc24acfc9--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedByMeCriteria.java@@ -0,0 +1,39 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.query.QueryBuildContext;++public class DiscardedByMeCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<User> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_CLOSE_USER);+ return context.getBuilder().equal(attribute, SecurityUtils.getUser());+ }++ @Override+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSubmitter(), SecurityUtils.getUser());+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.DiscardedByMe);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedCriteria.javanew file mode 100644index 0000000000..f1c3626bdc--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/DiscardedCriteria.java@@ -0,0 +1,38 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.util.query.QueryBuildContext;++public class DiscardedCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private PullRequestCriteria getCriteria(Project project) {+ return new StateCriteria(CloseInfo.Status.DISCARDED.toString());+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ return getCriteria(project).getPredicate(project, context);+ }++ @Override+ public boolean matches(PullRequest request) {+ return getCriteria(request.getTargetProject()).matches(request);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.Discarded);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasFailedBuildsCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasFailedBuildsCriteria.javanew file mode 100644index 0000000000..12e79b390f--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasFailedBuildsCriteria.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.util.query.QueryBuildContext;++public class HasFailedBuildsCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_BUILDS + "." + PullRequestBuild.PATH_BUILD);+ Path<?> status = join.get(Build.STATUS);++ return context.getBuilder().or(+ context.getBuilder().equal(status, Build.Status.ERROR),+ context.getBuilder().equal(status, Build.Status.FAILURE));+ }++ @Override+ public boolean matches(PullRequest request) {+ for (PullRequestBuild build: request.getBuilds()) {+ if (build.getBuild() != null &&+ (build.getBuild().getStatus() == Build.Status.ERROR || build.getBuild().getStatus() == Build.Status.FAILURE)) {+ return true;+ }+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasFailedBuilds);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasMergeConflictsCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasMergeConflictsCriteria.javanew file mode 100644index 0000000000..6b9d2b10cc--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasMergeConflictsCriteria.java@@ -0,0 +1,40 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.MergePreview;+import io.onedev.server.util.query.QueryBuildContext;++public class HasMergeConflictsCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<?> requestHead = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_LAST_MERGE_PREVIEW_REQUEST_HEAD);+ Path<?> merged = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_LAST_MERGE_PREVIEW_MERGED);+ return context.getBuilder().and(+ context.getBuilder().isNotNull(requestHead),+ context.getBuilder().isNull(merged));+ }++ @Override+ public boolean matches(PullRequest request) {+ MergePreview preview = request.getLastMergePreview();+ return preview != null && preview.getMerged() == null;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasMergeConflicts);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingBuildsCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingBuildsCriteria.javanew file mode 100644index 0000000000..7544fd4f60--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingBuildsCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Build;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestBuild;+import io.onedev.server.util.query.QueryBuildContext;++public class HasPendingBuildsCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_BUILDS + "." + PullRequestBuild.PATH_BUILD);+ Path<?> status = join.get(Build.STATUS);++ return context.getBuilder().or(+ context.getBuilder().isNull(status),+ context.getBuilder().equal(status, Build.Status.RUNNING));+ }++ @Override+ public boolean matches(PullRequest request) {+ for (PullRequestBuild build: request.getBuilds()) {+ if (build.getBuild() == null || build.getBuild().getStatus() == Build.Status.RUNNING)+ return true;+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasPendingBuilds);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingReviewsCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingReviewsCriteria.javanew file mode 100644index 0000000000..dd0ca410ac--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/HasPendingReviewsCriteria.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class HasPendingReviewsCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().isNotNull(user),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().isNull(approved));+ }++ @Override+ public boolean matches(PullRequest request) {+ for (PullRequestReview review: request.getReviews()) {+ if (review.getExcludeDate() == null && review.getResult() == null)+ return true;+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.HasPendingReviews);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergeStrategyCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergeStrategyCriteria.javanew file mode 100644index 0000000000..65ed50f950--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergeStrategyCriteria.java@@ -0,0 +1,42 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.util.query.QueryBuildContext;++public class MergeStrategyCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private MergeStrategy value;++ public MergeStrategyCriteria(MergeStrategy value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<?> attribute = context.getRoot().get(PullRequest.FIELD_MERGE_STRATEGY);+ return context.getBuilder().equal(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getMergeStrategy() == value;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_MERGE_STRATEGY) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.toString());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergedCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergedCriteria.javanew file mode 100644index 0000000000..23ac614b15--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/MergedCriteria.java@@ -0,0 +1,38 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.util.query.QueryBuildContext;++public class MergedCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private PullRequestCriteria getCriteria(Project project) {+ return new StateCriteria(CloseInfo.Status.MERGED.toString());+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ return getCriteria(project).getPredicate(project, context);+ }++ @Override+ public boolean matches(PullRequest request) {+ return getCriteria(request.getTargetProject()).matches(request);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.Merged);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NotCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NotCriteria.javanew file mode 100644index 0000000000..68312a646f--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NotCriteria.java@@ -0,0 +1,40 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.NotCriteriaHelper;+import io.onedev.server.util.query.QueryBuildContext;++public class NotCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final PullRequestCriteria criteria;++ public NotCriteria(PullRequestCriteria criteria) {+ this.criteria = criteria;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ return new NotCriteriaHelper<PullRequest>(criteria).getPredicate(project, context);+ }++ @Override+ public boolean matches(PullRequest request) {+ return new NotCriteriaHelper<PullRequest>(criteria).matches(request);+ }++ @Override+ public boolean needsLogin() {+ return new NotCriteriaHelper<PullRequest>(criteria).needsLogin();+ }++ @Override+ public String toString() {+ return new NotCriteriaHelper<PullRequest>(criteria).toString();+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NumberCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NumberCriteria.javanew file mode 100644index 0000000000..8c9a509757--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/NumberCriteria.java@@ -0,0 +1,54 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class NumberCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final long value;++ public NumberCriteria(long value, int operator) {+ this.operator = operator;+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<Long> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_NUMBER));+ if (operator == PullRequestQueryLexer.Is)+ return context.getBuilder().equal(attribute, value);+ else if (operator == PullRequestQueryLexer.IsGreaterThan)+ return context.getBuilder().greaterThan(attribute, value);+ else+ return context.getBuilder().lessThan(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ if (operator == PullRequestQueryLexer.Is)+ return request.getNumber() == value;+ else if (operator == PullRequestQueryLexer.IsGreaterThan)+ return request.getNumber() > value;+ else+ return request.getNumber() < value;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_NUMBER) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(String.valueOf(value));+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OpenCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OpenCriteria.javanew file mode 100644index 0000000000..6ccd3e81d8--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OpenCriteria.java@@ -0,0 +1,37 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class OpenCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private PullRequestCriteria getCriteria(Project project) {+ return new StateCriteria(PullRequest.STATE_OPEN);+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ return getCriteria(project).getPredicate(project, context);+ }++ @Override+ public boolean matches(PullRequest request) {+ return getCriteria(request.getTargetProject()).matches(request);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.Open);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OrCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OrCriteria.javanew file mode 100644index 0000000000..410a31be60--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/OrCriteria.java@@ -0,0 +1,43 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.List;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.ParensAware;+import io.onedev.server.util.query.OrCriteriaHelper;+import io.onedev.server.util.query.QueryBuildContext;++public class OrCriteria extends PullRequestCriteria implements ParensAware {++ private static final long serialVersionUID = 1L;++ private final List<PullRequestCriteria> criterias;++ public OrCriteria(List<PullRequestCriteria> criterias) {+ this.criterias = criterias;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ return new OrCriteriaHelper<PullRequest>(criterias).getPredicate(project, context);+ }++ @Override+ public boolean matches(PullRequest request) {+ return new OrCriteriaHelper<PullRequest>(criterias).matches(request);+ }++ @Override+ public boolean needsLogin() {+ return new OrCriteriaHelper<PullRequest>(criterias).needsLogin();+ }++ @Override+ public String toString() {+ return new OrCriteriaHelper<PullRequest>(criterias).toString();+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestCriteria.javanew file mode 100644index 0000000000..ea16889a98--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestCriteria.java@@ -0,0 +1,24 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.List;++import javax.annotation.Nullable;++import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.EntityCriteria;++public abstract class PullRequestCriteria extends EntityCriteria<PullRequest> {++ private static final long serialVersionUID = 1L;++ @Nullable+ public static PullRequestCriteria of(List<PullRequestCriteria> criterias) {+ if (criterias.size() > 1)+ return new AndCriteria(criterias);+ else if (criterias.size() == 1)+ return criterias.iterator().next();+ else+ return null;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.g4 b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.g4new file mode 100644index 0000000000..5e4fbadca8--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.g4@@ -0,0 +1,179 @@+grammar PullRequestQuery;++query+ : WS* (criteria|All) WS+ OrderBy WS+ order (WS+ And WS+ order)* WS* EOF+ | WS* (criteria|All) WS* EOF+ | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF+ | WS* EOF+ ;++criteria+ : operator=(Open|Merged|Discarded|SubmittedByMe|ToBeReviewedByMe|RequestedForChangesByMe|ApprovedByMe|DiscardedByMe|SomeoneRequestedForChanges|HasPendingReviews|HasFailedBuilds|HasPendingBuilds|HasMergeConflicts) #OperatorCriteria+ | operator=(ToBeReviewedBy|ApprovedBy|RequestedForChangesBy|SubmittedBy|DiscardedBy|ContainsCommit) WS+ criteriaValue=Quoted #OperatorValueCriteria+ | criteriaField=Quoted WS+ operator=(Is|IsGreaterThan|IsLessThan|IsBefore|IsAfter|Contains) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria+ | criteria WS+ And WS+ criteria #AndCriteria+ | criteria WS+ Or WS+ criteria #OrCriteria+ | Not WS* LParens WS* criteria WS* RParens #NotCriteria+ | LParens WS* criteria WS* RParens #ParensCriteria+ ;++order+ : orderField=Quoted WS* (WS+ direction=(Asc|Desc))?+ ;++All+ : 'all'+ ;++Open+ : 'open'+ ;++Merged+ : 'merged'+ ;++Discarded+ : 'discarded'+ ;++ToBeReviewedByMe+ : 'to' WS+ 'be' WS+ 'reviewed' WS+ 'by' WS+ 'me'+ ;++RequestedForChangesByMe+ : 'requested' WS+ 'for' WS+ 'changes' WS+ 'by' WS+ 'me'+ ;++ApprovedByMe+ : 'approved' WS+ 'by' WS+ 'me'+ ;++SubmittedByMe+ : 'submitted' WS+ 'by' WS+ 'me'+ ;++DiscardedByMe+ : 'discarded' WS+ 'by' WS+ 'me'+ ;++SomeoneRequestedForChanges+ : 'someone' WS+ 'requested' WS+ 'for' WS+ 'changes'+ ;++HasPendingReviews+ : 'has' WS+ 'pending' WS+ 'reviews'+ ;++HasFailedBuilds+ : 'has' WS+ 'failed' WS+ 'builds'+ ;++HasPendingBuilds+ : 'has' WS+ 'pending' WS+ 'builds'+ ;++HasMergeConflicts+ : 'has' WS+ 'merge' WS+ 'conflicts'+ ;++ToBeReviewedBy+ : 'to' WS+ 'be' WS+ 'reviewed' WS+ 'by'+ ;++RequestedForChangesBy+ : 'requested' WS+ 'for' WS+ 'changes' WS+ 'by'+ ;++ApprovedBy+ : 'approved' WS+ 'by'+ ;++SubmittedBy+ : 'submitted' WS+ 'by'+ ;++DiscardedBy+ : 'discarded' WS+ 'by'+ ;++ContainsCommit+ : 'contains' WS+ 'commit'+ ;++OrderBy+ : 'order' WS+ 'by'+ ;++Is+ : 'is'+ ;++Contains+ : 'contains'+ ;++IsGreaterThan+ : 'is' WS+ 'greater' WS+ 'than'+ ;++IsLessThan+ : 'is' WS+ 'less' WS+ 'than'+ ;++IsAfter+ : 'is' WS+ 'after'+ ;++IsBefore+ : 'is' WS+ 'before'+ ;++And+ : 'and'+ ;++Or+ : 'or'+ ;++Not+ : 'not'+ ;++Asc+ : 'asc'+ ;++Desc+ : 'desc'+ ;++LParens+ : '('+ ;++RParens+ : ')'+ ;++Quoted+ : '"' (ESCAPE|~["\\])+? '"'+ ;++/*+ * Use identifier to make the input "isnot" a whole token so that it becomes a "matchWith"+ * to provide suggestion for "is not"+ */+Identifier+ : [a-zA-Z]++ ;++WS+ : ' '+ ;++fragment+ESCAPE+ : '\\'["\\]+ ;diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.javanew file mode 100644index 0000000000..af40e54a30--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQuery.java@@ -0,0 +1,350 @@+package io.onedev.server.model.support.pullrequest.query;++import java.io.IOException;+import java.util.ArrayList;+import java.util.Date;+import java.util.List;++import javax.annotation.Nullable;++import org.antlr.v4.runtime.ANTLRInputStream;+import org.antlr.v4.runtime.BailErrorStrategy;+import org.antlr.v4.runtime.BaseErrorListener;+import org.antlr.v4.runtime.CommonTokenStream;+import org.antlr.v4.runtime.RecognitionException;+import org.antlr.v4.runtime.Recognizer;+import org.eclipse.jgit.errors.RevisionSyntaxException;+import org.eclipse.jgit.lib.ObjectId;++import io.onedev.server.OneDev;+import io.onedev.server.exception.OneException;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.manager.UserManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.model.support.pullrequest.MergeStrategy;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.AndCriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.CriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.FieldOperatorValueCriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.NotCriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OperatorCriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OperatorValueCriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OrCriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.OrderContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.ParensCriteriaContext;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser.QueryContext;+import io.onedev.server.util.DateUtils;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.EntitySort;+import io.onedev.server.util.query.EntitySort.Direction;++public class PullRequestQuery extends EntityQuery<PullRequest> {++ private static final long serialVersionUID = 1L;++ private final PullRequestCriteria criteria;++ private final List<EntitySort> sorts;++ public PullRequestQuery(@Nullable PullRequestCriteria criteria, List<EntitySort> sorts) {+ this.criteria = criteria;+ this.sorts = sorts;+ }++ public PullRequestQuery() {+ this(null, new ArrayList<>());+ }++ public static PullRequestQuery parse(Project project, @Nullable String queryString, boolean validate) {+ if (queryString != null) {+ ANTLRInputStream is = new ANTLRInputStream(queryString);+ PullRequestQueryLexer lexer = new PullRequestQueryLexer(is);+ lexer.removeErrorListeners();+ lexer.addErrorListener(new BaseErrorListener() {++ @Override+ public void syntaxError(Recognizer<?, ?> recognizer, Object offendingSymbol, int line,+ int charPositionInLine, String msg, RecognitionException e) {+ throw new OneException("Malformed query syntax", e);+ }++ });+ CommonTokenStream tokens = new CommonTokenStream(lexer);+ PullRequestQueryParser parser = new PullRequestQueryParser(tokens);+ parser.removeErrorListeners();+ parser.setErrorHandler(new BailErrorStrategy());+ QueryContext queryContext;+ try {+ queryContext = parser.query();+ } catch (Exception e) {+ if (e instanceof OneException)+ throw e;+ else+ throw new OneException("Malformed query syntax", e);+ }+ CriteriaContext criteriaContext = queryContext.criteria();+ PullRequestCriteria requestCriteria;+ if (criteriaContext != null) {+ requestCriteria = new PullRequestQueryBaseVisitor<PullRequestCriteria>() {++ @Override+ public PullRequestCriteria visitOperatorCriteria(OperatorCriteriaContext ctx) {+ switch (ctx.operator.getType()) {+ case PullRequestQueryLexer.Open:+ return new OpenCriteria();+ case PullRequestQueryLexer.Merged:+ return new MergedCriteria();+ case PullRequestQueryLexer.Discarded:+ return new DiscardedCriteria();+ case PullRequestQueryLexer.SubmittedByMe:+ return new SubmittedByMeCriteria();+ case PullRequestQueryLexer.ToBeReviewedByMe:+ return new ToBeReviewedByMeCriteria();+ case PullRequestQueryLexer.RequestedForChangesByMe:+ return new RequestForChangesByMeCriteria();+ case PullRequestQueryLexer.ApprovedByMe:+ return new ApprovedByMeCriteria();+ case PullRequestQueryLexer.DiscardedByMe:+ return new DiscardedByMeCriteria();+ case PullRequestQueryLexer.SomeoneRequestedForChanges:+ return new SomeoneRequestedForChangesCriteria();+ case PullRequestQueryLexer.HasFailedBuilds:+ return new HasFailedBuildsCriteria();+ case PullRequestQueryLexer.HasMergeConflicts:+ return new HasMergeConflictsCriteria();+ case PullRequestQueryLexer.HasPendingBuilds:+ return new HasPendingBuildsCriteria();+ case PullRequestQueryLexer.HasPendingReviews:+ return new HasPendingReviewsCriteria();+ default:+ throw new OneException("Unexpected operator: " + ctx.operator.getText());+ }+ }++ private User getUser(String value) {+ User user = OneDev.getInstance(UserManager.class).findByName(value);+ if (user == null)+ throw new OneException("Unable to find user with login: " + value);+ return user;+ }++ @Override+ public PullRequestCriteria visitOperatorValueCriteria(OperatorValueCriteriaContext ctx) {+ String value = getValue(ctx.Quoted().getText());+ switch (ctx.operator.getType()) {+ case PullRequestQueryLexer.ToBeReviewedBy:+ return new ToBeReviewedByCriteria(getUser(value));+ case PullRequestQueryLexer.ApprovedBy:+ return new ApprovedByCriteria(getUser(value));+ case PullRequestQueryLexer.RequestedForChangesBy:+ return new RequestForChangesByCriteria(getUser(value));+ case PullRequestQueryLexer.SubmittedBy:+ return new SubmittedByCriteria(getUser(value));+ case PullRequestQueryLexer.DiscardedBy:+ return new DiscardedByCriteria(getUser(value));+ case PullRequestQueryLexer.ContainsCommit:+ try {+ ObjectId commitId = project.getRepository().resolve(value);+ if (commitId == null)+ throw new RevisionSyntaxException("");+ return new ContainsCommitCriteria(commitId);+ } catch (RevisionSyntaxException | IOException e) {+ throw new OneException("Invalid revision string: " + value);+ }+ default:+ throw new OneException("Unexpected operator: " + ctx.operator.getText());+ }+ }++ @Override+ public PullRequestCriteria visitParensCriteria(ParensCriteriaContext ctx) {+ return visit(ctx.criteria());+ }++ @Override+ public PullRequestCriteria visitFieldOperatorValueCriteria(FieldOperatorValueCriteriaContext ctx) {+ String fieldName = getValue(ctx.Quoted(0).getText());+ String value = getValue(ctx.Quoted(1).getText());+ int operator = ctx.operator.getType();+ if (validate)+ checkField(project, fieldName, operator);++ switch (operator) {+ case PullRequestQueryLexer.IsBefore:+ case PullRequestQueryLexer.IsAfter:+ Date dateValue = DateUtils.parseRelaxed(value);+ if (dateValue == null)+ throw new OneException("Unrecognized date: " + value);+ switch (fieldName) {+ case PullRequest.FIELD_SUBMIT_DATE:+ return new SubmitDateCriteria(dateValue, value, operator);+ case PullRequest.FIELD_UPDATE_DATE:+ return new UpdateDateCriteria(dateValue, value, operator);+ case PullRequest.FIELD_CLOSE_DATE:+ return new CloseDateCriteria(dateValue, value, operator);+ default:+ throw new IllegalStateException();+ }+ case PullRequestQueryLexer.Contains:+ switch (fieldName) {+ case PullRequest.FIELD_TITLE:+ return new TitleCriteria(value);+ case PullRequest.FIELD_DESCRIPTION:+ return new DescriptionCriteria(value);+ default:+ throw new IllegalStateException();+ }+ case PullRequestQueryLexer.Is:+ switch (fieldName) {+ case PullRequest.FIELD_STATE:+ return new StateCriteria(value);+ case PullRequest.FIELD_NUMBER:+ return new NumberCriteria(getIntValue(value), operator);+ case PullRequest.FIELD_MERGE_STRATEGY:+ return new MergeStrategyCriteria(MergeStrategy.from(value));+ case PullRequest.FIELD_SOURCE_BRANCH:+ return new SourceBranchCriteria(value);+ case PullRequest.FIELD_SOURCE_PROJECT:+ Project project = OneDev.getInstance(ProjectManager.class).find(value);+ if (project == null)+ throw new OneException("Unable to find project: " + value);+ return new SourceProjectCriteria(project);+ case PullRequest.FIELD_TARGET_BRANCH:+ return new TargetBranchCriteria(value);+ default:+ throw new IllegalStateException();+ }+ case PullRequestQueryLexer.IsLessThan:+ case PullRequestQueryLexer.IsGreaterThan:+ switch (fieldName) {+ case PullRequest.FIELD_NUMBER:+ return new NumberCriteria(getIntValue(value), operator);+ default:+ throw new IllegalStateException();+ }+ default:+ throw new IllegalStateException();+ }+ }++ @Override+ public PullRequestCriteria visitOrCriteria(OrCriteriaContext ctx) {+ List<PullRequestCriteria> childCriterias = new ArrayList<>();+ for (CriteriaContext childCtx: ctx.criteria())+ childCriterias.add(visit(childCtx));+ return new OrCriteria(childCriterias);+ }++ @Override+ public PullRequestCriteria visitAndCriteria(AndCriteriaContext ctx) {+ List<PullRequestCriteria> childCriterias = new ArrayList<>();+ for (CriteriaContext childCtx: ctx.criteria())+ childCriterias.add(visit(childCtx));+ return new AndCriteria(childCriterias);+ }++ @Override+ public PullRequestCriteria visitNotCriteria(NotCriteriaContext ctx) {+ return new NotCriteria(visit(ctx.criteria()));+ }++ }.visit(criteriaContext);+ } else {+ requestCriteria = null;+ }++ List<EntitySort> requestSorts = new ArrayList<>();+ for (OrderContext order: queryContext.order()) {+ String fieldName = getValue(order.Quoted().getText());+ if (validate+ && !fieldName.equals(PullRequest.FIELD_SUBMIT_DATE)+ && !fieldName.equals(PullRequest.FIELD_UPDATE_DATE)+ && !fieldName.equals(PullRequest.FIELD_CLOSE_DATE)+ && !fieldName.equals(PullRequest.FIELD_NUMBER)) {+ throw new OneException("Can not order by field: " + fieldName);+ }++ EntitySort pullRequestSort = new EntitySort();+ pullRequestSort.setField(fieldName);+ if (order.direction != null && order.direction.getText().equals("asc"))+ pullRequestSort.setDirection(Direction.ASCENDING);+ else+ pullRequestSort.setDirection(Direction.DESCENDING);+ requestSorts.add(pullRequestSort);+ }++ return new PullRequestQuery(requestCriteria, requestSorts);+ } else {+ return new PullRequestQuery();+ }+ }++ public static void checkField(Project project, String fieldName, int operator) {+ if (!PullRequest.FIELD_PATHS.containsKey(fieldName))+ throw new OneException("Field not found: " + fieldName);+ switch (operator) {+ case PullRequestQueryLexer.IsBefore:+ case PullRequestQueryLexer.IsAfter:+ if (!fieldName.equals(PullRequest.FIELD_SUBMIT_DATE)+ && !fieldName.equals(PullRequest.FIELD_UPDATE_DATE)+ && !fieldName.equals(PullRequest.FIELD_CLOSE_DATE)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case PullRequestQueryLexer.Contains:+ if (!fieldName.equals(PullRequest.FIELD_TITLE) && !fieldName.equals(PullRequest.FIELD_DESCRIPTION))+ throw newOperatorException(fieldName, operator);+ break;+ case PullRequestQueryLexer.Is:+ if (!fieldName.equals(PullRequest.FIELD_STATE)+ && !fieldName.equals(PullRequest.FIELD_NUMBER)+ && !fieldName.equals(PullRequest.FIELD_TARGET_BRANCH)+ && !fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)+ && !fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)) {+ throw newOperatorException(fieldName, operator);+ }+ break;+ case PullRequestQueryLexer.IsLessThan:+ case PullRequestQueryLexer.IsGreaterThan:+ if (!fieldName.equals(PullRequest.FIELD_NUMBER))+ throw newOperatorException(fieldName, operator);+ break;+ }+ }++ private static OneException newOperatorException(String fieldName, int operator) {+ return new OneException("Field '" + fieldName + "' is not applicable for operator '" + getRuleName(operator) + "'");+ }++ public static String getRuleName(int rule) {+ return getRuleName(PullRequestQueryLexer.ruleNames, rule);+ }++ public static int getOperator(String operatorName) {+ return getOperator(PullRequestQueryLexer.ruleNames, operatorName);+ }++ public static PullRequestQuery merge(PullRequestQuery query1, PullRequestQuery query2) {+ List<PullRequestCriteria> criterias = new ArrayList<>();+ if (query1.getCriteria() != null)+ criterias.add(query1.getCriteria());+ if (query2.getCriteria() != null)+ criterias.add(query2.getCriteria());+ List<EntitySort> sorts = new ArrayList<>();+ sorts.addAll(query1.getSorts());+ sorts.addAll(query2.getSorts());+ return new PullRequestQuery(PullRequestCriteria.of(criterias), sorts);+ }++ @Override+ public PullRequestCriteria getCriteria() {+ return criteria;+ }++ @Override+ public List<EntitySort> getSorts() {+ return sorts;+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQueryBuildContext.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQueryBuildContext.javanew file mode 100644index 0000000000..0b75557368--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/PullRequestQueryBuildContext.java@@ -0,0 +1,30 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.JoinType;+import javax.persistence.criteria.Root;++import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class PullRequestQueryBuildContext extends QueryBuildContext<PullRequest> {++ public PullRequestQueryBuildContext(Root<PullRequest> root, CriteriaBuilder builder) {+ super(root, builder);+ }++ @Override+ public Join<?, ?> newJoin(String joinPath) {+ if (joinPath.startsWith(PullRequest.PATH_BUILDS + ".")) {+ Join<?, ?> join = getRoot().join(PullRequest.PATH_BUILDS, JoinType.LEFT);+ return join.join(joinPath.substring((PullRequest.PATH_BUILDS+".").length()), JoinType.LEFT);+ } else if (joinPath.startsWith(PullRequest.PATH_REVIEWS + ".")) {+ Join<?, ?> join = getRoot().join(PullRequest.PATH_REVIEWS, JoinType.LEFT);+ return join.join(joinPath.substring((PullRequest.PATH_REVIEWS+".").length()), JoinType.LEFT);+ } else {+ return getRoot().join(joinPath, JoinType.LEFT);+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByCriteria.javanew file mode 100644index 0000000000..1682126c4a--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByCriteria.java@@ -0,0 +1,53 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.User;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class RequestForChangesByCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final User value;++ public RequestForChangesByCriteria(User value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().equal(user, value),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().equal(approved, false));+ }++ @Override+ public boolean matches(PullRequest request) {+ PullRequestReview review = request.getReview(value);+ return review != null && review.getExcludeDate() == null && review.getResult() != null+ && !review.getResult().isApproved();+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesBy) + " " + PullRequestQuery.quote(value.getName());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByMeCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByMeCriteria.javanew file mode 100644index 0000000000..ef86d6be0c--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/RequestForChangesByMeCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class RequestForChangesByMeCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().equal(user, SecurityUtils.getUser()),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().equal(approved, false));+ }++ @Override+ public boolean matches(PullRequest request) {+ PullRequestReview review = request.getReview(SecurityUtils.getUser());+ return review != null && review.getExcludeDate() == null && review.getResult() != null && !review.getResult().isApproved();+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.RequestedForChangesByMe);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SomeoneRequestedForChangesCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SomeoneRequestedForChangesCriteria.javanew file mode 100644index 0000000000..82ede081e7--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SomeoneRequestedForChangesCriteria.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class SomeoneRequestedForChangesCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().isNotNull(user),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().equal(approved, false));+ }++ @Override+ public boolean matches(PullRequest request) {+ for (PullRequestReview review: request.getReviews()) {+ if (review.getExcludeDate() == null && review.getResult() != null && !review.getResult().isApproved())+ return true;+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.SomeoneRequestedForChanges);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceBranchCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceBranchCriteria.javanew file mode 100644index 0000000000..37eb3e5d51--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceBranchCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.util.query.QueryBuildContext;++public class SourceBranchCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final String value;++ public SourceBranchCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SOURCE_BRANCH));+ return context.getBuilder().equal(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSourceBranch(), value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_SOURCE_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceProjectCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceProjectCriteria.javanew file mode 100644index 0000000000..ffe27d22cd--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SourceProjectCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.util.query.QueryBuildContext;++public class SourceProjectCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final Project value;++ public SourceProjectCriteria(Project value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SOURCE_PROJECT));+ return context.getBuilder().equal(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSourceProject(), value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_SOURCE_PROJECT) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value.getName());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/StateCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/StateCriteria.javanew file mode 100644index 0000000000..9c8ff962b7--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/StateCriteria.java@@ -0,0 +1,48 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.util.query.QueryBuildContext;++public class StateCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private String value;++ public StateCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<?> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.PATH_CLOSE_STATUS);+ if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))+ return context.getBuilder().isNull(attribute);+ else+ return context.getBuilder().equal(attribute, CloseInfo.Status.valueOf(value.toUpperCase()));+ }++ @Override+ public boolean matches(PullRequest request) {+ if (value.equalsIgnoreCase(PullRequest.STATE_OPEN))+ return request.getCloseInfo() == null;+ else+ return request.getCloseInfo() != null && request.getCloseInfo().getStatus().name().equalsIgnoreCase(value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_STATE) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmitDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmitDateCriteria.javanew file mode 100644index 0000000000..b3b8fcc6cb--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmitDateCriteria.java@@ -0,0 +1,55 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Date;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class SubmitDateCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final Date value;++ private final String rawValue;++ public SubmitDateCriteria(Date value, String rawValue, int operator) {+ this.operator = operator;+ this.value = value;+ this.rawValue = rawValue;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<Long> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMIT_DATE));+ if (operator == PullRequestQueryLexer.IsBefore)+ return context.getBuilder().lessThan(attribute, value.getTime());+ else+ return context.getBuilder().greaterThan(attribute, value.getTime());+ }++ @Override+ public boolean matches(PullRequest request) {+ if (operator == PullRequestQueryLexer.IsBefore)+ return request.getSubmitDate().before(value);+ else+ return request.getSubmitDate().after(value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_SUBMIT_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByCriteria.javanew file mode 100644index 0000000000..258e3fcb7d--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.util.query.QueryBuildContext;++public class SubmittedByCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final User value;++ public SubmittedByCriteria(User value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMITTER));+ return context.getBuilder().equal(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSubmitter(), value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + PullRequestQuery.quote(value.getName());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByMeCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByMeCriteria.javanew file mode 100644index 0000000000..8f0d2866fa--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/SubmittedByMeCriteria.java@@ -0,0 +1,38 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.query.QueryBuildContext;++public class SubmittedByMeCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<?> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_SUBMITTER));+ return context.getBuilder().equal(attribute, SecurityUtils.getUser());+ }++ @Override+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getSubmitter(), SecurityUtils.getUser());+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedByMe);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TargetBranchCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TargetBranchCriteria.javanew file mode 100644index 0000000000..84d8937fe0--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TargetBranchCriteria.java@@ -0,0 +1,44 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Objects;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.util.query.QueryBuildContext;++public class TargetBranchCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final String value;++ public TargetBranchCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<User> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_TARGET_BRANCH));+ return context.getBuilder().equal(attribute, value);+ }++ @Override+ public boolean matches(PullRequest request) {+ return Objects.equals(request.getTargetBranch(), value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_TARGET_BRANCH) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Is) + " " + PullRequestQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TitleCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TitleCriteria.javanew file mode 100644index 0000000000..44e197e9f4--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/TitleCriteria.java@@ -0,0 +1,41 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class TitleCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final String value;++ public TitleCriteria(String value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<String> attribute = context.getRoot().get(PullRequest.FIELD_PATHS.get(PullRequest.FIELD_TITLE));+ return context.getBuilder().like(attribute, "%" + value + "%");+ }++ @Override+ public boolean matches(PullRequest request) {+ return request.getTitle().toLowerCase().contains(value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_TITLE) + " " + PullRequestQuery.getRuleName(PullRequestQueryLexer.Contains) + " " + PullRequestQuery.quote(value);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByCriteria.javanew file mode 100644index 0000000000..c9f2284ae6--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByCriteria.java@@ -0,0 +1,52 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.model.User;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class ToBeReviewedByCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final User value;++ public ToBeReviewedByCriteria(User value) {+ this.value = value;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().equal(user, value),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().isNull(approved));+ }++ @Override+ public boolean matches(PullRequest request) {+ PullRequestReview review = request.getReview(value);+ return review != null && review.getExcludeDate() == null && review.getResult() == null;+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedBy) + " " + PullRequestQuery.quote(value.getName());+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByMeCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByMeCriteria.javanew file mode 100644index 0000000000..7f845dcc2c--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/ToBeReviewedByMeCriteria.java@@ -0,0 +1,46 @@+package io.onedev.server.model.support.pullrequest.query;++import javax.persistence.criteria.Join;+import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.PullRequestReview;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.util.query.QueryBuildContext;++public class ToBeReviewedByMeCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Join<?, ?> join = context.getJoin(PullRequest.PATH_REVIEWS);+ Path<?> user = EntityQuery.getPath(join, PullRequestReview.PATH_USER);+ Path<?> excludeDate = EntityQuery.getPath(join, PullRequestReview.PATH_EXCLUDE_DATE);+ Path<?> approved = EntityQuery.getPath(join, PullRequestReview.PATH_RESULT_APPROVED);+ return context.getBuilder().and(+ context.getBuilder().equal(user, SecurityUtils.getUser()),+ context.getBuilder().isNull(excludeDate),+ context.getBuilder().isNull(approved));+ }++ @Override+ public boolean matches(PullRequest request) {+ PullRequestReview review = request.getReview(SecurityUtils.getUser());+ return review != null && review.getExcludeDate() == null && review.getResult() == null;+ }++ @Override+ public boolean needsLogin() {+ return true;+ }++ @Override+ public String toString() {+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ToBeReviewedByMe);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/pullrequest/query/UpdateDateCriteria.java b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/UpdateDateCriteria.javanew file mode 100644index 0000000000..3d943c97c6--- /dev/null+++ b/core/src/main/java/io/onedev/server/model/support/pullrequest/query/UpdateDateCriteria.java@@ -0,0 +1,55 @@+package io.onedev.server.model.support.pullrequest.query;++import java.util.Date;++import javax.persistence.criteria.Path;+import javax.persistence.criteria.Predicate;++import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.util.query.QueryBuildContext;++public class UpdateDateCriteria extends PullRequestCriteria {++ private static final long serialVersionUID = 1L;++ private final int operator;++ private final Date value;++ private final String rawValue;++ public UpdateDateCriteria(Date value, String rawValue, int operator) {+ this.operator = operator;+ this.value = value;+ this.rawValue = rawValue;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<PullRequest> context) {+ Path<Long> attribute = PullRequestQuery.getPath(context.getRoot(), PullRequest.FIELD_PATHS.get(PullRequest.FIELD_UPDATE_DATE));+ if (operator == PullRequestQueryLexer.IsBefore)+ return context.getBuilder().lessThan(attribute, value.getTime());+ else+ return context.getBuilder().greaterThan(attribute, value.getTime());+ }++ @Override+ public boolean matches(PullRequest request) {+ if (operator == PullRequestQueryLexer.IsBefore)+ return request.getLastActivity().getDate().before(value);+ else+ return request.getLastActivity().getDate().after(value);+ }++ @Override+ public boolean needsLogin() {+ return false;+ }++ @Override+ public String toString() {+ return PullRequestQuery.quote(PullRequest.FIELD_UPDATE_DATE) + " " + PullRequestQuery.getRuleName(operator) + " " + PullRequestQuery.quote(rawValue);+ }++}diff --git a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java b/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.javaindex 3471397904..55de0d2efd 100644--- a/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java+++ b/core/src/main/java/io/onedev/server/rest/github/PullRequestResource.java@@ -175,7 +175,7 @@ public class PullRequestResource {requestMap.put("updated_at", sdf.format(request.getLatestUpdate().getDate()));if (!request.isOpen()) {- requestMap.put("closed_at", sdf.format(request.getCloseInfo().getCloseDate()));+ requestMap.put("closed_at", sdf.format(request.getCloseInfo().getDate()));}return requestMap;@@ -192,7 +192,7 @@ public class PullRequestResource {if (!SecurityUtils.canRead(project))throw new UnauthorizedException("Unauthorized access to project '" + projectName + "'");- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);+ EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);criteria.add(PullRequest.CriterionHelper.ofTargetProject(project));if ("closed".equals(state))criteria.add(PullRequest.CriterionHelper.ofClosed());diff --git a/core/src/main/java/io/onedev/server/util/DateUtils.java b/core/src/main/java/io/onedev/server/util/DateUtils.javaindex 3b2fc6a1cf..f0c17776c3 100644--- a/core/src/main/java/io/onedev/server/util/DateUtils.java+++ b/core/src/main/java/io/onedev/server/util/DateUtils.java@@ -8,6 +8,7 @@ import javax.annotation.Nullable;import org.joda.time.DateTime;import org.ocpsoft.prettytime.PrettyTime;+import com.google.common.collect.Lists;import com.joestelmach.natty.DateGroup;import com.joestelmach.natty.Parser;@@ -15,6 +16,11 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils {private static final PrettyTime PRETTY_TIME = new PrettyTime();+ public static final List<String> RELAX_DATE_EXAMPLES = Lists.newArrayList(+ "one hour ago", "2 hours ago", "3PM", "noon", "today", "yesterday",+ "yesterday midnight", "3 days ago", "last week", "last Monday",+ "4 weeks ago", "1 month 2 days ago", "1 year ago");+public static String formatAge(Date date) {return PRETTY_TIME.format(date);}diff --git a/core/src/main/java/io/onedev/server/util/query/AndCriteriaHelper.java b/core/src/main/java/io/onedev/server/util/query/AndCriteriaHelper.javanew file mode 100644index 0000000000..a8af7492b1--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/AndCriteriaHelper.java@@ -0,0 +1,65 @@+package io.onedev.server.util.query;++import java.util.ArrayList;+import java.util.List;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;++public class AndCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {++ private static final long serialVersionUID = 1L;++ private final List<? extends EntityCriteria<T>> criterias;++ public AndCriteriaHelper(List<? extends EntityCriteria<T>> criterias) {+ this.criterias = criterias;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<T> context) {+ List<Predicate> predicates = new ArrayList<>();+ for (EntityCriteria<T> criteria: criterias)+ predicates.add(criteria.getPredicate(project, context));+ return context.getBuilder().and(predicates.toArray(new Predicate[0]));+ }++ @Override+ public boolean matches(T entity) {+ for (EntityCriteria<T> criteria: criterias) {+ if (!criteria.matches(entity))+ return false;+ }+ return true;+ }++ @Override+ public boolean needsLogin() {+ for (EntityCriteria<T> criteria: criterias) {+ if (criteria.needsLogin())+ return true;+ }+ return false;+ }++ @Override+ public String toString() {+ StringBuilder builder = new StringBuilder();+ for (int i=0; i<criterias.size(); i++) {+ EntityCriteria<T> criteria = criterias.get(i);+ if (i != 0)+ builder.append(" and ");+ if (criteria instanceof ParensAware) {+ builder.append("(");+ builder.append(criteria.toString());+ builder.append(")");+ } else {+ builder.append(criteria.toString());+ }+ }+ return builder.toString().trim();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/query/EntityCriteria.java b/core/src/main/java/io/onedev/server/util/query/EntityCriteria.javanew file mode 100644index 0000000000..5dad9a194c--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/EntityCriteria.java@@ -0,0 +1,23 @@+package io.onedev.server.util.query;++import java.io.Serializable;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;++public abstract class EntityCriteria<T extends AbstractEntity> implements Serializable {++ private static final long serialVersionUID = 1L;++ public abstract Predicate getPredicate(Project project, QueryBuildContext<T> context);++ public abstract boolean matches(T entity);++ public abstract boolean needsLogin();++ @Override+ public abstract String toString();++}diff --git a/core/src/main/java/io/onedev/server/util/query/EntityQuery.java b/core/src/main/java/io/onedev/server/util/query/EntityQuery.javanew file mode 100644index 0000000000..136610bc34--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/EntityQuery.java@@ -0,0 +1,98 @@+package io.onedev.server.util.query;++import java.io.Serializable;+import java.util.List;++import javax.persistence.criteria.Path;++import org.unbescape.java.JavaEscape;++import com.google.common.base.Splitter;++import io.onedev.server.exception.OneException;+import io.onedev.server.model.AbstractEntity;+import io.onedev.utils.WordUtils;++public abstract class EntityQuery<T extends AbstractEntity> implements Serializable {++ private static final long serialVersionUID = 1L;++ public abstract EntityCriteria<T> getCriteria();++ public abstract List<EntitySort> getSorts();++ public static String getValue(String tokenText) {+ String value = tokenText.substring(1);+ return JavaEscape.unescapeJava(value.substring(0, value.length()-1));+ }++ public static int getIntValue(String value) {+ try {+ return Integer.parseInt(value);+ } catch (NumberFormatException e) {+ throw new OneException("Invalid number: " + value);+ }+ }++ public static boolean getBooleanValue(String value) {+ if (value.equals("true"))+ return true;+ else if (value.equals("false"))+ return false;+ else+ throw new OneException("Invalid boolean: " + value);+ }++ public boolean needsLogin() {+ return getCriteria() != null && getCriteria().needsLogin();+ }++ public boolean matches(T entity) {+ return getCriteria() == null || getCriteria().matches(entity);+ }++ @Override+ public String toString() {+ StringBuilder builder = new StringBuilder();+ if (getCriteria() != null)+ builder.append(getCriteria().toString()).append(" ");+ else+ builder.append("all");+ if (!getSorts().isEmpty()) {+ builder.append("order by ");+ for (EntitySort sort: getSorts())+ builder.append(sort.toString()).append(" ");+ }+ return builder.toString().trim();+ }++ public static String quote(String value) {+ return "\"" + JavaEscape.escapeJava(value) + "\"";+ }++ public static <T> Path<T> getPath(Path<?> root, String pathName) {+ int index = pathName.indexOf('.');+ if (index != -1) {+ Path<T> path = root.get(pathName.substring(0, index));+ for (String field: Splitter.on(".").split(pathName.substring(index+1)))+ path = path.get(field);+ return path;+ } else {+ return root.get(pathName);+ }+ }++ public static String getRuleName(String[] lexerRuleNames, int rule) {+ return WordUtils.uncamel(lexerRuleNames[rule-1]).toLowerCase();+ }++ public static int getOperator(String[] lexerRuleNames, String operatorName) {+ for (int i=0; i<lexerRuleNames.length; i++) {+ String ruleName = lexerRuleNames[i];+ if (WordUtils.uncamel(ruleName).toLowerCase().equals(operatorName))+ return i+1;+ }+ throw new OneException("Unable to find operator: " + operatorName);+ }++}diff --git a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java b/core/src/main/java/io/onedev/server/util/query/EntitySort.javasimilarity index 54%rename from core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.javarename to core/src/main/java/io/onedev/server/util/query/EntitySort.javaindex 9a017fa7fb..ebcb18d704 100644--- a/core/src/main/java/io/onedev/server/model/support/issue/query/IssueSort.java+++ b/core/src/main/java/io/onedev/server/util/query/EntitySort.java@@ -1,8 +1,8 @@-package io.onedev.server.model.support.issue.query;+package io.onedev.server.util.query;import java.io.Serializable;-public class IssueSort implements Serializable {+public class EntitySort implements Serializable {private static final long serialVersionUID = 1L;@@ -10,7 +10,7 @@ public class IssueSort implements Serializable {private String field;- private IssueSort.Direction direction = Direction.ASCENDING;+ private EntitySort.Direction direction = Direction.ASCENDING;public String getField() {return field;@@ -20,20 +20,20 @@ public class IssueSort implements Serializable {this.field = field;}- public IssueSort.Direction getDirection() {+ public EntitySort.Direction getDirection() {return direction;}- public void setDirection(IssueSort.Direction direction) {+ public void setDirection(EntitySort.Direction direction) {this.direction = direction;}@Overridepublic String toString() {if (direction == Direction.ASCENDING)- return IssueQuery.quote(field) + " asc";+ return EntityQuery.quote(field) + " asc";else- return IssueQuery.quote(field) + " desc";+ return EntityQuery.quote(field) + " desc";}}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/util/query/NotCriteriaHelper.java b/core/src/main/java/io/onedev/server/util/query/NotCriteriaHelper.javanew file mode 100644index 0000000000..99477a5cdf--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/NotCriteriaHelper.java@@ -0,0 +1,38 @@+package io.onedev.server.util.query;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;++public class NotCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {++ private static final long serialVersionUID = 1L;++ private final EntityCriteria<T> criteria;++ public NotCriteriaHelper(EntityCriteria<T> criteria) {+ this.criteria = criteria;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<T> context) {+ return criteria.getPredicate(project, context).not();+ }++ @Override+ public boolean matches(T entity) {+ return !criteria.matches(entity);+ }++ @Override+ public boolean needsLogin() {+ return criteria.needsLogin();+ }++ @Override+ public String toString() {+ return "not(" + criteria.toString() + ")";+ }++}diff --git a/core/src/main/java/io/onedev/server/util/query/OrCriteriaHelper.java b/core/src/main/java/io/onedev/server/util/query/OrCriteriaHelper.javanew file mode 100644index 0000000000..3ebc38158d--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/OrCriteriaHelper.java@@ -0,0 +1,65 @@+package io.onedev.server.util.query;++import java.util.ArrayList;+import java.util.List;++import javax.persistence.criteria.Predicate;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.Project;++public class OrCriteriaHelper<T extends AbstractEntity> extends EntityCriteria<T> {++ private static final long serialVersionUID = 1L;++ private final List<? extends EntityCriteria<T>> criterias;++ public OrCriteriaHelper(List<? extends EntityCriteria<T>> criterias) {+ this.criterias = criterias;+ }++ @Override+ public Predicate getPredicate(Project project, QueryBuildContext<T> context) {+ List<Predicate> predicates = new ArrayList<>();+ for (EntityCriteria<T> criteria: criterias)+ predicates.add(criteria.getPredicate(project, context));+ return context.getBuilder().or(predicates.toArray(new Predicate[0]));+ }++ @Override+ public boolean matches(T entity) {+ for (EntityCriteria<T> criteria: criterias) {+ if (criteria.matches(entity))+ return true;+ }+ return false;+ }++ @Override+ public boolean needsLogin() {+ for (EntityCriteria<T> criteria: criterias) {+ if (criteria.needsLogin())+ return true;+ }+ return false;+ }++ @Override+ public String toString() {+ StringBuilder builder = new StringBuilder();+ for (int i=0; i<criterias.size(); i++) {+ EntityCriteria<T> criteria = criterias.get(i);+ if (i != 0)+ builder.append(" or ");+ if (criteria instanceof ParensAware) {+ builder.append("(");+ builder.append(criteria.toString());+ builder.append(")");+ } else {+ builder.append(criteria.toString());+ }+ }+ return builder.toString().trim();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/query/ParensAware.java b/core/src/main/java/io/onedev/server/util/query/ParensAware.javanew file mode 100644index 0000000000..1cd8aa4c75--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/ParensAware.java@@ -0,0 +1,5 @@+package io.onedev.server.util.query;++public interface ParensAware {++}diff --git a/core/src/main/java/io/onedev/server/util/query/QueryBuildContext.java b/core/src/main/java/io/onedev/server/util/query/QueryBuildContext.javanew file mode 100644index 0000000000..30431c66b5--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/QueryBuildContext.java@@ -0,0 +1,42 @@+package io.onedev.server.util.query;++import java.util.HashMap;+import java.util.Map;++import javax.persistence.criteria.CriteriaBuilder;+import javax.persistence.criteria.Join;+import javax.persistence.criteria.Root;++public abstract class QueryBuildContext<T> {++ private final Root<T> root;++ private final CriteriaBuilder builder;++ private final Map<String, Join<?, ?>> joins = new HashMap<>();++ public QueryBuildContext(Root<T> root, CriteriaBuilder builder) {+ this.root = root;+ this.builder = builder;+ }++ public Join<?, ?> getJoin(String joinPath) {+ Join<?, ?> join = joins.get(joinPath);+ if (join == null) {+ join = newJoin(joinPath);+ joins.put(joinPath, join);+ }+ return join;+ }++ protected abstract Join<?, ?> newJoin(String joinPath);++ public Root<T> getRoot() {+ return root;+ }++ public CriteriaBuilder getBuilder() {+ return builder;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/query/QueryWatchBuilder.java b/core/src/main/java/io/onedev/server/util/query/QueryWatchBuilder.javanew file mode 100644index 0000000000..7df4b8ed78--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/query/QueryWatchBuilder.java@@ -0,0 +1,72 @@+package io.onedev.server.util.query;++import java.util.Collection;+import java.util.HashMap;+import java.util.Map;+import java.util.Optional;++import javax.annotation.Nullable;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.User;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.model.support.QuerySetting;++public abstract class QueryWatchBuilder<T extends AbstractEntity> {++ private final Map<String, Optional<EntityQuery<T>>> parsedQueries = new HashMap<>();++ private final Map<User, Boolean> watches = new HashMap<>();++ public QueryWatchBuilder() {+ for (QuerySetting<?> querySetting: getQuerySettings()) {+ boolean watched = false;+ for (Map.Entry<String, Boolean> entry: querySetting.getUserQueryWatches().entrySet()) {+ if (matches(querySetting.getUserQuery(entry.getKey()))) {+ watches.putIfAbsent(querySetting.getUser(), entry.getValue());+ watched = true;+ break;+ }+ }+ if (!watched) {+ for (Map.Entry<String, Boolean> entry: querySetting.getProjectQueryWatches().entrySet()) {+ if (matches(getSavedProjectQuery(entry.getKey()))) {+ watches.putIfAbsent(querySetting.getUser(), entry.getValue());+ watched = true;+ break;+ }+ }+ }+ }+ }++ private boolean matches(@Nullable NamedQuery namedQuery) {+ if (namedQuery != null) {+ Optional<EntityQuery<T>> entityQuery = parsedQueries.get(namedQuery.getQuery());+ if (entityQuery == null) {+ try {+ entityQuery = Optional.of(parse(namedQuery.getQuery()));+ } catch (Exception e) {+ entityQuery = Optional.empty();+ }+ parsedQueries.put(namedQuery.getQuery(), entityQuery);+ }+ return entityQuery.isPresent() && entityQuery.get().matches(getEntity());+ } else {+ return false;+ }+ }++ protected abstract T getEntity();++ protected abstract Collection<? extends QuerySetting<?>> getQuerySettings();++ protected abstract EntityQuery<T> parse(String queryString);++ protected abstract NamedQuery getSavedProjectQuery(String name);++ public Map<User, Boolean> getWatches() {+ return watches;+ }++}diff --git a/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.javanew file mode 100644index 0000000000..d92c550978--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/validation/PullRequestQueryValidator.java@@ -0,0 +1,40 @@+package io.onedev.server.util.validation;++import javax.validation.ConstraintValidator;+import javax.validation.ConstraintValidatorContext;++import io.onedev.server.model.Project;+import io.onedev.server.util.OneContext;+import io.onedev.server.web.editable.annotation.PullRequestQuery;+import io.onedev.utils.StringUtils;++public class PullRequestQueryValidator implements ConstraintValidator<PullRequestQuery, String> {++ @Override+ public void initialize(PullRequestQuery constaintAnnotation) {+ }++ @Override+ public boolean isValid(String value, ConstraintValidatorContext constraintContext) {+ if (value == null) {+ return true;+ } else {+ Project project = OneContext.get().getProject();+ try {+ io.onedev.server.model.support.pullrequest.query.PullRequestQuery.parse(project, value, true);+ return true;+ } catch (Exception e) {+ constraintContext.disableDefaultConstraintViolation();+ String message;+ if (StringUtils.isNotBlank(e.getMessage()))+ message = e.getMessage();+ else+ message = "Malformed pull request query";++ constraintContext.buildConstraintViolationWithTemplate(message).addConstraintViolation();+ return false;+ }+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.javaindex c0418f81ad..3fc03fb8da 100644--- a/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java+++ b/core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java@@ -33,6 +33,7 @@ import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.query.IssueQueryParser;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Constants;+import io.onedev.server.util.DateUtils;import io.onedev.server.util.EditContext;import io.onedev.server.util.OneContext;import io.onedev.server.util.inputspec.InputContext;@@ -58,11 +59,6 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {private static final String VALUE_CLOSE = "\"";- private static final List<String> DATE_EXAMPLES = Lists.newArrayList(- "one hour ago", "2 hours ago", "3PM", "noon", "today", "yesterday",- "yesterday midnight", "3 days ago", "last week", "last Monday",- "4 weeks ago", "1 month 2 days ago", "1 year ago");-private static final int MAX_ISSUE_TITLE_LEN = 75;public IssueQueryBehavior(IModel<Project> projectModel) {@@ -95,6 +91,22 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {if (spec.getRuleName().equals("Quoted")) {return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {+ private List<InputSuggestion> getUserSuggestions(String matchWith) {+ List<InputSuggestion> suggestions = new ArrayList<>();+ for (User user: OneDev.getInstance(UserManager.class).findAll()) {+ Range match = Range.match(user.getName(), matchWith, true, false, true);+ if (match != null) {+ String description;+ if (!user.getDisplayName().equals(user.getName()))+ description = user.getDisplayName();+ else+ description = null;+ suggestions.add(new InputSuggestion(user.getName(), description, match).escape("\"\\"));+ }+ }+ return suggestions;+ }+@Overrideprotected List<InputSuggestion> match(String unfencedMatchWith) {String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();@@ -102,13 +114,14 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {Project project = getProject();if ("criteriaField".equals(spec.getLabel())) {- List<String> candidates = new ArrayList<>(Issue.BUILTIN_FIELDS.keySet());+ List<String> candidates = new ArrayList<>(Issue.FIELD_PATHS.keySet());+ candidates.remove(Issue.FIELD_SUBMITTER);for (InputSpec field: project.getIssueWorkflow().getFieldSpecs())candidates.add(field.getName());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));} else if ("orderField".equals(spec.getLabel())) {- List<String> candidates = Lists.newArrayList(Issue.VOTES, Issue.COMMENTS, Issue.NUMBER,- Issue.SUBMIT_DATE, Issue.UPDATE_DATE);+ List<String> candidates = Lists.newArrayList(Issue.FIELD_VOTE_COUNT, Issue.FIELD_COMMENT_COUNT, Issue.FIELD_NUMBER,+ Issue.FIELD_SUBMIT_DATE, Issue.FIELD_UPDATE_DATE);for (InputSpec field: project.getIssueWorkflow().getFieldSpecs()) {if (field instanceof NumberInput || field instanceof ChoiceInput || field instanceof DateInput)candidates.add(field.getName());@@ -116,66 +129,59 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));} else if ("criteriaValue".equals(spec.getLabel())) {List<Element> fieldElements = expectedElement.getParent().findChildrenByLabel("criteriaField", true);- Preconditions.checkState(fieldElements.size() == 1);- String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());- List<Element> operatorElements = expectedElement.getParent().findChildrenByLabel("operator", true);- Preconditions.checkState(operatorElements.size() == 1);- String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());-- try {- IssueQuery.checkField(project, fieldName, IssueQuery.getOperator(operatorName));- InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);- if (fieldSpec instanceof DateInput || fieldName.equals(Issue.SUBMIT_DATE)- || fieldName.equals(Issue.UPDATE_DATE)) {- List<String> candidates = new ArrayList<>(DATE_EXAMPLES);- candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));- candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, null));- CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));- } else if (fieldName.equals(Issue.SUBMITTER) || fieldSpec instanceof UserChoiceInput) {- for (User user: OneDev.getInstance(UserManager.class).findAll()) {- Range match = Range.match(user.getName(), unfencedLowerCaseMatchWith, true, false, true);- if (match != null) {- String description;- if (!user.getDisplayName().equals(user.getName()))- description = user.getDisplayName();- else- description = null;- suggestions.add(new InputSuggestion(user.getName(), description, match).escape("\"\\"));+ if (fieldElements.isEmpty()) {+ suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));+ } else {+ String fieldName = IssueQuery.getValue(fieldElements.get(0).getMatchedText());+ List<Element> operatorElements = expectedElement.getParent().findChildrenByLabel("operator", true);+ Preconditions.checkState(operatorElements.size() == 1);+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());++ try {+ IssueQuery.checkField(project, fieldName, IssueQuery.getOperator(operatorName));+ InputSpec fieldSpec = project.getIssueWorkflow().getFieldSpec(fieldName);+ if (fieldSpec instanceof DateInput || fieldName.equals(Issue.FIELD_SUBMIT_DATE)+ || fieldName.equals(Issue.FIELD_UPDATE_DATE)) {+ List<String> candidates = new ArrayList<>(DateUtils.RELAX_DATE_EXAMPLES);+ candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));+ candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, null));+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));+ } else if (fieldSpec instanceof UserChoiceInput) {+ suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));+ } else if (fieldSpec instanceof IssueChoiceInput) {+ List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);+ for (Issue issue: issues) {+ InputSuggestion suggestion = new InputSuggestion("#" + issue.getNumber(), StringUtils.abbreviate(issue.getTitle(), MAX_ISSUE_TITLE_LEN), null);+ suggestions.add(suggestion);}- }- } else if (fieldSpec instanceof IssueChoiceInput) {- List<Issue> issues = OneDev.getInstance(IssueManager.class).query(project, unfencedLowerCaseMatchWith, InputAssistBehavior.MAX_SUGGESTIONS);- for (Issue issue: issues) {- InputSuggestion suggestion = new InputSuggestion("#" + issue.getNumber(), StringUtils.abbreviate(issue.getTitle(), MAX_ISSUE_TITLE_LEN), null);- suggestions.add(suggestion);- }- } else if (fieldSpec instanceof BooleanInput) {- suggestions.addAll(getSuggestions(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith, null));- } else if (fieldSpec instanceof GroupChoiceInput) {- List<String> candidates = OneDev.getInstance(GroupManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));- } else if (fieldName.equals(Issue.STATE)) {- List<String> candidates = project.getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));- } else if (fieldSpec instanceof ChoiceInput) {- OneContext.push(newOneContext());- try {- List<String> candidates = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());+ } else if (fieldSpec instanceof BooleanInput) {+ suggestions.addAll(getSuggestions(Lists.newArrayList("true", "false"), unfencedLowerCaseMatchWith, null));+ } else if (fieldSpec instanceof GroupChoiceInput) {+ List<String> candidates = OneDev.getInstance(GroupManager.class).findAll().stream().map(it->it.getName()).collect(Collectors.toList());+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } else if (fieldName.equals(Issue.FIELD_STATE)) {+ List<String> candidates = project.getIssueWorkflow().getStateSpecs().stream().map(it->it.getName()).collect(Collectors.toList());suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));- } finally {- OneContext.pop();- }- } else if (fieldName.equals(Issue.MILESTONE)) {- List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());- suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));- } else if (fieldName.equals(Issue.TITLE) || fieldName.equals(Issue.DESCRIPTION)- || fieldName.equals(Issue.VOTES) || fieldName.equals(Issue.COMMENTS)- || fieldName.equals(Issue.NUMBER) || fieldSpec instanceof NumberInput- || fieldSpec instanceof TextInput) {- return null;+ } else if (fieldSpec instanceof ChoiceInput) {+ OneContext.push(newOneContext());+ try {+ List<String> candidates = new ArrayList<>(((ChoiceInput)fieldSpec).getChoiceProvider().getChoices(true).keySet());+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } finally {+ OneContext.pop();+ }+ } else if (fieldName.equals(Issue.FIELD_MILESTONE)) {+ List<String> candidates = project.getMilestones().stream().map(it->it.getName()).collect(Collectors.toList());+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } else if (fieldName.equals(Issue.FIELD_TITLE) || fieldName.equals(Issue.FIELD_DESCRIPTION)+ || fieldName.equals(Issue.FIELD_VOTE_COUNT) || fieldName.equals(Issue.FIELD_COMMENT_COUNT)+ || fieldName.equals(Issue.FIELD_NUMBER) || fieldSpec instanceof NumberInput+ || fieldSpec instanceof TextInput) {+ return null;+ }+ } catch (OneException ex) {}- } catch (OneException ex) {}}return suggestions;diff --git a/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.javanew file mode 100644index 0000000000..b6a9fbc983--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java@@ -0,0 +1,202 @@+package io.onedev.server.web.behavior;++import java.util.ArrayList;+import java.util.List;++import org.apache.commons.collections4.CollectionUtils;+import org.apache.commons.lang3.StringUtils;+import org.apache.wicket.Component;+import org.apache.wicket.model.IModel;++import com.google.common.base.Optional;+import com.google.common.base.Preconditions;+import com.google.common.collect.Lists;++import io.onedev.codeassist.FenceAware;+import io.onedev.codeassist.InputSuggestion;+import io.onedev.codeassist.ParentedElement;+import io.onedev.codeassist.grammar.ElementSpec;+import io.onedev.codeassist.grammar.LexerRuleRefElementSpec;+import io.onedev.codeassist.grammar.LiteralElementSpec;+import io.onedev.codeassist.grammar.RuleRefElementSpec;+import io.onedev.codeassist.parser.Element;+import io.onedev.server.OneDev;+import io.onedev.server.exception.OneException;+import io.onedev.server.git.GitUtils;+import io.onedev.server.git.RefInfo;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.manager.UserManager;+import io.onedev.server.model.Project;+import io.onedev.server.model.PullRequest;+import io.onedev.server.model.User;+import io.onedev.server.model.support.pullrequest.CloseInfo;+import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryLexer;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryParser;+import io.onedev.server.util.Constants;+import io.onedev.server.util.DateUtils;+import io.onedev.server.web.behavior.inputassist.ANTLRAssistBehavior;+import io.onedev.utils.Range;++@SuppressWarnings("serial")+public class PullRequestQueryBehavior extends ANTLRAssistBehavior {++ private final IModel<Project> projectModel;++ private static final String VALUE_OPEN = "\"";++ private static final String VALUE_CLOSE = "\"";++ public PullRequestQueryBehavior(IModel<Project> projectModel) {+ super(PullRequestQueryParser.class, "query");+ this.projectModel = projectModel;+ }++ @Override+ public void detach(Component component) {+ super.detach(component);+ projectModel.detach();+ }++ private Project getProject() {+ return projectModel.getObject();+ }++ @Override+ protected int getEndOfMatch(ElementSpec spec, String content) {+ if (content.startsWith(VALUE_OPEN+VALUE_CLOSE))+ return 2;+ else+ return super.getEndOfMatch(spec, content);+ }++ @Override+ protected List<InputSuggestion> suggest(ParentedElement expectedElement, String matchWith) {+ if (expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {+ LexerRuleRefElementSpec spec = (LexerRuleRefElementSpec) expectedElement.getSpec();+ if (spec.getRuleName().equals("Quoted")) {+ return new FenceAware(codeAssist.getGrammar(), VALUE_OPEN, VALUE_CLOSE) {++ private List<InputSuggestion> getUserSuggestions(String matchWith) {+ List<InputSuggestion> suggestions = new ArrayList<>();+ for (User user: OneDev.getInstance(UserManager.class).findAll()) {+ Range match = Range.match(user.getName(), matchWith, true, false, true);+ if (match != null) {+ String description;+ if (!user.getDisplayName().equals(user.getName()))+ description = user.getDisplayName();+ else+ description = null;+ suggestions.add(new InputSuggestion(user.getName(), description, match).escape("\"\\"));+ }+ }+ return suggestions;+ }++ @Override+ protected List<InputSuggestion> match(String unfencedMatchWith) {+ String unfencedLowerCaseMatchWith = unfencedMatchWith.toLowerCase();+ List<InputSuggestion> suggestions = new ArrayList<>();+ Project project = getProject();++ if ("criteriaField".equals(spec.getLabel())) {+ List<String> candidates = new ArrayList<>(PullRequest.FIELD_PATHS.keySet());+ candidates.remove(PullRequest.FIELD_SUBMITTER);+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } else if ("orderField".equals(spec.getLabel())) {+ List<String> candidates = Lists.newArrayList(PullRequest.FIELD_NUMBER,+ PullRequest.FIELD_SUBMIT_DATE, PullRequest.FIELD_UPDATE_DATE, PullRequest.FIELD_CLOSE_DATE);+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } else if ("criteriaValue".equals(spec.getLabel())) {+ List<Element> fieldElements = expectedElement.getParent().findChildrenByLabel("criteriaField", true);+ List<Element> operatorElements = expectedElement.getParent().findChildrenByLabel("operator", true);+ Preconditions.checkState(operatorElements.size() == 1);+ String operatorName = StringUtils.normalizeSpace(operatorElements.get(0).getMatchedText());+ int operator = PullRequestQuery.getOperator(operatorName);+ if (fieldElements.isEmpty()) {+ if (operator != PullRequestQueryLexer.ContainsCommit)+ suggestions.addAll(getUserSuggestions(unfencedLowerCaseMatchWith));+ else+ return null;+ } else {+ String fieldName = PullRequestQuery.getValue(fieldElements.get(0).getMatchedText());++ try {+ PullRequestQuery.checkField(project, fieldName, operator);+ if (fieldName.equals(PullRequest.FIELD_SUBMIT_DATE) || fieldName.equals(PullRequest.FIELD_UPDATE_DATE)+ || fieldName.equals(PullRequest.FIELD_CLOSE_DATE)) {+ List<String> candidates = new ArrayList<>(DateUtils.RELAX_DATE_EXAMPLES);+ candidates.add(Constants.DATETIME_FORMATTER.print(System.currentTimeMillis()));+ candidates.add(Constants.DATE_FORMATTER.print(System.currentTimeMillis()));+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, null));+ CollectionUtils.addIgnoreNull(suggestions, suggestToFence(unfencedMatchWith));+ } else if (fieldName.equals(PullRequest.FIELD_STATE)) {+ List<String> candidates = Lists.newArrayList(PullRequest.STATE_OPEN);+ for (CloseInfo.Status status: CloseInfo.Status.values())+ candidates.add(status.toString());+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } else if (fieldName.equals(PullRequest.FIELD_SOURCE_PROJECT)) {+ List<String> candidates = new ArrayList<>();+ for (Project each: OneDev.getInstance(ProjectManager.class).findAll())+ candidates.add(each.getName());+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } else if (fieldName.equals(PullRequest.FIELD_TARGET_BRANCH) || fieldName.equals(PullRequest.FIELD_SOURCE_BRANCH)) {+ List<String> candidates = new ArrayList<>();+ for (RefInfo refInfo: project.getBranches())+ candidates.add(GitUtils.ref2branch(refInfo.getRef().getName()));+ suggestions.addAll(getSuggestions(candidates, unfencedLowerCaseMatchWith, "\"\\"));+ } else if (fieldName.equals(PullRequest.FIELD_TITLE) || fieldName.equals(PullRequest.FIELD_DESCRIPTION)+ || fieldName.equals(PullRequest.FIELD_NUMBER)) {+ return null;+ }+ } catch (OneException ex) {+ }+ }+ }+ return suggestions;+ }++ @Override+ protected String getFencingDescription() {+ return "quote as literal value";+ }++ }.suggest(expectedElement.getSpec(), matchWith);+ }+ }+ return null;+ }++ @Override+ protected List<String> getHints(ParentedElement expectedElement, String matchWith) {+ List<String> hints = super.getHints(expectedElement, matchWith);+ if (expectedElement.getSpec() instanceof LiteralElementSpec+ || expectedElement.getSpec() instanceof LexerRuleRefElementSpec) {+ hints.add("Input text without space to match options");+ }+ return hints;+ }++ @Override+ protected Optional<String> describe(ParentedElement expectedElement, String suggestedLiteral) {+ if (expectedElement.getParent() != null+ && expectedElement.getParent().getParent() != null+ && expectedElement.getParent().getParent().getSpec() instanceof RuleRefElementSpec) {+ RuleRefElementSpec ruleRefElementSpec = (RuleRefElementSpec) expectedElement.getParent().getParent().getSpec();+ if (ruleRefElementSpec.getRuleName().equals("criteria")) {+ List<Element> fieldElements = expectedElement.getParent().getParent()+ .findChildrenByLabel("criteriaField", false);+ if (!fieldElements.isEmpty()) {+ String fieldName = PullRequestQuery.getValue(fieldElements.iterator().next().getMatchedText());+ try {+ PullRequestQuery.checkField(getProject(), fieldName, PullRequestQuery.getOperator(suggestedLiteral));+ } catch (OneException e) {+ return null;+ }+ }+ }+ }+ return super.describe(expectedElement, suggestedLiteral);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.java b/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.javasimilarity index 84%rename from core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.javarename to core/src/main/java/io/onedev/server/web/component/RequestStateLabel.javaindex 8a7351ddc4..32a5d4fc0c 100644--- a/core/src/main/java/io/onedev/server/web/component/RequestStatusLabel.java+++ b/core/src/main/java/io/onedev/server/web/component/RequestStateLabel.java@@ -10,11 +10,11 @@ import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.pullrequest.CloseInfo;@SuppressWarnings("serial")-public class RequestStatusLabel extends Label {+public class RequestStateLabel extends Label {private final IModel<PullRequest> requestModel;- public RequestStatusLabel(String id, IModel<PullRequest> requestModel) {+ public RequestStateLabel(String id, IModel<PullRequest> requestModel) {super(id, new LoadableDetachableModel<String>() {@Override@@ -22,9 +22,9 @@ public class RequestStatusLabel extends Label {PullRequest request = requestModel.getObject();CloseInfo closeInfo = request.getCloseInfo();if (closeInfo == null)- return "OPEN";+ return PullRequest.STATE_OPEN;else- return closeInfo.getCloseStatus().toString();+ return closeInfo.getStatus().toString();}});@@ -43,7 +43,7 @@ public class RequestStatusLabel extends Label {CloseInfo closeInfo = request.getCloseInfo();if (closeInfo == null)return "label label-warning request-status";- else if (closeInfo.getCloseStatus() == CloseInfo.Status.MERGED)+ else if (closeInfo.getStatus() == CloseInfo.Status.MERGED)return "label label-success request-status";elsereturn "label label-danger request-status";diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.htmlindex 248f95f67a..0211b485e9 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html@@ -33,8 +33,8 @@</div><div wicket:id="content" class="content"></div><div wicket:id="lastActivity" class="last-activity">- <a wicket:id="user" class="user"></a>- <span wicket:id="action"></span>+ <span wicket:id="user"></span>+ <span wicket:id="description"></span><span wicket:id="date"></span></div></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.javaindex 6966087736..0499680edc 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java@@ -54,11 +54,12 @@ import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;import io.onedev.server.web.util.PagingHistorySupport;@SuppressWarnings("serial")-public abstract class CodeCommentListPanel extends Panel {+public class CodeCommentListPanel extends Panel {private final IModel<CodeCommentFilter> filterOptionModel;@@ -121,7 +122,8 @@ public abstract class CodeCommentListPanel extends Panel {} else {PullRequest request = getPullRequest();if (request != null) {- setResponsePage(RequestChangesPage.class, RequestChangesPage.paramsOf(request, comment));+ RequestDetailPage page = (RequestDetailPage) getPage();+ setResponsePage(RequestChangesPage.class, RequestChangesPage.paramsOf(request, page.getPosition(), comment));} else {String compareCommit = comment.getCompareContext().getCompareCommit();if (!compareCommit.equals(comment.getMarkPos().getCommit())@@ -187,12 +189,9 @@ public abstract class CodeCommentListPanel extends Panel {WebMarkupContainer lastActivityContainer = new WebMarkupContainer("lastActivity");if (comment.getLastActivity() != null) {- String action = comment.getLastActivity().getDescription();- lastActivityContainer.add(new Label("action", action));-- userForDisplay = User.getForDisplay(comment.getLastActivity().getUser(),- comment.getLastActivity().getUserName());- lastActivityContainer.add(new UserLink("user", userForDisplay));+ lastActivityContainer.add(new Label("user", comment.getLastActivity().getUserName())+ .setVisible(comment.getLastActivity().getUserName()!=null));+ lastActivityContainer.add(new Label("description", comment.getLastActivity().getDescription()));lastActivityContainer.add(new Label("date", DateUtils.formatAge(comment.getLastActivity().getDate())));} else {lastActivityContainer.add(new WebMarkupContainer("action"));@@ -306,6 +305,11 @@ public abstract class CodeCommentListPanel extends Panel {}@Nullable- protected abstract PullRequest getPullRequest();+ private PullRequest getPullRequest() {+ if (getPage() instanceof RequestDetailPage)+ return ((RequestDetailPage)getPage()).getPullRequest();+ else+ return null;+ }}diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.htmlindex ce21dd5c1d..c4bb83644a 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="code-comment"><a wicket:id="outdatedContext" class="outdated-context">- <i class="fa fa-warning"></i> comment context out dated, click to update+ <i class="fa fa-warning"></i> comment context outdated, click to update</a><div wicket:id="comment" class="comment section"></div><div wicket:id="replies" class="reply section"></div>diff --git a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.javaindex bea3e5d2bb..2f8c6ecd75 100644--- a/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentPanel.java@@ -39,7 +39,7 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.server.OneDev;import io.onedev.server.manager.CodeCommentManager;import io.onedev.server.manager.CodeCommentReplyManager;-import io.onedev.server.manager.VisitManager;+import io.onedev.server.manager.UserInfoManager;import io.onedev.server.model.CodeComment;import io.onedev.server.model.CodeCommentReply;import io.onedev.server.model.Project;@@ -55,8 +55,10 @@ import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.markdown.MarkdownViewer;import io.onedev.server.web.component.projectcomment.CommentInput;import io.onedev.server.web.page.project.blob.ProjectBlobPage;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;import io.onedev.server.web.util.ProjectAttachmentSupport;+import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.util.ajaxlistener.ConfirmListener;import io.onedev.server.web.websocket.PageDataChanged;@@ -399,7 +401,12 @@ public abstract class CodeCommentPanel extends Panel {super.onInitialize();if (getPullRequest() != null) {- PageParameters params = RequestChangesPage.paramsOf(getPullRequest(), getComment());+ QueryPosition position;+ if (getPage() instanceof RequestDetailPage)+ position = ((RequestDetailPage)getPage()).getPosition();+ else+ position = null;+ PageParameters params = RequestChangesPage.paramsOf(getPullRequest(), position, getComment());add(new BookmarkablePageLink<Void>("outdatedContext", RequestChangesPage.class, params) {@Override@@ -484,7 +491,7 @@ public abstract class CodeCommentPanel extends Panel {@Overridepublic void onEndRequest(RequestCycle cycle) {if (SecurityUtils.getUser() != null) {- OneDev.getInstance(VisitManager.class).visitCodeComment(SecurityUtils.getUser(), getComment());+ OneDev.getInstance(UserInfoManager.class).visitCodeComment(SecurityUtils.getUser(), getComment());}}diff --git a/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavCssResourceReference.javanew file mode 100644index 0000000000..3f878ec084--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.entitynav;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class EntityNavCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public EntityNavCssResourceReference() {+ super(EntityNavCssResourceReference.class, "entity-nav.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.html b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.htmlnew file mode 100644index 0000000000..0ad1e1a14e--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.html@@ -0,0 +1,7 @@+<wicket:panel>+ <div class="entity-nav">+ <a wicket:id="prev" class="prev"><i class="fa fa-arrow-left"></i></a>+ <span wicket:id="current"></span>+ <a wicket:id="next" class="next"><i class="fa fa-arrow-right"></i></a>+ </div>+</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.javanew file mode 100644index 0000000000..d9b8f8e9ee--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitynav/EntityNavPanel.java@@ -0,0 +1,140 @@+package io.onedev.server.web.component.entitynav;++import java.util.List;++import javax.annotation.Nullable;++import org.apache.wicket.markup.ComponentTag;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.link.Link;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.protocol.http.WebSession;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.util.query.EntityQuery;+import io.onedev.server.web.util.QueryPosition;+import io.onedev.utils.ReflectionUtils;+import io.onedev.utils.WordUtils;++@SuppressWarnings("serial")+public abstract class EntityNavPanel<T extends AbstractEntity> extends Panel {++ private final String entityName;++ public EntityNavPanel(String id) {+ super(id);++ List<Class<?>> typeArguments = ReflectionUtils.getTypeArguments(EntityNavPanel.class, getClass());+ entityName = WordUtils.uncamel(typeArguments.get(0).getSimpleName()).toLowerCase();+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPosition() != null);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ add(new Link<Void>("next") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(getPosition().getOffset()>0);+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (getPosition().getOffset() <= 0)+ tag.put("disabled", "disabled");+ tag.put("title", "Next " + entityName);+ }++ @Override+ public void onClick() {+ EntityQuery<T> query = parse(getPosition().getQuery());+ int count = getPosition().getCount();+ int offset = getPosition().getOffset() - 1;+ List<T> entities = query(query, offset, 1);+ if (!entities.isEmpty()) {+ if (!query.matches(getEntity()))+ count--;+ QueryPosition prevPosition = new QueryPosition(getPosition().getQuery(), count, offset);+ navTo(entities.get(0), prevPosition);+ } else {+ WebSession.get().warn("No more " + entityName + "s");+ }+ }++ });+ add(new Link<Void>("prev") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(getPosition().getOffset()<getPosition().getCount()-1);+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ if (getPosition().getOffset() >= getPosition().getCount()-1)+ tag.put("disabled", "disabled");+ tag.put("title", "Previous " + entityName);+ }++ @Override+ public void onClick() {+ EntityQuery<T> query = parse(getPosition().getQuery());+ int offset = getPosition().getOffset();+ int count = getPosition().getCount();+ if (query.matches(getEntity()))+ offset++;+ else+ count--;++ List<T> entities = query(query, offset, 1);+ if (!entities.isEmpty()) {+ QueryPosition nextPosition = new QueryPosition(getPosition().getQuery(), count, offset);+ navTo(entities.get(0), nextPosition);+ } else {+ WebSession.get().warn("No more " + entityName + "s");+ }+ }++ });++ add(new Label("current", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return entityName + " " + (getPosition().getCount()-getPosition().getOffset()) + " of " + getPosition().getCount();+ }++ }));+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new EntityNavCssResourceReference()));+ }++ protected abstract EntityQuery<T> parse(String queryString);++ protected abstract T getEntity();++ @Nullable+ protected abstract QueryPosition getPosition();++ protected abstract void navTo(T entity, QueryPosition position);++ protected abstract List<T> query(EntityQuery<T> query, int offset, int count);++}diff --git a/core/src/main/java/io/onedev/server/web/component/entitynav/entity-nav.css b/core/src/main/java/io/onedev/server/web/component/entitynav/entity-nav.cssnew file mode 100644index 0000000000..24fe8a8a69--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitynav/entity-nav.css@@ -0,0 +1,21 @@+.entity-nav {+ font-size: 16px;+ position: relative;+ text-align: center;+}+.entity-nav a {+ position: absolute;+ color: #666;+ top: 0;+}+.entity-nav a[disabled] {+ color: #BBB;+ cursor: default;+}+.entity-nav .prev {+ left: 0;+}+.entity-nav .next {+ right: 0;+}+diff --git a/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesCssResourceReference.java b/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesCssResourceReference.javanew file mode 100644index 0000000000..d99bc82d35--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.component.entitywatches;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class EntityWatchesCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public EntityWatchesCssResourceReference() {+ super(EntityWatchesCssResourceReference.class, "entity-watches.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesPanel.html b/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesPanel.htmlnew file mode 100644index 0000000000..4d1e55eb14--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesPanel.html@@ -0,0 +1,15 @@+<wicket:panel>+ <div class="entity-watches">+ <div class="head"><span wicket:id="title"></span></div>+ <div class="body">+ <wicket:enclosure child="watchers">+ <div class="watchers">+ <span wicket:id="watchers"><a wicket:id="watcher" class="avatar"></a></span> <a wicket:id="more">and more</a>+ </div>+ </wicket:enclosure>+ <div class="actions">+ <a wicket:id="watch" class="watch-status btn btn-sm btn-default"></a>+ </div>+ </div>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesPanel.java b/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesPanel.javanew file mode 100644index 0000000000..8802a0cb63--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitywatches/EntityWatchesPanel.java@@ -0,0 +1,168 @@+package io.onedev.server.web.component.entitywatches;++import java.util.ArrayList;+import java.util.Collections;+import java.util.Comparator;+import java.util.List;+import java.util.stream.Collectors;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;++import io.onedev.server.model.AbstractEntity;+import io.onedev.server.model.User;+import io.onedev.server.model.support.EntityWatch;+import io.onedev.server.model.support.WatchStatus;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.avatar.AvatarLink;+import io.onedev.server.web.component.userlist.UserListLink;+import io.onedev.server.web.component.watchstatus.WatchStatusLink;++@SuppressWarnings("serial")+public abstract class EntityWatchesPanel extends Panel {++ private static final int MAX_DISPLAY_AVATARS = 20;++ public EntityWatchesPanel(String id) {+ super(id);+ }++ private List<EntityWatch> getEffectWatches() {+ List<EntityWatch> watches = new ArrayList<>();+ for (EntityWatch watch: getEntity().getWatches()) {+ if (watch.isWatching())+ watches.add(watch);+ }+ Collections.sort(watches, new Comparator<EntityWatch>() {++ @Override+ public int compare(EntityWatch o1, EntityWatch o2) {+ return o2.getId().compareTo(o1.getId());+ }++ });+ return watches;+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new Label("title", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ return "Watchers(" + String.valueOf(getEffectWatches().size()) + ")";+ }++ }));++ add(new ListView<EntityWatch>("watchers", new LoadableDetachableModel<List<EntityWatch>>() {++ @Override+ protected List<EntityWatch> load() {+ List<EntityWatch> watches = getEffectWatches();+ if (watches.size() > MAX_DISPLAY_AVATARS)+ watches = watches.subList(0, MAX_DISPLAY_AVATARS);+ return watches;+ }++ }) {++ @Override+ protected void populateItem(ListItem<EntityWatch> item) {+ User user = item.getModelObject().getUser();+ item.add(new AvatarLink("watcher", user, user.getDisplayName()));+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getEffectWatches().isEmpty());+ }++ });++ add(new UserListLink("more") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getEffectWatches().size() > MAX_DISPLAY_AVATARS);+ }++ @Override+ protected List<User> getUsers() {+ List<EntityWatch> watches = getEffectWatches();+ if (watches.size() > MAX_DISPLAY_AVATARS)+ watches = watches.subList(MAX_DISPLAY_AVATARS, watches.size());+ else+ watches = new ArrayList<>();+ return watches.stream().map(it->it.getUser()).collect(Collectors.toList());+ }++ });++ add(new WatchStatusLink("watch") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.getUser() != null);+ }++ @Override+ protected WatchStatus getWatchStatus() {+ EntityWatch watch = getEntity().getWatch(SecurityUtils.getUser(), false);+ if (watch != null && !watch.isWatching())+ return WatchStatus.DO_NOT_WATCH;+ else if (watch != null && watch.isWatching())+ return WatchStatus.WATCH;+ else+ return WatchStatus.DEFAULT;+ }++ @Override+ protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {+ if (watchStatus == WatchStatus.DO_NOT_WATCH) {+ EntityWatch watch = getEntity().getWatch(SecurityUtils.getUser(), true);+ watch.setWatching(false);+ onSaveWatch(watch);+ } else if (watchStatus == WatchStatus.WATCH) {+ EntityWatch watch = getEntity().getWatch(SecurityUtils.getUser(), true);+ watch.setWatching(true);+ onSaveWatch(watch);+ } else {+ EntityWatch watch = getEntity().getWatch(SecurityUtils.getUser(), false);+ if (watch != null) {+ getEntity().getWatches().remove(watch);+ onDeleteWatch(watch);+ }+ }+ target.add(EntityWatchesPanel.this);+ }++ });++ setOutputMarkupId(true);+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new EntityWatchesCssResourceReference()));+ }++ protected abstract AbstractEntity getEntity();++ protected abstract void onSaveWatch(EntityWatch watch);++ protected abstract void onDeleteWatch(EntityWatch watch);++}diff --git a/core/src/main/java/io/onedev/server/web/component/entitywatches/entity-watches.css b/core/src/main/java/io/onedev/server/web/component/entitywatches/entity-watches.cssnew file mode 100644index 0000000000..d0b4538b60--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/entitywatches/entity-watches.css@@ -0,0 +1,10 @@+.entity-watches>.head {+ font-weight: bold;+ margin-bottom: 16px;+}+.entity-watches .body>* {+ margin-bottom: 16px;+}+.entity-watches>.body a.avatar {+ margin-right: 8px;+}diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.javaindex bbfc96b940..bc7c34e777 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/BatchEditPanel.java@@ -99,20 +99,20 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overridepublic Boolean getObject() {- return selectedFields.contains(Issue.MILESTONE);+ return selectedFields.contains(Issue.FIELD_MILESTONE);}@Overridepublic void setObject(Boolean object) {if (object)- selectedFields.add(Issue.MILESTONE);+ selectedFields.add(Issue.FIELD_MILESTONE);else- selectedFields.remove(Issue.MILESTONE);+ selectedFields.remove(Issue.FIELD_MILESTONE);}}).add(newOnChangeBehavior(form)));- List<String> customFieldNames = Lists.newArrayList(Issue.STATE);+ List<String> customFieldNames = Lists.newArrayList(Issue.FIELD_STATE);customFieldNames.addAll(getProject().getIssueWorkflow().getFieldNames());form.add(new ListView<String>("customFields", customFieldNames) {@@ -161,8 +161,8 @@ abstract class BatchEditPanel extends Panel implements InputContext {}Set<String> excludedProperties = new HashSet<>();- if (!selectedFields.contains(Issue.MILESTONE))- excludedProperties.add(Issue.BUILTIN_FIELDS.get(Issue.MILESTONE));+ if (!selectedFields.contains(Issue.FIELD_MILESTONE))+ excludedProperties.add(Issue.FIELD_PATHS.get(Issue.FIELD_MILESTONE));builtInFieldsEditor = BeanContext.editBean("builtInFieldsEditor", builtInFieldsBean, excludedProperties);form.add(builtInFieldsEditor);@@ -207,11 +207,11 @@ abstract class BatchEditPanel extends Panel implements InputContext {@Overrideprotected void runTask(AjaxRequestTarget target) {Optional<Milestone> milestone;- if (selectedFields.contains(Issue.MILESTONE))+ if (selectedFields.contains(Issue.FIELD_MILESTONE))milestone = Optional.fromNullable(getProject().getMilestone(builtInFieldsBean.getMilestone()));elsemilestone = null;- String state = (String) IssueFieldBeanUtils.getFieldValue(customFieldsBean, Issue.STATE);+ String state = (String) IssueFieldBeanUtils.getFieldValue(customFieldsBean, Issue.FIELD_STATE);Map<String, Object> fieldValues = IssueFieldBeanUtils.getFieldValues(customFieldsBean);fieldValues.keySet().retainAll(selectedFields);diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.java b/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.javaindex 2164f82abd..771696d8e1 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/FieldsEditBean.java@@ -30,8 +30,8 @@ public class FieldsEditBean implements Serializable {@SuppressWarnings("unused")private static List<String> getFieldChoices() {- List<String> fields = new ArrayList<>(Issue.BUILTIN_FIELDS.keySet());- fields.remove(Issue.DESCRIPTION);+ List<String> fields = new ArrayList<>(Issue.FIELD_PATHS.keySet());+ fields.remove(Issue.FIELD_DESCRIPTION);ProjectPage page = (ProjectPage) WicketUtils.getPage();for (InputSpec field: page.getProject().getIssueWorkflow().getFieldSpecs())fields.add(field.getName());diff --git a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.javaindex eed23f0d72..78b7012174 100644--- a/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/issuelist/IssueListPanel.java@@ -99,8 +99,6 @@ public abstract class IssueListPanel extends GenericPanel<String> {private SelectionColumn<Issue, Void> selectionColumn;- private Component querySave;-private ModalLink batchEditSelected;private SortableDataProvider<Issue, Void> dataProvider;@@ -140,6 +138,33 @@ public abstract class IssueListPanel extends GenericPanel<String> {protected void onInitialize() {super.onInitialize();+ Component querySave;+ add(querySave = new AjaxLink<Void>("saveQuery") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(StringUtils.isNotBlank(getQuery()));+ setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);+ }++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ configure();+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Input query to save");+ }+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ getQuerySaveSupport().onSaveQuery(target);+ }++ });+TextField<String> input = new TextField<String>("input", getModel());input.add(new IssueQueryBehavior(new AbstractReadOnlyModel<Project>() {@@ -250,32 +275,6 @@ public abstract class IssueListPanel extends GenericPanel<String> {});- add(querySave = new AjaxLink<Void>("saveQuery") {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(StringUtils.isNotBlank(getQuery()));- setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- configure();- if (!isEnabled()) {- tag.put("disabled", "disabled");- tag.put("title", "Input query to save");- }- }-- @Override- public void onClick(AjaxRequestTarget target) {- getQuerySaveSupport().onSaveQuery(target);- }-- });-add(batchEditSelected = new ModalLink("batchEditSelected") {@Override@@ -442,7 +441,7 @@ public abstract class IssueListPanel extends GenericPanel<String> {for (String field: getProject().getIssueListFields()) {switch (field) {- case Issue.NUMBER:+ case Issue.FIELD_NUMBER:columns.add(new AbstractColumn<Issue, Void>(Model.of("#")) {@Override@@ -452,8 +451,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.STATE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.STATE)) {+ case Issue.FIELD_STATE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_STATE)) {@Overridepublic String getCssClass() {@@ -467,8 +466,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.TITLE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.TITLE)) {+ case Issue.FIELD_TITLE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_TITLE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -485,8 +484,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.SUBMITTER:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.SUBMITTER)) {+ case Issue.FIELD_SUBMITTER:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_SUBMITTER)) {@Overridepublic String getCssClass() {@@ -505,8 +504,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.SUBMIT_DATE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.SUBMIT_DATE)) {+ case Issue.FIELD_SUBMIT_DATE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_SUBMIT_DATE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -515,8 +514,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.UPDATE_DATE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.UPDATE_DATE)) {+ case Issue.FIELD_UPDATE_DATE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_UPDATE_DATE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -525,8 +524,8 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.MILESTONE:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.MILESTONE)) {+ case Issue.FIELD_MILESTONE:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_MILESTONE)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,@@ -545,23 +544,23 @@ public abstract class IssueListPanel extends GenericPanel<String> {}});break;- case Issue.VOTES:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.VOTES)) {+ case Issue.FIELD_VOTE_COUNT:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_VOTE_COUNT)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,IModel<Issue> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getNumOfVotes()));+ cellItem.add(new Label(componentId, rowModel.getObject().getVoteCount()));}});break;- case Issue.COMMENTS:- columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.COMMENTS)) {+ case Issue.FIELD_COMMENT_COUNT:+ columns.add(new AbstractColumn<Issue, Void>(Model.of(Issue.FIELD_COMMENT_COUNT)) {@Overridepublic void populateItem(Item<ICellPopulator<Issue>> cellItem, String componentId,IModel<Issue> rowModel) {- cellItem.add(new Label(componentId, rowModel.getObject().getNumOfVotes()));+ cellItem.add(new Label(componentId, rowModel.getObject().getVoteCount()));}});break;diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.javaindex f390a55b5f..eca845aae2 100644--- a/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstIssueQueryLink.java@@ -6,7 +6,7 @@ import java.util.List;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.NamedQuery;+import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.page.project.issues.issuelist.IssueListPage;@@ -23,10 +23,10 @@ public class FirstIssueQueryLink extends ViewStateAwarePageLink<Void> {String query = null;List<String> queries = new ArrayList<>();if (project.getIssueQuerySettingOfCurrentUser() != null) {- for (NamedQuery namedQuery: project.getIssueQuerySettingOfCurrentUser().getUserQueries())+ for (NamedIssueQuery namedQuery: project.getIssueQuerySettingOfCurrentUser().getUserQueries())queries.add(namedQuery.getQuery());}- for (NamedQuery namedQuery: project.getSavedIssueQueries())+ for (NamedIssueQuery namedQuery: project.getSavedIssueQueries())queries.add(namedQuery.getQuery());for (String each: queries) {try {diff --git a/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java b/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.javanew file mode 100644index 0000000000..77dec8b5dd--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/link/FirstPullRequestQueryLink.java@@ -0,0 +1,43 @@+package io.onedev.server.web.component.link;++import java.util.ArrayList;+import java.util.List;++import org.apache.wicket.request.mapper.parameter.PageParameters;++import io.onedev.server.model.Project;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;++public class FirstPullRequestQueryLink extends ViewStateAwarePageLink<Void> {++ private static final long serialVersionUID = 1L;++ public FirstPullRequestQueryLink(String id, Project project) {+ super(id, RequestListPage.class, getPageParameters(project));+ }++ private static PageParameters getPageParameters(Project project) {+ String query = null;+ List<String> queries = new ArrayList<>();+ if (project.getPullRequestQuerySettingOfCurrentUser() != null) {+ for (NamedPullRequestQuery namedQuery: project.getPullRequestQuerySettingOfCurrentUser().getUserQueries())+ queries.add(namedQuery.getQuery());+ }+ for (NamedPullRequestQuery namedQuery: project.getSavedPullRequestQueries())+ queries.add(namedQuery.getQuery());+ for (String each: queries) {+ try {+ if (SecurityUtils.getUser() != null || !PullRequestQuery.parse(project, each, true).needsLogin()) {+ query = each;+ break;+ }+ } catch (Exception e) {+ }+ }+ return RequestListPage.paramsOf(project, query);+ }++}diff --git a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.javaindex 69eb384254..481f47bd4b 100644--- a/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/newissue/NewIssueEditor.java@@ -99,7 +99,7 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implementmilestoneChoice.setRequired(false);add(milestoneChoice);- Collection<String> excludedProperties = IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, Sets.newHashSet(Issue.STATE));+ Collection<String> excludedProperties = IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, Sets.newHashSet(Issue.FIELD_STATE));add(fieldEditor = new BeanContext(fieldBean.getClass(), excludedProperties).renderForEdit("fields", Model.of(fieldBean)));}diff --git a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.javaindex 8b3e6a0fab..802e1b7767 100644--- a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java+++ b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusLink.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.model.LoadableDetachableModel;-import io.onedev.server.model.support.issue.WatchStatus;+import io.onedev.server.model.support.WatchStatus;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;diff --git a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.javaindex 6f21d1f841..814baceba1 100644--- a/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java+++ b/core/src/main/java/io/onedev/server/web/component/watchstatus/WatchStatusPanel.java@@ -7,7 +7,7 @@ import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.markup.html.panel.Panel;-import io.onedev.server.model.support.issue.WatchStatus;+import io.onedev.server.model.support.WatchStatus;@SuppressWarnings("serial")abstract class WatchStatusPanel extends Panel {diff --git a/core/src/main/java/io/onedev/server/web/editable/annotation/PullRequestQuery.java b/core/src/main/java/io/onedev/server/web/editable/annotation/PullRequestQuery.javanew file mode 100644index 0000000000..46109ac123--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/annotation/PullRequestQuery.java@@ -0,0 +1,24 @@+package io.onedev.server.web.editable.annotation;++import java.lang.annotation.ElementType;+import java.lang.annotation.Retention;+import java.lang.annotation.RetentionPolicy;+import java.lang.annotation.Target;++import javax.validation.Constraint;+import javax.validation.Payload;++import io.onedev.server.util.validation.PullRequestQueryValidator;++@Target({ElementType.METHOD, ElementType.FIELD})+@Retention(RetentionPolicy.RUNTIME)+@Constraint(validatedBy=PullRequestQueryValidator.class)+public @interface PullRequestQuery {++ String message() default "";++ Class<?>[] groups() default {};++ Class<? extends Payload>[] payload() default {};++}diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.java b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.javanew file mode 100644index 0000000000..b118e7261a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditSupport.java@@ -0,0 +1,58 @@+package io.onedev.server.web.editable.pullrequestquery;++import java.lang.reflect.Method;++import org.apache.wicket.Component;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.model.IModel;++import io.onedev.server.web.editable.EditSupport;+import io.onedev.server.web.editable.EmptyValueLabel;+import io.onedev.server.web.editable.PropertyContext;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.editable.PropertyViewer;+import io.onedev.server.web.editable.annotation.PullRequestQuery;++@SuppressWarnings("serial")+public class PullRequestQueryEditSupport implements EditSupport {++ @Override+ public PropertyContext<?> getEditContext(PropertyDescriptor descriptor) {+ Method propertyGetter = descriptor.getPropertyGetter();+ if (propertyGetter.getAnnotation(PullRequestQuery.class) != null) {+ if (propertyGetter.getReturnType() != String.class) {+ throw new RuntimeException("Annotation 'PullRequestQuery' should be applied to property "+ + "with type 'String'");+ }+ return new PropertyContext<String>(descriptor) {++ @Override+ public PropertyViewer renderForView(String componentId, final IModel<String> model) {+ return new PropertyViewer(componentId, descriptor) {++ @Override+ protected Component newContent(String id, PropertyDescriptor propertyDescriptor) {+ String refMatch = model.getObject();+ if (refMatch != null) {+ return new Label(id, refMatch);+ } else {+ return new EmptyValueLabel(id, propertyDescriptor.getPropertyGetter());+ }+ }++ };+ }++ @Override+ public PropertyEditor<String> renderForEdit(String componentId, IModel<String> model) {+ return new PullRequestQueryEditor(componentId, descriptor, model);+ }++ };+ } else {+ return null;+ }+ }++}diff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.html b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.htmlnew file mode 100644index 0000000000..1b6893780c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.html@@ -0,0 +1,5 @@+<wicket:panel>+ <div class="clearable-wrapper">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control"></input>+ </div>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.javanew file mode 100644index 0000000000..2a7243a78c--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/editable/pullrequestquery/PullRequestQueryEditor.java@@ -0,0 +1,65 @@+package io.onedev.server.web.editable.pullrequestquery;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.model.AbstractReadOnlyModel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.util.convert.ConversionException;++import io.onedev.server.model.Project;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;+import io.onedev.server.web.behavior.PullRequestQueryBehavior;+import io.onedev.server.web.editable.ErrorContext;+import io.onedev.server.web.editable.PathSegment;+import io.onedev.server.web.editable.PropertyDescriptor;+import io.onedev.server.web.editable.PropertyEditor;+import io.onedev.server.web.page.project.ProjectPage;++@SuppressWarnings("serial")+public class PullRequestQueryEditor extends PropertyEditor<String> {++ private TextField<String> input;++ public PullRequestQueryEditor(String id, PropertyDescriptor propertyDescriptor, IModel<String> propertyModel) {+ super(id, propertyDescriptor, propertyModel);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ input = new TextField<String>("input", getModel());+ input.add(new PullRequestQueryBehavior(new AbstractReadOnlyModel<Project>() {++ @Override+ public Project getObject() {+ return ((ProjectPage) getPage()).getProject();+ }++ }));++ input.setLabel(Model.of(getDescriptor().getDisplayName(this)));++ add(input);+ input.add(new OnTypingDoneBehavior() {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ onPropertyUpdating(target);+ }++ });+ }++ @Override+ public ErrorContext getErrorContext(PathSegment pathSegment) {+ return null;+ }++ @Override+ protected String convertInputToValue() throws ConversionException {+ return input.getConvertedInput();+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.javaindex 97503923a9..d75d6f2b39 100644--- a/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/ProjectPage.java@@ -35,6 +35,7 @@ import io.onedev.server.web.ComponentRenderer;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.FirstIssueQueryLink;+import io.onedev.server.web.component.link.FirstPullRequestQueryLink;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sidebar.SideBar;import io.onedev.server.web.component.tabbable.PageTab;@@ -144,7 +145,20 @@ public abstract class ProjectPage extends LayoutPage {0, ProjectTagsPage.class));tabs.add(new ProjectTab(Model.of("Pull Requests"), "fa fa-fw fa-ext fa-branch-compare",- 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class));+ 0, RequestListPage.class, NewRequestPage.class, RequestDetailPage.class, InvalidRequestPage.class) {++ @Override+ public Component render(String componentId) {+ return new ProjectTabLink(componentId, this) {++ @Override+ protected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {+ return new FirstPullRequestQueryLink(linkId, getProject());+ }+ };+ }++ });tabs.add(new ProjectTab(Model.of("Issues"), "fa fa-fw fa-bug", 0, IssueListPage.class, IssuesPage.class,IssueDetailPage.class, NewIssuePage.class) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.javaindex 8584121e11..16468f7716 100644--- a/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/branches/ProjectBranchesPage.java@@ -63,6 +63,8 @@ import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.support.BranchProtection;import io.onedev.server.model.support.ProjectAndBranch;+import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;+import io.onedev.server.model.support.pullrequest.query.PullRequestQueryLexer;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.component.branchchoice.BranchChoiceProvider;@@ -80,9 +82,6 @@ import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.compare.RevisionComparePage;import io.onedev.server.web.page.project.pullrequests.requestdetail.activities.RequestActivitiesPage;import io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;-import io.onedev.server.web.page.project.pullrequests.requestlist.SearchOption;-import io.onedev.server.web.page.project.pullrequests.requestlist.SearchOption.Status;-import io.onedev.server.web.page.project.pullrequests.requestlist.SortOption;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.utils.StringUtils;@@ -590,7 +589,7 @@ public class ProjectBranchesPage extends ProjectPage {WebMarkupContainer requestLink;if (effectiveRequest != null && ab.getAhead() != 0) {requestLink = new BookmarkablePageLink<Void>("effectiveRequest",- RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(effectiveRequest));+ RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(effectiveRequest, null));if (effectiveRequest.isOpen()) {requestLink.add(new Label("label", "Open"));requestLink.add(AttributeAppender.append("title", "A pull request is open for this change"));@@ -625,10 +624,11 @@ public class ProjectBranchesPage extends ProjectPage {PullRequestManager pullRequestManager = OneDev.getInstance(PullRequestManager.class);if (!pullRequestManager.findAllOpen(new ProjectAndBranch(getProject(), branch)).isEmpty()) {Fragment bodyFrag = new Fragment("body", "openRequestsFrag", ProjectBranchesPage.this);- SearchOption searchOption = new SearchOption();- searchOption.setStatus(Status.OPEN);- searchOption.setTargetBranch(branch);- PageParameters params = RequestListPage.paramsOf(getProject(), searchOption, new SortOption());+ String query = String.format("\"%s\" %s \"%s\" %s %s",+ PullRequest.FIELD_TARGET_BRANCH, PullRequestQuery.getRuleName(PullRequestQueryLexer.Is),+ branch, PullRequestQuery.getRuleName(PullRequestQueryLexer.And),+ PullRequestQuery.getRuleName(PullRequestQueryLexer.Open));+ PageParameters params = RequestListPage.paramsOf(getProject(), query);bodyFrag.add(new ViewStateAwarePageLink<Void>("openRequests", RequestListPage.class, params));bodyFrag.add(new Label("branch", branch));fragment.add(bodyFrag);diff --git a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.javaindex 58d0cf9155..cd688937cb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/comments/ProjectCodeCommentsPage.java@@ -5,7 +5,6 @@ import org.apache.wicket.markup.head.IHeaderResponse;import org.apache.wicket.model.IModel;import org.apache.wicket.request.mapper.parameter.PageParameters;-import io.onedev.server.model.PullRequest;import io.onedev.server.web.component.codecomment.CodeCommentFilter;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;import io.onedev.server.web.page.project.ProjectPage;@@ -61,14 +60,7 @@ public class ProjectCodeCommentsPage extends ProjectPage {return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}- }) {-- @Override- protected PullRequest getPullRequest() {- return null;- }-- });+ }));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.javaindex a424e4fdaf..936e4fbd4b 100644--- a/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java@@ -462,7 +462,7 @@ public class RevisionComparePage extends ProjectPage implements CommentSupport {@Overridepublic void onClick() {- PageParameters params = RequestDetailPage.paramsOf(requestModel.getObject());+ PageParameters params = RequestDetailPage.paramsOf(requestModel.getObject(), null);setResponsePage(RequestActivitiesPage.class, params);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.javaindex 9defc557b2..cb8ad4db96 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BacklogColumnPanel.java@@ -27,8 +27,7 @@ import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.IssueQueryLexer;-import io.onedev.server.model.support.issue.query.MilestoneUnaryCriteria;+import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.modal.ModalLink;@@ -46,7 +45,7 @@ abstract class BacklogColumnPanel extends Panel {List<IssueCriteria> criterias = new ArrayList<>();if (backlogQuery.getCriteria() != null)criterias.add(backlogQuery.getCriteria());- criterias.add(new MilestoneUnaryCriteria(IssueQueryLexer.IsEmpty));+ criterias.add(new MilestoneCriteria(null));return new IssueQuery(IssueCriteria.of(criterias), backlogQuery.getSorts());} else {return null;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.javaindex f9ac79a8c3..c964752b49 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/BoardColumnPanel.java@@ -37,7 +37,7 @@ import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.model.support.issue.IssueBoard;import io.onedev.server.model.support.issue.query.ChoiceFieldCriteria;-import io.onedev.server.model.support.issue.query.FieldUnaryCriteria;+import io.onedev.server.model.support.issue.query.FieldOperatorCriteria;import io.onedev.server.model.support.issue.query.IssueCriteria;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.query.IssueQueryLexer;@@ -72,16 +72,16 @@ abstract class BoardColumnPanel extends Panel implements EditContext {if (boardQuery.getCriteria() != null)criterias.add(boardQuery.getCriteria());if (getMilestone() != null)- criterias.add(new MilestoneCriteria(getMilestone().getName(), IssueQueryLexer.Is));+ criterias.add(new MilestoneCriteria(getMilestone().getName()));String identifyField = getBoard().getIdentifyField();- if (identifyField.equals(Issue.STATE)) {- criterias.add(new StateCriteria(getColumn(), IssueQueryLexer.Is));+ if (identifyField.equals(Issue.FIELD_STATE)) {+ criterias.add(new StateCriteria(getColumn()));} else {if (getColumn() != null) {criterias.add(new ChoiceFieldCriteria(identifyField,getColumn(), -1, IssueQueryLexer.Is, false));} else {- criterias.add(new FieldUnaryCriteria(identifyField, IssueQueryLexer.IsEmpty));+ criterias.add(new FieldOperatorCriteria(identifyField, IssueQueryLexer.IsEmpty));}}return new IssueQuery(IssueCriteria.of(criterias), boardQuery.getSorts());@@ -128,7 +128,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {// move issue between board columnsIssueWorkflow workflow = getProject().getIssueWorkflow();String identifyField = getBoard().getIdentifyField();- if (identifyField.equals(Issue.STATE)) {+ if (identifyField.equals(Issue.FIELD_STATE)) {issue = SerializationUtils.clone(issue);for (TransitionSpec transition: workflow.getTransitionSpecs()) {if (transition.canApplyTo(issue) && transition.getToState().equals(getColumn())) {@@ -185,7 +185,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {String identifyField = getBoard().getIdentifyField();if (getColumn() != null) {title = getColumn();- if (identifyField.equals(Issue.STATE)) {+ if (identifyField.equals(Issue.FIELD_STATE)) {color = workflow.getStateSpec(getColumn()).getColor();} else {InputSpec field = workflow.getFieldSpec(identifyField);@@ -274,7 +274,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {super.onConfigure();setVisible(getQuery() != null&& SecurityUtils.getUser() != null- && (!getBoard().getIdentifyField().equals(Issue.STATE)+ && (!getBoard().getIdentifyField().equals(Issue.FIELD_STATE)|| getColumn().equals(getProject().getIssueWorkflow().getInitialStateSpec().getName())));}@@ -328,7 +328,7 @@ abstract class BoardColumnPanel extends Panel implements EditContext {OneDev.getInstance(IssueActionManager.class).changeMilestone(issue, getMilestone());markAccepted(target, issue, true);checkMatched(target, issue);- } else if (fieldName.equals(Issue.STATE)) {+ } else if (fieldName.equals(Issue.FIELD_STATE)) {IssueWorkflow workflow = getProject().getIssueWorkflow();boolean canTransiteIssue = false;for (TransitionSpec transition: workflow.getTransitionSpecs()) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.javaindex 7f316cfc2e..9b14ca81a3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/CardDetailPanel.java@@ -54,16 +54,16 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {add(new Label("title", getIssue().getTitle()));IssueWorkflow workflow = getIssue().getProject().getIssueWorkflow();- List<String> fieldNames = Lists.newArrayList(Issue.STATE);- fieldNames.add(Issue.SUBMITTER);- fieldNames.add(Issue.SUBMIT_DATE);+ List<String> fieldNames = Lists.newArrayList(Issue.FIELD_STATE);+ fieldNames.add(Issue.FIELD_SUBMITTER);+ fieldNames.add(Issue.FIELD_SUBMIT_DATE);for (String fieldName: workflow.getFieldNames()) {if (getIssue().isFieldVisible(fieldName, getIssue().getState()))fieldNames.add(fieldName);}- fieldNames.add(Issue.MILESTONE);- fieldNames.add(Issue.COMMENTS);- fieldNames.add(Issue.VOTES);+ fieldNames.add(Issue.FIELD_MILESTONE);+ fieldNames.add(Issue.FIELD_COMMENT_COUNT);+ fieldNames.add(Issue.FIELD_VOTE_COUNT);if (fieldNames.size() % 2 != 0)fieldNames.add(null);@@ -95,16 +95,16 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {private Component renderField(String componentId, String fieldName) {switch (fieldName) {- case Issue.STATE:+ case Issue.FIELD_STATE:return new IssueStateLabel(componentId, CardDetailPanel.this.getModel());- case Issue.SUBMITTER:+ case Issue.FIELD_SUBMITTER:Fragment fragment = new Fragment(componentId, "userFrag", CardDetailPanel.this);fragment.add(new UserLink("name", User.getForDisplay(getIssue().getSubmitter(), getIssue().getSubmitterName())));fragment.add(new AvatarLink("avatar", getIssue().getSubmitter()));return fragment;- case Issue.SUBMIT_DATE:+ case Issue.FIELD_SUBMIT_DATE:return new Label(componentId, DateUtils.formatAge(getIssue().getSubmitDate()));- case Issue.MILESTONE:+ case Issue.FIELD_MILESTONE:if (getIssue().getMilestone() != null) {return new BookmarkablePageLink<Void>(componentId, MilestoneDetailPage.class,MilestoneDetailPage.paramsOf(getIssue().getMilestone(), null)) {@@ -118,10 +118,10 @@ abstract class CardDetailPanel extends GenericPanel<Issue> {} else {return new Label(componentId, "<i>No milestone</i>").setEscapeModelStrings(false);}- case Issue.COMMENTS:- return new Label(componentId, getIssue().getNumOfComments());- case Issue.VOTES:- return new Label(componentId, getIssue().getNumOfVotes());+ case Issue.FIELD_COMMENT_COUNT:+ return new Label(componentId, getIssue().getCommentCount());+ case Issue.FIELD_VOTE_COUNT:+ return new Label(componentId, getIssue().getVoteCount());default:return new FieldValuesPanel(componentId) {diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.javaindex 5d9f591856..4c5a4dede9 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issueboards/StateTransitionPanel.java@@ -36,7 +36,7 @@ abstract class StateTransitionPanel extends Panel implements InputContext {Class<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getIssue().getProject());Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);IssueFieldBeanUtils.setState(fieldBean, getTargetState());- Collection<String> excludedFields = Sets.newHashSet(Issue.STATE);+ Collection<String> excludedFields = Sets.newHashSet(Issue.FIELD_STATE);for (String fieldName: getIssue().getProject().getIssueWorkflow().getFieldNames()) {if (getIssue().isFieldVisible(fieldName, getIssue().getState()))excludedFields.add(fieldName);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.htmlindex bbbf0fe60b..e700071fc0 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.html@@ -51,21 +51,7 @@</div></div></div>- <div wicket:id="watches" class="watches">- <div class="head">- Issue Watchers (<span wicket:id="count"></span>)- </div>- <div class="body">- <wicket:enclosure child="watchers">- <div class="watchers">- <span wicket:id="watchers"><a wicket:id="watcher" class="avatar"></a></span> <a wicket:id="more">and more</a>- </div>- </wicket:enclosure>- <div class="actions">- <a wicket:id="watch" class="watch-status btn btn-sm btn-default"></a>- </div>- </div>- </div>+ <div wicket:id="watches" class="watches"></div><wicket:enclosure child="delete"><div class="actions"><a wicket:id="delete" class="delete btn btn-danger btn-sm"><i class="fa fa-trash"></i> Delete</a>@@ -95,11 +81,6 @@<span wicket:id="title"></span><a wicket:id="edit" title="Edit title" class="edit"><i class="fa fa-pencil"></i></a></wicket:fragment>- <wicket:fragment wicket:id="issueNavFrag">- <a wicket:id="prev" title="Previous issue" class="prev"><i class="fa fa-arrow-left"></i></a>- <span wicket:id="current"></span>- <a wicket:id="next" title="Next issue" class="next"><i class="fa fa-arrow-right"></i></a>- </wicket:fragment><wicket:fragment wicket:id="userFrag"><a wicket:id="avatar"></a> <a wicket:id="name"></a></wicket:fragment>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.javaindex 430c368062..9c14a43843 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/IssueDetailPage.java@@ -39,7 +39,6 @@ import org.apache.wicket.model.IModel;import org.apache.wicket.model.LoadableDetachableModel;import org.apache.wicket.model.Model;import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.protocol.http.WebSession;import org.apache.wicket.request.IRequestHandler;import org.apache.wicket.request.Url;import org.apache.wicket.request.cycle.IRequestCycleListener;@@ -55,15 +54,16 @@ import io.onedev.server.manager.IssueActionManager;import io.onedev.server.manager.IssueManager;import io.onedev.server.manager.IssueVoteManager;import io.onedev.server.manager.IssueWatchManager;-import io.onedev.server.manager.VisitManager;+import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Issue;import io.onedev.server.model.IssueVote;import io.onedev.server.model.IssueWatch;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.User;+import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.issue.IssueField;-import io.onedev.server.model.support.issue.WatchStatus;import io.onedev.server.model.support.issue.query.IssueQuery;import io.onedev.server.model.support.issue.workflow.IssueWorkflow;import io.onedev.server.model.support.issue.workflow.TransitionSpec;@@ -72,7 +72,10 @@ import io.onedev.server.util.inputspec.InputContext;import io.onedev.server.util.inputspec.InputSpec;import io.onedev.server.util.inputspec.choiceinput.ChoiceInput;import io.onedev.server.util.inputspec.dateinput.DateInput;+import io.onedev.server.util.query.EntityQuery;import io.onedev.server.web.component.avatar.AvatarLink;+import io.onedev.server.web.component.entitynav.EntityNavPanel;+import io.onedev.server.web.component.entitywatches.EntityWatchesPanel;import io.onedev.server.web.component.issuestate.IssueStateLabel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.markdown.AttachmentSupport;@@ -86,7 +89,6 @@ import io.onedev.server.web.component.tabbable.PageTabLink;import io.onedev.server.web.component.tabbable.Tab;import io.onedev.server.web.component.tabbable.Tabbable;import io.onedev.server.web.component.userlist.UserListLink;-import io.onedev.server.web.component.watchstatus.WatchStatusLink;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.ProjectPage;@@ -113,8 +115,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexprivate static final String TITLE_ID = "title";- private static final String NAV_ID = "issueNav";-private final IModel<Issue> issueModel;private final QueryPosition position;@@ -258,7 +258,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexSerializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);IssueFieldBeanUtils.setState(fieldBean, transition.getToState());- Collection<String> excludedFields = Sets.newHashSet(Issue.STATE);+ Collection<String> excludedFields = Sets.newHashSet(Issue.FIELD_STATE);for (String fieldName: getProject().getIssueWorkflow().getFieldNames()) {if (getIssue().isFieldVisible(fieldName, getIssue().getState()))excludedFields.add(fieldName);@@ -336,7 +336,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexList<String> criterias = new ArrayList<>();if (getIssue().getMilestone() != null)- criterias.add(IssueQuery.quote(Issue.MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));+ criterias.add(IssueQuery.quote(Issue.FIELD_MILESTONE) + " is " + IssueQuery.quote(getIssue().getMilestoneName()));for (Map.Entry<String, IssueField> entry: getIssue().getFields().entrySet()) {List<String> strings = entry.getValue().getValues();if (strings.isEmpty()) {@@ -404,9 +404,8 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic void onEndRequest(RequestCycle cycle) {- if (SecurityUtils.getUser() != null) {- OneDev.getInstance(VisitManager.class).visitIssue(SecurityUtils.getUser(), getIssue());- }+ if (SecurityUtils.getUser() != null)+ OneDev.getInstance(UserInfoManager.class).visitIssue(SecurityUtils.getUser(), getIssue());}@Override@@ -419,11 +418,58 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex});- add(newNavContainer());+ add(new EntityNavPanel<Issue>("issueNav") {++ @Override+ protected EntityQuery<Issue> parse(String queryString) {+ return IssueQuery.parse(getProject(), queryString, true);+ }++ @Override+ protected Issue getEntity() {+ return getIssue();+ }++ @Override+ protected QueryPosition getPosition() {+ return position;+ }++ @Override+ protected void navTo(Issue issue, QueryPosition position) {+ PageParameters params = IssueDetailPage.paramsOf(issue, position);+ setResponsePage(getPageClass(), params);+ }++ @Override+ protected List<Issue> query(EntityQuery<Issue> query, int offset, int count) {+ return getIssueManager().query(getProject(), query, offset, count);+ }++ });+add(newFieldsContainer());add(newMilestoneContainer());add(newVotesContainer());- add(newWatchesContainer());++ add(new EntityWatchesPanel("watches") {++ @Override+ protected void onSaveWatch(EntityWatch watch) {+ OneDev.getInstance(IssueWatchManager.class).save((IssueWatch) watch);+ }++ @Override+ protected void onDeleteWatch(EntityWatch watch) {+ OneDev.getInstance(IssueWatchManager.class).delete((IssueWatch) watch);+ }++ @Override+ protected AbstractEntity getEntity() {+ return getIssue();+ }++ });Link<Void> deleteLink = new Link<Void>("delete") {@@ -439,87 +485,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexadd(deleteLink);}- private Component newNavContainer() {- if (position != null) {- Fragment fragment = new Fragment(NAV_ID, "issueNavFrag", this);- fragment.add(new Link<Void>("next") {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(position.getOffset()>0);- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (position.getOffset() <= 0)- tag.put("disabled", "disabled");- }-- @Override- public void onClick() {- IssueQuery query = IssueQuery.parse(getProject(), position.getQuery(), true);- int count = position.getCount();- int offset = position.getOffset() - 1;- List<Issue> issues = getIssueManager().query(getProject(), query, offset, 1);- if (!issues.isEmpty()) {- if (!query.matches(getIssue()))- count--;- QueryPosition prevPosition = new QueryPosition(position.getQuery(), count, offset);- PageParameters params = IssueDetailPage.paramsOf(issues.get(0), prevPosition);- setResponsePage(getPageClass(), params);- } else {- WebSession.get().warn("No more issues");- }- }-- });- fragment.add(new Link<Void>("prev") {-- @Override- protected void onConfigure() {- super.onConfigure();- setEnabled(position.getOffset()<position.getCount()-1);- }-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- if (position.getOffset() >= position.getCount()-1)- tag.put("disabled", "disabled");- }-- @Override- public void onClick() {- IssueQuery query = IssueQuery.parse(getProject(), position.getQuery(), true);- int offset = position.getOffset();- int count = position.getCount();- if (query.matches(getIssue()))- offset++;- else- count--;-- List<Issue> issues = getIssueManager().query(getProject(), query, offset, 1);- if (!issues.isEmpty()) {- QueryPosition nextPosition = new QueryPosition(position.getQuery(), count, offset);- PageParameters params = IssueDetailPage.paramsOf(issues.get(0), nextPosition);- setResponsePage(getPageClass(), params);- } else {- WebSession.get().warn("No more issues");- }- }-- });-- fragment.add(new Label("current", "issue " + (position.getCount()-position.getOffset()) + " of " + position.getCount()));-- return fragment;- } else {- return new WebMarkupContainer(NAV_ID).setVisible(false);- }- }-private Component newFieldsContainer() {IModel<List<IssueField>> fieldsModel = new LoadableDetachableModel<List<IssueField>>() {@@ -578,7 +543,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexClass<?> fieldBeanClass = IssueFieldBeanUtils.defineBeanClass(getProject());Serializable fieldBean = getIssue().getFieldBean(fieldBeanClass, true);- Collection<String> excludedFields = Sets.newHashSet(Issue.STATE);+ Collection<String> excludedFields = Sets.newHashSet(Issue.FIELD_STATE);form.add(BeanContext.editBean("editor", fieldBean, IssueFieldBeanUtils.getPropertyNames(fieldBeanClass, excludedFields)));form.add(new AjaxButton("save") {@@ -747,7 +712,7 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContex@Overridepublic String getObject() {- return String.valueOf(getIssue().getNumOfVotes());+ return String.valueOf(getIssue().getVoteCount());}}));@@ -855,138 +820,6 @@ public abstract class IssueDetailPage extends ProjectPage implements InputContexreturn votesContainer;}- private List<IssueWatch> getEffectWatches() {- List<IssueWatch> watches = new ArrayList<>();- for (IssueWatch watch: getIssue().getWatches()) {- if (watch.isWatching())- watches.add(watch);- }- Collections.sort(watches, new Comparator<IssueWatch>() {-- @Override- public int compare(IssueWatch o1, IssueWatch o2) {- return o2.getId().compareTo(o1.getId());- }-- });- return watches;- }-- private Component newWatchesContainer() {- WebMarkupContainer watchesContainer = new WebMarkupContainer("watches");- watchesContainer.setOutputMarkupId(true);-- watchesContainer.add(new Label("count", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- return String.valueOf(getEffectWatches().size());- }-- }));-- watchesContainer.add(new ListView<IssueWatch>("watchers", new LoadableDetachableModel<List<IssueWatch>>() {-- @Override- protected List<IssueWatch> load() {- List<IssueWatch> watches = getEffectWatches();- if (watches.size() > MAX_DISPLAY_AVATARS)- watches = watches.subList(0, MAX_DISPLAY_AVATARS);- return watches;- }-- }) {-- @Override- protected void populateItem(ListItem<IssueWatch> item) {- User user = item.getModelObject().getUser();- item.add(new AvatarLink("watcher", user, user.getDisplayName()));- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getEffectWatches().isEmpty());- }-- });-- watchesContainer.add(new UserListLink("more") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getEffectWatches().size() > MAX_DISPLAY_AVATARS);- }-- @Override- protected List<User> getUsers() {- List<IssueWatch> watches = getEffectWatches();- if (watches.size() > MAX_DISPLAY_AVATARS)- watches = watches.subList(MAX_DISPLAY_AVATARS, watches.size());- else- watches = new ArrayList<>();- return watches.stream().map(it->it.getUser()).collect(Collectors.toList());- }-- });-- watchesContainer.add(new WatchStatusLink("watch") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() != null);- }-- @Override- protected WatchStatus getWatchStatus() {- IssueWatch issueWatch = getIssue().getWatch(getLoginUser());- if (issueWatch != null && !issueWatch.isWatching())- return WatchStatus.DO_NOT_WATCH;- else if (issueWatch != null && issueWatch.isWatching())- return WatchStatus.WATCH;- else- return WatchStatus.DEFAULT;- }-- @Override- protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {- if (watchStatus == WatchStatus.DO_NOT_WATCH) {- IssueWatch issueWatch = getIssue().getWatch(getLoginUser());- if (issueWatch == null) {- issueWatch = new IssueWatch();- issueWatch.setIssue(getIssue());- issueWatch.setUser(getLoginUser());- getIssue().getWatches().add(issueWatch);- }- issueWatch.setWatching(false);- OneDev.getInstance(IssueWatchManager.class).save(issueWatch);- } else if (watchStatus == WatchStatus.WATCH) {- IssueWatch issueWatch = getIssue().getWatch(getLoginUser());- if (issueWatch == null) {- issueWatch = new IssueWatch();- issueWatch.setIssue(getIssue());- issueWatch.setUser(getLoginUser());- getIssue().getWatches().add(issueWatch);- }- issueWatch.setWatching(true);- OneDev.getInstance(IssueWatchManager.class).save(issueWatch);- } else {- IssueWatch issueWatch = getIssue().getWatch(getLoginUser());- if (issueWatch != null) {- getIssue().getWatches().remove(issueWatch);- OneDev.getInstance(IssueWatchManager.class).delete(issueWatch);- }- }- target.add(watchesContainer);- }-- });-- return watchesContainer;- }-private void newEmptyActionOptions(@Nullable AjaxRequestTarget target) {WebMarkupContainer actionOptions = new WebMarkupContainer(ACTION_OPTIONS_ID);actionOptions.setOutputMarkupPlaceholderTag(true);diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.cssindex 4d4e29aa45..ab839967ee 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuedetail/issue-detail.css@@ -36,28 +36,6 @@margin-right: 20px;}-#issue-detail>.side>.nav {- font-size: 16px;- position: relative;- text-align: center;-}-#issue-detail>.side>.nav a {- position: absolute;- color: #666;- top: 0;-}-#issue-detail>.side>.nav a[disabled] {- color: #BBB;- cursor: default;-}--#issue-detail>.side>.nav .prev {- left: 0;-}-#issue-detail>.side>.nav .next {- right: 0;-}-#issue-detail>.side>div>.head {font-weight: bold;margin-bottom: 16px;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.htmlindex b97d490f2b..2bd6a48643 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html@@ -1,73 +1,6 @@<wicket:extend><div id="issue-list">- <div wicket:id="side" class="side">- <div class="head clearfix">- <h4 class="pull-left title">Saved Queries</h4>- <div class="pull-left actions">- <a wicket:id="edit" title="Edit saved queries"><i class="fa fa-pencil"></i></a>- </div>- </div>- <hr>- <div class="body">- <wicket:enclosure child="userQueries">- <div wicket:id="userQueries">- <span class="btn-group">- <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>- <a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>- </span>- </div>- <hr/>- </wicket:enclosure>- <div wicket:id="projectQueries">- <span class="btn-group">- <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>- <a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>- </span>- </div>- <div class="help-block">- <b><i class="fa fa-lightbulb-o"></i> Tips:</b> You may watch/unwatch issues matching specified queries above. When an issue is opened,- non-default watch status of the first matching query will apply- </div>- </div>- </div>+ <div wicket:id="side" class="side"></div><div wicket:id="main" class="main"></div></div>- <wicket:fragment wicket:id="saveQueryFrag">- <form wicket:id="form" class="save-issue-query">- <div class="modal-header">- <button wicket:id="close" type="button" class="close">×</button>- <h4 id="modal-title" class="modal-title">- Save Query- </h4>- </div>- <div class="modal-body">- <div wicket:id="editor"></div>- </div>- <div class="modal-footer clearfix">- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save as Mine"></input>- <a wicket:id="saveForAll" class="dirty-aware btn btn-primary">Save for All Users</a>- <a wicket:id="cancel" class="btn btn-default">Cancel</a>- </div>- </form>- </wicket:fragment>- <wicket:fragment wicket:id="editSavedQueriesFrag">- <div class="modal-header">- <button wicket:id="close" type="button" class="close">×</button>- <h4 class="modal-title">Edit Saved Queries</h4>- </div>- <div class="modal-body">- <ul wicket:id="tab" class="nav nav-tabs"></ul>- <div wicket:id="tabPanel"></div>- </div>- </wicket:fragment>- <wicket:fragment wicket:id="editSavedQueriesContentFrag">- <form wicket:id="form" class="leave-confirm edit-saved-queries">- <div wicket:id="feedback"></div>- <div wicket:id="editor"></div>- <div class="actions">- <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>- <a wicket:id="cancel" class="btn btn-default">Cancel</a>- </div>- </form>- </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.javaindex 4b08854060..08d4cbb6ed 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java@@ -1,57 +1,34 @@package io.onedev.server.web.page.project.issues.issuelist;import java.util.ArrayList;-import java.util.HashSet;-import java.util.List;-import java.util.Map;-import java.util.Set;import javax.annotation.Nullable;import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;-import org.apache.wicket.ajax.markup.html.AjaxLink;-import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;-import org.apache.wicket.markup.html.basic.Label;-import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.list.ListItem;-import org.apache.wicket.markup.html.list.ListView;-import org.apache.wicket.markup.html.panel.Fragment;-import org.apache.wicket.model.LoadableDetachableModel;-import org.apache.wicket.model.Model;import org.apache.wicket.model.PropertyModel;-import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;import io.onedev.server.manager.IssueQuerySettingManager;import io.onedev.server.manager.ProjectManager;import io.onedev.server.model.IssueQuerySetting;import io.onedev.server.model.Project;-import io.onedev.server.model.support.issue.NamedQuery;-import io.onedev.server.model.support.issue.WatchStatus;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.issuelist.IssueListPanel;import io.onedev.server.web.component.issuelist.QuerySaveSupport;-import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;-import io.onedev.server.web.component.tabbable.AjaxActionTab;-import io.onedev.server.web.component.tabbable.Tab;-import io.onedev.server.web.component.tabbable.Tabbable;-import io.onedev.server.web.component.watchstatus.WatchStatusLink;-import io.onedev.server.web.editable.BeanContext;-import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.page.project.issues.IssuesPage;+import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;+import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;+import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.PagingHistorySupport;-import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;@SuppressWarnings("serial")public class IssueListPage extends IssuesPage {@@ -62,8 +39,6 @@ public class IssueListPage extends IssuesPage {private String query;- private Component side;-public IssueListPage(PageParameters params) {super(params);query = params.get(PARAM_QUERY).toOptionalString();@@ -73,291 +48,50 @@ public class IssueListPage extends IssuesPage {return OneDev.getInstance(IssueQuerySettingManager.class);}- private void setWatchStatus(Map<String, Boolean> watches, String name, WatchStatus watchStatus) {- if (watchStatus != WatchStatus.DEFAULT)- watches.put(name, watchStatus == WatchStatus.WATCH);- else- watches.remove(name);- }-- private ArrayList<NamedQuery> getUserQueries() {- if (getProject().getIssueQuerySettingOfCurrentUser() != null)- return getProject().getIssueQuerySettingOfCurrentUser().getUserQueries();- else- return new ArrayList<>();- }+ @Override+ protected void onInitialize() {+ super.onInitialize();- private WatchStatus getWatchStatus(Map<String, Boolean> watches, String name) {- Boolean watching = watches.get(name);- if (Boolean.TRUE.equals(watching))- return WatchStatus.WATCH;- else if (Boolean.FALSE.equals(watching))- return WatchStatus.DO_NOT_WATCH;- else- return WatchStatus.DEFAULT;- }-- private WebMarkupContainer newSideContainer() {- WebMarkupContainer side = new WebMarkupContainer("side");- side.setOutputMarkupId(true);- add(side);-- side.add(new ModalLink("edit") {+ Component side;+ add(side = new SavedQueriesPanel<NamedIssueQuery>("side") {- private static final String TAB_PANEL_ID = "tabPanel";-@Override- protected void onConfigure() {- super.onConfigure();- if (SecurityUtils.canManage(getProject())) {- setVisible(!getUserQueries().isEmpty() || !getProject().getSavedIssueQueries().isEmpty());- } else {- setVisible(getLoginUser() != null && !getUserQueries().isEmpty());- }+ protected NamedQueriesBean<NamedIssueQuery> newNamedQueriesBean() {+ return new NamedIssueQueriesBean();}- private Component newUserQueriesEditor(String componentId, ModalPanel modal, ArrayList<NamedQuery> userQueries) {- return new NamedQueriesEditor(componentId, userQueries) {-- @Override- protected void onSave(AjaxRequestTarget target, ArrayList<NamedQuery> queries) {- IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();- if (setting == null) {- setting = new IssueQuerySetting();- setting.setProject(getProject());- setting.setUser(getLoginUser());- }- setting.setUserQueries(queries);- getIssueQuerySettingManager().save(setting);- target.add(side);- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }- };- }-- private Component newProjectQueriesEditor(String componentId, ModalPanel modal, ArrayList<NamedQuery> projectQueries) {- return new NamedQueriesEditor(componentId, projectQueries) {-- @Override- protected void onSave(AjaxRequestTarget target, ArrayList<NamedQuery> queries) {- getProject().setSavedIssueQueries(queries);- OneDev.getInstance(ProjectManager.class).save(getProject());- target.add(side);- modal.close();- }-- @Override- protected void onCancel(AjaxRequestTarget target) {- modal.close();- }-- };- }-@Override- protected Component newContent(String id, ModalPanel modal) {- Fragment fragment = new Fragment(id, "editSavedQueriesFrag", IssueListPage.this);- List<Tab> tabs = new ArrayList<>();-- ArrayList<NamedQuery> userQueries = getUserQueries();- if (!userQueries.isEmpty()) {- tabs.add(new AjaxActionTab(Model.of("For Mine")) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component editor = newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries);- fragment.replace(editor);- target.add(editor);- }-- });- fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));- }-- ArrayList<NamedQuery> projectQueries = getProject().getSavedIssueQueries();- if (SecurityUtils.canManage(getProject()) && !projectQueries.isEmpty()) {- tabs.add(new AjaxActionTab(Model.of("For All Users")) {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- protected void onSelect(AjaxRequestTarget target, Component tabLink) {- Component editor = newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries);- fragment.replace(editor);- target.add(editor);- }-- });- if (userQueries.isEmpty())- fragment.add(newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries));- }-- fragment.add(new Tabbable("tab", tabs));-- fragment.add(new AjaxLink<Void>("close") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- public void onClick(AjaxRequestTarget target) {- modal.close();- }-- });- return fragment;+ protected boolean needsLogin(NamedIssueQuery namedQuery) {+ return IssueQuery.parse(getProject(), namedQuery.getQuery(), true).needsLogin();}-- });-- side.add(new ListView<NamedQuery>("userQueries", new LoadableDetachableModel<List<NamedQuery>>() {@Override- protected List<NamedQuery> load() {- if (getLoginUser() != null)- return getUserQueries();- else- return new ArrayList<>();+ protected Link<Void> newQueryLink(String componentId, NamedIssueQuery namedQuery) {+ return new BookmarkablePageLink<Void>(componentId, IssueListPage.class, IssueListPage.paramsOf(getProject(), namedQuery.getQuery()));}-- }) {@Override- protected void populateItem(ListItem<NamedQuery> item) {- NamedQuery namedQuery = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueListPage.class, IssueListPage.paramsOf(getProject(), namedQuery.getQuery()));- link.add(new Label("label", namedQuery.getName()));- item.add(link);-- item.add(new WatchStatusLink("watchStatus") {-- @Override- protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {- IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();- if (setting == null) {- setting = new IssueQuerySetting();- setting.setProject(getProject());- setting.setUser(getLoginUser());- }- setWatchStatus(setting.getUserQueryWatches(), namedQuery.getName(), watchStatus);- getIssueQuerySettingManager().save(setting);- target.add(this);- }-- @Override- protected WatchStatus getWatchStatus() {- IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();- if (setting != null)- return IssueListPage.this.getWatchStatus(setting.getUserQueryWatches(), namedQuery.getName());- else- return WatchStatus.DEFAULT;- }-- });+ protected QuerySetting<NamedIssueQuery> getQuerySetting() {+ return getProject().getIssueQuerySettingOfCurrentUser();}@Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getModelObject().isEmpty());+ protected ArrayList<NamedIssueQuery> getProjectQueries() {+ return getProject().getSavedIssueQueries();}- });-- side.add(new ListView<NamedQuery>("projectQueries", new LoadableDetachableModel<List<NamedQuery>>() {-@Override- protected List<NamedQuery> load() {- List<NamedQuery> namedQueries = new ArrayList<>();- for (NamedQuery namedQuery: getProject().getSavedIssueQueries()) {- try {- if (getLoginUser() != null || !IssueQuery.parse(getProject(), namedQuery.getQuery(), true).needsLogin())- namedQueries.add(namedQuery);- } catch (Exception e) {- namedQueries.add(namedQuery);- }- }- return namedQueries;+ protected void onSaveQuerySetting(QuerySetting<NamedIssueQuery> querySetting) {+ getIssueQuerySettingManager().save((IssueQuerySetting) querySetting);}-- }) {@Override- protected void populateItem(ListItem<NamedQuery> item) {- NamedQuery namedQuery = item.getModelObject();- Link<Void> link = new BookmarkablePageLink<Void>("link", IssueListPage.class, IssueListPage.paramsOf(getProject(), namedQuery.getQuery()));- link.add(new Label("label", namedQuery.getName()));- item.add(link);-- item.add(new WatchStatusLink("watchStatus") {-- @Override- protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {- IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();- if (setting == null) {- setting = new IssueQuerySetting();- setting.setProject(getProject());- setting.setUser(getLoginUser());- getProject().setIssueQuerySettingOfCurrentUser(setting);- }- setWatchStatus(setting.getProjectQueryWatches(), namedQuery.getName(), watchStatus);- getIssueQuerySettingManager().save(setting);- target.add(this);- }-- @Override- protected WatchStatus getWatchStatus() {- IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();- if (setting != null)- return IssueListPage.this.getWatchStatus(setting.getProjectQueryWatches(), namedQuery.getName());- else- return WatchStatus.DEFAULT;- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() != null);- }-- });-- }-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(!getModelObject().isEmpty());+ protected void onSaveProjectQueries(ArrayList<NamedIssueQuery> projectQueries) {+ getProject().setSavedIssueQueries(projectQueries);+ OneDev.getInstance(ProjectManager.class).save(getProject());}});-- return side;- }-- @Override- protected void onInitialize() {- super.onInitialize();-- add(side = newSideContainer());PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@@ -402,34 +136,14 @@ public class IssueListPage extends IssuesPage {@Overrideprotected Component newContent(String id) {- Fragment fragment = new Fragment(id, "saveQueryFrag", IssueListPage.this);- Form<?> form = new Form<Void>("form") {-- @Override- protected void onError() {- super.onError();- RequestCycle.get().find(AjaxRequestTarget.class).add(this);- }-- };- SaveQueryBean bean = new SaveQueryBean();- BeanEditor editor = BeanContext.editBean("editor", bean);- form.add(editor);- form.add(new AjaxButton("save") {+ return new SaveQueryPanel(id) {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);+ protected void onSaveForMine(AjaxRequestTarget target, String name) {IssueQuerySetting setting = getProject().getIssueQuerySettingOfCurrentUser();- if (setting == null) {- setting = new IssueQuerySetting();- setting.setProject(getProject());- setting.setUser(getLoginUser());- getProject().setIssueQuerySettingOfCurrentUser(setting);- }- NamedQuery namedQuery = setting.getUserQuery(bean.getName());+ NamedIssueQuery namedQuery = setting.getUserQuery(name);if (namedQuery == null) {- namedQuery = new NamedQuery(bean.getName(), query);+ namedQuery = new NamedIssueQuery(name, query);setting.getUserQueries().add(namedQuery);} else {namedQuery.setQuery(query);@@ -438,16 +152,12 @@ public class IssueListPage extends IssuesPage {target.add(side);close();}-- });- form.add(new AjaxButton("saveForAll") {@Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);- NamedQuery namedQuery = getProject().getSavedIssueQuery(bean.getName());+ protected void onSaveForAll(AjaxRequestTarget target, String name) {+ NamedIssueQuery namedQuery = getProject().getSavedIssueQuery(name);if (namedQuery == null) {- namedQuery = new NamedQuery(bean.getName(), query);+ namedQuery = new NamedIssueQuery(name, query);getProject().getSavedIssueQueries().add(namedQuery);} else {namedQuery.setQuery(query);@@ -458,31 +168,11 @@ public class IssueListPage extends IssuesPage {}@Override- protected void onConfigure() {- super.onConfigure();- setVisible(SecurityUtils.canManage(getProject()));- }-- });- form.add(new AjaxLink<Void>("close") {-- @Override- public void onClick(AjaxRequestTarget target) {- close();- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- public void onClick(AjaxRequestTarget target) {+ protected void onCancel(AjaxRequestTarget target) {close();}- });- form.setOutputMarkupId(true);- fragment.add(form);- return fragment;+ };}};@@ -508,70 +198,4 @@ public class IssueListPage extends IssuesPage {return params;}- private abstract class NamedQueriesEditor extends Fragment {-- private final NamedQueriesBean bean;-- public NamedQueriesEditor(String id, ArrayList<NamedQuery> queries) {- super(id, "editSavedQueriesContentFrag", IssueListPage.this);- bean = new NamedQueriesBean();- bean.getQueries().addAll(queries);- }-- @Override- protected void onInitialize() {- super.onInitialize();-- Form<?> form = new Form<Void>("form");- form.setOutputMarkupId(true);-- form.add(new NotificationPanel("feedback", form));- form.add(BeanContext.editBean("editor", bean));- form.add(new AjaxButton("save") {-- @Override- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {- super.onSubmit(target, form);-- Set<String> names = new HashSet<>();- for (NamedQuery namedQuery: bean.getQueries()) {- if (names.contains(namedQuery.getName())) {- form.error("Duplicate name found: " + namedQuery.getName());- return;- } else {- names.add(namedQuery.getName());- }- }- onSave(target, (ArrayList<NamedQuery>)bean.getQueries());- }-- @Override- protected void onError(AjaxRequestTarget target, Form<?> form) {- super.onError(target, form);- target.add(form);- }-- });- form.add(new AjaxLink<Void>("cancel") {-- @Override- protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {- super.updateAjaxAttributes(attributes);- attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());- }-- @Override- public void onClick(AjaxRequestTarget target) {- onCancel(target);- }-- });- add(form);- setOutputMarkupId(true);- }-- protected abstract void onSave(AjaxRequestTarget target, ArrayList<NamedQuery> queries);-- protected abstract void onCancel(AjaxRequestTarget target);- }}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedIssueQueriesBean.javasimilarity index 53%rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedQueriesBean.javarename to core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedIssueQueriesBean.javaindex 71e337422f..bcf8af175d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedQueriesBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/NamedIssueQueriesBean.java@@ -1,30 +1,30 @@package io.onedev.server.web.page.project.issues.issuelist;-import java.io.Serializable;import java.util.ArrayList;import java.util.List;import javax.validation.constraints.NotNull;-import io.onedev.server.model.support.issue.NamedQuery;+import io.onedev.server.model.support.issue.NamedIssueQuery;import io.onedev.server.web.editable.annotation.Editable;import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;@Editable-public class NamedQueriesBean implements Serializable {+public class NamedIssueQueriesBean extends NamedQueriesBean<NamedIssueQuery> {private static final long serialVersionUID = 1L;- private List<NamedQuery> queries = new ArrayList<>();+ private List<NamedIssueQuery> queries = new ArrayList<>();@NotNull@Editable@OmitName- public List<NamedQuery> getQueries() {+ public List<NamedIssueQuery> getQueries() {return queries;}- public void setQueries(List<NamedQuery> queries) {+ public void setQueries(List<NamedIssueQuery> queries) {this.queries = queries;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.cssindex c565802cf5..e385efc525 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css@@ -11,41 +11,6 @@padding: 20px;border-radius: 4px;}-#issue-list>.side>.head>.actions {- margin: 8px 0 0 12px;-}-#issue-list>.side>.head>.actions>a {- color: #444;- margin-right: 8px;- font-size: 16px;-}-#issue-list>.side>.head>.actions>a[disabled] {- color: #AAA;- cursor: default;-}-#issue-list>.side>.body>* {- margin-bottom: 20px;-}-#issue-list>.side>.body>:last-child {- margin-bottom: 0;-}-#issue-list>.side>.body .watch-status:after {- display: none;-}-#issue-list>.side>.body .watch-status:before {- font-size: 10px;-}--.edit-saved-queries th {- font-weight: bold !important;-}-.edit-saved-queries th.name {- width: 30%;-}-.edit-saved-queries tfoot {- display: none;-}-#issue-list>.main {padding-left: 20px;vertical-align: top;diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.javaindex ae8269fc2f..6eca21990a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/milestones/MilestoneDetailPage.java@@ -18,7 +18,6 @@ import io.onedev.server.manager.MilestoneManager;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;import io.onedev.server.model.support.issue.query.IssueQuery;-import io.onedev.server.model.support.issue.query.IssueQueryLexer;import io.onedev.server.model.support.issue.query.MilestoneCriteria;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.MilestoneDueLabel;@@ -129,7 +128,7 @@ public class MilestoneDetailPage extends IssuesPage {@Overrideprotected IssueQuery getBaseQuery() {- return new IssueQuery(new MilestoneCriteria(getMilestone().getName(), IssueQueryLexer.Is), new ArrayList<>());+ return new IssueQuery(new MilestoneCriteria(getMilestone().getName()), new ArrayList<>());}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.htmlindex 24f92b0509..739be22797 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.html@@ -4,25 +4,25 @@<div class="body"><table class="branches"><tr>- <td class="target branch">- <div class="title clearfix">- <label class="pull-left">Target</label>+ <td class="source branch">+ <div class="title">+ <label>From</label></div>- <div wicket:id="target" class="selector"></div>+ <div wicket:id="source" class="selector"></div><div class="message">- <a wicket:id="targetCommitLink"><span wicket:id="message"></span></a>+ <a wicket:id="sourceCommitLink"><span wicket:id="message"></span></a></div></td><td class="action"><a wicket:id="swap" class="swap btn btn-default" title="Swap"><i class="fa fa-exchange"></i></a></td>- <td class="source branch">- <div class="title">- <label>Source</label>+ <td class="target branch">+ <div class="title clearfix">+ <label class="pull-left">To</label></div>- <div wicket:id="source" class="selector"></div>+ <div wicket:id="target" class="selector"></div><div class="message">- <a wicket:id="sourceCommitLink"><span wicket:id="message"></span></a>+ <a wicket:id="targetCommitLink"><span wicket:id="message"></span></a></div></td></tr>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.javaindex ce0ba099a1..fe407cfb65 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/newrequest/NewRequestPage.java@@ -169,8 +169,8 @@ public class NewRequestPage extends ProjectPage implements CommentSupport {request.setHeadCommitHash(source.getObjectName());if (request.getBaseCommitHash().equals(source.getObjectName())) {CloseInfo closeInfo = new CloseInfo();- closeInfo.setCloseDate(new Date());- closeInfo.setCloseStatus(CloseInfo.Status.MERGED);+ closeInfo.setDate(new Date());+ closeInfo.setStatus(CloseInfo.Status.MERGED);request.setCloseInfo(closeInfo);}@@ -482,7 +482,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport {@Overridepublic void onClick() {- PageParameters params = RequestDetailPage.paramsOf(getPullRequest());+ PageParameters params = RequestDetailPage.paramsOf(getPullRequest(), null);setResponsePage(RequestActivitiesPage.class, params);}@@ -547,7 +547,7 @@ public class NewRequestPage extends ProjectPage implements CommentSupport {OneDev.getInstance(PullRequestManager.class).open(getPullRequest());- setResponsePage(RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(getPullRequest()));+ setResponsePage(RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(getPullRequest(), null));}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.htmlindex 127874cfc4..142ff88955 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.html@@ -13,8 +13,8 @@<div wicket:id="statusAndBranches" class="status-and-branches clearfix"><div wicket:id="status" class="label pull-left status"></div><div class="pull-left branches">- <a wicket:id="user"></a> wants to merge into <a wicket:id="target" class="branch"></a>- from <a wicket:id="source" class="branch"></a> <span wicket:id="date"></span>+ <a wicket:id="user"></a> wants to merge <a wicket:id="source" class="branch"></a> into+ <a wicket:id="target" class="branch"></a> <span wicket:id="date"></span></div></div><div wicket:id="requestSummary" class="summary">@@ -75,6 +75,7 @@<wicket:child></wicket:child></div><div wicket:id="side" class="side">+ <div wicket:id="requestNav" class="nav"></div><wicket:enclosure child="reviews"><div class="reviews"><div class="head">Reviews</div>@@ -97,13 +98,7 @@<div wicket:id="help" class="help-block"></div></div></div>- <div wicket:id="watch" class="watch">- <div class="head">Watch Status</div>- <div class="body">- <select wicket:id="option" class="form-control"></select>- <div wicket:id="help" class="help-block"></div>- </div>- </div>+ <div wicket:id="watches" class="watches"></div><div wicket:id="manage" class="manage"><a wicket:id="synchronize" class="check btn btn-default">Synchronize</a><p class="help-block">In case the pull request status is out of sync with underlyingdiff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.javaindex da5391289d..5677983242 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/RequestDetailPage.java@@ -16,6 +16,7 @@ import java.util.Arrays;import java.util.Collection;import java.util.List;+import javax.annotation.Nullable;import javax.persistence.EntityNotFoundException;import org.apache.commons.lang3.StringUtils;@@ -44,7 +45,6 @@ import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.DropDownChoice;import org.apache.wicket.markup.html.form.Form;import org.apache.wicket.markup.html.form.FormComponent;-import org.apache.wicket.markup.html.form.IChoiceRenderer;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.Link;import org.apache.wicket.markup.html.panel.Fragment;@@ -69,21 +69,26 @@ import io.onedev.server.OneDev;import io.onedev.server.manager.PullRequestActionManager;import io.onedev.server.manager.PullRequestManager;import io.onedev.server.manager.PullRequestUpdateManager;-import io.onedev.server.manager.VisitManager;+import io.onedev.server.manager.PullRequestWatchManager;+import io.onedev.server.manager.UserInfoManager;+import io.onedev.server.model.AbstractEntity;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.PullRequestWatch;import io.onedev.server.model.User;import io.onedev.server.model.support.BranchProtection;+import io.onedev.server.model.support.EntityWatch;import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.model.support.issue.WatchStatus;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.MergeStrategy;-import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;+import io.onedev.server.util.query.EntityQuery;import io.onedev.server.web.component.build.PullRequestBuildsPanel;+import io.onedev.server.web.component.entitynav.EntityNavPanel;+import io.onedev.server.web.component.entitywatches.EntityWatchesPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.BranchLink;import io.onedev.server.web.component.link.DropdownLink;@@ -105,6 +110,7 @@ import io.onedev.server.web.page.project.pullrequests.requestdetail.mergepreviewimport io.onedev.server.web.page.project.pullrequests.requestlist.RequestListPage;import io.onedev.server.web.util.ConfirmOnClick;import io.onedev.server.web.util.ProjectAttachmentSupport;+import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.util.WicketUtils;import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;import io.onedev.server.web.util.model.EntityModel;@@ -119,6 +125,8 @@ public abstract class RequestDetailPage extends ProjectPage {protected final IModel<PullRequest> requestModel;+ private final QueryPosition position;+private boolean isEditingTitle;private String title;@@ -135,7 +143,7 @@ public abstract class RequestDetailPage extends ProjectPage {@Overrideprotected PullRequest load() {Long requestNumber = params.get(PARAM_REQUEST).toLong();- PullRequest request = OneDev.getInstance(PullRequestManager.class).find(getProject(), requestNumber);+ PullRequest request = getPullRequestManager().find(getProject(), requestNumber);if (request == null)throw new EntityNotFoundException("Unable to find request #" + requestNumber + " in project " + getProject());return request;@@ -148,8 +156,14 @@ public abstract class RequestDetailPage extends ProjectPage {reviewUpdateId = requestModel.getObject().getLatestUpdate().getId();++ position = QueryPosition.from(params);}+ private PullRequestManager getPullRequestManager() {+ return OneDev.getInstance(PullRequestManager.class);+ }+@Overrideprotected void onInitialize() {super.onInitialize();@@ -353,9 +367,8 @@ public abstract class RequestDetailPage extends ProjectPage {@Overridepublic void onEndRequest(RequestCycle cycle) {- if (SecurityUtils.getUser() != null) {- OneDev.getInstance(VisitManager.class).visitPullRequest(SecurityUtils.getUser(), getPullRequest());- }+ if (SecurityUtils.getUser() != null)+ OneDev.getInstance(UserInfoManager.class).visitPullRequest(SecurityUtils.getUser(), getPullRequest());}@Override@@ -368,7 +381,7 @@ public abstract class RequestDetailPage extends ProjectPage {});- WebMarkupContainer sideContainer = new WebMarkupContainer("side") {+ WebMarkupContainer side = new WebMarkupContainer("side") {@Overridepublic void renderHead(IHeaderResponse response) {@@ -390,22 +403,70 @@ public abstract class RequestDetailPage extends ProjectPage {}};- sideContainer.setOutputMarkupId(true);- add(sideContainer);+ side.setOutputMarkupId(true);+ add(side);++ side.add(new EntityNavPanel<PullRequest>("requestNav") {++ @Override+ protected EntityQuery<PullRequest> parse(String queryString) {+ return PullRequestQuery.parse(getProject(), queryString, true);+ }++ @Override+ protected PullRequest getEntity() {+ return getPullRequest();+ }++ @Override+ protected QueryPosition getPosition() {+ return position;+ }++ @Override+ protected void navTo(PullRequest request, QueryPosition position) {+ PageParameters params = RequestDetailPage.paramsOf(request, position);+ setResponsePage(getPageClass(), params);+ }++ @Override+ protected List<PullRequest> query(EntityQuery<PullRequest> query, int offset, int count) {+ return getPullRequestManager().query(getProject(), query, offset, count);+ }++ });- sideContainer.add(newMergeStrategyContainer());- sideContainer.add(new ReviewListPanel("reviews", requestModel));+ side.add(newMergeStrategyContainer());+ side.add(new ReviewListPanel("reviews", requestModel));BranchProtection protection = request.getTargetProject().getBranchProtection(request.getTargetBranch(), request.getSubmitter());if (protection != null && !protection.getConfigurations().isEmpty() && protection.isBuildMerges()) {- sideContainer.add(new Label("buildsTitle", "Builds (On Merged Commit)"));+ side.add(new Label("buildsTitle", "Builds (On Merged Commit)"));} else {- sideContainer.add(new Label("buildsTitle", "Builds"));+ side.add(new Label("buildsTitle", "Builds"));}- sideContainer.add(new PullRequestBuildsPanel("builds", requestModel));+ side.add(new PullRequestBuildsPanel("builds", requestModel));- sideContainer.add(newWatchContainer());- sideContainer.add(newManageContainer());+ side.add(new EntityWatchesPanel("watches") {++ @Override+ protected void onSaveWatch(EntityWatch watch) {+ OneDev.getInstance(PullRequestWatchManager.class).save((PullRequestWatch) watch);+ }++ @Override+ protected void onDeleteWatch(EntityWatch watch) {+ OneDev.getInstance(PullRequestWatchManager.class).delete((PullRequestWatch) watch);+ }++ @Override+ protected AbstractEntity getEntity() {+ return getPullRequest();+ }++ });++ side.add(newManageContainer());}private WebMarkupContainer newManageContainer() {@@ -421,7 +482,7 @@ public abstract class RequestDetailPage extends ProjectPage {@Overridepublic void onClick() {- OneDev.getInstance(PullRequestManager.class).check(getPullRequest());+ getPullRequestManager().check(getPullRequest());Session.get().success("Pull request is synchronized");}@@ -431,7 +492,7 @@ public abstract class RequestDetailPage extends ProjectPage {@Overridepublic void onClick() {PullRequest request = getPullRequest();- OneDev.getInstance(PullRequestManager.class).delete(request);+ getPullRequestManager().delete(request);Session.get().success("Pull request #" + request.getNumber() + " is deleted");setResponsePage(RequestListPage.class, RequestListPage.paramsOf(getProject()));}@@ -475,7 +536,7 @@ public abstract class RequestDetailPage extends ProjectPage {@Overridepublic String getObject() {- return getPullRequest().getMergeStrategy().getDisplayName();+ return getPullRequest().getMergeStrategy().toString();}}) {@@ -510,118 +571,6 @@ public abstract class RequestDetailPage extends ProjectPage {return mergeStrategyContainer;}- private WebMarkupContainer newWatchContainer() {- final WebMarkupContainer watchContainer = new WebMarkupContainer("watch") {-- @Override- protected void onConfigure() {- super.onConfigure();- setVisible(getLoginUser() != null);- }-- };-- watchContainer.setOutputMarkupId(true);-- final IModel<WatchStatus> optionModel = new LoadableDetachableModel<WatchStatus>() {-- @Override- protected WatchStatus load() {- PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());- if (watch != null) {- if (watch.isWatching())- return WatchStatus.WATCH;- else- return WatchStatus.DO_NOT_WATCH;- } else {- return WatchStatus.DEFAULT;- }- }-- };-- List<WatchStatus> options = Arrays.asList(WatchStatus.values());-- IChoiceRenderer<WatchStatus> choiceRenderer = new IChoiceRenderer<WatchStatus>() {-- @Override- public Object getDisplayValue(WatchStatus object) {- return object.toString();- }-- @Override- public String getIdValue(WatchStatus object, int index) {- return object.name();- }-- @Override- public WatchStatus getObject(String id, IModel<? extends List<? extends WatchStatus>> choices) {- return WatchStatus.valueOf(id);- }-- };- DropDownChoice<WatchStatus> choice = new DropDownChoice<>("option", optionModel,- options, choiceRenderer);-- choice.add(new OnChangeAjaxBehavior() {-- @Override- protected void onUpdate(AjaxRequestTarget target) {- PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());- Dao dao = OneDev.getInstance(Dao.class);- if (optionModel.getObject() == WatchStatus.WATCH) {- if (watch != null) {- watch.setWatching(true);- } else {- watch = new PullRequestWatch();- watch.setRequest(getPullRequest());- watch.setUser(getLoginUser());- watch.setWatching(true);- getPullRequest().getWatches().add(watch);- }- dao.persist(watch);- } else if (optionModel.getObject() == WatchStatus.DEFAULT) {- if (watch != null) {- dao.remove(watch);- getPullRequest().getWatches().remove(watch);- }- } else {- if (watch != null) {- watch.setWatching(false);- } else {- watch = new PullRequestWatch();- watch.setRequest(getPullRequest());- watch.setUser(getLoginUser());- watch.setWatching(false);- getPullRequest().getWatches().add(watch);- }- dao.persist(watch);- }- target.add(watchContainer);- }-- });- watchContainer.add(choice);- watchContainer.add(new Label("help", new LoadableDetachableModel<String>() {-- @Override- protected String load() {- PullRequestWatch watch = getPullRequest().getWatch(getLoginUser());- if (watch != null) {- if (!watch.isWatching())- return "Ignore notifications irrelevant to me.";- else- return "You will be notified of any activities.";- } else {- return "Ignore notifications irrelevant to me, but start to watch once I am involved.";- }- }-- }));-- return watchContainer;- }-private WebMarkupContainer newStatusAndBranchesContainer() {WebMarkupContainer statusAndBranchesContainer = new WebMarkupContainer("statusAndBranches");@@ -635,7 +584,7 @@ public abstract class RequestDetailPage extends ProjectPage {if (request.isOpen())return "OPEN";else- return request.getCloseInfo().getCloseStatus().toString();+ return request.getCloseInfo().getStatus().toString();}}) {@@ -983,7 +932,7 @@ public abstract class RequestDetailPage extends ProjectPage {target.appendJavaScript("$(window).resize();");} else {operation.operate(request, noteInput.getModelObject());- setResponsePage(RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(getPullRequest()));+ setResponsePage(RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(getPullRequest(), position));}}@@ -1129,16 +1078,22 @@ public abstract class RequestDetailPage extends ProjectPage {super.onDetach();}- public static PageParameters paramsOf(PullRequest request) {- PageParameters params = ProjectPage.paramsOf(request.getTarget().getProject());- params.set(PARAM_REQUEST, request.getNumber());+ public static PageParameters paramsOf(PullRequest request, @Nullable QueryPosition position) {+ PageParameters params = ProjectPage.paramsOf(request.getTargetProject());+ params.add(PARAM_REQUEST, request.getNumber());+ if (position != null)+ position.fill(params);return params;}-+public PullRequest getPullRequest() {return requestModel.getObject();}+ public QueryPosition getPosition() {+ return position;+ }+@Overridepublic Collection<String> getWebSocketObservables() {Collection<String> observables = super.getWebSocketObservables();@@ -1163,7 +1118,7 @@ public abstract class RequestDetailPage extends ProjectPage {public Component render(String componentId) {if (getMainPageClass() == RequestCodeCommentsPage.class) {Fragment fragment = new Fragment(componentId, "codeCommentsTabLinkFrag", RequestDetailPage.this);- Link<Void> link = new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, paramsOf(getPullRequest())) {+ Link<Void> link = new ViewStateAwarePageLink<Void>("link", RequestCodeCommentsPage.class, paramsOf(getPullRequest(), position)) {@Overridepublic void onEvent(IEvent<?> event) {@@ -1196,7 +1151,7 @@ public abstract class RequestDetailPage extends ProjectPage {@Overrideprotected Link<?> newLink(String linkId, Class<? extends Page> pageClass) {- return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getPullRequest()));+ return new ViewStateAwarePageLink<Void>(linkId, pageClass, paramsOf(getPullRequest(), position));}};diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.javaindex 297026931f..10b6af3ceb 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UnreviewedChangesPanel.java@@ -24,8 +24,9 @@ public class UnreviewedChangesPanel extends GenericPanel<PullRequestUpdate> {state.oldCommit = update.getHeadCommitHash();state.newCommit = update.getRequest().getHeadCommitHash();+ RequestDetailPage page = (RequestDetailPage) getPage();add(new ViewStateAwarePageLink<Void>("link", RequestChangesPage.class,- RequestChangesPage.paramsOf(update.getRequest(), state)));+ RequestChangesPage.paramsOf(update.getRequest(), page.getPosition(), state)));}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UpdateChangesLink.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UpdateChangesLink.javaindex 8d3a746c57..dfdf41f811 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UpdateChangesLink.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/UpdateChangesLink.java@@ -1,5 +1,7 @@package io.onedev.server.web.page.project.pullrequests.requestdetail;+import javax.annotation.Nullable;+import org.apache.wicket.model.IModel;import org.apache.wicket.model.Model;import org.apache.wicket.request.mapper.parameter.PageParameters;@@ -7,18 +9,19 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;+import io.onedev.server.web.util.QueryPosition;@SuppressWarnings("serial")public class UpdateChangesLink extends ViewStateAwarePageLink<Void> {- public UpdateChangesLink(String id, PullRequestUpdate update) {- super(id, RequestChangesPage.class, paramsOf(update));+ public UpdateChangesLink(String id, PullRequestUpdate update, @Nullable QueryPosition position) {+ super(id, RequestChangesPage.class, paramsOf(update, position));setEscapeModelStrings(false);}- private static PageParameters paramsOf(PullRequestUpdate update) {- return RequestChangesPage.paramsOf(update.getRequest(), update.getBaseCommitHash(), update.getHeadCommitHash());+ private static PageParameters paramsOf(PullRequestUpdate update, @Nullable QueryPosition position) {+ return RequestChangesPage.paramsOf(update.getRequest(), position, update.getBaseCommitHash(), update.getHeadCommitHash());}public IModel<?> getBody() {diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/SinceChangesLink.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/SinceChangesLink.javaindex 92a9f4f40e..358b4ab1d1 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/SinceChangesLink.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/activities/SinceChangesLink.java@@ -11,6 +11,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.changes.RequestChangesPage;import io.onedev.server.web.websocket.PageDataChanged;@@ -48,7 +49,8 @@ public class SinceChangesLink extends ViewStateAwarePageLink<Void> {RequestChangesPage.State state = new RequestChangesPage.State();state.oldCommit = oldCommitModel.getObject();state.newCommit = request.getHeadCommitHash();- return RequestChangesPage.paramsOf(request, state);+ RequestDetailPage page = (RequestDetailPage) getPage();+ return RequestChangesPage.paramsOf(request, page.getPosition(), state);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.javaindex b9d33f8ded..30c0488e99 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/changes/RequestChangesPage.java@@ -47,6 +47,7 @@ import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;+import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;@@ -353,11 +354,11 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSuppsuper.onDetach();}- public static PageParameters paramsOf(PullRequest request, String oldCommit, String newCommit) {+ public static PageParameters paramsOf(PullRequest request, @Nullable QueryPosition position, String oldCommit, String newCommit) {State state = new State();state.oldCommit = oldCommit;state.newCommit = newCommit;- return paramsOf(request, state);+ return paramsOf(request, position, state);}public static State getState(CodeComment comment) {@@ -369,12 +370,12 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSuppreturn state;}- public static PageParameters paramsOf(PullRequest request, CodeComment comment) {- return paramsOf(request, getState(comment));+ public static PageParameters paramsOf(PullRequest request, @Nullable QueryPosition position, CodeComment comment) {+ return paramsOf(request, position, getState(comment));}- public static PageParameters paramsOf(PullRequest request, State state) {- PageParameters params = RequestDetailPage.paramsOf(request);+ public static PageParameters paramsOf(PullRequest request, @Nullable QueryPosition position, State state) {+ PageParameters params = RequestDetailPage.paramsOf(request, position);fillParams(params, state);return params;}@@ -406,7 +407,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSupp}private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {- PageParameters params = paramsOf(getPullRequest(), state);+ PageParameters params = paramsOf(getPullRequest(), getPosition(), state);CharSequence url = RequestCycle.get().urlFor(RequestChangesPage.class, params);pushState(partialPageRequestHandler, url.toString(), state);}@@ -498,7 +499,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSuppmarkState.newCommit = state.newCommit;markState.pathFilter = state.pathFilter;markState.whitespaceOption = state.whitespaceOption;- return urlFor(RequestChangesPage.class, paramsOf(getPullRequest(), markState)).toString();+ return urlFor(RequestChangesPage.class, paramsOf(getPullRequest(), getPosition(), markState)).toString();}@Override@@ -510,7 +511,7 @@ public class RequestChangesPage extends RequestDetailPage implements CommentSuppcommentState.newCommit = state.newCommit;commentState.pathFilter = state.pathFilter;commentState.whitespaceOption = state.whitespaceOption;- return urlFor(RequestChangesPage.class, paramsOf(getPullRequest(), commentState)).toString();+ return urlFor(RequestChangesPage.class, paramsOf(getPullRequest(), getPosition(), commentState)).toString();}@Overridediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.javaindex fea58689ec..578360ffc5 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/codecomments/RequestCodeCommentsPage.java@@ -8,8 +8,7 @@ import org.apache.wicket.request.cycle.RequestCycle;import org.apache.wicket.request.mapper.parameter.PageParameters;import io.onedev.server.OneDev;-import io.onedev.server.manager.VisitManager;-import io.onedev.server.model.PullRequest;+import io.onedev.server.manager.UserInfoManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.web.component.codecomment.CodeCommentFilter;import io.onedev.server.web.component.codecomment.CodeCommentListPanel;@@ -51,7 +50,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@Overridepublic void setObject(CodeCommentFilter object) {- PageParameters params = paramsOf(getPullRequest());+ PageParameters params = paramsOf(getPullRequest(), getPosition());object.fillPageParams(params);setResponsePage(RequestCodeCommentsPage.class, params);}@@ -60,7 +59,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getPullRequest());+ PageParameters params = paramsOf(getPullRequest(), getPosition());filterOption.fillPageParams(params);params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;@@ -71,14 +70,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {return getPageParameters().get(PARAM_CURRENT_PAGE).toInt(1)-1;}- }) {-- @Override- protected PullRequest getPullRequest() {- return RequestCodeCommentsPage.this.getPullRequest();- }-- });+ }));RequestCycle.get().getListeners().add(new IRequestCycleListener() {@@ -110,7 +102,7 @@ public class RequestCodeCommentsPage extends RequestDetailPage {@Overridepublic void onEndRequest(RequestCycle cycle) {if (SecurityUtils.getUser() != null) {- OneDev.getInstance(VisitManager.class).visitPullRequestCodeComments(SecurityUtils.getUser(), getPullRequest());+ OneDev.getInstance(UserInfoManager.class).visitPullRequestCodeComments(SecurityUtils.getUser(), getPullRequest());}}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.htmlindex 2ae6c661ed..852d6b279d 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.html@@ -23,7 +23,7 @@</div></div><div wicket:id="outDated" class="out-dated alert alert-warning">- <a wicket:id="link"><i class="fa fa-warning"></i> Merge preview is out dated, click to refresh</a>+ <a wicket:id="link"><i class="fa fa-warning"></i> Merge preview is outdated, click to refresh</a></div><div wicket:id="revisionDiff" class="body"></div></div>diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.javaindex 3e401ec048..3d07ffeffd 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestdetail/mergepreview/MergePreviewPage.java@@ -37,6 +37,7 @@ import io.onedev.server.web.component.diff.revision.RevisionDiffPanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.RequestDetailPage;+import io.onedev.server.web.util.QueryPosition;import io.onedev.server.web.websocket.PageDataChanged;import io.onedev.server.web.websocket.WebSocketManager;@@ -71,8 +72,8 @@ public class MergePreviewPage extends RequestDetailPage {newContent(null);}- public static PageParameters paramsOf(PullRequest request, State state) {- PageParameters params = RequestDetailPage.paramsOf(request);+ public static PageParameters paramsOf(PullRequest request, @Nullable QueryPosition position, State state) {+ PageParameters params = RequestDetailPage.paramsOf(request, position);if (state.whitespaceOption != WhitespaceOption.DEFAULT)params.set(PARAM_WHITESPACE_OPTION, state.whitespaceOption.name());@@ -263,7 +264,7 @@ public class MergePreviewPage extends RequestDetailPage {}private void pushState(IPartialPageRequestHandler partialPageRequestHandler) {- PageParameters params = paramsOf(getPullRequest(), state);+ PageParameters params = paramsOf(getPullRequest(), getPosition(), state);CharSequence url = RequestCycle.get().urlFor(MergePreviewPage.class, params);pushState(partialPageRequestHandler, url.toString(), state);}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/NamedPullRequestQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/NamedPullRequestQueriesBean.javanew file mode 100644index 0000000000..96f89e1206--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/NamedPullRequestQueriesBean.java@@ -0,0 +1,33 @@+package io.onedev.server.web.page.project.pullrequests.requestlist;++import java.util.ArrayList;+import java.util.List;++import javax.validation.constraints.NotNull;++import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.web.editable.annotation.Editable;+import io.onedev.server.web.editable.annotation.OmitName;+import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;++@Editable+public class NamedPullRequestQueriesBean extends NamedQueriesBean<NamedPullRequestQuery> {++ private static final long serialVersionUID = 1L;++ private List<NamedPullRequestQuery> queries = new ArrayList<>();++ @Override+ @NotNull+ @Editable+ @OmitName+ public List<NamedPullRequestQuery> getQueries() {+ return queries;+ }++ @Override+ public void setQueries(List<NamedPullRequestQuery> queries) {+ this.queries = queries;+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.htmlindex 3a45a25ff5..923a40ed0f 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.html@@ -1,48 +1,31 @@<wicket:extend><div id="request-list">- <div class="head">- <a wicket:id="filters" class="btn btn-default"><i class="fa fa-filter"></i> Filters <span class="caret"></span></a>- <a wicket:id="sortBy" class="btn btn-default"> <i class="fa fa-sort"></i> Sort by <span class="caret"></span></a>- <a wicket:id="newRequest" class="btn btn-success"><i class="fa fa-plus"></i> Open New</a>- </div>- <table class="body">- <tr>- <td class="filter">- <h4>Filter options</h4>- <hr>- <div class="body">- <form wicket:id="filterForm">- <div wicket:id="editor" class="no-autofocus"></div>- <button type="submit" class="btn btn-primary"><i class="fa fa-search"></i> Filter</button>- </form>+ <div wicket:id="side" class="side"></div>+ <div class="main">+ <div class="head">+ <form wicket:id="query" class="clearable-wrapper">+ <div class="input-group no-autofocus">+ <input wicket:id="input" spellcheck="false" autocomplete="off" class="form-control" placeholder="Query and order pull requests here"></input>+ <span class="input-group-btn">+ <button wicket:id="submit" type="submit" class="btn btn-default" title="Query"><i class="fa fa-search"></i></button>+ </span></div>- </td>- <td class="spacing"> </td>- <td class="result">- <table wicket:id="requests"></table>- </td>- </tr>- </table>- </div>- <wicket:fragment wicket:id="requestFrag">- <div class="title clearfix">- <a wicket:id="submitter" class="avatar pull-left"></a>- <a wicket:id="text" class="text pull-left"></a>- <span wicket:id="number" class="number pull-left"></span>- <span wicket:id="status" class="status pull-right"></span>+ </form>+ <a wicket:id="newRequest" class="open-new btn btn-success"><i class="fa fa-plus"></i> New Pull Request</a>+ <div class="others clearfix">+ <a wicket:id="saveQuery" class="pull-left"><i class="fa fa-save"></i> Save Query</a>+ <div wicket:id="pageInfo" class="page-info pull-right"></div>+ </div>+ </div>+ <div class="body">+ <div wicket:id="feedback"></div>+ <table wicket:id="requests" class="table"></table>+ </div></div>- <div class="additional-info">- <span class="branches">- <a wicket:id="target" class="branch"></a>- <span class="fa fa-long-arrow-left"></span>- <a wicket:id="source" class="branch"></a>- </span>- <span wicket:id="lastActivity">- <span class="middot"></span>- <a wicket:id="user"></a>- <span wicket:id="description"></span>- <span wicket:id="date"></span>- </span>- </div>- </wicket:fragment>+ </div>+ <wicket:fragment wicket:id="lastActivityFrag">+ <span wicket:id="user"></span>+ <span wicket:id="description"></span>+ <span wicket:id="date"></span>+ </wicket:fragment></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.javaindex 4fd50975ec..2da37a2d15 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/RequestListPage.java@@ -1,331 +1,387 @@package io.onedev.server.web.page.project.pullrequests.requestlist;import java.util.ArrayList;-import java.util.Date;import java.util.Iterator;-import java.util.LinkedHashMap;import java.util.List;-import java.util.Map;+import javax.annotation.Nullable;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;import org.apache.wicket.behavior.AttributeAppender;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.DataTable;import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigationToolbar;-import org.apache.wicket.extensions.markup.html.repeater.data.table.NoRecordsToolbar;+import org.apache.wicket.extensions.markup.html.repeater.data.table.NavigatorLabel;+import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.basic.Label;import org.apache.wicket.markup.html.form.Form;-import org.apache.wicket.markup.html.link.AbstractLink;+import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.link.BookmarkablePageLink;import org.apache.wicket.markup.html.link.Link;-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;import org.apache.wicket.markup.html.panel.Fragment;import org.apache.wicket.markup.repeater.Item;-import org.apache.wicket.markup.repeater.data.IDataProvider;+import org.apache.wicket.markup.repeater.OddEvenItem;+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.mapper.parameter.PageParameters;+import org.eclipse.jgit.lib.FileMode;+import org.slf4j.Logger;+import org.slf4j.LoggerFactory;+import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;import io.onedev.server.OneDev;-import io.onedev.server.manager.UserManager;+import io.onedev.server.git.BlobIdent;+import io.onedev.server.manager.ProjectManager;+import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.manager.PullRequestQuerySettingManager;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.model.User;-import io.onedev.server.persistence.dao.Dao;-import io.onedev.server.persistence.dao.EntityCriteria;+import io.onedev.server.model.PullRequestQuerySetting;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.pullrequest.NamedPullRequestQuery;+import io.onedev.server.model.support.pullrequest.query.PullRequestQuery;+import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.DateUtils;import io.onedev.server.web.WebConstants;-import io.onedev.server.web.component.RequestStatusLabel;-import io.onedev.server.web.component.avatar.AvatarLink;-import io.onedev.server.web.component.datatable.HistoryAwarePagingNavigator;-import io.onedev.server.web.component.floating.FloatingPanel;-import io.onedev.server.web.component.link.BranchLink;-import io.onedev.server.web.component.link.UserLink;-import io.onedev.server.web.component.link.ViewStateAwarePageLink;-import io.onedev.server.web.component.menu.MenuItem;-import io.onedev.server.web.component.menu.MenuLink;-import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.behavior.PullRequestQueryBehavior;+import io.onedev.server.web.component.RequestStateLabel;+import io.onedev.server.web.component.datatable.HistoryAwareDataTable;+import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.page.project.blob.ProjectBlobPage;import io.onedev.server.web.page.project.pullrequests.newrequest.NewRequestPage;import io.onedev.server.web.page.project.pullrequests.requestdetail.activities.RequestActivitiesPage;-import io.onedev.server.web.page.project.pullrequests.requestlist.SearchOption.Status;+import io.onedev.server.web.page.project.savedquery.NamedQueriesBean;+import io.onedev.server.web.page.project.savedquery.SaveQueryPanel;+import io.onedev.server.web.page.project.savedquery.SavedQueriesPanel;import io.onedev.server.web.util.PagingHistorySupport;+import io.onedev.server.web.util.QueryPosition;+import io.onedev.utils.StringUtils;@SuppressWarnings("serial")public class RequestListPage extends ProjectPage {+ private static final Logger logger = LoggerFactory.getLogger(RequestListPage.class);+private static final String PARAM_CURRENT_PAGE = "currentPage";- private static final Map<SortOption, String> sortNames = new LinkedHashMap<>();+ private static final String PARAM_QUERY = "query";- static {- sortNames.put(new SortOption("submitDate", false), "Newest");- sortNames.put(new SortOption("submitDate", true), "Oldest");- sortNames.put(new SortOption("lastEvent.date", false), "Recently updated");- sortNames.put(new SortOption("lastEvent.date", true), "Least recently updated");- }+ private IModel<PullRequestQuery> parsedQueryModel = new LoadableDetachableModel<PullRequestQuery>() {++ @Override+ protected PullRequestQuery load() {+ try {+ PullRequestQuery parsedQuery = PullRequestQuery.parse(getProject(), query, true);+ if (SecurityUtils.getUser() == null && parsedQuery.needsLogin())+ error("Please login to perform this query");+ else+ return parsedQuery;+ } catch (Exception e) {+ logger.error("Error parsing pull request query: " + query, e);+ error(e.getMessage());+ }+ return null;+ }++ };- private SearchOption searchOption;+ private String query;- private SortOption sortOption;+ private DataTable<PullRequest, Void> requestsTable;public RequestListPage(PageParameters params) {super(params);-- searchOption = new SearchOption(params);- sortOption = new SortOption(params);+ query = params.get(PARAM_QUERY).toOptionalString();+ }++ private PullRequestQuerySettingManager getPullRequestQuerySettingManager() {+ return OneDev.getInstance(PullRequestQuerySettingManager.class);+ }++ private PullRequestManager getPullRequestManager() {+ return OneDev.getInstance(PullRequestManager.class);+ }++ @Override+ protected void onDetach() {+ parsedQueryModel.detach();+ super.onDetach();}@Overrideprotected void onInitialize() {super.onInitialize();++ Component side;+ add(side = new SavedQueriesPanel<NamedPullRequestQuery>("side") {++ @Override+ protected NamedQueriesBean<NamedPullRequestQuery> newNamedQueriesBean() {+ return new NamedPullRequestQueriesBean();+ }++ @Override+ protected boolean needsLogin(NamedPullRequestQuery namedQuery) {+ return PullRequestQuery.parse(getProject(), namedQuery.getQuery(), true).needsLogin();+ }++ @Override+ protected Link<Void> newQueryLink(String componentId, NamedPullRequestQuery namedQuery) {+ return new BookmarkablePageLink<Void>(componentId, RequestListPage.class, RequestListPage.paramsOf(getProject(), namedQuery.getQuery()));+ }++ @Override+ protected QuerySetting<NamedPullRequestQuery> getQuerySetting() {+ return getProject().getPullRequestQuerySettingOfCurrentUser();+ }++ @Override+ protected ArrayList<NamedPullRequestQuery> getProjectQueries() {+ return getProject().getSavedPullRequestQueries();+ }++ @Override+ protected void onSaveQuerySetting(QuerySetting<NamedPullRequestQuery> querySetting) {+ getPullRequestQuerySettingManager().save((PullRequestQuerySetting) querySetting);+ }++ @Override+ protected void onSaveProjectQueries(ArrayList<NamedPullRequestQuery> projectQueries) {+ getProject().setSavedPullRequestQueries(projectQueries);+ OneDev.getInstance(ProjectManager.class).save(getProject());+ }++ });- add(new MenuLink("filters") {+ Component querySave;+ add(querySave = new AjaxLink<Void>("saveQuery") {@Override- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- List<MenuItem> menuItems = new ArrayList<>();+ protected void onConfigure() {+ super.onConfigure();+ setEnabled(StringUtils.isNotBlank(query));+ setVisible(SecurityUtils.getUser() != null);+ }- menuItems.add(new MenuItem() {+ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ configure();+ if (!isEnabled()) {+ tag.put("disabled", "disabled");+ tag.put("title", "Input query to save");+ }+ }- @Override- public String getLabel() {- return "Open requests";- }+ @Override+ public void onClick(AjaxRequestTarget target) {+ new ModalPanel(target) {@Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {+ protected Component newContent(String id) {+ return new SaveQueryPanel(id) {@Override- public void onClick() {- searchOption = new SearchOption();- searchOption.setStatus(Status.OPEN);-- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));+ protected void onSaveForMine(AjaxRequestTarget target, String name) {+ PullRequestQuerySetting setting = getProject().getPullRequestQuerySettingOfCurrentUser();+ NamedPullRequestQuery namedQuery = setting.getUserQuery(name);+ if (namedQuery == null) {+ namedQuery = new NamedPullRequestQuery(name, query);+ setting.getUserQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ getPullRequestQuerySettingManager().save(setting);+ target.add(side);+ close();}-- };- }-- });-- menuItems.add(new MenuItem() {- @Override- public String getLabel() {- return "Closed requests";- }-- @Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {+ @Override+ protected void onSaveForAll(AjaxRequestTarget target, String name) {+ NamedPullRequestQuery namedQuery = getProject().getSavedPullRequestQuery(name);+ if (namedQuery == null) {+ namedQuery = new NamedPullRequestQuery(name, query);+ getProject().getSavedPullRequestQueries().add(namedQuery);+ } else {+ namedQuery.setQuery(query);+ }+ OneDev.getInstance(ProjectManager.class).save(getProject());+ target.add(side);+ close();+ }@Override- public void onClick() {- searchOption = new SearchOption();- searchOption.setStatus(Status.CLOSED);-- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));+ protected void onCancel(AjaxRequestTarget target) {+ close();}};}- });-- User currentUser = OneDev.getInstance(UserManager.class).getCurrent();- if (currentUser != null) {- String userName = currentUser.getName();- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return "My open requests";- }-- @Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- searchOption = new SearchOption();- searchOption.setStatus(Status.OPEN);- searchOption.setSubmitterName(userName);-- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));- }-- };- }-- });- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return "My closed requests";- }-- @Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- searchOption = new SearchOption();- searchOption.setStatus(Status.CLOSED);- searchOption.setSubmitterName(userName);-- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));- }-- };- }-- });- }- return menuItems;- }+ };+ }});- add(new MenuLink("sortBy") {+ TextField<String> input = new TextField<String>("input", Model.of(query));+ input.add(new PullRequestQueryBehavior(new AbstractReadOnlyModel<Project>() {@Override- protected List<MenuItem> getMenuItems(FloatingPanel dropdown) {- List<MenuItem> menuItems = new ArrayList<>();-- for (Map.Entry<SortOption, String> entry: sortNames.entrySet()) {- final SortOption sortOption = entry.getKey();- final String displayName = entry.getValue();- menuItems.add(new MenuItem() {-- @Override- public String getLabel() {- return displayName;- }-- @Override- public String getIconClass() {- if (RequestListPage.this.sortOption.equals(sortOption))- return "fa fa-check";- else- return null;- }-- @Override- public AbstractLink newLink(String id) {- return new Link<Void>(id) {-- @Override- public void onClick() {- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));- }-- };- }-- });- }-- return menuItems;+ public Project getObject() {+ return getProject();+ }++ }));+ input.add(new AjaxFormComponentUpdatingBehavior("input"){++ @Override+ protected void onUpdate(AjaxRequestTarget target) {+ query = input.getModelObject();+ if (SecurityUtils.getUser() != null)+ target.add(querySave);}});- add(new Link<Void>("newRequest") {+ Form<?> form = new Form<Void>("query");+ form.add(input);+ form.add(new AjaxButton("submit") {@Override- public void onClick() {- ProjectPage page = (ProjectPage) getPage();- setResponsePage(NewRequestPage.class, NewRequestPage.paramsOf(page.getProject()));+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ setResponsePage(RequestListPage.class, paramsOf(getProject(), query));}});+ add(form);- Form<?> form = new Form<Void>("filterForm") {+ add(new BookmarkablePageLink<Void>("newRequest", NewRequestPage.class, NewRequestPage.paramsOf(getProject())) {@Override- protected void onSubmit() {- super.onSubmit();-- setResponsePage(RequestListPage.class, paramsOf(getProject(), searchOption, sortOption));+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canRead(getProject()));}- };- form.add(BeanContext.editBean("editor", searchOption));- add(form);+ });++ add(new NotificationPanel("feedback", this));List<IColumn<PullRequest, Void>> columns = new ArrayList<>();- columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Pull Request")) {++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("")) {@Override- public void populateItem(Item<ICellPopulator<PullRequest>> cellItem,- String componentId, final IModel<PullRequest> rowModel) {- PullRequest request = rowModel.getObject();- Fragment fragment = new Fragment(componentId, "requestFrag", RequestListPage.this);- User userForDisplay = User.getForDisplay(request.getSubmitter(), request.getSubmitterName());- fragment.add(new AvatarLink("submitter", userForDisplay));- fragment.add(new Label("number", "#" + request.getNumber()));- fragment.add(new ViewStateAwarePageLink<Void>("text", RequestActivitiesPage.class,- RequestActivitiesPage.paramsOf(request)) {+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ cellItem.add(new Label(componentId, ""));+ }++ @Override+ public String getCssClass() {+ return "new-indicator";+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("#")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ cellItem.add(new Label(componentId, rowModel.getObject().getNumber()));+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Title")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ OddEvenItem<?> row = cellItem.findParent(OddEvenItem.class);+ QueryPosition position = new QueryPosition(parsedQueryModel.getObject().toString(), (int)requestsTable.getItemCount(),+ (int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex());++ cellItem.add(new BookmarkablePageLink<Void>(componentId, RequestActivitiesPage.class,+ RequestActivitiesPage.paramsOf(rowModel.getObject(), position)) {@Overridepublic IModel<?> getBody() {return Model.of(rowModel.getObject().getTitle());}++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("a");+ }});-- fragment.add(new RequestStatusLabel("status", rowModel));- fragment.add(new BranchLink("target", request.getTarget(), null));- if (request.getSource() != null) {- fragment.add(new BranchLink("source", request.getSource(), request));- } else {- fragment.add(new Label("source", "(deleted)") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- });- }+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("State")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ cellItem.add(new RequestStateLabel(componentId, rowModel));+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Target Branch")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ PullRequest request = rowModel.getObject();+ PageParameters params = ProjectBlobPage.paramsOf(getProject(),+ new BlobIdent(request.getTargetBranch(), null, FileMode.TREE.getBits()));+ cellItem.add(new BookmarkablePageLink<Void>(componentId, ProjectBlobPage.class, params) {++ @Override+ public IModel<?> getBody() {+ return Model.of(rowModel.getObject().getTargetBranch());+ }- WebMarkupContainer lastActivityContainer = new WebMarkupContainer("lastActivity");- String description = request.getLastActivity().getDescription();- User user = User.getForDisplay(request.getLastActivity().getUser(),- request.getLastActivity().getUserName());- if (user != null)- lastActivityContainer.add(new UserLink("user", userForDisplay));- else- lastActivityContainer.add(new WebMarkupContainer("user").setVisible(false));- lastActivityContainer.add(new Label("description", description));- lastActivityContainer.add(new Label("date", DateUtils.formatAge(request.getLastActivity().getDate())));- fragment.add(lastActivityContainer);+ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("a");+ }++ });+ }++ });++ columns.add(new AbstractColumn<PullRequest, Void>(Model.of("Last Activity")) {++ @Override+ public void populateItem(Item<ICellPopulator<PullRequest>> cellItem, String componentId, IModel<PullRequest> rowModel) {+ PullRequest request = rowModel.getObject();+ Fragment fragment = new Fragment(componentId, "lastActivityFrag", RequestListPage.this);+ fragment.add(new Label("user", request.getLastActivity().getUserName()).setVisible(request.getLastActivity().getUserName()!=null));++ fragment.add(new Label("description", request.getLastActivity().getDescription()));+ fragment.add(new Label("date", DateUtils.formatAge(request.getLastActivity().getDate())));cellItem.add(fragment);-- Date lastActivityDate;- if (request.getLastActivity() != null)- lastActivityDate = request.getLastActivity().getDate();- else- lastActivityDate = request.getSubmitDate();- cellItem.add(AttributeAppender.append("class",- request.isVisitedAfter(lastActivityDate)?"request":"request new"));}-- });- IDataProvider<PullRequest> dataProvider = new IDataProvider<PullRequest>() {+ });++ SortableDataProvider<PullRequest, Void> dataProvider = new SortableDataProvider<PullRequest, Void>() {@Overridepublic void detach() {@@ -333,27 +389,26 @@ public class RequestListPage extends ProjectPage {@Overridepublic Iterator<? extends PullRequest> iterator(long first, long count) {- ProjectPage page = (ProjectPage) getPage();-- EntityCriteria<PullRequest> criteria = searchOption.getCriteria(page.getProject());- criteria.addOrder(sortOption.getOrder());- return OneDev.getInstance(Dao.class).findRange(criteria, (int)first, (int)count).iterator();+ return getPullRequestManager().query(getProject(), parsedQueryModel.getObject(), (int)first, (int)count).iterator();}@Overridepublic long size() {- ProjectPage page = (ProjectPage) getPage();- return OneDev.getInstance(Dao.class).count(searchOption.getCriteria(page.getProject()));+ PullRequestQuery parsedQuery = parsedQueryModel.getObject();+ if (parsedQuery != null)+ return getPullRequestManager().count(getProject(), parsedQuery.getCriteria());+ else+ return 0;}@Overridepublic IModel<PullRequest> model(PullRequest object) {- final Long pullRequestId = object.getId();+ Long requestId = object.getId();return new LoadableDetachableModel<PullRequest>() {@Overrideprotected PullRequest load() {- return OneDev.getInstance(Dao.class).load(PullRequest.class, pullRequestId);+ return getPullRequestManager().load(requestId);}};@@ -361,12 +416,12 @@ public class RequestListPage extends ProjectPage {};+PagingHistorySupport pagingHistorySupport = new PagingHistorySupport() {@Overridepublic PageParameters newPageParameters(int currentPage) {- PageParameters params = paramsOf(getProject());- searchOption.fillPageParams(params);+ PageParameters params = paramsOf(getProject(), query);params.add(PARAM_CURRENT_PAGE, currentPage+1);return params;}@@ -377,33 +432,42 @@ public class RequestListPage extends ProjectPage {}};++ add(requestsTable = new HistoryAwareDataTable<PullRequest, Void>("requests", columns, dataProvider,+ WebConstants.PAGE_SIZE, pagingHistorySupport) {++ @Override+ protected Item<PullRequest> newRowItem(String id, int index, IModel<PullRequest> model) {+ Item<PullRequest> item = super.newRowItem(id, index, model);+ PullRequest request = model.getObject();+ item.add(AttributeAppender.append("class",+ request.isVisitedAfter(request.getLastActivity().getDate())?"request":"request new"));+ return item;+ }+ });- DataTable<PullRequest, Void> dataTable = new DataTable<>("requests", columns,- dataProvider, WebConstants.PAGE_SIZE);- dataTable.setCurrentPage(pagingHistorySupport.getCurrentPage());- dataTable.addBottomToolbar(new NoRecordsToolbar(dataTable));- dataTable.addBottomToolbar(new NavigationToolbar(dataTable) {+ add(new NavigatorLabel("pageInfo", requestsTable) {@Override- protected PagingNavigator newPagingNavigator(String navigatorId, DataTable<?, ?> table) {- return new HistoryAwarePagingNavigator(navigatorId, table, pagingHistorySupport);+ protected void onConfigure() {+ super.onConfigure();+ setVisible(requestsTable.getItemCount() != 0);}});- add(dataTable);+}-+@Overridepublic void renderHead(IHeaderResponse response) {super.renderHead(response);-response.render(CssHeaderItem.forReference(new RequestListResourceReference()));}-- public static PageParameters paramsOf(Project project, SearchOption searchOption, SortOption sortOption) {++ public static PageParameters paramsOf(Project project, @Nullable String query) {PageParameters params = paramsOf(project);- searchOption.fillPageParams(params);- sortOption.fillPageParams(params);+ if (query != null)+ params.add(PARAM_QUERY, query);return params;}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SearchOption.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SearchOption.javadeleted file mode 100644index 6242b0ec5d..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SearchOption.java+++ /dev/null@@ -1,169 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.requestlist;--import static io.onedev.server.model.PullRequest.CriterionHelper.ofTarget;-import static io.onedev.server.model.PullRequest.CriterionHelper.ofTargetProject;--import java.io.Serializable;-import java.util.Date;--import javax.validation.constraints.NotNull;--import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.Restrictions;--import io.onedev.server.model.Project;-import io.onedev.server.model.PullRequest;-import io.onedev.server.model.support.ProjectAndBranch;-import io.onedev.server.persistence.dao.EntityCriteria;-import io.onedev.server.web.editable.annotation.BranchChoice;-import io.onedev.server.web.editable.annotation.Editable;-import io.onedev.server.web.editable.annotation.UserChoice;--@SuppressWarnings("serial")-@Editable-public class SearchOption implements Serializable {-- private static final String PARAM_STATUS = "status";-- private static final String PARAM_SUBMITTER = "submitter";-- private static final String PARAM_BRANCH = "branch";-- private static final String PARAM_TITLE = "title";-- private static final String PARAM_BEGIN_DATE = "begin";-- private static final String PARAM_END_DATE = "end";-- public enum Status {OPEN, CLOSED, ALL};-- private Status status = Status.OPEN;-- private String submitterName;-- private String targetBranch;-- private String title;-- private Date beginDate;-- private Date endDate;-- @Editable(order=100)- @NotNull(message="may not be empty")- public Status getStatus() {- return status;- }-- public void setStatus(Status status) {- this.status = status;- }-- @Editable(order=300, name="Submitted By")- @UserChoice- public String getSubmitterName() {- return submitterName;- }-- public void setSubmitterName(String submitterName) {- this.submitterName = submitterName;- }-- @Editable(order=400, description="Target branch for incoming request, or source branch for outgoing request")- @BranchChoice- public String getTargetBranch() {- return targetBranch;- }-- public void setTargetBranch(String targetBranch) {- this.targetBranch = targetBranch;- }-- @Editable(order=500, name="Title Containing")- public String getTitle() {- return title;- }-- public void setTitle(String title) {- this.title = title;- }-- @Editable(order=700, name="Submitted After", description="Date should be specified with format <i>yyyy-MM-dd</i>.")- public Date getBeginDate() {- return beginDate;- }-- public void setBeginDate(Date beginDate) {- this.beginDate = beginDate;- }-- @Editable(order=800, name="Submitted Before", description="Date should be specified with format <i>yyyy-MM-dd</i>.")- public Date getEndDate() {- return endDate;- }-- public void setEndDate(Date endDate) {- this.endDate = endDate;- }-- public SearchOption() {- }-- public SearchOption(PageParameters params) {- String value = params.get(PARAM_STATUS).toString();- if (value != null)- status = Status.valueOf(value);-- submitterName = params.get(PARAM_SUBMITTER).toString();-- targetBranch = params.get(PARAM_BRANCH).toString();- title = params.get(PARAM_TITLE).toString();-- value = params.get(PARAM_BEGIN_DATE).toString();- if (value != null)- beginDate = new Date(Long.valueOf(value));-- value = params.get(PARAM_END_DATE).toString();- if (value != null)- endDate = new Date(Long.valueOf(value));- }-- public EntityCriteria<PullRequest> getCriteria(Project project) {- EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);- if (targetBranch != null)- criteria.add(ofTarget(new ProjectAndBranch(project, targetBranch)));- else- criteria.add(ofTargetProject(project));-- if (status == Status.OPEN)- criteria.add(PullRequest.CriterionHelper.ofOpen());- else if (status == Status.CLOSED)- criteria.add(PullRequest.CriterionHelper.ofClosed());-- if (submitterName != null) {- criteria.createCriteria("submitter").add(Restrictions.eq("name", submitterName));- }- if (title != null)- criteria.add(Restrictions.ilike("title", "%" + title + "%"));- if (beginDate != null)- criteria.add(Restrictions.ge("createDate", beginDate));- if (endDate != null)- criteria.add(Restrictions.le("createDate", endDate));- return criteria;- }-- public void fillPageParams(PageParameters params) {- params.set(PARAM_STATUS, status.name());- if (submitterName != null)- params.set(PARAM_SUBMITTER, submitterName);- if (targetBranch != null)- params.set(PARAM_BRANCH, targetBranch);- if (title != null)- params.set(PARAM_TITLE, title);- if (beginDate != null)- params.set(PARAM_BEGIN_DATE, beginDate.getTime());- if (endDate != null)- params.set(PARAM_END_DATE, endDate.getTime());- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SortOption.java b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SortOption.javadeleted file mode 100644index b323af34c7..0000000000--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/SortOption.java+++ /dev/null@@ -1,76 +0,0 @@-package io.onedev.server.web.page.project.pullrequests.requestlist;--import java.io.Serializable;--import org.apache.commons.lang3.builder.EqualsBuilder;-import org.apache.commons.lang3.builder.HashCodeBuilder;-import org.apache.wicket.request.mapper.parameter.PageParameters;-import org.hibernate.criterion.Order;--import io.onedev.utils.WordUtils;--public class SortOption implements Serializable {-- private static final long serialVersionUID = 1L;-- private static final String PARAM_ORDER_PROPERTY = "orderProperty";-- private static final String PARAM_ORDER_ASCENDING = "orderAscending";-- private final String propertyName;-- private final boolean ascending;-- public SortOption() {- this("submitDate", false);- }-- public SortOption(String propertyName, boolean ascending) {- this.propertyName = propertyName;- this.ascending = ascending;- }-- public SortOption(PageParameters params) {- propertyName = params.get(PARAM_ORDER_PROPERTY).toString("submitDate");- ascending = params.get(PARAM_ORDER_ASCENDING).toBoolean(false);- }-- public Order getOrder() {- if (ascending)- return Order.asc(propertyName);- else- return Order.desc(propertyName);- }-- public String getDisplayName() {- String displayName = WordUtils.uncamel(propertyName).toLowerCase();- if (ascending)- return displayName + " ascending";- else- return displayName + " descending";- }-- public void fillPageParams(PageParameters params) {- params.set(PARAM_ORDER_PROPERTY, propertyName);- params.set(PARAM_ORDER_ASCENDING, ascending);- }-- @Override- public boolean equals(Object other) {- if (!(other instanceof SortOption))- return false;- if (this == other)- return true;- SortOption otherOption = (SortOption) other;- return new EqualsBuilder()- .append(propertyName, otherOption.propertyName)- .append(ascending, otherOption.ascending)- .isEquals();- }-- @Override- public int hashCode() {- return new HashCodeBuilder(17, 37).append(propertyName).append(ascending).toHashCode();- }--}diff --git a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.cssindex 4dc61ccfe4..87afd46a53 100644--- a/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/pullrequests/requestlist/request-list.css@@ -1,72 +1,48 @@-#request-list>.head {- margin-bottom: 20px;-}-#request-list>.head a {- margin-right: 8px;-}-#request-list td.filter {- width: 25%;- border: 2px solid #E0E0E0;- padding: 20px;-}-#request-list td.spacing {- width: 20px;+#request-list {+ display: table;+ width: 100%;}-#request-list td.result {- border: 2px solid #E0E0E0;-}-#request-list td.request {- color: #888;- padding: 12px 12px 0 12px;- border-left: 4px solid white;-}--#request-list td.request.new {- border-left: 4px solid #4667EE;+#request-list>div {+ display: table-cell;}-#request-list td.request>div {- padding-bottom: 12px;- border-bottom: 2px dotted #BBB;+#request-list>.side {+ width: 240px;+ border: 1px solid #E0E0E0;+ padding: 20px;+ border-radius: 4px;}-#request-list td.result tr:last-child td.request>div {- border-bottom: none;+#request-list>.main {+ padding-left: 20px;+ vertical-align: top;}-#request-list td.request .title {- margin-right: 4px;- font-size: 16px;+#request-list>.main>.head {+ position: relative;}-#request-list td.request .title a {- color: #333;-}--#request-list td.request .title>* {- margin-right: 8px;-}-#request-list td.request .title>.status {- margin-right: 0;+#request-list>.main>.head>* {+ margin-bottom: 20px;}--#request-list td.request .branches {- white-space: nowrap;- font-size: 15px;+#request-list>.main>.head>form {+ margin-right: 168px;}-#request-list td.request .additional-info {- margin-top: 4px;- margin-left: 32px;+#request-list>.main>.head>.open-new {+ position: absolute;+ right: 0;+ top: 0;}-#request-list td.request .additional-info a {- color: #444;+#request-list>.main>.head>.others>* {+ margin-right: 16px;+ color: #666;}-#request-list td.request .additional-info .middot:before {- margin-left: 8px;- margin-right: 8px;- font-size: 20px;- line-height: 9px;-+#request-list>.main>.head>.others a[disabled] {+ text-decoration: none;+ color: #999;+ cursor: default;}--#request-list td.result .norecords-td {- padding: 20px;- font-size: 20px;+#request-list>.main>.body .new-indicator {+ width: 4px;+ padding: 0;}+#request-list>.main>.body tr.request.new td.new-indicator {+ background: #4667EE;+}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/NamedQueriesBean.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/NamedQueriesBean.javanew file mode 100644index 0000000000..342f04aaff--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/NamedQueriesBean.java@@ -0,0 +1,23 @@+package io.onedev.server.web.page.project.savedquery;++import java.io.Serializable;+import java.util.ArrayList;+import java.util.List;++import io.onedev.server.model.support.NamedQuery;++public class NamedQueriesBean<T extends NamedQuery> implements Serializable {++ private static final long serialVersionUID = 1L;++ private List<T> queries = new ArrayList<>();++ public List<T> getQueries() {+ return queries;+ }++ public void setQueries(List<T> queries) {+ this.queries = queries;+ }++}\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/SaveQueryBean.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.javasimilarity index 89%rename from core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/SaveQueryBean.javarename to core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.javaindex b8c164f42e..61ab5bb1c3 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/SaveQueryBean.java+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryBean.java@@ -1,4 +1,4 @@-package io.onedev.server.web.page.project.issues.issuelist;+package io.onedev.server.web.page.project.savedquery;import java.io.Serializable;diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.htmlnew file mode 100644index 0000000000..6103921551--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.html@@ -0,0 +1,18 @@+<wicket:panel>+ <form wicket:id="form" class="save-request-query">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 id="modal-title" class="modal-title">+ Save Query+ </h4>+ </div>+ <div class="modal-body">+ <div wicket:id="editor"></div>+ </div>+ <div class="modal-footer clearfix">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save as Mine"></input>+ <a wicket:id="saveForAll" class="dirty-aware btn btn-primary">Save for All Users</a>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+</wicket:panel>diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.javanew file mode 100644index 0000000000..0116e746c3--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SaveQueryPanel.java@@ -0,0 +1,93 @@+package io.onedev.server.web.page.project.savedquery;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.html.form.Form;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.model.Project;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.editable.BeanEditor;+import io.onedev.server.web.page.project.ProjectPage;++@SuppressWarnings("serial")+public abstract class SaveQueryPanel extends Panel {++ public SaveQueryPanel(String id) {+ super(id);+ }++ private Project getProject() {+ ProjectPage page = (ProjectPage) getPage();+ return page.getProject();+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form") {++ @Override+ protected void onError() {+ super.onError();+ RequestCycle.get().find(AjaxRequestTarget.class).add(this);+ }++ };+ SaveQueryBean bean = new SaveQueryBean();+ BeanEditor editor = BeanContext.editBean("editor", bean);+ form.add(editor);+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ onSaveForMine(target, bean.getName());+ }++ });+ form.add(new AjaxButton("saveForAll") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);+ onSaveForAll(target, bean.getName());+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.canManage(getProject()));+ }++ });+ form.add(new AjaxLink<Void>("close") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ form.setOutputMarkupId(true);+ add(form);+ }++ protected abstract void onSaveForMine(AjaxRequestTarget target, String name);++ protected abstract void onSaveForAll(AjaxRequestTarget target, String name);++ protected abstract void onCancel(AjaxRequestTarget target);+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesCssResourceReference.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesCssResourceReference.javanew file mode 100644index 0000000000..29c6e014e7--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesCssResourceReference.java@@ -0,0 +1,13 @@+package io.onedev.server.web.page.project.savedquery;++import io.onedev.server.web.page.base.BaseDependentCssResourceReference;++public class SavedQueriesCssResourceReference extends BaseDependentCssResourceReference {++ private static final long serialVersionUID = 1L;++ public SavedQueriesCssResourceReference() {+ super(SavedQueriesCssResourceReference.class, "saved-queries.css");+ }++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.htmlnew file mode 100644index 0000000000..84f65577f8--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.html@@ -0,0 +1,52 @@+<wicket:panel>+ <div class="saved-queries">+ <div class="head clearfix">+ <h4 class="pull-left title">Saved Queries</h4>+ <div class="pull-left actions">+ <a wicket:id="edit" title="Edit saved queries"><i class="fa fa-pencil"></i></a>+ </div>+ </div>+ <hr>+ <div class="body">+ <wicket:enclosure child="userQueries">+ <div wicket:id="userQueries">+ <span class="btn-group">+ <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>+ <a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>+ </span>+ </div>+ <hr/>+ </wicket:enclosure>+ <div wicket:id="projectQueries">+ <span class="btn-group">+ <a wicket:id="link" class="btn btn-sm btn-default"><span wicket:id="label"></span></a>+ <a wicket:id="watchStatus" class="watch-status btn btn-default btn-sm"></a>+ </span>+ </div>+ <div class="help-block">+ <b><i class="fa fa-lightbulb-o"></i> Tips:</b> You may watch/unwatch specified queries above.+ The first matching query will take effect+ </div>+ </div>+ </div>+ <wicket:fragment wicket:id="editSavedQueriesFrag">+ <div class="modal-header">+ <button wicket:id="close" type="button" class="close">×</button>+ <h4 class="modal-title">Edit Saved Queries</h4>+ </div>+ <div class="modal-body">+ <ul wicket:id="tab" class="nav nav-tabs"></ul>+ <div wicket:id="tabPanel"></div>+ </div>+ </wicket:fragment>+ <wicket:fragment wicket:id="editSavedQueriesContentFrag">+ <form wicket:id="form" class="leave-confirm edit-saved-queries">+ <div wicket:id="feedback"></div>+ <div wicket:id="editor"></div>+ <div class="actions">+ <input wicket:id="save" type="submit" class="dirty-aware btn btn-primary" value="Save"></input>+ <a wicket:id="cancel" class="btn btn-default">Cancel</a>+ </div>+ </form>+ </wicket:fragment>+</wicket:panel>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.javanew file mode 100644index 0000000000..d9fd1b799b--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/SavedQueriesPanel.java@@ -0,0 +1,393 @@+package io.onedev.server.web.page.project.savedquery;++import java.util.ArrayList;+import java.util.HashSet;+import java.util.List;+import java.util.Set;++import org.apache.wicket.Component;+import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;+import org.apache.wicket.ajax.markup.html.AjaxLink;+import org.apache.wicket.ajax.markup.html.form.AjaxButton;+import org.apache.wicket.markup.head.CssHeaderItem;+import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.basic.Label;+import org.apache.wicket.markup.html.form.Form;+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.html.panel.Panel;+import org.apache.wicket.model.LoadableDetachableModel;+import org.apache.wicket.model.Model;++import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;+import io.onedev.server.model.Project;+import io.onedev.server.model.support.NamedQuery;+import io.onedev.server.model.support.QuerySetting;+import io.onedev.server.model.support.WatchStatus;+import io.onedev.server.security.SecurityUtils;+import io.onedev.server.web.component.modal.ModalLink;+import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.component.tabbable.AjaxActionTab;+import io.onedev.server.web.component.tabbable.Tab;+import io.onedev.server.web.component.tabbable.Tabbable;+import io.onedev.server.web.component.watchstatus.WatchStatusLink;+import io.onedev.server.web.editable.BeanContext;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.ajaxlistener.ConfirmLeaveListener;++@SuppressWarnings("serial")+public abstract class SavedQueriesPanel<T extends NamedQuery> extends Panel {++ public SavedQueriesPanel(String id) {+ super(id);+ }++ private ArrayList<T> getUserQueries() {+ QuerySetting<T> querySetting = getQuerySetting();+ if (querySetting != null)+ return querySetting.getUserQueries();+ else+ return new ArrayList<>();+ }++ private WatchStatus getProjectWatchStatus(T namedQuery) {+ QuerySetting<T> querySetting = getQuerySetting();+ if (querySetting != null)+ return querySetting.getProjectWatchStatus(namedQuery);+ else+ return WatchStatus.DEFAULT;+ }++ private WatchStatus getUserWatchStatus(T namedQuery) {+ QuerySetting<T> querySetting = getQuerySetting();+ if (querySetting != null)+ return querySetting.getUserWatchStatus(namedQuery);+ else+ return WatchStatus.DEFAULT;+ }++ private Project getProject() {+ ProjectPage page = (ProjectPage) getPage();+ return page.getProject();+ }++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(CssHeaderItem.forReference(new SavedQueriesCssResourceReference()));+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ add(new ModalLink("edit") {++ private static final String TAB_PANEL_ID = "tabPanel";++ @Override+ protected void onConfigure() {+ super.onConfigure();+ if (SecurityUtils.canManage(getProject())) {+ setVisible(!getUserQueries().isEmpty() || !getProjectQueries().isEmpty());+ } else {+ setVisible(SecurityUtils.getUser() != null && !getUserQueries().isEmpty());+ }+ }++ private Component newUserQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> userQueries) {+ return new NamedQueriesEditor(componentId, userQueries) {++ @Override+ protected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {+ target.add(SavedQueriesPanel.this);+ modal.close();++ QuerySetting<T> querySetting = getQuerySetting();+ querySetting.setUserQueries(queries);+ onSaveQuerySetting(querySetting);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }+ };+ }++ private Component newProjectQueriesEditor(String componentId, ModalPanel modal, ArrayList<T> projectQueries) {+ return new NamedQueriesEditor(componentId, projectQueries) {++ @Override+ protected void onSave(AjaxRequestTarget target, ArrayList<T> queries) {+ target.add(SavedQueriesPanel.this);+ modal.close();+ onSaveProjectQueries(queries);+ }++ @Override+ protected void onCancel(AjaxRequestTarget target) {+ modal.close();+ }++ };+ }++ @Override+ protected Component newContent(String id, ModalPanel modal) {+ Fragment fragment = new Fragment(id, "editSavedQueriesFrag", SavedQueriesPanel.this);+ List<Tab> tabs = new ArrayList<>();++ ArrayList<T> userQueries = getUserQueries();+ if (!userQueries.isEmpty()) {+ tabs.add(new AjaxActionTab(Model.of("For Mine")) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component editor = newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries);+ fragment.replace(editor);+ target.add(editor);+ }++ });+ fragment.add(newUserQueriesEditor(TAB_PANEL_ID, modal, userQueries));+ }++ ArrayList<T> projectQueries = getProjectQueries();+ if (SecurityUtils.canManage(getProject()) && !projectQueries.isEmpty()) {+ tabs.add(new AjaxActionTab(Model.of("For All Users")) {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ protected void onSelect(AjaxRequestTarget target, Component tabLink) {+ Component editor = newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries);+ fragment.replace(editor);+ target.add(editor);+ }++ });+ if (userQueries.isEmpty())+ fragment.add(newProjectQueriesEditor(TAB_PANEL_ID, modal, projectQueries));+ }++ fragment.add(new Tabbable("tab", tabs));++ fragment.add(new AjaxLink<Void>("close") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ modal.close();+ }++ });+ return fragment;+ }++ });++ add(new ListView<T>("userQueries", new LoadableDetachableModel<List<T>>() {++ @Override+ protected List<T> load() {+ return getUserQueries();+ }++ }) {++ @Override+ protected void populateItem(ListItem<T> item) {+ T namedQuery = item.getModelObject();+ Link<Void> link = newQueryLink("link", namedQuery);+ link.add(new Label("label", namedQuery.getName()));+ item.add(link);++ item.add(new WatchStatusLink("watchStatus") {++ @Override+ protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {+ target.add(this);+ QuerySetting<T> querySetting = getQuerySetting();+ querySetting.setUserWatchStatus(namedQuery, watchStatus);+ onSaveQuerySetting(querySetting);++ }++ @Override+ protected WatchStatus getWatchStatus() {+ return getUserWatchStatus(namedQuery);+ }++ });+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getModelObject().isEmpty());+ }++ });++ add(new ListView<T>("projectQueries", new LoadableDetachableModel<List<T>>() {++ @Override+ protected List<T> load() {+ List<T> namedQueries = new ArrayList<>();+ for (T namedQuery: getProjectQueries()) {+ try {+ if (SecurityUtils.getUser() != null || !needsLogin(namedQuery))+ namedQueries.add(namedQuery);+ } catch (Exception e) {+ namedQueries.add(namedQuery);+ }+ }+ return namedQueries;+ }++ }) {++ @Override+ protected void populateItem(ListItem<T> item) {+ T namedQuery = item.getModelObject();+ Link<Void> link = newQueryLink("link", namedQuery);+ link.add(new Label("label", namedQuery.getName()));+ item.add(link);++ item.add(new WatchStatusLink("watchStatus") {++ @Override+ protected void onWatchStatusChange(AjaxRequestTarget target, WatchStatus watchStatus) {+ target.add(this);++ QuerySetting<T> querySetting = getQuerySetting();+ querySetting.setProjectWatchStatus(namedQuery, watchStatus);+ onSaveQuerySetting(querySetting);+ }++ @Override+ protected WatchStatus getWatchStatus() {+ return getProjectWatchStatus(namedQuery);+ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(SecurityUtils.getUser() != null);+ }++ });++ }++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!getModelObject().isEmpty());+ }++ });+ setOutputMarkupId(true);+ }++ private abstract class NamedQueriesEditor extends Fragment {++ private final NamedQueriesBean<T> bean;++ public NamedQueriesEditor(String id, ArrayList<T> queries) {+ super(id, "editSavedQueriesContentFrag", SavedQueriesPanel.this);+ bean = newNamedQueriesBean();+ bean.getQueries().addAll(queries);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();++ Form<?> form = new Form<Void>("form");+ form.setOutputMarkupId(true);++ form.add(new NotificationPanel("feedback", form));+ form.add(BeanContext.editBean("editor", bean));+ form.add(new AjaxButton("save") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ Set<String> names = new HashSet<>();+ for (NamedQuery namedQuery: bean.getQueries()) {+ if (names.contains(namedQuery.getName())) {+ form.error("Duplicate name found: " + namedQuery.getName());+ return;+ } else {+ names.add(namedQuery.getName());+ }+ }+ onSave(target, (ArrayList<T>)bean.getQueries());+ }++ @Override+ protected void onError(AjaxRequestTarget target, Form<?> form) {+ super.onError(target, form);+ target.add(form);+ }++ });+ form.add(new AjaxLink<Void>("cancel") {++ @Override+ protected void updateAjaxAttributes(AjaxRequestAttributes attributes) {+ super.updateAjaxAttributes(attributes);+ attributes.getAjaxCallListeners().add(new ConfirmLeaveListener());+ }++ @Override+ public void onClick(AjaxRequestTarget target) {+ onCancel(target);+ }++ });+ add(form);+ setOutputMarkupId(true);+ }++ protected abstract void onSave(AjaxRequestTarget target, ArrayList<T> queries);++ protected abstract void onCancel(AjaxRequestTarget target);+ }++ protected abstract NamedQueriesBean<T> newNamedQueriesBean();++ protected abstract boolean needsLogin(T namedQuery);++ protected abstract Link<Void> newQueryLink(String componentId, T namedQuery);++ protected abstract QuerySetting<T> getQuerySetting();++ protected abstract ArrayList<T> getProjectQueries();++ protected abstract void onSaveProjectQueries(ArrayList<T> projectQueries);++ protected abstract void onSaveQuerySetting(QuerySetting<T> querySetting);++}diff --git a/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.cssnew file mode 100644index 0000000000..2f715e0cd0--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/page/project/savedquery/saved-queries.css@@ -0,0 +1,34 @@+.saved-queries>.head>.actions {+ margin: 8px 0 0 12px;+}+.saved-queries>.head>.actions>a {+ color: #444;+ margin-right: 8px;+ font-size: 16px;+}+.saved-queries>.head>.actions>a[disabled] {+ color: #AAA;+ cursor: default;+}+.saved-queries>.body>* {+ margin-bottom: 20px;+}+.saved-queries>.body>:last-child {+ margin-bottom: 0;+}+.saved-queries>.body .watch-status:after {+ display: none;+}+.saved-queries>.body .watch-status:before {+ font-size: 10px;+}++.edit-saved-queries th {+ font-weight: bold !important;+}+.edit-saved-queries th.name {+ width: 30%;+}+.edit-saved-queries tfoot {+ display: none;+}diff --git a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.javaindex 518bf40142..8c4dc9e696 100644--- a/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java+++ b/core/src/main/java/io/onedev/server/web/page/project/setting/issueworkflow/fields/FieldEditPanel.java@@ -147,7 +147,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {@Overridepublic List<String> getInputNames() {List<String> inputNames = new ArrayList<>();- inputNames.add(Issue.STATE);+ inputNames.add(Issue.FIELD_STATE);int currentIndex = 0;for (InputSpec field: getWorkflow().getFieldSpecs()) {if (currentIndex != fieldIndex)@@ -164,7 +164,7 @@ abstract class FieldEditPanel extends Panel implements InputContext {@Overridepublic boolean isReservedName(String inputName) {- for (String displayName: Issue.BUILTIN_FIELDS.keySet()) {+ for (String displayName: Issue.FIELD_PATHS.keySet()) {if (displayName.equals(inputName))return true;}diff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html b/core/src/main/java/io/onedev/server/web/page/test/TestPage.htmlindex b47194918b..795b443f3a 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.html+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.html@@ -1,2 +1,3 @@<wicket:extend>+ <a wicket:id="test">test</a></wicket:extend>\ No newline at end of filediff --git a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java b/core/src/main/java/io/onedev/server/web/page/test/TestPage.javaindex 8af456aaf3..48cc3d389b 100644--- a/core/src/main/java/io/onedev/server/web/page/test/TestPage.java+++ b/core/src/main/java/io/onedev/server/web/page/test/TestPage.java@@ -3,6 +3,7 @@ package io.onedev.server.web.page.test;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.html.link.Link;import io.onedev.server.web.page.base.BasePage;@@ -12,6 +13,14 @@ public class TestPage extends BasePage {@Overrideprotected void onInitialize() {super.onInitialize();++ add(new Link<Void>("test") {++ @Override+ public void onClick() {+ }++ });}@Overridediff --git a/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java b/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.javaindex 92d89a89ac..7018c3e53b 100644--- a/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java+++ b/core/src/main/java/io/onedev/server/web/util/IssueFieldBeanUtils.java@@ -51,7 +51,7 @@ public class IssueFieldBeanUtils {}public static void setState(Serializable fieldBean, String state) {- setFieldValue(fieldBean, Issue.STATE, state);+ setFieldValue(fieldBean, Issue.FIELD_STATE, state);}@Nullablediff --git a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.javaindex e87ef9a9ad..012a24127f 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java+++ b/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java@@ -19,7 +19,7 @@ public class PullRequestProcessor extends PullRequestParser implements MarkdownP@Overrideprotected String toHtml(PullRequest request) {CharSequence url = RequestCycle.get().urlFor(- RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(request));+ RequestActivitiesPage.class, RequestActivitiesPage.paramsOf(request, null));return String.format("<a href='%s' class='request'>#%d</a>", url, request.getNumber());}