diff --git a/frontend/packages/swarm-ui/src/App.tsx b/frontend/packages/swarm-ui/src/App.tsx index 3ef432e3..0b69fb3c 100644 --- a/frontend/packages/swarm-ui/src/App.tsx +++ b/frontend/packages/swarm-ui/src/App.tsx @@ -1,11 +1,62 @@ -// Root shell component — routing only. Each route's content is its own -// page component under `./pages/`; this file just maps paths to them. +// Root shell component. `/` is now the real hive-roster overview page — +// fetches swarm-controller's `GET /api/hives` and renders it through the +// shared primitives. Status starts as a static "configured" chip; grows +// into a real online/stale/offline tone once a status rollup exists +// server-side — same component, richer data later, no rebuild. +import { useEffect, useState } from 'preact/hooks'; import { Route, Switch } from 'wouter-preact'; import { Shell } from './shell/Shell.js'; import { ComponentsPage } from './pages/ComponentsPage.js'; import { JobsPage } from './pages/JobsPage.js'; -import { OverviewPage } from './pages/OverviewPage.js'; import { Panel } from './ui/panel/Panel.js'; +import { StatusChip } from './ui/status-chip/StatusChip.js'; +import { Table, type TableColumn } from './ui/table/Table.js'; + +interface Hive { + name: string; + domain: string; +} + +const COLUMNS: TableColumn[] = [ + { key: 'name', header: 'name', render: (h) => h.name }, + { + key: 'domain', + header: 'domain', + render: (h) => ( + + {h.domain} + + ), + }, + // Static "configured" tone until a swarm-wide status rollup exists — + // there is no data source for online/stale/offline yet, and a chip + // that always renders "positive" would misreport a genuinely offline + // hive. See StatusChip's own doc comment for the same reasoning. + { key: 'status', header: 'status', render: () => }, +]; + +function Home() { + const [hives, setHives] = useState(null); + const [error, setError] = useState(null); + + useEffect(() => { + fetch('/api/hives') + .then((r) => { + if (!r.ok) throw new Error(`http ${r.status}`); + return r.json() as Promise; + }) + .then(setHives) + .catch((e: unknown) => setError(String(e))); + }, []); + + return ( + + {error ?

failed to load the hive roster: {error}

: null} + {!error && hives === null ?

loading…

: null} + {hives ? h.name} /> : null} + + ); +} function NotFound() { return ( @@ -19,7 +70,7 @@ export function App() { return ( - + diff --git a/frontend/packages/swarm-ui/src/pages/OverviewPage.tsx b/frontend/packages/swarm-ui/src/pages/OverviewPage.tsx deleted file mode 100644 index b78f8f12..00000000 --- a/frontend/packages/swarm-ui/src/pages/OverviewPage.tsx +++ /dev/null @@ -1,82 +0,0 @@ -// — the hive-roster overview, `/`'s content. Fetches -// swarm-controller's `GET /api/hives/status`, the swarm-wide status -// aggregate: one row per roster hive, freshness derived at read time -// from the status bucket. Supersedes the earlier `GET /api/hives` + -// static "configured" chip placeholder now that the real rollup -// exists — same component, richer data, no rebuild, exactly the plan -// that placeholder's comment laid out. Its own component/file rather -// than living in `App.tsx`, matching `JobsPage`'s shape: `App.tsx` is -// routing, a page owns its own fetch + render. -import { useEffect, useState } from 'preact/hooks'; -import { Panel } from '../ui/panel/Panel.js'; -import { StatusChip, type ChipTone } from '../ui/status-chip/StatusChip.js'; -import { Table, type TableColumn } from '../ui/table/Table.js'; -import { fmtAgo } from '../util.js'; - -type Freshness = 'fresh' | 'stale' | 'never_reported' | 'unknown'; - -interface HiveStatus { - name: string; - domain: string | null; - freshness: Freshness; - last_seen_unix: number | null; - age_seconds: number | null; -} - -// One tone + label per freshness value. `unknown` (reporting but absent -// from the roster) reads `negative` — it's the one case this endpoint -// cannot vouch for at all, per `status.rs`'s doc comment. -const FRESHNESS: Record = { - fresh: { tone: 'positive', label: 'fresh' }, - stale: { tone: 'warning', label: 'stale' }, - never_reported: { tone: 'neutral', label: 'never reported' }, - unknown: { tone: 'negative', label: 'unknown' }, -}; - -const COLUMNS: TableColumn[] = [ - { key: 'name', header: 'name', render: (h) => h.name }, - { - key: 'domain', - header: 'domain', - render: (h) => - h.domain ? ( - - {h.domain} - - ) : ( - '—' - ), - }, - { - key: 'status', - header: 'status', - render: (h) => { - const { tone, label } = FRESHNESS[h.freshness]; - const age = h.age_seconds !== null ? ` (${fmtAgo(h.age_seconds)})` : ''; - return ; - }, - }, -]; - -export function OverviewPage() { - const [hives, setHives] = useState(null); - const [error, setError] = useState(null); - - useEffect(() => { - fetch('/api/hives/status') - .then((r) => { - if (!r.ok) throw new Error(`http ${r.status}`); - return r.json() as Promise; - }) - .then(setHives) - .catch((e: unknown) => setError(String(e))); - }, []); - - return ( - - {error ?

failed to load the hive roster: {error}

: null} - {!error && hives === null ?

loading…

: null} - {hives ?
h.name} /> : null} - - ); -} diff --git a/frontend/packages/swarm-ui/src/util.ts b/frontend/packages/swarm-ui/src/util.ts deleted file mode 100644 index 577b8b88..00000000 --- a/frontend/packages/swarm-ui/src/util.ts +++ /dev/null @@ -1,19 +0,0 @@ -// Small pure render helpers shared across swarm-ui pages. Not folded -// into `@hive/shared` — swarm-ui's formatting choices aren't a -// cross-package contract, and there's nothing here worth sharing. - -// Relative age, coarsened to one unit ("5m ago"). Built on the native -// `Intl.RelativeTimeFormat` (no dependency needed — mara asked whether -// a lightweight package was warranted; the runtime already ships this) -// with `style: 'narrow'`, which produces the same "5s/5m/5h/5d ago" -// shape the dashboard package's hand-rolled equivalent does, verified -// against a real `Intl` call rather than assumed from the spec. -const RTF = new Intl.RelativeTimeFormat('en', { numeric: 'always', style: 'narrow' }); - -export function fmtAgo(ageSeconds: number): string { - const age = Math.max(0, Math.floor(ageSeconds)); - if (age < 60) return RTF.format(-age, 'second'); - if (age < 3600) return RTF.format(-Math.floor(age / 60), 'minute'); - if (age < 86400) return RTF.format(-Math.floor(age / 3600), 'hour'); - return RTF.format(-Math.floor(age / 86400), 'day'); -}