The Unified and Autonomous Development Platform
Disable save query button if query is not submitted and validated
Robin Shen0a85739bf0d7
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.javaindex f59f4afa10..1658a22401 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,7 +1,9 @@package io.onedev.server.search.commit;+import java.util.ArrayList;import java.util.List;+import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.base.Preconditions;@@ -38,4 +40,12 @@ public class AfterCriteria extends CommitCriteria {return true;}+ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (String value: values)+ parts.add(getRuleName(CommitQueryLexer.AFTER) + parens(value));+ return StringUtils.join(parts, " ");+ }+}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.javaindex 27980b61bc..d47796dc8e 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,5 +1,6 @@package io.onedev.server.search.commit;+import java.util.ArrayList;import java.util.List;import org.apache.commons.lang3.StringUtils;@@ -57,4 +58,16 @@ public class AuthorCriteria extends CommitCriteria {return false;}+ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (String value: values) {+ if (value != null)+ parts.add(getRuleName(CommitQueryLexer.AUTHOR) + parens(value));+ else+ parts.add(getRuleName(CommitQueryLexer.AuthoredByMe));+ }+ return StringUtils.join(parts, " ");+ }+}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.javaindex 92c2e260bb..e36db7f72c 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,7 +1,9 @@package io.onedev.server.search.commit;+import java.util.ArrayList;import java.util.List;+import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.base.Preconditions;@@ -38,4 +40,12 @@ public class BeforeCriteria extends CommitCriteria {return true;}+ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (String value: values)+ parts.add(getRuleName(CommitQueryLexer.BEFORE) + parens(value));+ return StringUtils.join(parts, " ");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.javaindex f9cbed0889..6d8155fc54 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitCriteria.java@@ -4,6 +4,8 @@ import java.io.Serializable;import org.eclipse.jgit.lib.PersonIdent;+import io.onedev.commons.codeassist.AntlrUtils;+import io.onedev.commons.utils.StringUtils;import io.onedev.server.event.RefUpdated;import io.onedev.server.git.command.RevListCommand;import io.onedev.server.model.Project;@@ -22,4 +24,12 @@ public abstract class CommitCriteria implements Serializable {public abstract boolean matches(RefUpdated event);+ public static String getRuleName(int rule) {+ return AntlrUtils.getLexerRuleName(CommitQueryLexer.ruleNames, rule).replace(' ', '-');+ }++ public static String parens(String value) {+ return "(" + StringUtils.escape(value, "()") + ")";+ }+}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.javaindex 38525340fb..b90e09a082 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@@ -90,7 +90,7 @@ public class CommitQuery implements Serializable {Revision.Scope scope;if (criteria.revisionCriteria().DefaultBranch() != null)value = project.getDefaultBranch();- else+ elsevalue = getValue(criteria.revisionCriteria().Value());if (criteria.revisionCriteria().BUILD() != null) {String numberStr = value;@@ -99,7 +99,7 @@ public class CommitQuery implements Serializable {if (NumberUtils.isDigits(numberStr)) {Build build = OneDev.getInstance(BuildManager.class).find(project, Long.parseLong(numberStr));if (build == null)- throw new OneException("Unable to find build: #" + value);+ throw new OneException("Unable to find build: " + value);elsevalue = build.getCommitHash();} else {@@ -112,7 +112,7 @@ public class CommitQuery implements Serializable {scope = Revision.Scope.UNTIL;elsescope = null;- revisions.add(new Revision(value, scope));+ revisions.add(new Revision(value, scope, criteria.revisionCriteria().getText()));}}@@ -160,5 +160,13 @@ public class CommitQuery implements Serializable {criterias.addAll(query2.getCriterias());return new CommitQuery(criterias);}++ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (CommitCriteria criteria: criterias)+ parts.add(criteria.toString());+ return StringUtils.join(parts, " ");+ }}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.javaindex 107350fcec..cede632881 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/CommitterCriteria.java@@ -1,5 +1,6 @@package io.onedev.server.search.commit;+import java.util.ArrayList;import java.util.List;import org.apache.commons.lang3.StringUtils;@@ -57,4 +58,16 @@ public class CommitterCriteria extends CommitCriteria {return false;}+ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (String value: values) {+ if (value != null)+ parts.add(getRuleName(CommitQueryLexer.COMMITTER) + parens(value));+ else+ parts.add(getRuleName(CommitQueryLexer.CommittedByMe));+ }+ return StringUtils.join(parts, " ");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.javaindex ae0eae66bc..62791e18f2 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/MessageCriteria.java@@ -1,7 +1,9 @@package io.onedev.server.search.commit;+import java.util.ArrayList;import java.util.List;+import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.revwalk.RevCommit;import com.google.common.base.Preconditions;@@ -43,4 +45,12 @@ public class MessageCriteria extends CommitCriteria {return false;}+ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (String value: values)+ parts.add(getRuleName(CommitQueryLexer.MESSAGE) + parens(value));+ return StringUtils.join(parts, " ");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.javaindex 3b36e3245a..d1cf885bf1 100644--- a/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java+++ b/server-core/src/main/java/io/onedev/server/search/commit/PathCriteria.java@@ -1,9 +1,11 @@package io.onedev.server.search.commit;+import java.util.ArrayList;import java.util.Collection;import java.util.HashSet;import java.util.List;+import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.ObjectId;import org.eclipse.jgit.revwalk.RevCommit;@@ -61,4 +63,12 @@ public class PathCriteria extends CommitCriteria {return false;}+ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (String value: values)+ parts.add(getRuleName(CommitQueryLexer.PATH) + parens(value));+ return StringUtils.join(parts, " ");+ }+}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.javaindex 8058091ef6..2d78d89438 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@@ -12,23 +12,37 @@ public class Revision implements Serializable {private final String value;- private Scope scope;+ private final Scope scope;++ private final String toString;- public Revision(String value, @Nullable Scope scope) {+ public Revision(String value, @Nullable Scope scope, @Nullable String toString) {this.value = value;this.scope = scope;+ this.toString = toString;}+ public Revision(String value, @Nullable Scope scope) {+ this(value, scope, null);+ }+public Scope getScope() {return scope;}- public void setScope(Scope scope) {- this.scope = scope;- }-public String getValue() {return value;}++ @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;+ }+ return toString;+ }}\ No newline at end of filediff --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.javaindex 7eb97a4565..b2528e90df 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,9 +1,11 @@package io.onedev.server.search.commit;import java.io.IOException;+import java.util.ArrayList;import java.util.List;import java.util.stream.Collectors;+import org.apache.commons.lang3.StringUtils;import org.eclipse.jgit.lib.Ref;import com.google.common.base.Preconditions;@@ -64,4 +66,12 @@ public class RevisionCriteria extends CommitCriteria {}}+ @Override+ public String toString() {+ List<String> parts = new ArrayList<>();+ for (Revision revision: revisions)+ parts.add(revision.toString());+ return StringUtils.join(parts, " ");+ }+}diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.javaindex 4d6e9c550f..dd8bc3097d 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/inputassist/InputAssistBehavior.java@@ -202,6 +202,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {} else if (dropdown != null) {dropdown.close();}+ onInput(target, inputContent);}}@@ -210,6 +211,9 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {dropdown.close();}+ protected void onInput(AjaxRequestTarget target, String content) {+ }+@Overridepublic void renderHead(Component component, IHeaderResponse response) {super.renderHead(component, response);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.javaindex d1b6b0d157..37607b231d 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@@ -9,6 +9,7 @@ import java.util.Map;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;@@ -117,6 +118,8 @@ public abstract class BuildListPanel extends Panel {private Component saveQueryLink;+ private boolean querySubmitted = true;+public BuildListPanel(String id, IModel<String> queryModel, int expectedCount) {super(id);this.queryStringModel = queryModel;@@ -180,6 +183,7 @@ public abstract class BuildListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {buildsTable.setCurrentPage(0);target.add(body);+ querySubmitted = true;if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)target.add(saveQueryLink);}@@ -217,7 +221,7 @@ public abstract class BuildListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(queryModel.getObject() != null);+ setEnabled(querySubmitted && queryModel.getObject() != null);setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);}@@ -227,11 +231,15 @@ public abstract class BuildListPanel extends Panel {configure();if (!isEnabled())tag.put("disabled", "disabled");+ if (!querySubmitted)+ tag.put("title", "Query not submitted");+ else if (queryModel.getObject() == null)+ tag.put("title", "Can not save malformed query");}@Overridepublic void onClick(AjaxRequestTarget target) {- getQuerySaveSupport().onSaveQuery(target, queryStringModel.getObject());+ getQuerySaveSupport().onSaveQuery(target, queryModel.getObject().toString());}}.setOutputMarkupId(true));@@ -390,7 +398,17 @@ public abstract class BuildListPanel extends Panel {return getProject();}- }, true, true, true));+ }, true, true, true) {++ @Override+ protected void onInput(AjaxRequestTarget target, String inputContent) {+ BuildListPanel.this.getFeedbackMessages().clear();+ querySubmitted = StringUtils.trimToEmpty(queryStringModel.getObject())+ .equals(StringUtils.trimToEmpty(inputContent));+ target.add(saveQueryLink);+ }++ });queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {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.javaindex c7d39ea06b..95c3777ad6 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@@ -7,6 +7,7 @@ import java.util.List;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;@@ -109,6 +110,8 @@ public abstract class CodeCommentListPanel extends Panel {private WebMarkupContainer body;+ private boolean querySubmitted = true;+public CodeCommentListPanel(String id, IModel<String> queryModel) {super(id);this.queryStringModel = queryModel;@@ -121,6 +124,7 @@ public abstract class CodeCommentListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {commentsTable.setCurrentPage(0);target.add(body);+ querySubmitted = true;if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)target.add(saveQueryLink);}@@ -158,7 +162,7 @@ public abstract class CodeCommentListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(queryModel.getObject() != null);+ setEnabled(querySubmitted && queryModel.getObject() != null);setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);}@@ -168,11 +172,15 @@ public abstract class CodeCommentListPanel extends Panel {configure();if (!isEnabled())tag.put("disabled", "disabled");+ if (!querySubmitted)+ tag.put("title", "Query not submitted");+ else if (queryModel.getObject() == null)+ tag.put("title", "Can not save malformed query");}@Overridepublic void onClick(AjaxRequestTarget target) {- getQuerySaveSupport().onSaveQuery(target, queryStringModel.getObject());+ getQuerySaveSupport().onSaveQuery(target, queryModel.getObject().toString());}}.setOutputMarkupId(true));@@ -231,7 +239,17 @@ public abstract class CodeCommentListPanel extends Panel {return getProject();}- }));+ }) {++ @Override+ protected void onInput(AjaxRequestTarget target, String inputContent) {+ CodeCommentListPanel.this.getFeedbackMessages().clear();+ querySubmitted = StringUtils.trimToEmpty(queryStringModel.getObject())+ .equals(StringUtils.trimToEmpty(inputContent));+ target.add(saveQueryLink);+ }++ });queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@Overridediff --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.javaindex e53909a9cc..5f8925282f 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@@ -12,6 +12,7 @@ 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;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;@@ -233,6 +234,8 @@ public abstract class CommitListPanel extends Panel {private Component saveQueryLink;+ private boolean querySubmitted = true;+public CommitListPanel(String id, IModel<String> queryModel) {super(id);this.queryStringModel = queryModel;@@ -267,6 +270,7 @@ public abstract class CommitListPanel extends Panel {page = 1;target.add(body);target.add(foot);+ querySubmitted = true;target.appendJavaScript(renderCommitGraph());if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)target.add(saveQueryLink);@@ -305,7 +309,7 @@ public abstract class CommitListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(queryModel.getObject() != null);+ setEnabled(querySubmitted && queryModel.getObject() != null);setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);}@@ -315,11 +319,15 @@ public abstract class CommitListPanel extends Panel {configure();if (!isEnabled())tag.put("disabled", "disabled");+ if (!querySubmitted)+ tag.put("title", "Query not submitted");+ else if (queryModel.getObject() == null)+ tag.put("title", "Can not save malformed query");}@Overridepublic void onClick(AjaxRequestTarget target) {- getQuerySaveSupport().onSaveQuery(target, queryStringModel.getObject());+ getQuerySaveSupport().onSaveQuery(target, queryModel.getObject().toString());}}.setOutputMarkupId(true));@@ -332,7 +340,18 @@ public abstract class CommitListPanel extends Panel {return getProject();}- }));+ }) {++ @Override+ protected void onInput(AjaxRequestTarget target, String inputContent) {+ CommitListPanel.this.getFeedbackMessages().clear();+ querySubmitted = StringUtils.trimToEmpty(queryStringModel.getObject())+ .equals(StringUtils.trimToEmpty(inputContent));+ target.add(saveQueryLink);+ }++ });+queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@Overridediff --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.javaindex b6624d499f..77293967af 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@@ -9,6 +9,7 @@ import java.util.Map;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;@@ -123,6 +124,8 @@ public abstract class IssueListPanel extends Panel {private TextField<String> queryInput;+ private boolean querySubmitted = true;+public IssueListPanel(String id, IModel<String> queryModel) {super(id);this.queryStringModel = queryModel;@@ -181,6 +184,7 @@ public abstract class IssueListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {issuesTable.setCurrentPage(0);target.add(body);+ querySubmitted = true;if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)target.add(saveQueryLink);}@@ -218,7 +222,7 @@ public abstract class IssueListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(queryModel.getObject() != null);+ setEnabled(querySubmitted && queryModel.getObject() != null);setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);}@@ -228,11 +232,15 @@ public abstract class IssueListPanel extends Panel {configure();if (!isEnabled())tag.put("disabled", "disabled");+ if (!querySubmitted)+ tag.put("title", "Query not submitted");+ else if (queryModel.getObject() == null)+ tag.put("title", "Can not save malformed query");}@Overridepublic void onClick(AjaxRequestTarget target) {- getQuerySaveSupport().onSaveQuery(target, queryStringModel.getObject());+ getQuerySaveSupport().onSaveQuery(target, queryModel.getObject().toString());}}.setOutputMarkupId(true));@@ -296,7 +304,17 @@ public abstract class IssueListPanel extends Panel {return getProject();}- }, true, true, false, false, false));+ }, true, true, false, false, false) {++ @Override+ protected void onInput(AjaxRequestTarget target, String inputContent) {+ IssueListPanel.this.getFeedbackMessages().clear();+ querySubmitted = StringUtils.trimToEmpty(queryStringModel.getObject())+ .equals(StringUtils.trimToEmpty(inputContent));+ target.add(saveQueryLink);+ }++ });queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {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.javaindex 42627a4728..60db94ef34 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@@ -6,6 +6,7 @@ import java.util.List;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;@@ -99,6 +100,8 @@ public class ProjectListPanel extends Panel {private TextField<String> queryInput;+ private boolean querySubmitted = true;+public ProjectListPanel(String id, IModel<String> queryModel, int expectedCount) {super(id);this.queryStringModel = queryModel;@@ -129,6 +132,7 @@ public class ProjectListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {dataTable.setCurrentPage(0);target.add(body);+ querySubmitted = true;if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)target.add(saveQueryLink);}@@ -170,7 +174,7 @@ public class ProjectListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(queryModel.getObject() != null);+ setEnabled(querySubmitted && queryModel.getObject() != null);setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);}@@ -180,11 +184,15 @@ public class ProjectListPanel extends Panel {configure();if (!isEnabled())tag.put("disabled", "disabled");+ if (!querySubmitted)+ tag.put("title", "Query not submitted");+ else if (queryModel.getObject() == null)+ tag.put("title", "Can not save malformed query");}@Overridepublic void onClick(AjaxRequestTarget target) {- getQuerySaveSupport().onSaveQuery(target, queryStringModel.getObject());+ getQuerySaveSupport().onSaveQuery(target, queryModel.getObject().toString());}});@@ -236,7 +244,17 @@ public class ProjectListPanel extends Panel {queryInput = new TextField<String>("input", queryStringModel);queryInput.setOutputMarkupId(true);- queryInput.add(new ProjectQueryBehavior());+ queryInput.add(new ProjectQueryBehavior() {++ @Override+ protected void onInput(AjaxRequestTarget target, String inputContent) {+ ProjectListPanel.this.getFeedbackMessages().clear();+ querySubmitted = StringUtils.trimToEmpty(queryStringModel.getObject())+ .equals(StringUtils.trimToEmpty(inputContent));+ target.add(saveQueryLink);+ }++ });queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {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.javaindex b093959149..fff41c1f0b 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@@ -7,6 +7,7 @@ import java.util.List;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;@@ -109,6 +110,8 @@ public abstract class PullRequestListPanel extends Panel {private WebMarkupContainer body;+ private boolean querySubmitted = true;+public PullRequestListPanel(String id, IModel<String> queryModel) {super(id);this.queryStringModel = queryModel;@@ -164,6 +167,7 @@ public abstract class PullRequestListPanel extends Panel {private void doQuery(AjaxRequestTarget target) {requestsTable.setCurrentPage(0);target.add(body);+ querySubmitted = true;if (SecurityUtils.getUser() != null && getQuerySaveSupport() != null)target.add(saveQueryLink);}@@ -201,7 +205,7 @@ public abstract class PullRequestListPanel extends Panel {@Overrideprotected void onConfigure() {super.onConfigure();- setEnabled(queryModel.getObject() != null);+ setEnabled(querySubmitted && queryModel.getObject() != null);setVisible(SecurityUtils.getUser() != null && getQuerySaveSupport() != null);}@@ -211,11 +215,15 @@ public abstract class PullRequestListPanel extends Panel {configure();if (!isEnabled())tag.put("disabled", "disabled");+ if (!querySubmitted)+ tag.put("title", "Query not submitted");+ else if (queryModel.getObject() == null)+ tag.put("title", "Can not save malformed query");}@Overridepublic void onClick(AjaxRequestTarget target) {- getQuerySaveSupport().onSaveQuery(target, queryStringModel.getObject());+ getQuerySaveSupport().onSaveQuery(target, queryModel.getObject().toString());}}.setOutputMarkupId(true));@@ -275,7 +283,17 @@ public abstract class PullRequestListPanel extends Panel {return getProject();}- }));+ }) {++ @Override+ protected void onInput(AjaxRequestTarget target, String inputContent) {+ PullRequestListPanel.this.getFeedbackMessages().clear();+ querySubmitted = StringUtils.trimToEmpty(queryStringModel.getObject())+ .equals(StringUtils.trimToEmpty(inputContent));+ target.add(saveQueryLink);+ }++ });queryInput.add(new AjaxFormComponentUpdatingBehavior("clear") {@Overridediff --git a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.javaindex 0cb97c9fe6..71754fc8b4 100644--- a/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java+++ b/server-core/src/main/java/io/onedev/server/web/component/savedquery/SaveQueryBean.java@@ -13,7 +13,7 @@ public class SaveQueryBean implements Serializable {private static final long serialVersionUID = 1L;private String name;-+@Editable(description="Specify name of the saved query")@NotEmpty@OmitName