Skip to content

Commit 2250f35

Browse files
committed
Format and revert to previous logic
1 parent 7e848bb commit 2250f35

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

src/lib/components/Table/ColumnUtils.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ import type {
77
} from '@tanstack/table-core';
88
import DataTableSortButton from '$lib/components/Table/SortButton.svelte';
99
import { renderComponent, renderSnippet } from '$lib/components/ui/data-table';
10+
import { isDate } from '$lib/typeguards';
1011
import type { TwTextColor } from '$lib/types/Tailwind';
1112
import {
1213
durationToString,
@@ -16,7 +17,6 @@ import {
1617
} from '$lib/utils';
1718
import { type SemVer } from 'semver';
1819
import { createRawSnippet } from 'svelte';
19-
import { isDate } from '$lib/typeguards';
2020

2121
function CreateSortHeader<TData>(name: string): StringOrTemplateHeader<TData, unknown> {
2222
return ({ column }) =>
@@ -129,10 +129,12 @@ export const TimeSinceDurationRenderer = (date: Date): TableCell =>
129129
RenderCellWithTooltip(durationToString(Date.now() - date.getTime()), date.toString());
130130

131131
export const TimeSinceRelativeRenderer = (date: Date): TableCell =>
132-
RenderCellWithTooltip(elapsedToString(date.getTime() - Date.now()), date.toString());
132+
date.getTime() > 0
133+
? RenderCellWithTooltip(elapsedToString(date.getTime() - Date.now()), date.toString())
134+
: CellOrangeNever;
133135

134136
export const TimeSinceRelativeOrNeverRenderer = (date: Date | null | undefined): TableCell =>
135-
isDate(date) ? (date.getTime() > 0 ? TimeSinceRelativeRenderer(date) : CellOrangeNever) : CellOrangeNever; // The isDate check is a workaround, for some reason if the input data is undefined, it will be transformed to a empty object and throws an error when trying to access getTime().
137+
isDate(date) ? TimeSinceRelativeRenderer(date) : CellOrangeNever; // The isDate check is a workaround, for some reason if the input data is undefined, it will be transformed to a empty object and throws an error when trying to access getTime().
136138

137139
export const NumberRenderer = (number: number | null): TableCell =>
138140
number ? RenderBoldCell(number.toString()) : CellNotApplicable;

0 commit comments

Comments
 (0)