diff --git a/docs/4-implementation/web-ui/dashboard.md b/docs/4-implementation/web-ui/dashboard.md index 1860632c3..ad68093be 100644 --- a/docs/4-implementation/web-ui/dashboard.md +++ b/docs/4-implementation/web-ui/dashboard.md @@ -176,11 +176,6 @@ falls back to the dimmed hyperhive mark (`/favicon.svg`). The card body sits to the right with three stacked lines (`assets/agents.js::renderContainers`). -The agent's name links to its terminal in the swarm UI -(`/agents//terminal`), and the "needs login" badge to the -swarm UI's agent list, where the agent logs in again. The agent has no page of its -own, so a hive without a swarm domain shows both as plain text. - **Icon layout + load strategy:** the `` is absolutely diff --git a/frontend/packages/dashboard/src/agent-page.js b/frontend/packages/dashboard/src/agent-page.js deleted file mode 100644 index b02e96f97..000000000 --- a/frontend/packages/dashboard/src/agent-page.js +++ /dev/null @@ -1,26 +0,0 @@ -// Where an agent's name in the container list leads: its terminal in the swarm -// UI. The agent has no page of its own to open, so a hive without a swarm -// domain (`swarm_public_url` unset in the dashboard state) has no link to give. - -/** - * @param {{ swarm_public_url?: string | null } | null | undefined} state the dashboard state - * @param {string} name the agent's name - * @returns {string | null} the swarm UI URL of the agent's terminal, or null - */ -export function agentPageUrl(state, name) { - const base = state && state.swarm_public_url; - if (!base) return null; - return `${base.replace(/\/+$/, "")}/agents/${encodeURIComponent(name)}/terminal`; -} - -/** - * Where "needs login" leads: the swarm UI's agent list, where an agent is logged - * in again. Null with no swarm domain. - * - * @param {{ swarm_public_url?: string | null } | null | undefined} state - * @returns {string | null} - */ -export function loginPageUrl(state) { - const base = state && state.swarm_public_url; - return base ? `${base.replace(/\/+$/, "")}/agents` : null; -} diff --git a/frontend/packages/dashboard/src/agents.js b/frontend/packages/dashboard/src/agents.js index daa78905e..8d0de4c0b 100644 --- a/frontend/packages/dashboard/src/agents.js +++ b/frontend/packages/dashboard/src/agents.js @@ -9,7 +9,6 @@ import { el } from "@hive/shared/dom.js"; import { themedConfirm, themedToast } from "@hive/shared/modal.js"; import { h, render } from "preact"; import { JobqRollup } from "@hive/shared/jobq-rollup.js"; -import { agentPageUrl, loginPageUrl } from "./agent-page.js"; import { containersState } from "./state.js"; import { closeAllMenus } from "@hive/shared/hive-menu.js"; import "./agent-menu/hive-agent-menu.js"; // registers — side-effect import @@ -238,7 +237,6 @@ function containerRowFingerprint( selected, gatewayLinks, hostname, - swarmPublicUrl, ) { return JSON.stringify({ running: c.running, @@ -251,7 +249,6 @@ function containerRowFingerprint( selected, gatewayLinks, hostname, - swarmPublicUrl, }); } @@ -261,9 +258,6 @@ function containerRowFingerprint( // fetch for stable rows. function buildContainerLi(c, opts) { const { pending, opRunning, selected, url, containerBase, s } = opts; - // The agent has no page of its own; its name leads to its terminal in the swarm UI. - const pageUrl = agentPageUrl(s, c.name); - const loginUrl = loginPageUrl(s); // A single `pending-running` class covers any active transient // badge state (see the pending-badge derivation comment in // renderContainers). @@ -324,13 +318,11 @@ function buildContainerLi(c, opts) { // -- identity ------------------------------------------------------- const head = el("div", { class: "head" }); head.append( - pageUrl - ? el( - "a", - { class: "name", href: pageUrl, target: "_blank", rel: "noopener" }, - c.name, - ) - : el("span", { class: "name" }, c.name), + el( + "a", + { class: "name", href: url, target: "_blank", rel: "noopener" }, + c.name, + ), ); // Icon-only nav strip — populated async from the agent's own // `GET /api/dashboard-state` (via gateway when enabled, direct @@ -482,20 +474,17 @@ function buildContainerLi(c, opts) { ), ); } else if (c.needs_login) { - // Logging in again is on the swarm UI; without one the badge only says so. head.append( - loginUrl - ? el( - "a", - { - class: "hive-pill-sm badge-warn", - href: loginUrl, - target: "_blank", - rel: "noopener", - }, - "needs login →", - ) - : el("span", { class: "hive-pill-sm badge-warn" }, "needs login"), + el( + "a", + { + class: "hive-pill-sm badge-warn", + href: url, + target: "_blank", + rel: "noopener", + }, + "needs login →", + ), ); } if (c.paused) { @@ -624,7 +613,6 @@ export function renderContainers(s) { selected, gatewayLinks, hostname, - (s && s.swarm_public_url) || null, ); const cached = containerRowCache.get(c.name); diff --git a/frontend/packages/swarm-ui/test/dashboard-agent-page.test.mjs b/frontend/packages/swarm-ui/test/dashboard-agent-page.test.mjs deleted file mode 100644 index 2b874be9d..000000000 --- a/frontend/packages/swarm-ui/test/dashboard-agent-page.test.mjs +++ /dev/null @@ -1,42 +0,0 @@ -// Where the hive dashboard's agent rows lead. Run by `npm test`. -import assert from "node:assert/strict"; -import { test } from "node:test"; -import { agentPageUrl, loginPageUrl } from "../../dashboard/src/agent-page.js"; - -test("an agent's name leads to its terminal in the swarm UI", () => { - const state = { swarm_public_url: "https://swarm.example" }; - assert.equal( - agentPageUrl(state, "iris"), - "https://swarm.example/agents/iris/terminal", - ); -}); - -test("a trailing slash on the swarm address makes no double slash", () => { - const state = { swarm_public_url: "https://swarm.example/" }; - assert.equal( - agentPageUrl(state, "iris"), - "https://swarm.example/agents/iris/terminal", - ); - assert.equal(loginPageUrl(state), "https://swarm.example/agents"); -}); - -test("a name is escaped into the path", () => { - const state = { swarm_public_url: "https://swarm.example" }; - assert.equal( - agentPageUrl(state, "a b/c"), - "https://swarm.example/agents/a%20b%2Fc/terminal", - ); -}); - -test("a hive without a swarm domain has no page to link", () => { - for (const state of [ - null, - undefined, - {}, - { swarm_public_url: null }, - { swarm_public_url: "" }, - ]) { - assert.equal(agentPageUrl(state, "iris"), null); - assert.equal(loginPageUrl(state), null); - } -});