From 60728b4a4de795ea5bd80a84700b88589d21c818 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Fri, 23 Feb 2024 17:11:24 -0800 Subject: [PATCH 1/3] fix(messaging): fix SMTP provider's Encryption option population for None --- .../messaging/providers/provider-[provider]/+page.svelte | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte index e6e4f4a55..139723fc4 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/+page.svelte @@ -112,7 +112,9 @@ fromEmail: $providerData.options['fromEmail'], replyToName: $providerData.options['replyToName'], replyToEmail: $providerData.options['replyToEmail'], - encryption: $providerData.options['encryption'], + encryption: !$providerData.options['encryption'] + ? 'none' + : $providerData.options['encryption'], autoTLS: $providerData.options['autoTLS'], mailer: $providerData.options['mailer'] }; From 4aac6c4415a2e627693063f5ab76e5f37a534864 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Fri, 23 Feb 2024 17:11:57 -0800 Subject: [PATCH 2/3] fix(messaging): fix update SMTP provider updating incorrect param --- .../providers/provider-[provider]/updateSettings.svelte | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte index 5693f8ad4..8d0d0c26c 100644 --- a/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte +++ b/src/routes/console/project-[project]/messaging/providers/provider-[provider]/updateSettings.svelte @@ -152,11 +152,11 @@ formValues['password'] || undefined, formValues['encryption'], formValues['autoTLS'], + undefined, formValues['fromName'] || undefined, formValues['fromEmail'], formValues['replyToName'] || undefined, - formValues['replyToEmail'] || undefined, - undefined + formValues['replyToEmail'] || undefined ); break; case Providers.FCM: From d63efc0b0dc66b5a40ce62e4ef943fbaa7828c11 Mon Sep 17 00:00:00 2001 From: Steven Nguyen Date: Fri, 23 Feb 2024 17:14:13 -0800 Subject: [PATCH 3/3] fix(messaging): update SMTP provider fields based on design review - Use checkbox for autoTLS - Add popover for mailer field - Update description for autoTLS - Update placeholder for host field --- .../providers/settingsFormList.svelte | 7 ++++++ .../messaging/providers/store.ts | 23 +++++++++++++++---- 2 files changed, 25 insertions(+), 5 deletions(-) diff --git a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte index 470a3beb1..582ce00c0 100644 --- a/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte +++ b/src/routes/console/project-[project]/messaging/providers/settingsFormList.svelte @@ -10,6 +10,7 @@ InputText, InputPassword } from '$lib/elements/forms'; + import InputCheckbox from '$lib/elements/forms/inputCheckbox.svelte'; import PopoverContent from './popoverContent.svelte'; import type { ProviderInput, @@ -122,6 +123,12 @@ {input.description} + {:else if input.type === 'checkbox'} + + + {input.description} + + {:else if input.type === 'select'} ([ export type ProviderInput = { label: string; name: string; - type: 'text' | 'password' | 'phone' | 'email' | 'domain' | 'file' | 'switch' | 'select'; + type: + | 'text' + | 'password' + | 'phone' + | 'email' + | 'domain' + | 'file' + | 'switch' + | 'select' + | 'checkbox'; placeholder?: string; description?: string; popover?: string[]; @@ -311,7 +320,7 @@ export const providers: ProvidersMap = { label: 'Server host', name: 'host', type: 'text', - placeholder: 'Enter host' + placeholder: 'smtp.server.com' }, { label: 'Server port', @@ -347,8 +356,8 @@ export const providers: ProvidersMap = { { label: 'Auto TLS', name: 'autoTLS', - description: 'Automatically uses TLS encryption', - type: 'switch', + description: 'Automatically uses TLS encryption if available.', + type: 'checkbox', optional: true }, { @@ -356,7 +365,11 @@ export const providers: ProvidersMap = { name: 'mailer', type: 'text', optional: true, - placeholder: 'Enter mailer' + placeholder: 'Enter mailer', + popover: [ + 'What is the Mailer?', + 'The value to use for the X-Mailer header.' + ] } ] }