From c12b27afb55b32076cdfb7c781749ebc57e904a8 Mon Sep 17 00:00:00 2001
From: henrygd <hank@henrygd.me>
Date: Wed, 19 Feb 2025 20:28:45 -0500
Subject: [PATCH] refactor: update system table and improve add-system dialog

---
 beszel/site/src/components/add-system.tsx     | 62 +++++++++++------
 .../systems-table/systems-table.tsx           | 68 +++++++++++--------
 2 files changed, 78 insertions(+), 52 deletions(-)

diff --git a/beszel/site/src/components/add-system.tsx b/beszel/site/src/components/add-system.tsx
index fc154e0..1f1cc8b 100644
--- a/beszel/site/src/components/add-system.tsx
+++ b/beszel/site/src/components/add-system.tsx
@@ -19,7 +19,7 @@ import { i18n } from "@lingui/core"
 import { t, Trans } from "@lingui/macro"
 import { useStore } from "@nanostores/react"
 import { ChevronDownIcon, Copy, PlusIcon } from "lucide-react"
-import { memo, MutableRefObject, useRef, useState } from "react"
+import { memo, useRef, useState } from "react"
 import { basePath, navigate } from "./router"
 import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger } from "./ui/dropdown-menu"
 import { SystemRecord } from "@/types"
@@ -49,19 +49,8 @@ export function AddSystemButton({ className }: { className?: string }) {
 	)
 }
 
