diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 09:10:53 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-12-20 09:10:53 +0300 |
commit | 62c4f807157e1c58fb16db4c75abaed22916272b (patch) | |
tree | 14d872d9b437c5e7199c628b4ac627716786192b /app/assets/javascripts/init_confirm_danger.js | |
parent | 060951c7d132f17a818fe20346efd584c84c710c (diff) |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'app/assets/javascripts/init_confirm_danger.js')
-rw-r--r-- | app/assets/javascripts/init_confirm_danger.js | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/app/assets/javascripts/init_confirm_danger.js b/app/assets/javascripts/init_confirm_danger.js index a8833a17467..98bfa48740c 100644 --- a/app/assets/javascripts/init_confirm_danger.js +++ b/app/assets/javascripts/init_confirm_danger.js @@ -1,4 +1,5 @@ import Vue from 'vue'; +import { pickBy } from 'lodash'; import { parseBoolean } from './lib/utils/common_utils'; import ConfirmDanger from './vue_shared/components/confirm_danger/confirm_danger.vue'; @@ -12,21 +13,32 @@ export default () => { buttonText, buttonClass = '', buttonTestid = null, + buttonVariant = null, confirmDangerMessage, + confirmButtonText = null, disabled = false, + additionalInformation, + htmlConfirmationMessage, } = el.dataset; return new Vue({ el, - provide: { - confirmDangerMessage, - }, + provide: pickBy( + { + htmlConfirmationMessage, + confirmDangerMessage, + additionalInformation, + confirmButtonText, + }, + (v) => Boolean(v), + ), render: (createElement) => createElement(ConfirmDanger, { props: { phrase, buttonText, buttonClass, + buttonVariant, buttonTestid, disabled: parseBoolean(disabled), }, |