From 599747bacbff27beeb4579c2b17b810bb935eeeb Mon Sep 17 00:00:00 2001 From: iris Date: Mon, 26 Oct 2026 21:16:05 +0100 Subject: [PATCH] swarm-ui: alerts and the issue report are folded cards on a reports tab The alerts and issues tabs are one reports tab in the nav. Each page, unchanged inside, is a card that starts shut and reads nothing until opened; the alerts header's link, button and refresh picker move into the card's body. /alerts and /issues redirect to /reports. Docs follow. --- docs/swarm/ui.md | 7 ++- frontend/packages/swarm-ui/src/App.tsx | 12 ++-- .../swarm-ui/src/pages/AlertsPage.tsx | 62 ++++++++++--------- .../swarm-ui/src/pages/IssueReportPage.tsx | 24 +++++-- .../src/pages/reports/ReportsPage.css | 16 +++++ .../src/pages/reports/ReportsPage.tsx | 15 +++++ .../packages/swarm-ui/src/shell/Shell.tsx | 3 +- 7 files changed, 96 insertions(+), 43 deletions(-) create mode 100644 frontend/packages/swarm-ui/src/pages/reports/ReportsPage.css create mode 100644 frontend/packages/swarm-ui/src/pages/reports/ReportsPage.tsx diff --git a/docs/swarm/ui.md b/docs/swarm/ui.md index f563729a..a0f39470 100644 --- a/docs/swarm/ui.md +++ b/docs/swarm/ui.md @@ -26,11 +26,10 @@ shut. A dropdown inside a dialog opens above the dialog and the dialog doesn't c | `/agents` | every agent, under a folded **hives** card with the hive directory and each hive's last reported status: status, config PR, wanted state, inference settings, resource caps, permissions; create agents (with their permissions, optionally from an [archetype](archetypes.md)), link forge, matrix and GitHub accounts | | `/agents//terminal` | one agent's live terminal | | `/agents//subagents//terminal` | one of that agent's subagents' live terminal | -| `/alerts` | the alerts the swarm's Grafana holds now: the firing ones, with a button for the pending, no-data and error ones and a link to Grafana's own alert list; read through the controller with a Viewer service-account token | +| `/reports` | two folded cards, each read only once opened: the **alerts** the swarm's Grafana holds now, the firing ones, with a button for the pending, no-data and error ones and a link to Grafana's own alert list; read through the controller with a Viewer service-account token, and a cross-repo **issue report** | | `/jobs` | the controller's job graph, where agent creation and credential mints show progress, and under it the swarm builder's recent builds of agent config PRs, with what nix printed when one failed, and the review classifier's recent runs, a try-out on a real PR, and its settings | | `/messages` | the swarm-wide message feed: every message between agents, and to them from the operator, reminders and compaction, with a history window and a filter on sender or recipient; a folded **broadcast** card above the feed sends one message to more than one agent at once, and a folded **schedules** card holds the scheduled prompts: add, edit, pause, resume and remove | | `/notifications` | the notification router's flows: a switch for each built-in, every flow drawn as a graph, and an editor for custom flows | -| `/issues` | a cross-repo issue report | Everything it shows comes from [`swarm-controller`](../../swarm-controller/README.md). Pages that refresh on a timer share one polling rule: the page sends no new @@ -458,7 +457,9 @@ live rows only. ### Issue report -The **issues** page lists the open issues of every repo that has one, from +The card starts shut. The old `/issues` address redirects to the reports tab, as `/alerts` does. + +The **issue report** card on the **reports** tab lists the open issues of every repo that has one, from `GET /api/issue-report`, or of one repo from `GET /api/repos/{org}/{repo}/issue-report`. Each row shows whether an open dependency blocks the issue and how many other issues depend on it. The diff --git a/frontend/packages/swarm-ui/src/App.tsx b/frontend/packages/swarm-ui/src/App.tsx index d27f9a81..891678b3 100644 --- a/frontend/packages/swarm-ui/src/App.tsx +++ b/frontend/packages/swarm-ui/src/App.tsx @@ -6,14 +6,13 @@ import { Shell } from "./shell/Shell.js"; import { useGuardedLocation } from "./shell/useGuardedLocation.js"; import { AgentsPage } from "./pages/agents/AgentsPage.js"; import { AgentTerminalPage } from "./pages/agents/AgentTerminalPage.js"; -import { AlertsPage } from "./pages/AlertsPage.js"; import { MessagesPage } from "./pages/messages/MessagesPage.js"; import { NEW_FLOW_PATH } from "./pages/notifications/FlowDraft.js"; import { FlowEditorPage } from "./pages/notifications/FlowEditorPage.js"; import { NotificationsPage } from "./pages/notifications/NotificationsPage.js"; import { ComponentsPage } from "./pages/ComponentsPage.js"; import { JobsPage } from "./pages/JobsPage.js"; -import { IssueReportPage } from "./pages/IssueReportPage.js"; +import { ReportsPage } from "./pages/reports/ReportsPage.js"; import { StartPage } from "./pages/StartPage.js"; import { Panel } from "./ui/panel/Panel.js"; @@ -38,7 +37,10 @@ export function App() { - + + + + - + + + diff --git a/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx b/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx index f2e77dc8..fa6bf982 100644 --- a/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx +++ b/frontend/packages/swarm-ui/src/pages/AlertsPage.tsx @@ -1,4 +1,4 @@ -// — `/alerts`' content: the alerts the swarm's Grafana holds +// — a card of the reports tab: the alerts the swarm's Grafana holds // now, from swarm-controller's `GET /api/alerts`. Only the firing ones show at // first; a button in the header adds the pending, no-data and errored ones. // Same shape as `HivesCard`: one fetch on a `RefreshIntervalPicker` cadence, @@ -7,7 +7,7 @@ import { useState } from "preact/hooks"; import { ApiErrorPanel } from "@hive/shared/api-error-panel.js"; import { Badge, type BadgeTone } from "@hive/shared/badge.js"; import { Button } from "../ui/button/Button.js"; -import { Panel } from "../ui/panel/Panel.js"; +import { LazyDisclosure } from "../ui/disclosure/LazyDisclosure.js"; import { RelativeTime } from "../ui/relative-time/RelativeTime.js"; import { RefreshIntervalPicker, @@ -71,7 +71,7 @@ const COLUMNS: TableColumn[] = [ const DEFAULT_INTERVAL_MS: RefreshIntervalMs = 30_000; -export function AlertsPage() { +function AlertsBody() { const [showAll, setShowAll] = useState(false); const [intervalMs, setIntervalMs] = useState(DEFAULT_INTERVAL_MS); @@ -82,31 +82,22 @@ export function AlertsPage() { const hidden = alerts && listed ? alerts.length - listed.length : 0; return ( - - - Grafana's alert list - - {showAll || hidden > 0 ? ( - - ) : null} - - - } - > + <> +
+ + Grafana's alert list + + {showAll || hidden > 0 ? ( + + ) : null} + +
{error ? ( ) : null} - + + ); +} + +// A folded card on the reports tab: read and polled only once it is opened. +export function AlertsCard() { + return ( + + + ); } diff --git a/frontend/packages/swarm-ui/src/pages/IssueReportPage.tsx b/frontend/packages/swarm-ui/src/pages/IssueReportPage.tsx index 55430d18..614ebae2 100644 --- a/frontend/packages/swarm-ui/src/pages/IssueReportPage.tsx +++ b/frontend/packages/swarm-ui/src/pages/IssueReportPage.tsx @@ -1,4 +1,4 @@ -// — mara's custom issue report: browse open issues +// — a card of the reports tab: mara's custom issue report: browse open issues // across every repo that has one, sortable/filterable her own way, with // "hide blocked (open dependency)" as the headline filter and a rank // column for how many other open issues depend on each one. Backed by @@ -32,7 +32,7 @@ import { ApiErrorPanel } from "@hive/shared/api-error-panel.js"; import { readApiError, type ProblemDetails } from "@hive/shared/api-error.js"; import { Badge } from "@hive/shared/badge.js"; import { useLocalSetting } from "@hive/shared/settings-storage.js"; -import { Panel } from "../ui/panel/Panel.js"; +import { LazyDisclosure } from "../ui/disclosure/LazyDisclosure.js"; import { CheckboxField } from "../ui/checkbox-field/CheckboxField.js"; import { SelectField } from "../ui/select-field/SelectField.js"; import { Table, type TableColumn } from "../ui/table/Table.js"; @@ -128,7 +128,7 @@ function SortHeader({ ); } -export function IssueReportPage() { +function IssueReportBody() { const [repos, setRepos] = useState(null); const [repoFilter, setRepoFilter] = useLocalSetting( REPO_FILTER_KEY, @@ -370,7 +370,7 @@ export function IssueReportPage() { ]; return ( - + <>
) : null} - + + ); +} + +// A folded card on the reports tab: the repo list and the report are read only +// once it is opened. +export function IssueReportCard() { + return ( + + + ); } diff --git a/frontend/packages/swarm-ui/src/pages/reports/ReportsPage.css b/frontend/packages/swarm-ui/src/pages/reports/ReportsPage.css new file mode 100644 index 00000000..be8da904 --- /dev/null +++ b/frontend/packages/swarm-ui/src/pages/reports/ReportsPage.css @@ -0,0 +1,16 @@ +/* The reports tab: the folded cards, one gap apart. */ +.ui-reports-page { + display: flex; + flex-direction: column; + gap: 1em; +} +/* The bar at the top of the alerts card: the Grafana link, the show-more + button and the refresh picker, to the right. */ +.ui-alerts-bar { + display: flex; + flex-wrap: wrap; + align-items: center; + justify-content: flex-end; + gap: 0.5em 0.75em; + margin-block-end: 0.5em; +} diff --git a/frontend/packages/swarm-ui/src/pages/reports/ReportsPage.tsx b/frontend/packages/swarm-ui/src/pages/reports/ReportsPage.tsx new file mode 100644 index 00000000..cb8a9f8a --- /dev/null +++ b/frontend/packages/swarm-ui/src/pages/reports/ReportsPage.tsx @@ -0,0 +1,15 @@ +// — `/reports`: what the swarm reports about itself, as two +// folded cards: the alerts Grafana holds now, and mara's issue report. Neither +// reads anything until it is opened. +import { AlertsCard } from "../AlertsPage.js"; +import { IssueReportCard } from "../IssueReportPage.js"; +import "./ReportsPage.css"; + +export function ReportsPage() { + return ( +
+ + +
+ ); +} diff --git a/frontend/packages/swarm-ui/src/shell/Shell.tsx b/frontend/packages/swarm-ui/src/shell/Shell.tsx index a42d8339..9966834f 100644 --- a/frontend/packages/swarm-ui/src/shell/Shell.tsx +++ b/frontend/packages/swarm-ui/src/shell/Shell.tsx @@ -51,11 +51,10 @@ const MOTION_KEY = "swarm-ui:motion-override"; const NAV_ITEMS: { href: string; label: string; accent: string }[] = [ { href: "/agents", label: "agents", accent: "var(--green)" }, - { href: "/alerts", label: "alerts", accent: "var(--red)" }, + { href: "/reports", label: "reports", accent: "var(--red)" }, { href: "/jobs", label: "jobs", accent: "var(--pink)" }, { href: "/messages", label: "messages", accent: "var(--purple)" }, { href: "/notifications", label: "notifications", accent: "var(--yellow)" }, - { href: "/issues", label: "issues", accent: "var(--yellow)" }, { href: "/components", label: "components", accent: "var(--blue)" }, ];