The Unified and Autonomous Development Platform
Fix issue #571 - Show pull request submission info at right side to make page cleaner
Robin Shen02f4d215f59d
diff --git a/server-core/src/main/java/io/onedev/server/model/PullRequest.java b/server-core/src/main/java/io/onedev/server/model/PullRequest.javaindex bd348ce80f..7149460952 100644--- a/server-core/src/main/java/io/onedev/server/model/PullRequest.java+++ b/server-core/src/main/java/io/onedev/server/model/PullRequest.java@@ -178,7 +178,7 @@ public class PullRequest extends AbstractEntity implements Referenceable, Attachpublic static final String PROP_NO_SPACE_TITLE = "noSpaceTitle";- public static final String REFS_PREFIX = "refs/pull/";+ public static final String REFS_PREFIX = "refs/pulls/";public static final int MAX_CODE_COMMENTS = 1000;diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.htmlindex 289cb6593a..0ed1e16ccb 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/ProjectBlobPage.html@@ -7,7 +7,7 @@<div wicket:id="blobNavigator" class="blob-navigator mr-3 py-2"></div></div><div wicket:id="blobOperations" class="d-flex align-items-center py-2">- <a wicket:id="getCode" title="Code clone or download" class="mr-4 text-nowrap"><wicket:svg href="download2" class="icon"/> Code</a>+ <a wicket:id="getCode" title="Code clone or download" class="mr-4 text-nowrap link-info"><wicket:svg href="download2" class="icon"/> Clone</a><a wicket:id="add" title="Add files to current directory" class="mr-3 text-nowrap dropdown-toggle">Add</a><a wicket:id="search" title="Search files, symbols and texts" class="mr-3 text-nowrap dropdown-toggle">Search</a><a wicket:id="history" title="Commit history of current path" class="text-nowrap">History</a>@@ -17,7 +17,7 @@<wicket:svg href="loading" class="icon spin"/>Revision indexing in progress... (search in this revision will be accurate after indexed)</div>- <div wicket:id="buildSupportNote" class="build-support-note p-3 text-info flex-shrink-0">+ <div wicket:id="buildSupportNote" class="build-support-note p-3 flex-shrink-0"><wicket:svg href="bulb" class="icon"/>Enable build support by <a wicket:id="addFile" class="link-primary"></a></div>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 6d52ec4bdd..7360ec3292 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@@ -18,14 +18,9 @@</div><div class="card-body d-flex"><div class="main flex-grow-1">- <div wicket:id="statusAndBranches" class="status-and-branches d-flex mb-4">- <div wicket:id="status" class="badge status mr-3 font-size-h6"></div>- <div class="branches font-size-lg mr-3 d-flex align-items-center">- <div class="text-muted">- <a wicket:id="user" class="link-gray"></a> wants to merge into <a wicket:id="target" class="branch link-gray"></a>- from <a wicket:id="source" class="branch link-gray"></a> <span wicket:id="date"></span>- </div>- </div>+ <div wicket:id="statusBar" class="status-bar d-flex mb-4">+ <div wicket:id="status" class="badge status mr-3"></div>+ <a wicket:id="clone" title="Check out to local workspace" class="btn btn-light btn-hover-primary btn-icon mr-3"><wicket:svg href="download2" class="icon"></wicket:svg></a><a wicket:id="newPullRequest" class="btn btn-primary btn-icon flex-shrink-0 ml-auto" title="Open new pull request"><wicket:svg href="plus" class="icon"/></a></div><div wicket:id="requestSummary" class="summary mb-4 font-size-h6">@@ -82,7 +77,7 @@</div></wicket:enclosure><div wicket:id="mergeableByCodeWriters" class="mergeable-by-code-writers text-info">- <wicket:svg href="info-circle-o" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission+ <wicket:svg href="info-circle" class="icon"></wicket:svg> Pull request can only be merged by users with code write permission</div><div wicket:id="contributions" class="contribution"><div wicket:id="head" class="head font-weight-bold mb-2 "></div>@@ -90,14 +85,14 @@</div></div><div wicket:id="requestOperations" class="operations">- <a wicket:id="merge" class="btn btn-sm btn-success">Merge</a>- <a wicket:id="discard" class="btn btn-sm btn-danger">Discard</a>- <a wicket:id="approve" class="btn btn-sm btn-primary">Approve</a>- <a wicket:id="requestForChanges" class="btn btn-sm btn-primary">Request For Changes</a>- <a wicket:id="withdrawReview" class="btn btn-sm btn-primary">Withdraw Review</a>- <a wicket:id="reopen" class="btn btn-sm btn-primary">Reopen</a>- <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-primary">Delete Source Branch</a>- <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-primary">Restore Source Branch</a>+ <a wicket:id="merge" class="btn btn-sm btn-light-success">Merge</a>+ <a wicket:id="discard" class="btn btn-sm btn-light-danger">Discard</a>+ <a wicket:id="approve" class="btn btn-sm btn-light-primary">Approve</a>+ <a wicket:id="requestForChanges" class="btn btn-sm btn-light-primary">Request For Changes</a>+ <a wicket:id="withdrawReview" class="btn btn-sm btn-light-primary">Withdraw Review</a>+ <a wicket:id="reopen" class="btn btn-sm btn-light-primary">Reopen</a>+ <a wicket:id="deleteSourceBranch" class="btn btn-sm btn-light-primary">Delete Source Branch</a>+ <a wicket:id="restoreSourceBranch" class="btn btn-sm btn-light-primary">Restore Source Branch</a></div><ul wicket:id="requestTabs" class="tabs nav nav-tabs nav-tabs-line nav-bold mb-5 mt-3 align-items-center"></ul><wicket:child></wicket:child>@@ -109,6 +104,22 @@<a wicket:id="link" class="code-comments nav-link d-flex align-items-center">Code Comments <wicket:svg href="dot" class="icon ml-2 d-none"></wicket:svg></a></wicket:fragment><wicket:fragment wicket:id="moreInfoFrag">+ <div class="submission">+ <table class="table table-borderless">+ <tr>+ <td class="name">Submitter</td>+ <td class="value text-right"><span wicket:id="submitter"></span></td>+ </tr>+ <tr>+ <td class="name">Target Branch</td>+ <td class="value text-right"><a wicket:id="targetBranch"></a></td>+ </tr>+ <tr>+ <td class="name">Source Branch</td>+ <td class="value text-right"><a wicket:id="sourceBranch"></a></td>+ </tr>+ </table>+ </div><wicket:enclosure child="reviews"><div class="reviews"><div class="head">Reviewers</div>@@ -156,11 +167,26 @@</wicket:enclosure><a wicket:id="delete" class="delete btn btn-light-danger">Delete</a></div>-</wicket:fragment><wicket:fragment wicket:id="projectTitleFrag"><a wicket:id="pullRequests" class="text-nowrap">Pull Requests</a><span class="dot"></span><span wicket:id="pullRequestNumber"></span></wicket:fragment>+ <wicket:fragment wicket:id="cloneFrag">+ <div class="p-4">+ <h6>Checkout Pull Request Head</h6>+ <div class="code">+ <div>git fetch origin <span wicket:id="headRef"></span></div>+ <div>git checkout FETCH_HEAD</div>+ </div>+ <wicket:enclosure child="mergeRef">+ <h6 class="mt-4">Checkout Pull Request Merge Preview</h6>+ <div class="code">+ <div>git fetch origin <span wicket:id="mergeRef"></span></div>+ <div>git checkout FETCH_HEAD</div>+ </div>+ </wicket:enclosure>+ </div>+ </wicket:fragment></wicket:extend>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 8e6fb04714..df11ae7779 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@@ -76,7 +76,6 @@ import io.onedev.server.model.support.pullrequest.ReviewResult;import io.onedev.server.search.entity.EntityQuery;import io.onedev.server.search.entity.pullrequest.PullRequestQuery;import io.onedev.server.security.SecurityUtils;-import io.onedev.server.util.DateUtils;import io.onedev.server.util.ProjectScopedNumber;import io.onedev.server.web.WebSession;import io.onedev.server.web.asset.emoji.Emojis;@@ -305,7 +304,7 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRsuper.onInitialize();add(newRequestHead());- add(newStatusAndBranchesContainer());+ add(newStatusBarContainer());WebMarkupContainer summaryContainer = new WebMarkupContainer("requestSummary") {@Override@@ -675,6 +674,24 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected Component newBody(String componentId) {Fragment fragment = new Fragment(componentId, "moreInfoFrag", PullRequestDetailPage.this);++ fragment.add(new UserIdentPanel("submitter", getPullRequest().getSubmitter(), Mode.NAME));++ fragment.add(new BranchLink("targetBranch", getPullRequest().getTarget()));+ if (getPullRequest().getSourceProject() != null) {+ fragment.add(new BranchLink("sourceBranch", getPullRequest().getSource()));+ } else {+ fragment.add(new Label("sourceBranch", "unknown") {++ @Override+ protected void onComponentTag(ComponentTag tag) {+ super.onComponentTag(tag);+ tag.setName("span");+ }++ });+ }+fragment.add(newMergeStrategyContainer());fragment.add(new ReviewListPanel("reviews") {@@ -955,12 +972,10 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullRreturn mergeStrategyContainer;}- private WebMarkupContainer newStatusAndBranchesContainer() {- WebMarkupContainer statusAndBranchesContainer = new WebMarkupContainer("statusAndBranches");-- PullRequest request = getPullRequest();+ private WebMarkupContainer newStatusBarContainer() {+ WebMarkupContainer statusBarContainer = new WebMarkupContainer("statusBar");- statusAndBranchesContainer.add(new Label("status", new AbstractReadOnlyModel<String>() {+ statusBarContainer.add(new Label("status", new AbstractReadOnlyModel<String>() {@Overridepublic String getObject() {@@ -1006,29 +1021,38 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});- statusAndBranchesContainer.add(new UserIdentPanel("user", request.getSubmitter(), Mode.NAME));- statusAndBranchesContainer.add(new Label("date", DateUtils.formatAge(request.getSubmitDate()))- .add(new AttributeAppender("title", DateUtils.formatDateTime(request.getSubmitDate()))));-- statusAndBranchesContainer.add(new BranchLink("target", request.getTarget()));- if (request.getSourceProject() != null) {- statusAndBranchesContainer.add(new BranchLink("source", request.getSource()));- } else {- statusAndBranchesContainer.add(new Label("source", "unknown") {-- @Override- protected void onComponentTag(ComponentTag tag) {- super.onComponentTag(tag);- tag.setName("span");- }-- });- }+ statusBarContainer.add(new DropdownLink("clone") {++ @Override+ protected Component newContent(String id, FloatingPanel dropdown) {+ Fragment fragment = new Fragment(id, "cloneFrag", PullRequestDetailPage.this);+ fragment.add(new Label("headRef", getPullRequest().getHeadRef()));+ fragment.add(new Label("mergeRef", new AbstractReadOnlyModel<String>() {++ @Override+ public String getObject() {+ return getPullRequest().getMergeRef();+ }++ }) {++ @Override+ protected void onConfigure() {+ super.onConfigure();+ setVisible(getPullRequest().getMergePreview() != null+ && getPullRequest().getMergePreview().getMergeCommitHash() != null);+ }++ });+ return fragment;+ }++ });- statusAndBranchesContainer.add(new BookmarkablePageLink<Void>("newPullRequest", NewPullRequestPage.class,+ statusBarContainer.add(new BookmarkablePageLink<Void>("newPullRequest", NewPullRequestPage.class,NewPullRequestPage.paramsOf(getProject())));- return statusAndBranchesContainer;+ return statusBarContainer;}private WebMarkupContainer newSummaryContributions() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.cssindex d68e2dc6ab..c5ed7ad977 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/pull-request-detail.css@@ -1,6 +1,9 @@.pull-request-detail>.card-body {min-height: fit-content;}+.pull-request-detail>.card-body>.main>.status-bar>.status {+ font-size: 1rem;+}.pull-request-detail>.card-body>.main>.summary {border: 2px dashed var(--light-gray);padding: 1.2rem 1.5rem;@@ -88,3 +91,15 @@ ul>li>a.code-comments.new .icon {.pull-request-detail .more-info .assignments a.delete {margin-left: auto;}+.pull-request-detail .more-info .submission td.name {+ padding-left: 0;+}+.pull-request-detail .more-info .submission td.value {+ padding-right: 0;+}+.pull-request-detail .more-info .submission tr:first-child td {+ padding-top: 0;+}+.pull-request-detail .more-info .submission tr:last-child td {+ padding-bottom: 0;+}