Commit 9841f1c5 authored by Brandon Labuschagne's avatar Brandon Labuschagne

Merge branch 'jnnkl-gl-table-lite-mr-analytics' into 'master'

Replace GlTable with GlTablelite for Merge Request throughput table

See merge request gitlab-org/gitlab!75359
parents 287fcdb1 5f92b84f
<script>
import {
GlTable,
GlTableLite,
GlLink,
GlAvatarLink,
GlAvatar,
......@@ -42,7 +42,7 @@ const initialPaginationState = {
export default {
name: 'ThroughputTable',
components: {
GlTable,
GlTableLite,
GlLink,
GlAvatarLink,
GlAvatar,
......@@ -264,7 +264,7 @@ export default {
<template>
<gl-loading-icon v-if="tableDataLoading" size="md" />
<div v-else-if="tableDataAvailable">
<gl-table
<gl-table-lite
:fields="$options.tableHeaderFields"
:items="throughputTableData.list"
stacked="sm"
......@@ -376,7 +376,7 @@ export default {
</gl-avatars-inline>
</div>
</template>
</gl-table>
</gl-table-lite>
<gl-pagination
v-if="showPaginationControls"
:value="pagination.currentPage"
......
import { GlAlert, GlLoadingIcon, GlTable, GlIcon, GlAvatarsInline, GlPagination } from '@gitlab/ui';
import {
GlAlert,
GlLoadingIcon,
GlTableLite,
GlIcon,
GlAvatarsInline,
GlPagination,
} from '@gitlab/ui';
import { mount, shallowMount, createLocalVue } from '@vue/test-utils';
import Vuex from 'vuex';
import ThroughputTable from 'ee/analytics/merge_request_analytics/components/throughput_table.vue';
......@@ -66,7 +73,7 @@ describe('ThroughputTable', () => {
});
};
const findTable = () => wrapper.find(GlTable);
const findTable = () => wrapper.find(GlTableLite);
const findCol = (testId) => findTable().find(`[data-testid="${testId}"]`);
......@@ -104,7 +111,7 @@ describe('ThroughputTable', () => {
});
it('does not display the table', () => {
displaysComponent(GlTable, false);
displaysComponent(GlTableLite, false);
});
it('does not display the pagination', () => {
......@@ -130,7 +137,7 @@ describe('ThroughputTable', () => {
});
it('does not display the table', () => {
displaysComponent(GlTable, false);
displaysComponent(GlTableLite, false);
});
it('does not display the no data message', () => {
......@@ -150,7 +157,7 @@ describe('ThroughputTable', () => {
});
it('displays the table', () => {
displaysComponent(GlTable, true);
displaysComponent(GlTableLite, true);
});
it('does not display a loading icon', () => {
......@@ -429,7 +436,7 @@ describe('ThroughputTable', () => {
});
it('does not display the table', () => {
displaysComponent(GlTable, false);
displaysComponent(GlTableLite, false);
});
it('does not display a loading icon', () => {
......
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