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.

Return metadata preview focus to its invoking button

pulse-triage[bot]d3d0a84326f0
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
index d7edf9fe0a..ee09df0d8b 100644
--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md
+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md
@@ -222,7 +222,10 @@ TLS trust on the Pulse server without suggesting a verification bypass. Each
deliberate Preview makes one request, including CSRF/rate-limit refusals, and
does not save provider configuration. URL/certificate drafts and access
restrictions survive failure and retry; a successful parsed/XML preview still
-closes back to the editor and leaves saving explicit. Existing authentication
+closes back to the editor and leaves saving explicit. Its existing Dialog return-
+focus capability targets the Preview button explicitly, even when disabling that
+button during fetch blurred it before the preview opened. No shared focus-trap
+implementation changes. Existing authentication
expiry handling remains owned by the API client, not replaced by preview copy.
The normal-suite SSOMetadataPreview.test.tsx exercises create/edit through the
real state hook and API client, including failure -> explicit retry -> preview ->
diff --git a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx
index 480af100c0..5c51ed1016 100644
--- a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx
+++ b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx
@@ -72,6 +72,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {
canTest,
fetchMetadataPreview,
} = useSSOProvidersState(props);
+ let metadataPreviewButton: HTMLButtonElement | undefined;
return (
<div class="space-y-6">
@@ -500,6 +501,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {
{testing() ? 'Testing...' : 'Test'}
</Button>
<Button
+ ref={metadataPreviewButton}
type="button"
onClick={fetchMetadataPreview}
disabled={loadingPreview() || !form.samlIdpMetadataUrl.trim()}
@@ -875,6 +877,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {
onClose={() => setShowMetadataPreview(false)}
panelClass="max-w-4xl"
ariaLabel="IdP metadata preview"
+ returnFocus={() => metadataPreviewButton}
>
<div class="w-full max-h-[90vh] flex flex-col">
{/* Modal header */}
diff --git a/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsx b/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsx
index 002481b3b8..c6fca3d5a2 100644
--- a/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsx
+++ b/frontend-modern/src/components/Settings/__tests__/SSOMetadataPreview.test.tsx
@@ -186,6 +186,39 @@ describe.each([false, true])('SAML metadata preview recovery (editing=%s)', (edi
},
);
+ it('returns to Preview even when its pending disabled state loses focus', async () => {
+ let finishPreview!: (response: Response) => void;
+ fetchMock.mockImplementation(async (url: string) => {
+ if (url.endsWith('/metadata/preview'))
+ return new Promise<Response>((resolve) => {
+ finishPreview = resolve;
+ });
+ if (url.endsWith('/corp-saml')) return json(provider);
+ return json({ providers: editing ? [provider] : [] });
+ });
+ render(() => <SSOProvidersPanel />);
+ fireEvent.click(
+ await screen.findByRole('button', { name: editing ? 'Edit provider' : 'Add SAML' }),
+ );
+ const editor = within(await screen.findByRole('dialog'));
+ fireEvent.input(editor.getByLabelText('IdP Metadata URL'), {
+ target: { value: 'https://idp.example.test/metadata' },
+ });
+ const opener = editor.getByRole('button', { name: 'Preview' });
+ opener.focus();
+ fireEvent.click(opener);
+ await waitFor(() => expect(finishPreview).toBeTypeOf('function'));
+ expect(opener).toBeDisabled();
+ // Native browsers can blur a button when it becomes disabled during fetch.
+ // Do not rely on that transient focus as the nested Dialog's return target.
+ (editor.getByLabelText('Provider Name') as HTMLInputElement).focus();
+ finishPreview(json(preview));
+ const result = await screen.findByRole('dialog', { name: 'IdP metadata preview' });
+ fireEvent.click(within(result).getByRole('button', { name: 'Close metadata preview' }));
+ await waitFor(() => expect(opener).toHaveFocus());
+ expect(opener).toBeEnabled();
+ });
+
it('does not dispatch a blank URL or interpret preview as saving', async () => {
fetchMock.mockImplementation(async (url: string) =>
url.endsWith('/corp-saml') ? json(provider) : json({ providers: editing ? [provider] : [] }),
diff --git a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts
index 88b38ce665..30bdd7bf42 100644
--- a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts
+++ b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts
@@ -1195,6 +1195,7 @@ describe('settings architecture guardrails', () => {
expect(previewLifecycle).toContain('getSSOMetadataFetchErrorMessage(error)');
expect(previewLifecycle).toContain('getSSOMetadataFetchErrorMessage()');
expect(previewLifecycle).toContain('setEditorFeedback');
+ expect(ssoProvidersPanelSource).toContain('returnFocus={() => metadataPreviewButton}');
expect(previewLifecycle).toContain('retry: false');
expect(previewLifecycle).not.toContain('response.text()');
expect(previewLifecycle).not.toContain('String(error)');