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.
Go aialertsdashboarddockerdocker-monitoringgohomelabinfrastructure-monitoringkubernetesmonitoringmspproxmoxproxmox-backup-serverproxmox-mail-gatewayproxmox-veself-hostedtruenastypescriptvspherewebhooks
Keep failed resource reads distinct from empty report scope
pulse-triage[bot]0ab0f6cf23d2
diff --git a/frontend-modern/browser-verification/4c77e984a1c061ea.json b/frontend-modern/browser-verification/4c77e984a1c061ea.jsonnew file mode 100644index 0000000000..b8fd8640da--- /dev/null+++ b/frontend-modern/browser-verification/4c77e984a1c061ea.json@@ -0,0 +1,37 @@+{+ "version": 1,+ "base_sha": "8e001be0a20c2ec68ecc487ea381110214ad4929",+ "verified_at": "2026-11-02T18:06:12Z",+ "result": "passed",+ "changed_paths": [+ "frontend-modern/src/components/Settings/ResourcePicker.tsx",+ "frontend-modern/src/hooks/useResources.ts"+ ],+ "content_sha256": {+ "frontend-modern/src/components/Settings/ResourcePicker.tsx": "b0b55914b06b72eccbfd3c9aad5ec5bcbe5bf6f89e69eb63e805e72297ac9e39",+ "frontend-modern/src/hooks/useResources.ts": "4fb41fa6777a570ddedbcba00b56ab0cbe3ccdfb9a607be96617b8f55489a9d9"+ },+ "routes": [+ "/settings/support/reporting"+ ],+ "viewports": [+ {+ "width": 1280,+ "height": 900+ },+ {+ "width": 390,+ "height": 844+ }+ ],+ "states": [+ "Actual App, Settings registry, Reporting panel, shared picker, useResources/useUnifiedResources and existing API client consume only local synthetic HTTP status, resource and schedule endpoints. Chromium desktop/light and WebKit 390px/dark; Playwright1.56.1 matches integration lock.",+ "HTTP403 inventory denial, held explicit retry, accepted recovery and filtered empty, later failed canonical refresh over retained rows, cached saved-schedule remount, denied retry and accepted empty inventory with unchanged selected scope."+ ],+ "interactions": [+ "47 checks: explicit keyboard retry and duplicate activation while held; stale rows and Select all are unavailable after failure and during reads. Error feedback never renders provider details. Only accepted empty reads show No resources available.",+ "Saved selections remain intact; no generation or mutation from reads/retries. One explicit schedule PUT retains exactly the saved resource ID and workspace, rather than widening the backup report scope. Existing API-client CSRF recovery sends two denied requests on HTTP403; this patch does not change that retry policy.",+ "All eight retained desktop/narrow captures opened with native view_image and actual image content reviewed. Warning/Retry, recovered selection and saved-scope/empty states are readable without body overflow. Captures are scrolled and do not show every control; websocket handshake is intentionally absent and Sync reconnecting is not a health proof.",+ "Contexts, browsers, Vite and local HTTP server closed; no uncaught page errors. Three failed fixture attempts remain retained: overbroad row selector, collapsed native details, and an incorrect one-network-request expectation for existing CSRF recovery. No runtime change between browser attempts."+ ]+}diff --git a/frontend-modern/src/components/Settings/ResourcePicker.tsx b/frontend-modern/src/components/Settings/ResourcePicker.tsxindex 782e36ae7b..7d9c57326b 100644--- a/frontend-modern/src/components/Settings/ResourcePicker.tsx+++ b/frontend-modern/src/components/Settings/ResourcePicker.tsx@@ -6,6 +6,7 @@ import { formControl } from '@/components/shared/Form';import { SearchField } from '@/components/shared/SearchField';import { FilterButtonGroup, type FilterOption } from '@/components/shared/FilterButtonGroup';import { Button } from '@/components/shared/Button';+import { InlineNotice } from '@/components/shared/InlineNotice';import { StatusDot } from '@/components/shared/StatusDot';import { useResources } from '@/hooks/useResources';import type { Resource, ResourceType } from '@/types/resource';@@ -40,7 +41,22 @@ interface ResourcePickerProps {}export function ResourcePicker(props: ResourcePickerProps) {- const { resources, loading } = useResources();+ const { resources, loading, error, refetch } = useResources(undefined, { retainReadError: true });+ const [retrying, setRetrying] = createSignal(false);+ const inventoryLoading = () => loading() || retrying();+ const inventoryAvailable = () => !error() && !inventoryLoading();+ const retryResources = async () => {+ if (inventoryLoading()) return;+ setRetrying(true);+ try {+ await refetch();+ } catch {+ // The canonical hook retains the read error. Do not expose provider+ // details or turn a failed retry into an empty inventory.+ } finally {+ setRetrying(false);+ }+ };const [search, setSearch] = createSignal('');const [typeFilter, setTypeFilter] = createSignal<TypeFilter>('all');const [tagFilter, setTagFilter] = createSignal('');@@ -51,6 +67,9 @@ export function ResourcePicker(props: ResourcePickerProps) {// Filter to reportable resource types across infrastructure, workloads, storage, and recovery.const reportableResources = createMemo(() => {+ // A retained snapshot is not permission to choose resources after its+ // read failed. Preserve the caller's explicit selection, not stale rows.+ if (!inventoryAvailable()) return [];return resources().filter((r) =>REPORTABLE_RESOURCE_TYPES.has(r.type) &&@@ -112,6 +131,7 @@ export function ResourcePicker(props: ResourcePickerProps) {const isSelected = (id: string) => selectedIds().has(id);const toggleResource = (resource: Resource) => {+ if (!inventoryAvailable()) return;const current = props.selected();if (isSelected(resource.id)) {props.onSelectionChange(current.filter((s) => s.id !== resource.id));@@ -132,6 +152,7 @@ export function ResourcePicker(props: ResourcePickerProps) {};const selectAllVisible = () => {+ if (!inventoryAvailable()) return;const current = props.selected();const currentIds = new Set(current.map((s) => s.id));const toAdd = filteredResources()@@ -194,13 +215,34 @@ export function ResourcePicker(props: ResourcePickerProps) {</div>{/* Resource list */}- <div class="border border-border rounded-md overflow-hidden">+ <div class="border border-border rounded-md overflow-hidden" aria-busy={inventoryLoading()}><Show- when={!loading() || reportableResources().length > 0}+ when={inventoryAvailable()}fallback={- <div class="p-8 text-center text-sm text-muted" role="status">- Loading resources…- </div>+ <Show+ when={error()}+ fallback={+ <div class="p-8 text-center text-sm text-muted" role="status">+ Loading resources…+ </div>+ }+ >+ <InlineNotice role="alert" tone="warning" class="m-3">+ <div class="space-y-3">+ <p class="font-medium">Resources could not be loaded.</p>+ <p>Existing selections are unchanged. Retry loading to choose resources.</p>+ <Button+ variant="secondary"+ size="settingsAction"+ class="w-full sm:w-auto"+ disabled={inventoryLoading()}+ onClick={() => void retryResources()}+ >+ {inventoryLoading() ? 'Retrying resources…' : 'Retry loading resources'}+ </Button>+ </div>+ </InlineNotice>+ </Show>}><Show@@ -349,6 +391,7 @@ export function ResourcePicker(props: ResourcePickerProps) {variant="outline"size="settingsAction"class="w-full gap-1.5 text-muted sm:w-auto"+ disabled={!inventoryAvailable() || filteredResources().length === 0}onClick={selectAllVisible}><CheckSquare size={14} />diff --git a/frontend-modern/src/components/Settings/__tests__/ResourcePicker.test.tsx b/frontend-modern/src/components/Settings/__tests__/ResourcePicker.test.tsxindex 3b03f90ab7..3900a2666a 100644--- a/frontend-modern/src/components/Settings/__tests__/ResourcePicker.test.tsx+++ b/frontend-modern/src/components/Settings/__tests__/ResourcePicker.test.tsx@@ -7,12 +7,27 @@ import { ResourcePicker, type SelectedResource } from '../ResourcePicker';let mockResources: Resource[] = [];let mockLoading = false;+let mockError: unknown;+const [resourceVersion, setResourceVersion] = createSignal(0);+const updateResourceRead = () => setResourceVersion((version) => version + 1);+const refetchMock = vi.fn<() => Promise<Resource[]>>();const showWarningMock = vi.fn();vi.mock('@/hooks/useResources', () => ({useResources: () => ({- resources: () => mockResources,- loading: () => mockLoading,+ resources: () => {+ resourceVersion();+ return mockResources;+ },+ loading: () => {+ resourceVersion();+ return mockLoading;+ },+ error: () => {+ resourceVersion();+ return mockError;+ },+ refetch: () => refetchMock(),}),}));@@ -72,6 +87,8 @@ beforeEach(() => {showWarningMock.mockReset();mockResources = [];mockLoading = false;+ mockError = undefined;+ refetchMock.mockReset();});afterEach(() => {@@ -79,6 +96,109 @@ afterEach(() => {});describe('ResourcePicker', () => {+ it('reports a denied inventory as unavailable, not an empty estate or provider error', () => {+ mockError = new Error('403: private endpoint https://internal.invalid/token');+ const { onSelectionChange } = renderPicker(createSelectedResources(1));++ expect(screen.getByRole('alert')).toHaveTextContent('Resources could not be loaded.');+ expect(screen.getByRole('alert')).toHaveTextContent('Existing selections are unchanged.');+ expect(screen.queryByText('No resources available')).not.toBeInTheDocument();+ expect(screen.queryByText(/private endpoint/)).not.toBeInTheDocument();+ expect(screen.getByRole('button', { name: /Select all visible/ })).toBeDisabled();+ expect(screen.getByText('1 selected')).toBeInTheDocument();+ expect(onSelectionChange).not.toHaveBeenCalled();+ expect(refetchMock).not.toHaveBeenCalled();+ });++ it('withdraws retained rows after failure without clearing a saved report scope', async () => {+ mockResources = [makeResource()];+ const { onSelectionChange } = renderPicker(createSelectedResources(1));+ const oldRow = screen.getByRole('button', { name: /Alpha VM/ });++ mockError = new Error('Unavailable');+ updateResourceRead();++ expect(screen.queryByRole('button', { name: /Alpha VM/ })).not.toBeInTheDocument();+ expect(screen.getByRole('alert')).toBeInTheDocument();+ await fireEvent.click(oldRow);+ await fireEvent.click(screen.getByRole('button', { name: /Select all visible/ }));+ expect(onSelectionChange).not.toHaveBeenCalled();+ expect(screen.getByText('Preselected 0')).toBeInTheDocument();+ expect(screen.getByText('1 selected')).toBeInTheDocument();+ });++ it('keeps retained rows unselectable while a canonical read is pending', async () => {+ mockResources = [makeResource()];+ mockLoading = true;+ const { onSelectionChange } = renderPicker();++ expect(screen.getByRole('status')).toHaveTextContent('Loading resources…');+ expect(screen.queryByText('Alpha VM')).not.toBeInTheDocument();+ expect(screen.queryByText('No resources available')).not.toBeInTheDocument();+ await fireEvent.click(screen.getByRole('button', { name: /Select all visible/ }));+ expect(onSelectionChange).not.toHaveBeenCalled();+ });++ it('admits only recovered rows after one explicit, non-duplicating retry', async () => {+ mockResources = [makeResource()];+ mockError = new Error('Unavailable');+ let finishRead!: () => void;+ refetchMock.mockImplementation(async () => {+ await new Promise<void>((resolve) => (finishRead = resolve));+ mockResources = [+ makeResource({ id: 'vm-new', name: 'Recovered VM', displayName: 'Recovered VM' }),+ ];+ mockError = undefined;+ updateResourceRead();+ return mockResources;+ });+ const { onSelectionChange } = renderPicker(createSelectedResources(1));++ const retry = screen.getByRole('button', { name: 'Retry loading resources' });+ await fireEvent.click(retry);+ await fireEvent.click(retry);+ expect(refetchMock).toHaveBeenCalledTimes(1);+ expect(screen.getByRole('button', { name: 'Retrying resources…' })).toBeDisabled();+ expect(screen.getByRole('alert')).toBeInTheDocument();+ expect(screen.queryByText('No resources available')).not.toBeInTheDocument();+ expect(onSelectionChange).not.toHaveBeenCalled();++ finishRead();+ const row = await screen.findByRole('button', { name: /Recovered VM/ });+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();+ expect(screen.queryByText('Alpha VM')).not.toBeInTheDocument();+ expect(screen.getByText('1 selected')).toBeInTheDocument();+ expect(onSelectionChange).not.toHaveBeenCalled();+ await fireEvent.click(row);+ expect(onSelectionChange).toHaveBeenLastCalledWith([+ ...createSelectedResources(1),+ { id: 'vm-new', type: 'vm', name: 'Recovered VM' },+ ]);+ });++ it('keeps an unsuccessful retry recoverable and preserves the caller selection', async () => {+ mockError = new Error('Unavailable');+ refetchMock.mockRejectedValue(new Error('Still unavailable'));+ const { onSelectionChange } = renderPicker(createSelectedResources(1));++ await fireEvent.click(screen.getByRole('button', { name: 'Retry loading resources' }));+ await waitFor(() =>+ expect(screen.getByRole('button', { name: 'Retry loading resources' })).toBeEnabled(),+ );+ expect(screen.getByRole('alert')).toBeInTheDocument();+ expect(screen.queryByText('No resources available')).not.toBeInTheDocument();+ expect(screen.getByText('1 selected')).toBeInTheDocument();+ expect(refetchMock).toHaveBeenCalledTimes(1);+ expect(onSelectionChange).not.toHaveBeenCalled();+ });++ it('reserves the empty-estate message for an accepted empty read', () => {+ renderPicker();+ expect(screen.getByText('No resources available')).toBeInTheDocument();+ expect(screen.queryByRole('alert')).not.toBeInTheDocument();+ expect(screen.getByRole('button', { name: /Select all visible/ })).toBeDisabled();+ });+it('selects a whole client estate beyond the performance cap while excluding other resource types', async () => {mockResources = [...Array.from({ length: 61 }, (_, index) =>diff --git a/frontend-modern/src/hooks/__tests__/useUnifiedResources.test.ts b/frontend-modern/src/hooks/__tests__/useUnifiedResources.test.tsindex 9da242c62e..336199c3e2 100644--- a/frontend-modern/src/hooks/__tests__/useUnifiedResources.test.ts+++ b/frontend-modern/src/hooks/__tests__/useUnifiedResources.test.ts@@ -3437,6 +3437,46 @@ describe('useUnifiedResources', () => {dispose();});+ it('keeps picker read failures through the useResources adapter and cached remounts', async () => {+ const { useResources } = await import('../useResources');+ setWsConnected(false);+ const disposals: (() => void)[] = [];+ const mount = (retainReadError = true) => {+ let result!: ReturnType<typeof useResources>;+ createRoot((dispose) => {+ disposals.push(dispose);+ result = useResources(undefined, { retainReadError });+ });+ return result;+ };+ try {+ const first = mount();+ await waitForResourceCount(() => first.resources().length);+ const failure = new Error('canonical picker inventory unavailable');+ apiFetchMock.mockRejectedValueOnce(failure);+ await expect(first.refetch()).rejects.toBe(failure);+ expect(first.error()).toBe(failure);+ expect(first.resources()).toHaveLength(1);+ disposals.shift()!();++ const calls = apiFetchMock.mock.calls.length;+ const reopened = mount();+ const defaultConsumer = mount(false);+ await flushAsync();+ expect(reopened.error()).toBe(failure);+ expect(defaultConsumer.error()).toBeUndefined();+ expect(apiFetchMock).toHaveBeenCalledTimes(calls);++ apiFetchMock.mockResolvedValueOnce(resourceResponse([]));+ await reopened.refetch();+ expect(reopened.error()).toBeUndefined();+ expect(reopened.loading()).toBe(false);+ expect(reopened.resources()).toHaveLength(0);+ } finally {+ disposals.forEach((dispose) => dispose());+ }+ });+it('retains a scoped failed read across remounts until a real successful retry', async () => {const options = {query: 'type=physical_disk&parent=vm-alpha',diff --git a/frontend-modern/src/hooks/useResources.ts b/frontend-modern/src/hooks/useResources.tsindex edd6a4fc1c..d2b8df5569 100644--- a/frontend-modern/src/hooks/useResources.ts+++ b/frontend-modern/src/hooks/useResources.ts@@ -94,7 +94,10 @@ export interface UseResourcesReturn {/*** Hook for accessing unified resources with reactive filtering.*/-export function useResources(storeOverride?: ResourceStoreLike): UseResourcesReturn {+export function useResources(+ storeOverride?: ResourceStoreLike,+ options?: { retainReadError?: boolean },+): UseResourcesReturn {// Get the WebSocket store instanceconst wsStore = storeOverride ?? getGlobalWebSocketStore();@@ -106,6 +109,9 @@ export function useResources(storeOverride?: ResourceStoreLike): UseResourcesRetquery: '',cacheKey: 'all-resources',initialHydration: 'prefer-ws-then-rest',+ // Selection consumers must keep a failed canonical read across cached+ // remounts and websocket paints until a successful read replaces it.+ retainReadError: options?.retainReadError,});// All resources from the unified source.