windmill-components 1.433.0 → 1.434.1

package/package/components/FlowStatusViewerInner.svelte

@@ -67,36 +67,42 @@ function onFlowModuleId() {
     }
 }
 function updateModuleStates(moduleState, key, newValue, keepType) {
-    moduleState.update((x) => {
-        if (newValue.selectedForloop != undefined &&
-            x[key]?.selectedForloop != undefined &&
-            newValue.selectedForloop != x[key].selectedForloop) {
-            if (newValue.type == 'InProgress') {
-                x[key].type = 'InProgress';
-            }
-            return x;
-        }
-        if (x[key]?.selectedForLoopSetManually) {
-            if (newValue.selectedForloop != undefined &&
-                x[key]?.selectedForloop != newValue.selectedForloop) {
-                return x;
-            }
-            else {
-                newValue.selectedForLoopSetManually = true;
-                newValue.selectedForloopIndex = x[key]?.selectedForloopIndex;
-                newValue.selectedForloop = x[key]?.selectedForloop;
-            }
+    const state = get(moduleState);
+    if (newValue.selectedForloop != undefined &&
+        state[key]?.selectedForloop != undefined &&
+        newValue.selectedForloop != state[key].selectedForloop) {
+        if (newValue.type == 'InProgress' && state[key]?.type != 'InProgress') {
+            moduleState.update((state) => {
+                state[key].type = 'InProgress';
+                return state;
+            });
         }
-        else if (x[key]?.selectedForloopIndex != undefined) {
-            newValue.selectedForloopIndex = x[key]?.selectedForloopIndex;
-            newValue.selectedForloop = x[key]?.selectedForloop;
+        return;
+    }
+    if (state[key]?.selectedForLoopSetManually) {
+        if (newValue.selectedForloop != undefined &&
+            state[key]?.selectedForloop != newValue.selectedForloop) {
+            return state;
         }
-        if (keepType && (x[key]?.type == 'Success' || x[key]?.type == 'Failure')) {
-            newValue.type = x[key].type;
+        else {
+            newValue.selectedForLoopSetManually = true;
+            newValue.selectedForloopIndex = state[key]?.selectedForloopIndex;
+            newValue.selectedForloop = state[key]?.selectedForloop;
         }
-        x[key] = newValue;
-        return x;
-    });
+    }
+    else if (state[key]?.selectedForloopIndex != undefined) {
+        newValue.selectedForloopIndex = state[key]?.selectedForloopIndex;
+        newValue.selectedForloop = state[key]?.selectedForloop;
+    }
+    if (keepType && (state[key]?.type == 'Success' || state[key]?.type == 'Failure')) {
+        newValue.type = state[key].type;
+    }
+    if (!deepEqual(state[key], newValue)) {
+        moduleState.update((state) => {
+            state[key] = newValue;
+            return state;
+        });
+    }
 }
 function buildSubflowKey(key, prefix) {
     return prefix ? 'subflow:' + prefix + key : key;
@@ -114,7 +120,6 @@ async function refresh(clearLoop, rootJob) {
                     return x;
                 });
             }
-            console.log(rootJob);
             if (subflowParentsGlobalModuleStates.length > 0) {
                 subflowParentsGlobalModuleStates?.[subflowParentsGlobalModuleStates?.length - 1]?.update((x) => {
                     for (let mod of innerModules ?? []) {
@@ -470,28 +475,39 @@ function onJobsLoaded(mod, job, force) {
 }
 async function setIteration(j, id, clicked, modId, isForloop) {
     if (modId) {
-        if (clicked) {
-            await globalRefreshes?.[modId]?.(true, id);
+        let globalState = globalModuleStates?.[globalModuleStates?.length - 1];
+        let globalStateGet = globalState ? get(globalState) : undefined;
+        let state = globalStateGet?.[modId];
+        if (clicked && state?.selectedForloop) {
+            await globalRefreshes?.[modId]?.(true, state.selectedForloop);
         }
-        globalModuleStates?.[globalModuleStates?.length - 1]?.update((topLevelModuleStates) => {
-            let state = topLevelModuleStates?.[modId];
-            if (state) {
-                let manualOnce = state.selectedForLoopSetManually;
-                if (clicked ||
-                    (!manualOnce &&
-                        (state == undefined || !isForloop || j >= (state.selectedForloopIndex ?? -1)))) {
-                    let setManually = clicked || manualOnce;
+        let manualOnce = state?.selectedForLoopSetManually;
+        if (clicked ||
+            (!manualOnce &&
+                (state == undefined || !isForloop || j >= (state.selectedForloopIndex ?? -1)))) {
+            let setManually = clicked || manualOnce;
+            let newState = {
+                ...(state ?? {}),
+                selectedForloop: id,
+                selectedForloopIndex: j,
+                selectedForLoopSetManually: setManually
+            };
+            const selectedNotEqual = id != state?.selectedForloop ||
+                j != state?.selectedForloopIndex ||
+                setManually != state?.selectedForLoopSetManually;
+            if (selectedNotEqual) {
+                console.log('not equal');
+                globalState?.update((topLevelModuleStates) => {
                     topLevelModuleStates[modId] = {
-                        ...(topLevelModuleStates[modId] ?? {}),
-                        selectedForloop: id,
-                        selectedForloopIndex: j,
-                        selectedForLoopSetManually: setManually ?? false
+                        type: 'WaitingForPriorSteps',
+                        args: {},
+                        ...newState
                     };
+                    return topLevelModuleStates;
                     // clicked && callGlobRefresh(modId, {index: j, job: id, selectedManually: setManually ?? false})
-                }
+                });
             }
-            return topLevelModuleStates;
-        });
+        }
         if (clicked) {
             await globalRefreshes?.[modId]?.(false, id);
         }
@@ -1033,7 +1049,12 @@ function allModulesForTimeline(modules, expandedSubflows) {
 								let detail = e.detail
 								if (detail.manuallySet) {
 									let rootJobId = detail.id
-									await globalRefreshes?.[detail.moduleId]?.(true, rootJobId)
+									await tick()
+
+									let previousId = $localModuleStates[detail.moduleId]?.selectedForloop
+									if (previousId) {
+										await globalRefreshes?.[detail.moduleId]?.(true, previousId)
+									}
 
 									$localModuleStates[detail.moduleId] = {
 										...$localModuleStates[detail.moduleId],

package/package/components/apps/editor/AppEditorHeader.svelte

@@ -22,7 +22,7 @@ import PanelSection from './settingsPanel/common/PanelSection.svelte';
 import PreviewToggle from './PreviewToggle.svelte';
 import ToggleButtonGroup from '../../common/toggleButton-v2/ToggleButtonGroup.svelte';
 import ToggleButton from '../../common/toggleButton-v2/ToggleButton.svelte';
-import UnsavedConfirmationModal from '../../common/confirmationModal/UnsavedConfirmationModal.svelte';
+// import UnsavedConfirmationModal from '../../common/confirmationModal/UnsavedConfirmationModal.svelte'
 import Tooltip from '../../Tooltip.svelte';
 import { Sha256 } from '@aws-crypto/sha256-js';
 import { sendUserToast } from '../../../toast';
@@ -726,7 +726,7 @@ setTheme($app?.darkMode);
 <svelte:window on:keydown={onKeyDown} />
 
 <TestJobLoader bind:this={testJobLoader} bind:isLoading={testIsLoading} bind:job />
-<UnsavedConfirmationModal
+<!-- <UnsavedConfirmationModal
 	{diffDrawer}
 	savedValue={savedApp}
 	modifiedValue={{
@@ -738,7 +738,7 @@ setTheme($app?.darkMode);
 	additionalExitAction={() => {
 		setTheme(priorDarkMode)
 	}}
-/>
+/> -->
 
 <DeployOverrideConfirmationModal
 	bind:deployedBy

package/package/components/graph/FlowGraphV2.svelte

@@ -29,6 +29,7 @@ import FlowYamlEditor from '../flows/header/FlowYamlEditor.svelte';
 import BranchOneEndNode from './renderers/nodes/branchOneEndNode.svelte';
 import { workspaceStore } from '../../stores';
 import SubflowBound from './renderers/nodes/SubflowBound.svelte';
+import { deepEqual } from 'fast-equals';
 export let success = undefined;
 export let modules = [];
 export let failureModule = undefined;
@@ -172,7 +173,16 @@ let eventHandler = {
         expandedSubflows = expandedSubflows;
     }
 };
-$: graph = graphBuilder(modules, {
+let lastModules = structuredClone(modules);
+let newModules = modules;
+$: modules && onModulesChange2(modules);
+function onModulesChange2(modules) {
+    if (!deepEqual(modules, lastModules)) {
+        lastModules = structuredClone(modules);
+        newModules = modules;
+    }
+}
+$: graph = graphBuilder(newModules, {
     disableAi,
     insertable,
     flowModuleStates,

package/package/components/graph/graphBuilder.js

@@ -16,6 +16,7 @@ export function graphBuilder(modules, extra, failureModule, preprocessorModule,
 // 	flowIsSimplifiable?: boolean
 // }
 ) {
+    console.debug('Building graph');
     const nodes = [];
     const edges = [];
     try {

package/package.json

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