Commit 9d805baf authored by Nicolò Maria Mezzopera's avatar Nicolò Maria Mezzopera

Merge branch 'russell/replace-deprecated-button-in-remove-cluster-confirmation' into 'master'

Migrate buttons in remove-cluster-confirmation

Closes #219759

See merge request gitlab-org/gitlab!40341
parents 3f5312bc 4b9365a8
<script> <script>
/* eslint-disable vue/no-v-html */ /* eslint-disable vue/no-v-html */
import { escape } from 'lodash'; import { escape } from 'lodash';
import { GlModal, GlButton, GlDeprecatedButton, GlFormInput, GlSprintf } from '@gitlab/ui'; import { GlModal, GlButton, GlFormInput, GlSprintf } from '@gitlab/ui';
import SplitButton from '~/vue_shared/components/split_button.vue'; import SplitButton from '~/vue_shared/components/split_button.vue';
import { s__, sprintf } from '~/locale'; import { s__, sprintf } from '~/locale';
import csrf from '~/lib/utils/csrf'; import csrf from '~/lib/utils/csrf';
...@@ -29,7 +29,6 @@ export default { ...@@ -29,7 +29,6 @@ export default {
SplitButton, SplitButton,
GlModal, GlModal,
GlButton, GlButton,
GlDeprecatedButton,
GlFormInput, GlFormInput,
GlSprintf, GlSprintf,
}, },
...@@ -175,24 +174,31 @@ export default { ...@@ -175,24 +174,31 @@ export default {
}}</span> }}</span>
</template> </template>
<template #modal-footer> <template #modal-footer>
<gl-deprecated-button variant="secondary" @click="handleCancel">{{ <gl-button variant="secondary" @click="handleCancel">{{ s__('Cancel') }}</gl-button>
s__('Cancel')
}}</gl-deprecated-button>
<template v-if="confirmCleanup"> <template v-if="confirmCleanup">
<gl-deprecated-button :disabled="!canSubmit" variant="warning" @click="handleSubmit">{{ <gl-button
s__('ClusterIntegration|Remove integration') :disabled="!canSubmit"
}}</gl-deprecated-button> variant="warning"
<gl-deprecated-button category="primary"
@click="handleSubmit"
>{{ s__('ClusterIntegration|Remove integration') }}</gl-button
>
<gl-button
:disabled="!canSubmit" :disabled="!canSubmit"
variant="danger" variant="danger"
category="primary"
@click="handleSubmit(true)" @click="handleSubmit(true)"
>{{ s__('ClusterIntegration|Remove integration and resources') }}</gl-deprecated-button >{{ s__('ClusterIntegration|Remove integration and resources') }}</gl-button
> >
</template> </template>
<template v-else> <template v-else>
<gl-deprecated-button :disabled="!canSubmit" variant="danger" @click="handleSubmit">{{ <gl-button
s__('ClusterIntegration|Remove integration') :disabled="!canSubmit"
}}</gl-deprecated-button> variant="danger"
category="primary"
@click="handleSubmit"
>{{ s__('ClusterIntegration|Remove integration') }}</gl-button
>
</template> </template>
</template> </template>
</gl-modal> </gl-modal>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment