From 082b7381a7269e024fd4a4996b31ecc99312ed2d Mon Sep 17 00:00:00 2001 From: HugoCasa Date: Thu, 12 Dec 2024 00:31:45 +0100 Subject: [PATCH] fix(frontend): form and content update when script is emptied (#4887) * fix(frontend): form and content update when script is emptied * fix no schema on init --- frontend/src/lib/components/Editor.svelte | 11 ++++++----- frontend/src/lib/components/ScriptBuilder.svelte | 6 ++---- frontend/src/lib/components/WorkerGroup.svelte | 1 - 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte index ba23b76fdc..e3d14e158f 100644 --- a/frontend/src/lib/components/Editor.svelte +++ b/frontend/src/lib/components/Editor.svelte @@ -210,7 +210,6 @@ export let folding = false export let args: Record | undefined = undefined export let useWebsockets: boolean = true - export let listenEmptyChanges = false export let small = false export let scriptLang: Preview['language'] | 'bunnative' export let disabled: boolean = false @@ -413,6 +412,10 @@ } } + export function getScriptLang(): string | undefined { + return scriptLang + } + let command: Disposable | undefined = undefined let sqlTypeCompletor: Disposable | undefined = undefined @@ -1147,10 +1150,8 @@ timeoutModel && clearTimeout(timeoutModel) timeoutModel = setTimeout(() => { let ncode = getCode() - if (ncode != '' || listenEmptyChanges) { - code = ncode - dispatch('change', code) - } + code = ncode + dispatch('change', code) }, 500) ataModel && clearTimeout(ataModel) diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte index 3b9fddf6cf..5e299226e3 100644 --- a/frontend/src/lib/components/ScriptBuilder.svelte +++ b/frontend/src/lib/components/ScriptBuilder.svelte @@ -221,7 +221,7 @@ scriptEditor?.disableCollaboration() script.content = initialCode(language, kind, template) scriptEditor?.inferSchema(script.content, language) - if (script.content != editor?.getCode()) { + if (script.content != editor?.getCode() && editor?.getScriptLang() == language) { setCode(script.content) } } @@ -647,9 +647,7 @@ Triggers - + Configure how this script will be triggered. diff --git a/frontend/src/lib/components/WorkerGroup.svelte b/frontend/src/lib/components/WorkerGroup.svelte index 100468fb26..b87513cb8a 100644 --- a/frontend/src/lib/components/WorkerGroup.svelte +++ b/frontend/src/lib/components/WorkerGroup.svelte @@ -823,7 +823,6 @@ scriptLang={'bash'} useWebsockets={false} fixedOverflowWidgets={false} - listenEmptyChanges code={config?.init_bash ?? ''} on:change={(e) => { if (config) {