Commit feef163c authored by Phil Hughes's avatar Phil Hughes

Merge branch 'jnnkl-table-lite-time-tracking' into 'master'

Replace GlTable with GlTablelite for time-tracking-table

See merge request gitlab-org/gitlab!74374
parents aa8bd302 2d673877
<script> <script>
import { GlLoadingIcon, GlTable } from '@gitlab/ui'; import { GlLoadingIcon, GlTableLite } from '@gitlab/ui';
import createFlash from '~/flash'; import createFlash from '~/flash';
import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/graphql_shared/constants'; import { TYPE_ISSUE, TYPE_MERGE_REQUEST } from '~/graphql_shared/constants';
import { convertToGraphQLId } from '~/graphql_shared/utils'; import { convertToGraphQLId } from '~/graphql_shared/utils';
...@@ -12,7 +12,7 @@ const TIME_DATE_FORMAT = 'mmmm d, yyyy, HH:MM ("UTC:" o)'; ...@@ -12,7 +12,7 @@ const TIME_DATE_FORMAT = 'mmmm d, yyyy, HH:MM ("UTC:" o)';
export default { export default {
components: { components: {
GlLoadingIcon, GlLoadingIcon,
GlTable, GlTableLite,
}, },
inject: ['issuableType'], inject: ['issuableType'],
props: { props: {
...@@ -89,7 +89,7 @@ export default { ...@@ -89,7 +89,7 @@ export default {
<template> <template>
<div> <div>
<div v-if="isLoading"><gl-loading-icon size="md" /></div> <div v-if="isLoading"><gl-loading-icon size="md" /></div>
<gl-table v-else :items="report" :fields="$options.fields" foot-clone> <gl-table-lite v-else :items="report" :fields="$options.fields" foot-clone>
<template #cell(spentAt)="{ item: { spentAt } }"> <template #cell(spentAt)="{ item: { spentAt } }">
<div>{{ formatDate(spentAt) }}</div> <div>{{ formatDate(spentAt) }}</div>
</template> </template>
...@@ -111,6 +111,6 @@ export default { ...@@ -111,6 +111,6 @@ export default {
<div>{{ getSummary(summary, note) }}</div> <div>{{ getSummary(summary, note) }}</div>
</template> </template>
<template #foot(note)>&nbsp;</template> <template #foot(note)>&nbsp;</template>
</gl-table> </gl-table-lite>
</div> </div>
</template> </template>
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