- Fix dialog scrollability (flex layout + max-h-[90dvh]) and increase L4 dialog to lg width - Add styled enable card to L4 dialog matching proxy host pattern - Unify section colors across proxy host and L4 dialogs (cyan=LB, emerald=DNS, violet=upstream DNS, rose=geo, amber=mTLS) - Improve light mode contrast: muted-foreground oklch 0.552→0.502, remove opacity modifiers on secondary text - Improve dark mode: boost muted-foreground to 0.85, increase border opacity 10%→16%, input 15%→20% - Add bg-card to DataTable wrapper and bg-muted/40 to table headers for surface hierarchy - Add semantic badge variants (success, warning, info, muted) and StatusChip dark mode fix - Add server-side sortable columns to Proxy Hosts and L4 Proxy Hosts (name, upstream, status, protocol, listen) - Add sortKey to DataTable Column type with clickable sort headers (ArrowUp/Down indicators, URL param driven) - Fix E2E test selectors for shadcn UI (label associations, combobox roles, dropdown menus, mobile drawer) - Add htmlFor/id to proxy host form fields and aria-labels to select triggers for accessibility - Add sorting E2E tests for both proxy host pages Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
277 lines
10 KiB
TypeScript
277 lines
10 KiB
TypeScript
"use client";
|
|
|
|
import { useEffect, useRef, useState } from "react";
|
|
import { useRouter, usePathname, useSearchParams } from "next/navigation";
|
|
import { MoreHorizontal, Network, ArrowRight } from "lucide-react";
|
|
import type { L4ProxyHost } from "@/src/lib/models/l4-proxy-hosts";
|
|
import { toggleL4ProxyHostAction } from "./actions";
|
|
import { PageHeader } from "@/components/ui/PageHeader";
|
|
import { SearchField } from "@/components/ui/SearchField";
|
|
import { DataTable } from "@/components/ui/DataTable";
|
|
import { StatusChip } from "@/components/ui/StatusChip";
|
|
import { Badge } from "@/components/ui/badge";
|
|
import { Button } from "@/components/ui/button";
|
|
import { Switch } from "@/components/ui/switch";
|
|
import { Card, CardContent } from "@/components/ui/card";
|
|
import {
|
|
DropdownMenu,
|
|
DropdownMenuContent,
|
|
DropdownMenuItem,
|
|
DropdownMenuSeparator,
|
|
DropdownMenuTrigger,
|
|
} from "@/components/ui/dropdown-menu";
|
|
import { CreateL4HostDialog, EditL4HostDialog, DeleteL4HostDialog } from "@/components/l4-proxy-hosts/L4HostDialogs";
|
|
import { L4PortsApplyBanner } from "@/components/l4-proxy-hosts/L4PortsApplyBanner";
|
|
|
|
type Props = {
|
|
hosts: L4ProxyHost[];
|
|
pagination: { total: number; page: number; perPage: number };
|
|
initialSearch: string;
|
|
initialSort?: { sortBy: string; sortDir: "asc" | "desc" };
|
|
};
|
|
|
|
function formatMatcher(host: L4ProxyHost): string {
|
|
switch (host.matcher_type) {
|
|
case "tls_sni": return `SNI: ${host.matcher_value.join(", ")}`;
|
|
case "http_host": return `Host: ${host.matcher_value.join(", ")}`;
|
|
case "proxy_protocol": return "Proxy Protocol";
|
|
default: return "None";
|
|
}
|
|
}
|
|
|
|
function ProtocolBadge({ protocol }: { protocol: string }) {
|
|
if (protocol === "tcp") {
|
|
return <Badge variant="info">{protocol.toUpperCase()}</Badge>;
|
|
}
|
|
return <Badge variant="warning">{protocol.toUpperCase()}</Badge>;
|
|
}
|
|
|
|
export default function L4ProxyHostsClient({ hosts, pagination, initialSearch, initialSort }: Props) {
|
|
const [createOpen, setCreateOpen] = useState(false);
|
|
const [duplicateHost, setDuplicateHost] = useState<L4ProxyHost | null>(null);
|
|
const [editHost, setEditHost] = useState<L4ProxyHost | null>(null);
|
|
const [deleteHost, setDeleteHost] = useState<L4ProxyHost | null>(null);
|
|
const [searchTerm, setSearchTerm] = useState(initialSearch);
|
|
const [bannerRefresh, setBannerRefresh] = useState(0);
|
|
|
|
const router = useRouter();
|
|
const pathname = usePathname();
|
|
const searchParams = useSearchParams();
|
|
const debounceRef = useRef<ReturnType<typeof setTimeout> | null>(null);
|
|
|
|
const signalBannerRefresh = () => setBannerRefresh(n => n + 1);
|
|
|
|
useEffect(() => { setSearchTerm(initialSearch); }, [initialSearch]);
|
|
|
|
function handleSearchChange(value: string) {
|
|
setSearchTerm(value);
|
|
if (debounceRef.current) clearTimeout(debounceRef.current);
|
|
debounceRef.current = setTimeout(() => {
|
|
const params = new URLSearchParams(searchParams.toString());
|
|
if (value.trim()) { params.set("search", value.trim()); } else { params.delete("search"); }
|
|
params.set("page", "1");
|
|
router.push(`${pathname}?${params.toString()}`);
|
|
}, 400);
|
|
}
|
|
|
|
const handleToggleEnabled = async (id: number, enabled: boolean) => {
|
|
await toggleL4ProxyHostAction(id, enabled);
|
|
signalBannerRefresh();
|
|
};
|
|
|
|
const columns = [
|
|
{
|
|
id: "name",
|
|
label: "Name / Matcher",
|
|
sortKey: "name",
|
|
render: (host: L4ProxyHost) => (
|
|
<div className="flex items-start gap-3">
|
|
<div className={[
|
|
"mt-0.5 flex h-7 w-7 shrink-0 items-center justify-center rounded-md border",
|
|
host.protocol === "tcp"
|
|
? "border-cyan-500/30 bg-cyan-500/10 text-cyan-500"
|
|
: "border-amber-500/30 bg-amber-500/10 text-amber-500",
|
|
].join(" ")}>
|
|
<Network className="h-3.5 w-3.5" />
|
|
</div>
|
|
<div>
|
|
<p className="text-sm font-semibold leading-tight">{host.name}</p>
|
|
<p className="text-xs text-muted-foreground mt-0.5">{formatMatcher(host)}</p>
|
|
</div>
|
|
</div>
|
|
),
|
|
},
|
|
{
|
|
id: "protocol",
|
|
label: "Protocol",
|
|
sortKey: "protocol",
|
|
width: 90,
|
|
render: (host: L4ProxyHost) => <ProtocolBadge protocol={host.protocol} />,
|
|
},
|
|
{
|
|
id: "listen",
|
|
label: "Listen",
|
|
sortKey: "listen_address",
|
|
render: (host: L4ProxyHost) => (
|
|
<span className="text-sm font-mono font-medium tabular-nums text-foreground/80">
|
|
{host.listen_address}
|
|
</span>
|
|
),
|
|
},
|
|
{
|
|
id: "upstreams",
|
|
label: "Upstreams",
|
|
render: (host: L4ProxyHost) => (
|
|
<div className="flex items-center gap-1.5">
|
|
<ArrowRight className="h-3 w-3 shrink-0 text-muted-foreground" />
|
|
<span className="text-sm font-mono font-medium text-foreground/80">
|
|
{host.upstreams[0]}
|
|
{host.upstreams.length > 1 && (
|
|
<span className="ml-1 text-muted-foreground">+{host.upstreams.length - 1}</span>
|
|
)}
|
|
</span>
|
|
</div>
|
|
),
|
|
},
|
|
{
|
|
id: "status",
|
|
label: "Status",
|
|
sortKey: "enabled",
|
|
width: 110,
|
|
render: (host: L4ProxyHost) => (
|
|
<StatusChip status={host.enabled ? "active" : "inactive"} />
|
|
),
|
|
},
|
|
{
|
|
id: "actions",
|
|
label: "",
|
|
align: "right" as const,
|
|
width: 80,
|
|
render: (host: L4ProxyHost) => (
|
|
<div className="flex items-center gap-2 justify-end">
|
|
<Switch
|
|
checked={host.enabled}
|
|
onCheckedChange={(checked) => handleToggleEnabled(host.id, checked)}
|
|
/>
|
|
<DropdownMenu>
|
|
<DropdownMenuTrigger asChild>
|
|
<Button variant="ghost" size="icon" className="h-8 w-8">
|
|
<MoreHorizontal className="h-4 w-4" />
|
|
<span className="sr-only">Open menu</span>
|
|
</Button>
|
|
</DropdownMenuTrigger>
|
|
<DropdownMenuContent align="end">
|
|
<DropdownMenuItem onClick={() => setEditHost(host)}>Edit</DropdownMenuItem>
|
|
<DropdownMenuItem onClick={() => { setDuplicateHost(host); setCreateOpen(true); }}>Duplicate</DropdownMenuItem>
|
|
<DropdownMenuSeparator />
|
|
<DropdownMenuItem
|
|
className="text-destructive focus:text-destructive"
|
|
onClick={() => setDeleteHost(host)}
|
|
>
|
|
Delete
|
|
</DropdownMenuItem>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
</div>
|
|
),
|
|
},
|
|
];
|
|
|
|
const mobileCard = (host: L4ProxyHost) => (
|
|
<Card className={[
|
|
"border-l-2",
|
|
host.protocol === "tcp" ? "border-l-cyan-500" : "border-l-amber-500",
|
|
].join(" ")}>
|
|
<CardContent className="p-4">
|
|
<div className="flex items-start justify-between gap-2">
|
|
<div className="flex flex-col gap-1 min-w-0">
|
|
<div className="flex items-center gap-2">
|
|
<p className="text-sm font-semibold truncate">{host.name}</p>
|
|
<ProtocolBadge protocol={host.protocol} />
|
|
</div>
|
|
<p className="text-xs text-muted-foreground font-mono truncate">
|
|
{host.listen_address}
|
|
<span className="mx-1 text-muted-foreground">→</span>
|
|
{host.upstreams[0]}{host.upstreams.length > 1 ? ` +${host.upstreams.length - 1}` : ""}
|
|
</p>
|
|
<StatusChip status={host.enabled ? "active" : "inactive"} className="w-fit mt-1" />
|
|
</div>
|
|
<div className="flex items-center gap-1 shrink-0">
|
|
<Switch
|
|
checked={host.enabled}
|
|
onCheckedChange={(checked) => handleToggleEnabled(host.id, checked)}
|
|
/>
|
|
<DropdownMenu>
|
|
<DropdownMenuTrigger asChild>
|
|
<Button variant="ghost" size="icon" className="h-8 w-8">
|
|
<MoreHorizontal className="h-4 w-4" />
|
|
<span className="sr-only">Open menu</span>
|
|
</Button>
|
|
</DropdownMenuTrigger>
|
|
<DropdownMenuContent align="end">
|
|
<DropdownMenuItem onClick={() => setEditHost(host)}>Edit</DropdownMenuItem>
|
|
<DropdownMenuItem onClick={() => { setDuplicateHost(host); setCreateOpen(true); }}>Duplicate</DropdownMenuItem>
|
|
<DropdownMenuSeparator />
|
|
<DropdownMenuItem className="text-destructive focus:text-destructive" onClick={() => setDeleteHost(host)}>Delete</DropdownMenuItem>
|
|
</DropdownMenuContent>
|
|
</DropdownMenu>
|
|
</div>
|
|
</div>
|
|
</CardContent>
|
|
</Card>
|
|
);
|
|
|
|
return (
|
|
<div className="flex flex-col gap-6">
|
|
<L4PortsApplyBanner refreshSignal={bannerRefresh} />
|
|
|
|
<PageHeader
|
|
title="L4 Proxy Hosts"
|
|
description="Define TCP/UDP stream proxies powered by caddy-l4. Port mappings are applied automatically."
|
|
action={{ label: "Create L4 Host", onClick: () => setCreateOpen(true) }}
|
|
/>
|
|
|
|
<div className="flex items-center gap-2">
|
|
<SearchField
|
|
value={searchTerm}
|
|
onChange={(e) => handleSearchChange(e.target.value)}
|
|
placeholder="Search L4 hosts..."
|
|
/>
|
|
</div>
|
|
|
|
<DataTable
|
|
columns={columns}
|
|
data={hosts}
|
|
keyField="id"
|
|
emptyMessage={searchTerm ? "No L4 hosts match your search" : "No L4 proxy hosts found"}
|
|
pagination={pagination}
|
|
sort={initialSort}
|
|
mobileCard={mobileCard}
|
|
rowClassName={(host) => host.enabled ? "" : "opacity-75"}
|
|
/>
|
|
|
|
<CreateL4HostDialog
|
|
open={createOpen}
|
|
onClose={() => { setCreateOpen(false); setTimeout(() => setDuplicateHost(null), 200); signalBannerRefresh(); }}
|
|
initialData={duplicateHost}
|
|
/>
|
|
|
|
{editHost && (
|
|
<EditL4HostDialog
|
|
open={!!editHost}
|
|
host={editHost}
|
|
onClose={() => { setEditHost(null); signalBannerRefresh(); }}
|
|
/>
|
|
)}
|
|
|
|
{deleteHost && (
|
|
<DeleteL4HostDialog
|
|
open={!!deleteHost}
|
|
host={deleteHost}
|
|
onClose={() => { setDeleteHost(null); signalBannerRefresh(); }}
|
|
/>
|
|
)}
|
|
</div>
|
|
);
|
|
}
|