From 225b3c32bfc859f9d3067cac13adcd1302cbc22a Mon Sep 17 00:00:00 2001 From: mmckeen Date: Tue, 28 Apr 2026 15:40:25 +0000 Subject: [PATCH] Add controller node selector and accordion wizards --- app/api/controller-node/deploy/route.ts | 8 ++ app/api/controller-node/plan/route.ts | 11 +- app/api/controller-node/registry/route.ts | 36 +++++ app/components/Sidebar.tsx | 161 +++++++++++++++++++++- app/components/WizardPanel.tsx | 63 +++++++-- app/lib/controllerNodeRegistry.ts | 156 +++++++++++++++++++++ tests/controller-node-wizard-check.mjs | 17 ++- 7 files changed, 429 insertions(+), 23 deletions(-) create mode 100644 app/api/controller-node/registry/route.ts create mode 100644 app/lib/controllerNodeRegistry.ts diff --git a/app/api/controller-node/deploy/route.ts b/app/api/controller-node/deploy/route.ts index 8ed0939..e173344 100644 --- a/app/api/controller-node/deploy/route.ts +++ b/app/api/controller-node/deploy/route.ts @@ -1,6 +1,7 @@ import { NextResponse } from "next/server" import { Client } from "ssh2" import { buildControllerNodePlan, type ControllerPlanRequest } from "@/app/lib/controllerNodePlan" +import { upsertControllerNode } from "@/app/lib/controllerNodeRegistry" export const runtime = "nodejs" @@ -147,6 +148,13 @@ export async function POST(request: Request) { acceptUnknownHostKey, expectedHostKeySha256, }) + await upsertControllerNode({ + id: plan.controller.name, + name: plan.controller.name, + host: plan.controller.host, + url: plan.controller.url, + role: "controller-node", + }) return NextResponse.json({ ok: true, diff --git a/app/api/controller-node/plan/route.ts b/app/api/controller-node/plan/route.ts index c44ef6e..5d0be8c 100644 --- a/app/api/controller-node/plan/route.ts +++ b/app/api/controller-node/plan/route.ts @@ -1,10 +1,19 @@ import { NextResponse } from "next/server" import { buildControllerNodePlan, type ControllerPlanRequest } from "@/app/lib/controllerNodePlan" +import { upsertControllerNode } from "@/app/lib/controllerNodeRegistry" export async function POST(request: Request) { try { const body = (await request.json().catch(() => ({}))) as ControllerPlanRequest - return NextResponse.json({ ok: true, ...buildControllerNodePlan(body) }) + const plan = buildControllerNodePlan(body) + await upsertControllerNode({ + id: plan.controller.name, + name: plan.controller.name, + host: plan.controller.host, + url: plan.controller.url, + role: "controller-node", + }) + return NextResponse.json({ ok: true, ...plan }) } catch (error) { const message = error instanceof Error ? error.message : "Failed to build controller node plan" return NextResponse.json({ ok: false, error: message }, { status: 400 }) diff --git a/app/api/controller-node/registry/route.ts b/app/api/controller-node/registry/route.ts new file mode 100644 index 0000000..a9320fb --- /dev/null +++ b/app/api/controller-node/registry/route.ts @@ -0,0 +1,36 @@ +import { NextResponse } from "next/server" +import { listControllerNodes, renameControllerNode, upsertControllerNode } from "@/app/lib/controllerNodeRegistry" + +export async function GET() { + try { + return NextResponse.json({ nodes: await listControllerNodes() }) + } catch (error) { + const message = error instanceof Error ? error.message : "Failed to load controller nodes" + return NextResponse.json({ error: message }, { status: 500 }) + } +} + +export async function POST(request: Request) { + try { + const body = await request.json().catch(() => ({})) + const action = typeof body?.action === "string" ? body.action : "upsert" + + if (action === "rename") { + const node = await renameControllerNode(String(body?.nodeId || ""), String(body?.name || "")) + return NextResponse.json({ node, nodes: await listControllerNodes() }) + } + + const node = await upsertControllerNode({ + id: body?.id, + name: body?.name, + host: body?.host, + url: body?.url, + role: body?.role, + }) + + return NextResponse.json({ node, nodes: await listControllerNodes() }) + } catch (error) { + const message = error instanceof Error ? error.message : "Failed to update controller nodes" + return NextResponse.json({ error: message }, { status: 400 }) + } +} diff --git a/app/components/Sidebar.tsx b/app/components/Sidebar.tsx index daf2412..b5c3cea 100644 --- a/app/components/Sidebar.tsx +++ b/app/components/Sidebar.tsx @@ -1,5 +1,16 @@ "use client" +import { useEffect, useMemo, useState } from "react" + +type ControllerNodeRecord = { + id: string + name: string + host: string + url: string + role: "local" | "controller-node" + status: "configured" | "local" +} + interface SidebarProps { sandboxesRunning: number sandboxesTotal: number @@ -19,6 +30,8 @@ interface SidebarProps { terminalDisabled?: boolean } +const SELECTED_CONTROLLER_NODE_KEY = "openshell-control-selected-node" + export default function Sidebar({ sandboxesRunning, sandboxesTotal, @@ -37,6 +50,80 @@ export default function Sidebar({ onLogout, terminalDisabled = false, }: SidebarProps) { + const [controllerNodes, setControllerNodes] = useState([]) + const [selectedNodeId, setSelectedNodeId] = useState("local") + const [nodeMenuOpen, setNodeMenuOpen] = useState(false) + const [friendlyNameDraft, setFriendlyNameDraft] = useState("") + const [friendlyNameSaving, setFriendlyNameSaving] = useState(false) + const [friendlyNameMessage, setFriendlyNameMessage] = useState("") + + const selectedNode = useMemo( + () => controllerNodes.find((node) => node.id === selectedNodeId) || controllerNodes[0] || null, + [controllerNodes, selectedNodeId], + ) + const hasRemoteNodes = controllerNodes.some((node) => node.role === "controller-node") + + useEffect(() => { + const stored = window.localStorage.getItem(SELECTED_CONTROLLER_NODE_KEY) + if (stored) setSelectedNodeId(stored) + }, []) + + useEffect(() => { + let cancelled = false + const loadControllerNodes = () => { + fetch("/api/controller-node/registry", { cache: "no-store" }) + .then((response) => response.json()) + .then((data) => { + if (cancelled) return + const nodes = Array.isArray(data.nodes) ? data.nodes : [] + setControllerNodes(nodes) + if (nodes.length > 1) setNodeMenuOpen(true) + setSelectedNodeId((current) => nodes.some((node: ControllerNodeRecord) => node.id === current) ? current : nodes[0]?.id || "local") + }) + .catch(() => { + if (!cancelled) setControllerNodes([]) + }) + } + + loadControllerNodes() + window.addEventListener("controller-nodes-changed", loadControllerNodes) + return () => { + cancelled = true + window.removeEventListener("controller-nodes-changed", loadControllerNodes) + } + }, []) + + useEffect(() => { + if (!selectedNode) return + setFriendlyNameDraft(selectedNode.name) + window.localStorage.setItem(SELECTED_CONTROLLER_NODE_KEY, selectedNode.id) + }, [selectedNode]) + + async function saveFriendlyName() { + if (!selectedNode || friendlyNameSaving) return + try { + setFriendlyNameSaving(true) + setFriendlyNameMessage("") + const response = await fetch("/api/controller-node/registry", { + method: "POST", + headers: { "Content-Type": "application/json" }, + body: JSON.stringify({ + action: "rename", + nodeId: selectedNode.id, + name: friendlyNameDraft, + }), + }) + const data = await response.json() + if (!response.ok) throw new Error(data.error || "Failed to save node name") + setControllerNodes(Array.isArray(data.nodes) ? data.nodes : []) + setFriendlyNameMessage("Saved") + } catch (error) { + setFriendlyNameMessage(error instanceof Error ? error.message : "Failed to save") + } finally { + setFriendlyNameSaving(false) + } + } + const navItemClass = (active = false, danger = false) => `w-full flex items-center gap-3 rounded px-3 py-2.5 text-left transition-all focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-[var(--nvidia-green)] max-lg:min-w-24 max-lg:flex-col max-lg:justify-center max-lg:gap-1 max-lg:px-2 max-lg:py-2 ${ active ? danger @@ -47,21 +134,85 @@ export default function Sidebar({ return (