Commit 8393f464 authored by Illya Klymov's avatar Illya Klymov

Merge branch 'license-comp-btn' into 'master'

License compliance modal button migration

Closes #219846

See merge request gitlab-org/gitlab!40747
parents 10e38d8f 392a59f4
<script> <script>
import { uniqueId } from 'lodash'; import { uniqueId } from 'lodash';
import { GlLink, GlIntersperse, GlModal, GlDeprecatedButton, GlModalDirective } from '@gitlab/ui'; import { GlLink, GlIntersperse, GlModal, GlButton, GlModalDirective } from '@gitlab/ui';
import { sprintf, s__ } from '~/locale'; import { sprintf, s__ } from '~/locale';
const MODAL_ID_PREFIX = 'license-component-link-modal-'; const MODAL_ID_PREFIX = 'license-component-link-modal-';
...@@ -10,7 +10,7 @@ export default { ...@@ -10,7 +10,7 @@ export default {
components: { components: {
GlIntersperse, GlIntersperse,
GlLink, GlLink,
GlDeprecatedButton, GlButton,
GlModal, GlModal,
}, },
directives: { directives: {
...@@ -68,14 +68,14 @@ export default { ...@@ -68,14 +68,14 @@ export default {
}}</gl-link> }}</gl-link>
<template v-else>{{ component.name }}</template> <template v-else>{{ component.name }}</template>
</span> </span>
<gl-deprecated-button <gl-button
v-if="hasComponentsInModal" v-if="hasComponentsInModal"
v-gl-modal-directive="modalId" v-gl-modal-directive="modalId"
variant="link" variant="link"
class="align-baseline js-component-links-modal-trigger" class="align-baseline js-component-links-modal-trigger"
> >
{{ modalButtonText }} {{ modalButtonText }}
</gl-deprecated-button> </gl-button>
</gl-intersperse> </gl-intersperse>
<gl-modal <gl-modal
v-if="hasComponentsInModal" v-if="hasComponentsInModal"
......
---
title: ee Migrating modal button in License Compliance
merge_request: 40747
author:
type: changed
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