Commit 81198f1a authored by Mike Greiling's avatar Mike Greiling

Merge branch 'jnnkl-tablelite-issues-analytics-table' into 'master'

Replace GlTable with GlTablelite for Issue analytics table

See merge request gitlab-org/gitlab!75357
parents 36c12693 ae01dbd6
<script> <script>
import { import {
GlTable, GlTableLite,
GlLoadingIcon, GlLoadingIcon,
GlLink, GlLink,
GlIcon, GlIcon,
...@@ -30,7 +30,7 @@ const TH_TEST_ID = { 'data-testid': 'header' }; ...@@ -30,7 +30,7 @@ const TH_TEST_ID = { 'data-testid': 'header' };
export default { export default {
name: 'IssuesAnalyticsTable', name: 'IssuesAnalyticsTable',
components: { components: {
GlTable, GlTableLite,
GlLoadingIcon, GlLoadingIcon,
GlLink, GlLink,
GlIcon, GlIcon,
...@@ -147,7 +147,7 @@ export default { ...@@ -147,7 +147,7 @@ export default {
</script> </script>
<template> <template>
<gl-loading-icon v-if="isLoading" size="md" /> <gl-loading-icon v-if="isLoading" size="md" />
<gl-table <gl-table-lite
v-else-if="shouldDisplayTable" v-else-if="shouldDisplayTable"
:fields="$options.tableHeaderFields" :fields="$options.tableHeaderFields"
:items="issues" :items="issues"
...@@ -229,5 +229,5 @@ export default { ...@@ -229,5 +229,5 @@ export default {
<gl-avatar :size="$options.avatarSize" :src="value.avatar_url" :entity-name="value.name" /> <gl-avatar :size="$options.avatarSize" :src="value.avatar_url" :entity-name="value.name" />
</gl-avatar-link> </gl-avatar-link>
</template> </template>
</gl-table> </gl-table-lite>
</template> </template>
import { GlLoadingIcon, GlTable } from '@gitlab/ui'; import { GlLoadingIcon, GlTableLite } from '@gitlab/ui';
import { mount } from '@vue/test-utils'; import { mount } from '@vue/test-utils';
import axios from 'axios'; import axios from 'axios';
import MockAdapter from 'axios-mock-adapter'; import MockAdapter from 'axios-mock-adapter';
...@@ -22,7 +22,7 @@ describe('IssuesAnalyticsTable', () => { ...@@ -22,7 +22,7 @@ describe('IssuesAnalyticsTable', () => {
}); });
}; };
const findTable = () => wrapper.find(GlTable); const findTable = () => wrapper.findComponent(GlTableLite);
const findIssueDetailsCol = (rowIndex) => const findIssueDetailsCol = (rowIndex) =>
findTable().findAll('[data-testid="detailsCol"]').at(rowIndex); findTable().findAll('[data-testid="detailsCol"]').at(rowIndex);
......
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