The Unified and Autonomous Development Platform
feat: Add dates to commits in Pull request review. (OD-2055)
Robin Shen9a021bc8e88d
diff --git a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.cssindex 3863a5bf71..1471621443 100644--- a/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css+++ b/server-core/src/main/java/io/onedev/server/web/asset/bootstrap/css/bootstrap-custom.css@@ -3222,6 +3222,37 @@ h6, .h6 {margin-left: 0 !important;}}+@media (min-width: 1600px) {+ .d-xxl-none {+ display: none !important;+ }+ .d-xxl-inline {+ display: inline !important;+ }+ .d-xxl-inline-block {+ display: inline-block !important;+ }+ .d-xxl-block {+ display: block !important;+ }+ .d-xxl-table {+ display: table !important;+ }+ .d-xxl-table-row {+ display: table-row !important;+ }+ .d-xxl-table-cell {+ display: table-cell !important;+ }+ .d-xxl-flex {+ display: -ms-flexbox !important;+ display: flex !important;+ }+ .d-xxl-inline-flex {+ display: -ms-inline-flexbox !important;+ display: inline-flex !important;+ }+}.opacity-25 {opacity: 0.25 !important;diff --git a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.htmlindex 06663e8ca8..80850eda4e 100644--- a/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html+++ b/server-core/src/main/java/io/onedev/server/web/component/commit/message/CommitMessagePanel.html@@ -1,7 +1,7 @@<wicket:panel><div class="commit-message d-flex align-items-center flex-wrap">- <span wicket:id="summary" class="summary text-break mr-2"></span>- <a class="btn btn-xs h-75 btn-secondary btn-icon" href="javascript:void(0);" title="Toggle detail message" onclick="$(this).next().toggle(); $(window).resize();" wicket:id="toggle">+ <span wicket:id="summary" class="summary text-break"></span>+ <a class="btn btn-xs h-75 btn-secondary btn-icon ml-2" href="javascript:void(0);" title="Toggle detail message" onclick="$(this).next().toggle(); $(window).resize();" wicket:id="toggle"><wicket:svg href="ellipsis" class="icon"/></a><pre wicket:id="detail" class="detail text-break w-100"></pre>diff --git a/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.java b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.javaindex 10a8c29d61..44a922e614 100644--- a/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/component/gitsignature/SignatureStatusPanel.java@@ -62,12 +62,17 @@ public abstract class SignatureStatusPanel extends DropdownLink {elseicon = "unlocked";return String.format(- "<svg class='icon'><use xlink:href='%s'/></svg>",+ "<svg class='%s'><use xlink:href='%s'/></svg>",+ getIconClass(),SpriteImage.getVersionedHref(icon));}};}++ protected String getIconClass() {+ return "icon";+ }@Overrideprotected void onConfigure() {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.htmlindex be8eabf1ca..dc5627618e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.html@@ -2,7 +2,7 @@<div wicket:id="activities" class="activities"><table class="w-100"><tr wicket:id="activities" class="activity">- <td class="avatar"><a wicket:id="avatar"></a></td>+ <td wicket:id="avatar" class="avatar"><a wicket:id="avatar"></a></td><td wicket:id="content" class="content"></td></tr></table>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.javaindex 3fc35295d3..35d1fd6c4a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/PullRequestActivitiesPage.java@@ -104,12 +104,16 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {if (anchor != null)row.setMarkupId(anchor);- if (activity.getUser() != null)- row.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));- else- row.add(new WebMarkupContainer("avatar"));+ var avatarColumn = new WebMarkupContainer("avatar");+ row.add(avatarColumn);+ if (activity.getUser() != null) {+ avatarColumn.add(new UserIdentPanel("avatar", activity.getUser(), Mode.AVATAR));+ } else {+ avatarColumn.setVisible(false);+ avatarColumn.add(new WebMarkupContainer("avatar"));+ }- Component content = activity.render("content", new DeleteCallback() {+ Component contentColumn = activity.render("content", new DeleteCallback() {@Overridepublic void onDelete(AjaxRequestTarget target) {@@ -118,8 +122,10 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {}});+ if (activity.getUser() == null)+ contentColumn.add(AttributeAppender.append("colspan", "2"));- row.add(content);+ row.add(contentColumn);row.add(AttributeAppender.append("class", activity.getClass().getSimpleName()));@@ -181,7 +187,9 @@ public class PullRequestActivitiesPage extends PullRequestDetailPage {row.setOutputMarkupId(true);String avatarHtml = String.format("<svg class='icon'><use xlink:href='%s'/></svg>", SpriteImage.getVersionedHref("diff"));- row.add(new Label("avatar", avatarHtml) {+ var avatarColumn = new WebMarkupContainer("avatar");+ row.add(avatarColumn);+ avatarColumn.add(new Label("avatar", avatarHtml) {@Overrideprotected void onComponentTag(ComponentTag tag) {diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.htmlindex 426e2ce099..b448a6cf45 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.html@@ -2,25 +2,17 @@<div class="head">New commits added <span wicket:id="age"></span></div>- <div class="body">+ <div class="body border-left"><div wicket:id="tooManyCommits" class="alert alert-notice alert-light-warning"></div>- <div wicket:id="commits" class="commit d-flex align-items-center">- <wicket:svg href="commit" class="icon flex-shrink-0 mr-2"></wicket:svg>+ <div wicket:id="commits" class="commit d-flex align-items-start">+ <wicket:svg href="commit" class="icon flex-shrink-0 mr-2 mt-1 text-gray"></wicket:svg><div class="author flex-shrink-0 mr-2"><span wicket:id="author"></span></div>- <div class="message mr-3">- <div wicket:id="message"></div>- </div>- <div class="actions flex-shrink-0 ml-auto d-none d-lg-block">- <span class="btn-group mr-1">- <a wicket:id="signature" class="btn btn-sm btn-outline-secondary"></a>- </span>- <span class="btn-group hash mr-1">- <a wicket:id="hashLink" class="hash btn btn-sm btn-outline-secondary"><span wicket:id="hash"></span></a>- <a wicket:id="copyHash" class="btn btn-sm btn-outline-secondary btn-icon"><wicket:svg href="copy" class="icon"></wicket:svg></a>- </span>- <span class="btn-group browse">- <a wicket:id="browseCode" title="Browse code" class="btn btn-outline-secondary btn-sm btn-icon"><wicket:svg href="files" class="icon"></wicket:svg></a>- </span>+ <div wicket:id="message" class="message mr-2"></div>+ <div wicket:id="date" class="font-size-sm text-muted d-none d-xxl-block mr-2"></div>+ <div class="actions flex-shrink-0 ml-auto d-none d-lg-block font-size-sm">+ <a wicket:id="signature" class="mr-2"></a>+ <a wicket:id="hashLink" class="hash"><span wicket:id="hash"></span></a>+ <a wicket:id="copyHash" class="mr-2"><wicket:svg href="copy" class="icon icon-sm"></wicket:svg></a></div></div></div>diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.javaindex 25be1b393f..d365638255 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/activity/PullRequestUpdatedPanel.java@@ -89,7 +89,16 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {});+ var committer = commit.getCommitterIdent();+ item.add(new Label("date", DateUtils.formatAge(committer.getWhen()))+ .add(new AttributeAppender("title", DateUtils.formatDateTime(committer.getWhen()))));+item.add(new SignatureStatusPanel("signature") {++ @Override+ protected String getIconClass() {+ return "icon icon-sm";+ }@Overrideprotected RevObject getRevObject() {@@ -106,12 +115,6 @@ class PullRequestUpdatedPanel extends GenericPanel<PullRequestUpdate> {item.add(hashLink);hashLink.add(new Label("hash", GitUtils.abbreviateSHA(commit.name())));item.add(new CopyToClipboardLink("copyHash", Model.of(commit.name())));-- BlobIdent blobIdent = new BlobIdent(commit.name(), null, FileMode.TYPE_TREE);- ProjectBlobPage.State browseState = new ProjectBlobPage.State(blobIdent);- browseState.requestId = getUpdate().getRequest().getId();- params = ProjectBlobPage.paramsOf(project, browseState);- item.add(new ViewStateAwarePageLink<Void>("browseCode", ProjectBlobPage.class, params));}});diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.cssindex e079ce50d3..2a9ddbbf6a 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/activities/pull-request-activities.css@@ -58,15 +58,27 @@padding-bottom: 0;}.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit {- padding: 0.5rem 0;+ padding: 0.8rem 0;+ margin-left: -9px;+}+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>svg:first-child {+ background: white;+ opacity: 100%;+ width: 17px !important;+ height: 17px !important;+}+.dark-mode .pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body>.commit>svg:first-child {+ background: var(--dark-mode-dark);}-.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.head {display: none;}.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body {margin: 0;}+.pull-request-detail>.card-body>.main>.activities .PullRequestUpdatedActivity>td.content>.body {+ margin-left: 10px;+}.pull-request-detail>.card-body>.main>.activities .PullRequestChangeActivity>td.content>.body>.detail+.comment {margin-top: 1rem;}