Commit 4b25abb4 authored by Kushal Pandya's avatar Kushal Pandya

Merge branch 'replace-Gldeprecated-badge-in-unscanned-projects' into 'master'

Replaced GlDepreactedBadge in unscanned Projects

See merge request gitlab-org/gitlab!46036
parents a5320295 f4eb8b9c
<script> <script>
import { GlDeprecatedBadge as GlBadge, GlTabs, GlTab, GlLink, GlIcon } from '@gitlab/ui'; import { GlBadge, GlTabs, GlTab, GlLink, GlIcon } from '@gitlab/ui';
import { mapActions, mapGetters, mapState } from 'vuex'; import { mapActions, mapGetters, mapState } from 'vuex';
import UnscannedProjectsTabContent from './unscanned_projects_tab_content.vue'; import UnscannedProjectsTabContent from './unscanned_projects_tab_content.vue';
...@@ -62,9 +62,14 @@ export default { ...@@ -62,9 +62,14 @@ export default {
<gl-tab ref="outdatedProjectsTab" title-item-class="ml-3"> <gl-tab ref="outdatedProjectsTab" title-item-class="ml-3">
<template #title> <template #title>
{{ s__('UnscannedProjects|Out of date') }} {{ s__('UnscannedProjects|Out of date') }}
<gl-badge v-if="!isLoading" ref="outdatedProjectsCount" pill>{{ <gl-badge
outdatedProjectsCount v-if="!isLoading"
}}</gl-badge> ref="outdatedProjectsCount"
size="sm"
class="gl-tab-counter-badge"
pill
>{{ outdatedProjectsCount }}
</gl-badge>
</template> </template>
<unscanned-projects-tab-content :is-loading="isLoading" :is-empty="!hasOutdatedProjects"> <unscanned-projects-tab-content :is-loading="isLoading" :is-empty="!hasOutdatedProjects">
<div v-for="dateRange in outdatedProjects" :key="dateRange.fromDay" class="mb-3"> <div v-for="dateRange in outdatedProjects" :key="dateRange.fromDay" class="mb-3">
...@@ -82,9 +87,14 @@ export default { ...@@ -82,9 +87,14 @@ export default {
<gl-tab ref="untestedProjectsTab" title-item-class="ml-3"> <gl-tab ref="untestedProjectsTab" title-item-class="ml-3">
<template #title> <template #title>
{{ s__('UnscannedProjects|Untested') }} {{ s__('UnscannedProjects|Untested') }}
<gl-badge v-if="!isLoading" ref="untestedProjectsCount" pill>{{ <gl-badge
untestedProjectsCount v-if="!isLoading"
}}</gl-badge> ref="untestedProjectsCount"
size="sm"
class="gl-tab-counter-badge"
pill
>{{ untestedProjectsCount }}
</gl-badge>
</template> </template>
<unscanned-projects-tab-content :is-loading="isLoading" :is-empty="!hasUntestedProjects"> <unscanned-projects-tab-content :is-loading="isLoading" :is-empty="!hasUntestedProjects">
<ul class="list-unstyled m-0"> <ul class="list-unstyled m-0">
......
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