-/**
- * SystemDialog component for adding or editing a system.
- * @param {Object} props - The component props.
- * @param {function} props.setOpen - Function to set the open state of the dialog.
- * @param {SystemRecord} [props.system] - Optional system record for editing an existing system.
- */
-export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean) => void; system?: SystemRecord }) => {
-	const port = useRef() as MutableRefObject<HTMLInputElement>
-	const publicKey = useStore($publicKey)
-
-	function copyDockerCompose(port: string) {
+	function copyDockerCompose(port = "45876", publicKey: string) {
 		copyToClipboard(`services:
-  version: "3"
   beszel-agent:
     image: "henrygd/beszel-agent"
     container_name: "beszel-agent"
@@ -76,13 +65,13 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
       KEY: "${publicKey}"`)
 	}
 
-	function copyDockerRun(port: string) {
+	function copyDockerRun(port = "45876", publicKey: string) {
 		copyToClipboard(
 			`docker run -d --name beszel-agent --network host --restart unless-stopped -v /var/run/docker.sock:/var/run/docker.sock:ro -e KEY="${publicKey}" -e PORT=${port} henrygd/beszel-agent:latest`
 		)
 	}
 
-	function copyInstallCommand(port: string) {
+	function copyInstallCommand(port = "45876", publicKey: string) {
 		let cmd = `curl -sL https://raw.githubusercontent.com/henrygd/beszel/main/supplemental/scripts/install-agent.sh -o install-agent.sh && chmod +x install-agent.sh && ./install-agent.sh -p ${port} -k "${publicKey}"`
 		// add china mirrors flag if zh-CN
 		if ((i18n.locale + navigator.language).includes("zh-CN")) {
@@ -91,6 +80,18 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 		copyToClipboard(cmd)
 	}
 
+/**
+ * SystemDialog component for adding or editing a system.
+ * @param {Object} props - The component props.
+ * @param {function} props.setOpen - Function to set the open state of the dialog.
+ * @param {SystemRecord} [props.system] - Optional system record for editing an existing system.
+ */
+export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean) => void; system?: SystemRecord }) => {
+	const publicKey = useStore($publicKey)
+	const port = useRef<HTMLInputElement>(null)
+	const [hostValue, setHostValue] = useState(system?.host ?? "")
+	const isUnixSocket = hostValue.startsWith("/")
+
 	async function handleSubmit(e: SubmitEvent) {
 		e.preventDefault()
 		const formData = new FormData(e.target as HTMLFormElement)
@@ -111,7 +112,9 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 	}
 
 	return (
-		<DialogContent className="w-[90%] sm:w-auto sm:ns-dialog max-w-full rounded-lg">
+		<DialogContent className="w-[90%] sm:w-auto sm:ns-dialog max-w-full rounded-lg" onCloseAutoFocus={() => {
+			setHostValue(system?.host ?? "")
+		}}>
 			<Tabs defaultValue="docker">
 				<DialogHeader>
 					<DialogTitle className="mb-2">
@@ -150,11 +153,26 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 						<Label htmlFor="host" className="xs:text-end">
 							<Trans>Host / IP</Trans>
 						</Label>
-						<Input id="host" name="host" defaultValue={system?.host} required />
-						<Label htmlFor="port" className="xs:text-end">
+						<Input
+							id="host"
+							name="host"
+							value={hostValue}
+							required
+							onChange={(e) => {
+								setHostValue(e.target.value)
+							}}
+						/>
+						<Label htmlFor="port" className={cn("xs:text-end", isUnixSocket && "hidden")}>
 							<Trans>Port</Trans>
 						</Label>
-						<Input ref={port} name="port" id="port" defaultValue={system?.port || "45876"} required />
+						<Input
+							ref={port}
+							name="port"
+							id="port"
+							defaultValue={system?.port || "45876"}
+							required={!isUnixSocket}
+							className={cn(isUnixSocket && "hidden")}
+						/>
 						<Label htmlFor="pkey" className="xs:text-end whitespace-pre">
 							<Trans comment="Use 'Key' if your language requires many more characters">Public Key</Trans>
 						</Label>
@@ -193,7 +211,7 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 								<Button
 									type="button"
 									variant="outline"
-									onClick={() => copyDockerCompose(port.current.value)}
+									onClick={() => copyDockerCompose(isUnixSocket ? hostValue : port.current?.value, publicKey )}
 									className="rounded-e-none dark:border-e-0 grow"
 								>
 									<Trans>Copy</Trans> docker compose
@@ -206,7 +224,7 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 										</Button>
 									</DropdownMenuTrigger>
 									<DropdownMenuContent align="end">
-										<DropdownMenuItem onClick={() => copyDockerRun(port.current.value)}>
+										<DropdownMenuItem onClick={() => copyDockerRun(isUnixSocket ? hostValue : port.current?.value, publicKey)}>
 											<Trans>Copy</Trans> docker run
 										</DropdownMenuItem>
 									</DropdownMenuContent>
@@ -215,7 +233,7 @@ export const SystemDialog = memo(({ setOpen, system }: { setOpen: (open: boolean
 						</TabsContent>
 						{/* Binary */}
 						<TabsContent value="binary" className="contents">
-							<Button type="button" variant="outline" onClick={() => copyInstallCommand(port.current.value)}>
+							<Button type="button" variant="outline" onClick={() => copyInstallCommand(isUnixSocket ? hostValue : port.current?.value, publicKey)}>
 								<Trans>Copy Linux command</Trans>
 							</Button>
 						</TabsContent>
diff --git a/beszel/site/src/components/systems-table/systems-table.tsx b/beszel/site/src/components/systems-table/systems-table.tsx
index d8f6eaf..4f2f272 100644
--- a/beszel/site/src/components/systems-table/systems-table.tsx
+++ b/beszel/site/src/components/systems-table/systems-table.tsx
@@ -101,7 +101,7 @@ function CellFormatter(info: CellContext<SystemRecord, unknown>) {
 	)
 }
 
-function sortableHeader(context: HeaderContext<SystemRecord, unknown>, hideSortIcon = false) {
+function sortableHeader(context: HeaderContext<SystemRecord, unknown>) {
 	const { column } = context
 	return (
 		<Button
@@ -110,9 +110,10 @@ function sortableHeader(context: HeaderContext<SystemRecord, unknown>, hideSortI
 			onClick={() => column.toggleSorting(column.getIsSorted() === "asc")}
 		>
 			{/* @ts-ignore */}
-			{column.columnDef?.icon && <column.columnDef.icon className="me-2 size-4" />}
+			{column.columnDef.icon && <column.columnDef.icon className="me-2 size-4" />}
 			{column.id}
-			{!hideSortIcon && <ArrowUpDownIcon className="ms-2 size-4" />}
+			{/* @ts-ignore */}
+			{column.columnDef.hideSort || <ArrowUpDownIcon className="ms-2 size-4" />}
 		</Button>
 	)
 }
@@ -192,35 +193,11 @@ export default function SystemsTable() {
 				icon: GpuIcon,
 				header: sortableHeader,
 			},
-			{
-				accessorFn: (originalRow) => originalRow.info.dt,
-				id: t`Temp`,
-				invertSorting: true,
-				sortUndefined: -1,
-				size: 50,
-				icon: ThermometerIcon,
-				header: sortableHeader,
-				cell(info) {
-					const val = info.getValue() as number
-					if (!val) {
-						return null
-					}
-					return (
-						<span
-							className={cn("tabular-nums whitespace-nowrap", {
-								"ps-1": viewMode === "table",
-							})}
-						>
-							{decimalString(val)} °C
-						</span>
-					)
-				},
-			},
 			{
 				accessorFn: (originalRow) => originalRow.info.b || 0,
 				id: t`Net`,
 				invertSorting: true,
-				size: 100,
+				size: 50,
 				icon: EthernetIcon,
 				header: sortableHeader,
 				cell(info) {
@@ -236,12 +213,41 @@ export default function SystemsTable() {
 					)
 				},
 			},
+			{
+				accessorFn: (originalRow) => originalRow.info.dt,
+				id: t({
+					message: "Temp",
+					comment: "Temperature label in systems table",
+				}),
+				invertSorting: true,
+				sortUndefined: -1,
+				size: 50,
+				hideSort: true,
+				icon: ThermometerIcon,
+				header: sortableHeader,
+				cell(info) {
+					const val = info.getValue() as number
+					if (!val) {
+						return null
+					}
+					return (
+						<span
+							className={cn("tabular-nums whitespace-nowrap", {
+								"ps-1.5": viewMode === "table",
+							})}
+						>
+							{decimalString(val)} °C
+						</span>
+					)
+				},
+			},
 			{
 				accessorKey: "info.v",
 				id: t`Agent`,
 				invertSorting: true,
 				size: 50,
 				icon: WifiIcon,
+				hideSort: true,
 				header: sortableHeader,
 				cell(info) {
 					const version = info.getValue() as string
@@ -270,7 +276,7 @@ export default function SystemsTable() {
 			},
 			{
 				id: t({ message: "Actions", comment: "Table column" }),
-				size: 120,
+				size: 50,
 				cell: ({ row }) => (
 					<div className="flex justify-end items-center gap-1">
 						<AlertsButton system={row.original} />
@@ -302,6 +308,8 @@ export default function SystemsTable() {
 		},
 	})
 
+	const rows = table.getRowModel().rows
+
 	return (
 		<Card>
 			<CardHeader className="pb-5 px-2 sm:px-6 max-sm:pt-5 max-sm:pb-1">
@@ -432,7 +440,7 @@ export default function SystemsTable() {
 								))}
 							</TableHeader>
 							<TableBody>
-								{table.getRowModel().rows?.length ? (
+								{rows.length ? (
 									table.getRowModel().rows.map((row) => (
 										<TableRow
 											key={row.original.id}