diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs index 88429d0035..d4f3a53668 100644 --- a/backend/windmill-api/src/settings.rs +++ b/backend/windmill-api/src/settings.rs @@ -56,10 +56,10 @@ pub async fn test_email( require_super_admin(&db, &authed.email).await?; let smtp = test_email.smtp; let to = test_email.to; - let client = SmtpClientBuilder::new(smtp.host, smtp.port) + let mut client = SmtpClientBuilder::new(smtp.host, smtp.port) .implicit_tls(smtp.tls_implicit.unwrap_or(false)); if std::env::var("ACCEPT_INVALID_CERTS").is_ok() { - client.allow_invalid_certs(); + client = client.allow_invalid_certs(); } let client = if let (Some(username), Some(password)) = (smtp.username, smtp.password) { if !username.is_empty() { diff --git a/frontend/src/lib/components/Dev.svelte b/frontend/src/lib/components/Dev.svelte index b90160eed5..c02fef0756 100644 --- a/frontend/src/lib/components/Dev.svelte +++ b/frontend/src/lib/components/Dev.svelte @@ -311,7 +311,7 @@ } } - let mode: 'script' | 'flow' = 'flow' //'script' + let mode: 'script' | 'flow' = 'script' const flowStore = writable({ summary: '', @@ -375,10 +375,10 @@ initialPath: '' }) - $: updateCode($flowStore) + $: updateFlow($flowStore) let lastSent: OpenFlow | undefined = undefined - function updateCode(flow: OpenFlow) { + function updateFlow(flow: OpenFlow) { if (lockChanges) { return } diff --git a/frontend/src/lib/components/ModulePreview.svelte b/frontend/src/lib/components/ModulePreview.svelte index da7749eddb..91531113b8 100644 --- a/frontend/src/lib/components/ModulePreview.svelte +++ b/frontend/src/lib/components/ModulePreview.svelte @@ -23,8 +23,9 @@ export let schema: Schema export let pickableProperties: PickableProperties | undefined export let lang: Script.language - export let editor: Editor - export let diffEditor: DiffEditor + export let editor: Editor | undefined + export let diffEditor: DiffEditor | undefined + export let noEditor = false const { flowStore, flowStateStore, testStepStore, pathStore } = getContext('FlowEditorContext') @@ -35,7 +36,7 @@ let testJob: Job | undefined = undefined let stepArgs: Record | undefined = Object.fromEntries( - Object.keys(schema.properties).map((k) => [ + Object.keys(schema.properties ?? {}).map((k) => [ k, evalValue(k, mod, $testStepStore, pickableProperties, false) ]) @@ -89,6 +90,7 @@ jobDone()} bind:this={testJobLoader} bind:isLoading={testIsLoading} diff --git a/frontend/src/lib/components/TestJobLoader.svelte b/frontend/src/lib/components/TestJobLoader.svelte index 746c8bb111..c0dacbeaac 100644 --- a/frontend/src/lib/components/TestJobLoader.svelte +++ b/frontend/src/lib/components/TestJobLoader.svelte @@ -5,12 +5,14 @@ import type { Preview } from '$lib/gen/models/Preview' import { createEventDispatcher } from 'svelte' import type { SupportedLanguage } from '$lib/common' + import { sendUserToast } from '$lib/toast' export let isLoading = false export let job: Job | undefined = undefined export let workspaceOverride: string | undefined = undefined export let notfound = false export let jobUpdateLastFetch: Date | undefined = undefined + export let toastError = false const dispatch = createEventDispatcher() @@ -48,6 +50,9 @@ } return testId } catch (err) { + if (toastError) { + sendUserToast(err.body, true) + } // if error happens on submitting the job, reset UI state so the user can try again isLoading = false currentId = undefined diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte index f550dff29a..bb2240a77f 100644 --- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte +++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte @@ -346,6 +346,7 @@ mod={flowModule} {editor} {diffEditor} + {noEditor} lang={flowModule.value['language'] ?? 'deno'} schema={$flowStateStore[$selectedId]?.schema ?? {}} />