Commit 7592493c authored by Mark Florian's avatar Mark Florian

Merge branch...

Merge branch '233595-replace-gldeprecateddropdown-with-gldropdown-in-ee-app-assets-javascripts-licenses' into 'master'

Replaced depracted dropdown

Closes #233595

See merge request gitlab-org/gitlab!42323
parents bc69be37 b3aac465
<script> <script>
import { mapState, mapActions } from 'vuex'; import { mapState, mapActions } from 'vuex';
import { GlDeprecatedDropdown, GlDeprecatedDropdownItem } from '@gitlab/ui'; import { GlDropdown, GlDropdownItem } from '@gitlab/ui';
import { capitalizeFirstCharacter } from '~/lib/utils/text_utility'; import { capitalizeFirstCharacter } from '~/lib/utils/text_utility';
import { __ } from '~/locale'; import { __ } from '~/locale';
import LicenseCardBody from './license_card_body.vue'; import LicenseCardBody from './license_card_body.vue';
...@@ -9,8 +9,8 @@ export default { ...@@ -9,8 +9,8 @@ export default {
name: 'LicenseCard', name: 'LicenseCard',
components: { components: {
LicenseCardBody, LicenseCardBody,
GlDeprecatedDropdown, GlDropdown,
GlDeprecatedDropdownItem, GlDropdownItem,
}, },
props: { props: {
license: { license: {
...@@ -55,26 +55,21 @@ export default { ...@@ -55,26 +55,21 @@ export default {
}} }}
</h4> </h4>
<gl-deprecated-dropdown <gl-dropdown right class="js-manage-license" :text="__('Manage')" :disabled="isRemoving">
right <gl-dropdown-item
class="js-manage-license"
:text="__('Manage')"
:disabled="isRemoving"
>
<gl-deprecated-dropdown-item
v-if="isCurrentLicense" v-if="isCurrentLicense"
class="js-download-license" class="js-download-license"
:href="downloadLicensePath" :href="downloadLicensePath"
> >
{{ __('Download license') }} {{ __('Download license') }}
</gl-deprecated-dropdown-item> </gl-dropdown-item>
<gl-deprecated-dropdown-item <gl-dropdown-item
class="js-delete-license text-danger" class="js-delete-license text-danger"
@click="confirmDeleteLicense(license)" @click="confirmDeleteLicense(license)"
> >
{{ __('Delete license') }} {{ __('Delete license') }}
</gl-deprecated-dropdown-item> </gl-dropdown-item>
</gl-deprecated-dropdown> </gl-dropdown>
</div> </div>
</div> </div>
......
...@@ -16,21 +16,30 @@ exports[`LicenseCard renders license card with a delete button and license body ...@@ -16,21 +16,30 @@ exports[`LicenseCard renders license card with a delete button and license body
</h4> </h4>
<gl-deprecated-dropdown-stub <gl-dropdown-stub
category="tertiary"
class="js-manage-license" class="js-manage-license"
headertext=""
right="" right=""
size="medium"
text="Manage" text="Manage"
variant="default"
> >
<!----> <!---->
<gl-deprecated-dropdown-item-stub <gl-dropdown-item-stub
avatarurl=""
class="js-delete-license text-danger" class="js-delete-license text-danger"
iconcolor=""
iconname=""
iconrightname=""
secondarytext=""
> >
Delete license Delete license
</gl-deprecated-dropdown-item-stub> </gl-dropdown-item-stub>
</gl-deprecated-dropdown-stub> </gl-dropdown-stub>
</div> </div>
</div> </div>
......
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