windmill-components 1.677.1 → 1.687.0

package/package/components/flows/flowTree.test.js

@@ -0,0 +1,236 @@
+import { describe, expect, it } from 'vitest';
+import { collectAllFlowModuleIds, collectAllFlowModuleIdsFromModules, collectFlowNodes, ensureModuleArrayByLocation, findFlowNode, findModuleInFlow, findModuleInModules, findModuleParent, getModuleArrayContainer, removeFlowModule, replaceFlowModule } from './flowTree';
+function makeRawModule(id) {
+    return {
+        id,
+        summary: id,
+        value: { type: 'rawscript', content: '', language: 'python3', input_transforms: {} }
+    };
+}
+function makeFlowModuleTool(module) {
+    return {
+        id: module.id,
+        summary: module.summary,
+        value: {
+            tool_type: 'flowmodule',
+            ...module.value
+        }
+    };
+}
+function makeAiAgent(id, tools) {
+    return {
+        id,
+        summary: id,
+        value: {
+            type: 'aiagent',
+            tools,
+            input_transforms: {}
+        }
+    };
+}
+function makeMcpTool(id) {
+    return {
+        id,
+        summary: id,
+        value: {
+            tool_type: 'mcp',
+            resource_path: ''
+        }
+    };
+}
+describe('flowTree', () => {
+    it('returns the root container for top-level modules', () => {
+        const first = makeRawModule('first');
+        const second = makeRawModule('second');
+        const flow = {
+            modules: [first, second]
+        };
+        expect(findModuleParent(flow, 'second')).toEqual({ type: 'root', index: 1 });
+        expect(findModuleInFlow(flow, 'second')).toBe(second);
+        expect(getModuleArrayContainer(flow, 'second')).toEqual({
+            index: 1,
+            modules: flow.modules
+        });
+    });
+    it('returns nested branch containers from the live flow tree', () => {
+        const nested = makeRawModule('nested');
+        const branch = makeRawModule('branch');
+        const flow = {
+            modules: [
+                {
+                    id: 'router',
+                    summary: 'router',
+                    value: {
+                        type: 'branchone',
+                        default: [nested],
+                        branches: [{ expr: 'true', modules: [branch] }],
+                        input_transforms: {}
+                    }
+                }
+            ]
+        };
+        expect(findModuleParent(flow, 'nested')).toEqual({
+            type: 'branchone-default',
+            parentId: 'router',
+            index: 0
+        });
+        expect(getModuleArrayContainer(flow, 'branch')).toEqual({
+            index: 0,
+            modules: ((flow.modules?.[0].value).branches[0].modules ?? [])
+        });
+    });
+    it('returns ai agent tool containers as mutable flow module arrays', () => {
+        const lookup = makeFlowModuleTool(makeRawModule('lookup_user'));
+        const sum = makeFlowModuleTool(makeRawModule('sum'));
+        const agent = makeAiAgent('agent', [lookup, sum]);
+        const agentTools = (agent.value.tools ?? []);
+        const flow = {
+            modules: [agent]
+        };
+        const match = findFlowNode(flow, 'sum');
+        const container = getModuleArrayContainer(flow, 'sum');
+        expect(match).toMatchObject({
+            location: { type: 'aiagent', parentId: 'agent', index: 1 }
+        });
+        expect(findModuleInFlow(flow, 'sum')).toBe(sum);
+        expect(container).toEqual({
+            index: 1,
+            modules: agentTools
+        });
+        container?.modules.splice(container.index, 1);
+        expect(agentTools.map((module) => module.id)).toEqual(['lookup_user']);
+    });
+    it('finds ai agent flowmodule tools inside a plain modules array', () => {
+        const tool = makeFlowModuleTool(makeRawModule('sum'));
+        const flowModules = [makeAiAgent('agent', [tool])];
+        expect(findModuleInModules(flowModules, 'sum')).toBe(tool);
+    });
+    it('skips non-flowmodule ai agent tools in module traversal', () => {
+        const lookup = makeFlowModuleTool(makeRawModule('lookup_user'));
+        const agent = makeAiAgent('agent', [lookup, makeMcpTool('search_docs')]);
+        const flow = {
+            modules: [agent]
+        };
+        expect(findModuleInModules(flow.modules ?? [], 'search_docs')).toBeUndefined();
+        expect(findModuleInFlow(flow, 'search_docs')).toBeNull();
+        expect(collectFlowNodes(flow).map((entry) => entry.module.id)).toEqual(['agent', 'lookup_user']);
+    });
+    it('returns special modules without pretending they belong to an array container', () => {
+        const failure = makeRawModule('failure');
+        const preprocessor = makeRawModule('preprocessor');
+        const flow = {
+            modules: [],
+            failure_module: failure,
+            preprocessor_module: preprocessor
+        };
+        expect(findModuleParent(flow, 'failure')).toEqual({ type: 'failure', index: -1 });
+        expect(findModuleParent(flow, 'preprocessor')).toEqual({
+            type: 'preprocessor',
+            index: -1
+        });
+        expect(findModuleInFlow(flow, 'failure')).toBe(failure);
+        expect(findModuleInFlow(flow, 'preprocessor')).toBe(preprocessor);
+        expect(getModuleArrayContainer(flow, 'failure')).toBeNull();
+        expect(getModuleArrayContainer(flow, 'preprocessor')).toBeNull();
+    });
+    it('removes nested ai agent tools from the real stored tools array', () => {
+        const lookup = makeFlowModuleTool(makeRawModule('lookup_user'));
+        const sum = makeFlowModuleTool(makeRawModule('sum'));
+        const agent = makeAiAgent('agent', [lookup, sum]);
+        const flow = {
+            modules: [agent]
+        };
+        const removed = removeFlowModule(flow, 'sum');
+        expect(removed?.id).toBe('sum');
+        expect((agent.value.tools ?? []).map((module) => module.id)).toEqual([
+            'lookup_user'
+        ]);
+    });
+    it('replaces module content while preserving the original object reference', () => {
+        const original = makeRawModule('sum');
+        const replacement = makeRawModule('sum');
+        replacement.value.content = 'updated';
+        const result = replaceFlowModule(original, replacement);
+        expect(result).toBe(original);
+        expect(original.value.content).toBe('updated');
+    });
+    it('collectAllFlowModuleIds includes all aiagent tool IDs including non-flowmodule', () => {
+        const lookup = makeFlowModuleTool(makeRawModule('lookup_user'));
+        const mcp = makeMcpTool('search_docs');
+        const agent = makeAiAgent('agent', [lookup, mcp]);
+        const failure = makeRawModule('failure');
+        const flow = {
+            modules: [makeRawModule('step_a'), agent],
+            failure_module: failure
+        };
+        const ids = collectAllFlowModuleIds(flow);
+        // Should include ALL tool IDs (both flowmodule and MCP)
+        expect(ids).toContain('step_a');
+        expect(ids).toContain('agent');
+        expect(ids).toContain('lookup_user');
+        expect(ids).toContain('search_docs');
+        expect(ids).toContain('failure');
+        expect(ids).toHaveLength(5);
+    });
+    it('collectAllFlowModuleIdsFromModules works without special modules', () => {
+        const agent = makeAiAgent('agent', [
+            makeFlowModuleTool(makeRawModule('sum')),
+            makeMcpTool('websearch')
+        ]);
+        const ids = collectAllFlowModuleIdsFromModules([agent]);
+        expect(ids).toEqual(['agent', 'sum', 'websearch']);
+    });
+    it('collectFlowNodes excludes non-flowmodule tools (MCP)', () => {
+        // Verify that collectFlowNodes still filters non-flowmodule tools
+        const lookup = makeFlowModuleTool(makeRawModule('lookup_user'));
+        const mcp = makeMcpTool('search_docs');
+        const agent = makeAiAgent('agent', [lookup, mcp]);
+        const flow = { modules: [agent] };
+        const nodeIds = collectFlowNodes(flow).map((n) => n.module.id);
+        expect(nodeIds).toContain('agent');
+        expect(nodeIds).toContain('lookup_user');
+        expect(nodeIds).not.toContain('search_docs');
+    });
+    it('recreates a missing branch container from the source flow location', () => {
+        const nested = makeRawModule('nested');
+        const beforeFlow = {
+            modules: [
+                {
+                    id: 'router',
+                    summary: 'router',
+                    value: {
+                        type: 'branchone',
+                        default: [],
+                        branches: [{ expr: 'true', modules: [nested] }],
+                        input_transforms: {}
+                    }
+                }
+            ]
+        };
+        const targetFlow = {
+            modules: [
+                {
+                    id: 'router',
+                    summary: 'router',
+                    value: {
+                        type: 'branchone',
+                        default: [],
+                        branches: [],
+                        input_transforms: {}
+                    }
+                }
+            ]
+        };
+        const recreatedContainer = ensureModuleArrayByLocation(targetFlow, {
+            type: 'branchone-branch',
+            parentId: 'router',
+            branchIndex: 0,
+            index: 0
+        }, beforeFlow);
+        expect(recreatedContainer).toEqual([]);
+        expect(((targetFlow.modules?.[0].value).branches ?? [])[0]).toMatchObject({
+            expr: 'true',
+            modules: []
+        });
+    });
+});

