The Unified and Autonomous Development Platform
Add issue reference support from markdown
robin shenc473a25d24bc
diff --git a/core/src/main/java/io/onedev/server/CoreModule.java b/core/src/main/java/io/onedev/server/CoreModule.javaindex e3d73f0896..c72e6b4338 100644--- a/core/src/main/java/io/onedev/server/CoreModule.java+++ b/core/src/main/java/io/onedev/server/CoreModule.java@@ -215,6 +215,7 @@ import io.onedev.server.web.util.avatar.AvatarManager;import io.onedev.server.web.util.avatar.DefaultAvatarManager;import io.onedev.server.web.util.commitmessagetransform.CommitMessageTransformer;import io.onedev.server.web.util.commitmessagetransform.PatternCommitMessageTransformer;+import io.onedev.server.web.util.markdown.IssueProcessor;import io.onedev.server.web.util.markdown.MentionProcessor;import io.onedev.server.web.util.markdown.PullRequestProcessor;import io.onedev.server.web.util.markdown.RelativeUrlProcessor;@@ -390,6 +391,7 @@ public class CoreModule extends AbstractPluginModule {contribute(MarkdownProcessor.class, new MentionProcessor());contribute(MarkdownProcessor.class, new PullRequestProcessor());+ contribute(MarkdownProcessor.class, new IssueProcessor());contribute(MarkdownProcessor.class, new RelativeUrlProcessor());contribute(ResourcePackScopeContribution.class, new ResourcePackScopeContribution() {diff --git a/core/src/main/java/io/onedev/server/manager/IssueManager.java b/core/src/main/java/io/onedev/server/manager/IssueManager.javaindex 23ecd8ffc6..cb565881d9 100644--- a/core/src/main/java/io/onedev/server/manager/IssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/IssueManager.java@@ -16,6 +16,9 @@ import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.Undepublic interface IssueManager extends EntityManager<Issue> {+ @Nullable+ Issue find(Project target, long number);+void save(Issue issue, Serializable fieldBean, Collection<String> fieldNames);void fixUndefinedStates(Project project, Map<String, UndefinedStateResolution> resolutions);diff --git a/core/src/main/java/io/onedev/server/manager/MarkdownManager.java b/core/src/main/java/io/onedev/server/manager/MarkdownManager.javaindex 3c4d45ffea..0b6c13550e 100644--- a/core/src/main/java/io/onedev/server/manager/MarkdownManager.java+++ b/core/src/main/java/io/onedev/server/manager/MarkdownManager.java@@ -2,6 +2,8 @@ package io.onedev.server.manager;import javax.annotation.Nullable;+import io.onedev.server.model.Project;+public interface MarkdownManager {/**@@ -15,7 +17,7 @@ public interface MarkdownManager {*/String render(String markdown);- String process(String rendered, @Nullable Object context);+ String process(Project project, String rendered, @Nullable Object context);/*** Escape html characters in specified markdown so that the markdown plain textdiff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.javaindex cdacf64782..017dd563e2 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultIssueManager.java@@ -2,9 +2,11 @@ package io.onedev.server.manager.impl;import java.io.Serializable;import java.util.Collection;+import java.util.HashMap;import java.util.Iterator;import java.util.List;import java.util.Map;+import java.util.concurrent.atomic.AtomicLong;import javax.inject.Inject;import javax.inject.Singleton;@@ -13,6 +15,7 @@ import javax.persistence.criteria.CriteriaQuery;import javax.persistence.criteria.Join;import javax.persistence.criteria.Root;+import org.hibernate.criterion.Restrictions;import org.hibernate.query.Query;import io.onedev.server.manager.IssueFieldManager;@@ -27,6 +30,7 @@ import io.onedev.server.persistence.annotation.Sessional;import io.onedev.server.persistence.annotation.Transactional;import io.onedev.server.persistence.dao.AbstractEntityManager;import io.onedev.server.persistence.dao.Dao;+import io.onedev.server.persistence.dao.EntityCriteria;import io.onedev.server.web.page.project.issues.issuelist.workflowreconcile.UndefinedStateResolution;@Singleton@@ -34,12 +38,23 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implementsprivate final IssueFieldManager issueFieldManager;+ private final Map<String, AtomicLong> nextNumbers = new HashMap<>();+@Injectpublic DefaultIssueManager(Dao dao, IssueFieldManager issueFieldManager) {super(dao);this.issueFieldManager = issueFieldManager;}+ @Sessional+ @Override+ public Issue find(Project target, long number) {+ EntityCriteria<Issue> criteria = newCriteria();+ criteria.add(Restrictions.eq("project", target));+ criteria.add(Restrictions.eq("number", number));+ return find(criteria);+ }+@Transactional@Overridepublic void test() {@@ -126,10 +141,43 @@ public class DefaultIssueManager extends AbstractEntityManager<Issue> implements@Transactional@Overridepublic void save(Issue issue, Serializable fieldBean, Collection<String> fieldNames) {+ if (issue.isNew())+ issue.setNumber(getNextNumber(issue.getProject()));save(issue);issueFieldManager.writeFields(issue, fieldBean, fieldNames);}+ private long getNextNumber(Project project) {+ AtomicLong nextNumber;+ synchronized (nextNumbers) {+ nextNumber = nextNumbers.get(project.getUUID());+ }+ if (nextNumber == null) {+ long maxNumber;+ Query<?> query = getSession().createQuery("select max(number) from Issue where project=:project");+ query.setParameter("project", project);+ Object result = query.uniqueResult();+ if (result != null) {+ maxNumber = (Long)result;+ } else {+ maxNumber = 0;+ }++ /*+ * do not put the whole method in synchronized block to avoid possible deadlocks+ * if there are limited connections.+ */+ synchronized (nextNumbers) {+ nextNumber = nextNumbers.get(project.getUUID());+ if (nextNumber == null) {+ nextNumber = new AtomicLong(maxNumber+1);+ nextNumbers.put(project.getUUID(), nextNumber);+ }+ }+ }+ return nextNumber.getAndIncrement();+ }+@Sessional@Overridepublic List<Issue> query(IssueQuery issueQuery, int firstResult, int maxResults) {diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.javaindex 52dfc9145b..55d685c1be 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultMarkdownManager.java@@ -27,6 +27,7 @@ import com.vladsch.flexmark.util.options.MutableDataHolder;import com.vladsch.flexmark.util.options.MutableDataSet;import io.onedev.server.manager.MarkdownManager;+import io.onedev.server.model.Project;import io.onedev.server.util.JsoupUtils;import io.onedev.server.util.markdown.MarkdownProcessor;@@ -83,10 +84,10 @@ public class DefaultMarkdownManager implements MarkdownManager {}@Override- public String process(String rendered, @Nullable Object context) {+ public String process(Project project, String rendered, @Nullable Object context) {Document document = JsoupUtils.clean(rendered);for (MarkdownProcessor htmlTransformer: htmlTransformers)- htmlTransformer.process(document, context);+ htmlTransformer.process(project, document, context);return document.body().html();}diff --git a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.java b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.javaindex c97e9301cd..75f04602b9 100644--- a/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.java+++ b/core/src/main/java/io/onedev/server/manager/impl/DefaultPullRequestReferenceManager.java@@ -45,7 +45,7 @@ public class DefaultPullRequestReferenceManager extends AbstractEntityManager<Puif (markdown != null) {String rendered = markdownManager.render(markdown);- for (PullRequest referenced: new PullRequestParser().parseRequests(rendered)) {+ for (PullRequest referenced: new PullRequestParser().parseRequests(event.getRequest().getTargetProject(), rendered)) {if (!referenced.equals(event.getRequest())) {EntityCriteria<PullRequestReference> criteria = EntityCriteria.of(PullRequestReference.class);criteria.add(Restrictions.eq("referenced", referenced));diff --git a/core/src/main/java/io/onedev/server/model/Issue.java b/core/src/main/java/io/onedev/server/model/Issue.javaindex 06d37a2fd5..f57f817edd 100644--- a/core/src/main/java/io/onedev/server/model/Issue.java+++ b/core/src/main/java/io/onedev/server/model/Issue.java@@ -21,6 +21,7 @@ import javax.persistence.OneToMany;import javax.persistence.Table;import javax.persistence.Version;+import org.apache.commons.lang3.StringUtils;import org.hibernate.annotations.Cache;import org.hibernate.annotations.CacheConcurrencyStrategy;import org.hibernate.validator.constraints.NotEmpty;@@ -34,8 +35,10 @@ import io.onedev.server.util.inputspec.InputSpec;@Table(indexes={@Index(columnList="g_project_id"), @Index(columnList="state"),- @Index(columnList="title"), @Index(columnList="g_submitter_id"),- @Index(columnList="submitDate"), @Index(columnList="votes")})+ @Index(columnList="title"), @Index(columnList="noSpaceTitle"),+ @Index(columnList="number"), @Index(columnList="numberStr"),+ @Index(columnList="submitDate"), @Index(columnList="g_submitter_id"),+ @Index(columnList="votes")})@Cache(usage=CacheConcurrencyStrategy.READ_WRITE)@Editablepublic class Issue extends AbstractEntity {@@ -44,6 +47,8 @@ public class Issue extends AbstractEntity {public static final Map<String, String> BUILTIN_FIELDS = new HashMap<>();+ public static final String NUMBER = "Number";+public static final String STATE = "State";public static final String TITLE = "Title";@@ -57,6 +62,7 @@ public class Issue extends AbstractEntity {public static final String VOTES = "Votes";static {+ BUILTIN_FIELDS.put(NUMBER, "number");BUILTIN_FIELDS.put(STATE, "state");BUILTIN_FIELDS.put(TITLE, "title");BUILTIN_FIELDS.put(DESCRIPTION, "description");@@ -96,6 +102,16 @@ public class Issue extends AbstractEntity {private int votes;+ private long number;++ // used for number search in markdown editor+ @Column(nullable=false)+ private String numberStr;++ // used for title search in markdown editor+ @Column(nullable=false)+ private String noSpaceTitle;+@OneToMany(mappedBy="issue", cascade=CascadeType.REMOVE)private Collection<IssueField> fields = new ArrayList<>();@@ -121,6 +137,7 @@ public class Issue extends AbstractEntity {public void setTitle(String title) {this.title = title;+ noSpaceTitle = StringUtils.deleteWhitespace(title);}@Editable(order=200)@@ -141,6 +158,15 @@ public class Issue extends AbstractEntity {this.project = project;}+ public long getNumber() {+ return number;+ }++ public void setNumber(long number) {+ this.number = number;+ numberStr = String.valueOf(number);+ }+public User getSubmitter() {return submitter;}diff --git a/core/src/main/java/io/onedev/server/model/PullRequest.java b/core/src/main/java/io/onedev/server/model/PullRequest.javaindex cd1893c10f..46f2d29c90 100644--- a/core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/core/src/main/java/io/onedev/server/model/PullRequest.java@@ -870,4 +870,5 @@ public class PullRequest extends AbstractEntity {}}+}diff --git a/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java b/core/src/main/java/io/onedev/server/util/markdown/IssueParser.javanew file mode 100644index 0000000000..14cd5e9f1f--- /dev/null+++ b/core/src/main/java/io/onedev/server/util/markdown/IssueParser.java@@ -0,0 +1,74 @@+package io.onedev.server.util.markdown;++import java.util.Collection;+import java.util.HashSet;+import java.util.regex.Matcher;+import java.util.regex.Pattern;++import org.jsoup.Jsoup;+import org.jsoup.nodes.Document;+import org.jsoup.nodes.TextNode;+import org.jsoup.select.NodeTraversor;++import com.google.common.collect.ImmutableSet;++import io.onedev.server.OneDev;+import io.onedev.server.manager.IssueManager;+import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.util.JsoupUtils;+import io.onedev.server.util.TextNodeVisitor;+import io.onedev.utils.StringUtils;++public class IssueParser {++ private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");++ private static final Pattern PATTERN = Pattern.compile("(^|\\s+)(issue\\s+)#(\\d+)(?=($|\\s+))", Pattern.CASE_INSENSITIVE);++ public Collection<Issue> parseIssues(Project project, String rendered) {+ return parseIssues(project, Jsoup.parseBodyFragment(rendered));+ }++ public Collection<Issue> parseIssues(Project project, Document document) {+ Collection<Issue> references = new HashSet<>();++ TextNodeVisitor visitor = new TextNodeVisitor() {++ @Override+ protected boolean isApplicable(TextNode node) {+ if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))+ return false;++ return StringUtils.deleteWhitespace(node.getWholeText()).trim().contains("issue#"); // fast scan here, do pattern match later+ }+ };++ NodeTraversor tranversor = new NodeTraversor(visitor);+ tranversor.traverse(document);++ for (TextNode node : visitor.getMatchedNodes()) {+ Matcher matcher = PATTERN.matcher(node.getWholeText());+ while (matcher.find()) {+ Long issueNumber = Long.valueOf(matcher.group(3));+ String issueTag;+ Issue issue = OneDev.getInstance(IssueManager.class).find(project, issueNumber);+ if (issue != null) {+ references.add(issue);+ issueTag = toHtml(issue);+ } else {+ issueTag = "#" + issueNumber;+ }+ JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + matcher.group(2) + issueTag + matcher.group(4));+ }+ JsoupUtils.appendTail(matcher, node);+ }++ return references;+ }++ protected String toHtml(Issue issue) {+ return "#" + issue.getNumber();+ }++}diff --git a/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java b/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.javaindex 4314e0c579..15695175d9 100644--- a/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java+++ b/core/src/main/java/io/onedev/server/util/markdown/MarkdownProcessor.java@@ -5,10 +5,11 @@ import javax.annotation.Nullable;import org.jsoup.nodes.Document;import io.onedev.launcher.loader.ExtensionPoint;+import io.onedev.server.model.Project;@ExtensionPointpublic interface MarkdownProcessor {- void process(Document rendered, @Nullable Object context);+ void process(Project project, Document rendered, @Nullable Object context);}diff --git a/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.javaindex 024c6730cd..9b2e5ddd3d 100644--- a/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java+++ b/core/src/main/java/io/onedev/server/util/markdown/PullRequestParser.java@@ -13,22 +13,24 @@ import org.jsoup.select.NodeTraversor;import com.google.common.collect.ImmutableSet;import io.onedev.server.OneDev;+import io.onedev.server.manager.PullRequestManager;+import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;-import io.onedev.server.persistence.dao.Dao;import io.onedev.server.util.JsoupUtils;import io.onedev.server.util.TextNodeVisitor;+import io.onedev.utils.StringUtils;public class PullRequestParser {private static final Collection<String> IGNORED_TAGS = ImmutableSet.of("pre", "code", "a");- private static final Pattern PATTERN = Pattern.compile("(^|\\s+)#(\\d+)(?=($|\\s+))");+ private static final Pattern PATTERN = Pattern.compile("(^|\\s+)(pull\\s*request\\s+)#(\\d+)(?=($|\\s+))", Pattern.CASE_INSENSITIVE);- public Collection<PullRequest> parseRequests(String rendered) {- return parseRequests(Jsoup.parseBodyFragment(rendered));+ public Collection<PullRequest> parseRequests(Project project, String rendered) {+ return parseRequests(project, Jsoup.parseBodyFragment(rendered));}- public Collection<PullRequest> parseRequests(Document document) {+ public Collection<PullRequest> parseRequests(Project project, Document document) {Collection<PullRequest> references = new HashSet<>();TextNodeVisitor visitor = new TextNodeVisitor() {@@ -38,28 +40,26 @@ public class PullRequestParser {if (JsoupUtils.hasAncestor(node, IGNORED_TAGS))return false;- return node.getWholeText().contains("#"); // fast scan here, do pattern match later+ return StringUtils.deleteWhitespace(node.getWholeText()).trim().contains("pullrequest#"); // fast scan here, do pattern match later}};NodeTraversor tranversor = new NodeTraversor(visitor);tranversor.traverse(document);- Dao dao = OneDev.getInstance(Dao.class);-for (TextNode node : visitor.getMatchedNodes()) {Matcher matcher = PATTERN.matcher(node.getWholeText());while (matcher.find()) {- Long requestId = Long.valueOf(matcher.group(2));+ Long requestNumber = Long.valueOf(matcher.group(3));String requestTag;- PullRequest request = dao.get(PullRequest.class, requestId);+ PullRequest request = OneDev.getInstance(PullRequestManager.class).find(project, requestNumber);if (request != null) {references.add(request);requestTag = toHtml(request);} else {- requestTag = "#" + requestId;+ requestTag = "#" + requestNumber;}- JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + requestTag + matcher.group(3));+ JsoupUtils.appendReplacement(matcher, node, matcher.group(1) + matcher.group(2) + requestTag + matcher.group(4));}JsoupUtils.appendTail(matcher, node);}@@ -68,7 +68,7 @@ public class PullRequestParser {}protected String toHtml(PullRequest request) {- return "#" + request.getId();+ return "#" + request.getNumber();}}diff --git a/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java b/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.javaindex 07617f8bde..9726116e87 100644--- a/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java+++ b/core/src/main/java/io/onedev/server/web/asset/atwho/AtWhoResourceReference.java@@ -15,7 +15,7 @@ public class AtWhoResourceReference extends JavaScriptResourceReference {private static final long serialVersionUID = 1L;public AtWhoResourceReference() {- super(AtWhoResourceReference.class, "jquery.atwho.js");+ super(AtWhoResourceReference.class, "jquery.atwho.patched.js");}@Overridediff --git a/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js b/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.patched.jssimilarity index 99%rename from core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.jsrename to core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.patched.jsindex 111ddfa919..cb9a12c1bd 100644--- a/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.js+++ b/core/src/main/java/io/onedev/server/web/asset/atwho/jquery.atwho.patched.js@@ -347,6 +347,10 @@ Controller = (function() {Controller.prototype.insertContentFor = function($li) {var data, tpl;tpl = this.getOpt('insertTpl');++ // patched to support to use function as insert template+ if (typeof tpl !== "string")+ tpl = tpl();data = $.extend({}, $li.data('item-data'), {'atwho-at': this.at});@@ -937,6 +941,11 @@ View = (function() {this.$el.find('ul').empty();$ul = this.$el.find('ul');tpl = this.context.getOpt('displayTpl');++ // patched to support to use function as display template+ if (typeof tpl !== "string")+ tpl = tpl();+for (i = 0, len = list.length; i < len; i++) {item = list[i];item = $.extend({}, item, {diff --git a/core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java b/core/src/main/java/io/onedev/server/web/component/comment/CommentInput.javaindex 097e00d611..3c032ae732 100644--- a/core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java+++ b/core/src/main/java/io/onedev/server/web/component/comment/CommentInput.java@@ -10,6 +10,7 @@ import org.hibernate.criterion.Order;import org.hibernate.criterion.Restrictions;import io.onedev.server.OneDev;+import io.onedev.server.model.Issue;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.persistence.dao.Dao;@@ -18,7 +19,7 @@ import io.onedev.server.security.ProjectPrivilege;import io.onedev.server.security.SecurityUtils;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.component.markdown.MarkdownEditor;-import io.onedev.server.web.component.markdown.PullRequestReferenceSupport;+import io.onedev.server.web.component.markdown.AtWhoReferenceSupport;import io.onedev.server.web.component.markdown.UserMentionSupport;import io.onedev.utils.StringUtils;import io.onedev.utils.matchscore.MatchScoreProvider;@@ -60,11 +61,11 @@ public abstract class CommentInput extends MarkdownEditor {}@Override- protected PullRequestReferenceSupport getPullRequestReferenceSupport() {- return new PullRequestReferenceSupport() {+ protected AtWhoReferenceSupport getReferenceSupport() {+ return new AtWhoReferenceSupport() {@Override- public List<PullRequest> findRequests(String query, int count) {+ public List<PullRequest> findPullRequests(String query, int count) {EntityCriteria<PullRequest> criteria = EntityCriteria.of(PullRequest.class);criteria.add(Restrictions.eq("targetProject", getProject()));if (StringUtils.isNotBlank(query)) {@@ -76,6 +77,20 @@ public abstract class CommentInput extends MarkdownEditor {criteria.addOrder(Order.desc("number"));return OneDev.getInstance(Dao.class).findRange(criteria, 0, count);}++ @Override+ public List<Issue> findIssues(String query, int count) {+ EntityCriteria<Issue> criteria = EntityCriteria.of(Issue.class);+ criteria.add(Restrictions.eq("project", getProject()));+ if (StringUtils.isNotBlank(query)) {+ query = StringUtils.deleteWhitespace(query);+ criteria.add(Restrictions.or(+ Restrictions.ilike("noSpaceTitle", query, MatchMode.ANYWHERE),+ Restrictions.ilike("numberStr", query, MatchMode.START)));+ }+ criteria.addOrder(Order.desc("number"));+ return OneDev.getInstance(Dao.class).findRange(criteria, 0, count);+ }};}diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/AtWhoReferenceSupport.java b/core/src/main/java/io/onedev/server/web/component/markdown/AtWhoReferenceSupport.javanew file mode 100644index 0000000000..7b82e7724a--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/component/markdown/AtWhoReferenceSupport.java@@ -0,0 +1,14 @@+package io.onedev.server.web.component.markdown;++import java.util.List;++import io.onedev.server.model.Issue;+import io.onedev.server.model.PullRequest;++public interface AtWhoReferenceSupport {++ List<PullRequest> findPullRequests(String query, int count);++ List<Issue> findIssues(String query, int count);++}diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.htmlindex 0e5a721205..f50135d63c 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.html@@ -10,15 +10,15 @@<a class="do-link pull-left" title="Link (Ctrl-L)"><i class="fa fa-link"></i></a><a class="do-image pull-left" title="Image (Ctrl-I)"><i class="fa fa-picture-o"></i></a><span class="separator pull-left"></span>- <a class="do-list pull-left" title="Unordered List"><i class="fa fa-list"></i></a>- <a class="do-orderlist pull-left" title="Ordered List"><i class="fa fa-list-ol"></i></a>- <a class="do-tasklist pull-left" title="Task List"><i class="fa fa-check-square-o"></i></a>+ <a class="do-list pull-left" title="Unordered list"><i class="fa fa-list"></i></a>+ <a class="do-orderlist pull-left" title="Ordered list"><i class="fa fa-list-ol"></i></a>+ <a class="do-tasklist pull-left" title="Task list"><i class="fa fa-check-square-o"></i></a><a class="do-code pull-left" title="Code"><i class="fa fa-code"></i></a><a class="do-quote pull-left" title="Quote"><i class="fa fa-quote-left"></i></a><span class="separator pull-left"></span>- <a class="do-emoji pull-left" title="Show Emojis"><i class="fa fa-smile-o"></i></a>- <a class="do-mention pull-left" title="Mention Someone"><i class="fa fa-at"></i></a>- <a class="do-hashtag pull-left" title="Reference Pull Request"><i class="fa fa-hashtag"></i></a>+ <a class="do-emoji pull-left" title="Show emojis"><i class="fa fa-smile-o"></i></a>+ <a class="do-mention pull-left" title="Mention someone"><i class="fa fa-at"></i></a>+ <a class="do-hashtag pull-left" title="Reference pull request/issue"><i class="fa fa-hashtag"></i></a></div><div class="pull-left dropdown compact-mode"><a data-toggle="dropdown" type="button"><i class="fa fa-navicon"></i></a>@@ -38,7 +38,7 @@<li role="separator" class="divider"></li><li><a class="do-emoji"><i class="fa fa-smile-o fa-fw"></i> Show Emojis</a></li><li><a class="do-mention"><i class="fa fa-at fa-fw"></i> Mention Someone</a></li>- <li><a class="do-hashtag"><i class="fa fa-hashtag fa-fw"></i> Reference Pull Request</a></li>+ <li><a class="do-hashtag"><i class="fa fa-hashtag fa-fw"></i> Reference Pull Request/Issue</a></li></ul></div><div class="pull-right clearfix">diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.javaindex 3b35ec3d8a..3a8ee4d897 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownEditor.java@@ -2,6 +2,7 @@ package io.onedev.server.web.component.markdown;import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit;+import java.io.Serializable;import java.io.UnsupportedEncodingException;import java.net.URLDecoder;import java.util.ArrayList;@@ -48,11 +49,13 @@ import com.google.common.base.Preconditions;import io.onedev.launcher.loader.AppLoader;import io.onedev.server.OneDev;import io.onedev.server.manager.MarkdownManager;+import io.onedev.server.model.Issue;import io.onedev.server.model.PullRequest;import io.onedev.server.util.facade.UserFacade;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;import io.onedev.server.web.component.markdown.emoji.EmojiOnes;import io.onedev.server.web.component.modal.ModalPanel;+import io.onedev.server.web.page.project.ProjectPage;import io.onedev.server.web.page.project.blob.render.BlobRenderContext;import io.onedev.server.web.util.avatar.AvatarManager;@@ -124,7 +127,8 @@ public class MarkdownEditor extends FormComponentPanel<String> {protected String renderMarkdown(String markdown) {MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class);String rendered = markdownManager.render(markdown);- return markdownManager.process(rendered, blobRenderContext);+ ProjectPage page = (ProjectPage) getPage();+ return markdownManager.process(page.getProject(), rendered, blobRenderContext);}@Override@@ -286,24 +290,38 @@ public class MarkdownEditor extends FormComponentPanel<String> {script = String.format("$('#%s').data('atWhoUserRenderCallback')(%s);", container.getMarkupId(), json);target.appendJavaScript(script);break;- case "requestQuery":- String requestQuery = params.getParameterValue("param1").toOptionalString();+ case "referenceQuery":+ String referenceQuery = params.getParameterValue("param1").toOptionalString();+ String referenceQueryType = params.getParameterValue("param2").toOptionalString();- List<Map<String, String>> requestList = new ArrayList<>();- for (PullRequest request: getPullRequestReferenceSupport().findRequests(requestQuery, ATWHO_LIMIT)) {- Map<String, String> requestMap = new HashMap<>();- requestMap.put("requestNumber", request.getNumberStr());- requestMap.put("requestTitle", request.getTitle());- requestMap.put("searchKey", request.getNumberStr() + " " + request.getNoSpaceTitle());- requestList.add(requestMap);+ List<Map<String, String>> referenceList = new ArrayList<>();+ if (StringUtils.isBlank(referenceQueryType) || "issue".equals(referenceQueryType)) {+ for (Issue issue: getReferenceSupport().findIssues(referenceQuery, ATWHO_LIMIT)) {+ Map<String, String> referenceMap = new HashMap<>();+ referenceMap.put("referenceType", "issue");+ referenceMap.put("referenceNumber", String.valueOf(issue.getNumber()));+ referenceMap.put("referenceTitle", issue.getTitle());+ referenceMap.put("searchKey", issue.getNumber() + " " + StringUtils.deleteWhitespace(issue.getTitle()));+ referenceList.add(referenceMap);+ }+ }+ if (StringUtils.isBlank(referenceQueryType) || "pull request".equals(referenceQueryType)) {+ for (PullRequest request: getReferenceSupport().findPullRequests(referenceQuery, ATWHO_LIMIT)) {+ Map<String, String> referenceMap = new HashMap<>();+ referenceMap.put("referenceType", "pull request");+ referenceMap.put("referenceNumber", String.valueOf(request.getNumber()));+ referenceMap.put("referenceTitle", request.getTitle());+ referenceMap.put("searchKey", request.getNumber() + " " + StringUtils.deleteWhitespace(request.getTitle()));+ referenceList.add(referenceMap);+ }}try {- json = OneDev.getInstance(ObjectMapper.class).writeValueAsString(requestList);+ json = OneDev.getInstance(ObjectMapper.class).writeValueAsString(referenceList);} catch (JsonProcessingException e) {throw new RuntimeException(e);}- script = String.format("$('#%s').data('atWhoRequestRenderCallback')(%s);", container.getMarkupId(), json);+ script = String.format("$('#%s').data('atWhoReferenceRenderCallback')(%s);", container.getMarkupId(), json);target.appendJavaScript(script);break;case "selectImage":@@ -391,7 +409,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {encodedAttachmentSupport,getAttachmentSupport()!=null?getAttachmentSupport().getAttachmentMaxSize():0,getUserMentionSupport() != null,- getPullRequestReferenceSupport() != null,+ getReferenceSupport() != null,autosaveKey);response.render(OnDomReadyHeaderItem.forScript(script));@@ -425,7 +443,7 @@ public class MarkdownEditor extends FormComponentPanel<String> {}@Nullable- protected PullRequestReferenceSupport getPullRequestReferenceSupport() {+ protected AtWhoReferenceSupport getReferenceSupport() {return null;}@@ -443,4 +461,14 @@ public class MarkdownEditor extends FormComponentPanel<String> {return blobRenderContext;}+ static class ReferencedEntity implements Serializable {+ String entityType;++ String entityTitle;++ String entityNumber;++ String searchKey;+ }+}diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.javaindex 8008d8fe3b..6c368daa7a 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java+++ b/core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java@@ -20,6 +20,8 @@ import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanelimport io.onedev.launcher.loader.AppLoader;import io.onedev.server.manager.MarkdownManager;import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;+import io.onedev.server.web.page.project.ProjectPage;+import io.onedev.server.web.util.WicketUtils;import io.onedev.utils.StringUtils;@SuppressWarnings("serial")@@ -60,7 +62,8 @@ public class MarkdownViewer extends GenericPanel<String> {if (markdown != null) {MarkdownManager markdownManager = AppLoader.getInstance(MarkdownManager.class);String html = markdownManager.render(markdown);- return markdownManager.process(html, getRenderContext());+ ProjectPage page = (ProjectPage) getPage();+ return markdownManager.process(page.getProject(), html, getRenderContext());} else {return null;}diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/PullRequestReferenceSupport.java b/core/src/main/java/io/onedev/server/web/component/markdown/PullRequestReferenceSupport.javadeleted file mode 100644index 81f1d82a9b..0000000000--- a/core/src/main/java/io/onedev/server/web/component/markdown/PullRequestReferenceSupport.java+++ /dev/null@@ -1,11 +0,0 @@-package io.onedev.server.web.component.markdown;--import java.util.List;--import io.onedev.server.model.PullRequest;--public interface PullRequestReferenceSupport {-- List<PullRequest> findRequests(String query, int count);--}diff --git a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.jsindex 2688fab261..6cc9340647 100644--- a/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js+++ b/core/src/main/java/io/onedev/server/web/component/markdown/markdown.js@@ -38,7 +38,7 @@ onedev.server.markdown = {$preview.outerHeight($rendered.outerHeight());},onDomReady: function(containerId, callback, atWhoLimit, attachmentSupport,- attachmentMaxSize, canMentionUser, canReferencePullRequest, autosaveKey) {+ attachmentMaxSize, canMentionUser, canReferenceEntity, autosaveKey) {var $container = $("#" + containerId);var $head = $container.children(".head");var $body = $container.children(".body");@@ -492,7 +492,7 @@ onedev.server.markdown = {if (!canMentionUser)$head.find(".do-mention").remove();- if (!canReferencePullRequest)+ if (!canReferenceEntity)$head.find(".do-hashtag").remove();$head.find(".do-mention, .do-hashtag").click(function() {@@ -567,18 +567,46 @@ onedev.server.markdown = {});}- if (canReferencePullRequest) {+ if (canReferenceEntity) {+ function isReferencingPullRequest() {+ var input = $input.val().substring(0, $input.caret()).toLowerCase().replace(/\s/g,'').trim();+ return input.endsWith("pullrequest#");+ }+ function isReferencingIssue() {+ var input = $input.val().substring(0, $input.caret()).toLowerCase().replace(/\s/g,'').trim();+ return input.endsWith("issue#");+ }+ function getInsertTemplate() {+ if (isReferencingPullRequest() || isReferencingIssue())+ return "#${referenceNumber}";+ else+ return '${referenceType} #${referenceNumber}';+ }+ function getDisplayTemplate() {+ if (isReferencingPullRequest() || isReferencingIssue())+ return "<li><span class='text-muted'>#${referenceNumber}</span> - ${referenceTitle}</li>";+ else+ return "<li><span class='text-muted'>${referenceType} #${referenceNumber}</span> - ${referenceTitle}</li>";+ }+$input.atwho({at: '#',searchKey: "searchKey",callbacks: {remoteFilter: function(query, renderCallback) {- $container.data("atWhoRequestRenderCallback", renderCallback);- callback("requestQuery", query);+ $container.data("atWhoReferenceRenderCallback", renderCallback);+ var queryType;+ if (isReferencingPullRequest())+ queryType = "pull request";+ else if (isReferencingIssue())+ queryType = "issue";+ else+ queryType = undefined;+ callback("referenceQuery", query, queryType);}},- displayTpl: "<li><span class='text-muted'>#${requestNumber}</span> - ${requestTitle}</li>",- insertTpl: '#${requestNumber}',+ displayTpl: getDisplayTemplate,+ insertTpl: getInsertTemplate,limit: atWhoLimit});}diff --git a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.javaindex 5ecd298453..b8ba228f1e 100644--- a/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java+++ b/core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/markdown/MarkdownBlobEditor.java@@ -49,7 +49,7 @@ abstract class MarkdownBlobEditor extends FormComponentPanel<byte[]> {protected String renderMarkdown(String markdown) {MarkdownManager markdownManager = OneDev.getInstance(MarkdownManager.class);String html = markdownManager.render(markdown);- return markdownManager.process(html, context);+ return markdownManager.process(context.getProject(), html, context);}});diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.htmlindex 6856e9fcdb..f386a2e605 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.html@@ -44,7 +44,7 @@</wicket:enclosure><div wicket:id="issues" class="issue"><div class="primary">- <div wicket:id="id" class="id"></div>+ <div wicket:id="number" class="number"></div><div wicket:id="title" class="title"></div><div class="submitter"><a wicket:id="submitterName"></a>diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.javaindex f2ebdac565..e2009ecd97 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/IssueListPage.java@@ -655,7 +655,7 @@ public class IssueListPage extends ProjectPage {@Overrideprotected void populateItem(Item<Issue> item) {Issue issue = item.getModelObject();- item.add(new Label("id", "#" + issue.getId()));+ item.add(new Label("number", "#" + issue.getNumber()));Fragment titleFrag = new Fragment("title", "titleFrag", IssueListPage.this);Link<Void> link = new BookmarkablePageLink<Void>("link", IssueDetailPage.class, IssueDetailPage.paramsOf(issue));link.add(new Label("label", issue.getTitle()));diff --git a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.cssindex 5a5c4c6799..5d10d8079a 100644--- a/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css+++ b/core/src/main/java/io/onedev/server/web/page/project/issues/issuelist/issue-list.css@@ -47,7 +47,7 @@text-overflow: ellipsis;padding-right: 8px;}-#issue-list .issue .primary .id {+#issue-list .issue .primary .number {width: 100px;font-size: 16px;font-weight: bold;diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.javanew file mode 100644index 0000000000..56abb2a524--- /dev/null+++ b/core/src/main/java/io/onedev/server/web/util/markdown/IssueProcessor.java@@ -0,0 +1,26 @@+package io.onedev.server.web.util.markdown;++import org.apache.wicket.request.cycle.RequestCycle;+import org.jsoup.nodes.Document;++import io.onedev.server.model.Issue;+import io.onedev.server.model.Project;+import io.onedev.server.util.markdown.IssueParser;+import io.onedev.server.util.markdown.MarkdownProcessor;+import io.onedev.server.web.page.project.issues.issuedetail.IssueDetailPage;++public class IssueProcessor extends IssueParser implements MarkdownProcessor {++ @Override+ public void process(Project project, Document document, Object context) {+ parseIssues(project, document);+ }++ @Override+ protected String toHtml(Issue issue) {+ CharSequence url = RequestCycle.get().urlFor(+ IssueDetailPage.class, IssueDetailPage.paramsOf(issue));+ return String.format("<a href='%s' class='issue'>#%d</a>", url, issue.getNumber());+ }++}diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.javaindex c62985b2c1..4714566c69 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java+++ b/core/src/main/java/io/onedev/server/web/util/markdown/MentionProcessor.java@@ -3,6 +3,7 @@ package io.onedev.server.web.util.markdown;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Document;+import io.onedev.server.model.Project;import io.onedev.server.model.User;import io.onedev.server.util.markdown.MarkdownProcessor;import io.onedev.server.util.markdown.MentionParser;@@ -11,7 +12,7 @@ import io.onedev.server.web.page.user.UserProfilePage;public class MentionProcessor extends MentionParser implements MarkdownProcessor {@Override- public void process(Document document, Object context) {+ public void process(Project project, Document document, Object context) {parseMentions(document);}diff --git a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.javaindex 0c9c4a5d3f..0130941f27 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java+++ b/core/src/main/java/io/onedev/server/web/util/markdown/PullRequestProcessor.java@@ -3,6 +3,7 @@ package io.onedev.server.web.util.markdown;import org.apache.wicket.request.cycle.RequestCycle;import org.jsoup.nodes.Document;+import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.util.markdown.MarkdownProcessor;import io.onedev.server.util.markdown.PullRequestParser;@@ -11,8 +12,8 @@ import io.onedev.server.web.page.project.pullrequests.requestdetail.overview.Reqpublic class PullRequestProcessor extends PullRequestParser implements MarkdownProcessor {@Override- public void process(Document document, Object context) {- parseRequests(document);+ public void process(Project project, Document document, Object context) {+ parseRequests(project, document);}@Overridediff --git a/core/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java b/core/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.javaindex 7dd741f507..e398495756 100644--- a/core/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java+++ b/core/src/main/java/io/onedev/server/web/util/markdown/RelativeUrlProcessor.java@@ -31,11 +31,10 @@ import io.onedev.utils.UrlUtils;public class RelativeUrlProcessor implements MarkdownProcessor {@Override- public void process(Document rendered, Object context) {+ public void process(Project project, Document rendered, Object context) {if (context instanceof BlobRenderContext) {BlobRenderContext blobRenderContext = (BlobRenderContext) context;- Project project = blobRenderContext.getProject();Repository repository = project.getRepository();RevCommit commit;try (RevWalk revWalk = new RevWalk(repository)) {