Skip to content

The Unified and Autonomous Development Platform

feat: A criteria edit to facilicate creating various queries (OD-2339)

Robin Shenfc7b35c6165e
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4 b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
index d00513f1c4..1b23b9e1de 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.g4
@@ -14,7 +14,7 @@ criteria
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
OnBranch
@@ -61,6 +61,10 @@ Quoted
: '"' ('\\'.|~[\\"])+? '"'
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
index d76aa01011..0f41888fb7 100644
--- a/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
+++ b/server-core/src/main/java/io/onedev/server/job/match/JobMatch.java
@@ -91,7 +91,7 @@ public class JobMatch extends Criteria<JobMatchContext> {
else
criterias.add(new JobCriteria(fieldValue, operator));
}
- return operator == IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator == IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -121,7 +121,7 @@ public class JobMatch extends Criteria<JobMatchContext> {
throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
}
}
- return new OrCriteria<>(criterias);
+ return Criteria.orCriterias(criterias);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.java
index 610bf76e98..ee96c52765 100644
--- a/server-core/src/main/java/io/onedev/server/model/Build.java
+++ b/server-core/src/main/java/io/onedev/server/model/Build.java
@@ -216,7 +216,7 @@ public class Build extends ProjectBelonging
NAME_VERSION, NAME_LOG, BuildMetric.NAME_REPORT);
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
- NAME_PROJECT, NAME_JOB, NAME_STATUS, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION,
+ NAME_PROJECT, NAME_JOB, NAME_NUMBER, NAME_BRANCH, NAME_TAG, NAME_VERSION,
NAME_LABEL, NAME_PULL_REQUEST, NAME_COMMIT, NAME_SUBMIT_DATE, NAME_PENDING_DATE,
NAME_RUNNING_DATE, NAME_FINISH_DATE);
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
index c36b2cbed0..3773f9d108 100644
--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java
+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java
@@ -188,7 +188,7 @@ public class PullRequest extends ProjectBelonging
private static final int MAX_CHECK_ERROR_LEN = 1024;
public static final List<String> QUERY_FIELDS = Lists.newArrayList(
- NAME_NUMBER, NAME_STATUS, NAME_TITLE, NAME_TARGET_PROJECT, NAME_TARGET_BRANCH,
+ NAME_NUMBER, NAME_TITLE, NAME_TARGET_PROJECT, NAME_TARGET_BRANCH,
NAME_SOURCE_PROJECT, NAME_SOURCE_BRANCH, NAME_LABEL, NAME_DESCRIPTION,
NAME_COMMENT, NAME_SUBMIT_DATE, NAME_LAST_ACTIVITY_DATE, NAME_CLOSE_DATE,
NAME_MERGE_STRATEGY, NAME_COMMENT_COUNT, NAME_THUMBS_UP_COUNT, NAME_THUMBS_DOWN_COUNT,
diff --git a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4 b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4
index 15682e81ad..baf93061f6 100644
--- a/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/buildmetric/BuildMetricQuery.g4
@@ -16,7 +16,7 @@ criteria
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
BuildIsSuccessful
@@ -75,6 +75,10 @@ Quoted
: '"' ('\\'.|~[\\"])+? '"'
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java
index d458cc1ff2..7444f05371 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/AfterCriteria.java
@@ -1,6 +1,7 @@
package io.onedev.server.search.commit;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -24,6 +25,10 @@ public class AfterCriteria extends CommitCriteria {
this.values = values;
}
+ public Date getDate() {
+ return DateUtils.parseRelaxed(values.get(0));
+ }
+
@Override
public void fill(Project project, RevListOptions options) {
for (String value: values)
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java
index 70c6ff3819..8076875aab 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/AuthorCriteria.java
@@ -1,11 +1,12 @@
package io.onedev.server.search.commit;
+import java.util.List;
+
+import org.eclipse.jgit.revwalk.RevCommit;
+
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.command.RevListOptions;
import io.onedev.server.model.Project;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import java.util.List;
public class AuthorCriteria extends PersonCriteria {
@@ -14,7 +15,7 @@ public class AuthorCriteria extends PersonCriteria {
public AuthorCriteria(List<String> values) {
super(values);
}
-
+
@Override
public void fill(Project project, RevListOptions options) {
fill(project, options.authors());
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java
index bcdfda1292..1ca690eaf5 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/BeforeCriteria.java
@@ -1,6 +1,7 @@
package io.onedev.server.search.commit;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
import org.apache.commons.lang3.StringUtils;
@@ -24,6 +25,10 @@ public class BeforeCriteria extends CommitCriteria {
this.values = values;
}
+ public Date getDate() {
+ return DateUtils.parseRelaxed(values.get(0));
+ }
+
@Override
public void fill(Project project, RevListOptions options) {
for (String value: values)
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
index 4ea6d2773b..3bf8d793df 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitQuery.java
@@ -5,8 +5,11 @@ import static io.onedev.commons.utils.StringUtils.unescape;
import static org.apache.commons.lang3.StringUtils.join;
import java.io.Serializable;
+import java.lang.reflect.InvocationTargetException;
import java.util.ArrayList;
+import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import javax.annotation.Nullable;
@@ -21,12 +24,8 @@ import org.antlr.v4.runtime.tree.TerminalNode;
import org.eclipse.jgit.lib.ObjectId;
import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.entityreference.BuildReference;
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.command.RevListOptions;
-import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.search.commit.CommitQueryParser.CriteriaContext;
@@ -34,12 +33,20 @@ public class CommitQuery implements Serializable {
private static final long serialVersionUID = 1L;
- private final List<CommitCriteria> criterias;
+ private List<CommitCriteria> criterias;
public CommitQuery(List<CommitCriteria> criterias) {
this.criterias = criterias;
}
+ public List<CommitCriteria> getCriterias() {
+ return criterias;
+ }
+
+ public void setCriterias(List<CommitCriteria> criterias) {
+ this.criterias = criterias;
+ }
+
public static CommitQuery parse(Project project, @Nullable String queryString, boolean withCurrentUserCriteria) {
List<CommitCriteria> criterias = new ArrayList<>();
if (queryString != null) {
@@ -60,92 +67,76 @@ public class CommitQuery implements Serializable {
parser.removeErrorListeners();
parser.setErrorHandler(new BailErrorStrategy());
- List<String> authorValues = new ArrayList<>();
- List<String> committerValues = new ArrayList<>();
- List<String> beforeValues = new ArrayList<>();
- List<String> afterValues = new ArrayList<>();
- List<String> pathValues = new ArrayList<>();
- List<String> messageValues = new ArrayList<>();
- List<String> fuzzyValues = new ArrayList<>();
- List<Revision> revisions = new ArrayList<>();
+ Map<Class<? extends CommitCriteria>, List<Object>> criteriaValues = new LinkedHashMap<>();
for (CriteriaContext criteria: parser.query().criteria()) {
if (criteria.authorCriteria() != null) {
if (criteria.authorCriteria().AuthoredByMe() != null) {
if (!withCurrentUserCriteria)
throw new ExplicitException("Criteria '" + criteria.authorCriteria().AuthoredByMe().getText() + "' is not supported here");
- authorValues.add(null);
+ criteriaValues.computeIfAbsent(AuthorCriteria.class, k->new ArrayList<>()).add(null);
} else {
for (var value: criteria.authorCriteria().Value())
- authorValues.add(getValue(value));
+ criteriaValues.computeIfAbsent(AuthorCriteria.class, k->new ArrayList<>()).add(getValue(value));
}
} else if (criteria.committerCriteria() != null) {
if (criteria.committerCriteria().CommittedByMe() != null) {
if (!withCurrentUserCriteria)
throw new ExplicitException("Criteria '" + criteria.committerCriteria().CommittedByMe().getText() + "' is not supported here");
- committerValues.add(null);
+ criteriaValues.computeIfAbsent(CommitterCriteria.class, k->new ArrayList<>()).add(null);
} else {
for (var value: criteria.committerCriteria().Value())
- committerValues.add(getValue(value));
+ criteriaValues.computeIfAbsent(CommitterCriteria.class, k->new ArrayList<>()).add(getValue(value));
}
} else if (criteria.messageCriteria() != null) {
for (var value: criteria.messageCriteria().Value())
- messageValues.add(getValue(value));
+ criteriaValues.computeIfAbsent(MessageCriteria.class, k->new ArrayList<>()).add(getValue(value));
} else if (criteria.fuzzyCriteria() != null) {
- fuzzyValues.add(unescape(unfence(criteria.fuzzyCriteria().getText())));
+ criteriaValues.computeIfAbsent(FuzzyCriteria.class, k->new ArrayList<>()).add(unescape(unfence(criteria.fuzzyCriteria().getText())));
} else if (criteria.pathCriteria() != null) {
for (var value: criteria.pathCriteria().Value())
- pathValues.add(getValue(value));
+ criteriaValues.computeIfAbsent(PathCriteria.class, k->new ArrayList<>()).add(getValue(value));
} else if (criteria.beforeCriteria() != null) {
- beforeValues.add(getValue(criteria.beforeCriteria().Value()));
+ criteriaValues.computeIfAbsent(BeforeCriteria.class, k->new ArrayList<>()).add(getValue(criteria.beforeCriteria().Value()));
} else if (criteria.afterCriteria() != null) {
- afterValues.add(getValue(criteria.afterCriteria().Value()));
+ criteriaValues.computeIfAbsent(AfterCriteria.class, k->new ArrayList<>()).add(getValue(criteria.afterCriteria().Value()));
} else if (criteria.revisionCriteria() != null) {
- List<String> values = new ArrayList<>();
- Revision.Scope scope;
+ Revision.Type type;
+ if (criteria.revisionCriteria().BRANCH() != null || criteria.revisionCriteria().DefaultBranch() != null)
+ type = Revision.Type.BRANCH;
+ else if (criteria.revisionCriteria().TAG() != null)
+ type = Revision.Type.TAG;
+ else if (criteria.revisionCriteria().COMMIT() != null)
+ type = Revision.Type.COMMIT;
+ else if (criteria.revisionCriteria().BUILD() != null)
+ type = Revision.Type.BUILD;
+ else
+ throw new ExplicitException("Unknown revision type");
+
+ var isSince = criteria.revisionCriteria().SINCE() != null;
+
if (criteria.revisionCriteria().DefaultBranch() != null) {
- values.add(project.getDefaultBranch());
+ criteriaValues.computeIfAbsent(RevisionCriteria.class, k->new ArrayList<>()).add(new Revision(type, null, isSince));
} else {
for (var valueNode: criteria.revisionCriteria().Value()) {
- var value = getValue(valueNode);
- if (criteria.revisionCriteria().BUILD() != null) {
- var buildReference = BuildReference.of(value, project);
- Build build = OneDev.getInstance(BuildManager.class).find(buildReference.getProject(), buildReference.getNumber());
- if (build == null)
- throw new ExplicitException("Unable to find build: " + value);
- else
- value = build.getCommitHash();
- }
- values.add(value);
+ criteriaValues.computeIfAbsent(RevisionCriteria.class, k->new ArrayList<>()).add(new Revision(type, getValue(valueNode), isSince));
}
}
- if (criteria.revisionCriteria().SINCE() != null)
- scope = Revision.Scope.SINCE;
- else if (criteria.revisionCriteria().UNTIL() != null)
- scope = Revision.Scope.UNTIL;
- else
- scope = null;
- for (var value: values)
- revisions.add(new Revision(value, scope, criteria.revisionCriteria().getText()));
}
}
- if (!authorValues.isEmpty())
- criterias.add(new AuthorCriteria(authorValues));
- if (!committerValues.isEmpty())
- criterias.add(new CommitterCriteria(committerValues));
- if (!pathValues.isEmpty())
- criterias.add(new PathCriteria(pathValues));
- if (!messageValues.isEmpty())
- criterias.add(new MessageCriteria(messageValues));
- if (!beforeValues.isEmpty())
- criterias.add(new BeforeCriteria(beforeValues));
- if (!afterValues.isEmpty())
- criterias.add(new AfterCriteria(afterValues));
- if (!revisions.isEmpty())
- criterias.add(new RevisionCriteria(revisions));
- if (!fuzzyValues.isEmpty())
- criterias.add(new FuzzyCriteria(fuzzyValues));
+ for (var entry: criteriaValues.entrySet()) {
+ Class<? extends CommitCriteria> criteriaClass = entry.getKey();
+ List<Object> values = entry.getValue();
+ if (!values.isEmpty()) {
+ try {
+ criterias.add(criteriaClass.getConstructor(List.class).newInstance(values));
+ } catch (InstantiationException | IllegalAccessException | IllegalArgumentException
+ | InvocationTargetException | NoSuchMethodException | SecurityException e) {
+ throw new RuntimeException(e);
+ }
+ }
+ }
}
return new CommitQuery(criterias);
@@ -166,10 +157,6 @@ public class CommitQuery implements Serializable {
criterias.stream().forEach(it->it.fill(project, options));
}
- public List<CommitCriteria> getCriterias() {
- return criterias;
- }
-
public static CommitQuery merge(CommitQuery query1, CommitQuery query2) {
List<CommitCriteria> criterias = new ArrayList<>();
criterias.addAll(query1.getCriterias());
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
index b810b3eedf..1eb16f30e7 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/PersonCriteria.java
@@ -26,6 +26,10 @@ public abstract class PersonCriteria extends CommitCriteria {
this.values = values;
}
+ public List<String> getValues() {
+ return values;
+ }
+
private boolean matches(String value, PersonIdent person) {
String formatted = String.format("%s <%s>", person.getName(), person.getEmailAddress());
return WildcardUtils.matchString(value, formatted);
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/Revision.java b/server-core/src/main/java/io/onedev/server/search/commit/Revision.java
index 2d78d89438..5d5f477088 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/Revision.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/Revision.java
@@ -1,48 +1,125 @@
package io.onedev.server.search.commit;
+import static io.onedev.server.search.commit.CommitCriteria.getRuleName;
+import static io.onedev.server.search.commit.CommitQueryLexer.BRANCH;
+import static io.onedev.server.search.commit.CommitQueryLexer.BUILD;
+import static io.onedev.server.search.commit.CommitQueryLexer.COMMIT;
+import static io.onedev.server.search.commit.CommitQueryLexer.DefaultBranch;
+import static io.onedev.server.search.commit.CommitQueryLexer.SINCE;
+import static io.onedev.server.search.commit.CommitQueryLexer.TAG;
+import static io.onedev.server.search.commit.CommitQueryLexer.UNTIL;
+
import java.io.Serializable;
import javax.annotation.Nullable;
+import org.eclipse.jgit.revwalk.RevCommit;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entityreference.BuildReference;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+
public class Revision implements Serializable {
private static final long serialVersionUID = 1L;
- public enum Scope {SINCE, UNTIL};
+ public enum Type {BRANCH, TAG, BUILD, COMMIT};
+ private final Type type;
+
private final String value;
- private final Scope scope;
-
- private final String toString;
+ private final boolean since;
- public Revision(String value, @Nullable Scope scope, @Nullable String toString) {
+ public Revision(Type type, @Nullable String value, boolean since) {
+ this.type = type;
this.value = value;
- this.scope = scope;
- this.toString = toString;
- }
-
- public Revision(String value, @Nullable Scope scope) {
- this(value, scope, null);
+ this.since = since;
}
- public Scope getScope() {
- return scope;
+ public Type getType() {
+ return type;
}
+ @Nullable
public String getValue() {
return value;
}
+ public boolean isSince() {
+ return since;
+ }
+
+ public Build getValueAsBuild(Project project) {
+ var buildReference = BuildReference.of(value, project);
+ var buildManager = OneDev.getInstance(BuildManager.class);
+ var build = buildManager.find(buildReference.getProject(), buildReference.getNumber());
+ if (build == null)
+ throw new ExplicitException("Unable to find build: " + value);
+ else
+ return build;
+ }
+
+ public RevCommit getRevCommit(Project project) {
+ if (type == Type.BRANCH) {
+ var branch = value != null? value: project.getDefaultBranch();
+ return project.getRevCommit(GitUtils.branch2ref(branch), true);
+ } else if (type == Type.TAG) {
+ return project.getRevCommit(GitUtils.tag2ref(value), true);
+ } else if (type == Type.COMMIT) {
+ return project.getRevCommit(value, true);
+ } else if (type == Type.BUILD) {
+ return project.getRevCommit(getValueAsBuild(project).getCommitHash(), true);
+ } else {
+ throw new RuntimeException("Unknown revision type: " + type);
+ }
+ }
+
+ public boolean matchesRef(Project project, String refName) {
+ if (type == Type.BRANCH) {
+ var branch = value != null? value: project.getDefaultBranch();
+ return refName.equals(GitUtils.branch2ref(branch));
+ } else if (type == Type.TAG) {
+ return refName.equals(GitUtils.tag2ref(value));
+ } else {
+ return false;
+ }
+ }
+
@Override
public String toString() {
- String toString = this.toString;
- if (toString == null) {
- toString = CommitCriteria.getRuleName(CommitQueryLexer.COMMIT) + "(" + value + ")";
- if (scope != null)
- toString = scope.name().toLowerCase() + " " + toString;
+ String revision;
+ if (value == null) {
+ revision = getRuleName(DefaultBranch);
+ } else {
+ int typeRuleName;
+ switch (type) {
+ case BRANCH:
+ typeRuleName = BRANCH;
+ break;
+ case TAG:
+ typeRuleName = TAG;
+ break;
+ case BUILD:
+ typeRuleName = BUILD;
+ break;
+ case COMMIT:
+ typeRuleName = COMMIT;
+ break;
+ default:
+ throw new RuntimeException("Unknown revision type: " + type);
+ }
+ revision = getRuleName(typeRuleName) + "(" + value + ")";
}
- return toString;
+ if (since)
+ revision = getRuleName(SINCE) + " " + revision;
+ else
+ revision = getRuleName(UNTIL) + " " + revision;
+ return revision;
}
}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.java
index 756172ed19..ada4e21e7c 100644
--- a/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/commit/RevisionCriteria.java
@@ -1,8 +1,9 @@
package io.onedev.server.search.commit;
+import static java.util.stream.Collectors.toList;
+
import java.util.ArrayList;
import java.util.List;
-import java.util.stream.Collectors;
import org.apache.commons.lang3.StringUtils;
@@ -10,9 +11,7 @@ import com.google.common.base.Preconditions;
import io.onedev.server.event.project.RefUpdated;
import io.onedev.server.git.command.RevListOptions;
-import io.onedev.server.git.service.RefFacade;
import io.onedev.server.model.Project;
-import io.onedev.server.search.commit.Revision.Scope;
public class RevisionCriteria extends CommitCriteria {
@@ -24,38 +23,28 @@ public class RevisionCriteria extends CommitCriteria {
Preconditions.checkArgument(!revisions.isEmpty());
this.revisions = revisions;
}
+
+ public List<Revision> getRevisions() {
+ return revisions;
+ }
@Override
public void fill(Project project, RevListOptions options) {
- boolean ranged = false;
for (Revision revision: revisions) {
- if (revision.getScope() == Scope.SINCE) {
- options.revisions().add("^" + revision.getValue());
- ranged = true;
- } else if (revision.getScope() == Scope.UNTIL) {
- options.revisions().add(revision.getValue());
- ranged = true;
- } else if (project.getBranchRef(revision.getValue()) != null) {
- ranged = true;
- options.revisions().add(revision.getValue());
+ var commitHash = revision.getRevCommit(project).name();
+ if (revision.isSince()) {
+ options.revisions().add("^" + commitHash);
} else {
- options.revisions().add(revision.getValue());
+ options.revisions().add(commitHash);
}
}
- if (options.revisions().size() == 1 && !ranged)
- options.count(1);
}
@Override
public boolean matches(RefUpdated event) {
- List<Revision> untilRevisions = revisions.stream().filter(it->it.getScope() != Scope.SINCE).collect(Collectors.toList());
+ List<Revision> untilRevisions = revisions.stream().filter(it->!it.isSince()).collect(toList());
if (!untilRevisions.isEmpty()) {
- for (Revision revision: untilRevisions) {
- RefFacade ref = event.getProject().getRef(revision.getValue());
- if (ref != null && ref.getName().equals(event.getRefName()))
- return true;
- }
- return false;
+ return untilRevisions.stream().anyMatch(it->it.matchesRef(event.getProject(), event.getRefName()));
} else {
return true;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
index 1f423b71b9..ba2e1151cf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/EntityQuery.java
@@ -1,39 +1,76 @@
package io.onedev.server.search.entity;
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.Path;
+import javax.validation.ValidationException;
+
import com.google.common.base.Splitter;
+
import io.onedev.commons.codeassist.FenceAware;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.commons.utils.StringUtils;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.IterationManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.PullRequestManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
import io.onedev.server.entityreference.BuildReference;
import io.onedev.server.entityreference.IssueReference;
import io.onedev.server.entityreference.PullRequestReference;
-import io.onedev.server.model.*;
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.Iteration;
+import io.onedev.server.model.LabelSpec;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.ProjectScopedRevision;
import io.onedev.server.util.criteria.Criteria;
-import javax.annotation.Nullable;
-import javax.persistence.criteria.Path;
-import javax.validation.ValidationException;
-import java.io.Serializable;
-import java.util.Date;
-import java.util.List;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
public abstract class EntityQuery<T extends AbstractEntity> implements Serializable {
private static final long serialVersionUID = 1L;
private static final Pattern INSIDE_QUOTE = Pattern.compile("\"([^\"\\\\]|\\\\.)*");
+ private Criteria<T> criteria;
+
+ private List<EntitySort> sorts;
+
+ public EntityQuery(@Nullable Criteria<T> criteria, List<EntitySort> sorts) {
+ this.criteria = criteria;
+ this.sorts = sorts;
+ }
+
@Nullable
- public abstract Criteria<T> getCriteria();
+ public Criteria<T> getCriteria() {
+ return criteria;
+ }
+
+ public void setCriteria(@Nullable Criteria<T> criteria) {
+ this.criteria = criteria;
+ }
- public abstract List<EntitySort> getSorts();
+ public List<EntitySort> getSorts() {
+ return sorts;
+ }
+
+ public void setSorts(List<EntitySort> sorts) {
+ this.sorts = sorts;
+ }
public static String getValue(String token) {
return StringUtils.unescape(FenceAware.unfence(token));
@@ -178,7 +215,7 @@ public abstract class EntityQuery<T extends AbstractEntity> implements Serializa
builder.append(getCriteria().toString()).append(" ");
if (!getSorts().isEmpty()) {
builder.append("order by ");
- builder.append(getSorts().stream().map(it->it.toString()).collect(Collectors.joining(" and ")));
+ builder.append(getSorts().stream().map(it->it.toString()).collect(Collectors.joining(", ")));
}
String toStringValue = builder.toString().trim();
if (toStringValue.length() == 0)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4
index 692e152080..310a4f58cb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.g4
@@ -1,8 +1,8 @@
grammar AgentQuery;
query
- : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
- | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ : WS* criteria WS* (WS OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS* EOF
| WS* EOF
;
@@ -22,7 +22,7 @@ order
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
Online
@@ -105,6 +105,10 @@ Quoted
: '"' ('\\'.|~[\\"])+? '"'
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
index 1d5cd13018..82d62d3e39 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/AgentQuery.java
@@ -1,5 +1,34 @@
package io.onedev.server.search.entity.agent;
+import static io.onedev.server.model.Agent.NAME_IP_ADDRESS;
+import static io.onedev.server.model.Agent.NAME_NAME;
+import static io.onedev.server.model.Agent.NAME_OS_ARCH;
+import static io.onedev.server.model.Agent.NAME_OS_NAME;
+import static io.onedev.server.model.Agent.NAME_OS_VERSION;
+import static io.onedev.server.model.Agent.QUERY_FIELDS;
+import static io.onedev.server.model.Agent.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static io.onedev.server.search.entity.agent.AgentQueryParser.HasRunningBuilds;
+import static io.onedev.server.search.entity.agent.AgentQueryParser.Is;
+import static io.onedev.server.search.entity.agent.AgentQueryParser.IsNot;
+import static io.onedev.server.search.entity.agent.AgentQueryParser.Offline;
+import static io.onedev.server.search.entity.agent.AgentQueryParser.Online;
+import static io.onedev.server.search.entity.agent.AgentQueryParser.Paused;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -7,40 +36,36 @@ import io.onedev.server.entitymanager.AgentAttributeManager;
import io.onedev.server.model.Agent;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.agent.AgentQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.FuzzyCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.OrderContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.agent.AgentQueryParser.QueryContext;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import org.antlr.v4.runtime.*;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.server.model.Agent.*;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static io.onedev.server.search.entity.agent.AgentQueryParser.*;
public class AgentQuery extends EntityQuery<Agent> {
private static final long serialVersionUID = 1L;
- private final Criteria<Agent> criteria;
-
- private final List<EntitySort> sorts;
-
public AgentQuery(@Nullable Criteria<Agent> criteria, List<EntitySort> sorts) {
- this.criteria = criteria;
- this.sorts = sorts;
+ super(criteria, sorts);
}
public AgentQuery(@Nullable Criteria<Agent> criteria) {
- this(criteria, new ArrayList<>());
+ super(criteria, new ArrayList<>());
}
-
+
public AgentQuery() {
- this(null);
+ super(null, new ArrayList<>());
}
public static AgentQuery parse(@Nullable String queryString, boolean forExecutor) {
@@ -110,7 +135,7 @@ public class AgentQuery extends EntityQuery<Agent> {
else
throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());
}
- return new OrCriteria<>(criterias);
+ return Criteria.orCriterias(criterias);
}
@Override
@@ -151,7 +176,7 @@ public class AgentQuery extends EntityQuery<Agent> {
throw new IllegalStateException();
}
}
- return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator==IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -220,16 +245,6 @@ public class AgentQuery extends EntityQuery<Agent> {
return AntlrUtils.getLexerRule(AgentQueryLexer.ruleNames, operatorName);
}
- @Override
- public Criteria<Agent> getCriteria() {
- return criteria;
- }
-
- @Override
- public List<EntitySort> getSorts() {
- return sorts;
- }
-
public static AgentQuery merge(AgentQuery query1, AgentQuery query2) {
List<Criteria<Agent>> criterias = new ArrayList<>();
if (query1.getCriteria() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
index 5dabaebe0e..c915748ed7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/EverUsedSinceCriteria.java
@@ -33,6 +33,10 @@ public class EverUsedSinceCriteria extends Criteria<Agent> {
this.value = value;
}
+ public Date getDate() {
+ return date;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<Date> attribute = getPath(from, PROP_LAST_USED_DATE + "." + PROP_VALUE);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
index 6a6c471749..dbb32b7e17 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/NotUsedSinceCriteria.java
@@ -33,6 +33,10 @@ public class NotUsedSinceCriteria extends Criteria<Agent> {
this.value = value;
}
+ public Date getDate() {
+ return date;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<Date> attribute = getPath(from, PROP_LAST_USED_DATE + "." + PROP_VALUE);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
index f14b5b71a1..7623a20a94 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OfflineCriteria.java
@@ -8,9 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Agent;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class OfflineCriteria extends Criteria<Agent> {
+public class OfflineCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
index 2c2a108dbc..a9f25909de 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OnlineCriteria.java
@@ -13,9 +13,8 @@ import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.AgentManager;
import io.onedev.server.model.Agent;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class OnlineCriteria extends Criteria<Agent> {
+public class OnlineCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
index 7f2255deff..10f80ba84f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsArchCriteria.java
@@ -25,6 +25,10 @@ public class OsArchCriteria extends Criteria<Agent> {
this.operator = operator;
}
+ public String getValue() {
+ return value;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Agent.PROP_OS_ARCH);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
index cc661ec9d6..bb434714c1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/OsCriteria.java
@@ -23,6 +23,10 @@ public class OsCriteria extends Criteria<Agent> {
this.operator = operator;
}
+ public String getValue() {
+ return value;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Agent, Agent> from, CriteriaBuilder builder) {
String normalized = value.toLowerCase().replace("*", "%");
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/agent/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/agent/StatusCriteria.java
new file mode 100644
index 0000000000..fc760dcde9
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/agent/StatusCriteria.java
@@ -0,0 +1,9 @@
+package io.onedev.server.search.entity.agent;
+
+import io.onedev.server.model.Agent;
+import io.onedev.server.util.criteria.Criteria;
+
+public abstract class StatusCriteria extends Criteria<Agent> {
+
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
index aaf096d0a2..25062027f8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.g4
@@ -1,8 +1,8 @@
grammar BuildQuery;
query
- : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
- | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ : WS* criteria WS* (WS OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS* EOF
| WS* EOF
;
@@ -24,7 +24,7 @@ order
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
Successful
@@ -163,6 +163,10 @@ Reference
: ([a-zA-Z0-9_]([a-zA-Z0-9_\-/.]*[a-zA-Z0-9_])?)? '#' [0-9]+ | [A-Z][A-Z]+ '-' [0-9]+
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
index d54330958b..41e2c26a5a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/BuildQuery.java
@@ -1,5 +1,56 @@
package io.onedev.server.search.entity.build;
+import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;
+import static io.onedev.server.model.Build.NAME_BRANCH;
+import static io.onedev.server.model.Build.NAME_COMMIT;
+import static io.onedev.server.model.Build.NAME_FINISH_DATE;
+import static io.onedev.server.model.Build.NAME_JOB;
+import static io.onedev.server.model.Build.NAME_LABEL;
+import static io.onedev.server.model.Build.NAME_PENDING_DATE;
+import static io.onedev.server.model.Build.NAME_PROJECT;
+import static io.onedev.server.model.Build.NAME_PULL_REQUEST;
+import static io.onedev.server.model.Build.NAME_RUNNING_DATE;
+import static io.onedev.server.model.Build.NAME_STATUS;
+import static io.onedev.server.model.Build.NAME_SUBMIT_DATE;
+import static io.onedev.server.model.Build.NAME_TAG;
+import static io.onedev.server.model.Build.NAME_VERSION;
+import static io.onedev.server.model.Build.QUERY_FIELDS;
+import static io.onedev.server.model.Build.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Cancelled;
+import static io.onedev.server.search.entity.build.BuildQueryParser.CancelledByMe;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Failed;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Finished;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Is;
+import static io.onedev.server.search.entity.build.BuildQueryParser.IsEmpty;
+import static io.onedev.server.search.entity.build.BuildQueryParser.IsGreaterThan;
+import static io.onedev.server.search.entity.build.BuildQueryParser.IsLessThan;
+import static io.onedev.server.search.entity.build.BuildQueryParser.IsNot;
+import static io.onedev.server.search.entity.build.BuildQueryParser.IsNotEmpty;
+import static io.onedev.server.search.entity.build.BuildQueryParser.IsSince;
+import static io.onedev.server.search.entity.build.BuildQueryParser.IsUntil;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Pending;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Running;
+import static io.onedev.server.search.entity.build.BuildQueryParser.SubmittedByMe;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Successful;
+import static io.onedev.server.search.entity.build.BuildQueryParser.TimedOut;
+import static io.onedev.server.search.entity.build.BuildQueryParser.Waiting;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
@@ -8,43 +59,39 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.build.BuildQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.FieldOperatorCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.FuzzyCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.OrderContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.QueryContext;
+import io.onedev.server.search.entity.build.BuildQueryParser.ReferenceCriteriaContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import org.antlr.v4.runtime.*;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-
-import static io.onedev.server.model.AbstractEntity.NAME_NUMBER;
-import static io.onedev.server.model.Build.*;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static io.onedev.server.search.entity.build.BuildQueryParser.*;
public class BuildQuery extends EntityQuery<Build> {
private static final long serialVersionUID = 1L;
-
- private final Criteria<Build> criteria;
-
- private final List<EntitySort> sorts;
public BuildQuery(@Nullable Criteria<Build> criteria, List<EntitySort> sorts) {
- this.criteria = criteria;
- this.sorts = sorts;
+ super(criteria, sorts);
}
public BuildQuery(@Nullable Criteria<Build> criteria) {
- this(criteria, new ArrayList<>());
+ super(criteria, new ArrayList<>());
}
public BuildQuery() {
- this(null);
+ super(null, new ArrayList<>());
}
public static BuildQuery parse(@Nullable Project project, @Nullable String queryString,
@@ -128,9 +175,9 @@ public class BuildQuery extends EntityQuery<Build> {
for (var quoted: ctx.criteriaValue.Quoted()) {
String value = getValue(quoted.getText());
if (ctx.SubmittedBy() != null)
- criterias.add(new SubmittedByCriteria(getUser(value)));
+ criterias.add(new SubmittedByUserCriteria(getUser(value)));
else if (ctx.CancelledBy() != null)
- criterias.add(new CancelledByCriteria(getUser(value)));
+ criterias.add(new CancelledByUserCriteria(getUser(value)));
else if (ctx.FixedIssue() != null)
criterias.add(new FixedIssueCriteria(project, value));
else if (ctx.DependsOn() != null)
@@ -142,7 +189,7 @@ public class BuildQuery extends EntityQuery<Build> {
else
throw new RuntimeException("Unexpected criteria: " + ctx.operator.getText());
}
- return new OrCriteria<>(criterias);
+ return Criteria.orCriterias(criterias);
}
@Override
@@ -204,13 +251,6 @@ public class BuildQuery extends EntityQuery<Build> {
case NAME_PROJECT:
criterias.add(new ProjectCriteria(value, operator));
break;
- case NAME_STATUS:
- Status status = Status.of(value);
- if (status != null)
- criterias.add(new StatusCriteria(status, operator));
- else
- throw new ExplicitException("Invalid status: " + value);
- break;
case NAME_COMMIT:
ProjectScopedCommit commitId = getCommitId(project, value);
criterias.add(new CommitCriteria(commitId.getProject(), commitId.getCommitId(), operator));
@@ -248,7 +288,7 @@ public class BuildQuery extends EntityQuery<Build> {
throw new IllegalStateException();
}
}
- return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator==IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -354,17 +394,7 @@ public class BuildQuery extends EntityQuery<Build> {
public static int getOperator(String operatorName) {
return AntlrUtils.getLexerRule(BuildQueryLexer.ruleNames, operatorName);
}
-
- @Override
- public Criteria<Build> getCriteria() {
- return criteria;
- }
-
- @Override
- public List<EntitySort> getSorts() {
- return sorts;
- }
-
+
public static BuildQuery merge(BuildQuery query1, BuildQuery query2) {
List<Criteria<Build>> criterias = new ArrayList<>();
if (query1.getCriteria() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java
similarity index 88%
rename from server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java
index 1a8b019c98..b07673eb15 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledByUserCriteria.java
@@ -14,16 +14,20 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class CancelledByCriteria extends Criteria<Build> {
+public class CancelledByUserCriteria extends Criteria<Build> {
private static final long serialVersionUID = 1L;
private final User user;
- public CancelledByCriteria(User user) {
+ public CancelledByUserCriteria(User user) {
this.user = user;
}
+ public User getUser() {
+ return user;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(Build.PROP_CANCELLER);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
index a598b8f7b1..275d55feb0 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/CancelledCriteria.java
@@ -9,9 +9,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class CancelledCriteria extends Criteria<Build> {
+public class CancelledCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
@@ -31,4 +30,9 @@ public class CancelledCriteria extends Criteria<Build> {
return BuildQuery.getRuleName(BuildQueryLexer.Cancelled);
}
+ @Override
+ public Build.Status getStatus() {
+ return Build.Status.CANCELLED;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
index dc10cbf967..b59469d560 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/FailedCriteria.java
@@ -9,9 +9,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class FailedCriteria extends Criteria<Build> {
+public class FailedCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
@@ -31,4 +30,9 @@ public class FailedCriteria extends Criteria<Build> {
return BuildQuery.getRuleName(BuildQueryLexer.Failed);
}
+ @Override
+ public Build.Status getStatus() {
+ return Build.Status.FAILED;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
index 8eff9241a4..89530de2eb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/JobCriteria.java
@@ -25,6 +25,10 @@ public class JobCriteria extends Criteria<Build> {
this.operator = operator;
}
+ public String getJobName() {
+ return jobName;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<String> attribute = from.get(Build.PROP_JOB_NAME);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
index f6095d55b7..18387ed760 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/LabelCriteria.java
@@ -25,6 +25,10 @@ public class LabelCriteria extends Criteria<Build> {
this.operator = operator;
}
+ public LabelSpec getLabelSpec() {
+ return labelSpec;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(BuildLabel.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
index e1039ae522..e79480fcd9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/PendingCriteria.java
@@ -9,9 +9,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class PendingCriteria extends Criteria<Build> {
+public class PendingCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
@@ -31,4 +30,9 @@ public class PendingCriteria extends Criteria<Build> {
return BuildQuery.getRuleName(BuildQueryLexer.Pending);
}
+ @Override
+ public Build.Status getStatus() {
+ return Build.Status.PENDING;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
index 1720744178..49e888834e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RanOnCriteria.java
@@ -28,6 +28,10 @@ public class RanOnCriteria extends Criteria<Build> {
this.value = value;
}
+ public String getValue() {
+ return value;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Join<?, ?> join = from.join(Build.PROP_AGENT, JoinType.INNER);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
index 8136d74252..541baccea4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/RunningCriteria.java
@@ -9,9 +9,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class RunningCriteria extends Criteria<Build> {
+public class RunningCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
@@ -31,4 +30,9 @@ public class RunningCriteria extends Criteria<Build> {
return BuildQuery.getRuleName(BuildQueryLexer.Running);
}
+ @Override
+ public Build.Status getStatus() {
+ return Build.Status.RUNNING;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java
index c8152d8101..968e499a11 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/StatusCriteria.java
@@ -1,49 +1,9 @@
package io.onedev.server.search.entity.build;
-import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-
import io.onedev.server.model.Build;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class StatusCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
-
- private final Build.Status status;
-
- private final int operator;
-
- public StatusCriteria(Build.Status status, int operator) {
- this.status = status;
- this.operator = operator;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
- var predicate = builder.equal(from.get(Build.PROP_STATUS), status);
- if (operator == BuildQueryLexer.IsNot)
- predicate = builder.not(predicate);
- return predicate;
- }
-
- @Override
- public boolean matches(Build build) {
- var matches = build.getStatus() == status;
- if (operator == BuildQueryLexer.IsNot)
- matches = !matches;
- return matches;
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(Build.NAME_STATUS) + " "
- + BuildQuery.getRuleName(operator) + " "
- + quote(status.toString());
- }
+public abstract class StatusCriteria extends Criteria<Build> {
+ public abstract Build.Status getStatus();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
index 06d46dc893..64c4138ed8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmitDateCriteria.java
@@ -30,6 +30,14 @@ public class SubmitDateCriteria extends Criteria<Build> {
this.value = value;
}
+ public int getOperator() {
+ return operator;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Build.PROP_SUBMIT_DATE);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
index 9a86079e86..d5a43397df 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByCriteria.java
@@ -1,43 +1,14 @@
package io.onedev.server.search.entity.build;
-import java.util.Objects;
-
import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class SubmittedByCriteria extends Criteria<Build> {
-
- private static final long serialVersionUID = 1L;
+public abstract class SubmittedByCriteria extends Criteria<Build> {
- private final User user;
+ @Nullable
+ public abstract User getUser();
- public SubmittedByCriteria(User user) {
- this.user = user;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
- Path<User> attribute = from.get(Build.PROP_SUBMITTER);
- return builder.equal(attribute, user);
- }
-
- @Override
- public boolean matches(Build build) {
- return Objects.equals(build.getSubmitter(), user);
- }
-
- @Override
- public String toStringWithoutParens() {
- return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + quote(user.getName());
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
index 4d95ac143e..fd58de9c42 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByMeCriteria.java
@@ -10,10 +10,10 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Build;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class SubmittedByMeCriteria extends Criteria<Build> {
+public class SubmittedByMeCriteria extends SubmittedByCriteria {
private static final long serialVersionUID = 1L;
@@ -27,6 +27,11 @@ public class SubmittedByMeCriteria extends Criteria<Build> {
}
}
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public boolean matches(Build build) {
if (User.get() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java
new file mode 100644
index 0000000000..e11c366f78
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SubmittedByUserCriteria.java
@@ -0,0 +1,47 @@
+package io.onedev.server.search.entity.build;
+
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Build;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+
+public class SubmittedByUserCriteria extends SubmittedByCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User user;
+
+ public SubmittedByUserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Build, Build> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(Build.PROP_SUBMITTER);
+ return builder.equal(attribute, user);
+ }
+
+ @Override
+ public boolean matches(Build build) {
+ return Objects.equals(build.getSubmitter(), user);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return BuildQuery.getRuleName(BuildQueryLexer.SubmittedBy) + " " + quote(user.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
index d2b7c5e826..0749baeb62 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/SuccessfulCriteria.java
@@ -8,10 +8,10 @@ import javax.persistence.criteria.Path;
import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
+import io.onedev.server.model.Build.Status;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class SuccessfulCriteria extends Criteria<Build> {
+public class SuccessfulCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
@@ -31,4 +31,9 @@ public class SuccessfulCriteria extends Criteria<Build> {
return BuildQuery.getRuleName(BuildQueryLexer.Successful);
}
+ @Override
+ public Status getStatus() {
+ return Build.Status.SUCCESSFUL;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
index 020a125e71..0ef0bf3c1a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/TimedOutCriteria.java
@@ -9,9 +9,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class TimedOutCriteria extends Criteria<Build> {
+public class TimedOutCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
@@ -31,4 +30,9 @@ public class TimedOutCriteria extends Criteria<Build> {
return BuildQuery.getRuleName(BuildQueryLexer.TimedOut);
}
+ @Override
+ public Build.Status getStatus() {
+ return Build.Status.TIMED_OUT;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
index b12ee07ee1..0c062d2f56 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/build/WaitingCriteria.java
@@ -9,9 +9,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Build;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class WaitingCriteria extends Criteria<Build> {
+public class WaitingCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
@@ -31,4 +30,9 @@ public class WaitingCriteria extends Criteria<Build> {
return BuildQuery.getRuleName(BuildQueryLexer.Waiting);
}
+ @Override
+ public Build.Status getStatus() {
+ return Build.Status.WAITING;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
index 9bed6bf6d0..7e18212671 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.g4
@@ -1,8 +1,8 @@
grammar CodeCommentQuery;
query
- : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
- | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ : WS* criteria WS* (WS OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS* EOF
| WS* EOF
;
@@ -22,7 +22,7 @@ order
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
CreatedByMe
@@ -125,6 +125,10 @@ Quoted
: '"' ('\\'.|~[\\"])+? '"'
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
index e900b39fa8..12950fc781 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CodeCommentQuery.java
@@ -1,47 +1,82 @@
package io.onedev.server.search.entity.codecomment;
+import static io.onedev.server.model.CodeComment.NAME_CONTENT;
+import static io.onedev.server.model.CodeComment.NAME_CREATE_DATE;
+import static io.onedev.server.model.CodeComment.NAME_LAST_ACTIVITY_DATE;
+import static io.onedev.server.model.CodeComment.NAME_PATH;
+import static io.onedev.server.model.CodeComment.NAME_REPLY;
+import static io.onedev.server.model.CodeComment.NAME_REPLY_COUNT;
+import static io.onedev.server.model.CodeComment.QUERY_FIELDS;
+import static io.onedev.server.model.CodeComment.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.Contains;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.CreatedBy;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.CreatedByMe;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.Is;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.IsGreaterThan;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.IsLessThan;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.IsNot;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.IsSince;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.IsUntil;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.Mentioned;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.MentionedMe;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.RepliedBy;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.RepliedByMe;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.Resolved;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.Unresolved;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.FuzzyCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.OrderContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.QueryContext;
import io.onedev.server.util.ProjectScopedCommit;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import org.antlr.v4.runtime.*;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-
-import static io.onedev.server.model.CodeComment.*;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static io.onedev.server.search.entity.codecomment.CodeCommentQueryParser.*;
public class CodeCommentQuery extends EntityQuery<CodeComment> {
private static final long serialVersionUID = 1L;
- private final Criteria<CodeComment> criteria;
-
- private final List<EntitySort> sorts;
-
public CodeCommentQuery(@Nullable Criteria<CodeComment> criteria, List<EntitySort> sorts) {
- this.criteria = criteria;
- this.sorts = sorts;
+ super(criteria, sorts);
}
public CodeCommentQuery(@Nullable Criteria<CodeComment> criteria) {
- this(criteria, new ArrayList<>());
+ super(criteria, new ArrayList<>());
}
public CodeCommentQuery() {
- this(null);
+ super(null, new ArrayList<>());
}
public static CodeCommentQuery parse(Project project, @Nullable String queryString,
@@ -104,17 +139,17 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
for (var quoted: ctx.criteriaValue.Quoted()) {
String value = getValue(quoted.getText());
if (operator == Mentioned) {
- criterias.add(new MentionedCriteria(getUser(value)));
+ criterias.add(new MentionedUserCriteria(getUser(value)));
} else if (operator == CreatedBy) {
- criterias.add(new CreatedByCriteria(getUser(value)));
+ criterias.add(new CreatedByUserCriteria(getUser(value)));
} else if (operator == RepliedBy) {
- criterias.add(new RepliedByCriteria(getUser(value)));
+ criterias.add(new RepliedByUserCriteria(getUser(value)));
} else {
ProjectScopedCommit commitId = getCommitId(project, value);
criterias.add(new OnCommitCriteria(commitId.getProject(), commitId.getCommitId()));
}
}
- return new OrCriteria<>(criterias);
+ return Criteria.orCriterias(criterias);
}
@Override
@@ -179,7 +214,7 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
throw new IllegalStateException();
}
}
- return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator==IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -272,14 +307,4 @@ public class CodeCommentQuery extends EntityQuery<CodeComment> {
return AntlrUtils.getLexerRule(CodeCommentQueryLexer.ruleNames, operatorName);
}
- @Override
- public Criteria<CodeComment> getCriteria() {
- return criteria;
- }
-
- @Override
- public List<EntitySort> getSorts() {
- return sorts;
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
index b24cfe2023..51c20db816 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByCriteria.java
@@ -1,43 +1,11 @@
package io.onedev.server.search.entity.codecomment;
-import java.util.Objects;
-
-import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class CreatedByCriteria extends Criteria<CodeComment> {
+public abstract class CreatedByCriteria extends Criteria<CodeComment> {
- private static final long serialVersionUID = 1L;
-
- private final User user;
+ public abstract User getUser();
- public CreatedByCriteria(User user) {
- this.user = user;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
- Path<User> attribute = from.get(CodeComment.PROP_USER);
- return builder.equal(attribute, user);
- }
-
- @Override
- public boolean matches(CodeComment comment) {
- return Objects.equals(comment.getUser(), user);
- }
-
- @Override
- public String toStringWithoutParens() {
- return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy) + " " + quote(user.getName());
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
index 4c90e112f6..3d33e2bfa3 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByMeCriteria.java
@@ -10,10 +10,10 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.CodeComment;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class CreatedByMeCriteria extends Criteria<CodeComment> {
+public class CreatedByMeCriteria extends CreatedByCriteria {
private static final long serialVersionUID = 1L;
@@ -27,6 +27,11 @@ public class CreatedByMeCriteria extends Criteria<CodeComment> {
}
}
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public boolean matches(CodeComment comment) {
if (User.get() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java
new file mode 100644
index 0000000000..7e09121155
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/CreatedByUserCriteria.java
@@ -0,0 +1,47 @@
+package io.onedev.server.search.entity.codecomment;
+
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+
+public class CreatedByUserCriteria extends CreatedByCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User user;
+
+ public CreatedByUserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(CodeComment.PROP_USER);
+ return builder.equal(attribute, user);
+ }
+
+ @Override
+ public boolean matches(CodeComment comment) {
+ return Objects.equals(comment.getUser(), user);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return CodeCommentQuery.getRuleName(CodeCommentQueryLexer.CreatedBy) + " " + quote(user.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
index ead76bea19..ea2ef06647 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/LastActivityDateCriteria.java
@@ -20,38 +20,46 @@ public class LastActivityDateCriteria extends Criteria<CodeComment> {
private final int operator;
- private final Date value;
+ private final Date date;
- private final String rawValue;
+ private final String value;
- public LastActivityDateCriteria(Date value, String rawValue, int operator) {
+ public LastActivityDateCriteria(Date date, String value, int operator) {
this.operator = operator;
+ this.date = date;
this.value = value;
- this.rawValue = rawValue;
+ }
+
+ public int getOperator() {
+ return operator;
+ }
+
+ public Date getDate() {
+ return date;
}
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<CodeComment, CodeComment> from, CriteriaBuilder builder) {
Path<Date> attribute = CodeCommentQuery.getPath(from, CodeComment.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE);
if (operator == CodeCommentQueryLexer.IsUntil)
- return builder.lessThan(attribute, value);
+ return builder.lessThan(attribute, date);
else
- return builder.greaterThan(attribute, value);
+ return builder.greaterThan(attribute, date);
}
@Override
public boolean matches(CodeComment comment) {
if (operator == CodeCommentQueryLexer.IsUntil)
- return comment.getLastActivity().getDate().before(value);
+ return comment.getLastActivity().getDate().before(date);
else
- return comment.getLastActivity().getDate().after(value);
+ return comment.getLastActivity().getDate().after(date);
}
@Override
public String toStringWithoutParens() {
return quote(CodeComment.NAME_LAST_ACTIVITY_DATE) + " "
+ CodeCommentQuery.getRuleName(operator) + " "
- + quote(rawValue);
+ + quote(value);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java
index 7c6a86a5f5..aa966cb68a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/MentionedUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class MentionedCriteria extends Criteria<CodeComment> {
+public class MentionedUserCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
private final User user;
- public MentionedCriteria(User user) {
+ public MentionedUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java
index 86e061d4fc..8c74085318 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/RepliedByUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class RepliedByCriteria extends Criteria<CodeComment> {
+public class RepliedByUserCriteria extends Criteria<CodeComment> {
private static final long serialVersionUID = 1L;
private final User user;
- public RepliedByCriteria(User user) {
+ public RepliedByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
index b2ff232d91..1f313b172a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/ResolvedCriteria.java
@@ -8,9 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class ResolvedCriteria extends Criteria<CodeComment> {
+public class ResolvedCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/StatusCriteria.java
new file mode 100644
index 0000000000..454571f576
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/StatusCriteria.java
@@ -0,0 +1,8 @@
+package io.onedev.server.search.entity.codecomment;
+
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.util.criteria.Criteria;
+
+public abstract class StatusCriteria extends Criteria<CodeComment> {
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
index 9d4374689e..57415d3975 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/codecomment/UnresolvedCriteria.java
@@ -8,9 +8,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.CodeComment;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class UnresolvedCriteria extends Criteria<CodeComment> {
+public class UnresolvedCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
index f55012fab9..5d901b3ab2 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/BooleanFieldCriteria.java
@@ -24,6 +24,10 @@ public class BooleanFieldCriteria extends FieldCriteria {
this.operator = operator;
}
+ public boolean getValue() {
+ return value;
+ }
+
@Override
public Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
var predicate = builder.equal(fieldFrom.get(IssueField.PROP_VALUE), String.valueOf(value));
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
index 8c368545fa..82d1fbbbaf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/ChoiceFieldCriteria.java
@@ -40,6 +40,10 @@ public class ChoiceFieldCriteria extends FieldCriteria {
this.allowMultiple = allowMultiple;
}
+ public String getValue() {
+ return value;
+ }
+
@Override
protected Predicate getValuePredicate(From<Issue, Issue> issueFrom, From<IssueField, IssueField> fieldFrom, CriteriaBuilder builder) {
if (allowMultiple) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java
index 14e8cf9386..e5f0a4abcb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/CommentedByUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class CommentedByCriteria extends Criteria<Issue> {
+public class CommentedByUserCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
private final User user;
- public CommentedByCriteria(User user) {
+ public CommentedByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
index 82e6fe65e3..0929dcdbea 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByMeCriteria.java
@@ -37,7 +37,7 @@ public class IgnoredByMeCriteria extends Criteria<Issue> {
}
private Criteria<Issue> getCriteria(User user) {
- return new IgnoredByCriteria(user);
+ return new IgnoredByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java
index f9b42807c8..81b00cc6c4 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IgnoredByUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class IgnoredByCriteria extends Criteria<Issue> {
+public class IgnoredByUserCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
private final User user;
- public IgnoredByCriteria(User user) {
+ public IgnoredByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
index e886d68567..0fb92bbb21 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.g4
@@ -1,8 +1,8 @@
grammar IssueQuery;
query
- : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
- | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ : WS* criteria WS* (WS OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS* EOF
| WS* EOF
;
@@ -30,7 +30,7 @@ order
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
OrderBy
@@ -241,6 +241,10 @@ Reference
: ([a-zA-Z0-9_]([a-zA-Z0-9_\-/.]*[a-zA-Z0-9_])?)? '#' [0-9]+ | [A-Z][A-Z]+ '-' [0-9]+
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
index 68557352c5..e97b8dceae 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IssueQuery.java
@@ -123,30 +123,16 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
private static final long serialVersionUID = 1L;
- private final Criteria<Issue> criteria;
-
- private final List<EntitySort> sorts;
-
public IssueQuery(@Nullable Criteria<Issue> criteria, List<EntitySort> sorts) {
- this.criteria = criteria;
- this.sorts = sorts;
+ super(criteria, sorts);
}
public IssueQuery(@Nullable Criteria<Issue> criteria) {
- this(criteria, new ArrayList<>());
+ super(criteria, new ArrayList<>());
}
public IssueQuery() {
- this(null);
- }
-
- @Nullable
- public Criteria<Issue> getCriteria() {
- return criteria;
- }
-
- public List<EntitySort> getSorts() {
- return sorts;
+ super(null, new ArrayList<>());
}
public static IssueQuery parse(@Nullable Project project, @Nullable String queryString,
@@ -268,15 +254,15 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
for (var quoted: ctx.criteriaValue.Quoted()) {
String value = getValue(quoted.getText());
if (ctx.Mentioned() != null)
- criterias.add(new MentionedCriteria(getUser(value)));
+ criterias.add(new MentionedUserCriteria(getUser(value)));
else if (ctx.SubmittedBy() != null)
- criterias.add(new SubmittedByCriteria(getUser(value)));
+ criterias.add(new SubmittedByUserCriteria(getUser(value)));
else if (ctx.WatchedBy() != null)
- criterias.add(new WatchedByCriteria(getUser(value)));
+ criterias.add(new WatchedByUserCriteria(getUser(value)));
else if (ctx.IgnoredBy() != null)
- criterias.add(new IgnoredByCriteria(getUser(value)));
+ criterias.add(new IgnoredByUserCriteria(getUser(value)));
else if (ctx.CommentedBy() != null)
- criterias.add(new CommentedByCriteria(getUser(value)));
+ criterias.add(new CommentedByUserCriteria(getUser(value)));
else if (ctx.FixedInBuild() != null)
criterias.add(new FixedInBuildCriteria(project, value));
else if (ctx.FixedInPullRequest() != null)
@@ -288,7 +274,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
else
throw new RuntimeException("Unexpected operator: " + ctx.operator.getText());
}
- return new OrCriteria<>(criterias);
+ return Criteria.orCriterias(criterias);
}
@Override
@@ -476,7 +462,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
throw new ExplicitException("Unexpected operator " + getRuleName(operator));
}
}
- return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator==IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -657,7 +643,7 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
@Override
public boolean matches(Issue issue) {
- return criteria == null || criteria.matches(issue);
+ return getCriteria() == null || getCriteria().matches(issue);
}
public static String getRuleName(int rule) {
@@ -682,18 +668,18 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
}
public Collection<String> getUndefinedStates() {
- if (criteria != null)
- return criteria.getUndefinedStates();
+ if (getCriteria() != null)
+ return getCriteria().getUndefinedStates();
else
return new ArrayList<>();
}
public Collection<String> getUndefinedFields() {
Set<String> undefinedFields = new HashSet<>();
- if (criteria != null) {
- undefinedFields.addAll(criteria.getUndefinedFields());
+ if (getCriteria() != null) {
+ undefinedFields.addAll(getCriteria().getUndefinedFields());
}
- for (EntitySort sort : sorts) {
+ for (EntitySort sort : getSorts()) {
if (!Issue.QUERY_FIELDS.contains(sort.getField())
&& getGlobalIssueSetting().getFieldSpec(sort.getField()) == null) {
undefinedFields.add(sort.getField());
@@ -703,23 +689,23 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
}
public Collection<UndefinedFieldValue> getUndefinedFieldValues() {
- if (criteria != null)
- return criteria.getUndefinedFieldValues();
+ if (getCriteria() != null)
+ return getCriteria().getUndefinedFieldValues();
else
return new HashSet<>();
}
public boolean fixUndefinedStates(Map<String, UndefinedStateResolution> resolutions) {
- if (criteria != null)
- return criteria.fixUndefinedStates(resolutions);
+ if (getCriteria() != null)
+ return getCriteria().fixUndefinedStates(resolutions);
else
return true;
}
public boolean fixUndefinedFields(Map<String, UndefinedFieldResolution> resolutions) {
- if (criteria != null && !criteria.fixUndefinedFields(resolutions))
+ if (getCriteria() != null && !getCriteria().fixUndefinedFields(resolutions))
return false;
- for (Iterator<EntitySort> it = sorts.iterator(); it.hasNext(); ) {
+ for (Iterator<EntitySort> it = getSorts().iterator(); it.hasNext(); ) {
EntitySort sort = it.next();
UndefinedFieldResolution resolution = resolutions.get(sort.getField());
if (resolution != null) {
@@ -733,8 +719,8 @@ public class IssueQuery extends EntityQuery<Issue> implements Comparator<Issue>
}
public boolean fixUndefinedFieldValues(Map<String, UndefinedFieldValuesResolution> resolutions) {
- if (criteria != null)
- return criteria.fixUndefinedFieldValues(resolutions);
+ if (getCriteria() != null)
+ return getCriteria().fixUndefinedFieldValues(resolutions);
else
return true;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
index a27e0c0136..3b4e2a84f7 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/IterationCriteria.java
@@ -30,6 +30,10 @@ public class IterationCriteria extends Criteria<Issue> {
this.operator = operator;
}
+ public String getIterationName() {
+ return iterationName;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Subquery<IssueSchedule> scheduleQuery = query.subquery(IssueSchedule.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
index f24b9a00fc..c94615bd6c 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/LastActivityDateCriteria.java
@@ -38,6 +38,14 @@ public class LastActivityDateCriteria extends Criteria<Issue> {
this.value = DateUtils.formatDate(date);
}
+ public int getOperator() {
+ return operator;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
Path<Date> attribute = IssueQuery.getPath(from, Issue.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java
index 9a6bedde0c..799a5887ee 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/MentionedUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class MentionedCriteria extends Criteria<Issue> {
+public class MentionedUserCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
private final User user;
- public MentionedCriteria(User user) {
+ public MentionedUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
index d94eec2979..f7c452f245 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/StateCriteria.java
@@ -34,6 +34,10 @@ public class StateCriteria extends Criteria<Issue> {
this.operator = operator;
}
+ public String getValue() {
+ return value;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
if (operator == IssueQueryLexer.IsBefore)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
index 71a567f8f7..a86ce21ece 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByCriteria.java
@@ -1,43 +1,11 @@
package io.onedev.server.search.entity.issue;
-import java.util.Objects;
-
-import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
-
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class SubmittedByCriteria extends Criteria<Issue> {
+public abstract class SubmittedByCriteria extends Criteria<Issue> {
- private static final long serialVersionUID = 1L;
-
- private final User user;
+ public abstract User getUser();
- public SubmittedByCriteria(User user) {
- this.user = user;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
- Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
- return builder.equal(attribute, user);
- }
-
- @Override
- public boolean matches(Issue issue) {
- return Objects.equals(issue.getSubmitter(), user);
- }
-
- @Override
- public String toStringWithoutParens() {
- return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + quote(user.getName());
- }
-
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
index 8a485b478c..494c5c5400 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByMeCriteria.java
@@ -10,10 +10,10 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Issue;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class SubmittedByMeCriteria extends Criteria<Issue> {
+public class SubmittedByMeCriteria extends SubmittedByCriteria {
private static final long serialVersionUID = 1L;
@@ -27,6 +27,11 @@ public class SubmittedByMeCriteria extends Criteria<Issue> {
}
}
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public boolean matches(Issue issue) {
if (User.get() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java
new file mode 100644
index 0000000000..9451f9560e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/SubmittedByUserCriteria.java
@@ -0,0 +1,47 @@
+package io.onedev.server.search.entity.issue;
+
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.Issue;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+
+public class SubmittedByUserCriteria extends SubmittedByCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User user;
+
+ public SubmittedByUserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Issue, Issue> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(Issue.PROP_SUBMITTER);
+ return builder.equal(attribute, user);
+ }
+
+ @Override
+ public boolean matches(Issue issue) {
+ return Objects.equals(issue.getSubmitter(), user);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return IssueQuery.getRuleName(IssueQueryLexer.SubmittedBy) + " " + quote(user.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
index 1872a809c5..d0d8ecf5cd 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByMeCriteria.java
@@ -37,7 +37,7 @@ public class WatchedByMeCriteria extends Criteria<Issue> {
}
private Criteria<Issue> getCriteria(User user) {
- return new WatchedByCriteria(user);
+ return new WatchedByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java
index 61e0c5c3a2..f2cd5e317e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/issue/WatchedByUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class WatchedByCriteria extends Criteria<Issue> {
+public class WatchedByUserCriteria extends Criteria<Issue> {
private static final long serialVersionUID = 1L;
private final User user;
- public WatchedByCriteria(User user) {
+ public WatchedByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
index ecfb62813d..c3465867b6 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/LabelCriteria.java
@@ -25,6 +25,10 @@ public class LabelCriteria extends Criteria<Pack> {
this.operator = operator;
}
+ public LabelSpec getLabelSpec() {
+ return labelSpec;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(PackLabel.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4
index afb6759592..488a9cd545 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.g4
@@ -1,8 +1,8 @@
grammar PackQuery;
query
- : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
- | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ : WS* criteria WS* (WS OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS* EOF
| WS* EOF
;
@@ -22,7 +22,7 @@ order
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
PublishedByMe
@@ -93,6 +93,10 @@ Quoted
: '"' ('\\'.|~[\\"])+? '"'
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
index fbfb87e5b9..ac7d1f20c8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PackQuery.java
@@ -53,21 +53,16 @@ public class PackQuery extends EntityQuery<Pack> {
private static final long serialVersionUID = 1L;
- private final Criteria<Pack> criteria;
-
- private final List<EntitySort> sorts;
-
public PackQuery(@Nullable Criteria<Pack> criteria, List<EntitySort> sorts) {
- this.criteria = criteria;
- this.sorts = sorts;
+ super(criteria, sorts);
}
public PackQuery(@Nullable Criteria<Pack> criteria) {
- this(criteria, new ArrayList<>());
+ super(criteria, new ArrayList<>());
}
public PackQuery() {
- this(null);
+ super(null, new ArrayList<>());
}
public static PackQuery parse(@Nullable Project project, @Nullable String queryString, boolean withCurrentUserCriteria) {
@@ -118,13 +113,13 @@ public class PackQuery extends EntityQuery<Pack> {
if (ctx.PublishedByUser() != null)
criterias.add(new PublishedByUserCriteria(getUser(value)));
else if (ctx.PublishedByBuild() != null)
- criterias.add(new PublishedByBuildCriteria(project, value));
+ criterias.add(new PublishedViaBuildCriteria(project, value));
else if (ctx.PublishedByProject() != null)
- criterias.add(new PublishedByProjectCriteria(value));
+ criterias.add(new PublishedViaProjectCriteria(value));
else
throw new ExplicitException("Unexpected criteria: " + ctx.operator.getText());
- }
- return new OrCriteria<>(criterias);
+ }
+ return Criteria.orCriterias(criterias);
}
@Override
@@ -170,7 +165,7 @@ public class PackQuery extends EntityQuery<Pack> {
throw new IllegalStateException();
}
}
- return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator==IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -262,16 +257,6 @@ public class PackQuery extends EntityQuery<Pack> {
return AntlrUtils.getLexerRule(PackQueryLexer.ruleNames, operatorName);
}
- @Override
- public Criteria<Pack> getCriteria() {
- return criteria;
- }
-
- @Override
- public List<EntitySort> getSorts() {
- return sorts;
- }
-
public static PackQuery merge(PackQuery query1, PackQuery query2) {
List<Criteria<Pack>> criterias = new ArrayList<>();
if (query1.getCriteria() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
index 8e2caf533d..b5186d1823 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishDateCriteria.java
@@ -30,6 +30,14 @@ public class PublishDateCriteria extends Criteria<Pack> {
this.value = value;
}
+ public Date getDate() {
+ return date;
+ }
+
+ public int getOperator() {
+ return operator;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
Path<Date> attribute = from.get(Pack.PROP_PUBLISH_DATE);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByCriteria.java
new file mode 100644
index 0000000000..1639157146
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByCriteria.java
@@ -0,0 +1,11 @@
+package io.onedev.server.search.entity.pack;
+
+import io.onedev.server.model.Pack;
+import io.onedev.server.model.User;
+import io.onedev.server.util.criteria.Criteria;
+
+public abstract class PublishedByCriteria extends Criteria<Pack> {
+
+ public abstract User getUser();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
index 9a9dfb079e..cf30511b65 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByMeCriteria.java
@@ -10,10 +10,10 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Pack;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class PublishedByMeCriteria extends Criteria<Pack> {
+public class PublishedByMeCriteria extends PublishedByCriteria {
private static final long serialVersionUID = 1L;
@@ -27,6 +27,11 @@ public class PublishedByMeCriteria extends Criteria<Pack> {
}
}
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public boolean matches(Pack pack) {
if (User.get() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
index 42b550805a..fbafcbea48 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByUserCriteria.java
@@ -12,9 +12,8 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.Pack;
import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class PublishedByUserCriteria extends Criteria<Pack> {
+public class PublishedByUserCriteria extends PublishedByCriteria {
private static final long serialVersionUID = 1L;
@@ -24,6 +23,11 @@ public class PublishedByUserCriteria extends Criteria<Pack> {
this.user = user;
}
+ @Override
+ public User getUser() {
+ return user;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
Path<User> attribute = from.get(Pack.PROP_USER);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByBuildCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
index 2887533fb5..ade3bbdebb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
@@ -14,7 +14,7 @@ import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class PublishedByBuildCriteria extends Criteria<Pack> {
+public class PublishedViaBuildCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
@@ -22,12 +22,12 @@ public class PublishedByBuildCriteria extends Criteria<Pack> {
private final String value;
- public PublishedByBuildCriteria(Build build) {
+ public PublishedViaBuildCriteria(Build build) {
this.build = build;
this.value = build.getReference().toString(null);
}
- public PublishedByBuildCriteria(@Nullable Project project, String value) {
+ public PublishedViaBuildCriteria(@Nullable Project project, String value) {
build = EntityQuery.getBuild(project, value);
this.value = value;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java
similarity index 82%
rename from server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java
index 8a269d92ac..f69ad6deef 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedByProjectCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaProjectCriteria.java
@@ -15,16 +15,20 @@ import io.onedev.server.model.Pack;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class PublishedByProjectCriteria extends Criteria<Pack> {
+public class PublishedViaProjectCriteria extends Criteria<Pack> {
private static final long serialVersionUID = 1L;
private final String projectPath;
- public PublishedByProjectCriteria(String projectPath) {
+ public PublishedViaProjectCriteria(String projectPath) {
this.projectPath = projectPath;
}
+ public String getProjectPath() {
+ return projectPath;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
return OneDev.getInstance(ProjectManager.class).getPathMatchPredicate(
@@ -41,6 +45,6 @@ public class PublishedByProjectCriteria extends Criteria<Pack> {
@Override
public String toStringWithoutParens() {
- return PackQueryLexer.PublishedByProject + " " + quote(projectPath);
+ return PackQuery.getRuleName(PackQueryLexer.PublishedByProject) + " " + quote(projectPath);
}
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
index d47bf77e23..8eb093789a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/TypeCriteria.java
@@ -23,6 +23,10 @@ public class TypeCriteria extends Criteria<Pack> {
this.operator = operator;
}
+ public String getValue() {
+ return value;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Pack, Pack> from, CriteriaBuilder builder) {
var predicate = builder.equal(from.get(Pack.PROP_TYPE), value);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
index d45583ac8a..73ffd6336a 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ChildrenOfCriteria.java
@@ -25,6 +25,10 @@ public class ChildrenOfCriteria extends Criteria<Project> {
this.parentPath = parentPath;
}
+ public String getParentPath() {
+ return parentPath;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Subquery<Project> parentQuery = query.subquery(Project.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
index 205d59f9fc..cc33fa2479 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ForksOfCriteria.java
@@ -25,6 +25,10 @@ public class ForksOfCriteria extends Criteria<Project> {
this.forkedFromPath = forkedFromPath;
}
+ public String getForkedFromPath() {
+ return forkedFromPath;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Subquery<Project> forkedFromQuery = query.subquery(Project.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
index efc6e899fc..ea90500919 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LabelCriteria.java
@@ -25,6 +25,10 @@ public class LabelCriteria extends Criteria<Project> {
this.operator = operator;
}
+ public LabelSpec getLabelSpec() {
+ return labelSpec;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(ProjectLabel.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
index 5f4458ab26..a96b81977e 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LastActivityDateCriteria.java
@@ -31,6 +31,14 @@ public class LastActivityDateCriteria extends Criteria<Project> {
this.value = value;
}
+ public Date getDate() {
+ return date;
+ }
+
+ public int getOperator() {
+ return operator;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
Path<Date> attribute = ProjectQuery.getPath(from, Project.PROP_LAST_EVENT_DATE + "." + ProjectLastEventDate.PROP_ACTIVITY);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java
similarity index 96%
rename from server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java
index 464f05bf86..26a2b5f79d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByNoneCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/NoOwnerCriteria.java
@@ -15,7 +15,7 @@ import io.onedev.server.model.UserAuthorization;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class OwnedByNoneCriteria extends Criteria<Project> {
+public class NoOwnerCriteria extends Criteria<Project> {
private static final long serialVersionUID = 1L;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
index 3ae1a830fa..e784d54a73 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByCriteria.java
@@ -1,66 +1,14 @@
package io.onedev.server.search.entity.project;
import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Join;
-import javax.persistence.criteria.JoinType;
-import javax.persistence.criteria.Predicate;
-import io.onedev.server.model.GroupAuthorization;
import io.onedev.server.model.Project;
-import io.onedev.server.model.Role;
import io.onedev.server.model.User;
-import io.onedev.server.model.UserAuthorization;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class OwnedByCriteria extends Criteria<Project> {
+public abstract class OwnedByCriteria extends Criteria<Project> {
- private static final long serialVersionUID = 1L;
-
- private final User user;
-
- public OwnedByCriteria(User user) {
- this.user = user;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
- Join<?, ?> userAuthorizationJoin = from.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);
-
- userAuthorizationJoin.on(builder.and(
- builder.equal(userAuthorizationJoin.get(UserAuthorization.PROP_ROLE), Role.OWNER_ID),
- builder.equal(userAuthorizationJoin.get(UserAuthorization.PROP_USER), user)));
-
- if (user.getGroups().isEmpty()) {
- return userAuthorizationJoin.isNotNull();
- } else {
- Join<?, ?> groupAuthorizationJoin = from.join(Project.PROP_GROUP_AUTHORIZATIONS, JoinType.LEFT);
- groupAuthorizationJoin.on(builder.and(
- builder.equal(groupAuthorizationJoin.get(GroupAuthorization.PROP_ROLE), Role.OWNER_ID),
- groupAuthorizationJoin.get(GroupAuthorization.PROP_GROUP).in(user.getGroups())));
- return builder.or(userAuthorizationJoin.isNotNull(), groupAuthorizationJoin.isNotNull());
- }
- }
-
- @Override
- public boolean matches(Project project) {
- for (UserAuthorization authorization: project.getUserAuthorizations()) {
- if (authorization.getUser().equals(user) && authorization.getRole().isOwner())
- return true;
- }
- for (GroupAuthorization authorization: project.getGroupAuthorizations()) {
- if (authorization.getRole().isOwner() && authorization.getGroup().getMembers().contains(user))
- return true;
- }
- return false;
- }
-
- @Override
- public String toStringWithoutParens() {
- return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedBy) + " " + Criteria.quote(user.getName());
- }
+ @Nullable
+ public abstract User getUser();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
index 10dd0409f9..11159f2693 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByMeCriteria.java
@@ -9,25 +9,30 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Project;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class OwnedByMeCriteria extends Criteria<Project> {
+public class OwnedByMeCriteria extends OwnedByCriteria {
private static final long serialVersionUID = 1L;
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
if (User.get() != null)
- return new OwnedByCriteria(User.get()).getPredicate(projectScope, query, from, builder);
+ return new OwnedByUserCriteria(User.get()).getPredicate(projectScope, query, from, builder);
else
throw new ExplicitException("Please login to perform this query");
}
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public boolean matches(Project project) {
if (User.get() != null)
- return new OwnedByCriteria(User.get()).matches(project);
+ return new OwnedByUserCriteria(User.get()).matches(project);
else
throw new ExplicitException("Please login to perform this query");
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java
new file mode 100644
index 0000000000..457f7c536e
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/OwnedByUserCriteria.java
@@ -0,0 +1,71 @@
+package io.onedev.server.search.entity.project;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Join;
+import javax.persistence.criteria.JoinType;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.GroupAuthorization;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.Role;
+import io.onedev.server.model.User;
+import io.onedev.server.model.UserAuthorization;
+import io.onedev.server.util.ProjectScope;
+import io.onedev.server.util.criteria.Criteria;
+
+public class OwnedByUserCriteria extends OwnedByCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User user;
+
+ public OwnedByUserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Join<?, ?> userAuthorizationJoin = from.join(Project.PROP_USER_AUTHORIZATIONS, JoinType.LEFT);
+
+ userAuthorizationJoin.on(builder.and(
+ builder.equal(userAuthorizationJoin.get(UserAuthorization.PROP_ROLE), Role.OWNER_ID),
+ builder.equal(userAuthorizationJoin.get(UserAuthorization.PROP_USER), user)));
+
+ if (user.getGroups().isEmpty()) {
+ return userAuthorizationJoin.isNotNull();
+ } else {
+ Join<?, ?> groupAuthorizationJoin = from.join(Project.PROP_GROUP_AUTHORIZATIONS, JoinType.LEFT);
+ groupAuthorizationJoin.on(builder.and(
+ builder.equal(groupAuthorizationJoin.get(GroupAuthorization.PROP_ROLE), Role.OWNER_ID),
+ groupAuthorizationJoin.get(GroupAuthorization.PROP_GROUP).in(user.getGroups())));
+ return builder.or(userAuthorizationJoin.isNotNull(), groupAuthorizationJoin.isNotNull());
+ }
+ }
+
+ @Override
+ public boolean matches(Project project) {
+ for (UserAuthorization authorization: project.getUserAuthorizations()) {
+ if (authorization.getUser().equals(user) && authorization.getRole().isOwner())
+ return true;
+ }
+ for (GroupAuthorization authorization: project.getGroupAuthorizations()) {
+ if (authorization.getRole().isOwner() && authorization.getGroup().getMembers().contains(user))
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return ProjectQuery.getRuleName(ProjectQueryLexer.OwnedBy) + " " + Criteria.quote(user.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
index ecba260f2e..c6ef599424 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.g4
@@ -1,8 +1,8 @@
grammar ProjectQuery;
query
- : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
- | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ : WS* criteria WS* (WS OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS* EOF
| WS* EOF
;
@@ -22,7 +22,7 @@ order
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
OrderBy
@@ -125,6 +125,10 @@ Quoted
: '"' ('\\'.|~[\\"])+? '"'
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
index 8a8f05c732..aa1a60c852 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/ProjectQuery.java
@@ -1,55 +1,74 @@
package io.onedev.server.search.entity.project;
+import static io.onedev.server.model.Project.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.ChildrenOf;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.Contains;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.ForkRoots;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.ForksOf;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.HasOutdatedReplicas;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.Is;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.IsNot;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.IsSince;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.IsUntil;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.Leafs;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.MissingStorage;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.OwnedByMe;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.OwnedByNone;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.Roots;
+import static io.onedev.server.search.entity.project.ProjectQueryParser.WithoutEnoughReplicas;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.project.ProjectQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.FuzzyCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.OrderContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.project.ProjectQueryParser.QueryContext;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import org.antlr.v4.runtime.*;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.server.model.Project.SORT_FIELDS;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static io.onedev.server.search.entity.project.ProjectQueryParser.*;
public class ProjectQuery extends EntityQuery<Project> {
private static final long serialVersionUID = 1L;
-
- private final Criteria<Project> criteria;
-
- private final List<EntitySort> sorts;
public ProjectQuery(@Nullable Criteria<Project> criteria, List<EntitySort> sorts) {
- this.criteria = criteria;
- this.sorts = sorts;
+ super(criteria, sorts);
}
public ProjectQuery(@Nullable Criteria<Project> criteria) {
- this(criteria, new ArrayList<>());
+ super(criteria, new ArrayList<>());
}
public ProjectQuery() {
- this(null);
+ super(null, new ArrayList<>());
}
- @Nullable
- public Criteria<Project> getCriteria() {
- return criteria;
- }
-
- public List<EntitySort> getSorts() {
- return sorts;
- }
-
public static ProjectQuery parse(@Nullable String queryString) {
if (queryString != null) {
CharStream is = CharStreams.fromString(queryString);
@@ -91,7 +110,7 @@ public class ProjectQuery extends EntityQuery<Project> {
case OwnedByMe:
return new OwnedByMeCriteria();
case OwnedByNone:
- return new OwnedByNoneCriteria();
+ return new NoOwnerCriteria();
case WithoutEnoughReplicas:
return new WithoutEnoughReplicasCriteria();
case HasOutdatedReplicas:
@@ -112,9 +131,9 @@ public class ProjectQuery extends EntityQuery<Project> {
else if (ctx.operator.getType() == ForksOf)
criterias.add(new ForksOfCriteria(value));
else
- criterias.add(new OwnedByCriteria(getUser(value)));
+ criterias.add(new OwnedByUserCriteria(getUser(value)));
}
- return new OrCriteria<>(criterias);
+ return Criteria.orCriterias(criterias);
}
@Override
@@ -168,7 +187,7 @@ public class ProjectQuery extends EntityQuery<Project> {
throw new ExplicitException("Unexpected operator " + getRuleName(operator));
}
}
- return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator==IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -270,7 +289,7 @@ public class ProjectQuery extends EntityQuery<Project> {
@Override
public boolean matches(Project project) {
- return criteria == null || criteria.matches(project);
+ return getCriteria() == null || getCriteria().matches(project);
}
public static String getRuleName(int rule) {
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
index f2051657bb..fd65efa2fb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByCriteria.java
@@ -1,52 +1,14 @@
package io.onedev.server.search.entity.pullrequest;
import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestReview;
-import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.User;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class ApprovedByCriteria extends Criteria<PullRequest> {
-
- private static final long serialVersionUID = 1L;
-
- private final User user;
-
- public ApprovedByCriteria(User user) {
- this.user = user;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
- Root<PullRequestReview> review = reviewQuery.from(PullRequestReview.class);
- reviewQuery.select(review);
- reviewQuery.where(builder.and(
- builder.equal(review.get(PullRequestReview.PROP_STATUS), Status.APPROVED),
- builder.equal(review.get(PullRequestReview.PROP_REQUEST), from),
- builder.equal(review.get(PullRequestReview.PROP_USER), user)));
- return builder.exists(reviewQuery);
- }
-
- @Override
- public boolean matches(PullRequest request) {
- PullRequestReview review = request.getReview(user);
- return review != null && review.getStatus() == Status.APPROVED;
- }
-
- @Override
- public String toStringWithoutParens() {
- return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " "
- + quote(user.getName());
- }
+public abstract class ApprovedByCriteria extends Criteria<PullRequest> {
+ @Nullable
+ public abstract User getUser();
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
index e591589ac7..dbd8d46140 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByMeCriteria.java
@@ -9,13 +9,19 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class ApprovedByMeCriteria extends Criteria<PullRequest> {
+public class ApprovedByMeCriteria extends ApprovedByCriteria {
private static final long serialVersionUID = 1L;
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var user = User.get();
@@ -35,7 +41,7 @@ public class ApprovedByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new ApprovedByCriteria(user);
+ return new ApprovedByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java
new file mode 100644
index 0000000000..25ea98e080
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ApprovedByUserCriteria.java
@@ -0,0 +1,56 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.PullRequestReview.Status;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+
+public class ApprovedByUserCriteria extends ApprovedByCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User user;
+
+ public ApprovedByUserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
+ Root<PullRequestReview> review = reviewQuery.from(PullRequestReview.class);
+ reviewQuery.select(review);
+ reviewQuery.where(builder.and(
+ builder.equal(review.get(PullRequestReview.PROP_STATUS), Status.APPROVED),
+ builder.equal(review.get(PullRequestReview.PROP_REQUEST), from),
+ builder.equal(review.get(PullRequestReview.PROP_USER), user)));
+ return builder.exists(reviewQuery);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ PullRequestReview review = request.getReview(user);
+ return review != null && review.getStatus() == Status.APPROVED;
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.ApprovedBy) + " "
+ + quote(user.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
index 1af20758ca..c9a1c1c82d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToCriteria.java
@@ -1,49 +1,14 @@
package io.onedev.server.search.entity.pullrequest;
import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-import javax.persistence.criteria.Subquery;
import io.onedev.server.model.PullRequest;
-import io.onedev.server.model.PullRequestAssignment;
import io.onedev.server.model.User;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class AssignedToCriteria extends Criteria<PullRequest> {
-
- private static final long serialVersionUID = 1L;
-
- private final User user;
-
- public AssignedToCriteria(User user) {
- this.user = user;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- Subquery<PullRequestAssignment> assignmentQuery = query.subquery(PullRequestAssignment.class);
- Root<PullRequestAssignment> assignment = assignmentQuery.from(PullRequestAssignment.class);
- assignmentQuery.select(assignment);
- assignmentQuery.where(builder.and(
- builder.equal(assignment.get(PullRequestAssignment.PROP_REQUEST), from),
- builder.equal(assignment.get(PullRequestAssignment.PROP_USER), user)));
- return builder.exists(assignmentQuery);
- }
-
- @Override
- public boolean matches(PullRequest request) {
- return request.getAssignments().stream().anyMatch(it->it.getUser().equals(user));
- }
-
- @Override
- public String toStringWithoutParens() {
- return PullRequestQuery.getRuleName(PullRequestQueryLexer.AssignedTo) + " "
- + quote(user.getName());
- }
+public abstract class AssignedToCriteria extends Criteria<PullRequest> {
+ @Nullable
+ public abstract User getUser();
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
index ecd658eb5b..33b9a99349 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToMeCriteria.java
@@ -9,10 +9,11 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class AssignedToMeCriteria extends Criteria<PullRequest> {
+public class AssignedToMeCriteria extends AssignedToCriteria {
private static final long serialVersionUID = 1L;
@@ -25,6 +26,11 @@ public class AssignedToMeCriteria extends Criteria<PullRequest> {
throw new ExplicitException("Please login to perform this query");
}
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public boolean matches(PullRequest request) {
var user = User.get();
@@ -35,7 +41,7 @@ public class AssignedToMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new AssignedToCriteria(user);
+ return new AssignedToUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java
new file mode 100644
index 0000000000..e930e767a6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/AssignedToUserCriteria.java
@@ -0,0 +1,53 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Predicate;
+import javax.persistence.criteria.Root;
+import javax.persistence.criteria.Subquery;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestAssignment;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+
+public class AssignedToUserCriteria extends AssignedToCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User user;
+
+ public AssignedToUserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Subquery<PullRequestAssignment> assignmentQuery = query.subquery(PullRequestAssignment.class);
+ Root<PullRequestAssignment> assignment = assignmentQuery.from(PullRequestAssignment.class);
+ assignmentQuery.select(assignment);
+ assignmentQuery.where(builder.and(
+ builder.equal(assignment.get(PullRequestAssignment.PROP_REQUEST), from),
+ builder.equal(assignment.get(PullRequestAssignment.PROP_USER), user)));
+ return builder.exists(assignmentQuery);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ return request.getAssignments().stream().anyMatch(it->it.getUser().equals(user));
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.AssignedTo) + " "
+ + quote(user.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
index 8a7e65ef12..aaeb0272ab 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByMeCriteria.java
@@ -35,7 +35,7 @@ public class CommentedByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new CommentedByCriteria(user);
+ return new CommentedByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java
index 704d1321cc..3d87f4dafa 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/CommentedByUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class CommentedByCriteria extends Criteria<PullRequest> {
+public class CommentedByUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public CommentedByCriteria(User user) {
+ public CommentedByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
index b0b9668bc5..023e09dea9 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/DiscardedCriteria.java
@@ -9,24 +9,19 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class DiscardedCriteria extends Criteria<PullRequest> {
+public class DiscardedCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
- private Criteria<PullRequest> getCriteria() {
- return new StatusCriteria(Status.DISCARDED, PullRequestQueryLexer.Is);
- }
-
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(projectScope, query, from, builder);
+ return builder.equal(from.get(PullRequest.PROP_STATUS), Status.DISCARDED);
}
@Override
public boolean matches(PullRequest request) {
- return getCriteria().matches(request);
+ return request.isDiscarded();
}
@Override
@@ -34,4 +29,9 @@ public class DiscardedCriteria extends Criteria<PullRequest> {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.Discarded);
}
+ @Override
+ public Status getStatus() {
+ return Status.DISCARDED;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
index e260c23679..e518c9bc11 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByMeCriteria.java
@@ -37,7 +37,7 @@ public class IgnoredByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new IgnoredByCriteria(user);
+ return new IgnoredByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java
index 7058723cfd..4bdbeec062 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/IgnoredByUserCriteria.java
@@ -16,13 +16,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class IgnoredByCriteria extends Criteria<PullRequest> {
+public class IgnoredByUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public IgnoredByCriteria(User user) {
+ public IgnoredByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
index 847040bfdc..87b1e03f71 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LabelCriteria.java
@@ -25,6 +25,10 @@ public class LabelCriteria extends Criteria<PullRequest> {
this.operator = operator;
}
+ public LabelSpec getLabelSpec() {
+ return labelSpec;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
var labelQuery = query.subquery(PullRequestLabel.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
index ba552a53db..d34c5c3ed1 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/LastActivityDateCriteria.java
@@ -31,6 +31,14 @@ public class LastActivityDateCriteria extends Criteria<PullRequest> {
date = EntityQuery.getDateValue(value);
}
+ public int getOperator() {
+ return operator;
+ }
+
+ public Date getDate() {
+ return date;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Path<Date> attribute = PullRequestQuery.getPath(from, PullRequest.PROP_LAST_ACTIVITY + "." + LastActivity.PROP_DATE);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
index 6222086554..1f44187481 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedMeCriteria.java
@@ -35,7 +35,7 @@ public class MentionedMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new MentionedCriteria(user);
+ return new MentionedUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java
index e3bf5413e4..322f520818 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MentionedUserCriteria.java
@@ -14,13 +14,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class MentionedCriteria extends Criteria<PullRequest> {
+public class MentionedUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public MentionedCriteria(User user) {
+ public MentionedUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
index 5cdde1eb57..8ffe958f32 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/MergedCriteria.java
@@ -9,24 +9,19 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class MergedCriteria extends Criteria<PullRequest> {
+public class MergedCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
- private Criteria<PullRequest> getCriteria() {
- return new StatusCriteria(Status.MERGED, PullRequestQueryLexer.Is);
- }
-
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(projectScope, query, from, builder);
+ return builder.equal(from.get(PullRequest.PROP_STATUS), Status.MERGED);
}
@Override
public boolean matches(PullRequest request) {
- return getCriteria().matches(request);
+ return request.isMerged();
}
@Override
@@ -34,4 +29,9 @@ public class MergedCriteria extends Criteria<PullRequest> {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.Merged);
}
+ @Override
+ public Status getStatus() {
+ return Status.MERGED;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
index 1e46bf7af2..65b9842c28 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedMyActionCriteria.java
@@ -35,7 +35,7 @@ public class NeedMyActionCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new NeedActionOfCriteria(user);
+ return new NeedUserActionCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedActionOfCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java
similarity index 79%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedActionOfCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java
index 7e85f0573e..654ed6599d 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedActionOfCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/NeedUserActionCriteria.java
@@ -13,13 +13,13 @@ import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.OrCriteria;
-public class NeedActionOfCriteria extends Criteria<PullRequest> {
+public class NeedUserActionCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public NeedActionOfCriteria(User user) {
+ public NeedUserActionCriteria(User user) {
this.user = user;
}
@@ -36,10 +36,10 @@ public class NeedActionOfCriteria extends Criteria<PullRequest> {
@SuppressWarnings("unchecked")
private Criteria<PullRequest> getCriteria() {
return new OrCriteria<>(
- new ToBeReviewedByCriteria(user),
- new ToBeChangedByCriteria(user),
- new ToBeMergedByCriteria(user),
- new AndCriteria<>(new SubmittedByCriteria(user), new HasUnsuccessfulBuilds())
+ new ToBeReviewedByUserCriteria(user),
+ new ToBeChangedByUserCriteria(user),
+ new ToBeMergedByUserCriteria(user),
+ new AndCriteria<>(new SubmittedByUserCriteria(user), new HasUnsuccessfulBuilds())
);
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
index b8335ff258..2f2b98fc11 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/OpenCriteria.java
@@ -9,24 +9,19 @@ import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class OpenCriteria extends Criteria<PullRequest> {
+public class OpenCriteria extends StatusCriteria {
private static final long serialVersionUID = 1L;
-
- private Criteria<PullRequest> getCriteria() {
- return new StatusCriteria(Status.OPEN, PullRequestQueryLexer.Is);
- }
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- return getCriteria().getPredicate(projectScope, query, from, builder);
+ return builder.equal(from.get(PullRequest.PROP_STATUS), Status.OPEN);
}
@Override
public boolean matches(PullRequest request) {
- return getCriteria().matches(request);
+ return request.isOpen();
}
@Override
@@ -34,4 +29,9 @@ public class OpenCriteria extends Criteria<PullRequest> {
return PullRequestQuery.getRuleName(PullRequestQueryLexer.Open);
}
+ @Override
+ public Status getStatus() {
+ return Status.OPEN;
+ }
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4 b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
index 1dc59b07fb..1f45d391a8 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.g4
@@ -1,8 +1,8 @@
grammar PullRequestQuery;
query
- : WS* criteria WS* (WS OrderBy WS+ order (WS+ And WS+ order)* WS*)? EOF
- | WS* OrderBy WS+ order (WS+ And WS+ order)* WS* EOF
+ : WS* criteria WS* (WS OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS*)? EOF
+ | WS* OrderBy WS+ order (WS* orderOperator=Comma WS* order)* WS* EOF
| WS* EOF
;
@@ -23,7 +23,7 @@ order
;
multipleQuoted
- : Quoted(','Quoted)*
+ : Quoted(WS* Comma WS* Quoted)*
;
Open
@@ -234,10 +234,14 @@ Reference
: ([a-zA-Z0-9_]([a-zA-Z0-9_\-/.]*[a-zA-Z0-9_])?)? '#' [0-9]+ | [A-Z][A-Z]+ '-' [0-9]+
;
+Comma
+ : ','
+ ;
+
WS
: ' '
;
-
+
Fuzzy
: '~' ('\\'.|~[~])+? '~'
;
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
index c71375baa6..cc463e6638 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/PullRequestQuery.java
@@ -1,5 +1,64 @@
package io.onedev.server.search.entity.pullrequest;
+import static io.onedev.server.model.PullRequest.SORT_FIELDS;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ApprovedBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ApprovedByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.AssignedTo;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.AssignedToMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.CommentedBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.CommentedByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.Contains;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.Discarded;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.HasMergeConflicts;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.HasPendingReviews;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.HasUnfinishedBuilds;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.HasUnsuccessfulBuilds;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IgnoredBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IgnoredByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IncludesCommit;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IncludesIssue;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.Is;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IsGreaterThan;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IsLessThan;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IsNot;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IsSince;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.IsUntil;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.Mentioned;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.MentionedMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.Merged;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.NeedActionOf;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.NeedMyAction;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.Open;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ReadyToMerge;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.RequestedForChangesBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.RequestedForChangesByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.SomeoneRequestedForChanges;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.SubmittedBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.SubmittedByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ToBeChangedBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ToBeChangedByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ToBeMergedBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ToBeMergedByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ToBeReviewedBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ToBeReviewedByMe;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.WatchedBy;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.WatchedByMe;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.annotation.Nullable;
+
+import org.antlr.v4.runtime.BailErrorStrategy;
+import org.antlr.v4.runtime.BaseErrorListener;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.CharStreams;
+import org.antlr.v4.runtime.CommonTokenStream;
+import org.antlr.v4.runtime.RecognitionException;
+import org.antlr.v4.runtime.Recognizer;
+
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.Project;
@@ -7,42 +66,37 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.pullrequest.MergeStrategy;
import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
-import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.*;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.AndCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.CriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.FieldOperatorValueCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.FuzzyCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.NotCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OperatorCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OperatorValueCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.OrderContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ParensCriteriaContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.QueryContext;
+import io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.ReferenceCriteriaContext;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.util.criteria.NotCriteria;
import io.onedev.server.util.criteria.OrCriteria;
-import org.antlr.v4.runtime.*;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-import static io.onedev.server.model.PullRequest.SORT_FIELDS;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.search.entity.EntitySort.Direction.DESCENDING;
-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.HasUnsuccessfulBuilds;
-import static io.onedev.server.search.entity.pullrequest.PullRequestQueryParser.*;
public class PullRequestQuery extends EntityQuery<PullRequest> {
private static final long serialVersionUID = 1L;
- private final Criteria<PullRequest> criteria;
-
- private final List<EntitySort> sorts;
-
public PullRequestQuery(@Nullable Criteria<PullRequest> criteria, List<EntitySort> sorts) {
- this.criteria = criteria;
- this.sorts = sorts;
+ super(criteria, sorts);
}
public PullRequestQuery(@Nullable Criteria<PullRequest> criteria) {
- this(criteria, new ArrayList<>());
+ super(criteria, new ArrayList<>());
}
public PullRequestQuery() {
- this(null);
+ super(null, new ArrayList<>());
}
public static PullRequestQuery parse(@Nullable Project project, @Nullable String queryString, boolean withCurrentUserCriteria) {
@@ -160,40 +214,40 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
String value = getValue(quoted.getText());
switch (ctx.operator.getType()) {
case ToBeReviewedBy:
- criterias.add(new ToBeReviewedByCriteria(getUser(value)));
+ criterias.add(new ToBeReviewedByUserCriteria(getUser(value)));
break;
case ToBeChangedBy:
- criterias.add(new ToBeChangedByCriteria(getUser(value)));
+ criterias.add(new ToBeChangedByUserCriteria(getUser(value)));
break;
case ToBeMergedBy:
- criterias.add(new ToBeMergedByCriteria(getUser(value)));
+ criterias.add(new ToBeMergedByUserCriteria(getUser(value)));
break;
case ApprovedBy:
- criterias.add(new ApprovedByCriteria(getUser(value)));
+ criterias.add(new ApprovedByUserCriteria(getUser(value)));
break;
case AssignedTo:
- criterias.add(new AssignedToCriteria(getUser(value)));
+ criterias.add(new AssignedToUserCriteria(getUser(value)));
break;
case RequestedForChangesBy:
- criterias.add(new RequestedForChangesByCriteria(getUser(value)));
+ criterias.add(new RequestedForChangesByUserCriteria(getUser(value)));
break;
case Mentioned:
- criterias.add(new MentionedCriteria(getUser(value)));
+ criterias.add(new MentionedUserCriteria(getUser(value)));
break;
case SubmittedBy:
- criterias.add(new SubmittedByCriteria(getUser(value)));
+ criterias.add(new SubmittedByUserCriteria(getUser(value)));
break;
case WatchedBy:
- criterias.add(new WatchedByCriteria(getUser(value)));
+ criterias.add(new WatchedByUserCriteria(getUser(value)));
break;
case IgnoredBy:
- criterias.add(new IgnoredByCriteria(getUser(value)));
+ criterias.add(new IgnoredByUserCriteria(getUser(value)));
break;
case NeedActionOf:
- criterias.add(new NeedActionOfCriteria(getUser(value)));
+ criterias.add(new NeedUserActionCriteria(getUser(value)));
break;
case CommentedBy:
- criterias.add(new CommentedByCriteria(getUser(value)));
+ criterias.add(new CommentedByUserCriteria(getUser(value)));
break;
case IncludesCommit:
criterias.add(new IncludesCommitCriteria(project, value));
@@ -205,7 +259,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
throw new ExplicitException("Unexpected operator: " + ctx.operator.getText());
}
}
- return new OrCriteria<>(criterias);
+ return Criteria.orCriterias(criterias);
}
@Override
@@ -260,13 +314,6 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
case PullRequest.NAME_NUMBER:
criterias.add(new ReferenceCriteria(project, value, operator));
break;
- case PullRequest.NAME_STATUS:
- try {
- criterias.add(new StatusCriteria(PullRequest.Status.valueOf(value.toUpperCase()), operator));
- break;
- } catch (IllegalArgumentException e) {
- throw new ExplicitException("Invalid status: " + value);
- }
case PullRequest.NAME_MERGE_STRATEGY:
criterias.add(new MergeStrategyCriteria(MergeStrategy.fromString(value), operator));
break;
@@ -355,7 +402,7 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
throw new IllegalStateException();
}
}
- return operator==IsNot? new AndCriteria<>(criterias): new OrCriteria<>(criterias);
+ return operator==IsNot? Criteria.andCriterias(criterias): Criteria.orCriterias(criterias);
}
@Override
@@ -481,16 +528,6 @@ public class PullRequestQuery extends EntityQuery<PullRequest> {
return AntlrUtils.getLexerRule(PullRequestQueryLexer.ruleNames, operatorName);
}
- @Override
- public Criteria<PullRequest> getCriteria() {
- return criteria;
- }
-
- @Override
- public List<EntitySort> getSorts() {
- return sorts;
- }
-
public static PullRequestQuery merge(PullRequestQuery query1, PullRequestQuery query2) {
List<Criteria<PullRequest>> criterias = new ArrayList<>();
if (query1.getCriteria() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
index 04ff34c149..a8881c9b98 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByMeCriteria.java
@@ -35,7 +35,7 @@ public class RequestedForChangesByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new RequestedForChangesByCriteria(user);
+ return new RequestedForChangesByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java
similarity index 92%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java
index c2556f0b82..4e92a2464f 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/RequestedForChangesByUserCriteria.java
@@ -15,13 +15,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class RequestedForChangesByCriteria extends Criteria<PullRequest> {
+public class RequestedForChangesByUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public RequestedForChangesByCriteria(User user) {
+ public RequestedForChangesByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
index 7d6202c56c..9700556afb 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/StatusCriteria.java
@@ -1,50 +1,10 @@
package io.onedev.server.search.entity.pullrequest;
-import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Predicate;
-
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class StatusCriteria extends Criteria<PullRequest> {
-
- private static final long serialVersionUID = 1L;
-
- private final Status status;
-
- private final int operator;
-
- public StatusCriteria(Status status, int operator) {
- this.status = status;
- this.operator = operator;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- var predicate = builder.equal(from.get(PullRequest.PROP_STATUS), status);
- if (operator == PullRequestQueryLexer.IsNot)
- predicate = builder.not(predicate);
- return predicate;
- }
-
- @Override
- public boolean matches(PullRequest request) {
- var matches = request.getStatus() == status;
- if (operator == PullRequestQueryLexer.IsNot)
- matches = !matches;
- return matches;
- }
-
- @Override
- public String toStringWithoutParens() {
- return quote(PullRequest.NAME_STATUS) + " "
- + PullRequestQuery.getRuleName(operator) + " "
- + quote(status.toString());
- }
+public abstract class StatusCriteria extends Criteria<PullRequest> {
+ public abstract Status getStatus();
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
index d7d1cbdecb..90d23cd943 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByCriteria.java
@@ -1,43 +1,14 @@
package io.onedev.server.search.entity.pullrequest;
-import java.util.Objects;
-
import javax.annotation.Nullable;
-import javax.persistence.criteria.CriteriaBuilder;
-import javax.persistence.criteria.CriteriaQuery;
-import javax.persistence.criteria.From;
-import javax.persistence.criteria.Path;
-import javax.persistence.criteria.Predicate;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
-import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class SubmittedByCriteria extends Criteria<PullRequest> {
-
- private static final long serialVersionUID = 1L;
-
- private final User user;
-
- public SubmittedByCriteria(User user) {
- this.user = user;
- }
-
- @Override
- public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
- Path<User> attribute = from.get(PullRequest.PROP_SUBMITTER);
- return builder.equal(attribute, user);
- }
-
- @Override
- public boolean matches(PullRequest request) {
- return Objects.equals(request.getSubmitter(), user);
- }
-
- @Override
- public String toStringWithoutParens() {
- return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + quote(user.getName());
- }
+public abstract class SubmittedByCriteria extends Criteria<PullRequest> {
+ @Nullable
+ public abstract User getUser();
+
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
index 5bf744a979..f5b2af3a37 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByMeCriteria.java
@@ -10,10 +10,10 @@ import javax.persistence.criteria.Predicate;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.User;
+import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.criteria.Criteria;
-public class SubmittedByMeCriteria extends Criteria<PullRequest> {
+public class SubmittedByMeCriteria extends SubmittedByCriteria {
private static final long serialVersionUID = 1L;
@@ -27,6 +27,11 @@ public class SubmittedByMeCriteria extends Criteria<PullRequest> {
}
}
+ @Override
+ public User getUser() {
+ return SecurityUtils.getUser();
+ }
+
@Override
public boolean matches(PullRequest request) {
if (User.get() != null)
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java
new file mode 100644
index 0000000000..6b53ddd5e3
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/SubmittedByUserCriteria.java
@@ -0,0 +1,47 @@
+package io.onedev.server.search.entity.pullrequest;
+
+import java.util.Objects;
+
+import javax.annotation.Nullable;
+import javax.persistence.criteria.CriteriaBuilder;
+import javax.persistence.criteria.CriteriaQuery;
+import javax.persistence.criteria.From;
+import javax.persistence.criteria.Path;
+import javax.persistence.criteria.Predicate;
+
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.util.ProjectScope;
+
+public class SubmittedByUserCriteria extends SubmittedByCriteria {
+
+ private static final long serialVersionUID = 1L;
+
+ private final User user;
+
+ public SubmittedByUserCriteria(User user) {
+ this.user = user;
+ }
+
+ @Override
+ public User getUser() {
+ return user;
+ }
+
+ @Override
+ public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
+ Path<User> attribute = from.get(PullRequest.PROP_SUBMITTER);
+ return builder.equal(attribute, user);
+ }
+
+ @Override
+ public boolean matches(PullRequest request) {
+ return Objects.equals(request.getSubmitter(), user);
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return PullRequestQuery.getRuleName(PullRequestQueryLexer.SubmittedBy) + " " + quote(user.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
index 7fdc384243..544aa2457b 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByMeCriteria.java
@@ -35,7 +35,7 @@ public class ToBeChangedByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new ToBeChangedByCriteria(user);
+ return new ToBeChangedByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java
index 6b5c0b4a18..49ef191adc 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeChangedByUserCriteria.java
@@ -12,16 +12,20 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
-public class ToBeChangedByCriteria extends Criteria<PullRequest> {
+public class ToBeChangedByUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public ToBeChangedByCriteria(User user) {
+ public ToBeChangedByUserCriteria(User user) {
this.user = user;
}
+ public User getUser() {
+ return user;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
return getCriteria(user).getPredicate(projectScope, query, from, builder);
@@ -36,7 +40,7 @@ public class ToBeChangedByCriteria extends Criteria<PullRequest> {
private Criteria<PullRequest> getCriteria(User user) {
return new AndCriteria<>(
new OpenCriteria(),
- new SubmittedByCriteria(user),
+ new SubmittedByUserCriteria(user),
new SomeoneRequestedForChangesCriteria());
}
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
index ee281e31fa..6f36e366af 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByMeCriteria.java
@@ -35,7 +35,7 @@ public class ToBeMergedByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new ToBeMergedByCriteria(user);
+ return new ToBeMergedByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java
similarity index 87%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java
index fd8b6be3da..1abc6db995 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeMergedByUserCriteria.java
@@ -12,15 +12,19 @@ import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.AndCriteria;
import io.onedev.server.util.criteria.Criteria;
-public class ToBeMergedByCriteria extends Criteria<PullRequest> {
+public class ToBeMergedByUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public ToBeMergedByCriteria(User user) {
+ public ToBeMergedByUserCriteria(User user) {
this.user = user;
}
+
+ public User getUser() {
+ return user;
+ }
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
@@ -34,7 +38,7 @@ public class ToBeMergedByCriteria extends Criteria<PullRequest> {
@SuppressWarnings("unchecked")
private Criteria<PullRequest> getCriteria(User user) {
- return new AndCriteria<>(new ReadyToMergeCriteria(), new AssignedToCriteria(user));
+ return new AndCriteria<>(new ReadyToMergeCriteria(), new AssignedToUserCriteria(user));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
index 7d52b4ee92..62ea11cfcf 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByMeCriteria.java
@@ -35,7 +35,7 @@ public class ToBeReviewedByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new ToBeReviewedByCriteria(user);
+ return new ToBeReviewedByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java
similarity index 91%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java
index 7c9cb84c7a..2f8e202a91 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/ToBeReviewedByUserCriteria.java
@@ -15,16 +15,20 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class ToBeReviewedByCriteria extends Criteria<PullRequest> {
+public class ToBeReviewedByUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public ToBeReviewedByCriteria(User user) {
+ public ToBeReviewedByUserCriteria(User user) {
this.user = user;
}
+ public User getUser() {
+ return user;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<PullRequest, PullRequest> from, CriteriaBuilder builder) {
Subquery<PullRequestReview> reviewQuery = query.subquery(PullRequestReview.class);
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
index 67d51384f5..59b2d19a25 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByMeCriteria.java
@@ -37,7 +37,7 @@ public class WatchedByMeCriteria extends Criteria<PullRequest> {
}
private Criteria<PullRequest> getCriteria(User user) {
- return new WatchedByCriteria(user);
+ return new WatchedByUserCriteria(user);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java
similarity index 93%
rename from server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java
rename to server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java
index 0021f2075e..1dba305c37 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pullrequest/WatchedByUserCriteria.java
@@ -16,13 +16,13 @@ import io.onedev.server.model.User;
import io.onedev.server.util.ProjectScope;
import io.onedev.server.util.criteria.Criteria;
-public class WatchedByCriteria extends Criteria<PullRequest> {
+public class WatchedByUserCriteria extends Criteria<PullRequest> {
private static final long serialVersionUID = 1L;
private final User user;
- public WatchedByCriteria(User user) {
+ public WatchedByUserCriteria(User user) {
this.user = user;
}
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
index 573f0e226a..1b51166c15 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/AndCriteria.java
@@ -37,6 +37,10 @@ public class AndCriteria<T> extends Criteria<T> {
this.criterias = criterias;
}
+ public List<Criteria<T>> getCriterias() {
+ return criterias;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
diff --git a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
index 366e495d42..9c693688cc 100644
--- a/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/util/criteria/OrCriteria.java
@@ -37,6 +37,10 @@ public class OrCriteria<T> extends Criteria<T> {
this.criterias = criterias;
}
+ public List<Criteria<T>> getCriterias() {
+ return criterias;
+ }
+
@Override
public Predicate getPredicate(@Nullable ProjectScope projectScope, CriteriaQuery<?> query, From<T, T> root, CriteriaBuilder builder) {
List<Predicate> predicates = new ArrayList<>();
@@ -158,7 +162,7 @@ public class OrCriteria<T> extends Criteria<T> {
@Override
public void fill(T object) {
- if (criterias.size() == 1)
+ if (criterias.size() > 1)
criterias.iterator().next().fill(object);
}
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/FlatPickrResourceReference.java b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/FlatPickrResourceReference.java
new file mode 100644
index 0000000000..a93cad50c4
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/FlatPickrResourceReference.java
@@ -0,0 +1,37 @@
+package io.onedev.server.web.asset.flatpickr;
+
+import java.util.List;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.HeaderItem;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.request.resource.CssResourceReference;
+import org.apache.wicket.request.resource.JavaScriptResourceReference;
+
+import io.onedev.server.web.page.base.BaseDependentResourceReference;
+
+public class FlatPickrResourceReference extends BaseDependentResourceReference {
+
+ private static final long serialVersionUID = 1L;
+
+ public FlatPickrResourceReference() {
+ super(FlatPickrResourceReference.class, "flatpickr.min.js");
+ }
+
+ @Override
+ public List<HeaderItem> getDependencies() {
+ List<HeaderItem> dependencies = super.getDependencies();
+
+ dependencies.add(CssHeaderItem.forReference(
+ new CssResourceReference(FlatPickrResourceReference.class, "flatpickr.min.css")
+ ));
+ dependencies.add(CssHeaderItem.forReference(
+ new CssResourceReference(FlatPickrResourceReference.class, "dark.css")
+ ));
+ dependencies.add(JavaScriptHeaderItem.forReference(
+ new JavaScriptResourceReference(FlatPickrResourceReference.class, "flatpickr-locale.js")
+ ));
+
+ return dependencies;
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/dark.css b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/dark.css
similarity index 56%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/dark.css
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/dark.css
index d0202f8ac2..bfd9f1653e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datepicker/dark.css
+++ b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/dark.css
@@ -1,4 +1,4 @@
-.flatpickr-calendar {
+.dark-mode .flatpickr-calendar {
background: transparent;
opacity: 0;
display: none;
@@ -22,59 +22,59 @@
-webkit-box-shadow: 1px 0 0 #20222c, -1px 0 0 #20222c, 0 1px 0 #20222c, 0 -1px 0 #20222c, 0 3px 13px rgba(0,0,0,0.08);
box-shadow: 1px 0 0 #20222c, -1px 0 0 #20222c, 0 1px 0 #20222c, 0 -1px 0 #20222c, 0 3px 13px rgba(0,0,0,0.08);
}
-.flatpickr-calendar.open,
-.flatpickr-calendar.inline {
+.dark-mode .flatpickr-calendar.open,
+.dark-mode .flatpickr-calendar.inline {
opacity: 1;
max-height: 640px;
visibility: visible;
}
-.flatpickr-calendar.open {
+.dark-mode .flatpickr-calendar.open {
display: inline-block;
z-index: 99999;
}
-.flatpickr-calendar.animate.open {
+.dark-mode .flatpickr-calendar.animate.open {
-webkit-animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
animation: fpFadeInDown 300ms cubic-bezier(0.23, 1, 0.32, 1);
}
-.flatpickr-calendar.inline {
+.dark-mode .flatpickr-calendar.inline {
display: block;
position: relative;
top: 2px;
}
-.flatpickr-calendar.static {
+.dark-mode .flatpickr-calendar.static {
position: absolute;
top: calc(100% + 2px);
}
-.flatpickr-calendar.static.open {
+.dark-mode .flatpickr-calendar.static.open {
z-index: 999;
display: block;
}
-.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7) {
+.dark-mode .flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+1) .flatpickr-day.inRange:nth-child(7n+7) {
-webkit-box-shadow: none !important;
box-shadow: none !important;
}
-.flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1) {
+.dark-mode .flatpickr-calendar.multiMonth .flatpickr-days .dayContainer:nth-child(n+2) .flatpickr-day.inRange:nth-child(7n+1) {
-webkit-box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
box-shadow: -2px 0 0 #e6e6e6, 5px 0 0 #e6e6e6;
}
-.flatpickr-calendar .hasWeeks .dayContainer,
-.flatpickr-calendar .hasTime .dayContainer {
+.dark-mode .flatpickr-calendar .hasWeeks .dayContainer,
+.dark-mode .flatpickr-calendar .hasTime .dayContainer {
border-bottom: 0;
border-bottom-right-radius: 0;
border-bottom-left-radius: 0;
}
-.flatpickr-calendar .hasWeeks .dayContainer {
+.dark-mode .flatpickr-calendar .hasWeeks .dayContainer {
border-left: 0;
}
-.flatpickr-calendar.hasTime .flatpickr-time {
+.dark-mode .flatpickr-calendar.hasTime .flatpickr-time {
height: 40px;
border-top: 1px solid #20222c;
}
-.flatpickr-calendar.noCalendar.hasTime .flatpickr-time {
+.dark-mode .flatpickr-calendar.noCalendar.hasTime .flatpickr-time {
height: auto;
}
-.flatpickr-calendar:before,
-.flatpickr-calendar:after {
+.dark-mode .flatpickr-calendar:before,
+.dark-mode .flatpickr-calendar:after {
position: absolute;
display: block;
pointer-events: none;
@@ -84,60 +84,60 @@
width: 0;
left: 22px;
}
-.flatpickr-calendar.rightMost:before,
-.flatpickr-calendar.arrowRight:before,
-.flatpickr-calendar.rightMost:after,
-.flatpickr-calendar.arrowRight:after {
+.dark-mode .flatpickr-calendar.rightMost:before,
+.dark-mode .flatpickr-calendar.arrowRight:before,
+.dark-mode .flatpickr-calendar.rightMost:after,
+.dark-mode .flatpickr-calendar.arrowRight:after {
left: auto;
right: 22px;
}
-.flatpickr-calendar.arrowCenter:before,
-.flatpickr-calendar.arrowCenter:after {
+.dark-mode .flatpickr-calendar.arrowCenter:before,
+.dark-mode .flatpickr-calendar.arrowCenter:after {
left: 50%;
right: 50%;
}
-.flatpickr-calendar:before {
+.dark-mode .flatpickr-calendar:before {
border-width: 5px;
margin: 0 -5px;
}
-.flatpickr-calendar:after {
+.dark-mode .flatpickr-calendar:after {
border-width: 4px;
margin: 0 -4px;
}
-.flatpickr-calendar.arrowTop:before,
-.flatpickr-calendar.arrowTop:after {
+.dark-mode .flatpickr-calendar.arrowTop:before,
+.dark-mode .flatpickr-calendar.arrowTop:after {
bottom: 100%;
}
-.flatpickr-calendar.arrowTop:before {
+.dark-mode .flatpickr-calendar.arrowTop:before {
border-bottom-color: #20222c;
}
-.flatpickr-calendar.arrowTop:after {
+.dark-mode .flatpickr-calendar.arrowTop:after {
border-bottom-color: #3f4458;
}
-.flatpickr-calendar.arrowBottom:before,
-.flatpickr-calendar.arrowBottom:after {
+.dark-mode .flatpickr-calendar.arrowBottom:before,
+.dark-mode .flatpickr-calendar.arrowBottom:after {
top: 100%;
}
-.flatpickr-calendar.arrowBottom:before {
+.dark-mode .flatpickr-calendar.arrowBottom:before {
border-top-color: #20222c;
}
-.flatpickr-calendar.arrowBottom:after {
+.dark-mode .flatpickr-calendar.arrowBottom:after {
border-top-color: #3f4458;
}
-.flatpickr-calendar:focus {
+.dark-mode .flatpickr-calendar:focus {
outline: 0;
}
-.flatpickr-wrapper {
+.dark-mode .flatpickr-wrapper {
position: relative;
display: inline-block;
}
-.flatpickr-months {
+.dark-mode .flatpickr-months {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
display: flex;
}
-.flatpickr-months .flatpickr-month {
+.dark-mode .flatpickr-months .flatpickr-month {
background: #3f4458;
color: #fff;
fill: #fff;
@@ -155,8 +155,8 @@
-ms-flex: 1;
flex: 1;
}
-.flatpickr-months .flatpickr-prev-month,
-.flatpickr-months .flatpickr-next-month {
+.dark-mode .flatpickr-months .flatpickr-prev-month,
+.dark-mode .flatpickr-months .flatpickr-next-month {
text-decoration: none;
cursor: pointer;
position: absolute;
@@ -167,16 +167,16 @@
color: #fff;
fill: #fff;
}
-.flatpickr-months .flatpickr-prev-month.flatpickr-disabled,
-.flatpickr-months .flatpickr-next-month.flatpickr-disabled {
+.dark-mode .flatpickr-months .flatpickr-prev-month.flatpickr-disabled,
+.dark-mode .flatpickr-months .flatpickr-next-month.flatpickr-disabled {
display: none;
}
-.flatpickr-months .flatpickr-prev-month i,
-.flatpickr-months .flatpickr-next-month i {
+.dark-mode .flatpickr-months .flatpickr-prev-month i,
+.dark-mode .flatpickr-months .flatpickr-next-month i {
position: relative;
}
-.flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,
-.flatpickr-months .flatpickr-next-month.flatpickr-prev-month {
+.dark-mode .flatpickr-months .flatpickr-prev-month.flatpickr-prev-month,
+.dark-mode .flatpickr-months .flatpickr-next-month.flatpickr-prev-month {
/*
/*rtl:begin:ignore*/
/*
@@ -191,8 +191,8 @@
/*rtl:begin:ignore*/
/*
/*rtl:end:ignore*/
-.flatpickr-months .flatpickr-prev-month.flatpickr-next-month,
-.flatpickr-months .flatpickr-next-month.flatpickr-next-month {
+.dark-mode .flatpickr-months .flatpickr-prev-month.flatpickr-next-month,
+.dark-mode .flatpickr-months .flatpickr-next-month.flatpickr-next-month {
/*
/*rtl:begin:ignore*/
/*
@@ -207,45 +207,45 @@
/*rtl:begin:ignore*/
/*
/*rtl:end:ignore*/
-.flatpickr-months .flatpickr-prev-month:hover,
-.flatpickr-months .flatpickr-next-month:hover {
+.dark-mode .flatpickr-months .flatpickr-prev-month:hover,
+.dark-mode .flatpickr-months .flatpickr-next-month:hover {
color: #eee;
}
-.flatpickr-months .flatpickr-prev-month:hover svg,
-.flatpickr-months .flatpickr-next-month:hover svg {
+.dark-mode .flatpickr-months .flatpickr-prev-month:hover svg,
+.dark-mode .flatpickr-months .flatpickr-next-month:hover svg {
fill: #f64747;
}
-.flatpickr-months .flatpickr-prev-month svg,
-.flatpickr-months .flatpickr-next-month svg {
+.dark-mode .flatpickr-months .flatpickr-prev-month svg,
+.dark-mode .flatpickr-months .flatpickr-next-month svg {
width: 14px;
height: 14px;
}
-.flatpickr-months .flatpickr-prev-month svg path,
-.flatpickr-months .flatpickr-next-month svg path {
+.dark-mode .flatpickr-months .flatpickr-prev-month svg path,
+.dark-mode .flatpickr-months .flatpickr-next-month svg path {
-webkit-transition: fill 0.1s;
transition: fill 0.1s;
fill: inherit;
}
-.numInputWrapper {
+.dark-mode .numInputWrapper {
position: relative;
height: auto;
}
-.numInputWrapper input,
-.numInputWrapper span {
+.dark-mode .numInputWrapper input,
+.dark-mode .numInputWrapper span {
display: inline-block;
}
-.numInputWrapper input {
+.dark-mode .numInputWrapper input {
width: 100%;
}
-.numInputWrapper input::-ms-clear {
+.dark-mode .numInputWrapper input::-ms-clear {
display: none;
}
-.numInputWrapper input::-webkit-outer-spin-button,
-.numInputWrapper input::-webkit-inner-spin-button {
+.dark-mode .numInputWrapper input::-webkit-outer-spin-button,
+.dark-mode .numInputWrapper input::-webkit-inner-spin-button {
margin: 0;
-webkit-appearance: none;
}
-.numInputWrapper span {
+.dark-mode .numInputWrapper span {
position: absolute;
right: 0;
width: 14px;
@@ -258,50 +258,50 @@
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
-.numInputWrapper span:hover {
+.dark-mode .numInputWrapper span:hover {
background: rgba(192,187,167,0.1);
}
-.numInputWrapper span:active {
+.dark-mode .numInputWrapper span:active {
background: rgba(192,187,167,0.2);
}
-.numInputWrapper span:after {
+.dark-mode .numInputWrapper span:after {
display: block;
content: "";
position: absolute;
}
-.numInputWrapper span.arrowUp {
+.dark-mode .numInputWrapper span.arrowUp {
top: 0;
border-bottom: 0;
}
-.numInputWrapper span.arrowUp:after {
+.dark-mode .numInputWrapper span.arrowUp:after {
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-bottom: 4px solid rgba(255,255,255,0.6);
top: 26%;
}
-.numInputWrapper span.arrowDown {
+.dark-mode .numInputWrapper span.arrowDown {
top: 50%;
}
-.numInputWrapper span.arrowDown:after {
+.dark-mode .numInputWrapper span.arrowDown:after {
border-left: 4px solid transparent;
border-right: 4px solid transparent;
border-top: 4px solid rgba(255,255,255,0.6);
top: 40%;
}
-.numInputWrapper span svg {
+.dark-mode .numInputWrapper span svg {
width: inherit;
height: auto;
}
-.numInputWrapper span svg path {
+.dark-mode .numInputWrapper span svg path {
fill: rgba(255,255,255,0.5);
}
-.numInputWrapper:hover {
+.dark-mode .numInputWrapper:hover {
background: rgba(192,187,167,0.05);
}
-.numInputWrapper:hover span {
+.dark-mode .numInputWrapper:hover span {
opacity: 1;
}
-.flatpickr-current-month {
+.dark-mode .flatpickr-current-month {
font-size: 135%;
line-height: inherit;
font-weight: 300;
@@ -317,7 +317,7 @@
-webkit-transform: translate3d(0px, 0px, 0px);
transform: translate3d(0px, 0px, 0px);
}
-.flatpickr-current-month span.cur-month {
+.dark-mode .flatpickr-current-month span.cur-month {
font-family: inherit;
font-weight: 700;
color: inherit;
@@ -325,21 +325,21 @@
margin-left: 0.5ch;
padding: 0;
}
-.flatpickr-current-month span.cur-month:hover {
+.dark-mode .flatpickr-current-month span.cur-month:hover {
background: rgba(192,187,167,0.05);
}
-.flatpickr-current-month .numInputWrapper {
+.dark-mode .flatpickr-current-month .numInputWrapper {
width: 6ch;
width: 7ch\0;
display: inline-block;
}
-.flatpickr-current-month .numInputWrapper span.arrowUp:after {
+.dark-mode .flatpickr-current-month .numInputWrapper span.arrowUp:after {
border-bottom-color: #fff;
}
-.flatpickr-current-month .numInputWrapper span.arrowDown:after {
+.dark-mode .flatpickr-current-month .numInputWrapper span.arrowDown:after {
border-top-color: #fff;
}
-.flatpickr-current-month input.cur-year {
+.dark-mode .flatpickr-current-month input.cur-year {
background: transparent;
-webkit-box-sizing: border-box;
box-sizing: border-box;
@@ -360,17 +360,17 @@
-moz-appearance: textfield;
appearance: textfield;
}
-.flatpickr-current-month input.cur-year:focus {
+.dark-mode .flatpickr-current-month input.cur-year:focus {
outline: 0;
}
-.flatpickr-current-month input.cur-year[disabled],
-.flatpickr-current-month input.cur-year[disabled]:hover {
+.dark-mode .flatpickr-current-month input.cur-year[disabled],
+.dark-mode .flatpickr-current-month input.cur-year[disabled]:hover {
font-size: 100%;
color: rgba(255,255,255,0.5);
background: transparent;
pointer-events: none;
}
-.flatpickr-current-month .flatpickr-monthDropdown-months {
+.dark-mode .flatpickr-current-month .flatpickr-monthDropdown-months {
appearance: menulist;
background: #3f4458;
border: none;
@@ -393,19 +393,19 @@
-moz-appearance: menulist;
width: auto;
}
-.flatpickr-current-month .flatpickr-monthDropdown-months:focus,
-.flatpickr-current-month .flatpickr-monthDropdown-months:active {
+.dark-mode .flatpickr-current-month .flatpickr-monthDropdown-months:focus,
+.dark-mode .flatpickr-current-month .flatpickr-monthDropdown-months:active {
outline: none;
}
-.flatpickr-current-month .flatpickr-monthDropdown-months:hover {
+.dark-mode .flatpickr-current-month .flatpickr-monthDropdown-months:hover {
background: rgba(192,187,167,0.05);
}
-.flatpickr-current-month .flatpickr-monthDropdown-months .flatpickr-monthDropdown-month {
+.dark-mode .flatpickr-current-month .flatpickr-monthDropdown-months .flatpickr-monthDropdown-month {
background-color: #3f4458;
outline: none;
padding: 0;
}
-.flatpickr-weekdays {
+.dark-mode .flatpickr-weekdays {
background: transparent;
text-align: center;
overflow: hidden;
@@ -420,7 +420,7 @@
align-items: center;
height: 28px;
}
-.flatpickr-weekdays .flatpickr-weekdaycontainer {
+.dark-mode .flatpickr-weekdays .flatpickr-weekdaycontainer {
display: -webkit-box;
display: -webkit-flex;
display: -ms-flexbox;
@@ -430,7 +430,7 @@
-ms-flex: 1;
flex: 1;
}
-span.flatpickr-weekday {
+.dark-mode span.flatpickr-weekday {
cursor: default;
font-size: 90%;
background: #3f4458;
@@ -445,11 +445,11 @@ span.flatpickr-weekday {
flex: 1;
font-weight: bolder;
}
-.dayContainer,
-.flatpickr-weeks {
+.dark-mode .dayContainer,
+.dark-mode .flatpickr-weeks {
padding: 1px 0 0 0;
}
-.flatpickr-days {
+.dark-mode .flatpickr-days {
position: relative;
overflow: hidden;
display: -webkit-box;
@@ -462,10 +462,10 @@ span.flatpickr-weekday {
align-items: flex-start;
width: 307.875px;
}
-.flatpickr-days:focus {
+.dark-mode .flatpickr-days:focus {
outline: 0;
}
-.dayContainer {
+.dark-mode .dayContainer {
padding: 0;
outline: 0;
text-align: left;
@@ -489,11 +489,11 @@ span.flatpickr-weekday {
transform: translate3d(0px, 0px, 0px);
opacity: 1;
}
-.dayContainer + .dayContainer {
+.dark-mode .dayContainer + .dayContainer {
-webkit-box-shadow: -1px 0 0 #20222c;
box-shadow: -1px 0 0 #20222c;
}
-.flatpickr-day {
+.dark-mode .flatpickr-day {
background: none;
border: 1px solid transparent;
border-radius: 150px;
@@ -518,125 +518,125 @@ span.flatpickr-weekday {
justify-content: center;
text-align: center;
}
-.flatpickr-day.inRange,
-.flatpickr-day.prevMonthDay.inRange,
-.flatpickr-day.nextMonthDay.inRange,
-.flatpickr-day.today.inRange,
-.flatpickr-day.prevMonthDay.today.inRange,
-.flatpickr-day.nextMonthDay.today.inRange,
-.flatpickr-day:hover,
-.flatpickr-day.prevMonthDay:hover,
-.flatpickr-day.nextMonthDay:hover,
-.flatpickr-day:focus,
-.flatpickr-day.prevMonthDay:focus,
-.flatpickr-day.nextMonthDay:focus {
+.dark-mode .flatpickr-day.inRange,
+.dark-mode .flatpickr-day.prevMonthDay.inRange,
+.dark-mode .flatpickr-day.nextMonthDay.inRange,
+.dark-mode .flatpickr-day.today.inRange,
+.dark-mode .flatpickr-day.prevMonthDay.today.inRange,
+.dark-mode .flatpickr-day.nextMonthDay.today.inRange,
+.dark-mode .flatpickr-day:hover,
+.dark-mode .flatpickr-day.prevMonthDay:hover,
+.dark-mode .flatpickr-day.nextMonthDay:hover,
+.dark-mode .flatpickr-day:focus,
+.dark-mode .flatpickr-day.prevMonthDay:focus,
+.dark-mode .flatpickr-day.nextMonthDay:focus {
cursor: pointer;
outline: 0;
background: #646c8c;
border-color: #646c8c;
}
-.flatpickr-day.today {
+.dark-mode .flatpickr-day.today {
border-color: #eee;
}
-.flatpickr-day.today:hover,
-.flatpickr-day.today:focus {
+.dark-mode .flatpickr-day.today:hover,
+.dark-mode .flatpickr-day.today:focus {
border-color: #eee;
background: #eee;
color: #3f4458;
}
-.flatpickr-day.selected,
-.flatpickr-day.startRange,
-.flatpickr-day.endRange,
-.flatpickr-day.selected.inRange,
-.flatpickr-day.startRange.inRange,
-.flatpickr-day.endRange.inRange,
-.flatpickr-day.selected:focus,
-.flatpickr-day.startRange:focus,
-.flatpickr-day.endRange:focus,
-.flatpickr-day.selected:hover,
-.flatpickr-day.startRange:hover,
-.flatpickr-day.endRange:hover,
-.flatpickr-day.selected.prevMonthDay,
-.flatpickr-day.startRange.prevMonthDay,
-.flatpickr-day.endRange.prevMonthDay,
-.flatpickr-day.selected.nextMonthDay,
-.flatpickr-day.startRange.nextMonthDay,
-.flatpickr-day.endRange.nextMonthDay {
+.dark-mode .flatpickr-day.selected,
+.dark-mode .flatpickr-day.startRange,
+.dark-mode .flatpickr-day.endRange,
+.dark-mode .flatpickr-day.selected.inRange,
+.dark-mode .flatpickr-day.startRange.inRange,
+.dark-mode .flatpickr-day.endRange.inRange,
+.dark-mode .flatpickr-day.selected:focus,
+.dark-mode .flatpickr-day.startRange:focus,
+.dark-mode .flatpickr-day.endRange:focus,
+.dark-mode .flatpickr-day.selected:hover,
+.dark-mode .flatpickr-day.startRange:hover,
+.dark-mode .flatpickr-day.endRange:hover,
+.dark-mode .flatpickr-day.selected.prevMonthDay,
+.dark-mode .flatpickr-day.startRange.prevMonthDay,
+.dark-mode .flatpickr-day.endRange.prevMonthDay,
+.dark-mode .flatpickr-day.selected.nextMonthDay,
+.dark-mode .flatpickr-day.startRange.nextMonthDay,
+.dark-mode .flatpickr-day.endRange.nextMonthDay {
background: #80cbc4;
-webkit-box-shadow: none;
box-shadow: none;
color: #fff;
border-color: #80cbc4;
}
-.flatpickr-day.selected.startRange,
-.flatpickr-day.startRange.startRange,
-.flatpickr-day.endRange.startRange {
+.dark-mode .flatpickr-day.selected.startRange,
+.dark-mode .flatpickr-day.startRange.startRange,
+.dark-mode .flatpickr-day.endRange.startRange {
border-radius: 50px 0 0 50px;
}
-.flatpickr-day.selected.endRange,
-.flatpickr-day.startRange.endRange,
-.flatpickr-day.endRange.endRange {
+.dark-mode .flatpickr-day.selected.endRange,
+.dark-mode .flatpickr-day.startRange.endRange,
+.dark-mode .flatpickr-day.endRange.endRange {
border-radius: 0 50px 50px 0;
}
-.flatpickr-day.selected.startRange + .endRange:not(:nth-child(7n+1)),
-.flatpickr-day.startRange.startRange + .endRange:not(:nth-child(7n+1)),
-.flatpickr-day.endRange.startRange + .endRange:not(:nth-child(7n+1)) {
+.dark-mode .flatpickr-day.selected.startRange + .endRange:not(:nth-child(7n+1)),
+.dark-mode .flatpickr-day.startRange.startRange + .endRange:not(:nth-child(7n+1)),
+.dark-mode .flatpickr-day.endRange.startRange + .endRange:not(:nth-child(7n+1)) {
-webkit-box-shadow: -10px 0 0 #80cbc4;
box-shadow: -10px 0 0 #80cbc4;
}
-.flatpickr-day.selected.startRange.endRange,
-.flatpickr-day.startRange.startRange.endRange,
-.flatpickr-day.endRange.startRange.endRange {
+.dark-mode .flatpickr-day.selected.startRange.endRange,
+.dark-mode .flatpickr-day.startRange.startRange.endRange,
+.dark-mode .flatpickr-day.endRange.startRange.endRange {
border-radius: 50px;
}
-.flatpickr-day.inRange {
+.dark-mode .flatpickr-day.inRange {
border-radius: 0;
-webkit-box-shadow: -5px 0 0 #646c8c, 5px 0 0 #646c8c;
box-shadow: -5px 0 0 #646c8c, 5px 0 0 #646c8c;
}
-.flatpickr-day.flatpickr-disabled,
-.flatpickr-day.flatpickr-disabled:hover,
-.flatpickr-day.prevMonthDay,
-.flatpickr-day.nextMonthDay,
-.flatpickr-day.notAllowed,
-.flatpickr-day.notAllowed.prevMonthDay,
-.flatpickr-day.notAllowed.nextMonthDay {
+.dark-mode .flatpickr-day.flatpickr-disabled,
+.dark-mode .flatpickr-day.flatpickr-disabled:hover,
+.dark-mode .flatpickr-day.prevMonthDay,
+.dark-mode .flatpickr-day.nextMonthDay,
+.dark-mode .flatpickr-day.notAllowed,
+.dark-mode .flatpickr-day.notAllowed.prevMonthDay,
+.dark-mode .flatpickr-day.notAllowed.nextMonthDay {
color: rgba(255,255,255,0.3);
background: transparent;
border-color: transparent;
cursor: default;
}
-.flatpickr-day.flatpickr-disabled,
-.flatpickr-day.flatpickr-disabled:hover {
+.dark-mode .flatpickr-day.flatpickr-disabled,
+.dark-mode .flatpickr-day.flatpickr-disabled:hover {
cursor: not-allowed;
color: rgba(255,255,255,0.1);
}
-.flatpickr-day.week.selected {
+.dark-mode .flatpickr-day.week.selected {
border-radius: 0;
-webkit-box-shadow: -5px 0 0 #80cbc4, 5px 0 0 #80cbc4;
box-shadow: -5px 0 0 #80cbc4, 5px 0 0 #80cbc4;
}
-.flatpickr-day.hidden {
+.dark-mode .flatpickr-day.hidden {
visibility: hidden;
}
-.rangeMode .flatpickr-day {
+.dark-mode .rangeMode .flatpickr-day {
margin-top: 1px;
}
-.flatpickr-weekwrapper {
+.dark-mode .flatpickr-weekwrapper {
float: left;
}
-.flatpickr-weekwrapper .flatpickr-weeks {
+.dark-mode .flatpickr-weekwrapper .flatpickr-weeks {
padding: 0 12px;
-webkit-box-shadow: 1px 0 0 #20222c;
box-shadow: 1px 0 0 #20222c;
}
-.flatpickr-weekwrapper .flatpickr-weekday {
+.dark-mode .flatpickr-weekwrapper .flatpickr-weekday {
float: none;
width: 100%;
line-height: 28px;
}
-.flatpickr-weekwrapper span.flatpickr-day,
-.flatpickr-weekwrapper span.flatpickr-day:hover {
+.dark-mode .flatpickr-weekwrapper span.flatpickr-day,
+.dark-mode .flatpickr-weekwrapper span.flatpickr-day:hover {
display: block;
width: 100%;
max-width: none;
@@ -645,7 +645,7 @@ span.flatpickr-weekday {
cursor: default;
border: none;
}
-.flatpickr-innerContainer {
+.dark-mode .flatpickr-innerContainer {
display: block;
display: -webkit-box;
display: -webkit-flex;
@@ -655,13 +655,13 @@ span.flatpickr-weekday {
box-sizing: border-box;
overflow: hidden;
}
-.flatpickr-rContainer {
+.dark-mode .flatpickr-rContainer {
display: inline-block;
padding: 0;
-webkit-box-sizing: border-box;
box-sizing: border-box;
}
-.flatpickr-time {
+.dark-mode .flatpickr-time {
text-align: center;
outline: 0;
display: block;
@@ -676,12 +676,12 @@ span.flatpickr-weekday {
display: -ms-flexbox;
display: flex;
}
-.flatpickr-time:after {
+.dark-mode .flatpickr-time:after {
content: "";
display: table;
clear: both;
}
-.flatpickr-time .numInputWrapper {
+.dark-mode .flatpickr-time .numInputWrapper {
-webkit-box-flex: 1;
-webkit-flex: 1;
-ms-flex: 1;
@@ -690,19 +690,19 @@ span.flatpickr-weekday {
height: 40px;
float: left;
}
-.flatpickr-time .numInputWrapper span.arrowUp:after {
+.dark-mode .flatpickr-time .numInputWrapper span.arrowUp:after {
border-bottom-color: rgba(255,255,255,0.95);
}
-.flatpickr-time .numInputWrapper span.arrowDown:after {
+.dark-mode .flatpickr-time .numInputWrapper span.arrowDown:after {
border-top-color: rgba(255,255,255,0.95);
}
-.flatpickr-time.hasSeconds .numInputWrapper {
+.dark-mode .flatpickr-time.hasSeconds .numInputWrapper {
width: 26%;
}
-.flatpickr-time.time24hr .numInputWrapper {
+.dark-mode .flatpickr-time.time24hr .numInputWrapper {
width: 49%;
}
-.flatpickr-time input {
+.dark-mode .flatpickr-time input {
background: transparent;
-webkit-box-shadow: none;
box-shadow: none;
@@ -722,19 +722,19 @@ span.flatpickr-weekday {
-moz-appearance: textfield;
appearance: textfield;
}
-.flatpickr-time input.flatpickr-hour {
+.dark-mode .flatpickr-time input.flatpickr-hour {
font-weight: bold;
}
-.flatpickr-time input.flatpickr-minute,
-.flatpickr-time input.flatpickr-second {
+.dark-mode .flatpickr-time input.flatpickr-minute,
+.dark-mode .flatpickr-time input.flatpickr-second {
font-weight: 400;
}
-.flatpickr-time input:focus {
+.dark-mode .flatpickr-time input:focus {
outline: 0;
border: 0;
}
-.flatpickr-time .flatpickr-time-separator,
-.flatpickr-time .flatpickr-am-pm {
+.dark-mode .flatpickr-time .flatpickr-time-separator,
+.dark-mode .flatpickr-time .flatpickr-am-pm {
height: inherit;
float: left;
line-height: inherit;
@@ -749,20 +749,20 @@ span.flatpickr-weekday {
-ms-flex-item-align: center;
align-self: center;
}
-.flatpickr-time .flatpickr-am-pm {
+.dark-mode .flatpickr-time .flatpickr-am-pm {
outline: 0;
width: 18%;
cursor: pointer;
text-align: center;
font-weight: 400;
}
-.flatpickr-time input:hover,
-.flatpickr-time .flatpickr-am-pm:hover,
-.flatpickr-time input:focus,
-.flatpickr-time .flatpickr-am-pm:focus {
+.dark-mode .flatpickr-time input:hover,
+.dark-mode .flatpickr-time .flatpickr-am-pm:hover,
+.dark-mode .flatpickr-time input:focus,
+.dark-mode .flatpickr-time .flatpickr-am-pm:focus {
background: #6a7395;
}
-.flatpickr-input[readonly] {
+.dark-mode .flatpickr-input[readonly] {
cursor: pointer;
}
@-webkit-keyframes fpFadeInDown {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ar.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ar.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ar.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ar.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_at.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_at.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_at.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_at.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_az.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_az.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_az.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_az.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_be.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_be.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_be.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_be.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_bg.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_bg.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_bg.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_bg.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_bn.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_bn.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_bn.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_bn.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_bs.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_bs.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_bs.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_bs.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_cat.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_cat.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_cat.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_cat.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_cs.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_cs.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_cs.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_cs.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_cy.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_cy.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_cy.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_cy.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_da.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_da.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_da.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_da.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_de.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_de.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_de.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_de.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_en_AU.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_en_AU.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_en_AU.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_en_AU.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_en_GB.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_en_GB.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_en_GB.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_en_GB.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_en_NZ.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_en_NZ.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_en_NZ.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_en_NZ.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_eo.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_eo.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_eo.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_eo.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_es.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_es.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_es.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_es.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_et.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_et.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_et.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_et.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fa.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fa.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fa.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fa.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fi.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fi.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fi.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fi.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fo.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fo.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fo.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fo.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fr.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fr.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_fr.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_fr.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ga.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ga.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ga.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ga.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_gr.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_gr.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_gr.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_gr.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_he.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_he.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_he.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_he.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_hi.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_hi.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_hi.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_hi.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_hr.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_hr.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_hr.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_hr.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_hu.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_hu.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_hu.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_hu.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_id.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_id.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_id.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_id.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_is.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_is.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_is.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_is.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_it.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_it.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_it.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_it.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ja.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ja.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ja.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ja.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ka.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ka.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ka.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ka.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_km.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_km.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_km.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_km.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ko.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ko.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ko.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ko.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_kz.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_kz.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_kz.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_kz.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_lt.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_lt.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_lt.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_lt.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_lv.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_lv.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_lv.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_lv.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_mk.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_mk.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_mk.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_mk.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_mn.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_mn.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_mn.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_mn.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ms.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ms.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ms.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ms.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_my.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_my.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_my.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_my.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_nl.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_nl.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_nl.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_nl.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_no.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_no.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_no.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_no.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_pa.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_pa.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_pa.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_pa.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_pl.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_pl.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_pl.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_pl.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_pt.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_pt.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_pt.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_pt.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ro.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ro.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ro.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ro.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ru.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ru.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_ru.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_ru.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_si.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_si.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_si.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_si.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sk.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sk.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sk.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sk.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sl.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sl.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sl.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sl.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sq.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sq.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sq.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sq.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sr.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sr.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sr.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sr.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sv.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sv.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_sv.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_sv.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_th.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_th.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_th.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_th.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_tr.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_tr.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_tr.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_tr.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_uk.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_uk.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_uk.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_uk.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_uz.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_uz.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_uz.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_uz.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_vn.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_vn.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_vn.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_vn.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_zh.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_zh.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr-locale_zh.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr-locale_zh.js
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr.min.css b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr.min.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr.min.css
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr.min.css
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr.min.js b/server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr.min.js
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/datepicker/flatpickr.min.js
rename to server-core/src/main/java/io/onedev/server/web/asset/flatpickr/flatpickr.min.js
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/filter.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/filter.svg
new file mode 100644
index 0000000000..45953bdc12
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/asset/icon/filter.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1742204631670" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2599" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M872.533333 134.4c-12.8-10.666667-29.866667-17.066667-49.066666-17.066667H198.4C157.866667 117.333333 123.733333 151.466667 123.733333 192c0 17.066667 6.4 34.133333 17.066667 49.066667l256 302.933333v251.733333c0 12.8 6.4 23.466667 17.066667 27.733334l162.133333 81.066666c4.266667 2.133333 8.533333 4.266667 14.933333 4.266667 6.4 0 10.666667-2.133333 17.066667-4.266667 8.533333-6.4 14.933333-17.066667 14.933333-27.733333V541.866667l256-302.933334c12.8-14.933333 19.2-34.133333 17.066667-53.333333 2.133333-19.2-6.4-38.4-23.466667-51.2z m-38.4 64L569.6 509.866667c-4.266667 6.4-8.533333 12.8-8.533333 21.333333v292.266667l-98.133334-49.066667V531.2c0-8.533333-2.133333-14.933333-8.533333-21.333333L189.866667 198.4c0-2.133333-2.133333-4.266667-2.133334-6.4 0-6.4 4.266667-10.666667 10.666667-10.666667h625.066667c2.133333 0 4.266667 0 6.4 2.133334 2.133333 2.133333 4.266667 6.4 4.266666 6.4 2.133333 2.133333 2.133333 6.4 0 8.533333z" p-id="2600"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/icon/focus.svg b/server-core/src/main/java/io/onedev/server/web/asset/icon/focus.svg
deleted file mode 100644
index 1003b9d379..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/asset/icon/focus.svg
+++ /dev/null
@@ -1 +0,0 @@
-<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1686815400180" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="13290" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M511.715374 956.115742c-59.949604 0-117.960515-11.762074-172.773581-34.946452-52.874372-22.384916-100.26244-54.363368-141.034966-95.125901s-72.740985-88.160595-95.125902-141.034967c-23.174384-54.703139-34.946452-112.823976-34.946452-172.77358 0-59.949604 11.762074-117.960515 34.946452-172.773581 22.384916-52.874372 54.353375-100.26244 95.125902-141.034966 40.762533-40.772526 88.150602-72.740985 141.034966-95.125902C393.644933 80.126009 451.765769 68.353941 511.715374 68.353941s117.970508 11.762074 172.77358 34.946452c52.874372 22.384916 100.26244 54.353375 141.034967 95.125902 40.762533 40.762533 72.740985 88.150602 95.125901 141.034966 23.174384 54.703139 34.946452 112.823976 34.946452 172.773581 0 59.949604-11.762074 117.970508-34.946452 172.77358-22.384916 52.874372-54.363368 100.26244-95.125901 141.034967-40.762533 40.762533-88.160595 72.740985-141.034967 95.125901-54.813065 23.294304-112.823976 34.946452-172.77358 34.946452z m0-814.4512c-99.003289 0-192.070577 38.603988-262.083401 108.606818-70.00283 70.00283-108.596824 163.070119-108.596825 262.073408 0 99.013282 38.593994 192.080571 108.596825 262.083401C319.634803 844.430999 412.702092 883.024993 511.715374 883.024993c99.003289 0 192.080571-38.593994 262.073407-108.596824 70.00283-70.00283 108.606818-163.070119 108.606818-262.083401 0-99.003289-38.593994-192.080571-108.606818-262.073408-70.00283-70.122749-163.070119-108.606818-262.073407-108.606818z m0 0" p-id="13291"></path><path d="M511.715374 715.677756c-112.134441 0-203.382955-91.238521-203.382955-203.382955 0-112.134441 91.248514-203.263036 203.382955-203.263035 112.134441 0 203.382955 91.128595 203.382955 203.263035 0 112.144434-91.248514 203.382955-203.382955 203.382955z m0-333.565234c-71.831598 0-130.302199 58.470601-130.302199 130.302199s58.470601 130.302199 130.302199 130.302198 130.302199-58.470601 130.302198-130.302198c0-71.951517-58.470601-130.302199-130.302198-130.302199z m-1.149226-153.256731c20.216378 0 36.545375-16.328997 36.545375-36.545375V37.015058c0-20.216378-16.328997-36.545375-36.545375-36.545374s-36.545375 16.328997-36.545375 36.545374v155.305351c0 20.206384 16.33899 36.535381 36.545375 36.535382z m1.149226 566.758102c-20.216378 0-36.545375 16.328997-36.545375 36.545375v155.305351c0 20.216378 16.328997 36.535381 36.545375 36.535381s36.535381-16.328997 36.535381-36.535381V832.159268c0-20.216378-16.328997-36.545375-36.535381-36.545375z m0 0M228.396282 512.804458c0-20.216378-16.328997-36.545375-36.545375-36.545375H36.545557c-20.216378 0-36.545375 16.328997-36.545375 36.545375s16.328997 36.535381 36.545375 36.535381h155.30535c20.096458 0.009993 36.545375-16.319004 36.545375-36.535381z m566.638183-1.139232c0 20.216378 16.328997 36.535381 36.535382 36.535381h155.305351c20.216378 0 36.545375-16.328997 36.545374-36.535381 0-20.216378-16.328997-36.545375-36.545374-36.545375H831.569847c-20.096458 0-36.535381 16.448916-36.535382 36.545375z m0 0" p-id="13292"></path></svg>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
index 0c3331cf15..8cad422c68 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/AgentQueryBehavior.java
@@ -141,8 +141,12 @@ public class AgentQueryBehavior extends ANTLRAssistBehavior {
return null;
}
}
- if (suggestedLiteral.equals(","))
- return Optional.of("add another value");
+ if (suggestedLiteral.equals(",")) {
+ if (parseExpect.findExpectByLabel("orderOperator") != null)
+ return Optional.of("add another order");
+ else
+ return Optional.of("or match another value");
+ }
parseExpect = parseExpect.findExpectByLabel("operator");
if (parseExpect != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
index e06878180d..9746e45c25 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildMetricQueryBehavior.java
@@ -122,7 +122,7 @@ public class BuildMetricQueryBehavior extends ANTLRAssistBehavior {
@Override
protected Optional<String> describe(ParseExpect parseExpect, String suggestedLiteral) {
if (suggestedLiteral.equals(","))
- return Optional.of("add another value");
+ return Optional.of("or match another value");
parseExpect = parseExpect.findExpectByLabel("operator");
if (parseExpect != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
index 0e7007c2f1..b9ecf620e8 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/BuildQueryBehavior.java
@@ -130,11 +130,6 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
return SuggestionUtils.suggestJobs(project, matchWith);
else
return null;
- case Build.NAME_STATUS:
- List<String> candidates = new ArrayList<>();
- for (Build.Status status : Build.Status.values())
- candidates.add(status.toString());
- return SuggestionUtils.suggest(candidates, matchWith);
case Build.NAME_NUMBER:
return SuggestionUtils.suggestBuilds(project, matchWith, InputAssistBehavior.MAX_SUGGESTIONS);
case Build.NAME_VERSION:
@@ -210,7 +205,10 @@ public class BuildQueryBehavior extends ANTLRAssistBehavior {
}
if (suggestedLiteral.equals(",")) {
- return Optional.of("add another value");
+ if (parseExpect.findExpectByLabel("orderOperator") != null)
+ return Optional.of("add another order");
+ else
+ return Optional.of("or match another value");
} else if (suggestedLiteral.equals("#")) {
if (getProject() != null)
return Optional.of("find build by number");
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
index 483f4160e3..5a6f250fe3 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CodeCommentQueryBehavior.java
@@ -132,7 +132,10 @@ public class CodeCommentQueryBehavior extends ANTLRAssistBehavior {
|| !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(CreatedByMe)) || suggestedLiteral.equals(getRuleName(RepliedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)))) {
return null;
} else if (suggestedLiteral.equals(",")) {
- return Optional.of("add another value");
+ if (parseExpect.findExpectByLabel("orderOperator") != null)
+ return Optional.of("add another order");
+ else
+ return Optional.of("or match another value");
}
parseExpect = parseExpect.findExpectByLabel("operator");
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
index efc9a98cd2..bf61002ba6 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/CommitQueryBehavior.java
@@ -75,8 +75,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
case CommitQueryParser.AUTHOR:
case CommitQueryParser.COMMITTER:
Map<String, LinearRange> suggestedInputs = new LinkedHashMap<>();
- CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
- List<NameAndEmail> users = commitInfoManager.getUsers(project.getId());
+ List<NameAndEmail> users = getCommitInfoManager().getUsers(project.getId());
for (NameAndEmail user: users) {
String content;
if (StringUtils.isNotBlank(user.getEmailAddress()))
@@ -101,7 +100,7 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
suggestions = SuggestionUtils.suggest(candidates, matchWith);
return !suggestions.isEmpty()? suggestions: null;
case CommitQueryParser.PATH:
- return SuggestionUtils.suggestBlobs(projectModel.getObject(), matchWith);
+ return SuggestionUtils.suggestPathsByStringPattern(getCommitInfoManager().getFiles(projectModel.getObject().getId()), matchWith, false);
default:
return null;
}
@@ -132,6 +131,10 @@ public class CommitQueryBehavior extends ANTLRAssistBehavior {
}
return null;
}
+
+ private CommitInfoManager getCommitInfoManager() {
+ return OneDev.getInstance(CommitInfoManager.class);
+ }
@Override
protected List<String> getHints(TerminalExpect terminalExpect) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
index 46275cea45..f78140eb66 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/IssueQueryBehavior.java
@@ -368,7 +368,10 @@ public class IssueQueryBehavior extends ANTLRAssistBehavior {
|| !option.withCurrentIssueCriteria() && suggestedLiteral.equals(getRuleName(CurrentIssue))) {
return null;
} else if (suggestedLiteral.equals(",")) {
- return Optional.of("add another value");
+ if (parseExpect.findExpectByLabel("orderOperator") != null)
+ return Optional.of("add another order");
+ else
+ return Optional.of("or match another value");
} else if (suggestedLiteral.equals("#")) {
if (getProject() != null)
return Optional.of("find issue by number");
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
index 6a20a7eb03..bc5370a51d 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/JobMatchBehavior.java
@@ -98,7 +98,7 @@ public class JobMatchBehavior extends ANTLRAssistBehavior {
if (suggestedLiteral.equals(getLexerRuleName(ruleNames, OnBranch)))
return Optional.of("branch the build commit is merged into");
else if (suggestedLiteral.equals(","))
- return Optional.of("add another value");
+ return Optional.of("or match another value");
parseExpect = parseExpect.findExpectByLabel("operator");
if (parseExpect != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
index fd2ea7023c..f3430afb3b 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PackQueryBehavior.java
@@ -169,8 +169,12 @@ public class PackQueryBehavior extends ANTLRAssistBehavior {
return null;
if (!withCurrentUserCriteria && suggestedLiteral.equals(PackQuery.getRuleName(PackQueryLexer.PublishedByMe)))
return null;
- if (suggestedLiteral.equals(","))
- return Optional.of("add another value");
+ if (suggestedLiteral.equals(",")) {
+ if (parseExpect.findExpectByLabel("orderOperator") != null)
+ return Optional.of("add another order");
+ else
+ return Optional.of("or match another value");
+ }
parseExpect = parseExpect.findExpectByLabel("operator");
if (parseExpect != null) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
index bacf08bdef..933e139ba6 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/ProjectQueryBehavior.java
@@ -161,7 +161,10 @@ public class ProjectQueryBehavior extends ANTLRAssistBehavior {
&& (suggestedLiteral.equals(getRuleName(WithoutEnoughReplicas)) || suggestedLiteral.equals(getRuleName(HasOutdatedReplicas)))) {
return null;
} else if (suggestedLiteral.equals(",")) {
- return Optional.of("add another value");
+ if (parseExpect.findExpectByLabel("orderOperator") != null)
+ return Optional.of("add another order");
+ else
+ return Optional.of("or match another value");
}
if (childQuery) {
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
index 0200243ce2..d16c6d108b 100644
--- a/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
+++ b/server-core/src/main/java/io/onedev/server/web/behavior/PullRequestQueryBehavior.java
@@ -117,12 +117,6 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
case PullRequest.NAME_CLOSE_DATE:
List<InputSuggestion> suggestions = SuggestionUtils.suggest(DateUtils.RELAX_DATE_EXAMPLES, matchWith);
return !suggestions.isEmpty() ? suggestions : null;
- case PullRequest.NAME_STATUS: {
- List<String> candidates = new ArrayList<>();
- for (PullRequest.Status status : PullRequest.Status.values())
- candidates.add(status.toString());
- return SuggestionUtils.suggest(candidates, matchWith);
- }
case PullRequest.NAME_TARGET_PROJECT:
case PullRequest.NAME_SOURCE_PROJECT:
if (!matchWith.contains("*"))
@@ -197,7 +191,10 @@ public class PullRequestQueryBehavior extends ANTLRAssistBehavior {
|| !withCurrentUserCriteria && (suggestedLiteral.equals(getRuleName(SubmittedByMe)) || suggestedLiteral.equals(getRuleName(WatchedByMe)) || suggestedLiteral.equals(getRuleName(IgnoredByMe)) || suggestedLiteral.equals(getRuleName(NeedMyAction)) || suggestedLiteral.equals(getRuleName(CommentedByMe)) || suggestedLiteral.equals(getRuleName(MentionedMe)) || suggestedLiteral.equals(getRuleName(ToBeReviewedByMe)) || suggestedLiteral.equals(getRuleName(RequestedForChangesByMe)) || suggestedLiteral.equals(getRuleName(ApprovedByMe)) || suggestedLiteral.equals(getRuleName(AssignedToMe)) || suggestedLiteral.equals(getRuleName(ToBeChangedByMe)) || suggestedLiteral.equals(getRuleName(ToBeMergedByMe)))) {
return null;
} else if (suggestedLiteral.equals(",")) {
- return Optional.of("add another value");
+ if (parseExpect.findExpectByLabel("orderOperator") != null)
+ return Optional.of("add another order");
+ else
+ return Optional.of("or match another value");
} else if (suggestedLiteral.equals("#")) {
if (getProject() != null)
return Optional.of("find pull request by number");
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.html
new file mode 100644
index 0000000000..16f0583571
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.html
@@ -0,0 +1,36 @@
+<wicket:extend>
+ <div class="form-group">
+ <label class="control-label">Status</label>
+ <input wicket:id="status" type="hidden" class="form-control">
+ </div>
+ <wicket:enclosure>
+ <div class="form-group">
+ <label class="control-label">Job</label>
+ <input wicket:id="job" type="hidden" class="form-control">
+ </div>
+ </wicket:enclosure>
+ <div class="form-group">
+ <label class="control-label">Submitted By</label>
+ <input wicket:id="submittedBy" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Label</label>
+ <input wicket:id="label" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Ran On Agent</label>
+ <input wicket:id="ranAgent" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Submitted After</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="submittedAfter" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Submitted Before</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="submittedBefore" type="text" class="form-control">
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
new file mode 100644
index 0000000000..445750815d
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildFilterPanel.java
@@ -0,0 +1,396 @@
+package io.onedev.server.web.component.build.list;
+
+import static io.onedev.server.search.entity.build.BuildQueryLexer.IsSince;
+import static io.onedev.server.search.entity.build.BuildQueryLexer.IsUntil;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.build.BuildQueryLexer;
+import io.onedev.server.search.entity.build.CancelledCriteria;
+import io.onedev.server.search.entity.build.FailedCriteria;
+import io.onedev.server.search.entity.build.JobCriteria;
+import io.onedev.server.search.entity.build.LabelCriteria;
+import io.onedev.server.search.entity.build.PendingCriteria;
+import io.onedev.server.search.entity.build.RanOnCriteria;
+import io.onedev.server.search.entity.build.RunningCriteria;
+import io.onedev.server.search.entity.build.StatusCriteria;
+import io.onedev.server.search.entity.build.SubmitDateCriteria;
+import io.onedev.server.search.entity.build.SubmittedByCriteria;
+import io.onedev.server.search.entity.build.SubmittedByUserCriteria;
+import io.onedev.server.search.entity.build.SuccessfulCriteria;
+import io.onedev.server.search.entity.build.TimedOutCriteria;
+import io.onedev.server.search.entity.build.WaitingCriteria;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.filteredit.FilterEditPanel;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.user.choice.UserMultiChoice;
+
+abstract class BuildFilterPanel extends FilterEditPanel<Build> {
+
+ public BuildFilterPanel(String id, IModel<EntityQuery<Build>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var statusChoice = new StringMultiChoice("status", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), StatusCriteria.class, null);
+ return criterias.stream().map(it->it.getStatus().name()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = new ArrayList<Criteria<Build>>();
+ for (String status: object) {
+ if (status.equals(Build.Status.SUCCESSFUL.name())) {
+ criterias.add(new SuccessfulCriteria());
+ } else if (status.equals(Build.Status.FAILED.name())) {
+ criterias.add(new FailedCriteria());
+ } else if (status.equals(Build.Status.TIMED_OUT.name())) {
+ criterias.add(new TimedOutCriteria());
+ } else if (status.equals(Build.Status.CANCELLED.name())) {
+ criterias.add(new CancelledCriteria());
+ } else if (status.equals(Build.Status.RUNNING.name())) {
+ criterias.add(new RunningCriteria());
+ } else if (status.equals(Build.Status.PENDING.name())) {
+ criterias.add(new PendingCriteria());
+ } else if (status.equals(Build.Status.WAITING.name())) {
+ criterias.add(new WaitingCriteria());
+ }
+ }
+ Criteria<Build> rootCriteria = Criteria.orCriterias(criterias);
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), StatusCriteria.class, rootCriteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ for (Build.Status status: Build.Status.values()) {
+ map.put(status.name(), status.name());
+ }
+ return map;
+ }
+ }, false);
+ statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(statusChoice);
+
+ var jobChoice = new StringMultiChoice("job", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), JobCriteria.class, null);
+ return criterias.stream().map(it->it.getJobName()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new JobCriteria(it, BuildQueryLexer.Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), JobCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ for (String jobName: getBuildManager().getAccessibleJobNames(getProject())) {
+ map.put(jobName, jobName);
+ }
+ return map;
+ }
+ }, false) {
+
+ @Override
+ protected void onConfigure() {
+ super.onConfigure();
+ setVisible(getProject() != null);
+ }
+ };
+
+ jobChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(jobChoice);
+
+ var ranAgentChoice = new StringMultiChoice("ranAgent", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), RanOnCriteria.class, null);
+ return criterias.stream().map(it->it.getValue()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new RanOnCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), RanOnCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ for (Agent agent: getAgentManager().query()) {
+ map.put(agent.getName(), agent.getName());
+ }
+ return map;
+ }
+ }, false);
+
+ ranAgentChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(ranAgentChoice);
+
+ var submittedByChoice = new UserMultiChoice("submittedBy", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), SubmittedByCriteria.class, null);
+ return criterias.stream().map(it->it.getUser()).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it->new SubmittedByUserCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), SubmittedByUserCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return getUserManager().query();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+ };
+ submittedByChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(submittedByChoice);
+
+ var labelChoice = new StringMultiChoice("label", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LabelCriteria.class, null);
+ return criterias.stream()
+ .map(it->it.getLabelSpec().getName())
+ .collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new LabelCriteria(getLabelSpecManager().find(it), BuildQueryLexer.Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LabelCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());
+ Collections.sort(names);
+ var map = new LinkedHashMap<String, String>();
+ for (String name: names) {
+ map.put(name, name);
+ }
+ return map;
+ }
+
+ }, false);
+ labelChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(labelChoice);
+
+ var submittedAfterPicker = new DatePicker("submittedAfter", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<SubmitDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsSince;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), SubmitDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new SubmitDateCriteria(DateUtils.formatDate(object), IsSince) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), SubmitDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ submittedAfterPicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(submittedAfterPicker);
+
+ var submittedBeforePicker = new DatePicker("submittedBefore", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<SubmitDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsUntil;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), SubmitDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new SubmitDateCriteria(DateUtils.formatDate(object), IsUntil) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), SubmitDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ submittedBeforePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(submittedBeforePicker);
+ }
+
+ @Nullable
+ protected abstract Project getProject();
+
+ private BuildManager getBuildManager() {
+ return OneDev.getInstance(BuildManager.class);
+ }
+
+ private LabelSpecManager getLabelSpecManager() {
+ return OneDev.getInstance(LabelSpecManager.class);
+ }
+
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
+ private AgentManager getAgentManager() {
+ return OneDev.getInstance(AgentManager.class);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
index 40af9d3564..48410f2e95 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html
@@ -25,6 +25,9 @@
<a wicket:id="listParams" class="list-params text-gray d-inline-block mr-4 mb-2 d-none d-xl-inline text-nowrap">
<wicket:svg href="select" class="icon"></wicket:svg> Display Params
</a>
+ <a wicket:id="filter" class="filter text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filter
+ </a>
<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
index f122d5204d..68f03f6d1d 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.java
@@ -1,6 +1,54 @@
package io.onedev.server.web.component.build.list;
+import static io.onedev.server.model.Build.SORT_FIELDS;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+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.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+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.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+import org.apache.wicket.markup.ComponentTag;
+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.form.TextField;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.OddEvenItem;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.FileMode;
+
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
@@ -14,6 +62,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.build.BuildQuery;
@@ -44,11 +93,11 @@ import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import io.onedev.server.web.component.orderedit.SortEditPanel;
import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.revision.RevisionSelector;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.stringchoice.StringMultiChoice;
import io.onedev.server.web.page.builds.BuildListPage;
import io.onedev.server.web.page.project.blob.ProjectBlobPage;
@@ -57,48 +106,8 @@ import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardP
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-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.event.Broadcast;
-import org.apache.wicket.event.IEvent;
-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.util.SortableDataProvider;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-import org.apache.wicket.markup.ComponentTag;
-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.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.OddEvenItem;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.FileMode;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import static io.onedev.server.model.Build.SORT_FIELDS;
+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
public abstract class BuildListPanel extends Panel {
@@ -801,6 +810,37 @@ public abstract class BuildListPanel extends Panel {
});
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new BuildFilterPanel(id, new IModel<EntityQuery<Build>>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public EntityQuery<Build> getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new BuildQuery();
+ }
+ @Override
+ public void setObject(EntityQuery<Build> object) {
+ BuildListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject((BuildQuery) object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ }) {
+
+ @Override
+ protected Project getProject() {
+ return BuildListPanel.this.getProject();
+ }
+
+ };
+ }
+ });
+
add(new DropdownLink("orderBy") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.html
new file mode 100644
index 0000000000..b0cac75e1a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.html
@@ -0,0 +1,22 @@
+<wicket:extend>
+ <div class="form-group">
+ <label class="control-label">Status</label>
+ <input wicket:id="status" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Created By</label>
+ <input wicket:id="createdBy" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="activeSince" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Not Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="notActiveSince" type="text" class="form-control">
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
new file mode 100644
index 0000000000..b6ffaa77ef
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentFilterPanel.java
@@ -0,0 +1,219 @@
+package io.onedev.server.web.component.codecomment;
+
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.IsSince;
+import static io.onedev.server.search.entity.codecomment.CodeCommentQueryLexer.IsUntil;
+import static java.util.stream.Collectors.toList;
+
+import java.util.Collection;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.codecomment.CreatedByCriteria;
+import io.onedev.server.search.entity.codecomment.CreatedByUserCriteria;
+import io.onedev.server.search.entity.codecomment.LastActivityDateCriteria;
+import io.onedev.server.search.entity.codecomment.ResolvedCriteria;
+import io.onedev.server.search.entity.codecomment.StatusCriteria;
+import io.onedev.server.search.entity.codecomment.UnresolvedCriteria;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.filteredit.FilterEditPanel;
+import io.onedev.server.web.component.stringchoice.StringSingleChoice;
+import io.onedev.server.web.component.user.choice.UserMultiChoice;
+
+class CodeCommentFilterPanel extends FilterEditPanel<CodeComment> {
+
+ public CodeCommentFilterPanel(String id, IModel<EntityQuery<CodeComment>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var statusChoice = new StringSingleChoice("status", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), StatusCriteria.class, null);
+ if (criterias.size() == 0)
+ return null;
+ else
+ return criterias.get(0) instanceof UnresolvedCriteria ? "Unresolved" : "Resolved";
+ }
+
+ @Override
+ public void setObject(String object) {
+ Criteria<CodeComment> rootCriteria;
+ if (object == null)
+ rootCriteria = null;
+ else if (object.equals("Unresolved"))
+ rootCriteria = new UnresolvedCriteria();
+ else
+ rootCriteria = new ResolvedCriteria();
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), StatusCriteria.class, rootCriteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ map.put("Unresolved", "Unresolved");
+ map.put("Resolved", "Resolved");
+ return map;
+ }
+ }, false);
+ statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(statusChoice);
+
+ var createdByChoice = new UserMultiChoice("createdBy", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), CreatedByCriteria.class, null);
+ return criterias.stream().map(it->it.getUser()).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it->new CreatedByUserCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), CreatedByUserCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return getUserManager().query();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+ };
+ createdByChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(createdByChoice);
+
+ var activeSincePicker = new DatePicker("activeSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsSince;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(object, DateUtils.formatDate(object), IsSince) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ activeSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(activeSincePicker);
+
+ var notActiveSincePicker = new DatePicker("notActiveSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsUntil;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(object, DateUtils.formatDate(object), IsUntil) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ notActiveSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(notActiveSincePicker);
+ }
+
+ private static UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
index 9ac8b55d8b..83e28110a8 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.html
@@ -19,12 +19,12 @@
<a wicket:id="operations" class="text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="ellipsis-circle" class="icon rotate-180"></wicket:svg> Operations
</a>
+ <a wicket:id="filter" class="filter text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filter
+ </a>
<a wicket:id="orderBy" class="order-by text-gray d-inline-block mb-2 mr-4">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
- <a wicket:id="unresolved" class="order-by text-gray d-inline-block mb-2 mr-4">
- <wicket:svg href="focus" class="icon"></wicket:svg> Unresolved
- </a>
<span wicket:id="count" class="float-right text-gray"></span>
</div>
<div wicket:id="body" class="body">
diff --git a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
index 2684d979d4..541ca871b4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/codecomment/CodeCommentListPanel.java
@@ -1,17 +1,69 @@
package io.onedev.server.web.component.codecomment;
+import static io.onedev.server.model.CodeComment.SORT_FIELDS;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+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.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+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.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.form.TextField;
+import org.apache.wicket.markup.html.link.ExternalLink;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.CodeCommentManager;
import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
-import io.onedev.server.model.*;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.PullRequestAssignment;
+import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.LastActivity;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.codecomment.CodeCommentQuery;
import io.onedev.server.search.entity.codecomment.FuzzyCriteria;
-import io.onedev.server.search.entity.codecomment.UnresolvedCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Provider;
@@ -28,54 +80,16 @@ import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import io.onedev.server.web.component.orderedit.SortEditPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
-import io.onedev.server.web.page.project.pullrequests.detail.codecomments.PullRequestCodeCommentsPage;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.xodus.VisitInfoManager;
-import org.apache.commons.lang3.StringUtils;
-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.event.Broadcast;
-import org.apache.wicket.event.IEvent;
-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.util.SortableDataProvider;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-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.form.TextField;
-import org.apache.wicket.markup.html.link.ExternalLink;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.stream.Collectors;
-
-import static io.onedev.server.model.CodeComment.SORT_FIELDS;
public abstract class CodeCommentListPanel extends Panel {
@@ -610,6 +624,30 @@ public abstract class CodeCommentListPanel extends Panel {
});
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new CodeCommentFilterPanel(id, new IModel<EntityQuery<CodeComment>>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public EntityQuery<CodeComment> getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new CodeCommentQuery();
+ }
+ @Override
+ public void setObject(EntityQuery<CodeComment> object) {
+ CodeCommentListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject((CodeCommentQuery) object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ });
+ }
+ });
+
add(new DropdownLink("orderBy") {
@Override
@@ -653,21 +691,7 @@ public abstract class CodeCommentListPanel extends Panel {
}
});
-
- add(new AjaxLink<Void>("unresolved") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- CodeCommentListPanel.this.getFeedbackMessages().clear();
- var criteria = new UnresolvedCriteria();
- queryModel.setObject(new CodeCommentQuery(criteria));
- queryStringModel.setObject(criteria.toString());
- target.add(queryInput);
- doQuery(target);
- }
-
- }.setVisible(getPage() instanceof PullRequestCodeCommentsPage));
-
+
queryInput = new TextField<>("input", queryStringModel);
queryInput.add(new CodeCommentQueryBehavior(new AbstractReadOnlyModel<Project>() {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.html
new file mode 100644
index 0000000000..af2dbf9a2c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.html
@@ -0,0 +1,44 @@
+<wicket:panel>
+ <div class="commit-filter-edit">
+ <div class="mb-3 font-size-sm text-muted">
+ <wicket:svg href="bulb" class="icon"/>
+ Below are some common criterias. Type in search box above to view the complete list and available combinations.
+ </div>
+ <div class="form-group">
+ <label class="control-label">Branch</label>
+ <input wicket:id="branch" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Tag</label>
+ <input wicket:id="tag" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Build</label>
+ <input wicket:id="build" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Touched File</label>
+ <input wicket:id="file" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Authored By</label>
+ <input wicket:id="authoredBy" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Committed By</label>
+ <input wicket:id="committedBy" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Committed After</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="committedAfter" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Committed Before</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="committedBefore" type="text" class="form-control">
+ </div>
+ </div>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java
new file mode 100644
index 0000000000..b9951fe76c
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitFilterPanel.java
@@ -0,0 +1,434 @@
+package io.onedev.server.web.component.commit.list;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.commons.utils.StringUtils;
+import io.onedev.server.OneDev;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.Project;
+import io.onedev.server.search.commit.AfterCriteria;
+import io.onedev.server.search.commit.AuthorCriteria;
+import io.onedev.server.search.commit.BeforeCriteria;
+import io.onedev.server.search.commit.CommitQuery;
+import io.onedev.server.search.commit.CommitterCriteria;
+import io.onedev.server.search.commit.PathCriteria;
+import io.onedev.server.search.commit.Revision;
+import io.onedev.server.search.commit.RevisionCriteria;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.web.component.build.choice.BuildChoiceProvider;
+import io.onedev.server.web.component.build.choice.BuildSingleChoice;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.stringchoice.StringSingleChoice;
+import io.onedev.server.xodus.CommitInfoManager;
+
+abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
+
+ public CommitFilterPanel(String id, IModel<CommitQuery> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ addBranchOrTagChoice("branch", true);
+ addBranchOrTagChoice("tag", false);
+
+ var buildChoice = new BuildSingleChoice("build", new IModel<Build>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Build getObject() {
+ var query = getModelObject();
+ for (var criteria: query.getCriterias()) {
+ if (criteria instanceof RevisionCriteria) {
+ var revisionCriteria = (RevisionCriteria) criteria;
+ for (var revision: revisionCriteria.getRevisions()) {
+ if (!revision.isSince() && revision.getType() == Revision.Type.BUILD) {
+ return revision.getValueAsBuild(getProject());
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void setObject(Build object) {
+ var query = getModelObject();
+ var found = false;
+ for (var criteria: query.getCriterias()) {
+ if (criteria instanceof RevisionCriteria) {
+ var revisionCriteria = (RevisionCriteria) criteria;
+ for (var i=0; i<revisionCriteria.getRevisions().size(); i++) {
+ var revision = revisionCriteria.getRevisions().get(i);
+ if (!revision.isSince() && revision.getType() == Revision.Type.BUILD) {
+ if (object != null) {
+ revisionCriteria.getRevisions().set(i, new Revision(Revision.Type.BUILD, object.getReference().toString(getProject()), false));
+ } else {
+ revisionCriteria.getRevisions().remove(i);
+ }
+ found = true;
+ break;
+ }
+ }
+ if (revisionCriteria.getRevisions().isEmpty()) {
+ query.getCriterias().remove(revisionCriteria);
+ }
+ if (found)
+ break;
+ }
+ }
+ if (!found && object != null) {
+ query.getCriterias().add(new RevisionCriteria(List.of(new Revision(Revision.Type.BUILD, object.getReference().toString(getProject()), false))));
+ }
+ getModel().setObject(query);
+ }
+
+ }, new BuildChoiceProvider() {
+
+ @Override
+ protected Project getProject() {
+ return CommitFilterPanel.this.getProject();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+
+ };
+ buildChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(buildChoice);
+
+ var fileChoice = new StringSingleChoice("file", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ var query = getModelObject();
+ for (var criteria: query.getCriterias()) {
+ if (criteria instanceof PathCriteria) {
+ var pathCriteria = (PathCriteria) criteria;
+ if (!pathCriteria.getValues().isEmpty())
+ return pathCriteria.getValues().get(0);
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void setObject(String object) {
+ var query = getModelObject();
+ var criterias = query.getCriterias();
+ var found = false;
+ for (var i=0; i<criterias.size(); i++) {
+ var criteria = criterias.get(i);
+ if (criteria instanceof PathCriteria) {
+ if (object != null)
+ criterias.set(i, new PathCriteria(List.of(object)));
+ else
+ criterias.remove(i);
+ found = true;
+ break;
+ }
+ }
+ if (!found && object != null) {
+ query.getCriterias().add(new PathCriteria(List.of(object)));
+ }
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ for (var file: OneDev.getInstance(CommitInfoManager.class).getFiles(getProject().getId())) {
+ map.put(file, file);
+ }
+ return map;
+ }
+ }, true);
+ fileChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(fileChoice);
+
+ addAuthorOrCommitterChoice("authoredBy", true);
+ addAuthorOrCommitterChoice("committedBy", false);
+
+ addCommitBeforeOrAfterChoice("committedAfter", false);
+ addCommitBeforeOrAfterChoice("committedBefore", true);
+ }
+
+ private void addBranchOrTagChoice(String componentId, boolean isBranch) {
+ var type = isBranch? Revision.Type.BRANCH: Revision.Type.TAG;
+ var choice = new StringSingleChoice(componentId, new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ var query = getModelObject();
+ for (var criteria: query.getCriterias()) {
+ if (criteria instanceof RevisionCriteria) {
+ var revisionCriteria = (RevisionCriteria) criteria;
+ for (var revision: revisionCriteria.getRevisions()) {
+ if (!revision.isSince() && revision.getType() == type) {
+ return revision.getValue() != null? revision.getValue(): getProject().getDefaultBranch();
+ }
+ }
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void setObject(String object) {
+ var query = getModelObject();
+ var found = false;
+ for (var criteria: query.getCriterias()) {
+ if (criteria instanceof RevisionCriteria) {
+ var revisionCriteria = (RevisionCriteria) criteria;
+ for (var i=0; i<revisionCriteria.getRevisions().size(); i++) {
+ var revision = revisionCriteria.getRevisions().get(i);
+ if (!revision.isSince() && revision.getType() == type) {
+ if (object != null) {
+ revisionCriteria.getRevisions().set(i, new Revision(type, object, false));
+ } else {
+ revisionCriteria.getRevisions().remove(i);
+ }
+ found = true;
+ break;
+ }
+ }
+ if (revisionCriteria.getRevisions().isEmpty()) {
+ query.getCriterias().remove(revisionCriteria);
+ }
+ if (found)
+ break;
+ }
+ }
+ if (!found && object != null) {
+ query.getCriterias().add(new RevisionCriteria(List.of(new Revision(type, object, false))));
+ }
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ if (type == Revision.Type.BRANCH) {
+ for (var ref: getProject().getBranchRefs()) {
+ var branch = GitUtils.ref2branch(ref.getName());
+ map.put(branch, branch);
+ }
+ } else {
+ for (var ref: getProject().getTagRefs()) {
+ var tag = GitUtils.ref2tag(ref.getName());
+ map.put(tag, tag);
+ }
+ }
+ return map;
+ }
+ }, false);
+ choice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(choice);
+ }
+
+ private void addAuthorOrCommitterChoice(String componentId, boolean isAuthor) {
+ var choice = new StringMultiChoice(componentId, new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var query = getModelObject();
+ for (var criteria: query.getCriterias()) {
+ if (isAuthor && (criteria instanceof AuthorCriteria)) {
+ var authorCriteria = (AuthorCriteria) criteria;
+ return authorCriteria.getValues().stream().map(it->it!=null?it:SecurityUtils.getUser().getName()).collect(toList());
+ } else if (!isAuthor && criteria instanceof CommitterCriteria) {
+ var committerCriteria = (CommitterCriteria) criteria;
+ return committerCriteria.getValues().stream().map(it->it!=null?it:SecurityUtils.getUser().getName()).collect(toList());
+ }
+ }
+ return Collections.emptyList();
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var query = getModelObject();
+ var criterias = query.getCriterias();
+ var found = false;
+ for (var i=0; i<criterias.size(); i++) {
+ var criteria = criterias.get(i);
+ if (isAuthor && (criteria instanceof AuthorCriteria)) {
+ if (object != null)
+ criterias.set(i, new AuthorCriteria(new ArrayList<>(object)));
+ else
+ criterias.remove(i);
+ found = true;
+ break;
+ } else if (!isAuthor && criteria instanceof CommitterCriteria) {
+ if (object != null)
+ criterias.set(i, new CommitterCriteria(new ArrayList<>(object)));
+ else
+ criterias.remove(i);
+ found = true;
+ break;
+ }
+ }
+ if (!found && object != null) {
+ if (isAuthor)
+ query.getCriterias().add(new AuthorCriteria(new ArrayList<>(object)));
+ else
+ query.getCriterias().add(new CommitterCriteria(new ArrayList<>(object)));
+ }
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ Map<String, String> map = new LinkedHashMap<>();
+ var commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
+ var users = commitInfoManager.getUsers(getProject().getId());
+ for (var user: users) {
+ String content;
+ if (StringUtils.isNotBlank(user.getEmailAddress()))
+ content = user.getName() + " <" + user.getEmailAddress() + ">";
+ else
+ content = user.getName() + " <>";
+ content = content.trim();
+ map.put(content, content);
+ }
+ return map;
+ }
+ }, false);
+ choice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(choice);
+ }
+
+ private void addCommitBeforeOrAfterChoice(String componentId, boolean isBefore) {
+ var picker = new DatePicker(componentId, new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Date getObject() {
+ var query = getModelObject();
+ for (var criteria: query.getCriterias()) {
+ if (isBefore && (criteria instanceof BeforeCriteria)) {
+ return ((BeforeCriteria) criteria).getDate();
+ } else if (!isBefore && (criteria instanceof AfterCriteria)) {
+ return ((AfterCriteria) criteria).getDate();
+ }
+ }
+ return null;
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var query = getModelObject();
+ var criterias = query.getCriterias();
+ var found = false;
+ for (var i=0; i<criterias.size(); i++) {
+ var criteria = criterias.get(i);
+ if (isBefore && (criteria instanceof BeforeCriteria)) {
+ if (object != null)
+ criterias.set(i, new BeforeCriteria(List.of(DateUtils.formatDate(object))));
+ else
+ criterias.remove(i);
+ found = true;
+ break;
+ } else if (!isBefore && (criteria instanceof AfterCriteria)) {
+ if (object != null)
+ criterias.set(i, new AfterCriteria(List.of(DateUtils.formatDate(object))));
+ else
+ criterias.remove(i);
+ found = true;
+ break;
+ }
+ }
+ if (!found && object != null) {
+ if (isBefore)
+ query.getCriterias().add(new BeforeCriteria(List.of(DateUtils.formatDate(object))));
+ else
+ query.getCriterias().add(new AfterCriteria(List.of(DateUtils.formatDate(object))));
+ }
+ getModel().setObject(query);
+ }
+
+ }, false);
+ picker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(picker);
+ }
+
+ protected abstract Project getProject();
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
index 8da4a32d29..3ff0476257 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.html
@@ -16,6 +16,9 @@
<a wicket:id="saveQuery" class="save-query text-gray d-inline-block mb-2 mr-4">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
+ <a wicket:id="filter" class="filter text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filter
+ </a>
</div>
<div wicket:id="body" class="body resize-aware">
<div wicket:id="feedback"></div>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
index d9bf590c2c..bc94d649f2 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/CommitListPanel.java
@@ -1,39 +1,16 @@
package io.onedev.server.web.component.commit.list;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.google.common.collect.Lists;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.BuildManager;
-import io.onedev.server.git.BlobIdent;
-import io.onedev.server.git.GitUtils;
-import io.onedev.server.git.command.RevListOptions;
-import io.onedev.server.git.service.GitService;
-import io.onedev.server.git.service.RefFacade;
-import io.onedev.server.model.Project;
-import io.onedev.server.model.PullRequest;
-import io.onedev.server.search.commit.*;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.util.Constants;
-import io.onedev.server.util.ProjectAndRevision;
-import io.onedev.server.util.patternset.PatternSet;
-import io.onedev.server.web.behavior.CommitQueryBehavior;
-import io.onedev.server.web.behavior.RunTaskBehavior;
-import io.onedev.server.web.component.commit.message.CommitMessagePanel;
-import io.onedev.server.web.component.commit.status.CommitStatusLink;
-import io.onedev.server.web.component.commit.status.CommitStatusSupport;
-import io.onedev.server.web.component.contributorpanel.ContributorPanel;
-import io.onedev.server.web.component.gitsignature.SignatureStatusPanel;
-import io.onedev.server.web.component.link.ViewStateAwarePageLink;
-import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
-import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
-import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
-import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
-import io.onedev.server.web.page.project.blob.ProjectBlobPage;
-import io.onedev.server.web.page.project.commits.CommitDetailPage;
-import io.onedev.server.web.page.project.compare.RevisionComparePage;
-import io.onedev.server.web.util.QuerySaveSupport;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Stack;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -60,6 +37,7 @@ import org.apache.wicket.model.AbstractReadOnlyModel;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.eclipse.jgit.lib.FileMode;
import org.eclipse.jgit.lib.ObjectId;
@@ -70,9 +48,47 @@ import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.regex.Pattern;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.google.common.collect.Lists;
+
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.BuildManager;
+import io.onedev.server.git.BlobIdent;
+import io.onedev.server.git.GitUtils;
+import io.onedev.server.git.command.RevListOptions;
+import io.onedev.server.git.service.GitService;
+import io.onedev.server.git.service.RefFacade;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.search.commit.CommitCriteria;
+import io.onedev.server.search.commit.CommitQuery;
+import io.onedev.server.search.commit.FuzzyCriteria;
+import io.onedev.server.search.commit.MessageCriteria;
+import io.onedev.server.search.commit.PathCriteria;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.Constants;
+import io.onedev.server.util.ProjectAndRevision;
+import io.onedev.server.util.patternset.PatternSet;
+import io.onedev.server.web.behavior.CommitQueryBehavior;
+import io.onedev.server.web.behavior.RunTaskBehavior;
+import io.onedev.server.web.component.commit.message.CommitMessagePanel;
+import io.onedev.server.web.component.commit.status.CommitStatusLink;
+import io.onedev.server.web.component.commit.status.CommitStatusSupport;
+import io.onedev.server.web.component.contributorpanel.ContributorPanel;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.gitsignature.SignatureStatusPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.link.ViewStateAwarePageLink;
+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;
+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.user.contributoravatars.ContributorAvatars;
+import io.onedev.server.web.page.project.blob.ProjectBlobPage;
+import io.onedev.server.web.page.project.commits.CommitDetailPage;
+import io.onedev.server.web.page.project.compare.RevisionComparePage;
+import io.onedev.server.web.util.QuerySaveSupport;
public abstract class CommitListPanel extends Panel {
@@ -98,7 +114,7 @@ public abstract class CommitListPanel extends Panel {
error(e.getMessage());
return null;
} else {
- info("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ and author(robin)");
+ info("Performing fuzzy query. Enclosing search text with '~' to add more conditions, for instance: ~text to search~ author(robin)");
parsedQuery = new CommitQuery(Lists.newArrayList(new FuzzyCriteria(Lists.newArrayList(queryString))));
}
}
@@ -185,10 +201,6 @@ public abstract class CommitListPanel extends Panel {
};
- private GitService getGitService() {
- return OneDev.getInstance(GitService.class);
- }
-
private final IModel<Map<String, List<String>>> labelsModel = new LoadableDetachableModel<Map<String, List<String>>>() {
@Override
@@ -223,6 +235,8 @@ public abstract class CommitListPanel extends Panel {
private Component saveQueryLink;
+ private TextField<String> queryInput;
+
private boolean querySubmitted = true;
public CommitListPanel(String id, IModel<String> queryModel) {
@@ -326,7 +340,38 @@ public abstract class CommitListPanel extends Panel {
}.setOutputMarkupPlaceholderTag(true));
- TextField<String> queryInput = new TextField<String>("input", queryStringModel);
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new CommitFilterPanel(id, new IModel<CommitQuery>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public CommitQuery getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new CommitQuery(new ArrayList<>());
+ }
+ @Override
+ public void setObject(CommitQuery object) {
+ CommitListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject(object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ }) {
+
+ @Override
+ protected Project getProject() {
+ return CommitListPanel.this.getProject();
+ }
+
+ };
+ }
+ });
+
+ queryInput = new TextField<String>("input", queryStringModel);
queryInput.add(new CommitQueryBehavior(new AbstractReadOnlyModel<Project>() {
@Override
@@ -763,6 +808,10 @@ public abstract class CommitListPanel extends Panel {
response.render(OnDomReadyHeaderItem.forScript(script));
}
+ private GitService getGitService() {
+ return OneDev.getInstance(GitService.class);
+ }
+
/*
* We do not use "--date-order", "--topo-order" or "--author-order" option of git log to
* retrieve commits as they can be slow. However use the default log ordering has the
diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
index 7bcb4c77ea..ed22b39cd4 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/list/commit-list.css
@@ -171,3 +171,9 @@
.dark-mode .commit-list .no-commits {
filter: invert(80%);
}
+
+.commit-filter-edit {
+ min-width: 360px;
+ max-width: 400px;
+ padding: 1rem;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.java b/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.java
index 71ff492e5c..e82696033f 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePicker.java
@@ -3,25 +3,18 @@ package io.onedev.server.web.component.datepicker;
import java.util.Date;
import org.apache.wicket.extensions.markup.html.form.DateTextField;
-import org.apache.wicket.markup.head.CssHeaderItem;
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.model.IModel;
import io.onedev.server.util.Constants;
-import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
-import io.onedev.server.web.page.base.BasePage;
public class DatePicker extends DateTextField {
private static final long serialVersionUID = 1L;
private final boolean withTime;
-
- public DatePicker(String id, boolean withTime) {
- this(id, null, withTime);
- }
public DatePicker(String id, IModel<Date> model, boolean withTime) {
super(id, model, withTime?Constants.DATETIME_FORMAT: Constants.DATE_FORMAT);
@@ -31,14 +24,7 @@ public class DatePicker extends DateTextField {
@Override
public void renderHead(IHeaderResponse response) {
super.renderHead(response);
- response.render(JavaScriptHeaderItem.forReference(new DatePickerResourceReference()));
-
- BasePage page = (BasePage) getPage();
- if (page.isDarkMode()) {
- response.render(CssHeaderItem.forReference(
- new BaseDependentCssResourceReference(DatePickerResourceReference.class, "dark.css")));
- }
-
+ response.render(JavaScriptHeaderItem.forReference(new DatePickerResourceReference()));
String script = String.format("onedev.server.datePicker.onDomReady('%s', %b)",
getMarkupId(), withTime);
response.render(OnDomReadyHeaderItem.forScript(script));
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePickerResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePickerResourceReference.java
index 70eac055a6..4a015aee16 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePickerResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/datepicker/DatePickerResourceReference.java
@@ -2,12 +2,10 @@ package io.onedev.server.web.component.datepicker;
import java.util.List;
-import org.apache.wicket.markup.head.CssHeaderItem;
import org.apache.wicket.markup.head.HeaderItem;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
-import org.apache.wicket.request.resource.CssResourceReference;
-import org.apache.wicket.request.resource.JavaScriptResourceReference;
+import io.onedev.server.web.asset.flatpickr.FlatPickrResourceReference;
import io.onedev.server.web.page.base.BaseDependentResourceReference;
public class DatePickerResourceReference extends BaseDependentResourceReference {
@@ -20,18 +18,8 @@ public class DatePickerResourceReference extends BaseDependentResourceReference
@Override
public List<HeaderItem> getDependencies() {
- List<HeaderItem> dependencies = super.getDependencies();
-
- dependencies.add(JavaScriptHeaderItem.forReference(
- new JavaScriptResourceReference(DatePickerResourceReference.class, "flatpickr.min.js")
- ));
- dependencies.add(CssHeaderItem.forReference(
- new CssResourceReference(DatePickerResourceReference.class, "flatpickr.min.css")
- ));
- dependencies.add(JavaScriptHeaderItem.forReference(
- new JavaScriptResourceReference(DatePickerResourceReference.class, "flatpickr-locale.js")
- ));
-
+ List<HeaderItem> dependencies = super.getDependencies();
+ dependencies.add(JavaScriptHeaderItem.forReference(new FlatPickrResourceReference()));
return dependencies;
}
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/date-picker.css b/server-core/src/main/java/io/onedev/server/web/component/datepicker/date-picker.css
new file mode 100644
index 0000000000..b4294e3855
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/datepicker/date-picker.css
@@ -0,0 +1,35 @@
+.flatpickr-wrapper {
+ position: relative;
+ display: inline-block;
+}
+
+.flatpickr-clear {
+ position: absolute;
+ right: 10px;
+ top: 50%;
+ transform: translateY(-50%);
+ background: none;
+ border: none;
+ padding: 0;
+ margin: 0;
+ width: 20px;
+ height: 20px;
+ line-height: 20px;
+ font-size: 16px;
+ color: #999;
+ cursor: pointer;
+ z-index: 2;
+}
+
+.flatpickr-clear:hover {
+ color: #666;
+}
+
+/* Dark mode support */
+.dark-mode .flatpickr-clear {
+ color: #777;
+}
+
+.dark-mode .flatpickr-clear:hover {
+ color: #999;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/datepicker/date-picker.js b/server-core/src/main/java/io/onedev/server/web/component/datepicker/date-picker.js
index a901a64e20..21daced332 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/datepicker/date-picker.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/datepicker/date-picker.js
@@ -13,6 +13,9 @@ onedev.server.datePicker = {
enableTime: withTime,
allowInput: true
});
+ $input.on("clear", function() {
+ $input.trigger("change");
+ });
$input.keydown(function(e) {
/*
diff --git a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
index 3264304d7a..e6b2ceb0ed 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/diff/revision/RevisionDiffPanel.java
@@ -623,7 +623,7 @@ public abstract class RevisionDiffPanel extends Panel {
@Override
protected List<InputSuggestion> suggest(String matchWith) {
- return SuggestionUtils.suggestByPattern(listOfInvolvedPaths, matchWith);
+ return SuggestionUtils.suggestPathsByPathPattern(listOfInvolvedPaths, matchWith, true);
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditCssResourceReference.java
new file mode 100644
index 0000000000..4dde3e7ced
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditCssResourceReference.java
@@ -0,0 +1,11 @@
+package io.onedev.server.web.component.filteredit;
+
+import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
+
+public class FilterEditCssResourceReference extends BaseDependentCssResourceReference {
+
+ public FilterEditCssResourceReference() {
+ super(FilterEditCssResourceReference.class, "filter-edit.css");
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.html
new file mode 100644
index 0000000000..789074b403
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.html
@@ -0,0 +1,9 @@
+<wicket:panel>
+ <div class="filter-edit">
+ <div class="mb-3 font-size-sm text-muted">
+ <wicket:svg href="bulb" class="icon"/>
+ Below are some common criterias. Type in search box above to view the complete list and available combinations.
+ </div>
+ <wicket:child/>
+ </div>
+</wicket:panel>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
new file mode 100644
index 0000000000..308dc7bb06
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/filteredit/FilterEditPanel.java
@@ -0,0 +1,130 @@
+package io.onedev.server.web.component.filteredit;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Predicate;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.markup.head.CssHeaderItem;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.html.panel.GenericPanel;
+import org.apache.wicket.model.IModel;
+
+import io.onedev.server.model.AbstractEntity;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.util.Pair;
+import io.onedev.server.util.criteria.AndCriteria;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.util.criteria.OrCriteria;
+
+public abstract class FilterEditPanel<T extends AbstractEntity> extends GenericPanel<EntityQuery<T>> {
+
+ public FilterEditPanel(String id, IModel<EntityQuery<T>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ }
+
+ @SuppressWarnings("unchecked")
+ private <C extends Criteria<T>> boolean isCriteriaMatching(Criteria<T> criteria, Class<C> criteriaClass, @Nullable Predicate<C> predicate) {
+ return criteriaClass.isInstance(criteria) && (predicate == null || predicate.test((C) criteria));
+ }
+
+ private <C extends Criteria<T>> boolean isMemberAllMatching(OrCriteria<T> rootCriteria, Class<C> criteriaClass, @Nullable Predicate<C> predicate) {
+ for (var childCriteria: rootCriteria.getCriterias()) {
+ if (childCriteria instanceof OrCriteria) {
+ if (!isMemberAllMatching((OrCriteria<T>) childCriteria, criteriaClass, predicate))
+ return false;
+ } else if (!isCriteriaMatching(childCriteria, criteriaClass, predicate)) {
+ return false;
+ }
+ }
+ return true;
+ }
+
+ @SuppressWarnings("unchecked")
+ private <C extends Criteria<T>> List<C> getFlattenedMembers(OrCriteria<T> rootCriteria) {
+ var flattenedCriterias = new ArrayList<C>();
+ for (var childCriteria: rootCriteria.getCriterias()) {
+ if (childCriteria instanceof OrCriteria) {
+ flattenedCriterias.addAll(getFlattenedMembers((OrCriteria<T>) childCriteria));
+ } else {
+ flattenedCriterias.add((C) childCriteria);
+ }
+ }
+ return flattenedCriterias;
+ }
+
+ @Nullable
+ private <C extends Criteria<T>> Pair<AndCriteria<T>, Integer> getFirstMatchingMember(AndCriteria<T> rootCriteria, Class<C> criteriaClass, @Nullable Predicate<C> predicate) {
+ for (int i=0; i<rootCriteria.getCriterias().size(); i++) {
+ var childCriteria = rootCriteria.getCriterias().get(i);
+ if (isCriteriaMatching(childCriteria, criteriaClass, predicate)
+ || (childCriteria instanceof OrCriteria && isMemberAllMatching((OrCriteria<T>)childCriteria, criteriaClass, predicate))) {
+ return new Pair<>(rootCriteria, i);
+ } else if (childCriteria instanceof AndCriteria) {
+ var firstMatchingMember = getFirstMatchingMember((AndCriteria<T>) childCriteria, criteriaClass, predicate);
+ if (firstMatchingMember != null)
+ return firstMatchingMember;
+ }
+ }
+ return null;
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <C extends Criteria<T>> List<C> getMatchingCriterias(@Nullable Criteria<T> rootCriteria, Class<C> criteriaClass, @Nullable Predicate<C> predicate) {
+ if (rootCriteria == null) {
+ return new ArrayList<>();
+ } else if (isCriteriaMatching(rootCriteria, criteriaClass, predicate)) {
+ return (List<C>) List.of(rootCriteria);
+ } else if (rootCriteria instanceof AndCriteria) {
+ var firstMatchingMember = getFirstMatchingMember((AndCriteria<T>) rootCriteria, criteriaClass, predicate);
+ if (firstMatchingMember != null) {
+ var matchingCriteria = firstMatchingMember.getLeft().getCriterias().get(firstMatchingMember.getRight());
+ if (matchingCriteria instanceof OrCriteria)
+ return getFlattenedMembers((OrCriteria<T>) matchingCriteria);
+ else
+ return (List<C>) List.of(matchingCriteria);
+ } else {
+ return new ArrayList<>();
+ }
+ } else if (rootCriteria instanceof OrCriteria && isMemberAllMatching((OrCriteria<T>)rootCriteria, criteriaClass, predicate)) {
+ return getFlattenedMembers((OrCriteria<T>)rootCriteria);
+ } else {
+ return new ArrayList<>();
+ }
+ }
+
+ @SuppressWarnings("unchecked")
+ protected <C extends Criteria<T>> Criteria<T> setMatchingCriteria(@Nullable Criteria<T> rootCriteria,
+ Class<C> criteriaClass, @Nullable Criteria<T> criteria, @Nullable Predicate<C> predicate) {
+ if (rootCriteria == null
+ || isCriteriaMatching(rootCriteria, criteriaClass, predicate)
+ || (rootCriteria instanceof OrCriteria && isMemberAllMatching((OrCriteria<T>)rootCriteria, criteriaClass, predicate))) {
+ rootCriteria = criteria;
+ } else if (rootCriteria instanceof AndCriteria) {
+ var firstMatchingMember = getFirstMatchingMember((AndCriteria<T>) rootCriteria, criteriaClass, predicate);
+ if (firstMatchingMember != null) {
+ if (criteria != null)
+ firstMatchingMember.getLeft().getCriterias().set(firstMatchingMember.getRight(), criteria);
+ else
+ firstMatchingMember.getLeft().getCriterias().remove(firstMatchingMember.getRight().intValue());
+ } else if (criteria != null) {
+ ((AndCriteria<T>) rootCriteria).getCriterias().add(criteria);
+ }
+ } else {
+ rootCriteria = new AndCriteria<T>(rootCriteria, criteria);
+ }
+ return rootCriteria;
+ }
+
+ @Override
+ public void renderHead(IHeaderResponse response) {
+ super.renderHead(response);
+ response.render(CssHeaderItem.forReference(new FilterEditCssResourceReference()));
+ }
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/filteredit/filter-edit.css b/server-core/src/main/java/io/onedev/server/web/component/filteredit/filter-edit.css
new file mode 100644
index 0000000000..09d948aec7
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/filteredit/filter-edit.css
@@ -0,0 +1,5 @@
+.filter-edit {
+ min-width: 360px;
+ max-width: 400px;
+ padding: 1rem;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.html
new file mode 100644
index 0000000000..92713da103
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.html
@@ -0,0 +1,41 @@
+<wicket:extend>
+ <div class="form-group">
+ <label class="control-label">State</label>
+ <input wicket:id="state" type="hidden" class="form-control">
+ </div>
+ <div wicket:id="customFields" class="form-group"></div>
+ <div class="form-group">
+ <label class="control-label">Submitted By</label>
+ <input wicket:id="submittedBy" type="hidden" class="form-control">
+ </div>
+ <wicket:enclosure>
+ <div class="form-group">
+ <label class="control-label">Iteration</label>
+ <input wicket:id="iteration" type="hidden" class="form-control">
+ </div>
+ </wicket:enclosure>
+ <div class="form-group">
+ <label class="control-label">Confidential</label>
+ <span class="switch switch-sm switch-primary">
+ <label>
+ <input wicket:id="confidential" type="checkbox">
+ </label>
+ </span>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="activeSince" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Not Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="notActiveSince" type="text" class="form-control">
+ </div>
+ </div>
+ <wicket:fragment wicket:id="choiceFieldFrag">
+ <label wicket:id="label" class="control-label"></label>
+ <input wicket:id="choice" type="hidden" class="form-control">
+ </wicket:fragment>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
new file mode 100644
index 0000000000..e87e27c010
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueFilterPanel.java
@@ -0,0 +1,528 @@
+package io.onedev.server.web.component.issue.list;
+
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.Is;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsSince;
+import static io.onedev.server.search.entity.issue.IssueQueryLexer.IsUntil;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.GroupManager;
+import io.onedev.server.entitymanager.SettingManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Group;
+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.field.spec.BooleanField;
+import io.onedev.server.model.support.issue.field.spec.FieldSpec;
+import io.onedev.server.model.support.issue.field.spec.GroupChoiceField;
+import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
+import io.onedev.server.model.support.issue.field.spec.userchoicefield.UserChoiceField;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.issue.BooleanFieldCriteria;
+import io.onedev.server.search.entity.issue.ChoiceFieldCriteria;
+import io.onedev.server.search.entity.issue.ConfidentialCriteria;
+import io.onedev.server.search.entity.issue.FieldCriteria;
+import io.onedev.server.search.entity.issue.FieldOperatorCriteria;
+import io.onedev.server.search.entity.issue.IterationCriteria;
+import io.onedev.server.search.entity.issue.LastActivityDateCriteria;
+import io.onedev.server.search.entity.issue.StateCriteria;
+import io.onedev.server.search.entity.issue.SubmittedByCriteria;
+import io.onedev.server.search.entity.issue.SubmittedByUserCriteria;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.util.CollectionUtils;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.filteredit.FilterEditPanel;
+import io.onedev.server.web.component.groupchoice.GroupMultiChoice;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.stringchoice.StringSingleChoice;
+import io.onedev.server.web.component.user.choice.UserMultiChoice;
+
+abstract class IssueFilterPanel extends FilterEditPanel<Issue> {
+
+ public IssueFilterPanel(String id, IModel<EntityQuery<Issue>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var issueSetting = OneDev.getInstance(SettingManager.class).getIssueSetting();
+ var stateChoice = new StringMultiChoice("state", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), StateCriteria.class, null);
+ return criterias.stream().map(it->it.getValue()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it -> new StateCriteria(it, Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), StateCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ for (var stateSpec: issueSetting.getStateSpecs()) {
+ map.put(stateSpec.getName(), stateSpec.getName());
+ }
+ return map;
+ }
+
+ }, false);
+ stateChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(stateChoice);
+
+ var customFieldsView = new RepeatingView("customFields");
+ for (var field: issueSetting.getFieldSpecs()) {
+ if (field instanceof ChoiceField) {
+ var fragment = new Fragment(customFieldsView.newChildId(), "choiceFieldFrag", this);
+ fragment.add(new Label("label", field.getName()));
+
+ var choiceField = (ChoiceField) field;
+ var choiceValues = new ArrayList<>(choiceField.getChoiceProvider().getChoices(true).keySet());
+ var fieldChoice = new StringMultiChoice("choice", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), ChoiceFieldCriteria.class, getFieldPredicate(field));
+ return criterias.stream().map(it->it.getValue()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it -> new ChoiceFieldCriteria(field.getName(), it, choiceValues.indexOf(it), Is, field.isAllowMultiple())).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), ChoiceFieldCriteria.class, criteria, getFieldPredicate(field)));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ return choiceValues.stream().collect(Collectors.toMap(it -> it, it -> it));
+ }
+
+ }, false);
+ fieldChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ fragment.add(fieldChoice);
+ customFieldsView.add(fragment);
+ } else if (field instanceof UserChoiceField) {
+ var fragment = new Fragment(customFieldsView.newChildId(), "choiceFieldFrag", this);
+ fragment.add(new Label("label", field.getName()));
+
+ var userChoiceField = (UserChoiceField) field;
+ var fieldChoice = new UserMultiChoice("choice", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), FieldCriteria.class, getFieldPredicate(field));
+ var users = new ArrayList<User>();
+ for (var criteria: criterias) {
+ if (criteria instanceof ChoiceFieldCriteria) {
+ var user = getUserManager().findByName(((ChoiceFieldCriteria) criteria).getValue());
+ if (user != null)
+ users.add(user);
+ } else if (criteria instanceof FieldOperatorCriteria) {
+ var user = SecurityUtils.getUser();
+ if (user != null)
+ users.add(user);
+ }
+ }
+ return users;
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it -> new ChoiceFieldCriteria(field.getName(), it.getName(), -1, Is, field.isAllowMultiple())).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), FieldCriteria.class, criteria, getFieldPredicate(field)));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return userChoiceField.getChoiceProvider().getChoices(true);
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+
+ };
+ fieldChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ fragment.add(fieldChoice);
+ customFieldsView.add(fragment);
+ } else if (field instanceof GroupChoiceField) {
+ var fragment = new Fragment(customFieldsView.newChildId(), "choiceFieldFrag", this);
+ fragment.add(new Label("label", field.getName()));
+
+ var groupChoiceField = (GroupChoiceField) field;
+ var fieldChoice = new GroupMultiChoice("choice", new IModel<Collection<Group>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<Group> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), ChoiceFieldCriteria.class, getFieldPredicate(field));
+ return criterias.stream().map(it->it.getValue()).map(it->getGroupManager().find(it)).filter(it->it!=null).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<Group> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it -> new ChoiceFieldCriteria(field.getName(), it.getName(), -1, Is, field.isAllowMultiple())).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), ChoiceFieldCriteria.class, criteria, getFieldPredicate(field)));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Collection<Group>>() {
+
+ @Override
+ protected List<Group> load() {
+ return groupChoiceField.getChoiceProvider().getChoices(true);
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+ };
+ fieldChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ fragment.add(fieldChoice);
+ customFieldsView.add(fragment);
+ } else if (field instanceof BooleanField) {
+ var fragment = new Fragment(customFieldsView.newChildId(), "choiceFieldFrag", this);
+ fragment.add(new Label("label", field.getName()));
+
+ var fieldChoice = new StringSingleChoice("choice", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), BooleanFieldCriteria.class, getFieldPredicate(field));
+ if (criterias.isEmpty())
+ return null;
+ else
+ return String.valueOf(criterias.get(0).getValue());
+ }
+
+ @Override
+ public void setObject(String object) {
+ var criteria = object == null? null : new BooleanFieldCriteria(field.getName(), Boolean.valueOf(object), Is);
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), BooleanFieldCriteria.class, criteria, getFieldPredicate(field)));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ return CollectionUtils.newLinkedHashMap(
+ String.valueOf(true), String.valueOf(true),
+ String.valueOf(false), String.valueOf(false));
+ }
+
+ }, false);
+ fieldChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ fragment.add(fieldChoice);
+ customFieldsView.add(fragment);
+ }
+ }
+ add(customFieldsView);
+
+ var submittedByChoice = new UserMultiChoice("submittedBy", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), SubmittedByCriteria.class, null);
+ return criterias.stream().map(it->it.getUser()).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it -> new SubmittedByUserCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), SubmittedByUserCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return getUserManager().query();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+ };
+ submittedByChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(submittedByChoice);
+
+ if (getProject() != null) {
+ var iterationChoice = new StringMultiChoice("iteration", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), IterationCriteria.class, null);
+ return criterias.stream().map(it->it.getIterationName()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it -> new IterationCriteria(it, Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), IterationCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ return getProject().getHierarchyIterations().stream().collect(Collectors.toMap(it -> it.getName(), it -> it.getName()));
+ }
+
+ }, false);
+ iterationChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(iterationChoice);
+ } else {
+ add(new WebMarkupContainer("iteration").setVisible(false));
+ }
+
+ var confidentialCheck = new CheckBox("confidential", new IModel<Boolean>() {
+
+ @Override
+ public Boolean getObject() {
+ return !getMatchingCriterias(getModelObject().getCriteria(), ConfidentialCriteria.class, null).isEmpty();
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ var criteria = object? new ConfidentialCriteria() : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), ConfidentialCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ @Override
+ public void detach() {
+ }
+
+ });
+
+ confidentialCheck.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(confidentialCheck);
+
+ var activeSincePicker = new DatePicker("activeSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsSince;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(DateUtils.formatDate(object), IsSince) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ activeSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(activeSincePicker);
+
+ var notActiveSincePicker = new DatePicker("notActiveSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsUntil;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(DateUtils.formatDate(object), IsUntil) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ notActiveSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(notActiveSincePicker);
+ }
+
+ @Nullable
+ protected abstract Project getProject();
+
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
+ private GroupManager getGroupManager() {
+ return OneDev.getInstance(GroupManager.class);
+ }
+
+ private <T extends FieldCriteria> Predicate<T> getFieldPredicate(FieldSpec field) {
+ return it -> it.getFieldName().equals(field.getName());
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
index b22cbd3eb6..25b65fe4ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.html
@@ -28,6 +28,9 @@
<a wicket:id="import" class="import-issues text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="import" class="icon"></wicket:svg> Import
</a>
+ <a wicket:id="filter" class="filter text-gray d-inline-block mb-2 mr-4">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filters
+ </a>
<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
index eabc1af44a..dc34b3ab34 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/IssueListPanel.java
@@ -1,10 +1,75 @@
package io.onedev.server.web.component.issue.list;
+import static com.google.common.collect.Lists.newArrayList;
+import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
+import static io.onedev.server.search.entity.issue.IssueQuery.merge;
+import static java.util.Comparator.comparingInt;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.collections4.Predicate;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+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.core.request.handler.IPartialPageRequestHandler;
+import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+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.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.form.TextField;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
import com.google.common.collect.Sets;
+
import edu.emory.mathcs.backport.java.util.Collections;
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.*;
+import io.onedev.server.entitymanager.IssueLinkManager;
+import io.onedev.server.entitymanager.IssueManager;
+import io.onedev.server.entitymanager.IssueWatchManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.imports.IssueImporter;
import io.onedev.server.imports.IssueImporterContribution;
import io.onedev.server.model.Issue;
@@ -16,6 +81,7 @@ import io.onedev.server.model.support.issue.field.spec.DateField;
import io.onedev.server.model.support.issue.field.spec.FieldSpec;
import io.onedev.server.model.support.issue.field.spec.IntegerField;
import io.onedev.server.model.support.issue.field.spec.choicefield.ChoiceField;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.issue.FuzzyCriteria;
@@ -53,11 +119,11 @@ import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.ModalLink;
import io.onedev.server.web.component.modal.ModalPanel;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import io.onedev.server.web.component.orderedit.SortEditPanel;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.watchstatus.WatchStatusPanel;
@@ -65,56 +131,12 @@ import io.onedev.server.web.editable.BeanContext;
import io.onedev.server.web.page.project.issues.create.NewIssuePage;
import io.onedev.server.web.page.project.issues.imports.IssueImportPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
-import io.onedev.server.web.util.*;
+import io.onedev.server.web.util.Cursor;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
+import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.web.util.WicketUtils;
import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.xodus.VisitInfoManager;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.collections4.Predicate;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-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.core.request.handler.IPartialPageRequestHandler;
-import org.apache.wicket.event.Broadcast;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-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.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.list.ListItem;
-import org.apache.wicket.markup.html.list.ListView;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import static com.google.common.collect.Lists.newArrayList;
-import static io.onedev.server.search.entity.EntitySort.Direction.ASCENDING;
-import static io.onedev.server.search.entity.issue.IssueQuery.merge;
-import static java.util.Comparator.comparingInt;
-import static java.util.stream.Collectors.toList;
public abstract class IssueListPanel extends Panel {
@@ -274,6 +296,34 @@ public abstract class IssueListPanel extends Panel {
}.setOutputMarkupPlaceholderTag(true));
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new IssueFilterPanel(id, new IModel<EntityQuery<Issue>>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public EntityQuery<Issue> getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new IssueQuery();
+ }
+ @Override
+ public void setObject(EntityQuery<Issue> object) {
+ IssueListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject((IssueQuery) object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ }) {
+ @Override
+ protected Project getProject() {
+ return IssueListPanel.this.getProject();
+ }
+ };
+ }
+ });
add(new DropdownLink("orderBy") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html
new file mode 100644
index 0000000000..8ab262dc6a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.html
@@ -0,0 +1,30 @@
+<wicket:extend>
+ <div class="form-group">
+ <label class="control-label">Type</label>
+ <input wicket:id="type" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Label</label>
+ <input wicket:id="label" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Published After</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="publishedAfter" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Published Before</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="publishedBefore" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Published By Project</label>
+ <input wicket:id="publishedByProject" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Published By User</label>
+ <input wicket:id="publishedByUser" type="hidden" class="form-control">
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java
new file mode 100644
index 0000000000..ff587e98fe
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackFilterPanel.java
@@ -0,0 +1,321 @@
+package io.onedev.server.web.component.pack.list;
+
+import static io.onedev.server.search.entity.pack.PackQueryLexer.Is;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Pack;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.pack.PackSupport;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.pack.LabelCriteria;
+import io.onedev.server.search.entity.pack.PackQueryLexer;
+import io.onedev.server.search.entity.pack.PublishDateCriteria;
+import io.onedev.server.search.entity.pack.PublishedViaProjectCriteria;
+import io.onedev.server.search.entity.pack.PublishedByUserCriteria;
+import io.onedev.server.search.entity.pack.PublishedByCriteria;
+import io.onedev.server.search.entity.pack.TypeCriteria;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.filteredit.FilterEditPanel;
+import io.onedev.server.web.component.project.choice.ProjectMultiChoice;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.user.choice.UserMultiChoice;
+
+class PackFilterPanel extends FilterEditPanel<Pack> {
+
+ public PackFilterPanel(String id, IModel<EntityQuery<Pack>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var typeChoice = new StringMultiChoice("type", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), TypeCriteria.class, null);
+ return criterias.stream().map(it->it.getValue()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var rootCriteria = Criteria.orCriterias(object.stream().map(it->new TypeCriteria(it, Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), TypeCriteria.class, rootCriteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ List<PackSupport> packSupports = new ArrayList<>(OneDev.getExtensions(PackSupport.class));
+ packSupports.sort(Comparator.comparing(PackSupport::getOrder));
+ for (var packSupport: packSupports) {
+ map.put(packSupport.getPackType(), packSupport.getPackType());
+ }
+ return map;
+ }
+ }, false);
+ typeChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(typeChoice);
+
+ var publishedByProjectChoice = new ProjectMultiChoice("publishedByProject", new IModel<Collection<Project>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<Project> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), PublishedViaProjectCriteria.class, null);
+ return criterias.stream().map(it->getProjectManager().findByPath(it.getProjectPath())).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<Project> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new PublishedViaProjectCriteria(it.getPath())).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), PublishedViaProjectCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<Project>>() {
+
+ @Override
+ protected List<Project> load() {
+ return new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+ };
+
+ publishedByProjectChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(publishedByProjectChoice);
+
+ var publishedByUserChoice = new UserMultiChoice("publishedByUser", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), PublishedByCriteria.class, null);
+ return criterias.stream().map(it->it.getUser()).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it->new PublishedByUserCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), PublishedByUserCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return getUserManager().query();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+ };
+ publishedByUserChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(publishedByUserChoice);
+
+ var labelChoice = new StringMultiChoice("label", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LabelCriteria.class, null);
+ return criterias.stream()
+ .map(it->it.getLabelSpec().getName())
+ .collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new LabelCriteria(getLabelSpecManager().find(it), Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LabelCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());
+ Collections.sort(names);
+ var map = new LinkedHashMap<String, String>();
+ for (String name: names) {
+ map.put(name, name);
+ }
+ return map;
+ }
+
+ }, false);
+ labelChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(labelChoice);
+
+ var publishedAfterPicker = new DatePicker("publishedAfter", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<PublishDateCriteria> getPredicate() {
+ return t -> t.getOperator() == PackQueryLexer.IsSince;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), PublishDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new PublishDateCriteria(DateUtils.formatDate(object), PackQueryLexer.IsSince) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), PublishDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ publishedAfterPicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(publishedAfterPicker);
+
+ var publishedBeforePicker = new DatePicker("publishedBefore", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<PublishDateCriteria> getPredicate() {
+ return t -> t.getOperator() == PackQueryLexer.IsUntil;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), PublishDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new PublishDateCriteria(DateUtils.formatDate(object), PackQueryLexer.IsUntil) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), PublishDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ publishedBeforePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(publishedBeforePicker);
+ }
+
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
+
+ private LabelSpecManager getLabelSpecManager() {
+ return OneDev.getInstance(LabelSpecManager.class);
+ }
+
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
index 86dcd82314..f8a592584a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.html
@@ -21,6 +21,9 @@
<a wicket:id="operations" class="operations text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> Operations
</a>
+ <a wicket:id="filter" class="filter text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filter
+ </a>
<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
index 170cf67d8a..11b428e41c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/list/PackListPanel.java
@@ -1,11 +1,54 @@
package io.onedev.server.web.component.pack.list;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.StringUtils;
+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.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+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.feedback.FencedFeedbackPanel;
+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.form.TextField;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+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.cycle.RequestCycle;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PackManager;
import io.onedev.server.model.Pack;
import io.onedev.server.model.Project;
import io.onedev.server.pack.PackSupport;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.pack.FuzzyCriteria;
@@ -26,9 +69,9 @@ import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import io.onedev.server.web.component.orderedit.SortEditPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.svg.SpriteImage;
import io.onedev.server.web.component.tabbable.AjaxActionTab;
import io.onedev.server.web.component.tabbable.Tab;
@@ -37,42 +80,8 @@ import io.onedev.server.web.page.project.packs.ProjectPacksPage;
import io.onedev.server.web.page.project.packs.detail.PackDetailPage;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
-import org.apache.commons.io.FileUtils;
-import org.apache.commons.lang3.StringUtils;
-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.event.Broadcast;
-import org.apache.wicket.event.IEvent;
-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.feedback.FencedFeedbackPanel;
-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.form.TextField;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-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.cycle.RequestCycle;
-
-import javax.annotation.Nullable;
-import java.util.*;
+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
public abstract class PackListPanel extends Panel {
@@ -381,6 +390,30 @@ public abstract class PackListPanel extends Panel {
});
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new PackFilterPanel(id, new IModel<EntityQuery<Pack>>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public EntityQuery<Pack> getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new PackQuery();
+ }
+ @Override
+ public void setObject(EntityQuery<Pack> object) {
+ PackListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject((PackQuery) object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ });
+ }
+ });
+
add(new DropdownLink("orderBy") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
index 773e140965..20e33796e3 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pack/side/PackSidePanel.java
@@ -1,6 +1,27 @@
package io.onedev.server.web.component.pack.side;
-import com.google.common.collect.Lists;
+import static io.onedev.server.search.commit.Revision.Type.COMMIT;
+import static io.onedev.server.search.entity.issue.IssueQuery.merge;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
+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.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.panel.Panel;
+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 io.onedev.server.OneDev;
import io.onedev.server.entitymanager.PackLabelManager;
import io.onedev.server.entitymanager.PackManager;
@@ -29,26 +50,6 @@ import io.onedev.server.web.page.project.builds.detail.dashboard.BuildDashboardP
import io.onedev.server.web.page.project.commits.ProjectCommitsPage;
import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;
import io.onedev.server.web.util.editbean.LabelsBean;
-import org.apache.commons.io.FileUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
-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.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.panel.Panel;
-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 java.io.Serializable;
-import java.util.List;
-
-import static io.onedev.server.search.entity.issue.IssueQuery.merge;
public abstract class PackSidePanel extends Panel {
@@ -150,10 +151,10 @@ public abstract class PackSidePanel extends Panel {
add(new SelectPackToActChoice("changesSince", choiceProvider) {
@Override
protected void onSelect(AjaxRequestTarget target, Pack selection) {
- var revisionCriteria = new RevisionCriteria(Lists.newArrayList(
- new Revision(selection.getBuild().getCommitHash(), Revision.Scope.SINCE),
- new Revision(getPack().getBuild().getCommitHash(), Revision.Scope.UNTIL)));
- var commitQuery = new CommitQuery(Lists.newArrayList(revisionCriteria));
+ var revisionCriteria = new RevisionCriteria(List.of(
+ new Revision(COMMIT, selection.getBuild().getCommitHash(), true),
+ new Revision(COMMIT, getPack().getBuild().getCommitHash(), false)));
+ var commitQuery = new CommitQuery(List.of(revisionCriteria));
setResponsePage(ProjectCommitsPage.class, ProjectCommitsPage.paramsOf(getPack().getBuild().getProject(), commitQuery.toString(), null));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.html
new file mode 100644
index 0000000000..79d0d0efb0
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.html
@@ -0,0 +1,46 @@
+<wicket:extend>
+ <div class="form-group">
+ <label class="control-label">Root Projects</label>
+ <span class="switch switch-sm switch-primary">
+ <label>
+ <input wicket:id="roots" type="checkbox">
+ </label>
+ </span>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Leaf Projects</label>
+ <span class="switch switch-sm switch-primary">
+ <label>
+ <input wicket:id="leafs" type="checkbox">
+ </label>
+ </span>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Child Projects Of</label>
+ <input wicket:id="children" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Forks Of</label>
+ <input wicket:id="forks" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Ownered By</label>
+ <input wicket:id="ownedBy" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Label</label>
+ <input wicket:id="label" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="activeSince" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Not Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="notActiveSince" type="text" class="form-control">
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java
new file mode 100644
index 0000000000..980c23854a
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectFilterPanel.java
@@ -0,0 +1,384 @@
+package io.onedev.server.web.component.project.list;
+
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.Is;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.IsSince;
+import static io.onedev.server.search.entity.project.ProjectQueryLexer.IsUntil;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.ProjectManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.project.ChildrenOfCriteria;
+import io.onedev.server.search.entity.project.ForksOfCriteria;
+import io.onedev.server.search.entity.project.LabelCriteria;
+import io.onedev.server.search.entity.project.LastActivityDateCriteria;
+import io.onedev.server.search.entity.project.LeafsCriteria;
+import io.onedev.server.search.entity.project.OwnedByCriteria;
+import io.onedev.server.search.entity.project.OwnedByUserCriteria;
+import io.onedev.server.search.entity.project.RootsCriteria;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.security.permission.AccessProject;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.filteredit.FilterEditPanel;
+import io.onedev.server.web.component.project.choice.ProjectMultiChoice;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.user.choice.UserMultiChoice;
+
+class ProjectFilterPanel extends FilterEditPanel<Project> {
+
+ public ProjectFilterPanel(String id, IModel<EntityQuery<Project>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var rootsCheck = new CheckBox("roots", new IModel<Boolean>() {
+
+ @Override
+ public Boolean getObject() {
+ return !getMatchingCriterias(getModelObject().getCriteria(), RootsCriteria.class, null).isEmpty();
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ var criteria = object? new RootsCriteria() : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), RootsCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ @Override
+ public void detach() {
+ }
+
+ });
+ rootsCheck.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(rootsCheck);
+
+ var leafsCheck = new CheckBox("leafs", new IModel<Boolean>() {
+
+ @Override
+ public Boolean getObject() {
+ return !getMatchingCriterias(getModelObject().getCriteria(), LeafsCriteria.class, null).isEmpty();
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ var criteria = object? new LeafsCriteria() : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LeafsCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ @Override
+ public void detach() {
+ }
+
+ });
+ leafsCheck.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(leafsCheck);
+
+ var childrenChoice = new ProjectMultiChoice("children", new IModel<Collection<Project>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<Project> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), ChildrenOfCriteria.class, null);
+ return criterias.stream().map(it->getProjectManager().findByPath(it.getParentPath())).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<Project> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new ChildrenOfCriteria(it.getPath())).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), ChildrenOfCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<Project>>() {
+
+ @Override
+ protected List<Project> load() {
+ return new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ }
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+
+ };
+
+ childrenChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(childrenChoice);
+
+ var forksChoice = new ProjectMultiChoice("forks", new IModel<Collection<Project>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<Project> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), ForksOfCriteria.class, null);
+ return criterias.stream().map(it->getProjectManager().findByPath(it.getForkedFromPath())).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<Project> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new ForksOfCriteria(it.getPath())).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), ForksOfCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<Project>>() {
+
+ @Override
+ protected List<Project> load() {
+ return new ArrayList<>(SecurityUtils.getAuthorizedProjects(new AccessProject()));
+ }
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+
+ };
+
+ forksChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(forksChoice);
+
+ var ownedByChoice = new UserMultiChoice("ownedBy", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), OwnedByCriteria.class, null);
+ return criterias.stream().map(it->it.getUser()).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it->new OwnedByUserCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), OwnedByUserCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return getUserManager().query();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+
+ };
+ ownedByChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(ownedByChoice);
+
+ var labelChoice = new StringMultiChoice("label", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LabelCriteria.class, null);
+ return criterias.stream()
+ .map(it->it.getLabelSpec().getName())
+ .collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new LabelCriteria(getLabelSpecManager().find(it), Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LabelCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());
+ Collections.sort(names);
+ var map = new LinkedHashMap<String, String>();
+ for (String name: names) {
+ map.put(name, name);
+ }
+ return map;
+ }
+
+ }, false);
+ labelChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(labelChoice);
+
+ var activeSincePicker = new DatePicker("activeSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsSince;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(DateUtils.formatDate(object), IsSince) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ activeSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(activeSincePicker);
+
+ var notActiveSincePicker = new DatePicker("notActiveSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsUntil;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(DateUtils.formatDate(object), IsUntil) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ notActiveSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(notActiveSincePicker);
+ }
+
+ private LabelSpecManager getLabelSpecManager() {
+ return OneDev.getInstance(LabelSpecManager.class);
+ }
+
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
+ private ProjectManager getProjectManager() {
+ return OneDev.getInstance(ProjectManager.class);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
index 4f2ca966d3..eeb7f00a36 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.html
@@ -25,6 +25,9 @@
<a wicket:id="importProjects" class="import-projects d-inline-block mb-2 mr-4 text-gray">
<wicket:svg href="import" class="icon"></wicket:svg> Import
</a>
+ <a wicket:id="filter" class="filter text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filter
+ </a>
<a wicket:id="orderBy" class="order-by text-gray d-inline-block mb-2 mr-4">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
index 01c8d385a7..bcb5fdbd37 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/list/ProjectListPanel.java
@@ -62,6 +62,7 @@ import io.onedev.server.model.Build;
import io.onedev.server.model.Project;
import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.project.ChildrenOfCriteria;
@@ -87,7 +88,6 @@ import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import io.onedev.server.web.component.orderedit.SortEditPanel;
import io.onedev.server.web.component.project.ProjectAvatar;
import io.onedev.server.web.component.project.childrentree.ProjectChildrenTree;
import io.onedev.server.web.component.project.selector.ProjectSelector;
@@ -98,6 +98,7 @@ import io.onedev.server.web.component.project.stats.pack.PackStatsPanel;
import io.onedev.server.web.component.project.stats.pullrequest.PullRequestStatsPanel;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.page.base.BasePage;
import io.onedev.server.web.page.project.NewProjectPage;
import io.onedev.server.web.page.project.children.ProjectChildrenPage;
@@ -291,6 +292,30 @@ public class ProjectListPanel extends Panel {
}.setOutputMarkupPlaceholderTag(true));
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new ProjectFilterPanel(id, new IModel<EntityQuery<Project>>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public EntityQuery<Project> getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new ProjectQuery();
+ }
+ @Override
+ public void setObject(EntityQuery<Project> object) {
+ ProjectListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject((ProjectQuery) object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ });
+ }
+ });
+
add(new DropdownLink("orderBy") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.java
index 44a2732ee2..1f20c0c29c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/build/BuildStatsPanel.java
@@ -5,7 +5,6 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
-import io.onedev.server.search.entity.build.BuildQueryLexer;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.link.BookmarkablePageLink;
@@ -17,9 +16,18 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import io.onedev.server.model.Build;
import io.onedev.server.model.Build.Status;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.search.entity.build.CancelledCriteria;
+import io.onedev.server.search.entity.build.FailedCriteria;
+import io.onedev.server.search.entity.build.PendingCriteria;
+import io.onedev.server.search.entity.build.RunningCriteria;
+import io.onedev.server.search.entity.build.SuccessfulCriteria;
+import io.onedev.server.search.entity.build.TimedOutCriteria;
+import io.onedev.server.search.entity.build.WaitingCriteria;
+import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.page.project.builds.ProjectBuildsPage;
public class BuildStatsPanel extends Panel {
@@ -68,8 +76,33 @@ public class BuildStatsPanel extends Panel {
@Override
protected void populateItem(ListItem<Map.Entry<Status, Long>> item) {
Map.Entry<Status, Long> entry = item.getModelObject();
- BuildQuery query = new BuildQuery(
- new io.onedev.server.search.entity.build.StatusCriteria(entry.getKey(), BuildQueryLexer.Is));
+ Criteria<Build> criteria;
+ switch (entry.getKey()) {
+ case SUCCESSFUL:
+ criteria = new SuccessfulCriteria();
+ break;
+ case FAILED:
+ criteria = new FailedCriteria();
+ break;
+ case TIMED_OUT:
+ criteria = new TimedOutCriteria();
+ break;
+ case CANCELLED:
+ criteria = new CancelledCriteria();
+ break;
+ case RUNNING:
+ criteria = new RunningCriteria();
+ break;
+ case PENDING:
+ criteria = new PendingCriteria();
+ break;
+ case WAITING:
+ criteria = new WaitingCriteria();
+ break;
+ default:
+ throw new RuntimeException("Unknown build status: " + entry.getKey());
+ }
+ BuildQuery query = new BuildQuery(criteria);
PageParameters params = ProjectBuildsPage.paramsOf(getProject(), query.toString(), 0);
Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectBuildsPage.class, params);
String statusName = entry.getKey().toString();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java
index 98ff3cb2a1..a8a76d5c8e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/project/stats/pullrequest/PullRequestStatsPanel.java
@@ -16,9 +16,13 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
+import io.onedev.server.search.entity.pullrequest.DiscardedCriteria;
+import io.onedev.server.search.entity.pullrequest.MergedCriteria;
+import io.onedev.server.search.entity.pullrequest.OpenCriteria;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
-import io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer;
+import io.onedev.server.util.criteria.Criteria;
import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;
public class PullRequestStatsPanel extends Panel {
@@ -67,8 +71,15 @@ public class PullRequestStatsPanel extends Panel {
@Override
protected void populateItem(ListItem<Map.Entry<Status, Long>> item) {
Map.Entry<Status, Long> entry = item.getModelObject();
- PullRequestQuery query = new PullRequestQuery(
- new io.onedev.server.search.entity.pullrequest.StatusCriteria(entry.getKey(), PullRequestQueryLexer.Is));
+ Criteria<PullRequest> criteria;
+ if (entry.getKey() == Status.OPEN) {
+ criteria = new OpenCriteria();
+ } else if (entry.getKey() == Status.MERGED) {
+ criteria = new MergedCriteria();
+ } else {
+ criteria = new DiscardedCriteria();
+ }
+ PullRequestQuery query = new PullRequestQuery(criteria);
PageParameters params = ProjectPullRequestsPage.paramsOf(getProject(), query.toString(), 0);
Link<Void> statusLink = new BookmarkablePageLink<Void>("link", ProjectPullRequestsPage.class, params);
String statusName = entry.getKey().toString();
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.html
new file mode 100644
index 0000000000..d4ca5182d2
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.html
@@ -0,0 +1,30 @@
+<wicket:extend>
+ <div class="form-group">
+ <label class="control-label">Status</label>
+ <input wicket:id="status" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Submitted By</label>
+ <input wicket:id="submittedBy" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Assigned To</label>
+ <input wicket:id="assignedTo" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Label</label>
+ <input wicket:id="label" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="activeSince" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Not Active Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="notActiveSince" type="text" class="form-control">
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java
new file mode 100644
index 0000000000..2364f8205b
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestFilterPanel.java
@@ -0,0 +1,331 @@
+package io.onedev.server.web.component.pullrequest.list;
+
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.Is;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IsSince;
+import static io.onedev.server.search.entity.pullrequest.PullRequestQueryLexer.IsUntil;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.function.Predicate;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.LabelSpecManager;
+import io.onedev.server.entitymanager.UserManager;
+import io.onedev.server.model.PullRequest;
+import io.onedev.server.model.User;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.pullrequest.AssignedToCriteria;
+import io.onedev.server.search.entity.pullrequest.AssignedToUserCriteria;
+import io.onedev.server.search.entity.pullrequest.DiscardedCriteria;
+import io.onedev.server.search.entity.pullrequest.LabelCriteria;
+import io.onedev.server.search.entity.pullrequest.LastActivityDateCriteria;
+import io.onedev.server.search.entity.pullrequest.MergedCriteria;
+import io.onedev.server.search.entity.pullrequest.OpenCriteria;
+import io.onedev.server.search.entity.pullrequest.StatusCriteria;
+import io.onedev.server.search.entity.pullrequest.SubmittedByCriteria;
+import io.onedev.server.search.entity.pullrequest.SubmittedByUserCriteria;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.filteredit.FilterEditPanel;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.user.choice.UserMultiChoice;
+
+class PullRequestFilterPanel extends FilterEditPanel<PullRequest> {
+
+ public PullRequestFilterPanel(String id, IModel<EntityQuery<PullRequest>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var statusChoice = new StringMultiChoice("status", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), StatusCriteria.class, null);
+ return criterias.stream().map(it->it.getStatus().name()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = new ArrayList<Criteria<PullRequest>>();
+ for (String status: object) {
+ if (status.equals(PullRequest.Status.OPEN.name())) {
+ criterias.add(new OpenCriteria());
+ } else if (status.equals(PullRequest.Status.DISCARDED.name())) {
+ criterias.add(new DiscardedCriteria());
+ } else {
+ criterias.add(new MergedCriteria());
+ }
+ }
+ Criteria<PullRequest> rootCriteria = Criteria.orCriterias(criterias);
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), StatusCriteria.class, rootCriteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ for (PullRequest.Status status: PullRequest.Status.values()) {
+ map.put(status.name(), status.name());
+ }
+ return map;
+ }
+ }, false);
+ statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(statusChoice);
+
+ var submittedByChoice = new UserMultiChoice("submittedBy", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), SubmittedByCriteria.class, null);
+ return criterias.stream().map(it->it.getUser()).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it->new SubmittedByUserCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), SubmittedByUserCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return getUserManager().query();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+
+ };
+ submittedByChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(submittedByChoice);
+
+ var assignedToChoice = new UserMultiChoice("assignedTo", new IModel<Collection<User>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<User> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), AssignedToCriteria.class, null);
+ return criterias.stream().map(it->it.getUser()).filter(Objects::nonNull).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<User> object) {
+ var criteria = Criteria.orCriterias(object.stream().map(it->new AssignedToUserCriteria(it)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), AssignedToUserCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<List<User>>() {
+
+ @Override
+ protected List<User> load() {
+ return getUserManager().query();
+ }
+
+ }) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+
+ };
+ assignedToChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(assignedToChoice);
+
+ var labelChoice = new StringMultiChoice("label", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LabelCriteria.class, null);
+ return criterias.stream()
+ .map(it->it.getLabelSpec().getName())
+ .collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var criterias = Criteria.orCriterias(object.stream().map(it->new LabelCriteria(getLabelSpecManager().find(it), Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LabelCriteria.class, criterias, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var names = getLabelSpecManager().query().stream().map(it->it.getName()).collect(toList());
+ Collections.sort(names);
+ var map = new LinkedHashMap<String, String>();
+ for (String name: names) {
+ map.put(name, name);
+ }
+ return map;
+ }
+
+ }, false) {
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ getSettings().setPlaceholder("");
+ }
+ };
+ labelChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(labelChoice);
+
+ var activeSincePicker = new DatePicker("activeSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsSince;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(DateUtils.formatDate(object), IsSince) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ activeSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(activeSincePicker);
+
+ var notActiveSincePicker = new DatePicker("notActiveSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ private Predicate<LastActivityDateCriteria> getPredicate() {
+ return t -> t.getOperator() == IsUntil;
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), LastActivityDateCriteria.class, getPredicate());
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new LastActivityDateCriteria(DateUtils.formatDate(object), IsUntil) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), LastActivityDateCriteria.class, criteria, getPredicate()));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ notActiveSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(notActiveSincePicker);
+ }
+
+ private LabelSpecManager getLabelSpecManager() {
+ return OneDev.getInstance(LabelSpecManager.class);
+ }
+
+ private UserManager getUserManager() {
+ return OneDev.getInstance(UserManager.class);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
index 6d8f4b1a12..2cc9b73d83 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html
@@ -22,6 +22,9 @@
<a wicket:id="operations" class="operations text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> Operations
</a>
+ <a wicket:id="filter" class="filter text-gray d-inline-block mb-2 mr-4">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filters
+ </a>
<a wicket:id="orderBy" class="order-by text-gray mr-4 mb-2 text-nowrap d-inline-block">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
index aca2d378d6..41d5f60277 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.java
@@ -1,6 +1,57 @@
package io.onedev.server.web.component.pullrequest.list;
+import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.Session;
+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.event.Broadcast;
+import org.apache.wicket.event.IEvent;
+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.util.SortableDataProvider;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.head.OnDomReadyHeaderItem;
+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.form.TextField;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
+import org.apache.wicket.markup.html.panel.Fragment;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.markup.repeater.Item;
+import org.apache.wicket.markup.repeater.RepeatingView;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+
import com.google.common.collect.Sets;
+
import io.onedev.commons.utils.ExplicitException;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.ProjectManager;
@@ -14,6 +65,7 @@ import io.onedev.server.model.PullRequestLabel;
import io.onedev.server.model.PullRequestReview;
import io.onedev.server.model.PullRequestReview.Status;
import io.onedev.server.model.support.LastActivity;
+import io.onedev.server.search.entity.EntityQuery;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.pullrequest.FuzzyCriteria;
@@ -37,7 +89,6 @@ import io.onedev.server.web.component.link.DropdownLink;
import io.onedev.server.web.component.menu.MenuItem;
import io.onedev.server.web.component.menu.MenuLink;
import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import io.onedev.server.web.component.orderedit.SortEditPanel;
import io.onedev.server.web.component.pagenavigator.OnePagingNavigator;
import io.onedev.server.web.component.project.selector.ProjectSelector;
import io.onedev.server.web.component.pullrequest.RequestStatusBadge;
@@ -45,6 +96,7 @@ import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;
import io.onedev.server.web.component.pullrequest.review.ReviewerAvatar;
import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.sortedit.SortEditPanel;
import io.onedev.server.web.component.user.ident.Mode;
import io.onedev.server.web.component.user.ident.UserIdentPanel;
import io.onedev.server.web.component.watchstatus.WatchStatusPanel;
@@ -52,48 +104,9 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.Cursor;
import io.onedev.server.web.util.LoadableDetachableDataProvider;
-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
import io.onedev.server.xodus.VisitInfoManager;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.Session;
-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.event.Broadcast;
-import org.apache.wicket.event.IEvent;
-import org.apache.wicket.extensions.markup.html.repeater.data.grid.ICellPopulator;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.*;
-import org.apache.wicket.extensions.markup.html.repeater.util.SortableDataProvider;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-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.head.OnDomReadyHeaderItem;
-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.form.TextField;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.navigation.paging.PagingNavigator;
-import org.apache.wicket.markup.html.panel.Fragment;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.markup.repeater.Item;
-import org.apache.wicket.markup.repeater.RepeatingView;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-
-import javax.annotation.Nullable;
-import java.util.*;
-
-import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;
-import static java.util.stream.Collectors.toList;
public abstract class PullRequestListPanel extends Panel {
@@ -692,6 +705,30 @@ public abstract class PullRequestListPanel extends Panel {
});
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new PullRequestFilterPanel(id, new IModel<EntityQuery<PullRequest>>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public EntityQuery<PullRequest> getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new PullRequestQuery();
+ }
+ @Override
+ public void setObject(EntityQuery<PullRequest> object) {
+ PullRequestListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject((PullRequestQuery) object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ });
+ }
+ });
+
add(new DropdownLink("orderBy") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
index 96acafffb8..1bd26b48ae 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.css
@@ -630,3 +630,8 @@ disabled look for disabled choices in the results dropdown
background-position: 100% -21px !important;
}
}
+
+.select2-result-label {
+ word-wrap: break-word;
+ word-break: break-all;
+}
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
index 1c47a9673f..a59228bf4a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/select2/res/select2.js
@@ -691,6 +691,9 @@ the specific language governing permissions and limitations under the Apache Lic
}
if (opts.element.is(":disabled") || opts.element.is("[readonly='readonly']")) this.disable();
+ var $floating = $(this.container).closest(".floating");
+ if ($floating.length != 0)
+ $(document).trigger("afterElementReplace", $floating.attr("id"));
},
// abstract
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditCssResourceReference.java b/server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditCssResourceReference.java
similarity index 86%
rename from server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditCssResourceReference.java
rename to server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditCssResourceReference.java
index 7b82a35f75..2506f0e574 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditCssResourceReference.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditCssResourceReference.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.orderedit;
+package io.onedev.server.web.component.sortedit;
import io.onedev.server.web.page.base.BaseDependentCssResourceReference;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditPanel.html b/server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditPanel.html
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditPanel.html
rename to server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditPanel.html
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditPanel.java b/server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditPanel.java
similarity index 99%
rename from server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditPanel.java
rename to server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditPanel.java
index 2f821d347c..18ec41fe04 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/orderedit/SortEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/sortedit/SortEditPanel.java
@@ -1,4 +1,4 @@
-package io.onedev.server.web.component.orderedit;
+package io.onedev.server.web.component.sortedit;
import io.onedev.server.model.AbstractEntity;
import io.onedev.server.search.entity.EntitySort;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/orderedit/sort-edit.css b/server-core/src/main/java/io/onedev/server/web/component/sortedit/sort-edit.css
similarity index 100%
rename from server-core/src/main/java/io/onedev/server/web/component/orderedit/sort-edit.css
rename to server-core/src/main/java/io/onedev/server/web/component/sortedit/sort-edit.css
diff --git a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
index 8ce3094460..805d75b48d 100644
--- a/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
+++ b/server-core/src/main/java/io/onedev/server/web/editable/InplacePropertyEditLink.java
@@ -27,7 +27,7 @@ public abstract class InplacePropertyEditLink extends DropdownLink {
@Override
protected void onInitialize(FloatingPanel dropdown) {
super.onInitialize(dropdown);
- dropdown.add(AttributeAppender.append("class", "inplace-edit inplace-property-edit"));
+ dropdown.add(AttributeAppender.append("class", "inplace-property-edit"));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.html
new file mode 100644
index 0000000000..a41c11dc43
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.html
@@ -0,0 +1,42 @@
+<wicket:extend>
+ <div class="form-group">
+ <label class="control-label">Status</label>
+ <input wicket:id="status" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">OS</label>
+ <input wicket:id="os" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">OS Arch</label>
+ <input wicket:id="osArch" type="hidden" class="form-control">
+ </div>
+ <div class="form-group">
+ <label class="control-label">Paused</label>
+ <span class="switch switch-sm switch-primary">
+ <label>
+ <input wicket:id="paused" type="checkbox">
+ </label>
+ </span>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Has Running Builds</label>
+ <span class="switch switch-sm switch-primary">
+ <label>
+ <input wicket:id="hasRunningBuilds" type="checkbox">
+ </label>
+ </span>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Ever Used Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="everUsedSince" type="text" class="form-control">
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="control-label">Not Used Since</label>
+ <div class="clearable-wrapper">
+ <input wicket:id="notUsedSince" type="text" class="form-control">
+ </div>
+ </div>
+</wicket:extend>
\ No newline at end of file
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java
new file mode 100644
index 0000000000..3aa5b750f6
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentFilterPanel.java
@@ -0,0 +1,310 @@
+package io.onedev.server.web.page.admin.buildsetting.agent;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
+import org.apache.wicket.markup.html.form.CheckBox;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.agent.AgentQueryLexer;
+import io.onedev.server.search.entity.agent.EverUsedSinceCriteria;
+import io.onedev.server.search.entity.agent.HasRunningBuildsCriteria;
+import io.onedev.server.search.entity.agent.NotUsedSinceCriteria;
+import io.onedev.server.search.entity.agent.OfflineCriteria;
+import io.onedev.server.search.entity.agent.OnlineCriteria;
+import io.onedev.server.search.entity.agent.OsArchCriteria;
+import io.onedev.server.search.entity.agent.OsCriteria;
+import io.onedev.server.search.entity.agent.PausedCriteria;
+import io.onedev.server.search.entity.agent.StatusCriteria;
+import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.criteria.Criteria;
+import io.onedev.server.web.component.datepicker.DatePicker;
+import io.onedev.server.web.component.filteredit.FilterEditPanel;
+import io.onedev.server.web.component.stringchoice.StringMultiChoice;
+import io.onedev.server.web.component.stringchoice.StringSingleChoice;
+
+class AgentFilterPanel extends FilterEditPanel<Agent> {
+
+ public AgentFilterPanel(String id, IModel<EntityQuery<Agent>> queryModel) {
+ super(id, queryModel);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+
+ var statusChoice = new StringSingleChoice("status", new IModel<String>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public String getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), StatusCriteria.class, null);
+ if (criterias.size() == 0)
+ return null;
+ else
+ return criterias.get(0) instanceof OnlineCriteria ? "Online" : "Offline";
+ }
+
+ @Override
+ public void setObject(String object) {
+ Criteria<Agent> rootCriteria;
+ if (object == null)
+ rootCriteria = null;
+ else if (object.equals("Online"))
+ rootCriteria = new OnlineCriteria();
+ else
+ rootCriteria = new OfflineCriteria();
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), StatusCriteria.class, rootCriteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ map.put("Online", "Online");
+ map.put("Offline", "Offline");
+ return map;
+ }
+ }, false);
+ statusChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(statusChoice);
+
+ var osChoice = new StringMultiChoice("os", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), OsCriteria.class, null);
+ return criterias.stream().map(it -> it.getValue()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var rootCriteria = Criteria.orCriterias(object.stream().map(it -> new OsCriteria(it, AgentQueryLexer.Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), OsCriteria.class, rootCriteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ var osNames = new ArrayList<>(getAgentManager().getOsNames());
+ Collections.sort(osNames);
+ for (var os: osNames)
+ map.put(os, os);
+ return map;
+ }
+ }, false);
+ osChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(osChoice);
+
+ var osArchChoice = new StringMultiChoice("osArch", new IModel<Collection<String>>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Collection<String> getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), OsArchCriteria.class, null);
+ return criterias.stream().map(it -> it.getValue()).collect(toList());
+ }
+
+ @Override
+ public void setObject(Collection<String> object) {
+ var rootCriteria = Criteria.orCriterias(object.stream().map(it -> new OsArchCriteria(it, AgentQueryLexer.Is)).collect(toList()));
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), OsArchCriteria.class, rootCriteria, null));
+ getModel().setObject(query);
+ }
+
+ }, new LoadableDetachableModel<Map<String, String>>() {
+
+ @Override
+ protected Map<String, String> load() {
+ var map = new LinkedHashMap<String, String>();
+ var osArchs = new ArrayList<>(getAgentManager().getOsArchs());
+ Collections.sort(osArchs);
+ for (var osArch: osArchs)
+ map.put(osArch, osArch);
+ return map;
+ }
+ }, false);
+ osArchChoice.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(osArchChoice);
+
+ var pausedCheck = new CheckBox("paused", new IModel<Boolean>() {
+
+ @Override
+ public Boolean getObject() {
+ return !getMatchingCriterias(getModelObject().getCriteria(), PausedCriteria.class, null).isEmpty();
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ var criteria = object? new PausedCriteria() : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), PausedCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ @Override
+ public void detach() {
+ }
+
+ });
+
+ pausedCheck.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(pausedCheck);
+
+ var hasRunningBuildsCheck = new CheckBox("hasRunningBuilds", new IModel<Boolean>() {
+
+ @Override
+ public Boolean getObject() {
+ return !getMatchingCriterias(getModelObject().getCriteria(), HasRunningBuildsCriteria.class, null).isEmpty();
+ }
+
+ @Override
+ public void setObject(Boolean object) {
+ var criteria = object? new HasRunningBuildsCriteria() : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), HasRunningBuildsCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ @Override
+ public void detach() {
+ }
+
+ });
+
+ hasRunningBuildsCheck.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(hasRunningBuildsCheck);
+
+ var everUsedSincePicker = new DatePicker("everUsedSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), EverUsedSinceCriteria.class, null);
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new EverUsedSinceCriteria(DateUtils.formatDate(object)) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), EverUsedSinceCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ everUsedSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(everUsedSincePicker);
+
+ var notUsedSincePicker = new DatePicker("notUsedSince", new IModel<Date>() {
+
+ @Override
+ public void detach() {
+ }
+
+ @Override
+ public Date getObject() {
+ var criterias = getMatchingCriterias(getModelObject().getCriteria(), NotUsedSinceCriteria.class, null);
+ if (criterias.isEmpty())
+ return null;
+ else
+ return criterias.get(0).getDate();
+ }
+
+ @Override
+ public void setObject(Date object) {
+ var criteria = object!=null? new NotUsedSinceCriteria(DateUtils.formatDate(object)) : null;
+ var query = getModelObject();
+ query.setCriteria(setMatchingCriteria(query.getCriteria(), NotUsedSinceCriteria.class, criteria, null));
+ getModel().setObject(query);
+ }
+
+ }, false);
+ notUsedSincePicker.add(new AjaxFormComponentUpdatingBehavior("change") {
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ }
+
+ });
+ add(notUsedSincePicker);
+ }
+
+ private static AgentManager getAgentManager() {
+ return OneDev.getInstance(AgentManager.class);
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
index c6269639c3..3a6f264ede 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.html
@@ -19,6 +19,9 @@
<a wicket:id="saveQuery" class="save-query text-gray mr-4 d-inline-block mb-2 text-nowrap">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
+ <a wicket:id="filter" class="filter text-gray mr-4 mb-2 d-inline-block text-nowrap">
+ <wicket:svg href="filter" class="icon"></wicket:svg> Filter
+ </a>
<a wicket:id="orderBy" class="order-by text-gray mr-4 d-inline-block mb-2 text-nowrap">
<wicket:svg href="sort" class="icon"></wicket:svg> Order By
</a>
diff --git a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
index ef63569637..7cf758740d 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/admin/buildsetting/agent/AgentListPanel.java
@@ -1,30 +1,13 @@
package io.onedev.server.web.page.admin.buildsetting.agent;
-import io.onedev.commons.utils.ExplicitException;
-import io.onedev.server.OneDev;
-import io.onedev.server.entitymanager.AgentManager;
-import io.onedev.server.model.Agent;
-import io.onedev.server.search.entity.EntitySort;
-import io.onedev.server.search.entity.EntitySort.Direction;
-import io.onedev.server.search.entity.agent.AgentQuery;
-import io.onedev.server.search.entity.agent.FuzzyCriteria;
-import io.onedev.server.security.SecurityUtils;
-import io.onedev.server.web.WebConstants;
-import io.onedev.server.web.behavior.AgentQueryBehavior;
-import io.onedev.server.web.component.AgentStatusBadge;
-import io.onedev.server.web.component.datatable.DefaultDataTable;
-import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
-import io.onedev.server.web.component.floating.FloatingPanel;
-import io.onedev.server.web.component.link.DropdownLink;
-import io.onedev.server.web.component.menu.MenuItem;
-import io.onedev.server.web.component.menu.MenuLink;
-import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
-import io.onedev.server.web.component.orderedit.SortEditPanel;
-import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
-import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
-import io.onedev.server.web.util.LoadableDetachableDataProvider;
-import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
-import io.onedev.server.web.util.QuerySaveSupport;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.Nullable;
+
import org.apache.commons.lang3.StringUtils;
import org.apache.wicket.Component;
import org.apache.wicket.Session;
@@ -56,8 +39,32 @@ import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.request.cycle.RequestCycle;
-import javax.annotation.Nullable;
-import java.util.*;
+import io.onedev.commons.utils.ExplicitException;
+import io.onedev.server.OneDev;
+import io.onedev.server.entitymanager.AgentManager;
+import io.onedev.server.model.Agent;
+import io.onedev.server.search.entity.EntityQuery;
+import io.onedev.server.search.entity.EntitySort;
+import io.onedev.server.search.entity.EntitySort.Direction;
+import io.onedev.server.search.entity.agent.AgentQuery;
+import io.onedev.server.search.entity.agent.FuzzyCriteria;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.web.WebConstants;
+import io.onedev.server.web.behavior.AgentQueryBehavior;
+import io.onedev.server.web.component.AgentStatusBadge;
+import io.onedev.server.web.component.datatable.DefaultDataTable;
+import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;
+import io.onedev.server.web.component.floating.FloatingPanel;
+import io.onedev.server.web.component.link.DropdownLink;
+import io.onedev.server.web.component.menu.MenuItem;
+import io.onedev.server.web.component.menu.MenuLink;
+import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;
+import io.onedev.server.web.component.savedquery.SavedQueriesClosed;
+import io.onedev.server.web.component.savedquery.SavedQueriesOpened;
+import io.onedev.server.web.component.sortedit.SortEditPanel;
+import io.onedev.server.web.util.LoadableDetachableDataProvider;
+import io.onedev.server.web.util.QuerySaveSupport;
+import io.onedev.server.web.util.paginghistory.PagingHistorySupport;
class AgentListPanel extends Panel {
@@ -190,6 +197,30 @@ class AgentListPanel extends Panel {
}.setOutputMarkupPlaceholderTag(true));
+ add(new DropdownLink("filter") {
+ @Override
+ protected Component newContent(String id, FloatingPanel dropdown) {
+ return new AgentFilterPanel(id, new IModel<EntityQuery<Agent>>() {
+ @Override
+ public void detach() {
+ }
+ @Override
+ public EntityQuery<Agent> getObject() {
+ return queryModel.getObject() != null? queryModel.getObject() : new AgentQuery();
+ }
+ @Override
+ public void setObject(EntityQuery<Agent> object) {
+ AgentListPanel.this.getFeedbackMessages().clear();
+ queryModel.setObject((AgentQuery) object);
+ queryStringModel.setObject(object.toString());
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
+ target.add(queryInput);
+ doQuery(target);
+ }
+ });
+ }
+ });
+
add(new DropdownLink("orderBy") {
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.js b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
index 4971272a3d..cd48ae0f49 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.js
@@ -253,7 +253,7 @@ onedev.server = {
$this[0].CodeMirror.focus();
} else if ($this.attr("readonly") != "readonly" && $this.attr("disabled") != "disabled") {
if ($this.closest(".select2-container").length != 0) {
- if ($this.closest(".inplace-edit").length != 0) {
+ if ($this.closest(".inplace-property-edit").length != 0) {
$this.focus();
$this.closest(".select2-container").next("input").select2("open");
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
index fca01aa573..e192c78f1f 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/changes/BuildChangesPage.java
@@ -1,5 +1,7 @@
package io.onedev.server.web.page.project.builds.detail.changes;
+import static io.onedev.server.search.commit.Revision.Type.COMMIT;
+
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -11,8 +13,6 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import com.google.common.collect.Lists;
-
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.BuildManager;
import io.onedev.server.model.Build;
@@ -77,9 +77,9 @@ public class BuildChangesPage extends BuildDetailPage {
List<Revision> revisions = new ArrayList<>();
if (baseCommitHash != null)
- revisions.add(new Revision(baseCommitHash, Revision.Scope.SINCE));
- revisions.add(new Revision(getBuild().getCommitHash(), Revision.Scope.UNTIL));
- return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));
+ revisions.add(new Revision(COMMIT, baseCommitHash, true));
+ revisions.add(new Revision(COMMIT, getBuild().getCommitHash(), false));
+ return new CommitQuery(List.of(new RevisionCriteria(revisions)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pack/BuildPacksPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pack/BuildPacksPage.java
index 283b1e3f8b..e58219dcaa 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pack/BuildPacksPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/pack/BuildPacksPage.java
@@ -5,7 +5,7 @@ import io.onedev.server.model.Pack;
import io.onedev.server.model.Project;
import io.onedev.server.search.entity.pack.PackQuery;
import io.onedev.server.search.entity.pack.PackQueryLexer;
-import io.onedev.server.search.entity.pack.PublishedByBuildCriteria;
+import io.onedev.server.search.entity.pack.PublishedViaBuildCriteria;
import io.onedev.server.search.entity.pack.TypeCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.criteria.AndCriteria;
@@ -63,7 +63,7 @@ public class BuildPacksPage extends BuildDetailPage {
@Override
protected PackQuery getBaseQuery() {
return new PackQuery(new AndCriteria<>(
- new PublishedByBuildCriteria(getBuild()),
+ new PublishedViaBuildCriteria(getBuild()),
new TypeCriteria(packType, PackQueryLexer.Is)));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
index 211642a47e..d2b7ba9c69 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/compare/RevisionComparePage.java
@@ -1,6 +1,37 @@
package io.onedev.server.web.page.project.compare;
-import com.google.common.collect.Lists;
+import static io.onedev.server.search.commit.Revision.Type.COMMIT;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+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.form.OnChangeAjaxBehavior;
+import org.apache.wicket.behavior.AttributeAppender;
+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.CheckBox;
+import org.apache.wicket.markup.html.link.BookmarkablePageLink;
+import org.apache.wicket.markup.html.link.Link;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
+
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.codequality.CodeProblem;
@@ -13,7 +44,12 @@ import io.onedev.server.entitymanager.CodeCommentStatusChangeManager;
import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.Mark;
import io.onedev.server.search.commit.CommitQuery;
@@ -38,28 +74,6 @@ import io.onedev.server.web.page.project.pullrequests.create.NewPullRequestPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.util.EditParamsAware;
-import org.apache.wicket.Component;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.behavior.AttributeAppender;
-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.CheckBox;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
-import org.apache.wicket.markup.html.link.Link;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
-
-import javax.annotation.Nullable;
-import java.io.Serializable;
-import java.util.*;
public class RevisionComparePage extends ProjectPage implements RevisionAnnotationSupport, EditParamsAware {
@@ -657,16 +671,16 @@ public class RevisionComparePage extends ProjectPage implements RevisionAnnotati
protected CommitQuery getBaseQuery() {
List<Revision> revisions = new ArrayList<>();
- revisions.add(new Revision(mergeBase.name(), Revision.Scope.SINCE));
- revisions.add(new Revision(rightCommitId.name(), Revision.Scope.UNTIL));
-
+ revisions.add(new Revision(COMMIT, mergeBase.name(), true));
+ revisions.add(new Revision(COMMIT, rightCommitId.name(), false));
+
Project rightProject = state.rightSide.getProject();
if (rightProject.equals(state.leftSide.getProject())
&& !state.compareWithMergeBase
&& !mergeBase.equals(leftCommitId)) {
- revisions.add(new Revision(leftCommitId.name(), Revision.Scope.UNTIL));
+ revisions.add(new Revision(COMMIT, leftCommitId.name(), false));
}
- return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));
+ return new CommitQuery(List.of(new RevisionCriteria(revisions)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
index 3a73c30939..c6c82e7771 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/create/NewPullRequestPage.java
@@ -1,6 +1,51 @@
package io.onedev.server.web.page.project.pullrequests.create;
-import com.google.common.collect.Lists;
+import static io.onedev.server.search.commit.Revision.Type.COMMIT;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.atomic.AtomicReference;
+import java.util.stream.Collectors;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.wicket.Component;
+import org.apache.wicket.RestartResponseAtInterceptPageException;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
+import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
+import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
+import org.apache.wicket.feedback.FencedFeedbackPanel;
+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.Button;
+import org.apache.wicket.markup.html.form.DropDownChoice;
+import org.apache.wicket.markup.html.form.Form;
+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.panel.Fragment;
+import org.apache.wicket.model.AbstractReadOnlyModel;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.revwalk.RevCommit;
+
import io.onedev.commons.utils.PlanarRange;
import io.onedev.server.OneDev;
import io.onedev.server.attachment.AttachmentSupport;
@@ -16,8 +61,17 @@ import io.onedev.server.entitymanager.PullRequestManager;
import io.onedev.server.git.GitUtils;
import io.onedev.server.git.service.GitService;
import io.onedev.server.git.service.RefFacade;
-import io.onedev.server.model.*;
+import io.onedev.server.model.Build;
+import io.onedev.server.model.CodeComment;
+import io.onedev.server.model.CodeCommentReply;
+import io.onedev.server.model.CodeCommentStatusChange;
+import io.onedev.server.model.Project;
+import io.onedev.server.model.PullRequest;
import io.onedev.server.model.PullRequest.Status;
+import io.onedev.server.model.PullRequestAssignment;
+import io.onedev.server.model.PullRequestReview;
+import io.onedev.server.model.PullRequestUpdate;
+import io.onedev.server.model.User;
import io.onedev.server.model.support.CompareContext;
import io.onedev.server.model.support.Mark;
import io.onedev.server.model.support.pullrequest.MergePreview;
@@ -53,40 +107,6 @@ import io.onedev.server.web.page.project.pullrequests.ProjectPullRequestsPage;
import io.onedev.server.web.page.project.pullrequests.detail.PullRequestDetailPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
import io.onedev.server.web.page.simple.security.LoginPage;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.wicket.Component;
-import org.apache.wicket.RestartResponseAtInterceptPageException;
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;
-import org.apache.wicket.ajax.form.OnChangeAjaxBehavior;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.ajax.markup.html.AjaxLazyLoadPanel;
-import org.apache.wicket.feedback.FencedFeedbackPanel;
-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.Button;
-import org.apache.wicket.markup.html.form.DropDownChoice;
-import org.apache.wicket.markup.html.form.Form;
-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.panel.Fragment;
-import org.apache.wicket.model.AbstractReadOnlyModel;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.Model;
-import org.apache.wicket.request.cycle.RequestCycle;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.eclipse.jgit.lib.ObjectId;
-import org.eclipse.jgit.revwalk.RevCommit;
-
-import javax.annotation.Nullable;
-import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
-import java.util.stream.Collectors;
public class NewPullRequestPage extends ProjectPage implements RevisionAnnotationSupport {
@@ -427,9 +447,9 @@ public class NewPullRequestPage extends ProjectPage implements RevisionAnnotatio
protected CommitQuery getBaseQuery() {
PullRequest request = NewPullRequestPage.this.getPullRequest();
List<Revision> revisions = new ArrayList<>();
- revisions.add(new Revision(request.getBaseCommitHash(), Revision.Scope.SINCE));
- revisions.add(new Revision(request.getLatestUpdate().getHeadCommitHash(), Revision.Scope.UNTIL));
- return new CommitQuery(Lists.newArrayList(new RevisionCriteria(revisions)));
+ revisions.add(new Revision(COMMIT, request.getBaseCommitHash(), true));
+ revisions.add(new Revision(COMMIT, request.getLatestUpdate().getHeadCommitHash(), false));
+ return new CommitQuery(List.of(new RevisionCriteria(revisions)));
}
@Override
diff --git a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
index 33f7b29ec3..d011fc623c 100644
--- a/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
+++ b/server-core/src/main/java/io/onedev/server/web/util/SuggestionUtils.java
@@ -457,7 +457,7 @@ public class SuggestionUtils {
public static List<InputSuggestion> suggestBlobs(Project project, String matchWith) {
CommitInfoManager commitInfoManager = OneDev.getInstance(CommitInfoManager.class);
- return suggestByPattern(commitInfoManager.getFiles(project.getId()), matchWith);
+ return suggestPathsByPathPattern(commitInfoManager.getFiles(project.getId()), matchWith, false);
}
public static List<InputSuggestion> suggestJobs(Project project, String matchWith) {
@@ -530,34 +530,63 @@ public class SuggestionUtils {
return children;
}
- public static List<InputSuggestion> suggestByPattern(List<String> paths, String pattern) {
+ public static List<InputSuggestion> suggestPathsByPathPattern(List<String> paths, String pattern, boolean includeExts) {
pattern = pattern.toLowerCase();
List<InputSuggestion> suggestions = new ArrayList<>();
+ if (includeExts)
+ suggestions.addAll(suggestExts(paths, pattern, "**/*."));
+
+ List<PatternApplied> allApplied = new ArrayList<>();
+ for (String path: paths) {
+ PatternApplied applied = WildcardUtils.applyPathPattern(pattern, path, false);
+ if (applied != null)
+ allApplied.add(applied);
+ }
+ allApplied.sort(comparingInt(o -> o.getMatch().getFrom()));
+ suggestions.addAll(suggestPaths(allApplied));
+ return suggestions;
+ }
+
+ public static List<InputSuggestion> suggestPathsByStringPattern(List<String> paths, String pattern, boolean includeExts) {
+ pattern = pattern.toLowerCase();
+ List<InputSuggestion> suggestions = new ArrayList<>();
+
+ if (includeExts)
+ suggestions.addAll(suggestExts(paths, pattern, "*."));
+ List<PatternApplied> allApplied = new ArrayList<>();
+ for (String path: paths) {
+ PatternApplied applied = WildcardUtils.applyStringPattern(pattern, path, false);
+ if (applied != null)
+ allApplied.add(applied);
+ }
+ allApplied.sort(comparingInt(o -> o.getMatch().getFrom()));
+ suggestions.addAll(suggestPaths(allApplied));
+ return suggestions;
+ }
+
+ private static List<InputSuggestion> suggestExts(List<String> paths, String pattern, String extPrefix) {
var exts = new TreeSet<String>();
for (var path: paths) {
var ext = StringUtils.substringAfterLast(Paths.get(path).getFileName().toFile().getName(), ".");
if (ext.length() != 0)
exts.add(ext);
}
+ List<InputSuggestion> suggestions = new ArrayList<>();
for (var ext: exts) {
- var suggestContent = "**/*." + ext;
+ var suggestContent = extPrefix + ext;
var index = suggestContent.indexOf(pattern);
if (index != -1)
suggestions.add(new InputSuggestion(suggestContent, -1, "files with ext '" + ext + "'", new LinearRange(index, index + pattern.length())));
}
-
- List<PatternApplied> allApplied = new ArrayList<>();
- for (String path: paths) {
- PatternApplied applied = WildcardUtils.applyPathPattern(pattern, path, false);
- if (applied != null)
- allApplied.add(applied);
- }
- allApplied.sort(comparingInt(o -> o.getMatch().getFrom()));
-
+ return suggestions;
+ }
+
+ private static List<InputSuggestion> suggestPaths(List<PatternApplied> patternApplieds) {
+ List<InputSuggestion> suggestions = new ArrayList<>();
Map<String, Set<String>> childrenCache = new HashMap<>();
Map<String, LinearRange> suggestedInputs = new LinkedHashMap<>();
- for (PatternApplied applied: allApplied) {
+ for (PatternApplied applied: patternApplieds) {
LinearRange match = applied.getMatch();
String suffix = applied.getText().substring(match.getTo());
int index = suffix.indexOf('/');
@@ -567,7 +596,7 @@ public class SuggestionUtils {
while (true) {
Set<String> children = childrenCache.get(suggestedInput);
if (children == null) {
- children = getChildren(allApplied, suggestedInput);
+ children = getChildren(patternApplieds, suggestedInput);
childrenCache.put(suggestedInput, children);
}
Preconditions.checkState(!children.isEmpty());
@@ -600,5 +629,5 @@ public class SuggestionUtils {
return suggestions;
}
-
+
}
diff --git a/server-ee b/server-ee
index 1f9ad945c8..aec5198716 160000
--- a/server-ee
+++ b/server-ee
@@ -1 +1 @@
-Subproject commit 1f9ad945c8b14821764b06846e7d5ddaa09265f5
+Subproject commit aec51987165435d26f26e7ba4e18dc6eb145955e
diff --git a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
index 2f8a8f4c9e..da9d3c196a 100644
--- a/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
+++ b/server-plugin/server-plugin-report-problem/src/main/java/io/onedev/server/plugin/report/problem/ProblemReportPage.java
@@ -135,7 +135,7 @@ public class ProblemReportPage extends BuildReportPage {
@Override
protected List<InputSuggestion> suggest(String matchWith) {
- return SuggestionUtils.suggestByPattern(keyNames, matchWith);
+ return SuggestionUtils.suggestPathsByPathPattern(keyNames, matchWith, true);
}
@Override
diff --git a/server-product/system/incompatibilities/incompatibilities.md b/server-product/system/incompatibilities/incompatibilities.md
index 883445c0bc..988931da12 100644
--- a/server-product/system/incompatibilities/incompatibilities.md
+++ b/server-product/system/incompatibilities/incompatibilities.md
@@ -1,3 +1,11 @@
+# 11.8.0
+
+### Query Syntax
+
+1. Multiple order by clauses now connects via **,** instead of **and**
+1. Pull request status criteria of form `"Status" is "<name>"` is removed, use `open`, `merged`, or `discarded` instead
+1. Build status criteria of form `"Status" is "<name>"` is removed, use respective status criteria instead, such as `successful`, `failed`, `running`
+
# 11.6.12
### RESTful API