From 600fcaf32f5859bfb9cafe2f2688ecbff3bf0d3a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Sat, 8 Jun 2024 17:38:06 +0200
Subject: [PATCH] return flow value in flow dependency job

---
 .github/DockerfileBackendTests                               | 4 ++--
 backend/windmill-worker/src/worker_lockfiles.rs              | 5 +++--
 .../lib/components/flows/content/FlowModuleComponent.svelte  | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.github/DockerfileBackendTests b/.github/DockerfileBackendTests
index a10a647d7e..e4684d1563 100644
--- a/.github/DockerfileBackendTests
+++ b/.github/DockerfileBackendTests
@@ -1,5 +1,5 @@
 ARG DEBIAN_IMAGE=debian:bookworm-slim
-ARG RUST_IMAGE=rust:1.75-slim-bookworm
+ARG RUST_IMAGE=rust:1.78-slim-bookworm
 ARG PYTHON_IMAGE=python:3.11.4-slim-bookworm
 
 FROM ${DEBIAN_IMAGE} as downloader
@@ -53,7 +53,7 @@ RUN wget https://www.python.org/ftp/python/${PYTHON_VERSION}/Python-${PYTHON_VER
 
 RUN /usr/local/bin/python3 -m pip install pip-tools
 
-COPY --from=oven/bun:1.0.29 /usr/local/bin/bun /usr/bin/bun
+COPY --from=oven/bun:1.1.8 /usr/local/bin/bun /usr/bin/bun
 
 
 RUN [ "$TARGETPLATFORM" == "linux/amd64" ] && curl -Lsf https://github.com/denoland/deno/releases/download/v1.41.0/deno-x86_64-unknown-linux-gnu.zip -o deno.zip || true
diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index eb724d0223..4f81354a70 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -260,7 +260,7 @@ pub async fn handle_dependency_job<R: rsmq_async::RsmqConnection + Send + Sync +
             if job.script_hash.is_none() {
                 // it a one-off raw script dependency job, no need to update the db
                 return Ok(to_raw_value_owned(
-                    json!({ "success": "Successful lock file generation", "lock": content }),
+                    json!({ "status": "Successful lock file generation", "lock": content }),
                 ));
             }
 
@@ -326,7 +326,7 @@ pub async fn handle_dependency_job<R: rsmq_async::RsmqConnection + Send + Sync +
             }
 
             Ok(to_raw_value_owned(
-                json!({ "success": "Successful lock file generation", "lock": content }),
+                json!({ "status": "Successful lock file generation", "lock": content }),
             ))
         }
         Err(error) => {
@@ -555,6 +555,7 @@ pub async fn handle_flow_dependency_job<R: rsmq_async::RsmqConnection + Send + S
     Ok(to_raw_value_owned(json!({
         "status": "Successful lock file generation",
         "modified_ids": modified_ids,
+        "updated_flow_value": new_flow_value,
     })))
 }
 
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index f877ad5903..b67c60dfba 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -262,7 +262,7 @@
 								{#key flowModule.id}
 									<Editor
 										folding
-										path={$pathStore}
+										path={$pathStore + '/' + flowModule.id}
 										bind:websocketAlive
 										bind:this={editor}
 										class="h-full relative"