The Unified and Autonomous Development Platform
feat(pr): indicate unresolved code comments
Robin Shena04af83d2960
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 bc69392564..870b3d571e 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@@ -135,7 +135,7 @@</div></div><wicket:fragment wicket:id="codeCommentsTabLinkFrag">- <a wicket:id="link" class="code-comments nav-link d-flex align-items-center"><wicket:t>Code Comments</wicket:t> <wicket:svg href="dot" class="icon ml-2 d-none"></wicket:svg></a>+ <a wicket:id="link" class="code-comments nav-link d-flex align-items-center"><wicket:t>Code Comments</wicket:t> <svg wicket:id="indicator" class="icon ml-2 d-none"></svg></a></wicket:fragment><wicket:fragment wicket:id="moreInfoFrag"><div class="submission">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 f30b90dc28..51b6c18621 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@@ -145,6 +145,7 @@ import io.onedev.server.web.component.pullrequest.build.PullRequestJobsPanel;import io.onedev.server.web.component.pullrequest.review.ReviewListPanel;import io.onedev.server.web.component.sideinfo.SideInfoLink;import io.onedev.server.web.component.sideinfo.SideInfoPanel;+import io.onedev.server.web.component.svg.SpriteImage;import io.onedev.server.web.component.tabbable.PageTab;import io.onedev.server.web.component.tabbable.PageTabHead;import io.onedev.server.web.component.tabbable.Tab;@@ -923,8 +924,16 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR@Overrideprotected String load() {Date updateDate = getPullRequest().getCodeCommentsUpdateDate();- if (updateDate != null && !getPullRequest().isCodeCommentsVisitedAfter(updateDate))+ boolean unviewed = updateDate != null+ && !getPullRequest().isCodeCommentsVisitedAfter(updateDate);+ boolean unresolved = getPullRequest().getCodeComments().stream()+ .anyMatch(it -> !it.isResolved());+ if (unviewed && unresolved)+ return "new unresolved";+ else if (unviewed)return "new";+ else if (unresolved)+ return "unresolved";elsereturn "";}@@ -940,6 +949,25 @@ public abstract class PullRequestDetailPage extends ProjectPage implements PullR});link.setOutputMarkupId(true);fragment.add(link);+ link.add(new SpriteImage("indicator", "dot")+ .add(AttributeAppender.replace("data-tippy-content", new LoadableDetachableModel<String>() {++ @Override+ protected String load() {+ Date updateDate = getPullRequest().getCodeCommentsUpdateDate();+ boolean unviewed = updateDate != null+ && !getPullRequest().isCodeCommentsVisitedAfter(updateDate);+ boolean unresolved = getPullRequest().getCodeComments().stream()+ .anyMatch(it -> !it.isResolved());+ if (unviewed && unresolved)+ return _T("Unresolved comments with unviewed activity");+ else if (unresolved)+ return _T("Unresolved comments");+ else+ return _T("Unviewed code comment activity");+ }++ })));return fragment;}});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 e569d70678..dbfef2332c 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@@ -50,13 +50,26 @@border-top-color: var(--dark-mode-dark-gray);}-ul>li>a.code-comments.new .icon {+ul>li>a.code-comments.new .icon,+ul>li>a.code-comments.unresolved .icon {width: 12px;height: 12px;- fill: var(--primary);flex-shrink: 0;display: inline-block !important;}+ul>li>a.code-comments.new .icon {+ fill: var(--primary);+}+ul>li>a.code-comments.unresolved .icon {+ fill: none;+ stroke: none;+ border: 1px solid var(--warning);+ border-radius: 50%;+}+ul>li>a.code-comments.new.unresolved .icon {+ fill: var(--warning);+ border: 0;+}.conflict-resolve-instruction {max-width: 480px;