Commit 6dcafaf5 authored by Mike Greiling's avatar Mike Greiling

Merge branch...

Merge branch '233600-replace-gldeprecateddropdown-with-gldropdown-in-ee-app-assets-javascripts-vue_shared' into 'master'

Replace deprecated dropdown

Closes #233600

See merge request gitlab-org/gitlab!42099
parents db8bf8a6 f5dc7037
<script>
import { mapActions } from 'vuex';
import { GlDeprecatedDropdown, GlDeprecatedDropdownItem, GlLoadingIcon, GlIcon } from '@gitlab/ui';
import { GlDropdown, GlDropdownItem, GlLoadingIcon, GlIcon } from '@gitlab/ui';
import { getIssueStatusFromLicenseStatus } from 'ee/vue_shared/license_compliance/store/utils';
import { LICENSE_MANAGEMENT } from 'ee/vue_shared/license_compliance/store/constants';
import { s__ } from '~/locale';
......@@ -14,8 +14,8 @@ const invisibleClass = 'invisible';
export default {
name: 'AdminLicenseManagementRow',
components: {
GlDeprecatedDropdown,
GlDeprecatedDropdownItem,
GlDropdown,
GlDropdownItem,
GlLoadingIcon,
GlIcon,
IssueStatusIcon,
......@@ -70,21 +70,21 @@ export default {
<div class="float-right">
<div class="d-flex">
<gl-loading-icon v-if="loading" class="js-loading-icon d-flex align-items-center mr-2" />
<gl-deprecated-dropdown
<gl-dropdown
:text="dropdownText"
:disabled="loading"
toggle-class="d-flex justify-content-between align-items-center"
right
>
<gl-deprecated-dropdown-item @click="allowLicense(license)">
<gl-dropdown-item @click="allowLicense(license)">
<gl-icon :class="approveIconClass" name="mobile-issue-close" />
{{ $options[$options.LICENSE_APPROVAL_ACTION.ALLOW] }}
</gl-deprecated-dropdown-item>
<gl-deprecated-dropdown-item @click="denyLicense(license)">
</gl-dropdown-item>
<gl-dropdown-item @click="denyLicense(license)">
<gl-icon :class="blacklistIconClass" name="mobile-issue-close" />
{{ $options[$options.LICENSE_APPROVAL_ACTION.DENY] }}
</gl-deprecated-dropdown-item>
</gl-deprecated-dropdown>
</gl-dropdown-item>
</gl-dropdown>
<button
:disabled="loading"
class="btn btn-blank js-remove-button"
......
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