fix(frontend): simplify

windmill-labs · Oct 4, 2023 · 3aab7fd · 3aab7fd
1 parent eae3d08
commit 3aab7fd
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/frontend/src/lib/components/FlowBuilder.svelte b/frontend/src/lib/components/FlowBuilder.svelte
@@ -14,6 +14,7 @@
 		copilotInfo,
 		enterpriseLicense,
 		hubScripts,
+		tutorialsToDo,
 		userStore,
 		workspaceStore
 	} from '$lib/stores'
@@ -861,6 +862,8 @@
 
 		if (tutorial) {
 			flowTutorials?.runTutorialById(tutorial)
+		} else if ($tutorialsToDo.includes(0)) {
+			flowTutorials?.runTutorialById('action')
 		}
 	}
 </script>

diff --git a/frontend/src/lib/components/FlowBuilderTutorials.svelte b/frontend/src/lib/components/FlowBuilderTutorials.svelte
@@ -80,7 +80,12 @@
 	</ButtonDropdown>
 </button>
 
-<FlowTutorials bind:this={flowTutorials} />
+<FlowTutorials
+	bind:this={flowTutorials}
+	on:error={({ detail }) => {
+		targetTutorial = detail.detail
+	}}
+/>
 
 <ConfirmationModal
 	open={targetTutorial !== undefined}

diff --git a/frontend/src/lib/components/FlowTutorials.svelte b/frontend/src/lib/components/FlowTutorials.svelte
@@ -22,7 +22,7 @@
 	}
 </script>
 
-<FlowBuilderTutorialSimpleFlow bind:this={flowBuilderTutorialSimpleFlow} />
-<FlowBuilderTutorialsForLoop bind:this={flowBuilderTutorialsForLoop} />
-<FlowBranchOne bind:this={flowBranchOne} />
-<FlowBranchAll bind:this={flowBranchAll} />
+<FlowBuilderTutorialSimpleFlow bind:this={flowBuilderTutorialSimpleFlow} on:error />
+<FlowBuilderTutorialsForLoop bind:this={flowBuilderTutorialsForLoop} on:error />
+<FlowBranchOne bind:this={flowBranchOne} on:error />
+<FlowBranchAll bind:this={flowBranchAll} on:error />
diff --git a/frontend/src/lib/components/tutorials/FlowBranchAll.svelte b/frontend/src/lib/components/tutorials/FlowBranchAll.svelte
@@ -16,7 +16,7 @@
 			$flowStore.value.modules.length > 0 ||
 			Object.keys($flowStore?.schema?.properties).length > 0
 		) {
-			dispatch('error')
+			dispatch('error', { detail: 'branchall' })
 			return
 		}
 

diff --git a/frontend/src/lib/components/tutorials/FlowBranchOne.svelte b/frontend/src/lib/components/tutorials/FlowBranchOne.svelte
@@ -20,7 +20,7 @@
 			$flowStore.value.modules.length > 0 ||
 			Object.keys($flowStore?.schema?.properties).length > 0
 		) {
-			dispatch('error')
+			dispatch('error', { detail: 'branchone' })
 			return
 		}
 

diff --git a/frontend/src/lib/components/tutorials/FlowBuilderTutorialSimpleFlow.svelte b/frontend/src/lib/components/tutorials/FlowBuilderTutorialSimpleFlow.svelte
@@ -21,7 +21,7 @@
 			$flowStore.value.modules.length > 0 ||
 			Object.keys($flowStore?.schema?.properties).length > 0
 		) {
-			dispatch('error')
+			dispatch('error', { detail: 'action' })
 			return
 		}
 

diff --git a/frontend/src/lib/components/tutorials/FlowBuilderTutorialsForLoop.svelte b/frontend/src/lib/components/tutorials/FlowBuilderTutorialsForLoop.svelte
@@ -23,7 +23,7 @@
 			$flowStore.value.modules.length > 0 ||
 			Object.keys($flowStore?.schema?.properties).length > 0
 		) {
-			dispatch('error')
+			dispatch('error', { detail: 'forloop' })
 			return
 		}