danvics/zerobyte
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

refactor: use tanstack table for filtering and sorting

Browse source
This commit is contained in:
Nicolas Meienberger 2026-05-02 09:58:38 +02:00
parent a63ab4e0ec
commit 27ea2caebc
No known key found for this signature in database
6 changed files with 284 additions and 278 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

54
app/client/components/data-table-sort-header.tsx Normal file
View file

@ -0,0 +1,54 @@
import type { Column } from "@tanstack/react-table";
import { ArrowDown, ArrowUp, ArrowUpDown } from "lucide-react";
import { Button } from "~/client/components/ui/button";
import { cn } from "~/client/lib/utils";
export function DataTableSortHeader<TData, TValue>({
column,
title,
sortDirection,
center = false,
}: {
column: Column<TData, TValue>;
title: string;
sortDirection: false | "asc" | "desc";
center?: boolean;
}) {
const icon =
sortDirection === "desc" ? (
<ArrowDown className="ml-2 h-3.5 w-3.5" />
) : sortDirection === "asc" ? (
<ArrowUp className="ml-2 h-3.5 w-3.5" />
) : (
<ArrowUpDown className="ml-2 h-3.5 w-3.5" />
);
const iconVisibility = sortDirection ? "" : "lg:invisible lg:group-hover/sort:visible";
if (center) {
return (
<Button
type="button"
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
className="h-auto! w-full! p-0! font-inherit hover:bg-transparent uppercase group/sort relative"
>
<span className="relative flex w-full items-center justify-center">
{title}
<span className={cn("lg:absolute lg:-right-6 lg:top-1/2 lg:-translate-y-1/2", iconVisibility)}>{icon}</span>
</span>
</Button>
);
}
return (
<Button
type="button"
variant="ghost"
onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
className="h-auto! p-0! font-inherit hover:bg-transparent uppercase group/sort"
>
{title}
<span className={iconVisibility}>{icon}</span>
</Button>
);
}

2
app/client/components/status-dot.tsx
View file

@ -54,7 +54,7 @@ export const StatusDot = ({ variant, label, animated }: StatusDotProps) => {
</span> </span>
</TooltipTrigger> </TooltipTrigger>
<TooltipContent> <TooltipContent>
<p>{label}</p> <p className="capitalize">{label}</p>
</TooltipContent> </TooltipContent>
</Tooltip> </Tooltip>
); );

269
app/client/modules/repositories/routes/repositories.tsx
View file

