Skip to content

armgit / Pulse

Public Imported from GitHub
0

Real-time monitoring dashboard for Proxmox VE, PBS, Docker, Kubernetes, TrueNAS and vSphere. Self-hosted, with alerts for failed backups, full disks, unhealthy containers and offline nodes.

Leave PBS host figures to the Backup servers drawer

rcourtman6dfcfed1e154
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
index 16cda823f9..3fc389f753 100644
--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md
+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
@@ -523,6 +523,17 @@ desktop/narrow browser journeys cover the shared filter rail, keyboard/touch
day selection, metric switching, empty matches and recovery. No shared-filter,
route, navigation, access or backup operation changes.
+### Backup servers table drops its host columns (2 November 2026)
+
+`ProxmoxBackupServersTable` no longer renders Version, CPU, Memory or Uptime
+columns; `BACKUP_SERVER_COLUMNS` is server, status, datastore, used, jobs,
+backups and dedup, and every layout's weights were redistributed so Used, the
+longest value (percentage plus the used/total pair or the forecast pill), keeps
+the widest datastore share. The table therefore no longer consumes
+`formatPlatformTableUptimeValue`, and the shared-template registry drops it
+from that rule's required consumers. The memory cell's multi-line "Last known"
+qualifier went with it, so every row is now single-line by construction.
+
### Datastore fill forecast stays on one row line (2 November 2026)
`ProxmoxBackupServersTable` shows a PBS datastore's fill forecast as the
diff --git a/docs/release-control/v6/internal/subsystems/storage-recovery.md b/docs/release-control/v6/internal/subsystems/storage-recovery.md
index 32eb6391a7..ab264aad8c 100644
--- a/docs/release-control/v6/internal/subsystems/storage-recovery.md
+++ b/docs/release-control/v6/internal/subsystems/storage-recovery.md
@@ -635,28 +635,30 @@ proof must inspect desktop and 320px pixels, ordinary disclosure clicks/taps,
namesake isolation, task refresh/withdrawal and close-focus return. No shared
primitive, read cadence, protection policy, backup or guest operation changes.
-### Backup-server memory does not invent empty or current readings
-
-The Backup servers table keeps a valid selected memory percentage when a partial
-metric reports capacity without used bytes; it never substitutes zero used bytes.
-A displayed byte pair needs finite non-negative used bytes and positive capacity,
-with used not exceeding capacity. Valid reported pairs still determine the
-percentage, including an explicit measured zero. An independent finite percentage
-in the range 0–100 remains usable when the byte pair is absent or invalid.
-
-Server reachability does not renew memory evidence. The table reuses the resource
-drawer's memory-observation qualification: retained and unknown readings say
-`Last known` or `Freshness unknown`; explicitly unavailable readings show no
-number. A stopped linked agent qualifies its own reading without invalidating an
-independent current source. Offline suppression, datastore risk, backup counts,
-identity, History targets and original observation clocks remain unchanged.
-
-Normal-suite `ProxmoxBackupServersTable.memory.test.tsx` covers partial and invalid
-metrics, measured zero, retained/unavailable/future observations, stopped-agent
-source isolation, live recovery and multi-datastore/offline controls. Browser
-proof must consume the resource producer through the actual Backups surface and
-its existing drawer at desktop and narrow widths. This improves truthful
-inspection, not installed memory relief, a successful backup or guest recovery.
+### Backup-server rows leave host figures to the server drawer (2 November 2026)
+
+A Backup servers row answers "is the server reachable and is this datastore
+OK?": Status, datastore, Used, Jobs, the backup count and dedup. The PBS host's
+CPU, memory, uptime and version moved out of the row into the server's
+drawer, where they sit with their History charts and the version badge. Status
+already says whether the box is alive, and those columns took the row's room
+from the datastore answers, which now carry job results and the fill forecast.
+Phones never showed them. The row model no longer copies host readings into
+datastore rows; the drawer reads them from the row's resource.
+
+Host-figure truthfulness therefore belongs to the drawer. The deleted
+table-cell proof (`ProxmoxBackupServersTable.memory.test.tsx`) has no surface
+left to cover, and the drawer is weaker than that cell in two known ways: its
+CPU and memory percentages come from its History charts, so a failed history
+read hides them where the row showed the live reading; and its shared
+`getMemoryPercent` treats a measured zero used with a positive capacity as
+missing and lets an invalid byte pair override a valid percentage. Those are
+existing drawer behaviors on every platform, not part of this change, and are
+not yet fixed; this section does not claim the drawer matches the deleted
+cell's validation.
+`ProxmoxBackupServersTable.test.ts` pins that rows carry no host readings and
+keep the host resource the drawer reads, and `ProxmoxBackupsTable.test.tsx`
+pins the column set.
### Contradictory task completion cannot complete an archive
diff --git a/docs/release-control/v6/internal/subsystems/unified-resources.md b/docs/release-control/v6/internal/subsystems/unified-resources.md
index c885d912ad..08fe46f2f0 100644
--- a/docs/release-control/v6/internal/subsystems/unified-resources.md
+++ b/docs/release-control/v6/internal/subsystems/unified-resources.md
@@ -209,6 +209,15 @@ narrow browser proof exercises the same producer through the inventory consumer
with native interactions and inspected pixels. No API, provider, guest, polling,
auth, resource identity or protection-policy change, nor installed recovery claim.
+### Backup-server rows read host figures through the drawer resource (2 November 2026)
+
+Backup servers rows no longer copy the PBS host's CPU, memory or uptime out of
+the unified resource; the server's drawer reads them from the row's resource
+snapshot, which keeps the agent-merged presentation (`cpu`, `memory`, `uptime`
+from the uniquely correlated host agent when one exists). Correlation,
+retention and History targets are unchanged. `ProxmoxBackupServersTable.test.ts`
+pins that the row resource still carries the host readings.
+
### PBS datastore alerts join by instance id, not display name (2 November 2026)
The Backup servers table finds a datastore's capacity alert from the unified
diff --git a/frontend-modern/browser-verification/a704cd840a16ea15.json b/frontend-modern/browser-verification/a704cd840a16ea15.json
new file mode 100644
index 0000000000..c2aa4bbf8c
--- /dev/null
+++ b/frontend-modern/browser-verification/a704cd840a16ea15.json
@@ -0,0 +1,53 @@
+{
+ "version": 1,
+ "base_sha": "8918a53c3d2de7626e31bb2a847b20417c2e81b7",
+ "verified_at": "2026-11-02T11:05:41Z",
+ "result": "passed",
+ "changed_paths": [
+ "frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx",
+ "frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts"
+ ],
+ "content_sha256": {
+ "frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx": "30109b7fe1684eb8bf7c1d5035e33e68fd5291ba3cb30691359e611beea8e674",
+ "frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts": "62ca40112ab1bbae9d60386847657ed7ee14f4313342a5400baa9fc26ca34e9c"
+ },
+ "routes": [
+ "/proxmox/backups"
+ ],
+ "viewports": [
+ {
+ "width": 1440,
+ "height": 1000
+ },
+ {
+ "width": 1000,
+ "height": 1000
+ },
+ {
+ "width": 800,
+ "height": 1000
+ },
+ {
+ "width": 640,
+ "height": 1000
+ },
+ {
+ "width": 375,
+ "height": 812
+ }
+ ],
+ "states": [
+ "private mock-mode backend built from this branch on pulse-dev",
+ "Backup servers table at every layout width, and a server's drawer with its host figures",
+ "an injected PBS datastore forecast alert in the reshaped Used column",
+ "dark theme, desktop, intermediate and phone layouts"
+ ],
+ "interactions": [
+ "signed in to the private mock backend built from this branch and opened Proxmox > Backups at 1440, 1000, 800, 640 and 375 px wide",
+ "before: the Backup servers header read Backup server, Status, Version, CPU, Memory, Uptime, Datastore, Used, Jobs, Backups, Dedup; after: Backup server, Status, Datastore, Used, Jobs, Backups, Dedup",
+ "every row stayed 32-33 px and single-line at every width with no clipped cell on desktop; datastore names truncate at 640 and 375 as they already did",
+ "opened a server's drawer at desktop and phone: it shows the PBS 3.2.1 version badge, CPU and memory with History charts, 5.33 GB of 16.0 GB RAM and uptime in Details",
+ "with an injected PBS datastore forecast alert the 'Full in ~4d' pill still fits in Used on desktop and moves to State on phone",
+ "no horizontal page overflow at any width"
+ ]
+}
diff --git a/frontend-modern/scripts/shared-template-registry.json b/frontend-modern/scripts/shared-template-registry.json
index 7e92e4cf42..8b99e5185d 100644
--- a/frontend-modern/scripts/shared-template-registry.json
+++ b/frontend-modern/scripts/shared-template-registry.json
@@ -2256,7 +2256,6 @@
"requiredConsumers": [
{ "path": "src/features/docker/DockerHostsTable.tsx" },
{ "path": "src/features/kubernetes/KubernetesNodesTable.tsx" },
- { "path": "src/features/proxmox/ProxmoxBackupServersTable.tsx" },
{ "path": "src/features/proxmox/ProxmoxMailGatewayDrawer.tsx" },
{ "path": "src/features/proxmox/ProxmoxMailGatewayTable.tsx" },
{ "path": "src/features/proxmox/ProxmoxNodesTable.tsx" },
@@ -2273,10 +2272,6 @@
"path": "src/features/kubernetes/KubernetesNodesTable.tsx",
"patterns": ["const formatUptime"]
},
- {
- "path": "src/features/proxmox/ProxmoxBackupServersTable.tsx",
- "patterns": ["formatUptime(row.uptimeSeconds ?? 0)"]
- },
{
"path": "src/features/proxmox/ProxmoxMailGatewayDrawer.tsx",
"patterns": [
diff --git a/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts b/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
index 8606191329..263b92c9d1 100644
--- a/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
+++ b/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
@@ -5725,7 +5725,6 @@ describe('shared primitive guardrails', () => {
const platformUptimeConsumers: Array<[string, string]> = [
['src/features/docker/DockerHostsTable.tsx', dockerHostsTableSource],
['src/features/kubernetes/KubernetesNodesTable.tsx', kubernetesNodesTableSource],
- ['src/features/proxmox/ProxmoxBackupServersTable.tsx', proxmoxBackupServersTableSource],
['src/features/proxmox/ProxmoxMailGatewayDrawer.tsx', proxmoxMailGatewayDrawerSource],
['src/features/proxmox/ProxmoxMailGatewayTable.tsx', proxmoxMailGatewayTableSource],
['src/features/proxmox/ProxmoxNodesTable.tsx', proxmoxNodesTableSource],
@@ -5748,10 +5747,6 @@ describe('shared primitive guardrails', () => {
path: 'src/features/kubernetes/KubernetesNodesTable.tsx',
patterns: ['const formatUptime'],
},
- {
- path: 'src/features/proxmox/ProxmoxBackupServersTable.tsx',
- patterns: ['formatUptime(row.uptimeSeconds ?? 0)'],
- },
{
path: 'src/features/proxmox/ProxmoxMailGatewayDrawer.tsx',
patterns: [
diff --git a/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx b/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
index 17516aefcd..f17f23b3b6 100644
--- a/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
+++ b/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
@@ -9,7 +9,6 @@ import {
formatPlatformTableBytesValue,
formatPlatformTableIntegerValue,
formatPlatformTablePercentValue,
- formatPlatformTableUptimeValue,
getPlatformTableCellClassForKind,
getPlatformTableHeadClassForKind,
PlatformResponsiveTableLabel,
@@ -27,10 +26,6 @@ import {
import type { Alert, PBSBackup } from '@/types/api';
import type { Resource, ResourcePBSDatastore } from '@/types/resource';
import { getPlatformAgentRecord } from '@/utils/agentResources';
-import {
- getMemoryObservationPresentation,
- type MemoryObservationPresentation,
-} from '@/utils/memoryObservation';
import type { StatusIndicatorVariant } from '@/utils/status';
import { useObservedElementWidth } from '@/hooks/useObservedElementWidth';
@@ -63,10 +58,11 @@ import {
// per datastore, labelled by its server; a server with no datastore data still
// gets a reachability row.
// PBS hosts left the v5 nodes table in the v6 IA, so this is where their health
-// lives. Host status, version, CPU, memory and uptime show once, on the server's
-// first datastore row; its later rows keep the server name (muted), toggle and
-// web link but leave those host cells empty, so two datastores never read as
-// two identical servers.
+// lives. The row says whether the server is reachable; its CPU, memory, uptime,
+// version and their history are in the server's drawer, one click away. Status
+// shows once, on the server's first datastore row; its later rows keep the
+// server name (muted), toggle and web link, so two datastores never read as two
+// identical servers.
interface BackupServerRow {
key: string;
@@ -74,13 +70,6 @@ interface BackupServerRow {
serverName: string;
online: boolean;
connectionLabel: string;
- version?: string;
- cpuPercent?: number;
- memoryPercent?: number;
- memoryUsed?: number;
- memoryTotal?: number;
- memoryReading?: MemoryObservationPresentation | null;
- uptimeSeconds?: number;
datastore?: ResourcePBSDatastore;
// The worst backend-judged GC, prune, verify or sync result for this store.
jobs: DatastoreJobSummary;
@@ -504,46 +493,10 @@ export function buildBackupServerRows(
const datastores = (server.pbs?.datastores ?? [])
.slice()
.sort((left, right) => left.name.localeCompare(right.name));
- const memory = server.memory;
- const memoryTotal =
- typeof memory?.total === 'number' && Number.isFinite(memory.total) && memory.total > 0
- ? memory.total
- : undefined;
- const memoryUsed =
- typeof memory?.used === 'number' &&
- Number.isFinite(memory.used) &&
- memory.used >= 0 &&
- (memoryTotal === undefined || memory.used <= memoryTotal)
- ? memory.used
- : undefined;
- // A partial metric may report a percentage and capacity without used
- // bytes. Capacity cannot turn the missing amount into a measured zero.
- // Keep an independently valid percentage, but show a byte pair only when
- // both amounts were actually reported. Explicit zero remains a reading.
- const percent =
- memoryTotal !== undefined && memoryUsed !== undefined
- ? (memoryUsed / memoryTotal) * 100
- : memory?.current;
- const memoryPercent =
- typeof percent === 'number' && Number.isFinite(percent) && percent >= 0 && percent <= 100
- ? percent
- : undefined;
const host = {
serverName: server.name,
online: serverIsOnline(server),
connectionLabel: connectionLabel(server),
- version: server.pbs?.version,
- cpuPercent: typeof server.cpu?.current === 'number' ? server.cpu.current : undefined,
- memoryPercent,
- memoryUsed,
- memoryTotal,
- // A healthy PBS connection does not renew a linked host's retained
- // memory. Use the same source-owned observation as the resource drawer.
- memoryReading: getMemoryObservationPresentation(memoryPercent, memory?.observation, false, {
- includeCurrent: false,
- agentStale: (server.agent ?? getPlatformAgentRecord(server))?.stale === true,
- }),
- uptimeSeconds: server.uptime ?? server.pbs?.uptimeSeconds,
};
// Each keyed row has a reconciled Solid store. Give it its own JSON DTO
// snapshot: otherwise joining an Agent mutates the source's service
@@ -641,22 +594,6 @@ export function ProxmoxBackupServersTable(props: {
<TableHead class={`${getPlatformTableHeadClassForKind('text')}`}>
<PlatformResponsiveTableLabel compact="State" full="Status" />
</TableHead>
- <Show when={columnVisible('version')}>
- <TableHead class={getPlatformTableHeadClassForKind('text')}>Version</TableHead>
- </Show>
- <Show when={columnVisible('cpu')}>
- <TableHead class={getPlatformTableHeadClassForKind('numeric-value')}>CPU</TableHead>
- </Show>
- <Show when={columnVisible('memory')}>
- <TableHead class={getPlatformTableHeadClassForKind('numeric-value')}>
- Memory
- </TableHead>
- </Show>
- <Show when={columnVisible('uptime')}>
- <TableHead class={getPlatformTableHeadClassForKind('numeric-value')}>
- Uptime
- </TableHead>
- </Show>
<Show when={columnVisible('datastore')}>
<TableHead class={`${getPlatformTableHeadClassForKind('text')}`}>
<PlatformResponsiveTableLabel compact="Store" full="Datastore" />
@@ -812,99 +749,6 @@ export function ProxmoxBackupServersTable(props: {
)}
</Show>
</TableCell>
- <Show when={columnVisible('version')}>
- <TableCell
- class={`${getPlatformTableCellClassForKind('text')} text-muted truncate text-[11px]`}
- >
- <Show when={!row.continuesServer}>{row.version || '—'}</Show>
- </TableCell>
- </Show>
- <Show when={columnVisible('cpu')}>
- <TableCell
- class={`${getPlatformTableCellClassForKind('numeric-value')} text-base-content`}
- >
- <Show when={!row.continuesServer}>
- <Show
- when={row.online && row.cpuPercent !== undefined}
- fallback={<span class="text-muted">—</span>}
- >
- <PlatformTablePercentValue value={row.cpuPercent} />
- </Show>
- </Show>
- </TableCell>
- </Show>
- <Show when={columnVisible('memory')}>
- <TableCell class={getPlatformTableCellClassForKind('numeric-value')}>
- <Show when={!row.continuesServer}>
- <Show
- when={
- row.online &&
- row.memoryPercent !== undefined &&
- row.memoryReading?.state !== 'unavailable'
- }
- fallback={
- <span class="text-muted text-[11px]">
- {row.online && row.memoryReading?.state === 'unavailable'
- ? 'Unavailable'
- : '—'}
- </span>
- }
- >
- <span
- class="text-base-content"
- title={
- row.memoryReading?.message ??
- (row.memoryTotal !== undefined && row.memoryUsed !== undefined
- ? `${formatPlatformTableBytesValue(row.memoryUsed, '0 B')} / ${formatPlatformTableBytesValue(row.memoryTotal)}`
- : undefined)
- }
- >
- <PlatformTablePercentValue value={row.memoryPercent} />
- </span>
- <Show
- when={
- row.memoryTotal !== undefined &&
- row.memoryUsed !== undefined &&
- layoutMode() === 'full'
- }
- >
- <span class="ml-1 text-[10px] text-muted tabular-nums">
- {`(${formatPlatformTableBytesValue(row.memoryUsed, '0 B')}/${formatPlatformTableBytesValue(row.memoryTotal)})`}
- </span>
- </Show>
- <Show
- when={
- row.memoryReading?.state === 'last-known' ||
- row.memoryReading?.state === 'unknown'
- }
- >
- <span
- class="block whitespace-normal text-[10px] leading-snug text-amber-600 dark:text-amber-300"
- title={row.memoryReading?.message}
- >
- {row.memoryReading?.state === 'last-known'
- ? 'Last known'
- : 'Freshness unknown'}
- </span>
- </Show>
- </Show>
- </Show>
- </TableCell>
- </Show>
- <Show when={columnVisible('uptime')}>
- <TableCell
- class={`${getPlatformTableCellClassForKind('numeric-value')} text-base-content tabular-nums`}
- >
- <Show when={!row.continuesServer}>
- <Show
- when={row.online && (row.uptimeSeconds ?? 0) > 0}
- fallback={<span class="text-muted">—</span>}
- >
- {formatPlatformTableUptimeValue(row.uptimeSeconds)}
- </Show>
- </Show>
- </TableCell>
- </Show>
<Show when={columnVisible('datastore')}>
<TableCell
class={`${getPlatformTableCellClassForKind('text')} text-base-content truncate font-mono text-[11px]`}
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.drawer.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.drawer.test.tsx
index e3a7c6ce32..adcca8ad57 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.drawer.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.drawer.test.tsx
@@ -78,10 +78,13 @@ describe('ProxmoxBackupServersTable details', () => {
expect(resourceDetailDrawerMount).toHaveBeenCalledTimes(1);
const refreshed = makePbsResource();
- refreshed.pbs = { ...refreshed.pbs!, version: '3.2.2' };
+ refreshed.pbs = {
+ ...refreshed.pbs!,
+ datastores: [{ name: 'tank', total: 1_000, used: 550, available: 450, usagePercent: 55 }],
+ };
setServers([refreshed]);
- await waitFor(() => expect(screen.getByText('3.2.2')).toBeInTheDocument());
+ await waitFor(() => expect(screen.getByText('550 B / 1000 B')).toBeInTheDocument());
expect(resourceDetailDrawerMount).toHaveBeenCalledTimes(1);
expect(screen.getByTestId('pbs-resource-detail')).toBeInTheDocument();
});
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.memory.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.memory.test.tsx
deleted file mode 100644
index 330e3017b9..0000000000
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.memory.test.tsx
+++ /dev/null
@@ -1,230 +0,0 @@
-import { cleanup, render, waitFor, within } from '@solidjs/testing-library';
-import { createSignal } from 'solid-js';
-import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import type { Resource, ResourceMetric } from '@/types/resource';
-import { canonicalizeRealtimeResource } from '@/utils/resourceStateAdapters';
-import { buildBackupServerRows, ProxmoxBackupServersTable } from '../ProxmoxBackupServersTable';
-
-vi.mock('@/components/Infrastructure/ResourceDetailDrawer', () => ({
- ResourceDetailDrawer: () => <div>Server details</div>,
-}));
-
-const NOW = '2026-10-29T20:00:00Z';
-const OBSERVED = '2026-10-29T19:59:00Z';
-const server = (memory?: ResourceMetric, extra: Partial<Resource> = {}): Resource =>
- canonicalizeRealtimeResource({
- id: 'pbs-memory',
- type: 'pbs',
- name: 'pbs-memory',
- displayName: 'pbs-memory',
- status: 'online',
- platformId: 'pbs-memory',
- platformType: 'proxmox-pbs',
- sourceType: 'api',
- lastSeen: Date.parse(NOW),
- memory,
- pbs: {
- instanceId: 'pbs-memory',
- connectionHealth: 'healthy',
- datastores: [{ name: 'tank', total: 1000, used: 950, status: 'available' }],
- },
- ...extra,
- });
-
-function memoryCell(container: HTMLElement): HTMLElement {
- const table = container.querySelector('table')!;
- const index = [...table.querySelectorAll('th')].findIndex(
- (head) => head.textContent === 'Memory',
- );
- expect(index).toBeGreaterThan(-1);
- return table.querySelector('tbody tr')!.querySelectorAll('td')[index] as HTMLElement;
-}
-
-const show = (resource: Resource, width = 1200) =>
- render(() => <ProxmoxBackupServersTable servers={[resource]} layoutWidth={() => width} />);
-
-beforeEach(() => {
- vi.useFakeTimers({ toFake: ['Date'] });
- vi.setSystemTime(new Date(NOW));
-});
-afterEach(() => {
- cleanup();
- vi.useRealTimers();
-});
-
-describe('PBS memory evidence', () => {
- it('[partial-memory] keeps a percentage-only reading instead of inventing zero used bytes', () => {
- const { container } = show(server({ current: 75, total: 8192 }));
- const cell = memoryCell(container);
- expect(cell.textContent).toBe('75.0%');
- expect(cell.innerHTML).not.toContain('0 B');
- expect(cell.querySelector('[title]')).toBeNull();
- const row = buildBackupServerRows([server({ current: 75, total: 8192 })])[0];
- expect(row.memoryUsed).toBeUndefined();
- expect(row.memoryTotal).toBe(8192);
- expect(row.memoryPercent).toBe(75);
- });
-
- it('uses reported byte pairs, including measured zero, ahead of inconsistent percentage metadata', () => {
- const positive = show(server({ current: 0, total: 1000, used: 400 }));
- expect(memoryCell(positive.container).textContent).toContain('40.0%');
- expect(memoryCell(positive.container).textContent).toContain('400 B/1000 B');
- positive.unmount();
- const zero = show(server({ current: 99, total: 1000, used: 0 }));
- expect(memoryCell(zero.container).textContent).toBe('0.0%(0 B/1000 B)');
- });
-
- it('preserves a percentage-only measured zero without claiming a byte amount', () => {
- const { container } = show(server({ current: 0, total: 1000 }));
- expect(memoryCell(container).textContent).toBe('0.0%');
- });
-
- it.each([undefined, null, '40', -1, 101, NaN, Infinity])(
- 'does not turn invalid or absent percentage %s into a measured zero',
- (current) => {
- const { container } = show(server({ current, total: 1000 } as ResourceMetric));
- expect(memoryCell(container).textContent).toBe('—');
- },
- );
-
- it.each([
- { used: -1 },
- { used: 1001 },
- { used: NaN },
- { used: Infinity },
- { used: null },
- { used: '400' },
- { total: 0 },
- { total: -1 },
- { total: Infinity },
- { total: '1000' },
- ])('keeps a valid selected percentage without displaying an invalid byte pair %j', (patch) => {
- const { container } = show(
- server({ current: 40, total: 1000, used: 400, ...patch } as ResourceMetric),
- );
- expect(memoryCell(container).textContent).toBe('40.0%');
- });
-
- it.each([
- ['last-known', OBSERVED, 'Last known'],
- ['new-state', OBSERVED, 'Freshness unknown'],
- ['current', undefined, 'Freshness unknown'],
- ['current', '2026-10-30T20:00:00Z', 'Freshness unknown'],
- ])(
- '[retained-memory] qualifies %s observations without renewing their clock',
- (state, observedAt, label) => {
- const { container } = show(
- server({
- current: 40,
- total: 1000,
- used: 400,
- observation: { state, source: 'agent', observedAt },
- }),
- );
- const cell = memoryCell(container);
- expect(cell.textContent).toContain('40.0%');
- expect(within(cell).getByText(label)).toBeInTheDocument();
- expect(cell.querySelector('[title]')?.getAttribute('title')).toContain(
- 'Not a current measurement',
- );
- expect(within(container).getByText('Healthy')).toBeInTheDocument();
- expect(container.textContent).toContain('95.0%');
- },
- );
-
- it('[unavailable-memory] hides an explicitly unavailable reading even when old bytes remain', () => {
- const { container } = show(
- server({
- current: 40,
- total: 1000,
- used: 400,
- observation: { state: 'unavailable', source: 'agent', observedAt: OBSERVED },
- }),
- );
- expect(memoryCell(container).textContent).toBe('Unavailable');
- expect(memoryCell(container).innerHTML).not.toContain('400 B');
- expect(container.textContent).toContain('95.0%');
- });
-
- it('honours a stopped agent without invalidating an independent current memory source', () => {
- const resource = server(
- {
- current: 40,
- observation: { state: 'current', source: 'agent', observedAt: OBSERVED },
- },
- { agent: { agentId: 'host-agent', stale: true } },
- );
- const agent = show(resource);
- expect(within(memoryCell(agent.container)).getByText('Last known')).toBeInTheDocument();
- expect(memoryCell(agent.container).querySelector('[title]')?.getAttribute('title')).toContain(
- 'stopped reporting',
- );
- agent.unmount();
- resource.memory!.observation!.source = 'available-field';
- const independent = show(resource);
- expect(memoryCell(independent.container).textContent).toBe('40.0%');
- });
-
- it('keeps partial, retained, unavailable and recovered reads on the same live row', async () => {
- const [resources, setResources] = createSignal([server({ current: 75, total: 1000 })]);
- const { container } = render(() => (
- <ProxmoxBackupServersTable servers={resources()} layoutWidth={() => 1200} />
- ));
- const cell = memoryCell(container);
- const row = cell.closest('tr');
- expect(cell.textContent).toBe('75.0%');
- setResources([
- server({
- current: 40,
- total: 1000,
- used: 400,
- observation: {
- state: 'last-known',
- source: 'agent',
- observedAt: OBSERVED,
- },
- }),
- ]);
- await waitFor(() => expect(cell.textContent).toContain('Last known'));
- setResources([
- server({
- current: 40,
- total: 1000,
- used: 400,
- observation: {
- state: 'unavailable',
- source: 'agent',
- observedAt: OBSERVED,
- },
- }),
- ]);
- await waitFor(() => expect(cell.textContent).toBe('Unavailable'));
- setResources([
- server({
- current: 20,
- total: 1000,
- used: 200,
- observation: {
- state: 'current',
- source: 'agent',
- observedAt: OBSERVED,
- },
- }),
- ]);
- await waitFor(() => expect(cell.textContent).toBe('20.0%(200 B/1000 B)'));
- expect(memoryCell(container)).toBe(cell);
- expect(cell.closest('tr')).toBe(row);
- });
-
- it('keeps host readings suppressed offline and present only once across datastores', () => {
- const resource = server({ current: 40, total: 1000, used: 400 });
- resource.pbs!.datastores!.push({ name: 'offsite', total: 1000, used: 500 });
- const online = show(resource);
- expect(online.container.textContent?.match(/40.0%/g)).toHaveLength(1);
- online.unmount();
- resource.pbs!.connectionHealth = 'unreachable';
- const offline = show(resource);
- expect(memoryCell(offline.container).textContent).toBe('—');
- expect(offline.container.textContent).not.toContain('40.0%');
- });
-});
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts
index 82fbbc35ff..9d5c3e22ca 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts
@@ -49,16 +49,18 @@ describe('buildBackupServerRows', () => {
expect(rows.find((row) => row.datastore?.name === 'offsite')?.datastore?.usagePercent).toBe(95);
});
- it('carries host CPU, memory, and uptime onto every datastore row of the server', () => {
+ it('leaves host figures to the drawer and keeps the host resource on every row', () => {
const rows = buildBackupServerRows([makePbsResource()]);
expect(rows).toHaveLength(2);
for (const row of rows) {
- expect(row.cpuPercent).toBeCloseTo(12.4);
- expect(row.memoryPercent).toBeCloseTo(40);
- expect(row.memoryUsed).toBe(3_200);
- expect(row.memoryTotal).toBe(8_000);
- expect(row.uptimeSeconds).toBe(1_036_800);
+ // CPU, memory and uptime are read by the server's drawer from the row's
+ // resource, not copied into datastore rows.
+ expect(row).not.toHaveProperty('cpuPercent');
+ expect(row).not.toHaveProperty('memoryPercent');
+ expect(row).not.toHaveProperty('uptimeSeconds');
+ expect(row.resource.cpu?.current).toBeCloseTo(12.4);
+ expect(row.resource.uptime).toBe(1_036_800);
}
expect(rows.map((row) => row.datastore?.name)).toEqual(['offsite', 'tank']);
// The table shows host cells once per server: only later rows continue it.
@@ -145,9 +147,7 @@ describe('buildBackupServerRows', () => {
expect(rows).toHaveLength(1);
expect(rows[0].online).toBe(false);
- expect(rows[0].cpuPercent).toBeUndefined();
- expect(rows[0].memoryPercent).toBeUndefined();
- expect(rows[0].uptimeSeconds).toBeUndefined();
+ expect(rows[0].datastore).toBeUndefined();
});
});
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
index 62833bedc5..f3a5ddb045 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
@@ -395,14 +395,16 @@ describe('ProxmoxBackupsTable', () => {
};
// Two datastores of one server read as one server, not two identical ones:
- // the host cells sit on its first row, and the second row keeps its name
- // and its own datastore figures.
+ // status sits on its first row, and the second row keeps its name and its
+ // own datastore figures. Host CPU, memory, uptime and version are in the
+ // server's drawer, not the row.
expect(dataRows()).toHaveLength(2);
expect(within(table).getAllByText('pbs-main')).toHaveLength(2);
- for (const column of ['status', 'version', 'cpu', 'memory', 'uptime']) {
- expect(cellText(0, column)).not.toBe('');
- expect(cellText(1, column)).toBe('');
- }
+ expect(cellText(0, 'status')).not.toBe('');
+ expect(cellText(1, 'status')).toBe('');
+ expect(
+ columns.filter((column) => ['version', 'cpu', 'memory', 'uptime'].includes(column ?? '')),
+ ).toEqual([]);
expect(cellText(0, 'datastore')).toBe('main');
expect(cellText(1, 'datastore')).toBe('offsite');
expect(cellText(1, 'used')).toContain('25');
@@ -1060,23 +1062,16 @@ describe('ProxmoxBackupsTable', () => {
);
});
- it('keeps PBS backup count and uptime cells on shared platform primitives', () => {
+ it('keeps PBS backup count and capacity cells on shared platform primitives', () => {
const directLocaleCountCall = 'row.backupCount.' + 'toLocale' + 'String()';
- const directCpuPercentRound = 'Math.round(row.cpuPercent ?? 0)}' + '%';
- const directMemoryPercentRound = 'Math.round(row.memoryPercent ?? 0)}' + '%';
const directDatastorePercentRound = 'Math.round(pct() ?? 0)}' + '%';
- const directUptimeCall = 'formatUptime(row.uptimeSeconds ?? 0)';
expect(proxmoxBackupServersTableSource).toContain('PlatformTableNumberValue');
expect(proxmoxBackupServersTableSource).toContain('formatPlatformTableIntegerValue');
expect(proxmoxBackupServersTableSource).toContain('PlatformTablePercentValue');
expect(proxmoxBackupServersTableSource).toContain('formatPlatformTablePercentValue');
- expect(proxmoxBackupServersTableSource).toContain('formatPlatformTableUptimeValue');
expect(proxmoxBackupServersTableSource).not.toContain(directLocaleCountCall);
- expect(proxmoxBackupServersTableSource).not.toContain(directCpuPercentRound);
- expect(proxmoxBackupServersTableSource).not.toContain(directMemoryPercentRound);
expect(proxmoxBackupServersTableSource).not.toContain(directDatastorePercentRound);
- expect(proxmoxBackupServersTableSource).not.toContain(directUptimeCall);
});
it('routes PBS server expansion through the canonical resource drawer', () => {
@@ -3579,18 +3574,18 @@ describe('PBS inventory state column', () => {
const countColumn = table.querySelector<HTMLElement>(
'col[data-proxmox-backups-column="backups"]',
)!;
- // Server, status, CPU, memory, datastore, used, jobs, then the count.
+ // Server, status, datastore, used, jobs, then the count.
const cells = table.querySelector('tbody tr')!.querySelectorAll('td');
- expect(countColumn.style.width).toBe('12%');
- expect(cells[7]).toHaveTextContent(/^Loading$/);
+ expect(countColumn.style.width).toBe('11%');
+ expect(cells[5]).toHaveTextContent(/^Loading$/);
setState('unavailable');
- expect(cells[7]).toHaveTextContent(/^Unavailable$/);
+ expect(cells[5]).toHaveTextContent(/^Unavailable$/);
expect(cells[1]).toHaveTextContent('Healthy');
- expect(cells[5]).toHaveTextContent('40.0%');
- expect(cells[5]).toHaveTextContent('400 B / 1000 B');
+ expect(cells[3]).toHaveTextContent('40.0%');
+ expect(cells[3]).toHaveTextContent('400 B / 1000 B');
setState('available');
- expect(cells[7]).toHaveTextContent(/^0$/);
- expect(countColumn.style.width).toBe('12%');
+ expect(cells[5]).toHaveTextContent(/^0$/);
+ expect(countColumn.style.width).toBe('11%');
});
});
diff --git a/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx b/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx
index 0ea9aea458..d89b867ad5 100644
--- a/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx
@@ -47,14 +47,16 @@ const rows = (servers: Resource[], payload: unknown) =>
buildBackupServerRows(servers, parsePBSBackupInventory(payload).backups);
// No DOM marker dependency: the table's summary rows have count-column cells,
-// whereas a detail row has only its spanning cell.
-const displayedCounts = (table: HTMLElement) => {
- const index = [...table.querySelectorAll('th')].findIndex(
+// whereas a detail row has only its spanning cell. Only the table's own body
+// rows count: an open drawer nests its own detail table inside a detail row.
+const displayedCounts = (owner: HTMLElement) => {
+ const table = owner.matches('table') ? owner : owner.querySelector('table')!;
+ const index = [...table.querySelectorAll(':scope > thead th')].findIndex(
(cell) => cell.getAttribute('aria-label') === 'Backups',
);
- return [...table.querySelectorAll('tbody tr')]
- .filter((row) => row.querySelectorAll('td').length > index)
- .map((row) => row.querySelectorAll('td')[index].textContent?.trim());
+ return [...table.querySelectorAll(':scope > tbody > tr')]
+ .filter((row) => row.querySelectorAll(':scope > td').length > index)
+ .map((row) => row.querySelectorAll(':scope > td')[index].textContent?.trim());
};
afterEach(() => {
diff --git a/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts b/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts
index e1fd4e1c75..be0ab6d798 100644
--- a/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts
+++ b/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts
@@ -61,18 +61,25 @@ describe('Proxmox backups responsive table presentation', () => {
expect(ids(getBackupServerColumns('operational'))).toEqual([
'server',
'status',
- 'cpu',
- 'memory',
'datastore',
'used',
'jobs',
'backups',
]);
- expect(ids(getBackupServerColumns('full'))).toHaveLength(11);
+ // Host CPU, memory, uptime and version live in the server's drawer.
+ expect(ids(getBackupServerColumns('full'))).toEqual([
+ 'server',
+ 'status',
+ 'datastore',
+ 'used',
+ 'jobs',
+ 'backups',
+ 'dedup',
+ ]);
});
it.each([
- ['operational', '12%'],
+ ['operational', '11%'],
['expanded', '9%'],
['full', '8%'],
] as const)(
@@ -91,9 +98,9 @@ describe('Proxmox backups responsive table presentation', () => {
it.each([
['basic', '15.5%'],
- ['operational', '11%'],
- ['expanded', '10%'],
- ['full', '10%'],
+ ['operational', '13%'],
+ ['expanded', '12%'],
+ ['full', '14%'],
] as const)('fits a worded job result such as "Verify failed" in %s', (layout, width) => {
expect(getBackupServerColumnWidthStyle('jobs', layout)).toEqual({ width });
const total = getBackupServerColumns(layout).reduce(
diff --git a/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts b/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
index 21ea9e38a7..b234de156e 100644
--- a/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
+++ b/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
@@ -11,17 +11,7 @@ export type ProxmoxBackupsTableLayoutMode =
'compact' | 'basic' | 'operational' | 'expanded' | 'full';
export type BackupServerColumnId =
- | 'server'
- | 'status'
- | 'version'
- | 'cpu'
- | 'memory'
- | 'uptime'
- | 'datastore'
- | 'used'
- | 'jobs'
- | 'backups'
- | 'dedup';
+ 'server' | 'status' | 'datastore' | 'used' | 'jobs' | 'backups' | 'dedup';
export type CoverageColumnId =
'workload' | 'type' | 'targetId' | 'node' | 'posture' | 'latest' | 'task';
@@ -69,10 +59,6 @@ export const getRecoverableLayoutForContainer = (width: number): ProxmoxBackupsT
export const BACKUP_SERVER_COLUMNS: readonly BackupTableColumn<BackupServerColumnId>[] = [
{ id: 'server', label: 'Backup server', kind: 'name' },
{ id: 'status', label: 'Status', kind: 'text' },
- { id: 'version', label: 'Version', kind: 'text' },
- { id: 'cpu', label: 'CPU', kind: 'numeric-value' },
- { id: 'memory', label: 'Memory', kind: 'numeric-value' },
- { id: 'uptime', label: 'Uptime', kind: 'numeric-value' },
{ id: 'datastore', label: 'Datastore', kind: 'text' },
{ id: 'used', label: 'Used', kind: 'numeric-value' },
{ id: 'jobs', label: 'Jobs', kind: 'text' },
@@ -85,16 +71,17 @@ const BACKUP_SERVER_VISIBLE: Record<
readonly BackupServerColumnId[]
> = {
// Reachability and datastore exhaustion are the two risks that can stop all
- // future backups. Host telemetry and space-efficiency context return only as
- // the table gains enough room to keep those headline answers readable. The
- // phone projection keeps those two answers whole ("Healthy", "33.6%"); its
- // job results live in the row's drawer. Job results (GC, prune, verify,
- // sync) are the next answer, so they take the first wider layout ahead of
- // the backup count, which Coverage and By date already answer per guest.
+ // future backups, so every layout keeps them whole ("Healthy", "33.6%"). Job
+ // results (GC, prune, verify, sync) are the next answer; on phones a job
+ // problem or a fill forecast takes State instead. The backup count and dedup
+ // follow as width allows; Coverage and By date already answer per guest.
+ // Host CPU, memory, uptime and version live in the server's drawer, with
+ // their history: they say whether the box is alive, which Status already
+ // answers, and took the row's room from the datastore answers.
compact: ['server', 'status', 'datastore', 'used'],
basic: ['server', 'status', 'datastore', 'used', 'jobs'],
- operational: ['server', 'status', 'cpu', 'memory', 'datastore', 'used', 'jobs', 'backups'],
- expanded: ['server', 'status', 'cpu', 'memory', 'uptime', 'datastore', 'used', 'jobs', 'backups'],
+ operational: ['server', 'status', 'datastore', 'used', 'jobs', 'backups'],
+ expanded: BACKUP_SERVER_COLUMNS.map((column) => column.id),
full: BACKUP_SERVER_COLUMNS.map((column) => column.id),
};
@@ -102,54 +89,22 @@ const BACKUP_SERVER_WEIGHTS: Record<
ProxmoxBackupsTableLayoutMode,
Partial<Record<BackupServerColumnId, number>>
> = {
- // State must fit a job problem ("Sync failed", "Verify late") because the
- // phone layout has no Jobs column, and capacity must fit "Unavailable".
- // Datastore names truncate at either width; keep the shared 40% identity
- // anchor. The compact status omits its redundant dot.
+ // State must fit a job problem ("Sync failed", "Verify late") or a fill
+ // forecast ("Full in ~4d") because the phone layout has no Jobs column, and
+ // capacity must fit "Unavailable". Datastore names truncate at either width;
+ // keep the shared 40% identity anchor. The compact status omits its
+ // redundant dot.
compact: { server: 40, status: 24, datastore: 13, used: 23 },
- // Jobs must fit "Verify failed" and Count must fit Loading and
- // Unavailable, not just short values. Keep reachability and the used/total
- // pair; datastore names already disclose their full value on hover and in
- // the existing detail. The 30% identity anchor below still owns the server
- // column in this band.
+ // Jobs must fit "Verify failed" and Used must fit "Unavailable" or a fill
+ // forecast pill, not just short values. The 30% identity anchor below still
+ // owns the server column in this band.
basic: { server: 30, status: 13.6, datastore: 14, used: 26.9, jobs: 15.5 },
- operational: {
- server: 18,
- status: 11,
- cpu: 8,
- memory: 11,
- datastore: 12,
- used: 17,
- jobs: 11,
- backups: 12,
- },
- expanded: {
- server: 17,
- status: 10,
- cpu: 7,
- memory: 10,
- uptime: 8,
- datastore: 11,
- used: 18,
- jobs: 10,
- backups: 9,
- },
- // Memory and Used carry a percentage plus a used/total pair, the longest
- // values in the row, so they take the slack from the one-word status and
- // version cells instead of truncating.
- full: {
- server: 14,
- status: 7,
- version: 6,
- cpu: 5,
- memory: 12.5,
- uptime: 6,
- datastore: 11,
- used: 14.5,
- jobs: 10,
- backups: 8,
- dedup: 6,
- },
+ // Used carries a percentage plus the used/total pair or the forecast pill,
+ // the longest value in the row, so it keeps the widest share.
+ operational: { server: 24, status: 13, datastore: 17, used: 22, jobs: 13, backups: 11 },
+ // At the 900px breakpoint Count needs 9% (81px) to fit "Unavailable".
+ expanded: { server: 22, status: 12, datastore: 16, used: 21, jobs: 12, backups: 9, dedup: 8 },
+ full: { server: 22, status: 11, datastore: 17, used: 20, jobs: 14, backups: 8, dedup: 8 },
};
export const getBackupServerColumns = (