The Unified and Autonomous Development Platform
Fix issue #569 - Prompt user for similar issues while typing title of new issues
Robin Shene6908c24a5f8
diff --git a/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java b/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.javaindex 3414bc88a8..4fed3fb555 100644--- a/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java+++ b/server-core/src/main/java/io/onedev/server/web/behavior/OnTypingDoneBehavior.java@@ -1,14 +1,11 @@package io.onedev.server.web.behavior;-import java.util.Objects;-import org.apache.wicket.Component;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;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.form.FormComponent;import io.onedev.server.web.asset.doneevents.DoneEventsResourceReference;@@ -17,8 +14,6 @@ public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBehaprivate int timeout;- private String input;-public OnTypingDoneBehavior(int timeout) {super("donetyping");this.timeout = timeout;@@ -44,15 +39,7 @@ public abstract class OnTypingDoneBehavior extends AjaxFormComponentUpdatingBeha@Overrideprotected void onUpdate(AjaxRequestTarget target) {- // IE triggers "input" event when the focused on the search input even if nothing is- // input into search box yet. To work around this issue, we compare search string- // against previous value to only update the branches table if there is an actual- // change.- String newInput = ((FormComponent<?>)getComponent()).getInput();- if (!Objects.equals(newInput, input)) {- input = newInput;- onTypingDone(target);- }+ onTypingDone(target);}protected abstract void onTypingDone(AjaxRequestTarget target);diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.htmlindex ed60ffc640..52c8f87656 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.html@@ -5,6 +5,15 @@<input wicket:id="title" type="text" class="form-control" placeholder="Input title here"><div wicket:id="titleFeedback"></div></div>+ <div wicket:id="similarIssues" class="similar-issues alert alert-light">+ <h6>Similar Issues</h6>+ <table class="table mb-0">+ <tr wicket:id="similarIssues">+ <td class="state"><span wicket:id="state"></span></td>+ <td wicket:id="numberAndTitle"></td>+ </tr>+ </table>+ </div><div class="form-group description"><label class="control-label">Description</label><div wicket:id="description"></div>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.javaindex 4fd1351d67..cd1dfe173e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/NewIssueEditor.java@@ -1,6 +1,7 @@package io.onedev.server.web.component.issue.create;import java.io.Serializable;+import java.util.ArrayList;import java.util.Collection;import java.util.Date;import java.util.List;@@ -16,9 +17,13 @@ import org.apache.wicket.event.IEvent;import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;+import org.apache.wicket.markup.html.WebMarkupContainer;import org.apache.wicket.markup.html.form.FormComponentPanel;import org.apache.wicket.markup.html.form.TextField;+import org.apache.wicket.markup.html.list.ListItem;+import org.apache.wicket.markup.html.list.ListView;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.IRequestParameters;@@ -41,11 +46,16 @@ import io.onedev.server.model.support.issue.IssueTemplate;import io.onedev.server.model.support.issue.field.FieldUtils;import io.onedev.server.search.entity.issue.IssueQuery;import io.onedev.server.search.entity.issue.IssueQueryParseOption;+import io.onedev.server.search.entitytext.IssueTextManager;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.ComponentContext;+import io.onedev.server.util.ProjectScope;import io.onedev.server.util.criteria.Criteria;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.behavior.OnTypingDoneBehavior;import io.onedev.server.web.behavior.ReferenceInputBehavior;+import io.onedev.server.web.component.issue.IssueStateBadge;+import io.onedev.server.web.component.issue.link.IssueLinkPanel;import io.onedev.server.web.component.markdown.AttachmentSupport;import io.onedev.server.web.component.milestone.choice.MilestoneMultiChoice;import io.onedev.server.web.component.modal.confirm.ConfirmModalPanel;@@ -53,6 +63,7 @@ import io.onedev.server.web.component.project.comment.CommentInput;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.editable.BeanEditor;import io.onedev.server.web.editable.BeanUpdating;+import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.ProjectAttachmentSupport;@SuppressWarnings("serial")@@ -110,6 +121,90 @@ public abstract class NewIssueEditor extends FormComponentPanel<Issue> implement});+ IModel<List<Issue>> similarIssuesModel = new LoadableDetachableModel<List<Issue>>() {++ @Override+ protected List<Issue> load() {+ String title = titleInput.getInput();+ if (StringUtils.isNotBlank(title)) {+ IssueTextManager issueTextManager = OneDev.getInstance(IssueTextManager.class);+ return issueTextManager.query(new ProjectScope() {++ @Override+ public Project getProject() {+ return NewIssueEditor.this.getProject();+ }++ @Override+ public boolean isRecursive() {+ return true;+ }++ @Override+ public RecursiveConfigurable getRecursiveConfigurable() {+ return null;+ }++ }, title, false, 0, 10);+ } else {+ return new ArrayList<>();+ }+ }++ };+ WebMarkupContainer similarIssuesContainer = new WebMarkupContainer("similarIssues") {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(!similarIssuesModel.getObject().isEmpty());+ }++ };+ titleInput.add(new OnTypingDoneBehavior() {++ @Override+ protected void onTypingDone(AjaxRequestTarget target) {+ target.add(similarIssuesContainer);+ }++ @Override+ protected void onError(AjaxRequestTarget target, RuntimeException e) {+ super.onError(target, e);+ target.add(similarIssuesContainer);+ }++ });++ similarIssuesContainer.setOutputMarkupPlaceholderTag(true);+ add(similarIssuesContainer);+ similarIssuesContainer.add(new ListView<Issue>("similarIssues", similarIssuesModel) {++ @Override+ protected void populateItem(ListItem<Issue> item) {+ item.add(new IssueStateBadge("state", item.getModel()));+ item.add(new IssueLinkPanel("numberAndTitle") {++ @Override+ protected Issue getIssue() {+ return item.getModelObject();+ }++ @Override+ protected Project getCurrentProject() {+ return getProject();+ }++ @Override+ protected Cursor getCursor() {+ return null;+ }++ });+ }++ });+lastDescriptionTemplate = getDescriptionTemplate(issue);add(descriptionInput = newDescriptionInput(lastDescriptionTemplate));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.css b/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.cssindex afb50038ab..a1d585a09f 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/create/new-issue.css@@ -3,4 +3,13 @@}.new-issue ul.feedbackPanel {margin: 10px 0;-}\ No newline at end of file+}+.new-issue .similar-issues .state {+ width: 1px;+}+.new-issue .similar-issues .number {+ margin-right: 0.5rem;+}+.new-issue .similar-issues .number, .new-issue .similar-issues .title {+ font-weight: 500;+}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.htmlsimilarity index 100%rename from server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.htmlrename to server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.htmldiff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.javasimilarity index 96%rename from server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.javarename to server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.javaindex 5c04f22ff8..8ce1fc4c06 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/title/IssueTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java@@ -1,4 +1,4 @@-package io.onedev.server.web.component.issue.title;+package io.onedev.server.web.component.issue.editabletitle;import org.apache.wicket.ajax.AjaxRequestTarget;import org.apache.wicket.ajax.markup.html.AjaxLink;@@ -23,11 +23,11 @@ import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.util.ReferenceTransformer;@SuppressWarnings("serial")-public abstract class IssueTitlePanel extends Panel {+public abstract class IssueEditableTitlePanel extends Panel {private static final String CONTENT_ID = "content";- public IssueTitlePanel(String id) {+ public IssueEditableTitlePanel(String id) {super(id);}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.htmlnew file mode 100644index 0000000000..426b085168--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.html@@ -0,0 +1,4 @@+<wicket:panel>+ <a wicket:id="number" class="number"></a>+ <span wicket:id="title" class="title"></span>+</wicket:panel>\ No newline at end of filediff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.javanew file mode 100644index 0000000000..1448953607--- /dev/null+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/link/IssueLinkPanel.java@@ -0,0 +1,108 @@+package io.onedev.server.web.component.issue.link;++import javax.annotation.Nullable;++import org.apache.wicket.ajax.AjaxRequestTarget;+import org.apache.wicket.markup.head.IHeaderResponse;+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.link.BookmarkablePageLink;+import org.apache.wicket.markup.html.panel.Panel;+import org.apache.wicket.model.IModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.cycle.RequestCycle;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.web.WebSession;+import io.onedev.server.web.asset.emoji.Emojis;+import io.onedev.server.web.component.link.ActionablePageLink;+import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;+import io.onedev.server.web.util.Cursor;+import io.onedev.server.web.util.ReferenceTransformer;++@SuppressWarnings("serial")+public abstract class IssueLinkPanel extends Panel {++ public IssueLinkPanel(String id) {+ super(id);+ }++ @Override+ protected void onInitialize() {+ super.onInitialize();+ String label;++ Project currentProject = getCurrentProject();+ Issue issue = getIssue();+ if (currentProject == null)+ label = issue.getProject() + "#" + issue.getNumber();+ else if (currentProject.equals(issue.getProject()))+ label = "#" + issue.getNumber();+ else+ label = issue.getProject() + "#" + issue.getNumber();++ WebMarkupContainer numberLink;+ if (getCursor() != null) {+ add(numberLink = new ActionablePageLink("number",+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {++ @Override+ public IModel<?> getBody() {+ return Model.of(label);+ }++ @Override+ protected void doBeforeNav(AjaxRequestTarget target) {+ WebSession.get().setIssueCursor(getCursor());+ String redirectUrlAfterDelete = RequestCycle.get().urlFor(+ getPage().getClass(), getPage().getPageParameters()).toString();+ WebSession.get().setRedirectUrlAfterDelete(Issue.class, redirectUrlAfterDelete);+ }++ });+ } else {+ add(numberLink = new BookmarkablePageLink<Void>("number",+ IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {++ @Override+ public IModel<?> getBody() {+ return Model.of(label);+ }++ });+ }++ String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,+ IssueActivitiesPage.paramsOf(issue)).toString();++ String transformed = Emojis.getInstance().apply(new ReferenceTransformer(issue.getProject(), url).apply(issue.getTitle()));+ add(new Label("title", transformed) {++ @Override+ public void renderHead(IHeaderResponse response) {+ super.renderHead(response);+ String script = String.format(""+ + "$('#%s a:not(.embedded-reference)').click(function(e) {\n"+ + " if (!e.ctrlKey && !e.metaKey) {\n"+ + " $('#%s').click();\n"+ + " return false;\n"+ + " }\n"+ + "});",+ getMarkupId(), numberLink.getMarkupId());+ response.render(OnDomReadyHeaderItem.forScript(script));+ }++ }.setEscapeModelStrings(false).setOutputMarkupId(true));+ }++ protected abstract Issue getIssue();++ @Nullable+ protected abstract Project getCurrentProject();++ @Nullable+ protected abstract Cursor getCursor();++}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.htmlindex e3036ec395..711ac99cef 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@@ -44,8 +44,7 @@<wicket:fragment wicket:id="contentFrag"><div class="primary d-flex mb-3"><div class="mr-4 flex-grow-1">- <a wicket:id="number" class="number h6 mr-2"></a>- <span wicket:id="title" class="title h6 mr-1"></span>+ <wicket:container wicket:id="numberAndTitle" class="mr-1"></wicket:container><a wicket:id="copy" title="Copy issue number and title" class="copy mr-3 btn btn-icon btn-xs btn-light btn-hover-primary"><wicket:svg href="copy" class="icon"></wicket:svg></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.javaindex 1deec7834f..12a5e5dcd4 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@@ -33,7 +33,6 @@ import org.apache.wicket.feedback.FencedFeedbackPanel;import org.apache.wicket.markup.ComponentTag;import org.apache.wicket.markup.head.CssHeaderItem;import org.apache.wicket.markup.head.IHeaderResponse;-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.Form;@@ -86,10 +85,8 @@ import io.onedev.server.util.Input;import io.onedev.server.util.LinkSide;import io.onedev.server.util.ProjectScope;import io.onedev.server.web.WebConstants;-import io.onedev.server.web.WebSession;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;-import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.IssueQueryBehavior;import io.onedev.server.web.behavior.NoRecordsBehavior;import io.onedev.server.web.behavior.WebSocketObserver;@@ -97,8 +94,8 @@ import io.onedev.server.web.component.datatable.selectioncolumn.SelectionColumn;import io.onedev.server.web.component.floating.FloatingPanel;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;+import io.onedev.server.web.component.issue.link.IssueLinkPanel;import io.onedev.server.web.component.issue.operation.TransitionMenuLink;-import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.link.DropdownLink;import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.menu.MenuItem;@@ -115,14 +112,12 @@ import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;import io.onedev.server.web.editable.BeanContext;import io.onedev.server.web.page.project.issues.create.NewIssuePage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.page.project.issues.imports.IssueImportPage;import io.onedev.server.web.page.project.issues.list.ProjectIssueListPage;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.LoadableDetachableDataProvider;import io.onedev.server.web.util.PagingHistorySupport;import io.onedev.server.web.util.QuerySaveSupport;-import io.onedev.server.web.util.ReferenceTransformer;@SuppressWarnings("serial")public abstract class IssueListPanel extends Panel {@@ -1178,54 +1173,24 @@ public abstract class IssueListPanel extends Panel {Issue issue = (Issue) fragment.getDefaultModelObject();- String label;- if (getProject() == null)- label = issue.getProject() + "#" + issue.getNumber();- else if (getProject().equals(issue.getProject()))- label = "#" + issue.getNumber();- else- label = issue.getProject() + "#" + issue.getNumber();-- ActionablePageLink numberLink;- fragment.add(numberLink = new ActionablePageLink("number",- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {+ fragment.add(new IssueLinkPanel("numberAndTitle") {@Override- public IModel<?> getBody() {- return Model.of(label);+ protected Issue getIssue() {+ return (Issue) fragment.getDefaultModelObject();}@Override- protected void doBeforeNav(AjaxRequestTarget target) {- WebSession.get().setIssueCursor(cursor);- String redirectUrlAfterDelete = RequestCycle.get().urlFor(- getPage().getClass(), getPage().getPageParameters()).toString();- WebSession.get().setRedirectUrlAfterDelete(Issue.class, redirectUrlAfterDelete);+ protected Project getCurrentProject() {+ return getProject();}-- });-- String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(issue)).toString();-- String transformed = Emojis.getInstance().apply(new ReferenceTransformer(issue.getProject(), url).apply(issue.getTitle()));- fragment.add(new Label("title", transformed) {@Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- String script = String.format(""- + "$('#%s a:not(.embedded-reference)').click(function(e) {\n"- + " if (!e.ctrlKey && !e.metaKey) {\n"- + " $('#%s').click();\n"- + " return false;\n"- + " }\n"- + "});",- getMarkupId(), numberLink.getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));+ protected Cursor getCursor() {+ return cursor;}- }.setEscapeModelStrings(false).setOutputMarkupId(true));+ });fragment.add(new CopyToClipboardLink("copy", Model.of(issue.getNumberAndTitle())));diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.cssindex 035174201a..7722f46505 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/list/issue-list.css@@ -24,6 +24,13 @@margin-top: 4px;}+.issue-list .number {+ margin-right: 0.25rem;+}+.issue-list .number, .issue-list .title {+ font-size: 1.175rem;+ font-weight: 500;+}.issue-list .state {border-bottom: 2px dotted transparent;cursor: pointer;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.htmlindex 7f016bf3f7..61c1767fcb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.html@@ -2,8 +2,7 @@<div wicket:id="content"></div><wicket:fragment wicket:id="contentFrag"><div class="primary font-weight-bold mb-3">- <a wicket:id="number" class="mr-2"></a>- <span wicket:id="title" class="mr-3"></span>+ <wicket:container wicket:id="numberAndTitle" class="mr-3"></wicket:container><a wicket:id="links" class="link-info font-weight-normal link d-inline-flex align-items-center mr-2"><span wicket:id="label"></span><wicket:svg href="arrow" class="icon icon-sm"/></a><a wicket:id="showDetail" title="Click to show issue details" class="show-detail"><wicket:svg href="ellipsis" class="icon"/></a></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.javaindex f1bac0c8d7..10d73ea119 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/BoardCardPanel.java@@ -23,7 +23,6 @@ import org.apache.wicket.markup.repeater.RepeatingView;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.hibernate.Hibernate;@@ -40,23 +39,19 @@ import io.onedev.server.model.support.issue.field.spec.FieldSpec;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.Input;import io.onedev.server.util.LinkSide;-import io.onedev.server.web.WebSession;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener;import io.onedev.server.web.ajaxlistener.AttachAjaxIndicatorListener.AttachMode;-import io.onedev.server.web.asset.emoji.Emojis;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.issue.IssueStateBadge;import io.onedev.server.web.component.issue.fieldvalues.FieldValuesPanel;+import io.onedev.server.web.component.issue.link.IssueLinkPanel;import io.onedev.server.web.component.issue.operation.TransitionMenuLink;-import io.onedev.server.web.component.link.ActionablePageLink;import io.onedev.server.web.component.modal.ModalLink;import io.onedev.server.web.component.modal.ModalPanel;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.page.base.BasePage;-import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;import io.onedev.server.web.util.Cursor;import io.onedev.server.web.util.CursorSupport;-import io.onedev.server.web.util.ReferenceTransformer;import io.onedev.server.web.websocket.WebSocketManager;@SuppressWarnings("serial")@@ -244,50 +239,24 @@ abstract class BoardCardPanel extends GenericPanel<Issue> {});- ActionablePageLink numberLink;- fragment.add(numberLink = new ActionablePageLink("number",- IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {+ fragment.add(new IssueLinkPanel("numberAndTitle") {@Override- public IModel<?> getBody() {- Issue issue = issueModel.getObject();- if (getProject().equals(issue.getProject()))- return Model.of("#" + issue.getNumber());- else- return Model.of(issue.getProject() + "#" + issue.getNumber());+ protected Issue getIssue() {+ return issueModel.getObject();}@Override- protected void doBeforeNav(AjaxRequestTarget target) {- WebSession.get().setIssueCursor(cursor);-- String redirectUrlAfterDelete = RequestCycle.get().urlFor(- getPage().getClass(), getPage().getPageParameters()).toString();- WebSession.get().setRedirectUrlAfterDelete(Issue.class, redirectUrlAfterDelete);+ protected Project getCurrentProject() {+ return getProject();}-- });-- String url = RequestCycle.get().urlFor(IssueActivitiesPage.class,- IssueActivitiesPage.paramsOf(issue)).toString();-- ReferenceTransformer transformer = new ReferenceTransformer(issue.getProject(), url);-- fragment.add(new Label("title", Emojis.getInstance().apply(transformer.apply(issue.getTitle()))) {@Override- public void renderHead(IHeaderResponse response) {- super.renderHead(response);- String script = String.format(""- + "$('#%s a:not(.embedded-reference)').click(function() {"- + " $('#%s').click();"- + " return false;"- + "});",- getMarkupId(), numberLink.getMarkupId());- response.render(OnDomReadyHeaderItem.forScript(script));+ protected Cursor getCursor() {+ return cursor;}- }.setEscapeModelStrings(false).setOutputMarkupId(true));+ });AtomicReference<String> expandedLinkName = new AtomicReference<>(null);RepeatingView linksView = new RepeatingView("links");diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.javaindex 421b9a954b..c79b3a9e33 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/boards/CardDetailPanel.java@@ -39,10 +39,10 @@ import io.onedev.server.web.component.build.list.BuildListPanel;import io.onedev.server.web.component.entity.nav.EntityNavPanel;import io.onedev.server.web.component.issue.activities.IssueActivitiesPanel;import io.onedev.server.web.component.issue.commits.IssueCommitsPanel;+import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.pullrequests.IssuePullRequestsPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;-import io.onedev.server.web.component.issue.title.IssueTitlePanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;import io.onedev.server.web.component.tabbable.AjaxActionTab;@@ -82,7 +82,7 @@ abstract class CardDetailPanel extends GenericPanel<Issue> implements InputConteprotected void onInitialize() {super.onInitialize();- add(new IssueTitlePanel("title") {+ add(new IssueEditableTitlePanel("title") {@Overrideprotected Issue getIssue() {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 ea69e0c93a..983ad81724 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@@ -77,6 +77,9 @@position: relative;padding-right: 20px;}+.issue-boards>.body .board-card .primary .number {+ margin-right: 0.25rem;+}.issue-boards>.body .board-card .primary .show-detail {position: absolute;right: 0;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.javaindex e2f0b1930c..9707bfe8e9 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/issues/detail/IssueDetailPage.java@@ -44,9 +44,9 @@ import io.onedev.server.util.ProjectScope;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.web.WebSession;import io.onedev.server.web.component.entity.nav.EntityNavPanel;+import io.onedev.server.web.component.issue.editabletitle.IssueEditableTitlePanel;import io.onedev.server.web.component.issue.operation.IssueOperationsPanel;import io.onedev.server.web.component.issue.side.IssueSidePanel;-import io.onedev.server.web.component.issue.title.IssueTitlePanel;import io.onedev.server.web.component.link.ViewStateAwarePageLink;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;@@ -105,7 +105,7 @@ public abstract class IssueDetailPage extends ProjectIssuesPage implements Inputprotected void onInitialize() {super.onInitialize();- add(new IssueTitlePanel("title") {+ add(new IssueEditableTitlePanel("title") {@Overrideprotected Issue getIssue() {