{#if !shouldDisableTriggerScripts}
Scripts
{/if}
diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
new file mode 100644
index 0000000000..816f0589e2
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -0,0 +1,36 @@
+
+
+
+
+
+ {#if $flowStateStore.modules[index].flowModule.value.type === 'forloopflow'}
+ Iterator expression
+
+ Skip failures
+
+
+ {/if}
+
+
diff --git a/frontend/src/lib/components/flows/content/FlowModule.svelte b/frontend/src/lib/components/flows/content/FlowModule.svelte
new file mode 100644
index 0000000000..2d40f9b104
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowModule.svelte
@@ -0,0 +1,173 @@
+
+
+
+
+
+
+ apply(fork, flowModule)}
+ on:createScriptFromInlineScript={() => {
+ apply(createScriptFromInlineScript, {
+ flowModule: flowModule,
+ suffix: indexes,
+ schema
+ })
+ }}
+ />
+
+
+ {#if shouldPick}
+ 1 || i == 0}
+ on:loop={() => applyCreateLoop()}
+ on:pick={(e) => apply(pickScript, e.detail.path)}
+ on:new={(e) =>
+ apply(createInlineScriptModule, {
+ language: e.detail.language,
+ kind: e.detail.kind,
+ subkind: e.detail.subkind
+ })}
+ />
+ {:else}
+ {#if flowModule.value.type === 'rawscript'}
+
+
+
+ {/if}
+
+
+
+
+ {#if flowModule.value.type === 'rawscript'}
+ reload(flowModule)} class="h-full overflow-auto">
+ reload(flowModule)}
+ />
+
+ {/if}
+
+
+
+
+ Inputs
+ Test
+
+
+
+
+
+
+
+
+
diff --git a/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
new file mode 100644
index 0000000000..700e33c0ad
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowModuleHeader.svelte
@@ -0,0 +1,70 @@
+
+
+
undefined}>
+ {#if module.value.type === 'script' && !shouldPick}
+
+
+ {/if}
+
+ {#if module.value.type === 'rawscript' && !shouldPick}
+
+ {/if}
+
+
+
+
+ Script {'path' in module?.value ? module?.value.path : ''}
+
+
+
+
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
new file mode 100644
index 0000000000..3bbbffd14c
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
@@ -0,0 +1,48 @@
+
+
+{#if $flowStateStore.modules[parentIndex] && $flowStateStore.modules[parentIndex].childFlowModules !== undefined}
+ {#each $flowStateStore.modules[parentIndex].childFlowModules ?? [] as fa, index}
+ {#if index === childIndex}
+
{
+ $flowStateStore.modules[parentIndex].childFlowModules?.splice(index, 1)
+ $flowStateStore = $flowStateStore
+ }}
+ />
+ {/if}
+ {/each}
+{:else}
+ {#each $flowStateStore.modules ?? [] as fa, index}
+ {#if index === parentIndex}
+ {
+ $flowStateStore.modules.splice(index, 1)
+ $flowStateStore = $flowStateStore
+ }}
+ />
+ {/if}
+ {/each}
+{/if}
diff --git a/frontend/src/lib/components/flows/content/FlowSchedules.svelte b/frontend/src/lib/components/flows/content/FlowSchedules.svelte
new file mode 100644
index 0000000000..d4d4f9b544
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowSchedules.svelte
@@ -0,0 +1,20 @@
+
+
+
+
+
+
+
diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
new file mode 100644
index 0000000000..c6fc5bc5d5
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -0,0 +1,50 @@
+
+
+
+
+ Configuration
+ Schedule
+
+
+
+
+ Flow permissions depend on their path. Select the group
all
+ to share your flow, and
user to keep it private.
+
docs
+
+
+
+
+
+
+
+ select('settings-schedule')}
+ >
+ {$schedule?.enabled ? `Schedule: ${$schedule?.cron}` : 'Schedule disabled'}
+
+
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
new file mode 100644
index 0000000000..c0ece03827
--- /dev/null
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaItem.svelte
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+ {#if deletable}
+
+ {/if}
+
+
+ {#if prefix === undefined}
+ select('settings')}
+ class={classNames(
+ 'border w-full rounded-md p-2 bg-white text-sm cursor-pointer flex items-center mb-4',
+ $selectedId.includes('settings')
+ ? 'outline outline-offset-1 outline-2 outline-slate-900'
+ : ''
+ )}
+ >
+
+ Settings
+
+
+ select('inputs')}
+ isFirst
+ hasLine
+ selected={$selectedId === 'inputs'}
+ >
+
+
+
+
+ Inputs
+
+
+ {/if}
+
+ {#each flowModuleSchemas as flowModuleSchema, index (index)}
+
+ {#if flowModuleSchema.flowModule.value.type === 'forloopflow'}
+ -
+ removeAtIndex(index)}
+ on:click={() => select(['loop', String(index)].join('-'))}
+ selected={$selectedId === ['loop', String(index)].join('-')}
+ >
+
+ {index}
+
+
+ For loop
+
+
+
+
+
+
+ The loop's result is the list of every iteration's result.
+
+
+ {:else}
+ -
+ select([prefix, String(index)].filter(Boolean).join('-'))}
+ color={prefix ? 'orange' : 'blue'}
+ isFirst={index === 0}
+ isLast={index === flowModuleSchemas.length - 1}
+ selected={$selectedId === [prefix, String(index)].filter(Boolean).join('-')}
+ deletable
+ on:delete={() => removeAtIndex(index)}
+ >
+
+ {index}
+
+
+
+
+
+
+ {/if}
+ {/each}
+
+
+
+
+
diff --git a/frontend/src/lib/components/flows/stepOpenedStore.ts b/frontend/src/lib/components/flows/stepOpenedStore.ts
deleted file mode 100644
index 8317e061a7..0000000000
--- a/frontend/src/lib/components/flows/stepOpenedStore.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { writable } from 'svelte/store'
-import { scrollIntoView } from './utils'
-
-export const stepOpened = writable(undefined)
-
-stepOpened.subscribe((insertAt) => {
- setTimeout(() => scrollIntoView(document.querySelector(`#module-${insertAt}`)), 100)
-})
diff --git a/frontend/src/lib/components/flows/types.ts b/frontend/src/lib/components/flows/types.ts
new file mode 100644
index 0000000000..6b9e4de2bd
--- /dev/null
+++ b/frontend/src/lib/components/flows/types.ts
@@ -0,0 +1,9 @@
+import type { Writable } from 'svelte/store'
+import type { Schedule } from './scheduleUtils'
+
+export type FlowEditorContext = {
+ selectedId: Writable
+ select: (id: string) => void
+ schedule: Writable
+ path: string
+}
diff --git a/frontend/src/lib/components/flows/utils.ts b/frontend/src/lib/components/flows/utils.ts
index c3f1dd3a55..638ea14e2a 100644
--- a/frontend/src/lib/components/flows/utils.ts
+++ b/frontend/src/lib/components/flows/utils.ts
@@ -122,8 +122,9 @@ export function getDefaultExpr(
previousExpr?: string
) {
const expr = previousExpr ?? `previous_result.${key}`
- return `import { previous_result, flow_input, step, variable, resource, params } from 'windmill${importPath ? `@${importPath}` : ''
- }'
+ return `import { previous_result, flow_input, step, variable, resource, params } from 'windmill${
+ importPath ? `@${importPath}` : ''
+ }'
${expr}`
}
@@ -166,3 +167,14 @@ export function codeToStaticTemplate(code?: string): string | undefined {
}
return undefined
}
+
+export function getIndexes(parentIndex: number | undefined, childIndex: number): number[] {
+ const indexes: number[] = []
+
+ if (parentIndex !== undefined) {
+ indexes.push(parentIndex)
+ }
+ indexes.push(childIndex)
+
+ return indexes
+}
diff --git a/frontend/src/lib/script_helpers.ts b/frontend/src/lib/script_helpers.ts
index 6a2c35c1e3..884af165eb 100644
--- a/frontend/src/lib/script_helpers.ts
+++ b/frontend/src/lib/script_helpers.ts
@@ -63,15 +63,15 @@ func main(x string) (interface{}, error) {
export const DENO_INIT_CODE_CLEAR = `// import * as wmill from "https://deno.land/x/windmill@v${__pkg__.version}/mod.ts"
-export async function main() {
- return
+export async function main(x: string) {
+ return x
}
`
export const PYTHON_INIT_CODE_CLEAR = `#import wmill
-def main():
- return
+def main(x: str):
+ return x
`
export const POSTGRES_INIT_CODE = `import {
diff --git a/frontend/src/routes/__layout@root.svelte b/frontend/src/routes/__layout@root.svelte
index 649fe80bdb..0061ef30bd 100644
--- a/frontend/src/routes/__layout@root.svelte
+++ b/frontend/src/routes/__layout@root.svelte
@@ -136,7 +136,7 @@
)}
>
-
+
diff --git a/frontend/src/routes/flows/add.svelte b/frontend/src/routes/flows/add.svelte
index 3570b23c16..6822a7863b 100644
--- a/frontend/src/routes/flows/add.svelte
+++ b/frontend/src/routes/flows/add.svelte
@@ -8,7 +8,6 @@
-
-
-
+
diff --git a/frontend/src/routes/flows/edit/[...path].svelte b/frontend/src/routes/flows/edit/[...path].svelte
index bc4e5ba0db..0567a10633 100644
--- a/frontend/src/routes/flows/edit/[...path].svelte
+++ b/frontend/src/routes/flows/edit/[...path].svelte
@@ -14,7 +14,6 @@
import { workspaceStore } from '$lib/stores'
import { decodeState, emptySchema } from '$lib/utils'
import { initFlow } from '$lib/components/flows/flowStore'
- import CenteredPage from '$lib/components/CenteredPage.svelte'
const initialState = $page.url.searchParams.get('state')
let flowLoadedFromUrl = initialState != undefined ? decodeState(initialState) : undefined
@@ -54,6 +53,4 @@
}
-
-
-
+