Skip to content

The Unified and Autonomous Development Platform

fix: show issue and PR tooltips in workspaces

Robin Shen9025a31eadd2
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
index 8f837a5e2c..f865b3009c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/MarkdownViewer.java
@@ -40,14 +40,9 @@ import io.onedev.server.model.Project;
import io.onedev.server.model.User;
import io.onedev.server.security.SecurityUtils;
import io.onedev.server.service.BuildService;
-import io.onedev.server.service.IssueService;
import io.onedev.server.service.ProjectService;
-import io.onedev.server.service.PullRequestService;
-import io.onedev.server.service.SettingService;
import io.onedev.server.service.UserService;
-import io.onedev.server.util.ColorUtils;
import io.onedev.server.util.DateUtils;
-import io.onedev.server.web.asset.emoji.Emojis;
import io.onedev.server.web.asset.lozad.LozadResourceReference;
import io.onedev.server.web.avatar.AvatarService;
import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
@@ -82,15 +77,6 @@ public class MarkdownViewer extends GenericPanel<String> {
@Inject
private MarkdownService markdownService;
- @Inject
- private IssueService issueService;
-
- @Inject
- private PullRequestService pullRequestService;
-
- @Inject
- private SettingService settingService;
-
@Inject
private BuildService buildService;
@@ -223,48 +209,13 @@ public class MarkdownViewer extends GenericPanel<String> {
String referenceId = params.getParameterValue(REFERENCE_ID).toString();
switch (referenceType) {
case "issue":
- EntityReference reference = IssueReference.of(referenceId, null);
- var issue = issueService.find(reference.getProject(), reference.getNumber());
- // check permission here as issue project may not be the same as current project
- if (issue != null && SecurityUtils.canAccessIssue(issue)) {
- String color = settingService.getIssueSetting().getStateSpec(issue.getState()).getColor();
- String script = String.format("onedev.server.markdown.renderIssueTooltip('%s', '%s', '%s', '%s');",
- Emojis.getInstance().apply(JavaScriptEscape.escapeJavaScript(issue.getTitle())),
- JavaScriptEscape.escapeJavaScript(issue.getState()),
- ColorUtils.isLight(color)? "black": "white", color);
- target.appendJavaScript(script);
- } else {
- target.appendJavaScript("onedev.server.markdown.renderIssueTooltip();");
- }
+ ReferenceTooltipBehavior.renderTooltip(target, IssueReference.of(referenceId, null));
break;
case "pull request":
- reference = PullRequestReference.of(referenceId, null);
- var request = pullRequestService.find(reference.getProject(), reference.getNumber());
- // check permission here as target project may not be the same as current project
- if (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {
- String status = request.getStatus().toString();
- String statusCss;
- switch (request.getStatus()) {
- case OPEN:
- statusCss = "badge-warning";
- break;
- case MERGED:
- statusCss = "badge-success";
- break;
- default:
- statusCss = "badge-danger";
- }
-
- String script = String.format("onedev.server.markdown.renderPullRequestTooltip('%s', '%s', '%s');",
- Emojis.getInstance().apply(JavaScriptEscape.escapeJavaScript(request.getTitle())),
- status, statusCss);
- target.appendJavaScript(script);
- } else {
- target.appendJavaScript("onedev.server.markdown.renderPullRequestTooltip();");
- }
+ ReferenceTooltipBehavior.renderTooltip(target, PullRequestReference.of(referenceId, null));
break;
case "build":
- reference = BuildReference.of(referenceId, null);
+ EntityReference reference = BuildReference.of(referenceId, null);
var build = buildService.find(reference.getProject(), reference.getNumber());
// check permission here as build project may not be the same as current project
if (build != null && SecurityUtils.canAccessProject(build.getProject())) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/ReferenceTooltipBehavior.java b/server-core/src/main/java/io/onedev/server/web/component/markdown/ReferenceTooltipBehavior.java
new file mode 100644
index 0000000000..fdd1722017
--- /dev/null
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/ReferenceTooltipBehavior.java
@@ -0,0 +1,85 @@
+package io.onedev.server.web.component.markdown;
+
+import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
+import org.apache.wicket.markup.head.OnDomReadyHeaderItem;
+import org.unbescape.javascript.JavaScriptEscape;
+
+import io.onedev.server.OneDev;
+import io.onedev.server.entityreference.EntityReference;
+import io.onedev.server.entityreference.IssueReference;
+import io.onedev.server.entityreference.PullRequestReference;
+import io.onedev.server.security.SecurityUtils;
+import io.onedev.server.service.IssueService;
+import io.onedev.server.service.PullRequestService;
+import io.onedev.server.service.SettingService;
+import io.onedev.server.util.ColorUtils;
+import io.onedev.server.web.asset.emoji.Emojis;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
+
+public class ReferenceTooltipBehavior extends AbstractPostAjaxBehavior {
+
+ private final EntityReference reference;
+
+ public ReferenceTooltipBehavior(EntityReference reference) {
+ this.reference = reference;
+ }
+
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ renderTooltip(target, reference);
+ }
+
+ static void renderTooltip(AjaxRequestTarget target, EntityReference reference) {
+ if (reference instanceof IssueReference) {
+ var issue = OneDev.getInstance(IssueService.class).find(reference.getProject(), reference.getNumber());
+ if (issue != null && SecurityUtils.canAccessIssue(issue)) {
+ String color = OneDev.getInstance(SettingService.class).getIssueSetting()
+ .getStateSpec(issue.getState()).getColor();
+ String script = String.format("onedev.server.markdown.renderIssueTooltip('%s', '%s', '%s', '%s');",
+ Emojis.getInstance().apply(JavaScriptEscape.escapeJavaScript(issue.getTitle())),
+ JavaScriptEscape.escapeJavaScript(issue.getState()),
+ ColorUtils.isLight(color) ? "black" : "white", color);
+ target.appendJavaScript(script);
+ } else {
+ target.appendJavaScript("onedev.server.markdown.renderIssueTooltip();");
+ }
+ } else if (reference instanceof PullRequestReference) {
+ var request = OneDev.getInstance(PullRequestService.class).find(reference.getProject(), reference.getNumber());
+ if (request != null && SecurityUtils.canReadCode(request.getTargetProject())) {
+ String status = request.getStatus().toString();
+ String statusCss;
+ switch (request.getStatus()) {
+ case OPEN:
+ statusCss = "badge-warning";
+ break;
+ case MERGED:
+ statusCss = "badge-success";
+ break;
+ default:
+ statusCss = "badge-danger";
+ }
+ String script = String.format("onedev.server.markdown.renderPullRequestTooltip('%s', '%s', '%s');",
+ Emojis.getInstance().apply(JavaScriptEscape.escapeJavaScript(request.getTitle())),
+ status, statusCss);
+ target.appendJavaScript(script);
+ } else {
+ target.appendJavaScript("onedev.server.markdown.renderPullRequestTooltip();");
+ }
+ } else {
+ throw new IllegalArgumentException("Unsupported tooltip reference: " + reference.getType());
+ }
+ }
+
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ super.renderHead(component, response);
+ response.render(JavaScriptHeaderItem.forReference(new MarkdownResourceReference()));
+ String script = String.format("onedev.server.markdown.initReferenceTooltips($('#%s'), %s, %s);",
+ component.getMarkupId(true), getCallbackFunction(), JavascriptTranslations.get());
+ response.render(OnDomReadyHeaderItem.forScript(script));
+ }
+
+}
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
index 2c00cb711e..569c27b32c 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.css
@@ -509,17 +509,10 @@ body.markdown-editor-expanded {
#reference-tooltip {
z-index: 1000;
- background-color: var(--light-info);
- border-radius: 0.42rem;
- color: var(--info);
font-size: 12px;
padding: 1rem;
box-shadow: 0px 10px 30px 0px rgba(82, 63, 105, 0.08);
}
-.dark-mode #reference-tooltip {
- background-color: var(--dark-mode-light-info);
- color: var(--info);
-}
.markdown-image-loading {
position: absolute;
diff --git a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
index fc06af02cf..ba8318c95e 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
+++ b/server-core/src/main/java/io/onedev/server/web/component/markdown/markdown.js
@@ -1439,8 +1439,7 @@ onedev.server.markdown = {
});
}
- var alignment = {targetX: 0, targetY: 0, x: 0, y: 100};
- $container.find(".reference").hover(function() {
+ onedev.server.markdown.initReferenceTooltips($container.find(".reference"), function() {
var $reference = $(this);
var referenceType;
var referenceId = $reference.data("reference");
@@ -1457,15 +1456,9 @@ onedev.server.markdown = {
} else if ($reference.hasClass("workspace")) {
referenceType = "workspace";
}
- if (referenceType) {
- var $tooltip = $("<div id='reference-tooltip'>" + onedev.server.markdown.translations["loading"] + "</div>");
- $tooltip.data("trigger", this);
- $tooltip.data("alignment", alignment);
- $("body").append($tooltip);
+ if (referenceType)
referenceCallback(referenceType, referenceId);
- return $tooltip;
- }
- }, alignment);
+ }, translations);
onedev.server.markdown.initRendered(containerId);
@@ -1479,6 +1472,18 @@ onedev.server.markdown = {
lozad("#" + containerId + " .markdown-rendered img").observe();
},
+ initReferenceTooltips: function($references, callback, translations) {
+ onedev.server.markdown.translations = translations;
+ var alignment = {targetX: 0, targetY: 0, x: 0, y: 100};
+ $references.hover(function() {
+ var $tooltip = $("<div id='reference-tooltip' class='bg-white border rounded'>" + translations["loading"] + "</div>");
+ $tooltip.data("trigger", this);
+ $tooltip.data("alignment", alignment);
+ $("body").append($tooltip);
+ callback.call(this);
+ return $tooltip;
+ }, alignment);
+ },
renderIssueTooltip: function(title, state, stateFontColor, stateBackgroundColor) {
var $tooltip = $("#reference-tooltip");
if (title) {
diff --git a/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.java b/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.java
index a7df52859d..8ce0afe48a 100644
--- a/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/component/workspace/on/WorkspaceOnPanel.java
@@ -10,6 +10,7 @@ import io.onedev.server.model.Workspace;
import io.onedev.server.util.ProjectAndBranch;
import io.onedev.server.web.component.branch.BranchLink;
import io.onedev.server.web.component.commit.CommitLink;
+import io.onedev.server.web.component.markdown.ReferenceTooltipBehavior;
import io.onedev.server.web.page.project.issues.detail.IssueActivitiesPage;
import io.onedev.server.web.page.project.pullrequests.detail.activities.PullRequestActivitiesPage;
@@ -27,11 +28,13 @@ public class WorkspaceOnPanel extends GenericPanel<Workspace> {
if (workspace.getIssue() != null) {
add(new BookmarkablePageLink<Void>("link", IssueActivitiesPage.class,
IssueActivitiesPage.paramsOf(workspace.getIssue()))
- .setBody(Model.of(workspace.getOnDescription())));
+ .setBody(Model.of(workspace.getOnDescription()))
+ .add(new ReferenceTooltipBehavior(workspace.getIssue().getReference())));
} else if (workspace.getRequest() != null) {
add(new BookmarkablePageLink<Void>("link", PullRequestActivitiesPage.class,
PullRequestActivitiesPage.paramsOf(workspace.getRequest()))
- .setBody(Model.of(workspace.getOnDescription())));
+ .setBody(Model.of(workspace.getOnDescription()))
+ .add(new ReferenceTooltipBehavior(workspace.getRequest().getReference())));
} else if (workspace.getBranch() != null) {
add(new BranchLink("link", new ProjectAndBranch(workspace.getProject(), workspace.getBranch())) {