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 SSO recovery feedback in the active editor
pulse-triage[bot]ac36a9a94c63
diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.mdindex 3208ee20d1..94909b2f6e 100644--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md@@ -20,6 +20,30 @@## Purpose+### SSO editor feedback and exact group names (24 October 2026)++The provider editor scrolls its fields independently of its header and recovery+footer. Save refusals, metadata-preview errors and clipboard outcomes stay in+that active dialog, with live alert/status semantics; connection tests use the+existing inline result. They do not rely on the intentionally inert background+notification portal. Copy confirms success only after clipboard completion and+otherwise offers manual copying. The full callback URL wraps at narrow widths.+Save/Cancel stay reachable, and a pending save neither repeats nor dismisses.+Retained background toasts lower below the modal backdrop while any blocking+dialog is open, then regain their ordinary layer on close; they are not+unmounted or made interactive through the modal. Shared modal focus trapping,+inertness and restoration remain unchanged.++Allowed Groups are comma- or newline-separated exact IdP group names, preserving+spaces through details → edit → no-op/mapping-only save for OIDC and SAML. This+replaces the former whitespace split for that field only. Scopes, domains and+emails keep their existing parsing; explicit empty restriction lists still clear+them. Payload shape, secret omission and server-owned authorisation are unchanged.+`SSOProvidersPanel.test.tsx`, `ssoProvidersModel.test.ts` and the settings+architecture suite cover this boundary. Browser evidence uses the production+panel, state hook, API client, Dialog, Toast and CSS with synthetic HTTP at desktop+and 320px widths; it is not native IdP, encrypted persistence or restart proof.+### Locked update pill names the command-access option by its shared label (21 October 2026)For a host whose agent was installed without command access, the locked pill@@ -7783,8 +7807,9 @@ OIDC, SAML, and multi-provider SSO are Community-tier capabilities.The group-to-role mapping form must retain IdP group names with embeddedspaces through provider detail, edit, payload, and reload. Its entries arecomma- or newline-delimited `group=roleId` pairs; whitespace within a group-name is not an entry separator. Keep the existing whitespace parsing for-OIDC scopes and the other allowed lists separate from mapping parsing.+name is not an entry separator. Allowed Groups use the same comma/newline+boundary so no-op saves preserve those exact names too. Keep the existing whitespace parsing for OIDC scopes,+allowed domains and allowed emails separate from group-name parsing.`ssoProvidersModel.test.ts` and `SSOProvidersPanel.test.tsx` pin this roundtrip, and browser verification must inspect the saved mapping in the desktopand narrow edit dialog.diff --git a/frontend-modern/browser-verification/91ae95b4d6779efe.json b/frontend-modern/browser-verification/91ae95b4d6779efe.jsonnew file mode 100644index 0000000000..787aa719e6--- /dev/null+++ b/frontend-modern/browser-verification/91ae95b4d6779efe.json@@ -0,0 +1,45 @@+{+ "version": 1,+ "base_sha": "a079862edc1284b90a89ebae1a0fb6086e0e1df2",+ "verified_at": "2026-10-24T01:35:17.926Z",+ "result": "passed",+ "changed_paths": [+ "frontend-modern/src/components/Settings/SSOProvidersPanel.tsx",+ "frontend-modern/src/components/Settings/ssoProvidersModel.ts",+ "frontend-modern/src/components/Settings/useSSOProvidersState.ts",+ "frontend-modern/src/components/Toast/Toast.tsx",+ "frontend-modern/src/utils/ssoProviderPresentation.ts"+ ],+ "content_sha256": {+ "frontend-modern/src/components/Settings/SSOProvidersPanel.tsx": "2eb2ecc8c72fb7462bcd4eab6213e4af730d2c29febdfa839855f8a0f2c79c8f",+ "frontend-modern/src/components/Settings/ssoProvidersModel.ts": "3c995445a21034ed7ca3242bccc5ef14662cf0d6aeddc71f8555218aea6ac23e",+ "frontend-modern/src/components/Settings/useSSOProvidersState.ts": "465e68954b4aa66b3461d480b409c47592864ebc7412b41fc40453e45f6415ba",+ "frontend-modern/src/components/Toast/Toast.tsx": "c1c564f3f6af3acebf8671d723f23a8b1242dbf7e056af2dff70faaa366a7954",+ "frontend-modern/src/utils/ssoProviderPresentation.ts": "cf5d992ef94776f00e31722155388ab622d6d0401273e24d4b195981ecb7face"+ },+ "routes": [+ "/settings/security/sso (production panel with synthetic HTTP, not full application)"+ ],+ "viewports": [+ {+ "width": 1440,+ "height": 900+ },+ {+ "width": 320,+ "height": 812+ }+ ],+ "states": [+ "Production SSO panel, state hook, API client, Dialog, Toast and CSS with synthetic safe HTTP and controlled clipboard success/refusal. Baseline is the exact supplied parent. No native IdP, encrypted persistence or restart acceptance.",+ "Refused write remains inside the active editor, preserving draft, omitted client secret and exact spaced group restrictions. An explicit keyboard correction saves and reopens with the same restrictions and corrected role.",+ "Header/callback layout, clipboard refusal/manual fallback, connection-test failure and SAML metadata-preview failure are inspected at desktop and narrow widths. Feedback and footer are readable. Some WebKit capture frames retain top-heading clipping observations in the lane dossier, not a claim of perfect general layout.",+ "Retained success notification lowers below blocking dialogs; correction/reopen does not cover the footer. Shared modal isolation is unchanged.",+ "All fourteen retained captures, including two exact-parent controls, were opened with the native image viewer."+ ],+ "interactions": [+ "Real HTTP-adapter GET/detail/PUT/test/preview flows and callback-copy control; exact payload, scopes, groups/domains, secret omission and explicit correction/reopen checks.",+ "One pending save does not repeat or dismiss on Escape; read-only controls, focus trapping, Escape close and focus return remain.",+ "Playwright 1.56.1, Chromium desktop and WebKit 320px; no page errors or external requests. Only deliberately refused HTTP400 and their existing error logs in the final run. Browser contexts and server closed."+ ]+}diff --git a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsxindex 0853a41a39..c6af5ff4e9 100644--- a/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx+++ b/frontend-modern/src/components/Settings/SSOProvidersPanel.tsx@@ -42,6 +42,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {providers,loading,saving,+ editorFeedback,showModal,setShowModal,editingProvider,@@ -272,18 +273,20 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {<Show when={showModal()}><DialogisOpen={true}- onClose={() => setShowModal(false)}+ onClose={() => {+ if (!saving()) setShowModal(false);+ }}panelClass="max-w-2xl"ariaLabel={`${editingProvider() ? 'Edit' : 'Add'} ${getSSOProviderTypeLabel(form.type)} provider`}>- <div class="w-full max-h-[90vh] overflow-y-auto">- <div class="sticky top-0 bg-surface px-6 py-4 border-b border-border z-10">+ <form class="flex max-h-[calc(100dvh-2rem-2px)] min-h-0 flex-col" onSubmit={handleSave}>+ <div class="sticky top-0 z-10 shrink-0 border-b border-border bg-surface px-4 py-4 sm:px-6"><h3 class="text-lg font-semibold text-base-content">{getSSOProviderModalTitle(Boolean(editingProvider()), form.type)}</h3></div>- <form class="p-6 space-y-4" onSubmit={handleSave}>+ <div class="min-h-0 flex-1 space-y-4 overflow-y-auto p-4 sm:p-6">{/* Common fields */}<div class="grid grid-cols-1 md:grid-cols-2 gap-4"><div class={formField}>@@ -342,10 +345,12 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {onCopyValue={(value) => copyToClipboard(value, 'Callback URL')}label="Copy callback / redirect URL"variant="accent"- size="chip"- class="max-w-full text-xs"+ size="sm"+ class="min-w-0 max-w-full justify-between gap-2 py-2 text-left text-xs [&>svg]:shrink-0">- <span class="min-w-0 truncate">{editingProvider()?.oidcCallbackUrl}</span>+ <span class="min-w-0 [overflow-wrap:anywhere]">+ {editingProvider()?.oidcCallbackUrl}+ </span></CopyValueButton></div></Show>@@ -609,7 +614,10 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {{/* Test result display */}<Show when={testResult()}>- <div class={testResultPresentation()!.panelClass}>+ <div+ class={testResultPresentation()!.panelClass}+ role={testResult()?.success ? 'status' : 'alert'}+ ><div class="flex items-start gap-3">{testResult()?.success ? (<CheckCircle class={testResultPresentation()!.iconClass} />@@ -712,7 +720,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {type="button"variant="ghost"size="xs"- class="font-semibold hover:underline"+ class="h-auto max-w-full whitespace-normal text-left font-semibold hover:underline"onClick={() => setAdvancedOpen(!advancedOpen())}>{advancedOpen() ? 'Hide' : 'Show'} access restrictions & role mapping@@ -748,7 +756,7 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {onInput={(e) => setForm('allowedGroups', e.currentTarget.value)}placeholder="admin, sso-users"textareaBaseClass={controlClass('min-h-[60px]')}- help="Comma-separated. Empty allows all."+ help="Comma- or newline-separated. Group names may contain spaces. Empty allows all."/><FormTextarealabel="Allowed Domains"@@ -780,9 +788,26 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {</div></Show></div>+ </div>- {/* Actions */}- <div class="flex justify-end gap-3 pt-4 border-t border-border">+ {/* Keep feedback and recovery actions inside the active modal, clear of toasts. */}+ <div class="relative z-10 shrink-0 space-y-3 border-t border-border bg-surface p-4 sm:px-6">+ <Show when={editorFeedback()} keyed>+ {(feedback) => (+ <p+ role={feedback.tone === 'error' ? 'alert' : 'status'}+ tabindex="0"+ class={`max-h-28 overflow-y-auto text-sm [overflow-wrap:anywhere] ${+ feedback.tone === 'error'+ ? 'text-red-700 dark:text-red-300'+ : 'text-base-content'+ }`}+ >+ {feedback.message}+ </p>+ )}+ </Show>+ <div class="grid grid-cols-1 gap-2 sm:flex sm:justify-end sm:gap-3"><Buttontype="button"onClick={() => setShowModal(false)}@@ -802,8 +827,8 @@ export const SSOProvidersPanel: Component<SSOProvidersPanelProps> = (props) => {{saving() ? 'Saving...' : editingProvider() ? 'Save Changes' : 'Create Provider'}</Button></div>- </form>- </div>+ </div>+ </form></Dialog></Show>diff --git a/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsx b/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsxindex 66e6a026f5..26eb91a9ee 100644--- a/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsx+++ b/frontend-modern/src/components/Settings/__tests__/SSOProvidersPanel.test.tsx@@ -1,5 +1,5 @@import { afterEach, beforeEach, describe, expect, it, vi } from 'vitest';-import { cleanup, fireEvent, render, screen, waitFor } from '@solidjs/testing-library';+import { cleanup, fireEvent, render, screen, waitFor, within } from '@solidjs/testing-library';import { SSOProvidersPanel } from '../SSOProvidersPanel';const fetchMock = vi.fn();@@ -156,6 +156,7 @@ describe('SSOProvidersPanel OIDC group role mappings', () => {it('preserves a multi-word group from provider details through the edit form and PUT', async () => {setupFetch([corpProvider], {...corpProviderDetails,+ allowedGroups: ['Server Access'],groupRoleMappings: { 'Server Access': 'admin' },});render(() => <SSOProvidersPanel />);@@ -183,6 +184,7 @@ describe('SSOProvidersPanel OIDC group role mappings', () => {expect(saveCall).toBeTruthy();const body = JSON.parse((saveCall![1] as RequestInit).body as string);expect(body.groupRoleMappings).toEqual({ 'Server Access': 'admin', Everyone: 'viewer' });+ expect(body.allowedGroups).toEqual(['Server Access']);expect(body.oidc.scopes).toEqual(['openid', 'profile', 'email', 'groups']);});});@@ -265,3 +267,164 @@ describe('SSOProvidersPanel IdP endpoint URLs', () => {).toBeTruthy();});});++describe('SSOProvidersPanel modal feedback and recovery', () => {+ beforeEach(() => {+ vi.resetAllMocks();+ vi.stubGlobal('fetch', fetchMock);+ document.cookie = 'pulse_csrf=test-csrf-token';+ });++ afterEach(() => {+ cleanup();+ vi.unstubAllGlobals();+ });++ const editProvider = async () => {+ render(() => <SSOProvidersPanel />);+ fireEvent.click(await screen.findByRole('button', { name: 'Edit provider' }));+ return within(await screen.findByRole('dialog', { name: 'Edit OIDC provider' }));+ };++ it('keeps a refused save and the unchanged draft inside the active dialog until an explicit correction', async () => {+ setupFetch([corpProvider]);+ const read = fetchMock.getMockImplementation()!;+ let refuse = true;+ fetchMock.mockImplementation((url: string, options?: RequestInit) => {+ if (options?.method === 'PUT') {+ return Promise.resolve(+ refuse ? new Response('Invalid role mapping', { status: 400 }) : jsonResponse({}),+ );+ }+ return read(url, options);+ });+ const dialog = await editProvider();+ const name = dialog.getByLabelText('Provider Name') as HTMLInputElement;+ const secret = dialog.getByLabelText('Client Secret') as HTMLInputElement;+ fireEvent.input(name, { target: { value: 'Edited provider' } });+ const save = dialog.getByRole('button', { name: 'Save Changes' });+ fireEvent.submit(save.closest('form')!);++ expect(await dialog.findByRole('alert')).toHaveTextContent('Invalid role mapping');+ expect(name.value).toBe('Edited provider');+ expect(secret.value).toBe('');+ expect(notificationErrorMock).not.toHaveBeenCalled();+ expect(notificationSuccessMock).not.toHaveBeenCalled();+ expect(fetchMock.mock.calls.filter(([, options]) => options?.method === 'PUT')).toHaveLength(1);++ refuse = false;+ fireEvent.input(name, { target: { value: 'Corrected provider' } });+ fireEvent.submit(save.closest('form')!);+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());+ const writes = fetchMock.mock.calls.filter(([, options]) => options?.method === 'PUT');+ expect(writes).toHaveLength(2);+ const payload = JSON.parse(writes[1][1].body);+ expect(payload.name).toBe('Corrected provider');+ expect(payload.oidc.clientSecret).toBeUndefined();+ expect(payload.allowedGroups).toEqual(['admins']);+ expect(payload.groupRoleMappings).toEqual({ admins: 'admin' });+ expect(notificationSuccessMock).toHaveBeenCalledOnce();+ });++ it('ignores repeated submit and keeps the modal open while a save is pending', async () => {+ setupFetch([corpProvider]);+ const read = fetchMock.getMockImplementation()!;+ let finish!: (response: Response) => void;+ fetchMock.mockImplementation((url: string, options?: RequestInit) =>+ options?.method === 'PUT'+ ? new Promise<Response>((resolve) => {+ finish = resolve;+ })+ : read(url, options),+ );+ const dialog = await editProvider();+ const form = dialog.getByRole('button', { name: 'Save Changes' }).closest('form')!;+ fireEvent.submit(form);+ await waitFor(() =>+ expect(fetchMock.mock.calls.filter(([, options]) => options?.method === 'PUT')).toHaveLength(+ 1,+ ),+ );+ fireEvent.submit(form);+ fireEvent.keyDown(document, { key: 'Escape' });+ expect(screen.getByRole('dialog')).toBeTruthy();+ expect(fetchMock.mock.calls.filter(([, options]) => options?.method === 'PUT')).toHaveLength(1);+ expect(dialog.getByRole('button', { name: 'Cancel' })).toBeDisabled();+ finish(jsonResponse({}));+ await waitFor(() => expect(screen.queryByRole('dialog')).toBeNull());+ });++ it('clears failed-save feedback when a different editor session opens', async () => {+ setupFetch([corpProvider]);+ const read = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) =>+ options?.method === 'PUT'+ ? Promise.resolve(new Response('Refused', { status: 400 }))+ : read(url, options),+ );+ const dialog = await editProvider();+ fireEvent.submit(dialog.getByRole('button', { name: 'Save Changes' }).closest('form')!);+ expect(await dialog.findByRole('alert')).toHaveTextContent('Refused');+ fireEvent.click(dialog.getByRole('button', { name: 'Cancel' }));+ fireEvent.click(screen.getByRole('button', { name: 'Add OIDC' }));+ expect(within(screen.getByRole('dialog')).queryByRole('alert')).toBeNull();+ });++ it.each([false, true])(+ 'reports clipboard completion inside the modal, rejected=%s',+ async (rejected) => {+ const callback = 'https://pulse.example.com/api/oidc/corp-oidc/callback';+ setupFetch([{ ...corpProvider, oidcCallbackUrl: callback }]);+ const writeText = vi+ .fn()+ .mockImplementation(() =>+ rejected ? Promise.reject(new Error('Denied')) : Promise.resolve(),+ );+ Object.defineProperty(navigator, 'clipboard', { value: { writeText }, configurable: true });+ const dialog = await editProvider();+ fireEvent.click(dialog.getByRole('button', { name: 'Copy callback / redirect URL' }));+ expect(await dialog.findByRole(rejected ? 'alert' : 'status')).toHaveTextContent(+ rejected ? 'Unable to copy callback url' : 'Callback URL has been copied',+ );+ expect(writeText).toHaveBeenCalledWith(callback);+ expect(notificationErrorMock).not.toHaveBeenCalled();+ expect(notificationSuccessMock).not.toHaveBeenCalled();+ },+ );++ it('keeps SAML preview failures inside the modal without an inert toast', async () => {+ setupFetch([]);+ const read = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) =>+ url.endsWith('/metadata/preview')+ ? Promise.resolve(new Response('Metadata unavailable', { status: 502 }))+ : read(url, options),+ );+ render(() => <SSOProvidersPanel />);+ fireEvent.click(await screen.findByRole('button', { name: 'Add SAML' }));+ const dialog = within(screen.getByRole('dialog'));+ fireEvent.input(dialog.getByLabelText('IdP Metadata URL'), {+ target: { value: 'https://idp.example.com/metadata' },+ });+ fireEvent.click(dialog.getByRole('button', { name: 'Preview' }));+ expect(await dialog.findByRole('alert')).toHaveTextContent('Metadata unavailable');+ expect(notificationErrorMock).not.toHaveBeenCalled();+ });++ it('announces connection-test failure in the existing result without a background toast', async () => {+ setupFetch([corpProvider]);+ const read = fetchMock.getMockImplementation()!;+ fetchMock.mockImplementation((url: string, options?: RequestInit) =>+ url.endsWith('/test')+ ? Promise.resolve(jsonResponse({ success: false, message: 'Synthetic IdP unavailable' }))+ : read(url, options),+ );+ const dialog = await editProvider();+ fireEvent.click(dialog.getByRole('button', { name: 'Test' }));+ expect(await dialog.findByRole('alert')).toHaveTextContent('Synthetic IdP unavailable');+ expect(notificationErrorMock).not.toHaveBeenCalled();+ fireEvent.click(dialog.getByRole('button', { name: 'Cancel' }));+ fireEvent.click(screen.getByRole('button', { name: 'Edit provider' }));+ expect((await screen.findByRole('dialog')).querySelector('[role="alert"]')).toBeNull();+ });+});diff --git a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.tsindex 987793791b..366ce3724a 100644--- a/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts+++ b/frontend-modern/src/components/Settings/__tests__/settingsArchitecture.test.ts@@ -1184,6 +1184,9 @@ describe('settings architecture guardrails', () => {it('separates SSO mapping entries without splitting spaces inside IdP group names', () => {expect(ssoProvidersModelSource).toContain('input.split(/[,\\r\\n]+/)');expect(ssoProvidersModelSource).not.toContain('splitList(input).forEach');+ expect(ssoProvidersModelSource).toContain('allowedGroups: splitGroupList(form.allowedGroups)');+ expect(ssoProvidersModelSource).toContain('scopes: splitList(form.oidcScopes)');+ expect(ssoProvidersPanelSource).toContain('Comma- or newline-separated.');expect(ssoProvidersPanelSource).toContain('Group names may contain spaces.');});diff --git a/frontend-modern/src/components/Settings/__tests__/ssoProvidersModel.test.ts b/frontend-modern/src/components/Settings/__tests__/ssoProvidersModel.test.tsindex 41ac3ec230..bb4632d094 100644--- a/frontend-modern/src/components/Settings/__tests__/ssoProvidersModel.test.ts+++ b/frontend-modern/src/components/Settings/__tests__/ssoProvidersModel.test.ts@@ -6,6 +6,50 @@ import {} from '../ssoProvidersModel';describe('ssoProvidersModel', () => {+ it.each(['oidc', 'saml'] as const)(+ 'preserves exact %s group restrictions on no-op and mapping-only saves',+ (type) => {+ const form = mapProviderDetailsToForm({+ id: 'corp',+ name: 'Corporate SSO',+ enabled: true,+ type,+ allowedGroups: ['Server Access', 'Read Only'],+ allowedDomains: ['example.com', 'corp.example.com'],+ allowedEmails: ['[email protected]'],+ groupRoleMappings: { 'Server Access': 'admin' },+ oidc: { scopes: ['openid', 'profile', 'email', 'groups'] },+ });+ for (const draft of [form, { ...form, groupRoleMappings: 'Server Access=viewer' }]) {+ const payload = buildProviderPayload(draft);+ expect(payload.allowedGroups).toEqual(['Server Access', 'Read Only']);+ expect(payload.allowedDomains).toEqual(['example.com', 'corp.example.com']);+ expect(payload.allowedEmails).toEqual(['[email protected]']);+ }+ expect(+ buildProviderPayload({ ...form, allowedGroups: ' Server Access,\n Read Only\r\n ' })+ .allowedGroups,+ ).toEqual(['Server Access', 'Read Only']);+ expect(buildProviderPayload({ ...form, allowedGroups: ' ' }).allowedGroups).toEqual([]);+ // Scope/domain/email conveniences remain whitespace-separated, not group-name parsing.+ const oidc = buildProviderPayload({+ ...form,+ type: 'oidc',+ oidcScopes: 'openid profile email groups',+ allowedDomains: 'example.com corp.example.com',+ allowedEmails: '[email protected] [email protected]',+ });+ expect((oidc.oidc as Record<string, unknown>).scopes).toEqual([+ 'openid',+ 'profile',+ 'email',+ 'groups',+ ]);+ expect(oidc.allowedDomains).toEqual(['example.com', 'corp.example.com']);+ expect(oidc.allowedEmails).toEqual(['[email protected]', '[email protected]']);+ },+ );+it('serializes OIDC group claim settings for restrictions and role mappings', () => {const form = {...createEmptyProviderForm(),@@ -47,7 +91,7 @@ describe('ssoProvidersModel', () => {const payload = buildProviderPayload({...form,groupRoleMappings: ' Server Access = admin,\n Everyone = viewer ',- allowedGroups: 'admins operators',+ allowedGroups: 'admins, operators',});expect(payload.groupRoleMappings).toEqual({ 'Server Access': 'admin', Everyone: 'viewer' });expect(payload.allowedGroups).toEqual(['admins', 'operators']);diff --git a/frontend-modern/src/components/Settings/ssoProvidersModel.ts b/frontend-modern/src/components/Settings/ssoProvidersModel.tsindex 82102d5318..07ec8ccc4b 100644--- a/frontend-modern/src/components/Settings/ssoProvidersModel.ts+++ b/frontend-modern/src/components/Settings/ssoProvidersModel.ts@@ -166,6 +166,13 @@ export const splitList = (input: string) =>.map((value) => value.trim()).filter(Boolean);+// Group restrictions use exact IdP names, just like role-mapping keys.+const splitGroupList = (input: string) =>+ input+ .split(/[,\r\n]+/)+ .map((value) => value.trim())+ .filter(Boolean);+export const mappingsToString = (mappings?: Record<string, string>) =>mappings? Object.entries(mappings)@@ -175,7 +182,7 @@ export const mappingsToString = (mappings?: Record<string, string>) =>export const stringToMappings = (input: string) => {const result: Record<string, string> = {};- // A group name can contain spaces. Unlike scopes and allowed lists, mappings+ // A group name can contain spaces. Like allowed groups, mappings// are separated only by commas or newlines, as shown by mappingsToString.input.split(/[,\r\n]+/).forEach((pair) => {const [key, value] = pair.split('=').map((segment) => segment.trim());@@ -224,7 +231,7 @@ export const buildProviderPayload = (form: ProviderForm): Record<string, unknownenabled: form.enabled,displayName: form.displayName.trim() || undefined,priority: form.priority,- allowedGroups: splitList(form.allowedGroups),+ allowedGroups: splitGroupList(form.allowedGroups),allowedDomains: splitList(form.allowedDomains),allowedEmails: splitList(form.allowedEmails),groupRoleMappings: stringToMappings(form.groupRoleMappings),diff --git a/frontend-modern/src/components/Settings/useSSOProvidersState.ts b/frontend-modern/src/components/Settings/useSSOProvidersState.tsindex 4093acfc43..b3aef7cc07 100644--- a/frontend-modern/src/components/Settings/useSSOProvidersState.ts+++ b/frontend-modern/src/components/Settings/useSSOProvidersState.ts@@ -4,9 +4,8 @@ import { notificationStore } from '@/stores/notifications';import { logger } from '@/utils/logger';import {getSSOCopySuccessMessage,+ getSSOCopyErrorMessage,getSSOConnectionTestErrorMessage,- getSSOConnectionTestFailureMessage,- getSSOConnectionTestSuccessMessage,getSSOMetadataFetchErrorMessage,getSSOMetadataUrlRequiredMessage,getSSOProviderDeleteErrorMessage,@@ -44,6 +43,10 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {const [providers, setProviders] = createSignal<SSOProvider[]>([]);const [loading, setLoading] = createSignal(true);const [saving, setSaving] = createSignal(false);+ const [editorFeedback, setEditorFeedback] = createSignal<{+ tone: 'success' | 'error';+ message: string;+ } | null>(null);const [showModal, setShowModal] = createSignal(false);const [editingProvider, setEditingProvider] = createSignal<SSOProvider | null>(null);const [form, setForm] = createStore<ProviderForm>(createEmptyProviderForm());@@ -90,6 +93,8 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {if (!canManage()) {return;}+ setEditorFeedback(null);+ setTestResult(null);setEditingProvider(null);setForm(createEmptyProviderForm());setForm('type', type);@@ -101,6 +106,8 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {if (!canManage()) {return;}+ setEditorFeedback(null);+ setTestResult(null);setEditingProvider(provider);try {const { apiFetch } = await import('@/utils/apiClient');@@ -119,9 +126,10 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {const handleSave = async (event?: Event) => {event?.preventDefault();- if (!canManage()) {+ if (!canManage() || saving()) {return;}+ setEditorFeedback(null);setSaving(true);try {@@ -149,7 +157,7 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {props.onConfigUpdated?.();} catch (error) {logger.error('[SSOProvidersPanel] Failed to save provider:', error);- notificationStore.error(getSSOProviderSaveErrorMessage(error));+ setEditorFeedback({ tone: 'error', message: getSSOProviderSaveErrorMessage(error) });} finally {setSaving(false);}@@ -221,9 +229,23 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {}};- const copyToClipboard = (text: string, label: string) => {- void navigator.clipboard.writeText(text);- notificationStore.success(getSSOCopySuccessMessage(label));+ const copyToClipboard = async (text: string, label: string) => {+ try {+ await navigator.clipboard.writeText(text);+ const message = getSSOCopySuccessMessage(label);+ if (showModal()) {+ setEditorFeedback({ tone: 'success', message });+ } else {+ notificationStore.success(message);+ }+ } catch {+ const message = getSSOCopyErrorMessage(label);+ if (showModal()) {+ setEditorFeedback({ tone: 'error', message });+ } else {+ notificationStore.error(message);+ }+ }};const testResultPresentation = createMemo(() =>@@ -231,6 +253,7 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {);const testConnection = async () => {+ setEditorFeedback(null);setTesting(true);setTestResult(null);@@ -245,11 +268,7 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {const result = (await response.json()) as SSOProviderTestResult;setTestResult(result);- if (result.success) {- notificationStore.success(getSSOConnectionTestSuccessMessage());- } else {- notificationStore.error(getSSOConnectionTestFailureMessage(result.message));- }+ // The result belongs to the active dialog, not its inert background toast.} catch (error) {logger.error('[SSOProvidersPanel] Test connection error:', error);setTestResult({@@ -257,7 +276,6 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {message: getSSOConnectionTestErrorMessage(),error: String(error),});- notificationStore.error(getSSOConnectionTestErrorMessage());} finally {setTesting(false);}@@ -266,8 +284,9 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {const canTest = () => canTestProviderForm(form);const fetchMetadataPreview = async () => {+ setEditorFeedback(null);if (!form.samlIdpMetadataUrl.trim()) {- notificationStore.error(getSSOMetadataUrlRequiredMessage());+ setEditorFeedback({ tone: 'error', message: getSSOMetadataUrlRequiredMessage() });return;}@@ -291,7 +310,7 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {setShowMetadataPreview(true);} catch (error) {logger.error('[SSOProvidersPanel] Metadata preview error:', error);- notificationStore.error(getSSOMetadataFetchErrorMessage(error));+ setEditorFeedback({ tone: 'error', message: getSSOMetadataFetchErrorMessage(error) });} finally {setLoadingPreview(false);}@@ -301,6 +320,7 @@ export const useSSOProvidersState = (props: SSOProvidersPanelProps) => {providers,loading,saving,+ editorFeedback,showModal,setShowModal,editingProvider,diff --git a/frontend-modern/src/components/Toast/Toast.tsx b/frontend-modern/src/components/Toast/Toast.tsxindex b531d3a6f7..8ea2238672 100644--- a/frontend-modern/src/components/Toast/Toast.tsx+++ b/frontend-modern/src/components/Toast/Toast.tsx@@ -6,6 +6,7 @@ import CircleAlertIcon from 'lucide-solid/icons/circle-alert';import InfoIcon from 'lucide-solid/icons/info';import XIcon from 'lucide-solid/icons/x';import { ActionIconButton } from '@/components/shared/Button';+import { dialogStackHasBlockingDialog } from '@/components/shared/useDialogState';import { POLLING_INTERVALS } from '@/constants';import { getSemanticTonePresentation } from '@/utils/semanticTonePresentation';@@ -217,7 +218,9 @@ export const ToastContainer: Component = () => {<divrole="region"aria-label="Notifications"- class="fixed inset-x-3 bottom-3 z-9999 space-y-2 sm:left-auto sm:right-4 sm:bottom-4 sm:w-full sm:max-w-[500px]"+ class={`fixed inset-x-3 bottom-3 space-y-2 sm:left-auto sm:right-4 sm:bottom-4 sm:w-full sm:max-w-[500px] ${+ dialogStackHasBlockingDialog() ? 'z-50' : 'z-9999'+ }`}><For each={toasts()}>{(toast) => <Toast toast={toast} onRemove={removeToast} />}</For></div>diff --git a/frontend-modern/src/components/Toast/__tests__/Toast.test.tsx b/frontend-modern/src/components/Toast/__tests__/Toast.test.tsxindex c6e46be7e8..a51e745aa2 100644--- a/frontend-modern/src/components/Toast/__tests__/Toast.test.tsx+++ b/frontend-modern/src/components/Toast/__tests__/Toast.test.tsx@@ -1,5 +1,6 @@import { afterEach, describe, expect, it, vi } from 'vitest';-import { batch } from 'solid-js';+import { batch, createSignal } from 'solid-js';+import { Dialog } from '@/components/shared/Dialog';import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';import { Toast, ToastContainer } from '@/components/Toast/Toast';import toastSource from '@/components/Toast/Toast.tsx?raw';@@ -37,6 +38,30 @@ describe('Toast', () => {expect(screen.queryByRole(role === 'alert' ? 'status' : 'alert')).not.toBeInTheDocument();});+ it('keeps a retained notification below blocking dialogs, restoring it after close', () => {+ const [open, setOpen] = createSignal(false);+ render(() => (+ <>+ <ToastContainer />+ <Dialog isOpen={open()} onClose={() => setOpen(false)} ariaLabel="Editor">+ <button onClick={() => setOpen(false)}>Close editor</button>+ </Dialog>+ </>+ ));+ window.showToast('success', 'Previous operation completed');+ const notifications = screen.getByRole('region', { name: 'Notifications' });+ expect(notifications).toHaveClass('z-9999');+ setOpen(true);+ expect(screen.getByRole('dialog')).toBeTruthy();+ expect(notifications).toHaveClass('z-50');+ expect(notifications).not.toHaveClass('z-9999');+ expect(notifications.closest('[inert]')).not.toBeNull();+ fireEvent.click(screen.getByRole('button', { name: 'Close editor' }));+ expect(notifications).toHaveClass('z-9999');+ expect(notifications.closest('[inert]')).toBeNull();+ expect(screen.getByText('Previous operation completed')).toBeInTheDocument();+ });+it('keeps all toasts created within a batch', () => {render(() => <ToastContainer />);diff --git a/frontend-modern/src/utils/__tests__/ssoProviderPresentation.test.ts b/frontend-modern/src/utils/__tests__/ssoProviderPresentation.test.tsindex a13b1bb0f5..aed54dc799 100644--- a/frontend-modern/src/utils/__tests__/ssoProviderPresentation.test.ts+++ b/frontend-modern/src/utils/__tests__/ssoProviderPresentation.test.ts@@ -1,6 +1,7 @@import { describe, expect, it } from 'vitest';import {getSSOCopySuccessMessage,+ getSSOCopyErrorMessage,getSSOProviderAddButtonLabel,getSSOCertificatePresentation,getSSOConnectionTestErrorMessage,@@ -84,6 +85,7 @@ describe('ssoProviderPresentation', () => {expect(getSSOProviderToggleSuccessMessage(true)).toBe('SSO provider has been enabled.');expect(getSSOProviderToggleSuccessMessage(false)).toBe('SSO provider has been disabled.');expect(getSSOProviderToggleErrorMessage()).toBe('Unable to update the SSO provider.');+ expect(getSSOCopyErrorMessage('Callback URL')).toContain('Select and copy the URL manually.');expect(getSSOCopySuccessMessage('XML')).toBe('XML has been copied to the clipboard.');expect(getSSOConnectionTestSuccessMessage()).toBe('Connection test completed successfully.');expect(getSSOConnectionTestFailureMessage('Bad certificate')).toBe(diff --git a/frontend-modern/src/utils/ssoProviderPresentation.ts b/frontend-modern/src/utils/ssoProviderPresentation.tsindex 787736cdde..07a78563db 100644--- a/frontend-modern/src/utils/ssoProviderPresentation.ts+++ b/frontend-modern/src/utils/ssoProviderPresentation.ts@@ -83,6 +83,10 @@ export function getSSOCopySuccessMessage(label: string): string {return `${label} has been copied to the clipboard.`;}+export function getSSOCopyErrorMessage(label: string): string {+ return `Unable to copy ${label.toLowerCase()}. Select and copy the URL manually.`;+}+export function getSSOConnectionTestSuccessMessage(): string {return 'Connection test completed successfully.';}