The Unified and Autonomous Development Platform
feat(pull-request): show merge commit in activities
Chief Work Horse64bbc213b7d4
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.htmlindex f850b5d3c7..64207cb7ac 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.html@@ -3,9 +3,14 @@<wicket:svg href="history" class="icon text-gray"></wicket:svg><div class="head"><span wicket:id="user"></span>- <span wicket:id="description"></span> <span wicket:id="age"></span>+ <span wicket:id="description"></span>+ <span wicket:id="mergeCommit">+ <a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a>+ </span>+ <span wicket:id="age"></span><a wicket:id="changes" class="since-changes ml-2" t:data-tippy-content="Changes since this action"><wicket:svg href="diff" class="icon"></wicket:svg></a></div><div wicket:id="body" class="body mt-3"></div></div>-</wicket:panel>\ No newline at end of file+</wicket:panel>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.javaindex 0616b91f7c..2bff3f7a51 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestChangePanel.java@@ -5,13 +5,20 @@ 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.AbstractReadOnlyModel;+import org.apache.wicket.model.Model;+import org.apache.wicket.request.mapper.parameter.PageParameters;+import io.onedev.server.git.GitUtils;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;+import io.onedev.server.model.support.pullrequest.changedata.PullRequestMergeData;import io.onedev.server.notification.ActivityDetail;import io.onedev.server.util.DateUtils;+import io.onedev.server.web.component.link.ViewStateAwarePageLink;+import io.onedev.server.web.component.link.copytoclipboard.CopyToClipboardLink;import io.onedev.server.web.component.user.ident.Mode;import io.onedev.server.web.component.user.ident.UserIdentPanel;+import io.onedev.server.web.page.project.commits.CommitDetailPage;import io.onedev.server.web.page.project.pullrequests.detail.activities.SinceChangesLink;class PullRequestChangePanel extends Panel {@@ -28,6 +35,23 @@ class PullRequestChangePanel extends Panel {add(new UserIdentPanel("user", change.getUser(), Mode.AVATAR_AND_NAME));add(new Label("description", change.getData().getActivity()));++ var mergeCommit = new WebMarkupContainer("mergeCommit");+ var mergePreview = change.getRequest().getMergePreview();+ if (change.getData() instanceof PullRequestMergeData+ && mergePreview != null && mergePreview.getMergeCommitHash() != null) {+ var mergeCommitHash = mergePreview.getMergeCommitHash();+ PageParameters commitParams = CommitDetailPage.paramsOf(+ change.getRequest().getTargetProject(), mergeCommitHash);+ var hashLink = new ViewStateAwarePageLink<Void>(+ "hashLink", CommitDetailPage.class, commitParams);+ hashLink.add(new Label("hash", GitUtils.abbreviateSHA(mergeCommitHash)));+ mergeCommit.add(hashLink);+ mergeCommit.add(new CopyToClipboardLink("copyHash", Model.of(mergeCommitHash)));+ } else {+ mergeCommit.setVisible(false);+ }+ add(mergeCommit);add(new Label("age", DateUtils.formatAge(change.getDate())).add(new AttributeAppender("data-tippy-content", DateUtils.formatDateTime(change.getDate()))));