From e4a175908173ea60abeaeeaae9c4c83065fc0364 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 9 Nov 2023 23:36:04 +0100
Subject: [PATCH] results.x returns null in non trivial evals

---
 backend/windmill-worker/src/global_cache.rs               | 2 +-
 backend/windmill-worker/src/js_eval.rs                    | 8 ++++++--
 frontend/src/lib/components/ScriptBuilder.svelte          | 2 +-
 .../src/lib/components/flows/content/FlowSettings.svelte  | 4 +++-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/backend/windmill-worker/src/global_cache.rs b/backend/windmill-worker/src/global_cache.rs
index 75032f8cb2..07c52c670b 100644
--- a/backend/windmill-worker/src/global_cache.rs
+++ b/backend/windmill-worker/src/global_cache.rs
@@ -330,7 +330,7 @@ pub async fn copy_denogo_cache_from_bucket_as_tar(bucket: &str) {
     }
 
     tracing::info!(
-        "Fonished copying denogobun tar for from bucket as tar. took {}s",
+        "Finished copying denogobun tar for from bucket as tar. took {}s",
         start.elapsed().as_secs()
     );
 
diff --git a/backend/windmill-worker/src/js_eval.rs b/backend/windmill-worker/src/js_eval.rs
index bd87c77c7e..985c6af84e 100644
--- a/backend/windmill-worker/src/js_eval.rs
+++ b/backend/windmill-worker/src/js_eval.rs
@@ -439,8 +439,12 @@ async fn op_get_id(
     if let Some(client) = client {
         let result = client
             .get_result_by_id::<Option<Box<RawValue>>>(flow_job_id, node_id, None)
-            .await?;
-        Ok(result.map(|x| x.get().to_string()))
+            .await.ok();
+        if let Some(result) = result {
+            Ok(result.map(|x| x.get().to_string()))
+        } else {
+            Ok(None)
+        }
     } else {
         anyhow::bail!("No client found in op state");
     }
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 9117b960ae..e8560b0546 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -584,7 +584,7 @@
 											</div>
 										{:else}
 											<div class="text-sm text-secondary flex flex-row gap-2">
-												No custom worker group defined on this instance.
+												No custom worker group tag defined on this instance in "Workers {"->"} Assignable Tags"
 												<a
 													href="https://www.windmill.dev/docs/core_concepts/worker_groups"
 													target="_blank"
diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
index b37c320b63..37b939e0f6 100644
--- a/frontend/src/lib/components/flows/content/FlowSettings.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -352,7 +352,9 @@
 								</div>
 							{:else}
 								<div class="text-sm text-secondary italic mb-2">
-									No custom worker group defined on this instance. See <a
+									No custom worker group tag defined on this instance in "Workers {'->'} Assignable Tags".
+									See
+									<a
 										href="https://www.windmill.dev/docs/core_concepts/worker_groups"
 										target="_blank">documentation</a
 									>