Skip to content

The Unified and Autonomous Development Platform

fix: Query editor generates incorrect query sometimes (OD-2354)

Robin Shendf33bfb2f39b
diff --git a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
index ade3bbdebb..58d272b915 100644
--- a/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
+++ b/server-core/src/main/java/io/onedev/server/search/entity/pack/PublishedViaBuildCriteria.java
@@ -45,6 +45,6 @@ public class PublishedViaBuildCriteria extends Criteria<Pack> {
@Override
public String toStringWithoutParens() {
- return PackQueryLexer.PublishedByBuild + " " + quote(value);
+ return PackQuery.getRuleName(PackQueryLexer.PublishedByBuild) + " " + quote(value);
}
}
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 48410f2e95..4c4f92c668 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
@@ -19,18 +19,18 @@
<a wicket:id="saveQuery" class="save-query text-gray d-inline-block mb-2 mr-4 text-nowrap">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <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="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>
+ <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="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>
<span wicket:id="extraActions"></span>
<span wicket:id="count" class="float-right text-gray"></span>
</div>
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 e6c4bd18ad..dd0c0e390b 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
@@ -819,16 +819,16 @@ public abstract class BuildListPanel extends Panel {
}
@Override
public EntityQuery<Build> getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new BuildQuery();
+ var query = parse(queryStringModel.getObject(), new BuildQuery());
+ return query!=null? query : 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);
+ doQuery(target);
}
}) {
@@ -860,11 +860,7 @@ public abstract class BuildListPanel extends Panel {
@Override
public List<EntitySort> getObject() {
BuildQuery query = parse(queryStringModel.getObject(), new BuildQuery());
- BuildListPanel.this.getFeedbackMessages().clear();
- if (query != null)
- return query.getSorts();
- else
- return new ArrayList<>();
+ return query!=null? query.getSorts() : new ArrayList<>();
}
@Override
@@ -873,8 +869,7 @@ public abstract class BuildListPanel extends Panel {
BuildListPanel.this.getFeedbackMessages().clear();
if (query == null)
query = new BuildQuery();
- query.getSorts().clear();
- query.getSorts().addAll(object);
+ query.setSorts(object);
queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
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 83e28110a8..555f36608a 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
@@ -16,15 +16,15 @@
<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="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="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>
<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 541ca871b4..3dfd2cca9e 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
@@ -633,7 +633,7 @@ public abstract class CodeCommentListPanel extends Panel {
}
@Override
public EntityQuery<CodeComment> getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new CodeCommentQuery();
+ return queryModel.getObject()!=null? queryModel.getObject() : new CodeCommentQuery();
}
@Override
public void setObject(EntityQuery<CodeComment> object) {
@@ -665,11 +665,7 @@ public abstract class CodeCommentListPanel extends Panel {
@Override
public List<EntitySort> getObject() {
var query = queryModel.getObject();
- CodeCommentListPanel.this.getFeedbackMessages().clear();
- if (query != null)
- return query.getSorts();
- else
- return new ArrayList<>();
+ return query!=null? query.getSorts() : new ArrayList<>();
}
@Override
@@ -678,8 +674,7 @@ public abstract class CodeCommentListPanel extends Panel {
CodeCommentListPanel.this.getFeedbackMessages().clear();
if (query == null)
query = new CodeCommentQuery();
- query.getSorts().clear();
- query.getSorts().addAll(object);
+ query.setSorts(object);
queryModel.setObject(query);
queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
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
index e7a691c625..c60aa1016a 100644
--- 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
@@ -299,14 +299,14 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
for (var i=0; i<criterias.size(); i++) {
var criteria = criterias.get(i);
if (isAuthor && (criteria instanceof AuthorCriteria)) {
- if (object != null)
+ if (!object.isEmpty())
criterias.set(i, new AuthorCriteria(new ArrayList<>(object)));
else
criterias.remove(i);
found = true;
break;
} else if (!isAuthor && criteria instanceof CommitterCriteria) {
- if (object != null)
+ if (!object.isEmpty())
criterias.set(i, new CommitterCriteria(new ArrayList<>(object)));
else
criterias.remove(i);
@@ -314,7 +314,7 @@ abstract class CommitFilterPanel extends GenericPanel<CommitQuery> {
break;
}
}
- if (!found && object != null) {
+ if (!found && !object.isEmpty()) {
if (isAuthor)
query.getCriterias().add(new AuthorCriteria(new ArrayList<>(object)));
else
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 bc94d649f2..d40f009179 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
@@ -104,21 +104,7 @@ public abstract class CommitListPanel extends Panel {
@Override
protected CommitQuery load() {
- String queryString = queryStringModel.getObject();
- CommitQuery parsedQuery;
- try {
- parsedQuery = CommitQuery.parse(getProject(), queryString, true);
- } catch (Exception e) {
- getFeedbackMessages().clear();
- if (e instanceof ExplicitException) {
- error(e.getMessage());
- return null;
- } else {
- 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))));
- }
- }
- return CommitQuery.merge(getBaseQuery(), parsedQuery);
+ return parse(queryStringModel.getObject(), getBaseQuery());
}
};
@@ -273,6 +259,24 @@ public abstract class CommitListPanel extends Panel {
protected QuerySaveSupport getQuerySaveSupport() {
return null;
}
+
+ @Nullable
+ private CommitQuery parse(@Nullable String queryString, CommitQuery baseQuery) {
+ CommitQuery parsedQuery;
+ try {
+ parsedQuery = CommitQuery.parse(getProject(), queryString, true);
+ } catch (Exception e) {
+ getFeedbackMessages().clear();
+ if (e instanceof ExplicitException) {
+ error(e.getMessage());
+ return null;
+ } else {
+ 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))));
+ }
+ }
+ return CommitQuery.merge(baseQuery, parsedQuery);
+ }
private void doQuery(AjaxRequestTarget target) {
page = 1;
@@ -349,16 +353,16 @@ public abstract class CommitListPanel extends Panel {
}
@Override
public CommitQuery getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new CommitQuery(new ArrayList<>());
+ var query = parse(queryStringModel.getObject(), new CommitQuery(new ArrayList<>()));
+ return query!=null? query : 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);
+ doQuery(target);
}
}) {
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 25b65fe4ae..4f069ec72f 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
@@ -19,6 +19,12 @@
<a wicket:id="saveQuery" class="save-query text-gray d-inline-block mr-4 mb-2 text-nowrap">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</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>
<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>
@@ -28,12 +34,6 @@
<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>
<a wicket:id="showProgress" class="text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="clock" class="icon"></wicket:svg> Timing
</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 aa344ee315..cfb8766751 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
@@ -305,17 +305,18 @@ public abstract class IssueListPanel extends Panel {
}
@Override
public EntityQuery<Issue> getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new IssueQuery();
+ var query = parse(queryStringModel.getObject(), new IssueQuery());
+ return query!=null? query : 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);
+ doQuery(target);
}
+
}) {
@Override
protected Project getProject() {
@@ -347,21 +348,16 @@ public abstract class IssueListPanel extends Panel {
@Override
public List<EntitySort> getObject() {
var query = parse(queryStringModel.getObject(), new IssueQuery());
- IssueListPanel.this.getFeedbackMessages().clear();
- if (query != null)
- return query.getSorts();
- else
- return new ArrayList<>();
+ return query!=null? query.getSorts() : new ArrayList<>();
}
-
+
@Override
public void setObject(List<EntitySort> object) {
var query = parse(queryStringModel.getObject(), new IssueQuery());
IssueListPanel.this.getFeedbackMessages().clear();
if (query == null)
query = new IssueQuery();
- query.getSorts().clear();
- query.getSorts().addAll(object);
+ query.setSorts(object);
queryStringModel.setObject(query.toString());
AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
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 f8a592584a..73b806165c 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
@@ -18,15 +18,15 @@
<a wicket:id="saveQuery" class="save-query text-gray d-inline-block mb-2 mr-4 text-nowrap">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <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>
+ <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="help" class="help text-gray mr-4 mb-2 d-inline-block text-nowrap">
<wicket:svg href="question-circle" class="icon"></wicket:svg> How to Publish
</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 11b428e41c..ffaa7d9cf3 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
@@ -53,8 +53,6 @@ import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.EntitySort.Direction;
import io.onedev.server.search.entity.pack.FuzzyCriteria;
import io.onedev.server.search.entity.pack.PackQuery;
-import io.onedev.server.search.entity.pack.PackQueryLexer;
-import io.onedev.server.search.entity.pack.TypeCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.util.DateUtils;
import io.onedev.server.web.WebConstants;
@@ -93,7 +91,7 @@ public abstract class PackListPanel extends Panel {
@Override
protected PackQuery load() {
- return parse(queryStringModel.getObject(), getBaseQuery(), getPackType());
+ return parse(queryStringModel.getObject(), getBaseQuery());
}
};
@@ -127,7 +125,7 @@ public abstract class PackListPanel extends Panel {
}
@Nullable
- private PackQuery parse(@Nullable String queryString, PackQuery baseQuery, @Nullable String packType) {
+ private PackQuery parse(@Nullable String queryString, PackQuery baseQuery) {
PackQuery parsedQuery;
try {
parsedQuery = PackQuery.parse(getProject(), queryString, true);
@@ -141,10 +139,7 @@ public abstract class PackListPanel extends Panel {
parsedQuery = new PackQuery(new FuzzyCriteria(queryString));
}
}
- var query = PackQuery.merge(baseQuery, parsedQuery);
- if (packType != null)
- query = PackQuery.merge(query, new PackQuery(new TypeCriteria(packType, PackQueryLexer.Is)));
- return query;
+ return PackQuery.merge(baseQuery, parsedQuery);
}
@Override
@@ -399,16 +394,16 @@ public abstract class PackListPanel extends Panel {
}
@Override
public EntityQuery<Pack> getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new PackQuery();
+ var query = parse(queryStringModel.getObject(), new PackQuery());
+ return query!=null? query : 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);
+ doQuery(target);
}
});
}
@@ -432,24 +427,19 @@ public abstract class PackListPanel extends Panel {
@Override
public List<EntitySort> getObject() {
- PackQuery query = parse(queryStringModel.getObject(), new PackQuery(), null);
- PackListPanel.this.getFeedbackMessages().clear();
- if (query != null)
- return query.getSorts();
- else
- return new ArrayList<>();
+ var query = parse(queryStringModel.getObject(), new PackQuery());
+ return query!=null? query.getSorts() : new ArrayList<>();
}
@Override
public void setObject(List<EntitySort> object) {
- PackQuery query = parse(queryStringModel.getObject(), new PackQuery(), null);
+ PackQuery query = parse(queryStringModel.getObject(), new PackQuery());
PackListPanel.this.getFeedbackMessages().clear();
if (query == null)
query = new PackQuery();
- query.getSorts().clear();
- query.getSorts().addAll(object);
+ query.setSorts(object);
queryStringModel.setObject(query.toString());
- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
}
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 eeb7f00a36..f2551697dd 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
@@ -19,18 +19,18 @@
<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="operations" class="operations d-inline-block mb-2 mr-4 text-gray">
- <wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> Operations
- </a>
- <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>
+ <a wicket:id="operations" class="operations d-inline-block mb-2 mr-4 text-gray">
+ <wicket:svg href="ellipsis-circle" class="icon"></wicket:svg> Operations
+ </a>
+ <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>
<span wicket:id="count" class="float-right text-gray"></span>
</div>
<div wicket:id="body">
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 bcb5fdbd37..1eeb3a1f35 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
@@ -301,16 +301,16 @@ public class ProjectListPanel extends Panel {
}
@Override
public EntityQuery<Project> getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new ProjectQuery();
+ var query = parse(queryStringModel.getObject(), new ProjectQuery());
+ return query!=null? query : 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);
+ doQuery(target);
}
});
}
@@ -331,12 +331,8 @@ public class ProjectListPanel extends Panel {
@Override
public List<EntitySort> getObject() {
- ProjectQuery query = parse(queryStringModel.getObject(), new ProjectQuery());
- ProjectListPanel.this.getFeedbackMessages().clear();
- if (query != null)
- return query.getSorts();
- else
- return new ArrayList<>();
+ var query = parse(queryStringModel.getObject(), new ProjectQuery());
+ return query!=null? query.getSorts() : new ArrayList<>();
}
@Override
@@ -345,10 +341,9 @@ public class ProjectListPanel extends Panel {
ProjectListPanel.this.getFeedbackMessages().clear();
if (query == null)
query = new ProjectQuery();
- query.getSorts().clear();
- query.getSorts().addAll(object);
+ query.setSorts(object);
queryStringModel.setObject(query.toString());
- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
}
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 2cc9b73d83..e3ac29a576 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
@@ -19,15 +19,15 @@
<a wicket:id="saveQuery" class="save-query text-gray mr-4 mb-2 text-nowrap d-inline-block">
<wicket:svg href="save" class="icon"></wicket:svg> Save Query
</a>
- <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>
+ <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>
<span wicket:id="extraActions"></span>
<span wicket:id="count" class="float-right text-gray"></span>
</div>
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 44201cd15e..f5870bf3df 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
@@ -718,16 +718,16 @@ public abstract class PullRequestListPanel extends Panel {
}
@Override
public EntityQuery<PullRequest> getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new PullRequestQuery();
+ var query = parse(queryStringModel.getObject(), new PullRequestQuery());
+ return query!=null? query : 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);
+ doQuery(target);
}
});
}
@@ -752,11 +752,7 @@ public abstract class PullRequestListPanel extends Panel {
@Override
public List<EntitySort> getObject() {
var query = parse(queryStringModel.getObject(), new PullRequestQuery());
- PullRequestListPanel.this.getFeedbackMessages().clear();
- if (query != null)
- return query.getSorts();
- else
- return new ArrayList<>();
+ return query!=null? query.getSorts() : new ArrayList<>();
}
@Override
@@ -765,10 +761,9 @@ public abstract class PullRequestListPanel extends Panel {
PullRequestListPanel.this.getFeedbackMessages().clear();
if (query == null)
query = new PullRequestQuery();
- query.getSorts().clear();
- query.getSorts().addAll(object);
+ query.setSorts(object);
queryStringModel.setObject(query.toString());
- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
}
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 7cf758740d..0de2c4e6b2 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
@@ -206,7 +206,7 @@ class AgentListPanel extends Panel {
}
@Override
public EntityQuery<Agent> getObject() {
- return queryModel.getObject() != null? queryModel.getObject() : new AgentQuery();
+ return queryModel.getObject()!=null? queryModel.getObject() : new AgentQuery();
}
@Override
public void setObject(EntityQuery<Agent> object) {
@@ -236,25 +236,20 @@ class AgentListPanel extends Panel {
@Override
public List<EntitySort> getObject() {
- AgentQuery query = queryModel.getObject();
- AgentListPanel.this.getFeedbackMessages().clear();
- if (query != null)
- return query.getSorts();
- else
- return new ArrayList<>();
+ var query = queryModel.getObject();
+ return query!=null? query.getSorts() : new ArrayList<>();
}
@Override
public void setObject(List<EntitySort> object) {
- AgentQuery query = queryModel.getObject();
+ var query = queryModel.getObject();
AgentListPanel.this.getFeedbackMessages().clear();
if (query == null)
query = new AgentQuery();
- query.getSorts().clear();
- query.getSorts().addAll(object);
+ query.setSorts(object);
queryModel.setObject(query);
queryStringModel.setObject(query.toString());
- AjaxRequestTarget target = RequestCycle.get().find(AjaxRequestTarget.class);
+ var target = RequestCycle.get().find(AjaxRequestTarget.class);
target.add(queryInput);
doQuery(target);
}
diff --git a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html
index add838558e..98af463fda 100644
--- a/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html
+++ b/server-plugin/server-plugin-pack-container/src/main/java/io/onedev/server/plugin/pack/container/ContainerHelpPanel.html
@@ -7,8 +7,8 @@
<div class="font-size-lg font-weight-bolder mb-3">Then push image to desired repository under specified project</div>
<div wicket:id="pushCommand" class="mb-5"></div>
- <div>You may also do this via publish docker image step in CI/CD job, and specify built-in registry access
- token secret with package write permission</div>
+ <div>You can also achieve this by adding a build docker image step to your CI/CD job and configuring the built-in
+ registry login with an access token secret that has package write permissions</div>
<div wicket:id="insecureRegistryNote" class="mt-4"></div>
</div>
</wicket:panel>
\ No newline at end of file