From 1ed9901aecf735fbb8f96394355ee856a538d32a Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 7 Feb 2024 00:42:23 +0100
Subject: [PATCH] fix: only create shared dir symlink if not exists

---
 backend/windmill-worker/src/worker.rs         | 22 ++++++++++---------
 .../src/lib/components/DeployWorkspace.svelte |  4 ++--
 .../components/DeployWorkspaceDrawer.svelte   |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 4d81cd8509..819bea9514 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -1522,17 +1522,19 @@ pub async fn run_worker<R: rsmq_async::RsmqConnection + Send + Sync + Clone + 's
                     let target = &format!("{job_dir}/shared");
 
                     if same_worker && job.parent_job.is_some() {
-                        let parent_flow = job.parent_job.unwrap();
-                        let parent_shared_dir = format!("{worker_dir}/{parent_flow}/shared");
-                        DirBuilder::new()
-                            .recursive(true)
-                            .create(&parent_shared_dir)
-                            .await
-                            .expect("could not create parent shared dir");
+                        if tokio::fs::metadata(target).await.is_err() {
+                            let parent_flow = job.parent_job.unwrap();
+                            let parent_shared_dir = format!("{worker_dir}/{parent_flow}/shared");
+                            DirBuilder::new()
+                                .recursive(true)
+                                .create(&parent_shared_dir)
+                                .await
+                                .expect("could not create parent shared dir");
 
-                        symlink(&parent_shared_dir, target)
-                            .await
-                            .expect("could not symlink target");
+                            symlink(&parent_shared_dir, target)
+                                .await
+                                .expect("could not symlink target");
+                        }
                     } else {
                         DirBuilder::new()
                             .recursive(true)
diff --git a/frontend/src/lib/components/DeployWorkspace.svelte b/frontend/src/lib/components/DeployWorkspace.svelte
index 44ebd31d99..deb1ba4fb8 100644
--- a/frontend/src/lib/components/DeployWorkspace.svelte
+++ b/frontend/src/lib/components/DeployWorkspace.svelte
@@ -440,7 +440,7 @@
 						x.value.hash = undefined
 					}
 				})
-				return flow.value
+				return { summary: flow.summary, description: flow.description, value: flow.value }
 			} else if (kind == 'script') {
 				const script = await ScriptService.getScriptByPath({
 					workspace: workspace,
@@ -559,7 +559,7 @@
 				{@const statusPath = computeStatusPath(kind, path)}
 				<div class="col-span-1 truncate text-secondary text-sm pt-0.5">{kind}</div><div
 					class="col-span-5 truncate font-semibold">{path}</div
-				><div class="col-span-1"><Toggle size="xs" bind:checked={include} /></div><div
+				><div class="col-span-1 pt-1.5"><Toggle size="xs" bind:checked={include} /></div><div
 					class="col-span-1"
 				>
 					{#if allAlreadyExists[statusPath] == false}
diff --git a/frontend/src/lib/components/DeployWorkspaceDrawer.svelte b/frontend/src/lib/components/DeployWorkspaceDrawer.svelte
index fce7adb5da..e2e7529d7f 100644
--- a/frontend/src/lib/components/DeployWorkspaceDrawer.svelte
+++ b/frontend/src/lib/components/DeployWorkspaceDrawer.svelte
@@ -19,7 +19,7 @@
 </script>
 
 <Drawer bind:this={drawer} size="900px">
-	<DrawerContent title="Deploy {initialPath} to staging or prod" on:close={drawer.closeDrawer}>
+	<DrawerContent title="Deploy {initialPath}" on:close={drawer.closeDrawer}>
 		{#if kind != undefined && initialPath != undefined}
 			<DeployWorkspace
 				hideButton