The Unified and Autonomous Development Platform
chore: Display issue and PR number in gray color to make title clear
Robin Shen4c05d6b60e93
diff --git a/server-core/src/main/java/io/onedev/server/model/Build.java b/server-core/src/main/java/io/onedev/server/model/Build.javaindex 0013730c1f..f40784c806 100644--- a/server-core/src/main/java/io/onedev/server/model/Build.java+++ b/server-core/src/main/java/io/onedev/server/model/Build.java@@ -1142,11 +1142,13 @@ public class Build extends ProjectBelongingreturn null;}- public String getCaption(@Nullable Project currentProject) {+ public String getCaption(@Nullable Project currentProject, boolean withReference) {var caption = getJobName();if (getVersion() != null)caption += ": " + getVersion();- return caption + " (" + getReference().toString(currentProject) + ")";+ if (withReference)+ caption += " (" + getReference().toString(currentProject) + ")";+ return caption;}public LoggingSupport getLoggingSupport() {diff --git a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.htmlindex c3a3f7f43d..78529c23f8 100644--- a/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/build/list/BuildListPanel.html@@ -42,10 +42,11 @@</div><wicket:fragment wicket:id="buildFrag"><div class="d-flex flex-wrap row-gap-2">- <a wicket:id="link" class="text-nowrap mr-2">+ <a wicket:id="link" class="text-nowrap"><svg wicket:id="icon" class="icon mr-1"></svg><span wicket:id="caption"></span></a>+ <span wicket:id="number" class="number ml-1 mr-2 text-muted"></span><span wicket:id="labels"></span></div></wicket:fragment>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 0bd9dc05a3..ae3b08ec65 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@@ -1135,12 +1135,14 @@ public abstract class BuildListPanel extends Panel {@Overridepublic String getObject() {- return rowModel.getObject().getCaption(getProject());+ return rowModel.getObject().getCaption(getProject(), false);}}));fragment.add(link);+ fragment.add(new Label("number", rowModel.getObject().getReference().toString(getProject())));+fragment.add(new EntityLabelsPanel<>("labels", rowModel));fragment.add(newBuildObserver(buildId));diff --git a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.javaindex 10a99e9f14..b46b6ee227 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java+++ b/server-core/src/main/java/io/onedev/server/web/component/commandpalette/BuildParam.java@@ -44,7 +44,7 @@ public class BuildParam extends ParamSegment {List<Build> builds = buildService.query(SecurityUtils.getSubject(), project, query, false, 0, count);for (Build build: builds)- suggestions.put(build.getCaption(project), String.valueOf(build.getNumber()));+ suggestions.put(build.getCaption(project, true), String.valueOf(build.getNumber()));return suggestions;}diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.htmlindex 20c5ebb883..03386baae7 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.html@@ -12,7 +12,8 @@</form></wicket:fragment><wicket:fragment wicket:id="titleViewFrag">- <span wicket:id="title" class="mr-2"></span>+ <span wicket:id="title"></span>+ <span wicket:id="number" class="number ml-2 mr-2 text-muted"></span><span wicket:id="confidential" t:data-tippy-content="Confidential" class="text-warning mr-2"><wicket:svg href="incognito" class="icon icon-lg"/></span><a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-2"><wicket:svg href="copy" class="icon"></wicket:svg></a><a wicket:id="edit" class="btn btn-xs btn-icon btn-light btn-hover-primary edit flex-shrink-0 mr-2" t:data-tippy-content="Edit issue title"><wicket:svg href="edit" class="icon"></wicket:svg></a>diff --git a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.javaindex df8a0c3203..d9065b513c 100644--- a/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/issue/editabletitle/IssueEditableTitlePanel.java@@ -116,11 +116,13 @@ public abstract class IssueEditableTitlePanel extends Panel {protected String load() {var transformed = transformReferences(getIssue().getTitle(), getIssue().getProject(),new LinkTransformer(null));- return Emojis.getInstance().apply(transformed) + " (" + getIssue().getReference().toString(getProject()) + ")";+ return Emojis.getInstance().apply(transformed);}}).setEscapeModelStrings(false));+ titleViewer.add(new Label("number", "#" + getIssue().getNumber()));+titleViewer.add(new WebMarkupContainer("confidential") {@Overridediff --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/title/IssueTitlePanel.htmlindex c085ef4277..bff48cc4bd 100644--- 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/title/IssueTitlePanel.html@@ -1,5 +1,6 @@<wicket:panel><span wicket:id="title" class="title"></span>- <a wicket:id="number" class="number"></a>+ <span wicket:id="number" class="number ml-1 text-muted"></span>+ <a wicket:id="link" class="d-none"></a><span wicket:id="confidential" class="text-warning" t:data-tippy-content="Confidential"><wicket:svg href="incognito" class="icon"/></span></wicket:panel>\ No newline at end of filediff --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/title/IssueTitlePanel.javaindex a552230e28..6f57d87b32 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/title/IssueTitlePanel.java@@ -2,17 +2,14 @@ package io.onedev.server.web.component.issue.title;import static io.onedev.server.entityreference.ReferenceUtils.transformReferences;-import org.jspecify.annotations.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.panel.Panel;-import org.apache.wicket.model.IModel;-import org.apache.wicket.model.Model;import org.apache.wicket.request.cycle.RequestCycle;+import org.jspecify.annotations.Nullable;import io.onedev.server.entityreference.LinkTransformer;import io.onedev.server.model.Issue;@@ -34,16 +31,10 @@ public abstract class IssueTitlePanel extends Panel {super.onInitialize();Issue issue = getIssue();- var label = "(" + issue.getReference().toString(getCurrentProject()) + ")";- WebMarkupContainer numberLink;- add(numberLink = new ActionablePageLink("number",+ WebMarkupContainer link;+ add(link = new ActionablePageLink("link",IssueActivitiesPage.class, IssueActivitiesPage.paramsOf(issue)) {- @Override- public IModel<?> getBody() {- return Model.of(label);- }-@Overrideprotected void doBeforeNav(AjaxRequestTarget target) {WebSession.get().setIssueCursor(getCursor());@@ -71,11 +62,13 @@ public abstract class IssueTitlePanel extends Panel {+ " return false;\n"+ " }\n"+ "});",- getMarkupId(), numberLink.getMarkupId());+ getMarkupId(), link.getMarkupId());response.render(OnDomReadyHeaderItem.forScript(script));}}.setEscapeModelStrings(false).setOutputMarkupId(true));++ add(new Label("number", issue.getReference().toString(getCurrentProject())));add(new WebMarkupContainer("confidential") {diff --git a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.htmlindex 95907745ac..df5bdd9eee 100644--- a/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/pullrequest/list/PullRequestListPanel.html@@ -42,7 +42,8 @@<div class="flex-grow-1 d-flex flex-wrap row-gap-2"><span class="mr-2"><span wicket:id="title" class="title h6 mb-0"></span>- <a wicket:id="number" class="number h6 mb-0"></a>+ <span wicket:id="number" class="text-muted number h6 mb-0 ml-1"></span>+ <a wicket:id="link" class="d-none"></a></span><span wicket:id="labels" class="mr-2"></span></div>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 1f790b4855..9bf468aded 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@@ -914,17 +914,11 @@ public abstract class PullRequestListPanel extends Panel {Cursor cursor = new Cursor(queryModel.getObject().toString(), (int)requestsTable.getItemCount(),(int)requestsTable.getCurrentPage() * WebConstants.PAGE_SIZE + row.getIndex(), getProject());- String label = "(" + request.getReference().toString(getProject()) + ")";+ fragment.add(new Label("number", request.getReference().toString(getProject())));- ActionablePageLink numberLink;- fragment.add(numberLink = new ActionablePageLink("number",+ ActionablePageLink prLink = new ActionablePageLink("link",PullRequestActivitiesPage.class, PullRequestActivitiesPage.paramsOf(request)) {- @Override- public IModel<?> getBody() {- return Model.of(label);- }-@Overrideprotected void doBeforeNav(AjaxRequestTarget target) {WebSession.get().setPullRequestCursor(cursor);@@ -934,7 +928,8 @@ public abstract class PullRequestListPanel extends Panel {WebSession.get().setRedirectUrlAfterDelete(PullRequest.class, redirectUrlAfterDelete);}- });+ };+ fragment.add(prLink);String url = RequestCycle.get().urlFor(PullRequestActivitiesPage.class,PullRequestActivitiesPage.paramsOf(request)).toString();@@ -954,7 +949,7 @@ public abstract class PullRequestListPanel extends Panel {+ " return false;\n"+ " }\n"+ "});",- getMarkupId(), numberLink.getMarkupId());+ getMarkupId(), prLink.getMarkupId());response.render(OnDomReadyHeaderItem.forScript(script));}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.htmlindex ceb8e65bd9..1e627ee27b 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.html@@ -2,7 +2,8 @@<div class="build-detail d-flex flex-column card m-2 m-sm-5 flex-grow-1"><div class="card-header flex-shrink-0 flex-nowrap"><div class="card-title flex-wrap">- <span wicket:id="caption" class="mr-4 text-break"></span>+ <span wicket:id="caption" class="text-break"></span>+ <span wicket:id="number" class="number ml-2 mr-4 text-muted"></span><div class="status text-nowrap mr-4"><svg wicket:id="statusIcon" class="mr-2"></svg><span wicket:id="statusLabel"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.javaindex 19d2a7cf1e..fd16de91a6 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/builds/detail/BuildDetailPage.java@@ -242,7 +242,7 @@ public abstract class BuildDetailPage extends ProjectPage@Overridepublic String getObject() {- return getBuild().getCaption(getProject());+ return getBuild().getCaption(getProject(), false);}}) {@@ -256,6 +256,8 @@ public abstract class BuildDetailPage extends ProjectPage});+ add(new Label("number", "#" + getBuild().getNumber()));+add(new BuildStatusIcon("statusIcon", new AbstractReadOnlyModel<Status>() {@Overridediff --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 5d0ff9ac72..80ce651ec0 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,7 +2,7 @@<div wicket:id="content"></div><wicket:fragment wicket:id="contentFrag"><div class="primary d-flex align-items-center flex-wrap row-gap-2 mb-3">- <span wicket:id="numberAndTitle" class="font-weight-bold mr-2"></span>+ <span wicket:id="numberAndTitle" class="font-weight-bold mr-1"></span><a wicket:id="copy" class="btn btn-xs btn-icon btn-light btn-hover-primary copy flex-shrink-0 mr-2" t:data-tippy-content="Copy issue number and title"><wicket:svg href="copy" class="icon"></wicket:svg></a><a wicket:id="workspaces" class="btn btn-xs btn-icon btn-light btn-hover-primary workspaces flex-shrink-0 mr-2" t:data-tippy-content="Workspaces on this issue"><wicket:svg href="workspace" class="icon"></wicket:svg></a><span wicket:id="links" class="links mr-2"></span>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.htmlindex 02fdfdeb40..3d455beb5e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.html@@ -3,7 +3,7 @@<div wicket:id="requestHeader" class="card-header align-items-center justify-content-start flex-nowrap"><div class="d-flex align-items-center flex-grow-1"><wicket:enclosure child="title">- <div class="card-title mr-3"><span wicket:id="title"></span></div>+ <div class="card-title mr-3"><span wicket:id="title"></span> <span wicket:id="number" class="text-muted ml-1"></span></div></wicket:enclosure><a wicket:id="edit" t:data-tippy-content="Edit title" class="btn btn-xs btn-icon btn-light btn-hover-primary edit mr-3"><wicket:svg href="edit" class="icon"></wicket:svg></a><form wicket:id="editForm" class="form flex-grow-1 d-flex align-items-center">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.javaindex 4e617e5c84..474df4671c 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/PullRequestDetailPage.java@@ -286,8 +286,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRPullRequest request = getPullRequest();var transformed = transformReferences(request.getTitle(), request.getTargetProject(),new LinkTransformer(null));- transformed = Emojis.getInstance().apply(transformed);- return transformed + " (" + getPullRequest().getReference().toString(getProject()) + ")";+ return Emojis.getInstance().apply(transformed);}}) {@@ -300,6 +299,8 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR}.setEscapeModelStrings(false));+ requestHead.add(new Label("number", "#" + getPullRequest().getNumber()));+requestHead.add(new AjaxLink<Void>("edit") {@Override