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.

Stop Storage group headers pinning the group they collapse

rcourtman03cf49787557
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
index 351562de65..ba492f1e1b 100644
--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md
+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
@@ -3179,10 +3179,10 @@ Agent`), with the plain-language source phrase available through accessible
than receiving an unfiltered copy of the estate. Opaque unified-resource ids
are not part of that visible search vocabulary and must not retain a node
when the normalized guest table has no corresponding match.
-8. Keep summary interaction identity on one shared helper. Pages that expose row-hover, group-hover, or route-focus-driven summary emphasis, today the Workloads and Storage tables through `useSummaryPageInteractionState` in `frontend-modern/src/components/shared/summaryTableFocus.ts`, must derive page/group/entity scope through `frontend-modern/src/components/shared/summaryCardInteraction.ts` rather than letting each surface read `hovered || focused` from its own page-local ID source. Hovering or pinning a storage pool-group header must scope the matching rows through that same shared contract instead of forking a page-local summary filter path. Workloads grouped host rows are static identity dividers and pass no group scope to the bridge; a grouped table that wants group hover or pin again needs a demand-ledger entry and must use this shared scope rather than reviving a Workloads-local path. No summary card or chart strip renders today, and the bridge carries no chart-hover input; one that returns must consume that same resolved scope, and the chart under the pointer must enter its hovered series into `resolveSummaryScopeState` as a preview input that outranks row hover instead of keeping a chart-local hover island. Recovery is explicitly outside this interaction dialect: its retired posture-card strip must not return with row/group/chart hover behavior without a separate governed product decision.
+8. Keep summary interaction identity on one shared helper. Pages that expose row-hover or route-focus-driven summary emphasis, today the Workloads and Storage tables through `useSummaryPageInteractionState` in `frontend-modern/src/components/shared/summaryTableFocus.ts`, must derive page/entity scope through `frontend-modern/src/components/shared/summaryCardInteraction.ts` rather than letting each surface read `hovered || focused` from its own page-local ID source. No table previews or pins a group scope, and the shared helper and bridge carry none: Workloads grouped host rows are static identity dividers, and Storage pool-group headers are disclosure rows whose click opens or closes the group only. The Storage group pin went after the storage summary charts it was built to rescope were retired; the click that pinned an open group also collapsed it, hiding the member-row emphasis that was left. A grouped table that wants group hover or pin again needs a demand-ledger entry and must add that scope to this shared helper rather than reviving a page-local path. No summary card or chart strip renders today, and the bridge carries no chart-hover input; one that returns must consume that same resolved scope, and the chart under the pointer must enter its hovered series into `resolveSummaryScopeState` as a preview input that outranks row hover instead of keeping a chart-local hover island. Recovery is explicitly outside this interaction dialect: its retired posture-card strip must not return with row/group/chart hover behavior without a separate governed product decision.
9. Keep any page summary page-scoped when table rows enter contextual focus. No infrastructure, workloads, or storage summary cards render today. If one returns, route-backed row selection may add a focused label and shared series emphasis, but the summary must continue to render the page-level series set instead of collapsing down to the selected row or replacing the global trend view with row-local empty states.
-10. Keep contextual row focus on the shared primitives. Same-route table drill-ins must reuse `frontend-modern/src/components/shared/contextualFocus.ts` for local scroll preservation, off-screen reveal, inline-detail lookup, and deliberate inline-detail reveal, and must resolve the active series through `frontend-modern/src/components/shared/summaryCardInteraction.ts` behind `frontend-modern/src/components/shared/summaryTableFocus.ts`, instead of rebuilding page-local `Set` filters, focused-label scans, drawer-aware scroll math, or ad hoc scroll restoration in each surface. `frontend-modern/src/components/shared/summaryTableFocus.ts` measures and scrolls rows only for deliberate focus, a focused row's inline detail or a pinned group header, and reveals a focused row once per focus change: its reveal effect subscribes to the focused series id and table root alone (a remounted table root starts a new reveal for the same focus) and runs the consumer's `revealActiveSeries` callback and the inline-detail scroll untracked, so page state the callback reads (live group lookups, expanded groups) cannot start another reveal, scroll the page back to the row, or reopen a group the operator collapsed. A reveal ends when its row and detail settle in view or its bounded retry window lapses, and filter changes do not re-run the consumer callback, so a row that stays filtered out past that window is not revealed when it returns. It must not keep window-level scroll or resize listeners or re-measure the hovered row on hover changes and scroll frames; an off-screen affordance for the active row needs a rendered consumer before that cost returns.
-11. Keep summary-linked table row emphasis on the shared primitive contract. Workloads, infrastructure, and storage rows that mirror the active summary entity must expose that state through `data-summary-row-active` and let the shared presentation in `frontend-modern/src/index.css` render the row emphasis, rather than carrying page-local sky or blue fill classes inside each row renderer. Group-scoped preview and pin must use that same shared presentation boundary: child rows that belong to a hovered or pinned summary group should expose `data-summary-group-member-active="preview|pinned"` so the block-level emphasis stays subtle, consistent, and reversible instead of each table inventing its own outline, badge, or full-strength fill treatment. Static grouped row headers on workloads, infrastructure, storage, recovery, and future grouped tables must use `frontend-modern/src/components/shared/groupedTableRowPresentation.ts` plus the `.grouped-table-row` CSS contract in `frontend-modern/src/index.css`, rather than rebuilding local `bg-surface-alt` variants with subtly different light/dark behavior or page-local left-accent markers. That shared grouped-table primitive owns the subgroup cell padding, typography, small metadata, and badge treatment as well as the row background token, so a future adjustment to the subgroup visual language changes every grouped product table from one owner. Inline table detail rows on platform, workload, and infrastructure tables must compose `frontend-modern/src/components/shared/InlineDetailTableRow.tsx` for the full-width row, surface-alt cell, detail padding, and row-click containment instead of rebuilding page-local `TableRow` / `TableCell` / `div` shells around each drawer. Storage-backed reusable row presenters under `frontend-modern/src/features/storageBackups/` must also keep row height and alert accents on class/data-attribute presentation instead of runtime inline style maps, so the shared table contract stays CSP-safe on both steady-state and alert-highlighted routes.
+10. Keep contextual row focus on the shared primitives. Same-route table drill-ins must reuse `frontend-modern/src/components/shared/contextualFocus.ts` for local scroll preservation, off-screen reveal, inline-detail lookup, and deliberate inline-detail reveal, and must resolve the active series through `frontend-modern/src/components/shared/summaryCardInteraction.ts` behind `frontend-modern/src/components/shared/summaryTableFocus.ts`, instead of rebuilding page-local `Set` filters, focused-label scans, drawer-aware scroll math, or ad hoc scroll restoration in each surface. `frontend-modern/src/components/shared/summaryTableFocus.ts` measures and scrolls rows only for deliberate focus of a row and its inline detail, and reveals a focused row once per focus change: its reveal effect subscribes to the focused series id and table root alone (a remounted table root starts a new reveal for the same focus) and runs the consumer's `revealActiveSeries` callback and the inline-detail scroll untracked, so page state the callback reads (live group lookups, expanded groups) cannot start another reveal, scroll the page back to the row, or reopen a group the operator collapsed. A reveal ends when its row and detail settle in view or its bounded retry window lapses, and filter changes do not re-run the consumer callback, so a row that stays filtered out past that window is not revealed when it returns. It must not keep window-level scroll or resize listeners or re-measure the hovered row on hover changes and scroll frames; an off-screen affordance for the active row needs a rendered consumer before that cost returns.
+11. Keep summary-linked table row emphasis on the shared primitive contract. Workloads, infrastructure, and storage rows that mirror the active summary entity must expose that state through `data-summary-row-active` and let the shared presentation in `frontend-modern/src/index.css` render the row emphasis, rather than carrying page-local sky or blue fill classes inside each row renderer. No table renders group-member emphasis: the `data-summary-group-member-active` rows and their `index.css` tokens went with the Storage group pin, so a group scope that returns must add its member emphasis to that shared presentation rather than a table-local outline, badge, or full-strength fill. Static grouped row headers on workloads, infrastructure, storage, recovery, and future grouped tables must use `frontend-modern/src/components/shared/groupedTableRowPresentation.ts` plus the `.grouped-table-row` CSS contract in `frontend-modern/src/index.css`, rather than rebuilding local `bg-surface-alt` variants with subtly different light/dark behavior or page-local left-accent markers. That shared grouped-table primitive owns the subgroup cell padding, typography, small metadata, and badge treatment as well as the row background token, so a future adjustment to the subgroup visual language changes every grouped product table from one owner. Inline table detail rows on platform, workload, and infrastructure tables must compose `frontend-modern/src/components/shared/InlineDetailTableRow.tsx` for the full-width row, surface-alt cell, detail padding, and row-click containment instead of rebuilding page-local `TableRow` / `TableCell` / `div` shells around each drawer. Storage-backed reusable row presenters under `frontend-modern/src/features/storageBackups/` must also keep row height and alert accents on class/data-attribute presentation instead of runtime inline style maps, so the shared table contract stays CSP-safe on both steady-state and alert-highlighted routes.
12. Keep retained-value data loading honest at the ownership boundary. Helpers
that prevent a feature surface from falling through the app-level Suspense
boundary during in-flight refresh should stay feature-local until multiple
diff --git a/docs/release-control/v6/internal/subsystems/storage-recovery.md b/docs/release-control/v6/internal/subsystems/storage-recovery.md
index 34d4e0d1c7..e7d3bc083e 100644
--- a/docs/release-control/v6/internal/subsystems/storage-recovery.md
+++ b/docs/release-control/v6/internal/subsystems/storage-recovery.md
@@ -2913,18 +2913,21 @@ canonical pre-handler authorization proof covering both transfer routes.
page must reuse one resolved active-series ID for row emphasis in both
views instead of leaving stale row-local IDs or storage-local hover
branches on the page.
- Any page, group, or entity scope that becomes pinned through storage
- interaction must stay row-first: the pinned row or group remains the
- visible scoped state, and explicit clearing belongs to the shared storage
- content-card header action plus the shared `Escape` reset path rather than
- an extra storage-local strip, search-row widget, or filter-bar badge.
+ Any pool or disk focus that becomes pinned through storage interaction
+ must stay row-first: the open row is the scoped state, and explicit
+ clearing belongs to the shared storage content-card header action plus the
+ shared `Escape` reset path rather than an extra storage-local strip,
+ search-row widget, or filter-bar badge. Collapsing the open row's group
+ hides the row without clearing that focus.
Background whitespace clearing may remain a convenience, but storage must
not rely on it as the only reversible control.
- When that scope is a storage
- pool group, member pool rows should expose shared
- `data-summary-group-member-active="preview|pinned"` state so the grouped
- block reads as one scoped set without adding storage-local outlines, pill
- buttons, or heavy full-row fills.
+ Storage pool-group headers pin nothing. A header click opens or closes its
+ group, exactly like its chevron, so it neither closes an open pool in
+ another group nor writes a `summaryGroup` route param, and Storage reads
+ none. The group pin and its member-row emphasis were removed after the
+ storage summary charts the pinned scope was built to rescope were
+ retired: one click pinned a group and toggled it, so pinning an open
+ group also collapsed it and hid the rows it emphasised.
18. Keep the storage summary history cache versioned with the chart contract.
`frontend-modern/src/utils/storageSummaryCache.ts`, which
`frontend-modern/src/components/Storage/useStorageSummaryCharts.ts` reads
@@ -2950,18 +2953,18 @@ canonical pre-handler authorization proof covering both transfer routes.
expose that state through `data-summary-row-active` and let the shared row
presentation owned by `frontend-modern/src/index.css` render the emphasis,
rather than carrying storage-local sky fill classes that drift from the
- rest of the product or obscure inline capacity bars. Storage pool rows,
- physical-disk rows, and storage group headers must also route pointer,
- and focus preview through
- `frontend-modern/src/components/shared/summaryInteractionA11y.ts`. Pool
- rows and physical-disk rows may keep deliberate expand/pin ownership on
- `frontend-modern/src/components/shared/SummaryRowActionButton.tsx`, but
- storage group headers should pin through the row itself and must not add a
- separate scope/pinned pill button beside the disclosure chevron. Touch
- pool, physical-disk, and storage group rows own expansion through the whole
- row, so they must explicitly suppress the redundant visible mobile
- chevron. Storage group row activation performs disclosure and summary
- focus together rather than preserving a storage-only chevron exception.
+ rest of the product or obscure inline capacity bars. Storage pool rows
+ and physical-disk rows must also route pointer and focus preview through
+ `frontend-modern/src/components/shared/summaryInteractionA11y.ts`, and may
+ keep deliberate expand/pin ownership on
+ `frontend-modern/src/components/shared/SummaryRowActionButton.tsx`.
+ Storage group headers have no preview or pin: the whole row and its
+ disclosure chevron perform the same open/close, the row keeps
+ `data-summary-group-id` so the shared clear-surface click leaves an open
+ pool alone, and the header must not add a separate scope/pinned pill
+ button beside the chevron. Touch pool, physical-disk, and storage group
+ rows own expansion through the whole row, so they must explicitly
+ suppress the redundant visible mobile chevron.
A drag that selects pool row text, such as a pool name being copied, must
not expand the row: `StoragePoolRow` wires the shared
`createRowTextSelectionGuard()` from
@@ -4484,9 +4487,9 @@ for pools and disks. Expanding a pool row or selecting a disk row sets the
focused summary series ID and row hover sets the hovered one;
`frontend-modern/src/components/Storage/useStoragePageModel.ts` must resolve
both through the shared `useSummaryPageInteractionState` bridge in
-`frontend-modern/src/components/shared/summaryTableFocus.ts`, so pool, disk,
-and pool-group row emphasis keeps the same page/group/entity semantics as
-workloads instead of preserving a storage-local hover/focus branch. The
+`frontend-modern/src/components/shared/summaryTableFocus.ts`, so pool and disk
+row emphasis keeps the same page/entity semantics as workloads instead of
+preserving a storage-local hover/focus branch. The
storage summary history that `useStorageSummaryCharts.ts` loads feeds only the
pool Growth column and its sort; no storage summary card strip renders, and
one that returns must stay page-scoped instead of collapsing to the expanded
@@ -4495,8 +4498,7 @@ That same storage ownership now also governs reveal. Row hover may highlight
the matching row in place, but storage hover must not auto-filter or
auto-scroll the table. Reveal belongs only to deliberate focus: the bridge
hands the focused pool or disk series to the `revealActiveSeries` callback,
-which reopens a focused pool's collapsed owning group, and a pinned pool-group
-header that sits off-screen scrolls into view through the same bridge. Focus
+which reopens a focused pool's collapsed owning group. Focus
only ever names a row in the active pools or disks view, so the callback never
switches views; the view-switching branches that served the retired jump to
the active row are gone. Reveal runs once per deliberate focus change: the
diff --git a/docs/release-control/v6/internal/subsystems/unified-resources.md b/docs/release-control/v6/internal/subsystems/unified-resources.md
index 710e2f90b5..0f0a5aacba 100644
--- a/docs/release-control/v6/internal/subsystems/unified-resources.md
+++ b/docs/release-control/v6/internal/subsystems/unified-resources.md
@@ -4960,6 +4960,10 @@ top-level system is a merged hybrid surface, the route-state helper must
resolve the deep-link source from the canonical merged source set before
falling back to raw `platformType`, so TrueNAS-backed hybrid systems do not
lose their storage context just because agent telemetry is also present.
+Storage route state names no `summaryGroup` param: `STORAGE_QUERY_PARAMS`,
+`parseStorageLinkSearch(...)` and `buildStorageRouteSearch(...)` dropped it
+with the Storage pool-group pin, no link builder passed one, and a leftover
+param in a saved URL is ignored.
That same routing contract now also owns workload platform scoping without
restoring the retired `/workloads` top-level route. Workloads URL-sync state,
and any workload link built through the shared `buildWorkloadsRouteSearch(...)`
diff --git a/frontend-modern/browser-verification/7aba289965a8c192.json b/frontend-modern/browser-verification/7aba289965a8c192.json
new file mode 100644
index 0000000000..c2e2cdfa46
--- /dev/null
+++ b/frontend-modern/browser-verification/7aba289965a8c192.json
@@ -0,0 +1,69 @@
+{
+ "version": 1,
+ "base_sha": "410d84c69444ce4b59d00432b0b5510ce3016d0e",
+ "verified_at": "2026-10-08T07:52:00Z",
+ "result": "passed",
+ "changed_paths": [
+ "frontend-modern/src/components/Storage/Storage.tsx",
+ "frontend-modern/src/components/Storage/StorageContentCard.tsx",
+ "frontend-modern/src/components/Storage/StorageGroupRow.tsx",
+ "frontend-modern/src/components/Storage/StoragePoolRow.tsx",
+ "frontend-modern/src/components/Storage/StoragePoolsTable.tsx",
+ "frontend-modern/src/components/Storage/storageSummaryGroups.ts",
+ "frontend-modern/src/components/Storage/useStoragePageModel.ts",
+ "frontend-modern/src/components/shared/summaryCardInteraction.ts",
+ "frontend-modern/src/components/shared/summaryTableFocus.ts",
+ "frontend-modern/src/index.css",
+ "frontend-modern/src/routing/resourceLinks.ts"
+ ],
+ "content_sha256": {
+ "frontend-modern/src/components/Storage/Storage.tsx": "da1ef534e98e348283e79269c800bd3cfcbacdac3f28bc7865e8d559526a8663",
+ "frontend-modern/src/components/Storage/StorageContentCard.tsx": "65d6d7248ecf77a3aeee0ea9994749971e49d0f412ee8f86499ef52fa395dc4a",
+ "frontend-modern/src/components/Storage/StorageGroupRow.tsx": "b54cdecfbf8f0ccb6ed70e054cedc92f33bf11845370af083dab93f114c2a9a4",
+ "frontend-modern/src/components/Storage/StoragePoolRow.tsx": "118627e025ab76e544b85ff064442fcdd53720c249b0952a6df450c49c3ee181",
+ "frontend-modern/src/components/Storage/StoragePoolsTable.tsx": "6954ea9c2eaa74e3dd6dcb1e7e51e1589994247b0c3056b9753389800c0294e2",
+ "frontend-modern/src/components/Storage/storageSummaryGroups.ts": "e3e27f9ceea6bdad727d61e23738b11da3c2542a47dfe14d87e6ec91a4a31c89",
+ "frontend-modern/src/components/Storage/useStoragePageModel.ts": "2cb615953e5833766111b77933458ddc9b3ea7a6503b3f07c868b5961d3ea62e",
+ "frontend-modern/src/components/shared/summaryCardInteraction.ts": "054c9c7d90fdc594b70225d6fc2c9c591344adcd0c7e62b07c4c477610610766",
+ "frontend-modern/src/components/shared/summaryTableFocus.ts": "4028c380e21b6515ec5b28ba495b6721534257c69bf9fa5560ef72fa07f8d378",
+ "frontend-modern/src/index.css": "66a8493ec824aeb75a5a77314373276d7c87a3e21d276fcdec779b99a983b64b",
+ "frontend-modern/src/routing/resourceLinks.ts": "6dfba4f6f5e13be54983f348c76215b04d726a19976b337c262cb960c970a178"
+ },
+ "routes": [
+ "/proxmox/storage?group=node",
+ "/proxmox/storage?group=node&summaryGroup=storage%3Anode%3Acluster",
+ "/proxmox/storage?group=node&resource=ceph-rbd"
+ ],
+ "viewports": [
+ {
+ "width": 1440,
+ "height": 900
+ },
+ {
+ "width": 390,
+ "height": 844
+ }
+ ],
+ "states": [
+ "Private stack: backend built from origin/main d2ac0c5112 in mock mode (6 nodes; 10 storage groups when grouped by node) on :7801, Vite dev server on :5321 serving this change's tree from the landing clone; the served StorageGroupRow.tsx was fetched and confirmed to be the changed source. Prettier later reflowed two lines in StorageContentCard.tsx and useStoragePageModel.ts with no code change",
+ "Baseline on the same stack before the edit (origin/main): clicking the cluster header collapsed it (20 to 18 pool rows), added summaryGroup=storage:node:cluster to the URL, showed Clear selection and kept the header highlighted, with 0 pinned member rows visible; a second click expanded and unpinned; hovering the header tinted its 2 member rows (preview); with offsite-vault open in backup-vault, clicking the cluster header closed that pool",
+ "After, grouped by node: hovering a group header adds no member-row emphasis and no data-summary-row-active on the header; the header carries data-summary-group-id only (no data-summary-group-series-count)",
+ "After: clicking the cluster header collapses it (20 to 18 rows) and a second click expands it; the URL stays ?group=node, no Clear selection appears, and the collapsed header has no pinned accent",
+ "After: with offsite-vault open in backup-vault, clicking the cluster header collapses cluster and the offsite-vault detail stays open; Clear selection is shown for the open pool and Escape clears it",
+ "After: a hand-typed ?summaryGroup=storage:node:cluster URL renders every group expanded with no pinned rows, no highlighted header and no Clear selection (the leftover param is ignored)",
+ "After: an in-app navigation to ?group=node&resource=ceph-rbd with the shared group collapsed reopens shared and opens the ceph-rbd detail",
+ "After: pool row hover still sets data-summary-row-active on the hovered pool",
+ "390x844: tapping the cluster header collapses and expands the group; the URL and Clear selection are unchanged",
+ "Committed onto origin/main 410d84c694, 885 commits past the verified base d2ac0c5112: none of them touches Storage, summaryTableFocus.ts, summaryCardInteraction.ts, resourceLinks.ts or index.css (git log over those paths is empty), so the verified frontend bytes are unchanged; the only same-file overlaps are three contract docs and SharedPrimitives.guardrails.test.ts, which merged cleanly"
+ ],
+ "interactions": [
+ "Mouse hover over the cluster group header row",
+ "Click on the cluster group header row body (not the chevron), twice",
+ "Click on the offsite-vault pool row to open its detail, then click the cluster group header",
+ "Escape keypress with a pool detail open",
+ "Full navigation to a URL carrying summaryGroup",
+ "In-app navigation (history pushState plus popstate) to a ?resource=ceph-rbd link after collapsing the shared group",
+ "Pointer enter on a pool row",
+ "Tap on the cluster group header at 390x844, twice"
+ ]
+}
diff --git a/frontend-modern/src/__tests__/App.architecture.test.ts b/frontend-modern/src/__tests__/App.architecture.test.ts
index 2d3b2accc9..670a29cbda 100644
--- a/frontend-modern/src/__tests__/App.architecture.test.ts
+++ b/frontend-modern/src/__tests__/App.architecture.test.ts
@@ -354,6 +354,13 @@ describe('App architecture', () => {
expect(appStylesSource).toContain('-webkit-text-fill-color: var(--color-text-base);');
});
+ it('keeps summary row emphasis to the shared active-row rules', () => {
+ expect(appStylesSource).toContain("tr[data-summary-row-active='true'] > td");
+ // Group-member emphasis went with the Storage group pin; no table sets it.
+ expect(appStylesSource).not.toContain('data-summary-group-member-active');
+ expect(appStylesSource).not.toContain('--color-summary-group-member-');
+ });
+
it('keeps infrastructure platforms marked as dense data surfaces', () => {
platformSurfaceSources.forEach((source) => {
expect(source).toMatch(/data-testid="[^"]+-page" class="pulse-wide-data-surface /);
diff --git a/frontend-modern/src/components/Storage/Storage.tsx b/frontend-modern/src/components/Storage/Storage.tsx
index c7f7f2d7ff..8672588b1b 100644
--- a/frontend-modern/src/components/Storage/Storage.tsx
+++ b/frontend-modern/src/components/Storage/Storage.tsx
@@ -51,11 +51,7 @@ const Storage: Component<StorageProps> = (props) => {
sourceFilterOptions,
nodeFilterOptions,
clearPinnedSummaryScope,
- activeSummaryStorageGroupScope,
activeSummaryStorageResourceId,
- focusedSummaryStorageGroupScope,
- focusedSummaryStorageGroupId,
- hoveredSummaryStorageGroupScope,
physicalDisks,
getDiskAlertResourceIds,
nodes,
@@ -73,8 +69,6 @@ const Storage: Component<StorageProps> = (props) => {
isLoadingPools,
selectedDiskId,
setClearSurfaceRootRef,
- setFocusedStorageGroupScope,
- setHoveredStorageGroupScope,
setHoveredStorageResourceId,
setSelectedDiskId,
setSummaryTableRootRef,
@@ -160,13 +154,7 @@ const Storage: Component<StorageProps> = (props) => {
highlightedRecordId={highlightedRecordId}
getRecordAlertState={getRecordAlertState}
isLoadingPools={isLoadingPools}
- activeSummaryGroupScope={activeSummaryStorageGroupScope}
clearPinnedSummaryScope={clearPinnedSummaryScope}
- hoveredSummaryGroupScope={hoveredSummaryStorageGroupScope}
- focusedSummaryGroupScope={focusedSummaryStorageGroupScope}
- focusedSummaryGroupId={focusedSummaryStorageGroupId}
- onGroupFocusChange={setFocusedStorageGroupScope}
- onGroupHoverChange={setHoveredStorageGroupScope}
highlightedSummaryResourceId={activeSummaryStorageResourceId}
hoveredStorageResourceId={hoveredStorageResourceId}
setTableRootRef={setSummaryTableRootRef}
diff --git a/frontend-modern/src/components/Storage/StorageContentCard.tsx b/frontend-modern/src/components/Storage/StorageContentCard.tsx
index 076f1e2fdc..6057f76f9e 100644
--- a/frontend-modern/src/components/Storage/StorageContentCard.tsx
+++ b/frontend-modern/src/components/Storage/StorageContentCard.tsx
@@ -12,7 +12,6 @@ import type { StorageGroupKey, StorageGroupedRecords } from './useStorageModel';
import type { StorageAlertRowState } from '@/features/storageBackups/storageAlertState';
import type { StorageView } from './storagePageState';
import { useStorageContentCardModel } from './useStorageContentCardModel';
-import type { SummarySeriesGroupScope } from '@/components/shared/summaryCardInteraction';
type StorageContentCardProps = {
view: () => StorageView;
@@ -37,13 +36,7 @@ type StorageContentCardProps = {
highlightedRecordId: () => string | null;
getRecordAlertState: (recordId: string) => StorageAlertRowState;
isLoadingPools: () => boolean;
- activeSummaryGroupScope: () => SummarySeriesGroupScope | null;
clearPinnedSummaryScope: () => void;
- hoveredSummaryGroupScope: () => SummarySeriesGroupScope | null;
- focusedSummaryGroupScope: () => SummarySeriesGroupScope | null;
- focusedSummaryGroupId: () => string | null;
- onGroupFocusChange: (scope: SummarySeriesGroupScope | null) => void;
- onGroupHoverChange: (scope: SummarySeriesGroupScope | null) => void;
highlightedSummaryResourceId: () => string | null;
hoveredStorageResourceId: () => string | null;
setTableRootRef: (element: HTMLDivElement | undefined) => void;
@@ -58,8 +51,7 @@ export const StorageContentCard: Component<StorageContentCardProps> = (props) =>
view: props.view,
selectedNodeId: props.selectedNodeId,
});
- const showClearSelection = () =>
- Boolean(props.focusedSummaryGroupId() || props.expandedPoolId() || props.selectedDiskId());
+ const showClearSelection = () => Boolean(props.expandedPoolId() || props.selectedDiskId());
return (
<TableCard
@@ -108,12 +100,6 @@ export const StorageContentCard: Component<StorageContentCardProps> = (props) =>
highlightedRecordId={props.highlightedRecordId()}
getRecordAlertState={props.getRecordAlertState}
isLoading={props.isLoadingPools()}
- activeSummaryGroupScope={props.activeSummaryGroupScope()}
- hoveredSummaryGroupScope={props.hoveredSummaryGroupScope()}
- focusedSummaryGroupScope={props.focusedSummaryGroupScope()}
- focusedSummaryGroupId={props.focusedSummaryGroupId()}
- onGroupFocusChange={props.onGroupFocusChange}
- onGroupHoverChange={props.onGroupHoverChange}
highlightedSummarySeriesId={props.highlightedSummaryResourceId()}
onHoverChange={props.setHoveredStorageResourceId}
/>
diff --git a/frontend-modern/src/components/Storage/StorageGroupRow.tsx b/frontend-modern/src/components/Storage/StorageGroupRow.tsx
index 301166e092..d9f45d5596 100644
--- a/frontend-modern/src/components/Storage/StorageGroupRow.tsx
+++ b/frontend-modern/src/components/Storage/StorageGroupRow.tsx
@@ -1,8 +1,6 @@
import { Component, For, Show } from 'solid-js';
import { EnhancedStorageBar } from './EnhancedStorageBar';
-import type { StorageGroupedRecords, StorageGroupKey } from './useStorageModel';
-import type { SummarySeriesGroupScope } from '@/components/shared/summaryCardInteraction';
-import { createSummaryInteractiveRowPreviewHandlers } from '@/components/shared/summaryInteractionA11y';
+import type { StorageGroupedRecords } from './useStorageModel';
import { SummaryRowActionButton } from '@/components/shared/SummaryRowActionButton';
import {
buildStorageGroupRowPresentation,
@@ -21,34 +19,22 @@ import {
interface StorageGroupRowProps {
group: StorageGroupedRecords;
- groupBy: StorageGroupKey;
+ summaryGroupId: string | null;
expanded: boolean;
onToggle: () => void;
- summaryGroupScope: SummarySeriesGroupScope | null;
- summaryActive: boolean;
- summaryFocused: boolean;
- onFocusChange?: (scope: SummarySeriesGroupScope | null) => void;
- onHoverChange?: (scope: SummarySeriesGroupScope | null) => void;
}
+// A group header is a disclosure row: clicking anywhere on it opens or closes
+// the group, exactly like its chevron. data-summary-group-id keeps that click
+// from clearing an open pool elsewhere in the table.
export const StorageGroupRow: Component<StorageGroupRowProps> = (props) => {
const row = () => buildStorageGroupRowPresentation(props.group);
- const interactiveRowHandlers = createSummaryInteractiveRowPreviewHandlers({
- onPreview: () => props.onHoverChange?.(props.summaryGroupScope),
- onPreviewClear: () => props.onHoverChange?.(null),
- });
return (
<tr
class={STORAGE_GROUP_ROW_CLASS}
- data-summary-group-id={props.summaryGroupScope?.id ?? undefined}
- data-summary-group-series-count={String(props.summaryGroupScope?.seriesIds.length ?? 0)}
- data-summary-row-active={props.summaryActive ? 'true' : 'false'}
- onClick={() => {
- props.onToggle();
- props.onFocusChange?.(props.summaryFocused ? null : props.summaryGroupScope);
- }}
- {...interactiveRowHandlers}
+ data-summary-group-id={props.summaryGroupId ?? undefined}
+ onClick={() => props.onToggle()}
>
<td colSpan={99} class={STORAGE_GROUP_ROW_CELL_CLASS}>
<div class={STORAGE_GROUP_ROW_CONTENT_CLASS}>
@@ -58,7 +44,6 @@ export const StorageGroupRow: Component<StorageGroupRowProps> = (props) => {
expanded={props.expanded}
hideWhenRowTappableOnMobile
onAction={props.onToggle}
- onPreviewClear={() => props.onHoverChange?.(null)}
class="inline-flex items-center justify-center"
/>
diff --git a/frontend-modern/src/components/Storage/StoragePoolRow.tsx b/frontend-modern/src/components/Storage/StoragePoolRow.tsx
index bf98501879..409f0128f4 100644
--- a/frontend-modern/src/components/Storage/StoragePoolRow.tsx
+++ b/frontend-modern/src/components/Storage/StoragePoolRow.tsx
@@ -32,7 +32,6 @@ import {
type StoragePoolTableColumnId,
type StoragePoolTableLayoutMode,
} from '@/features/storageBackups/storagePagePresentation';
-import type { SummaryGroupMemberInteractionState } from '@/components/shared/summaryCardInteraction';
import { getPlatformTableCellClassForKind } from '@/features/platformPage/sharedPlatformPage';
import { EnhancedStorageBar } from './EnhancedStorageBar';
import { StoragePoolDetail } from './StoragePoolDetail';
@@ -50,7 +49,6 @@ interface StoragePoolRowProps {
summarySeriesId: string;
expanded: boolean;
summaryHighlighted?: boolean;
- summaryGroupMemberState?: SummaryGroupMemberInteractionState;
onToggleExpand: () => void;
onHoverChange?: (recordId: string | null) => void;
rowClass: string;
@@ -94,11 +92,6 @@ export const StoragePoolRow: Component<StoragePoolRowProps> = (props) => {
}}
{...interactiveRowHandlers}
data-summary-series-id={props.summarySeriesId}
- data-summary-group-member-active={
- props.summaryGroupMemberState && props.summaryGroupMemberState !== 'default'
- ? props.summaryGroupMemberState
- : undefined
- }
data-summary-row-active={props.summaryHighlighted && !props.expanded ? 'true' : 'false'}
{...props.alertDataAttrs}
>
diff --git a/frontend-modern/src/components/Storage/StoragePoolsTable.tsx b/frontend-modern/src/components/Storage/StoragePoolsTable.tsx
index 3bfc614191..346501aa38 100644
--- a/frontend-modern/src/components/Storage/StoragePoolsTable.tsx
+++ b/frontend-modern/src/components/Storage/StoragePoolsTable.tsx
@@ -31,9 +31,7 @@ import { StorageGroupRow } from './StorageGroupRow';
import { StoragePoolRow } from './StoragePoolRow';
import type { StorageGroupedRecords, StorageGroupKey } from './useStorageModel';
import { useStoragePoolsTableModel } from './useStoragePoolsTableModel';
-import type { SummarySeriesGroupScope } from '@/components/shared/summaryCardInteraction';
-import { resolveSummaryGroupMemberInteractionState } from '@/components/shared/summaryCardInteraction';
-import { buildStorageSummaryGroupScope } from './storageSummaryGroups';
+import { buildStorageSummaryGroupId } from './storageSummaryGroups';
import { useStoragePoolsTableWindowing } from './useStoragePoolsTableWindowing';
type StoragePoolsTableProps = {
@@ -51,12 +49,6 @@ type StoragePoolsTableProps = {
highlightedRecordId: string | null;
getRecordAlertState: (recordId: string) => StorageAlertRowState;
isLoading: boolean;
- activeSummaryGroupScope?: SummarySeriesGroupScope | null;
- hoveredSummaryGroupScope?: SummarySeriesGroupScope | null;
- focusedSummaryGroupScope?: SummarySeriesGroupScope | null;
- focusedSummaryGroupId?: string | null;
- onGroupFocusChange?: (scope: SummarySeriesGroupScope | null) => void;
- onGroupHoverChange?: (scope: SummarySeriesGroupScope | null) => void;
highlightedSummarySeriesId?: string | null;
onHoverChange?: (recordId: string | null) => void;
};
@@ -155,21 +147,12 @@ export const StoragePoolsTable: Component<StoragePoolsTableProps> = (props) => {
<For each={tableWindow.visibleItems()}>
{(item) => {
if (item.kind === 'group') {
- const groupSummaryScope = buildStorageSummaryGroupScope(
- item.group,
- props.groupBy,
- );
return (
<StorageGroupRow
group={item.group}
- groupBy={props.groupBy}
+ summaryGroupId={buildStorageSummaryGroupId(props.groupBy, item.group.key)}
expanded={item.group.expanded}
onToggle={() => props.toggleGroup(item.group.key)}
- summaryGroupScope={groupSummaryScope}
- summaryActive={props.activeSummaryGroupScope?.id === groupSummaryScope?.id}
- summaryFocused={props.focusedSummaryGroupId === groupSummaryScope?.id}
- onFocusChange={props.onGroupFocusChange}
- onHoverChange={props.onGroupHoverChange}
/>
);
}
@@ -185,11 +168,6 @@ export const StoragePoolsTable: Component<StoragePoolsTableProps> = (props) => {
summarySeriesId={metricResourceId}
expanded={rowModel().expanded}
summaryHighlighted={props.highlightedSummarySeriesId === metricResourceId}
- summaryGroupMemberState={resolveSummaryGroupMemberInteractionState({
- seriesId: metricResourceId,
- hoveredGroupScope: props.hoveredSummaryGroupScope,
- focusedGroupScope: props.focusedSummaryGroupScope,
- })}
onToggleExpand={() => model.togglePool(record.id)}
onHoverChange={props.onHoverChange}
rowClass={rowModel().rowClass}
diff --git a/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx b/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx
index 9da5e5a709..9ab48f90c8 100644
--- a/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx
+++ b/frontend-modern/src/components/Storage/__tests__/Storage.test.tsx
@@ -9,19 +9,6 @@ import type { Resource, ResourceType } from '@/types/resource';
import Storage from '@/components/Storage/Storage';
import { ROUTE_STATE_REPLACE_OPTIONS } from '@/utils/routeStateNavigation';
-const buildVisibleRect = (): DOMRect =>
- ({
- x: 0,
- y: 120,
- width: 960,
- height: 32,
- top: 120,
- bottom: 152,
- left: 0,
- right: 960,
- toJSON: () => ({}),
- }) as DOMRect;
-
// Stub ResizeObserver for jsdom (used by HistoryChart in pool detail panels)
if (typeof globalThis.ResizeObserver === 'undefined') {
globalThis.ResizeObserver = class ResizeObserver {
@@ -865,46 +852,73 @@ describe('Storage', () => {
expect(queryStorageChip('Node')).toBeNull();
});
- it('pins storage group scope into the route without conflating it with expansion', async () => {
+ it('toggles a storage group from its header row without pinning a group scope', async () => {
hookResources = [
buildStorageResource('storage-1', 'Node-Store', 'pve1'),
buildStorageResource('storage-2', 'Edge-Store', 'pve2'),
];
mockLocationSearch = '?group=node';
- navigateSpy.mockImplementation((nextPath: string) => {
- mockLocationSearch = nextPath.includes('?') ? nextPath.slice(nextPath.indexOf('?')) : '';
- });
render(() => <Storage />);
await waitFor(() => {
expect(document.querySelector('tr[data-summary-group-id="storage:node:pve1"]')).toBeTruthy();
});
-
- let groupRow = document.querySelector(
+ const groupRow = document.querySelector(
'tr[data-summary-group-id="storage:node:pve1"]',
- ) as HTMLTableRowElement | null;
- expect(groupRow).not.toBeNull();
- if (!groupRow) {
- return;
- }
- Object.defineProperty(groupRow, 'getBoundingClientRect', {
- configurable: true,
- value: () => buildVisibleRect(),
- });
+ ) as HTMLTableRowElement;
+
+ fireEvent.pointerEnter(groupRow, { pointerType: 'mouse' });
+ expect(document.querySelector('tr[data-summary-group-member-active]')).toBeNull();
+ expect(groupRow).not.toHaveAttribute('data-summary-row-active');
fireEvent.click(groupRow);
await waitFor(() => {
- expect(navigateSpy).toHaveBeenCalledWith(
- '/proxmox/storage?group=node&summaryGroup=storage%3Anode%3Apve1',
- ROUTE_STATE_REPLACE_OPTIONS,
- );
+ expect(screen.queryByText('Node-Store')).not.toBeInTheDocument();
});
-
+ expect(screen.getByRole('button', { name: 'Expand pve1' })).toBeInTheDocument();
+ expect(screen.getByText('Edge-Store')).toBeInTheDocument();
expect(
- screen.queryByRole('button', { name: 'Unpin summary scope for pve1' }),
+ within(screen.getByTestId('storage-content-surface')).queryByRole('button', {
+ name: 'Clear selection',
+ }),
).not.toBeInTheDocument();
+
+ fireEvent.click(groupRow);
+
+ await waitFor(() => {
+ expect(screen.getByText('Node-Store')).toBeInTheDocument();
+ });
+ expect(screen.getByRole('button', { name: 'Collapse pve1' })).toBeInTheDocument();
+ for (const [path] of navigateSpy.mock.calls) {
+ expect(String(path)).not.toContain('summaryGroup');
+ }
+ });
+
+ it('keeps an open pool open when another group header is clicked', async () => {
+ hookResources = [
+ buildStorageResource('storage-1', 'Node-Store', 'pve1'),
+ buildStorageResource('storage-2', 'Edge-Store', 'pve2'),
+ ];
+ mockLocationSearch = '?group=node';
+
+ render(() => <Storage />);
+
+ fireEvent.click(await screen.findByRole('button', { name: 'Expand Node-Store' }));
+ await waitFor(() => {
+ expect(document.querySelector('tr[data-inline-detail-for]')).toBeTruthy();
+ });
+
+ fireEvent.click(
+ document.querySelector('tr[data-summary-group-id="storage:node:pve2"]') as HTMLElement,
+ );
+
+ await waitFor(() => {
+ expect(screen.queryByText('Edge-Store')).not.toBeInTheDocument();
+ });
+ expect(screen.getByRole('button', { name: 'Collapse Node-Store' })).toBeInTheDocument();
+ expect(document.querySelector('tr[data-inline-detail-for]')).toBeTruthy();
});
it('reopens the collapsed group of a pool focused by an in-app storage link', async () => {
@@ -1009,91 +1023,26 @@ describe('Storage', () => {
expect(screen.getByRole('button', { name: 'Expand pve1' })).toBeInTheDocument();
});
- it('clears pinned storage group scope from the content-card header action', async () => {
+ it('ignores a summaryGroup param left in a storage URL', async () => {
hookResources = [
buildStorageResource('storage-1', 'Node-Store', 'pve1'),
buildStorageResource('storage-2', 'Edge-Store', 'pve2'),
];
mockLocationSearch = '?group=node&summaryGroup=storage%3Anode%3Apve1';
- navigateSpy.mockImplementation((nextPath: string) => {
- mockLocationSearch = nextPath.includes('?') ? nextPath.slice(nextPath.indexOf('?')) : '';
- });
-
- render(() => <Storage />);
-
- await waitFor(() => {
- expect(document.querySelector('tr[data-summary-group-id="storage:node:pve1"]')).toBeTruthy();
- });
-
- const clearButton = within(screen.getByTestId('storage-content-surface')).getByRole('button', {
- name: 'Clear selection',
- });
- fireEvent.click(clearButton);
-
- await waitFor(() => {
- expect(navigateSpy).toHaveBeenCalledWith(
- '/proxmox/storage?group=node',
- ROUTE_STATE_REPLACE_OPTIONS,
- );
- });
- });
-
- it('uses shared preview and pinned group-member emphasis for storage pool rows', async () => {
- hookResources = [
- buildStorageResource('storage-1', 'Node-Store', 'pve1'),
- buildStorageResource('storage-2', 'Edge-Store', 'pve2'),
- ];
- mockLocationSearch = '?group=node';
- navigateSpy.mockImplementation((nextPath: string) => {
- mockLocationSearch = nextPath.includes('?') ? nextPath.slice(nextPath.indexOf('?')) : '';
- });
render(() => <Storage />);
await waitFor(() => {
- expect(document.querySelector('tr[data-summary-group-id="storage:node:pve1"]')).toBeTruthy();
- });
-
- const groupRow = document.querySelector(
- 'tr[data-summary-group-id="storage:node:pve1"]',
- ) as HTMLTableRowElement | null;
- expect(groupRow).not.toBeNull();
- if (!groupRow) {
- return;
- }
-
- fireEvent.pointerEnter(groupRow, { pointerType: 'mouse' });
-
- await waitFor(() => {
- expect(
- document.querySelectorAll('tr[data-summary-group-member-active="preview"]'),
- ).toHaveLength(1);
- });
-
- fireEvent.pointerLeave(groupRow, { pointerType: 'mouse' });
-
- await waitFor(() => {
- expect(
- document.querySelectorAll('tr[data-summary-group-member-active="preview"]'),
- ).toHaveLength(0);
- });
-
- fireEvent.click(groupRow);
-
- await waitFor(() => {
- expect(navigateSpy).toHaveBeenCalledWith(
- '/proxmox/storage?group=node&summaryGroup=storage%3Anode%3Apve1',
- ROUTE_STATE_REPLACE_OPTIONS,
- );
- });
-
- fireEvent.click(screen.getByRole('button', { name: 'Expand pve1' }));
-
- await waitFor(() => {
- expect(
- document.querySelectorAll('tr[data-summary-group-member-active="pinned"]'),
- ).toHaveLength(1);
+ expect(screen.getByText('Node-Store')).toBeInTheDocument();
});
+ expect(screen.getByText('Edge-Store')).toBeInTheDocument();
+ expect(document.querySelector('tr[data-summary-group-member-active]')).toBeNull();
+ expect(document.querySelector('tr[data-summary-row-active="true"]')).toBeNull();
+ expect(
+ within(screen.getByTestId('storage-content-surface')).queryByRole('button', {
+ name: 'Clear selection',
+ }),
+ ).not.toBeInTheDocument();
});
it('keeps a storage pool row closed when a drag selects its text', async () => {
diff --git a/frontend-modern/src/components/Storage/__tests__/StorageGroupRow.test.tsx b/frontend-modern/src/components/Storage/__tests__/StorageGroupRow.test.tsx
index 8f65608db4..703ab73b49 100644
--- a/frontend-modern/src/components/Storage/__tests__/StorageGroupRow.test.tsx
+++ b/frontend-modern/src/components/Storage/__tests__/StorageGroupRow.test.tsx
@@ -36,12 +36,9 @@ describe('StorageGroupRow', () => {
<tbody>
<StorageGroupRow
group={makeGroup()}
- groupBy="node"
+ summaryGroupId={null}
expanded={false}
onToggle={onToggle}
- summaryGroupScope={null}
- summaryActive={false}
- summaryFocused={false}
/>
</tbody>
</table>
@@ -58,29 +55,17 @@ describe('StorageGroupRow', () => {
expect(container.querySelector('.bg-slate-300')).toBeInTheDocument();
});
- it('lets the whole group row own disclosure and summary focus', () => {
+ it('lets the whole group row own disclosure and nothing else', () => {
const onToggle = vi.fn();
- const onFocusChange = vi.fn();
- const onHoverChange = vi.fn();
- const scope = {
- id: 'storage:node:tower',
- label: 'tower (2 storage items)',
- seriesIds: ['pool-1', 'pool-2'],
- };
render(() => (
<table>
<tbody>
<StorageGroupRow
group={makeGroup()}
- groupBy="node"
+ summaryGroupId="storage:node:tower"
expanded={false}
onToggle={onToggle}
- summaryGroupScope={scope}
- summaryActive={false}
- summaryFocused={false}
- onFocusChange={onFocusChange}
- onHoverChange={onHoverChange}
/>
</tbody>
</table>
@@ -91,10 +76,9 @@ describe('StorageGroupRow', () => {
if (!row) {
return;
}
-
- fireEvent.pointerEnter(row, { pointerType: 'mouse' });
- expect(onHoverChange).toHaveBeenCalledWith(scope);
-
+ expect(row).toHaveAttribute('data-summary-group-id', 'storage:node:tower');
+ expect(row).not.toHaveAttribute('data-summary-row-active');
+ expect(row).not.toHaveAttribute('data-summary-group-series-count');
expect(
screen.queryByRole('button', {
name: 'Pin summary scope for tower',
@@ -102,7 +86,6 @@ describe('StorageGroupRow', () => {
).not.toBeInTheDocument();
fireEvent.click(row);
- expect(onFocusChange).toHaveBeenCalledWith(scope);
expect(onToggle).toHaveBeenCalledTimes(1);
const toggleButton = screen.getByRole('button', { name: 'Expand tower' });
@@ -110,8 +93,5 @@ describe('StorageGroupRow', () => {
expect(toggleButton).toHaveClass('sm:not-sr-only');
fireEvent.click(toggleButton);
expect(onToggle).toHaveBeenCalledTimes(2);
-
- fireEvent.pointerLeave(row, { pointerType: 'mouse' });
- expect(onHoverChange).toHaveBeenLastCalledWith(null);
});
});
diff --git a/frontend-modern/src/components/Storage/__tests__/storagePageState.branchcov.test.ts b/frontend-modern/src/components/Storage/__tests__/storagePageState.branchcov.test.ts
index 48d4975237..d5fe9162ba 100644
--- a/frontend-modern/src/components/Storage/__tests__/storagePageState.branchcov.test.ts
+++ b/frontend-modern/src/components/Storage/__tests__/storagePageState.branchcov.test.ts
@@ -83,7 +83,6 @@ const makeParsed = (overrides: Partial<ParsedStorageSearch> = {}): ParsedStorage
resource: '',
sort: '',
order: '',
- summaryGroup: '',
...overrides,
});
diff --git a/frontend-modern/src/components/Storage/__tests__/storageSummaryGroups.branchcov0712.test.ts b/frontend-modern/src/components/Storage/__tests__/storageSummaryGroups.branchcov0712.test.ts
index a55ab0b3d1..d9c3036ce4 100644
--- a/frontend-modern/src/components/Storage/__tests__/storageSummaryGroups.branchcov0712.test.ts
+++ b/frontend-modern/src/components/Storage/__tests__/storageSummaryGroups.branchcov0712.test.ts
@@ -1,48 +1,6 @@
import { describe, expect, it } from 'vitest';
-import type { NormalizedHealth, StorageRecord } from '@/features/storageBackups/models';
-import type { StorageGroupedRecords, StorageGroupKey } from '@/components/Storage/useStorageModel';
-import {
- buildStorageSummaryGroupId,
- buildStorageSummaryGroupScope,
-} from '@/components/Storage/storageSummaryGroups';
-
-const emptyByHealth = (): Record<NormalizedHealth, number> => ({
- healthy: 0,
- warning: 0,
- critical: 0,
- offline: 0,
- unknown: 0,
-});
-
-const makeRecord = (overrides: Partial<StorageRecord> = {}): StorageRecord => ({
- id: 'storage-1',
- name: 'pool-1',
- category: 'pool',
- health: 'healthy',
- location: { label: 'pve1', scope: 'node' },
- capacity: { totalBytes: 100, usedBytes: 40, freeBytes: 60, usagePercent: 40 },
- capabilities: [],
- source: {
- platform: 'truenas',
- family: 'generic',
- origin: 'resource',
- adapterId: 'adapter-1',
- },
- observedAt: 0,
- ...overrides,
-});
-
-const makeGroup = (overrides: Partial<StorageGroupedRecords> = {}): StorageGroupedRecords => ({
- key: 'pve1',
- items: [],
- stats: {
- totalBytes: 0,
- usedBytes: 0,
- usagePercent: 0,
- byHealth: emptyByHealth(),
- },
- ...overrides,
-});
+import type { StorageGroupKey } from '@/components/Storage/useStorageModel';
+import { buildStorageSummaryGroupId } from '@/components/Storage/storageSummaryGroups';
describe('buildStorageSummaryGroupId (branch coverage)', () => {
it('returns null when groupBy is "none" (first guard true arm)', () => {
@@ -75,145 +33,3 @@ describe('buildStorageSummaryGroupId (branch coverage)', () => {
expect(buildStorageSummaryGroupId('type', '\tZFS\n')).toBe('storage:type:ZFS');
});
});
-
-describe('buildStorageSummaryGroupScope (branch coverage)', () => {
- it('returns null when the resolved id is null because groupBy is "none"', () => {
- // `if (!id)` true arm, reached via buildStorageSummaryGroupId -> 'none' guard.
- const group = makeGroup({ items: [makeRecord()] });
- expect(buildStorageSummaryGroupScope(group, 'none')).toBeNull();
- });
-
- it('returns null when the resolved id is null because group.key trims to empty', () => {
- // `if (!id)` true arm, reached via the empty-normalized-key guard inside buildStorageSummaryGroupId.
- const group = makeGroup({ key: ' ', items: [makeRecord()] });
- expect(buildStorageSummaryGroupScope(group, 'node')).toBeNull();
- });
-
- it('returns null when the group has no items (seriesIds.length === 0)', () => {
- // `if (seriesIds.length === 0)` true arm: items.map -> [] -> Set -> [] -> length 0.
- const group = makeGroup({ items: [] });
- expect(buildStorageSummaryGroupScope(group, 'node')).toBeNull();
- });
-
- it('returns null when every item resolves to an empty/falsy metric resource id', () => {
- // `if (seriesIds.length === 0)` true arm, but items is non-empty: each record's
- // resolveStorageRecordMetricResourceId falls through metricsTarget/refs to id,
- // and `.filter(Boolean)` strips the empty strings.
- const blankRecord = makeRecord({ id: '' });
- const group = makeGroup({ items: [blankRecord, makeRecord({ id: ' ' })] });
- expect(buildStorageSummaryGroupScope(group, 'node')).toBeNull();
- });
-
- it('builds a scope using the record id fallback when items have no metricsTarget/refs', () => {
- // Happy path: resolveStorageRecordMetricResourceId's third operand (record.id).
- const group = makeGroup({
- key: 'pve1',
- items: [makeRecord({ id: 'storage-1' }), makeRecord({ id: 'storage-2' })],
- });
- expect(buildStorageSummaryGroupScope(group, 'node')).toStrictEqual({
- id: 'storage:node:pve1',
- label: 'pve1 (2 storage items)',
- seriesIds: ['storage-1', 'storage-2'],
- });
- });
-
- it('prefers metricsTarget.resourceId over refs.resourceId and record.id in the emitted seriesIds', () => {
- // resolveStorageRecordMetricResourceId's first operand wins: metricsTarget.resourceId.
- const group = makeGroup({
- key: 'node-a',
- items: [
- makeRecord({
- id: 'storage-1',
- metricsTarget: { resourceType: 'pool', resourceId: 'series-via-metrics' },
- refs: { resourceId: 'series-via-refs' },
- }),
- ],
- });
- expect(buildStorageSummaryGroupScope(group, 'node')).toStrictEqual({
- id: 'storage:node:node-a',
- label: 'node-a (1 storage item)',
- seriesIds: ['series-via-metrics'],
- });
- });
-
- it('falls back to refs.resourceId when metricsTarget.resourceId is absent/blank', () => {
- // resolveStorageRecordMetricResourceId's second operand: refs.resourceId.
- const group = makeGroup({
- key: 'node-b',
- items: [
- makeRecord({
- id: 'storage-1',
- metricsTarget: { resourceType: 'pool', resourceId: ' ' },
- refs: { resourceId: 'series-via-refs' },
- }),
- ],
- });
- expect(buildStorageSummaryGroupScope(group, 'type')).toStrictEqual({
- id: 'storage:type:node-b',
- label: 'node-b (1 storage item)',
- seriesIds: ['series-via-refs'],
- });
- });
-
- it('deduplicates seriesIds that collapse to the same resource id (new Set de-dup arm)', () => {
- // `new Set(...)` collapses duplicates while preserving first-seen order.
- const group = makeGroup({
- key: 'pve1',
- items: [
- makeRecord({ id: 'r1', metricsTarget: { resourceType: 'pool', resourceId: 'series-a' } }),
- makeRecord({ id: 'r2', refs: { resourceId: 'series-a' } }),
- makeRecord({ id: 'r3', metricsTarget: { resourceType: 'pool', resourceId: 'series-b' } }),
- ],
- });
- expect(buildStorageSummaryGroupScope(group, 'status')!.seriesIds).toStrictEqual([
- 'series-a',
- 'series-b',
- ]);
- });
-
- it('drops blank resolved ids while keeping non-blank ones (filter(Boolean) arm)', () => {
- // A single group with a mix: one record resolves to '' (metricsTarget, refs AND id all
- // blank/whitespace so every operand of resolveStorageRecordMetricResourceId is falsy),
- // another resolves to 'series-a'. filter(Boolean) must drop only the blank one.
- const group = makeGroup({
- key: 'pve1',
- items: [
- makeRecord({
- id: ' ',
- metricsTarget: { resourceType: 'pool', resourceId: ' ' },
- refs: { resourceId: ' ' },
- }),
- makeRecord({ id: 'real', metricsTarget: { resourceType: 'pool', resourceId: 'series-a' } }),
- ],
- });
- expect(buildStorageSummaryGroupScope(group, 'node')!.seriesIds).toStrictEqual(['series-a']);
- });
-
- it('uses the plural count label when the group has more than one item', () => {
- // getStorageGroupPoolCountLabel: count === 1 ? 'storage item' : 'storage items'.
- const group = makeGroup({
- key: 'pve1',
- items: [
- makeRecord({ id: 'a', metricsTarget: { resourceType: 'pool', resourceId: 's1' } }),
- makeRecord({ id: 'b', metricsTarget: { resourceType: 'pool', resourceId: 's2' } }),
- makeRecord({ id: 'c', metricsTarget: { resourceType: 'pool', resourceId: 's3' } }),
- ],
- });
- expect(buildStorageSummaryGroupScope(group, 'node')!.label).toBe('pve1 (3 storage items)');
- });
-
- it('propagates a whitespace-padded group key untrimmed into the label but trimmed into the id', () => {
- // Documents current behaviour: the scope `id` is built from the *trimmed* key
- // (via buildStorageSummaryGroupId), but the label is built from
- // buildStorageGroupRowPresentation, which reads `group.key` verbatim.
- const group = makeGroup({
- key: ' pve1 ',
- items: [makeRecord({ id: 'storage-1' })],
- });
- expect(buildStorageSummaryGroupScope(group, 'node')).toStrictEqual({
- id: 'storage:node:pve1',
- label: ' pve1 (1 storage item)',
- seriesIds: ['storage-1'],
- });
- });
-});
diff --git a/frontend-modern/src/components/Storage/storageSummaryGroups.ts b/frontend-modern/src/components/Storage/storageSummaryGroups.ts
index dac1011c52..6459c1d544 100644
--- a/frontend-modern/src/components/Storage/storageSummaryGroups.ts
+++ b/frontend-modern/src/components/Storage/storageSummaryGroups.ts
@@ -1,10 +1,4 @@
-import type { SummarySeriesGroupScope } from '@/components/shared/summaryCardInteraction';
-import {
- buildStorageGroupRowPresentation,
- getStorageGroupPoolCountLabel,
-} from '@/features/storageBackups/groupPresentation';
-import { resolveStorageRecordMetricResourceId } from '@/features/storageBackups/storageMetricsIdentity';
-import type { StorageGroupKey, StorageGroupedRecords } from './useStorageModel';
+import type { StorageGroupKey } from './useStorageModel';
const normalizeStorageSummaryGroupKey = (value: string): string => value.trim();
@@ -21,45 +15,3 @@ export const buildStorageSummaryGroupId = (
}
return `storage:${groupBy}:${normalizedGroupKey}`;
};
-
-export const buildStorageSummaryGroupScope = (
- group: StorageGroupedRecords,
- groupBy: StorageGroupKey,
-): SummarySeriesGroupScope | null => {
- const id = buildStorageSummaryGroupId(groupBy, group.key);
- if (!id) {
- return null;
- }
-
- const seriesIds = Array.from(
- new Set(
- group.items.map((record) => resolveStorageRecordMetricResourceId(record)).filter(Boolean),
- ),
- );
- if (seriesIds.length === 0) {
- return null;
- }
-
- const presentation = buildStorageGroupRowPresentation(group);
- const countLabel = getStorageGroupPoolCountLabel(group.items.length);
-
- return {
- id,
- label: `${presentation.label} (${countLabel})`,
- seriesIds,
- };
-};
-
-export const buildStorageSummaryGroupScopeMap = (
- groups: StorageGroupedRecords[],
- groupBy: StorageGroupKey,
-): Map<string, SummarySeriesGroupScope> => {
- const scopes = new Map<string, SummarySeriesGroupScope>();
- for (const group of groups) {
- const scope = buildStorageSummaryGroupScope(group, groupBy);
- if (scope) {
- scopes.set(scope.id, scope);
- }
- }
- return scopes;
-};
diff --git a/frontend-modern/src/components/Storage/useStoragePageModel.ts b/frontend-modern/src/components/Storage/useStoragePageModel.ts
index 76df466b99..7d064318d8 100644
--- a/frontend-modern/src/components/Storage/useStoragePageModel.ts
+++ b/frontend-modern/src/components/Storage/useStoragePageModel.ts
@@ -1,4 +1,4 @@
-import { createEffect, createMemo, createSignal, onCleanup, untrack } from 'solid-js';
+import { createEffect, createMemo, createSignal } from 'solid-js';
import { useLocation, useNavigate } from '@solidjs/router';
import {
SUMMARY_TIME_RANGE_LABEL,
@@ -11,13 +11,6 @@ import {
} from '@/features/storageBackups/storageMetricsIdentity';
import { useKioskMode } from '@/hooks/useKioskMode';
import { useSummaryPageInteractionState } from '@/components/shared/summaryTableFocus';
-import {
- isSummarySeriesInGroupScope,
- type SummarySeriesGroupScope,
-} from '@/components/shared/summaryCardInteraction';
-import { createRouteStateNavigateScheduler } from '@/utils/routeStateNavigation';
-import { areSearchParamsEquivalent } from '@/utils/searchParams';
-import { parseStorageLinkSearch, STORAGE_QUERY_PARAMS } from '@/routing/resourceLinks';
import { useStorageExpansionState } from './useStorageExpansionState';
import { useStorageFilterState } from './useStorageFilterState';
import { useStoragePageData } from './useStoragePageData';
@@ -33,7 +26,6 @@ import {
DEFAULT_STORAGE_DISK_ROLE_FILTER,
isStorageRecordCeph,
} from './storagePageState';
-import { buildStorageSummaryGroupScopeMap } from './storageSummaryGroups';
type UseStoragePageModelOptions = {
forcedSourceFilter?: () => string | undefined;
@@ -43,16 +35,8 @@ type UseStoragePageModelOptions = {
export const useStoragePageModel = (options: UseStoragePageModelOptions = {}) => {
const navigate = useNavigate();
const location = useLocation();
- const routeStateNavigate = createRouteStateNavigateScheduler(
- navigate,
- () => `${untrack(() => location.pathname)}${untrack(() => location.search)}`,
- );
const kioskMode = useKioskMode();
const [hoveredStorageRowId, setHoveredStorageResourceId] = createSignal<string | null>(null);
- const [hoveredStorageGroupScope, setHoveredStorageGroupScope] =
- createSignal<SummarySeriesGroupScope | null>(null);
- const [selectedStorageGroupId, setSelectedStorageGroupIdRaw] = createSignal<string | null>(null);
- const [handledSummaryGroupId, setHandledSummaryGroupId] = createSignal<string | null>(null);
const [selectedDiskId, setSelectedDiskId] = createSignal<string | null>(null);
// Growth column on the storage table is anchored to a 24h window. The
// standalone summary chart that let operators retune the range was
@@ -159,16 +143,12 @@ export const useStoragePageModel = (options: UseStoragePageModelOptions = {}) =>
void storageResources.refetch();
reconnect();
};
- const {
- expandedGroups,
- expandedPoolId,
- setExpandedPoolId: setExpandedPoolIdRaw,
- toggleGroup,
- } = useStorageExpansionState({
- groupBy,
- groupedKeys: () => groupedRecords().map((group) => group.key),
- view,
- });
+ const { expandedGroups, expandedPoolId, setExpandedPoolId, toggleGroup } =
+ useStorageExpansionState({
+ groupBy,
+ groupedKeys: () => groupedRecords().map((group) => group.key),
+ view,
+ });
const storageRecordMetricIds = createMemo(() => {
const ids = new Map<string, string>();
for (const record of records()) {
@@ -210,45 +190,9 @@ export const useStoragePageModel = (options: UseStoragePageModelOptions = {}) =>
}
return keys;
});
- const storageSummaryGroupScopes = createMemo<Map<string, SummarySeriesGroupScope>>(() => {
- if (view() !== 'pools' || groupBy() === 'none') {
- return new Map<string, SummarySeriesGroupScope>();
- }
- return buildStorageSummaryGroupScopeMap(groupedRecords(), groupBy());
- });
- const focusedStorageGroupScope = createMemo<SummarySeriesGroupScope | null>(() => {
- const groupId = selectedStorageGroupId();
- if (!groupId) {
- return null;
- }
- return storageSummaryGroupScopes().get(groupId) ?? null;
- });
-
- const scheduleStorageSummaryGroupPath = (summaryGroupId: string | null) => {
- const currentParams = new URLSearchParams(location.search);
- const nextParams = new URLSearchParams(location.search);
- nextParams.delete(STORAGE_QUERY_PARAMS.summaryGroup);
- const normalizedSummaryGroupId = summaryGroupId?.trim() || '';
- if (normalizedSummaryGroupId) {
- nextParams.set(STORAGE_QUERY_PARAMS.summaryGroup, normalizedSummaryGroupId);
- }
- if (areSearchParamsEquivalent(currentParams, nextParams)) {
- return;
- }
- const nextSearch = nextParams.toString();
- const nextPath = nextSearch ? `${location.pathname}?${nextSearch}` : location.pathname;
- routeStateNavigate.schedule(nextPath);
- };
-
- const clearFocusedStorageGroup = () => {
- setSelectedStorageGroupIdRaw(null);
- scheduleStorageSummaryGroupPath(null);
- };
-
const clearPinnedSummaryScope = () => {
- setExpandedPoolIdRaw(null);
+ setExpandedPoolId(null);
setSelectedDiskId(null);
- clearFocusedStorageGroup();
};
const clearStorageFilters = () => {
setSearch('');
@@ -263,91 +207,9 @@ export const useStoragePageModel = (options: UseStoragePageModelOptions = {}) =>
clearStorageFilters();
};
- const setExpandedPoolId = (
- value: string | null | ((current: string | null) => string | null),
- ) => {
- const nextValue = typeof value === 'function' ? value(expandedPoolId()) : value;
- const focusedScope = focusedStorageGroupScope();
- const nextResourceId =
- nextValue && storageRecordMetricIds().get(nextValue)
- ? storageRecordMetricIds().get(nextValue)!
- : null;
- if (
- focusedScope &&
- nextResourceId &&
- !isSummarySeriesInGroupScope(focusedScope, nextResourceId)
- ) {
- clearFocusedStorageGroup();
- }
- setExpandedPoolIdRaw(nextValue);
- };
-
- const setFocusedStorageGroupScope = (scope: SummarySeriesGroupScope | null) => {
- const nextGroupId = scope?.id ?? null;
- setSelectedStorageGroupIdRaw(nextGroupId);
- if (scope && !isSummarySeriesInGroupScope(scope, focusedStorageResourceId())) {
- setExpandedPoolIdRaw(null);
- }
- scheduleStorageSummaryGroupPath(nextGroupId);
- };
-
createEffect(() => {
view();
setHoveredStorageResourceId(null);
- if (view() !== 'pools') {
- setHoveredStorageGroupScope(null);
- if (selectedStorageGroupId()) {
- setFocusedStorageGroupScope(null);
- }
- }
- });
-
- createEffect(() => {
- const { summaryGroup } = parseStorageLinkSearch(location.search);
- if (!summaryGroup) {
- if (handledSummaryGroupId() === null) {
- return;
- }
- setSelectedStorageGroupIdRaw(null);
- setHandledSummaryGroupId(null);
- return;
- }
- if (summaryGroup === handledSummaryGroupId()) {
- return;
- }
- setSelectedStorageGroupIdRaw(summaryGroup);
- setHandledSummaryGroupId(summaryGroup);
- });
-
- createEffect(() => {
- const hoveredGroup = hoveredStorageGroupScope();
- if (!hoveredGroup) {
- return;
- }
- if (!storageSummaryGroupScopes().has(hoveredGroup.id)) {
- setHoveredStorageGroupScope(null);
- }
- });
-
- createEffect(() => {
- const selectedGroupId = selectedStorageGroupId();
- if (!selectedGroupId) {
- return;
- }
- if (!focusedStorageGroupScope()) {
- setFocusedStorageGroupScope(null);
- }
- });
-
- createEffect(() => {
- const focusedScope = focusedStorageGroupScope();
- const focusedResourceId = focusedStorageResourceId();
- if (!focusedScope || !focusedResourceId) {
- return;
- }
- if (!isSummarySeriesInGroupScope(focusedScope, focusedResourceId)) {
- clearFocusedStorageGroup();
- }
});
const {
@@ -396,10 +258,7 @@ export const useStoragePageModel = (options: UseStoragePageModelOptions = {}) =>
});
const summaryInteraction = useSummaryPageInteractionState({
clearPinnedScope: clearPinnedSummaryScope,
- hoveredGroupScope: hoveredStorageGroupScope,
hoveredSeriesId: hoveredStorageResourceId,
- focusedGroupScope: focusedStorageGroupScope,
- focusedGroupId: selectedStorageGroupId,
focusedSeriesId: focusedStorageResourceId,
onEscapeClear: clearAllPageStateOnEscape,
revealActiveSeries: (seriesId) => {
@@ -415,12 +274,7 @@ export const useStoragePageModel = (options: UseStoragePageModelOptions = {}) =>
},
});
- onCleanup(() => {
- routeStateNavigate.cleanup();
- });
-
return {
- activeSummaryStorageGroupScope: summaryInteraction.activeGroupScope,
activeSummaryStorageResourceId: summaryInteraction.activeSeriesId,
clearPinnedSummaryScope,
kioskMode,
@@ -470,13 +324,8 @@ export const useStoragePageModel = (options: UseStoragePageModelOptions = {}) =>
getRecordAlertState,
hoveredStorageResourceId,
isLoadingPools,
- focusedSummaryStorageGroupScope: focusedStorageGroupScope,
- focusedSummaryStorageGroupId: selectedStorageGroupId,
- hoveredSummaryStorageGroupScope: hoveredStorageGroupScope,
selectedDiskId,
setClearSurfaceRootRef: summaryInteraction.setClearSurfaceRootRef,
- setFocusedStorageGroupScope,
- setHoveredStorageGroupScope,
setHoveredStorageResourceId,
setSelectedDiskId,
setSummaryTableRootRef: summaryInteraction.setTableRootRef,
diff --git a/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts b/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
index 029eecd4dd..14827ee595 100644
--- a/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
+++ b/frontend-modern/src/components/shared/SharedPrimitives.guardrails.test.ts
@@ -1351,10 +1351,9 @@ describe('shared primitive guardrails', () => {
expect(contextualFocusSource).toContain('export const revealInlineDetailInViewport');
expect(contextualFocusSource).toContain('markRouteStateDeliberateScroll');
expect(contextualFocusSource).toContain('data-inline-detail-for');
- expect(summaryCardInteractionSource).toContain('SummarySeriesGroupScope');
- expect(summaryCardInteractionSource).toContain('resolveSummaryGroupScope');
- expect(summaryCardInteractionSource).toContain('resolveSummaryGroupMemberInteractionState');
expect(summaryCardInteractionSource).toContain('resolveSummaryScopeState');
+ // No table pins or previews a group scope since the Storage group pin went.
+ expect(summaryCardInteractionSource).not.toContain('SummarySeriesGroupScope');
expect(workloadSelectionStateSource).toContain('preserveScrollableAncestorVerticalOffset');
expect(workloadSelectionStateSource).not.toContain('const scrollTop = scroller?.scrollTop');
@@ -1375,9 +1374,8 @@ describe('shared primitive guardrails', () => {
expect(summaryTableFocusSource).toContain('[data-summary-clear-ignore]');
expect(summaryTableFocusSource).toContain("event.key !== 'Escape'");
expect(summaryTableFocusSource).toContain('querySelector<HTMLElement>(');
- expect(summaryTableFocusSource).toContain(
- "row.scrollIntoView({ behavior: 'smooth', block: 'nearest' })",
- );
+ expect(summaryTableFocusSource).not.toContain('focusedGroupId');
+ expect(summaryTableFocusSource).not.toContain('activeGroupScope');
expect(summaryTableFocusSource).not.toContain("window.addEventListener('scroll'");
expect(summaryTableFocusSource).not.toContain('useNavigate(');
});
@@ -1388,9 +1386,8 @@ describe('shared primitive guardrails', () => {
expect(frontendIndexCssSource).toContain("tr[data-summary-row-active='true'] > td");
expect(frontendIndexCssSource).toContain('--color-summary-row-bg');
expect(frontendIndexCssSource).toContain('--color-summary-row-accent');
- expect(frontendIndexCssSource).toContain("tr[data-summary-group-member-active='preview'] > td");
- expect(frontendIndexCssSource).toContain("tr[data-summary-group-member-active='pinned'] > td");
- expect(frontendIndexCssSource).toContain('--color-summary-group-member-pinned-accent');
+ expect(frontendIndexCssSource).not.toContain('data-summary-group-member-active');
+ expect(frontendIndexCssSource).not.toContain('--color-summary-group-member-');
expect(frontendIndexCssSource).toContain('tr.grouped-table-row > td');
expect(frontendIndexCssSource).toContain('--color-grouped-table-row-bg');
expect(frontendIndexCssSource).toContain(
@@ -1417,7 +1414,7 @@ describe('shared primitive guardrails', () => {
expect(source).not.toContain('ring-blue-300 dark:ring-blue-600');
}
- expect(storagePoolRowSource).toContain('data-summary-group-member-active');
+ expect(storagePoolRowSource).not.toContain('data-summary-group-member-active');
expect(storageGroupRowSource).toContain('STORAGE_GROUP_ROW_CLASS');
expect(storageGroupPresentationSource).toContain('getInteractiveGroupedTableRowClass');
expect(storageGroupPresentationSource).toContain('getGroupedTableRowCellClass');
@@ -1692,11 +1689,13 @@ describe('shared primitive guardrails', () => {
expect(source).toContain('hideWhenRowTappableOnMobile');
}
- expect(storageGroupRowSource).toContain('createSummaryInteractiveRowPreviewHandlers');
+ // Storage group headers are disclosure rows: no hover preview, no group pin.
+ expect(storageGroupRowSource).not.toContain('createSummaryInteractiveRowPreviewHandlers');
expect(storageGroupRowSource).toContain('SummaryRowActionButton');
expect(storageGroupRowSource).toContain('hideWhenRowTappableOnMobile');
expect(storageGroupRowSource).not.toContain('hideWhenRowTappableOnMobile={false}');
- expect(storageGroupRowSource).toContain('props.onToggle();');
+ expect(storageGroupRowSource).toContain('onClick={() => props.onToggle()}');
+ expect(storageGroupRowSource).not.toContain('onFocusChange');
expect(workloadPanelSource).not.toContain('kind="scope"');
expect(storageGroupRowSource).not.toContain('kind="scope"');
diff --git a/frontend-modern/src/components/shared/__tests__/summaryCardInteraction.branchcov0724pm.test.ts b/frontend-modern/src/components/shared/__tests__/summaryCardInteraction.branchcov0724pm.test.ts
deleted file mode 100644
index 8b995327f5..0000000000
--- a/frontend-modern/src/components/shared/__tests__/summaryCardInteraction.branchcov0724pm.test.ts
+++ /dev/null
@@ -1,204 +0,0 @@
-import { describe, expect, it } from 'vitest';
-
-import {
- isSummarySeriesInGroupScope,
- normalizeSummarySeriesGroupScope,
- resolveSummaryGroupMemberInteractionState,
- resolveSummaryScopeState,
- type SummarySeriesGroupScope,
-} from '@/components/shared/summaryCardInteraction';
-
-// Branch-coverage tests for the UNCOVERED guard arms of
-// summaryCardInteraction.ts. The existing spec (summaryCardInteraction.test.ts)
-// exercises the precedence/happy paths; this file targets the null/empty/
-// malformed-input arms that never fire there. A scoped v8 coverage run against
-// the existing spec alone leaves these branch arms cold:
-// b6 normalizeSummarySeriesGroupScope: `scope.seriesIds ?? []` nullish-fallback
-// b8 normalizeSummarySeriesGroupScope: valid id but `seriesIds.length === 0` -> null
-// b10 normalizeSummarySeriesGroupScope: `typeof scope.label !== 'string'` else arm
-// b11 normalizeSummarySeriesGroupScope: `label || null` right operand (falsy label)
-// b14 isSummarySeriesInGroupScope: valid scope but empty seriesId -> false
-// b19 resolveSummaryGroupMemberInteractionState: empty seriesId -> 'default'
-// b37 resolveSummaryScopeState: hoveredGroupScope truthy -> group/preview return
-// Every asserted value below is hand-computed against the source in
-// src/components/shared/summaryCardInteraction.ts — no snapshots, no
-// constant-equals-itself tautologies. Deliberately-malformed inputs (missing
-// required `seriesIds`, non-string `label`) are cast via `as unknown as`.
-
-const validScope: SummarySeriesGroupScope = {
- id: 'cluster-a',
- label: 'Cluster A',
- seriesIds: ['alpha', 'beta'],
-};
-
-describe('summaryCardInteraction.branchcov0724pm', () => {
- // -------------------------------------------------------------------------
- // normalizeSummarySeriesGroupScope — the 4 normalization cold arms live here.
- // The existing spec always passes a fully-populated scope with at least one
- // valid series id and a string label, so every defensive branch is cold.
- // -------------------------------------------------------------------------
- describe('normalizeSummarySeriesGroupScope', () => {
- it('returns null when seriesIds is nullish, exercising the `?? []` fallback (b6) and the empty -> null path (b8)', () => {
- // `scope.seriesIds` is undefined -> the `?? []` right operand is taken
- // (b6). The resulting list is empty, so `seriesIds.length === 0` is true
- // (b8) and the function returns null. seriesIds is a required field on the
- // type, so the malformed object is cast.
- const malformed = { id: 'cluster-a' } as unknown as SummarySeriesGroupScope;
- expect(normalizeSummarySeriesGroupScope(malformed)).toBeNull();
- });
-
- it('returns null when seriesIds is present but empty, proving b8 fires independently of the `?? []` fallback', () => {
- // seriesIds is a real (empty) array -> `?? []` NOT taken (b6 stays cold
- // here), but `seriesIds.length === 0` is still true -> b8 -> null.
- expect(normalizeSummarySeriesGroupScope({ id: 'cluster-a', seriesIds: [] })).toBeNull();
- });
-
- it('coerces a non-string label to "" then null, covering the ternary else arm (b10) and the `|| null` arm (b11)', () => {
- // scope.label omitted -> `typeof undefined === 'string'` is false (b10
- // else arm) -> label = '' -> `'' || null` takes the right operand (b11)
- // -> returned label is null. Asserts the full observable shape, not just
- // the label slot.
- expect(normalizeSummarySeriesGroupScope({ id: 'cluster-a', seriesIds: ['alpha'] })).toEqual({
- id: 'cluster-a',
- label: null,
- seriesIds: ['alpha'],
- });
- });
-
- it('yields label: null for a whitespace-only string label that trims to empty', () => {
- // label IS a string (ternary then-arm, already covered) but trims to ''
- // -> `'' || null` right operand (b11) -> label: null.
- expect(
- normalizeSummarySeriesGroupScope({
- id: 'cluster-a',
- label: ' ',
- seriesIds: ['alpha'],
- }),
- ).toEqual({
- id: 'cluster-a',
- label: null,
- seriesIds: ['alpha'],
- });
- });
-
- it('trims and preserves a real label string (then + left-operand path, regression guard for the b10/b11 neighbours)', () => {
- // label is a non-empty string -> then-arm trims it -> `label || null`
- // left operand -> returned verbatim. Locks the non-cold neighbour so the
- // b10/b11 coverage cannot be silently regarded by a refactor. Asserting
- // the full shape avoids a null-deref (the helper returns ... | null).
- expect(
- normalizeSummarySeriesGroupScope({
- id: 'cluster-a',
- label: ' Cluster A ',
- seriesIds: ['alpha'],
- }),
- ).toEqual({
- id: 'cluster-a',
- label: 'Cluster A',
- seriesIds: ['alpha'],
- });
- });
- });
-
- // -------------------------------------------------------------------------
- // isSummarySeriesInGroupScope — the `!normalizedSeriesId` short-circuit.
- // The existing spec only ever calls this with a non-empty seriesId.
- // -------------------------------------------------------------------------
- describe('isSummarySeriesInGroupScope', () => {
- it('returns false when the scope is valid but the seriesId is empty/blank (b14)', () => {
- // normalizedScope is valid (truthy) so `!normalizedScope` is false; the
- // `||` evaluates `!normalizedSeriesId` which is true for '' / ' ' /
- // null -> returns false without reaching .includes.
- expect(isSummarySeriesInGroupScope(validScope, '')).toBe(false);
- expect(isSummarySeriesInGroupScope(validScope, ' ')).toBe(false);
- expect(isSummarySeriesInGroupScope(validScope, null)).toBe(false);
- expect(isSummarySeriesInGroupScope(validScope, undefined)).toBe(false);
- });
-
- it('still returns true for a real match so the b14 guard is proven not to over-reject', () => {
- expect(isSummarySeriesInGroupScope(validScope, 'alpha')).toBe(true);
- // 'alpha' with surrounding whitespace still matches after trim.
- expect(isSummarySeriesInGroupScope(validScope, ' alpha ')).toBe(true);
- });
- });
-
- // -------------------------------------------------------------------------
- // resolveSummaryGroupMemberInteractionState — the empty-seriesId early
- // return. The existing spec always passes a concrete seriesId.
- // -------------------------------------------------------------------------
- describe('resolveSummaryGroupMemberInteractionState', () => {
- it("returns 'default' when seriesId is missing/blank, before consulting any group scope (b19)", () => {
- // The very first guard `if (!normalizedSeriesId) return 'default';` fires
- // for '' / ' ' / undefined / null.
- expect(resolveSummaryGroupMemberInteractionState({})).toBe('default');
- expect(resolveSummaryGroupMemberInteractionState({ seriesId: '' })).toBe('default');
- expect(resolveSummaryGroupMemberInteractionState({ seriesId: ' ' })).toBe('default');
- expect(resolveSummaryGroupMemberInteractionState({ seriesId: null })).toBe('default');
- });
-
- it("returns 'default' for an empty seriesId even when a hoveredGroupScope is supplied, proving the guard precedes the scope checks", () => {
- // A valid hoveredGroupScope would otherwise yield 'preview' for an in-scope
- // id; the empty-seriesId guard must short-circuit first.
- expect(
- resolveSummaryGroupMemberInteractionState({
- seriesId: '',
- hoveredGroupScope: validScope,
- focusedGroupScope: validScope,
- }),
- ).toBe('default');
- });
- });
-
- // -------------------------------------------------------------------------
- // resolveSummaryScopeState — the hoveredGroupScope truthy arm. Every existing
- // call either resolves an active entity series first, or reaches this point
- // only with hoveredGroupScope === null/undefined (focused path).
- // -------------------------------------------------------------------------
- describe('resolveSummaryScopeState', () => {
- it('returns a group/preview scope state when only hoveredGroupScope is supplied (b37)', () => {
- // No series ids and no explicit groupScope option -> groupScope resolves
- // to hoveredGroupScope via resolveSummaryGroupScope; all three series
- // guards are skipped (empty ids) -> hoveredGroupScope is truthy at
- // line 150 -> kind 'group', source 'preview'.
- expect(resolveSummaryScopeState({ hoveredGroupScope: validScope })).toEqual({
- groupScope: validScope,
- kind: 'group',
- seriesId: null,
- source: 'preview',
- });
- });
-
- it('falls through to the hoveredGroupScope group return even when a hovered series id is filtered out by that same scope (b37 via the scope-mismatch skip)', () => {
- // groupScope resolves to hoveredGroupScope (alpha,beta). hoveredSeriesId
- // 'gamma' is truthy but NOT in the resolved scope -> the entity condition
- // is false -> skipped -> reaches the hoveredGroupScope check -> b37.
- expect(
- resolveSummaryScopeState({
- hoveredSeriesId: 'gamma',
- hoveredGroupScope: validScope,
- }),
- ).toEqual({
- groupScope: validScope,
- kind: 'group',
- seriesId: null,
- source: 'preview',
- });
- });
-
- it('prefers a hovered series inside the scope over the hoveredGroupScope group return, confirming b37 is precedence-gated (regression guard)', () => {
- // hoveredSeriesId 'alpha' is in the resolved scope -> entity/preview
- // return wins; the hoveredGroupScope group arm (b37) is NOT taken here.
- expect(
- resolveSummaryScopeState({
- hoveredSeriesId: 'alpha',
- hoveredGroupScope: validScope,
- }),
- ).toEqual({
- groupScope: validScope,
- kind: 'entity',
- seriesId: 'alpha',
- source: 'preview',
- });
- });
- });
-});
diff --git a/frontend-modern/src/components/shared/__tests__/summaryCardInteraction.test.ts b/frontend-modern/src/components/shared/__tests__/summaryCardInteraction.test.ts
index 9d8c2d4417..1dad4e6e7c 100644
--- a/frontend-modern/src/components/shared/__tests__/summaryCardInteraction.test.ts
+++ b/frontend-modern/src/components/shared/__tests__/summaryCardInteraction.test.ts
@@ -3,9 +3,7 @@ import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
import { preserveScrollableAncestorVerticalOffset } from '@/components/shared/contextualFocus';
import {
resolveSummaryActiveSeriesId,
- resolveSummaryGroupMemberInteractionState,
resolveSummaryScopeState,
- type SummarySeriesGroupScope,
} from '@/components/shared/summaryCardInteraction';
describe('summaryCardInteraction', () => {
@@ -38,38 +36,13 @@ describe('summaryCardInteraction', () => {
).toBe('alpha');
});
- it('keeps group scope separate from active entity focus', () => {
- const groupScope: SummarySeriesGroupScope = {
- id: 'cluster-a',
- label: 'Cluster A (2 workloads)',
- seriesIds: ['alpha', 'beta'],
- };
-
- expect(
- resolveSummaryActiveSeriesId({
- hoveredSeriesId: 'gamma',
- focusedSeriesId: 'alpha',
- groupScope,
- }),
- ).toBe('alpha');
- });
-
- it('resolves preview and pinned scope state through one shared precedence helper', () => {
- const groupScope: SummarySeriesGroupScope = {
- id: 'cluster-a',
- label: 'Cluster A (2 workloads)',
- seriesIds: ['alpha', 'beta'],
- };
-
+ it('resolves preview, pinned and page scope state through one shared precedence helper', () => {
expect(
resolveSummaryScopeState({
hoveredSeriesId: 'beta',
focusedSeriesId: 'alpha',
- hoveredGroupScope: groupScope,
- focusedGroupScope: groupScope,
}),
).toEqual({
- groupScope,
kind: 'entity',
seriesId: 'beta',
source: 'preview',
@@ -77,65 +50,22 @@ describe('summaryCardInteraction', () => {
expect(
resolveSummaryScopeState({
- focusedGroupScope: groupScope,
+ hoveredSeriesId: ' ',
+ focusedSeriesId: ' alpha ',
}),
).toEqual({
- groupScope,
- kind: 'group',
- seriesId: null,
+ kind: 'entity',
+ seriesId: 'alpha',
source: 'pinned',
});
- expect(
- resolveSummaryScopeState({
- hoveredSeriesId: 'gamma',
- focusedGroupScope: groupScope,
- }),
- ).toEqual({
- groupScope,
- kind: 'group',
+ expect(resolveSummaryScopeState({})).toEqual({
+ kind: 'page',
seriesId: null,
- source: 'pinned',
+ source: 'page',
});
});
- it('resolves group-member emphasis from hovered and pinned group scope', () => {
- const hoveredGroupScope: SummarySeriesGroupScope = {
- id: 'cluster-a',
- label: 'Cluster A (2 workloads)',
- seriesIds: ['alpha', 'beta'],
- };
- const focusedGroupScope: SummarySeriesGroupScope = {
- id: 'cluster-b',
- label: 'Cluster B (2 workloads)',
- seriesIds: ['gamma', 'delta'],
- };
-
- expect(
- resolveSummaryGroupMemberInteractionState({
- seriesId: 'alpha',
- hoveredGroupScope,
- focusedGroupScope,
- }),
- ).toBe('preview');
-
- expect(
- resolveSummaryGroupMemberInteractionState({
- seriesId: 'gamma',
- hoveredGroupScope,
- focusedGroupScope,
- }),
- ).toBe('pinned');
-
- expect(
- resolveSummaryGroupMemberInteractionState({
- seriesId: 'omega',
- hoveredGroupScope,
- focusedGroupScope,
- }),
- ).toBe('default');
- });
-
it('preserves the nearest scrollable ancestor when contextual focus changes locally', () => {
const scroller = document.createElement('div');
scroller.style.overflowY = 'auto';
diff --git a/frontend-modern/src/components/shared/__tests__/summaryTableFocus.branchcov0723pm.test.ts b/frontend-modern/src/components/shared/__tests__/summaryTableFocus.branchcov0723pm.test.ts
index 5b5c58a922..6a79174c1f 100644
--- a/frontend-modern/src/components/shared/__tests__/summaryTableFocus.branchcov0723pm.test.ts
+++ b/frontend-modern/src/components/shared/__tests__/summaryTableFocus.branchcov0723pm.test.ts
@@ -1,16 +1,11 @@
import { renderHook } from '@solidjs/testing-library';
import { createSignal } from 'solid-js';
import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';
-import {
- useSummaryPageInteractionState,
- useSummaryTableFocusBridge,
-} from '@/components/shared/summaryTableFocus';
+import { useSummaryPageInteractionState } from '@/components/shared/summaryTableFocus';
// Branch-coverage tests for the UNCOVERED guard arms of summaryTableFocus.ts.
// The existing spec (summaryTableFocus.test.tsx) exercises the happy paths;
// this file targets the null/empty/early-return arms that never fire there:
-// - focusedGroupRow guards: missing container ref, empty id, querySelector
-// miss, attribute-selector escaping.
// - page-default and hover-only active series resolution.
// - Escape handler: defaultPrevented, every modifier arm, dialog target.
// Every asserted value below is hand-computed against the source in
@@ -46,98 +41,11 @@ describe('summaryTableFocus.branchcov0723pm', () => {
vi.unstubAllGlobals();
});
- // -------------------------------------------------------------------------
- // focusedGroupRow guard arms: missing container ref, empty id, querySelector
- // miss, attribute-selector escaping.
- // -------------------------------------------------------------------------
- describe('focusedGroupRow guard arms', () => {
- it('does not attempt a reveal when setTableRootRef receives undefined (setter `element ?? null` right arm)', () => {
- const rafSpy = vi.fn((cb: FrameRequestCallback) => {
- cb(0);
- return 1;
- });
- vi.stubGlobal('requestAnimationFrame', rafSpy);
-
- const [focusedGroupId] = createSignal<string | null>('group-a');
- const { result } = renderHook(() => useSummaryTableFocusBridge({ focusedGroupId }));
- result.setTableRootRef(undefined);
-
- // tableRoot stays null -> the reveal effect returns before scheduling.
- expect(rafSpy).not.toHaveBeenCalled();
- });
-
- it('does not attempt a reveal for a whitespace-only focused group id (normalizeSeriesId guard)', () => {
- const rafSpy = vi.fn((cb: FrameRequestCallback) => {
- cb(0);
- return 1;
- });
- vi.stubGlobal('requestAnimationFrame', rafSpy);
-
- const root = document.createElement('div');
- document.body.appendChild(root);
-
- const [focusedGroupId] = createSignal<string | null>(' ');
- const { result } = renderHook(() => useSummaryTableFocusBridge({ focusedGroupId }));
- result.setTableRootRef(root);
-
- expect(rafSpy).not.toHaveBeenCalled();
- });
-
- it('does not scroll a decoy row when no group row carries the matching id (querySelector miss)', () => {
- const scrollIntoView = vi.fn();
- const root = document.createElement('div');
- const decoy = document.createElement('div');
- decoy.setAttribute('data-summary-group-id', 'other');
- Object.defineProperty(decoy, 'getBoundingClientRect', {
- configurable: true,
- value: () => buildRect(1200, 40),
- });
- Object.defineProperty(decoy, 'scrollIntoView', {
- configurable: true,
- value: scrollIntoView,
- });
- root.appendChild(decoy);
- document.body.appendChild(root);
-
- const [focusedGroupId] = createSignal<string | null>('group-a');
- const { result } = renderHook(() => useSummaryTableFocusBridge({ focusedGroupId }));
- result.setTableRootRef(root);
-
- expect(scrollIntoView).not.toHaveBeenCalled();
- });
-
- it('escapes backslashes and double quotes in the group id before injecting it into the attribute selector', () => {
- const scrollIntoView = vi.fn();
- const root = document.createElement('div');
- const row = document.createElement('div');
- // Literal id containing both a double-quote and a backslash — the exact
- // characters escapeAttributeSelectorValue rewrites.
- row.setAttribute('data-summary-group-id', 'id"with\\special');
- Object.defineProperty(row, 'getBoundingClientRect', {
- configurable: true,
- value: () => buildRect(1200, 40),
- });
- Object.defineProperty(row, 'scrollIntoView', {
- configurable: true,
- value: scrollIntoView,
- });
- root.appendChild(row);
- document.body.appendChild(root);
-
- const [focusedGroupId] = createSignal<string | null>('id"with\\special');
- const { result } = renderHook(() => useSummaryTableFocusBridge({ focusedGroupId }));
- result.setTableRootRef(root);
-
- // If escaping were broken the selector would not match the literal id.
- expect(scrollIntoView).toHaveBeenCalledWith({ behavior: 'smooth', block: 'nearest' });
- });
- });
-
// -------------------------------------------------------------------------
// Active series resolution — page default and transient hover
// -------------------------------------------------------------------------
describe('active series resolution arms', () => {
- it('resolves no active series or group when no hover/focus/group signal is set (page-default state)', () => {
+ it('resolves no active series when no hover or focus signal is set (page-default state)', () => {
const root = document.createElement('div');
document.body.appendChild(root);
@@ -145,7 +53,6 @@ describe('summaryTableFocus.branchcov0723pm', () => {
result.setTableRootRef(root);
expect(result.activeSeriesId()).toBeNull();
- expect(result.activeGroupScope()).toBeNull();
});
it('highlights a hovered off-screen row without moving the page (hover is not a reveal)', () => {
@@ -184,81 +91,6 @@ describe('summaryTableFocus.branchcov0723pm', () => {
});
});
- // -------------------------------------------------------------------------
- // Focused-group reveal effect (summaryTableFocus.ts:350) — the
- // already-visible arm skips scrollIntoView; the out-of-viewport arm scrolls.
- // -------------------------------------------------------------------------
- describe('focused-group reveal arms', () => {
- it('does not call scrollIntoView when the focused group row is already visible (already-focused arm)', () => {
- const scrollIntoView = vi.fn();
- const root = document.createElement('div');
- const row = document.createElement('div');
- row.setAttribute('data-summary-group-id', 'group-a');
- Object.defineProperty(row, 'getBoundingClientRect', {
- configurable: true,
- value: () => buildRect(120, 40), // inside viewport
- });
- Object.defineProperty(row, 'scrollIntoView', {
- configurable: true,
- value: scrollIntoView,
- });
- root.appendChild(row);
- document.body.appendChild(root);
-
- const [focusedGroupId] = createSignal<string | null>('group-a');
- const { result } = renderHook(() => useSummaryTableFocusBridge({ focusedGroupId }));
- result.setTableRootRef(root);
-
- // `!isElementVisibleWithinViewport(row) && ...` short-circuits on the
- // left operand when the row is already on-screen.
- expect(scrollIntoView).not.toHaveBeenCalled();
- });
-
- it('calls scrollIntoView with nearest-block when the focused group row sits below the viewport', () => {
- const scrollIntoView = vi.fn();
- const root = document.createElement('div');
- const row = document.createElement('div');
- row.setAttribute('data-summary-group-id', 'group-a');
- Object.defineProperty(row, 'getBoundingClientRect', {
- configurable: true,
- value: () => buildRect(1200, 40), // below innerHeight(800)
- });
- Object.defineProperty(row, 'scrollIntoView', {
- configurable: true,
- value: scrollIntoView,
- });
- root.appendChild(row);
- document.body.appendChild(root);
-
- const [focusedGroupId] = createSignal<string | null>('group-a');
- const { result } = renderHook(() => useSummaryTableFocusBridge({ focusedGroupId }));
- result.setTableRootRef(root);
-
- expect(scrollIntoView).toHaveBeenCalledWith({
- behavior: 'smooth',
- block: 'nearest',
- });
- });
-
- it('retries via rAF then stops when the focused group row never mounts (no matching group row -> remainingFrames exhausted)', () => {
- const rafSpy = vi.fn((cb: FrameRequestCallback) => {
- cb(0);
- return 1;
- });
- vi.stubGlobal('requestAnimationFrame', rafSpy);
-
- const root = document.createElement('div');
- document.body.appendChild(root);
-
- const [focusedGroupId] = createSignal<string | null>('group-a');
- const { result } = renderHook(() => useSummaryTableFocusBridge({ focusedGroupId }));
- result.setTableRootRef(root);
-
- // Initial rAF + one per decrement: remainingFrames 12->0 = 13 calls.
- expect(rafSpy).toHaveBeenCalledTimes(13);
- });
- });
-
// -------------------------------------------------------------------------
// Escape handler guard arms (summaryTableFocus.ts:174). The existing spec
// only covers the happy path; every short-circuit in the `||` chain and the
diff --git a/frontend-modern/src/components/shared/__tests__/summaryTableFocus.test.tsx b/frontend-modern/src/components/shared/__tests__/summaryTableFocus.test.tsx
index 80e1ea0712..3e1db0b96c 100644
--- a/frontend-modern/src/components/shared/__tests__/summaryTableFocus.test.tsx
+++ b/frontend-modern/src/components/shared/__tests__/summaryTableFocus.test.tsx
@@ -286,7 +286,7 @@ describe('useSummaryPageInteractionState', () => {
});
it('does not clear pinned scope when operators click ignored controls inside the clear root', () => {
- const [focusedGroupId] = createSignal<string | null>('group-a');
+ const [focusedSeriesId] = createSignal<string | null>('workload-a');
const clearPinnedScope = vi.fn();
const clearRoot = document.createElement('div');
const root = document.createElement('div');
@@ -300,7 +300,7 @@ describe('useSummaryPageInteractionState', () => {
const { result } = renderHook(() =>
useSummaryPageInteractionState({
clearPinnedScope,
- focusedGroupId,
+ focusedSeriesId,
}),
);
@@ -312,7 +312,7 @@ describe('useSummaryPageInteractionState', () => {
});
it('clears pinned scope when operators click neutral whitespace inside the table root', () => {
- const [focusedGroupId] = createSignal<string | null>('group-a');
+ const [focusedSeriesId] = createSignal<string | null>('workload-a');
const clearPinnedScope = vi.fn();
const clearRoot = document.createElement('div');
const root = document.createElement('div');
@@ -324,7 +324,7 @@ describe('useSummaryPageInteractionState', () => {
const { result } = renderHook(() =>
useSummaryPageInteractionState({
clearPinnedScope,
- focusedGroupId,
+ focusedSeriesId,
}),
);
@@ -336,7 +336,7 @@ describe('useSummaryPageInteractionState', () => {
});
it('does not clear pinned scope when page-shell clicks land above the table root', () => {
- const [focusedGroupId] = createSignal<string | null>('group-a');
+ const [focusedSeriesId] = createSignal<string | null>('workload-a');
const clearPinnedScope = vi.fn();
const clearRoot = document.createElement('div');
const root = document.createElement('div');
@@ -356,7 +356,7 @@ describe('useSummaryPageInteractionState', () => {
const { result } = renderHook(() =>
useSummaryPageInteractionState({
clearPinnedScope,
- focusedGroupId,
+ focusedSeriesId,
}),
);
diff --git a/frontend-modern/src/components/shared/summaryCardInteraction.ts b/frontend-modern/src/components/shared/summaryCardInteraction.ts
index 7de92e64d7..490f18f366 100644
--- a/frontend-modern/src/components/shared/summaryCardInteraction.ts
+++ b/frontend-modern/src/components/shared/summaryCardInteraction.ts
@@ -1,15 +1,7 @@
-export type SummaryGroupMemberInteractionState = 'default' | 'preview' | 'pinned';
-export type SummaryScopeKind = 'page' | 'group' | 'entity';
+export type SummaryScopeKind = 'page' | 'entity';
export type SummaryScopeSource = 'page' | 'preview' | 'pinned';
-export interface SummarySeriesGroupScope {
- id: string;
- label?: string | null;
- seriesIds: readonly string[];
-}
-
export interface SummaryScopeState {
- groupScope: SummarySeriesGroupScope | null;
kind: SummaryScopeKind;
seriesId: string | null;
source: SummaryScopeSource;
@@ -17,97 +9,13 @@ export interface SummaryScopeState {
const normalizeSeriesId = (value: string | null | undefined): string => value?.trim() || '';
-export const normalizeSummarySeriesGroupScope = (
- scope: SummarySeriesGroupScope | null | undefined,
-): SummarySeriesGroupScope | null => {
- if (!scope) {
- return null;
- }
-
- const id = normalizeSeriesId(scope.id);
- const seriesIds = Array.from(
- new Set((scope.seriesIds ?? []).map((value) => normalizeSeriesId(value)).filter(Boolean)),
- );
-
- if (!id || seriesIds.length === 0) {
- return null;
- }
-
- const label = typeof scope.label === 'string' ? scope.label.trim() : '';
- return {
- id,
- label: label || null,
- seriesIds,
- };
-};
-
-export const isSummarySeriesInGroupScope = (
- scope: SummarySeriesGroupScope | null | undefined,
- seriesId: string | null | undefined,
-): boolean => {
- const normalizedScope = normalizeSummarySeriesGroupScope(scope);
- const normalizedSeriesId = normalizeSeriesId(seriesId);
- if (!normalizedScope || !normalizedSeriesId) {
- return false;
- }
- return normalizedScope.seriesIds.includes(normalizedSeriesId);
-};
-
-export const resolveSummaryGroupScope = (options: {
- hoveredGroupScope?: SummarySeriesGroupScope | null;
- focusedGroupScope?: SummarySeriesGroupScope | null;
-}): SummarySeriesGroupScope | null => {
- const hoveredGroupScope = normalizeSummarySeriesGroupScope(options.hoveredGroupScope);
- if (hoveredGroupScope) {
- return hoveredGroupScope;
- }
- return normalizeSummarySeriesGroupScope(options.focusedGroupScope);
-};
-
-export const resolveSummaryGroupMemberInteractionState = (options: {
- seriesId?: string | null;
- hoveredGroupScope?: SummarySeriesGroupScope | null;
- focusedGroupScope?: SummarySeriesGroupScope | null;
-}): SummaryGroupMemberInteractionState => {
- const normalizedSeriesId = normalizeSeriesId(options.seriesId);
- if (!normalizedSeriesId) {
- return 'default';
- }
-
- const hoveredGroupScope = normalizeSummarySeriesGroupScope(options.hoveredGroupScope);
- if (isSummarySeriesInGroupScope(hoveredGroupScope, normalizedSeriesId)) {
- return 'preview';
- }
-
- const focusedGroupScope = normalizeSummarySeriesGroupScope(options.focusedGroupScope);
- if (isSummarySeriesInGroupScope(focusedGroupScope, normalizedSeriesId)) {
- return 'pinned';
- }
-
- return 'default';
-};
-
export const resolveSummaryScopeState = (options: {
hoveredSeriesId?: string | null;
focusedSeriesId?: string | null;
- hoveredGroupScope?: SummarySeriesGroupScope | null;
- focusedGroupScope?: SummarySeriesGroupScope | null;
- groupScope?: SummarySeriesGroupScope | null;
}): SummaryScopeState => {
- const groupScope =
- normalizeSummarySeriesGroupScope(options.groupScope) ??
- resolveSummaryGroupScope({
- hoveredGroupScope: options.hoveredGroupScope,
- focusedGroupScope: options.focusedGroupScope,
- });
-
const hoveredSeriesId = normalizeSeriesId(options.hoveredSeriesId);
- if (
- hoveredSeriesId &&
- (!groupScope || isSummarySeriesInGroupScope(groupScope, hoveredSeriesId))
- ) {
+ if (hoveredSeriesId) {
return {
- groupScope,
kind: 'entity',
seriesId: hoveredSeriesId,
source: 'preview',
@@ -115,40 +23,15 @@ export const resolveSummaryScopeState = (options: {
}
const focusedSeriesId = normalizeSeriesId(options.focusedSeriesId);
- if (
- focusedSeriesId &&
- (!groupScope || isSummarySeriesInGroupScope(groupScope, focusedSeriesId))
- ) {
+ if (focusedSeriesId) {
return {
- groupScope,
kind: 'entity',
seriesId: focusedSeriesId,
source: 'pinned',
};
}
- const hoveredGroupScope = normalizeSummarySeriesGroupScope(options.hoveredGroupScope);
- if (hoveredGroupScope) {
- return {
- groupScope: hoveredGroupScope,
- kind: 'group',
- seriesId: null,
- source: 'preview',
- };
- }
-
- const focusedGroupScope = normalizeSummarySeriesGroupScope(options.focusedGroupScope);
- if (focusedGroupScope) {
- return {
- groupScope: focusedGroupScope,
- kind: 'group',
- seriesId: null,
- source: 'pinned',
- };
- }
-
return {
- groupScope: null,
kind: 'page',
seriesId: null,
source: 'page',
@@ -158,7 +41,6 @@ export const resolveSummaryScopeState = (options: {
export function resolveSummaryActiveSeriesId(options: {
hoveredSeriesId?: string | null;
focusedSeriesId?: string | null;
- groupScope?: SummarySeriesGroupScope | null;
}): string | null {
return resolveSummaryScopeState(options).seriesId;
}
diff --git a/frontend-modern/src/components/shared/summaryTableFocus.ts b/frontend-modern/src/components/shared/summaryTableFocus.ts
index d854027f4f..f2e65cadfa 100644
--- a/frontend-modern/src/components/shared/summaryTableFocus.ts
+++ b/frontend-modern/src/components/shared/summaryTableFocus.ts
@@ -7,11 +7,7 @@ import {
type Accessor,
} from 'solid-js';
import { findInlineDetailElement, revealInlineDetailInViewport } from './contextualFocus';
-import {
- resolveSummaryActiveSeriesId,
- resolveSummaryGroupScope,
- type SummarySeriesGroupScope,
-} from './summaryCardInteraction';
+import { resolveSummaryActiveSeriesId } from './summaryCardInteraction';
const normalizeSeriesId = (value: string | null | undefined): string => value?.trim() || '';
@@ -36,42 +32,8 @@ const SUMMARY_CLEAR_IGNORE_SELECTOR = [
'[data-inline-detail-for]',
].join(', ');
-const isElementVisibleWithinViewport = (element: HTMLElement): boolean => {
- const rect = element.getBoundingClientRect();
- if (rect.height <= 0 || rect.width <= 0) {
- return false;
- }
- if (typeof window === 'undefined') {
- return true;
- }
-
- if (rect.bottom <= 0 || rect.top >= window.innerHeight) {
- return false;
- }
-
- let current: HTMLElement | null = element.parentElement;
- while (current) {
- const style = getComputedStyle(current);
- const clipsVertically =
- (style.overflowY === 'auto' ||
- style.overflowY === 'scroll' ||
- style.overflowY === 'hidden') &&
- current.scrollHeight > current.clientHeight;
- if (clipsVertically) {
- const containerRect = current.getBoundingClientRect();
- if (rect.bottom <= containerRect.top || rect.top >= containerRect.bottom) {
- return false;
- }
- }
- current = current.parentElement;
- }
-
- return true;
-};
-
export interface UseSummaryTableFocusBridgeOptions {
focusedSeriesId?: Accessor<string | null | undefined>;
- focusedGroupId?: Accessor<string | null | undefined>;
clearPinnedScope?: () => void;
onEscapeClear?: () => void;
revealActiveSeries?: (seriesId: string) => void;
@@ -81,7 +43,6 @@ export function useSummaryTableFocusBridge(options: UseSummaryTableFocusBridgeOp
const [tableRoot, setTableRoot] = createSignal<HTMLElement | null>(null);
const [clearSurfaceRoot, setClearSurfaceRoot] = createSignal<HTMLElement | null>(null);
const focusedSeriesId = options.focusedSeriesId ?? (() => null);
- const focusedGroupId = options.focusedGroupId ?? (() => null);
const focusedRow = (): HTMLElement | null => {
const root = tableRoot();
@@ -94,17 +55,6 @@ export function useSummaryTableFocusBridge(options: UseSummaryTableFocusBridgeOp
);
};
- const focusedGroupRow = (): HTMLElement | null => {
- const root = tableRoot();
- const focusedId = normalizeSeriesId(focusedGroupId());
- if (!root || !focusedId) {
- return null;
- }
- return root.querySelector<HTMLElement>(
- `[data-summary-group-id="${escapeAttributeSelectorValue(focusedId)}"]`,
- );
- };
-
createEffect(() => {
const root = clearSurfaceRoot() ?? tableRoot();
const lookupRoot = tableRoot();
@@ -113,7 +63,7 @@ export function useSummaryTableFocusBridge(options: UseSummaryTableFocusBridgeOp
}
const handleRootClick = (event: MouseEvent) => {
- if (!normalizeSeriesId(focusedSeriesId()) && !normalizeSeriesId(focusedGroupId())) {
+ if (!normalizeSeriesId(focusedSeriesId())) {
return;
}
const target = event.target;
@@ -275,42 +225,6 @@ export function useSummaryTableFocusBridge(options: UseSummaryTableFocusBridgeOp
untrack(() => revealFocusedSeries(root, focusedId));
});
- createEffect(() => {
- const focusedId = normalizeSeriesId(focusedGroupId());
- const root = tableRoot();
- if (!focusedId || !root || typeof window === 'undefined') {
- return;
- }
-
- let rafId: number | undefined;
- let remainingFrames = 12;
-
- const attemptReveal = () => {
- const row = focusedGroupRow();
- if (!row) {
- if (remainingFrames <= 0) {
- return;
- }
- remainingFrames -= 1;
- rafId = window.requestAnimationFrame(attemptReveal);
- return;
- }
- if (
- !isElementVisibleWithinViewport(row) &&
- typeof (row as HTMLElement).scrollIntoView === 'function'
- ) {
- row.scrollIntoView({ behavior: 'smooth', block: 'nearest' });
- }
- };
-
- rafId = window.requestAnimationFrame(attemptReveal);
- onCleanup(() => {
- if (rafId !== undefined) {
- window.cancelAnimationFrame(rafId);
- }
- });
- });
-
return {
setClearSurfaceRootRef: (element: HTMLElement | undefined) =>
setClearSurfaceRoot(element ?? null),
@@ -321,9 +235,6 @@ export function useSummaryTableFocusBridge(options: UseSummaryTableFocusBridgeOp
export interface UseSummaryPageInteractionStateOptions {
hoveredSeriesId?: Accessor<string | null | undefined>;
focusedSeriesId?: Accessor<string | null | undefined>;
- focusedGroupId?: Accessor<string | null | undefined>;
- hoveredGroupScope?: Accessor<SummarySeriesGroupScope | null | undefined>;
- focusedGroupScope?: Accessor<SummarySeriesGroupScope | null | undefined>;
clearPinnedScope?: () => void;
onEscapeClear?: () => void;
revealActiveSeries?: (seriesId: string) => void;
@@ -332,35 +243,22 @@ export interface UseSummaryPageInteractionStateOptions {
export function useSummaryPageInteractionState(options: UseSummaryPageInteractionStateOptions) {
const hoveredSeriesId = options.hoveredSeriesId ?? (() => null);
const focusedSeriesId = options.focusedSeriesId ?? (() => null);
- const focusedGroupId = options.focusedGroupId ?? (() => null);
- const hoveredGroupScope = options.hoveredGroupScope ?? (() => null);
- const focusedGroupScope = options.focusedGroupScope ?? (() => null);
-
- const activeGroupScope = createMemo<SummarySeriesGroupScope | null>(() =>
- resolveSummaryGroupScope({
- hoveredGroupScope: hoveredGroupScope(),
- focusedGroupScope: focusedGroupScope(),
- }),
- );
const activeSeriesId = createMemo<string | null>(() =>
resolveSummaryActiveSeriesId({
hoveredSeriesId: hoveredSeriesId(),
focusedSeriesId: focusedSeriesId(),
- groupScope: activeGroupScope(),
}),
);
const tableFocus = useSummaryTableFocusBridge({
clearPinnedScope: options.clearPinnedScope,
focusedSeriesId,
- focusedGroupId,
onEscapeClear: options.onEscapeClear,
revealActiveSeries: options.revealActiveSeries,
});
return {
- activeGroupScope,
activeSeriesId,
setClearSurfaceRootRef: tableFocus.setClearSurfaceRootRef,
setTableRootRef: tableFocus.setTableRootRef,
diff --git a/frontend-modern/src/index.css b/frontend-modern/src/index.css
index 3bf508a87f..2ad6f2047c 100644
--- a/frontend-modern/src/index.css
+++ b/frontend-modern/src/index.css
@@ -281,11 +281,6 @@
--color-summary-row-bg-hover: rgba(14, 165, 233, 0.08);
--color-summary-row-border: rgba(14, 165, 233, 0.16);
--color-summary-row-accent: rgba(14, 165, 233, 0.42);
- --color-summary-group-member-preview-bg: rgba(14, 165, 233, 0.025);
- --color-summary-group-member-preview-bg-hover: rgba(14, 165, 233, 0.04);
- --color-summary-group-member-pinned-bg: rgba(14, 165, 233, 0.04);
- --color-summary-group-member-pinned-bg-hover: rgba(14, 165, 233, 0.055);
- --color-summary-group-member-pinned-accent: rgba(14, 165, 233, 0.22);
/* Shared product-table subgroup band. It should read as body segmentation, not table chrome. */
--color-grouped-table-row-bg: rgba(226, 232, 240, 0.72);
--color-grouped-table-row-bg-hover: rgba(203, 213, 225, 0.82);
@@ -309,11 +304,6 @@
--color-summary-row-bg-hover: rgba(56, 189, 248, 0.12);
--color-summary-row-border: rgba(56, 189, 248, 0.18);
--color-summary-row-accent: rgba(56, 189, 248, 0.5);
- --color-summary-group-member-preview-bg: rgba(56, 189, 248, 0.045);
- --color-summary-group-member-preview-bg-hover: rgba(56, 189, 248, 0.065);
- --color-summary-group-member-pinned-bg: rgba(56, 189, 248, 0.07);
- --color-summary-group-member-pinned-bg-hover: rgba(56, 189, 248, 0.09);
- --color-summary-group-member-pinned-accent: rgba(56, 189, 248, 0.28);
--color-grouped-table-row-bg: rgba(51, 65, 85, 0.58);
--color-grouped-table-row-bg-hover: rgba(51, 65, 85, 0.82);
--color-grouped-table-row-border: rgba(71, 85, 105, 0.85);
@@ -918,31 +908,6 @@
background-color: var(--color-grouped-table-row-bg-hover);
}
- tr[data-summary-group-member-active='preview'] > td,
- tr[data-summary-group-member-active='preview'] > th {
- background-color: var(--color-summary-group-member-preview-bg);
- }
-
- tr[data-summary-group-member-active='preview']:hover > td,
- tr[data-summary-group-member-active='preview']:hover > th {
- background-color: var(--color-summary-group-member-preview-bg-hover);
- }
-
- tr[data-summary-group-member-active='pinned'] > td,
- tr[data-summary-group-member-active='pinned'] > th {
- background-color: var(--color-summary-group-member-pinned-bg);
- }
-
- tr[data-summary-group-member-active='pinned']:hover > td,
- tr[data-summary-group-member-active='pinned']:hover > th {
- background-color: var(--color-summary-group-member-pinned-bg-hover);
- }
-
- tr[data-summary-group-member-active='pinned'] > td:first-child,
- tr[data-summary-group-member-active='pinned'] > th:first-child {
- box-shadow: inset 1px 0 0 var(--color-summary-group-member-pinned-accent);
- }
-
tr[data-summary-row-active='true'] > td,
tr[data-summary-row-active='true'] > th {
background-color: var(--color-summary-row-bg);
diff --git a/frontend-modern/src/routing/__tests__/resourceLinks.branchcov0712b.test.ts b/frontend-modern/src/routing/__tests__/resourceLinks.branchcov0712b.test.ts
index 4b493224da..5c0a7ff9a3 100644
--- a/frontend-modern/src/routing/__tests__/resourceLinks.branchcov0712b.test.ts
+++ b/frontend-modern/src/routing/__tests__/resourceLinks.branchcov0712b.test.ts
@@ -6,7 +6,6 @@ import {
buildVmwarePath,
buildWorkloadsRouteSearch,
KUBERNETES_PATH,
- STORAGE_QUERY_PARAMS,
TRUENAS_PATH,
VMWARE_PATH,
WORKLOADS_QUERY_PARAMS,
@@ -160,13 +159,6 @@ describe('buildStorageRouteSearch branch coverage', () => {
expect(buildStorageRouteSearch({})).toBe('');
});
- it('emits the summaryGroup param the sibling suite omits', () => {
- expect(buildStorageRouteSearch({ summaryGroup: 'capacity' })).toBe(
- `?${STORAGE_QUERY_PARAMS.summaryGroup}=capacity`,
- );
- expect(STORAGE_QUERY_PARAMS.summaryGroup).toBe('summaryGroup');
- });
-
it('canonicalizes raw ceph-family storage types through normalizeStorageSourceKey switch arms', () => {
expect(buildStorageRouteSearch({ source: 'ceph' })).toBe('?source=ceph');
expect(buildStorageRouteSearch({ source: 'cephfs' })).toBe('?source=ceph');
@@ -196,7 +188,6 @@ describe('buildStorageRouteSearch branch coverage', () => {
resource: ' ',
sort: '',
order: null,
- summaryGroup: undefined,
}),
).toBe('');
});
@@ -215,10 +206,9 @@ describe('buildStorageRouteSearch branch coverage', () => {
resource: 'r-1',
sort: 'usage',
order: 'desc',
- summaryGroup: 'capacity',
}),
).toBe(
- '?tab=disks&group=storage&source=ceph&status=available&diskRole=nvme&diskGroup=data&node=pve1&q=lvm&resource=r-1&sort=usage&order=desc&summaryGroup=capacity',
+ '?tab=disks&group=storage&source=ceph&status=available&diskRole=nvme&diskGroup=data&node=pve1&q=lvm&resource=r-1&sort=usage&order=desc',
);
});
});
diff --git a/frontend-modern/src/routing/__tests__/resourceLinks.test.ts b/frontend-modern/src/routing/__tests__/resourceLinks.test.ts
index 618c0690d6..a8c12b9c4a 100644
--- a/frontend-modern/src/routing/__tests__/resourceLinks.test.ts
+++ b/frontend-modern/src/routing/__tests__/resourceLinks.test.ts
@@ -320,7 +320,6 @@ describe('resource link routing contract', () => {
resource: 'storage-1',
sort: 'usage',
order: 'desc',
- summaryGroup: '',
});
expect(STORAGE_QUERY_PARAMS.tab).toBe('tab');
@@ -331,7 +330,7 @@ describe('resource link routing contract', () => {
expect(STORAGE_QUERY_PARAMS.resource).toBe('resource');
expect(STORAGE_QUERY_PARAMS.sort).toBe('sort');
expect(STORAGE_QUERY_PARAMS.order).toBe('order');
- expect(STORAGE_QUERY_PARAMS.summaryGroup).toBe('summaryGroup');
+ expect(STORAGE_QUERY_PARAMS).not.toHaveProperty('summaryGroup');
});
it('canonicalizes legacy storage source aliases when parsing links', () => {
diff --git a/frontend-modern/src/routing/resourceLinks.ts b/frontend-modern/src/routing/resourceLinks.ts
index 5f2326b7f8..1c77d7807a 100644
--- a/frontend-modern/src/routing/resourceLinks.ts
+++ b/frontend-modern/src/routing/resourceLinks.ts
@@ -103,7 +103,6 @@ export const STORAGE_QUERY_PARAMS = {
resource: 'resource',
sort: 'sort',
order: 'order',
- summaryGroup: 'summaryGroup',
} as const;
const normalizeQueryValue = (value: string | null | undefined): string => (value || '').trim();
@@ -147,7 +146,6 @@ type StorageLinkOptions = {
resource?: string | null;
sort?: string | null;
order?: string | null;
- summaryGroup?: string | null;
};
export const parseWorkloadsLinkSearch = (search: string) => {
@@ -314,7 +312,6 @@ export const parseStorageLinkSearch = (search: string) => {
resource: normalizeQueryValue(params.get(STORAGE_QUERY_PARAMS.resource)),
sort: normalizeQueryValue(params.get(STORAGE_QUERY_PARAMS.sort)),
order: normalizeQueryValue(params.get(STORAGE_QUERY_PARAMS.order)),
- summaryGroup: normalizeQueryValue(params.get(STORAGE_QUERY_PARAMS.summaryGroup)),
};
};
@@ -331,7 +328,6 @@ export const buildStorageRouteSearch = (options: StorageLinkOptions = {}): strin
const resource = normalizeQueryValue(options.resource);
const sort = normalizeQueryValue(options.sort);
const order = normalizeQueryValue(options.order);
- const summaryGroup = normalizeQueryValue(options.summaryGroup);
if (tab) params.set(STORAGE_QUERY_PARAMS.tab, tab);
if (group) params.set(STORAGE_QUERY_PARAMS.group, group);
@@ -344,7 +340,6 @@ export const buildStorageRouteSearch = (options: StorageLinkOptions = {}): strin
if (resource) params.set(STORAGE_QUERY_PARAMS.resource, resource);
if (sort) params.set(STORAGE_QUERY_PARAMS.sort, sort);
if (order) params.set(STORAGE_QUERY_PARAMS.order, order);
- if (summaryGroup) params.set(STORAGE_QUERY_PARAMS.summaryGroup, summaryGroup);
return serializedRouteSearch(params);
};