Add latest changes from gitlab-org/gitlab@master

4 files changed, 32 insertions, 18 deletions

diff --git a/app/assets/javascripts/notes/components/discussion_counter.vue b/app/assets/javascripts/notes/components/discussion_counter.vue
index d7ffa0abb79..98f1f385e9b 100644
--- a/app/assets/javascripts/notes/components/discussion_counter.vue
+++ b/app/assets/javascripts/notes/components/discussion_counter.vue
@@ -19,6 +19,7 @@ export default {
       'resolvableDiscussionsCount',
       'firstUnresolvedDiscussionId',
       'unresolvedDiscussionsCount',
+      'getDiscussion',
     ]),
     isLoggedIn() {
       return this.getUserData.id;
@@ -40,9 +41,10 @@ export default {
     ...mapActions(['expandDiscussion']),
     jumpToFirstUnresolvedDiscussion() {
       const diffTab = window.mrTabs.currentAction === 'diffs';
-      const discussionId = this.firstUnresolvedDiscussionId(diffTab);
-
-      this.jumpToDiscussion(discussionId);
+      const discussionId =
+        this.firstUnresolvedDiscussionId(diffTab) || this.firstUnresolvedDiscussionId();
+      const firstDiscussion = this.getDiscussion(discussionId);
+      this.jumpToDiscussion(firstDiscussion);
     },
   },
 };
diff --git a/app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue b/app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue
index 7fbfe8eebb2..7d742fbfeee 100644
--- a/app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue
+++ b/app/assets/javascripts/notes/components/discussion_keyboard_navigator.vue
@@ -19,7 +19,11 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['nextUnresolvedDiscussionId', 'previousUnresolvedDiscussionId']),
+    ...mapGetters([
+      'nextUnresolvedDiscussionId',
+      'previousUnresolvedDiscussionId',
+      'getDiscussion',
+    ]),
   },
   mounted() {
     Mousetrap.bind('n', () => this.jumpToNextDiscussion());
@@ -33,14 +37,14 @@ export default {
     ...mapActions(['expandDiscussion']),
     jumpToNextDiscussion() {
       const nextId = this.nextUnresolvedDiscussionId(this.currentDiscussionId, this.isDiffView);
-
-      this.jumpToDiscussion(nextId);
+      const nextDiscussion = this.getDiscussion(nextId);
+      this.jumpToDiscussion(nextDiscussion);
       this.currentDiscussionId = nextId;
     },
     jumpToPreviousDiscussion() {
       const prevId = this.previousUnresolvedDiscussionId(this.currentDiscussionId, this.isDiffView);
-
-      this.jumpToDiscussion(prevId);
+      const prevDiscussion = this.getDiscussion(prevId);
+      this.jumpToDiscussion(prevDiscussion);
       this.currentDiscussionId = prevId;
     },
   },
diff --git a/app/assets/javascripts/notes/components/noteable_discussion.vue b/app/assets/javascripts/notes/components/noteable_discussion.vue
index 47ec740b63a..62d401d4911 100644
--- a/app/assets/javascripts/notes/components/noteable_discussion.vue
+++ b/app/assets/javascripts/notes/components/noteable_discussion.vue
@@ -84,6 +84,7 @@ export default {
       'hasUnresolvedDiscussions',
       'showJumpToNextDiscussion',
       'getUserData',
+      'getDiscussion',
     ]),
     currentUser() {
       return this.getUserData;
@@ -221,8 +222,9 @@ export default {
         this.discussion.id,
         this.discussionsByDiffOrder,
       );
+      const nextDiscussion = this.getDiscussion(nextId);
 
-      this.jumpToDiscussion(nextId);
+      this.jumpToDiscussion(nextDiscussion);
     },
     deleteNoteHandler(note) {
       this.$emit('noteDeleted', this.discussion, note);
diff --git a/app/assets/javascripts/notes/mixins/discussion_navigation.js b/app/assets/javascripts/notes/mixins/discussion_navigation.js
index 3d89d907777..94ca01e44cc 100644
--- a/app/assets/javascripts/notes/mixins/discussion_navigation.js
+++ b/app/assets/javascripts/notes/mixins/discussion_navigation.js
@@ -35,20 +35,26 @@ export default {
 
       return false;
     },
-    jumpToDiscussion(id) {
+
+    switchToDiscussionsTabAndJumpTo(id) {
+      window.mrTabs.eventHub.$once('MergeRequestTabChange', () => {
+        setTimeout(() => this.discussionJump(id), 0);
+      });
+
+      window.mrTabs.tabShown('show');
+    },
+
+    jumpToDiscussion(discussion) {
+      const { id, diff_discussion: isDiffDiscussion } = discussion;
       if (id) {
         const activeTab = window.mrTabs.currentAction;
 
-        if (activeTab === 'diffs') {
+        if (activeTab === 'diffs' && isDiffDiscussion) {
           this.diffsJump(id);
-        } else if (activeTab === 'commits' || activeTab === 'pipelines') {
-          window.mrTabs.eventHub.$once('MergeRequestTabChange', () => {
-            setTimeout(() => this.discussionJump(id), 0);
-          });
-
-          window.mrTabs.tabShown('show');
-        } else {
+        } else if (activeTab === 'show') {
           this.discussionJump(id);
+        } else {
+          this.switchToDiscussionsTabAndJumpTo(id);
         }
       }
     },