Added jump to next discussion button

app/assets/javascripts/diff_notes/components/jump_to_discussion.js.es6

@@ -0,0 +1,35 @@
+(() => {
+  JumpToDiscussion = Vue.extend({
+    data: function () {
+      return {
+        discussions: CommentsStore.state,
+      };
+    },
+    methods: {
+      jumpToNextUnresolvedDiscussion: function () {
+        let nextUnresolvedDiscussionId;
+
+        for (const discussionId in this.discussions) {
+          const discussion = this.discussions[discussionId];
+
+          for (const noteId in discussion) {
+            const note = discussion[noteId];
+
+            if (!note.resolved) {
+              nextUnresolvedDiscussionId = discussionId;
+              break;
+            }
+          }
+
+          if (nextUnresolvedDiscussionId) break;
+        }
+
+        $.scrollTo(`.${nextUnresolvedDiscussionId}`, {
+          offset: -($('.navbar-gitlab').outerHeight() + $('.layout-nav').outerHeight())
+        });
+      },
+    }
+  });
+
+  Vue.component('jump-to-discussion', JumpToDiscussion);
+}());

app/assets/javascripts/diff_notes/components/resolve_count.js.es6

@@ -10,8 +10,8 @@
       resolved: function () {
         let resolvedCount = 0;
 
-        for (const discussionId in this.comments) {
-          const comments = this.comments[discussionId];
+        for (const discussionId in this.discussions) {
+          const comments = this.discussions[discussionId];
           let resolved = true;
 
           for (const noteId in comments) {
@@ -33,7 +33,7 @@
         return Object.keys(this.discussions).length;
       },
       allResolved: function () {
-        return this.resolved === this.commentsCount;
+        return this.resolved === this.discussionCount;
       }
     }
   });

app/views/projects/merge_requests/_show.html.haml

@@ -47,9 +47,12 @@
     - if current_user
       #resolve-count-app{ "v-cloak" => true }
         %resolve-count{ "inline-template" => true }
-          .line-resolve-all{ "v-show" => "commentsCount > 0" }
+          .line-resolve-all{ "v-show" => "discussionCount > 0" }
             %span.line-resolve-text
               {{ resolved }}/{{ discussionCount }} discussions resolved
+          %jump-to-discussion{ "inline-template" => true }
+            %button.btn.btn-default.has-tooltip{ "@click" => "jumpToNextUnresolvedDiscussion", title: "Jump to next unresolved discussion", data: { container: "body" } }
+              = icon("caret-down")
 
     - if @commits_count.nonzero?
       %ul.merge-request-tabs.nav-links.no-top.no-bottom