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
Lead Notifications with where alerts go
rcourtman76a1d8df4974
diff --git a/docs/release-control/v6/internal/subsystems/alerts.md b/docs/release-control/v6/internal/subsystems/alerts.mdindex 0a133cf8fe..d5f84143cd 100644--- a/docs/release-control/v6/internal/subsystems/alerts.md+++ b/docs/release-control/v6/internal/subsystems/alerts.md@@ -2860,11 +2860,19 @@ windows separately: completed attempts remain for seven days whiledead-letter attempts can remain for 30 days. It requests the bounded maximumof 200 rows, displays an absolute semantic timestamp for timeline correlationwith relative time as secondary hover context, and says that test sends skip-the queue. An unreadable log renders as unavailable rather than empty. The-card sits directly below delivery health and recovery controls on the-Notifications route; a degraded Overview warning links to that route so the-diagnostic evidence and safe retry/dismiss actions are reachable from the-warning. The same card interleaves alert-owned+the queue. An unreadable log renders as unavailable rather than empty. While+delivery needs attention the card sits directly below delivery health and+recovery controls on the Notifications route; a degraded Overview warning+links to that route so the diagnostic evidence and safe retry/dismiss actions+are reachable from the warning. Otherwise the route answers "where do my+alerts go" first: webhooks (named by the services they reach), then email and+Apprise, then this card. A switched-off email or Apprise destination renders+one line saying what turning it on does plus a "Show settings" control that+reveals the form without enabling it or marking the page changed. A new+webhook opens on the service choice rather than the generic JSON form.+`useNotificationDeliveryHealth` updates the health snapshot and its+availability in one batch so the attention state never reads a half-updated+pair and remounts the warning mid-refresh. The same card interleaves alert-owned`notification_suppressed` and `notification_deferred` evidence from`GET /api/alerts/events` with those attempts, ordered by the recorded event orattempt time. Held rows name the affected resource, alert type, anddiff --git a/docs/release-control/v6/internal/subsystems/frontend-primitives.md b/docs/release-control/v6/internal/subsystems/frontend-primitives.mdindex c1c7b52d3e..ed3aaf27c9 100644--- a/docs/release-control/v6/internal/subsystems/frontend-primitives.md+++ b/docs/release-control/v6/internal/subsystems/frontend-primitives.md@@ -7853,6 +7853,17 @@ Alert feature state owns persistence and entitlement gating; the primitiveowns presentation only. `alertDestinationsPresentation.test.ts` pins theshared vocabulary and the distinct mobile guidance.+### Switched-off destinations collapse to one line++`AlertDestinationOffSummary` is the shared off-state body for destination+panels: one muted sentence saying what turning the destination on does and a+"Show settings" link button that reveals the panel's form without changing+its enabled state, then moves keyboard focus to the first revealed control+because the button itself unmounts. Email and Apprise panels compose it+instead of rendering a full greyed form, so the panel header and its enable+toggle keep their place while the page stays short. Apprise keeps its header+test action; email's test action returns with its form.+### Escalation configuration uses destination identity, not channel aliasesThe alerts-owned escalation section composes shared settings, toggle, and formdiff --git a/frontend-modern/browser-verification/2100ac9d275d48e3.json b/frontend-modern/browser-verification/2100ac9d275d48e3.jsonnew file mode 100644index 0000000000..18b4e6e409--- /dev/null+++ b/frontend-modern/browser-verification/2100ac9d275d48e3.json@@ -0,0 +1,53 @@+{+ "version": 1,+ "base_sha": "5b7a9df8acda2b897ae593fd2f728d70bade5f84",+ "verified_at": "2026-10-05T02:28:06Z",+ "result": "passed",+ "changed_paths": [+ "frontend-modern/src/components/Alerts/WebhookConfigForm.tsx",+ "frontend-modern/src/components/Alerts/useWebhookConfigState.ts",+ "frontend-modern/src/features/alerts/AlertAppriseDestinationsSection.tsx",+ "frontend-modern/src/features/alerts/AlertDestinationOffSummary.tsx",+ "frontend-modern/src/features/alerts/AlertEmailDestinationsSection.tsx",+ "frontend-modern/src/features/alerts/tabs/DestinationsTab.tsx",+ "frontend-modern/src/features/alerts/useNotificationDeliveryHealth.ts",+ "frontend-modern/src/utils/alertDestinationsPresentation.ts",+ "frontend-modern/src/utils/alertWebhookPresentation.ts"+ ],+ "content_sha256": {+ "frontend-modern/src/components/Alerts/WebhookConfigForm.tsx": "29c99dc9b0433d3a737f113b109eab65c9ce4d21ff043ca128690b426aae9f9f",+ "frontend-modern/src/components/Alerts/useWebhookConfigState.ts": "6583f2032ef303fd9e46acd78d9a568cd2a2915bd58f32decac2adbcf8abc27b",+ "frontend-modern/src/features/alerts/AlertAppriseDestinationsSection.tsx": "2bf4fa3451dda07b2734b4218fcbf46ac398d174ead6012bf3dafcdc91dd524d",+ "frontend-modern/src/features/alerts/AlertDestinationOffSummary.tsx": "a38d98ba4d4241dec259f3bdba41f31ca646b1c8336cd581bc0a8f537dd94775",+ "frontend-modern/src/features/alerts/AlertEmailDestinationsSection.tsx": "0bedb52a56f414331b3c6496bf268474fea65c74399aaea777ab68ac82b4720e",+ "frontend-modern/src/features/alerts/tabs/DestinationsTab.tsx": "f6682910a0516f8d1bd17b0b3c339fb83311162f21907ab5450be4576819b6be",+ "frontend-modern/src/features/alerts/useNotificationDeliveryHealth.ts": "1cadc57cf7358d38ed3c8bc5395fe44879aebf5aa554d9bdfadf899212af5bbe",+ "frontend-modern/src/utils/alertDestinationsPresentation.ts": "f4b1a144d7430b31ad4c6701d619652e594537f0f6ea8eb1e61f6abe035e179b",+ "frontend-modern/src/utils/alertWebhookPresentation.ts": "ff857bcf9ffce1a14f462fc2a2f9dc2191f417c361b2041b8e9b806a6d9a82ce"+ },+ "routes": [+ "/alerts/notifications"+ ],+ "viewports": [+ {+ "width": 1440,+ "height": 900+ },+ {+ "width": 390,+ "height": 844+ }+ ],+ "states": [+ "Delivery paused, not degraded: paused banner, then Webhooks (description names Discord, Telegram, Slack, Teams, ntfy, Gotify, Pushover, PagerDuty), then Email and Apprise each collapsed to one Off line with Show settings, then Recent delivery activity, then External watchdog",+ "Phone 390: same order, collapsed panels one line each, webhook description clamps to one line",+ "Add Webhook opens on the service grid (Discord, Telegram, Slack, Microsoft Teams, PagerDuty, Teams Adaptive, Pushover, Gotify, ntfy, Mattermost, Generic)",+ "Discord and Telegram presets show their numbered setup steps on separate lines, long Telegram URLs wrap inside the column on phone",+ "No console errors"+ ],+ "interactions": [+ "Show settings on Email: SMTP form revealed greyed, delivery stays disabled, no unsaved-changes banner",+ "Keyboard Enter on Show settings: focus lands on the email provider select and the Apprise delivery-mode select",+ "Add Webhook then pick Discord and Telegram: grid closes, preset name, URL placeholder and instructions load"+ ]+}diff --git a/frontend-modern/src/components/Alerts/WebhookConfig.test.tsx b/frontend-modern/src/components/Alerts/WebhookConfig.test.tsxindex ec1088c947..b58eb327c7 100644--- a/frontend-modern/src/components/Alerts/WebhookConfig.test.tsx+++ b/frontend-modern/src/components/Alerts/WebhookConfig.test.tsx@@ -786,7 +786,7 @@ describe('WebhookConfig', () => {// --- Service selection ---- it('toggles service dropdown when service type button is clicked', async () => {+ it('opens a new webhook on the service choice and toggles it from the service button', async () => {render(() => (<WebhookConfigwebhooks={[]}@@ -799,18 +799,18 @@ describe('WebhookConfig', () => {fireEvent.click(screen.getByText('+ Add Webhook'));- // Default service is Generic- const serviceBtn = screen.getByText(/Generic →/);- fireEvent.click(serviceBtn);-+ // Adding starts on the service choice, not the generic JSON form.await waitFor(() => {expect(screen.getByText('Discord')).toBeInTheDocument();});-- // Service options should appear- expect(screen.getByText('Discord')).toBeInTheDocument();expect(screen.getByText('Slack')).toBeInTheDocument();expect(screen.getByText('Pushover')).toBeInTheDocument();++ fireEvent.click(screen.getByText(/Generic →/));+ expect(screen.queryByText('Discord')).toBeNull();++ fireEvent.click(screen.getByText(/Generic →/));+ expect(screen.getByText('Discord')).toBeInTheDocument();});it('applies template settings when selecting a service', async () => {@@ -833,8 +833,7 @@ describe('WebhookConfig', () => {});// Open service dropdown- const serviceBtn = screen.getByText(/Generic →/);- fireEvent.click(serviceBtn);+ // The service choice is already open on a new webhook.await waitFor(() => {expect(screen.getByText('Discord')).toBeInTheDocument();@@ -877,8 +876,7 @@ describe('WebhookConfig', () => {expect(screen.getByPlaceholderText('Generic Webhook')).toBeInTheDocument();});- const serviceBtn = screen.getByText(/Generic →/);- fireEvent.click(serviceBtn);+ // The service choice is already open on a new webhook.await waitFor(() => {expect(screen.getByText('Discord')).toBeInTheDocument();@@ -912,8 +910,7 @@ describe('WebhookConfig', () => {});// Open service dropdown and select Discord- const serviceBtn = screen.getByText(/Generic →/);- fireEvent.click(serviceBtn);+ // The service choice is already open on a new webhook.await waitFor(() => {expect(screen.getByText('Discord')).toBeInTheDocument();@@ -983,8 +980,7 @@ describe('WebhookConfig', () => {expect(screen.getByText(/Custom payload template/)).toBeInTheDocument();// Switch to Discord- const serviceBtn = screen.getByText(/Generic →/);- fireEvent.click(serviceBtn);+ // The service choice is already open on a new webhook.await waitFor(() => {expect(screen.getByText('Discord')).toBeInTheDocument();@@ -1301,7 +1297,7 @@ describe('WebhookConfig', () => {expect(screen.getByPlaceholderText('Generic Webhook')).toBeInTheDocument();});- fireEvent.click(screen.getByText(/Generic →/));+ // The service choice is already open on a new webhook.await waitFor(() => {expect(screen.getByText('Pushover')).toBeInTheDocument();});@@ -1437,8 +1433,7 @@ describe('WebhookConfig', () => {});// Switch to Discord to show mention field- const serviceBtn = screen.getByText(/Generic →/);- fireEvent.click(serviceBtn);+ // The service choice is already open on a new webhook.await waitFor(() => {expect(screen.getByText('Discord')).toBeInTheDocument();@@ -1578,8 +1573,7 @@ describe('WebhookConfig', () => {fireEvent.input(urlInput, { target: { value: 'https://test.com/hook' } });// Switch to Discord- const serviceBtn = screen.getByText(/Generic →/);- fireEvent.click(serviceBtn);+ // The service choice is already open on a new webhook.await waitFor(() => {expect(screen.getByText('Discord')).toBeInTheDocument();diff --git a/frontend-modern/src/components/Alerts/WebhookConfigForm.tsx b/frontend-modern/src/components/Alerts/WebhookConfigForm.tsxindex 35b80aec49..1bdac0f9ec 100644--- a/frontend-modern/src/components/Alerts/WebhookConfigForm.tsx+++ b/frontend-modern/src/components/Alerts/WebhookConfigForm.tsx@@ -117,7 +117,7 @@ export function WebhookConfigForm(props: WebhookConfigFormProps) {<h4 class="text-sm font-medium text-blue-900/25 dark:text-blue-100 mb-2">{getAlertWebhookSetupInstructionsTitle()}</h4>- {props.currentTemplate()!.instructions}+ <p class="whitespace-pre-line break-words">{props.currentTemplate()!.instructions}</p></div></Show></div>diff --git a/frontend-modern/src/components/Alerts/useWebhookConfigState.ts b/frontend-modern/src/components/Alerts/useWebhookConfigState.tsindex 71aad94d27..d0a9d703d2 100644--- a/frontend-modern/src/components/Alerts/useWebhookConfigState.ts+++ b/frontend-modern/src/components/Alerts/useWebhookConfigState.ts@@ -160,7 +160,9 @@ export function useWebhookConfigState(props: WebhookConfigProps): WebhookConfigSsetAdding(true);setEditingId(null);setFormData(createDefaultFormData());- setShowServiceDropdown(false);+ // A new webhook starts by choosing the service: most installs want+ // Discord, Telegram, ntfy and the like, not the generic JSON form.+ setShowServiceDropdown(true);setHeaderInputs([createHeaderInput(0, 'Content-Type', 'application/json')]);setCustomFieldInputs([]);};diff --git a/frontend-modern/src/features/alerts/AlertAppriseDestinationsSection.tsx b/frontend-modern/src/features/alerts/AlertAppriseDestinationsSection.tsxindex e21c4d58df..bb2ef9ff0e 100644--- a/frontend-modern/src/features/alerts/AlertAppriseDestinationsSection.tsx+++ b/frontend-modern/src/features/alerts/AlertAppriseDestinationsSection.tsx@@ -1,4 +1,4 @@-import { Show, createUniqueId } from 'solid-js';+import { Show, createSignal, createUniqueId } from 'solid-js';import { SettingsPanel } from '@/components/shared/SettingsPanel';import { TlsVerificationWarningBanner } from '@/components/shared/TlsVerificationWarningBanner';@@ -8,6 +8,7 @@ import { FormSelect } from '@/components/shared/FormSelect';import { FormTextarea } from '@/components/shared/FormTextarea';import { DestinationSeveritySelect } from '@/components/Alerts/DestinationSeveritySelect';import type { UIAppriseConfig } from './types';+import { AlertDestinationOffSummary } from './AlertDestinationOffSummary';import {ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_HELP,ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_LABEL,@@ -26,6 +27,7 @@ import {ALERT_DESTINATIONS_APPRISE_MODE_HELP,ALERT_DESTINATIONS_APPRISE_MODE_HTTP_LABEL,ALERT_DESTINATIONS_APPRISE_MODE_LABEL,+ ALERT_DESTINATIONS_APPRISE_OFF_MESSAGE,ALERT_DESTINATIONS_APPRISE_PANEL_DESCRIPTION,ALERT_DESTINATIONS_APPRISE_PANEL_TITLE,ALERT_DESTINATIONS_APPRISE_SERVER_URL_HELP,@@ -65,6 +67,14 @@ export function AlertAppriseDestinationsSection(props: AlertAppriseDestinationsStimeout: `${fieldIdPrefix}-timeout`,minimumSeverity: `${fieldIdPrefix}-minimum-severity`,};+ const [showSettings, setShowSettings] = createSignal(false);+ let settingsRegion: HTMLDivElement | undefined;+ // The summary's button unmounts as the form renders, so hand keyboard focus+ // to the first revealed control instead of dropping it on the document.+ const revealSettings = () => {+ setShowSettings(true);+ settingsRegion?.querySelector<HTMLElement>('input, select, textarea, button')?.focus();+ };return (<SettingsPanel@@ -98,206 +108,219 @@ export function AlertAppriseDestinationsSection(props: AlertAppriseDestinationsSclass="min-w-0"bodyClass="space-y-4">- <div class="space-y-4">- <FormSelect- id="alert-apprise-delivery-mode"- label={ALERT_DESTINATIONS_APPRISE_MODE_LABEL}- labelClass="text-xs uppercase tracking-[0.08em]"- value={props.config.mode}- onInput={(event) => {- props.updateApprise({ mode: event.currentTarget.value as 'cli' | 'http' });- props.setHasUnsavedChanges(true);- }}- selectBaseClass={formControl}- help={ALERT_DESTINATIONS_APPRISE_MODE_HELP}- >- <option value="cli">{ALERT_DESTINATIONS_APPRISE_MODE_CLI_LABEL}</option>- <option value="http">{ALERT_DESTINATIONS_APPRISE_MODE_HTTP_LABEL}</option>- </FormSelect>-- <FormTextarea- id={fieldIds.targets}- label={ALERT_DESTINATIONS_APPRISE_TARGETS_LABEL}- labelClass="text-xs uppercase tracking-[0.08em]"- rows={4}- textareaBaseClass={`${formControl} min-h-[120px] font-mono`}- value={props.config.targetsText}- placeholder={ALERT_DESTINATIONS_APPRISE_TARGETS_PLACEHOLDER}- onInput={(event) => {- props.updateApprise({ targetsText: event.currentTarget.value });- props.setHasUnsavedChanges(true);- }}- help={getAlertDestinationsAppriseTargetsHelp(props.config.mode)}- />+ <Show+ when={props.config.enabled || showSettings()}+ fallback={+ <AlertDestinationOffSummary+ message={ALERT_DESTINATIONS_APPRISE_OFF_MESSAGE}+ onShowSettings={revealSettings}+ />+ }+ >+ <div ref={settingsRegion} class="space-y-4">+ <FormSelect+ id="alert-apprise-delivery-mode"+ label={ALERT_DESTINATIONS_APPRISE_MODE_LABEL}+ labelClass="text-xs uppercase tracking-[0.08em]"+ value={props.config.mode}+ onInput={(event) => {+ props.updateApprise({ mode: event.currentTarget.value as 'cli' | 'http' });+ props.setHasUnsavedChanges(true);+ }}+ selectBaseClass={formControl}+ help={ALERT_DESTINATIONS_APPRISE_MODE_HELP}+ >+ <option value="cli">{ALERT_DESTINATIONS_APPRISE_MODE_CLI_LABEL}</option>+ <option value="http">{ALERT_DESTINATIONS_APPRISE_MODE_HTTP_LABEL}</option>+ </FormSelect>- <DestinationSeveritySelect- id={fieldIds.minimumSeverity}- value={props.config.minimumSeverity ?? 'all'}- onChange={(minimumSeverity) => {- props.updateApprise({ minimumSeverity });- props.setHasUnsavedChanges(true);- }}- />+ <FormTextarea+ id={fieldIds.targets}+ label={ALERT_DESTINATIONS_APPRISE_TARGETS_LABEL}+ labelClass="text-xs uppercase tracking-[0.08em]"+ rows={4}+ textareaBaseClass={`${formControl} min-h-[120px] font-mono`}+ value={props.config.targetsText}+ placeholder={ALERT_DESTINATIONS_APPRISE_TARGETS_PLACEHOLDER}+ onInput={(event) => {+ props.updateApprise({ targetsText: event.currentTarget.value });+ props.setHasUnsavedChanges(true);+ }}+ help={getAlertDestinationsAppriseTargetsHelp(props.config.mode)}+ />- <Show when={props.config.mode === 'cli'}>- <div class={formField}>- <label for={fieldIds.cliPath} class={labelClass('text-xs uppercase tracking-[0.08em]')}>- {ALERT_DESTINATIONS_APPRISE_CLI_PATH_LABEL}- </label>- <input- id={fieldIds.cliPath}- type="text"- value={props.config.cliPath}- class={formControl}- placeholder={ALERT_DESTINATIONS_APPRISE_CLI_PATH_PLACEHOLDER}- onInput={(event) => {- props.updateApprise({ cliPath: event.currentTarget.value });- props.setHasUnsavedChanges(true);- }}- />- <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_CLI_PATH_HELP}</p>- </div>- </Show>+ <DestinationSeveritySelect+ id={fieldIds.minimumSeverity}+ value={props.config.minimumSeverity ?? 'all'}+ onChange={(minimumSeverity) => {+ props.updateApprise({ minimumSeverity });+ props.setHasUnsavedChanges(true);+ }}+ />- <Show when={props.config.mode === 'http'}>- <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">- <div class={`${formField} sm:col-span-2`}>- <label- for={fieldIds.serverUrl}- class={labelClass('text-xs uppercase tracking-[0.08em]')}- >- {ALERT_DESTINATIONS_APPRISE_SERVER_URL_LABEL}- </label>- <input- id={fieldIds.serverUrl}- type="text"- value={props.config.serverUrl}- class={formControl}- placeholder={ALERT_DESTINATIONS_APPRISE_SERVER_URL_PLACEHOLDER}- onInput={(event) => {- props.updateApprise({ serverUrl: event.currentTarget.value });- props.setHasUnsavedChanges(true);- }}- />- <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_SERVER_URL_HELP}</p>- </div>- <div class={formField}>- <label- for={fieldIds.configKey}- class={labelClass('text-xs uppercase tracking-[0.08em]')}- >- {ALERT_DESTINATIONS_APPRISE_CONFIG_KEY_LABEL}- </label>- <input- id={fieldIds.configKey}- type="text"- value={props.config.configKey}- class={formControl}- placeholder={ALERT_DESTINATIONS_APPRISE_CONFIG_KEY_PLACEHOLDER}- onInput={(event) => {- props.updateApprise({ configKey: event.currentTarget.value });- props.setHasUnsavedChanges(true);- }}- />- <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_CONFIG_KEY_HELP}</p>- </div>- <div class={formField}>- <label- for={fieldIds.apiKey}- class={labelClass('text-xs uppercase tracking-[0.08em]')}- >- {ALERT_DESTINATIONS_APPRISE_API_KEY_LABEL}- </label>- <input- id={fieldIds.apiKey}- type="password"- value={props.config.apiKey}- class={formControl}- placeholder={- props.config.hasApiKey- ? ALERT_DESTINATIONS_APPRISE_API_KEY_SAVED_PLACEHOLDER- : ALERT_DESTINATIONS_APPRISE_API_KEY_PLACEHOLDER- }- autocomplete="new-password"- onInput={(event) => {- props.updateApprise({ apiKey: event.currentTarget.value });- props.setHasUnsavedChanges(true);- }}- />- <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_API_KEY_HELP}</p>- </div>+ <Show when={props.config.mode === 'cli'}><div class={formField}><label- for={fieldIds.apiKeyHeader}+ for={fieldIds.cliPath}class={labelClass('text-xs uppercase tracking-[0.08em]')}>- {ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_LABEL}+ {ALERT_DESTINATIONS_APPRISE_CLI_PATH_LABEL}</label><input- id={fieldIds.apiKeyHeader}+ id={fieldIds.cliPath}type="text"- value={props.config.apiKeyHeader}+ value={props.config.cliPath}class={formControl}- placeholder={ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_PLACEHOLDER}+ placeholder={ALERT_DESTINATIONS_APPRISE_CLI_PATH_PLACEHOLDER}onInput={(event) => {- props.updateApprise({ apiKeyHeader: event.currentTarget.value });+ props.updateApprise({ cliPath: event.currentTarget.value });props.setHasUnsavedChanges(true);}}/>- <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_HELP}</p>+ <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_CLI_PATH_HELP}</p></div>- <div class={`${formField} sm:col-span-2`}>- <span class={labelClass('text-xs uppercase tracking-[0.08em]')}>- {ALERT_DESTINATIONS_APPRISE_TLS_LABEL}- </span>- <Show when={props.config.skipTlsVerify}>- <TlsVerificationWarningBanner- class="mb-3"- subject="this Apprise API endpoint"- remediation="Install a trusted certificate on the Apprise server before using this in production."+ </Show>++ <Show when={props.config.mode === 'http'}>+ <div class="grid grid-cols-1 gap-4 sm:grid-cols-2">+ <div class={`${formField} sm:col-span-2`}>+ <label+ for={fieldIds.serverUrl}+ class={labelClass('text-xs uppercase tracking-[0.08em]')}+ >+ {ALERT_DESTINATIONS_APPRISE_SERVER_URL_LABEL}+ </label>+ <input+ id={fieldIds.serverUrl}+ type="text"+ value={props.config.serverUrl}+ class={formControl}+ placeholder={ALERT_DESTINATIONS_APPRISE_SERVER_URL_PLACEHOLDER}+ onInput={(event) => {+ props.updateApprise({ serverUrl: event.currentTarget.value });+ props.setHasUnsavedChanges(true);+ }}+ />+ <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_SERVER_URL_HELP}</p>+ </div>+ <div class={formField}>+ <label+ for={fieldIds.configKey}+ class={labelClass('text-xs uppercase tracking-[0.08em]')}+ >+ {ALERT_DESTINATIONS_APPRISE_CONFIG_KEY_LABEL}+ </label>+ <input+ id={fieldIds.configKey}+ type="text"+ value={props.config.configKey}+ class={formControl}+ placeholder={ALERT_DESTINATIONS_APPRISE_CONFIG_KEY_PLACEHOLDER}+ onInput={(event) => {+ props.updateApprise({ configKey: event.currentTarget.value });+ props.setHasUnsavedChanges(true);+ }}/>- </Show>- <label class="inline-flex items-center gap-2">+ <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_CONFIG_KEY_HELP}</p>+ </div>+ <div class={formField}>+ <label+ for={fieldIds.apiKey}+ class={labelClass('text-xs uppercase tracking-[0.08em]')}+ >+ {ALERT_DESTINATIONS_APPRISE_API_KEY_LABEL}+ </label><input- id={fieldIds.skipTlsVerify}- type="checkbox"- class="h-4 w-4 rounded-sm border border-border"- checked={props.config.skipTlsVerify}- onChange={(event) => {- props.updateApprise({ skipTlsVerify: event.currentTarget.checked });+ id={fieldIds.apiKey}+ type="password"+ value={props.config.apiKey}+ class={formControl}+ placeholder={+ props.config.hasApiKey+ ? ALERT_DESTINATIONS_APPRISE_API_KEY_SAVED_PLACEHOLDER+ : ALERT_DESTINATIONS_APPRISE_API_KEY_PLACEHOLDER+ }+ autocomplete="new-password"+ onInput={(event) => {+ props.updateApprise({ apiKey: event.currentTarget.value });props.setHasUnsavedChanges(true);}}/>- <span class="text-sm text-muted">- {ALERT_DESTINATIONS_APPRISE_TLS_CHECKBOX_LABEL}+ <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_API_KEY_HELP}</p>+ </div>+ <div class={formField}>+ <label+ for={fieldIds.apiKeyHeader}+ class={labelClass('text-xs uppercase tracking-[0.08em]')}+ >+ {ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_LABEL}+ </label>+ <input+ id={fieldIds.apiKeyHeader}+ type="text"+ value={props.config.apiKeyHeader}+ class={formControl}+ placeholder={ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_PLACEHOLDER}+ onInput={(event) => {+ props.updateApprise({ apiKeyHeader: event.currentTarget.value });+ props.setHasUnsavedChanges(true);+ }}+ />+ <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_API_KEY_HEADER_HELP}</p>+ </div>+ <div class={`${formField} sm:col-span-2`}>+ <span class={labelClass('text-xs uppercase tracking-[0.08em]')}>+ {ALERT_DESTINATIONS_APPRISE_TLS_LABEL}</span>- </label>- <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_TLS_HELP}</p>+ <Show when={props.config.skipTlsVerify}>+ <TlsVerificationWarningBanner+ class="mb-3"+ subject="this Apprise API endpoint"+ remediation="Install a trusted certificate on the Apprise server before using this in production."+ />+ </Show>+ <label class="inline-flex items-center gap-2">+ <input+ id={fieldIds.skipTlsVerify}+ type="checkbox"+ class="h-4 w-4 rounded-sm border border-border"+ checked={props.config.skipTlsVerify}+ onChange={(event) => {+ props.updateApprise({ skipTlsVerify: event.currentTarget.checked });+ props.setHasUnsavedChanges(true);+ }}+ />+ <span class="text-sm text-muted">+ {ALERT_DESTINATIONS_APPRISE_TLS_CHECKBOX_LABEL}+ </span>+ </label>+ <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_TLS_HELP}</p>+ </div></div>- </div>- </Show>+ </Show>- <div class={formField}>- <label for={fieldIds.timeout} class={labelClass('text-xs uppercase tracking-[0.08em]')}>- {ALERT_DESTINATIONS_APPRISE_TIMEOUT_LABEL}- </label>- <input- id={fieldIds.timeout}- type="number"- min="5"- max="120"- value={props.config.timeoutSeconds}- class={formControl}- onInput={(event) => {- const raw = event.currentTarget.valueAsNumber;- const safe = Number.isNaN(raw) ? 15 : Math.min(120, Math.max(5, Math.trunc(raw)));- props.updateApprise({ timeoutSeconds: safe });- props.setHasUnsavedChanges(true);- }}- />- <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_TIMEOUT_HELP}</p>+ <div class={formField}>+ <label for={fieldIds.timeout} class={labelClass('text-xs uppercase tracking-[0.08em]')}>+ {ALERT_DESTINATIONS_APPRISE_TIMEOUT_LABEL}+ </label>+ <input+ id={fieldIds.timeout}+ type="number"+ min="5"+ max="120"+ value={props.config.timeoutSeconds}+ class={formControl}+ onInput={(event) => {+ const raw = event.currentTarget.valueAsNumber;+ const safe = Number.isNaN(raw) ? 15 : Math.min(120, Math.max(5, Math.trunc(raw)));+ props.updateApprise({ timeoutSeconds: safe });+ props.setHasUnsavedChanges(true);+ }}+ />+ <p class={formHelpText}>{ALERT_DESTINATIONS_APPRISE_TIMEOUT_HELP}</p>+ </div></div>- </div>+ </Show></SettingsPanel>);}diff --git a/frontend-modern/src/features/alerts/AlertDestinationOffSummary.tsx b/frontend-modern/src/features/alerts/AlertDestinationOffSummary.tsxnew file mode 100644index 0000000000..6648cd5e5d--- /dev/null+++ b/frontend-modern/src/features/alerts/AlertDestinationOffSummary.tsx@@ -0,0 +1,28 @@+interface AlertDestinationOffSummaryProps {+ message: string;+ onShowSettings: () => void;+}++// A switched-off destination states what turning it on does in one line+// instead of rendering its whole form greyed out. The settings stay one click+// away without enabling the destination, so a saved but disabled setup can be+// inspected without marking the page as changed.+export function AlertDestinationOffSummary(props: AlertDestinationOffSummaryProps) {+ return (+ <div+ class="flex flex-wrap items-center justify-between gap-x-3 gap-y-1 text-sm text-muted"+ data-alert-destination-off+ >+ <span>{props.message}</span>+ <button+ type="button"+ class="min-h-11 text-sm font-medium text-blue-600 hover:underline sm:min-h-0 dark:text-blue-300"+ onClick={() => props.onShowSettings()}+ >+ {ALERT_DESTINATION_SHOW_SETTINGS_LABEL}+ </button>+ </div>+ );+}++export const ALERT_DESTINATION_SHOW_SETTINGS_LABEL = 'Show settings';diff --git a/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.tsx b/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.tsxindex b0ef160f86..563b8649fb 100644--- a/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.tsx+++ b/frontend-modern/src/features/alerts/AlertEmailDestinationsSection.tsx@@ -1,10 +1,12 @@-import { createUniqueId } from 'solid-js';+import { Show, createSignal, createUniqueId } from 'solid-js';import { EmailProviderSelect } from '@/components/Alerts/EmailProviderSelect';import { SettingsPanel } from '@/components/shared/SettingsPanel';import { Toggle } from '@/components/shared/Toggle';import type { UIEmailConfig } from './types';+import { AlertDestinationOffSummary } from './AlertDestinationOffSummary';import {+ ALERT_DESTINATIONS_EMAIL_OFF_MESSAGE,ALERT_DESTINATIONS_EMAIL_PANEL_DESCRIPTION,ALERT_DESTINATIONS_EMAIL_PANEL_TITLE,getAlertDestinationsStatusLabel,@@ -20,6 +22,14 @@ interface AlertEmailDestinationsSectionProps {export function AlertEmailDestinationsSection(props: AlertEmailDestinationsSectionProps) {const titleId = `alert-email-destinations-${createUniqueId()}-title`;+ const [showSettings, setShowSettings] = createSignal(false);+ let settingsRegion: HTMLDivElement | undefined;+ // The summary's button unmounts as the form renders, so hand keyboard focus+ // to the first revealed control instead of dropping it on the document.+ const revealSettings = () => {+ setShowSettings(true);+ settingsRegion?.querySelector<HTMLElement>('input, select, textarea, button')?.focus();+ };return (<SettingsPanel@@ -48,19 +58,30 @@ export function AlertEmailDestinationsSection(props: AlertEmailDestinationsSecticlass="min-w-0"bodyClass="">- <div- class={`${!props.config.enabled ? 'pointer-events-none opacity-50 transition-opacity' : 'transition-opacity'}`}+ <Show+ when={props.config.enabled || showSettings()}+ fallback={+ <AlertDestinationOffSummary+ message={ALERT_DESTINATIONS_EMAIL_OFF_MESSAGE}+ onShowSettings={revealSettings}+ />+ }>- <EmailProviderSelect- config={props.config}- onChange={(config) => {- props.setConfig(config);- props.setHasUnsavedChanges(true);- }}- onTest={props.onTest}- testing={props.testing}- />- </div>+ <div+ ref={settingsRegion}+ class={`${!props.config.enabled ? 'pointer-events-none opacity-50 transition-opacity' : 'transition-opacity'}`}+ >+ <EmailProviderSelect+ config={props.config}+ onChange={(config) => {+ props.setConfig(config);+ props.setHasUnsavedChanges(true);+ }}+ onTest={props.onTest}+ testing={props.testing}+ />+ </div>+ </Show></SettingsPanel>);}diff --git a/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsx b/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsxindex 2d3589247e..539fcf282e 100644--- a/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsx+++ b/frontend-modern/src/features/alerts/__tests__/DestinationsTab.recoveryediting.test.tsx@@ -137,6 +137,89 @@ describe('DestinationsTab recovery while editing SMTP', () => {vi.restoreAllMocks();});+ it('collapses switched-off email to one line and reveals settings without enabling it', async () => {+ const [emailConfig, setEmailConfig] = createSignal({ ...buildEmailConfig(), enabled: false });+ const [appriseConfig, setAppriseConfig] = createSignal(buildAppriseConfig());+ const dirty = vi.fn();+ render(() => (+ <DestinationsTab+ emailConfig={emailConfig}+ setEmailConfig={setEmailConfig}+ appriseConfig={appriseConfig}+ setAppriseConfig={setAppriseConfig}+ setHasUnsavedChanges={dirty}+ configLoadError={() => null}+ isRetrying={() => false}+ isLoadingDestinations={() => false}+ onRetryLoad={vi.fn()}+ webhooks={() => []}+ deadManPingUrl={() => ''}+ setDeadManPingUrl={vi.fn()}+ pushMinimumSeverity={() => 'all'}+ setPushMinimumSeverity={vi.fn()}+ />+ ));++ await screen.findByText('Off. Turn it on to send alerts by email through your SMTP server.');+ expect(screen.queryByRole('textbox', { name: 'SMTP server' })).toBeNull();++ const reveal = screen.getByRole('button', { name: 'Show settings' });+ reveal.focus();+ fireEvent.click(reveal);++ expect(screen.getByRole('textbox', { name: 'SMTP server' })).toBeInTheDocument();+ // The button unmounts, so focus lands on the first revealed control.+ expect(document.activeElement).not.toBe(document.body);+ expect(document.activeElement?.closest('[data-settings-panel]')).not.toBeNull();+ expect(emailConfig().enabled).toBe(false);+ expect(dirty).not.toHaveBeenCalled();+ });++ it.each([+ { health: 'healthy', logFirst: false },+ { health: 'degraded', logFirst: true },+ ] as const)(+ 'places delivery activity $health: before destinations only when delivery is degraded',+ async ({ health, logFirst }) => {+ if (health === 'healthy') {+ const healthy = degradedHealth();+ healthy.overallHealthy = true;+ healthy.queue.status = 'healthy';+ healthy.queue.healthy = true;+ vi.mocked(NotificationsAPI.getHealth).mockResolvedValue(healthy);+ }+ const [emailConfig, setEmailConfig] = createSignal(buildEmailConfig());+ const [appriseConfig, setAppriseConfig] = createSignal(buildAppriseConfig());+ render(() => (+ <DestinationsTab+ emailConfig={emailConfig}+ setEmailConfig={setEmailConfig}+ appriseConfig={appriseConfig}+ setAppriseConfig={setAppriseConfig}+ setHasUnsavedChanges={vi.fn()}+ configLoadError={() => null}+ isRetrying={() => false}+ isLoadingDestinations={() => false}+ onRetryLoad={vi.fn()}+ webhooks={() => []}+ deadManPingUrl={() => ''}+ setDeadManPingUrl={vi.fn()}+ pushMinimumSeverity={() => 'all'}+ setPushMinimumSeverity={vi.fn()}+ />+ ));++ const smtp = await screen.findByRole('textbox', { name: 'SMTP server' });+ if (logFirst) await screen.findByRole('button', { name: 'Retry retained deliveries' });+ const activity = await screen.findByText('SMTP fixture rejected');+ const activityFollowsSmtp = Boolean(+ smtp.compareDocumentPosition(activity) & Node.DOCUMENT_POSITION_FOLLOWING,+ );+ expect(activityFollowsSmtp).toBe(!logFirst);+ expect(screen.getAllByText('SMTP fixture rejected')).toHaveLength(1);+ },+ );+it.each(([diff --git a/frontend-modern/src/features/alerts/__tests__/useNotificationDeliveryHealth.test.tsx b/frontend-modern/src/features/alerts/__tests__/useNotificationDeliveryHealth.test.tsxindex 1016db6cd8..87d4df674f 100644--- a/frontend-modern/src/features/alerts/__tests__/useNotificationDeliveryHealth.test.tsx+++ b/frontend-modern/src/features/alerts/__tests__/useNotificationDeliveryHealth.test.tsx@@ -1,4 +1,4 @@-import { createRoot } from 'solid-js';+import { createEffect, createRoot } from 'solid-js';import { beforeEach, describe, expect, it, vi } from 'vitest';import { NotificationsAPI } from '@/api/notifications';@@ -64,6 +64,24 @@ describe('useNotificationDeliveryHealth', () => {dispose();}));+ it('never drops attention while a degraded queue becomes unreadable', () =>+ createRoot(async (dispose) => {+ vi.mocked(NotificationsAPI.getHealth).mockResolvedValueOnce(healthWith('degraded'));+ const state = useNotificationDeliveryHealth();+ await state.loadDeliveryHealth();++ const seen: boolean[] = [];+ createEffect(() => seen.push(state.deliveryNeedsAttention()));+ vi.mocked(NotificationsAPI.getHealth).mockRejectedValueOnce(new Error('network down'));+ await state.loadDeliveryHealth();++ // The snapshot and its availability flip together, so the warning (and+ // the delivery evidence mounted beside it) is never torn down mid-refresh.+ expect(seen).toEqual([true]);+ expect(state.deliveryHealthUnavailable()).toBe(true);+ dispose();+ }));+it('treats a queue the server reports as unavailable as needing attention', () =>createRoot(async (dispose) => {vi.mocked(NotificationsAPI.getHealth).mockResolvedValue(healthWith('unavailable'));diff --git a/frontend-modern/src/features/alerts/tabs/DestinationsTab.tsx b/frontend-modern/src/features/alerts/tabs/DestinationsTab.tsxindex 56fefd9c7c..2c1a804600 100644--- a/frontend-modern/src/features/alerts/tabs/DestinationsTab.tsx+++ b/frontend-modern/src/features/alerts/tabs/DestinationsTab.tsx@@ -32,6 +32,18 @@ export function DestinationsTab(props: DestinationsTabProps) {// Destinations configured here are inert while delivery is gated off, so the// pause has to be visible on this surface rather than only on the overview.const deliveryPaused = useAlertDeliveryPausedReason();+ const deliveryLog = () => (+ <AlertDeliveryLogCard+ log={state.deliveryLog()}+ unavailable={state.deliveryLogUnavailable()}+ refreshing={state.refreshingDeliveryLog()}+ onRefresh={() => void state.loadDeliveryLog()}+ webhooks={state.webhooks()}+ heldEvents={state.heldEvents()}+ heldEventsUnavailable={state.heldEventsUnavailable()}+ refreshingHeldEvents={state.refreshingHeldEvents()}+ />+ );return (<div class="flex w-full max-w-full flex-col gap-6 md:gap-8">@@ -61,19 +73,10 @@ export function DestinationsTab(props: DestinationsTabProps) {onRetryFailures={() => void state.retryTerminalFailures()}onDismissFailures={() => void state.dismissTerminalFailures()}/>+ {/* Degraded delivery keeps its evidence beside the recovery controls. */}+ {deliveryLog()}</Show>- <AlertDeliveryLogCard- log={state.deliveryLog()}- unavailable={state.deliveryLogUnavailable()}- refreshing={state.refreshingDeliveryLog()}- onRefresh={() => void state.loadDeliveryLog()}- webhooks={state.webhooks()}- heldEvents={state.heldEvents()}- heldEventsUnavailable={state.heldEventsUnavailable()}- refreshingHeldEvents={state.refreshingHeldEvents()}- />-<Show when={state.hasLoadError()}><AlertDestinationsLoadErrorCarderror={props.configLoadError() || state.webhookLoadError() || ''}@@ -82,6 +85,21 @@ export function DestinationsTab(props: DestinationsTabProps) {/></Show>+ {/*+ Unless delivery is degraded, destinations lead: "where do my alerts+ go" is the page's job. Webhooks (Discord, Telegram, ntfy, Gotify,+ Teams, Slack) come first because they are what most installs use, and+ delivery activity follows the destinations.+ */}+ <AlertWebhookDestinationsSection+ webhooks={state.webhooks()}+ addWebhook={state.addWebhook}+ updateWebhook={state.updateWebhook}+ deleteWebhook={state.deleteWebhook}+ testWebhook={state.testWebhook}+ testingWebhook={state.testingWebhook()}+ />+<AlertEmailDestinationsSectionconfig={props.emailConfig()}setConfig={props.setEmailConfig}@@ -98,14 +116,7 @@ export function DestinationsTab(props: DestinationsTabProps) {testing={state.testingApprise()}/>- <AlertWebhookDestinationsSection- webhooks={state.webhooks()}- addWebhook={state.addWebhook}- updateWebhook={state.updateWebhook}- deleteWebhook={state.deleteWebhook}- testWebhook={state.testWebhook}- testingWebhook={state.testingWebhook()}- />+ <Show when={!state.deliveryNeedsAttention()}>{deliveryLog()}</Show><AlertDeadManDestinationSectionpingUrl={props.deadManPingUrl}diff --git a/frontend-modern/src/features/alerts/useNotificationDeliveryHealth.ts b/frontend-modern/src/features/alerts/useNotificationDeliveryHealth.tsindex 0ba5733687..a98fdb4552 100644--- a/frontend-modern/src/features/alerts/useNotificationDeliveryHealth.ts+++ b/frontend-modern/src/features/alerts/useNotificationDeliveryHealth.ts@@ -1,4 +1,4 @@-import { createMemo, createSignal } from 'solid-js';+import { batch, createMemo, createSignal } from 'solid-js';import { NotificationsAPI, type NotificationHealth } from '@/api/notifications';import { notificationStore } from '@/stores/notifications';@@ -31,13 +31,20 @@ export function useNotificationDeliveryHealth(options?: {try {const health = await NotificationsAPI.getHealth();if (request !== latestHealthRequest) return;- setDeliveryHealth(health);- setDeliveryHealthUnavailable(health.queue.status === 'unavailable');+ // Snapshot and availability change together. Set one at a time and+ // deliveryNeedsAttention reads a half-updated pair (no health, not yet+ // unavailable), briefly unmounting the warning and everything it holds.+ batch(() => {+ setDeliveryHealth(health);+ setDeliveryHealthUnavailable(health.queue.status === 'unavailable');+ });} catch (error) {if (request !== latestHealthRequest) return;logger.error('Failed to load notification delivery health', error);- setDeliveryHealth(null);- setDeliveryHealthUnavailable(true);+ batch(() => {+ setDeliveryHealth(null);+ setDeliveryHealthUnavailable(true);+ });} finally {if (request === latestHealthRequest) {setLoadedOnce(true);diff --git a/frontend-modern/src/utils/__tests__/alertDestinationsPresentation.test.ts b/frontend-modern/src/utils/__tests__/alertDestinationsPresentation.test.tsindex ec04dbd576..a1eafd9511 100644--- a/frontend-modern/src/utils/__tests__/alertDestinationsPresentation.test.ts+++ b/frontend-modern/src/utils/__tests__/alertDestinationsPresentation.test.ts@@ -18,10 +18,12 @@ import {ALERT_DESTINATIONS_APPRISE_MISSING_TARGETS_ERROR,ALERT_DESTINATIONS_APPRISE_MISSING_SERVER_URL_ERROR,ALERT_DESTINATIONS_APPRISE_MODE_HELP,+ ALERT_DESTINATIONS_APPRISE_OFF_MESSAGE,ALERT_DESTINATIONS_APPRISE_PANEL_TITLE,ALERT_DESTINATIONS_APPRISE_TARGETS_PLACEHOLDER,ALERT_DESTINATIONS_APPRISE_TEST_FAILURE,ALERT_DESTINATIONS_APPRISE_TEST_SUCCESS,+ ALERT_DESTINATIONS_EMAIL_OFF_MESSAGE,ALERT_DESTINATIONS_EMAIL_PANEL_TITLE,ALERT_DESTINATIONS_EMAIL_TEST_FAILURE,ALERT_DESTINATIONS_EMAIL_TEST_SUCCESS,@@ -91,6 +93,13 @@ describe('alertDestinationsPresentation', () => {it('returns canonical destinations panel and apprise vocabulary', () => {expect(ALERT_DESTINATIONS_EMAIL_PANEL_TITLE).toBe('Email notifications');expect(ALERT_DESTINATIONS_APPRISE_PANEL_TITLE).toBe('Apprise notifications');+ // A switched-off destination says what turning it on does, in one line.+ expect(ALERT_DESTINATIONS_EMAIL_OFF_MESSAGE).toBe(+ 'Off. Turn it on to send alerts by email through your SMTP server.',+ );+ expect(ALERT_DESTINATIONS_APPRISE_OFF_MESSAGE).toBe(+ 'Off. Turn it on to relay alerts through the Apprise CLI or an Apprise API server.',+ );expect(getAlertDestinationsStatusLabel(true)).toBe('Enabled');expect(getAlertDestinationsStatusLabel(false)).toBe('Disabled');expect(getAlertDestinationsAppriseTestLabel(false)).toBe('Send test');diff --git a/frontend-modern/src/utils/__tests__/alertWebhookPresentation.branchcov0712b.test.ts b/frontend-modern/src/utils/__tests__/alertWebhookPresentation.branchcov0712b.test.tsindex c9bb39f770..2784b1c7a6 100644--- a/frontend-modern/src/utils/__tests__/alertWebhookPresentation.branchcov0712b.test.ts+++ b/frontend-modern/src/utils/__tests__/alertWebhookPresentation.branchcov0712b.test.ts@@ -235,7 +235,7 @@ describe('alertWebhookPresentation (branch coverage 2)', () => {describe('getAlertWebhooksSectionDescription', () => {it('returns the canonical section description', () => {expect(getAlertWebhooksSectionDescription()).toBe(- 'Push alerts to chat apps or automation systems.',+ 'Discord, Telegram, Slack, Teams, ntfy, Gotify, Pushover, PagerDuty or any HTTP endpoint.',);});});diff --git a/frontend-modern/src/utils/__tests__/alertWebhookPresentation.test.ts b/frontend-modern/src/utils/__tests__/alertWebhookPresentation.test.tsindex 12e73d18d4..19c396424e 100644--- a/frontend-modern/src/utils/__tests__/alertWebhookPresentation.test.ts+++ b/frontend-modern/src/utils/__tests__/alertWebhookPresentation.test.ts@@ -13,10 +13,18 @@ import {getAlertWebhookServiceLabelFromTemplates,getAlertWebhookTestFailure,getAlertWebhookTestSuccess,+ getAlertWebhooksSectionDescription,normalizeAlertWebhookCustomFields,} from '@/utils/alertWebhookPresentation';describe('alertWebhookPresentation', () => {+ it('names the services webhooks reach instead of the transport', () => {+ // Users look for Discord or Telegram, not "webhook".+ expect(getAlertWebhooksSectionDescription()).toBe(+ 'Discord, Telegram, Slack, Teams, ntfy, Gotify, Pushover, PagerDuty or any HTTP endpoint.',+ );+ });+it('advertises translation-ready generic webhook variables', () => {expect(ALERT_WEBHOOK_PAYLOAD_TEMPLATE_PLACEHOLDER).toContain('"message_key": "{{.MessageKey}}"',diff --git a/frontend-modern/src/utils/alertDestinationsPresentation.ts b/frontend-modern/src/utils/alertDestinationsPresentation.tsindex 64caa8b729..8df6da5c84 100644--- a/frontend-modern/src/utils/alertDestinationsPresentation.ts+++ b/frontend-modern/src/utils/alertDestinationsPresentation.ts@@ -20,6 +20,10 @@ export const ALERT_DESTINATIONS_EMAIL_PANEL_DESCRIPTION =export const ALERT_DESTINATIONS_APPRISE_PANEL_TITLE = 'Apprise notifications';export const ALERT_DESTINATIONS_APPRISE_PANEL_DESCRIPTION ='Relay grouped alerts through Apprise by using the CLI or a remote API.';+export const ALERT_DESTINATIONS_EMAIL_OFF_MESSAGE =+ 'Off. Turn it on to send alerts by email through your SMTP server.';+export const ALERT_DESTINATIONS_APPRISE_OFF_MESSAGE =+ 'Off. Turn it on to relay alerts through the Apprise CLI or an Apprise API server.';export const ALERT_DESTINATIONS_APPRISE_TEST_LABEL = 'Send test';export const ALERT_DESTINATIONS_APPRISE_TESTING_LABEL = 'Testing…';export const ALERT_DESTINATIONS_APPRISE_MODE_LABEL = 'Delivery mode';diff --git a/frontend-modern/src/utils/alertWebhookPresentation.ts b/frontend-modern/src/utils/alertWebhookPresentation.tsindex e41722ffd0..b8c1131b3e 100644--- a/frontend-modern/src/utils/alertWebhookPresentation.ts+++ b/frontend-modern/src/utils/alertWebhookPresentation.ts@@ -145,7 +145,8 @@ export const ALERT_WEBHOOK_TESTING_ASCII_LABEL = 'Testing...';export const ALERT_WEBHOOK_TEST_SUCCESS = 'Test webhook sent successfully!';export const ALERT_WEBHOOK_TEST_FAILURE = 'Failed to send test webhook';export const ALERT_WEBHOOKS_SECTION_TITLE = 'Webhooks';-export const ALERT_WEBHOOKS_SECTION_DESCRIPTION = 'Push alerts to chat apps or automation systems.';+export const ALERT_WEBHOOKS_SECTION_DESCRIPTION =+ 'Discord, Telegram, Slack, Teams, ntfy, Gotify, Pushover, PagerDuty or any HTTP endpoint.';export const ALERT_WEBHOOK_ADD_SUCCESS = 'Webhook added successfully';export const ALERT_WEBHOOK_ADD_FAILURE = 'Failed to add webhook';export const ALERT_WEBHOOK_UPDATE_SUCCESS = 'Webhook updated successfully';