The Unified and Autonomous Development Platform
Simplify multi-commit selection in pull request changes
Robin Shen6fb2f943542f
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.htmlindex b00a3e5e31..d25b4c8dd1 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.html@@ -19,7 +19,6 @@<div class="links mb-3"><a wicket:id="allChanges" class="btn btn-light btn-sm mr-2">All changes</a><a wicket:id="changesSinceLastReview" class="btn btn-light btn-sm mr-2">Changes since last review</a>- <a class="btn btn-light btn-sm selected-changes disabled">Show selected changes</a></div><ul class="list-unstyled autosuit mb-0"><li wicket:id="commits">diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.javaindex 76f774c4b5..d8c620bf4d 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/PullRequestChangesPage.java@@ -62,14 +62,12 @@ import io.onedev.server.model.CodeCommentStatusChange;import io.onedev.server.model.Project;import io.onedev.server.model.PullRequest;import io.onedev.server.model.PullRequestChange;-import io.onedev.server.model.PullRequestComment;import io.onedev.server.model.PullRequestUpdate;import io.onedev.server.model.User;import io.onedev.server.model.support.CompareContext;import io.onedev.server.model.support.Mark;import io.onedev.server.model.support.pullrequest.MergePreview;import io.onedev.server.model.support.pullrequest.changedata.PullRequestApproveData;-import io.onedev.server.model.support.pullrequest.changedata.PullRequestReopenData;import io.onedev.server.model.support.pullrequest.changedata.PullRequestRequestedForChangesData;import io.onedev.server.util.diff.DiffUtils;import io.onedev.server.util.diff.WhitespaceOption;@@ -456,35 +454,15 @@ public class PullRequestChangesPage extends PullRequestDetailPage implements RevUser user = getLoginUser();if (user != null) {PullRequest request = getPullRequest();- for (PullRequestComment comment: request.getComments()) {- if (comment.getUser().equals(user) &&- (lastReviewDate == null || lastReviewDate.before(comment.getDate()))) {- lastReviewDate = comment.getDate();- }- }for (PullRequestChange change: request.getChanges()) {if (user.equals(change.getUser())&& (lastReviewDate == null || lastReviewDate.before(change.getDate()))&& (change.getData() instanceof PullRequestApproveData- || change.getData() instanceof PullRequestReopenData|| change.getData() instanceof PullRequestRequestedForChangesData)) {lastReviewDate = change.getDate();}}-- for (CodeComment comment: request.getCodeComments()) {- if (user.equals(comment.getUser()) &&- (lastReviewDate == null || lastReviewDate.before(comment.getCreateDate()))) {- lastReviewDate = comment.getCreateDate();- }- for (CodeCommentReply reply: comment.getReplies()) {- if (user.equals(reply.getUser()) &&- (lastReviewDate == null || lastReviewDate.before(reply.getDate()))) {- lastReviewDate = reply.getDate();- }- }- }}return lastReviewDate;}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.cssindex 3e3b87182c..1dd0098cf0 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.css@@ -21,5 +21,11 @@background: var(--light-warning);}.dark-mode .commits-selector ul a.selected, .dark-mode .commits-selector ul a.selected:hover {- background: var(--dark-mode-lighter-dark);+ background: var(--dark-mode-light-warning);+}+.commits-selector ul a.shift-selected, .commits-selector ul a.shift-selected:hover {+ background: var(--light-primary);+}+.dark-mode .commits-selector ul a.shift-selected, .dark-mode .commits-selector ul a.shift-selected:hover {+ background: var(--dark-mode-light-primary);}diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.jsindex 58b016ad3d..4c5a53ab2e 100644--- a/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js+++ b/server-core/src/main/java/io/onedev/server/web/page/project/pullrequests/detail/changes/pull-request-changes.js@@ -1,46 +1,60 @@onedev.server.requestChanges = {initCommitSelector: function(callback, baseCommit, fromIndex, toIndex) {var $commits = $(".commits-selector ul a");- if (fromIndex!=undefined && toIndex!=undefined) {+ if (fromIndex!=undefined && toIndex!=undefined)$commits.slice(fromIndex, toIndex+1).addClass("selected");++ fromIndex = toIndex = undefined;++ function onSelectionChanged() {+ var oldCommit;+ if (fromIndex == 0)+ oldCommit = baseCommit;+ else+ oldCommit = $($(".commits-selector ul li").get(fromIndex-1)).data("hash");+ var newCommit = $($(".commits-selector ul li").get(toIndex)).data("hash");+ callback(oldCommit, newCommit);}- var fromIndexToApply = fromIndex;- var toIndexToApply = toIndex;- function onIndexChanged() {- var $apply = $(".commits-selector>.links a.selected-changes");- if (fromIndexToApply != fromIndex || toIndexToApply != toIndex) {- $apply.removeClass("disabled").off("click").click(function() {- var oldCommit;- if (fromIndexToApply == 0)- oldCommit = baseCommit;- else- oldCommit = $($(".commits-selector ul li").get(fromIndexToApply-1)).data("hash");- var newCommit = $($(".commits-selector ul li").get(toIndexToApply)).data("hash");- callback(oldCommit, newCommit);- });+ $commits.mouseover(function(e) {+ if (e.shiftKey) {+ if (fromIndex != undefined) {+ $commits.removeClass("shift-selected");+ var index = $commits.index(this);+ if (fromIndex < index)+ $commits.slice(fromIndex, index+1).addClass("shift-selected");+ else+ $commits.slice(index, fromIndex+1).addClass("shift-selected");+ }} else {- $apply.addClass("disabled");+ $commits.removeClass("shift-selected");+ if (fromIndex != undefined)+ $commits.eq(fromIndex).addClass("shift-selected");}- $commits.removeClass("selected").slice(fromIndexToApply, toIndexToApply+1).addClass("selected");- }+ });$commits.click(function(e) {var index = $commits.index(this);if (e.shiftKey) {- if (fromIndexToApply != undefined && toIndexToApply != undefined) {- if (index < fromIndexToApply) {- fromIndexToApply = index;- } else if (index > toIndexToApply) {- toIndexToApply = index;- }+ if (fromIndex == undefined) {+ fromIndex = index;+ $(this).addClass("shift-selected");+ } else if (fromIndex == index) {+ fromIndex = undefined;+ $(this).removeClass("shift-selected");} else {- fromIndexToApply = toIndexToApply = index;+ if (fromIndex < index) {+ toIndex = index;+ } else {+ toIndex = fromIndex;+ fromIndex = index;+ }+ onSelectionChanged();}} else {- fromIndexToApply = toIndexToApply = index;+ fromIndex = toIndex = index;+ onSelectionChanged();}- onIndexChanged();});}};\ No newline at end of file