windmill-components 1.70.0 → 1.77.0

package/components/flows/content/FlowModuleSleep.svelte

@@ -3,11 +3,10 @@ import Toggle from '../../Toggle.svelte';
 import Tooltip from '../../Tooltip.svelte';
 import { emptySchema } from '../../../utils';
 import { getContext } from 'svelte';
-import { flowStateStore } from '../flowState';
 import PropPickerWrapper from '../propPicker/PropPickerWrapper.svelte';
 export let flowModule;
 export let previousModuleId;
-const { selectedId } = getContext('FlowEditorContext');
+const { selectedId, flowStateStore } = getContext('FlowEditorContext');
 let schema = emptySchema();
 schema.properties['sleep'] = {
     type: 'number',
@@ -53,6 +52,7 @@ $: isSleepEnabled = Boolean(flowModule.sleep);
 				pickableProperties={undefined}
 				on:select={({ detail }) => {
 					editor?.insertAtCursor(detail)
+					editor?.focus()
 				}}
 			>
 				<InputTransformForm

package/components/flows/content/FlowModuleWrapper.svelte

@@ -6,12 +6,11 @@ import FlowBranchAllWrapper from './FlowBranchAllWrapper.svelte';
 import FlowBranchOneWrapper from './FlowBranchOneWrapper.svelte';
 import { createInlineScriptModule, pickFlow, pickScript } from '../flowStateUtils';
 import FlowInputs from './FlowInputs.svelte';
-import { flowStateStore } from '../flowState';
 import { Alert } from '../../common';
 import FlowInputsFlow from './FlowInputsFlow.svelte';
 import FlowBranchesAllWrapper from './FlowBranchesAllWrapper.svelte';
 import FlowBranchesOneWrapper from './FlowBranchesOneWrapper.svelte';
-const { selectedId, schedule } = getContext('FlowEditorContext');
+const { selectedId, schedule, flowStateStore } = getContext('FlowEditorContext');
 export let flowModule;
 // These pointers are used to easily access previewArgs of parent module, and previous module
 // Pointer to parent module, only defined within Branches or Loops.
@@ -30,12 +29,7 @@ export let previousModule = undefined;
 	{:else if flowModule.value.type === 'identity'}
 		{#if $selectedId == 'failure'}
 			<Alert type="info" title="Error handlers are triggered upon non recovered errors">
-				If defined, the error handler will take as input, the result of the step that errored (which
-				has its error in the 'error field').
-				<br />
-				<br />
-				Steps are retried until they succeed, or until the maximum number of retries defined for that
-				spec is reached, at which point the error handler is called.
+				If defined, the error handler will take the error as input.
 			</Alert>
 		{/if}
 

package/components/flows/content/FlowSchedules.svelte

@@ -3,8 +3,7 @@ import SchemaForm from '../../SchemaForm.svelte';
 import Toggle from '../../Toggle.svelte';
 import { emptyString } from '../../../utils';
 import { getContext } from 'svelte';
-import { flowStore } from '../flowStore';
-const { schedule } = getContext('FlowEditorContext');
+const { schedule, flowStore } = getContext('FlowEditorContext');
 </script>
 
 <CronInput bind:schedule={$schedule.cron} />

package/components/flows/content/FlowSettings.svelte

@@ -1,14 +1,12 @@
 <script>import Tabs from '../../common/tabs/Tabs.svelte';
 import Tab from '../../common/tabs/Tab.svelte';
 import TabContent from '../../common/tabs/TabContent.svelte';
-import { flowStore } from '../flowStore';
 import Path from '../../Path.svelte';
 import Required from '../../Required.svelte';
 import FlowCard from '../common/FlowCard.svelte';
 import FlowSchedules from './FlowSchedules.svelte';
 import Toggle from '../../Toggle.svelte';
 import { Alert } from '../../common';
-import { FlowGraph } from '../../graph';
 import { getContext } from 'svelte';
 import autosize from 'svelte-autosize';
 import Slider from '../../Slider.svelte';
@@ -17,9 +15,8 @@ import { workspaceStore } from '../../../stores';
 import { copyToClipboard } from '../../../utils';
 import { Icon } from 'svelte-awesome';
 import { faClipboard } from '@fortawesome/free-solid-svg-icons';
-const { selectedId } = getContext('FlowEditorContext');
+const { selectedId, flowStore } = getContext('FlowEditorContext');
 export let initialPath;
-let topHeight = 0;
 $: url = `${$page.url.hostname}/api/w/${$workspaceStore}/jobs/run/f/${$flowStore?.path}`;
 </script>
 
@@ -30,7 +27,6 @@ $: url = `${$page.url.hostname}/api/w/${$workspaceStore}/jobs/run/f/${$flowStore
 				<Tab value="settings-metadata">Metadata</Tab>
 				<Tab value="settings-schedule">Schedule</Tab>
 				<Tab value="settings-same-worker">Shared Directory</Tab>
-				<Tab value="settings-graph">Graph</Tab>
 
 				<svelte:fragment slot="content">
 					<TabContent value="settings-metadata" class="p-4 h-full">
@@ -82,18 +78,22 @@ $: url = `${$page.url.hostname}/api/w/${$workspaceStore}/jobs/run/f/${$flowStore
 											</a>
 										</li>
 										<li class="mt-2">
-											<div class="flex flex-row gap-2">
-												2. Use a trigger script and schedule this flow to run as frequently as
-												needed and compare a state persisted in Windmill to the state of the
-												external system. If a difference is detected, then the rest of the flow is
-												triggered. Oftentimes, the second step of a flow is a for-loop that will
-												iterate over every elements. When using a trigger, a default schedule will
-												be created.
-												<img
-													class="shadow-lg border rounded"
-													alt="static button"
-													src="/trigger_button.png"
-												/>
+											<div class="flex flex-col gap-2">
+												<p>
+													2. Use a trigger script and schedule this flow to run as frequently as
+													needed and compare a state persisted in Windmill to the state of the
+													external system. If a difference is detected, then the rest of the flow is
+													triggered. Oftentimes, the second step of a flow is a for-loop that will
+													iterate over every elements. When using a trigger, a default schedule will
+													be created.
+												</p>
+												<div>
+													<img
+														class="shadow-lg border rounded"
+														alt="static button"
+														src="/trigger_button.png"
+													/>
+												</div>
 											</div>
 										</li></ul
 									>
@@ -125,26 +125,6 @@ $: url = `${$page.url.hostname}/api/w/${$workspaceStore}/jobs/run/f/${$flowStore
 							}}
 						/>
 					</TabContent>
-					<TabContent value="settings-graph">
-						<div
-							bind:clientHeight={topHeight}
-							class="max-w-full w-full overflow-hidden h-screen bg-gray-50"
-						>
-							{#if $flowStore.value.modules}
-								<FlowGraph
-									on:click={(e) => {
-										if (e.detail.id) {
-											$selectedId = e.detail.id
-										}
-									}}
-									minHeight={topHeight}
-									modules={$flowStore.value.modules}
-									failureModule={$flowStore.value.failure_module}
-									notSelectable
-								/>
-							{/if}
-						</div>
-					</TabContent>
 				</svelte:fragment>
 			</Tabs>
 		</div>

package/components/flows/content/ScriptEditorDrawer.svelte

@@ -0,0 +1,98 @@
+<script>import { Button, Drawer, DrawerContent } from '../../common';
+import ScriptEditor from '../../ScriptEditor.svelte';
+import { ScriptService } from '../../../gen';
+import { inferArgs } from '../../../infer';
+import { workspaceStore } from '../../../stores';
+import { emptySchema, getScriptByPath, sendUserToast } from '../../../utils';
+import { faSave } from '@fortawesome/free-solid-svg-icons';
+import { Loader2 } from 'lucide-svelte';
+import { createEventDispatcher } from 'svelte';
+import { fade } from 'svelte/transition';
+let scriptEditorDrawer;
+const dispatch = createEventDispatcher();
+export async function openDrawer(hash, cb) {
+    script = undefined;
+    scriptEditorDrawer.openDrawer?.();
+    script = await ScriptService.getScriptByHash({
+        workspace: $workspaceStore,
+        hash
+    });
+    callback = cb;
+}
+let callback = undefined;
+let script = undefined;
+async function saveScript() {
+    if (script) {
+        try {
+            script.schema = script.schema ?? emptySchema();
+            try {
+                await inferArgs(script.language, script.content, script.schema);
+            }
+            catch (error) {
+                sendUserToast(`Impossible to infer the schema. Assuming this is a script without main function`, true);
+            }
+            await ScriptService.createScript({
+                workspace: $workspaceStore,
+                requestBody: {
+                    path: script.path,
+                    summary: script.summary,
+                    description: script.description ?? '',
+                    content: script.content,
+                    parent_hash: script.hash != '' ? script.hash : undefined,
+                    schema: script.schema,
+                    is_template: false,
+                    language: script.language,
+                    kind: script.kind
+                }
+            });
+            callback?.();
+        }
+        catch (error) {
+            sendUserToast(`Impossible to save the script: ${error.body}`, true);
+        }
+    }
+}
+</script>
+
+<Drawer bind:this={scriptEditorDrawer} size="1200px">
+	<DrawerContent
+		title="Script Editor"
+		noPadding
+		forceOverflowVisible
+		on:close={() => {
+			scriptEditorDrawer.closeDrawer()
+		}}
+	>
+		{#if script}
+			{#key script.hash}
+				<ScriptEditor
+					noSyncFromGithub
+					lang={script.language}
+					path={script.path}
+					fixedOverflowWidgets={false}
+					bind:code={script.content}
+					bind:schema={script.schema}
+				/>
+			{/key}
+		{:else}
+			<div
+				out:fade={{ duration: 200 }}
+				class="absolute inset-0 center-center flex-col bg-white text-gray-600 border"
+			>
+				<Loader2 class="animate-spin" size={16} />
+				<span class="text-xs mt-1">Loading</span>
+			</div>
+		{/if}
+		<svelte:fragment slot="actions">
+			<Button
+				on:click={async () => {
+					await saveScript()
+					dispatch('save')
+					scriptEditorDrawer.closeDrawer()
+				}}
+				disabled={!script}
+				startIcon={{ icon: faSave }}>Save</Button
+			>
+		</svelte:fragment>
+	</DrawerContent>
+</Drawer>

package/components/flows/content/ScriptEditorDrawer.svelte.d.ts

@@ -0,0 +1,19 @@
+import { SvelteComponentTyped } from "svelte";
+declare const __propDef: {
+    props: {
+        openDrawer?: ((hash: string, cb: () => void) => Promise<void>) | undefined;
+    };
+    events: {
+        save: CustomEvent<any>;
+    } & {
+        [evt: string]: CustomEvent<any>;
+    };
+    slots: {};
+};
+export type ScriptEditorDrawerProps = typeof __propDef.props;
+export type ScriptEditorDrawerEvents = typeof __propDef.events;
+export type ScriptEditorDrawerSlots = typeof __propDef.slots;
+export default class ScriptEditorDrawer extends SvelteComponentTyped<ScriptEditorDrawerProps, ScriptEditorDrawerEvents, ScriptEditorDrawerSlots> {
+    get openDrawer(): (hash: string, cb: () => void) => Promise<void>;
+}
+export {};

package/components/flows/flowState.d.ts

@@ -1,5 +1,6 @@
 import type { Schema } from '../../common';
 import type { Flow } from '../../gen';
+import type { Writable } from 'svelte/store';
 export type FlowModuleState = {
     schema: Schema;
     previewResult?: any;
@@ -11,6 +12,4 @@ export type FlowState = Record<string, FlowModuleState>;
  * It contains data loaded that are not contained in a Flow object i.e. schemas.
  * We also hold the data of the results of a test job, ran by the user.
  */
-export declare const flowStateStore: import("svelte/store").Writable<FlowState>;
-export declare const testStepStore: import("svelte/store").Writable<Record<string, any>>;
-export declare function initFlowState(flow: Flow): Promise<void>;
+export declare function initFlowState(flow: Flow, flowStateStore: Writable<FlowState>): Promise<void>;

package/components/flows/flowState.js

@@ -1,4 +1,3 @@
-import { writable } from 'svelte/store';
 import { loadFlowModuleState } from './flowStateUtils';
 import { emptyFlowModuleState } from './utils';
 /**
@@ -6,9 +5,7 @@ import { emptyFlowModuleState } from './utils';
  * It contains data loaded that are not contained in a Flow object i.e. schemas.
  * We also hold the data of the results of a test job, ran by the user.
  */
-export const flowStateStore = writable({});
-export const testStepStore = writable({});
-export async function initFlowState(flow) {
+export async function initFlowState(flow, flowStateStore) {
     const modulesState = {};
     await mapFlowModules(flow.value.modules, modulesState);
     const failureModule = flow.value.failure_module

package/components/flows/flowStateUtils.d.ts

@@ -1,11 +1,12 @@
 import type { Schema } from '../../common';
-import { Script, type FlowModule, type PathFlow, type PathScript, type RawScript } from '../../gen';
-import { type FlowModuleState } from './flowState';
+import { Script, type Flow, type FlowModule, type PathFlow, type PathScript, type RawScript } from '../../gen';
+import { type Writable } from 'svelte/store';
+import type { FlowModuleState, FlowState } from './flowState';
 import { Mutex } from 'async-mutex';
 export declare function loadFlowModuleState(flowModule: FlowModule): Promise<FlowModuleState>;
 export declare const idMutex: Mutex;
 export declare function getNextId(currentKeys: string[]): string;
-export declare function nextId(): string;
+export declare function nextId(flowState: FlowState): string;
 export declare function pickScript(path: string, summary: string, id: string, hash?: string): Promise<[FlowModule & {
     value: PathScript;
 }, FlowModuleState]>;
@@ -20,8 +21,8 @@ export declare function createFlow(id: string): Promise<[FlowModule, FlowModuleS
 export declare function fork(flowModule: FlowModule): Promise<[FlowModule & {
     value: RawScript;
 }, FlowModuleState]>;
-export declare function emptyModule(flow?: boolean): FlowModule;
-export declare function createScriptFromInlineScript(flowModule: FlowModule, suffix: string, schema: Schema): Promise<[FlowModule & {
+export declare function emptyModule(flowState: FlowState, flow?: boolean): FlowModule;
+export declare function createScriptFromInlineScript(flowModule: FlowModule, suffix: string, schema: Schema, flow: Flow): Promise<[FlowModule & {
     value: PathScript;
 }, FlowModuleState]>;
-export declare function deleteFlowStateById(id: string): void;
+export declare function deleteFlowStateById(id: string, flowStateStore: Writable<FlowState>): void;

package/components/flows/flowStateUtils.js

@@ -3,8 +3,6 @@ import { initialCode } from '../../script_helpers';
 import { userStore, workspaceStore } from '../../stores';
 import { getScriptByPath } from '../../utils';
 import { get } from 'svelte/store';
-import { flowStateStore } from './flowState';
-import { flowStore } from './flowStore';
 import { charsToNumber, emptyFlowModuleState, findNextAvailablePath, loadSchemaFromModule, NEVER_TESTED_THIS_FAR, numberToChars } from './utils';
 import { Mutex } from 'async-mutex';
 export async function loadFlowModuleState(flowModule) {
@@ -36,8 +34,7 @@ export function getNextId(currentKeys) {
     return numberToChars(max);
 }
 // Computes the next available id
-export function nextId() {
-    const flowState = get(flowStateStore);
+export function nextId(flowState) {
     const max = Object.keys(flowState).reduce((acc, key) => {
         if (key === 'failure' || key.includes('branch') || key.includes('loop')) {
             return acc;
@@ -145,14 +142,13 @@ async function createInlineScriptModuleFromPath(path, id) {
         }
     };
 }
-export function emptyModule(flow) {
+export function emptyModule(flowState, flow) {
     return {
-        id: nextId(),
+        id: nextId(flowState),
         value: { type: 'identity', flow }
     };
 }
-export async function createScriptFromInlineScript(flowModule, suffix, schema) {
-    const flow = get(flowStore);
+export async function createScriptFromInlineScript(flowModule, suffix, schema, flow) {
     const user = get(userStore);
     if (flowModule.value.type != 'rawscript') {
         throw new Error("Can't create script from non-inline script");
@@ -182,7 +178,7 @@ export async function createScriptFromInlineScript(flowModule, suffix, schema) {
     });
     return pickScript(availablePath, flowModule.summary ?? '', flowModule.id, hash);
 }
-export function deleteFlowStateById(id) {
+export function deleteFlowStateById(id, flowStateStore) {
     flowStateStore.update((fss) => {
         delete fss[id];
         return fss;

package/components/flows/flowStore.d.ts

@@ -1,7 +1,8 @@
 import type { Flow, FlowModule } from '../../gen';
+import { type Writable } from 'svelte/store';
+import { type FlowState } from './flowState';
 export type FlowMode = 'push' | 'pull';
-export declare const importFlowStore: import("svelte/store").Writable<Flow | undefined>;
-export declare const flowStore: import("svelte/store").Writable<Flow>;
+export declare const importFlowStore: Writable<Flow | undefined>;
 export declare function dfs<T>(modules: FlowModule[], f: (x: FlowModule) => T): T[];
-export declare function initFlow(flow: Flow): Promise<void>;
-export declare function copyFirstStepSchema(): Promise<void>;
+export declare function initFlow(flow: Flow, flowStore: Writable<Flow>, flowStateStore: Writable<FlowState>): Promise<void>;
+export declare function copyFirstStepSchema(flowState: FlowState, flowStore: Writable<Flow>): Promise<void>;

package/components/flows/flowStore.js

@@ -1,17 +1,7 @@
-import { sendUserToast } from '../../utils';
-import { get, writable, derived } from 'svelte/store';
-import { flowStateStore, initFlowState } from './flowState';
+import { get, writable } from 'svelte/store';
+import { initFlowState } from './flowState';
 import { numberToChars } from './utils';
 export const importFlowStore = writable(undefined);
-export const flowStore = writable({
-    summary: '',
-    value: { modules: [] },
-    path: '',
-    edited_at: '',
-    edited_by: '',
-    archived: false,
-    extra_perms: {}
-});
 export function dfs(modules, f) {
     let result = [];
     for (const module of modules) {
@@ -33,7 +23,7 @@ export function dfs(modules, f) {
     }
     return result;
 }
-export async function initFlow(flow) {
+export async function initFlow(flow, flowStore, flowStateStore) {
     let counter = 0;
     for (const mod of flow.value.modules) {
         migrateFlowModule(mod);
@@ -47,7 +37,7 @@ export async function initFlow(flow) {
             flowVal.modules.forEach(migrateFlowModule);
         }
     }
-    await initFlowState(flow);
+    await initFlowState(flow, flowStateStore);
     flowStore.set(flow);
     function migrateFlowModule(mod) {
         if (mod.id == undefined) {
@@ -75,8 +65,7 @@ export async function initFlow(flow) {
         }
     }
 }
-export async function copyFirstStepSchema() {
-    const flowState = get(flowStateStore);
+export async function copyFirstStepSchema(flowState, flowStore) {
     flowStore.update((flow) => {
         const firstModuleId = flow.value.modules[0]?.id;
         if (flowState[firstModuleId] && firstModuleId) {
@@ -93,5 +82,4 @@ export async function copyFirstStepSchema() {
         }
         return flow;
     });
-    sendUserToast('Copied first step schema as flow input schema');
 }

package/components/flows/header/FlowImportExportMenu.svelte

@@ -2,10 +2,11 @@
 import DrawerContent from '../../common/drawer/DrawerContent.svelte';
 import FlowViewer from '../../FlowViewer.svelte';
 import { faFileExport } from '@fortawesome/free-solid-svg-icons';
+import { getContext } from 'svelte';
 import Icon from 'svelte-awesome';
 import { Button } from '../../common';
-import { flowStore } from '../flowStore';
 import { cleanInputs } from '../utils';
+const { flowStore } = getContext('FlowEditorContext');
 let jsonViewerDrawer;
 </script>
 

package/components/flows/map/FlowConstantsItem.svelte

@@ -1,11 +1,11 @@
 <script>import { getContext } from 'svelte';
 import { classNames } from '../../../utils';
 import { DollarSign } from 'lucide-svelte';
-const { select, selectedId } = getContext('FlowEditorContext');
+const { selectedId } = getContext('FlowEditorContext');
 $: settingsClass = classNames('border w-full rounded-sm p-2 bg-white border-gray-400 text-sm cursor-pointer flex items-center', $selectedId == 'constants' ? 'outline outline-offset-1 outline-2  outline-slate-900' : '');
 </script>
 
-<button on:click={() => select('constants')} class={settingsClass}>
+<button on:click={() => ($selectedId = 'constants')} class={settingsClass}>
 	<DollarSign size={16} />
 	<span class="text-xs flex flex-row justify-between w-full gap-2 items-center truncate ml-1">
 		All Static Inputs

package/components/flows/map/FlowErrorHandlerItem.svelte

@@ -2,16 +2,14 @@
 import Icon from 'svelte-awesome';
 import { faBug } from '@fortawesome/free-solid-svg-icons';
 import { classNames, emptySchema } from '../../../utils';
-import { flowStateStore } from '../flowState';
 import Toggle from '../../Toggle.svelte';
-import { flowStore } from '../flowStore';
 import { NEVER_TESTED_THIS_FAR } from '../utils';
-const { select, selectedId } = getContext('FlowEditorContext');
+const { selectedId, flowStateStore, flowStore } = getContext('FlowEditorContext');
 function onToggle() {
     if ($flowStore?.value?.failure_module) {
         $flowStore.value.failure_module = undefined;
         // By default, we return to settings when disabling the failure module
-        select('settings-metadata');
+        $selectedId = 'settings-metadata';
     }
     else {
         const failureModule = {
@@ -23,7 +21,7 @@ function onToggle() {
             id: 'failure',
             value: { type: 'identity' }
         };
-        select('failure');
+        $selectedId = 'failure';
     }
 }
 </script>
@@ -32,34 +30,35 @@ function onToggle() {
 <div
 	on:click={() => {
 		if ($flowStore?.value?.failure_module) {
-			select('failure')
+			$selectedId = 'failure'
 		} else {
 			onToggle()
 		}
 	}}
 	class={classNames(
-		'border rounded-sm px-2 py-1 bg-white text-sm border-gray-400 cursor-pointer flex flex-col overflow-x-hidden ',
+		'border mx-auto rounded-sm px-2 py-1 bg-white text-sm border-gray-400 cursor-pointer flex justify-between items-center flex-row overflow-x-hidden ',
 		$selectedId?.includes('failure') ? 'outline outline-offset-1 outline-2 outline-slate-900' : ''
 	)}
+	style="min-width: 275px"
 >
 	<div class=" flex justify-between items-center flex-wrap">
 		<div>
 			<Icon data={faBug} class="mr-2" />
 			<span class="font-bold text-xs">Error handler</span>
 		</div>
-		<div class="-my-1">
-			<Toggle checked={Boolean($flowStore?.value?.failure_module)} on:change={onToggle} />
-		</div>
 	</div>
 
-	<div class="w-full truncate block">
+	<div class=" items-center truncate flex text-xs">
 		{#if Boolean($flowStore?.value?.failure_module)}
 			<span>
 				{$flowStore.value.failure_module?.summary ||
 					($flowStore.value.failure_module?.value.type === 'rawscript'
-						? `Inline ${$flowStore.value.failure_module?.value.language}`
-						: 'Select a script')}
+						? `${$flowStore.value.failure_module?.value.language}`
+						: 'TBD')}
 			</span>
 		{/if}
 	</div>
+	<div class="-my-1">
+		<Toggle checked={Boolean($flowStore?.value?.failure_module)} on:change={onToggle} />
+	</div>
 </div>

package/components/flows/map/FlowInputsItem.svelte

@@ -2,12 +2,11 @@
 import FlowModuleSchemaItem from './FlowModuleSchemaItem.svelte';
 import Icon from 'svelte-awesome';
 import { faFlagCheckered } from '@fortawesome/free-solid-svg-icons';
-const { select, selectedId } = getContext('FlowEditorContext');
+const { selectedId } = getContext('FlowEditorContext');
 </script>
 
 <FlowModuleSchemaItem
-	on:click={() => select('inputs')}
-	hasLine
+	on:click={() => ($selectedId = 'inputs')}
 	selected={$selectedId === 'inputs'}
 	bold
 	label="Flow Input"