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.

Lead the datastore drawer with the datastore

rcourtman33fbf6e53786
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
index c49cb88865..bd15c04617 100644
--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md
+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
@@ -614,6 +614,19 @@ header) as shares of that width, and the name takes the rest; without a width
the shared 40% identity share still applies. At 360px and up a 16-character
guest name fits whole. Rows stay 32px and single-line.
+### PlatformResourceDetailTableRow can collapse its resource inspector (3 November 2026)
+
+`PlatformResourceDetailTableRow` takes an optional `collapseResource`
+(`title`, `summary`, `showLabel`, `hideLabel`). When set, the row's `context`
+answers the row and the canonical `ResourceDetailDrawer` sits inside a
+`ResourceDetailDrawerSupportDisclosure`, mounted only when opened, so its
+history reads start on demand. It starts collapsed every time the row opens,
+and the inspector gets no `onClose`, because "Hide" is its close and the row's
+own heading closes the row. Without it every caller is unchanged. The
+Backups datastore drawer is the one user: its context carries the canonical
+`ObjectDrawerHeader` and `DrawerSubjectHeading`, so the drawer keeps a subject
+heading and a close control while the server inspector is collapsed.
+
### Backup servers table drops its host columns (2 November 2026)
`ProxmoxBackupServersTable` no longer renders Version, CPU, Memory or Uptime
diff --git a/docs/release-control/v6/internal/subsystems/storage-recovery.md b/docs/release-control/v6/internal/subsystems/storage-recovery.md
index 1726655b97..7ea26d4b2b 100644
--- a/docs/release-control/v6/internal/subsystems/storage-recovery.md
+++ b/docs/release-control/v6/internal/subsystems/storage-recovery.md
@@ -5102,6 +5102,19 @@ named; namesakes keep the VM id and connection that tell them apart. The
disclosure label and the row drawer always carry both. Wider layouts are
unchanged.
+### The datastore drawer answers the datastore (3 November 2026)
+
+Opening a Backup servers datastore row filled about 750px with a "Selected
+datastore" list that repeated the row, then the whole server dashboard (CPU,
+network, disk and temperature charts), none of which says whether backups are
+safe. The drawer now leads with the canonical drawer heading, the datastore
+named with its status dot and "on <server>", then one compact Datastore block:
+capacity with free space, fill forecast when there is one, job results and
+backup entries. The server's own inspector waits behind a collapsed "Server"
+section ("Show server"), mounted and read only when opened, so power users
+lose nothing. A server row with no datastore is about the server and still
+opens its inspector directly. About 260px at desktop and phone widths.
+
### Backup health reason rows show they open Coverage (2 November 2026)
Each Backup health reason row was already a button that filters Coverage to
diff --git a/docs/release-control/v6/internal/subsystems/unified-resources.md b/docs/release-control/v6/internal/subsystems/unified-resources.md
index e67f3c3419..f1f1ca1496 100644
--- a/docs/release-control/v6/internal/subsystems/unified-resources.md
+++ b/docs/release-control/v6/internal/subsystems/unified-resources.md
@@ -9531,6 +9531,14 @@ misrepresented. `ProxmoxCoverageTable.test.tsx` checks narrow/full projection
and complete long location text; the parsed inventory regressions also retain
reader identity and full repository context without adding reads or routes.
+### A datastore drawer keeps its server's resource one click away (3 November 2026)
+
+A Backup servers datastore row still resolves to its canonical PBS resource,
+and correlated host details and history still come from that resource. The
+drawer opens on the datastore instead: the resource inspector sits behind a
+collapsed "Server" section and is mounted, with its reads, only when opened.
+A server row with no datastore opens the inspector directly, as before.
+
### Backup rows stay on one line (1 November 2026)
Coverage and By date rows keep one line at every container width, phones
diff --git a/frontend-modern/browser-verification/9cc36aaaeb136276.json b/frontend-modern/browser-verification/9cc36aaaeb136276.json
new file mode 100644
index 0000000000..a2c97e56b7
--- /dev/null
+++ b/frontend-modern/browser-verification/9cc36aaaeb136276.json
@@ -0,0 +1,40 @@
+{
+ "version": 1,
+ "base_sha": "26f033091328307194e6014d65e13d40fa4adfcb",
+ "verified_at": "2026-11-03T22:00:00Z",
+ "result": "passed",
+ "changed_paths": [
+ "frontend-modern/src/features/platformPage/PlatformResourceDetailTableRow.tsx",
+ "frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx"
+ ],
+ "content_sha256": {
+ "frontend-modern/src/features/platformPage/PlatformResourceDetailTableRow.tsx": "843e80f6dc7964a59b69deeba43f1ca35b1be7044f7e2ea86f767b6444515f4f",
+ "frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx": "39070dc8d6ef0fa71c7024da32fa20e196387544f99bb82b3dc71d869811c978"
+ },
+ "routes": [
+ "/proxmox/backups/coverage"
+ ],
+ "viewports": [
+ {
+ "width": 1280,
+ "height": 800
+ },
+ {
+ "width": 390,
+ "height": 844
+ }
+ ],
+ "states": [
+ "Mock stack built from this exact working tree: Backup servers table with PBS datastore rows",
+ "Desktop 1280: datastore drawer 258px (was about 753px): heading with status dot and \"on <server>\", Datastore block with capacity and free space, jobs, backup entries and footer",
+ "Server section collapsed by default with its summary; no inspector tabs mounted until opened",
+ "Server shown: inspector with its 2 tabs, still exactly one \"Collapse <datastore> details\" control in the drawer",
+ "Phone 390: drawer 260px, no horizontal overflow; only the Server summary truncates"
+ ],
+ "interactions": [
+ "Expanded a datastore row and opened \"Show server\" (drawer 848px at 1024 wide)",
+ "Closed the row with the heading collapse control while the server was shown, then reopened it: Server collapsed again, drawer back to its compact height",
+ "Opened \"Show server\", then \"Hide server\": inspector tabs gone, compact height restored",
+ "Inspected the open drawer at 1280 and 390 with screenshots"
+ ]
+}
diff --git a/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts b/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
index 4554d688ae..c030d94414 100644
--- a/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
+++ b/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
@@ -601,6 +601,8 @@ describe('shared primitive guardrails', () => {
expect(platformResourceDetailTableRowSource).toContain('PlatformResourceDetailToggleButton');
expect(platformResourceDetailTableRowSource).toContain('SummaryRowActionButton');
expect(platformResourceDetailTableRowSource).toContain('hideWhenRowTappableOnMobile');
+ // A collapsed resource inspector uses the canonical drawer disclosure.
+ expect(platformResourceDetailTableRowSource).toContain('ResourceDetailDrawerSupportDisclosure');
for (const source of [guestRowSource, storagePoolRowSource, diskListSource]) {
expect(source).toContain('createSummaryInteractiveRowPreviewHandlers');
diff --git a/frontend-modern/src/features/platformPage/PlatformResourceDetailTableRow.tsx b/frontend-modern/src/features/platformPage/PlatformResourceDetailTableRow.tsx
index f90dc960f5..e01cfe933b 100644
--- a/frontend-modern/src/features/platformPage/PlatformResourceDetailTableRow.tsx
+++ b/frontend-modern/src/features/platformPage/PlatformResourceDetailTableRow.tsx
@@ -1,5 +1,6 @@
import { Show, createSignal, type Component, type JSX } from 'solid-js';
import { ResourceDetailDrawer } from '@/components/Infrastructure/ResourceDetailDrawer';
+import { ResourceDetailDrawerSupportDisclosure } from '@/components/Infrastructure/ResourceDetailDrawerSupportDisclosure';
import { InlineDetailTableRow } from '@/components/shared/InlineDetailTableRow';
import { SummaryRowActionButton } from '@/components/shared/SummaryRowActionButton';
import type { Resource } from '@/types/resource';
@@ -111,6 +112,34 @@ export function createPlatformResourceLabelResolver(resources: () => readonly Re
};
}
+type CollapseResourceOptions = {
+ title: string;
+ summary?: string;
+ showLabel: string;
+ hideLabel: string;
+};
+
+// Mounted with the open row, so every opening starts collapsed again.
+const CollapsedResourceDisclosure: Component<{
+ options: CollapseResourceOptions;
+ children: JSX.Element;
+}> = (props) => {
+ const [shown, setShown] = createSignal(false);
+ return (
+ <ResourceDetailDrawerSupportDisclosure
+ title={props.options.title}
+ summary={props.options.summary}
+ expanded={shown()}
+ onToggle={() => setShown((value) => !value)}
+ showLabel={props.options.showLabel}
+ hideLabel={props.options.hideLabel}
+ dataTestId="platform-resource-detail-collapsed-resource"
+ >
+ {props.children}
+ </ResourceDetailDrawerSupportDisclosure>
+ );
+};
+
export const PlatformResourceDetailTableRow: Component<{
resource: Resource;
open: boolean;
@@ -123,9 +152,29 @@ export const PlatformResourceDetailTableRow: Component<{
initialShowHostDetails?: boolean;
/** Row-specific evidence, separate from the canonical host/resource inspector. */
context?: JSX.Element;
+ /**
+ * When the row is about something the resource holds (a datastore on a
+ * backup server), the context answers the row and the resource's own
+ * inspector waits behind this disclosure, mounted only when opened.
+ */
+ collapseResource?: CollapseResourceOptions;
onResourceActionSettled?: () => void | Promise<void>;
onClose?: () => void;
}> = (props) => {
+ // A collapsed inspector sits under the row's own heading, which closes the
+ // row; its "Hide" control is the inspector's own close.
+ const drawer = (closesRow: boolean) => (
+ <ResourceDetailDrawer
+ resource={props.resource}
+ statusIndicator={props.statusIndicator}
+ presentation="table-row"
+ resolveResourceLabel={props.resolveResourceLabel}
+ initialShowAccessContext={props.initialShowAccessContext}
+ initialShowHostDetails={props.initialShowHostDetails}
+ onResourceActionSettled={props.onResourceActionSettled}
+ onClose={closesRow ? props.onClose : undefined}
+ />
+ );
return (
<Show when={props.open}>
<InlineDetailTableRow
@@ -135,16 +184,13 @@ export const PlatformResourceDetailTableRow: Component<{
data-inline-platform-resource-detail-for={props.resource.id}
>
{props.context}
- <ResourceDetailDrawer
- resource={props.resource}
- statusIndicator={props.statusIndicator}
- presentation="table-row"
- resolveResourceLabel={props.resolveResourceLabel}
- initialShowAccessContext={props.initialShowAccessContext}
- initialShowHostDetails={props.initialShowHostDetails}
- onResourceActionSettled={props.onResourceActionSettled}
- onClose={props.onClose}
- />
+ <Show when={props.collapseResource} fallback={drawer(true)}>
+ {(collapse) => (
+ <CollapsedResourceDisclosure options={collapse()}>
+ {drawer(false)}
+ </CollapsedResourceDisclosure>
+ )}
+ </Show>
</InlineDetailTableRow>
</Show>
);
diff --git a/frontend-modern/src/features/platformPage/__tests__/PlatformResourceDetailTableRow.test.tsx b/frontend-modern/src/features/platformPage/__tests__/PlatformResourceDetailTableRow.test.tsx
index 8773f174f8..adc26ddc21 100644
--- a/frontend-modern/src/features/platformPage/__tests__/PlatformResourceDetailTableRow.test.tsx
+++ b/frontend-modern/src/features/platformPage/__tests__/PlatformResourceDetailTableRow.test.tsx
@@ -12,8 +12,10 @@ import {
} from '../PlatformResourceDetailTableRow';
vi.mock('@/components/Infrastructure/ResourceDetailDrawer', () => ({
- ResourceDetailDrawer: (props: { resource: Resource }) => (
- <div data-testid="canonical-resource-inspector">{props.resource.id}</div>
+ ResourceDetailDrawer: (props: { resource: Resource; onClose?: () => void }) => (
+ <div data-testid="canonical-resource-inspector" data-has-close={props.onClose ? '' : undefined}>
+ {props.resource.id}
+ </div>
),
}));
@@ -56,6 +58,71 @@ describe('platform resource row context', () => {
expect(screen.queryByRole('region')).toBeNull();
});
+ it('keeps a collapsed resource inspector unmounted until its disclosure opens', () => {
+ render(() => (
+ <table>
+ <tbody>
+ <PlatformResourceDetailTableRow
+ resource={{ id: 'backup-server' } as Resource}
+ open
+ detailRowId="datastore-row"
+ colSpan={4}
+ context={<section aria-label="Selected row">Datastore readings</section>}
+ collapseResource={{
+ title: 'Server',
+ summary: 'backup-server · CPU, memory, network, disk',
+ showLabel: 'Show server',
+ hideLabel: 'Hide server',
+ }}
+ />
+ </tbody>
+ </table>
+ ));
+ // The row's own answer shows at once; the resource's inspector, and the
+ // reads it starts, wait for a click.
+ expect(screen.getByRole('region', { name: 'Selected row' })).toBeInTheDocument();
+ expect(screen.queryByTestId('canonical-resource-inspector')).toBeNull();
+ expect(screen.getByText('backup-server · CPU, memory, network, disk')).toBeInTheDocument();
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
+ expect(screen.getByTestId('canonical-resource-inspector')).toHaveTextContent('backup-server');
+ fireEvent.click(screen.getByRole('button', { name: 'Hide server' }));
+ expect(screen.queryByTestId('canonical-resource-inspector')).toBeNull();
+ });
+
+ it('starts a collapsed resource inspector collapsed each time the row opens', () => {
+ const [open, setOpen] = createSignal(true);
+ const onClose = vi.fn();
+ render(() => (
+ <table>
+ <tbody>
+ <PlatformResourceDetailTableRow
+ resource={{ id: 'backup-server' } as Resource}
+ open={open()}
+ detailRowId="datastore-row"
+ colSpan={4}
+ context={<section aria-label="Selected row">Datastore readings</section>}
+ collapseResource={{
+ title: 'Server',
+ showLabel: 'Show server',
+ hideLabel: 'Hide server',
+ }}
+ onClose={onClose}
+ />
+ </tbody>
+ </table>
+ ));
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
+ expect(screen.getByTestId('canonical-resource-inspector')).toBeInTheDocument();
+ // The row's own heading closes the row; the inspector carries no second close.
+ expect(screen.getByTestId('canonical-resource-inspector')).not.toHaveAttribute(
+ 'data-has-close',
+ );
+ setOpen(false);
+ setOpen(true);
+ expect(screen.queryByTestId('canonical-resource-inspector')).toBeNull();
+ expect(screen.getByRole('button', { name: 'Show server' })).toBeInTheDocument();
+ });
+
it('leaves context-free inspectors unchanged', () => {
render(() => (
<table>
diff --git a/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx b/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
index 451ba86d9e..d3e72c1686 100644
--- a/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
+++ b/frontend-modern/src/features/proxmox/ProxmoxBackupServersTable.tsx
@@ -1,7 +1,9 @@
-import { For, Show, createMemo, type Accessor, type JSX } from 'solid-js';
+import { For, Show, createMemo, createUniqueId, type Accessor, type JSX } from 'solid-js';
import { unwrap } from 'solid-js/store';
import { StatusDot } from '@/components/shared/StatusDot';
+import { DrawerSubjectHeading } from '@/components/shared/DrawerSubjectHeading';
+import { ObjectDrawerHeader } from '@/components/shared/ObjectDrawerHeader';
import {
GROUPED_TABLE_ROW_META_CLASS,
getGroupedTableRowCellClass,
@@ -228,7 +230,10 @@ function BackupServerDatastoreContext(props: {
row: BackupServerRow;
inventoryState?: 'available' | 'loading' | 'unavailable';
forecast?: DatastoreFillForecast | null;
+ onClose?: () => void;
}) {
+ const id = createUniqueId();
+ const headingId = () => `backup-datastore-drawer-${id}`;
const capacityText = () => {
const datastore = props.row.datastore;
if (!datastore) return 'No datastore data';
@@ -236,7 +241,11 @@ function BackupServerDatastoreContext(props: {
if (reading.state !== 'available') {
return `${reading.state === 'unavailable' ? 'Unavailable' : 'Unknown'}. This does not mean the datastore is empty.`;
}
- return `${formatPlatformTablePercentValue(reading.percent)} used · ${formatPlatformTableBytesValue(datastore.used, '0 B')} / ${formatPlatformTableBytesValue(datastore.total)}`;
+ const free =
+ typeof datastore.total === 'number' && typeof datastore.used === 'number'
+ ? ` · ${formatPlatformTableBytesValue(Math.max(0, datastore.total - datastore.used), '0 B')} free`
+ : '';
+ return `${formatPlatformTablePercentValue(reading.percent)} used · ${formatPlatformTableBytesValue(datastore.used, '0 B')} / ${formatPlatformTableBytesValue(datastore.total)}${free}`;
};
const inventoryText = () => {
if (!props.row.datastore) return 'Not reported';
@@ -253,31 +262,38 @@ function BackupServerDatastoreContext(props: {
};
return (
- <section class="mb-3" aria-label="Selected PBS datastore">
+ <section class="mb-3 space-y-2" aria-label="Selected PBS datastore">
+ {/* A datastore row's drawer is about the datastore; its server is one
+ click away below. A server row with no datastore is about the server,
+ whose own inspector header names it. */}
+ <Show when={props.row.datastore}>
+ {(datastore) => (
+ <ObjectDrawerHeader
+ collapseLabel={`Collapse ${datastore().name} details`}
+ onCollapse={() => props.onClose?.()}
+ >
+ <DrawerSubjectHeading
+ headingId={headingId()}
+ title={datastore().name}
+ statusVariant={props.row.online ? 'success' : 'danger'}
+ statusLabel={props.row.connectionLabel}
+ trailing={<span class="truncate text-xs text-muted">on {props.row.serverName}</span>}
+ />
+ </ObjectDrawerHeader>
+ )}
+ </Show>
<DetailSectionTable
wrapValues
sections={[
{
- label: 'Selected datastore',
+ label: 'Datastore',
rows: [
- { label: 'Backup reader', value: props.row.serverName, layout: 'stacked' },
- {
- label: 'Datastore',
- value: props.row.datastore?.name ?? 'Not reported',
- layout: 'stacked',
- },
- {
- label: 'Capacity',
- value: capacityText(),
- layout: 'stacked',
- tone: capacityTone(),
- },
+ { label: 'Capacity', value: capacityText(), tone: capacityTone() },
...(props.forecast
? [
{
label: 'Fill forecast',
value: props.forecast.detail,
- layout: 'stacked' as const,
tone: forecastDetailTone(props.forecast),
},
]
@@ -285,16 +301,14 @@ function BackupServerDatastoreContext(props: {
{
label: 'Jobs',
value: describeDatastoreJobs(props.row.jobs),
- layout: 'stacked',
tone: jobDetailTone(props.row.jobs.state),
},
- { label: 'Backup entries', value: inventoryText(), layout: 'stacked' },
+ { label: 'Backup entries', value: inventoryText() },
],
footerContent: (
<p class="whitespace-normal text-[11px] leading-snug text-muted">
- Counts describe the loaded inventory, which can include in-progress and unverified
- entries. They do not establish backup protection. Connection health and datastore
- capacity are separate readings.
+ Backup entries can include running and unverified backups. They do not prove a guest
+ is protected.
</p>
),
},
@@ -986,9 +1000,20 @@ export function ProxmoxBackupServersTable(props: {
row={row}
inventoryState={props.backupInventoryState}
forecast={forecast()}
+ onClose={() => detail.close(rowIdentity)}
/>
}
initialShowHostDetails
+ collapseResource={
+ row.datastore
+ ? {
+ title: 'Server',
+ summary: `${row.serverName} · CPU, memory, network, disk`,
+ showLabel: 'Show server',
+ hideLabel: 'Hide server',
+ }
+ : undefined
+ }
onClose={() => detail.close(rowIdentity)}
/>
</>
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 adcca8ad57..4816354110 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.drawer.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.drawer.test.tsx
@@ -75,6 +75,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
expect(resourceDetailDrawerMount).toHaveBeenCalledTimes(1);
const refreshed = makePbsResource();
@@ -113,6 +114,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
const detail = screen.getByTestId('pbs-resource-detail');
expect(datastoreNames()).toEqual(['pbs-main · archive', 'pbs-main · tank']);
@@ -130,13 +132,20 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
const detail = screen.getByTestId('pbs-resource-detail');
expect(detail).toHaveAttribute('data-resource-id', 'pbs-1');
expect(detail).toHaveAttribute('data-host-details-open', 'true');
- fireEvent.click(screen.getByRole('button', { name: 'Close details' }));
+ // The datastore heading closes the row; reopening starts collapsed again.
+ fireEvent.click(screen.getByRole('button', { name: 'Collapse tank details' }));
expect(screen.queryByTestId('pbs-resource-detail')).not.toBeInTheDocument();
+ fireEvent.click(
+ screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
+ );
+ expect(screen.queryByTestId('pbs-resource-detail')).not.toBeInTheDocument();
+ expect(screen.getByRole('button', { name: 'Show server' })).toBeInTheDocument();
});
it.each(['agent', 'vm', 'system-container'] as const)(
@@ -174,6 +183,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
const detail = screen.getByTestId('pbs-resource-detail');
expect(detail).toHaveAttribute('data-resource-id', 'pbs-1');
@@ -199,6 +209,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
expect(screen.getByTestId('pbs-resource-detail')).toHaveAttribute(
'data-metrics-resource-id',
'pbs-main',
@@ -232,6 +243,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
const detail = screen.getByTestId('pbs-resource-detail');
expect(detail).toHaveAttribute('data-metrics-resource-id', 'agent-pbs-1');
@@ -260,6 +272,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
const detail = screen.getByTestId('pbs-resource-detail');
expect(detail).toHaveAttribute('data-metrics-resource-id', 'pbs-main');
@@ -304,6 +317,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for pbs-main · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
expect(screen.getByTestId('pbs-resource-detail')).toHaveAttribute(
'data-metrics-resource-id',
@@ -359,6 +373,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for backup-connection · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
const detail = screen.getByTestId('pbs-resource-detail');
expect(detail).toHaveAttribute('data-agent-id', 'agent-pbs-1');
@@ -425,6 +440,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for proxback · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
expect(screen.getByTestId('pbs-resource-detail')).toHaveAttribute(
'data-metrics-resource-type',
@@ -486,6 +502,7 @@ describe('ProxmoxBackupServersTable details', () => {
fireEvent.click(
screen.getByRole('button', { name: 'Expand details for proxback · datastore tank' }),
);
+ fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
expect(screen.getByTestId('pbs-resource-detail')).toHaveAttribute(
'data-metrics-resource-id',
'agent-proxback',
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 3406d2042f..b5ac68f6fd 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.webInterface.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupServersTable.webInterface.test.tsx
@@ -85,6 +85,7 @@ describe('PBS Backups web-interface parity', () => {
name: 'Expand details for pbs-main · datastore archive',
}),
);
+ fireEvent.click(within(container).getByRole('button', { name: 'Show server' }));
expect(within(container).getByTestId('pbs-detail')).toHaveAttribute(
'data-resource-id',
'pbs-east',
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
index 88dab2ceca..79795a50bb 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
@@ -432,12 +432,12 @@ describe('ProxmoxBackupsTable', () => {
).not.toBe(offsite);
fireEvent.click(offsite);
const selected = screen.getByRole('region', { name: 'Selected PBS datastore' });
- expect(within(selected).getByText('Datastore').closest('tr')).toHaveTextContent('offsite');
- expect(within(selected).getByText('Backup reader').closest('tr')).toHaveTextContent('pbs-main');
+ expect(within(selected).getByRole('heading')).toHaveTextContent('offsite');
+ expect(selected).toHaveTextContent('on pbs-main');
expect(within(selected).getByText('Capacity').closest('tr')).toHaveTextContent('25.0%');
// The surrounding scan table is nowrap; the interpretation must wrap too,
// not only the four fields protected by DetailSectionTable.wrapValues.
- expect(within(selected).getByText(/Counts describe the loaded inventory/)).toHaveClass(
+ expect(within(selected).getByText(/Backup entries can include running/)).toHaveClass(
'whitespace-normal',
);
});
diff --git a/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx b/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx
index 99662aba8e..a8e4da2143 100644
--- a/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/backupServerCountEvidence.test.tsx
@@ -163,6 +163,7 @@ describe('PBS server count identity', () => {
await waitFor(() => expect(displayedCounts(table)).toEqual(['0', '2']));
const disclosures = within(table).getAllByRole('button', { name: /details/i });
await fireEvent.click(disclosures[0]);
+ await fireEvent.click(screen.getByRole('button', { name: 'Show server' }));
const detail = screen.getByTestId('pbs-count-owner-detail');
// Only the query's actual 30-second polling is advanced; no direct call to
diff --git a/frontend-modern/src/features/proxmox/__tests__/backupServerDatastoreAccess.test.tsx b/frontend-modern/src/features/proxmox/__tests__/backupServerDatastoreAccess.test.tsx
index 8cc8651d1e..1dffaa0d16 100644
--- a/frontend-modern/src/features/proxmox/__tests__/backupServerDatastoreAccess.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/backupServerDatastoreAccess.test.tsx
@@ -46,6 +46,8 @@ const mount = (component: () => JSX.Element) =>
));
const selected = () => screen.getByRole('region', { name: 'Selected PBS datastore' });
const field = (name: string) => within(selected()).getByText(name).closest('tr')!;
+// The drawer names its datastore in the heading and its server beside it.
+const heading = () => within(selected()).getByRole('heading');
const disclosure = (name = store) =>
screen.getByRole('button', {
name: `Expand details for ${reader} · datastore ${name}`,
@@ -84,18 +86,18 @@ describe('selected PBS datastore inspection', () => {
});
expect(east).not.toBe(disclosure(otherStore));
fireEvent.click(east);
- expect(field('Backup reader')).toHaveTextContent(reader);
- expect(field('Datastore')).toHaveTextContent(store);
- expect(field('Datastore')).not.toHaveTextContent(otherStore);
+ expect(selected()).toHaveTextContent(`on ${reader}`);
+ expect(heading()).toHaveTextContent(store);
+ expect(heading()).not.toHaveTextContent(otherStore);
expect(field('Capacity')).toHaveTextContent('98.0% used · 980 B / 1000 B');
expect(field('Backup entries')).toHaveTextContent('0');
- expect(selected()).toHaveTextContent('They do not establish backup protection.');
+ expect(selected()).toHaveTextContent('They do not prove a guest is protected.');
expect(document.getElementById(east.getAttribute('aria-controls')!)).toContainElement(
selected(),
);
fireEvent.click(disclosure(otherStore));
expect(screen.getAllByRole('region', { name: 'Selected PBS datastore' })).toHaveLength(1);
- expect(field('Datastore')).toHaveTextContent(otherStore);
+ expect(heading()).toHaveTextContent(otherStore);
expect(field('Capacity')).toHaveTextContent('0.0% used · 0 B / 1000 B');
},
);
@@ -122,7 +124,10 @@ describe('selected PBS datastore inspection', () => {
it('does not invent a selected store or count when no datastore was reported', async () => {
mount(() => <ProxmoxBackupServersTable servers={[server([])]} layoutWidth={() => 320} />);
fireEvent.click(await screen.findByRole('button', { name: `Expand details for ${reader}` }));
- expect(field('Datastore')).toHaveTextContent('Not reported');
+ // With no datastore the row is about the server: no datastore heading,
+ // and its inspector opens directly rather than behind "Show server".
+ expect(within(selected()).queryByRole('heading')).toBeNull();
+ expect(screen.queryByRole('button', { name: 'Show server' })).toBeNull();
expect(field('Capacity')).toHaveTextContent('No datastore data');
expect(field('Backup entries')).toHaveTextContent('Not reported');
});
@@ -145,7 +150,7 @@ describe('selected PBS datastore inspection', () => {
]);
await waitFor(() => expect(field('Capacity')).toHaveTextContent('Unavailable.'));
expect(selected()).toBe(context);
- expect(field('Datastore')).toHaveTextContent(store);
+ expect(heading()).toHaveTextContent(store);
expect(toggle).toHaveFocus();
const detail = document.getElementById(toggle.getAttribute('aria-controls')!)!;
const close = within(detail).getByRole('button', { name: /Collapse .* details/ });
@@ -201,7 +206,7 @@ describe('selected PBS datastore inspection', () => {
await vi.advanceTimersByTimeAsync(30_000);
await waitFor(() => expect(field('Backup entries')).toHaveTextContent('2'));
expect(selected()).toBe(context);
- expect(field('Datastore')).toHaveTextContent(store);
+ expect(heading()).toHaveTextContent(store);
expect(api.fetch.mock.calls.filter(([url]) => url === '/api/backups/pbs')).toHaveLength(3);
const calls = api.fetch.mock.calls.length;
mounted.unmount();
diff --git a/tests/integration/tests/64-workloads-proxmox-refresh-stability.spec.ts b/tests/integration/tests/64-workloads-proxmox-refresh-stability.spec.ts
index 9b43754ba4..65fc6ec781 100644
--- a/tests/integration/tests/64-workloads-proxmox-refresh-stability.spec.ts
+++ b/tests/integration/tests/64-workloads-proxmox-refresh-stability.spec.ts
@@ -409,6 +409,8 @@ test.describe.serial("Workloads Proxmox refresh stability", () => {
"tr[data-inline-platform-resource-detail-for]",
);
await expect(detailRow).toBeVisible();
+ // The datastore drawer keeps its server's inspector behind a disclosure.
+ await detailRow.getByRole("button", { name: "Show server" }).click();
const manageTab = detailRow.getByRole("tab", {
name: "Manage",
exact: true,