Merge branch 'jnnkl-confirm-via-gl-modal-canceling-comment-on-mr' into 'master'

Confirm via gl modal canceling comment on mr

See merge request gitlab-org/gitlab!84270

app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_modal.vue

@@ -66,6 +66,7 @@ export default {
         text: this.secondaryText,
         attributes: {
           variant: this.secondaryVariant,
+          category: 'secondary',
         },
       };
     },

app/assets/javascripts/notes/components/noteable_note.vue

@@ -357,7 +357,13 @@ export default {
     }) {
       if (shouldConfirm && isDirty) {
         const msg = __('Are you sure you want to cancel editing this comment?');
-        const confirmed = await confirmAction(msg);
+        const confirmed = await confirmAction(msg, {
+          primaryBtnText: __('Cancel editing'),
+          primaryBtnVariant: 'danger',
+          secondaryBtnVariant: 'default',
+          secondaryBtnText: __('Continue editing'),
+          hideCancel: true,
+        });
         if (!confirmed) return;
       }
       this.$refs.noteBody.resetAutoSave();

locale/gitlab.pot

@@ -6798,6 +6798,9 @@ msgstr ""
 msgid "Cancel and close"
 msgstr ""
 
+msgid "Cancel editing"
+msgstr ""
+
 msgid "Cancel index deletion"
 msgstr ""
 
@@ -9979,6 +9982,9 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
+msgid "Continue editing"
+msgstr ""
+
 msgid "Continue to the next step"
 msgstr ""
 

spec/features/merge_request/user_posts_notes_spec.rb

@@ -169,7 +169,7 @@ RSpec.describe 'Merge request > User posts notes', :js do
         end
 
         page.within('.modal') do
-          click_button('OK', match: :first)
+          click_button('Cancel editing', match: :first)
         end
 
         expect(find('.js-note-text').text).to eq ''