Add latest changes from gitlab-org/gitlab@master

2 files changed, 69 insertions, 66 deletions

diff --git a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_action.js b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_action.js
new file mode 100644
index 00000000000..3bfbfea7f22
--- /dev/null
+++ b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_action.js
@@ -0,0 +1,57 @@
+import Vue from 'vue';
+
+export function confirmAction(
+  message,
+  {
+    primaryBtnVariant,
+    primaryBtnText,
+    secondaryBtnVariant,
+    secondaryBtnText,
+    cancelBtnVariant,
+    cancelBtnText,
+    modalHtmlMessage,
+    title,
+    hideCancel,
+  } = {},
+) {
+  return new Promise((resolve) => {
+    let confirmed = false;
+    let component;
+
+    const ConfirmAction = Vue.extend({
+      components: {
+        ConfirmModal: () => import('./confirm_modal.vue'),
+      },
+      render(h) {
+        return h(
+          'confirm-modal',
+          {
+            props: {
+              secondaryText: secondaryBtnText,
+              secondaryVariant: secondaryBtnVariant,
+              primaryVariant: primaryBtnVariant,
+              primaryText: primaryBtnText,
+              cancelVariant: cancelBtnVariant,
+              cancelText: cancelBtnText,
+              title,
+              modalHtmlMessage,
+              hideCancel,
+            },
+            on: {
+              confirmed() {
+                confirmed = true;
+              },
+              closed() {
+                component.$destroy();
+                resolve(confirmed);
+              },
+            },
+          },
+          [message],
+        );
+      },
+    });
+
+    component = new ConfirmAction().$mount();
+  });
+}
diff --git a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
index 2dc479db80a..0e959e899e9 100644
--- a/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
+++ b/app/assets/javascripts/lib/utils/confirm_via_gl_modal/confirm_via_gl_modal.js
@@ -1,75 +1,21 @@
-import Vue from 'vue';
+import { confirmAction } from './confirm_action';
 
-export function confirmAction(
-  message,
-  {
-    primaryBtnVariant,
-    primaryBtnText,
-    secondaryBtnVariant,
-    secondaryBtnText,
-    cancelBtnVariant,
-    cancelBtnText,
-    modalHtmlMessage,
-    title,
-    hideCancel,
-  } = {},
-) {
-  return new Promise((resolve) => {
-    let confirmed = false;
-
-    const component = new Vue({
-      components: {
-        ConfirmModal: () => import('./confirm_modal.vue'),
-      },
-      render(h) {
-        return h(
-          'confirm-modal',
-          {
-            props: {
-              secondaryText: secondaryBtnText,
-              secondaryVariant: secondaryBtnVariant,
-              primaryVariant: primaryBtnVariant,
-              primaryText: primaryBtnText,
-              cancelVariant: cancelBtnVariant,
-              cancelText: cancelBtnText,
-              title,
-              modalHtmlMessage,
-              hideCancel,
-            },
-            on: {
-              confirmed() {
-                confirmed = true;
-              },
-              closed() {
-                component.$destroy();
-                resolve(confirmed);
-              },
-            },
-          },
-          [message],
-        );
-      },
-    }).$mount();
-  });
-}
-
-export function confirmViaGlModal(message, element) {
-  const primaryBtnConfig = {};
-
-  const { confirmBtnVariant } = element.dataset;
-
-  if (confirmBtnVariant) {
-    primaryBtnConfig.primaryBtnVariant = confirmBtnVariant;
-  }
+function confirmViaGlModal(message, element) {
+  const { confirmBtnVariant, title, isHtmlMessage } = element.dataset;
 
   const screenReaderText =
     element.querySelector('.gl-sr-only')?.textContent ||
     element.querySelector('.sr-only')?.textContent ||
     element.getAttribute('aria-label');
 
-  if (screenReaderText) {
-    primaryBtnConfig.primaryBtnText = screenReaderText;
-  }
+  const config = {
+    ...(screenReaderText && { primaryBtnText: screenReaderText }),
+    ...(confirmBtnVariant && { primaryBtnVariant: confirmBtnVariant }),
+    ...(title && { title }),
+    ...(isHtmlMessage && { modalHtmlMessage: message }),
+  };
 
-  return confirmAction(message, primaryBtnConfig);
+  return confirmAction(message, config);
 }
+
+export { confirmAction, confirmViaGlModal };