Skip to content

Agent Mesh

console: hide revoked nodes from the Nodes view

Tomas Tormo374902fa0cc6
diff --git a/internal/console/public/app.js b/internal/console/public/app.js
index 2ea3b4ab..093569f0 100644
--- a/internal/console/public/app.js
+++ b/internal/console/public/app.js
@@ -219,9 +219,13 @@ async function loadData() {
}
}
+ // A revoked node is banned, not deleted: the record survives for unban
+ // and audit, but it is out of the mesh, so no view may list it.
+ const enrolledNodes = (data.enrolled_nodes || []).filter(node => !node.Banned);
+
// Update Stats
const usersCount = (data.users && data.users.length) || 0;
- const nodesCount = (data.enrolled_nodes && data.enrolled_nodes.length) || 0;
+ const nodesCount = enrolledNodes.length;
const routersCount = (data.active_routers && data.active_routers.length) || 0;
const reqsCount = (data.enrollment_requests && data.enrollment_requests.length) || 0;
@@ -243,8 +247,8 @@ async function loadData() {
setTableMessage('table-users', 4, 'Restricted to administrators.');
setTableMessage('table-enrollments', 4, 'Restricted to administrators.');
}
- renderNodesTable(data.enrolled_nodes || [], role);
- renderServicesTable(data.node_catalog || {}, buildLabelsByPeer(data.enrolled_nodes || []));
+ renderNodesTable(enrolledNodes, role);
+ renderServicesTable(data.node_catalog || {}, buildLabelsByPeer(enrolledNodes));
renderRoutersTable(data.active_routers || []);
renderRouterTopography(data.active_routers || []);
renderBootstrapTokensTable(data.bootstrap_tokens || []);
diff --git a/tests/ui/console.spec.js b/tests/ui/console.spec.js
index 41bd14a5..58b30e52 100644
--- a/tests/ui/console.spec.js
+++ b/tests/ui/console.spec.js
@@ -398,3 +398,26 @@ test('reported services render with type, labels and report time', async ({ page
const nodeRow = page.locator('#table-nodes tr', { hasText: PEER });
await expect(nodeRow.locator('.cell-subtext')).toHaveText('component=stvv, region=eu-west');
});
+
+// Revoking a node bans its record rather than deleting it, so /admin/status
+// keeps returning it; the console must not keep showing it as enrolled.
+test('revoked nodes disappear from the Nodes view and the node count', async ({ page }) => {
+ const LIVE = '12D3KooWLiveNodeFixturePeer';
+ const REVOKED = '12D3KooWRevokedNodeFixturePeer';
+ await page.route('**/api/admin/status', async (route) => {
+ const response = await route.fetch();
+ const status = await response.json();
+ status.enrolled_nodes = [
+ { PeerID: LIVE, Role: 'sam:role:node', OwnerID: 'root-admin', Banned: false },
+ { PeerID: REVOKED, Role: 'sam:role:node', OwnerID: 'root-admin', Banned: true },
+ ];
+ await route.fulfill({ response, json: status });
+ });
+
+ await login(page);
+ await page.click('.nav-item[data-target="nodes"]');
+
+ await expect(page.locator('#table-nodes')).toContainText(LIVE);
+ await expect(page.locator('#table-nodes')).not.toContainText(REVOKED);
+ await expect(page.locator('#stat-nodes')).toHaveText('1');
+});