diff --git a/cli/conf.ts b/cli/conf.ts index 14de9bcdda..e2a4c1cdbf 100644 --- a/cli/conf.ts +++ b/cli/conf.ts @@ -63,5 +63,5 @@ export async function mergeConfigWithConfigFile( opts: T ): Promise { const configFile = await readConfigFile(); - return Object.assign(configFile, opts); + return Object.assign(configFile ?? {}, opts); } diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte index f09e9cb4a8..2cd9f2d5e0 100644 --- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte +++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte @@ -146,7 +146,10 @@ } } let inputTransformSchemaForm: InputTransformSchemaForm | undefined = undefined + + let reloadError: string | undefined = undefined async function reload(flowModule: FlowModule) { + reloadError = undefined try { const { input_transforms, schema } = await loadSchemaFromModule(flowModule) validCode = true @@ -189,6 +192,7 @@ } } catch (e) { validCode = false + reloadError = e?.message } } @@ -477,6 +481,12 @@ error={failureModule} noPadding > + {#if reloadError} +
+ {/if}