Commit b4380218 authored by Natalia Tepluhina's avatar Natalia Tepluhina

Merge branch...

Merge branch '219791-replace-gl-deprecated-button-with-gl-button-in-ee-app-assets-javascripts-licenses-components' into 'master'

Replace deprecated button

Closes #219791

See merge request gitlab-org/gitlab!42097
parents 4d52b1df 6ca3d401
<script> <script>
import { mapState, mapGetters } from 'vuex'; import { mapState, mapGetters } from 'vuex';
import { GlDeprecatedButton } from '@gitlab/ui'; import { GlButton } from '@gitlab/ui';
import { LicenseCard, SkeletonLicenseCard } from './cards'; import { LicenseCard, SkeletonLicenseCard } from './cards';
export default { export default {
...@@ -8,7 +8,7 @@ export default { ...@@ -8,7 +8,7 @@ export default {
components: { components: {
LicenseCard, LicenseCard,
SkeletonLicenseCard, SkeletonLicenseCard,
GlDeprecatedButton, GlButton,
}, },
computed: { computed: {
...mapState(['licenses', 'isLoadingLicenses', 'newLicensePath']), ...mapState(['licenses', 'isLoadingLicenses', 'newLicensePath']),
...@@ -22,9 +22,9 @@ export default { ...@@ -22,9 +22,9 @@ export default {
<div class="d-flex justify-content-between align-items-center"> <div class="d-flex justify-content-between align-items-center">
<h4>{{ __('Instance license') }}</h4> <h4>{{ __('Instance license') }}</h4>
<gl-deprecated-button class="my-3 js-add-license" variant="success" :href="newLicensePath"> <gl-button class="my-3 js-add-license" variant="success" :href="newLicensePath">
{{ __('Add license') }} {{ __('Add license') }}
</gl-deprecated-button> </gl-button>
</div> </div>
<ul class="license-list list-unstyled"> <ul class="license-list list-unstyled">
......
...@@ -9,16 +9,18 @@ exports[`InstanceCardsList renders a list of license cards 1`] = ` ...@@ -9,16 +9,18 @@ exports[`InstanceCardsList renders a list of license cards 1`] = `
Instance license Instance license
</h4> </h4>
<gl-deprecated-button-stub <gl-button-stub
category="primary"
class="my-3 js-add-license" class="my-3 js-add-license"
href="/newLicensePath" href="/newLicensePath"
size="md" icon=""
size="medium"
variant="success" variant="success"
> >
Add license Add license
</gl-deprecated-button-stub> </gl-button-stub>
</div> </div>
<ul <ul
...@@ -48,16 +50,18 @@ exports[`InstanceCardsList renders a message when there are no licenses 1`] = ` ...@@ -48,16 +50,18 @@ exports[`InstanceCardsList renders a message when there are no licenses 1`] = `
Instance license Instance license
</h4> </h4>
<gl-deprecated-button-stub <gl-button-stub
category="primary"
class="my-3 js-add-license" class="my-3 js-add-license"
href="/newLicensePath" href="/newLicensePath"
size="md" icon=""
size="medium"
variant="success" variant="success"
> >
Add license Add license
</gl-deprecated-button-stub> </gl-button-stub>
</div> </div>
<ul <ul
...@@ -83,16 +87,18 @@ exports[`InstanceCardsList renders a skeleton loading card if loading licenses 1 ...@@ -83,16 +87,18 @@ exports[`InstanceCardsList renders a skeleton loading card if loading licenses 1
Instance license Instance license
</h4> </h4>
<gl-deprecated-button-stub <gl-button-stub
category="primary"
class="my-3 js-add-license" class="my-3 js-add-license"
href="/newLicensePath" href="/newLicensePath"
size="md" icon=""
size="medium"
variant="success" variant="success"
> >
Add license Add license
</gl-deprecated-button-stub> </gl-button-stub>
</div> </div>
<ul <ul
......
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