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.

Keep backup rows single-line and cut page copy

rcourtman40b192a8b7aa
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
index e6b6abe195..764d9fc27b 100644
--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md
+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
@@ -6192,7 +6192,12 @@ its text like the other drawers. Their table rows (Docker hosts, Machines,
Kubernetes nodes) take the platform host rows'
red (critical) or yellow tint from the same set through
`getUnifiedResourceAlertStyles`, only for unacknowledged alerts and never on
-an expanded row, so a row and its drawer agree. The remaining Overview rows are additive
+an expanded row, so a row and its drawer agree. The Alerts > Thresholds
+"Active alert" dot reads the same map by each alert's `resourceId` and
+`type`, never by rebuilding an alert-ID key; a threshold row names the
+resource IDs its alerts are raised on (`alertResourceIds`, with
+`getUnifiedResourceAlertResourceIds` for unified guest rows) and machine rows
+also answer for their disks' alerts. The remaining Overview rows are additive
operator context that the parent table row cannot carry, such as OS/runtime,
Pulse observation or action coverage, primary reachability, protection gaps,
pending updates, or an identified service. Routine health, placement, and
@@ -9066,8 +9071,9 @@ evidence.
The bounded restore evidence keeps the newest point and the newest completed
point of each source before filling with the newest overall, so a run of guest
snapshots or a running job cannot push the latest usable backup out of the
-disclosure. A coverage strip footnote is
-plain muted text under the legend, not another counter or badge row.
+disclosure. The coverage strip's posture
+rule sits behind a collapsed "What the counts mean" toggle under the legend,
+not an always-open paragraph, counter or badge row.
Protection table controls continue to compose shared filter, table, status,
counter, loading, error, disclosure, and inline-detail primitives. The bounded
@@ -10871,20 +10877,27 @@ 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.
-### Narrow Coverage keeps workload identity visible
-
-Coverage containers below 720px wrap the full workload name and PVE connection
-instead of making touch users rely on hover titles. The folded VM/LXC target ID
-sits on its own line so it cannot squeeze the name to an ellipsis. Wider tables
-retain their dense projection; the expanded owner, inventory association, posture,
-read cadence and guest operations are unchanged. This is readable identity, not
-original-incident recovery.
-
-The normal `backupWorkloadIdentity.test.tsx` suite checks long namesake labels,
-end-distinguished connections, 719/720px projection, scoped evidence and owner
-links. Browser proof must inspect complete rendered names/connections, layout
-resize, keyboard/touch disclosure and retained polling at desktop and narrow
-widths, with actual pixels.
+### Backup rows stay on one line (1 November 2026)
+
+Coverage and By date rows keep one line at every container width, phones
+included: the workload name truncates beside its folded type/target ID, and a
+PVE or reader connection is named inline only when the loaded inventory spans
+more than one, where it tells namesakes apart. The page decides that over the
+whole inventory, so labels do not appear and vanish as filters narrow the list.
+Narrow By date rows are workload, age and state; source kind, reader
+connection, repository location, size and provider identifiers live in the
+single-point drawer, whose disclosure name already carries both scopes before
+it opens. This supersedes the earlier wrapped-identity projections below
+720px, which grew phone date rows to 116-132px and Coverage rows to 65-81px
+and pushed the list below the fold; measured on the mock rig the rows are now
+37px and 32px (desktop 47px to 33px). Matching, posture, verification, filters,
+polling and the API are unchanged.
+
+`backupWorkloadIdentity.test.tsx`, `recoverableIdentityAccess.test.tsx` and
+`backupSourceConnection.test.tsx` exercise the parsed inventory consumers at
+320-1200px: single-line truncation, inline connections only for multi-connection
+inventories, drawer identity and live refresh. Browser proof measures row
+heights and inspects actual pixels at desktop and phone widths.
### Location-filtered backup evidence is not a location protection rating
@@ -11004,31 +11017,6 @@ the consuming TrueNAS table with ordinary keyboard/phone taps, hover parity,
updates and dismissal, and natively inspected desktop/narrow pixels. This repairs
composition access, not the reporter's missing native ARC or I/O/History source.
-### Restore-point identity is readable before narrow-screen disclosure
-
-The existing Proxmox By date list groups workload name/type/target ID, PVE
-workload connection, source kind, reader connection and repository location in
-one wrapping identity cell below 720px table width. These are different scopes:
-a PBS reader/namespace never supplies an unknown guest's PVE connection. Age and
-state retain independent columns and their existing meanings. Wider tables keep
-separate source/location columns and expose PVE scope beneath the workload name;
-a hidden Target ID column never hides the ID itself. Full provider identifiers,
-size and existing owner links remain in the same single-point drawer. This
-changes no matching, posture, verification, pruning, filter, poll or API contract.
-
-The three-column narrow projection reserves enough width for the grouped
-identity, Unknown age and full state words instead of the old single-name 40%
-anchor. Normal-suite `recoverableIdentityAccess.test.tsx` exercises the real
-parsed inventory consumer across 320/479/480/719/720/1200px, namesakes, every source
-kind, unmatched/host scope and open-record live refresh/focus. The registered
-`ProxmoxBackupsTable.test.tsx` checks workload/reader separation before disclosure;
-`ProxmoxRecoverableTable.test.tsx` and `proxmoxBackupsTablePresentation.test.ts`
-protect grouped metadata, responsive columns and bounded rendering. Browser
-proof must exercise the consuming list at desktop/narrow widths, inspect actual
-pixels, identity, state/age fit, touch/keyboard disclosure, filters and live
-updates. This is safer evidence inspection, not a restore or installed recovery.
-
-
### SSO endpoint cards remain readable and copyable on narrow screens
The SSO provider card in `SSOProvidersPanel.tsx` separates each endpoint's
diff --git a/docs/release-control/v6/internal/subsystems/storage-recovery.md b/docs/release-control/v6/internal/subsystems/storage-recovery.md
index 0f5f5a82b1..d6248b729a 100644
--- a/docs/release-control/v6/internal/subsystems/storage-recovery.md
+++ b/docs/release-control/v6/internal/subsystems/storage-recovery.md
@@ -4981,10 +4981,21 @@ unless it is the active filter, and checking and not-evaluated have no
filter, so they stay text. On a 375px phone the coverage list starts below
the fold and the posture filter sits behind Filters, so "which 11 are
unprotected?" took three taps through a sheet; it is now one tap on the
-count. The rule footnote, the posture sort (attention before unprotected)
+count. The posture rule, the posture sort (attention before unprotected)
and the servers table are unchanged, and no posture, freshness or protection
evaluation changes.
+### Backups page states its answer before its caveats (1 November 2026)
+
+The health strip's posture rule moved behind a collapsed "What the counts
+mean" toggle, the "Health counts cover all targets and backup locations,
+regardless of filters" sentence and the chart's "Activity follows the backup
+filters" caption are gone, and restore-point and Coverage rows stay on one
+line (see frontend-primitives "Backup rows stay on one line"). On a phone the
+always-open copy took most of the first screen above the list. Each workload's
+drawer still explains its own posture, and the recovery docs still describe the
+chart and day-filter scope. No count, posture, filter or read changes.
+
### Backup table values truncate inside their own column
The coverage Node cell, the restore-evidence Location and Details cells, and
diff --git a/docs/release-control/v6/internal/subsystems/unified-resources.md b/docs/release-control/v6/internal/subsystems/unified-resources.md
index 3d4484d117..8fb56d73b2 100644
--- a/docs/release-control/v6/internal/subsystems/unified-resources.md
+++ b/docs/release-control/v6/internal/subsystems/unified-resources.md
@@ -9382,20 +9382,27 @@ 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.
-### Narrow Coverage keeps workload identity visible
-
-Coverage containers below 720px wrap the full workload name and PVE connection
-instead of making touch users rely on hover titles. The folded VM/LXC target ID
-sits on its own line so it cannot squeeze the name to an ellipsis. Wider tables
-retain their dense projection; the expanded owner, inventory association, posture,
-read cadence and guest operations are unchanged. This is readable identity, not
-original-incident recovery.
-
-The normal `backupWorkloadIdentity.test.tsx` suite checks long namesake labels,
-end-distinguished connections, 719/720px projection, scoped evidence and owner
-links. Browser proof must inspect complete rendered names/connections, layout
-resize, keyboard/touch disclosure and retained polling at desktop and narrow
-widths, with actual pixels.
+### Backup rows stay on one line (1 November 2026)
+
+Coverage and By date rows keep one line at every container width, phones
+included: the workload name truncates beside its folded type/target ID, and a
+PVE or reader connection is named inline only when the loaded inventory spans
+more than one, where it tells namesakes apart. The page decides that over the
+whole inventory, so labels do not appear and vanish as filters narrow the list.
+Narrow By date rows are workload, age and state; source kind, reader
+connection, repository location, size and provider identifiers live in the
+single-point drawer, whose disclosure name already carries both scopes before
+it opens. This supersedes the earlier wrapped-identity projections below
+720px, which grew phone date rows to 116-132px and Coverage rows to 65-81px
+and pushed the list below the fold; measured on the mock rig the rows are now
+37px and 32px (desktop 47px to 33px). Matching, posture, verification, filters,
+polling and the API are unchanged.
+
+`backupWorkloadIdentity.test.tsx`, `recoverableIdentityAccess.test.tsx` and
+`backupSourceConnection.test.tsx` exercise the parsed inventory consumers at
+320-1200px: single-line truncation, inline connections only for multi-connection
+inventories, drawer identity and live refresh. Browser proof measures row
+heights and inspects actual pixels at desktop and phone widths.
### Location-filtered backup evidence is not a location protection rating
@@ -9466,30 +9473,6 @@ the consuming TrueNAS table with ordinary keyboard/phone taps, hover parity,
updates and dismissal, and natively inspected desktop/narrow pixels. This repairs
composition access, not the reporter's missing native ARC or I/O/History source.
-### Restore-point identity is readable before narrow-screen disclosure
-
-The existing Proxmox By date list groups workload name/type/target ID, PVE
-workload connection, source kind, reader connection and repository location in
-one wrapping identity cell below 720px table width. These are different scopes:
-a PBS reader/namespace never supplies an unknown guest's PVE connection. Age and
-state retain independent columns and their existing meanings. Wider tables keep
-separate source/location columns and expose PVE scope beneath the workload name;
-a hidden Target ID column never hides the ID itself. Full provider identifiers,
-size and existing owner links remain in the same single-point drawer. This
-changes no matching, posture, verification, pruning, filter, poll or API contract.
-
-The three-column narrow projection reserves enough width for the grouped
-identity, Unknown age and full state words instead of the old single-name 40%
-anchor. Normal-suite `recoverableIdentityAccess.test.tsx` exercises the real
-parsed inventory consumer across 320/479/480/719/720/1200px, namesakes, every source
-kind, unmatched/host scope and open-record live refresh/focus. The registered
-`ProxmoxBackupsTable.test.tsx` checks workload/reader separation before disclosure;
-`ProxmoxRecoverableTable.test.tsx` and `proxmoxBackupsTablePresentation.test.ts`
-protect grouped metadata, responsive columns and bounded rendering. Browser
-proof must exercise the consuming list at desktop/narrow widths, inspect actual
-pixels, identity, state/age fit, touch/keyboard disclosure, filters and live
-updates. This is safer evidence inspection, not a restore or installed recovery.
-
### Monitor adapter announces the changes it recorded (29 October 2026)
`MonitorAdapter.SetChangeObserver` installs one non-blocking observer that
diff --git a/frontend-modern/browser-verification/7f2364441d4ba4ce.json b/frontend-modern/browser-verification/7f2364441d4ba4ce.json
new file mode 100644
index 0000000000..7118895547
--- /dev/null
+++ b/frontend-modern/browser-verification/7f2364441d4ba4ce.json
@@ -0,0 +1,46 @@
+{
+ "version": 1,
+ "base_sha": "c93d188aff3c0e6c10839a29bcdfe7f4f3d49373",
+ "verified_at": "2026-11-01T14:20:00Z",
+ "result": "passed",
+ "changed_paths": [
+ "frontend-modern/src/features/proxmox/ProxmoxBackupsCoverageStrip.tsx",
+ "frontend-modern/src/features/proxmox/ProxmoxBackupsTable.tsx",
+ "frontend-modern/src/features/proxmox/ProxmoxCoverageTable.tsx",
+ "frontend-modern/src/features/proxmox/ProxmoxRecoverableTable.tsx",
+ "frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts",
+ "frontend-modern/src/features/proxmox/proxmoxBackupsTableShared.tsx"
+ ],
+ "content_sha256": {
+ "frontend-modern/src/features/proxmox/ProxmoxBackupsCoverageStrip.tsx": "03a085996e5d1b21de47ce7f8d484c210b4f9a7d6eb18cba63821f921fc4ee0d",
+ "frontend-modern/src/features/proxmox/ProxmoxBackupsTable.tsx": "19d4f7759acc6abe69f3345a965373e1da3a84b3a56ba595f929493d495d3f26",
+ "frontend-modern/src/features/proxmox/ProxmoxCoverageTable.tsx": "c67f7adc16cd4dcf0c048862d0deb802f9b58ba6bf23f4b38fb594e830bac8e5",
+ "frontend-modern/src/features/proxmox/ProxmoxRecoverableTable.tsx": "410b7d1323806646a1856d8038093653c040c38d2f32d62e0850989a5e54d6da",
+ "frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts": "3c01481ff02b1fee297b0212ea705f1af51e986e28ce59f769c99711e33181fc",
+ "frontend-modern/src/features/proxmox/proxmoxBackupsTableShared.tsx": "df54d96188fb4df2e06ebd977edcb1667a0786b8d338c2cf93028a1277985a41"
+ },
+ "routes": [
+ "/proxmox/backups/date",
+ "/proxmox/backups/coverage"
+ ],
+ "viewports": [
+ {
+ "width": 1440,
+ "height": 1000
+ },
+ {
+ "width": 375,
+ "height": 812
+ }
+ ],
+ "states": [
+ "mock rig inventory, dark theme, By date and Coverage views",
+ "health strip with the posture rule collapsed behind What the counts mean",
+ "multi-connection inventory naming connections inline on one line"
+ ],
+ "interactions": [
+ "signed in, opened Backups By date and Coverage at 1440x1000 and 375x812",
+ "measured the first 20 row heights per view: phone date 116-132px to 37px, Coverage 65-81px to 32px, desktop 47px to 33px",
+ "compared before/after screenshots of each view and width"
+ ]
+}
diff --git a/frontend-modern/src/features/docs/__tests__/completedBackupCountsDocs.test.ts b/frontend-modern/src/features/docs/__tests__/completedBackupCountsDocs.test.ts
index 81395752ef..fc69caa109 100644
--- a/frontend-modern/src/features/docs/__tests__/completedBackupCountsDocs.test.ts
+++ b/frontend-modern/src/features/docs/__tests__/completedBackupCountsDocs.test.ts
@@ -58,9 +58,6 @@ describe('completed backup count guidance', () => {
}
expect(copy).not.toContain('Completed restore volume per day');
expect(tableSource).toContain('aria-label="Clear date filter"');
- expect(tableSource).toContain(
- 'Activity follows the backup filters. Selecting a day narrows only the list.',
- );
expect(copy).toContain(
'covers the loaded inventory, not just the rows matching your list filters',
);
diff --git a/frontend-modern/src/features/proxmox/ProxmoxBackupsCoverageStrip.tsx b/frontend-modern/src/features/proxmox/ProxmoxBackupsCoverageStrip.tsx
index 472dd9496a..90dafd6ace 100644
--- a/frontend-modern/src/features/proxmox/ProxmoxBackupsCoverageStrip.tsx
+++ b/frontend-modern/src/features/proxmox/ProxmoxBackupsCoverageStrip.tsx
@@ -1,4 +1,5 @@
import { For, Index, Show, type Component, type JSX } from 'solid-js';
+import ChevronRightIcon from 'lucide-solid/icons/chevron-right';
// A single horizontal bar broken into proportional segments, followed by
// a one-line legend of labels + counts. Visually integrated with the page
@@ -28,9 +29,10 @@ export interface CoverageStripProps {
segments: readonly CoverageStripSegment[];
// Compact context shown to the right of the title (e.g. "1.2 TB on disk").
tail?: JSX.Element;
- // The rule behind the segments, so a count such as "17 attention" says what
- // it is counting.
- footnote?: JSX.Element;
+ // The rule behind the segments, so a count such as "17 attention" can say
+ // what it is counting. Collapsed by default: the counts are the answer, and
+ // each workload's own drawer explains its state.
+ rule?: JSX.Element;
}
export const ProxmoxBackupsCoverageStrip: Component<CoverageStripProps> = (props) => {
@@ -115,10 +117,17 @@ export const ProxmoxBackupsCoverageStrip: Component<CoverageStripProps> = (props
}}
</Index>
</ul>
- <Show when={props.footnote}>
- <p class="mt-1.5 text-[11px] leading-4 text-muted" data-coverage-strip-footnote>
- {props.footnote}
- </p>
+ <Show when={props.rule}>
+ <details class="group mt-1 text-[11px] text-muted" data-coverage-strip-rule>
+ <summary class="inline-flex cursor-pointer list-none items-center gap-1 rounded-sm hover:text-base-content focus-visible:outline-hidden focus-visible:ring-2 focus-visible:ring-blue-500 [&::-webkit-details-marker]:hidden">
+ <ChevronRightIcon
+ class="h-3 w-3 transition-transform group-open:rotate-90"
+ aria-hidden="true"
+ />
+ What the counts mean
+ </summary>
+ <p class="mt-1 leading-4">{props.rule}</p>
+ </details>
</Show>
</div>
);
diff --git a/frontend-modern/src/features/proxmox/ProxmoxBackupsTable.tsx b/frontend-modern/src/features/proxmox/ProxmoxBackupsTable.tsx
index b229704d69..1c8b473b81 100644
--- a/frontend-modern/src/features/proxmox/ProxmoxBackupsTable.tsx
+++ b/frontend-modern/src/features/proxmox/ProxmoxBackupsTable.tsx
@@ -75,6 +75,8 @@ import {
COVERAGE_FILTERS,
RECOVERABLE_FILTERS,
artifactStateLabel,
+ getBackupWorkloadPVEConnection,
+ hasMultipleConnections,
} from './proxmoxBackupsTableShared';
import { getProxmoxBackupSourcePresentation } from './proxmoxBackupSourcePresentation';
import { ProxmoxBackupsCoverageStrip } from './ProxmoxBackupsCoverageStrip';
@@ -426,6 +428,19 @@ export const ProxmoxBackupsTable: Component<{
),
);
+ // Connection labels in rows tell namesakes apart. Decide over the whole
+ // inventory so they do not appear and vanish as filters narrow the list.
+ const showWorkloadConnection = createMemo(() =>
+ hasMultipleConnections(
+ recoveryModel().coverageRows.map((row) => getBackupWorkloadPVEConnection(row.workload)),
+ ),
+ );
+ const showSourceConnection = createMemo(() =>
+ hasMultipleConnections(
+ recoveryModel().recoverableArtifacts.map((artifact) => artifact.locationConnection ?? ''),
+ ),
+ );
+
const coverageRowsForLocation = createMemo<WorkloadCoverageRow[]>(() => {
const selected = locationFilter();
if (!selected) return recoveryModel().coverageRows;
@@ -863,15 +878,10 @@ export const ProxmoxBackupsTable: Component<{
{/* The health strip renders identically in both route-backed views. */}
<ProxmoxBackupsCoverageStrip
title="Backup health"
- footnote={
- <>
- <span class="font-medium">
- Health counts cover all targets and backup locations, regardless of filters.
- </span>
- <Show when={getBackupPostureRuleText(protectionPostures.policy())}>
- {(rule) => <span data-coverage-posture-rule> {rule()}</span>}
- </Show>
- </>
+ rule={
+ <Show when={getBackupPostureRuleText(protectionPostures.policy())}>
+ {(rule) => <span data-coverage-posture-rule>{rule()}</span>}
+ </Show>
}
tail={
<span>
@@ -990,9 +1000,6 @@ export const ProxmoxBackupsTable: Component<{
}
>
<div ref={retainEvidenceFocus} class="space-y-1">
- <p class="text-xs text-muted">
- Activity follows the backup filters. Selecting a day narrows only the list.
- </p>
<Show when={recoverableMetricMode() === 'volume' && unknownVolumeCount() > 0}>
<p class="text-xs text-amber-700 dark:text-amber-300" role="status">
Sizes are unavailable for {unknownVolumeCount()} completed restore{' '}
@@ -1085,6 +1092,8 @@ export const ProxmoxBackupsTable: Component<{
onSort={handleRecoverableSort}
sizeMaxBytes={recoverableSizeMaxBytes()}
groupByDay
+ showWorkloadConnection={showWorkloadConnection()}
+ showSourceConnection={showSourceConnection()}
retainInspectionFocus={retainEvidenceFocus}
/>
</Show>
@@ -1116,6 +1125,7 @@ export const ProxmoxBackupsTable: Component<{
onToggleExpand={toggleCoverageExpansion}
retainInspectionFocus={retainEvidenceFocus}
showTaskColumn={coverageHasTask()}
+ showWorkloadConnection={showWorkloadConnection()}
evidenceLocationLabel={evidenceLocationLabel()}
historyReadIncomplete={
inventoryIncomplete() ||
@@ -1159,6 +1169,7 @@ export const ProxmoxBackupsTable: Component<{
onToggleExpand={toggleCoverageExpansion}
retainInspectionFocus={retainEvidenceFocus}
showTaskColumn={coverageHasTask()}
+ showWorkloadConnection={showWorkloadConnection()}
evidenceLocationLabel={evidenceLocationLabel()}
historyReadIncomplete={
inventoryIncomplete() ||
diff --git a/frontend-modern/src/features/proxmox/ProxmoxCoverageTable.tsx b/frontend-modern/src/features/proxmox/ProxmoxCoverageTable.tsx
index 1f99be8ab8..4c9bf08c3a 100644
--- a/frontend-modern/src/features/proxmox/ProxmoxCoverageTable.tsx
+++ b/frontend-modern/src/features/proxmox/ProxmoxCoverageTable.tsx
@@ -60,6 +60,7 @@ import {
retainBackupTableFocus,
artifactStateLabel,
getBackupWorkloadPVEConnection,
+ hasMultipleConnections,
getBackupWorkloadNodeLabel,
getBackupWorkloadDisclosureLabel,
} from './proxmoxBackupsTableShared';
@@ -529,6 +530,8 @@ export function ProxmoxCoverageTable(props: {
/** Resolved restore-evidence filter; assessments and tasks remain workload-wide. */
evidenceLocationLabel?: string;
layoutWidth?: Accessor<number | null | undefined>;
+ /** Name each row's PVE connection; defaults to whether the rows span several. */
+ showWorkloadConnection?: boolean;
/** Register focus retention with each row/detail's own cleanup owner. */
retainInspectionFocus?: (content: HTMLElement) => void;
}) {
@@ -558,9 +561,14 @@ export function ProxmoxCoverageTable(props: {
const width = props.layoutWidth?.() ?? observedWidth.width();
return typeof width === 'number' && width > 0 ? getCoverageLayoutForContainer(width) : 'full';
});
- // Phones (and narrow panes beside the Assistant) cannot reveal hover titles.
- // Keep complete guest/connection identity visible before opening a namesake.
- const wrapWorkloadIdentity = () => layoutMode() === 'compact' || layoutMode() === 'basic';
+ // Rows stay on one line at every width. The PVE connection is named inline
+ // only when the rows span more than one, where it tells namesakes apart;
+ // the drawer always shows it in full.
+ const showWorkloadConnection = createMemo(
+ () =>
+ props.showWorkloadConnection ??
+ hasMultipleConnections(props.rows.map((row) => getBackupWorkloadPVEConnection(row.workload))),
+ );
const visibleColumns = createMemo(() =>
getCoverageColumns(layoutMode(), {
task: props.showTaskColumn,
@@ -713,21 +721,8 @@ export function ProxmoxCoverageTable(props: {
onToggle={() => props.onToggleExpand(row.key)}
/>
<div class="min-w-0 flex-1">
- <div
- class={
- wrapWorkloadIdentity()
- ? 'flex min-w-0 flex-col items-start'
- : 'flex min-w-0 items-center gap-1'
- }
- >
- <span
- class={`font-semibold ${
- wrapWorkloadIdentity()
- ? 'block w-full whitespace-normal wrap-anywhere'
- : 'truncate'
- }`}
- title={row.workload.label}
- >
+ <div class="flex min-w-0 items-baseline gap-1.5">
+ <span class="truncate font-semibold" title={row.workload.label}>
{row.workload.name || row.workload.label}
</span>
<Show
@@ -743,22 +738,24 @@ export function ProxmoxCoverageTable(props: {
{row.workload.typeLabel} {row.workload.vmid}
</span>
</Show>
+ <Show
+ when={
+ showWorkloadConnection() &&
+ getBackupWorkloadPVEConnection(row.workload)
+ }
+ >
+ {(connection) => (
+ <span
+ class="min-w-0 truncate text-[10px] text-muted"
+ title={`PVE connection: ${connection()}`}
+ data-backup-workload-connection
+ >
+ <span class="sr-only">PVE: </span>
+ {connection()}
+ </span>
+ )}
+ </Show>
</div>
- <Show when={getBackupWorkloadPVEConnection(row.workload)}>
- {(connection) => (
- <span
- class={`block text-[10px] text-muted ${
- wrapWorkloadIdentity()
- ? 'whitespace-normal wrap-anywhere'
- : 'truncate'
- }`}
- title={`PVE connection: ${connection()}`}
- data-backup-workload-connection
- >
- PVE: {connection()}
- </span>
- )}
- </Show>
</div>
</div>
</TableCell>
diff --git a/frontend-modern/src/features/proxmox/ProxmoxRecoverableTable.tsx b/frontend-modern/src/features/proxmox/ProxmoxRecoverableTable.tsx
index 36f71bed61..5b054aa92e 100644
--- a/frontend-modern/src/features/proxmox/ProxmoxRecoverableTable.tsx
+++ b/frontend-modern/src/features/proxmox/ProxmoxRecoverableTable.tsx
@@ -33,7 +33,6 @@ import { useObservedElementWidth } from '@/hooks/useObservedElementWidth';
import type { RecoverableArtifact } from './proxmoxBackupRecoveryModel';
import type { RecoverableSortKey } from './proxmoxBackupsTableModel';
import {
- ArtifactSourceBadge,
ArtifactSourceIdentity,
ArtifactStateBadge,
PROXMOX_BACKUP_COLUMN_LABELS,
@@ -46,12 +45,12 @@ import {
getBackupWorkloadPVEConnection,
getBackupWorkloadNodeLabel,
getBackupWorkloadDisclosureLabel,
+ hasMultipleConnections,
} from './proxmoxBackupsTableShared';
import {
getRecoverableColumns,
getRecoverableColumnWidthStyle,
getRecoverableLayoutForContainer,
- isCompactBackupIdentityLayout,
type RecoverableColumnId,
} from './proxmoxBackupsTablePresentation';
import { getProxmoxBackupSourcePresentation } from './proxmoxBackupSourcePresentation';
@@ -267,6 +266,10 @@ export function ProxmoxRecoverableTable(props: {
sizeMaxBytes: number;
groupByDay?: boolean;
layoutWidth?: Accessor<number | null | undefined>;
+ /** Name each row's PVE connection; defaults to whether the rows span several. */
+ showWorkloadConnection?: boolean;
+ /** Name each row's backup source connection; defaults to whether the rows span several. */
+ showSourceConnection?: boolean;
/** Register focus retention with each row/detail's own cleanup owner. */
retainInspectionFocus?: (content: HTMLElement) => void;
}) {
@@ -279,7 +282,20 @@ export function ProxmoxRecoverableTable(props: {
: 'full';
});
const visibleColumns = createMemo(() => getRecoverableColumns(layoutMode()));
- const stackedIdentity = () => isCompactBackupIdentityLayout(layoutMode());
+ // Connection labels appear only when they tell rows apart. The page decides
+ // over the whole inventory so labels do not come and go as filters narrow it.
+ const showWorkloadConnection = createMemo(
+ () =>
+ props.showWorkloadConnection ??
+ hasMultipleConnections(
+ props.artifacts.map((artifact) => getBackupWorkloadPVEConnection(artifact.workload)),
+ ),
+ );
+ const showSourceConnection = createMemo(
+ () =>
+ props.showSourceConnection ??
+ hasMultipleConnections(props.artifacts.map((artifact) => artifact.locationConnection ?? '')),
+ );
const columnVisible = (column: RecoverableColumnId) =>
visibleColumns().some((candidate) => candidate.id === column);
const showDayGroups = () => props.groupByDay && props.sortKey() === 'created';
@@ -318,7 +334,9 @@ export function ProxmoxRecoverableTable(props: {
data-proxmox-backup-row="recoverable"
>
<TableCell class={`${getPlatformTableCellClassForKind('name')} text-base-content`}>
- <div class={`flex min-w-0 gap-2 ${stackedIdentity() ? 'items-start' : 'items-center'}`}>
+ {/* One line at every width: source, connection and location live in
+ their own columns or the drawer, never stacked under the name. */}
+ <div class="flex min-w-0 items-center gap-2">
<PlatformResourceDetailToggleButton
expanded={drawer.isExpanded(artifact)}
resourceLabel={artifactDisclosureLabel(artifact)}
@@ -327,46 +345,29 @@ export function ProxmoxRecoverableTable(props: {
class="my-0"
onToggle={() => drawer.toggle(artifact)}
/>
- <div class="min-w-0 flex-1">
- <span
- class={`block font-semibold ${stackedIdentity() ? 'whitespace-normal wrap-anywhere' : 'truncate'}`}
- title={artifact.workload.label}
- >
+ <div class="flex min-w-0 flex-1 items-baseline gap-1.5">
+ <span class="truncate font-semibold" title={artifact.workload.label}>
{artifact.workload.name || artifact.workload.label}
</span>
<Show when={!columnVisible('targetId') && artifact.workload.vmid}>
- <span class="block text-[10px] text-muted">
+ <span class="shrink-0 text-[10px] text-muted">
{artifact.workload.typeLabel} {artifact.workload.vmid}
</span>
</Show>
- <Show when={getBackupWorkloadPVEConnection(artifact.workload)}>
+ <Show
+ when={showWorkloadConnection() && getBackupWorkloadPVEConnection(artifact.workload)}
+ >
{(connection) => (
<span
- class={`block text-[10px] text-muted ${stackedIdentity() ? 'whitespace-normal wrap-anywhere' : 'truncate'}`}
+ class="min-w-0 truncate text-[10px] text-muted"
title={`PVE connection: ${connection()}`}
data-backup-workload-connection
>
- PVE: {connection()}
+ <span class="sr-only">PVE: </span>
+ {connection()}
</span>
)}
</Show>
- <Show when={stackedIdentity()}>
- <div class="mt-1 space-y-0.5 text-[10px] leading-snug">
- <ArtifactSourceBadge artifact={artifact} wrap />
- <span
- class="block whitespace-normal text-muted wrap-anywhere"
- data-backup-source-connection
- >
- Connection: {artifact.locationConnection || 'Unknown connection'}
- </span>
- <span
- class="block whitespace-normal text-muted wrap-anywhere"
- data-backup-location
- >
- Location: {artifact.location}
- </span>
- </div>
- </Show>
</div>
</div>
</TableCell>
@@ -387,7 +388,7 @@ export function ProxmoxRecoverableTable(props: {
</Show>
<Show when={columnVisible('source')}>
<TableCell class={`${getPlatformTableCellClassForKind('text')} text-base-content`}>
- <ArtifactSourceIdentity artifact={artifact} />
+ <ArtifactSourceIdentity artifact={artifact} showConnection={showSourceConnection()} />
</TableCell>
</Show>
<Show when={columnVisible('location')}>
@@ -488,7 +489,7 @@ export function ProxmoxRecoverableTable(props: {
header={
<>
<SortableHead
- label={stackedIdentity() ? 'Restore point' : 'Workload'}
+ label="Workload"
sortKey="workload"
currentSort={props.sortKey}
direction={props.sortDirection}
@@ -568,7 +569,7 @@ export function ProxmoxRecoverableTable(props: {
items={tableItems}
keyExtractor={(item) => `${item.kind}:${item.key}`}
colSpan={visibleColumns().length}
- estimatedRowHeight={stackedIdentity() ? 128 : 44}
+ estimatedRowHeight={44}
reserveScrollExtent
>
{(item) => (
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
index 792213dabf..e16f57b95b 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxBackupsTable.test.tsx
@@ -2823,11 +2823,6 @@ describe('location-scoped evidence keeps workload-wide protection explicit', ()
);
expect(screen.getByRole('button', { name: '1 protected' })).toBeInTheDocument();
expect(screen.getByRole('button', { name: '1 unprotected' })).toBeInTheDocument();
- expect(
- screen.getByText(
- 'Health counts cover all targets and backup locations, regardless of filters.',
- ),
- ).toBeInTheDocument();
const row = document.querySelector<HTMLElement>('[data-proxmox-backup-row="coverage"]')!;
expect(document.querySelectorAll('[data-proxmox-backup-row="coverage"]')).toHaveLength(1);
expect(row).toHaveTextContent('Protected');
@@ -3265,11 +3260,12 @@ describe('By-date restore-point scope', () => {
const toggle = await screen.findByRole('button', {
name: /^Expand details for east-100 \(VM 100\) · PVE connection: east · PBS snapshot/,
});
+ // With one PVE connection and one reader the row stays a single line;
+ // the disclosure still names both scopes before it is opened.
+ expect(toggle).toHaveAccessibleName(/Backup connection: independent-pbs-reader/);
const point = toggle.closest('tr')!;
- expect(point.querySelector('[data-backup-workload-connection]')).toHaveTextContent('PVE: east');
- expect(point.querySelector('[data-backup-source-connection]')).toHaveTextContent(
- 'independent-pbs-reader',
- );
+ expect(point.querySelector('[data-backup-workload-connection]')).toBeNull();
+ expect(point.querySelector('[data-backup-source-connection]')).toBeNull();
expect(screen.queryByTestId('proxmox-recoverable-detail')).not.toBeInTheDocument();
expect(apiFetchMock).toHaveBeenCalledTimes(2);
vi.useRealTimers();
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxPageSurface.contract.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxPageSurface.contract.test.tsx
index 615e15c094..b8b50664c7 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxPageSurface.contract.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxPageSurface.contract.test.tsx
@@ -508,14 +508,15 @@ describe('ProxmoxPageSurface contract', () => {
expect(proxmoxBackupServersTableSource).toContain(
"title={[row.serverName, row.datastore?.name].filter(Boolean).join(' · ')}",
);
- // The date feed groups complete scope on phones instead of requiring a
- // single clipped line. Real inventory/width/focus cases live in
- // recoverableIdentityAccess.test.tsx, not this source-wiring check.
- expect(proxmoxRecoverableTableSource).toContain('class="min-w-0 flex-1"');
+ // Date-feed rows stay on one line at every width: the identity truncates
+ // and full scope lives in the drawer. Real inventory/width/focus cases live
+ // in recoverableIdentityAccess.test.tsx, not this source-wiring check.
+ expect(proxmoxRecoverableTableSource).toContain(
+ 'class="flex min-w-0 flex-1 items-baseline gap-1.5"',
+ );
expect(proxmoxRecoverableTableSource).toContain('data-backup-workload-connection');
- expect(proxmoxRecoverableTableSource).toContain('data-backup-source-connection');
- expect(proxmoxRecoverableTableSource).toContain('data-backup-location');
- expect(proxmoxRecoverableTableSource).not.toContain('class="truncate text-[10px] text-muted"');
+ expect(proxmoxRecoverableTableSource).not.toContain("whitespace-normal wrap-anywhere'");
+ expect(proxmoxRecoverableTableSource).not.toContain('data-backup-location');
});
it('hydrates only the active source-scoped resource family', () => {
diff --git a/frontend-modern/src/features/proxmox/__tests__/ProxmoxRecoverableTable.test.tsx b/frontend-modern/src/features/proxmox/__tests__/ProxmoxRecoverableTable.test.tsx
index 6f98393e61..cea526a6dc 100644
--- a/frontend-modern/src/features/proxmox/__tests__/ProxmoxRecoverableTable.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/ProxmoxRecoverableTable.test.tsx
@@ -135,20 +135,18 @@ describe('ProxmoxRecoverableTable record drawer', () => {
});
describe('ProxmoxRecoverableTable responsive columns', () => {
- it('groups full restore-point identity beside age and state in compact containers', () => {
+ it('keeps compact rows to one line of workload, age and state', () => {
renderTable(330);
expect([...document.querySelectorAll('thead th')].map((th) => th.textContent?.trim())).toEqual([
- 'Restore point',
+ 'Workload',
'Age▼',
'State',
]);
expect(document.body.textContent).toContain('VM 100');
- // No hover is needed to identify the repository on a phone.
- expect(document.querySelector('[data-backup-location]')).toHaveTextContent('main / pve1');
- expect(document.querySelector('[data-backup-source-connection]')).toHaveTextContent(
- 'Connection: Unknown connection',
- );
+ // Repository and connection are drawer detail, not a stack under the name.
+ expect(document.body.textContent).not.toContain('main / pve1');
+ expect(document.querySelector('[data-backup-source-connection]')).toBeNull();
expect(document.body.textContent).not.toContain('5 PBS files');
});
diff --git a/frontend-modern/src/features/proxmox/__tests__/backupSourceConnection.test.tsx b/frontend-modern/src/features/proxmox/__tests__/backupSourceConnection.test.tsx
index 93e506f305..ae94960456 100644
--- a/frontend-modern/src/features/proxmox/__tests__/backupSourceConnection.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/backupSourceConnection.test.tsx
@@ -181,7 +181,8 @@ describe('restore-point source connections in real inventory consumers', () => {
it('keeps a missing source explicit instead of borrowing the guest connection or namespace', async () => {
mount(() => [identityPBS({ instance: undefined })]);
const [row] = await inventoryRows();
- expect(connectionOf(row)).toBe('Connection: Unknown connection');
+ // A lone source tells no rows apart, so only the drawer names it.
+ expect(connectionOf(row)).toBeUndefined();
fireEvent.click(within(row).getByRole('button', { name: /expand details/i }));
const detail = screen.getByTestId('proxmox-recoverable-detail');
const connectionRow = within(detail).getByText('Connection').closest('tr')!;
@@ -221,7 +222,7 @@ describe('restore-point source connections in real inventory consumers', () => {
const name = '<img data-source-injected src=x>';
mount(() => [identityPBS({ instance: name })]);
const [row] = await inventoryRows();
- expect(connectionOf(row)).toBe(`Connection: ${name}`);
+ expect(connectionOf(row)).toBeUndefined();
fireEvent.click(within(row).getByRole('button', { name: /expand details/i }));
expect(
within(screen.getByTestId('proxmox-recoverable-detail')).getByText(name),
diff --git a/frontend-modern/src/features/proxmox/__tests__/backupWorkloadIdentity.test.tsx b/frontend-modern/src/features/proxmox/__tests__/backupWorkloadIdentity.test.tsx
index a5b0f4f311..581453006e 100644
--- a/frontend-modern/src/features/proxmox/__tests__/backupWorkloadIdentity.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/backupWorkloadIdentity.test.tsx
@@ -110,7 +110,7 @@ describe('backup workload identity in real inventory consumers', () => {
);
it.each([320, 390, 600, 719, 720, 1200])(
- 'keeps complete guest and connection labels readable in narrow Coverage at %ipx',
+ 'keeps namesake Coverage rows on one line with their connection named at %ipx',
async (width) => {
api.width = width;
const name = 'accounting-database-production-primary';
@@ -141,16 +141,12 @@ describe('backup workload identity in real inventory consumers', () => {
const row = rows.find((item) => connectionOf(item) === `PVE: ${scope}`)!;
const label = within(row).getByText(name, { exact: true });
const connection = row.querySelector('[data-backup-workload-connection]')!;
- if (width < 720) {
- expect(label).toHaveClass('whitespace-normal', 'wrap-anywhere');
- expect(label).not.toHaveClass('truncate');
- expect(label.parentElement).toHaveClass('flex-col', 'items-start');
- expect(connection).toHaveClass('whitespace-normal', 'wrap-anywhere');
- expect(connection).not.toHaveClass('truncate');
- } else {
- expect(label).toHaveClass('truncate');
- expect(connection).toHaveClass('truncate');
- }
+ // Rows never grow a second line; the full identity is in the drawer.
+ expect(label).toHaveClass('truncate');
+ expect(label).not.toHaveClass('whitespace-normal');
+ expect(label.parentElement).not.toHaveClass('flex-col');
+ expect(connection).toHaveClass('truncate');
+ expect(connection).toHaveAttribute('title', `PVE connection: ${scope}`);
if (width < 1120) expect(row).toHaveTextContent('VM 100');
const toggle = within(row).getByRole('button', { name: /Expand details/ });
fireEvent.click(toggle);
@@ -176,7 +172,8 @@ describe('backup workload identity in real inventory consumers', () => {
pbs: [identityPBS({ instance: 'pbs-reader', namespace: 'unrelated-namespace' })],
});
const [row] = await coverageRows();
- expect(connectionOf(row)).toBe('PVE: east');
+ // One PVE connection tells no rows apart, so only the drawer names it.
+ expect(connectionOf(row)).toBeUndefined();
fireEvent.click(within(row).getByRole('button', { name: /expand details/i }));
let detail = screen.getByTestId('proxmox-coverage-detail');
expect(connectionRow(detail)).toHaveTextContent('east');
@@ -275,7 +272,7 @@ describe('backup workload identity in real inventory consumers', () => {
pve: emptyPVE,
});
const [row] = await coverageRows();
- expect(connectionOf(row)).toBe('PVE: Not reported');
+ expect(connectionOf(row)).toBeUndefined();
fireEvent.click(within(row).getByRole('button', { name: /expand details/i }));
expect(connectionRow(screen.getByTestId('proxmox-coverage-detail'))).toHaveTextContent(
'Not reported',
@@ -290,11 +287,9 @@ describe('backup workload identity in real inventory consumers', () => {
fireEvent.click(toggle);
toggle.focus();
const detail = screen.getByTestId('proxmox-coverage-detail');
- const origin = row.querySelector('[data-backup-workload-connection]');
const literal = '<img data-workload-injected src=x>';
setWorkloads([{ ...guest, proxmox: { ...guest.proxmox!, instance: literal } }]);
- await waitFor(() => expect(connectionOf(row)).toBe(`PVE: ${literal}`));
- expect(row.querySelector('[data-backup-workload-connection]')).toBe(origin);
+ await waitFor(() => expect(connectionRow(detail)).toHaveTextContent(literal));
expect(screen.getByTestId('proxmox-coverage-detail')).toBe(detail);
expect(connectionRow(detail)).toHaveTextContent(literal);
expect(document.querySelector('[data-workload-injected]')).toBeNull();
diff --git a/frontend-modern/src/features/proxmox/__tests__/recoverableIdentityAccess.test.tsx b/frontend-modern/src/features/proxmox/__tests__/recoverableIdentityAccess.test.tsx
index 10543b4b01..17106c4c21 100644
--- a/frontend-modern/src/features/proxmox/__tests__/recoverableIdentityAccess.test.tsx
+++ b/frontend-modern/src/features/proxmox/__tests__/recoverableIdentityAccess.test.tsx
@@ -191,22 +191,22 @@ describe('restore-point identity without hover', () => {
expect(row).toBeDefined();
expect(row).toHaveTextContent(name);
expect(row).toHaveTextContent('100');
- expect(row.querySelector('[data-backup-source-connection]')).toHaveTextContent(scope);
- expect(row).toHaveTextContent(`repository-${index}`);
+ // Rows stay on one line: identity truncates, never wraps.
+ for (const element of [
+ within(row).getByText(name, { exact: true }),
+ row.querySelector('[data-backup-workload-connection]')!,
+ ]) {
+ expect(element).toHaveClass('truncate');
+ expect(element).not.toHaveClass('whitespace-normal');
+ }
if (width < 720) {
- for (const element of [
- within(row).getByText(name, { exact: true }),
- row.querySelector('[data-backup-workload-connection]')!,
- row.querySelector('[data-backup-source-connection]')!,
- row.querySelector('[data-backup-location]')!,
- ]) {
- expect(element).toHaveClass('whitespace-normal', 'wrap-anywhere');
- expect(element).not.toHaveClass('truncate');
- }
+ // Narrow rows are workload, age and state; source and location are drawer detail.
expect(row.children).toHaveLength(3);
- expect(row.closest('table')?.querySelector('thead th')).toHaveTextContent(
- 'Restore point',
- );
+ expect(row.querySelector('[data-backup-source-connection]')).toBeNull();
+ expect(row).not.toHaveTextContent(`repository-${index}`);
+ } else {
+ expect(row.querySelector('[data-backup-source-connection]')).toHaveTextContent(scope);
+ expect(row).toHaveTextContent(`repository-${index}`);
}
fireEvent.click(within(row).getByRole('button', { name: /Expand details/ }));
const panel = screen.getByTestId('proxmox-recoverable-detail');
@@ -242,18 +242,17 @@ describe('restore-point identity without hover', () => {
: [],
});
const [point] = await rows();
- expect(point.querySelector('[data-backup-workload-connection]')).toHaveTextContent(scopes[0]);
- expect(point.querySelector('[data-backup-source-connection]')).toHaveTextContent(
- kind === 'pbs' ? reader : scopes[0],
- );
- expect(point.querySelector('[data-backup-location]')).toHaveTextContent(
+ // A narrow row holds no reader or location text; the drawer has it whole.
+ expect(point.querySelector('[data-backup-workload-connection]')).toBeNull();
+ expect(point.querySelector('[data-backup-source-connection]')).toBeNull();
+ fireEvent.click(within(point).getByRole('button', { name: /Expand details/ }));
+ const panel = screen.getByTestId('proxmox-recoverable-detail');
+ expect(
+ within(panel).getByText('Connection', { exact: true }).closest('tr'),
+ ).toHaveTextContent(kind === 'pbs' ? reader : scopes[0]);
+ expect(panel).toHaveTextContent(
kind === 'pbs' ? `${location} / pve-1` : kind === 'archive' ? location : 'pve-1',
);
- expect(
- within(point.children[0] as HTMLElement).getByText(
- kind === 'pbs' ? 'PBS' : kind === 'archive' ? 'PVE file' : 'Snapshot',
- ),
- ).toBeInTheDocument();
expect(point).toHaveTextContent(
kind === 'pbs' ? 'Verified' : kind === 'snapshot' ? 'Snapshot' : 'Backup file',
);
@@ -271,15 +270,31 @@ describe('restore-point identity without hover', () => {
const points = await rows();
expect(points).toHaveLength(2);
const guest = points.find((point) => point.textContent?.includes('VM 100'))!;
+ const host = points.find((point) => point !== guest)!;
+ // The inventory spans two PVE connections, so the guest row names its own
+ // (not reported) rather than borrowing the reader; a host has none.
expect(guest.querySelector('[data-backup-workload-connection]')).toHaveTextContent(
'PVE: Not reported',
);
- expect(guest.querySelector('[data-backup-source-connection]')).toHaveTextContent('shared-pbs');
- const host = points.find((point) => point !== guest)!;
expect(host.querySelector('[data-backup-workload-connection]')).toBeNull();
- expect(host.querySelector('[data-backup-source-connection]')).toHaveTextContent('shared-pbs');
+ for (const point of points) {
+ expect(point.querySelector('[data-backup-source-connection]')).toBeNull();
+ }
fireEvent.click(within(guest).getByRole('button', { name: /Expand details/ }));
- expect(within(screen.getByTestId('proxmox-recoverable-detail')).queryByRole('link')).toBeNull();
+ let panel = screen.getByTestId('proxmox-recoverable-detail');
+ expect(within(panel).getByText('PVE connection').closest('tr')).toHaveTextContent(
+ 'Not reported',
+ );
+ expect(within(panel).getByText('Connection', { exact: true }).closest('tr')).toHaveTextContent(
+ 'shared-pbs',
+ );
+ expect(within(panel).queryByRole('link')).toBeNull();
+ fireEvent.click(within(host).getByRole('button', { name: /Expand details/ }));
+ panel = screen.getByTestId('proxmox-recoverable-detail');
+ expect(within(panel).queryByText('PVE connection')).toBeNull();
+ expect(within(panel).getByText('Connection', { exact: true }).closest('tr')).toHaveTextContent(
+ 'shared-pbs',
+ );
});
it('updates an open point in place without dropping focus or borrowing its new reader', async () => {
@@ -302,11 +317,7 @@ describe('restore-point identity without hover', () => {
reader = 'pbs-after';
datastore = 'after';
await vi.advanceTimersByTimeAsync(30_000);
- await waitFor(() =>
- expect(point.querySelector('[data-backup-source-connection]')).toHaveTextContent(reader),
- );
- expect(point.querySelector('[data-backup-workload-connection]')).toHaveTextContent(scopes[0]);
- expect(point.querySelector('[data-backup-location]')).toHaveTextContent('after / pve-1');
+ await waitFor(() => expect(panel).toHaveTextContent('after / pve-1'));
expect(screen.getByTestId('proxmox-recoverable-detail')).toBe(panel);
expect(panel).toHaveTextContent(reader);
expect(panel).not.toHaveTextContent('pbs-before');
diff --git a/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts b/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
index 17224da68e..795010f68e 100644
--- a/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
+++ b/frontend-modern/src/features/proxmox/proxmoxBackupsTablePresentation.ts
@@ -265,10 +265,9 @@ export const RECOVERABLE_COLUMNS: readonly BackupTableColumn<RecoverableColumnId
];
const RECOVERABLE_VISIBLE: Record<ProxmoxBackupsTableLayoutMode, readonly RecoverableColumnId[]> = {
- // Narrow restore-point rows group full workload/source/location identity in
- // the first cell. Separate tiny columns hid namesake connections behind hover
- // titles on touch devices. Age and state remain independent scan columns;
- // size and provider identifiers stay progressive detail in the drawer.
+ // Narrow restore-point rows keep the workload, age and state on one line.
+ // Source, location, size and provider identifiers are drawer detail; the
+ // row names a connection inline only when it tells namesakes apart.
compact: ['workload', 'created', 'state'],
basic: ['workload', 'created', 'state'],
operational: ['workload', 'type', 'source', 'location', 'created', 'size', 'state'],
diff --git a/frontend-modern/src/features/proxmox/proxmoxBackupsTableShared.tsx b/frontend-modern/src/features/proxmox/proxmoxBackupsTableShared.tsx
index 7f76b8551f..8d85ff80e2 100644
--- a/frontend-modern/src/features/proxmox/proxmoxBackupsTableShared.tsx
+++ b/frontend-modern/src/features/proxmox/proxmoxBackupsTableShared.tsx
@@ -365,20 +365,52 @@ export function ArtifactSourceBadge(props: { artifact: RecoverableArtifact; wrap
);
}
+// True when the listed values name more than one distinct connection, so a
+// connection label would tell same-named workloads or repositories apart.
+// Undefined means the row has no such connection at all (a host backup).
+export const hasMultipleConnections = (values: readonly (string | undefined)[]): boolean =>
+ new Set(values.filter((value) => value !== undefined).map((value) => value.trim())).size > 1;
+
// A provider kind and a repository name do not identify a backup's origin:
-// separate connections can both contain "main". Coverage wraps the full
-// connection; the compact list keeps it in its cell and its drawer shows it whole.
-export function ArtifactSourceIdentity(props: { artifact: RecoverableArtifact; wrap?: boolean }) {
+// separate connections can both contain "main". Drawers wrap the full
+// connection. Table rows stay on one line and name the connection only when
+// the rows span more than one, since a single connection disambiguates nothing.
+export function ArtifactSourceIdentity(props: {
+ artifact: RecoverableArtifact;
+ wrap?: boolean;
+ showConnection?: boolean;
+}) {
const connection = () => props.artifact.locationConnection || 'Unknown connection';
+ return (
+ <Show
+ when={props.wrap}
+ fallback={
+ <div class="flex min-w-0 items-center gap-1.5" title={`Connection: ${connection()}`}>
+ <ArtifactSourceBadge artifact={props.artifact} />
+ <Show when={props.showConnection}>
+ <span class="min-w-0 truncate text-muted" data-backup-source-connection>
+ <span class="sr-only">Connection: </span>
+ {connection()}
+ </span>
+ </Show>
+ </div>
+ }
+ >
+ <ArtifactSourceWrappedIdentity artifact={props.artifact} connection={connection()} />
+ </Show>
+ );
+}
+
+function ArtifactSourceWrappedIdentity(props: {
+ artifact: RecoverableArtifact;
+ connection: string;
+}) {
+ const connection = () => props.connection;
return (
<div class="min-w-0 space-y-0.5">
- <ArtifactSourceBadge artifact={props.artifact} wrap={props.wrap} />
+ <ArtifactSourceBadge artifact={props.artifact} wrap />
<span
- class={
- props.wrap
- ? 'block whitespace-normal text-muted leading-snug wrap-anywhere'
- : 'block truncate text-muted'
- }
+ class="block whitespace-normal text-muted leading-snug wrap-anywhere"
title={`Connection: ${connection()}`}
data-backup-source-connection
>