From b71bb23e064aedc0fcd7b21f842d4ecd0f70c653 Mon Sep 17 00:00:00 2001 From: Blake Bauman Date: Mon, 20 Jul 2026 00:39:00 -0700 Subject: [PATCH 1/2] Quiet the Kubernetes pages to match Docker polish. Move Helm install into a sheet, collapse header actions into ActionMenu, demote non-status badges to text, and tidy overview charts. Co-authored-by: Cursor --- app/src/routes/k8s/DeploymentsPage.tsx | 245 ++++++++++++++---------- app/src/routes/k8s/HelmPage.tsx | 218 +++++++++++---------- app/src/routes/k8s/K8sOverviewPage.tsx | 10 +- app/src/routes/k8s/K8sResourcesPage.tsx | 60 +++--- app/src/routes/k8s/PodsPage.tsx | 66 +++++-- 5 files changed, 344 insertions(+), 255 deletions(-) diff --git a/app/src/routes/k8s/DeploymentsPage.tsx b/app/src/routes/k8s/DeploymentsPage.tsx index c9df055..de55810 100644 --- a/app/src/routes/k8s/DeploymentsPage.tsx +++ b/app/src/routes/k8s/DeploymentsPage.tsx @@ -1,11 +1,12 @@ import { useQuery, useQueryClient } from "@tanstack/react-query"; import { useEffect, useMemo, useState } from "react"; -import { Button, Slider } from "@react-spectrum/s2"; +import { ActionMenu, Button, MenuItem, MenuSection, Slider, Text } from "@react-spectrum/s2"; import { style } from "@react-spectrum/s2/style" with { type: "macro" }; import { api } from "@/lib/api"; import { ConfirmDialog } from "@/components/ConfirmDialog"; import { CopyButton } from "@/components/CopyButton"; import { DetailEmpty, DetailHeading, DetailPane } from "@/components/DetailPane"; +import { InspectFields } from "@/components/InspectFields"; import { ListEmpty, ListPane } from "@/components/ListPane"; import { SettingRow } from "@/components/SettingRow"; import { toast } from "@/components/Toaster"; @@ -15,6 +16,10 @@ import { useUIStore } from "@/stores/uiStore"; import { copyText } from "@/routes/shared"; import { K8sChrome } from "@/routes/k8s/K8sChrome"; +function readyTone(ready: number, desired: number) { + return ready > 0 && ready === desired ? "success" : "muted"; +} + export function DeploymentsPage() { const namespace = useUIStore((s) => s.namespace); const qc = useQueryClient(); @@ -36,6 +41,8 @@ export function DeploymentsPage() { }, [list.data, q]); const row = filtered.find((d) => d.metadata.name === selected); + const ready = row?.status?.readyReplicas ?? 0; + const desired = row?.spec?.replicas ?? 0; useEffect(() => { setReplicas(row?.spec?.replicas ?? 1); @@ -55,88 +62,71 @@ export function DeploymentsPage() { } search={{ value: q, onChange: setQ, placeholder: "Search deployments" }} > - {filtered.map((d) => ( - setSelected(d.metadata.name)} - items={[ - { id: "open", label: "Open", onAction: () => setSelected(d.metadata.name) }, - { id: "copy", label: "Copy name", onAction: () => void copyText(d.metadata.name) }, - { - id: "scale-up", - label: "Scale +", - onAction: () => - void api - .scaleDeployment(namespace, d.metadata.name, (d.spec?.replicas || 1) + 1) - .then(() => qc.invalidateQueries({ queryKey: ["deployments"] })), - }, - { - id: "restart", - label: "Restart", - onAction: () => - void api - .restartDeployment(namespace, d.metadata.name) - .then(() => qc.invalidateQueries({ queryKey: ["deployments"] })), - }, - { id: "sep-1", label: "", onAction: () => {} }, - { - id: "delete", - label: "Delete…", - destructive: true, - onAction: () => { - setSelected(d.metadata.name); - setConfirmDelete(true); + {filtered.map((d) => { + const r = d.status?.readyReplicas ?? 0; + const want = d.spec?.replicas ?? 0; + return ( + setSelected(d.metadata.name)} + items={[ + { id: "open", label: "Open", onAction: () => setSelected(d.metadata.name) }, + { id: "copy", label: "Copy name", onAction: () => void copyText(d.metadata.name) }, + { + id: "scale-up", + label: "Scale +", + onAction: () => + void api + .scaleDeployment(namespace, d.metadata.name, (d.spec?.replicas || 1) + 1) + .then(() => qc.invalidateQueries({ queryKey: ["deployments"] })), }, - }, - ]} - suffix={ - 0 && - (d.status?.readyReplicas ?? 0) === (d.spec?.replicas ?? 0) - ? "success" - : "muted" - } - > - {d.status?.readyReplicas ?? 0}/{d.spec?.replicas ?? 0} - - } - > -
- {d.metadata.name} -
-
- ))} + { + id: "restart", + label: "Restart", + onAction: () => + void api + .restartDeployment(namespace, d.metadata.name) + .then(() => qc.invalidateQueries({ queryKey: ["deployments"] })), + }, + { id: "sep-1", label: "", onAction: () => {} }, + { + id: "delete", + label: "Delete…", + destructive: true, + onAction: () => { + setSelected(d.metadata.name); + setConfirmDelete(true); + }, + }, + ]} + suffix={ + + {r}/{want} + + } + > +
+ {d.metadata.name} +
+
+ ); + })} } header={ row ? ( -
-
-
-
- {row.metadata.name} - 0 && - (row.status?.readyReplicas ?? 0) === (row.spec?.replicas ?? 0) - ? "success" - : "muted" - } - > - {row.status?.readyReplicas ?? 0}/{row.spec?.replicas ?? 0} - -
-

- {namespace} -

-
- +
+
+ {row.metadata.name} + + {ready}/{desired} + +
-
+
- + + + + void api + .scaleDeployment(namespace, row.metadata.name, desired + 1) + .then(() => { + toast.success("Scaled", { description: `${row.metadata.name} → ${desired + 1}` }); + qc.invalidateQueries({ queryKey: ["deployments"] }); + }) + .catch((e: any) => toast.error("Scale failed", { description: e?.message })) + } + > + Scale + + + + + setConfirmDelete(true)}> + + Delete… + + + +
) : null } > {row ? ( -
- {replicas}} - > - { - void api - .scaleDeployment(namespace, row.metadata.name, v) - .then(() => { - toast.success("Scaled", { description: `${row.metadata.name} → ${v}` }); - qc.invalidateQueries({ queryKey: ["deployments"] }); - }) - .catch((e: any) => toast.error("Scale failed", { description: e?.message })); - }} - /> - +
+
+ {replicas}} + > + { + void api + .scaleDeployment(namespace, row.metadata.name, v) + .then(() => { + toast.success("Scaled", { description: `${row.metadata.name} → ${v}` }); + qc.invalidateQueries({ queryKey: ["deployments"] }); + }) + .catch((e: any) => toast.error("Scale failed", { description: e?.message })); + }} + /> + +
+ `${k}=${v}`) + .join(", ") + : undefined, + mono: true, + }, + { + label: "Image", + value: row.spec?.template?.spec?.containers?.[0]?.image, + mono: true, + copy: row.spec?.template?.spec?.containers?.[0]?.image, + }, + { label: "Created", value: row.metadata.creationTimestamp }, + { label: "UID", value: row.metadata.uid, mono: true, copy: row.metadata.uid }, + ]} + />
) : null} diff --git a/app/src/routes/k8s/HelmPage.tsx b/app/src/routes/k8s/HelmPage.tsx index 664406a..b9e99fb 100644 --- a/app/src/routes/k8s/HelmPage.tsx +++ b/app/src/routes/k8s/HelmPage.tsx @@ -5,9 +5,14 @@ import { style } from "@react-spectrum/s2/style" with { type: "macro" }; import { api } from "@/lib/api"; import { GlassSheet, TerminalBlock } from "@/components/GlassSheet"; import { ConfirmDialog } from "@/components/ConfirmDialog"; +import { ListEmpty } from "@/components/ListPane"; import { PageShell } from "@/components/PageShell"; +import { RowMenu } from "@/components/spectrum/RowMenu"; import { StatusBadge } from "@/components/spectrum/StatusBadge"; +import { Tip } from "@/components/spectrum/Tip"; +import { toast } from "@/components/Toaster"; import { useUIStore } from "@/stores/uiStore"; +import { copyText } from "@/routes/shared"; import { K8sChrome } from "@/routes/k8s/K8sChrome"; export function HelmPage() { @@ -19,6 +24,8 @@ export function HelmPage() { const [output, setOutput] = useState(""); const [sheetOpen, setSheetOpen] = useState(false); const [sheetTitle, setSheetTitle] = useState("Helm"); + const [installOpen, setInstallOpen] = useState(false); + const [installing, setInstalling] = useState(false); const [confirmUninstall, setConfirmUninstall] = useState(null); const list = useQuery({ queryKey: ["helm", namespace], @@ -32,50 +39,90 @@ export function HelmPage() { setSheetOpen(true); }; + const releases = list.data || []; + return ( - -
-
- - + + + } + > +
+ {list.isLoading ? ( +

Loading releases…

+ ) : releases.length === 0 ? ( + setInstallOpen(true)}> + Install chart + + } /> -
-