Commit 26b05251 authored by Ezekiel Kigbo's avatar Ezekiel Kigbo

Merge branch...

Merge branch '219509-replace-gldeprecatedbadge-with-glbadge-in-ee-app-assets-javascripts-dependencies-components' into 'master'

Replace GlDeprecatedBadge with GlBadge in Dependency List

See merge request gitlab-org/gitlab!33417
parents a50bd89d a38bbf63
<script> <script>
import { cloneDeep } from 'lodash'; import { cloneDeep } from 'lodash';
import { import { GlBadge, GlIcon, GlLink, GlButton, GlSkeletonLoading, GlTable } from '@gitlab/ui';
GlDeprecatedBadge as GlBadge,
GlIcon,
GlLink,
GlButton,
GlSkeletonLoading,
GlTable,
} from '@gitlab/ui';
import { s__ } from '~/locale'; import { s__ } from '~/locale';
import DependencyLicenseLinks from './dependency_license_links.vue'; import DependencyLicenseLinks from './dependency_license_links.vue';
import DependencyVulnerabilities from './dependency_vulnerabilities.vue'; import DependencyVulnerabilities from './dependency_vulnerabilities.vue';
...@@ -130,13 +123,10 @@ export default { ...@@ -130,13 +123,10 @@ export default {
</template> </template>
<template #cell(isVulnerable)="{ item, toggleDetails }"> <template #cell(isVulnerable)="{ item, toggleDetails }">
<!-- This badge usage will be simplified by
https://gitlab.com/gitlab-org/gitlab/-/merge_requests/28356 -->
<gl-badge <gl-badge
v-if="item.vulnerabilities.length" v-if="item.vulnerabilities.length"
variant="warning" variant="warning"
href="#" href="#"
class="d-inline-flex align-items-center bg-warning-100 text-warning-700 bold"
@click.native="toggleDetails" @click.native="toggleDetails"
> >
<gl-icon name="warning" class="text-warning-500 mr-1" /> <gl-icon name="warning" class="text-warning-500 mr-1" />
......
---
title: Update vulnerabilities badge design in Dependency List
merge_request: 33417
author:
type: other
import { nextTick } from 'vue'; import { nextTick } from 'vue';
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import { GlDeprecatedBadge as GlBadge, GlButton, GlLink, GlSkeletonLoading } from '@gitlab/ui'; import { GlBadge, GlButton, GlLink, GlSkeletonLoading } from '@gitlab/ui';
import stubChildren from 'helpers/stub_children'; import stubChildren from 'helpers/stub_children';
import DependenciesTable from 'ee/dependencies/components/dependencies_table.vue'; import DependenciesTable from 'ee/dependencies/components/dependencies_table.vue';
import DependencyLicenseLinks from 'ee/dependencies/components/dependency_license_links.vue'; import DependencyLicenseLinks from 'ee/dependencies/components/dependency_license_links.vue';
......
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