Commit 5551987b authored by Kushal Pandya's avatar Kushal Pandya

Merge branch '344300-environments-tab-badge-pajamas' into 'master'

Update cluster environment badge to pajamas

See merge request gitlab-org/gitlab!79400
parents 74ac81cc 750fbdb1
<script> <script>
import { GlTable, GlEmptyState, GlLoadingIcon, GlIcon, GlLink, GlSprintf } from '@gitlab/ui'; import {
GlBadge,
GlTable,
GlEmptyState,
GlLoadingIcon,
GlIcon,
GlLink,
GlSprintf,
} from '@gitlab/ui';
import { __ } from '~/locale'; import { __ } from '~/locale';
import deploymentInstance from '~/vue_shared/components/deployment_instance.vue'; import deploymentInstance from '~/vue_shared/components/deployment_instance.vue';
import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue'; import TimeAgo from '~/vue_shared/components/time_ago_tooltip.vue';
export default { export default {
components: { components: {
GlBadge,
GlEmptyState, GlEmptyState,
GlTable, GlTable,
GlIcon, GlIcon,
...@@ -120,7 +129,7 @@ export default { ...@@ -120,7 +129,7 @@ export default {
<!-- column: Pods in use --> <!-- column: Pods in use -->
<template #head(rolloutStatus)="data"> <template #head(rolloutStatus)="data">
{{ data.label }} <span class="badge badge-pill bold">{{ podsInUseCount }}</span> {{ data.label }} <gl-badge>{{ podsInUseCount }}</gl-badge>
</template> </template>
<template #cell(rolloutStatus)="row"> <template #cell(rolloutStatus)="row">
......
...@@ -53,7 +53,7 @@ describe('Environments', () => { ...@@ -53,7 +53,7 @@ describe('Environments', () => {
}); });
it('renders the correct table headers', () => { it('renders the correct table headers', () => {
const tableHeaders = ['Project', 'Environment', 'Job', `Pods in use 2`, 'Last updated']; const tableHeaders = ['Project', 'Environment', 'Job', `Pods in use 2`, 'Last updated'];
const headers = table.findAll('th'); const headers = table.findAll('th');
expect(headers).toHaveLength(tableHeaders.length); expect(headers).toHaveLength(tableHeaders.length);
......
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