windmill-components 1.406.5 → 1.407.2

package/package/components/flows/content/FlowInputsQuick.svelte

@@ -320,7 +320,7 @@ onDestroy(() => {
 						}
 
 						dispatch('new', {
-							kind: 'script',
+							kind: selectedKind,
 							inlineScript: {
 								language: lang == 'docker' ? 'bash' : lang,
 								kind: selectedKind,

package/package/components/flows/content/FlowModuleComponent.svelte

@@ -324,7 +324,7 @@ function setFlowInput(argName) {
 							class={advancedSelected === 'runtime' ? 'h-[calc(100%-68px)]' : 'h-[calc(100%-34px)]'}
 						>
 							{#if selected === 'inputs' && (flowModule.value.type == 'rawscript' || flowModule.value.type == 'script' || flowModule.value.type == 'flow')}
-								<div class="h-full overflow-auto" id="flow-editor-step-input">
+								<div class="h-full overflow-auto px-2" id="flow-editor-step-input">
 									<PropPickerWrapper
 										pickableProperties={stepPropPicker.pickableProperties}
 										error={failureModule}

package/package/components/flows/map/FlowModuleSchemaMap.svelte

@@ -54,20 +54,25 @@ async function insertNewModuleAtIndex(modules, index, kind, wsScript, wsFlow, in
         [module, state] = await createBranchAll(module.id);
     }
     $flowStateStore[module.id] = state;
-    if (kind == 'trigger') {
-        module.summary = 'Trigger';
-    }
-    else if (kind == 'approval') {
-        module.summary = 'Approval';
-    }
-    else if (kind == 'end') {
-        module.summary = 'Terminate flow';
-        module.stop_after_if = { skip_if_stopped: false, expr: 'true' };
-    }
     if (inlineScript) {
         const { language, kind, subkind } = inlineScript;
         [module, state] = await createInlineScriptModule(language, kind, subkind, module.id, module.summary);
         $flowStateStore[module.id] = state;
+        if (kind == 'trigger') {
+            module.summary = 'Trigger';
+        }
+        else if (kind == 'approval') {
+            module.summary = 'Approval';
+        }
+    }
+    if (kind == 'approval') {
+        module.suspend = { required_events: 1 };
+    }
+    else if (kind == 'trigger') {
+        module.stop_after_if = {
+            expr: '!result || (Array.isArray(result) && result.length == 0)',
+            skip_if_stopped: true
+        };
     }
     if (!modules)
         return [module];
@@ -180,6 +185,12 @@ async function updateFlowInputsStore() {
         };
     }
 }
+function setExpr(module, expr) {
+    if (module.value.type == 'forloopflow') {
+        module.value.iterator = { type: 'javascript', expr };
+        module.value.parallel = true;
+    }
+}
 </script>
 
 <Portal name="flow-module">
@@ -275,7 +286,7 @@ async function updateFlowInputsStore() {
 				} else if (shouldRunTutorial('branchall', detail.detail, 3)) {
 					flowTutorials?.runTutorialById('branchall')
 				} else {
-					if (detail.modules) {
+					if (detail.modules && Array.isArray(detail.modules)) {
 						await tick()
 						if ($moving) {
 							push(history, $flowStore)
@@ -289,19 +300,33 @@ async function updateFlowInputsStore() {
 								insertNewPreprocessorModule(detail.inlineScript, detail.script)
 								$selectedId = 'preprocessor'
 							} else {
+								const index = detail.index ?? 0
 								await insertNewModuleAtIndex(
 									detail.modules,
-									detail.index ?? 0,
+									index,
 									detail.kind,
 									detail.script,
 									detail.flow,
 									detail.inlineScript
 								)
-								$selectedId = detail.modules[detail.index ?? 0].id
+								const id = detail.modules[detail.index ?? 0].id
+								$selectedId = id
+
+								if (detail.kind == 'trigger') {
+									await insertNewModuleAtIndex(
+										detail.modules,
+										index + 1,
+										'forloop',
+										undefined,
+										undefined,
+										undefined
+									)
+									setExpr(detail.modules[index + 1], `results.${id}`)
+								}
 							}
 						}
 
-						if (['branchone', 'branchall'].includes(detail.detail)) {
+						if (['branchone', 'branchall'].includes(detail.kind)) {
 							await addBranch(detail.modules[detail.index ?? 0])
 						}
 						$flowStateStore = $flowStateStore

package/package/components/flows/pickers/WorkspaceScriptPickerQuick.svelte

@@ -58,7 +58,7 @@ function onKeyDown(e) {
             dispatch('pickFlow', { path: item.path });
         }
         else {
-            dispatch('pickScript', { path: item.path, hash: lockHash ? item.hash : undefined });
+            dispatch('pickScript', { path: item.path, hash: lockHash ? item.hash : undefined, kind });
         }
     }
 }
@@ -90,7 +90,7 @@ function onKeyDown(e) {
 						if (kind == 'flow') {
 							dispatch('pickFlow', { path: path })
 						} else {
-							dispatch('pickScript', { path: path, hash: lockHash ? hash : undefined })
+							dispatch('pickScript', { path: path, hash: lockHash ? hash : undefined, kind })
 						}
 					}}
 				>

package/package/components/graph/renderers/edges/BaseEdge.svelte

@@ -40,7 +40,6 @@ const { useDataflow } = getContext('FlowGraphContext');
 				allowTrigger={data.enableTrigger}
 				modules={data?.modules ?? []}
 				on:new={(e) => {
-					// console.log('new', e)
 					data?.eventHandlers.insert({
 						modules: data.modules,
 						index: data.index,
@@ -53,7 +52,8 @@ const { useDataflow } = getContext('FlowGraphContext');
 					data?.eventHandlers.insert({
 						modules: data.modules,
 						index: data.index,
-						script: e.detail
+						script: e.detail,
+						kind: e.detail.kind
 					})
 				}}
 				on:pickFlow={(e) => {
@@ -87,7 +87,8 @@ const { useDataflow } = getContext('FlowGraphContext');
 						data?.eventHandlers.insert({
 							modules: data.modules,
 							index: data.index,
-							script: e.detail
+							script: e.detail,
+							kind: e.detail.kind
 						})
 					}}
 					on:pickFlow={(e) => {

package/package/script_helpers.d.ts

@@ -7,6 +7,7 @@ export declare const INITIAL_CODE: {
         approval: string;
         failure: string;
         preprocessor: string;
+        clear: string;
     };
     python3: {
         script: string;
@@ -14,6 +15,7 @@ export declare const INITIAL_CODE: {
         approval: string;
         failure: string;
         preprocessor: string;
+        clear: string;
     };
     deno: {
         script: string;
@@ -22,6 +24,7 @@ export declare const INITIAL_CODE: {
         failure: string;
         preprocessor: string;
         fetch: string;
+        clear: string;
     };
     go: {
         script: string;

package/package/script_helpers.js

@@ -638,14 +638,16 @@ export const INITIAL_CODE = {
         trigger: BUN_INIT_CODE_TRIGGER,
         approval: BUN_INIT_CODE_APPROVAL,
         failure: BUN_FAILURE_MODULE_CODE,
-        preprocessor: BUN_PREPROCESSOR_MODULE_CODE
+        preprocessor: BUN_PREPROCESSOR_MODULE_CODE,
+        clear: BUN_INIT_CODE_CLEAR
     },
     python3: {
         script: PYTHON_INIT_CODE,
         trigger: PYTHON_INIT_CODE_TRIGGER,
         approval: PYTHON_INIT_CODE_APPROVAL,
         failure: PYTHON_FAILURE_MODULE_CODE,
-        preprocessor: PYTHON_PREPROCESSOR_MODULE_CODE
+        preprocessor: PYTHON_PREPROCESSOR_MODULE_CODE,
+        clear: PYTHON_INIT_CODE_CLEAR
     },
     deno: {
         script: DENO_INIT_CODE,
@@ -653,7 +655,8 @@ export const INITIAL_CODE = {
         approval: DENO_INIT_CODE_APPROVAL,
         failure: DENO_FAILURE_MODULE_CODE,
         preprocessor: DENO_PREPROCESSOR_MODULE_CODE,
-        fetch: FETCH_INIT_CODE
+        fetch: FETCH_INIT_CODE,
+        clear: DENO_INIT_CODE_CLEAR
     },
     go: {
         script: GO_INIT_CODE,
@@ -723,7 +726,7 @@ export function initialCode(language, kind, subkind) {
         }
         else if (kind === 'script') {
             if (subkind === 'flow') {
-                return INITIAL_CODE.deno.script;
+                return INITIAL_CODE.deno.clear;
             }
             else if (subkind === 'pgsql') {
                 return INITIAL_CODE.postgresql.script;
@@ -762,7 +765,7 @@ export function initialCode(language, kind, subkind) {
             return INITIAL_CODE.python3.failure;
         }
         else if (subkind === 'flow') {
-            return INITIAL_CODE.python3.script;
+            return INITIAL_CODE.python3.clear;
         }
         else if (subkind === 'preprocessor') {
             return INITIAL_CODE.python3.preprocessor;
@@ -829,7 +832,7 @@ export function initialCode(language, kind, subkind) {
             return INITIAL_CODE.bun.preprocessor;
         }
         else if (subkind === 'flow') {
-            return INITIAL_CODE.bun.script;
+            return INITIAL_CODE.bun.clear;
         }
         return INITIAL_CODE.bun.script;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.406.5",
+	"version": "1.407.2",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",