From 7e31c3e34cfc1a3aa9491e634672f12e6c10be41 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 28 Aug 2023 15:59:49 +0200 Subject: [PATCH 1/3] fix: sent undefined arguments instead of empty string --- .../auth/templates/emailTemplate.svelte | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte index c7a4990f0..28400a253 100644 --- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte @@ -46,12 +46,12 @@ } await sdk.forConsole.projects.updateEmailTemplate( $project.$id, - $emailTemplate.type, - $emailTemplate.locale, - $emailTemplate.subject, - $emailTemplate.message, - $emailTemplate.senderName, - $emailTemplate.senderEmail, + $emailTemplate.type ?? undefined, + $emailTemplate.locale ?? undefined, + $emailTemplate.subject ?? undefined, + $emailTemplate.message ?? undefined, + $emailTemplate.senderName ?? undefined, + $emailTemplate.senderEmail ?? undefined, $emailTemplate.replyTo ? $emailTemplate.replyTo : undefined ); From ee40afbe7f817460d3c9c63feead71715ae4c575 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 28 Aug 2023 16:08:15 +0200 Subject: [PATCH 2/3] fix: remove duplicate code --- src/lib/stores/app.ts | 73 ------------------------------- src/routes/console/+layout.svelte | 3 +- 2 files changed, 2 insertions(+), 74 deletions(-) diff --git a/src/lib/stores/app.ts b/src/lib/stores/app.ts index 644e4cb1c..9e1ad8de7 100644 --- a/src/lib/stores/app.ts +++ b/src/lib/stores/app.ts @@ -1,7 +1,5 @@ import { browser } from '$app/environment'; -import { VARS } from '$lib/system'; import { derived, writable } from 'svelte/store'; -import type { Feedback } from './feedback'; export type AppStore = { theme: 'light' | 'dark' | 'auto'; @@ -19,77 +17,6 @@ export const iconPath = derived(app, ($app) => { }; }); -function createFeedbackStore() { - const { subscribe, update } = writable({ - elapsed: browser ? parseInt(localStorage.getItem('feedbackElapsed')) : 0, - visualized: browser ? parseInt(localStorage.getItem('feedbackVisualized')) : 0, - notification: false, - type: 'general', - show: false - }); - return { - subscribe, - update, - toggleFeedback: () => { - update((feedback) => { - feedback.show = !feedback.show; - return feedback; - }); - }, - toggleNotification: () => - update((feedback) => { - feedback.notification = !feedback.notification; - return feedback; - }), - switchType: (feedType: Feedback['type']) => - update((feedback) => { - feedback.type = feedType; - return feedback; - }), - addVisualization: () => - update((feedback) => { - feedback.visualized += 1; - localStorage.setItem('feedbackVisualized', feedback.visualized.toString()); - return feedback; - }), - - increaseElapsed: (time: number) => { - update((feedback) => { - feedback.elapsed += time; - localStorage.setItem('feedbackElapsed', feedback.elapsed.toString()); - return feedback; - }); - }, - submitFeedback: async ( - subject: string, - message: string, - firstname?: string, - email?: string, - value?: number - ) => { - if (!VARS.GROWTH_ENDPOINT) return; - const response = await fetch(`${VARS.GROWTH_ENDPOINT}/feedback`, { - method: 'POST', - headers: { - 'Content-Type': 'application/json' - }, - body: JSON.stringify({ - subject, - message, - email, - firstname: firstname ? firstname : undefined, - customFields: value ? [{ id: '40655', value }] : undefined - }) - }); - if (response.status >= 400) { - throw new Error('Failed to submit feedback'); - } - } - }; -} - -export const feedback = createFeedbackStore(); - if (browser) { app.update((n) => ({ ...n, diff --git a/src/routes/console/+layout.svelte b/src/routes/console/+layout.svelte index 51862a33d..c3bd1b938 100644 --- a/src/routes/console/+layout.svelte +++ b/src/routes/console/+layout.svelte @@ -6,7 +6,7 @@ import Header from '$lib/layout/header.svelte'; import SideNavigation from '$lib/layout/navigation.svelte'; import Shell from '$lib/layout/shell.svelte'; - import { app, feedback } from '$lib/stores/app'; + import { app } from '$lib/stores/app'; import { log } from '$lib/stores/logs'; import { newOrgModal } from '$lib/stores/organization'; import { wizard } from '$lib/stores/wizard'; @@ -24,6 +24,7 @@ import { openMigrationWizard } from './(migration-wizard)'; import { project } from './project-[project]/store'; import { sdk } from '$lib/stores/sdk'; + import { feedback } from '$lib/stores/feedback'; function kebabToSentenceCase(str: string) { return str From 63f9e77b8407c314dd1d975d9c932289d2f824d4 Mon Sep 17 00:00:00 2001 From: Arman Date: Mon, 28 Aug 2023 16:23:59 +0200 Subject: [PATCH 3/3] fix: templates empty strings --- .../auth/templates/emailTemplate.svelte | 20 ++++++++++--------- .../settings/smtp/+page.svelte | 14 ++++++------- 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte index 28400a253..6a02b14cc 100644 --- a/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte +++ b/src/routes/console/project-[project]/auth/templates/emailTemplate.svelte @@ -46,12 +46,12 @@ } await sdk.forConsole.projects.updateEmailTemplate( $project.$id, - $emailTemplate.type ?? undefined, - $emailTemplate.locale ?? undefined, - $emailTemplate.subject ?? undefined, - $emailTemplate.message ?? undefined, - $emailTemplate.senderName ?? undefined, - $emailTemplate.senderEmail ?? undefined, + $emailTemplate.type ? $emailTemplate.type : undefined, + $emailTemplate.locale ? $emailTemplate.locale : undefined, + $emailTemplate.subject ? $emailTemplate.subject : undefined, + $emailTemplate.message ? $emailTemplate.message : undefined, + $emailTemplate.senderName ? $emailTemplate.senderName : undefined, + $emailTemplate.senderEmail ? $emailTemplate.senderEmail : undefined, $emailTemplate.replyTo ? $emailTemplate.replyTo : undefined ); @@ -76,6 +76,8 @@ } $: isButtonDisabled = deepEqual($emailTemplate, $baseEmailTemplate); + + $: isSmtpEnabled = $project.smtpEnabled; @@ -96,14 +98,14 @@ bind:value={$emailTemplate.senderName} tooltip="Set up an SMTP server to edit the sender name" placeholder={'{{project}}'} - readonly={!$project.smtpEnabled} /> + readonly={!isSmtpEnabled} /> + readonly={!isSmtpEnabled} /> {#if $$slots.default}
  • @@ -129,7 +131,7 @@ label="Message" placeholder="Enter your message" tooltip="Set up an SMTP server to edit the message body" - readonly={!$project.smtpEnabled} /> + readonly={!isSmtpEnabled} />
    diff --git a/src/routes/console/project-[project]/settings/smtp/+page.svelte b/src/routes/console/project-[project]/settings/smtp/+page.svelte index aa2c6670a..cfe276fa4 100644 --- a/src/routes/console/project-[project]/settings/smtp/+page.svelte +++ b/src/routes/console/project-[project]/settings/smtp/+page.svelte @@ -58,13 +58,13 @@ await sdk.forConsole.projects.updateSmtpConfiguration( $project.$id, enabled, - senderName ?? undefined, - senderEmail ?? undefined, - replyTo ?? undefined, - host ?? undefined, - port ?? undefined, - username ?? undefined, - password ?? undefined, + senderName ? senderName : undefined, + senderEmail ? senderEmail : undefined, + replyTo ? replyTo : undefined, + host ? host : undefined, + port ? port : undefined, + username ? username : undefined, + password ? password : undefined, secure ? 'tls' : undefined );