package/package/components/flows/map/FlowJobsMenu.svelte

@@ -94,8 +94,7 @@ $effect(() => {
 					class={twMerge(
 						'text-xs bg-surface border-[1px] border-gray-300 dark:border-gray-500 focus:outline-none',
 						'hover:bg-surface-hover focus:ring-4 focus:ring-surface-selected font-medium rounded-sm w-[40px] gap-1 h-[20px]',
-						'flex items-center justify-center',
-						flowJobsSuccess?.[selected] == false ? 'text-red-400' : 'text-secondary'
+						'flex items-center justify-center text-secondary'
 					)}
 					meltElement={trigger}
 				>
@@ -113,34 +112,41 @@ $effect(() => {
 					<div class="max-h-[300px]">
 						{#key items}
 							{#if items.length > 0}
-							<VirtualList height={300} width="100%" itemCount={items.length} itemSize={24}>
-								{#snippet header()}{/snippet}
-								{#snippet footer()}{/snippet}
-								{#snippet item({ index: idx, style })}
-									<div {style}>
-										<MenuItem
-											class={twMerge(
-												'text-primary text-xs w-full text-left py-1 pl-2 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center',
-												items[idx].success == false ? 'text-red-400' : '',
-												'data-[highlighted]:bg-surface-hover',
-												items[idx].index == selected ? 'bg-surface-selected' : ''
-											)}
-											onClick={() => {
-												onSelectedIteration?.({
-													moduleId: moduleId,
-													index: items[idx].index,
-													id: items[idx].id,
-													manuallySet: true
-												})
-												menu?.close()
-											}}
-											item={childrenItem}
-										>
-											#{items[idx].index + 1}
-										</MenuItem>
-									</div>
-								{/snippet}
-							</VirtualList>
+								<VirtualList height={300} width="100%" itemCount={items.length} itemSize={24}>
+									{#snippet header()}{/snippet}
+									{#snippet footer()}{/snippet}
+									{#snippet item({ index: idx, style })}
+										<div {style}>
+											<MenuItem
+												class={twMerge(
+													'text-primary text-xs w-full text-left py-1 pl-2 hover:bg-surface-hover whitespace-nowrap flex flex-row gap-2 items-center',
+													'data-[highlighted]:bg-surface-hover',
+													items[idx].index == selected ? 'bg-surface-selected' : ''
+												)}
+												onClick={() => {
+													onSelectedIteration?.({
+														moduleId: moduleId,
+														index: items[idx].index,
+														id: items[idx].id,
+														manuallySet: true
+													})
+													menu?.close()
+												}}
+												item={childrenItem}
+											>
+												<span
+													class="inline-block w-2 h-2 rounded-full shrink-0 {items[idx].success ===
+													true
+														? 'bg-green-500'
+														: items[idx].success === false
+															? 'bg-red-500'
+															: 'bg-yellow-400'}"
+												></span>
+												#{items[idx].index + 1}
+											</MenuItem>
+										</div>
+									{/snippet}
+								</VirtualList>
 							{:else}
 								<div class="text-xs text-tertiary py-2 px-2">No iterations</div>
 							{/if}

package/package/components/flows/map/FlowModuleSchemaItem.svelte

@@ -443,7 +443,7 @@ let historyOpen = $derived.by(() => outputPickerInner?.getHistoryOpen?.() ?? fal
 			onmouseleave={() => (hover = false)}
 		>
 			{#if !isMultiSelected && (hover || selected || testRunDropdownOpen) && outputPickerVisible}
-				<div class="bg-surface rounded-md" transition:fade={{ duration: 100 }}>
+				<div class="bg-surface rounded-md" transition:fade={{ duration: 100 }} data-run-button={id}>
 					{#if !testIsLoading}
 						<Button
 							size="xs"