From 4b873a9f5f2787fb79de09f6623461c5591be22f Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Fri, 10 Nov 2023 15:14:22 +0100
Subject: [PATCH] fix: improve display of optimized one-loops + dependency jobs
 of dedicated workers happen on dedicated worker

---
 backend/windmill-api/src/scripts.rs           |   7 +-
 .../components/FlowStatusViewerInner.svelte   | 171 ++++++++++--------
 2 files changed, 105 insertions(+), 73 deletions(-)

diff --git a/backend/windmill-api/src/scripts.rs b/backend/windmill-api/src/scripts.rs
index cfb02b7680..0fe732dd7f 100644
--- a/backend/windmill-api/src/scripts.rs
+++ b/backend/windmill-api/src/scripts.rs
@@ -598,6 +598,11 @@ async fn create_script(
             }
             _ => ns.content,
         };
+        let tag = if ns.dedicated_worker.is_some_and(|x| x) {
+            Some(format!("{}:{}", &w_id, &ns.path,))
+        } else {
+            ns.tag
+        };
         let (_, new_tx) = windmill_queue::push(
             &db,
             tx,
@@ -616,7 +621,7 @@ async fn create_script(
             false,
             None,
             true,
-            ns.tag,
+            tag,
             None,
             None,
             None,
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index 61bcf3e249..59e23183ba 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -1,5 +1,13 @@
 <script lang="ts">
-	import { FlowStatusModule, Job, JobService, type FlowStatus } from '$lib/gen'
+	import {
+		FlowStatusModule,
+		Job,
+		JobService,
+		type FlowStatus,
+		CompletedJob,
+		QueuedJob,
+		type FlowModuleValue
+	} from '$lib/gen'
 	import { workspaceStore } from '$lib/stores'
 	import FlowJobResult from './FlowJobResult.svelte'
 	import FlowPreviewStatus from './preview/FlowPreviewStatus.svelte'
@@ -34,6 +42,9 @@
 		| undefined = undefined
 	export let job: Job | undefined = undefined
 
+	//only useful when forloops are optimized and the job doesn't contain the mod id anymore
+	export let innerModule: FlowModuleValue | undefined = undefined
+
 	export let render = true
 
 	export let isOwner = false
@@ -223,6 +234,91 @@
 		}
 	}
 
+	function innerJobLoaded(
+		jobLoaded: (QueuedJob & { type: 'QueuedJob' }) | (CompletedJob & { type: 'CompletedJob' }),
+		j: number
+	) {
+		let modId = flowJobIds?.moduleId
+		if (modId) {
+			if ($flowStateStore?.[modId]) {
+				if (
+					!$flowStateStore[modId].previewResult ||
+					!Array.isArray($flowStateStore[modId]?.previewResult)
+				) {
+					$flowStateStore[modId].previewResult = []
+				}
+				$flowStateStore[modId].previewArgs = jobLoaded.args
+				if (jobLoaded.type == 'QueuedJob') {
+					jobResults[j] = 'Job in progress ...'
+				} else {
+					$flowStateStore[modId].previewResult[j] = jobLoaded.result
+					jobResults[j] = jobLoaded.result
+					jobFailures[j] = jobLoaded.success === false
+				}
+			}
+
+			let started_at = jobLoaded.started_at ? new Date(jobLoaded.started_at).getTime() : undefined
+
+			let created_at = jobLoaded.created_at ? new Date(jobLoaded.created_at).getTime() : undefined
+
+			let job_id = jobLoaded.id
+			if ($durationStatuses[modId] == undefined) {
+				$durationStatuses[modId] = { byJob: {} }
+			}
+			if (jobLoaded.type == 'QueuedJob') {
+				$flowModuleStates[modId] = {
+					type: FlowStatusModule.type.IN_PROGRESS,
+					started_at,
+					logs: jobLoaded.logs,
+					job_id,
+					args: jobLoaded.args,
+					iteration: flowJobIds?.flowJobs.length,
+					iteration_total: flowJobIds?.length,
+					duration_ms: undefined
+				}
+
+				$durationStatuses[modId].byJob[job_id] = {
+					created_at,
+					started_at
+				}
+			} else {
+				$flowModuleStates[modId] = {
+					started_at,
+					args: jobLoaded.args,
+					type: jobLoaded.success ? FlowStatusModule.type.SUCCESS : FlowStatusModule.type.FAILURE,
+					logs: 'All jobs completed',
+					result: jobResults,
+					job_id,
+					iteration: flowJobIds?.flowJobs.length,
+					iteration_total: flowJobIds?.length,
+					duration_ms: undefined,
+					isListJob: true
+				}
+				$durationStatuses[modId].byJob[job_id] = {
+					created_at,
+					started_at,
+					duration_ms: jobLoaded.duration_ms
+				}
+			}
+
+			if (jobLoaded.job_kind == 'script' || jobLoaded.job_kind == 'preview') {
+				let id: string | undefined = undefined
+				if (innerModule?.type == 'forloopflow') {
+					id = innerModule?.modules?.[0]?.id
+				}
+				if (id) {
+					$flowModuleStates[id] = {
+						...($flowModuleStates[modId] ?? {}),
+						iteration: undefined,
+						isListJob: false,
+						iteration_total: undefined
+					}
+					$durationStatuses[id].byJob[job_id] = $durationStatuses[modId].byJob[job_id]
+				}
+			}
+		}
+	}
+
 	let flowTimeline: FlowTimeline
 
 	let rightColumnSelect: 'timeline' | 'detail' = 'timeline'
