diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-11-19 08:27:35 +0000 |
commit | 7e9c479f7de77702622631cff2628a9c8dcbc627 (patch) | |
tree | c8f718a08e110ad7e1894510980d2155a6549197 /app/assets/javascripts/environments/components/delete_environment_modal.vue | |
parent | e852b0ae16db4052c1c567d9efa4facc81146e88 (diff) | |
download | gitlab-ce-7e9c479f7de77702622631cff2628a9c8dcbc627.tar.gz |
Add latest changes from gitlab-org/gitlab@13-6-stable-eev13.6.0-rc42
Diffstat (limited to 'app/assets/javascripts/environments/components/delete_environment_modal.vue')
-rw-r--r-- | app/assets/javascripts/environments/components/delete_environment_modal.vue | 42 |
1 files changed, 22 insertions, 20 deletions
diff --git a/app/assets/javascripts/environments/components/delete_environment_modal.vue b/app/assets/javascripts/environments/components/delete_environment_modal.vue index 29aab268fd3..2eb2be351b3 100644 --- a/app/assets/javascripts/environments/components/delete_environment_modal.vue +++ b/app/assets/javascripts/environments/components/delete_environment_modal.vue @@ -1,29 +1,35 @@ <script> -import { GlTooltipDirective } from '@gitlab/ui'; -import GlModal from '~/vue_shared/components/gl_modal.vue'; +import { GlTooltipDirective, GlModal } from '@gitlab/ui'; import { s__, sprintf } from '~/locale'; import eventHub from '../event_hub'; export default { id: 'delete-environment-modal', name: 'DeleteEnvironmentModal', - components: { GlModal, }, - directives: { GlTooltip: GlTooltipDirective, }, - props: { environment: { type: Object, required: true, }, }, - computed: { + primaryProps() { + return { + text: s__('Environments|Delete environment'), + attributes: [{ variant: 'danger' }], + }; + }, + cancelProps() { + return { + text: s__('Cancel'), + }; + }, confirmDeleteMessage() { return sprintf( s__( @@ -35,8 +41,12 @@ export default { false, ); }, + modalTitle() { + return sprintf(s__(`Environments|Delete '%{environmentName}'?`), { + environmentName: this.environment.name, + }); + }, }, - methods: { onSubmit() { eventHub.$emit('deleteEnvironment', this.environment); @@ -47,20 +57,12 @@ export default { <template> <gl-modal - :id="$options.id" - :footer-primary-button-text="s__('Environments|Delete environment')" - footer-primary-button-variant="danger" - @submit="onSubmit" + :modal-id="$options.id" + :action-primary="primaryProps" + :action-cancel="cancelProps" + :title="modalTitle" + @primary="onSubmit" > - <template #header> - <h4 class="modal-title d-flex mw-100"> - {{ __('Delete') }} - <span v-gl-tooltip :title="environment.name" class="text-truncate mx-1 flex-fill"> - {{ environment.name }}? - </span> - </h4> - </template> - <p>{{ confirmDeleteMessage }}</p> </gl-modal> </template> |