The Unified and Autonomous Development Platform
fix issue #93: Fuzzy query support in issue boards
Robin Shenb030a67f9705
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 1b11bc2985..d9ecfab660 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@@ -93,7 +93,7 @@ import io.onedev.server.web.util.QuerySaveSupport;@SuppressWarnings("serial")public abstract class BuildListPanel extends Panel {- private final String query;+ private String query;private final int expectedCount;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.javaindex c3609c3a54..5a92e2888a 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@@ -96,7 +96,7 @@ import io.onedev.server.web.util.ReferenceTransformer;@SuppressWarnings("serial")public abstract class IssueListPanel extends Panel {- private final String query;+ private String query;private IModel<IssueQuery> parsedQueryModel = new LoadableDetachableModel<IssueQuery>() {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 3a2b110f85..f4f70f5119 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@@ -65,7 +65,7 @@ import io.onedev.server.web.util.QuerySaveSupport;@SuppressWarnings("serial")public class ProjectListPanel extends Panel {- private final String query;+ private String query;private final int expectedCount;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 f9ef8c5c92..c0d49b6611 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@@ -85,7 +85,7 @@ import io.onedev.server.web.util.ReferenceTransformer;@SuppressWarnings("serial")public abstract class PullRequestListPanel extends Panel {- private final String query;+ private String query;private IModel<PullRequestQuery> parsedQueryModel = new LoadableDetachableModel<PullRequestQuery>() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/base/base.css b/server-core/src/main/java/io/onedev/server/web/page/base/base.cssindex 9d888e1928..1d6b37dafc 100644--- a/server-core/src/main/java/io/onedev/server/web/page/base/base.css+++ b/server-core/src/main/java/io/onedev/server/web/page/base/base.css@@ -77,7 +77,7 @@ ul.feedbackPanel {}ul.feedbackPanel>li {margin: 0;- padding: 8px 0 8px 12px;+ padding: 0 0 0 12px;border-left: 6px solid;}li.feedbackPanelERROR, li.feedbackPanelFATAL {@@ -103,9 +103,11 @@ li.feedbackPanelWARNING {ul.feedbackPanel>li:first-child {border-radius: 4px 4px 0 0;+ padding-top: 8px;}ul.feedbackPanel>li:last-child {border-radius: 0 0 4px 4px;+ padding-bottom: 8px;}ul.feedbackPanel>li:first-child:last-child {border-radius: 4px;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.htmlindex 4b9f9d4bf9..e9b7432459 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.html@@ -1,7 +1,5 @@<wicket:extend>- <div id="issue-boards">- <wicket:container wicket:id="content"></wicket:container>- </div>+ <div wicket:id="content" id="issue-boards"></div><wicket:fragment wicket:id="hasBoardsFrag"><div class="head"><form wicket:id="query" class="clearable-wrapper">@@ -22,9 +20,11 @@</div></form></div>- <div wicket:id="feedback" class="feedback"></div>- <div class="body">- <div wicket:id="columns" class="column"></div>+ <div wicket:id="body" class="body">+ <div wicket:id="feedback" class="feedback"></div>+ <div class="columns">+ <div wicket:id="columns" class="column"></div>+ </div></div></wicket:fragment><wicket:fragment wicket:id="noBoardsFrag">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.javaindex 9585cd6c94..33d26a97f1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/IssueBoardsPage.java@@ -1,5 +1,6 @@package io.onedev.server.web.page.project.issues.boards;+import java.io.Serializable;import java.util.Date;import java.util.List;import java.util.stream.Collectors;@@ -12,13 +13,16 @@ import org.apache.wicket.Session;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.attributes.AjaxRequestAttributes;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.feedback.FeedbackMessage;+import org.apache.wicket.feedback.FencedFeedbackPanel;+import org.apache.wicket.feedback.IFeedbackMessageFilter;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.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.Form;import org.apache.wicket.markup.html.form.TextField;import org.apache.wicket.markup.html.link.BookmarkablePageLink;@@ -31,12 +35,9 @@ 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.slf4j.Logger;-import org.slf4j.LoggerFactory;-import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;-import io.onedev.commons.utils.HtmlUtils;import io.onedev.server.OneDev;import io.onedev.server.OneException;import io.onedev.server.entitymanager.MilestoneManager;@@ -44,7 +45,11 @@ import io.onedev.server.entitymanager.ProjectManager;import io.onedev.server.issue.BoardSpec;import io.onedev.server.model.Milestone;import io.onedev.server.model.Project;+import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.issue.IssueQuery;+import io.onedev.server.search.entity.issue.IssueQueryLexer;+import io.onedev.server.search.entity.issue.NumberCriteria;+import io.onedev.server.search.entity.issue.TitleCriteria;import io.onedev.server.util.DateUtils;import io.onedev.server.util.SecurityUtils;import io.onedev.server.web.ajaxlistener.ConfirmListener;@@ -64,8 +69,6 @@ import io.onedev.server.web.util.ConfirmOnClick;@SuppressWarnings("serial")public class IssueBoardsPage extends ProjectIssuesPage {- private static final Logger logger = LoggerFactory.getLogger(IssueBoardsPage.class);-private static final String PARAM_BOARD = "board";private static final String PARAM_MILESTONE = "milestone";@@ -84,11 +87,11 @@ public class IssueBoardsPage extends ProjectIssuesPage {private final boolean backlog;- private final String query;+ private String query;- private final String backlogQuery;+ private String backlogQuery;- private RepeatingView columnsView;+ private Fragment contentFrag;private final IModel<IssueQuery> parsedQueryModel = new LoadableDetachableModel<IssueQuery>() {@@ -108,49 +111,43 @@ public class IssueBoardsPage extends ProjectIssuesPage {};- private NotificationPanel feedback;-- private IssueQuery parse(boolean backlog, @Nullable String baseQueryString, @Nullable String additionalQueryString) {- IssueQuery additionalQuery;+ private IssueQuery parse(boolean backlog, @Nullable String baseQuery, @Nullable String query) {+ contentFrag.getFeedbackMessages().clear(new IFeedbackMessageFilter() {++ @Override+ public boolean accept(FeedbackMessage message) {+ return ((QueryParseMessage)message.getMessage()).backlog == backlog;+ }++ });++ IssueQuery parsedQuery;try {- additionalQuery = IssueQuery.parse(getProject(), additionalQueryString, true, true, false, false, false);+ parsedQuery = IssueQuery.parse(getProject(), query, true, true, false, false, false);+ } catch (OneException e) {+ contentFrag.error(new QueryParseMessage(backlog, "Error parsing %squery: " + e.getMessage()));+ return null;} catch (Exception e) {- if (backlog) {- logger.debug("Error parsing backlog query: " + additionalQueryString, e);- if (e.getMessage() != null)- error("Error parsing backlog query: " + HtmlUtils.formatAsHtml(e.getMessage()));- else- error("Malformed backlog query");- } else {- logger.debug("Error parsing issue query: " + additionalQueryString, e);- if (e.getMessage() != null)- error("Error parsing issue query: " + HtmlUtils.formatAsHtml(e.getMessage()));- else- error("Malformed issue query");+ contentFrag.warn(new QueryParseMessage(backlog, "Not a valid %sformal query, performing fuzzy query"));+ try {+ EntityQuery.getProjectScopedNumber(getProject(), query);+ parsedQuery = new IssueQuery(new NumberCriteria(getProject(), query, IssueQueryLexer.Is));+ } catch (Exception e2) {+ parsedQuery = new IssueQuery(new TitleCriteria("*" + query + "*"));}- return null;- }+ }- IssueQuery baseQuery;+ IssueQuery parsedBaseQuery;try {- baseQuery = IssueQuery.parse(getProject(), baseQueryString, true, true, false, false, false);+ parsedBaseQuery = IssueQuery.parse(getProject(), baseQuery, true, true, false, false, false);+ } catch (OneException e) {+ contentFrag.error(new QueryParseMessage(backlog, "Error parsing %sbase query: " + e.getMessage()));+ return null;} catch (Exception e) {- if (backlog) {- logger.debug("Error parsing backlog base query: " + baseQueryString, e);- if (e.getMessage() != null)- error("Error parsing backlog base query: " + HtmlUtils.formatAsHtml(e.getMessage()));- else- error("Malformed backlog base query");- } else {- logger.debug("Error parsing base query: " + baseQueryString, e);- if (e.getMessage() != null)- error("Error parsing base query: " + HtmlUtils.formatAsHtml(e.getMessage()));- else- error("Malformed issue query");- }+ contentFrag.error(new QueryParseMessage(backlog, "Malformed %sbase query: " + e.getMessage()));return null;}- return IssueQuery.merge(baseQuery, additionalQuery);+ return IssueQuery.merge(parsedBaseQuery, parsedQuery);}public IssueBoardsPage(PageParameters params) {@@ -229,7 +226,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {super.onInitialize();if (getBoard() != null) {- Fragment boardFragment = new Fragment("content", "hasBoardsFrag", this);+ contentFrag = new Fragment("content", "hasBoardsFrag", this);Form<?> form = new Form<Void>("query");if (!SecurityUtils.canManageIssues(getProject()))@@ -579,12 +576,26 @@ public class IssueBoardsPage extends ProjectIssuesPage {form.add(new WebMarkupContainer("milestone").setVisible(false));}- IModel<String> model;- if (backlog)- model = Model.of(backlogQuery);- else- model = Model.of(query);- TextField<String> input = new TextField<String>("input", model);+ TextField<String> input = new TextField<String>("input", new IModel<String>() {++ @Override+ public void detach() {+ }++ @Override+ public String getObject() {+ return backlog?backlogQuery:query;+ }++ @Override+ public void setObject(String object) {+ if (backlog)+ backlogQuery = object;+ else+ query = object;+ }++ });input.add(new IssueQueryBehavior(projectModel, true, true, false, false, false));if (backlog)input.add(AttributeAppender.append("placeholder", "Filter backlog issues"));@@ -593,31 +604,45 @@ public class IssueBoardsPage extends ProjectIssuesPage {form.add(input);- form.add(new Button("submit") {+ WebMarkupContainer body = new WebMarkupContainer("body") {@Override- public void onSubmit() {- super.onSubmit();- PageParameters params;- if (backlog) {- params = IssueBoardsPage.paramsOf(getProject(), getBoard(),- getMilestone(), backlog, query, input.getModelObject());- } else {- params = IssueBoardsPage.paramsOf(getProject(), getBoard(),- getMilestone(), backlog, input.getModelObject(), backlogQuery);- }+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueBoards.onBodyDomReady();"));+ }++ };+ body.setOutputMarkupId(true);+ body.add(new FencedFeedbackPanel("feedback", contentFrag));+ contentFrag.add(body);++ form.add(new AjaxButton("submit") {++ @Override+ protected void onSubmit(AjaxRequestTarget target, Form<?> form) {+ super.onSubmit(target, form);++ if (backlog)+ backlogQuery = input.getModelObject();+ else+ query = input.getModelObject();++ PageParameters params = IssueBoardsPage.paramsOf(getProject(), getBoard(),+ getMilestone(), backlog, query, backlogQuery);- setResponsePage(IssueBoardsPage.class, params);+ CharSequence url = RequestCycle.get().urlFor(IssueBoardsPage.class, params);+ pushState(target, url.toString(), input.getModelObject());++ target.add(body);+ target.appendJavaScript("$(window).resize();");}});- boardFragment.add(form);-- boardFragment.add(feedback = new NotificationPanel("feedback", IssueBoardsPage.this));- feedback.setOutputMarkupPlaceholderTag(true);+ contentFrag.add(form);- columnsView = new RepeatingView("columns");+ RepeatingView columnsView = new RepeatingView("columns");if (backlog) {columnsView.add(new BacklogColumnPanel("backlog") {@@ -664,12 +689,10 @@ public class IssueBoardsPage extends ProjectIssuesPage {});}- boardFragment.add(columnsView);-- add(boardFragment);+ body.add(columnsView);} else {- Fragment fragment = new Fragment("content", "noBoardsFrag", this);- fragment.add(new CreateBoardLink("newBoard") {+ contentFrag = new Fragment("content", "noBoardsFrag", this);+ contentFrag.add(new CreateBoardLink("newBoard") {@Overrideprotected void onConfigure() {@@ -678,7 +701,7 @@ public class IssueBoardsPage extends ProjectIssuesPage {}});- fragment.add(new Link<Void>("useDefault") {+ contentFrag.add(new Link<Void>("useDefault") {@Overrideprotected void onConfigure() {@@ -695,8 +718,9 @@ public class IssueBoardsPage extends ProjectIssuesPage {}});- add(fragment);}+ contentFrag.setOutputMarkupId(true);+ add(contentFrag);}@Override@@ -706,6 +730,16 @@ public class IssueBoardsPage extends ProjectIssuesPage {response.render(OnDomReadyHeaderItem.forScript("onedev.server.issueBoards.onDomReady();"));}+ @Override+ protected void onPopState(AjaxRequestTarget target, Serializable data) {+ if (backlog)+ backlogQuery = (String) data;+ else+ query = (String) data;+ target.add(contentFrag);+ target.appendJavaScript("$(window).resize();");+ }+public static PageParameters paramsOf(Project project, @Nullable BoardSpec board,@Nullable Milestone milestone, boolean backlog, @Nullable String query,@Nullable String backlogQuery) {@@ -843,4 +877,22 @@ public class IssueBoardsPage extends ProjectIssuesPage {};}}++ private static class QueryParseMessage implements Serializable {++ final boolean backlog;++ final String template;++ public QueryParseMessage(boolean backlog, String template) {+ this.backlog = backlog;+ this.template = template;+ }++ @Override+ public String toString() {+ return String.format(template, backlog?"backlog ":"");+ }++ }}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.cssindex d025e12a9b..c534854942 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.css@@ -1,6 +1,7 @@/* Make sure we have enough room for query input in mobile devices */#issue-boards>.head {min-width: 570px;+ margin-bottom: 20px;}#issue-boards .no-boards {font-size: 16px;@@ -42,25 +43,21 @@display: none;}-#issue-boards>.feedback .alert {- margin-top: 20px;- margin-bottom: 0;-}-#issue-boards>.body {+#issue-boards>.body>.columns {position: relative;margin: 0 -20px;/* hack to makes all column of same width and same space */- padding: 20px 0 20px 20px;+ padding: 0 0 20px 20px;display: flex;}-#issue-boards>.body>.column {+#issue-boards>.body>.columns>.column {flex: 1 1 auto;min-width: 360px;height: 100%;/* hack to makes all column of same width and same space */padding-right: 20px;}-#issue-boards>.body>.column>.content {+#issue-boards>.body>.columns>.column>.content {border: 1px solid #E0E0E0;border-radius: 4px;height: 100%;@@ -68,39 +65,39 @@flex-direction: column;background: #F9F9F9;}-#issue-boards>.body>.column>.content>.head {+#issue-boards>.body>.columns>.column>.content>.head {font-weight: bold;padding: 6px 12px;font-size: 15px;border-bottom: 1px solid #E0E0E0;border-top: 3px solid #E0E0E0;}-#issue-boards>.body>.column>.content>.head .badge {+#issue-boards>.body>.columns>.column>.content>.head .badge {margin-left: 8px;margin-top: 2px;font-size: 10px;}-#issue-boards>.body>.column>.content>.head a {+#issue-boards>.body>.columns>.column>.content>.head a {color: #666;margin-left: 8px;}-#issue-boards>.body>.column>.content>.body {+#issue-boards>.body>.columns>.column>.content>.body {position: relative;padding: 16px 16px 0 16px;height: 100%;overflow: auto;}-#issue-boards>.body>.column>.content>.body.issue-droppable.ui-droppable-active {+#issue-boards>.body>.columns>.column>.content>.body.issue-droppable.ui-droppable-active {background: #FDF2C5;}-#issue-boards>.body>.column>.content>.body.issue-droppable.ui-droppable-hover {+#issue-boards>.body>.columns>.column>.content>.body.issue-droppable.ui-droppable-hover {background: #FAE280;}-#issue-boards>.body>.column>.content>.body>.loading-indicator {+#issue-boards>.body>.columns>.column>.content>.body>.loading-indicator {margin-top: 8px;}-#issue-boards>.body>.column>.content>.body>.card {+#issue-boards>.body>.columns>.column>.content>.body>.card {margin-bottom: 16px;}@@ -167,7 +164,7 @@#issue-boards>.body .card .field-values a {font-size: 12px;}-#issue-boards>.body>.column>.content>.body .loading-indicator {+#issue-boards>.body>.columns>.column>.content>.body .loading-indicator {margin-bottom: 16px;}#issue-boards>.body .card .detail {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.jsindex a9e51f2cf6..87f999983e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/issue-boards.js@@ -1,23 +1,24 @@onedev.server.issueBoards = {onDomReady: function() {$("body").css("overflow-y", "hidden");- var $head = $("#issue-boards>.head");- var $body = $("#issue-boards>.body");- if ($body.length != 0) {+ },+ onBodyDomReady: function() {+ var $columns = $("#issue-boards>.body>.columns");+ if ($columns.length != 0) {// Do not use perfect scroll on Device as it may cause scroll issueif (onedev.server.util.isDevice()) {- $body.addClass("resize-aware").on("resized", function() {- $body.outerHeight($(window).height()-$body.offset().top);+ $columns.addClass("resize-aware").on("resized", function() {+ $columns.outerHeight($(window).height()-$columns.offset().top);});} else {- var ps = new PerfectScrollbar($body[0]);- $body.addClass("resize-aware").on("resized", function() {- $body.outerHeight($(window).height()-$body.offset().top);+ var ps = new PerfectScrollbar($columns[0]);+ $columns.addClass("resize-aware").on("resized", function() {+ $columns.outerHeight($(window).height()-$columns.offset().top);ps.update();});}}- },+ },onColumnLoad: function(containerId, callback) {var $body = $("#" + containerId);@@ -48,7 +49,7 @@ onedev.server.issueBoards = {onCardDomReady: function(cardId, callback) {var $card = $("#" + cardId);var $body = $card.closest(".body");- var $container = $body.parent().closest(".body");+ var $container = $card.closest(".columns");var containerContentWidth;if (callback) {$card.draggable({