diff options
Diffstat (limited to 'app/assets/javascripts/jobs/components/table/cells/duration_cell.vue')
-rw-r--r-- | app/assets/javascripts/jobs/components/table/cells/duration_cell.vue | 27 |
1 files changed, 7 insertions, 20 deletions
diff --git a/app/assets/javascripts/jobs/components/table/cells/duration_cell.vue b/app/assets/javascripts/jobs/components/table/cells/duration_cell.vue index 120f01db8f0..d1b2da4d115 100644 --- a/app/assets/javascripts/jobs/components/table/cells/duration_cell.vue +++ b/app/assets/javascripts/jobs/components/table/cells/duration_cell.vue @@ -1,15 +1,16 @@ <script> -import { GlIcon, GlTooltipDirective } from '@gitlab/ui'; -import { formatDate, getTimeago, durationTimeFormatted } from '~/lib/utils/datetime_utility'; +import { GlIcon } from '@gitlab/ui'; +import { durationTimeFormatted } from '~/lib/utils/datetime_utility'; +import TimeAgoTooltip from '~/vue_shared/components/time_ago_tooltip.vue'; +import timeagoMixin from '~/vue_shared/mixins/timeago'; export default { iconSize: 12, - directives: { - GlTooltip: GlTooltipDirective, - }, components: { GlIcon, + TimeAgoTooltip, }, + mixins: [timeagoMixin], props: { job: { type: Object, @@ -23,12 +24,6 @@ export default { duration() { return this.job?.duration; }, - timeFormatted() { - return getTimeago().format(this.finishedTime); - }, - tooltipTitle() { - return formatDate(this.finishedTime); - }, durationFormatted() { return durationTimeFormatted(this.duration); }, @@ -44,15 +39,7 @@ export default { </div> <div v-if="finishedTime" data-testid="job-finished-time"> <gl-icon name="calendar" :size="$options.iconSize" data-testid="finished-time-icon" /> - <time - v-gl-tooltip - :title="tooltipTitle" - :datetime="finishedTime" - data-placement="top" - data-container="body" - > - {{ timeFormatted }} - </time> + <time-ago-tooltip :time="finishedTime" /> </div> </div> </template> |