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
Show only persisted SMTP settings in the notification editor
pulse-triage[bot]2526d7dff21f
diff --git a/docs/release-control/v6/internal/subsystems/alerts.md b/docs/release-control/v6/internal/subsystems/alerts.mdindex a9718d4d31..c242472ccb 100644--- a/docs/release-control/v6/internal/subsystems/alerts.md+++ b/docs/release-control/v6/internal/subsystems/alerts.md@@ -4604,3 +4604,20 @@ Verification: `src/utils/__tests__/metricThresholds.test.ts`,production table/drawer fixture `browser-tests/truenas-disk-thresholds.cjs`.The containing backend also resolves the disk-specific tiers for Patrol.Frontend checks do not establish native appliance or notification recovery.++### Existing SMTP form exposes only persisted settings++The Email destination editor follows the public `EmailConfig`: SMTP connection,+credentials, From/recipients, security, rate limit, tags and minimum severity.+Reply-to, max retries and retry delay are not offered or fabricated by the UI;+the save path never accepted them. `UIEmailConfig` extends that public type+with concrete normalized password/rate-limit values, and the advanced form+explains that Pulse manages retries. Existing server retry behaviour is unchanged.++`EmailProviderSelect.supported-settings.test.tsx` requires absence of all three+ineffective controls, default/payload parity and supported edits/reloads when+email is on or off. Existing component and destination-state tests retain+provider, mask, routing and off-state behaviour;+`src/utils/__tests__/alertEmailPresentation.test.ts` covers the retry explanation.+Browser proof uses the production email panel, destination state, API and CSS+with synthetic local endpoints. It is not native SMTP delivery or a release.diff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.mdindex 351562de65..67882b19a9 100644--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md@@ -9068,3 +9068,14 @@ and `browser-tests/truenas-disk-thresholds.cjs` exercise desktop Chromium andphone WebKit, config refresh, Attention filtering and keyboard disclosure.The fixture imports the production store/table/drawer/CSS but uses syntheticHTTP and readings; it is not full-shell, appliance or published acceptance.++### SMTP form defaults derive from the persisted type++The existing alert email editor's `UIEmailConfig` extends the public+`EmailConfig` with concrete normalized password/rate-limit values. It no longer+declares or defaults Reply-to, max retries or retry delay that the save/read+path cannot persist. The email panel removes those ineffective controls and+explains that Pulse manages retries; supported SMTP, TLS, rate-limit, routing+and off-state editing remain unchanged. Destination payload builders still+discard unsupported fields from stale drafts. Component, helper, destination+and local browser controls cover the boundary; they do not prove SMTP delivery.diff --git a/docs/release-control/v6/internal/subsystems/notifications.md b/docs/release-control/v6/internal/subsystems/notifications.mdindex 56d172017b..420443ce5b 100644--- a/docs/release-control/v6/internal/subsystems/notifications.md+++ b/docs/release-control/v6/internal/subsystems/notifications.md@@ -1399,3 +1399,19 @@ source acceptance, not SMTP/Gmail delivery or an installed reporter retest.Literal ASCII encoded-word syntax in supplied names is itself MIME-encoded,so decoding the subject once preserves the name rather than interpreting it asanother identity. The literal-encoded-word control covers both MIME builders.++### SMTP editor settings follow the public configuration++The existing Email notification form offers only settings accepted by its+save/read path. Reply-to, max retries and retry delay were UI-only values:+`buildEmailConfigPayload` and `NotificationsAPI.updateEmailConfig` omitted them,+and the notification manager supplies its own retry policy. They are no longer+editable or fabricated by the form defaults. `UIEmailConfig` extends the public+`EmailConfig` rather than declaring unsupported settings separately.++`EmailProviderSelect.supported-settings.test.tsx` checks their absence both+before and after expanding the form, default/payload parity, and supported+SMTP, rate-limit and routing preservation through edits and reloads with email+on or off. Backend configuration, transport, retry policy, TLS, queue recovery+and notification delivery are unchanged. Browser controls are synthetic, not+native SMTP acceptance or a containing release.diff --git a/frontend-modern/browser-verification/643fe086037e0dfd.json b/frontend-modern/browser-verification/643fe086037e0dfd.jsonnew file mode 100644index 0000000000..3c9fc0bf2a--- /dev/null+++ b/frontend-modern/browser-verification/643fe086037e0dfd.json@@ -0,0 +1,69 @@+{+ "version": 1,+ "base_sha": "bcabde65c0628a17a6c67d3f8fb6f7dc761cab45",+ "verified_at": "2026-10-10T06:10:08.925Z",+ "result": "passed",+ "changed_paths": [+ "frontend-modern/src/components/Alerts/EmailProviderSelect.tsx",+ "frontend-modern/src/features/alerts/helpers.ts",+ "frontend-modern/src/features/alerts/types.ts",+ "frontend-modern/src/utils/alertEmailPresentation.ts"+ ],+ "content_sha256": {+ "frontend-modern/src/components/Alerts/EmailProviderSelect.tsx": "af3a0fd3ce727588d789c56a55e14dbbb960c7b8d89b594033040c4a48744fac",+ "frontend-modern/src/features/alerts/helpers.ts": "f4c1ad656338ac5fca9ab5a183b5cfdcc8718085d76932108722c5ceb08df3bf",+ "frontend-modern/src/features/alerts/types.ts": "b28f546f700fbfb04794811137a15759bf491591714aa6f9a2bb437ea8ba0cb5",+ "frontend-modern/src/utils/alertEmailPresentation.ts": "5fc09fa8924277130f9722349bbd90df6927ec74841637aeb487147243dcf84b"+ },+ "routes": [+ "/qualification/email (local fixture for the existing /alerts/notifications email panel; not a product route)"+ ],+ "viewports": [+ {+ "width": 1365,+ "height": 900,+ "name": "desktop-light"+ },+ {+ "width": 1365,+ "height": 900,+ "name": "desktop-dark"+ },+ {+ "width": 390,+ "height": 844,+ "name": "phone-light"+ },+ {+ "width": 320,+ "height": 844,+ "name": "narrow-dark"+ }+ ],+ "states": [+ "Production AlertEmailDestinationsSection, EmailProviderSelect, destination state, NotificationsAPI and CSS, with synthetic local GET/PUT responses; Playwright 1.56.1 matches the integration lock. Desktop Chromium 141.0.7390.37 and narrow WebKit 26.0, light/dark.",+ "Reply-to, max retries and retry delay are absent before and after expanding advanced settings. The form explains that Pulse manages retries.",+ "Supported SMTP/From/rate/TLS edits survive the real save payload/API and reload while preserving masked password, recipients, tags, matching mode and minimum severity.",+ "Off-state settings remain editable without enabling delivery; focus moves to the revealed provider control and Send test email remains disabled. Eight final screenshots inspected; changed labels/help fit, including 320 px. The inherited panel description truncates at 320 px.",+ "These synthetic checks are not native SMTP, physical-phone, ordinary notification acceptance, protected publication or a release."+ ],+ "interactions": [+ "32 assertion groups: load and expand; edit From/rate/security; save and reload; switch email off, reveal settings, edit rate, save and reload. Eight final on/off captures.",+ "Exact wire payloads checked for each on/off save. No Test, Retry, Dismiss, Relay, provider/native call, unexpected API request or page error; no horizontal overflow.",+ "Browser and preview server closed. Earlier fixture failures are retained separately; their exit 1 results are not cleared by this corrected verification."+ ],+ "evidence_sha256": {+ "script": "43ea7edf443bd38ef7143be0c960082d739fc93dcb4cf288693b1baab7ee04b6",+ "results": "1f485bfd85dc4a1ac995d0e85c28d3823cde022d08f73424990378ddc3bcac37",+ "captures": {+ "desktop-light-saved-on.png": "c55553f677140d22e3960916fe6af4ec43bfab684b6300c195e0b3e8b6dd5d64",+ "desktop-light-saved-off.png": "e5e42c7f75d8d643b13cdea14af9192937a410059737d2ef2bb901dd8b9c2728",+ "desktop-dark-saved-on.png": "64ac9d1e402b88e381eda4960f25e44c83cc93f8525b68d895ce23e483bee05c",+ "desktop-dark-saved-off.png": "791c6f6382f7c2bc29be266a9317aea958adf199975a501976522cfa0e0ad9d5",+ "phone-light-saved-on.png": "46d893531186b236d987de5c6d13cee60de1f1605669f7e6833c600d1f15a9dc",+ "phone-light-saved-off.png": "1e7312b7241e526a307aa9f5d7d344e3ce13a54c3fff27e7ecbbcae70e00e190",+ "narrow-dark-saved-on.png": "704ce0929a70915dfe6817260d9a7c3013940b17532aba182575204d7be08974",+ "narrow-dark-saved-off.png": "6b34f46279a6a49e16b7a7b3a989c31a3864a59fd2b78f3582248b660791bbdd"+ }+ }+}diff --git a/frontend-modern/src/components/Alerts/EmailProviderSelect.supported-settings.test.tsx b/frontend-modern/src/components/Alerts/EmailProviderSelect.supported-settings.test.tsxnew file mode 100644index 0000000000..044ff21b65--- /dev/null+++ b/frontend-modern/src/components/Alerts/EmailProviderSelect.supported-settings.test.tsx@@ -0,0 +1,77 @@+import { cleanup, fireEvent, render, screen } from '@solidjs/testing-library';+import { createSignal } from 'solid-js';+import { afterEach, describe, expect, it, vi } from 'vitest';+import { EmailProviderSelect } from './EmailProviderSelect';+import { createDefaultEmailConfig, normalizeEmailConfigFromAPI } from '@/features/alerts/helpers';+import { buildEmailConfigPayload } from '@/features/alerts/alertDestinationsModel';++vi.mock('@/api/notifications', () => ({+ NotificationsAPI: { getEmailProviders: vi.fn().mockResolvedValue([]) },+}));++afterEach(cleanup);++describe('email form settings must be backed by the public configuration', () => {+ it.each(['Reply-to address', 'Max retries', 'Retry delay (seconds)'])(+ 'does not offer the ineffective %s control',+ (name) => {+ render(() => (+ <EmailProviderSelect+ config={createDefaultEmailConfig()}+ onChange={vi.fn()}+ onTest={vi.fn()}+ />+ ));+ expect(screen.queryByLabelText(name)).not.toBeInTheDocument();+ fireEvent.click(screen.getByRole('button', { name: 'Show advanced options' }));+ expect(screen.queryByLabelText(name)).not.toBeInTheDocument();+ },+ );++ it('keeps defaults limited to settings the payload can persist', () => {+ const config = createDefaultEmailConfig();+ expect(config).toEqual(buildEmailConfigPayload(config));+ });++ it.each([true, false])(+ 'preserves supported settings through an edit and reload, enabled=%s',+ (enabled) => {+ const saved = normalizeEmailConfigFromAPI({+ enabled,+ provider: 'Custom SMTP Server',+ server: 'smtp.example.test',+ port: 587,+ username: '[email protected]',+ password: 'synthetic-only',+ from: '[email protected]',+ to: ['[email protected]'],+ tls: false,+ startTLS: true,+ rateLimit: 17,+ tagFilter: ['production'],+ tagFilterMode: 'any',+ minimumSeverity: 'warning',+ });+ const [config, setConfig] = createSignal(saved);+ render(() => <EmailProviderSelect config={config()} onChange={setConfig} onTest={vi.fn()} />);+ fireEvent.input(screen.getByRole('textbox', { name: 'From address' }), {+ target: { value: '[email protected]' },+ });+ fireEvent.click(screen.getByRole('button', { name: 'Show advanced options' }));+ fireEvent.input(screen.getByRole('spinbutton', { name: 'Rate limit' }), {+ target: { value: '12' },+ });+ const payload = buildEmailConfigPayload(config());+ expect(payload).toEqual({+ ...buildEmailConfigPayload(saved),+ from: '[email protected]',+ rateLimit: 12,+ });+ expect(normalizeEmailConfigFromAPI(payload)).toEqual(config());+ expect(screen.getByRole('button', { name: 'Send test email' })).toHaveProperty(+ 'disabled',+ !enabled,+ );+ },+ );+});diff --git a/frontend-modern/src/components/Alerts/EmailProviderSelect.test.tsx b/frontend-modern/src/components/Alerts/EmailProviderSelect.test.tsxindex 45d441eeef..96eee21c24 100644--- a/frontend-modern/src/components/Alerts/EmailProviderSelect.test.tsx+++ b/frontend-modern/src/components/Alerts/EmailProviderSelect.test.tsx@@ -37,9 +37,6 @@ function makeConfig(overrides: Partial<UIEmailConfig> = {}): UIEmailConfig {to: [],tls: false,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 5,rateLimit: 60,...overrides,};@@ -178,7 +175,6 @@ describe('EmailProviderSelect', () => {expect(screen.getByRole('textbox', { name: 'SMTP server' })).toBeInTheDocument();expect(screen.getByRole('spinbutton', { name: 'SMTP port' })).toBeInTheDocument();expect(screen.getByRole('textbox', { name: 'From address' })).toBeInTheDocument();- expect(screen.getByRole('textbox', { name: 'Reply-to address' })).toBeInTheDocument();expect(screen.getByRole('textbox', { name: 'Username' })).toBeInTheDocument();expect(screen.getByLabelText('Password / API key')).toHaveAttribute('type', 'password');expect(screen.getByRole('textbox', { name: 'Recipients (one per line)' })).toBeInTheDocument();@@ -186,8 +182,6 @@ describe('EmailProviderSelect', () => {fireEvent.click(screen.getByText('Show advanced options'));expect(screen.getByRole('spinbutton', { name: 'Rate limit' })).toBeInTheDocument();- expect(screen.getByRole('spinbutton', { name: 'Max retries' })).toBeInTheDocument();- expect(screen.getByRole('spinbutton', { name: 'Retry delay (seconds)' })).toBeInTheDocument();});it('loads providers from the API and populates the select', async () => {@@ -368,19 +362,6 @@ describe('EmailProviderSelect', () => {expect(onChangeMock).toHaveBeenCalledWith(expect.objectContaining({ from: '[email protected]' }));});- it('updates reply-to on input', async () => {- render(() => (- <EmailProviderSelect config={makeConfig()} onChange={onChangeMock} onTest={onTestMock} />- ));-- const replyToInput = screen.getByPlaceholderText('[email protected]');- fireEvent.input(replyToInput, { target: { value: '[email protected]' } });-- expect(onChangeMock).toHaveBeenCalledWith(- expect.objectContaining({ replyTo: '[email protected]' }),- );- });-it('updates username on input', async () => {render(() => (<EmailProviderSelect config={makeConfig()} onChange={onChangeMock} onTest={onTestMock} />@@ -458,8 +439,9 @@ describe('EmailProviderSelect', () => {fireEvent.click(screen.getByText('Show advanced options'));expect(screen.getByText('Security')).toBeInTheDocument();expect(screen.getByText('Rate limit')).toBeInTheDocument();- expect(screen.getByText('Max retries')).toBeInTheDocument();- expect(screen.getByText('Retry delay (seconds)')).toBeInTheDocument();+ expect(+ screen.getByText('Email retries are managed by Pulse, not by this form.'),+ ).toBeInTheDocument();expect(screen.getByText('Hide advanced options')).toBeInTheDocument();// Click to hide@@ -520,66 +502,8 @@ describe('EmailProviderSelect', () => {expect(onChangeMock).toHaveBeenCalledWith(expect.objectContaining({ rateLimit: 120 }));});- it('updates max retries via advanced options', async () => {- render(() => (- <EmailProviderSelect- config={makeConfig({ maxRetries: 3 })}- onChange={onChangeMock}- onTest={onTestMock}- />- ));-- fireEvent.click(screen.getByText('Show advanced options'));-- const numberInputs = screen.getAllByRole('spinbutton');- const retriesInput = numberInputs.find((el) => (el as HTMLInputElement).value === '3');- expect(retriesInput).toBeTruthy();-- fireEvent.input(retriesInput!, { target: { value: '5' } });- expect(onChangeMock).toHaveBeenCalledWith(expect.objectContaining({ maxRetries: 5 }));- });-- it('updates retry delay via advanced options', async () => {- render(() => (- <EmailProviderSelect- config={makeConfig({ retryDelay: 5 })}- onChange={onChangeMock}- onTest={onTestMock}- />- ));-- fireEvent.click(screen.getByText('Show advanced options'));-- const numberInputs = screen.getAllByRole('spinbutton');- const delayInput = numberInputs.find((el) => (el as HTMLInputElement).value === '5');- expect(delayInput).toBeTruthy();-- fireEvent.input(delayInput!, { target: { value: '15' } });- expect(onChangeMock).toHaveBeenCalledWith(expect.objectContaining({ retryDelay: 15 }));- });-- it('coerces maxRetries=0 to default display value of 3 (known || coercion)', async () => {- // NOTE: The source uses `value={props.config.maxRetries || 3}` which- // coerces 0 to 3. This test documents the current behavior.- // maxRetries has min={0} so 0 is semantically valid but displays as 3.- render(() => (- <EmailProviderSelect- config={makeConfig({ maxRetries: 0 })}- onChange={onChangeMock}- onTest={onTestMock}- />- ));-- fireEvent.click(screen.getByText('Show advanced options'));-- const numberInputs = screen.getAllByRole('spinbutton');- // With maxRetries=0, the input shows "3" due to || coercion- const retriesInput = numberInputs.find((el) => (el as HTMLInputElement).value === '3');- expect(retriesInput).toBeTruthy();- });-it('coerces rateLimit=0 to default display value of 60 (known || coercion)', async () => {- // NOTE: Same || coercion pattern as maxRetries.+ // The backend interprets the legacy zero sentinel as the default rate limit.render(() => (<EmailProviderSelectconfig={makeConfig({ rateLimit: 0 })}diff --git a/frontend-modern/src/components/Alerts/EmailProviderSelect.tsx b/frontend-modern/src/components/Alerts/EmailProviderSelect.tsxindex 767798b9a9..5026f98349 100644--- a/frontend-modern/src/components/Alerts/EmailProviderSelect.tsx+++ b/frontend-modern/src/components/Alerts/EmailProviderSelect.tsx@@ -4,7 +4,6 @@ import {ALERT_EMAIL_FROM_ADDRESS_LABEL,ALERT_EMAIL_FROM_ADDRESS_PLACEHOLDER,ALERT_EMAIL_MANUAL_CONFIGURATION_LABEL,- ALERT_EMAIL_MAX_RETRIES_LABEL,ALERT_EMAIL_PASSWORD_LABEL,ALERT_EMAIL_PASSWORD_PLACEHOLDER,ALERT_EMAIL_PROVIDER_LABEL,@@ -12,9 +11,7 @@ import {ALERT_EMAIL_RATE_LIMIT_SUFFIX,ALERT_EMAIL_REAPPLY_DEFAULTS_LABEL,ALERT_EMAIL_RECIPIENTS_LABEL,- ALERT_EMAIL_REPLY_TO_LABEL,- ALERT_EMAIL_REPLY_TO_PLACEHOLDER,- ALERT_EMAIL_RETRY_DELAY_LABEL,+ ALERT_EMAIL_RETRY_POLICY_HELP,ALERT_EMAIL_SECURITY_LABEL,ALERT_EMAIL_SECURITY_NONE_LABEL,ALERT_EMAIL_SECURITY_STARTTLS_LABEL,@@ -54,13 +51,10 @@ export function EmailProviderSelect(props: EmailProviderSelectProps) {smtpServer: `${fieldIdPrefix}-smtp-server`,smtpPort: `${fieldIdPrefix}-smtp-port`,fromAddress: `${fieldIdPrefix}-from-address`,- replyTo: `${fieldIdPrefix}-reply-to`,username: `${fieldIdPrefix}-username`,password: `${fieldIdPrefix}-password`,recipients: `${fieldIdPrefix}-recipients`,rateLimit: `${fieldIdPrefix}-rate-limit`,- maxRetries: `${fieldIdPrefix}-max-retries`,- retryDelay: `${fieldIdPrefix}-retry-delay`,tagMode: `${fieldIdPrefix}-tag-mode`,minimumSeverity: `${fieldIdPrefix}-minimum-severity`,};@@ -162,7 +156,7 @@ export function EmailProviderSelect(props: EmailProviderSelectProps) {/></div>- <div class={formField}>+ <div class={`${formField} sm:col-span-2`}><label for={fieldIds.fromAddress} class={labelClass()}>{ALERT_EMAIL_FROM_ADDRESS_LABEL}</label>@@ -176,20 +170,6 @@ export function EmailProviderSelect(props: EmailProviderSelectProps) {/></div>- <div class={formField}>- <label for={fieldIds.replyTo} class={labelClass()}>- {ALERT_EMAIL_REPLY_TO_LABEL}- </label>- <input- id={fieldIds.replyTo}- type="email"- value={props.config.replyTo || ''}- onInput={(e) => props.onChange({ ...props.config, replyTo: e.currentTarget.value })}- placeholder={ALERT_EMAIL_REPLY_TO_PLACEHOLDER}- class={controlClass('px-2 py-1.5')}- />- </div>-<div class={formField}><label for={fieldIds.username} class={labelClass()}>{ALERT_EMAIL_USERNAME_LABEL}@@ -293,7 +273,7 @@ export function EmailProviderSelect(props: EmailProviderSelectProps) {<Show when={state.showAdvanced()}><div class="mt-3 space-y-3 text-xs text-base-content">- <div class="grid gap-3 sm:grid-cols-3">+ <div class="grid gap-3 sm:grid-cols-2"><FormSelectid="alert-email-security-select"label={ALERT_EMAIL_SECURITY_LABEL}@@ -337,46 +317,7 @@ export function EmailProviderSelect(props: EmailProviderSelectProps) {</div></div>- <div class="grid w-full gap-3 sm:grid-cols-2">- <div class={formField}>- <label- for={fieldIds.maxRetries}- class={labelClass('text-xs uppercase tracking-[0.08em]')}- >- {ALERT_EMAIL_MAX_RETRIES_LABEL}- </label>- <input- id={fieldIds.maxRetries}- type="number"- value={props.config.maxRetries || 3}- min={0}- max={5}- onInput={(e) =>- props.onChange({ ...props.config, maxRetries: parseInt(e.currentTarget.value) })- }- class={controlClass('px-2 py-1 text-sm')}- />- </div>- <div class={formField}>- <label- for={fieldIds.retryDelay}- class={labelClass('text-xs uppercase tracking-[0.08em]')}- >- {ALERT_EMAIL_RETRY_DELAY_LABEL}- </label>- <input- id={fieldIds.retryDelay}- type="number"- value={props.config.retryDelay || 5}- min={1}- max={60}- onInput={(e) =>- props.onChange({ ...props.config, retryDelay: parseInt(e.currentTarget.value) })- }- class={controlClass('px-2 py-1 text-sm')}- />- </div>- </div>+ <p class={formHelpText}>{ALERT_EMAIL_RETRY_POLICY_HELP}</p></div></Show></div>diff --git a/frontend-modern/src/components/Alerts/__tests__/useEmailProviderSelectState.test.tsx b/frontend-modern/src/components/Alerts/__tests__/useEmailProviderSelectState.test.tsxindex 68aed738c0..c4cafdd3c2 100644--- a/frontend-modern/src/components/Alerts/__tests__/useEmailProviderSelectState.test.tsx+++ b/frontend-modern/src/components/Alerts/__tests__/useEmailProviderSelectState.test.tsx@@ -48,9 +48,6 @@ const buildConfig = (overrides: Record<string, unknown> = {}) => ({to: ['[email protected]'],tls: false,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 5,rateLimit: 60,...overrides,});diff --git a/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.test.tsx b/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.test.tsxindex 397eacfdbd..26c8b7e221 100644--- a/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.test.tsx+++ b/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.test.tsx@@ -21,9 +21,6 @@ function makeConfig(overrides: Partial<UIEmailConfig> = {}): UIEmailConfig {to: [],tls: false,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 10,...overrides,};diff --git a/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsx b/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsxindex 539fcf282e..7c13a54495 100644--- a/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsx+++ b/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsx@@ -44,13 +44,10 @@ vi.mock('../AlertPushDestinationsSection', () => ({ AlertPushDestinationsSectionconst buildEmailConfig = (): UIEmailConfig => ({enabled: true,from: '[email protected]',- maxRetries: 3,password: '',port: 587,provider: 'smtp',rateLimit: 60,- replyTo: '',- retryDelay: 5,server: 'smtp.example.com',startTLS: true,tls: true,diff --git a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712.test.ts b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712.test.tsindex cc328a8163..018e8b0543 100644--- a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712.test.ts+++ b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712.test.ts@@ -21,9 +21,6 @@ function makeUIEmailConfig(overrides: Partial<UIEmailConfig> = {}): UIEmailConfito: ['[email protected]'],tls: true,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 0,...overrides,};@@ -82,8 +79,8 @@ describe('buildEmailConfigPayload — branch coverage (batch 2)', () => {});// ------------------------------------------------------------------------ // Exact payload shape — toStrictEqual verifies that UI-only fields- // (replyTo, maxRetries, retryDelay) are absent from the+ // Exact payload shape — toStrictEqual verifies that unsupported fields+ // (replyTo, maxRetries, retryDelay) stay absent from the// output and that falsy scalar values pass through unchanged.// -----------------------------------------------------------------------describe('payload shape', () => {@@ -100,9 +97,6 @@ describe('buildEmailConfigPayload — branch coverage (batch 2)', () => {to: ['[email protected]'],tls: false,startTLS: false,- replyTo: '[email protected]',- maxRetries: 5,- retryDelay: 120,rateLimit: 100,}),);@@ -128,13 +122,13 @@ describe('buildEmailConfigPayload — branch coverage (batch 2)', () => {});it('does not include replyTo, maxRetries, or retryDelay in the payload', () => {- const result = buildEmailConfigPayload(- makeUIEmailConfig({- replyTo: '[email protected]',- maxRetries: 10,- retryDelay: 300,- }),- );+ const staleDraft = {+ ...makeUIEmailConfig(),+ replyTo: '[email protected]',+ maxRetries: 10,+ retryDelay: 300,+ };+ const result = buildEmailConfigPayload(staleDraft);expect(result).not.toHaveProperty('replyTo');expect(result).not.toHaveProperty('maxRetries');expect(result).not.toHaveProperty('retryDelay');diff --git a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712c.test.ts b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712c.test.tsindex 13c893e70a..b6af8952ea 100644--- a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712c.test.ts+++ b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0712c.test.ts@@ -22,9 +22,6 @@ function makeUIEmailConfig(overrides: Partial<UIEmailConfig> = {}): UIEmailConfito: ['[email protected]'],tls: true,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 0,...overrides,};@@ -144,15 +141,14 @@ describe('buildEmailConfigPayload — branch coverage (batch 3 / 0712c)', () =>// the value-level toStrictEqual checks in the sibling suite.// -----------------------------------------------------------------------describe('payload contract — exact key set', () => {- it('emits exactly the EmailConfig keys including rateLimit and omits UI-only fields', () => {- const result = buildEmailConfigPayload(- makeUIEmailConfig({- replyTo: '[email protected]',- maxRetries: 9,- retryDelay: 300,- rateLimit: 50,- }),- );+ it('emits only supported EmailConfig keys even when a stale draft contains extra fields', () => {+ const staleDraft = {+ ...makeUIEmailConfig({ rateLimit: 50 }),+ replyTo: '[email protected]',+ maxRetries: 9,+ retryDelay: 300,+ };+ const result = buildEmailConfigPayload(staleDraft);expect(Object.keys(result)).toStrictEqual(['enabled','provider',diff --git a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0713.test.ts b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0713.test.tsindex b267f5dc43..b56435b733 100644--- a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0713.test.ts+++ b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.branchcov0713.test.ts@@ -46,9 +46,6 @@ function makeUIEmailConfig(overrides: Partial<UIEmailConfig> = {}): UIEmailConfito: ['[email protected]'],tls: true,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 0,...overrides,};diff --git a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.test.ts b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.test.tsindex 1aa9d1664b..70ed913512 100644--- a/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.test.ts+++ b/frontend-modern/src/features/alerts/__tests__/alertDestinationsModel.test.ts@@ -44,9 +44,6 @@ describe('alertDestinationsModel', () => {to: ['[email protected]', '', ' [email protected] ', ''],tls: true,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 0,}).to,).toEqual(['[email protected]', '[email protected]']);@@ -65,9 +62,6 @@ describe('alertDestinationsModel', () => {to: ['[email protected]'],tls: true,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 0,tagFilter: [],tagFilterMode: 'any',@@ -95,9 +89,6 @@ describe('alertDestinationsModel', () => {to: ['[email protected]'],tls: true,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 0,minimumSeverity: 'critical',}),@@ -147,9 +138,6 @@ describe('alertDestinationsModel', () => {to: ['[email protected]'],tls: true,startTLS: true,- replyTo: '',- maxRetries: 3,- retryDelay: 60,rateLimit: 0,minimumSeverity: 'warning',}).minimumSeverity,diff --git a/frontend-modern/src/features/alerts/__tests__/useAlertDestinationsTabState.test.tsx b/frontend-modern/src/features/alerts/__tests__/useAlertDestinationsTabState.test.tsxindex 2515c6f393..d50ceb33b3 100644--- a/frontend-modern/src/features/alerts/__tests__/useAlertDestinationsTabState.test.tsx+++ b/frontend-modern/src/features/alerts/__tests__/useAlertDestinationsTabState.test.tsx@@ -52,13 +52,10 @@ vi.mock('@/utils/toast', () => ({const buildEmailConfig = (): UIEmailConfig => ({enabled: true,from: '[email protected]',- maxRetries: 3,password: '',port: 587,provider: 'smtp',rateLimit: 60,- replyTo: '',- retryDelay: 5,server: 'smtp.example.com',startTLS: true,tls: true,diff --git a/frontend-modern/src/features/alerts/helpers.ts b/frontend-modern/src/features/alerts/helpers.tsindex 40bed432e1..eb84df8737 100644--- a/frontend-modern/src/features/alerts/helpers.ts+++ b/frontend-modern/src/features/alerts/helpers.ts@@ -109,9 +109,6 @@ export const createDefaultEmailConfig = (): UIEmailConfig => ({to: [],tls: true,startTLS: false,- replyTo: '',- maxRetries: 3,- retryDelay: 5,rateLimit: 60,tagFilter: [],tagFilterMode: 'all',diff --git a/frontend-modern/src/features/alerts/types.ts b/frontend-modern/src/features/alerts/types.tsindex c51c6fca3b..c003f54ff1 100644--- a/frontend-modern/src/features/alerts/types.ts+++ b/frontend-modern/src/features/alerts/types.ts@@ -137,25 +137,11 @@ export interface Override {};}-// Local email config with UI-specific fields-export interface UIEmailConfig {- enabled: boolean;- provider: string;- server: string; // Fixed: use 'server' not 'smtpHost'- port: number; // Fixed: use 'port' not 'smtpPort'- username: string;+// The editor offers only settings backed by the public email configuration.+// Normalization supplies concrete password/rate-limit values for form controls.+export interface UIEmailConfig extends EmailConfig {password: string;- from: string;- to: string[];- tls: boolean;- startTLS: boolean;- replyTo: string;- maxRetries: number;- retryDelay: number;rateLimit: number;- tagFilter?: string[];- tagFilterMode?: 'all' | 'any';- minimumSeverity?: 'all' | 'warning' | 'critical';}export interface UIAppriseConfig {diff --git a/frontend-modern/src/pages/__tests__/Alerts.helpers.test.ts b/frontend-modern/src/pages/__tests__/Alerts.helpers.test.tsindex c05be23189..f7df2d8519 100644--- a/frontend-modern/src/pages/__tests__/Alerts.helpers.test.ts+++ b/frontend-modern/src/pages/__tests__/Alerts.helpers.test.ts@@ -1106,9 +1106,6 @@ describe('normalizeEmailConfigFromAPI', () => {to: ['[email protected]'],tls: false,startTLS: false,- replyTo: '',- maxRetries: 3,- retryDelay: 5,rateLimit: 0,tagFilter: [],tagFilterMode: 'all',@@ -1144,9 +1141,6 @@ describe('normalizeEmailConfigFromAPI', () => {to: ['[email protected]'],tls: true,startTLS: false,- replyTo: '',- maxRetries: 3,- retryDelay: 5,rateLimit: 60,tagFilter: [],tagFilterMode: 'all',diff --git a/frontend-modern/src/utils/__tests__/alertEmailPresentation.branchcov0718.test.ts b/frontend-modern/src/utils/__tests__/alertEmailPresentation.branchcov0718.test.tsindex ef5f5692cc..9eafc9d457 100644--- a/frontend-modern/src/utils/__tests__/alertEmailPresentation.branchcov0718.test.ts+++ b/frontend-modern/src/utils/__tests__/alertEmailPresentation.branchcov0718.test.ts@@ -4,7 +4,6 @@ import {ALERT_EMAIL_FROM_ADDRESS_PLACEHOLDER,ALERT_EMAIL_HIDE_ADVANCED_OPTIONS_LABEL,ALERT_EMAIL_HIDE_SETUP_INSTRUCTIONS_LABEL,- ALERT_EMAIL_MAX_RETRIES_LABEL,ALERT_EMAIL_PASSWORD_LABEL,ALERT_EMAIL_PASSWORD_PLACEHOLDER,ALERT_EMAIL_RATE_LIMIT_LABEL,@@ -12,9 +11,6 @@ import {ALERT_EMAIL_RECIPIENTS_FALLBACK_FROM,ALERT_EMAIL_RECIPIENTS_LABEL,ALERT_EMAIL_RECIPIENTS_PLACEHOLDER_SUFFIX,- ALERT_EMAIL_REPLY_TO_LABEL,- ALERT_EMAIL_REPLY_TO_PLACEHOLDER,- ALERT_EMAIL_RETRY_DELAY_LABEL,ALERT_EMAIL_SECURITY_LABEL,ALERT_EMAIL_SECURITY_NONE_LABEL,ALERT_EMAIL_SECURITY_STARTTLS_LABEL,@@ -193,11 +189,9 @@ describe('alertEmailPresentation — branch coverage (batch 0718)', () => {expect(ALERT_EMAIL_SMTP_PORT_PLACEHOLDER).toBe('587');});- it('exposes the from / reply-to label + placeholder vocabulary', () => {+ it('exposes the from-address label + placeholder vocabulary', () => {expect(ALERT_EMAIL_FROM_ADDRESS_LABEL).toBe('From address');expect(ALERT_EMAIL_FROM_ADDRESS_PLACEHOLDER).toBe('[email protected]');- expect(ALERT_EMAIL_REPLY_TO_LABEL).toBe('Reply-to address');- expect(ALERT_EMAIL_REPLY_TO_PLACEHOLDER).toBe('[email protected]');});it('exposes the username label + both placeholder constants', () => {@@ -239,11 +233,6 @@ describe('alertEmailPresentation — branch coverage (batch 0718)', () => {expect(ALERT_EMAIL_RATE_LIMIT_SUFFIX).toBe('/min');});- it('exposes the retry vocabulary (max retries + retry delay)', () => {- expect(ALERT_EMAIL_MAX_RETRIES_LABEL).toBe('Max retries');- expect(ALERT_EMAIL_RETRY_DELAY_LABEL).toBe('Retry delay (seconds)');- });-it('exposes the test-email idle vocabulary (testing arm covered above)', () => {expect(ALERT_EMAIL_TEST_LABEL).toBe('Send test email');});diff --git a/frontend-modern/src/utils/__tests__/alertEmailPresentation.test.ts b/frontend-modern/src/utils/__tests__/alertEmailPresentation.test.tsindex 89b143c7f9..0d6239ee9c 100644--- a/frontend-modern/src/utils/__tests__/alertEmailPresentation.test.ts+++ b/frontend-modern/src/utils/__tests__/alertEmailPresentation.test.ts@@ -5,6 +5,7 @@ import {ALERT_EMAIL_PROVIDER_LABEL,ALERT_EMAIL_REAPPLY_DEFAULTS_LABEL,ALERT_EMAIL_REPLY_TO_PLACEHOLDER,+ ALERT_EMAIL_RETRY_POLICY_HELP,ALERT_EMAIL_SMTP_PORT_PLACEHOLDER,ALERT_EMAIL_SMTP_SERVER_PLACEHOLDER,ALERT_EMAIL_TESTING_LABEL,@@ -46,6 +47,12 @@ describe('alertEmailPresentation', () => {expect(getAlertEmailAdvancedToggleLabel(false)).toBe('Show advanced options');});+ it('explains that the form does not configure email retries', () => {+ expect(ALERT_EMAIL_RETRY_POLICY_HELP).toBe(+ 'Email retries are managed by Pulse, not by this form.',+ );+ });+it('exposes canonical test-email button labels', () => {expect(getAlertEmailTestButtonLabel(false)).toBe('Send test email');expect(getAlertEmailTestButtonLabel(true)).toBe(ALERT_EMAIL_TESTING_LABEL);diff --git a/frontend-modern/src/utils/alertEmailPresentation.ts b/frontend-modern/src/utils/alertEmailPresentation.tsindex 7ef3b24fd9..8a40e2c1c3 100644--- a/frontend-modern/src/utils/alertEmailPresentation.ts+++ b/frontend-modern/src/utils/alertEmailPresentation.ts@@ -9,7 +9,7 @@ export const ALERT_EMAIL_SMTP_PORT_LABEL = 'SMTP port';export const ALERT_EMAIL_SMTP_PORT_PLACEHOLDER = '587';export const ALERT_EMAIL_FROM_ADDRESS_LABEL = 'From address';export const ALERT_EMAIL_FROM_ADDRESS_PLACEHOLDER = '[email protected]';-export const ALERT_EMAIL_REPLY_TO_LABEL = 'Reply-to address';+// Shared with the SSO administrator-email field; not a supported SMTP setting.export const ALERT_EMAIL_REPLY_TO_PLACEHOLDER = '[email protected]';export const ALERT_EMAIL_USERNAME_LABEL = 'Username';export const ALERT_EMAIL_USERNAME_PLACEHOLDER = '[email protected]';@@ -27,8 +27,8 @@ export const ALERT_EMAIL_SECURITY_STARTTLS_LABEL = 'STARTTLS (587)';export const ALERT_EMAIL_SECURITY_TLS_LABEL = 'TLS/SSL (465)';export const ALERT_EMAIL_RATE_LIMIT_LABEL = 'Rate limit';export const ALERT_EMAIL_RATE_LIMIT_SUFFIX = '/min';-export const ALERT_EMAIL_MAX_RETRIES_LABEL = 'Max retries';-export const ALERT_EMAIL_RETRY_DELAY_LABEL = 'Retry delay (seconds)';+export const ALERT_EMAIL_RETRY_POLICY_HELP =+ 'Email retries are managed by Pulse, not by this form.';export const ALERT_EMAIL_TEST_LABEL = 'Send test email';export const ALERT_EMAIL_TESTING_LABEL = 'Sending test email…';