Commit 74ac7b0b authored by Martin Wortschack's avatar Martin Wortschack

Merge branch...

Merge branch '219779-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-javascripts-packages-details' into 'master'

Replace deprecated-button in package details app

Closes #219779

See merge request gitlab-org/gitlab!38032
parents f855c4a3 e0ed3bea
<script> <script>
import { import {
GlBadge, GlBadge,
GlDeprecatedButton, GlButton,
GlIcon, GlIcon,
GlModal, GlModal,
GlModalDirective, GlModalDirective,
...@@ -37,7 +37,7 @@ export default { ...@@ -37,7 +37,7 @@ export default {
name: 'PackagesApp', name: 'PackagesApp',
components: { components: {
GlBadge, GlBadge,
GlDeprecatedButton, GlButton,
GlEmptyState, GlEmptyState,
GlLink, GlLink,
GlModal, GlModal,
...@@ -204,14 +204,16 @@ export default { ...@@ -204,14 +204,16 @@ export default {
<package-title /> <package-title />
<div class="mt-sm-2"> <div class="mt-sm-2">
<gl-deprecated-button <gl-button
v-if="canDeletePackage" v-if="canDeletePackage"
v-gl-modal="'delete-modal'" v-gl-modal="'delete-modal'"
class="js-delete-button" class="js-delete-button"
variant="danger" variant="danger"
category="primary"
data-qa-selector="delete_button" data-qa-selector="delete_button"
>{{ __('Delete') }}</gl-deprecated-button
> >
{{ __('Delete') }}
</gl-button>
</div> </div>
</div> </div>
...@@ -326,16 +328,18 @@ export default { ...@@ -326,16 +328,18 @@ export default {
<div slot="modal-footer" class="w-100"> <div slot="modal-footer" class="w-100">
<div class="float-right"> <div class="float-right">
<gl-deprecated-button @click="cancelDelete()">{{ __('Cancel') }}</gl-deprecated-button> <gl-button @click="cancelDelete()">{{ __('Cancel') }}</gl-button>
<gl-deprecated-button <gl-button
ref="modal-delete-button" ref="modal-delete-button"
data-method="delete" data-method="delete"
:to="destroyPath" :to="destroyPath"
variant="danger" variant="danger"
category="primary"
data-qa-selector="delete_modal_button" data-qa-selector="delete_modal_button"
@click="track($options.trackingActions.DELETE_PACKAGE)" @click="track($options.trackingActions.DELETE_PACKAGE)"
>{{ __('Delete') }}</gl-deprecated-button
> >
{{ __('Delete') }}
</gl-button>
</div> </div>
</div> </div>
</gl-modal> </gl-modal>
......
...@@ -62,7 +62,7 @@ describe('PackagesApp', () => { ...@@ -62,7 +62,7 @@ describe('PackagesApp', () => {
store, store,
stubs: { stubs: {
...stubChildren(PackagesApp), ...stubChildren(PackagesApp),
GlDeprecatedButton: false, GlButton: false,
GlModal: false, GlModal: false,
GlTab: false, GlTab: false,
GlTabs: false, GlTabs: false,
......
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