@ -1,7 +1,18 @@
import { useSuspenseQuery } from "@tanstack/react-query"; import { useSuspenseQuery } from "@tanstack/react-query";
import { ArrowDown, ArrowUp, ArrowUpDown, Database, Plus, RotateCcw } from "lucide-react"; import {
flexRender,
getCoreRowModel,
getFilteredRowModel,
getSortedRowModel,
type ColumnDef,
type ColumnFiltersState,
type SortingState,
useReactTable,
} from "@tanstack/react-table";
import { Database, Plus, RotateCcw } from "lucide-react";
import { useState } from "react"; import { useState } from "react";
import { listRepositoriesOptions } from "~/client/api-client/@tanstack/react-query.gen"; import { listRepositoriesOptions } from "~/client/api-client/@tanstack/react-query.gen";
import { DataTableSortHeader } from "~/client/components/data-table-sort-header";
import { RepositoryIcon } from "~/client/components/repository-icon"; import { RepositoryIcon } from "~/client/components/repository-icon";
import { Button } from "~/client/components/ui/button"; import { Button } from "~/client/components/ui/button";
import { Card } from "~/client/components/ui/card"; import { Card } from "~/client/components/ui/card";
@ -14,8 +25,6 @@ import { EmptyState } from "~/client/components/empty-state";
import { useNavigate } from "@tanstack/react-router"; import { useNavigate } from "@tanstack/react-router";
import type { RepositoryBackend } from "@zerobyte/core/restic"; import type { RepositoryBackend } from "@zerobyte/core/restic";
type SortColumn = "name" | "backend" | "status" | "compression";
type SortDirection = "asc" | "desc";
type RepositoryRow = { type RepositoryRow = {
id: string; id: string;
shortId: string; shortId: string;
@ -25,31 +34,62 @@ type RepositoryRow = {
compressionMode?: string | null; compressionMode?: string | null;
}; };
const getSortValue = (column: SortColumn, repository: RepositoryRow) => { const repositoryColumns: ColumnDef<RepositoryRow>[] = [
switch (column) { {
case "name": accessorKey: "name",
return repository.name; header: ({ column }) => <DataTableSortHeader column={column} title="Name" sortDirection={column.getIsSorted()} />,
case "backend": cell: ({ row }) => (
return repository.type; <div className="flex items-center gap-2">
case "status": <span>{row.original.name}</span>
return repository.status || ""; </div>
case "compression": ),
return repository.compressionMode || ""; },
} {
}; accessorKey: "type",
header: ({ column }) => (
<DataTableSortHeader column={column} title="Backend" sortDirection={column.getIsSorted()} />
),
cell: ({ row }) => (
<span className="flex items-center gap-2 text-muted-foreground">
<RepositoryIcon backend={row.original.type} />
{row.original.type}
</span>
),
filterFn: (row, id, value) => row.getValue(id) === value,
},
{
accessorFn: (row) => row.compressionMode || "off",
id: "compressionMode",
header: ({ column }) => (
<DataTableSortHeader column={column} title="Compression" sortDirection={column.getIsSorted()} />
),
cell: ({ row }) => (
<span className="text-muted-foreground text-xs bg-primary/10 rounded-md px-2 py-1">
{row.original.compressionMode || "off"}
</span>
),
sortingFn: "alphanumeric",
},
{
accessorFn: (row) => row.status || "unknown",
id: "status",
header: ({ column }) => (
<DataTableSortHeader column={column} title="Status" sortDirection={column.getIsSorted()} center />
),
cell: ({ row }) => (
<StatusDot
variant={row.original.status === "healthy" ? "success" : row.original.status === "error" ? "error" : "warning"}
label={row.original.status || "unknown"}
/>
),
sortingFn: "alphanumeric",
filterFn: (row, id, value) => row.getValue(id) === value,
},
];
export function RepositoriesPage() { export function RepositoriesPage() {
const [searchQuery, setSearchQuery] = useState(""); const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
const [statusFilter, setStatusFilter] = useState(""); const [sorting, setSorting] = useState<SortingState>([{ id: "name", desc: false }]);
const [backendFilter, setBackendFilter] = useState("");
const [sortColumn, setSortColumn] = useState<SortColumn>("name");
const [sortDirection, setSortDirection] = useState<SortDirection>("asc");
const clearFilters = () => {
setSearchQuery("");
setStatusFilter("");
setBackendFilter("");
};
const navigate = useNavigate(); const navigate = useNavigate();
@ -59,45 +99,23 @@ export function RepositoriesPage() {
const repositories = data as RepositoryRow[]; const repositories = data as RepositoryRow[];
const toggleSort = (column: SortColumn) => { const table = useReactTable({
if (sortColumn === column) { data: repositories,
setSortDirection((prev) => (prev === "asc" ? "desc" : "asc")); columns: repositoryColumns,
return; state: { columnFilters, sorting },
} onColumnFiltersChange: setColumnFilters,
onSortingChange: setSorting,
setSortColumn(column); getCoreRowModel: getCoreRowModel(),
setSortDirection("asc"); getFilteredRowModel: getFilteredRowModel(),
}; getSortedRowModel: getSortedRowModel(),
const renderSortIcon = (column: SortColumn) => {
if (sortColumn !== column) {
return <ArrowUpDown className="ml-2 h-3.5 w-3.5" />;
}
return sortDirection === "asc" ? (
<ArrowUp className="ml-2 h-3.5 w-3.5" />
) : (
<ArrowDown className="ml-2 h-3.5 w-3.5" />
);
};
const filteredRepositories = repositories.filter((repository) => {
const matchesSearch = repository.name.toLowerCase().includes(searchQuery.toLowerCase());
const matchesStatus = !statusFilter || repository.status === statusFilter;
const matchesBackend = !backendFilter || repository.type === backendFilter;
return matchesSearch && matchesStatus && matchesBackend;
}); });
const rows = table.getRowModel().rows;
const hasFilters = columnFilters.length > 0;
const sortedFilteredRepositories = [...filteredRepositories].sort((a, b) => { const clearFilters = () => table.resetColumnFilters();
const valueA = getSortValue(sortColumn, a).toLowerCase();
const valueB = getSortValue(sortColumn, b).toLowerCase();
const result = valueA.localeCompare(valueB);
return sortDirection === "asc" ? result : -result;
});
const hasNoRepositories = repositories.length === 0; const hasNoRepositories = repositories.length === 0;
const hasNoFilteredRepositories = sortedFilteredRepositories.length === 0 && !hasNoRepositories; const hasNoFilteredRepositories = rows.length === 0 && !hasNoRepositories;
if (hasNoRepositories) { if (hasNoRepositories) {
return ( return (
@ -115,6 +133,10 @@ export function RepositoriesPage() {
); );
} }
const search = (table.getColumn("name")?.getFilterValue() as string) ?? "";
const type = (table.getColumn("type")?.getFilterValue() as string) ?? "";
const status = (table.getColumn("status")?.getFilterValue() as string) ?? "";
return ( return (
<Card className="p-0 gap-0"> <Card className="p-0 gap-0">
<div className="flex flex-col lg:flex-row items-stretch lg:items-center gap-2 md:justify-between p-4 bg-card-header py-4"> <div className="flex flex-col lg:flex-row items-stretch lg:items-center gap-2 md:justify-between p-4 bg-card-header py-4">
@ -122,10 +144,10 @@ export function RepositoriesPage() {
<Input <Input
className="w-full lg:w-45 min-w-45" className="w-full lg:w-45 min-w-45"
placeholder="Search…" placeholder="Search…"
value={searchQuery} value={search}
onChange={(e) => setSearchQuery(e.target.value)} onChange={(e) => table.getColumn("name")?.setFilterValue(e.target.value)}
/> />
<Select value={statusFilter} onValueChange={setStatusFilter}> <Select value={status} onValueChange={(value) => table.getColumn("status")?.setFilterValue(value)}>
<SelectTrigger className="w-full lg:w-45 min-w-45"> <SelectTrigger className="w-full lg:w-45 min-w-45">
<SelectValue placeholder="All status" /> <SelectValue placeholder="All status" />
</SelectTrigger> </SelectTrigger>
@ -135,7 +157,7 @@ export function RepositoriesPage() {
<SelectItem value="unknown">Unknown</SelectItem> <SelectItem value="unknown">Unknown</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
<Select value={backendFilter} onValueChange={setBackendFilter}> <Select value={type} onValueChange={(value) => table.getColumn("type")?.setFilterValue(value)}>
<SelectTrigger className="w-full lg:w-45 min-w-45"> <SelectTrigger className="w-full lg:w-45 min-w-45">
<SelectValue placeholder="All backends" /> <SelectValue placeholder="All backends" />
</SelectTrigger> </SelectTrigger>
@ -146,7 +168,7 @@ export function RepositoriesPage() {
<SelectItem value="gcs">Google Cloud Storage</SelectItem> <SelectItem value="gcs">Google Cloud Storage</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
{(searchQuery || statusFilter || backendFilter) && ( {hasFilters && (
<Button onClick={clearFilters} className="w-full lg:w-auto mt-2 lg:mt-0 lg:ml-2"> <Button onClick={clearFilters} className="w-full lg:w-auto mt-2 lg:mt-0 lg:ml-2">
<RotateCcw className="h-4 w-4 mr-2" /> <RotateCcw className="h-4 w-4 mr-2" />
Clear filters Clear filters
@ -161,56 +183,23 @@ export function RepositoriesPage() {
<div className="overflow-x-auto"> <div className="overflow-x-auto">
<Table className="border-t"> <Table className="border-t">
<TableHeader className="bg-card-header"> <TableHeader className="bg-card-header">
<TableRow> {table.getHeaderGroups().map((headerGroup) => (
<TableHead className="w-25 uppercase"> <TableRow key={headerGroup.id}>
<Button {headerGroup.headers.map((header) => (
type="button" <TableHead
variant="ghost" key={header.id}
onClick={() => toggleSort("name")} className={cn("uppercase", {
className="h-auto! p-0! font-inherit hover:bg-transparent uppercase group/sort" "w-25": header.column.id === "name",
> "text-left": header.column.id === "type",
Name "hidden sm:table-cell": header.column.id === "compressionMode",
<div className="lg:invisible lg:group-hover/sort:visible">{renderSortIcon("name")}</div> "text-center": header.column.id === "status",
</Button> })}
</TableHead> >
<TableHead className="uppercase text-left"> {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
<Button </TableHead>
type="button" ))}
variant="ghost" </TableRow>
onClick={() => toggleSort("backend")} ))}
className="h-auto! p-0! font-inherit hover:bg-transparent uppercase group/sort"
>
Backend
<div className="lg:invisible lg:group-hover/sort:visible">{renderSortIcon("backend")}</div>
</Button>
</TableHead>
<TableHead className="uppercase hidden sm:table-cell">
<Button
type="button"
variant="ghost"
onClick={() => toggleSort("compression")}
className="h-auto! p-0! font-inherit hover:bg-transparent uppercase group/sort"
>
Compresison
<div className="lg:invisible lg:group-hover/sort:visible">{renderSortIcon("compression")}</div>
</Button>
</TableHead>
<TableHead className="uppercase text-center">
<Button
type="button"
variant="ghost"
onClick={() => toggleSort("status")}
className="h-auto! w-full! p-0! font-inherit hover:bg-transparent uppercase group/sort relative"
>
<span className="relative flex w-full items-center justify-center">
Status
<span className="lg:absolute lg:-right-6 lg:top-1/2 lg:-translate-y-1/2 lg:invisible lg:group-hover/sort:visible">
{renderSortIcon("status")}
</span>
</span>
</Button>
</TableHead>
</TableRow>
</TableHeader> </TableHeader>
<TableBody> <TableBody>
<TableRow className={cn({ hidden: !hasNoFilteredRepositories })}> <TableRow className={cn({ hidden: !hasNoFilteredRepositories })}>
@ -224,38 +213,24 @@ export function RepositoriesPage() {
</div> </div>
</TableCell> </TableCell>
</TableRow> </TableRow>
{sortedFilteredRepositories.map((repository) => ( {rows.map((row) => (
<TableRow <TableRow
key={repository.id} key={row.original.id}
className="hover:bg-accent/50 hover:cursor-pointer h-12" className="hover:bg-accent/50 hover:cursor-pointer h-12"
onClick={() => navigate({ to: `/repositories/${repository.shortId}` })} onClick={() => navigate({ to: `/repositories/${row.original.shortId}` })}
> >
<TableCell className="font-medium text-strong-accent"> {row.getVisibleCells().map((cell) => (
<div className="flex items-center gap-2"> <TableCell
<span>{repository.name}</span> key={cell.id}
</div> className={cn({
</TableCell> "font-medium text-strong-accent": cell.column.id === "name",
<TableCell> "hidden sm:table-cell": cell.column.id === "compressionMode",
<span className="flex items-center gap-2 text-muted-foreground"> "text-center": cell.column.id === "status",
<RepositoryIcon backend={repository.type} /> })}
{repository.type} >
</span> {flexRender(cell.column.columnDef.cell, cell.getContext())}
</TableCell> </TableCell>
<TableCell className="hidden sm:table-cell"> ))}
<span className="text-muted-foreground text-xs bg-primary/10 rounded-md px-2 py-1">
{repository.compressionMode || "off"}
</span>
</TableCell>
<TableCell className="text-center">
<StatusDot
variant={
repository.status === "healthy" ? "success" : repository.status === "error" ? "error" : "warning"
}
label={
repository.status ? repository.status[0].toUpperCase() + repository.status.slice(1) : "Unknown"
}
/>
</TableCell>
</TableRow> </TableRow>
))} ))}
</TableBody> </TableBody>
@ -266,8 +241,8 @@ export function RepositoriesPage() {
"No repositories match filters." "No repositories match filters."
) : ( ) : (
<span> <span>
<span className="text-strong-accent">{sortedFilteredRepositories.length}</span> repositor <span className="text-strong-accent">{rows.length}</span> repositor
{sortedFilteredRepositories.length === 1 ? "y" : "ies"} {rows.length === 1 ? "y" : "ies"}
</span> </span>
)} )}
</div> </div>

231
app/client/modules/volumes/routes/volumes.tsx
View file

@ -1,6 +1,18 @@
import { useSuspenseQuery } from "@tanstack/react-query"; import { useSuspenseQuery } from "@tanstack/react-query";
import { ArrowDown, ArrowUp, ArrowUpDown, HardDrive, Plus, RotateCcw } from "lucide-react"; import {
flexRender,
getCoreRowModel,
getFilteredRowModel,
getSortedRowModel,
type ColumnDef,
type ColumnFiltersState,
type SortingState,
useReactTable,
} from "@tanstack/react-table";
import { HardDrive, Plus, RotateCcw } from "lucide-react";
import { useState } from "react"; import { useState } from "react";
import { listVolumesOptions } from "~/client/api-client/@tanstack/react-query.gen";
import { DataTableSortHeader } from "~/client/components/data-table-sort-header";
import { EmptyState } from "~/client/components/empty-state"; import { EmptyState } from "~/client/components/empty-state";
import { StatusDot } from "~/client/components/status-dot"; import { StatusDot } from "~/client/components/status-dot";
import { Button } from "~/client/components/ui/button"; import { Button } from "~/client/components/ui/button";
@ -9,7 +21,6 @@ import { Input } from "~/client/components/ui/input";
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "~/client/components/ui/select"; import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "~/client/components/ui/select";
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "~/client/components/ui/table"; import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "~/client/components/ui/table";
import { VolumeIcon } from "~/client/components/volume-icon"; import { VolumeIcon } from "~/client/components/volume-icon";
import { listVolumesOptions } from "~/client/api-client/@tanstack/react-query.gen";
import type { VolumeStatus } from "~/client/lib/types"; import type { VolumeStatus } from "~/client/lib/types";
import { useNavigate } from "@tanstack/react-router"; import { useNavigate } from "@tanstack/react-router";
import { cn } from "~/client/lib/utils"; import { cn } from "~/client/lib/utils";
@ -24,8 +35,6 @@ const getVolumeStatusVariant = (status: VolumeStatus): "success" | "neutral" | "
return statusMap[status]; return statusMap[status];
}; };
type SortColumn = "name" | "backend" | "status";
type SortDirection = "asc" | "desc";
type VolumeRow = { type VolumeRow = {
shortId: string; shortId: string;
name: string; name: string;
@ -33,78 +42,61 @@ type VolumeRow = {
status: VolumeStatus; status: VolumeStatus;
}; };
const getSortValue = (column: SortColumn, volume: VolumeRow) => { const volumeColumns: ColumnDef<VolumeRow>[] = [
switch (column) { {
case "name": accessorKey: "name",
return volume.name; header: ({ column }) => <DataTableSortHeader column={column} title="Name" sortDirection={column.getIsSorted()} />,
case "backend": cell: ({ row }) => (
return volume.type; <div className="flex items-center gap-2">
case "status": <span>{row.original.name}</span>
return volume.status; </div>
} ),
}; },
{
accessorKey: "type",
header: ({ column }) => (
<DataTableSortHeader column={column} title="Backend" sortDirection={column.getIsSorted()} />
),
cell: ({ row }) => <VolumeIcon backend={row.original.type} />,
filterFn: (row, id, value) => row.getValue(id) === value,
},
{
accessorKey: "status",
header: ({ column }) => (
<DataTableSortHeader column={column} title="Status" sortDirection={column.getIsSorted()} center />
),
cell: ({ row }) => <StatusDot variant={getVolumeStatusVariant(row.original.status)} label={row.original.status} />,
filterFn: (row, id, value) => row.getValue(id) === value,
},
];
export function VolumesPage() { export function VolumesPage() {
const [searchQuery, setSearchQuery] = useState(""); const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
const [statusFilter, setStatusFilter] = useState(""); const [sorting, setSorting] = useState<SortingState>([]);
const [backendFilter, setBackendFilter] = useState("");
const [sortColumn, setSortColumn] = useState<SortColumn>("name");
const [sortDirection, setSortDirection] = useState<SortDirection>("asc");
const clearFilters = () => {
setSearchQuery("");
setStatusFilter("");
setBackendFilter("");
};
const navigate = useNavigate(); const navigate = useNavigate();
const { data } = useSuspenseQuery({ ...listVolumesOptions() });
const { data } = useSuspenseQuery({
...listVolumesOptions(),
});
const volumes = data as VolumeRow[]; const volumes = data as VolumeRow[];
const toggleSort = (column: SortColumn) => { const table = useReactTable({
if (sortColumn === column) { data: volumes,
setSortDirection((prev) => (prev === "asc" ? "desc" : "asc")); columns: volumeColumns,
return; state: { columnFilters, sorting },
} onColumnFiltersChange: setColumnFilters,
onSortingChange: setSorting,
setSortColumn(column); getCoreRowModel: getCoreRowModel(),
setSortDirection("asc"); getFilteredRowModel: getFilteredRowModel(),
}; getSortedRowModel: getSortedRowModel(),
const renderSortIcon = (column: SortColumn) => {
if (sortColumn !== column) {
return <ArrowUpDown className="ml-2 h-3.5 w-3.5" />;
}
return sortDirection === "asc" ? (
<ArrowUp className="ml-2 h-3.5 w-3.5" />
) : (
<ArrowDown className="ml-2 h-3.5 w-3.5" />
);
};
const filteredVolumes =
volumes.filter((volume) => {
const matchesSearch = volume.name.toLowerCase().includes(searchQuery.toLowerCase());
const matchesStatus = !statusFilter || volume.status === statusFilter;
const matchesBackend = !backendFilter || volume.type === backendFilter;
return matchesSearch && matchesStatus && matchesBackend;
}) || [];
const sortedFilteredVolumes = [...filteredVolumes].sort((a, b) => {
const valueA = getSortValue(sortColumn, a).toLowerCase();
const valueB = getSortValue(sortColumn, b).toLowerCase();
const result = valueA.localeCompare(valueB);
return sortDirection === "asc" ? result : -result;
}); });
const rows = table.getRowModel().rows;
const hasFilters = columnFilters.length > 0;
const clearFilters = () => table.resetColumnFilters();
const hasNoVolumes = volumes.length === 0; const hasNoVolumes = volumes.length === 0;
const hasNoFilteredVolumes = sortedFilteredVolumes.length === 0 && !hasNoVolumes; const hasNoFilteredVolumes = rows.length === 0 && !hasNoVolumes;
if (hasNoVolumes) { if (hasNoVolumes) {
return ( return (
@ -122,6 +114,10 @@ export function VolumesPage() {
); );
} }
const search = (table.getColumn("name")?.getFilterValue() as string) ?? "";
const status = (table.getColumn("status")?.getFilterValue() as string) ?? "";
const type = (table.getColumn("type")?.getFilterValue() as string) ?? "";
return ( return (
<Card className="p-0 gap-0"> <Card className="p-0 gap-0">
<div className="flex flex-col lg:flex-row items-stretch lg:items-center gap-2 md:justify-between p-4 bg-card-header py-4"> <div className="flex flex-col lg:flex-row items-stretch lg:items-center gap-2 md:justify-between p-4 bg-card-header py-4">
@ -129,10 +125,10 @@ export function VolumesPage() {
<Input <Input
className="w-full lg:w-45 min-w-45" className="w-full lg:w-45 min-w-45"
placeholder="Search…" placeholder="Search…"
value={searchQuery} value={search}
onChange={(e) => setSearchQuery(e.target.value)} onChange={(e) => table.getColumn("name")?.setFilterValue(e.target.value)}
/> />
<Select value={statusFilter} onValueChange={setStatusFilter}> <Select value={status} onValueChange={(value) => table.getColumn("status")?.setFilterValue(value)}>
<SelectTrigger className="w-full lg:w-45 min-w-45"> <SelectTrigger className="w-full lg:w-45 min-w-45">
<SelectValue placeholder="All status" /> <SelectValue placeholder="All status" />
</SelectTrigger> </SelectTrigger>
@ -142,7 +138,7 @@ export function VolumesPage() {
<SelectItem value="error">Error</SelectItem> <SelectItem value="error">Error</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
<Select value={backendFilter} onValueChange={setBackendFilter}> <Select value={type} onValueChange={(value) => table.getColumn("type")?.setFilterValue(value)}>
<SelectTrigger className="w-full lg:w-45 min-w-45"> <SelectTrigger className="w-full lg:w-45 min-w-45">
<SelectValue placeholder="All backends" /> <SelectValue placeholder="All backends" />
</SelectTrigger> </SelectTrigger>
@ -155,7 +151,7 @@ export function VolumesPage() {
<SelectItem value="rclone">rclone</SelectItem> <SelectItem value="rclone">rclone</SelectItem>
</SelectContent> </SelectContent>
</Select> </Select>
{(searchQuery || statusFilter || backendFilter) && ( {hasFilters && (
<Button onClick={clearFilters} className="w-full lg:w-auto mt-2 lg:mt-0 lg:ml-2"> <Button onClick={clearFilters} className="w-full lg:w-auto mt-2 lg:mt-0 lg:ml-2">
<RotateCcw className="h-4 w-4 mr-2" /> <RotateCcw className="h-4 w-4 mr-2" />
Clear filters Clear filters
@ -170,49 +166,26 @@ export function VolumesPage() {
<div className="overflow-x-auto"> <div className="overflow-x-auto">
<Table className="border-t"> <Table className="border-t">
<TableHeader className="bg-card-header"> <TableHeader className="bg-card-header">
<TableRow> {table.getHeaderGroups().map((headerGroup) => (
<TableHead className="w-25 uppercase group/sort"> <TableRow key={headerGroup.id}>
<Button {headerGroup.headers.map((header) => (
type="button" <TableHead
variant="ghost" key={header.id}
onClick={() => toggleSort("name")} className={cn("uppercase", {
className="h-auto! p-0! font-inherit hover:bg-transparent uppercase group/sort" "w-25": header.column.id === "name",
> "text-left": header.column.id === "type",
Name "text-center": header.column.id === "status",
<div className="lg:invisible lg:group-hover/sort:visible">{renderSortIcon("name")}</div> })}
</Button> >
</TableHead> {header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
<TableHead className="uppercase text-left"> </TableHead>
<Button ))}
type="button" </TableRow>
variant="ghost" ))}
onClick={() => toggleSort("backend")}
className="h-auto! p-0! font-inherit hover:bg-transparent uppercase group/sort"
>
Backend
<div className="lg:invisible lg:group-hover/sort:visible">{renderSortIcon("backend")}</div>
</Button>
</TableHead>
<TableHead className="uppercase text-center">
<Button
type="button"
variant="ghost"
onClick={() => toggleSort("status")}
className="h-auto! p-0! font-inherit hover:bg-transparent uppercase group/sort relative"
>
<span className="relative flex w-full items-center justify-center">
Status
<span className="lg:absolute lg:-right-6 lg:top-1/2 lg:-translate-y-1/2 lg:invisible lg:group-hover/sort:visible">
{renderSortIcon("status")}
</span>
</span>
</Button>
</TableHead>
</TableRow>
</TableHeader> </TableHeader>
<TableBody> <TableBody>
<TableRow className={cn({ hidden: !hasNoFilteredVolumes })}> <TableRow className={cn({ hidden: !hasNoFilteredVolumes })}>
<TableCell colSpan={4} className="text-center py-12"> <TableCell colSpan={3} className="text-center py-12">
<div className="flex flex-col items-center gap-3"> <div className="flex flex-col items-center gap-3">
<p className="text-muted-foreground">No volumes match your filters.</p> <p className="text-muted-foreground">No volumes match your filters.</p>
<Button onClick={clearFilters} variant="outline" size="sm"> <Button onClick={clearFilters} variant="outline" size="sm">
@ -222,26 +195,24 @@ export function VolumesPage() {
</div> </div>
</TableCell> </TableCell>
</TableRow> </TableRow>
{sortedFilteredVolumes.map((volume) => ( {rows.map((row) => (
<TableRow <TableRow
key={volume.shortId} key={row.original.shortId}
className="hover:bg-muted/50 hover:cursor-pointer transition-colors h-12" className="hover:bg-muted/50 hover:cursor-pointer transition-colors h-12"
onClick={() => navigate({ to: `/volumes/${volume.shortId}` })} onClick={() => navigate({ to: `/volumes/${row.original.shortId}` })}
> >
<TableCell className="font-medium font-mono text-strong-accent"> {row.getVisibleCells().map((cell) => (
<div className="flex items-center gap-2"> <TableCell
<span>{volume.name}</span> key={cell.id}
</div> className={cn("font-mono", {
</TableCell> "font-medium text-strong-accent": cell.column.id === "name",
<TableCell className="font-mono text-muted-foreground"> "text-muted-foreground": cell.column.id === "type",
<VolumeIcon backend={volume.type} /> "text-center": cell.column.id === "status",
</TableCell> })}
<TableCell className="text-center font-mono"> >
<StatusDot {flexRender(cell.column.columnDef.cell, cell.getContext())}
variant={getVolumeStatusVariant(volume.status)} </TableCell>
label={volume.status[0].toUpperCase() + volume.status.slice(1)} ))}
/>
</TableCell>
</TableRow> </TableRow>
))} ))}
</TableBody> </TableBody>
@ -252,8 +223,8 @@ export function VolumesPage() {
"No volumes match filters." "No volumes match filters."
) : ( ) : (
<span className="font-mono"> <span className="font-mono">
<span className="text-strong-accent font-bold">{sortedFilteredVolumes.length}</span> volume <span className="text-strong-accent font-bold">{rows.length}</span> volume
{sortedFilteredVolumes.length > 1 ? "s" : ""} {rows.length > 1 ? "s" : ""}
</span> </span>
)} )}
</div> </div>

5
bun.lock
View file

@ -34,6 +34,7 @@
"@tanstack/react-router": "^1.168.1", "@tanstack/react-router": "^1.168.1",
"@tanstack/react-router-ssr-query": "^1.166.10", "@tanstack/react-router-ssr-query": "^1.166.10",
"@tanstack/react-start": "^1.167.1", "@tanstack/react-start": "^1.167.1",
"@tanstack/react-table": "^8.21.3",
"@zerobyte/contracts": "workspace:*", "@zerobyte/contracts": "workspace:*",
"@zerobyte/core": "workspace:*", "@zerobyte/core": "workspace:*",
"better-auth": "^1.5.5", "better-auth": "^1.5.5",
@ -1246,6 +1247,8 @@
"@tanstack/react-store": ["@tanstack/react-store@0.9.3", "", { "dependencies": { "@tanstack/store": "0.9.3", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-y2iHd/N9OkoQbFJLUX1T9vbc2O9tjH0pQRgTcx1/Nz4IlwLvkgpuglXUx+mXt0g5ZDFrEeDnONPqkbfxXJKwRg=="], "@tanstack/react-store": ["@tanstack/react-store@0.9.3", "", { "dependencies": { "@tanstack/store": "0.9.3", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, "sha512-y2iHd/N9OkoQbFJLUX1T9vbc2O9tjH0pQRgTcx1/Nz4IlwLvkgpuglXUx+mXt0g5ZDFrEeDnONPqkbfxXJKwRg=="],
"@tanstack/react-table": ["@tanstack/react-table@8.21.3", "", { "dependencies": { "@tanstack/table-core": "8.21.3" }, "peerDependencies": { "react": ">=16.8", "react-dom": ">=16.8" } }, "sha512-5nNMTSETP4ykGegmVkhjcS8tTLW6Vl4axfEGQN3v0zdHYbK4UfoqfPChclTrJ4EoK9QynqAu9oUf8VEmrpZ5Ww=="],
"@tanstack/router-core": ["@tanstack/router-core@1.168.1", "", { "dependencies": { "@tanstack/history": "1.161.6", "cookie-es": "^2.0.0", "seroval": "^1.4.2", "seroval-plugins": "^1.4.2", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" }, "bin": { "intent": "bin/intent.js" } }, "sha512-RtpshTLZsMOkwW7rI52WFWGZSSfMAyDR1zWP9kVm91UX28gedc+LXih1CTP6TchS+TvxK4q8oW7ApMTvnpiY1w=="], "@tanstack/router-core": ["@tanstack/router-core@1.168.1", "", { "dependencies": { "@tanstack/history": "1.161.6", "cookie-es": "^2.0.0", "seroval": "^1.4.2", "seroval-plugins": "^1.4.2", "tiny-invariant": "^1.3.3", "tiny-warning": "^1.0.3" }, "bin": { "intent": "bin/intent.js" } }, "sha512-RtpshTLZsMOkwW7rI52WFWGZSSfMAyDR1zWP9kVm91UX28gedc+LXih1CTP6TchS+TvxK4q8oW7ApMTvnpiY1w=="],
"@tanstack/router-devtools-core": ["@tanstack/router-devtools-core@1.167.3", "", { "dependencies": { "clsx": "^2.1.1", "goober": "^2.1.16" }, "peerDependencies": { "@tanstack/router-core": "^1.168.11", "csstype": "^3.0.10" }, "optionalPeers": ["csstype"] }, "sha512-fJ1VMhyQgnoashTrP763c2HRc9kofgF61L7Jb3F6eTHAmCKtGVx8BRtiFt37sr3U0P0jmaaiiSPGP6nT5JtVNg=="], "@tanstack/router-devtools-core": ["@tanstack/router-devtools-core@1.167.3", "", { "dependencies": { "clsx": "^2.1.1", "goober": "^2.1.16" }, "peerDependencies": { "@tanstack/router-core": "^1.168.11", "csstype": "^3.0.10" }, "optionalPeers": ["csstype"] }, "sha512-fJ1VMhyQgnoashTrP763c2HRc9kofgF61L7Jb3F6eTHAmCKtGVx8BRtiFt37sr3U0P0jmaaiiSPGP6nT5JtVNg=="],
@ -1270,6 +1273,8 @@
"@tanstack/store": ["@tanstack/store@0.9.3", "", {}, "sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw=="], "@tanstack/store": ["@tanstack/store@0.9.3", "", {}, "sha512-8reSzl/qGWGGVKhBoxXPMWzATSbZLZFWhwBAFO9NAyp0TxzfBP0mIrGb8CP8KrQTmvzXlR/vFPPUrHTLBGyFyw=="],
"@tanstack/table-core": ["@tanstack/table-core@8.21.3", "", {}, "sha512-ldZXEhOBb8Is7xLs01fR3YEc3DERiz5silj8tnGkFZytt1abEvl/GhUmCE0PMLaMPTa3Jk4HbKmRlHmu+gCftg=="],
"@tanstack/virtual-file-routes": ["@tanstack/virtual-file-routes@1.161.7", "", { "bin": { "intent": "bin/intent.js" } }, "sha512-olW33+Cn+bsCsZKPwEGhlkqS6w3M2slFv11JIobdnCFKMLG97oAI2kWKdx5/zsywTL8flpnoIgaZZPlQTFYhdQ=="], "@tanstack/virtual-file-routes": ["@tanstack/virtual-file-routes@1.161.7", "", { "bin": { "intent": "bin/intent.js" } }, "sha512-olW33+Cn+bsCsZKPwEGhlkqS6w3M2slFv11JIobdnCFKMLG97oAI2kWKdx5/zsywTL8flpnoIgaZZPlQTFYhdQ=="],
"@tediousjs/connection-string": ["@tediousjs/connection-string@0.5.0", "", {}, "sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ=="], "@tediousjs/connection-string": ["@tediousjs/connection-string@0.5.0", "", {}, "sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ=="],

1
package.json
View file

@ -62,6 +62,7 @@
"@tanstack/react-router": "^1.168.1", "@tanstack/react-router": "^1.168.1",
"@tanstack/react-router-ssr-query": "^1.166.10", "@tanstack/react-router-ssr-query": "^1.166.10",
"@tanstack/react-start": "^1.167.1", "@tanstack/react-start": "^1.167.1",
"@tanstack/react-table": "^8.21.3",
"@zerobyte/contracts": "workspace:*", "@zerobyte/contracts": "workspace:*",
"@zerobyte/core": "workspace:*", "@zerobyte/core": "workspace:*",
"better-auth": "^1.5.5", "better-auth": "^1.5.5",