From aa6ecae0fbabc0fb2c12553642b752cdd3c7a584 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 4 Dec 2024 00:04:48 -0700
Subject: [PATCH 01/10] Add 'Start review' button to MR Overview

Changelog: added
---
 .../notes/components/comment_form.vue           | 17 +++++++++++++++++
 app/assets/javascripts/notes/i18n.js            |  1 +
 locale/gitlab.pot                               |  3 +++
 3 files changed, 21 insertions(+)

diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 33d6a60ba84c8a..acd5b57083d3ae 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -172,6 +172,11 @@ export default {
     isEpic() {
       return constants.NOTEABLE_TYPE_MAPPING[this.noteableType] === constants.EPIC_NOTEABLE_TYPE;
     },
+    isMergeRequest() {
+      return (
+        constants.NOTEABLE_TYPE_MAPPING[this.noteableType] === constants.MERGE_REQUEST_NOTEABLE_TYPE
+      );
+    },
     trackingLabel() {
       return slugifyWithUnderscore(`${this.commentButtonTitle} button`);
     },
@@ -439,6 +444,18 @@ export default {
                   :discussions-require-resolution="discussionsRequireResolution"
                   @click="handleSave"
                 />
+                <template v-if="isMergeRequest">
+                  <gl-button
+                    :disabled="disableSubmitButton"
+                    data-testid="start-review-button"
+                    category="secondary"
+                    variant="confirm"
+                    class="gl-mr-3"
+                    @click="handleSaveDraft()"
+                  >
+                    {{ $options.i18n.startReview }}
+                  </gl-button>
+                </template>
               </template>
               <gl-button
                 v-if="canToggleIssueState"
diff --git a/app/assets/javascripts/notes/i18n.js b/app/assets/javascripts/notes/i18n.js
index ba7322b753059e..8e32542e7fe676 100644
--- a/app/assets/javascripts/notes/i18n.js
+++ b/app/assets/javascripts/notes/i18n.js
@@ -50,6 +50,7 @@ export const COMMENT_FORM = {
     saveThread: __('Add thread to review'),
     saveComment: __('Add comment to review'),
   },
+  startReview: __('Start review'),
   addCommentNow: __('Add comment now'),
   addThreadNow: __('Add thread now'),
 };
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 1200dae9b13608..ca2c86cbf4e3ec 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -53475,6 +53475,9 @@ msgstr ""
 msgid "Start merge train..."
 msgstr ""
 
+msgid "Start review"
+msgstr ""
+
 msgid "Start search"
 msgstr ""
 
-- 
GitLab


From 7f8ac84dbd87f5046c984a99292c79171f2d0771 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 4 Dec 2024 00:06:36 -0700
Subject: [PATCH 02/10] Make all draft comments be resolvable/threads

---
 app/assets/javascripts/notes/components/comment_form.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index acd5b57083d3ae..645ef450dd562d 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -242,7 +242,7 @@ export default {
           isDraft,
         };
 
-        if (this.noteType === constants.DISCUSSION) {
+        if (this.noteType === constants.DISCUSSION || isDraft) {
           noteData.data.note.type = constants.DISCUSSION_NOTE;
         }
 
-- 
GitLab


From b183a4ed7ae9f251834810be4e4b77a4598c490e Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 4 Dec 2024 00:07:15 -0700
Subject: [PATCH 03/10] Simplify comment options when a review is in progress

---
 .../notes/components/comment_form.vue         | 24 +++++++------------
 app/assets/javascripts/notes/i18n.js          |  1 +
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 645ef450dd562d..68206f0bc0b00c 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -191,11 +191,6 @@ export default {
 
       return null;
     },
-    commentNowButtonTitle() {
-      return this.noteType === constants.COMMENT
-        ? this.$options.i18n.addCommentNow
-        : this.$options.i18n.addThreadNow;
-    },
   },
   watch: {
     noteIsInternal(val) {
@@ -412,24 +407,23 @@ export default {
                 />
               </gl-form-checkbox>
               <template v-if="hasDrafts">
-                <comment-type-dropdown
-                  v-model="noteType"
-                  class="gl-mr-3"
-                  data-testid="add-to-review-dropdown"
+                <gl-button
                   :disabled="disableSubmitButton"
-                  :tracking-label="trackingLabel"
-                  is-review-dropdown
-                  :noteable-display-name="noteableDisplayName"
-                  :discussions-require-resolution="discussionsRequireResolution"
+                  data-testid="add-to-review-button"
+                  category="primary"
+                  variant="confirm"
+                  class="gl-mr-3"
                   @click="handleSaveDraft()"
-                />
+                >
+                  {{ $options.i18n.addToReview }}
+                </gl-button>
                 <gl-button
                   :disabled="disableSubmitButton"
                   data-testid="add-comment-now-button"
                   category="secondary"
                   class="gl-mr-3"
                   @click.prevent="handleSave()"
-                  >{{ commentNowButtonTitle }}</gl-button
+                  >{{ $options.i18n.addCommentNow }}</gl-button
                 >
               </template>
               <template v-else>
diff --git a/app/assets/javascripts/notes/i18n.js b/app/assets/javascripts/notes/i18n.js
index 8e32542e7fe676..748a8b5d66648a 100644
--- a/app/assets/javascripts/notes/i18n.js
+++ b/app/assets/javascripts/notes/i18n.js
@@ -50,6 +50,7 @@ export const COMMENT_FORM = {
     saveThread: __('Add thread to review'),
     saveComment: __('Add comment to review'),
   },
+  addToReview: __('Add to review'),
   startReview: __('Start review'),
   addCommentNow: __('Add comment now'),
   addThreadNow: __('Add thread now'),
-- 
GitLab


From e76285d8f62a00a8f043d56ea5f9b9fdb380e011 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 4 Dec 2024 01:42:27 -0700
Subject: [PATCH 04/10] Update tests for "Start review" and always threading
 review comments

---
 .../notes/components/comment_form_spec.js     | 21 ++++++++++++++-----
 .../components/comment_type_dropdown_spec.js  | 19 ++++++++++-------
 2 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js
index 71037750bce838..f72f400eb97c4a 100644
--- a/spec/frontend/notes/components/comment_form_spec.js
+++ b/spec/frontend/notes/components/comment_form_spec.js
@@ -49,8 +49,8 @@ describe('issue_comment_form component', () => {
   const findCloseReopenButton = () => wrapper.findByTestId('close-reopen-button');
   const findMarkdownEditor = () => wrapper.findComponent(MarkdownEditor);
   const findMarkdownEditorTextarea = () => findMarkdownEditor().find('textarea');
-  const findAddToReviewDropdown = () => wrapper.findByTestId('add-to-review-dropdown');
-  const findAddToReviewButton = () => findAddToReviewDropdown().find('button');
+  const findStartReviewButton = () => wrapper.findByTestId('start-review-button');
+  const findAddToReviewButton = () => wrapper.findByTestId('add-to-review-button');
   const findAddCommentNowButton = () => wrapper.findByTestId('add-comment-now-button');
   const findConfidentialNoteCheckbox = () => wrapper.findByTestId('internal-note-checkbox');
   const findInternalNoteTooltipIcon = () => wrapper.findByTestId('question-o-icon');
@@ -466,6 +466,7 @@ describe('issue_comment_form component', () => {
                     note: 'a',
                     noteable_id: noteableDataMock.id,
                     noteable_type: 'Issue',
+                    type: 'DiscussionNote',
                   },
                 },
                 endpoint: notesDataMock.draftsPath,
@@ -485,6 +486,7 @@ describe('issue_comment_form component', () => {
                     note: 'a',
                     noteable_id: noteableDataMock.id,
                     noteable_type: 'Issue',
+                    type: 'DiscussionNote',
                   },
                 },
                 endpoint: notesDataMock.draftsPath,
@@ -865,7 +867,7 @@ describe('issue_comment_form component', () => {
   });
 
   describe('with batchComments in store', () => {
-    describe('add to review and comment now buttons', () => {
+    describe('start review, add to review and comment now buttons', () => {
       let store;
 
       beforeEach(() => {
@@ -876,7 +878,16 @@ describe('issue_comment_form component', () => {
       it('when no drafts exist, should not render', () => {
         mountComponent({ store });
         expect(findCommentTypeDropdown().exists()).toBe(true);
-        expect(findAddToReviewDropdown().exists()).toBe(false);
+        expect(findStartReviewButton().exists()).toBe(false);
+        expect(findAddToReviewButton().exists()).toBe(false);
+        expect(findAddCommentNowButton().exists()).toBe(false);
+      });
+
+      it('when no drafts exist in a merge request, should render', () => {
+        mountComponent({ noteableType: constants.MERGE_REQUEST_NOTEABLE_TYPE, store });
+        expect(findCommentTypeDropdown().exists()).toBe(true);
+        expect(findStartReviewButton().exists()).toBe(true);
+        expect(findAddToReviewButton().exists()).toBe(false);
         expect(findAddCommentNowButton().exists()).toBe(false);
       });
 
@@ -888,7 +899,7 @@ describe('issue_comment_form component', () => {
         it('should render', async () => {
           await mountComponent({ store });
           expect(findCommentTypeDropdown().exists()).toBe(false);
-          expect(findAddToReviewDropdown().exists()).toBe(true);
+          expect(findAddToReviewButton().exists()).toBe(true);
           expect(findAddCommentNowButton().exists()).toBe(true);
         });
 
diff --git a/spec/frontend/notes/components/comment_type_dropdown_spec.js b/spec/frontend/notes/components/comment_type_dropdown_spec.js
index e1cb1c9a8bccfb..53eee66f37eeb1 100644
--- a/spec/frontend/notes/components/comment_type_dropdown_spec.js
+++ b/spec/frontend/notes/components/comment_type_dropdown_spec.js
@@ -35,15 +35,18 @@ describe('CommentTypeDropdown component', () => {
   });
 
   it.each`
-    isInternalNote | isReviewDropdown | buttonText
-    ${false}       | ${false}         | ${COMMENT_FORM.comment}
-    ${true}        | ${false}         | ${COMMENT_FORM.internalComment}
-    ${false}       | ${true}          | ${COMMENT_FORM.addToReviewButton.saveComment}
-    ${true}        | ${true}          | ${COMMENT_FORM.internalComment}
+    isInternalNote | isReviewDropdown | isMr     | buttonText
+    ${false}       | ${false}         | ${false} | ${COMMENT_FORM.comment}
+    ${true}        | ${false}         | ${false} | ${COMMENT_FORM.internalComment}
+    ${false}       | ${true}          | ${false} | ${COMMENT_FORM.addToReviewButton.saveComment}
+    ${true}        | ${true}          | ${false} | ${COMMENT_FORM.internalComment}
+    ${true}        | ${false}         | ${true}  | ${COMMENT_FORM.comment}
   `(
-    'Should label action button as "$buttonText" for comment when `isInternalNote` is $isInternalNote and `isReviewDropdown` is $isReviewDropdown',
-    ({ isInternalNote, isReviewDropdown, buttonText }) => {
-      mountComponent({ props: { noteType: constants.COMMENT, isInternalNote, isReviewDropdown } });
+    'Should label action button as "$buttonText" for comment when props are {isInternalNote: $isInternalNote, isReviewDropdown: $isReviewDropdown, isMr: $isMr}',
+    ({ isInternalNote, isReviewDropdown, isMr, buttonText }) => {
+      mountComponent({
+        props: { noteType: constants.COMMENT, isInternalNote, isReviewDropdown, isMr },
+      });
 
       expect(findCommentButton().text()).toBe(buttonText);
     },
-- 
GitLab


From db268ba32cdf2094d385ff0dca2726aba2bd8880 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 30 Oct 2024 12:08:27 -0600
Subject: [PATCH 05/10] Add QA spec updates

---
 qa/qa/page/component/note.rb                       | 14 ++++++++++++++
 .../add_batch_comments_in_merge_request_spec.rb    | 11 ++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/qa/qa/page/component/note.rb b/qa/qa/page/component/note.rb
index 8cba760edee80e..d18778f9f16163 100644
--- a/qa/qa/page/component/note.rb
+++ b/qa/qa/page/component/note.rb
@@ -15,6 +15,8 @@ def self.included(base)
 
           base.view 'app/assets/javascripts/notes/components/comment_form.vue' do
             element 'comment-field'
+            element 'add-to-review-button'
+            element 'start-review-button'
           end
 
           base.view 'app/assets/javascripts/notes/components/comment_type_dropdown.vue' do
@@ -156,6 +158,18 @@ def start_discussion(text)
           has_comment?(text)
         end
 
+        def start_review_with_comment(text)
+          fill_editor_element 'comment-field', text
+          click_element 'start-review-button'
+          has_comment?(text)
+        end
+
+        def add_comment_to_review(text)
+          fill_editor_element 'comment-field', text
+          click_element 'add-to-review-button'
+          has_comment?(text)
+        end
+
         def toggle_comments(position)
           all_elements('toggle-comments-button', minimum: position)[position - 1].click
         end
diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
index 5d6a751ea468db..d11b20e0b00568 100644
--- a/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
@@ -14,17 +14,10 @@ module QA
         merge_request.visit!
 
         Page::MergeRequest::Show.perform do |show|
-          show.click_discussions_tab
-
-          # You can't start a review immediately, so we have to add a
-          # comment (or start a thread) first
-          show.start_discussion("I'm starting a new discussion")
-          show.type_reply_to_discussion(1, "Could you please check this?")
-          show.start_review
+          show.start_review_with_comment('new comment to start review')
           show.submit_pending_reviews
 
-          expect(show).to have_comment("I'm starting a new discussion")
-          expect(show).to have_comment("Could you please check this?")
+          expect(show).to have_comment('new comment to start review')
           expect(show).to have_content("1 unresolved thread")
         end
       end
-- 
GitLab


From 0615e793c24d81160b3c71e7e740a2980ea047a8 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 4 Dec 2024 16:26:21 -0700
Subject: [PATCH 06/10] Update feature specs for new UI

---
 spec/features/merge_request/batch_comments_spec.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/spec/features/merge_request/batch_comments_spec.rb b/spec/features/merge_request/batch_comments_spec.rb
index d3006667e90a50..ecea99b9f1634f 100644
--- a/spec/features/merge_request/batch_comments_spec.rb
+++ b/spec/features/merge_request/batch_comments_spec.rb
@@ -144,7 +144,7 @@
       end
 
       it 'can add comment to review' do
-        write_comment(selector: '.js-main-target-form', field: 'note-body', text: 'Its a draft comment', button_text: 'Add comment to review')
+        write_comment(selector: '.js-main-target-form', field: 'note-body', text: 'Its a draft comment', button_text: 'Add to review')
 
         expect(page).to have_selector('.draft-note', text: 'Its a draft comment')
 
-- 
GitLab


From e52de32fb28cb50a8a78bb2a097d0037b0d0e810 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 4 Dec 2024 19:09:44 -0700
Subject: [PATCH 07/10] Don't change the note submit button dropdown text for
 MRs

---
 app/assets/javascripts/notes/components/comment_form.vue   | 1 +
 .../javascripts/notes/components/comment_type_dropdown.vue | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 68206f0bc0b00c..7589d4a4351d76 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -431,6 +431,7 @@ export default {
                   v-model="noteType"
                   class="gl-mr-3"
                   data-testid="comment-button"
+                  :is-mr="isMergeRequest"
                   :disabled="disableSubmitButton"
                   :tracking-label="trackingLabel"
                   :is-internal-note="noteIsInternal"
diff --git a/app/assets/javascripts/notes/components/comment_type_dropdown.vue b/app/assets/javascripts/notes/components/comment_type_dropdown.vue
index f2ac527d4c0be1..cbc7976be0b2f5 100644
--- a/app/assets/javascripts/notes/components/comment_type_dropdown.vue
+++ b/app/assets/javascripts/notes/components/comment_type_dropdown.vue
@@ -41,6 +41,11 @@ export default {
       required: false,
       default: false,
     },
+    isMr: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
     noteableDisplayName: {
       type: String,
       required: true,
@@ -76,7 +81,7 @@ export default {
       const { comment, internalComment, startThread, startInternalThread } = this.$options.i18n;
       const { saveThread, saveComment } = this.$options.i18n.addToReviewButton;
 
-      if (this.isInternalNote) {
+      if (this.isInternalNote && !this.isMr) {
         return this.noteType === constants.COMMENT ? internalComment : startInternalThread;
       }
 
-- 
GitLab


From fbacddf1d88af3ebb9a20da6056596dac518054c Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 9 Dec 2024 20:35:44 +0000
Subject: [PATCH 08/10] Apply 1 suggestion(s) to 1 file(s)

Co-authored-by: Valerie Burton <vburton@gitlab.com>
---
 .../merge_request/add_batch_comments_in_merge_request_spec.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb b/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
index d11b20e0b00568..92b7825d342974 100644
--- a/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
+++ b/qa/qa/specs/features/ee/browser_ui/3_create/merge_request/add_batch_comments_in_merge_request_spec.rb
@@ -15,10 +15,12 @@ module QA
 
         Page::MergeRequest::Show.perform do |show|
           show.start_review_with_comment('new comment to start review')
+          show.add_comment_to_review('comment added to review')
           show.submit_pending_reviews
 
           expect(show).to have_comment('new comment to start review')
-          expect(show).to have_content("1 unresolved thread")
+          expect(show).to have_comment('comment added to review')
+          expect(show).to have_content("2 unresolved threads")
         end
       end
 
-- 
GitLab


From 5c7dfe805e4deb37aa39ba736dfd7f576279afed Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Mon, 16 Dec 2024 18:24:42 -0700
Subject: [PATCH 09/10] Update specs with review notes

---
 spec/frontend/notes/components/comment_form_spec.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/spec/frontend/notes/components/comment_form_spec.js b/spec/frontend/notes/components/comment_form_spec.js
index f72f400eb97c4a..c7c6791938c203 100644
--- a/spec/frontend/notes/components/comment_form_spec.js
+++ b/spec/frontend/notes/components/comment_form_spec.js
@@ -875,7 +875,7 @@ describe('issue_comment_form component', () => {
         store.registerModule('batchComments', batchComments());
       });
 
-      it('when no drafts exist, should not render', () => {
+      it('when no drafts exist on non-merge request, should not render', () => {
         mountComponent({ store });
         expect(findCommentTypeDropdown().exists()).toBe(true);
         expect(findStartReviewButton().exists()).toBe(false);
@@ -896,11 +896,12 @@ describe('issue_comment_form component', () => {
           store.state.batchComments.drafts = [{ note: 'A' }];
         });
 
-        it('should render', async () => {
+        it('should render proper action elements', async () => {
           await mountComponent({ store });
           expect(findCommentTypeDropdown().exists()).toBe(false);
           expect(findAddToReviewButton().exists()).toBe(true);
           expect(findAddCommentNowButton().exists()).toBe(true);
+          expect(findStartReviewButton().exists()).toBe(false);
         });
 
         it('clicking `add to review`, should call draft endpoint, set `isDraft` true', async () => {
-- 
GitLab


From 8d7129cbee9b5b7f4fdaf0a00de813be6a74efb8 Mon Sep 17 00:00:00 2001
From: Thomas Randolph <trandolph@gitlab.com>
Date: Wed, 18 Dec 2024 08:46:30 -0700
Subject: [PATCH 10/10] Remove MR-specific primary action text change for
 internal notes

---
 .../notes/components/comment_form.vue         |  1 -
 .../components/comment_type_dropdown.vue      |  7 +------
 .../components/comment_type_dropdown_spec.js  | 19 ++++++++-----------
 3 files changed, 9 insertions(+), 18 deletions(-)

diff --git a/app/assets/javascripts/notes/components/comment_form.vue b/app/assets/javascripts/notes/components/comment_form.vue
index 7589d4a4351d76..68206f0bc0b00c 100644
--- a/app/assets/javascripts/notes/components/comment_form.vue
+++ b/app/assets/javascripts/notes/components/comment_form.vue
@@ -431,7 +431,6 @@ export default {
                   v-model="noteType"
                   class="gl-mr-3"
                   data-testid="comment-button"
-                  :is-mr="isMergeRequest"
                   :disabled="disableSubmitButton"
                   :tracking-label="trackingLabel"
                   :is-internal-note="noteIsInternal"
diff --git a/app/assets/javascripts/notes/components/comment_type_dropdown.vue b/app/assets/javascripts/notes/components/comment_type_dropdown.vue
index cbc7976be0b2f5..f2ac527d4c0be1 100644
--- a/app/assets/javascripts/notes/components/comment_type_dropdown.vue
+++ b/app/assets/javascripts/notes/components/comment_type_dropdown.vue
@@ -41,11 +41,6 @@ export default {
       required: false,
       default: false,
     },
-    isMr: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
     noteableDisplayName: {
       type: String,
       required: true,
@@ -81,7 +76,7 @@ export default {
       const { comment, internalComment, startThread, startInternalThread } = this.$options.i18n;
       const { saveThread, saveComment } = this.$options.i18n.addToReviewButton;
 
-      if (this.isInternalNote && !this.isMr) {
+      if (this.isInternalNote) {
         return this.noteType === constants.COMMENT ? internalComment : startInternalThread;
       }
 
diff --git a/spec/frontend/notes/components/comment_type_dropdown_spec.js b/spec/frontend/notes/components/comment_type_dropdown_spec.js
index 53eee66f37eeb1..e1cb1c9a8bccfb 100644
--- a/spec/frontend/notes/components/comment_type_dropdown_spec.js
+++ b/spec/frontend/notes/components/comment_type_dropdown_spec.js
@@ -35,18 +35,15 @@ describe('CommentTypeDropdown component', () => {
   });
 
   it.each`
-    isInternalNote | isReviewDropdown | isMr     | buttonText
-    ${false}       | ${false}         | ${false} | ${COMMENT_FORM.comment}
-    ${true}        | ${false}         | ${false} | ${COMMENT_FORM.internalComment}
-    ${false}       | ${true}          | ${false} | ${COMMENT_FORM.addToReviewButton.saveComment}
-    ${true}        | ${true}          | ${false} | ${COMMENT_FORM.internalComment}
-    ${true}        | ${false}         | ${true}  | ${COMMENT_FORM.comment}
+    isInternalNote | isReviewDropdown | buttonText
+    ${false}       | ${false}         | ${COMMENT_FORM.comment}
+    ${true}        | ${false}         | ${COMMENT_FORM.internalComment}
+    ${false}       | ${true}          | ${COMMENT_FORM.addToReviewButton.saveComment}
+    ${true}        | ${true}          | ${COMMENT_FORM.internalComment}
   `(
-    'Should label action button as "$buttonText" for comment when props are {isInternalNote: $isInternalNote, isReviewDropdown: $isReviewDropdown, isMr: $isMr}',
-    ({ isInternalNote, isReviewDropdown, isMr, buttonText }) => {
-      mountComponent({
-        props: { noteType: constants.COMMENT, isInternalNote, isReviewDropdown, isMr },
-      });
+    'Should label action button as "$buttonText" for comment when `isInternalNote` is $isInternalNote and `isReviewDropdown` is $isReviewDropdown',
+    ({ isInternalNote, isReviewDropdown, buttonText }) => {
+      mountComponent({ props: { noteType: constants.COMMENT, isInternalNote, isReviewDropdown } });
 
       expect(findCommentButton().text()).toBe(buttonText);
     },
-- 
GitLab