From f2758fac40dcb5d6de7fc2284e346dfbe2f11fae Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 31 Oct 2023 23:43:40 +0100
Subject: [PATCH] improve app timelines

---
 frontend/src/lib/components/ResultJobLoader.svelte             | 3 +++
 .../apps/components/helpers/RunnableComponent.svelte           | 3 +--
 frontend/src/lib/components/apps/editor/AppTimeline.svelte     | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/ResultJobLoader.svelte b/frontend/src/lib/components/ResultJobLoader.svelte
index 9b54abcf2c..860a6e2420 100644
--- a/frontend/src/lib/components/ResultJobLoader.svelte
+++ b/frontend/src/lib/components/ResultJobLoader.svelte
@@ -171,6 +171,8 @@
 							dispatch('done', job)
 						}
 						currentId = undefined
+					} else {
+						dispatch('cancel', id)
 					}
 				}
 				notfound = false
@@ -185,6 +187,7 @@
 			}
 			return isCompleted
 		} else {
+			dispatch('cancel', id)
 			return true
 		}
 	}
diff --git a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
index 96a7447264..e11d62f33e 100644
--- a/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
+++ b/frontend/src/lib/components/apps/components/helpers/RunnableComponent.svelte
@@ -422,7 +422,6 @@
 
 	async function setResult(res: any, jobId: string | undefined) {
 		dispatch('done')
-
 		const errors = getResultErrors(res)
 
 		if (errors) {
@@ -552,12 +551,12 @@
 		if (job && job.started_at && !job.duration_ms) {
 			$jobsById[jobId] = {
 				...job,
+				started_compute_at: job.started_compute_at ?? Date.now(),
 				duration_ms: Date.now() - (job.started_compute_at ?? job.started_at)
 			}
 		}
 	}}
 	on:running={(e) => {
-		console.log('running', e.detail)
 		let jobId = e.detail
 		let job = $jobsById[jobId]
 		if (job && !job.started_compute_at) {
diff --git a/frontend/src/lib/components/apps/editor/AppTimeline.svelte b/frontend/src/lib/components/apps/editor/AppTimeline.svelte
index 12dec70bbf..5acabe2da4 100644
--- a/frontend/src/lib/components/apps/editor/AppTimeline.svelte
+++ b/frontend/src/lib/components/apps/editor/AppTimeline.svelte
@@ -130,6 +130,8 @@
 							{@const waitingLen = b?.started_at
 								? b.started_compute_at
 									? b.started_compute_at - b?.started_at
+									: b.duration_ms
+									? 0
 									: now - b?.started_at
 								: 0}
 							<div class="flex w-full">