Skip to content

Fix table sorting function to not sort based on date time string #37

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ben-fornefeld merged 2 commits into from
Apr 8, 2025
Merged

Fix table sorting function to not sort based on date time string #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7abae81
fix: table sorting function to not sort based on date time string but…
ben-fornefeld Apr 8, 2025
3c783c4
improve: table timestamp accessors, sorting & rendering
ben-fornefeld Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions src/features/dashboard/sandboxes/table-config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,12 +317,18 @@ export const COLUMNS: ColumnDef<Sandbox>[] = [
},
{
id: 'startedAt',
accessorFn: (row) => new Date(row.startedAt).toUTCString(),
accessorKey: 'startedAt',
header: 'Started At',
cell: ({ row, getValue }) => {
const dateTimeString = getValue() as string
// Split the date and time parts
const [day, date, month, year, time, timezone] = dateTimeString.split(' ')
const dateValue = getValue() as string;

const dateTimeString = useMemo(() => {
return new Date(dateValue).toUTCString();
}, [dateValue]);

const [day, date, month, year, time, timezone] = useMemo(() => {
return dateTimeString.split(' ');
}, [dateTimeString]);

return (
<div className={cn('h-full truncate font-mono text-xs')}>
Expand All @@ -337,5 +343,8 @@ export const COLUMNS: ColumnDef<Sandbox>[] = [
// @ts-expect-error dateRange is not a valid filterFn
filterFn: 'dateRange',
enableColumnFilter: true,
sortingFn: (rowA, rowB) => {
return rowA.original.startedAt.localeCompare(rowB.original.startedAt);
},
},
]
2 changes: 1 addition & 1 deletion src/features/dashboard/sandboxes/table.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ export default function SandboxesTable({
getFilteredRowModel: getFilteredRowModel(),
getSortedRowModel: getSortedRowModel(),
enableSorting: true,
enableMultiSort: true,
enableMultiSort: false,
columnResizeMode: 'onChange' as const,
enableColumnResizing: true,
keepPinnedRows: true,
Expand Down
60 changes: 47 additions & 13 deletions src/features/dashboard/templates/table-config.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,30 +294,64 @@ export const useColumns = (deps: unknown[]) => {
filterFn: 'equals',
},
{
accessorFn: (row) => new Date(row.createdAt).toUTCString(),
accessorKey: 'createdAt',
enableGlobalFilter: true,
id: 'createdAt',
header: 'Created At',
size: 250,
minSize: 140,
cell: ({ getValue }) => (
<div className="text-fg-500 truncate font-mono text-xs">
{getValue() as string}
</div>
),
cell: ({ row, getValue }) => {
const dateValue = getValue() as string;

const dateTimeString = useMemo(() => {
return new Date(dateValue).toUTCString();
}, [dateValue]);

const [day, date, month, year, time, timezone] = useMemo(() => {
return dateTimeString.split(' ');
}, [dateTimeString]);

return (
<div className={cn('h-full truncate font-mono text-xs')}>
<span className="text-fg-500">{`${day} ${date} ${month} ${year}`}</span>{' '}
<span className="text-fg">{time}</span>{' '}
<span className="text-fg-500">{timezone}</span>
</div>
)
},
sortingFn: (rowA, rowB) => {
return rowA.original.createdAt.localeCompare(rowB.original.createdAt);
},
},
{
accessorFn: (row) => new Date(row.updatedAt).toUTCString(),
accessorKey: 'updatedAt',
id: 'updatedAt',
header: 'Updated At',
size: 250,
minSize: 140,
enableGlobalFilter: true,
cell: ({ getValue }) => (
<div className="text-fg-500 truncate font-mono text-xs">
{getValue() as string}
</div>
),
cell: ({ row, getValue }) => {
const dateValue = getValue() as string;

const dateTimeString = useMemo(() => {
return new Date(dateValue).toUTCString();
}, [dateValue]);

const [day, date, month, year, time, timezone] = useMemo(() => {
return dateTimeString.split(' ');
}, [dateTimeString]);

return (
<div className={cn('h-full truncate font-mono text-xs')}>
<span className="text-fg-500">{`${day} ${date} ${month} ${year}`}</span>{' '}
<span className="text-fg">{time}</span>{' '}
<span className="text-fg-500">{timezone}</span>
</div>
)
},
sortingFn: (rowA, rowB) => {
return rowA.original.updatedAt.localeCompare(rowB.original.updatedAt);
},
},
{
accessorKey: 'public',
Expand Down Expand Up @@ -351,7 +385,7 @@ export const templatesTableConfig: Partial<
getFilteredRowModel: getFilteredRowModel(),
getSortedRowModel: getSortedRowModel(),
enableSorting: true,
enableMultiSort: true,
enableMultiSort: false,
columnResizeMode: 'onChange',
enableColumnResizing: true,
enableGlobalFilter: true,
Expand Down