@@ -376,77 +472,7 @@
 							render={forloop_selected == loopJobId && selected == 'sequence' && render}
 							{workspaceId}
 							jobId={loopJobId}
-							on:jobsLoaded={(e) => {
-								let modId = flowJobIds?.moduleId
-								if (modId) {
-									if ($flowStateStore?.[modId]) {
-										if (
-											!$flowStateStore[modId].previewResult ||
-											!Array.isArray($flowStateStore[modId]?.previewResult)
-										) {
-											$flowStateStore[modId].previewResult = []
-										}
-										$flowStateStore[modId].previewResult[j] = e.detail.result
-										$flowStateStore[modId].previewArgs = e.detail.args
-										if (e.detail.type == 'QueuedJob') {
-											jobResults[j] = 'Job in progress ...'
-										} else {
-											jobResults[j] = e.detail.result
-											jobFailures[j] = e.detail.success === false
-										}
-									}
-
-									let started_at = e.detail.started_at
-										? new Date(e.detail.started_at).getTime()
-										: undefined
-
-									let created_at = e.detail.created_at
-										? new Date(e.detail.created_at).getTime()
-										: undefined
-
-									let job_id = e.detail.id
-									if ($durationStatuses[modId] == undefined) {
-										$durationStatuses[modId] = { byJob: {} }
-									}
-									if (e.detail.type == 'QueuedJob') {
-										$flowModuleStates[modId] = {
-											type: FlowStatusModule.type.IN_PROGRESS,
-											started_at,
-											logs: e.detail.logs,
-											job_id,
-											args: e.detail.args,
-											iteration: flowJobIds?.flowJobs.length,
-											iteration_total: flowJobIds?.length,
-											duration_ms: undefined
-										}
-
-										$durationStatuses[modId].byJob[job_id] = {
-											created_at,
-											started_at
-										}
-									} else {
-										$flowModuleStates[modId] = {
-											started_at,
-											args: e.detail.args,
-											type: e.detail.success
-												? FlowStatusModule.type.SUCCESS
-												: FlowStatusModule.type.FAILURE,
-											logs: 'All jobs completed',
-											result: jobResults,
-											job_id,
-											iteration: flowJobIds?.flowJobs.length,
-											iteration_total: flowJobIds?.length,
-											duration_ms: undefined,
-											isListJob: true
-										}
-										$durationStatuses[modId].byJob[job_id] = {
-											created_at,
-											started_at,
-											duration_ms: e.detail.duration_ms
-										}
-									}
-								}
-							}}
+							on:jobsLoaded={(e) => innerJobLoaded(e.detail, j)}
 						/>
 					</div>
 				{/each}
@@ -492,6 +518,7 @@
 										render={selected == 'sequence' && render}
 										{workspaceId}
 										jobId={mod.job}
+										innerModule={mod.flow_jobs ? job.raw_flow?.modules[i]?.value : undefined}
 										flowJobIds={mod.flow_jobs
 											? {
 													moduleId: mod.id,