feat: add repositories & volumes column sorting (#808)
Some checks failed
Release Workflow / e2e-tests (push) Has been cancelled
Release Workflow / determine-release-type (push) Has been cancelled
Release Workflow / checks (push) Has been cancelled
Release Workflow / build-images (push) Has been cancelled
Release Workflow / publish-release (push) Has been cancelled
Release Workflow / request-docs-version-update (push) Has been cancelled
Some checks failed
Release Workflow / e2e-tests (push) Has been cancelled
Release Workflow / determine-release-type (push) Has been cancelled
Release Workflow / checks (push) Has been cancelled
Release Workflow / build-images (push) Has been cancelled
Release Workflow / publish-release (push) Has been cancelled
Release Workflow / request-docs-version-update (push) Has been cancelled
* Add repository column sorting * Make status title correctly centered o nsmaller screens * Add volumes column sorting * refactor: use tanstack table for filtering and sorting * feat: make notifications sortable * chore: pr feedbacks --------- Co-authored-by: Antoine Jeanselme <67123340+ajeanselme@users.noreply.github.com> Co-authored-by: Nicolas Meienberger <github@thisprops.com>
This commit is contained in:
Antoine Jeanselme
GitHub
parent
d19d827496
commit
3d5a0a9b75
7 changed files with 414 additions and 149 deletions
54
app/client/components/data-table-sort-header.tsx
Normal file
54
app/client/components/data-table-sort-header.tsx
Normal 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>
|
||||
);
|
||||
}
|
||||
|
|
@ -54,7 +54,7 @@ export const StatusDot = ({ variant, label, animated }: StatusDotProps) => {
|
|||
</span>
|
||||
</TooltipTrigger>
|
||||
<TooltipContent>
|
||||
<p>{label}</p>
|
||||
<p className="capitalize">{label}</p>
|
||||
</TooltipContent>
|
||||
</Tooltip>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,18 @@
|
|||
import { useSuspenseQuery } from "@tanstack/react-query";
|
||||
import {
|
||||
flexRender,
|
||||
getCoreRowModel,
|
||||
getFilteredRowModel,
|
||||
getSortedRowModel,
|
||||
type ColumnDef,
|
||||
type ColumnFiltersState,
|
||||
type SortingState,
|
||||
useReactTable,
|
||||
} from "@tanstack/react-table";
|
||||
import { Bell, Plus, RotateCcw } from "lucide-react";
|
||||
import { useState } from "react";
|
||||
import { listNotificationDestinationsOptions } 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 { StatusDot } from "~/client/components/status-dot";
|
||||
import { Button } from "~/client/components/ui/button";
|
||||
|
|
@ -8,20 +20,47 @@ import { Card } from "~/client/components/ui/card";
|
|||
import { Input } from "~/client/components/ui/input";
|
||||
import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "~/client/components/ui/select";
|
||||
import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "~/client/components/ui/table";
|
||||
import { listNotificationDestinationsOptions } from "~/client/api-client/@tanstack/react-query.gen";
|
||||
import { useNavigate } from "@tanstack/react-router";
|
||||
import { cn } from "~/client/lib/utils";
|
||||
|
||||
export function NotificationsPage() {
|
||||
const [searchQuery, setSearchQuery] = useState("");
|
||||
const [typeFilter, setTypeFilter] = useState("");
|
||||
const [statusFilter, setStatusFilter] = useState("");
|
||||
type NotificationRow = {
|
||||
id: number;
|
||||
name: string;
|
||||
type: "email" | "slack" | "discord" | "gotify" | "ntfy" | "pushover" | "telegram" | "custom" | "generic";
|
||||
enabled: boolean;
|
||||
};
|
||||
|
||||
const clearFilters = () => {
|
||||
setSearchQuery("");
|
||||
setTypeFilter("");
|
||||
setStatusFilter("");
|
||||
};
|
||||
const notificationColumns: ColumnDef<NotificationRow>[] = [
|
||||
{
|
||||
accessorKey: "name",
|
||||
header: ({ column }) => <DataTableSortHeader column={column} title="Name" sortDirection={column.getIsSorted()} />,
|
||||
cell: ({ row }) => row.original.name,
|
||||
},
|
||||
{
|
||||
accessorKey: "type",
|
||||
header: ({ column }) => <DataTableSortHeader column={column} title="Type" sortDirection={column.getIsSorted()} />,
|
||||
cell: ({ row }) => row.original.type,
|
||||
filterFn: (row, id, value) => row.getValue(id) === value,
|
||||
},
|
||||
{
|
||||
accessorFn: (row) => (row.enabled ? "enabled" : "disabled"),
|
||||
id: "status",
|
||||
header: ({ column }) => (
|
||||
<DataTableSortHeader column={column} title="Status" sortDirection={column.getIsSorted()} center />
|
||||
),
|
||||
cell: ({ row }) => (
|
||||
<StatusDot
|
||||
variant={row.original.enabled ? "success" : "neutral"}
|
||||
label={row.original.enabled ? "Enabled" : "Disabled"}
|
||||
/>
|
||||
),
|
||||
filterFn: (row, id, value) => row.getValue(id) === value,
|
||||
},
|
||||
];
|
||||
|
||||
export function NotificationsPage() {
|
||||
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
|
||||
const [sorting, setSorting] = useState<SortingState>([]);
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
|
|
@ -29,15 +68,24 @@ export function NotificationsPage() {
|
|||
...listNotificationDestinationsOptions(),
|
||||
});
|
||||
|
||||
const filteredNotifications = data.filter((notification) => {
|
||||
const matchesSearch = notification.name.toLowerCase().includes(searchQuery.toLowerCase());
|
||||
const matchesType = !typeFilter || notification.type === typeFilter;
|
||||
const matchesStatus = !statusFilter || (statusFilter === "enabled" ? notification.enabled : !notification.enabled);
|
||||
return matchesSearch && matchesType && matchesStatus;
|
||||
const table = useReactTable({
|
||||
data,
|
||||
columns: notificationColumns,
|
||||
state: { columnFilters, sorting },
|
||||
onColumnFiltersChange: setColumnFilters,
|
||||
onSortingChange: setSorting,
|
||||
getCoreRowModel: getCoreRowModel(),
|
||||
getFilteredRowModel: getFilteredRowModel(),
|
||||
getSortedRowModel: getSortedRowModel(),
|
||||
});
|
||||
|
||||
const rows = table.getRowModel().rows;
|
||||
const hasFilters = columnFilters.length > 0;
|
||||
|
||||
const clearFilters = () => table.resetColumnFilters();
|
||||
|
||||
const hasNoNotifications = data.length === 0;
|
||||
const hasNoFilteredNotifications = filteredNotifications.length === 0 && !hasNoNotifications;
|
||||
const hasNoFilteredNotifications = rows.length === 0 && !hasNoNotifications;
|
||||
|
||||
if (hasNoNotifications) {
|
||||
return (
|
||||
|
|
@ -55,6 +103,10 @@ export function NotificationsPage() {
|
|||
);
|
||||
}
|
||||
|
||||
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 (
|
||||
<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">
|
||||
|
|
@ -62,10 +114,10 @@ export function NotificationsPage() {
|
|||
<Input
|
||||
className="w-full lg:w-45 min-w-45"
|
||||
placeholder="Search…"
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
value={search}
|
||||
onChange={(e) => table.getColumn("name")?.setFilterValue(e.target.value)}
|
||||
/>
|
||||
<Select value={typeFilter} onValueChange={setTypeFilter}>
|
||||
<Select value={type} onValueChange={(value) => table.getColumn("type")?.setFilterValue(value)}>
|
||||
<SelectTrigger className="w-full lg:w-45 min-w-45">
|
||||
<SelectValue placeholder="All types" />
|
||||
</SelectTrigger>
|
||||
|
|
@ -77,10 +129,11 @@ export function NotificationsPage() {
|
|||
<SelectItem value="ntfy">Ntfy</SelectItem>
|
||||
<SelectItem value="pushover">Pushover</SelectItem>
|
||||
<SelectItem value="telegram">Telegram</SelectItem>
|
||||
<SelectItem value="generic">Generic</SelectItem>
|
||||
<SelectItem value="custom">Custom</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
<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">
|
||||
<SelectValue placeholder="All status" />
|
||||
</SelectTrigger>
|
||||
|
|
@ -89,7 +142,7 @@ export function NotificationsPage() {
|
|||
<SelectItem value="disabled">Disabled</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{(searchQuery || typeFilter || statusFilter) && (
|
||||
{hasFilters && (
|
||||
<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" />
|
||||
Clear filters
|
||||
|
|
@ -104,11 +157,22 @@ export function NotificationsPage() {
|
|||
<div className="overflow-x-auto">
|
||||
<Table className="border-t">
|
||||
<TableHeader className="bg-card-header">
|
||||
<TableRow>
|
||||
<TableHead className="w-25 uppercase">Name</TableHead>
|
||||
<TableHead className="uppercase text-left">Type</TableHead>
|
||||
<TableHead className="uppercase text-center">Status</TableHead>
|
||||
</TableRow>
|
||||
{table.getHeaderGroups().map((headerGroup) => (
|
||||
<TableRow key={headerGroup.id}>
|
||||
{headerGroup.headers.map((header) => (
|
||||
<TableHead
|
||||
key={header.id}
|
||||
className={cn("uppercase", {
|
||||
"w-25": header.column.id === "name",
|
||||
"text-left": header.column.id === "type",
|
||||
"text-center": header.column.id === "status",
|
||||
})}
|
||||
>
|
||||
{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
|
||||
</TableHead>
|
||||
))}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
<TableRow className={cn({ hidden: !hasNoFilteredNotifications })}>
|
||||
|
|
@ -122,30 +186,38 @@ export function NotificationsPage() {
|
|||
</div>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
{filteredNotifications.map((notification) => (
|
||||
{rows.map((row) => (
|
||||
<TableRow
|
||||
key={notification.id}
|
||||
key={row.original.id}
|
||||
className="hover:bg-accent/50 hover:cursor-pointer h-12"
|
||||
onClick={() => navigate({ to: `/notifications/${notification.id}` })}
|
||||
onClick={() => navigate({ to: `/notifications/${row.original.id}` })}
|
||||
>
|
||||
<TableCell className="font-medium text-strong-accent">{notification.name}</TableCell>
|
||||
<TableCell className="capitalize text-muted-foreground">{notification.type}</TableCell>
|
||||
<TableCell className="text-center">
|
||||
<StatusDot
|
||||
variant={notification.enabled ? "success" : "neutral"}
|
||||
label={notification.enabled ? "Enabled" : "Disabled"}
|
||||
/>
|
||||
</TableCell>
|
||||
{row.getVisibleCells().map((cell) => (
|
||||
<TableCell
|
||||
key={cell.id}
|
||||
className={cn({
|
||||
"font-medium text-strong-accent": cell.column.id === "name",
|
||||
"capitalize text-muted-foreground": cell.column.id === "type",
|
||||
"text-center": cell.column.id === "status",
|
||||
})}
|
||||
>
|
||||
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
||||
</TableCell>
|
||||
))}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
</Table>
|
||||
</div>
|
||||
<div className="px-4 py-2 text-sm text-muted-foreground bg-card-header flex justify-end border-t">
|
||||
<span>
|
||||
<span className="text-strong-accent">{filteredNotifications.length}</span> destination
|
||||
{filteredNotifications.length !== 1 ? "s" : ""}
|
||||
</span>
|
||||
{hasNoFilteredNotifications ? (
|
||||
"No destinations match filters."
|
||||
) : (
|
||||
<span>
|
||||
<span className="text-strong-accent">{rows.length}</span> destination
|
||||
{rows.length !== 1 ? "s" : ""}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
</Card>
|
||||
);
|
||||
|
|
|
|||
|
|
@ -1,7 +1,18 @@
|
|||
import { useSuspenseQuery } from "@tanstack/react-query";
|
||||
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 { 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 { Button } from "~/client/components/ui/button";
|
||||
import { Card } from "~/client/components/ui/card";
|
||||
|
|
@ -12,17 +23,73 @@ import { cn } from "~/client/lib/utils";
|
|||
import { StatusDot } from "~/client/components/status-dot";
|
||||
import { EmptyState } from "~/client/components/empty-state";
|
||||
import { useNavigate } from "@tanstack/react-router";
|
||||
import type { RepositoryBackend } from "@zerobyte/core/restic";
|
||||
|
||||
type RepositoryRow = {
|
||||
id: string;
|
||||
shortId: string;
|
||||
name: string;
|
||||
type: RepositoryBackend;
|
||||
status: string | null;
|
||||
compressionMode?: string | null;
|
||||
};
|
||||
|
||||
const repositoryColumns: ColumnDef<RepositoryRow>[] = [
|
||||
{
|
||||
accessorKey: "name",
|
||||
header: ({ column }) => <DataTableSortHeader column={column} title="Name" sortDirection={column.getIsSorted()} />,
|
||||
cell: ({ row }) => (
|
||||
<div className="flex items-center gap-2">
|
||||
<span>{row.original.name}</span>
|
||||
</div>
|
||||
),
|
||||
},
|
||||
{
|
||||
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() {
|
||||
const [searchQuery, setSearchQuery] = useState("");
|
||||
const [statusFilter, setStatusFilter] = useState("");
|
||||
const [backendFilter, setBackendFilter] = useState("");
|
||||
|
||||
const clearFilters = () => {
|
||||
setSearchQuery("");
|
||||
setStatusFilter("");
|
||||
setBackendFilter("");
|
||||
};
|
||||
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
|
||||
const [sorting, setSorting] = useState<SortingState>([{ id: "name", desc: false }]);
|
||||
|
||||
const navigate = useNavigate();
|
||||
|
||||
|
|
@ -30,15 +97,23 @@ export function RepositoriesPage() {
|
|||
...listRepositoriesOptions(),
|
||||
});
|
||||
|
||||
const filteredRepositories = data.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 table = useReactTable({
|
||||
data,
|
||||
columns: repositoryColumns,
|
||||
state: { columnFilters, sorting },
|
||||
onColumnFiltersChange: setColumnFilters,
|
||||
onSortingChange: setSorting,
|
||||
getCoreRowModel: getCoreRowModel(),
|
||||
getFilteredRowModel: getFilteredRowModel(),
|
||||
getSortedRowModel: getSortedRowModel(),
|
||||
});
|
||||
const rows = table.getRowModel().rows;
|
||||
const hasFilters = columnFilters.length > 0;
|
||||
|
||||
const clearFilters = () => table.resetColumnFilters();
|
||||
|
||||
const hasNoRepositories = data.length === 0;
|
||||
const hasNoFilteredRepositories = filteredRepositories.length === 0 && !hasNoRepositories;
|
||||
const hasNoFilteredRepositories = rows.length === 0 && !hasNoRepositories;
|
||||
|
||||
if (hasNoRepositories) {
|
||||
return (
|
||||
|
|
@ -56,6 +131,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 (
|
||||
<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">
|
||||
|
|
@ -63,10 +142,10 @@ export function RepositoriesPage() {
|
|||
<Input
|
||||
className="w-full lg:w-45 min-w-45"
|
||||
placeholder="Search…"
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
value={search}
|
||||
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">
|
||||
<SelectValue placeholder="All status" />
|
||||
</SelectTrigger>
|
||||
|
|
@ -76,7 +155,7 @@ export function RepositoriesPage() {
|
|||
<SelectItem value="unknown">Unknown</SelectItem>
|
||||
</SelectContent>
|
||||
</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">
|
||||
<SelectValue placeholder="All backends" />
|
||||
</SelectTrigger>
|
||||
|
|
@ -87,7 +166,7 @@ export function RepositoriesPage() {
|
|||
<SelectItem value="gcs">Google Cloud Storage</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{(searchQuery || statusFilter || backendFilter) && (
|
||||
{hasFilters && (
|
||||
<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" />
|
||||
Clear filters
|
||||
|
|
@ -102,12 +181,23 @@ export function RepositoriesPage() {
|
|||
<div className="overflow-x-auto">
|
||||
<Table className="border-t">
|
||||
<TableHeader className="bg-card-header">
|
||||
<TableRow>
|
||||
<TableHead className="w-25 uppercase">Name</TableHead>
|
||||
<TableHead className="uppercase text-left">Backend</TableHead>
|
||||
<TableHead className="uppercase hidden sm:table-cell">Compression</TableHead>
|
||||
<TableHead className="uppercase text-center">Status</TableHead>
|
||||
</TableRow>
|
||||
{table.getHeaderGroups().map((headerGroup) => (
|
||||
<TableRow key={headerGroup.id}>
|
||||
{headerGroup.headers.map((header) => (
|
||||
<TableHead
|
||||
key={header.id}
|
||||
className={cn("uppercase", {
|
||||
"w-25": header.column.id === "name",
|
||||
"text-left": header.column.id === "type",
|
||||
"hidden sm:table-cell": header.column.id === "compressionMode",
|
||||
"text-center": header.column.id === "status",
|
||||
})}
|
||||
>
|
||||
{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
|
||||
</TableHead>
|
||||
))}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
<TableRow className={cn({ hidden: !hasNoFilteredRepositories })}>
|
||||
|
|
@ -121,38 +211,24 @@ export function RepositoriesPage() {
|
|||
</div>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
{filteredRepositories.map((repository) => (
|
||||
{rows.map((row) => (
|
||||
<TableRow
|
||||
key={repository.id}
|
||||
key={row.original.id}
|
||||
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">
|
||||
<div className="flex items-center gap-2">
|
||||
<span>{repository.name}</span>
|
||||
</div>
|
||||
</TableCell>
|
||||
<TableCell>
|
||||
<span className="flex items-center gap-2 text-muted-foreground">
|
||||
<RepositoryIcon backend={repository.type} />
|
||||
{repository.type}
|
||||
</span>
|
||||
</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>
|
||||
{row.getVisibleCells().map((cell) => (
|
||||
<TableCell
|
||||
key={cell.id}
|
||||
className={cn({
|
||||
"font-medium text-strong-accent": cell.column.id === "name",
|
||||
"hidden sm:table-cell": cell.column.id === "compressionMode",
|
||||
"text-center": cell.column.id === "status",
|
||||
})}
|
||||
>
|
||||
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
||||
</TableCell>
|
||||
))}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
|
|
@ -163,8 +239,8 @@ export function RepositoriesPage() {
|
|||
"No repositories match filters."
|
||||
) : (
|
||||
<span>
|
||||
<span className="text-strong-accent">{filteredRepositories.length}</span> repositor
|
||||
{filteredRepositories.length === 1 ? "y" : "ies"}
|
||||
<span className="text-strong-accent">{rows.length}</span> repositor
|
||||
{rows.length === 1 ? "y" : "ies"}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -1,6 +1,18 @@
|
|||
import { useSuspenseQuery } from "@tanstack/react-query";
|
||||
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 { 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 { StatusDot } from "~/client/components/status-dot";
|
||||
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 { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from "~/client/components/ui/table";
|
||||
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 { useNavigate } from "@tanstack/react-router";
|
||||
import { cn } from "~/client/lib/utils";
|
||||
|
|
@ -24,33 +35,66 @@ const getVolumeStatusVariant = (status: VolumeStatus): "success" | "neutral" | "
|
|||
return statusMap[status];
|
||||
};
|
||||
|
||||
export function VolumesPage() {
|
||||
const [searchQuery, setSearchQuery] = useState("");
|
||||
const [statusFilter, setStatusFilter] = useState("");
|
||||
const [backendFilter, setBackendFilter] = useState("");
|
||||
type VolumeRow = {
|
||||
shortId: string;
|
||||
name: string;
|
||||
type: "directory" | "nfs" | "smb" | "webdav" | "sftp" | "rclone";
|
||||
status: VolumeStatus;
|
||||
};
|
||||
|
||||
const clearFilters = () => {
|
||||
setSearchQuery("");
|
||||
setStatusFilter("");
|
||||
setBackendFilter("");
|
||||
};
|
||||
const volumeColumns: ColumnDef<VolumeRow>[] = [
|
||||
{
|
||||
accessorKey: "name",
|
||||
header: ({ column }) => <DataTableSortHeader column={column} title="Name" sortDirection={column.getIsSorted()} />,
|
||||
cell: ({ row }) => (
|
||||
<div className="flex items-center gap-2">
|
||||
<span>{row.original.name}</span>
|
||||
</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() {
|
||||
const [columnFilters, setColumnFilters] = useState<ColumnFiltersState>([]);
|
||||
const [sorting, setSorting] = useState<SortingState>([]);
|
||||
|
||||
const navigate = useNavigate();
|
||||
const { data } = useSuspenseQuery({ ...listVolumesOptions() });
|
||||
|
||||
const { data } = useSuspenseQuery({
|
||||
...listVolumesOptions(),
|
||||
const table = useReactTable({
|
||||
data,
|
||||
columns: volumeColumns,
|
||||
state: { columnFilters, sorting },
|
||||
onColumnFiltersChange: setColumnFilters,
|
||||
onSortingChange: setSorting,
|
||||
getCoreRowModel: getCoreRowModel(),
|
||||
getFilteredRowModel: getFilteredRowModel(),
|
||||
getSortedRowModel: getSortedRowModel(),
|
||||
});
|
||||
|
||||
const filteredVolumes =
|
||||
data.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 rows = table.getRowModel().rows;
|
||||
const hasFilters = columnFilters.length > 0;
|
||||
|
||||
const clearFilters = () => table.resetColumnFilters();
|
||||
|
||||
const hasNoVolumes = data.length === 0;
|
||||
const hasNoFilteredVolumes = filteredVolumes.length === 0 && !hasNoVolumes;
|
||||
const hasNoFilteredVolumes = rows.length === 0 && !hasNoVolumes;
|
||||
|
||||
if (hasNoVolumes) {
|
||||
return (
|
||||
|
|
@ -68,6 +112,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 (
|
||||
<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">
|
||||
|
|
@ -75,10 +123,10 @@ export function VolumesPage() {
|
|||
<Input
|
||||
className="w-full lg:w-45 min-w-45"
|
||||
placeholder="Search…"
|
||||
value={searchQuery}
|
||||
onChange={(e) => setSearchQuery(e.target.value)}
|
||||
value={search}
|
||||
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">
|
||||
<SelectValue placeholder="All status" />
|
||||
</SelectTrigger>
|
||||
|
|
@ -88,7 +136,7 @@ export function VolumesPage() {
|
|||
<SelectItem value="error">Error</SelectItem>
|
||||
</SelectContent>
|
||||
</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">
|
||||
<SelectValue placeholder="All backends" />
|
||||
</SelectTrigger>
|
||||
|
|
@ -101,7 +149,7 @@ export function VolumesPage() {
|
|||
<SelectItem value="rclone">rclone</SelectItem>
|
||||
</SelectContent>
|
||||
</Select>
|
||||
{(searchQuery || statusFilter || backendFilter) && (
|
||||
{hasFilters && (
|
||||
<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" />
|
||||
Clear filters
|
||||
|
|
@ -116,15 +164,26 @@ export function VolumesPage() {
|
|||
<div className="overflow-x-auto">
|
||||
<Table className="border-t">
|
||||
<TableHeader className="bg-card-header">
|
||||
<TableRow>
|
||||
<TableHead className="w-25 uppercase">Name</TableHead>
|
||||
<TableHead className="uppercase text-left">Backend</TableHead>
|
||||
<TableHead className="uppercase text-center">Status</TableHead>
|
||||
</TableRow>
|
||||
{table.getHeaderGroups().map((headerGroup) => (
|
||||
<TableRow key={headerGroup.id}>
|
||||
{headerGroup.headers.map((header) => (
|
||||
<TableHead
|
||||
key={header.id}
|
||||
className={cn("uppercase", {
|
||||
"w-25": header.column.id === "name",
|
||||
"text-left": header.column.id === "type",
|
||||
"text-center": header.column.id === "status",
|
||||
})}
|
||||
>
|
||||
{header.isPlaceholder ? null : flexRender(header.column.columnDef.header, header.getContext())}
|
||||
</TableHead>
|
||||
))}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableHeader>
|
||||
<TableBody>
|
||||
<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">
|
||||
<p className="text-muted-foreground">No volumes match your filters.</p>
|
||||
<Button onClick={clearFilters} variant="outline" size="sm">
|
||||
|
|
@ -134,26 +193,24 @@ export function VolumesPage() {
|
|||
</div>
|
||||
</TableCell>
|
||||
</TableRow>
|
||||
{filteredVolumes.map((volume) => (
|
||||
{rows.map((row) => (
|
||||
<TableRow
|
||||
key={volume.shortId}
|
||||
key={row.original.shortId}
|
||||
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">
|
||||
<div className="flex items-center gap-2">
|
||||
<span>{volume.name}</span>
|
||||
</div>
|
||||
</TableCell>
|
||||
<TableCell className="font-mono text-muted-foreground">
|
||||
<VolumeIcon backend={volume.type} />
|
||||
</TableCell>
|
||||
<TableCell className="text-center font-mono">
|
||||
<StatusDot
|
||||
variant={getVolumeStatusVariant(volume.status)}
|
||||
label={volume.status[0].toUpperCase() + volume.status.slice(1)}
|
||||
/>
|
||||
</TableCell>
|
||||
{row.getVisibleCells().map((cell) => (
|
||||
<TableCell
|
||||
key={cell.id}
|
||||
className={cn("font-mono", {
|
||||
"font-medium text-strong-accent": cell.column.id === "name",
|
||||
"text-muted-foreground": cell.column.id === "type",
|
||||
"text-center": cell.column.id === "status",
|
||||
})}
|
||||
>
|
||||
{flexRender(cell.column.columnDef.cell, cell.getContext())}
|
||||
</TableCell>
|
||||
))}
|
||||
</TableRow>
|
||||
))}
|
||||
</TableBody>
|
||||
|
|
@ -164,8 +221,8 @@ export function VolumesPage() {
|
|||
"No volumes match filters."
|
||||
) : (
|
||||
<span className="font-mono">
|
||||
<span className="text-strong-accent font-bold">{filteredVolumes.length}</span> volume
|
||||
{filteredVolumes.length > 1 ? "s" : ""}
|
||||
<span className="text-strong-accent font-bold">{rows.length}</span> volume
|
||||
{rows.length > 1 ? "s" : ""}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
|
|
|
|||
5
bun.lock
5
bun.lock
|
|
@ -32,6 +32,7 @@
|
|||
"@tanstack/react-router": "^1.168.1",
|
||||
"@tanstack/react-router-ssr-query": "^1.166.10",
|
||||
"@tanstack/react-start": "^1.167.1",
|
||||
"@tanstack/react-table": "^8.21.3",
|
||||
"@zerobyte/contracts": "workspace:*",
|
||||
"@zerobyte/core": "workspace:*",
|
||||
"better-auth": "^1.5.5",
|
||||
|
|
@ -1236,6 +1237,8 @@
|
|||
|
||||
"@tanstack/react-store": ["@tanstack/react-store@0.11.0", "", { "dependencies": { "@tanstack/store": "0.11.0", "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-tX4YXh3PDkmpvGQWkWqKpzs/MSqbtuwY9dWdWhtV9Q50PmO+jOkUKIWIX4G85dwt7lxdHLXsiaEKPdKmC8F41w=="],
|
||||
|
||||
"@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-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=="],
|
||||
|
|
@ -1260,6 +1263,8 @@
|
|||
|
||||
"@tanstack/store": ["@tanstack/store@0.11.0", "", {}, "sha512-WlzzCt3xi0G6pCAJu1U+2jiECwabETDpQDi3hfkFZvJii9AuZqEKbOiVarX1/bWhTNjU486yQtJCCasi/0q+Cw=="],
|
||||
|
||||
"@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=="],
|
||||
|
||||
"@tediousjs/connection-string": ["@tediousjs/connection-string@0.5.0", "", {}, "sha512-7qSgZbincDDDFyRweCIEvZULFAw5iz/DeunhvuxpL31nfntX3P4Yd4HkHBRg9H8CdqY1e5WFN1PZIz/REL9MVQ=="],
|
||||
|
|
|
|||
|
|
@ -60,6 +60,7 @@
|
|||
"@tanstack/react-router": "^1.168.1",
|
||||
"@tanstack/react-router-ssr-query": "^1.166.10",
|
||||
"@tanstack/react-start": "^1.167.1",
|
||||
"@tanstack/react-table": "^8.21.3",
|
||||
"@zerobyte/contracts": "workspace:*",
|
||||
"@zerobyte/core": "workspace:*",
|
||||
"better-auth": "^1.5.5",
|
||||
|
|
|
|||
Loading…
Reference in a new issue