diff --git a/apps/drive-web/src/directories/directory-page/directory-content-table.tsx b/apps/drive-web/src/directories/directory-page/directory-content-table.tsx index 6d260d1..2bdde28 100644 --- a/apps/drive-web/src/directories/directory-page/directory-content-table.tsx +++ b/apps/drive-web/src/directories/directory-page/directory-content-table.tsx @@ -1,5 +1,3 @@ -// TODO: make table sorting work (right now not working probably because different params share same query key) - import { useInfiniteQuery, useMutation } from "@tanstack/react-query" import { Link, useNavigate } from "@tanstack/react-router" import { @@ -101,96 +99,89 @@ function useTableColumns( directoryUrlFn: (directory: DirectoryInfo) => string, readOnly: boolean, ): ColumnDef[] { - return useMemo( - () => { - const columns: ColumnDef[] = [] - if (!readOnly) { - columns.push({ - id: "select", - header: ({ table }) => ( - { - table.toggleAllPageRowsSelected(!!value) - }} - aria-label="Select all" - /> - ), - cell: ({ row }) => ( - { - e.stopPropagation() - }} - onCheckedChange={row.getToggleSelectedHandler()} - aria-label="Select row" - /> - ), - enableSorting: false, - enableHiding: false, - size: 24, - }) - } + return useMemo(() => { + const columns: ColumnDef[] = [] + if (!readOnly) { + columns.push({ + id: "select", + header: ({ table }) => ( + { + table.toggleAllPageRowsSelected(!!value) + }} + aria-label="Select all" + /> + ), + cell: ({ row }) => ( + { + e.stopPropagation() + }} + onCheckedChange={row.getToggleSelectedHandler()} + aria-label="Select row" + /> + ), + enableSorting: false, + enableHiding: false, + size: 24, + }) + } - columns.push( - { - header: () => , - accessorKey: "doc.name", - cell: ({ row }) => { - switch (row.original.kind) { - case "file": - return ( - - ) - case "directory": - return ( - - ) - } - }, - size: 1000, + columns.push( + { + header: () => , + accessorKey: "doc.name", + cell: ({ row }) => { + switch (row.original.kind) { + case "file": + return ( + + ) + case "directory": + return ( + + ) + } }, - { - header: "Size", - accessorKey: "size", - cell: ({ row }) => { - switch (row.original.kind) { - case "file": - return ( -
- {formatFileSize(row.original.size)} -
- ) - case "directory": - return
-
- } - }, + size: 1000, + }, + { + header: "Size", + accessorKey: "size", + cell: ({ row }) => { + switch (row.original.kind) { + case "file": + return ( +
{formatFileSize(row.original.size)}
+ ) + case "directory": + return
-
+ } }, - { - header: "Created At", - accessorKey: "createdAt", - cell: ({ row }) => { - return ( -
- {new Date( - row.original.createdAt, - ).toLocaleString()} -
- ) - }, + }, + { + header: "Created At", + accessorKey: "createdAt", + cell: ({ row }) => { + return ( +
+ {new Date(row.original.createdAt).toLocaleString()} +
+ ) }, - ) + }, + ) - return columns - }, - [onOpenFile, directoryUrlFn, readOnly], - ) + return columns + }, [onOpenFile, directoryUrlFn, readOnly]) } export function DirectoryContentTable({