Skip to content

The Unified and Autonomous Development Platform

Fix issue #966 - Add "leafs" criteria to list all leaf projects

Robin Shended78b128ff1
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
new file mode 100644
index 0000000000..172135969f
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/search/entity/project/LeafsCriteria.java
@@ -0,0 +1,37 @@
+package io.onedev.server.search.entity.project;
+
+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.Project;
+import io.onedev.server.util.criteria.Criteria;
+
+public class LeafsCriteria extends Criteria<Project> {
+
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public Predicate getPredicate(CriteriaQuery<?> query, From<Project, Project> from, CriteriaBuilder builder) {
+ Subquery<Project> childrenQuery = query.subquery(Project.class);
+ Root<Project> childrenRoot = childrenQuery.from(Project.class);
+ childrenQuery.select(childrenRoot);
+
+ return builder.not(builder.exists(
+ childrenQuery.where(builder.equal(childrenRoot.get(Project.PROP_PARENT), from))));
+ }
+
+ @Override
+ public boolean matches(Project project) {
+ return project.getChildren().isEmpty();
+ }
+
+ @Override
+ public String toStringWithoutParens() {
+ return ProjectQuery.getRuleName(ProjectQueryLexer.Leafs);
+ }
+
+}
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 e6f0845120..29fa8e1ce5 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
@@ -7,7 +7,7 @@ query
;
criteria
- : operator=(Roots|ForkRoots|OwnedByMe|OwnedByNone) #OperatorCriteria
+ : operator=(Roots|Leafs|ForkRoots|OwnedByMe|OwnedByNone) #OperatorCriteria
| operator=(OwnedBy|ForksOf|ChildrenOf) WS+ criteriaValue=Quoted #OperatorValueCriteria
| criteriaField=Quoted WS+ operator=(Is|Contains|IsUntil|IsSince) WS+ criteriaValue=Quoted #FieldOperatorValueCriteria
| criteria WS+ And WS+ criteria #AndCriteria
@@ -60,6 +60,10 @@ Roots
: 'roots'
;
+Leafs
+ : 'leafs'
+ ;
+
ForkRoots
: 'fork' WS+ 'roots'
;
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 a754349e2c..1b8d9e8f6d 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
@@ -92,6 +92,8 @@ public class ProjectQuery extends EntityQuery<Project> {
public Criteria<Project> visitOperatorCriteria(OperatorCriteriaContext ctx) {
if (ctx.operator.getType() == ProjectQueryLexer.Roots)
return new RootsCriteria();
+ else if (ctx.operator.getType() == ProjectQueryLexer.Leafs)
+ return new LeafsCriteria();
else if (ctx.operator.getType() == ProjectQueryLexer.ForkRoots)
return new ForkRootsCriteria();
else if (ctx.operator.getType() == ProjectQueryLexer.OwnedByMe)