Skip to content

The Unified and Autonomous Development Platform

feat: More user-friendly default Issues search behavior (OD-2092)

Robin Shena3f3adc072c2
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 1447ae49da..71298d528c 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
@@ -2,6 +2,7 @@ package io.onedev.server.search.entity.issue;
import io.onedev.commons.codeassist.AntlrUtils;
import io.onedev.commons.utils.ExplicitException;
+import io.onedev.commons.utils.LinearRange;
import io.onedev.server.OneDev;
import io.onedev.server.entitymanager.SettingManager;
import io.onedev.server.model.Issue;
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java
deleted file mode 100644
index 3090e8f92f..0000000000
--- a/server-core/src/main/java/io/onedev/server/web/behavior/MultilineAssistBehavior.java
+++ /dev/null
@@ -1,59 +0,0 @@
-package io.onedev.server.web.behavior;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import io.onedev.commons.codeassist.InputCompletion;
-import io.onedev.commons.codeassist.InputStatus;
-import io.onedev.commons.codeassist.InputSuggestion;
-import io.onedev.commons.utils.LinearRange;
-import io.onedev.server.web.behavior.inputassist.InputAssistBehavior;
-
-@SuppressWarnings("serial")
-public abstract class MultilineAssistBehavior extends InputAssistBehavior {
-
- public MultilineAssistBehavior() {
- super(false);
- }
-
- @Override
- protected List<InputCompletion> getSuggestions(InputStatus inputStatus) {
- List<InputCompletion> completions = new ArrayList<>();
- String contentBeforeCaret = inputStatus.getContentBeforeCaret();
- int lineStart = contentBeforeCaret.lastIndexOf('\n') + 1;
- for (InputSuggestion suggestion: getLineSuggestions(contentBeforeCaret.substring(lineStart).trim())) {
- int caret = suggestion.getCaret();
- if (caret == -1)
- caret = suggestion.getContent().length();
- caret += lineStart;
- completions.add(new InputCompletion(
- suggestion.getContent(),
- contentBeforeCaret.substring(0, lineStart) + suggestion.getContent(),
- caret,
- suggestion.getDescription(),
- suggestion.getMatch()
- ));
- }
-
- return completions;
- }
-
- protected abstract List<InputSuggestion> getLineSuggestions(String matchWith);
-
- @Override
- protected List<LinearRange> getErrors(String inputContent) {
- return null;
- }
-
- @Override
- protected int getAnchor(String content) {
- int lineStart = content.lastIndexOf('\n') + 1;
- String line = content.substring(0, lineStart);
- for (int i=0; i<line.length(); i++) {
- if (!Character.isWhitespace(line.charAt(i)))
- return i + lineStart;
- }
- return content.length() + lineStart;
- }
-
-}
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.java
index 4eaee66e60..1d4b53a41b 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
@@ -34,7 +34,7 @@ public abstract class InputAssistBehavior extends AbstractPostAjaxBehavior {
public static final int MAX_SUGGESTIONS = 1000;
- private boolean hideIfBlank;
+ private final boolean hideIfBlank;
private FloatingPanel dropdown;
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 e3c858df0c..3068ca64c3 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
@@ -16,11 +16,12 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.support.administration.GlobalBuildSetting;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.build.BuildQuery;
+import io.onedev.server.search.entity.build.FuzzyCriteria;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.JobPermission;
import io.onedev.server.security.permission.RunJob;
-import io.onedev.server.util.Input;
import io.onedev.server.util.DateUtils;
+import io.onedev.server.util.Input;
import io.onedev.server.web.WebConstants;
import io.onedev.server.web.WebSession;
import io.onedev.server.web.behavior.BuildQueryBehavior;
@@ -151,16 +152,19 @@ public abstract class BuildListPanel extends Panel {
@Nullable
private BuildQuery parse(@Nullable String queryString, BuildQuery baseQuery) {
+ BuildQuery parsedQuery;
try {
- return BuildQuery.merge(baseQuery, BuildQuery.parse(getProject(), queryString, true, true));
+ parsedQuery = BuildQuery.parse(getProject(), queryString, true, true);
} catch (Exception e) {
getFeedbackMessages().clear();
- if (e instanceof ExplicitException)
+ if (e instanceof ExplicitException) {
error(e.getMessage());
- else
- error("Malformed query");
- return null;
+ return null;
+ } else {
+ parsedQuery = new BuildQuery(new FuzzyCriteria(queryString));
+ }
}
+ return BuildQuery.merge(baseQuery, parsedQuery);
}
@Override
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 9ddbc765c2..4fa80dae25 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
@@ -9,6 +9,7 @@ import io.onedev.server.model.*;
import io.onedev.server.model.support.LastActivity;
import io.onedev.server.search.entity.EntitySort;
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;
@@ -89,11 +90,12 @@ public abstract class CodeCommentListPanel extends Panel {
return CodeCommentQuery.parse(getProject(), queryString, true);
} catch (Exception e) {
getFeedbackMessages().clear();
- if (e instanceof ExplicitException)
+ if (e instanceof ExplicitException) {
error(e.getMessage());
- else
- error("Malformed query");
- return null;
+ return null;
+ } else {
+ return new CodeCommentQuery(new FuzzyCriteria(queryString));
+ }
}
}
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 abea53dd2d..ee3a6aba80 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
@@ -89,18 +89,20 @@ public abstract class CommitListPanel extends Panel {
@Override
protected CommitQuery load() {
- getFeedbackMessages().clear();
String queryString = queryStringModel.getObject();
+ CommitQuery parsedQuery;
try {
- return CommitQuery.merge(getBaseQuery(), CommitQuery.parse(getProject(), queryString, true));
+ parsedQuery = CommitQuery.parse(getProject(), queryString, true);
} catch (Exception e) {
getFeedbackMessages().clear();
- if (e instanceof ExplicitException)
+ if (e instanceof ExplicitException) {
error(e.getMessage());
- else
- error("Malformed query");
- return null;
+ return null;
+ } else {
+ parsedQuery = new CommitQuery(Lists.newArrayList(new FuzzyCriteria(Lists.newArrayList(queryString))));
+ }
}
+ return CommitQuery.merge(getBaseQuery(), parsedQuery);
}
};
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 ca58fd211d..0ad225c668 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
@@ -17,15 +17,16 @@ 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.EntitySort;
+import io.onedev.server.search.entity.issue.FuzzyCriteria;
import io.onedev.server.search.entity.issue.IssueQuery;
import io.onedev.server.search.entity.issue.IssueQueryParseOption;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.AccessProject;
import io.onedev.server.timetracking.TimeTrackingManager;
+import io.onedev.server.util.DateUtils;
import io.onedev.server.util.Input;
import io.onedev.server.util.LinkSide;
import io.onedev.server.util.ProjectScope;
-import io.onedev.server.util.DateUtils;
import io.onedev.server.util.facade.ProjectCache;
import io.onedev.server.util.watch.WatchStatus;
import io.onedev.server.web.WebConstants;
@@ -173,16 +174,19 @@ public abstract class IssueListPanel extends Panel {
IssueQueryParseOption option = new IssueQueryParseOption().withCurrentUserCriteria(true);
if (getProject() != null)
option.withCurrentProjectCriteria(true);
+ IssueQuery parsedQuery;
try {
- return merge(baseQuery, IssueQuery.parse(getProject(), queryString, option, true));
+ parsedQuery = IssueQuery.parse(getProject(), queryString, option, true);
} catch (Exception e) {
getFeedbackMessages().clear();
- if (e instanceof ExplicitException)
+ if (e instanceof ExplicitException) {
error(e.getMessage());
- else
- error("Malformed query");
- return null;
+ return null;
+ } else {
+ parsedQuery = new IssueQuery(new FuzzyCriteria(queryString));
+ }
}
+ return merge(baseQuery, parsedQuery);
}
@Nullable
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 8366a305b2..e8ddab5487 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
@@ -7,6 +7,7 @@ import io.onedev.server.model.Pack;
import io.onedev.server.model.Project;
import io.onedev.server.pack.PackSupport;
import io.onedev.server.search.entity.EntitySort;
+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;
@@ -115,19 +116,22 @@ public abstract class PackListPanel extends Panel {
@Nullable
private PackQuery parse(@Nullable String queryString, PackQuery baseQuery, @Nullable String packType) {
+ PackQuery parsedQuery;
try {
- var query = PackQuery.merge(baseQuery, PackQuery.parse(getProject(), queryString, true));
- if (packType != null)
- query = PackQuery.merge(query, new PackQuery(new TypeCriteria(packType, PackQueryLexer.Is)));
- return query;
+ parsedQuery = PackQuery.parse(getProject(), queryString, true);
} catch (Exception e) {
getFeedbackMessages().clear();
- if (e instanceof ExplicitException)
+ if (e instanceof ExplicitException) {
error(e.getMessage());
- else
- error("Malformed query");
- return null;
+ return null;
+ } else {
+ 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;
}
@Override
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 9d58a37c9a..a0b4546b0d 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
@@ -11,6 +11,7 @@ import io.onedev.server.model.PullRequest;
import io.onedev.server.model.support.administration.GlobalIssueSetting;
import io.onedev.server.search.entity.EntitySort;
import io.onedev.server.search.entity.project.ChildrenOfCriteria;
+import io.onedev.server.search.entity.project.FuzzyCriteria;
import io.onedev.server.search.entity.project.ProjectQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.CreateChildren;
@@ -1248,16 +1249,19 @@ public class ProjectListPanel extends Panel {
@Nullable
private ProjectQuery parse(@Nullable String queryString, ProjectQuery baseQuery) {
+ ProjectQuery parsedQuery;
try {
- return ProjectQuery.merge(baseQuery, ProjectQuery.parse(queryString));
+ parsedQuery = ProjectQuery.parse(queryString);
} catch (Exception e) {
getFeedbackMessages().clear();
- if (e instanceof ExplicitException)
+ if (e instanceof ExplicitException) {
error(e.getMessage());
- else
- error("Malformed query");
- return null;
+ return null;
+ } else {
+ parsedQuery = new ProjectQuery(new FuzzyCriteria(queryString));
+ }
}
+ return ProjectQuery.merge(baseQuery, parsedQuery);
}
@Nullable
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 99eb0b5b16..37500ed2b3 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
@@ -15,6 +15,7 @@ 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.EntitySort;
+import io.onedev.server.search.entity.pullrequest.FuzzyCriteria;
import io.onedev.server.search.entity.pullrequest.PullRequestQuery;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.security.permission.ReadCode;
@@ -151,16 +152,19 @@ public abstract class PullRequestListPanel extends Panel {
@Nullable
private PullRequestQuery parse(@Nullable String queryString, PullRequestQuery baseQuery) {
+ PullRequestQuery parsedQuery;
try {
- return PullRequestQuery.merge(baseQuery, PullRequestQuery.parse(getProject(), queryString, true));
+ parsedQuery = PullRequestQuery.parse(getProject(), queryString, true);
} catch (Exception e) {
getFeedbackMessages().clear();
- if (e instanceof ExplicitException)
+ if (e instanceof ExplicitException) {
error(e.getMessage());
- else
- error("Malformed query");
- return null;
+ return null;
+ } else {
+ parsedQuery = new PullRequestQuery(new FuzzyCriteria(queryString));
+ }
}
+ return PullRequestQuery.merge(baseQuery, parsedQuery);
}
@Override