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.

Name Backup servers rows by their datastore

rcourtmanabb89293b6e6
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
index d6eab93366..0928d69d04 100644
--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md
+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
@@ -544,12 +544,14 @@ route, navigation, access or backup operation changes.
and phone, so a filtering row looks clickable without adding height. Rows that
open nothing leave the track empty, so every row's columns still line up.
-### Backup servers datastore rows name their server once (2 November 2026)
+### Backup servers rows lead with the datastore (2 November 2026)
-`ProxmoxBackupServersTable` renders `ResourceNameWithWebInterfaceLink` only on
-a server's first datastore row; rows with `continuesServer` leave the name cell
-to the detail toggle plus an `sr-only` server name, so the shared web-interface
-link appears once per server rather than once per datastore.
+`getBackupServerColumns` drops the `server` and separate `datastore` columns for
+one `datastore` identity column (`kind: 'name'`) that keeps the shared identity
+anchor (40% on phones, 30% in the basic band). `ProxmoxBackupServersTable`
+renders the datastore name in it, unshrinking up to the cell width, followed by
+`ResourceNameWithWebInterfaceLink` for the server in 10px muted text, which
+truncates first. The status cell renders on every row.
### Backups By date carries no activity chart (2 November 2026)
@@ -9745,11 +9747,11 @@ title because maintenance windows live elsewhere.
### Repeated parent cells show once per group
When a table keeps one row per child so each child keeps its own figures,
-toggle and link (PBS datastores under a server), the parent's own readings
-render once, on the group's first row. Later rows keep the parent's name,
-muted, and leave the parent cells empty, so one parent never reads as several
-identical ones. The rows must already be grouped; the Backups "Backup server"
-table follows this through `BackupServerRow.continuesServer`.
+toggle and link, the parent's own readings render once, on the group's first
+row, and later rows leave the parent cells empty, so one parent never reads as
+several identical ones. The rows must already be grouped. The Backups servers
+table no longer uses this rule: since 2 November 2026 each row is named by its
+datastore with the server beside it, and carries the server's status itself.
### A narrow table folds a dropped column's problem into one it keeps
diff --git a/docs/release-control/v6/internal/subsystems/storage-recovery.md b/docs/release-control/v6/internal/subsystems/storage-recovery.md
index f31102925a..dc0b729ce2 100644
--- a/docs/release-control/v6/internal/subsystems/storage-recovery.md
+++ b/docs/release-control/v6/internal/subsystems/storage-recovery.md
@@ -1770,10 +1770,10 @@ checks establish no native datastore repair, backup/thaw or release acceptance.
The Backups "Backup server" table keeps one row per server and datastore, so
each datastore keeps its own capacity, count, dedup, detail toggle and web
-link. Host status, version, CPU, memory and uptime render only on a server's
-first datastore row (`buildBackupServerRows` marks later rows
-`continuesServer`); later rows show the server name muted and leave those host
-cells empty, so two datastores no longer read as two identical servers. Rows
+link. (Superseded 2 November 2026: rows are now named by their datastore with
+the server beside them, every row shows its server's status, and
+`continuesServer` is gone; host version, CPU, memory and uptime live in the
+server's drawer.) Rows
stay grouped (servers by name then ID, datastores by name), and windowing
follows the scroll position, so a later row is only ever mounted without its
first row once that first row has scrolled out of view. Capacity evidence is
@@ -5078,16 +5078,19 @@ keeps its columns aligned. Rows stay 32px, the accessible names are unchanged,
and the phone bar narrows from 5rem to 4rem to make room. Which workloads each
reason selects is unchanged.
-### A server's later datastore rows stop repeating its name (2 November 2026)
-
-The Backup servers table keeps one row per datastore, but a server's later
-datastore rows no longer show its name or web-interface link. A muted repeated
-name still read as a second PBS server on a real two-datastore install. The
-name, status and link now appear once, on the server's first row; later rows
-keep their toggle (whose accessible name still names the server and datastore)
-and a screen-reader-only server name, and their drawer still reads the server.
-Earlier notes here that later rows keep the muted name and a link per datastore
-are historical.
+### Backup servers rows are named by their datastore (2 November 2026)
+
+The Backup servers table keeps one row per datastore, but each row is now
+named by its datastore, with its server beside it in muted text and that
+server's web-interface link, the way restore point rows name a workload and
+its connection. The first column is "Datastore"; the separate Datastore column
+is gone; every row carries its server's status. Rows named by their server read
+as two PBS servers on a real two-datastore install, and hiding the repeated
+name on later rows left a nameless row with only a toggle.
+`BackupServerRow.continuesServer` is removed. A server with no datastore data
+still gets one reachability row named by the server. Earlier notes in this
+contract that status shows once per server, or that later rows keep a muted
+server name, are historical.
### Restore points drop the per-day chart (2 November 2026)
diff --git a/docs/release-control/v6/internal/subsystems/unified-resources.md b/docs/release-control/v6/internal/subsystems/unified-resources.md
index 04344e038b..592d862fcc 100644
--- a/docs/release-control/v6/internal/subsystems/unified-resources.md
+++ b/docs/release-control/v6/internal/subsystems/unified-resources.md
@@ -222,13 +222,14 @@ 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 servers rows name a PBS resource once (2 November 2026)
+### Backup servers rows name the datastore, then its PBS resource (2 November 2026)
`ProxmoxBackupServersTable` still renders one row per datastore of a `pbs`
-resource, but only the resource's first row shows its name and web-interface
-link; later rows carry the name for screen readers alone and keep their own
-detail toggle and drawer. The rows and their resource identity are unchanged;
-only the repeated visible label is gone.
+resource, keyed by resource and datastore. Each row now leads with the
+datastore name and shows the resource's name and web-interface link beside it,
+and every row's State cell reads the resource's connection status (or, on
+phones, a job problem or fill forecast that takes its place). The rows, their keys and
+their drawers are unchanged; `BackupServerRow.continuesServer` is removed.
### Backup empty states name only filters that exist (2 November 2026)
@@ -1025,10 +1026,10 @@ server health or the other source's artifacts. Fixed diagnostics expose no
response body. The inventory parser, mounted table and
`browser-tests/backup-inventory-format.cjs` exercise that combined boundary.
-`BackupServerRow.continuesServer` is presentation only: every row still
-carries the server's host readings and resource snapshot, and the model test
-pins the readings on every row while the flag is true only for a server's
-later datastore rows.
+Every `BackupServerRow` carries the server's host readings and resource
+snapshot, and the model test pins the readings on every row. (The former
+`continuesServer` presentation flag was removed on 2 November 2026, when rows
+began naming their datastore first.)
`BackupServerRow.jobs` reads the PBS resource's existing `jobHealthEvidence`
(the backend's per-job posture and reason) and binds each job to a datastore
diff --git a/frontend-modern/browser-verification/35f138ce7b169880.json b/frontend-modern/browser-verification/35f138ce7b169880.json
new file mode 100644
index 0000000000..65b36e5f25
--- /dev/null
+++ b/frontend-modern/browser-verification/35f138ce7b169880.json
@@ -0,0 +1,40 @@
+{
+ "version": 1,
+ "base_sha": "8254756f4a9cccf1f205cff8f3f6d6e3eeab6109",
+ "verified_at": "2026-11-02T17:55:00Z",
+ "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": "09333b379010aea294ca0e1f552c4bffdbadf3128147a5bbd00fa5ddd071d9c8",
+ "frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts": "62093b6925501024cd3ea046145cac3e29ca97952589f1d0641d880c842fff3c"
+ },
+ "routes": [
+ "/proxmox/backups/date"
+ ],
+ "viewports": [
+ {
+ "width": 1440,
+ "height": 1000
+ },
+ {
+ "width": 375,
+ "height": 812
+ }
+ ],
+ "states": [
+ "private mock-mode backend built from this branch on pulse-dev",
+ "Backup servers table with a two-datastore server, closed and with the second row expanded",
+ "dark and light themes, desktop and phone layouts"
+ ],
+ "interactions": [
+ "built this branch and ran it in mock mode on pulse-dev, signed in and opened Proxmox > Backups > By date at 1440x1000 and 375x812 in dark and light themes",
+ "the Backup servers table's first column reads Datastore: rows read 'offsite-vault backup-vault', 'primary-vault backup-vault', 'primary-vault dr-vault', each with Healthy in State; no separate Datastore column",
+ "rows measured 33px on desktop and 32px on phone; no horizontal page overflow at either width",
+ "on phone the datastore names stay whole and the server name truncates; the datastore span computes max-width calc(100% - 32px), leaving room for the server's web link",
+ "opened the primary-vault row's drawer on desktop and tapped it on phone: the drawer reads Backup reader backup-vault, Datastore primary-vault",
+ "the same build also ran against a copy of the maintainer's real Proxmox and PBS config for the maintainer to inspect"
+ ]
+}
diff --git a/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx b/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
index 78b01458e7..d5dcf6ab52 100644
--- a/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
+++ b/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
@@ -55,14 +55,15 @@ import {
// where the rows read as generic "PVE" storage. Each datastore row also says
// whether its GC, prune, verify and sync jobs last succeeded, because a failed
// sync or verify leaves backups that exist but cannot be relied on. One row
-// per datastore, labelled by its server; a server with no datastore data still
-// gets a reachability row.
+// per datastore, named by the datastore with its server beside it in muted
+// text, the way restore point rows name a workload and its connection; a
+// server with no datastore data still gets a reachability row under its own
+// name. Rows named by their server read as two servers, and hiding the
+// repeated name left a nameless row.
// PBS hosts left the v5 nodes table in the v6 IA, so this is where their health
// 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. The
-// server's name, status and web link show once, on its first datastore row; its
-// later rows keep only their toggle, so two datastores never read as two
-// servers. A muted repeated name still read as a second server.
+// version and their history are in the server's drawer, one click away. Every
+// row carries its server's status and web link, so each row reads on its own.
interface BackupServerRow {
key: string;
@@ -74,8 +75,6 @@ interface BackupServerRow {
// The worst backend-judged GC, prune, verify or sync result for this store.
jobs: DatastoreJobSummary;
backupCount: number;
- // A later datastore row of the server on the row above: host cells stay empty.
- continuesServer: boolean;
}
// Key by instance and datastore so multi-datastore servers get accurate counts.
@@ -510,14 +509,12 @@ export function buildBackupServerRows(
resource: resourceSnapshot(),
jobs: summarizeDatastoreJobs(server.pbs?.jobHealthEvidence, undefined),
backupCount: 0,
- continuesServer: false,
});
continue;
}
- for (const [index, datastore] of datastores.entries()) {
+ for (const datastore of datastores) {
rows.push({
key: `${server.id}:${datastore.name}`,
- continuesServer: index > 0,
...host,
resource: resourceSnapshot(),
// Row stores reconcile independently from the nested PBS snapshot. Do
@@ -588,17 +585,10 @@ export function ProxmoxBackupServersTable(props: {
}
header={
<>
- <TableHead class={`${getPlatformTableHeadClassForKind('name')}`}>
- <PlatformResponsiveTableLabel compact="Server" full="Backup server" />
- </TableHead>
+ <TableHead class={`${getPlatformTableHeadClassForKind('name')}`}>Datastore</TableHead>
<TableHead class={`${getPlatformTableHeadClassForKind('text')}`}>
<PlatformResponsiveTableLabel compact="State" full="Status" />
</TableHead>
- <Show when={columnVisible('datastore')}>
- <TableHead class={`${getPlatformTableHeadClassForKind('text')}`}>
- <PlatformResponsiveTableLabel compact="Store" full="Datastore" />
- </TableHead>
- </Show>
<TableHead class={`${getPlatformTableHeadClassForKind('numeric-value')}`}>
Used
</TableHead>
@@ -677,7 +667,7 @@ export function ProxmoxBackupServersTable(props: {
})}
>
<TableCell
- class={`${getPlatformTableCellClassForKind('name')} truncate text-base-content font-medium`}
+ class={`${getPlatformTableCellClassForKind('name')} truncate text-base-content`}
title={[row.serverName, row.datastore?.name].filter(Boolean).join(' · ')}
>
<div class="flex min-w-0 items-center gap-1">
@@ -692,15 +682,37 @@ export function ProxmoxBackupServersTable(props: {
onToggle={() => detail.toggle(rowIdentity)}
/>
<Show
- when={!row.continuesServer}
- fallback={<span class="sr-only">{row.serverName}</span>}
+ when={row.datastore}
+ fallback={
+ <ResourceNameWithWebInterfaceLink
+ name={row.serverName}
+ url={row.resource.customUrl}
+ class="min-w-0 flex-1"
+ nameClass="block min-w-0 flex-1 truncate font-medium"
+ />
+ }
>
- <ResourceNameWithWebInterfaceLink
- name={row.serverName}
- url={row.resource.customUrl}
- class="min-w-0 flex-1"
- nameClass="block min-w-0 flex-1 truncate"
- />
+ {(datastore) => (
+ <div class="flex min-w-0 flex-1 items-baseline gap-1.5">
+ {/* The datastore name keeps priority but leaves room
+ for the server's web link, so a long name can never
+ push a focusable link out of view. */}
+ <span
+ class="min-w-0 max-w-[calc(100%-2rem)] shrink-0 truncate font-medium"
+ data-backup-server-datastore
+ >
+ {datastore().name}
+ </span>
+ <span class="flex min-w-6 flex-1">
+ <ResourceNameWithWebInterfaceLink
+ name={row.serverName}
+ url={row.resource.customUrl}
+ class="min-w-0 flex-1"
+ nameClass="block min-w-0 truncate text-[10px] text-muted"
+ />
+ </span>
+ </div>
+ )}
</Show>
</div>
</TableCell>
@@ -720,24 +732,22 @@ export function ProxmoxBackupServersTable(props: {
</span>
}
>
- <Show when={!row.continuesServer}>
- <div class="flex items-center gap-2">
- <Show when={layoutMode() !== 'compact'}>
- <StatusDot
- size="sm"
- variant={row.online ? 'success' : 'danger'}
- title={row.connectionLabel}
- ariaHidden
- />
- </Show>
- <span
- class="truncate text-[11px] text-base-content"
+ <div class="flex items-center gap-2">
+ <Show when={layoutMode() !== 'compact'}>
+ <StatusDot
+ size="sm"
+ variant={row.online ? 'success' : 'danger'}
title={row.connectionLabel}
- >
- {row.connectionLabel}
- </span>
- </div>
- </Show>
+ ariaHidden
+ />
+ </Show>
+ <span
+ class="truncate text-[11px] text-base-content"
+ title={row.connectionLabel}
+ >
+ {row.connectionLabel}
+ </span>
+ </div>
</Show>
}
>
@@ -752,14 +762,6 @@ export function ProxmoxBackupServersTable(props: {
)}
</Show>
</TableCell>
- <Show when={columnVisible('datastore')}>
- <TableCell
- class={`${getPlatformTableCellClassForKind('text')} text-base-content truncate font-mono text-[11px]`}
- title={row.datastore?.name}
- >
- {row.datastore?.name ?? '—'}
- </TableCell>
- </Show>
<TableCell class={getPlatformTableCellClassForKind('numeric-value')}>
<Show
when={row.datastore}
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts
index 9d5c3e22ca..882276bc2b 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.test.ts
@@ -63,11 +63,9 @@ describe('buildBackupServerRows', () => {
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.
- expect(rows.map((row) => row.continuesServer)).toEqual([false, true]);
});
- it('starts every server, and every reachability-only row, as its own first row', () => {
+ it('groups datastore rows by server, with reachability-only rows last', () => {
const first = makePbsResource();
const second = makePbsResource({ id: 'pbs-2', name: 'pbs-second' });
const empty = makePbsResource({
@@ -78,12 +76,12 @@ describe('buildBackupServerRows', () => {
const rows = buildBackupServerRows([empty, second, first]);
- expect(rows.map((row) => [row.serverName, row.continuesServer])).toEqual([
- ['pbs-main', false],
- ['pbs-main', true],
- ['pbs-second', false],
- ['pbs-second', true],
- ['pbs-third', false],
+ expect(rows.map((row) => [row.serverName, row.datastore?.name ?? null])).toEqual([
+ ['pbs-main', 'offsite'],
+ ['pbs-main', 'tank'],
+ ['pbs-second', 'offsite'],
+ ['pbs-second', 'tank'],
+ ['pbs-third', null],
]);
});
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.webInterface.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.webInterface.test.tsx
index 2e1afec5fe..d0392e04f3 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.webInterface.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.webInterface.test.tsx
@@ -54,7 +54,7 @@ const host: Resource = {
describe('PBS Backups web-interface parity', () => {
it.each([320, 390, 768, 1365])(
- 'uses the service-owned URL once per server at width %s without opening details',
+ 'uses the service-owned URL on every datastore at width %s without opening details',
(width) => {
const ancestorKeydown = vi.fn();
const { container } = render(() => (
@@ -65,13 +65,7 @@ describe('PBS Backups web-interface parity', () => {
const links = within(container).getAllByRole('link', {
name: 'Open web interface for pbs-main',
});
- // The second datastore row names no server and repeats no link, so the
- // two datastores never read as two servers.
- expect(links).toHaveLength(1);
- const names = within(container).getAllByText('pbs-main');
- expect(names).toHaveLength(2);
- expect(names[0]).not.toHaveClass('sr-only');
- expect(names[1]).toHaveClass('sr-only');
+ expect(links).toHaveLength(2);
for (const link of links) {
expect(link).toHaveAttribute('href', 'https://pbs-east.example:8007');
expect(link).toHaveAttribute('target', '_blank');
@@ -106,12 +100,14 @@ describe('PBS Backups web-interface parity', () => {
within(container)
.getAllByRole('link')
.map((a) => a.getAttribute('href'));
- expect(hrefs()).toEqual([east.customUrl, west.customUrl]);
+ expect(hrefs()).toEqual([east.customUrl, east.customUrl, west.customUrl, west.customUrl]);
setServers([
{ ...west, pbs: { ...west.pbs!, datastores: [...west.pbs!.datastores!].reverse() } },
east,
]);
- await waitFor(() => expect(hrefs()).toEqual([east.customUrl, west.customUrl]));
+ await waitFor(() =>
+ expect(hrefs()).toEqual([east.customUrl, east.customUrl, west.customUrl, west.customUrl]),
+ );
});
it.each([
@@ -127,7 +123,7 @@ describe('PBS Backups web-interface parity', () => {
expect(within(container).queryByRole('link')).not.toBeInTheDocument();
expect(
within(container).getAllByRole('img', { name: 'Web interface URL for pbs-main is invalid' }),
- ).toHaveLength(1);
+ ).toHaveLength(2);
expect(within(container).getAllByText('pbs-main')).toHaveLength(2);
});
@@ -135,7 +131,7 @@ describe('PBS Backups web-interface parity', () => {
const pbs = server();
const [servers, setServers] = createSignal([pbs, host]);
const { container } = render(() => <ProxmoxBackupServersTable servers={servers()} />);
- expect(within(container).getAllByRole('link')).toHaveLength(1);
+ expect(within(container).getAllByRole('link')).toHaveLength(2);
setServers([{ ...pbs, customUrl: 'javascript:alert(1)' }, host]);
await waitFor(() => expect(within(container).queryByRole('link')).not.toBeInTheDocument());
setServers([{ ...pbs, customUrl: '' }, host]);
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
index 7fb6e0f2e4..9de59f5d4b 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
@@ -354,7 +354,7 @@ describe('ProxmoxBackupsTable', () => {
expect(apiFetchMock.mock.calls.filter(([url]) => url === '/api/backups/pbs')).toHaveLength(1);
});
- it('shows host cells once for a server with several datastores', async () => {
+ it('names each row by its datastore, with its server beside it', async () => {
mockBackupAPIs();
const twoStores = {
...pbsServerResource,
@@ -391,22 +391,25 @@ describe('ProxmoxBackupsTable', () => {
return dataRows()[row].querySelectorAll('td')[columns.indexOf(column)].textContent?.trim();
};
- // Two datastores of one server read as one server, not two: its name and
- // status sit on its first row, and the second row shows only its own
- // datastore figures, naming the server for screen readers alone. Host CPU,
- // memory, uptime and version are in the server's drawer, not the row.
+ // Two datastores of one server read as two datastores, not two servers:
+ // each row leads with its datastore name and carries its server and status,
+ // so every row reads on its own. There is no separate server column. Host
+ // CPU, memory, uptime and version are in the server's drawer, not the row.
expect(dataRows()).toHaveLength(2);
- const names = within(table).getAllByText('pbs-main');
- expect(names).toHaveLength(2);
- expect(names[0]).not.toHaveClass('sr-only');
- expect(names[1]).toHaveClass('sr-only');
+ expect(columns[0]).toBe('datastore');
+ expect(columns).not.toContain('server');
+ const datastoreNames = Array.from(table.querySelectorAll('[data-backup-server-datastore]')).map(
+ (name) => name.textContent,
+ );
+ expect(datastoreNames).toEqual(['main', 'offsite']);
+ expect(within(table).getAllByText('pbs-main')).toHaveLength(2);
expect(cellText(0, 'status')).not.toBe('');
- expect(cellText(1, 'status')).toBe('');
+ expect(cellText(1, 'status')).toBe(cellText(0, 'status'));
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(0, 'datastore')).toBe('mainpbs-main');
+ expect(cellText(1, 'datastore')).toBe('offsitepbs-main');
expect(cellText(1, 'used')).toContain('25');
const offsite = within(table).getByRole('button', {
name: 'Expand details for pbs-main · datastore offsite',
@@ -3456,17 +3459,17 @@ describe('PBS inventory state column', () => {
const countColumn = table.querySelector<HTMLElement>(
'col[data-proxmox-backups-column="backups"]',
)!;
- // Server, status, datastore, used, jobs, then the count.
+ // Datastore (with its server), status, used, jobs, then the count.
const cells = table.querySelector('tbody tr')!.querySelectorAll('td');
expect(countColumn.style.width).toBe('11%');
- expect(cells[5]).toHaveTextContent(/^Loading$/);
+ expect(cells[4]).toHaveTextContent(/^Loading$/);
setState('unavailable');
- expect(cells[5]).toHaveTextContent(/^Unavailable$/);
+ expect(cells[4]).toHaveTextContent(/^Unavailable$/);
expect(cells[1]).toHaveTextContent('Healthy');
- expect(cells[3]).toHaveTextContent('40.0%');
- expect(cells[3]).toHaveTextContent('400 B / 1000 B');
+ expect(cells[2]).toHaveTextContent('40.0%');
+ expect(cells[2]).toHaveTextContent('400 B / 1000 B');
setState('available');
- expect(cells[5]).toHaveTextContent(/^0$/);
+ expect(cells[4]).toHaveTextContent(/^0$/);
expect(countColumn.style.width).toBe('11%');
});
});
diff --git a/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts b/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts
index be0ab6d798..8476fa7a48 100644
--- a/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts
+++ b/frontend-modern/src/features/proxmox/__tests__/proxmoxBackupsTablePresentation.test.ts
@@ -41,36 +41,24 @@ describe('Proxmox backups responsive table presentation', () => {
});
it('keeps server reachability and datastore exhaustion risk visible first', () => {
- expect(ids(getBackupServerColumns('compact'))).toEqual([
- 'server',
- 'status',
- 'datastore',
- 'used',
- ]);
- expect(getBackupServerColumnWidthStyle('server', 'compact')).toEqual({ width: '40%' });
- expect(getBackupServerColumnWidthStyle('status', 'compact')).toEqual({ width: '24%' });
- expect(getBackupServerColumnWidthStyle('used', 'compact')).toEqual({ width: '23%' });
- expect(getBackupServerColumnWidthStyle('datastore', 'compact')).toEqual({ width: '13%' });
- expect(ids(getBackupServerColumns('basic'))).toEqual([
- 'server',
- 'status',
- 'datastore',
- 'used',
- 'jobs',
- ]);
+ // Each row is a datastore, named first with its server beside it, so there
+ // is no separate server or datastore column to read as a second server.
+ expect(ids(getBackupServerColumns('compact'))).toEqual(['datastore', 'status', 'used']);
+ expect(getBackupServerColumnWidthStyle('datastore', 'compact')).toEqual({ width: '40%' });
+ expect(getBackupServerColumnWidthStyle('status', 'compact')).toEqual({ width: '30%' });
+ expect(getBackupServerColumnWidthStyle('used', 'compact')).toEqual({ width: '30%' });
+ expect(ids(getBackupServerColumns('basic'))).toEqual(['datastore', 'status', 'used', 'jobs']);
expect(ids(getBackupServerColumns('operational'))).toEqual([
- 'server',
- 'status',
'datastore',
+ 'status',
'used',
'jobs',
'backups',
]);
// Host CPU, memory, uptime and version live in the server's drawer.
expect(ids(getBackupServerColumns('full'))).toEqual([
- 'server',
- 'status',
'datastore',
+ 'status',
'used',
'jobs',
'backups',
@@ -97,10 +85,10 @@ describe('Proxmox backups responsive table presentation', () => {
);
it.each([
- ['basic', '15.5%'],
- ['operational', '13%'],
- ['expanded', '12%'],
- ['full', '14%'],
+ ['basic', '21.5%'],
+ ['operational', '20%'],
+ ['expanded', '16%'],
+ ['full', '19%'],
] 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 b234de156e..d26f82fdb6 100644
--- a/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
+++ b/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
@@ -10,8 +10,7 @@ import {
export type ProxmoxBackupsTableLayoutMode =
'compact' | 'basic' | 'operational' | 'expanded' | 'full';
-export type BackupServerColumnId =
- 'server' | 'status' | 'datastore' | 'used' | 'jobs' | 'backups' | 'dedup';
+export type BackupServerColumnId = 'datastore' | 'status' | 'used' | 'jobs' | 'backups' | 'dedup';
export type CoverageColumnId =
'workload' | 'type' | 'targetId' | 'node' | 'posture' | 'latest' | 'task';
@@ -57,9 +56,8 @@ export const getRecoverableLayoutForContainer = (width: number): ProxmoxBackupsT
layoutForWidth(width, [480, 720, 880, 1120]);
export const BACKUP_SERVER_COLUMNS: readonly BackupTableColumn<BackupServerColumnId>[] = [
- { id: 'server', label: 'Backup server', kind: 'name' },
+ { id: 'datastore', label: 'Datastore', kind: 'name' },
{ id: 'status', label: 'Status', kind: 'text' },
- { id: 'datastore', label: 'Datastore', kind: 'text' },
{ id: 'used', label: 'Used', kind: 'numeric-value' },
{ id: 'jobs', label: 'Jobs', kind: 'text' },
{ id: 'backups', label: 'Backups', kind: 'numeric-value' },
@@ -78,9 +76,9 @@ const BACKUP_SERVER_VISIBLE: Record<
// 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', 'datastore', 'used', 'jobs', 'backups'],
+ compact: ['datastore', 'status', 'used'],
+ basic: ['datastore', 'status', 'used', 'jobs'],
+ operational: ['datastore', 'status', 'used', 'jobs', 'backups'],
expanded: BACKUP_SERVER_COLUMNS.map((column) => column.id),
full: BACKUP_SERVER_COLUMNS.map((column) => column.id),
};
@@ -91,20 +89,20 @@ const BACKUP_SERVER_WEIGHTS: Record<
> = {
// 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 },
+ // capacity must fit "Unavailable". The datastore name, with its server in
+ // muted text, keeps the shared 40% identity anchor and truncates the server
+ // first. The compact status omits its redundant dot.
+ compact: { datastore: 40, status: 30, used: 30 },
// 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 },
+ // owns the datastore column in this band.
+ basic: { datastore: 30, status: 17.6, used: 30.9, jobs: 21.5 },
// 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 },
+ operational: { datastore: 34, status: 13, used: 22, jobs: 20, 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 },
+ expanded: { datastore: 34, status: 12, used: 21, jobs: 16, backups: 9, dedup: 8 },
+ full: { datastore: 34, status: 11, used: 20, jobs: 19, backups: 8, dedup: 8 },
};
export const getBackupServerColumns = (
@@ -124,7 +122,7 @@ export const getBackupServerColumnWidthStyle = (
BACKUP_SERVER_VISIBLE[layout],
layout === 'compact' || layout === 'basic'
? {
- columnId: 'server',
+ columnId: 'datastore',
widthPercent:
layout === 'compact'
? PLATFORM_TABLE_NARROW_IDENTITY_WIDTH_PERCENT