From 71fc31c4718a98211e0ce1dd4f18e8bc4cb6c2b7 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Tue, 3 Dec 2024 23:10:21 +0100
Subject: [PATCH 01/34] improve draft only delete security

---
 ...43061932dc5b4b17cf13d5cf8d833aedbe6d5.json |  2 +-
 ...5753b86a4ad239708851c998ff5620ebca5b8.json | 14 ---------
 ...06aaa6d6a8940017a1172403ca9851d0f13a7.json | 22 --------------
 ...b32cbde4240e143df1c980843dcdfeef3499e.json | 28 ------------------
 ...0560bacd55c6ae9fafcbb0239163a3d7f3c0c.json | 22 --------------
 ...2b5f818a4274ba223f905e68280b86b24fa25.json | 27 -----------------
 ...7f5033b9c9afc344d9c3e385ba20a3ad2197a.json |  2 +-
 ...11480ff040bb987a48b6f66522bc9b7e2c1d8.json | 28 ------------------
 ...120444af65b1dc43a234821cde5bf6bf8b74f.json | 27 -----------------
 ...160ad1962668fc3305d8e80ae91ef73614a80.json |  2 +-
 backend/windmill-api/src/scripts.rs           | 29 ++++++++++++++-----
 backend/windmill-worker/src/job_logger_ee.rs  | 17 ++++++++---
 12 files changed, 37 insertions(+), 183 deletions(-)
 delete mode 100644 backend/.sqlx/query-062859f1d0e5cfba3115f4241115753b86a4ad239708851c998ff5620ebca5b8.json
 delete mode 100644 backend/.sqlx/query-113b120ae10ea4469ec3575dc3506aaa6d6a8940017a1172403ca9851d0f13a7.json
 delete mode 100644 backend/.sqlx/query-15a5db0202c61ed187d9594311cb32cbde4240e143df1c980843dcdfeef3499e.json
 delete mode 100644 backend/.sqlx/query-3d77e5b691dab38b3e39477ed980560bacd55c6ae9fafcbb0239163a3d7f3c0c.json
 delete mode 100644 backend/.sqlx/query-5ac7c9eb3ce21e46f90e23435562b5f818a4274ba223f905e68280b86b24fa25.json
 delete mode 100644 backend/.sqlx/query-8653373c2c8301c902e21e8bf5a11480ff040bb987a48b6f66522bc9b7e2c1d8.json
 delete mode 100644 backend/.sqlx/query-aa98ab0e4b9a0eb41a804ab047a120444af65b1dc43a234821cde5bf6bf8b74f.json

diff --git a/backend/.sqlx/query-02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5.json b/backend/.sqlx/query-02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5.json
index 043d236a6b..c8b5e3086f 100644
--- a/backend/.sqlx/query-02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5.json
+++ b/backend/.sqlx/query-02424907504848e983bfa89eec343061932dc5b4b17cf13d5cf8d833aedbe6d5.json
@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],
diff --git a/backend/.sqlx/query-062859f1d0e5cfba3115f4241115753b86a4ad239708851c998ff5620ebca5b8.json b/backend/.sqlx/query-062859f1d0e5cfba3115f4241115753b86a4ad239708851c998ff5620ebca5b8.json
deleted file mode 100644
index 9803b76cea..0000000000
--- a/backend/.sqlx/query-062859f1d0e5cfba3115f4241115753b86a4ad239708851c998ff5620ebca5b8.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE queue SET last_ping = now() WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Uuid"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "062859f1d0e5cfba3115f4241115753b86a4ad239708851c998ff5620ebca5b8"
-}
diff --git a/backend/.sqlx/query-113b120ae10ea4469ec3575dc3506aaa6d6a8940017a1172403ca9851d0f13a7.json b/backend/.sqlx/query-113b120ae10ea4469ec3575dc3506aaa6d6a8940017a1172403ca9851d0f13a7.json
deleted file mode 100644
index 64ec588ffa..0000000000
--- a/backend/.sqlx/query-113b120ae10ea4469ec3575dc3506aaa6d6a8940017a1172403ca9851d0f13a7.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT flow as \"flow!: sqlx::types::Json<Box<RawValue>>\" FROM flow_node WHERE id = $1 LIMIT 1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "flow!: sqlx::types::Json<Box<RawValue>>",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "113b120ae10ea4469ec3575dc3506aaa6d6a8940017a1172403ca9851d0f13a7"
-}
diff --git a/backend/.sqlx/query-15a5db0202c61ed187d9594311cb32cbde4240e143df1c980843dcdfeef3499e.json b/backend/.sqlx/query-15a5db0202c61ed187d9594311cb32cbde4240e143df1c980843dcdfeef3499e.json
deleted file mode 100644
index d06eadbccf..0000000000
--- a/backend/.sqlx/query-15a5db0202c61ed187d9594311cb32cbde4240e143df1c980843dcdfeef3499e.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT lock, code AS \"code!: String\" FROM flow_node WHERE id = $1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "lock",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 1,
-        "name": "code!: String",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true,
-      true
-    ]
-  },
-  "hash": "15a5db0202c61ed187d9594311cb32cbde4240e143df1c980843dcdfeef3499e"
-}
diff --git a/backend/.sqlx/query-3d77e5b691dab38b3e39477ed980560bacd55c6ae9fafcbb0239163a3d7f3c0c.json b/backend/.sqlx/query-3d77e5b691dab38b3e39477ed980560bacd55c6ae9fafcbb0239163a3d7f3c0c.json
deleted file mode 100644
index edaec50386..0000000000
--- a/backend/.sqlx/query-3d77e5b691dab38b3e39477ed980560bacd55c6ae9fafcbb0239163a3d7f3c0c.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT flow AS \"flow!: Json<Box<JsonRawValue>>\" FROM flow_node WHERE id = $1 LIMIT 1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "flow!: Json<Box<JsonRawValue>>",
-        "type_info": "Jsonb"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true
-    ]
-  },
-  "hash": "3d77e5b691dab38b3e39477ed980560bacd55c6ae9fafcbb0239163a3d7f3c0c"
-}
diff --git a/backend/.sqlx/query-5ac7c9eb3ce21e46f90e23435562b5f818a4274ba223f905e68280b86b24fa25.json b/backend/.sqlx/query-5ac7c9eb3ce21e46f90e23435562b5f818a4274ba223f905e68280b86b24fa25.json
deleted file mode 100644
index 11c522e70d..0000000000
--- a/backend/.sqlx/query-5ac7c9eb3ce21e46f90e23435562b5f818a4274ba223f905e68280b86b24fa25.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        WITH existing AS (\n            SELECT id FROM flow_node\n            WHERE hash = $1 AND path = $2 AND workspace_id = $3 AND code = $4 AND lock = $5 AND (flow IS NOT DISTINCT FROM $6)\n            LIMIT 1\n        ),\n        inserted AS (\n            INSERT INTO flow_node (hash, path, workspace_id, code, lock, flow)\n            VALUES ($1, $2, $3, $4, $5, $6)\n            ON CONFLICT DO NOTHING\n            RETURNING id\n        )\n        SELECT id FROM existing\n        UNION ALL\n        SELECT id FROM inserted\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Text",
-        "Text",
-        "Text",
-        "Jsonb"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "5ac7c9eb3ce21e46f90e23435562b5f818a4274ba223f905e68280b86b24fa25"
-}
diff --git a/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json b/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
index 1fa370e682..75b8108281 100644
--- a/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
+++ b/backend/.sqlx/query-661f472ff3860983322162420457f5033b9c9afc344d9c3e385ba20a3ad2197a.json
@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],
diff --git a/backend/.sqlx/query-8653373c2c8301c902e21e8bf5a11480ff040bb987a48b6f66522bc9b7e2c1d8.json b/backend/.sqlx/query-8653373c2c8301c902e21e8bf5a11480ff040bb987a48b6f66522bc9b7e2c1d8.json
deleted file mode 100644
index f57226bfa9..0000000000
--- a/backend/.sqlx/query-8653373c2c8301c902e21e8bf5a11480ff040bb987a48b6f66522bc9b7e2c1d8.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "SELECT lock, code AS \"code!: String\" FROM flow_node WHERE id = $1 LIMIT 1",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "lock",
-        "type_info": "Text"
-      },
-      {
-        "ordinal": 1,
-        "name": "code!: String",
-        "type_info": "Text"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8"
-      ]
-    },
-    "nullable": [
-      true,
-      true
-    ]
-  },
-  "hash": "8653373c2c8301c902e21e8bf5a11480ff040bb987a48b6f66522bc9b7e2c1d8"
-}
diff --git a/backend/.sqlx/query-aa98ab0e4b9a0eb41a804ab047a120444af65b1dc43a234821cde5bf6bf8b74f.json b/backend/.sqlx/query-aa98ab0e4b9a0eb41a804ab047a120444af65b1dc43a234821cde5bf6bf8b74f.json
deleted file mode 100644
index d70e81e786..0000000000
--- a/backend/.sqlx/query-aa98ab0e4b9a0eb41a804ab047a120444af65b1dc43a234821cde5bf6bf8b74f.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "\n        WITH existing AS (\n            SELECT id FROM flow_node\n            WHERE hash = $1 AND path = $2 AND workspace_id = $3 AND code = $4 AND lock = $5 AND flow = $6\n            LIMIT 1\n        ),\n        inserted AS (\n            INSERT INTO flow_node (hash, path, workspace_id, code, lock, flow)\n            VALUES ($1, $2, $3, $4, $5, $6)\n            ON CONFLICT DO NOTHING\n            RETURNING id\n        )\n        SELECT id FROM existing\n        UNION ALL\n        SELECT id FROM inserted\n        ",
-  "describe": {
-    "columns": [
-      {
-        "ordinal": 0,
-        "name": "id",
-        "type_info": "Int8"
-      }
-    ],
-    "parameters": {
-      "Left": [
-        "Int8",
-        "Text",
-        "Text",
-        "Text",
-        "Text",
-        "Jsonb"
-      ]
-    },
-    "nullable": [
-      null
-    ]
-  },
-  "hash": "aa98ab0e4b9a0eb41a804ab047a120444af65b1dc43a234821cde5bf6bf8b74f"
-}
diff --git a/backend/.sqlx/query-d6615719bf8db4b333ed55c9a3c160ad1962668fc3305d8e80ae91ef73614a80.json b/backend/.sqlx/query-d6615719bf8db4b333ed55c9a3c160ad1962668fc3305d8e80ae91ef73614a80.json
index 103219fe05..271c395f9a 100644
--- a/backend/.sqlx/query-d6615719bf8db4b333ed55c9a3c160ad1962668fc3305d8e80ae91ef73614a80.json
+++ b/backend/.sqlx/query-d6615719bf8db4b333ed55c9a3c160ad1962668fc3305d8e80ae91ef73614a80.json
@@ -5,7 +5,7 @@
     "columns": [
       {
         "ordinal": 0,
-        "name": "bool",
+        "name": "?column?",
         "type_info": "Bool"
       }
     ],
diff --git a/backend/windmill-api/src/scripts.rs b/backend/windmill-api/src/scripts.rs
index 2f8c54232b..ba21c688e4 100644
--- a/backend/windmill-api/src/scripts.rs
+++ b/backend/windmill-api/src/scripts.rs
@@ -1439,14 +1439,27 @@ async fn delete_script_by_path(
         require_admin(authed.is_admin, &authed.username)?;
     }
 
-    let script = sqlx::query_scalar!(
-        "DELETE FROM script WHERE path = $1 AND workspace_id = $2 RETURNING path",
-        path,
-        w_id
-    )
-    .fetch_one(&db)
-    .await
-    .map_err(|e| Error::InternalErr(format!("deleting script by path {w_id}: {e:#}")))?;
+    let script = if !draft_only {
+        require_admin(authed.is_admin, &authed.username)?;
+        sqlx::query_scalar!(
+            "DELETE FROM script WHERE path = $1 AND workspace_id = $2 RETURNING path",
+            path,
+            w_id
+        )
+        .fetch_one(&db)
+        .await
+        .map_err(|e| Error::InternalErr(format!("deleting script by path {w_id}: {e:#}")))?
+    } else {
+        // If the script is draft only, we can delete it without admin permissions but we still need write permissions
+        sqlx::query_scalar!(
+            "DELETE FROM script WHERE path = $1 AND workspace_id = $2 RETURNING path",
+            path,
+            w_id
+        )
+        .fetch_one(&mut *tx)
+        .await
+        .map_err(|e| Error::InternalErr(format!("deleting script by path {w_id}: {e:#}")))?
+    };
 
     sqlx::query!(
         "DELETE FROM draft WHERE path = $1 AND workspace_id = $2 AND typ = 'script'",
diff --git a/backend/windmill-worker/src/job_logger_ee.rs b/backend/windmill-worker/src/job_logger_ee.rs
index e0758b31f3..5414ccd496 100644
--- a/backend/windmill-worker/src/job_logger_ee.rs
+++ b/backend/windmill-worker/src/job_logger_ee.rs
@@ -8,7 +8,14 @@ use windmill_common::DB;
 use crate::job_logger::CompactLogs;
 
 #[cfg(all(feature = "enterprise", feature = "parquet"))]
-pub(crate) async fn s3_storage(_job_id: Uuid, _w_id: &String, _db: &sqlx::Pool<sqlx::Postgres>, _logs: &String, _total_size: &Arc<AtomicU32>, _worker_name: &String) {
+pub(crate) async fn s3_storage(
+    _job_id: Uuid,
+    _w_id: &String,
+    _db: &sqlx::Pool<sqlx::Postgres>,
+    _logs: &String,
+    _total_size: &Arc<AtomicU32>,
+    _worker_name: &String,
+) {
     tracing::info!("Logs length of {job_id} has exceeded a threshold. Implementation to store excess on s3 in not OSS");
 }
 
@@ -24,7 +31,9 @@ pub(crate) async fn default_disk_log_storage(
     tracing::info!("Logs length of {job_id} has exceeded a threshold. Implementation to store excess on disk in not OSS");
 }
 
-
-pub(crate) fn process_streaming_log_lines(r: Result<Option<String>, io::Error>, _stderr: bool) -> Option<Result<String, io::Error>> {
+pub(crate) fn process_streaming_log_lines(
+    r: Result<Option<String>, io::Error>,
+    _stderr: bool,
+) -> Option<Result<String, io::Error>> {
     r.transpose()
-}
\ No newline at end of file
+}

From 7642b1121e0a5711840abf73580bc8a784e947d6 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 4 Dec 2024 07:11:31 +0100
Subject: [PATCH 02/34] nit editors

---
 frontend/src/lib/components/Editor.svelte                  | 2 ++
 frontend/src/lib/components/ScriptEditor.svelte            | 3 ++-
 frontend/src/lib/components/SimpleEditor.svelte            | 2 ++
 frontend/src/lib/components/TemplateEditor.svelte          | 7 ++++---
 .../settingsPanel/inputEditor/EvalV2InputEditor.svelte     | 5 +++--
 .../components/flows/content/FlowModuleComponent.svelte    | 1 +
 frontend/src/lib/editorUtils.ts                            | 7 ++++---
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/frontend/src/lib/components/Editor.svelte b/frontend/src/lib/components/Editor.svelte
index 68a58a989b..ba23b76fdc 100644
--- a/frontend/src/lib/components/Editor.svelte
+++ b/frontend/src/lib/components/Editor.svelte
@@ -214,6 +214,7 @@
 	export let small = false
 	export let scriptLang: Preview['language'] | 'bunnative'
 	export let disabled: boolean = false
+	export let lineNumbersMinChars = 3
 
 	const rHash = randomHash()
 	$: filePath = computePath(path)
@@ -1131,6 +1132,7 @@
 			...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets),
 			model,
 			fontSize: !small ? 14 : 12,
+			lineNumbersMinChars,
 			// overflowWidgetsDomNode: widgets,
 			tabSize: lang == 'python' ? 4 : 2,
 			folding
diff --git a/frontend/src/lib/components/ScriptEditor.svelte b/frontend/src/lib/components/ScriptEditor.svelte
index 3e1009d0d9..8adff7f21e 100644
--- a/frontend/src/lib/components/ScriptEditor.svelte
+++ b/frontend/src/lib/components/ScriptEditor.svelte
@@ -317,9 +317,10 @@
 <SplitPanesWrapper>
 	<Splitpanes class="!overflow-visible">
 		<Pane size={60} minSize={10} class="!overflow-visible">
-			<div class="pl-2 h-full !overflow-visible bg-gray-50 dark:bg-[#272D38]">
+			<div class="h-full !overflow-visible bg-gray-50 dark:bg-[#272D38]">
 				{#key lang}
 					<Editor
+						lineNumbersMinChars={4}
 						folding
 						{path}
 						bind:code
diff --git a/frontend/src/lib/components/SimpleEditor.svelte b/frontend/src/lib/components/SimpleEditor.svelte
index 86ec070f86..18a42d8408 100644
--- a/frontend/src/lib/components/SimpleEditor.svelte
+++ b/frontend/src/lib/components/SimpleEditor.svelte
@@ -225,6 +225,8 @@
 		editor = meditor.create(divEl as HTMLDivElement, {
 			...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets),
 			model,
+			lineDecorationsWidth: 6,
+			lineNumbersMinChars: 2,
 			// overflowWidgetsDomNode: widgets,
 			fontSize: small ? 12 : 14
 		})
diff --git a/frontend/src/lib/components/TemplateEditor.svelte b/frontend/src/lib/components/TemplateEditor.svelte
index 275bb06c80..0e999222f3 100644
--- a/frontend/src/lib/components/TemplateEditor.svelte
+++ b/frontend/src/lib/components/TemplateEditor.svelte
@@ -450,10 +450,11 @@
 			...editorConfig(code, lang, automaticLayout, fixedOverflowWidgets),
 			model,
 			// overflowWidgetsDomNode: widgets,
-			lineNumbers: 'off',
+			// lineNumbers: 'on',
+			lineDecorationsWidth: 6,
+			lineNumbersMinChars: 2,
 			fontSize,
-			suggestOnTriggerCharacters: true,
-			lineDecorationsWidth: 14
+			suggestOnTriggerCharacters: true
 		})
 
 		editor.onDidFocusEditorText(() => {
diff --git a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
index 5296fbc21c..6072e2569b 100644
--- a/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/settingsPanel/inputEditor/EvalV2InputEditor.svelte
@@ -133,8 +133,9 @@
 				</div>
 			{/if}
 			<button
-				class="border bg-surface absolute top-0.5 right-2 p-0.5"
-				on:click={() => (fullscreen = true)}><Maximize2 size={12} /></button
+				title="Open in drawer"
+				class="border bg-surface absolute hover:text-primary top-0 right-2 p-0.5 text-secondary"
+				on:click={() => (fullscreen = true)}><Maximize2 size={10} /></button
 			>
 			{#if focus}
 				<div class="relative w-full">
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 97801d24ab..e5992f4ab5 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -303,6 +303,7 @@
 							{#if !noEditor}
 								{#key flowModule.id}
 									<Editor
+										
 										folding
 										path={$pathStore + '/' + flowModule.id}
 										bind:websocketAlive
diff --git a/frontend/src/lib/editorUtils.ts b/frontend/src/lib/editorUtils.ts
index ca2daa1392..03ce7420ca 100644
--- a/frontend/src/lib/editorUtils.ts
+++ b/frontend/src/lib/editorUtils.ts
@@ -12,12 +12,13 @@ export function editorConfig(
 		automaticLayout,
 		readOnly: false,
 		fixedOverflowWidgets,
-		//lineNumbers: 'off',
-		lineDecorationsWidth: 15,
-		lineNumbersMinChars: 2,
+		lineNumbers: 'on' as const,
+		lineDecorationsWidth: 10,
+		lineNumbersMinChars: 3,
 		scrollbar: { alwaysConsumeMouseWheel: false },
 		folding: false,
 		scrollBeyondLastLine: false,
+		glyphMargin: false,
 		minimap: {
 			enabled: false
 		},

From bf4d90308392f92f6b065a1d80f793dbce091cb0 Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Wed, 4 Dec 2024 14:07:29 +0100
Subject: [PATCH 03/34] Trigger panels texts + doclinks (#4796)

* Trigger panels texts + doclinks

* create description component

* Description module workspace settings

* Delete package-lock.json

---------

Co-authored-by: Guilhem <guilhemlemouel@gmail.com>
---
 .../src/lib/components/Description.svelte     |  10 ++
 .../lib/components/RunPageSchedules.svelte    |  21 ++-
 .../details/EmailTriggerPanel.svelte          |   6 +
 .../triggers/KafkaTriggersPanel.svelte        | 117 +++++++-------
 .../components/triggers/RoutesPanel.svelte    |   7 +-
 .../triggers/ScheduledPollPanel.svelte        |  12 +-
 .../components/triggers/WebhooksPanel.svelte  |  27 ++--
 .../triggers/WebsocketTriggersPanel.svelte    | 107 +++++++------
 .../(logged)/workspace_settings/+page.svelte  | 149 ++++++------------
 9 files changed, 219 insertions(+), 237 deletions(-)
 create mode 100644 frontend/src/lib/components/Description.svelte

diff --git a/frontend/src/lib/components/Description.svelte b/frontend/src/lib/components/Description.svelte
new file mode 100644
index 0000000000..59e233aaa8
--- /dev/null
+++ b/frontend/src/lib/components/Description.svelte
@@ -0,0 +1,10 @@
+<script lang="ts">
+	export let link: string | undefined = undefined
+</script>
+
+<div class="text-xs text-tertiary font-normal">
+	<slot />
+	{#if link}
+		<a href={link} target="_blank">Learn more</a>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/RunPageSchedules.svelte b/frontend/src/lib/components/RunPageSchedules.svelte
index e7d5e68f79..f953d160a5 100644
--- a/frontend/src/lib/components/RunPageSchedules.svelte
+++ b/frontend/src/lib/components/RunPageSchedules.svelte
@@ -14,6 +14,7 @@
 	import Toggle from './Toggle.svelte'
 	import { loadSchedules, saveSchedule } from './flows/scheduleUtils'
 	import { type Writable, writable } from 'svelte/store'
+	import Description from '$lib/components/Description.svelte'
 
 	export let schema: any
 	export let isFlow: boolean
@@ -48,14 +49,18 @@
 	}
 </script>
 
-<ScheduleEditor
-	on:update={() => {
-		updateSchedules(true)
-	}}
-	bind:this={scheduleEditor}
-/>
-
 <div class="flex flex-col gap-4 w-full">
+	<Description link="https://www.windmill.dev/docs/core_concepts/scheduling">
+		Run scripts and flows automatically on a recurring basis using cron expressions. Each script or
+		flow can have multiple schedules, with one designated as primary.
+	</Description>
+	<ScheduleEditor
+		on:update={() => {
+			updateSchedules(true)
+		}}
+		bind:this={scheduleEditor}
+	/>
+
 	{#if $primarySchedule == undefined}
 		<Skeleton layout={[[12]]} />
 	{:else if $primarySchedule}
@@ -163,7 +168,7 @@
 					}}
 					variant="contained"
 					color="dark"
-					size="md"
+					size="sm"
 					startIcon={{ icon: Calendar }}
 				>
 					Set Primary Schedule
diff --git a/frontend/src/lib/components/details/EmailTriggerPanel.svelte b/frontend/src/lib/components/details/EmailTriggerPanel.svelte
index fca824946f..0eb69d12bb 100644
--- a/frontend/src/lib/components/details/EmailTriggerPanel.svelte
+++ b/frontend/src/lib/components/details/EmailTriggerPanel.svelte
@@ -17,6 +17,7 @@
 	import Label from '$lib/components/Label.svelte'
 	import TriggerTokens from '../triggers/TriggerTokens.svelte'
 	let userSettings: UserSettings
+	import Description from '$lib/components/Description.svelte'
 
 	export let token: string
 	export let scopes: string[] = []
@@ -79,6 +80,11 @@
 />
 
 <div class="flex flex-col w-full gap-4">
+	<Description link="https://www.windmill.dev/docs/advanced/email_triggers">
+		Email triggers execute scripts and flows when emails are sent to specific addresses. Each
+		trigger has its own unique email address that can be used to invoke the script or flow.
+	</Description>
+
 	{#if loading}
 		<Skeleton layout={[[18]]} />
 	{:else}
diff --git a/frontend/src/lib/components/triggers/KafkaTriggersPanel.svelte b/frontend/src/lib/components/triggers/KafkaTriggersPanel.svelte
index fa52e2b72e..e4d247d084 100644
--- a/frontend/src/lib/components/triggers/KafkaTriggersPanel.svelte
+++ b/frontend/src/lib/components/triggers/KafkaTriggersPanel.svelte
@@ -10,6 +10,7 @@
 	import KafkaTriggerEditor from './KafkaTriggerEditor.svelte'
 	import { isCloudHosted } from '$lib/cloud'
 	import KafkaIcon from '../icons/KafkaIcon.svelte'
+	import Description from '$lib/components/Description.svelte'
 
 	export let isFlow: boolean
 	export let path: string
@@ -47,60 +48,66 @@
 	bind:this={kafkaTriggerEditor}
 />
 
-{#if !$enterpriseLicense}
-	<Alert title="EE Only" type="warning" size="xs">
-		Kafka triggers are an enterprise only feature.
-	</Alert>
-{:else if isCloudHosted()}
-	<Alert title="Not compatible with multi-tenant cloud" type="warning" size="xs">
-		Kafka triggers are disabled in the multi-tenant cloud.
-	</Alert>
-{:else}
-	<div class="flex flex-col gap-4">
-		{#if newItem}
-			<Alert title="Triggers disabled" type="warning" size="xs">
-				Deploy the {isFlow ? 'flow' : 'script'} to add kafka triggers.
-			</Alert>
-		{:else}
-			<Button
-				on:click={() => kafkaTriggerEditor?.openNew(isFlow, path)}
-				variant="border"
-				color="light"
-				size="xs"
-				startIcon={{ icon: KafkaIcon }}
-			>
-				New Kafka Trigger
-			</Button>
-			{#if kafkaTriggers}
-				{#if kafkaTriggers.length == 0}
-					<div class="text-xs text-secondary"> No kafka triggers </div>
-				{:else}
-					<div class="flex flex-col divide-y pt-2">
-						{#each kafkaTriggers as kafkaTrigger (kafkaTrigger.path)}
-							<div class="grid grid-cols-5 text-2xs items-center py-2">
-								<div class="col-span-2 truncate">{kafkaTrigger.path}</div>
-								<div class="col-span-2 truncate">
-									{kafkaTrigger.kafka_resource_path}
-								</div>
-								<div class="flex justify-end">
-									<button
-										on:click={() => kafkaTriggerEditor?.openEdit(kafkaTrigger.path, isFlow)}
-										class="px-2"
-									>
-										{#if kafkaTrigger.canWrite}
-											Edit
-										{:else}
-											View
-										{/if}
-									</button>
-								</div>
-							</div>
-						{/each}
-					</div>
-				{/if}
+<div class="flex flex-col w-full gap-4">
+	<Description link="https://www.windmill.dev/docs/core_concepts/kafka_triggers">
+		Kafka triggers execute scripts and flows in response to messages published to Kafka topics.
+	</Description>
+
+	{#if !$enterpriseLicense}
+		<Alert title="EE Only" type="warning" size="xs">
+			Kafka triggers are an enterprise only feature.
+		</Alert>
+	{:else if isCloudHosted()}
+		<Alert title="Not compatible with multi-tenant cloud" type="warning" size="xs">
+			Kafka triggers are disabled in the multi-tenant cloud.
+		</Alert>
+	{:else}
+		<div class="flex flex-col gap-4">
+			{#if newItem}
+				<Alert title="Triggers disabled" type="warning" size="xs">
+					Deploy the {isFlow ? 'flow' : 'script'} to add kafka triggers.
+				</Alert>
 			{:else}
-				<Skeleton layout={[[8]]} />
+				<Button
+					on:click={() => kafkaTriggerEditor?.openNew(isFlow, path)}
+					variant="border"
+					color="light"
+					size="xs"
+					startIcon={{ icon: KafkaIcon }}
+				>
+					New Kafka Trigger
+				</Button>
+				{#if kafkaTriggers}
+					{#if kafkaTriggers.length == 0}
+						<div class="text-xs text-secondary"> No kafka triggers </div>
+					{:else}
+						<div class="flex flex-col divide-y pt-2">
+							{#each kafkaTriggers as kafkaTrigger (kafkaTrigger.path)}
+								<div class="grid grid-cols-5 text-2xs items-center py-2">
+									<div class="col-span-2 truncate">{kafkaTrigger.path}</div>
+									<div class="col-span-2 truncate">
+										{kafkaTrigger.kafka_resource_path}
+									</div>
+									<div class="flex justify-end">
+										<button
+											on:click={() => kafkaTriggerEditor?.openEdit(kafkaTrigger.path, isFlow)}
+											class="px-2"
+										>
+											{#if kafkaTrigger.canWrite}
+												Edit
+											{:else}
+												View
+											{/if}
+										</button>
+									</div>
+								</div>
+							{/each}
+						</div>
+					{/if}
+				{:else}
+					<Skeleton layout={[[8]]} />
+				{/if}
 			{/if}
-		{/if}
-	</div>
-{/if}
+		</div>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/triggers/RoutesPanel.svelte b/frontend/src/lib/components/triggers/RoutesPanel.svelte
index 12feac5bd8..425b9dd9c7 100644
--- a/frontend/src/lib/components/triggers/RoutesPanel.svelte
+++ b/frontend/src/lib/components/triggers/RoutesPanel.svelte
@@ -10,7 +10,7 @@
 	import Alert from '../common/alert/Alert.svelte'
 	import type { TriggerContext } from '../triggers'
 	import { getContext } from 'svelte'
-
+	import Description from '$lib/components/Description.svelte'
 	export let isFlow: boolean
 	export let path: string
 	export let newItem: boolean = false
@@ -48,6 +48,11 @@
 />
 
 <div class="flex flex-col gap-4">
+	<Description link="https://www.windmill.dev/docs/core_concepts/http_routing">
+		Routes expose your scripts and flows as HTTP endpoints. Each route can be configured with a
+		specific HTTP method and path.
+	</Description>
+
 	{#if !newItem}
 		{#if $userStore?.is_admin || $userStore?.is_super_admin}
 			<Button
diff --git a/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
index 5b60c96064..4502526c81 100644
--- a/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
+++ b/frontend/src/lib/components/triggers/ScheduledPollPanel.svelte
@@ -1,19 +1,15 @@
 <script lang="ts">
-	import Alert from '$lib/components/common/alert/Alert.svelte'
 	import Label from '$lib/components/Label.svelte'
 	import { base } from '$lib/base'
+	import Description from '$lib/components/Description.svelte'
 </script>
 
 <div class="flex flex-col w-full gap-4 text-sm">
-	<Alert
-		title="Scheduled Poll"
-		size="xs"
-		documentationLink="https://www.windmill.dev/docs/flows/flow_trigger"
-	>
-		Sheduled Poll is a trigger that polls an external API at a given interval. It is useful for
+	<Description link="https://www.windmill.dev/docs/flows/flow_trigger">
+		Scheduled Poll is a trigger that polls an external API at a given interval. It is useful for
 		triggering jobs based on the change of external states. Under the hood, it is a script triggered
 		by a schedule, and returning a list of the changed states so we can iterate over them.
-	</Alert>
+	</Description>
 
 	<Label label="Setting a scheduled poll" primary>
 		<ul class="pt-4 space-y-2 text-sm">
diff --git a/frontend/src/lib/components/triggers/WebhooksPanel.svelte b/frontend/src/lib/components/triggers/WebhooksPanel.svelte
index 40b89f5939..3746ab67ca 100644
--- a/frontend/src/lib/components/triggers/WebhooksPanel.svelte
+++ b/frontend/src/lib/components/triggers/WebhooksPanel.svelte
@@ -20,6 +20,7 @@
 	import { base } from '$lib/base'
 	import Label from '$lib/components/Label.svelte'
 	import TriggerTokens from './TriggerTokens.svelte'
+	import Description from '$lib/components/Description.svelte'
 	let userSettings: UserSettings
 
 	export let token: string
@@ -227,18 +228,22 @@ done`
 
 <HighlightTheme />
 
-<UserSettings
-	bind:this={userSettings}
-	on:tokenCreated={(e) => {
-		token = e.detail
-		triggerTokens?.listTokens()
-	}}
-	newTokenWorkspace={$workspaceStore}
-	newTokenLabel={`webhook-${$userStore?.username ?? 'superadmin'}-${generateRandomString(4)}`}
-	{scopes}
-/>
-
 <div class="flex flex-col w-full gap-4">
+	<Description link="https://www.windmill.dev/docs/core_concepts/webhooks">
+		Webhooks trigger scripts or flows via HTTP requests. Each webhook can be configured to run
+		synchronously or asynchronously. You can secure webhooks using tokens with specific permissions.
+	</Description>
+
+	<UserSettings
+		bind:this={userSettings}
+		on:tokenCreated={(e) => {
+			token = e.detail
+			triggerTokens?.listTokens()
+		}}
+		newTokenWorkspace={$workspaceStore}
+		newTokenLabel={`webhook-${$userStore?.username ?? 'superadmin'}-${generateRandomString(4)}`}
+		{scopes}
+	/>
 	{#if SCRIPT_VIEW_SHOW_CREATE_TOKEN_BUTTON}
 		<Label label="Token">
 			<div class="flex flex-row justify-between gap-2">
diff --git a/frontend/src/lib/components/triggers/WebsocketTriggersPanel.svelte b/frontend/src/lib/components/triggers/WebsocketTriggersPanel.svelte
index 2bd9aa5fca..aea9e6283c 100644
--- a/frontend/src/lib/components/triggers/WebsocketTriggersPanel.svelte
+++ b/frontend/src/lib/components/triggers/WebsocketTriggersPanel.svelte
@@ -11,7 +11,7 @@
 	import { getContext } from 'svelte'
 	import WebsocketTriggerEditor from './WebsocketTriggerEditor.svelte'
 	import { isCloudHosted } from '$lib/cloud'
-
+	import Description from '$lib/components/Description.svelte'
 	export let isFlow: boolean
 	export let path: string
 	export let newItem: boolean = false
@@ -48,54 +48,61 @@
 	bind:this={wsTriggerEditor}
 />
 
-{#if isCloudHosted()}
-	<Alert title="Not compatible with multi-tenant cloud" type="warning" size="xs">
-		Websocket triggers are disabled in the multi-tenant cloud.
-	</Alert>
-{:else}
-	<div class="flex flex-col gap-4">
-		{#if newItem}
-			<Alert title="Triggers disabled" type="warning" size="xs">
-				Deploy the {isFlow ? 'flow' : 'script'} to add WS triggers.
-			</Alert>
-		{:else if wsTriggers}
-			<Button
-				on:click={() => wsTriggerEditor?.openNew(isFlow, path)}
-				variant="border"
-				color="light"
-				size="xs"
-				startIcon={{ icon: UnplugIcon }}
-			>
-				New WS Trigger
-			</Button>
-			{#if wsTriggers.length == 0}
-				<div class="text-xs text-secondary"> No WS triggers </div>
+<div class="flex flex-col w-full gap-4">
+	<Description link="https://www.windmill.dev/docs/core_concepts/websocket_triggers">
+		Websocket triggers allow real-time bidirectional communication between your scripts/flows and
+		external systems. Each trigger creates a unique websocket endpoint.
+	</Description>
+
+	{#if isCloudHosted()}
+		<Alert title="Not compatible with multi-tenant cloud" type="warning" size="xs">
+			Websocket triggers are disabled in the multi-tenant cloud.
+		</Alert>
+	{:else}
+		<div class="flex flex-col gap-4">
+			{#if newItem}
+				<Alert title="Triggers disabled" type="warning" size="xs">
+					Deploy the {isFlow ? 'flow' : 'script'} to add WS triggers.
+				</Alert>
+			{:else if wsTriggers}
+				<Button
+					on:click={() => wsTriggerEditor?.openNew(isFlow, path)}
+					variant="border"
+					color="light"
+					size="xs"
+					startIcon={{ icon: UnplugIcon }}
+				>
+					New WS Trigger
+				</Button>
+				{#if wsTriggers.length == 0}
+					<div class="text-xs text-secondary"> No WS triggers </div>
+				{:else}
+					<div class="flex flex-col divide-y pt-2">
+						{#each wsTriggers as wsTriggers (wsTriggers.path)}
+							<div class="grid grid-cols-5 text-2xs items-center py-2">
+								<div class="col-span-2 truncate">{wsTriggers.path}</div>
+								<div class="col-span-2 truncate">
+									{wsTriggers.url}
+								</div>
+								<div class="flex justify-end">
+									<button
+										on:click={() => wsTriggerEditor?.openEdit(wsTriggers.path, isFlow)}
+										class="px-2"
+									>
+										{#if wsTriggers.canWrite}
+											Edit
+										{:else}
+											View
+										{/if}
+									</button>
+								</div>
+							</div>
+						{/each}
+					</div>
+				{/if}
 			{:else}
-				<div class="flex flex-col divide-y pt-2">
-					{#each wsTriggers as wsTriggers (wsTriggers.path)}
-						<div class="grid grid-cols-5 text-2xs items-center py-2">
-							<div class="col-span-2 truncate">{wsTriggers.path}</div>
-							<div class="col-span-2 truncate">
-								{wsTriggers.url}
-							</div>
-							<div class="flex justify-end">
-								<button
-									on:click={() => wsTriggerEditor?.openEdit(wsTriggers.path, isFlow)}
-									class="px-2"
-								>
-									{#if wsTriggers.canWrite}
-										Edit
-									{:else}
-										View
-									{/if}
-								</button>
-							</div>
-						</div>
-					{/each}
-				</div>
+				<Skeleton layout={[[8]]} />
 			{/if}
-		{:else}
-			<Skeleton layout={[[8]]} />
-		{/if}
-	</div>
-{/if}
+		</div>
+	{/if}
+</div>
diff --git a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
index 6e9ba1d116..36bfda9a2d 100644
--- a/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/workspace_settings/+page.svelte
@@ -66,6 +66,7 @@
 	import ToggleButtonGroup from '$lib/components/common/toggleButton-v2/ToggleButtonGroup.svelte'
 	import ToggleButton from '$lib/components/common/toggleButton-v2/ToggleButton.svelte'
 	import type { AiProviderTypes } from '$lib/components/copilot/lib'
+	import Description from '$lib/components/Description.svelte'
 
 	type GitSyncTypeMap = {
 		scripts: boolean
@@ -693,18 +694,12 @@
 		{:else if tab == 'deploy_to'}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold">
+					<div class="text-primary text-lg font-semibold">
 						Link this workspace to another Staging / Prod workspace
 					</div>
-					<div class="text-tertiary text-xs">
-						Connecting this workspace with another staging/production workspace enables web-based
-						deployment to that workspace.
-						<a
-							href="https://www.windmill.dev/docs/core_concepts/staging_prod"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					<Description link="https://www.windmill.dev/docs/core_concepts/staging_prod">
+						Connecting this workspace with another staging/production workspace enables web-based deployment to that workspace.
+					</Description>
 				</div>
 			</div>
 			{#if $enterpriseLicense}
@@ -722,15 +717,10 @@
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
 					<div class=" text-primary text-lg font-semibold"> Connect workspace to Slack </div>
-					<div class="text-tertiary text-xs">
+					<Description link="https://www.windmill.dev/docs/integrations/slack">
 						Connect your Windmill workspace to your Slack workspace to trigger a script or a flow
 						with a '/windmill' command or to configure Slack error handlers.
-						<a
-							href="https://www.windmill.dev/docs/integrations/slack"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					</Description>
 				</div>
 
 				{#if team_name}
@@ -891,15 +881,10 @@
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
 					<div class=" text-primary text-lg font-semibold"> Workspace Webhook</div>
-					<div class="text-tertiary text-xs">
+					<Description link="https://www.windmill.dev/docs/core_concepts/webhooks#workspace-webhook">
 						Connect your Windmill workspace to an external service to sync or get notified about any
 						change.
-						<a
-							href="https://www.windmill.dev/docs/core_concepts/webhooks#workspace-webhook"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					</Description>
 				</div>
 			</div>
 			<div class="flex flex-col gap-4 my-4">
@@ -926,20 +911,15 @@
 			{/if}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold"> Workspace Error Handler</div>
-					<div class="text-tertiary text-xs">
+					<div class="text-primary text-lg font-semibold"> Workspace Error Handler</div>
+					<Description link="https://www.windmill.dev/docs/core_concepts/error_handling#workspace-error-handler">
 						Define a script or flow to be executed automatically in case of error in the workspace.
-						<a
-							href="https://www.windmill.dev/docs/core_concepts/error_handling#workspace-error-handler"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					</Description>
 				</div>
 			</div>
 			<div class="flex flex-col gap-4 my-4">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-base font-semibold">
+					<div class="text-primary text-base font-semibold">
 						Script or flow to run as error handler</div
 					>
 				</div>
@@ -1001,16 +981,10 @@
 			</div>
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold"> Workspace Critical Alerts</div>
-					<div class="text-tertiary text-xs">
-						Critical alerts within the scope of a workspace are sent to the workspace admins through
-						a UI notification.
-						<a
-							href="https://www.windmill.dev/docs/core_concepts/critical_alerts"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					<div class="text-primary text-lg font-semibold"> Workspace Critical Alerts</div>
+					<Description link="https://www.windmill.dev/docs/core_concepts/critical_alerts">
+						Critical alerts within the scope of a workspace are sent to the workspace admins through a UI notification.
+					</Description>
 					<div class="flex flex-col mt-5 gap-5 items-start">
 						<Button
 							disabled={!$enterpriseLicense}
@@ -1037,24 +1011,20 @@
 		{:else if tab == 'ai'}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold"> Windmill AI</div>
-					<div class="text-tertiary text-xs">
+					<div class="text-primary text-lg font-semibold"> Windmill AI</div>
+					<Description>
 						Select an OpenAI resource to unlock Windmill AI features.
-					</div>
-					<div class="text-tertiary text-xs">
+					</Description>
+					<Description link="https://www.windmill.dev/docs/core_concepts/ai_generation">
 						Windmill AI supports integration with your preferred AI provider for all AI features.
-						<a
-							href="https://www.windmill.dev/docs/core_concepts/ai_generation"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					</Description>
 				</div>
 			</div>
 			<ToggleButtonGroup
 				bind:selected
 				on:selected={() => {
 					aiResourceInitialPath = ''
+					aiResourceInitialProvider = ''
 				}}
 			>
 				<ToggleButton value="openai" label="OpenAI" />
@@ -1091,18 +1061,10 @@
 		{:else if tab == 'windmill_lfs'}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold"
-						>Workspace object storage (S3/Azure Blob)</div
-					>
-					<div class="text-tertiary text-xs">
-						Connect your Windmill workspace to your S3 bucket or your Azure Blob storage to enable
-						users to read and write from S3 without having to have access to the credentials.
-						<a
-							href="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#workspace-object-storage"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					<div class="text-primary text-lg font-semibold">Workspace object storage (S3/Azure Blob)</div>
+					<Description link="https://www.windmill.dev/docs/core_concepts/object_storage_in_windmill#workspace-object-storage">
+						Connect your Windmill workspace to your S3 bucket or your Azure Blob storage to enable users to read and write from S3 without having to have access to the credentials.
+					</Description>
 				</div>
 			</div>
 			{#if !$enterpriseLicense}
@@ -1278,16 +1240,10 @@
 		{:else if tab == 'git_sync'}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold"> Git Sync </div>
-					<div class="text-tertiary text-xs">
-						Connect the Windmill workspace to a Git repository to automatically commit and push
-						scripts, flows, and apps to the repository on each deploy.
-						<a
-							href="https://www.windmill.dev/docs/advanced/git_sync"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					<div class="text-primary text-lg font-semibold">Git Sync</div>
+					<Description link="https://www.windmill.dev/docs/advanced/git_sync">
+						Connect the Windmill workspace to a Git repository to automatically commit and push scripts, flows, and apps to the repository on each deploy.
+					</Description>
 				</div>
 			</div>
 			{#if !$enterpriseLicense}
@@ -1732,20 +1688,13 @@ git push</code
 		{:else if tab == 'default_app'}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold">Workspace default app</div>
-					<div class="text-tertiary text-xs">
-						If configured, users who are operators in this workspace will be redirected to this app
-						automatically when logging into this workspace.
-					</div>
-					<div class="text-tertiary text-xs">
-						Make sure the default app is shared with all the operators of this workspace before
-						turning this feature on.
-						<a
-							href="https://www.windmill.dev/docs/apps/default_app"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					<div class="text-primary text-lg font-semibold">Workspace default app</div>
+					<Description>
+						If configured, users who are operators in this workspace will be redirected to this app automatically when logging into this workspace.
+					</Description>
+					<Description link="https://www.windmill.dev/docs/apps/default_app">
+						Make sure the default app is shared with all the operators of this workspace before turning this feature on.
+					</Description>
 				</div>
 			</div>
 			{#if !$enterpriseLicense}
@@ -1771,21 +1720,13 @@ git push</code
 		{:else if tab == 'encryption'}
 			<div class="flex flex-col gap-4 my-8">
 				<div class="flex flex-col gap-1">
-					<div class=" text-primary text-lg font-semibold">Workspace secret encryption</div>
-					<div class="text-tertiary text-xs">
-						When updating the encryption key of a workspace, all secrets will be re-encrypted with
-						the new key and the previous key will be replaced by the new one.
-					</div>
-					<div class="text-tertiary text-xs">
-						If you're manually updating the key to match another workspace key from another Windmill
-						instance, make sure not to use the 'SECRET_SALT' environment variable or, if you're
-						using it, make sure it the salt matches across both instances.
-						<a
-							href="https://www.windmill.dev/docs/core_concepts/workspace_secret_encryption"
-							target="_blank"
-							class="text-blue-500">Learn more</a
-						>.
-					</div>
+					<div class="text-primary text-lg font-semibold">Workspace secret encryption</div>
+					<Description>
+						When updating the encryption key of a workspace, all secrets will be re-encrypted with the new key and the previous key will be replaced by the new one.
+					</Description>
+					<Description link="https://www.windmill.dev/docs/core_concepts/workspace_secret_encryption">
+						If you're manually updating the key to match another workspace key from another Windmill instance, make sure not to use the 'SECRET_SALT' environment variable or, if you're using it, make sure it the salt matches across both instances.
+					</Description>
 				</div>
 			</div>
 			<div class="mt-5 flex gap-1 mb-10">

From 4efa9c2b0a03a559a583e581135397d84724aad8 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Wed, 4 Dec 2024 14:11:44 +0100
Subject: [PATCH 04/34] chore(main): release 1.434.2 (#4836)

* chore(main): release 1.434.2

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |   7 +
 backend/Cargo.lock                            | 386 +++++++++---------
 backend/Cargo.toml                            |   4 +-
 backend/windmill-api/openapi.yaml             |   2 +-
 benchmarks/lib.ts                             |   2 +-
 cli/main.ts                                   |   2 +-
 frontend/package-lock.json                    |   4 +-
 frontend/package.json                         |   2 +-
 lsp/Pipfile                                   |   4 +-
 openflow.openapi.yaml                         |   2 +-
 .../WindmillClient/WindmillClient.psd1        |   2 +-
 python-client/wmill/pyproject.toml            |   2 +-
 python-client/wmill_pg/pyproject.toml         |   2 +-
 typescript-client/jsr.json                    |   2 +-
 typescript-client/package.json                |   2 +-
 version.txt                                   |   2 +-
 16 files changed, 222 insertions(+), 205 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 656fb77d8a..29628db02c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.434.2](https://github.com/windmill-labs/windmill/compare/v1.434.1...v1.434.2) (2024-12-04)
+
+
+### Bug Fixes
+
+* custom http routes auth ([#4835](https://github.com/windmill-labs/windmill/issues/4835)) ([02611e4](https://github.com/windmill-labs/windmill/commit/02611e42e1b5c81d9bc57e3b46795e4c8cad67f7))
+
 ## [1.434.1](https://github.com/windmill-labs/windmill/compare/v1.434.0...v1.434.1) (2024-11-29)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 2e176de462..54facad0c1 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -96,9 +96,9 @@ dependencies = [
 
 [[package]]
 name = "allocator-api2"
-version = "0.2.20"
+version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45862d1c77f2228b9e10bc609d5bc203d86ebc9b87ad8d5d5167a6c9abf739d9"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
 [[package]]
 name = "android-tzdata"
@@ -166,9 +166,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.93"
+version = "1.0.94"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
 
 [[package]]
 name = "arc-swap"
@@ -359,7 +359,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "lexical-core",
  "num",
  "serde",
@@ -441,7 +441,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -499,7 +499,7 @@ checksum = "021cf450e9574793e45e1044a5d3d94bba7dbaa0802e6122e9c10eb8c4dd12dc"
 dependencies = [
  "base64 0.22.1",
  "bytes",
- "http 1.1.0",
+ "http 1.2.0",
  "rand 0.8.5",
  "reqwest 0.12.9",
  "serde",
@@ -518,7 +518,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -540,7 +540,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -576,7 +576,7 @@ checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -641,7 +641,7 @@ dependencies = [
  "aws-sdk-sts",
  "aws-smithy-async",
  "aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.60.7",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -672,9 +672,9 @@ dependencies = [
 
 [[package]]
 name = "aws-runtime"
-version = "1.4.3"
+version = "1.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a10d5c055aa540164d9561a0e2e74ad30f0dcf7393c3a92f6733ddf9c5762468"
+checksum = "b5ac934720fbb46206292d2c75b57e67acfc56fe7dfd34fb9a02334af08409ea"
 dependencies = [
  "aws-credential-types",
  "aws-sigv4",
@@ -697,15 +697,15 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sso"
-version = "1.49.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09677244a9da92172c8dc60109b4a9658597d4d298b188dd0018b6a66b410ca4"
+checksum = "05ca43a4ef210894f93096039ef1d6fa4ad3edfabb3be92b80908b9f2e4b4eab"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
  "aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -719,15 +719,15 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-ssooidc"
-version = "1.50.0"
+version = "1.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81fea2f3a8bb3bd10932ae7ad59cc59f65f270fc9183a7e91f501dc5efbef7ee"
+checksum = "abaf490c2e48eed0bb8e2da2fb08405647bd7f253996e0f93b981958ea0f73b0"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
  "aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
  "aws-smithy-types",
@@ -741,15 +741,15 @@ dependencies = [
 
 [[package]]
 name = "aws-sdk-sts"
-version = "1.50.0"
+version = "1.51.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ada54e5f26ac246dc79727def52f7f8ed38915cb47781e2a72213957dc3a7d5"
+checksum = "b68fde0d69c8bfdc1060ea7da21df3e39f6014da316783336deff0a9ec28f4bf"
 dependencies = [
  "aws-credential-types",
  "aws-runtime",
  "aws-smithy-async",
  "aws-smithy-http",
- "aws-smithy-json",
+ "aws-smithy-json 0.61.1",
  "aws-smithy-query",
  "aws-smithy-runtime",
  "aws-smithy-runtime-api",
@@ -764,9 +764,9 @@ dependencies = [
 
 [[package]]
 name = "aws-sigv4"
-version = "1.2.5"
+version = "1.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5619742a0d8f253be760bfbb8e8e8368c69e3587e4637af5754e488a611499b1"
+checksum = "7d3820e0c08d0737872ff3c7c1f21ebbb6693d832312d6152bf18ef50a5471c2"
 dependencies = [
  "aws-credential-types",
  "aws-smithy-http",
@@ -777,7 +777,7 @@ dependencies = [
  "hex",
  "hmac",
  "http 0.2.12",
- "http 1.1.0",
+ "http 1.2.0",
  "once_cell",
  "percent-encoding",
  "sha2 0.10.8",
@@ -825,6 +825,15 @@ dependencies = [
  "aws-smithy-types",
 ]
 
+[[package]]
+name = "aws-smithy-json"
+version = "0.61.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee4e69cc50921eb913c6b662f8d909131bb3e6ad6cb6090d3a39b66fc5c52095"
+dependencies = [
+ "aws-smithy-types",
+]
+
 [[package]]
 name = "aws-smithy-query"
 version = "0.60.7"
@@ -837,9 +846,9 @@ dependencies = [
 
 [[package]]
 name = "aws-smithy-runtime"
-version = "1.7.3"
+version = "1.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be28bd063fa91fd871d131fc8b68d7cd4c5fa0869bea68daca50dcb1cbd76be2"
+checksum = "9f20685047ca9d6f17b994a07f629c813f08b5bce65523e47124879e60103d45"
 dependencies = [
  "aws-smithy-async",
  "aws-smithy-http",
@@ -872,7 +881,7 @@ dependencies = [
  "aws-smithy-types",
  "bytes",
  "http 0.2.12",
- "http 1.1.0",
+ "http 1.2.0",
  "pin-project-lite",
  "tokio",
  "tracing",
@@ -890,7 +899,7 @@ dependencies = [
  "bytes-utils",
  "futures-core",
  "http 0.2.12",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 0.4.6",
  "http-body 1.0.1",
  "http-body-util",
@@ -938,7 +947,7 @@ dependencies = [
  "axum-core",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.5.1",
@@ -972,7 +981,7 @@ dependencies = [
  "async-trait",
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
  "mime",
@@ -1115,7 +1124,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.89",
+ "syn 2.0.90",
  "which 4.4.2",
 ]
 
@@ -1134,7 +1143,7 @@ dependencies = [
  "regex",
  "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1265,7 +1274,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1367,7 +1376,7 @@ checksum = "bcfcc3cd946cb52f0bbfdbbcfa2f4e24f75ebb6c0e1002f7c25904fada18b9ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -1598,9 +1607,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.21"
+version = "4.5.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb3b4b9e5a7c7514dfa52869339ee98b3156b0bfb4e8a77c4ff4babb64b1604f"
+checksum = "69371e34337c4c984bbe322360c2547210bf632eb2814bbe78a6e87a2935bd2b"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1608,9 +1617,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.21"
+version = "4.5.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b17a95aa67cc7b5ebd32aa5370189aa0d79069ef1c64ce893bd30fb24bff20ec"
+checksum = "6e24c1b4099818523236a8ca881d2b45db98dadfb4625cf6608c12069fcbbde1"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1627,7 +1636,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2012,7 +2021,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2060,7 +2069,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "strsim 0.11.1",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2082,7 +2091,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core 0.20.10",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2144,7 +2153,7 @@ dependencies = [
  "glob",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itertools 0.12.1",
  "log",
  "num_cpus",
@@ -2313,7 +2322,7 @@ dependencies = [
  "datafusion-expr",
  "datafusion-physical-expr",
  "hashbrown 0.14.5",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itertools 0.12.1",
  "log",
  "regex-syntax 0.8.5",
@@ -2342,7 +2351,7 @@ dependencies = [
  "half",
  "hashbrown 0.14.5",
  "hex",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itertools 0.12.1",
  "log",
  "paste",
@@ -2386,7 +2395,7 @@ dependencies = [
  "futures",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itertools 0.12.1",
  "log",
  "once_cell",
@@ -2531,7 +2540,7 @@ dependencies = [
  "deno_tls",
  "dyn-clone",
  "error_reporter",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body-util",
  "hyper 1.5.1",
  "hyper-rustls 0.27.3",
@@ -2603,7 +2612,7 @@ dependencies = [
  "quote",
  "strum 0.25.0",
  "strum_macros 0.25.3",
- "syn 2.0.89",
+ "syn 2.0.90",
  "thiserror 1.0.69",
 ]
 
@@ -2676,10 +2685,11 @@ dependencies = [
 
 [[package]]
 name = "deno_unsync"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f36b4ef61a04ce201b925a5dffa90f88437d37fee4836c758470dd15ba7f05e"
+checksum = "d774fd83f26b24f0805a6ab8b26834a0d06ceac0db517b769b1e4633c96a2057"
 dependencies = [
+ "futures",
  "parking_lot",
  "tokio",
 ]
@@ -2795,7 +2805,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustc_version 0.4.1",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2900,7 +2910,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -2923,7 +2933,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3079,7 +3089,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3099,7 +3109,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3304,7 +3314,7 @@ checksum = "32016f1242eb82af5474752d00fd8ebcd9004bd69b462b1c91de833972d08ed4"
 dependencies = [
  "proc-macro2",
  "swc_macros_common",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3336,7 +3346,7 @@ checksum = "e99b8b3c28ae0e84b604c75f721c21dc77afb3706076af5e8216d15fd1deaae3"
 dependencies = [
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3348,7 +3358,7 @@ dependencies = [
  "frunk_core",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3360,7 +3370,7 @@ dependencies = [
  "frunk_core",
  "frunk_proc_macro_helpers",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3471,7 +3481,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3724,7 +3734,7 @@ checksum = "53010ccb100b96a67bc32c0175f0ed1426b31b655d562898e57325f81c023ac0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -3802,7 +3812,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -3820,8 +3830,8 @@ dependencies = [
  "fnv",
  "futures-core",
  "futures-sink",
- "http 1.1.0",
- "indexmap 2.6.0",
+ "http 1.2.0",
+ "indexmap 2.7.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -4002,9 +4012,9 @@ dependencies = [
 
 [[package]]
 name = "http"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
+checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
 dependencies = [
  "bytes",
  "fnv",
@@ -4029,7 +4039,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
 dependencies = [
  "bytes",
- "http 1.1.0",
+ "http 1.2.0",
 ]
 
 [[package]]
@@ -4040,7 +4050,7 @@ checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
 dependencies = [
  "bytes",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "pin-project-lite",
 ]
@@ -4118,7 +4128,7 @@ dependencies = [
  "futures-channel",
  "futures-util",
  "h2 0.4.7",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "httparse",
  "httpdate",
@@ -4152,7 +4162,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08afdbb5c31130e3034af566421053ab03787c640246a446327f550d11bcb333"
 dependencies = [
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "hyper 1.5.1",
  "hyper-util",
  "rustls 0.23.19",
@@ -4201,7 +4211,7 @@ dependencies = [
  "bytes",
  "futures-channel",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "hyper 1.5.1",
  "pin-project-lite",
@@ -4350,7 +4360,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4409,9 +4419,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
+checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
  "equivalent",
  "hashbrown 0.15.2",
@@ -4482,7 +4492,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -4571,7 +4581,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ee7893dab2e44ae5f9d0173f26ff4aa327c10b01b06a72b52dd9405b628640d"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
 ]
 
 [[package]]
@@ -5126,7 +5136,7 @@ checksum = "a7ce64b975ed4f123575d11afd9491f2e37bbd5813fbfbc0f09ae1fbddea74e0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5138,7 +5148,7 @@ dependencies = [
  "bytes",
  "encoding_rs",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "httparse",
  "memchr",
  "mime",
@@ -5165,7 +5175,7 @@ dependencies = [
  "proc-macro-error2",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
  "termcolor",
  "thiserror 1.0.69",
 ]
@@ -5422,7 +5432,7 @@ dependencies = [
  "proc-macro-crate",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5596,7 +5606,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5840,7 +5850,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
 ]
 
 [[package]]
@@ -5883,7 +5893,7 @@ dependencies = [
  "phf_shared",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -5924,7 +5934,7 @@ checksum = "3c0f5fad0874fc7abcd4d750e76917eaebbecaa2c20bde22e1dbeeba8beb758c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6080,7 +6090,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "64d1ec885c64d0457d564db4ec299b2dae3f9c02808b8ad9c3a089c591b18033"
 dependencies = [
  "proc-macro2",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6120,7 +6130,7 @@ dependencies = [
  "proc-macro-error-attr2",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6131,7 +6141,7 @@ checksum = "07c277e4e643ef00c1233393c673f655e3672cf7eb3ba08a00bdd0ea59139b5f"
 dependencies = [
  "proc-macro-rules-macros",
  "proc-macro2",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6143,7 +6153,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6204,7 +6214,7 @@ dependencies = [
  "schemars",
  "serde",
  "serde_json",
- "syn 2.0.89",
+ "syn 2.0.90",
  "thiserror 1.0.69",
  "typify",
  "unicode-ident",
@@ -6224,7 +6234,7 @@ dependencies = [
  "serde_json",
  "serde_tokenstream",
  "serde_yaml",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6267,7 +6277,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -6380,10 +6390,10 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto",
  "quinn-udp",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
  "rustls 0.23.19",
  "socket2",
- "thiserror 2.0.3",
+ "thiserror 2.0.4",
  "tokio",
  "tracing",
 ]
@@ -6398,11 +6408,11 @@ dependencies = [
  "getrandom 0.2.15",
  "rand 0.8.5",
  "ring 0.17.8",
- "rustc-hash 2.0.0",
+ "rustc-hash 2.1.0",
  "rustls 0.23.19",
  "rustls-pki-types",
  "slab",
- "thiserror 2.0.3",
+ "thiserror 2.0.4",
  "tinyvec",
  "tracing",
  "web-time",
@@ -6759,7 +6769,7 @@ dependencies = [
  "futures-core",
  "futures-util",
  "h2 0.4.7",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.5.1",
@@ -6944,7 +6954,7 @@ dependencies = [
  "quote",
  "rust-embed-utils",
  "shellexpand",
- "syn 2.0.89",
+ "syn 2.0.90",
  "walkdir",
 ]
 
@@ -6999,9 +7009,9 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
 [[package]]
 name = "rustc-hash"
-version = "2.0.0"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+checksum = "c7fb8039b3032c191086b10f11f319a6e99e1e82889c5cc6046f515c9db1d497"
 
 [[package]]
 name = "rustc_version"
@@ -7326,7 +7336,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde_derive_internals",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7486,7 +7496,7 @@ checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7497,7 +7507,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7506,7 +7516,7 @@ version = "1.0.133"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itoa",
  "memchr",
  "ryu",
@@ -7572,7 +7582,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "serde",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7610,7 +7620,7 @@ dependencies = [
  "chrono",
  "hex",
  "indexmap 1.9.3",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_derive",
  "serde_json",
@@ -7627,7 +7637,7 @@ dependencies = [
  "darling 0.20.10",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -7636,7 +7646,7 @@ version = "0.9.34+deprecated"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itoa",
  "ryu",
  "serde",
@@ -7989,7 +7999,7 @@ checksum = "01b2e185515564f15375f593fb966b5718bc624ba77fe49fa4616ad619690554"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8028,7 +8038,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hashlink",
  "hex",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "log",
  "memchr",
  "once_cell",
@@ -8060,7 +8070,7 @@ dependencies = [
  "quote",
  "sqlx-core",
  "sqlx-macros-core",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8083,7 +8093,7 @@ dependencies = [
  "sqlx-mysql",
  "sqlx-postgres",
  "sqlx-sqlite",
- "syn 2.0.89",
+ "syn 2.0.90",
  "tempfile",
  "tokio",
  "url",
@@ -8235,7 +8245,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8289,7 +8299,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8302,7 +8312,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8394,7 +8404,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4740e53eaf68b101203c1df0937d5161a29f3c13bceed0836ddfe245b72dd000"
 dependencies = [
  "anyhow",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_json",
  "swc_cached",
@@ -8410,7 +8420,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8459,7 +8469,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8506,7 +8516,7 @@ checksum = "65f21494e75d0bd8ef42010b47cabab9caaed8f2207570e809f6f4eb51a710d1"
 dependencies = [
  "better_scoped_tls",
  "bitflags 2.6.0",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "once_cell",
  "phf",
  "rustc-hash 1.1.0",
@@ -8544,7 +8554,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8575,7 +8585,7 @@ checksum = "76c76d8b9792ce51401d38da0fa62158d61f6d80d16d68fe5b03ce4bf5fba383"
 dependencies = [
  "base64 0.21.7",
  "dashmap",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "once_cell",
  "serde",
  "sha1",
@@ -8615,7 +8625,7 @@ version = "0.134.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "029eec7dd485923a75b5a45befd04510288870250270292fc2c1b3a9e7547408"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "num_cpus",
  "once_cell",
  "rustc-hash 1.1.0",
@@ -8651,7 +8661,7 @@ checksum = "63db0adcff29d220c3d151c5b25c0eabe7e32dd936212b84cdaa1392e3130497"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8662,7 +8672,7 @@ checksum = "f486687bfb7b5c560868f69ed2d458b880cebc9babebcb67e49f31b55c5bf847"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8685,7 +8695,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "swc_macros_common",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8701,9 +8711,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.89"
+version = "2.0.90"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44d46482f1c1c87acd84dea20c1bf5ebff4c757009ed6bf19cfd36fb10e92c4e"
+checksum = "919d3b74a5dd0ccd15aeb8f93e7006bd9e14c295087c9896a110f490752bcf31"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8733,7 +8743,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -8992,11 +9002,11 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c006c85c7651b3cf2ada4584faa36773bd07bac24acfb39f3c431b36d7e667aa"
+checksum = "2f49a1853cf82743e3b7950f77e0f4d622ca36cf4317cba00c767838bac8d490"
 dependencies = [
- "thiserror-impl 2.0.3",
+ "thiserror-impl 2.0.4",
 ]
 
 [[package]]
@@ -9007,18 +9017,18 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.3"
+version = "2.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f077553d607adc1caf65430528a576c757a71ed73944b66ebb58ef2bbd243568"
+checksum = "8381894bb3efe0c4acac3ded651301ceee58a15d47c2e34885ed1908ad667061"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -9114,9 +9124,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.36"
+version = "0.3.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
+checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
 dependencies = [
  "deranged",
  "itoa",
@@ -9135,9 +9145,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
 
 [[package]]
 name = "time-macros"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
+checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
 dependencies = [
  "num-conv",
  "time-core",
@@ -9253,7 +9263,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -9367,9 +9377,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.12"
+version = "0.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
+checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
 dependencies = [
  "bytes",
  "futures-core",
@@ -9418,7 +9428,7 @@ version = "0.19.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -9431,7 +9441,7 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
@@ -9492,7 +9502,7 @@ dependencies = [
  "axum-core",
  "cookie 0.18.1",
  "futures-util",
- "http 1.1.0",
+ "http 1.2.0",
  "parking_lot",
  "pin-project-lite",
  "tower-layer",
@@ -9509,7 +9519,7 @@ dependencies = [
  "bitflags 2.6.0",
  "bytes",
  "futures-core",
- "http 1.1.0",
+ "http 1.2.0",
  "http-body 1.0.1",
  "http-body-util",
  "pin-project-lite",
@@ -9564,7 +9574,7 @@ checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -9755,7 +9765,7 @@ dependencies = [
  "byteorder",
  "bytes",
  "data-encoding",
- "http 1.1.0",
+ "http 1.2.0",
  "httparse",
  "log",
  "native-tls",
@@ -9811,7 +9821,7 @@ dependencies = [
  "regress",
  "schemars",
  "serde_json",
- "syn 2.0.89",
+ "syn 2.0.90",
  "thiserror 1.0.69",
  "unicode-ident",
 ]
@@ -9828,7 +9838,7 @@ dependencies = [
  "serde",
  "serde_json",
  "serde_tokenstream",
- "syn 2.0.89",
+ "syn 2.0.90",
  "typify-impl",
 ]
 
@@ -10034,9 +10044,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "ureq"
-version = "2.10.1"
+version = "2.12.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b74fc6b57825be3373f7054754755f03ac3a8f5d70015ccad699ba2029956f4a"
+checksum = "02d1a66277ed75f640d608235660df48c8e3c19f3b4edb6a263315626cc3c01d"
 dependencies = [
  "base64 0.22.1",
  "flate2",
@@ -10235,7 +10245,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
  "wasm-bindgen-shared",
 ]
 
@@ -10269,7 +10279,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -10302,7 +10312,7 @@ checksum = "b7f89739351a2e03cb94beb799d47fb2cac01759b40ec441f7de39b00cbf7ef0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -10436,7 +10446,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "axum",
@@ -10477,7 +10487,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10504,7 +10514,7 @@ dependencies = [
  "hex",
  "hf-hub",
  "hmac",
- "http 1.1.0",
+ "http 1.2.0",
  "hyper 1.5.1",
  "itertools 0.13.0",
  "jsonwebtoken",
@@ -10563,7 +10573,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10581,7 +10591,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "chrono",
  "serde",
@@ -10594,7 +10604,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "serde",
@@ -10608,7 +10618,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10628,7 +10638,7 @@ dependencies = [
  "hex",
  "hmac",
  "hyper 1.5.1",
- "indexmap 2.6.0",
+ "indexmap 2.7.0",
  "itertools 0.13.0",
  "lazy_static",
  "magic-crypt",
@@ -10644,7 +10654,7 @@ dependencies = [
  "serde_json",
  "sha2 0.10.8",
  "sqlx",
- "thiserror 2.0.3",
+ "thiserror 2.0.4",
  "tikv-jemalloc-ctl",
  "tokio",
  "tracing",
@@ -10658,7 +10668,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "regex",
  "serde",
@@ -10672,7 +10682,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10695,19 +10705,19 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
 name = "windmill-parser"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10716,7 +10726,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10728,7 +10738,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10740,7 +10750,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10752,7 +10762,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10763,7 +10773,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10774,7 +10784,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10792,7 +10802,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10802,14 +10812,14 @@ dependencies = [
  "quote",
  "regex",
  "serde_json",
- "syn 2.0.89",
+ "syn 2.0.90",
  "toml 0.7.8",
  "windmill-parser",
 ]
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10821,7 +10831,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10839,7 +10849,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10860,7 +10870,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10870,7 +10880,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10904,7 +10914,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10914,7 +10924,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.434.1"
+version = "1.434.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -11292,7 +11302,7 @@ checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -11314,7 +11324,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
@@ -11334,7 +11344,7 @@ checksum = "595eed982f7d355beb85837f651fa22e90b3c044842dc7f2c2842c086f295808"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
  "synstructure",
 ]
 
@@ -11363,7 +11373,7 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.89",
+ "syn 2.0.90",
 ]
 
 [[package]]
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 8802e10403..be954faac2 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.434.1"
+version = "1.434.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.434.1"
+version = "1.434.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 7a7525bf04..4a9492418b 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.434.1
+  version: 1.434.2
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index aed23d3ca0..da88c5d0aa 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.434.1";
+export const VERSION = "v1.434.2";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 3b1027fd14..bf465fc315 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.434.1";
+export const VERSION = "1.434.2";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 9bd2c2ee7d..237bcb81bd 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.434.1",
+	"version": "1.434.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.434.1",
+			"version": "1.434.2",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.32.1",
diff --git a/frontend/package.json b/frontend/package.json
index 5b358f953e..24cf283420 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.434.1",
+	"version": "1.434.2",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index cc4fe8a35e..b65209dcd2 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.434.1"
-wmill_pg = ">=1.434.1"
+wmill = ">=1.434.2"
+wmill_pg = ">=1.434.2"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index d578644ec0..9ed0fede12 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.434.1
+  version: 1.434.2
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 2b35f5df52..9dc95dee21 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
 RootModule = 'WindmillClient.psm1'
 
 # Version number of this module.
-ModuleVersion = '1.434.1'
+ModuleVersion = '1.434.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 99906b4dec..1ee961678d 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.434.1"
+version = "1.434.2"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index a0f543d788..4e41543428 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.434.1"
+version = "1.434.2"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 43d0625bf3..e113d36b82 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.434.1",
+  "version": "1.434.2",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index 1ba5e77965..ac77f8302b 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.434.1",
+  "version": "1.434.2",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 890aba3f45..417684d0b6 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.434.1
+1.434.2

From 1ec6c6f765904361e641d89495890bc87e8544aa Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Wed, 4 Dec 2024 16:50:17 +0100
Subject: [PATCH 05/34] feat: app custom paths (#4828)

* feat: app custom paths

* nit

* make ee only + fix sqlx

* fix: custom http routes auth

* nits

* fix auth + nits

* apps_ee

* move custom path to ee

* fix app jwt

* update ee ref
---
 ...71ca897dcfa9e82618ce8f11afb08a39e3b20.json |  23 +++
 ...979f51b53dcd4d8ec50d312c9e7fe31ad5f5.json} |   7 +-
 ...a1d606d9725e20e9c2d76a0887fadfd87f8df.json |  25 +++
 backend/ee-repo-ref.txt                       |   2 +-
 .../20241202134622_app_custom_path.down.sql   |   2 +
 .../20241202134622_app_custom_path.up.sql     |   2 +
 backend/windmill-api/openapi.yaml             |  50 +++++
 backend/windmill-api/src/apps.rs              | 109 +++++++++--
 backend/windmill-api/src/apps_ee.rs           |   5 +
 backend/windmill-api/src/lib.rs               |  13 ++
 .../components/apps/editor/AppEditor.svelte   |   1 +
 .../apps/editor/AppEditorHeader.svelte        | 126 +++++++++---
 .../components/details/ClipboardPanel.svelte  |   6 +-
 .../(logged)/apps/edit/[...path]/+page.svelte |   4 +-
 frontend/src/routes/a/[...path]/+page.js      |   5 +
 frontend/src/routes/a/[...path]/+page.svelte  | 182 ++++++++++++++++++
 16 files changed, 514 insertions(+), 48 deletions(-)
 create mode 100644 backend/.sqlx/query-1ec97e1bf7c6edfa82b7e64585171ca897dcfa9e82618ce8f11afb08a39e3b20.json
 rename backend/.sqlx/{query-75e880f9d9fbda36c2314706923cef36e4667d930fb8ee1876dd9ce1c92396b2.json => query-6b53f7c4bb73177316d6134698f3979f51b53dcd4d8ec50d312c9e7fe31ad5f5.json} (63%)
 create mode 100644 backend/.sqlx/query-fb1399c1dc171ec6bb24fee3477a1d606d9725e20e9c2d76a0887fadfd87f8df.json
 create mode 100644 backend/migrations/20241202134622_app_custom_path.down.sql
 create mode 100644 backend/migrations/20241202134622_app_custom_path.up.sql
 create mode 100644 backend/windmill-api/src/apps_ee.rs
 create mode 100644 frontend/src/routes/a/[...path]/+page.js
 create mode 100644 frontend/src/routes/a/[...path]/+page.svelte

diff --git a/backend/.sqlx/query-1ec97e1bf7c6edfa82b7e64585171ca897dcfa9e82618ce8f11afb08a39e3b20.json b/backend/.sqlx/query-1ec97e1bf7c6edfa82b7e64585171ca897dcfa9e82618ce8f11afb08a39e3b20.json
new file mode 100644
index 0000000000..51343088a6
--- /dev/null
+++ b/backend/.sqlx/query-1ec97e1bf7c6edfa82b7e64585171ca897dcfa9e82618ce8f11afb08a39e3b20.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM app WHERE custom_path = $1 AND ($2::TEXT IS NULL OR workspace_id = $2))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "1ec97e1bf7c6edfa82b7e64585171ca897dcfa9e82618ce8f11afb08a39e3b20"
+}
diff --git a/backend/.sqlx/query-75e880f9d9fbda36c2314706923cef36e4667d930fb8ee1876dd9ce1c92396b2.json b/backend/.sqlx/query-6b53f7c4bb73177316d6134698f3979f51b53dcd4d8ec50d312c9e7fe31ad5f5.json
similarity index 63%
rename from backend/.sqlx/query-75e880f9d9fbda36c2314706923cef36e4667d930fb8ee1876dd9ce1c92396b2.json
rename to backend/.sqlx/query-6b53f7c4bb73177316d6134698f3979f51b53dcd4d8ec50d312c9e7fe31ad5f5.json
index efaac63d39..0c82c9dd74 100644
--- a/backend/.sqlx/query-75e880f9d9fbda36c2314706923cef36e4667d930fb8ee1876dd9ce1c92396b2.json
+++ b/backend/.sqlx/query-6b53f7c4bb73177316d6134698f3979f51b53dcd4d8ec50d312c9e7fe31ad5f5.json
@@ -1,6 +1,6 @@
 {
   "db_name": "PostgreSQL",
-  "query": "INSERT INTO app\n            (workspace_id, path, summary, policy, versions, draft_only)\n            VALUES ($1, $2, $3, $4, '{}', $5) RETURNING id",
+  "query": "INSERT INTO app\n            (workspace_id, path, summary, policy, versions, draft_only, custom_path)\n            VALUES ($1, $2, $3, $4, '{}', $5, $6) RETURNING id",
   "describe": {
     "columns": [
       {
@@ -15,12 +15,13 @@
         "Varchar",
         "Varchar",
         "Jsonb",
-        "Bool"
+        "Bool",
+        "Text"
       ]
     },
     "nullable": [
       false
     ]
   },
-  "hash": "75e880f9d9fbda36c2314706923cef36e4667d930fb8ee1876dd9ce1c92396b2"
+  "hash": "6b53f7c4bb73177316d6134698f3979f51b53dcd4d8ec50d312c9e7fe31ad5f5"
 }
diff --git a/backend/.sqlx/query-fb1399c1dc171ec6bb24fee3477a1d606d9725e20e9c2d76a0887fadfd87f8df.json b/backend/.sqlx/query-fb1399c1dc171ec6bb24fee3477a1d606d9725e20e9c2d76a0887fadfd87f8df.json
new file mode 100644
index 0000000000..a2362be620
--- /dev/null
+++ b/backend/.sqlx/query-fb1399c1dc171ec6bb24fee3477a1d606d9725e20e9c2d76a0887fadfd87f8df.json
@@ -0,0 +1,25 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT EXISTS(SELECT 1 FROM app WHERE custom_path = $1 AND ($2::TEXT IS NULL OR workspace_id = $2) AND NOT (path = $3 AND workspace_id = $4))",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "exists",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Text",
+        "Text",
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "fb1399c1dc171ec6bb24fee3477a1d606d9725e20e9c2d76a0887fadfd87f8df"
+}
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 496432b7e0..c7e750d0f4 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-aefbc1e2188fea312996fcfc30a29d8fb5315316
\ No newline at end of file
+8606d98a692d11b09a387c5efbd6b4335c533fd3
\ No newline at end of file
diff --git a/backend/migrations/20241202134622_app_custom_path.down.sql b/backend/migrations/20241202134622_app_custom_path.down.sql
new file mode 100644
index 0000000000..1dadbefff1
--- /dev/null
+++ b/backend/migrations/20241202134622_app_custom_path.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE app DROP COLUMN custom_path;
diff --git a/backend/migrations/20241202134622_app_custom_path.up.sql b/backend/migrations/20241202134622_app_custom_path.up.sql
new file mode 100644
index 0000000000..832efd0cb2
--- /dev/null
+++ b/backend/migrations/20241202134622_app_custom_path.up.sql
@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE app ADD COLUMN custom_path TEXT CHECK (custom_path ~ '^[\w-]+(\/[\w-]+)*$');
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 4a9492418b..f0bd8856d5 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -3733,6 +3733,27 @@ paths:
                 required:
                   - app
 
+  /apps_u/public_app_by_custom_path/{custom_path}:
+    get:
+      summary: get public app by custom path
+      operationId: getPublicAppByCustomPath
+      tags:
+        - app
+      parameters:
+        - $ref: "#/components/parameters/CustomPath"
+      responses:
+        "200":
+          description: app details
+          content:
+            application/json:
+              schema:
+                allOf:
+                  - $ref: "#/components/schemas/AppWithLastVersion"
+                  - type: object
+                    properties:
+                      workspace_id:
+                        type: string
+
   /scripts/hub/get/{path}:
     get:
       summary: get hub script content by path
@@ -5371,6 +5392,8 @@ paths:
                   type: boolean
                 deployment_message:
                   type: string
+                custom_path:
+                  type: string
               required:
                 - path
                 - value
@@ -5696,6 +5719,8 @@ paths:
                   $ref: "#/components/schemas/Policy"
                 deployment_message:
                   type: string
+                custom_path:
+                  type: string
       responses:
         "200":
           description: app updated
@@ -5704,6 +5729,23 @@ paths:
               schema:
                 type: string
 
+  /w/{workspace}/apps/custom_path_exists/{custom_path}:
+    get:
+      summary: check if custom path exists
+      operationId: customPathExists
+      tags:
+        - app
+      parameters:
+        - $ref: "#/components/parameters/WorkspaceId"
+        - $ref: "#/components/parameters/CustomPath"
+      responses:
+        "200":
+          description: custom path exists
+          content:
+            application/json:
+              schema:
+                type: boolean
+
   /w/{workspace}/apps_u/execute_component/{path}:
     post:
       summary: executeComponent
@@ -10222,6 +10264,12 @@ components:
       required: true
       schema:
         type: string
+    CustomPath:
+      name: custom_path
+      in: path
+      required: true
+      schema:
+        type: string
     PathId:
       name: id
       in: path
@@ -12860,6 +12908,8 @@ components:
             draft_only:
               type: boolean
             draft: {}
+            custom_path:
+              type: string
 
     AppHistory:
       type: object
diff --git a/backend/windmill-api/src/apps.rs b/backend/windmill-api/src/apps.rs
index 5e236baeb6..e1a9421252 100644
--- a/backend/windmill-api/src/apps.rs
+++ b/backend/windmill-api/src/apps.rs
@@ -56,10 +56,10 @@ use windmill_common::{
     jobs::{get_payload_tag_from_prefixed_path, JobPayload, RawCode},
     users::username_to_permissioned_as,
     utils::{
-        http_get_from_hub, not_found_if_none, paginate, query_elems_from_hub, Pagination, StripPath,
+        http_get_from_hub, not_found_if_none, paginate, query_elems_from_hub, require_admin, Pagination, StripPath
     },
     variables::{build_crypt, build_crypt_with_key_suffix},
-    worker::to_raw_value,
+    worker::{to_raw_value, CLOUD_HOSTED},
     HUB_BASE_URL,
 };
 
@@ -81,6 +81,7 @@ pub fn workspaced_service() -> Router {
         .route("/history/p/*path", get(get_app_history))
         .route("/get_latest_version/*path", get(get_latest_version))
         .route("/history_update/a/:id/v/:version", post(update_app_history))
+        .route("/custom_path_exists/*custom_path", get(custom_path_exists))
 }
 
 pub fn unauthed_service() -> Router {
@@ -90,13 +91,17 @@ pub fn unauthed_service() -> Router {
         .route("/public_app/:secret", get(get_public_app_by_secret))
         .route("/public_resource/*path", get(get_public_resource))
 }
-
 pub fn global_service() -> Router {
     Router::new()
         .route("/hub/list", get(list_hub_apps))
         .route("/hub/get/:id", get(get_hub_app_by_id))
 }
 
+#[cfg(not(feature = "enterprise"))]
+pub fn global_unauthed_service() -> Router {
+    Router::new()
+}
+
 #[derive(FromRow, Deserialize, Serialize)]
 pub struct ListableApp {
     pub id: i64,
@@ -147,21 +152,26 @@ pub struct AppWithLastVersionAndStarred {
     pub starred: Option<bool>,
 }
 
+#[cfg(feature = "enterprise")]
+#[derive(Serialize, FromRow)]
+pub struct AppWithLastVersionAndWorkspace {
+    #[sqlx(flatten)]
+    #[serde(flatten)]
+    pub app: AppWithLastVersion,
+    pub workspace_id: String,
+}
+
 #[derive(Serialize, Deserialize, FromRow)]
 pub struct AppWithLastVersionAndDraft {
-    pub id: i64,
-    pub path: String,
-    pub summary: String,
-    pub policy: sqlx::types::Json<Box<RawValue>>,
-    pub versions: Vec<i64>,
-    pub value: sqlx::types::Json<Box<RawValue>>,
-    pub created_by: String,
-    pub created_at: chrono::DateTime<chrono::Utc>,
-    pub extra_perms: serde_json::Value,
+    #[sqlx(flatten)]
+    #[serde(flatten)]
+    pub app: AppWithLastVersion,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub draft: Option<sqlx::types::Json<Box<RawValue>>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub draft_only: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub custom_path: Option<String>,
 }
 
 #[derive(Serialize)]
@@ -229,6 +239,7 @@ pub struct CreateApp {
     pub policy: Policy,
     pub draft_only: Option<bool>,
     pub deployment_message: Option<String>,
+    pub custom_path: Option<String>,
 }
 
 #[derive(Deserialize)]
@@ -238,6 +249,7 @@ pub struct EditApp {
     pub value: Option<sqlx::types::Json<Box<RawValue>>>,
     pub policy: Option<Policy>,
     pub deployment_message: Option<String>,
+    pub custom_path: Option<String>,
 }
 
 #[derive(Serialize, FromRow)]
@@ -408,7 +420,7 @@ async fn get_app_w_draft(
 
     let app_o = sqlx::query_as::<_, AppWithLastVersionAndDraft>(
         r#"SELECT app.id, app.path, app.summary, app.versions, app.policy,
-        app.extra_perms, app_version.value, 
+        app.extra_perms, app_version.value, app.custom_path,
         app_version.created_at, app_version.created_by,
         app.draft_only, draft.value as "draft"
         from app
@@ -515,6 +527,22 @@ async fn update_app_history(
     return Ok(());
 }
 
+
+async fn custom_path_exists(
+    Extension(db): Extension<DB>,
+    Path((w_id, custom_path)): Path<(String, String)>,
+) -> JsonResult<bool> {
+    let exists = 
+        sqlx::query_scalar!(
+            "SELECT EXISTS(SELECT 1 FROM app WHERE custom_path = $1 AND ($2::TEXT IS NULL OR workspace_id = $2))",
+            custom_path,
+            if *CLOUD_HOSTED { Some(&w_id) } else { None }
+        )
+        .fetch_one(&db)
+        .await?.unwrap_or(false);
+    Ok(Json(exists))
+}
+
 async fn get_app_by_id(
     authed: ApiAuthed,
     Extension(user_db): Extension<UserDB>,
@@ -598,6 +626,7 @@ async fn get_public_app_by_secret(
     Ok(Json(app))
 }
 
+
 async fn get_public_resource(
     Extension(db): Extension<DB>,
     Path((w_id, path)): Path<(String, StripPath)>,
@@ -680,6 +709,26 @@ async fn create_app(
         )));
     }
 
+    if let Some(custom_path) = &app.custom_path {
+
+        require_admin(authed.is_admin, &authed.username)?;
+
+        let exists = sqlx::query_scalar!(
+            "SELECT EXISTS(SELECT 1 FROM app WHERE custom_path = $1 AND ($2::TEXT IS NULL OR workspace_id = $2))",
+            custom_path,
+            if *CLOUD_HOSTED { Some(&w_id) } else { None }
+        )
+        .fetch_one(&mut *tx)
+        .await?.unwrap_or(false);
+
+        if exists {
+            return Err(Error::BadRequest(format!(
+                "App with custom path {} already exists",
+                custom_path
+            )));
+        }
+    }
+
     sqlx::query!(
         "DELETE FROM draft WHERE path = $1 AND workspace_id = $2 AND typ = 'app'",
         &app.path,
@@ -690,13 +739,14 @@ async fn create_app(
 
     let id = sqlx::query_scalar!(
         "INSERT INTO app
-            (workspace_id, path, summary, policy, versions, draft_only)
-            VALUES ($1, $2, $3, $4, '{}', $5) RETURNING id",
+            (workspace_id, path, summary, policy, versions, draft_only, custom_path)
+            VALUES ($1, $2, $3, $4, '{}', $5, $6) RETURNING id",
         w_id,
         app.path,
         app.summary,
         json!(app.policy),
         app.draft_only,
+        app.custom_path,
     )
     .fetch_one(&mut *tx)
     .await?;
@@ -899,7 +949,11 @@ async fn update_app(
 
     let mut tx = user_db.clone().begin(&authed).await?;
 
-    let npath = if ns.policy.is_some() || ns.path.is_some() || ns.summary.is_some() {
+    let npath = if ns.policy.is_some()
+        || ns.path.is_some()
+        || ns.summary.is_some()
+        || ns.custom_path.is_some()
+    {
         let mut sqlb = SqlBuilder::update_table("app");
         sqlb.and_where_eq("path", "?".bind(&path));
         sqlb.and_where_eq("workspace_id", "?".bind(&w_id));
@@ -932,6 +986,29 @@ async fn update_app(
             sqlb.set_str("summary", nsummary);
         }
 
+        if let Some(ncustom_path) = &ns.custom_path {
+
+            require_admin(authed.is_admin, &authed.username)?;
+
+            let exists = sqlx::query_scalar!(
+                "SELECT EXISTS(SELECT 1 FROM app WHERE custom_path = $1 AND ($2::TEXT IS NULL OR workspace_id = $2) AND NOT (path = $3 AND workspace_id = $4))",
+                ncustom_path,
+                if *CLOUD_HOSTED { Some(&w_id) } else { None },
+                path,
+                w_id
+            )
+            .fetch_one(&mut *tx)
+            .await?.unwrap_or(false);
+
+            if exists {
+                return Err(Error::BadRequest(format!(
+                    "App with custom path {} already exists",
+                    ncustom_path
+                )));
+            }
+            sqlb.set_str("custom_path", ncustom_path);
+        }
+
         if let Some(mut npolicy) = ns.policy {
             npolicy.on_behalf_of = Some(username_to_permissioned_as(&authed.username));
             npolicy.on_behalf_of_email = Some(authed.email.clone());
diff --git a/backend/windmill-api/src/apps_ee.rs b/backend/windmill-api/src/apps_ee.rs
new file mode 100644
index 0000000000..a7737664b9
--- /dev/null
+++ b/backend/windmill-api/src/apps_ee.rs
@@ -0,0 +1,5 @@
+use axum::Router;
+
+pub fn global_unauthed_service() -> Router {
+    Router::new()
+}
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index 28f2523ad5..88243789b4 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -64,6 +64,8 @@ mod indexer_ee;
 mod inputs;
 mod integration;
 
+#[cfg(feature = "enterprise")]
+mod apps_ee;
 #[cfg(feature = "parquet")]
 mod job_helpers_ee;
 pub mod job_metrics;
@@ -343,6 +345,17 @@ pub async fn run_server(
                 )
                 .nest("/concurrency_groups", concurrency_groups::global_service())
                 .nest("/scripts_u", scripts::global_unauthed_service())
+                .nest("/apps_u", {
+                    #[cfg(feature = "enterprise")]
+                    {
+                        apps_ee::global_unauthed_service()
+                    }
+
+                    #[cfg(not(feature = "enterprise"))]
+                    {
+                        Router::new()
+                    }
+                })
                 .nest(
                     "/w/:workspace_id/apps_u",
                     apps::unauthed_service()
diff --git a/frontend/src/lib/components/apps/editor/AppEditor.svelte b/frontend/src/lib/components/apps/editor/AppEditor.svelte
index 66b2d3e009..f0380f09e2 100644
--- a/frontend/src/lib/components/apps/editor/AppEditor.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditor.svelte
@@ -68,6 +68,7 @@
 				summary: string
 				policy: any
 				draft_only?: boolean
+				custom_path?: string
 		  }
 		| undefined = undefined
 	export let version: number | undefined = undefined
diff --git a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
index 82e47a0473..3c7783e3f4 100644
--- a/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
+++ b/frontend/src/lib/components/apps/editor/AppEditorHeader.svelte
@@ -11,12 +11,11 @@
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { AppService, DraftService, type Job, type Policy } from '$lib/gen'
 	import { redo, undo } from '$lib/history'
-	import { enterpriseLicense, workspaceStore } from '$lib/stores'
+	import { enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
 	import {
 		AlignHorizontalSpaceAround,
 		BellOff,
 		Bug,
-		Clipboard,
 		DiffIcon,
 		Expand,
 		FileJson,
@@ -39,7 +38,6 @@
 	import {
 		classNames,
 		cleanValueProperties,
-		copyToClipboard,
 		truncateRev,
 		orderedJsonStringify,
 		type Value,
@@ -90,6 +88,9 @@
 	import HideButton from './settingsPanel/HideButton.svelte'
 	import DeployOverrideConfirmationModal from '$lib/components/common/confirmationModal/DeployOverrideConfirmationModal.svelte'
 	import { computeS3FileInputPolicy, computeWorkspaceS3FileInputPolicy } from './appUtilsS3'
+	import { isCloudHosted } from '$lib/cloud'
+	import { base } from '$lib/base'
+	import ClipboardPanel from '$lib/components/details/ClipboardPanel.svelte'
 
 	async function hash(message) {
 		try {
@@ -119,6 +120,7 @@
 				summary: string
 				policy: any
 				draft_only?: boolean
+				custom_path?: string
 		  }
 		| undefined = undefined
 	export let version: number | undefined = undefined
@@ -479,14 +481,16 @@
 				summary: $summary,
 				policy,
 				path: npath,
-				deployment_message: deploymentMsg
+				deployment_message: deploymentMsg,
+				custom_path: $userStore?.is_admin || $userStore?.is_super_admin ? customPath : undefined
 			}
 		})
 		savedApp = {
 			summary: $summary,
 			value: structuredClone($app),
 			path: npath,
-			policy
+			policy,
+			custom_path: customPath
 		}
 		const appHistory = await AppService.getAppHistoryByPath({
 			workspace: $workspaceStore!,
@@ -885,6 +889,37 @@
 
 	let priorDarkMode = document.documentElement.classList.contains('dark')
 	setTheme($app?.darkMode)
+
+	let customPath = savedApp?.custom_path
+	let dirtyCustomPath = false
+	let customPathError = ''
+	$: fullCustomUrl = `${window.location.origin}${base}/a/${
+		isCloudHosted() ? $workspaceStore + '/' : ''
+	}${customPath}`
+	async function appExists(customPath: string) {
+		return await AppService.customPathExists({
+			workspace: $workspaceStore!,
+			customPath
+		})
+	}
+	let validateTimeout: NodeJS.Timeout | undefined = undefined
+	async function validateCustomPath(customPath: string): Promise<void> {
+		customPathError = ''
+		if (validateTimeout) {
+			clearTimeout(validateTimeout)
+		}
+		validateTimeout = setTimeout(async () => {
+			if (!/^[\w-]+(\/[\w-]+)*$/.test(customPath)) {
+				customPathError = 'Invalid path'
+			} else if (customPath !== savedApp?.custom_path && (await appExists(customPath))) {
+				customPathError = 'Path already taken'
+			} else {
+				customPathError = ''
+			}
+			validateTimeout = undefined
+		}, 500)
+	}
+	$: customPath !== undefined && validateCustomPath(customPath)
 </script>
 
 <svelte:window on:keydown={onKeyDown} />
@@ -1071,7 +1106,7 @@
 			</Button>
 			<Button
 				startIcon={{ icon: Save }}
-				disabled={pathError != ''}
+				disabled={pathError != '' || customPathError != ''}
 				on:click={() => {
 					if ($appPath == '') {
 						createApp(newEditedPath)
@@ -1121,29 +1156,68 @@
 			</div>
 
 			<div class="my-6 box">
-				Public url:
+				<div class="text-secondary">
+					<div>Public URL</div>
+				</div>
 				{#if secretUrl}
-					{@const url = `${window.location.hostname}/public/${$workspaceStore}/${secretUrl}`}
-					{@const href = window.location.protocol + '//' + url}
-					<a
-						on:click={(e) => {
-							e.preventDefault()
-							copyToClipboard(href)
-						}}
-						{href}
-						class="whitespace-nowrap text-ellipsis overflow-hidden mr-1 inline-flex gap-2"
-					>
-						{url}
-						<span class="text-gray-700 ml-2">
-							<Clipboard />
-						</span>
-					</a>
+					{@const href = `${window.location.origin}${base}/public/${$workspaceStore}/${secretUrl}`}
+					<ClipboardPanel content={href} size="md" />
 				{:else}<Loader2 class="animate-spin" />
 				{/if}
-				<div class="text-xs text-secondary"
-					>Share this url directly or embed it using an iframe (if requiring login, top-level domain
-					of embedding app must be the same as the one of Windmill)</div
-				>
+				<div class="text-xs text-secondary mt-1">
+					Share this url directly or embed it using an iframe (if requiring login, top-level domain
+					of embedding app must be the same as the one of Windmill)
+				</div>
+
+				<div class="mt-4">
+					{#if !$enterpriseLicense}
+						<Alert title="EE Only" type="warning" size="xs">
+							Custom path is an enterprise only feature.
+						</Alert>
+						<div class="mb-2" />
+					{:else if !($userStore?.is_admin || $userStore?.is_super_admin)}
+						<Alert type="warning" title="Admin only" size="xs">
+							Custom path can only be set by workspace admins
+						</Alert>
+						<div class="mb-2" />
+					{/if}
+					<Toggle
+						on:change={({ detail }) => {
+							customPath = detail ? '' : undefined
+						}}
+						checked={customPath !== undefined}
+						options={{
+							right: 'Use a custom URL'
+						}}
+						disabled={!$enterpriseLicense || !($userStore?.is_admin || $userStore?.is_super_admin)}
+					/>
+
+					{#if customPath !== undefined}
+						<div class="text-secondary text-sm flex items-center gap-1 w-full justify-between">
+							<div>Custom path</div>
+						</div>
+						<input
+							disabled={!($userStore?.is_admin || $userStore?.is_super_admin)}
+							type="text"
+							autocomplete="off"
+							bind:value={customPath}
+							class={customPathError === ''
+								? ''
+								: 'border border-red-700 bg-red-100 border-opacity-30 focus:border-red-700 focus:border-opacity-30 focus-visible:ring-red-700 focus-visible:ring-opacity-25 focus-visible:border-red-700'}
+							on:input={() => {
+								dirtyCustomPath = true
+							}}
+						/>
+						<div class="text-secondary text-sm flex items-center gap-1 mt-2 w-full justify-between">
+							<div>Custom public URL</div>
+						</div>
+						<ClipboardPanel content={fullCustomUrl} size="md" />
+
+						<div class="text-red-600 dark:text-red-400 text-2xs mt-1.5"
+							>{dirtyCustomPath ? customPathError : ''}
+						</div>
+					{/if}
+				</div>
 			</div>
 			<Alert type="info" title="Only latest deployed app is publicly available">
 				You will still need to deploy the app to make visible the latest changes
diff --git a/frontend/src/lib/components/details/ClipboardPanel.svelte b/frontend/src/lib/components/details/ClipboardPanel.svelte
index 3107834df3..53d442fbb6 100644
--- a/frontend/src/lib/components/details/ClipboardPanel.svelte
+++ b/frontend/src/lib/components/details/ClipboardPanel.svelte
@@ -1,9 +1,11 @@
 <script lang="ts">
 	import { copyToClipboard } from '$lib/utils'
 	import { Clipboard } from 'lucide-svelte'
+	import { twMerge } from 'tailwind-merge'
 
 	export let content: string
 	export let title: string | undefined = undefined
+	export let size: 'sm' | 'md' = 'sm'
 </script>
 
 {#if title !== undefined}
@@ -19,6 +21,8 @@
 		copyToClipboard(content)
 	}}
 >
-	<div class="text-xs truncate whitespace-no-wrap grow">{content}</div>
+	<div class={twMerge('truncate whitespace-no-wrap grow', size === 'sm' ? 'text-xs' : 'text-sm')}
+		>{content}</div
+	>
 	<Clipboard size={12} class="flex-shrink-0" />
 </div>
diff --git a/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte b/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
index a0913dd1c8..083fd107d3 100644
--- a/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/apps/edit/[...path]/+page.svelte
@@ -19,6 +19,7 @@
 				summary: string
 				policy: any
 				draft_only?: boolean
+				custom_path?: string
 		  }
 		| undefined = undefined
 	let redraw = 0
@@ -58,7 +59,8 @@
 							path: app_w_draft_.path,
 							policy: app_w_draft_.policy
 					  }
-					: undefined
+					: undefined,
+			custom_path: app_w_draft_.custom_path
 		}
 
 		if (stateLoadedFromUrl) {
diff --git a/frontend/src/routes/a/[...path]/+page.js b/frontend/src/routes/a/[...path]/+page.js
new file mode 100644
index 0000000000..42a8b51427
--- /dev/null
+++ b/frontend/src/routes/a/[...path]/+page.js
@@ -0,0 +1,5 @@
+export function load({ params }) {
+	return {
+		stuff: { title: `Public App` }
+	}
+}
diff --git a/frontend/src/routes/a/[...path]/+page.svelte b/frontend/src/routes/a/[...path]/+page.svelte
new file mode 100644
index 0000000000..ba5135bfd8
--- /dev/null
+++ b/frontend/src/routes/a/[...path]/+page.svelte
@@ -0,0 +1,182 @@
+<script lang="ts">
+	import { BROWSER } from 'esm-env'
+	import { page } from '$app/stores'
+	import { base } from '$lib/base'
+	import AppPreview from '$lib/components/apps/editor/AppPreview.svelte'
+	import { IS_APP_PUBLIC_CONTEXT_KEY, type EditorBreakpoint } from '$lib/components/apps/types'
+
+	import { Alert, Skeleton } from '$lib/components/common'
+	import { WindmillIcon } from '$lib/components/icons'
+	import { AppService, OpenAPI, type AppWithLastVersion } from '$lib/gen'
+	import { enterpriseLicense, userStore, workspaceStore } from '$lib/stores'
+	import { twMerge } from 'tailwind-merge'
+
+	import { setContext } from 'svelte'
+	import { writable } from 'svelte/store'
+	import { setLicense } from '$lib/enterpriseUtils'
+	import { isCloudHosted } from '$lib/cloud'
+	import Login from '$lib/components/Login.svelte'
+	import { getUserExt } from '$lib/user'
+	import { User, UserRoundX } from 'lucide-svelte'
+	import { goto } from '$app/navigation'
+	import { sendUserToast } from '$lib/toast'
+
+	let app: (AppWithLastVersion & { value: any }) | undefined = undefined
+	let notExists = false
+	let noPermission = false
+
+	let jwtError = false
+	setContext(IS_APP_PUBLIC_CONTEXT_KEY, true)
+
+	function isJwt(t: string) {
+		// simply check that the first part is a valid base64 encoded json
+		try {
+			const parts = t.split('.')
+			const header = atob(parts[0])
+			JSON.parse(header)
+			return true
+		} catch (e) {
+			return false
+		}
+	}
+
+	function parseCustomPath(customPath: string): { path: string; jwt: string | undefined } {
+		const parts = customPath.split('/')
+		if (parts.length > 1 && isJwt(parts[parts.length - 1])) {
+			return {
+				path: parts.slice(0, -1).join('/'),
+				jwt: parts[parts.length - 1]
+			}
+		} else {
+			return {
+				path: customPath,
+				jwt: undefined
+			}
+		}
+	}
+
+	const parsedCustomPath = parseCustomPath($page.params.path)
+
+	async function loadApp() {
+		if (parsedCustomPath.jwt) {
+			OpenAPI.TOKEN = 'jwt_ext_' + parsedCustomPath.jwt
+			jwtError = false
+		}
+		try {
+			app = await AppService.getPublicAppByCustomPath({
+				customPath: parsedCustomPath.path
+			})
+			workspaceStore.set(app.workspace_id)
+			noPermission = false
+			notExists = false
+
+			try {
+				userStore.set(await getUserExt(app.workspace_id))
+				if (!$userStore && parsedCustomPath.jwt) {
+					jwtError = true
+					sendUserToast('Could not authentify user with jwt token', true)
+				}
+			} catch (e) {
+				console.warn('Anonymous user')
+			}
+		} catch (e) {
+			if (e.status == 401) {
+				noPermission = true
+			} else {
+				notExists = true
+			}
+		}
+	}
+
+	if (BROWSER) {
+		setLicense()
+		loadApp()
+	}
+
+	const breakpoint = writable<EditorBreakpoint>('lg')
+
+	const darkMode =
+		window.localStorage.getItem('dark-mode') ??
+		(window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light')
+
+	if (darkMode === 'dark') {
+		document.documentElement.classList.add('dark')
+	} else {
+		document.documentElement.classList.remove('dark')
+	}
+</script>
+
+<div
+	class="z-50 text-xs fixed bottom-1 right-2 {$enterpriseLicense && !isCloudHosted()
+		? 'transition-opacity delay-1000 duration-1000 opacity-20 hover:delay-0 hover:opacity-100'
+		: ''}"
+>
+	<a href="https://windmill.dev" class="whitespace-nowrap text-tertiary inline-flex items-center"
+		>Powered by &nbsp;<WindmillIcon />&nbsp;Windmill</a
+	>
+</div>
+
+<div class="z-50 text-2xs text-tertiary absolute top-3 left-2"
+	>{#if $userStore}
+		<div class="flex gap-1 items-center"><User size={14} />{$userStore.username}</div>
+	{:else}<UserRoundX size={14} />{/if}
+</div>
+
+{#if notExists}
+	<div class="px-4 mt-20"
+		><Alert type="error" title="Not found"
+			>There was an error loading the app, is the url correct? <a href={base}>Go to Windmill</a>
+		</Alert></div
+	>
+{:else if noPermission}
+	<div class="px-4 mt-20 w-full text-center font-bold text-xl"
+		>{#if $userStore}You are logged in but have no read access to this app{:else}You must be logged
+			in and have read access to this app{/if}</div
+	>
+	<div class="px-2 mx-auto mt-20 max-w-xl w-full">
+		{#if !jwtError}
+			<Login
+				on:login={() => {
+					// window.location.reload()
+					loadApp()
+					app = app
+				}}
+				popup
+				rd={$page.url.toString()}
+			/>
+		{/if}
+	</div>
+{:else if app}
+	{#key app}
+		<div
+			class={twMerge(
+				'min-h-screen h-full w-full flex',
+				app?.value?.['css']?.['app']?.['viewer']?.class,
+				'wm-app-viewer'
+			)}
+			style={app?.value?.['css']?.['app']?.['viewer']?.style}
+		>
+			<AppPreview
+				noBackend={false}
+				context={{
+					email: $userStore?.email,
+					groups: $userStore?.groups,
+					username: $userStore?.username,
+					query: Object.fromEntries($page.url.searchParams.entries()),
+					hash: $page.url.hash.substring(1)
+				}}
+				workspace={$page.params.workspace}
+				summary={app.summary}
+				app={app.value}
+				appPath={app.path}
+				{breakpoint}
+				policy={app.policy}
+				isEditor={false}
+				replaceStateFn={(path) => goto(path)}
+				gotoFn={(path, opt) => goto(path, opt)}
+			/>
+		</div>
+	{/key}
+{:else}
+	<Skeleton layout={[[4], 0.5, [50]]} />
+{/if}

From b534ef6074aba995eccc5010a3f739e500accc0e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 4 Dec 2024 17:30:52 +0100
Subject: [PATCH 06/34] improve transparency for slow queries

---
 backend/Cargo.lock                            |  1 +
 backend/Cargo.toml                            |  1 +
 ...4154025_grant_all_concurrency_key.down.sql |  1 +
 ...204154025_grant_all_concurrency_key.up.sql |  3 +
 backend/src/monitor.rs                        |  4 +-
 backend/windmill-common/Cargo.toml            |  1 +
 backend/windmill-common/src/utils.rs          | 98 +++++++++++++++++--
 .../windmill-worker/src/result_processor.rs   |  3 +
 backend/windmill-worker/src/worker.rs         | 22 ++++-
 backend/windmill-worker/src/worker_flow.rs    |  6 +-
 10 files changed, 124 insertions(+), 16 deletions(-)
 create mode 100644 backend/migrations/20241204154025_grant_all_concurrency_key.down.sql
 create mode 100644 backend/migrations/20241204154025_grant_all_concurrency_key.up.sql

diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 54facad0c1..93e027e005 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10644,6 +10644,7 @@ dependencies = [
  "magic-crypt",
  "mail-send",
  "object_store",
+ "pin-project-lite",
  "prometheus",
  "quick_cache",
  "rand 0.8.5",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index be954faac2..6b70463727 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -284,6 +284,7 @@ tikv-jemalloc-sys  = { version = "^0.5" }
 tikv-jemalloc-ctl = { version = "^0.5" }
 
 triomphe = "^0"
+pin-project-lite = "^0"
 
 tantivy = "0.22.0"
 
diff --git a/backend/migrations/20241204154025_grant_all_concurrency_key.down.sql b/backend/migrations/20241204154025_grant_all_concurrency_key.down.sql
new file mode 100644
index 0000000000..d2f607c5b8
--- /dev/null
+++ b/backend/migrations/20241204154025_grant_all_concurrency_key.down.sql
@@ -0,0 +1 @@
+-- Add down migration script here
diff --git a/backend/migrations/20241204154025_grant_all_concurrency_key.up.sql b/backend/migrations/20241204154025_grant_all_concurrency_key.up.sql
new file mode 100644
index 0000000000..da9b9704d7
--- /dev/null
+++ b/backend/migrations/20241204154025_grant_all_concurrency_key.up.sql
@@ -0,0 +1,3 @@
+-- Add up migration script here
+GRANT ALL ON concurrency_key TO windmill_admin;
+GRANT ALL ON concurrency_key TO windmill_user;
\ No newline at end of file
diff --git a/backend/src/monitor.rs b/backend/src/monitor.rs
index 733a841283..df3b695168 100644
--- a/backend/src/monitor.rs
+++ b/backend/src/monitor.rs
@@ -85,12 +85,12 @@ lazy_static::lazy_static! {
     static ref ZOMBIE_JOB_TIMEOUT: String = std::env::var("ZOMBIE_JOB_TIMEOUT")
     .ok()
     .and_then(|x| x.parse::<String>().ok())
-    .unwrap_or_else(|| "30".to_string());
+    .unwrap_or_else(|| "60".to_string());
 
     static ref FLOW_ZOMBIE_TRANSITION_TIMEOUT: String = std::env::var("FLOW_ZOMBIE_TRANSITION_TIMEOUT")
     .ok()
     .and_then(|x| x.parse::<String>().ok())
-    .unwrap_or_else(|| "30".to_string());
+    .unwrap_or_else(|| "60".to_string());
 
 
     pub static ref RESTART_ZOMBIE_JOBS: bool = std::env::var("RESTART_ZOMBIE_JOBS")
diff --git a/backend/windmill-common/Cargo.toml b/backend/windmill-common/Cargo.toml
index 068668930d..b56b9a39cf 100644
--- a/backend/windmill-common/Cargo.toml
+++ b/backend/windmill-common/Cargo.toml
@@ -62,6 +62,7 @@ windmill-macros.workspace = true
 semver.workspace = true
 croner = "2.0.6"
 quick_cache.workspace = true
+pin-project-lite.workspace = true
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemalloc-ctl = { optional = true, workspace = true }
diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index 08a0c32e3b..dc76c199e6 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -34,8 +34,8 @@ pub const GIT_VERSION: &str =
     git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
 
 use crate::CRITICAL_ALERT_MUTE_UI_ENABLED;
-use std::sync::atomic::Ordering;
 use std::panic::{self, AssertUnwindSafe};
+use std::sync::atomic::Ordering;
 
 use crate::worker::CLOUD_HOSTED;
 
@@ -78,14 +78,18 @@ pub fn require_admin(is_admin: bool, username: &str) -> Result<()> {
     }
 }
 
-pub async fn require_admin_or_devops(is_admin: bool, username: &str, email: &str, db: &DB) -> Result<()> {
+pub async fn require_admin_or_devops(
+    is_admin: bool,
+    username: &str,
+    email: &str,
+    db: &DB,
+) -> Result<()> {
     if !is_admin {
         if !is_devops_email(db, email).await? {
             return Err(Error::RequireAdmin(username.to_string()));
         }
     }
     Ok(())
-
 }
 
 pub fn hostname() -> String {
@@ -94,7 +98,7 @@ pub fn hostname() -> String {
             .to_str()
             .map(|x| x.to_string())
             .unwrap_or_else(|| rd_string(5))
-    }) 
+    })
 }
 
 pub fn paginate(pagination: Pagination) -> (usize, usize) {
@@ -440,9 +444,7 @@ impl ScheduleType {
             Some("v2") | Some(_) => {
                 // Use Croner for v2
                 let schedule_type_result = panic::catch_unwind(AssertUnwindSafe(|| {
-                    Cron::new(schedule_str)
-                        .with_seconds_optional()
-                        .parse()
+                    Cron::new(schedule_str).with_seconds_optional().parse()
                 }))
                 .map_err(|_| {
                     tracing::error!(
@@ -478,8 +480,14 @@ impl ScheduleType {
                     }
 
                     if let Err(e) = result {
-                        tracing::error!("An error occurred while finding the next occurrence: {:?}", e);
-                        return Err(Error::BadRequest(format!("cron: error during find_next_occurrence: {:?}", e)));
+                        tracing::error!(
+                            "An error occurred while finding the next occurrence: {:?}",
+                            e
+                        );
+                        return Err(Error::BadRequest(format!(
+                            "cron: error during find_next_occurrence: {:?}",
+                            e
+                        )));
                     }
                 }
 
@@ -526,3 +534,75 @@ impl ScheduleType {
         Ok(events)
     }
 }
+
+use std::future::Future;
+use std::pin::Pin;
+use std::task::{Context as TContext, Poll};
+use tokio::time::{self, Duration, Sleep};
+
+use pin_project_lite::pin_project;
+
+pub trait WarnAfterExt: Future + Sized {
+    /// Warns if the future takes longer than the specified number of seconds to complete.
+    fn warn_after_seconds(self, seconds: u8, location: &'static str) -> WarnAfterFuture<Self> {
+        WarnAfterFuture {
+            future: self,
+            timeout: time::sleep(Duration::from_secs(seconds as u64)),
+            warned: false,
+            start_time: std::time::Instant::now(),
+            location,
+            seconds,
+        }
+    }
+}
+
+// Blanket implementation for all futures.
+impl<F: Future> WarnAfterExt for F {}
+
+pin_project! {
+    /// A future that wraps another future and prints a warning if it takes too long.
+    pub struct WarnAfterFuture<F> {
+        #[pin]
+        future: F,
+        #[pin]
+        timeout: Sleep,
+        warned: bool,
+        location: &'static str,
+        start_time: std::time::Instant,
+        seconds: u8,
+    }
+}
+
+impl<F: Future> Future for WarnAfterFuture<F> {
+    type Output = F::Output;
+
+    fn poll(self: Pin<&mut Self>, cx: &mut TContext<'_>) -> Poll<Self::Output> {
+        let this = self.project();
+
+        // Poll the timeout future to check if it has elapsed.
+        if !*this.warned {
+            if this.timeout.poll(cx).is_ready() {
+                tracing::warn!(location = this.location, "SLOW_QUERY: query to db taking longer than expected (> {} seconds). This is a sign the database is under heavy load, query is too heavy or database is undersized",
+                    this.seconds,
+                );
+                *this.warned = true;
+            }
+        }
+
+        // Poll the wrapped future.
+        match this.future.poll(cx) {
+            Poll::Ready(output) => {
+                if *this.warned {
+                    let elapsed = this.start_time.elapsed();
+                    tracing::warn!(
+                        location = this.location,
+                        "SLOW QUERY: completed with total duration: {:.2?}",
+                        elapsed
+                    );
+                }
+                Poll::Ready(output)
+            }
+            Poll::Pending => Poll::Pending,
+        }
+    }
+}
diff --git a/backend/windmill-worker/src/result_processor.rs b/backend/windmill-worker/src/result_processor.rs
index ea8a883407..6d7d6b1acf 100644
--- a/backend/windmill-worker/src/result_processor.rs
+++ b/backend/windmill-worker/src/result_processor.rs
@@ -14,6 +14,7 @@ use windmill_common::{
     add_time,
     error::{self, Error},
     jobs::{JobKind, QueuedJob},
+    utils::WarnAfterExt,
     worker::{to_raw_value, WORKER_GROUP},
     DB,
 };
@@ -431,6 +432,7 @@ pub async fn process_completed_job(
                     #[cfg(feature = "benchmark")]
                     bench,
                 )
+                .warn_after_seconds(10, "update_flow_status_after_job_completion success")
                 .await?;
             }
         }
@@ -469,6 +471,7 @@ pub async fn process_completed_job(
                     #[cfg(feature = "benchmark")]
                     bench,
                 )
+                .warn_after_seconds(10, "update_flow_status_after_job_completion error")
                 .await?;
             }
         }
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 0d64b30c5a..51c0c64fe1 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -9,6 +9,7 @@
 use windmill_common::{
     auth::{fetch_authed_from_permissioned_as, JWTAuthClaims, JobPerms, JWT_SECRET},
     scripts::PREVIEW_IS_TAR_CODEBASE_HASH,
+    utils::WarnAfterExt,
     worker::{
         get_memory, get_vcpus, get_windmill_memory_usage, get_worker_memory_usage, write_file,
         ROOT_CACHE_DIR, TMP_DIR,
@@ -159,6 +160,7 @@ pub async fn create_token_for_owner_in_bg(
                 &email,
                 &job_id,
             )
+            .warn_after_seconds(5, "creating token for owner")
             .await
             .expect("could not create job token");
             *locked = token;
@@ -1823,7 +1825,9 @@ async fn handle_queued_job(
     if job.parent_job.is_none() && job.created_by.starts_with("email-") {
         let daily_count = sqlx::query!(
             "SELECT value FROM metrics WHERE id = 'email_trigger_usage' AND created_at > NOW() - INTERVAL '1 day' ORDER BY created_at DESC LIMIT 1"
-        ).fetch_optional(db).await?.map(|x| serde_json::from_value::<i64>(x.value).unwrap_or(1));
+        ).fetch_optional(db)
+        .warn_after_seconds(5, "getting email_trigger_usage")
+        .await?.map(|x| serde_json::from_value::<i64>(x.value).unwrap_or(1));
 
         if let Some(count) = daily_count {
             if count >= 100 {
@@ -1836,6 +1840,7 @@ async fn handle_queued_job(
                     serde_json::json!(count + 1)
                 )
                 .execute(db)
+                .warn_after_seconds(5, "updating email_trigger_usage")
                 .await?;
             }
         } else {
@@ -1843,6 +1848,7 @@ async fn handle_queued_job(
                 "INSERT INTO metrics (id, value) VALUES ('email_trigger_usage', to_jsonb(1))"
             )
             .execute(db)
+            .warn_after_seconds(5, "inserting email_trigger_usage")
             .await?;
         }
     }
@@ -1855,6 +1861,7 @@ async fn handle_queued_job(
                 .ok_or_else(|| Error::InternalErr(format!("expected parent job")))?,
             job.id,
         )
+        .warn_after_seconds(5, "updating flow status in progress")
         .await?;
 
         Some(r)
@@ -1867,6 +1874,7 @@ async fn handle_queued_job(
                 &job.workspace_id
             )
             .execute(db)
+            .warn_after_seconds(5, "updating parent job started_at flow_status")
             .await {
                 tracing::error!("Could not update parent job started_at flow_status: {}", e);
             }
@@ -1883,6 +1891,7 @@ async fn handle_queued_job(
             job.workspace_id
         )
         .fetch_one(db)
+        .warn_after_seconds(5, "getting job raw values")
         .await
         .map(|record| (record.raw_code, record.raw_lock, record.raw_flow))
         .unwrap_or_default(),
@@ -1923,6 +1932,7 @@ async fn handle_queued_job(
                 &job.parent_job.unwrap()
             )
             .fetch_one(db)
+            .warn_after_seconds(5, "getting script path from queue for caching purposes")
             .await
             .map_err(|e| {
                 Error::InternalErr(format!(
@@ -1957,6 +1967,7 @@ async fn handle_queued_job(
             &job.workspace_id,
             &cached_res_path,
         )
+        .warn_after_seconds(5, "getting cached resource value")
         .await;
         if let Some(cached_resource_value) = cached_resource_value_maybe {
             {
@@ -1995,6 +2006,7 @@ async fn handle_queued_job(
             worker_dir,
             job_completed_tx.0.clone(),
         )
+        .warn_after_seconds(10, "handling flow")
         .await?;
         Ok(true)
     } else {
@@ -2285,9 +2297,11 @@ async fn handle_code_execution_job(
             .await?
         }
         JobKind::FlowScript => {
-            let (lockfile, content) = cache::flow::fetch_script(db, FlowNodeId(
-                job.script_hash.unwrap_or(ScriptHash(0)).0
-            )).await?;
+            let (lockfile, content) = cache::flow::fetch_script(
+                db,
+                FlowNodeId(job.script_hash.unwrap_or(ScriptHash(0)).0),
+            )
+            .await?;
             ContentReqLangEnvs {
                 content,
                 lockfile,
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 33b17db790..a62ee84319 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -41,6 +41,7 @@ use windmill_common::jobs::{
     script_hash_to_tag_and_limits, script_path_to_payload, BranchResults, JobPayload, QueuedJob,
     RawCode, ENTRYPOINT_OVERRIDE,
 };
+use windmill_common::utils::WarnAfterExt;
 use windmill_common::worker::to_raw_value;
 use windmill_common::{
     error::{self, to_anyhow, Error},
@@ -1109,6 +1110,7 @@ pub async fn update_flow_status_after_job_completion_internal(
             worker_dir,
                 job_completed_tx,
         )
+        .warn_after_seconds(10, "handle_flow in update_flow_status")
         .await
         {
             Err(err) => {
@@ -1510,7 +1512,7 @@ pub async fn handle_flow(
         let schedule_path = flow_job.schedule_path.as_ref().unwrap();
 
         let schedule =
-            get_schedule_opt(&mut tx, &flow_job.workspace_id, schedule_path).await?;
+            get_schedule_opt(&mut tx, &flow_job.workspace_id, schedule_path).warn_after_seconds(5, "get schedule_opt in handle_flow").await?;
 
         tx.commit().await?;
 
@@ -1522,6 +1524,7 @@ pub async fn handle_flow(
                 flow_job.script_path.as_ref().unwrap(),
                 &flow_job.workspace_id,
             )
+            .warn_after_seconds(5, "handle_maybe_scheduled_job in handle_flow")
             .await
             {
                 match err {
@@ -1549,6 +1552,7 @@ pub async fn handle_flow(
         worker_dir,
         job_completed_tx,
     )
+    .warn_after_seconds(10, "push next flow job")
     .await?;
     Ok(())
 }

From bb9dd7d368fa667a0921e48a815b2af434c62861 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 4 Dec 2024 18:24:31 +0100
Subject: [PATCH 07/34] simplify warn_after_seconds

---
 backend/windmill-common/src/utils.rs          | 11 ++++++----
 .../windmill-worker/src/result_processor.rs   |  4 ++--
 backend/windmill-worker/src/worker.rs         | 20 +++++++++----------
 backend/windmill-worker/src/worker_flow.rs    |  8 ++++----
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index dc76c199e6..5dd89f80e1 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -34,7 +34,7 @@ pub const GIT_VERSION: &str =
     git_version!(args = ["--tag", "--always"], fallback = "unknown-version");
 
 use crate::CRITICAL_ALERT_MUTE_UI_ENABLED;
-use std::panic::{self, AssertUnwindSafe};
+use std::panic::{self, AssertUnwindSafe, Location};
 use std::sync::atomic::Ordering;
 
 use crate::worker::CLOUD_HOSTED;
@@ -544,13 +544,16 @@ use pin_project_lite::pin_project;
 
 pub trait WarnAfterExt: Future + Sized {
     /// Warns if the future takes longer than the specified number of seconds to complete.
-    fn warn_after_seconds(self, seconds: u8, location: &'static str) -> WarnAfterFuture<Self> {
+    #[track_caller]
+    fn warn_after_seconds(self, seconds: u8) -> WarnAfterFuture<Self> {
+        let caller = Location::caller();
+        let location = format!("{}:{}", caller.file(), caller.line());
         WarnAfterFuture {
             future: self,
             timeout: time::sleep(Duration::from_secs(seconds as u64)),
             warned: false,
             start_time: std::time::Instant::now(),
-            location,
+            location: location,
             seconds,
         }
     }
@@ -567,7 +570,7 @@ pin_project! {
         #[pin]
         timeout: Sleep,
         warned: bool,
-        location: &'static str,
+        location: String,
         start_time: std::time::Instant,
         seconds: u8,
     }
diff --git a/backend/windmill-worker/src/result_processor.rs b/backend/windmill-worker/src/result_processor.rs
index 6d7d6b1acf..25bfade2e8 100644
--- a/backend/windmill-worker/src/result_processor.rs
+++ b/backend/windmill-worker/src/result_processor.rs
@@ -432,7 +432,7 @@ pub async fn process_completed_job(
                     #[cfg(feature = "benchmark")]
                     bench,
                 )
-                .warn_after_seconds(10, "update_flow_status_after_job_completion success")
+                .warn_after_seconds(10)
                 .await?;
             }
         }
@@ -471,7 +471,7 @@ pub async fn process_completed_job(
                     #[cfg(feature = "benchmark")]
                     bench,
                 )
-                .warn_after_seconds(10, "update_flow_status_after_job_completion error")
+                .warn_after_seconds(10)
                 .await?;
             }
         }
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index 51c0c64fe1..f0fdc93885 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -160,7 +160,7 @@ pub async fn create_token_for_owner_in_bg(
                 &email,
                 &job_id,
             )
-            .warn_after_seconds(5, "creating token for owner")
+            .warn_after_seconds(5)
             .await
             .expect("could not create job token");
             *locked = token;
@@ -1826,7 +1826,7 @@ async fn handle_queued_job(
         let daily_count = sqlx::query!(
             "SELECT value FROM metrics WHERE id = 'email_trigger_usage' AND created_at > NOW() - INTERVAL '1 day' ORDER BY created_at DESC LIMIT 1"
         ).fetch_optional(db)
-        .warn_after_seconds(5, "getting email_trigger_usage")
+        .warn_after_seconds(5)
         .await?.map(|x| serde_json::from_value::<i64>(x.value).unwrap_or(1));
 
         if let Some(count) = daily_count {
@@ -1840,7 +1840,7 @@ async fn handle_queued_job(
                     serde_json::json!(count + 1)
                 )
                 .execute(db)
-                .warn_after_seconds(5, "updating email_trigger_usage")
+                .warn_after_seconds(5)
                 .await?;
             }
         } else {
@@ -1848,7 +1848,7 @@ async fn handle_queued_job(
                 "INSERT INTO metrics (id, value) VALUES ('email_trigger_usage', to_jsonb(1))"
             )
             .execute(db)
-            .warn_after_seconds(5, "inserting email_trigger_usage")
+            .warn_after_seconds(5)
             .await?;
         }
     }
@@ -1861,7 +1861,7 @@ async fn handle_queued_job(
                 .ok_or_else(|| Error::InternalErr(format!("expected parent job")))?,
             job.id,
         )
-        .warn_after_seconds(5, "updating flow status in progress")
+        .warn_after_seconds(5)
         .await?;
 
         Some(r)
@@ -1874,7 +1874,7 @@ async fn handle_queued_job(
                 &job.workspace_id
             )
             .execute(db)
-            .warn_after_seconds(5, "updating parent job started_at flow_status")
+            .warn_after_seconds(5)
             .await {
                 tracing::error!("Could not update parent job started_at flow_status: {}", e);
             }
@@ -1891,7 +1891,7 @@ async fn handle_queued_job(
             job.workspace_id
         )
         .fetch_one(db)
-        .warn_after_seconds(5, "getting job raw values")
+        .warn_after_seconds(5)
         .await
         .map(|record| (record.raw_code, record.raw_lock, record.raw_flow))
         .unwrap_or_default(),
@@ -1932,7 +1932,7 @@ async fn handle_queued_job(
                 &job.parent_job.unwrap()
             )
             .fetch_one(db)
-            .warn_after_seconds(5, "getting script path from queue for caching purposes")
+            .warn_after_seconds(5)
             .await
             .map_err(|e| {
                 Error::InternalErr(format!(
@@ -1967,7 +1967,7 @@ async fn handle_queued_job(
             &job.workspace_id,
             &cached_res_path,
         )
-        .warn_after_seconds(5, "getting cached resource value")
+        .warn_after_seconds(5)
         .await;
         if let Some(cached_resource_value) = cached_resource_value_maybe {
             {
@@ -2006,7 +2006,7 @@ async fn handle_queued_job(
             worker_dir,
             job_completed_tx.0.clone(),
         )
-        .warn_after_seconds(10, "handling flow")
+        .warn_after_seconds(10)
         .await?;
         Ok(true)
     } else {
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index a62ee84319..1e4aefdba0 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -1110,7 +1110,7 @@ pub async fn update_flow_status_after_job_completion_internal(
             worker_dir,
                 job_completed_tx,
         )
-        .warn_after_seconds(10, "handle_flow in update_flow_status")
+        .warn_after_seconds(10)
         .await
         {
             Err(err) => {
@@ -1512,7 +1512,7 @@ pub async fn handle_flow(
         let schedule_path = flow_job.schedule_path.as_ref().unwrap();
 
         let schedule =
-            get_schedule_opt(&mut tx, &flow_job.workspace_id, schedule_path).warn_after_seconds(5, "get schedule_opt in handle_flow").await?;
+            get_schedule_opt(&mut tx, &flow_job.workspace_id, schedule_path).warn_after_seconds(5).await?;
 
         tx.commit().await?;
 
@@ -1524,7 +1524,7 @@ pub async fn handle_flow(
                 flow_job.script_path.as_ref().unwrap(),
                 &flow_job.workspace_id,
             )
-            .warn_after_seconds(5, "handle_maybe_scheduled_job in handle_flow")
+            .warn_after_seconds(5)
             .await
             {
                 match err {
@@ -1552,7 +1552,7 @@ pub async fn handle_flow(
         worker_dir,
         job_completed_tx,
     )
-    .warn_after_seconds(10, "push next flow job")
+    .warn_after_seconds(10)
     .await?;
     Ok(())
 }

From db62a2c53cba6457df1bfc020833af715cc5c615 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Wed, 4 Dec 2024 18:28:05 +0100
Subject: [PATCH 08/34] simplify warn_after_seconds

---
 backend/windmill-common/src/job_metrics.rs | 3 ++-
 backend/windmill-common/src/utils.rs       | 2 +-
 backend/windmill-queue/src/jobs.rs         | 9 ++++++---
 backend/windmill-worker/src/worker_flow.rs | 4 +++-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/windmill-common/src/job_metrics.rs b/backend/windmill-common/src/job_metrics.rs
index c0c2300fed..6577e34d6e 100644
--- a/backend/windmill-common/src/job_metrics.rs
+++ b/backend/windmill-common/src/job_metrics.rs
@@ -1,4 +1,4 @@
-use crate::{db::DB, error};
+use crate::{db::DB, error, utils::WarnAfterExt};
 
 use serde::{Deserialize, Serialize};
 use uuid::Uuid;
@@ -90,6 +90,7 @@ pub async fn register_metric_for_job(
     .bind(timeseries_int)
     .bind(timeseries_float)
     .execute(db)
+    .warn_after_seconds(1)
     .await?;
 
     Ok(metric_id)
diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index 5dd89f80e1..c13f96e2de 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -599,7 +599,7 @@ impl<F: Future> Future for WarnAfterFuture<F> {
                     let elapsed = this.start_time.elapsed();
                     tracing::warn!(
                         location = this.location,
-                        "SLOW QUERY: completed with total duration: {:.2?}",
+                        "SLOW_QUERY: completed with total duration: {:.2?}",
                         elapsed
                     );
                 }
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index 2390ca47bb..1e516f4821 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -39,8 +39,8 @@ use windmill_audit::audit_ee::{audit_log, AuditAuthor};
 use windmill_audit::ActionKind;
 
 use windmill_common::{
-    cache,
     auth::{fetch_authed_from_permissioned_as, permissioned_as_to_username},
+    cache,
     db::{Authed, UserDB},
     error::{self, to_anyhow, Error},
     flow_status::{
@@ -57,7 +57,7 @@ use windmill_common::{
     schedule::Schedule,
     scripts::{get_full_hub_script_by_path, ScriptHash, ScriptLang},
     users::{SUPERADMIN_NOTIFICATION_EMAIL, SUPERADMIN_SECRET_EMAIL},
-    utils::{not_found_if_none, report_critical_error, StripPath},
+    utils::{not_found_if_none, report_critical_error, StripPath, WarnAfterExt},
     worker::{
         to_raw_value, CLOUD_HOSTED, DEFAULT_TAGS_PER_WORKSPACE, DEFAULT_TAGS_WORKSPACES,
         DISABLE_FLOW_SCRIPT, MIN_VERSION_IS_AT_LEAST_1_427, MIN_VERSION_IS_AT_LEAST_1_432, NO_LOGS,
@@ -318,6 +318,7 @@ pub async fn append_logs(
         workspace.as_ref(),
     )
     .execute(db.borrow())
+    .warn_after_seconds(1)
     .await
     {
         tracing::error!(%job_id, %err, "error updating logs for large_log job {job_id}: {err}");
@@ -3227,7 +3228,7 @@ pub async fn push<'c, 'd>(
                 None,
                 None,
             )
-        },
+        }
         JobPayload::ScriptHub { path } => {
             if path == "hub/7771/slack" || path == "hub/7836/slack" {
                 permissioned_as = SUPERADMIN_NOTIFICATION_EMAIL.to_string();
@@ -3851,6 +3852,7 @@ pub async fn push<'c, 'd>(
         tag,
     )
     .execute(&mut *tx)
+    .warn_after_seconds(1)
     .await?;
 
     let (raw_code, raw_lock, raw_flow) = if !*MIN_VERSION_IS_AT_LEAST_1_427.read().await {
@@ -3901,6 +3903,7 @@ pub async fn push<'c, 'd>(
         final_priority,
     )
     .fetch_one(&mut *tx)
+    .warn_after_seconds(1)
     .await
     .map_err(|e| Error::InternalErr(format!("Could not insert into queue {job_id} with tag {tag}, schedule_path {schedule_path:?}, script_path: {script_path:?}, email {email}, workspace_id {workspace_id}: {e:#}")))?;
 
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 1e4aefdba0..050f0ebcf4 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -2137,6 +2137,7 @@ async fn push_next_flow_job(
                 .bind(status.step)
                 .bind(json!(status.retry.failed_jobs))
                 .execute(db)
+                .warn_after_seconds(2)
                 .await
                 .context("update flow retry")?;
 
@@ -2562,6 +2563,7 @@ async fn push_next_flow_job(
             new_job_priority_override,
             job_perms.as_ref(),
         )
+        .warn_after_seconds(2)
         .await?;
 
         tracing::debug!(id = %flow_job.id, root_id = %job_root, "pushed next flow job: {uuid}");
@@ -2774,7 +2776,7 @@ async fn push_next_flow_job(
     .execute(&mut *tx)
     .await?;
 
-    tx.commit().await?;
+    tx.commit().warn_after_seconds(3).await?;
     tracing::info!(id = %flow_job.id, root_id = %job_root, "all next flow jobs pushed: {uuids:?}");
 
     if continue_on_same_worker {

From ff8e98feb8b703af597759a2454f272ddd0036c8 Mon Sep 17 00:00:00 2001
From: wendrul <53628737+wendrul@users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:33:41 +0100
Subject: [PATCH 09/34] Remove unused env vars from docker compose + css fixes
 (#4841)

---
 docker-compose.yml                            |  6 ---
 .../search/GlobalSearchModal.svelte           |  4 +-
 .../SplitPanesOrColumnOnMobile.svelte         | 44 +++++++++----------
 .../(root)/(logged)/service_logs/+page.svelte |  2 +-
 4 files changed, 25 insertions(+), 31 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index d45e589808..13d1c3ac98 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -129,12 +129,6 @@ services:
       - PORT=8001
       - DATABASE_URL=${DATABASE_URL}
       - MODE=indexer
-      - TANTIVY_MAX_INDEXED_JOB_LOG_SIZE__MB=1 # job logs bigger than this will be truncated before indexing
-      - TANTIVY_S3_BACKUP_PERIOD__S=3600 # how often to backup the index into object storage
-      - TANTIVY_INDEX_WRITER_MEMORY_BUDGET__MB=100 # higher budget for higher indexing throughput
-      - TANTIVY_REFRESH_INDEX_PERIOD__S=300 #how often to start indexing new jobs
-      - TANTIVY_DOC_COMMIT_MAX_BATCH_SIZE=100000 #how many documents to batch in one commit
-      - TANTIVY_SHOW_MEMORY_EVERY=10000 #log memory usage and progress every so many documents indexed
     depends_on:
       db:
         condition: service_healthy
diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index 599e8853cb..fc4db3bcf0 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -33,7 +33,7 @@
 	import ContentSearchInner from '../ContentSearchInner.svelte'
 	import { goto } from '$app/navigation'
 	import QuickMenuItem from '../search/QuickMenuItem.svelte'
-	import { enterpriseLicense, superadmin, workspaceStore } from '$lib/stores'
+	import { devopsRole, enterpriseLicense, superadmin, workspaceStore } from '$lib/stores'
 	import uFuzzy from '@leeoniya/ufuzzy'
 	import BarsStaggered from '../icons/BarsStaggered.svelte'
 	import { scroll_into_view_if_needed_polyfill } from '../multiselect/utils'
@@ -610,7 +610,7 @@
 						/>
 					{:else if tab === 'logs'}
 						<div class="p-2">
-							{#if !$superadmin}
+							{#if !$devopsRole}
 								<Alert title="Service logs are only available to superadmins" type="warning">
 									Service logs are only available to superadmins
 								</Alert>
diff --git a/frontend/src/lib/components/splitPanes/SplitPanesOrColumnOnMobile.svelte b/frontend/src/lib/components/splitPanes/SplitPanesOrColumnOnMobile.svelte
index a609b74637..39191e6ade 100644
--- a/frontend/src/lib/components/splitPanes/SplitPanesOrColumnOnMobile.svelte
+++ b/frontend/src/lib/components/splitPanes/SplitPanesOrColumnOnMobile.svelte
@@ -11,27 +11,27 @@
 	let clientWidth = window.innerWidth
 </script>
 
-<main class="h-screen w-full" bind:clientWidth>
-	{#if clientWidth >= 768}
-		<SplitPanesWrapper class="hidden md:block">
-			<Splitpanes>
-				<Pane size={30} minSize={25}>
-					<slot name="left-pane" />
-				</Pane>
-				<Pane size={70} minSize={25}>
+<main class="flex-grow w-full overflow-y-auto" bind:clientWidth>
+		{#if clientWidth >= 768}
+			<SplitPanesWrapper class="hidden md:block">
+				<Splitpanes>
+					<Pane size={leftPaneSize} minSize={leftPaneMinSize}>
+						<slot name="left-pane" />
+					</Pane>
+					<Pane size={rightPaneSize} minSize={rightPaneMinSize}>
+						<slot name="right-pane" />
+					</Pane>
+				</Splitpanes>
+			</SplitPanesWrapper>
+		{:else}
+			<div class="flex flex-col">
+				{#if rightPaneIsFirstInCol}
 					<slot name="right-pane" />
-				</Pane>
-			</Splitpanes>
-		</SplitPanesWrapper>
-	{:else}
-		<div class="flex flex-col">
-			{#if rightPaneIsFirstInCol}
-				<slot name="right-pane" />
-				<slot name="left-pane" />
-			{:else}
-				<slot name="left-pane" />
-				<slot name="right-pane" />
-			{/if}
-		</div>
-	{/if}
+					<slot name="left-pane" />
+				{:else}
+					<slot name="left-pane" />
+					<slot name="right-pane" />
+				{/if}
+			</div>
+		{/if}
 </main>
diff --git a/frontend/src/routes/(root)/(logged)/service_logs/+page.svelte b/frontend/src/routes/(root)/(logged)/service_logs/+page.svelte
index d378026430..ae080cb967 100644
--- a/frontend/src/routes/(root)/(logged)/service_logs/+page.svelte
+++ b/frontend/src/routes/(root)/(logged)/service_logs/+page.svelte
@@ -11,7 +11,7 @@
 	let queryParseErrors: string[] | undefined = undefined
 </script>
 
-<div class="w-full h-screen px-2">
+<div class="flex flex-col w-full h-screen max-h-screen max-w-screen px-2">
 	<div class="px-2">
 		<div class="flex items-center space-x-2 flex-row justify-between">
 			<div class="flex flex-row flex-wrap justify-between py-2 my-4 px-4 gap-1 items-center">

From 0b4b5404bd13e1b1b18d41ade1887ec67055e199 Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Wed, 4 Dec 2024 17:29:36 -0500
Subject: [PATCH 10/34] fix ci error unused superadmin import (#4844)

---
 frontend/src/lib/components/search/GlobalSearchModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index fc4db3bcf0..c443a55e8f 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -33,7 +33,7 @@
 	import ContentSearchInner from '../ContentSearchInner.svelte'
 	import { goto } from '$app/navigation'
 	import QuickMenuItem from '../search/QuickMenuItem.svelte'
-	import { devopsRole, enterpriseLicense, superadmin, workspaceStore } from '$lib/stores'
+	import { devopsRole, enterpriseLicense, workspaceStore } from '$lib/stores'
 	import uFuzzy from '@leeoniya/ufuzzy'
 	import BarsStaggered from '../icons/BarsStaggered.svelte'
 	import { scroll_into_view_if_needed_polyfill } from '../multiselect/utils'

From fdce1fd73f6cf4d082a092c6d0d11f1193008357 Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Wed, 4 Dec 2024 18:06:15 -0500
Subject: [PATCH 11/34] set/get state from powershell client (#4838)

* set/get state from powershell client

* format

* removing unneccessary arg
---
 .../WindmillClient/WindmillClient.psd1        | 206 +++++++++---------
 .../WindmillClient/WindmillClient.psm1        | 107 ++++++---
 2 files changed, 180 insertions(+), 133 deletions(-)

diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 9dc95dee21..cdcf7c0997 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -8,148 +8,150 @@
 
 @{
 
-# Script module or binary module file associated with this manifest.
-RootModule = 'WindmillClient.psm1'
+    # Script module or binary module file associated with this manifest.
+    RootModule        = 'WindmillClient.psm1'
 
-# Version number of this module.
-ModuleVersion = '1.434.2'
+    # Version number of this module.
+    ModuleVersion     = '1.434.2'
 
-# Supported PSEditions
-# CompatiblePSEditions = @()
+    # Supported PSEditions
+    # CompatiblePSEditions = @()
 
-# ID used to uniquely identify this module
-GUID = '8a2396f8-2582-400c-a762-cdd6a0699b0b'
+    # ID used to uniquely identify this module
+    GUID              = '8a2396f8-2582-400c-a762-cdd6a0699b0b'
 
-# Author of this module
-Author = 'Windmill Labs'
+    # Author of this module
+    Author            = 'Windmill Labs'
 
-# Company or vendor of this module
-CompanyName = 'Windmill Labs, Inc'
+    # Company or vendor of this module
+    CompanyName       = 'Windmill Labs, Inc'
 
-# Copyright statement for this module
-Copyright = '(c) Windmill Labs, Inc 2022'
+    # Copyright statement for this module
+    Copyright         = '(c) Windmill Labs, Inc 2022'
 
-# Description of the functionality provided by this module
-Description = 'Client for the Windmill platform.'
+    # Description of the functionality provided by this module
+    Description       = 'Client for the Windmill platform.'
 
-# Minimum version of the PowerShell engine required by this module
-# PowerShellVersion = ''
+    # Minimum version of the PowerShell engine required by this module
+    # PowerShellVersion = ''
 
-# Name of the PowerShell host required by this module
-# PowerShellHostName = ''
+    # Name of the PowerShell host required by this module
+    # PowerShellHostName = ''
 
-# Minimum version of the PowerShell host required by this module
-# PowerShellHostVersion = ''
+    # Minimum version of the PowerShell host required by this module
+    # PowerShellHostVersion = ''
 
-# Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
-# DotNetFrameworkVersion = ''
+    # Minimum version of Microsoft .NET Framework required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
+    # DotNetFrameworkVersion = ''
 
-# Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
-# ClrVersion = ''
+    # Minimum version of the common language runtime (CLR) required by this module. This prerequisite is valid for the PowerShell Desktop edition only.
+    # ClrVersion = ''
 
-# Processor architecture (None, X86, Amd64) required by this module
-# ProcessorArchitecture = ''
+    # Processor architecture (None, X86, Amd64) required by this module
+    # ProcessorArchitecture = ''
 
-# Modules that must be imported into the global environment prior to importing this module
-# RequiredModules = @()
+    # Modules that must be imported into the global environment prior to importing this module
+    # RequiredModules = @()
 
-# Assemblies that must be loaded prior to importing this module
-# RequiredAssemblies = @()
+    # Assemblies that must be loaded prior to importing this module
+    # RequiredAssemblies = @()
 
-# Script files (.ps1) that are run in the caller's environment prior to importing this module.
-# ScriptsToProcess = @()
+    # Script files (.ps1) that are run in the caller's environment prior to importing this module.
+    # ScriptsToProcess = @()
 
-# Type files (.ps1xml) to be loaded when importing this module
-# TypesToProcess = @()
+    # Type files (.ps1xml) to be loaded when importing this module
+    # TypesToProcess = @()
 
-# Format files (.ps1xml) to be loaded when importing this module
-# FormatsToProcess = @()
+    # Format files (.ps1xml) to be loaded when importing this module
+    # FormatsToProcess = @()
 
-# Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-# NestedModules = @()
+    # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
+    # NestedModules = @()
 
-# Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
-FunctionsToExport = @(
-    'Connect-Windmill',
-    'Disconnect-Windmill',
-    'New-WindmillToken',
-    'Get-WindmillIdToken',
-    'Get-WindmillWorkspace',
-    'Get-WindmillVersion',
-    'Get-WindmillUser',
-    'Get-WindmillVariable',
-    'New-WindmillVariable',
-    'Set-WindmillVariable',
-    'Remove-WindmillVariable',
-    'Get-WindmillResource',
-    'New-WindmillResource',
-    'Set-WindmillResource',
-    'Remove-WindmillResource',
-    'Invoke-WindmillScript',
-    'Start-WindmillScript',
-    'Start-WindmillFlow',
-    'Stop-WindmillJob',
-    'Wait-WindmillJob',
-    'Stop-WindmillExecution',
-    'Get-WindmillJob',
-    'Get-WindmillResult')
+    # Functions to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no functions to export.
+    FunctionsToExport = @(
+        'Connect-Windmill',
+        'Disconnect-Windmill',
+        'New-WindmillToken',
+        'Get-WindmillIdToken',
+        'Get-WindmillWorkspace',
+        'Get-WindmillVersion',
+        'Get-WindmillUser',
+        'Get-WindmillVariable',
+        'New-WindmillVariable',
+        'Set-WindmillVariable',
+        'Remove-WindmillVariable',
+        'Get-WindmillResource',
+        'Get-WindmillState',
+        'New-WindmillResource',
+        'Set-WindmillResource',
+        'Set-WindmillState',
+        'Remove-WindmillResource',
+        'Invoke-WindmillScript',
+        'Start-WindmillScript',
+        'Start-WindmillFlow',
+        'Stop-WindmillJob',
+        'Wait-WindmillJob',
+        'Stop-WindmillExecution',
+        'Get-WindmillJob',
+        'Get-WindmillResult')
 
-# Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = @()
+    # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
+    CmdletsToExport   = @()
 
-# Variables to export from this module
-VariablesToExport = '*'
+    # Variables to export from this module
+    VariablesToExport = '*'
 
-# Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
-AliasesToExport = @()
+    # Aliases to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no aliases to export.
+    AliasesToExport   = @()
 
-# DSC resources to export from this module
-# DscResourcesToExport = @()
+    # DSC resources to export from this module
+    # DscResourcesToExport = @()
 
-# List of all modules packaged with this module
-# ModuleList = @()
+    # List of all modules packaged with this module
+    # ModuleList = @()
 
-# List of all files packaged with this module
-# FileList = @()
+    # List of all files packaged with this module
+    # FileList = @()
 
-# Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
-PrivateData = @{
+    # Private data to pass to the module specified in RootModule/ModuleToProcess. This may also contain a PSData hashtable with additional module metadata used by PowerShell.
+    PrivateData       = @{
 
-    PSData = @{
+        PSData = @{
 
-        # Tags applied to this module. These help with module discovery in online galleries.
-        # Tags = @()
+            # Tags applied to this module. These help with module discovery in online galleries.
+            # Tags = @()
 
-        # A URL to the license for this module.
-        LicenseUri = 'https://github.com/windmill-labs/windmill/tree/main/LICENSE'
+            # A URL to the license for this module.
+            LicenseUri = 'https://github.com/windmill-labs/windmill/tree/main/LICENSE'
 
-        # A URL to the main website for this project.
-        ProjectUri = 'https://github.com/windmill-labs/windmill/tree/main/powershell-client'
+            # A URL to the main website for this project.
+            ProjectUri = 'https://github.com/windmill-labs/windmill/tree/main/powershell-client'
 
-        # A URL to an icon representing this module.
-        # IconUri = ''
+            # A URL to an icon representing this module.
+            # IconUri = ''
 
-        # ReleaseNotes of this module
-        # ReleaseNotes = ''
+            # ReleaseNotes of this module
+            # ReleaseNotes = ''
 
-        # Prerelease string of this module
-        # Prerelease = ''
+            # Prerelease string of this module
+            # Prerelease = ''
 
-        # Flag to indicate whether the module requires explicit user acceptance for install/update/save
-        # RequireLicenseAcceptance = $false
+            # Flag to indicate whether the module requires explicit user acceptance for install/update/save
+            # RequireLicenseAcceptance = $false
 
-        # External dependent modules of this module
-        # ExternalModuleDependencies = @()
+            # External dependent modules of this module
+            # ExternalModuleDependencies = @()
 
-    } # End of PSData hashtable
+        } # End of PSData hashtable
 
-} # End of PrivateData hashtable
+    } # End of PrivateData hashtable
 
-# HelpInfo URI of this module
-# HelpInfoURI = ''
+    # HelpInfo URI of this module
+    # HelpInfoURI = ''
 
-# Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
-# DefaultCommandPrefix = ''
+    # Default prefix for commands exported from this module. Override the default prefix using Import-Module -Prefix.
+    # DefaultCommandPrefix = ''
 
 }
 
diff --git a/powershell-client/WindmillClient/WindmillClient.psm1 b/powershell-client/WindmillClient/WindmillClient.psm1
index 0e997207d0..9f0aca4b1a 100644
--- a/powershell-client/WindmillClient/WindmillClient.psm1
+++ b/powershell-client/WindmillClient/WindmillClient.psm1
@@ -196,7 +196,7 @@ Sets the value of specified resource
 #>
 function Set-WindmillResource {
     param(
-        [string] $Path,
+        [string] $Path = $null,
         [Hashtable] $Value,
         [string] $ResourceType = $null
     )
@@ -204,10 +204,33 @@ function Set-WindmillResource {
     if (-not $script:WindmillConnection) {
         throw "Windmill connection not established. Run Connect-Windmill first."
     }
-
     $script:WindmillConnection.SetResource($Path, $Value, $ResourceType)
 }
 
+<#
+.SYNOPSIS
+Sets the value of a resource with type "state".
+#>
+function Set-WindmillState {
+    param(
+        [Hashtable] $Value
+    )
+
+    if (-not $script:WindmillConnection) {
+        throw "Windmill connection not established. Run Connect-Windmill first."
+    }
+
+    $script:WindmillConnection.SetResource($script:WindmillConnection.GetStatePath(), $Value, "state")
+}
+
+<#
+.SYNOPSIS
+Gets the value of a resource with type "state".
+#>
+function Get-WindmillState {
+    Get-WindmillResource -Path $script:WindmillConnection.GetStatePath()
+}
+
 <#
 .SYNOPSIS
 Deletes a resource
@@ -502,14 +525,20 @@ class Windmill {
         return $response.Content | ConvertFrom-Json
     }
 
-    [void] SetResource([string] $Path, [Hashtable] $Value, [string] $ResourceType) {
-        $response = $this.Get("/w/$($this.Workspace)/resources/get/$Path", $false)
-
-        if ($response.StatusCode -eq 404) {
-            throw "Resource $Path not found"
+    [void] SetResource([string] $Path, [Hashtable] $Value, [string] $ResourceType) {    
+        # Resolve the effective path
+        $resolvedPath = if ($Path) { $Path } else { $script:WindmillConnection.GetStatePath() }
+    
+        if ($this.Get("/w/$($this.Workspace)/resources/exists/$resolvedPath", $false).Content -eq "true") {
+            $this.Post("/w/$($this.Workspace)/resources/update_value/$resolvedPath", @{ "value" = $Value }, $true)
         }
+
+        elseif ($ResourceType) {
+            $this.CreateResource($resolvedPath, $Value, $ResourceType)
+        }
+
         else {
-            $this.Post("/w/$($this.Workspace)/resources/update_value/$Path", @{ "value" = $Value }, $true)
+            throw "Resource at path $resolvedPath does not exist and no type was provided to initialize it"
         }
     }
 
@@ -645,30 +674,46 @@ class Windmill {
 
         return $result
     }
+
+    [string] GetStatePath() {
+        $statePath = $env:WM_STATE_PATH_NEW
+
+        if (-not $statePath) {
+            $statePath = $env:WM_STATE_PATH
+        }
+
+        if (-not $statePath) {
+            throw "State path not set"
+        }
+    
+        return $statePath
+    }
 }
 
 Export-ModuleMember -Function @(
-  'Connect-Windmill',
-  'Disconnect-Windmill',
-  'New-WindmillToken',
-  'Get-WindmillIdToken',
-  'Get-WindmillWorkspace',
-  'Get-WindmillVersion',
-  'Get-WindmillUser',
-  'Get-WindmillVariable',
-  'New-WindmillVariable',
-  'Set-WindmillVariable',
-  'Remove-WindmillVariable',
-  'Get-WindmillResource',
-  'New-WindmillResource',
-  'Set-WindmillResource',
-  'Remove-WindmillResource',
-  'Invoke-WindmillScript',
-  'Start-WindmillScript',
-  'Start-WindmillFlow',
-  'Stop-WindmillJob',
-  'Wait-WindmillJob',
-  'Stop-WindmillExecution',
-  'Get-WindmillJob',
-  'Get-WindmillResult'
+    'Connect-Windmill',
+    'Disconnect-Windmill',
+    'New-WindmillToken',
+    'Get-WindmillIdToken',
+    'Get-WindmillWorkspace',
+    'Get-WindmillVersion',
+    'Get-WindmillUser',
+    'Get-WindmillVariable',
+    'New-WindmillVariable',
+    'Set-WindmillVariable',
+    'Remove-WindmillVariable',
+    'Get-WindmillResource',
+    'Get-WindmillState',
+    'New-WindmillResource',
+    'Set-WindmillResource',
+    'Set-WindmillState',
+    'Remove-WindmillResource',
+    'Invoke-WindmillScript',
+    'Start-WindmillScript',
+    'Start-WindmillFlow',
+    'Stop-WindmillJob',
+    'Wait-WindmillJob',
+    'Stop-WindmillExecution',
+    'Get-WindmillJob',
+    'Get-WindmillResult'
 )
\ No newline at end of file

From 5404ec9b48e8d7a0cb27b2319d54f04c94ec6fd0 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 10:12:37 +0100
Subject: [PATCH 12/34] fix: pass USERPROFILE on windows

---
 backend/windmill-worker/src/ansible_executor.rs | 14 +++++++-------
 backend/windmill-worker/src/bash_executor.rs    |  3 ++-
 backend/windmill-worker/src/bun_executor.rs     |  9 +++++++++
 backend/windmill-worker/src/deno_executor.rs    |  9 +++++++++
 backend/windmill-worker/src/go_executor.rs      |  7 +++++++
 backend/windmill-worker/src/python_executor.rs  |  7 +++++--
 backend/windmill-worker/src/rust_executor.rs    |  2 ++
 backend/windmill-worker/src/worker.rs           |  5 +++++
 8 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/backend/windmill-worker/src/ansible_executor.rs b/backend/windmill-worker/src/ansible_executor.rs
index fe8531d0ac..dcc288f108 100644
--- a/backend/windmill-worker/src/ansible_executor.rs
+++ b/backend/windmill-worker/src/ansible_executor.rs
@@ -433,6 +433,10 @@ fi
             .args(cmd_args)
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
+
+        #[cfg(windows)]
+        ansible_cmd.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+
         start_child_process(ansible_cmd, ANSIBLE_PLAYBOOK_PATH.as_str()).await?
     };
 
@@ -565,13 +569,9 @@ async fn create_file_resources(
             get_resource_or_variable_content(client, &file_res.resource_path, job_id.to_string())
                 .await?;
         let path = file_res.target_path.clone();
-        let validated_path = write_file_at_user_defined_location(
-            job_dir,
-            path.as_str(),
-            &r,
-            file_res.mode,
-        )
-        .map_err(|e| anyhow!("Couldn't write text file at {}: {}", path, e))?;
+        let validated_path =
+            write_file_at_user_defined_location(job_dir, path.as_str(), &r, file_res.mode)
+                .map_err(|e| anyhow!("Couldn't write text file at {}: {}", path, e))?;
 
         nsjail_mounts.push(
             define_nsjail_mount(job_dir, &validated_path)
diff --git a/backend/windmill-worker/src/bash_executor.rs b/backend/windmill-worker/src/bash_executor.rs
index 2582f98b58..680831e990 100644
--- a/backend/windmill-worker/src/bash_executor.rs
+++ b/backend/windmill-worker/src/bash_executor.rs
@@ -522,7 +522,8 @@ $env:PSModulePath = \"{};$PSModulePathBackup\"",
                     std::env::var("PATHEXT").unwrap_or_else(|_| {
                         String::from(".COM;.EXE;.BAT;.CMD;.VBS;.VBE;.JS;.JSE;.WSF;.WSH;.MSC;.CPL")
                     }),
-                );
+                )
+                .env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
         }
 
         cmd.spawn()?
diff --git a/backend/windmill-worker/src/bun_executor.rs b/backend/windmill-worker/src/bun_executor.rs
index a7d92874e1..707a668b84 100644
--- a/backend/windmill-worker/src/bun_executor.rs
+++ b/backend/windmill-worker/src/bun_executor.rs
@@ -1522,6 +1522,15 @@ pub async fn get_common_bun_proc_envs(base_internal_url: Option<&str>) -> HashMa
         bun_envs.insert(String::from("NODE_PATH"), node_path.to_string());
     }
 
+    #[cfg(windows)]
+    {
+        bun_envs.insert("SystemRoot".to_string(), crate::SYSTEM_ROOT.to_string());
+        bun_envs.insert(
+            "USERPROFILE".to_string(),
+            crate::USERPROFILE_ENV.to_string(),
+        );
+    }
+
     return bun_envs;
 }
 
diff --git a/backend/windmill-worker/src/deno_executor.rs b/backend/windmill-worker/src/deno_executor.rs
index 88f6733d1a..54a2631ccd 100644
--- a/backend/windmill-worker/src/deno_executor.rs
+++ b/backend/windmill-worker/src/deno_executor.rs
@@ -84,6 +84,15 @@ async fn get_common_deno_proc_envs(
     if DENO_TLS_CA_STORE.len() > 0 {
         deno_envs.insert(String::from("DENO_TLS_CA_STORE"), DENO_TLS_CA_STORE.clone());
     }
+
+    #[cfg(windows)]
+    {
+        deno_envs.insert("SystemRoot".to_string(), crate::SYSTEM_ROOT.to_string());
+        deno_envs.insert(
+            "USERPROFILE".to_string(),
+            crate::USERPROFILE_ENV.to_string(),
+        );
+    }
     return deno_envs;
 }
 
diff --git a/backend/windmill-worker/src/go_executor.rs b/backend/windmill-worker/src/go_executor.rs
index 470e647383..ea06f82c5a 100644
--- a/backend/windmill-worker/src/go_executor.rs
+++ b/backend/windmill-worker/src/go_executor.rs
@@ -194,6 +194,10 @@ func Run(req Req) (interface{{}}, error){{
             .args(vec!["build", "main.go"])
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
+
+        #[cfg(windows)]
+        build_go_cmd.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+
         let build_go_process = start_child_process(build_go_cmd, GO_PATH.as_str()).await?;
         handle_child(
             &job.id,
@@ -293,6 +297,9 @@ func Run(req Req) (interface{{}}, error){{
             run_go.env("GOPROXY", goproxy);
         }
 
+        #[cfg(windows)]
+        run_go.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+
         run_go.stdout(Stdio::piped()).stderr(Stdio::piped());
         start_child_process(run_go, compiled_executable_name).await?
     };
diff --git a/backend/windmill-worker/src/python_executor.rs b/backend/windmill-worker/src/python_executor.rs
index 4127af7f7b..3d1ba79def 100644
--- a/backend/windmill-worker/src/python_executor.rs
+++ b/backend/windmill-worker/src/python_executor.rs
@@ -749,8 +749,10 @@ mount {{
             .stdout(Stdio::piped())
             .stderr(Stdio::piped());
 
-        #[cfg(windows)]
-        python_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+        #[cfg(windows)] {
+            python_cmd.env("SystemRoot", SYSTEM_ROOT.as_str());
+            python_cmd.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+        }
 
         start_child_process(python_cmd, PYTHON_PATH.as_str()).await?
     };
@@ -1277,6 +1279,7 @@ async fn spawn_uv_install(
                 .envs(envs)
                 .envs(PROXY_ENVS.clone())
                 .env("SystemRoot", SYSTEM_ROOT.as_str())
+                .env("USERPROFILE", crate::USERPROFILE_ENV.as_str())
                 .env(
                     "TMP",
                     std::env::var("TMP").unwrap_or_else(|_| String::from("/tmp")),
diff --git a/backend/windmill-worker/src/rust_executor.rs b/backend/windmill-worker/src/rust_executor.rs
index 9391fd9a69..3f5ff3d18e 100644
--- a/backend/windmill-worker/src/rust_executor.rs
+++ b/backend/windmill-worker/src/rust_executor.rs
@@ -209,6 +209,7 @@ pub async fn build_rust_crate(
             "TMP",
             std::env::var("TMP").unwrap_or_else(|_| "C:\\tmp".to_string()),
         );
+        build_rust_cmd.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
     }
 
     let build_rust_process = start_child_process(build_rust_cmd, CARGO_PATH.as_str()).await?;
@@ -403,6 +404,7 @@ pub async fn handle_rust_job(
 
         #[cfg(windows)]
         run_rust.env("SystemRoot", SYSTEM_ROOT.as_str());
+        run_rust.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
 
         start_child_process(run_rust, compiled_executable_name).await?
     };
diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index f0fdc93885..b47f63e4c3 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -368,6 +368,7 @@ lazy_static::lazy_static! {
     pub static ref NSJAIL_PATH: String = std::env::var("NSJAIL_PATH").unwrap_or_else(|_| "nsjail".to_string());
     pub static ref PATH_ENV: String = std::env::var("PATH").unwrap_or_else(|_| String::new());
     pub static ref HOME_ENV: String = std::env::var("HOME").unwrap_or_else(|_| "/tmp".to_string());
+
     pub static ref NODE_PATH: Option<String> = std::env::var("NODE_PATH").ok();
 
     pub static ref TZ_ENV: String = std::env::var("TZ").unwrap_or_else(|_| String::new());
@@ -421,12 +422,16 @@ lazy_static::lazy_static! {
         .and_then(|x| x.parse().ok())
         .unwrap_or(false);
 
+    pub static ref USERPROFILE_ENV: String = std::env::var("USERPROFILE").unwrap_or_else(|_| "/tmp".to_string());
+
+
 
 }
 
 #[cfg(windows)]
 lazy_static::lazy_static! {
     pub static ref SYSTEM_ROOT: String = std::env::var("SystemRoot").unwrap_or_else(|_| "C:\\Windows".to_string());
+    pub static ref USERPROFILE_ENV: String = std::env::var("USERPROFILE").unwrap_or_else(|_| "/tmp".to_string());
 }
 
 //only matter if CLOUD_HOSTED

From e888c84a36a56a29c08eddfd182d265aff0cb5f9 Mon Sep 17 00:00:00 2001
From: Guilhem <guilhemlemouel@gmail.com>
Date: Thu, 5 Dec 2024 10:07:11 +0000
Subject: [PATCH 13/34] polish critical alert modal (#4802)

* polish critical alert modal

* Use Table component

* use table component pagination

* Add acknowledge to the table

* Polishing table

* fix nit

* Filter alerts

* Add notification count on modal

* Adjust table height

* Change mute description

* Fix layout

* minor fix

* Fix small screen issue

* fix toast on refresh

* Revert "fix toast on refresh"

This reverts commit ae3593e1af0a0019a7f8a8be724e646d7c514dd1.

* filtering to backend, superadmin also acknowledges workspace (unless CLOUD_HOSTED), simplifications

* sqlx prep

* improve reactivity

* improvements

---------

Co-authored-by: Alexander Petric <alpetric@users.noreply.github.com>
Co-authored-by: Alexander Petric <petric.al@gmail.com>
Co-authored-by: Ruben Fiszel <ruben@rubenfiszel.com>
---
 ...113eb91d65b98927eaaba427cbde27dd79bfe.json |  22 ++
 ...6eaca91a3616c9bfbd78a408b7079ca9706d4.json |  22 ++
 ...c068b72294cc99ff44ed0a13179df508ebc6a.json |  15 -
 ...36caae3fa256fc0803749ec5107632669adb3.json |  14 -
 ...ba523c9f17d106298d8781885134d28553d36.json |  15 +
 ...3d0193a0ee707e6482a892db58915e0c8a27f.json |  20 ++
 ...4361e75257c0e5faf8795274ec86236a27413.json |  23 ++
 ...976da6c6e331d5748bf6f8d59f9f75c027fe8.json |  16 +
 backend/windmill-api/openapi.yaml             |  34 +-
 backend/windmill-api/src/settings.rs          |   2 +-
 backend/windmill-api/src/utils.rs             |  78 ++++-
 backend/windmill-api/src/workspaces.rs        |   2 +-
 frontend/src/lib/components/Toggle.svelte     |   2 +-
 .../common/alert/Notification.svelte          |  16 +
 .../common/button/RefreshButton.svelte        |  34 ++
 .../lib/components/common/layout/List.svelte  |  38 +++
 .../common/layout/ListElement.svelte          |   3 +
 .../lib/components/common/modal/Modal.svelte  |  10 +-
 .../lib/components/common/modal/Modal2.svelte | 110 +++++++
 .../lib/components/common/popup/Popup.svelte  |   3 +
 .../sidebar/CriticalAlertModal.svelte         | 178 ++++++++++-
 .../sidebar/CriticalAlertModalInner.svelte    | 296 +++++-------------
 .../sidebar/CriticalAlertTable.svelte         | 146 +++++++++
 .../sidebar/SideBarNotification.svelte        |   8 +-
 frontend/src/lib/components/table/Cell.svelte |   8 +-
 .../src/lib/components/table/DataTable.svelte | 124 ++++----
 frontend/src/lib/components/table/Head.svelte |   2 +-
 frontend/src/lib/components/table/Row.svelte  |   4 +-
 28 files changed, 899 insertions(+), 346 deletions(-)
 create mode 100644 backend/.sqlx/query-0a46f1f3047d15227f82ae24ad2113eb91d65b98927eaaba427cbde27dd79bfe.json
 create mode 100644 backend/.sqlx/query-372eb162ace15a4f07162bb46706eaca91a3616c9bfbd78a408b7079ca9706d4.json
 delete mode 100644 backend/.sqlx/query-65da41c7ded54cdee8d33211561c068b72294cc99ff44ed0a13179df508ebc6a.json
 delete mode 100644 backend/.sqlx/query-7c32176755c6ea2b6ae531860d436caae3fa256fc0803749ec5107632669adb3.json
 create mode 100644 backend/.sqlx/query-80864158f61adaad8df934acc54ba523c9f17d106298d8781885134d28553d36.json
 create mode 100644 backend/.sqlx/query-951c053cf756f00e1da26b06edb3d0193a0ee707e6482a892db58915e0c8a27f.json
 create mode 100644 backend/.sqlx/query-b9ed42d4b795942251baafd016b4361e75257c0e5faf8795274ec86236a27413.json
 create mode 100644 backend/.sqlx/query-cd4067e68b375461a495f402d05976da6c6e331d5748bf6f8d59f9f75c027fe8.json
 create mode 100644 frontend/src/lib/components/common/alert/Notification.svelte
 create mode 100644 frontend/src/lib/components/common/button/RefreshButton.svelte
 create mode 100644 frontend/src/lib/components/common/layout/List.svelte
 create mode 100644 frontend/src/lib/components/common/layout/ListElement.svelte
 create mode 100644 frontend/src/lib/components/common/modal/Modal2.svelte
 create mode 100644 frontend/src/lib/components/sidebar/CriticalAlertTable.svelte

diff --git a/backend/.sqlx/query-0a46f1f3047d15227f82ae24ad2113eb91d65b98927eaaba427cbde27dd79bfe.json b/backend/.sqlx/query-0a46f1f3047d15227f82ae24ad2113eb91d65b98927eaaba427cbde27dd79bfe.json
new file mode 100644
index 0000000000..5bb7767b0e
--- /dev/null
+++ b/backend/.sqlx/query-0a46f1f3047d15227f82ae24ad2113eb91d65b98927eaaba427cbde27dd79bfe.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)\n                 FROM alerts\n                 WHERE COALESCE(acknowledged, false) = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Bool"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "0a46f1f3047d15227f82ae24ad2113eb91d65b98927eaaba427cbde27dd79bfe"
+}
diff --git a/backend/.sqlx/query-372eb162ace15a4f07162bb46706eaca91a3616c9bfbd78a408b7079ca9706d4.json b/backend/.sqlx/query-372eb162ace15a4f07162bb46706eaca91a3616c9bfbd78a408b7079ca9706d4.json
new file mode 100644
index 0000000000..68fe6dba85
--- /dev/null
+++ b/backend/.sqlx/query-372eb162ace15a4f07162bb46706eaca91a3616c9bfbd78a408b7079ca9706d4.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)\n                 FROM alerts\n                 WHERE workspace_id = $1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "372eb162ace15a4f07162bb46706eaca91a3616c9bfbd78a408b7079ca9706d4"
+}
diff --git a/backend/.sqlx/query-65da41c7ded54cdee8d33211561c068b72294cc99ff44ed0a13179df508ebc6a.json b/backend/.sqlx/query-65da41c7ded54cdee8d33211561c068b72294cc99ff44ed0a13179df508ebc6a.json
deleted file mode 100644
index e183d3b95c..0000000000
--- a/backend/.sqlx/query-65da41c7ded54cdee8d33211561c068b72294cc99ff44ed0a13179df508ebc6a.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE alerts\n         SET\n           acknowledged = true,\n           acknowledged_workspace = CASE\n             WHEN $2::text IS NOT NULL AND workspace_id = $2 THEN true\n             ELSE acknowledged_workspace\n           END\n         WHERE id = $1",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Int4",
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "65da41c7ded54cdee8d33211561c068b72294cc99ff44ed0a13179df508ebc6a"
-}
diff --git a/backend/.sqlx/query-7c32176755c6ea2b6ae531860d436caae3fa256fc0803749ec5107632669adb3.json b/backend/.sqlx/query-7c32176755c6ea2b6ae531860d436caae3fa256fc0803749ec5107632669adb3.json
deleted file mode 100644
index cf976de33f..0000000000
--- a/backend/.sqlx/query-7c32176755c6ea2b6ae531860d436caae3fa256fc0803749ec5107632669adb3.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "db_name": "PostgreSQL",
-  "query": "UPDATE alerts \n         SET\n           acknowledged = true,\n           acknowledged_workspace = CASE\n             WHEN $1::text IS NOT NULL THEN true\n             ELSE acknowledged_workspace\n           END\n         WHERE ($1::text IS NOT NULL AND workspace_id = $1)\n            OR ($1::text IS NULL)",
-  "describe": {
-    "columns": [],
-    "parameters": {
-      "Left": [
-        "Text"
-      ]
-    },
-    "nullable": []
-  },
-  "hash": "7c32176755c6ea2b6ae531860d436caae3fa256fc0803749ec5107632669adb3"
-}
diff --git a/backend/.sqlx/query-80864158f61adaad8df934acc54ba523c9f17d106298d8781885134d28553d36.json b/backend/.sqlx/query-80864158f61adaad8df934acc54ba523c9f17d106298d8781885134d28553d36.json
new file mode 100644
index 0000000000..5be45ac0fb
--- /dev/null
+++ b/backend/.sqlx/query-80864158f61adaad8df934acc54ba523c9f17d106298d8781885134d28553d36.json
@@ -0,0 +1,15 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE alerts \n         SET\n           acknowledged = true,\n           acknowledged_workspace = CASE\n             WHEN $2 THEN\n               CASE\n                 WHEN $1::text IS NOT NULL THEN true\n                 ELSE acknowledged_workspace\n               END\n             ELSE true\n           END\n         WHERE ($1::text IS NOT NULL AND workspace_id = $1)\n            OR ($1::text IS NULL)",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "80864158f61adaad8df934acc54ba523c9f17d106298d8781885134d28553d36"
+}
diff --git a/backend/.sqlx/query-951c053cf756f00e1da26b06edb3d0193a0ee707e6482a892db58915e0c8a27f.json b/backend/.sqlx/query-951c053cf756f00e1da26b06edb3d0193a0ee707e6482a892db58915e0c8a27f.json
new file mode 100644
index 0000000000..7c51668501
--- /dev/null
+++ b/backend/.sqlx/query-951c053cf756f00e1da26b06edb3d0193a0ee707e6482a892db58915e0c8a27f.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)\n                 FROM alerts",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "951c053cf756f00e1da26b06edb3d0193a0ee707e6482a892db58915e0c8a27f"
+}
diff --git a/backend/.sqlx/query-b9ed42d4b795942251baafd016b4361e75257c0e5faf8795274ec86236a27413.json b/backend/.sqlx/query-b9ed42d4b795942251baafd016b4361e75257c0e5faf8795274ec86236a27413.json
new file mode 100644
index 0000000000..40f0418eef
--- /dev/null
+++ b/backend/.sqlx/query-b9ed42d4b795942251baafd016b4361e75257c0e5faf8795274ec86236a27413.json
@@ -0,0 +1,23 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT COUNT(*)\n                 FROM alerts\n                 WHERE workspace_id = $1 AND COALESCE(acknowledged_workspace, false) = $2",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "count",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "b9ed42d4b795942251baafd016b4361e75257c0e5faf8795274ec86236a27413"
+}
diff --git a/backend/.sqlx/query-cd4067e68b375461a495f402d05976da6c6e331d5748bf6f8d59f9f75c027fe8.json b/backend/.sqlx/query-cd4067e68b375461a495f402d05976da6c6e331d5748bf6f8d59f9f75c027fe8.json
new file mode 100644
index 0000000000..1d1b577f7a
--- /dev/null
+++ b/backend/.sqlx/query-cd4067e68b375461a495f402d05976da6c6e331d5748bf6f8d59f9f75c027fe8.json
@@ -0,0 +1,16 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "UPDATE alerts\n         SET\n           acknowledged = true,\n           acknowledged_workspace = CASE\n             WHEN $3 THEN\n               CASE\n                 WHEN $2::text IS NOT NULL AND workspace_id = $2 THEN true\n                 ELSE acknowledged_workspace\n               END\n             ELSE true\n           END\n         WHERE id = $1",
+  "describe": {
+    "columns": [],
+    "parameters": {
+      "Left": [
+        "Int4",
+        "Text",
+        "Bool"
+      ]
+    },
+    "nullable": []
+  },
+  "hash": "cd4067e68b375461a495f402d05976da6c6e331d5748bf6f8d59f9f75c027fe8"
+}
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index f0bd8856d5..4ec45bbdfa 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -872,9 +872,20 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/CriticalAlert'
+                type: object
+                properties:
+                  alerts:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/CriticalAlert'
+                  total_rows:
+                    type: integer
+                    description: Total number of rows matching the query.
+                    example: 100
+                  total_pages:
+                    type: integer
+                    description: Total number of pages based on the page size.
+                    example: 10
 
   /settings/critical_alerts/{id}/acknowledge:
     post:
@@ -2757,9 +2768,20 @@ paths:
           content:
             application/json:
               schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/CriticalAlert'
+                type: object
+                properties:
+                  alerts:
+                    type: array
+                    items:
+                      $ref: '#/components/schemas/CriticalAlert'
+                  total_rows:
+                    type: integer
+                    description: Total number of rows matching the query.
+                    example: 100
+                  total_pages:
+                    type: integer
+                    description: Total number of pages based on the page size.
+                    example: 10
 
   /w/{workspace}/workspaces/critical_alerts/{id}/acknowledge:
     post:
diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs
index 61a7e46fef..c527eb481a 100644
--- a/backend/windmill-api/src/settings.rs
+++ b/backend/windmill-api/src/settings.rs
@@ -448,7 +448,7 @@ pub async fn get_critical_alerts(
     Extension(db): Extension<DB>,
     authed: ApiAuthed,
     Query(params): Query<crate::utils::AlertQueryParams>,
-) -> JsonResult<Vec<crate::utils::CriticalAlert>> {
+) -> JsonResult<serde_json::Value> {
     require_devops_role(&db, &authed.email).await?;
 
     crate::utils::get_critical_alerts(db, params, None).await
diff --git a/backend/windmill-api/src/utils.rs b/backend/windmill-api/src/utils.rs
index cc6360b994..a003481c9a 100644
--- a/backend/windmill-api/src/utils.rs
+++ b/backend/windmill-api/src/utils.rs
@@ -10,6 +10,7 @@ use axum::{body::Body, response::Response};
 use regex::Regex;
 use serde::Deserialize;
 use sqlx::{Postgres, Transaction};
+use windmill_common::worker::CLOUD_HOSTED;
 use windmill_common::{
     auth::{is_devops_email, is_super_admin_email},
     error::{self, Error},
@@ -206,11 +207,55 @@ pub async fn get_critical_alerts(
     db: DB,
     params: AlertQueryParams,
     workspace_id: Option<String>,
-) -> JsonResult<Vec<CriticalAlert>> {
+) -> JsonResult<serde_json::Value> {
+    // Returning total rows and total pages
     let page = params.page.unwrap_or(1).max(1);
     let page_size = params.page_size.unwrap_or(10).min(100) as i64;
     let offset = ((page - 1) * page_size as i32) as i64;
 
+    // Count total rows
+    let total_rows = if let Some(workspace_id) = &workspace_id {
+        if params.acknowledged.is_none() {
+            sqlx::query_scalar!(
+                "SELECT COUNT(*)
+                 FROM alerts
+                 WHERE workspace_id = $1",
+                workspace_id
+            )
+            .fetch_one(&db)
+            .await?
+        } else {
+            sqlx::query_scalar!(
+                "SELECT COUNT(*)
+                 FROM alerts
+                 WHERE workspace_id = $1 AND COALESCE(acknowledged_workspace, false) = $2",
+                workspace_id,
+                params.acknowledged
+            )
+            .fetch_one(&db)
+            .await?
+        }
+    } else {
+        if params.acknowledged.is_none() {
+            sqlx::query_scalar!(
+                "SELECT COUNT(*)
+                 FROM alerts"
+            )
+            .fetch_one(&db)
+            .await?
+        } else {
+            sqlx::query_scalar!(
+                "SELECT COUNT(*)
+                 FROM alerts
+                 WHERE COALESCE(acknowledged, false) = $1",
+                params.acknowledged
+            )
+            .fetch_one(&db)
+            .await?
+        }
+    };
+
+    // Fetch paginated rows
     let alerts = if let Some(workspace_id) = workspace_id {
         // `workspace_id` is provided => workspace admin
         if params.acknowledged.is_none() {
@@ -278,7 +323,14 @@ pub async fn get_critical_alerts(
         }
     };
 
-    Ok(Json(alerts))
+    let total_rows = total_rows.unwrap_or(0);
+    let total_pages = ((total_rows as f64) / (page_size as f64)).ceil() as i64;
+
+    Ok(Json(serde_json::json!({
+        "alerts": alerts,
+        "total_rows": total_rows,
+        "total_pages": total_pages
+    })))
 }
 
 #[cfg(feature = "enterprise")]
@@ -292,12 +344,17 @@ pub async fn acknowledge_critical_alert(
          SET
            acknowledged = true,
            acknowledged_workspace = CASE
-             WHEN $2::text IS NOT NULL AND workspace_id = $2 THEN true
-             ELSE acknowledged_workspace
+             WHEN $3 THEN
+               CASE
+                 WHEN $2::text IS NOT NULL AND workspace_id = $2 THEN true
+                 ELSE acknowledged_workspace
+               END
+             ELSE true
            END
          WHERE id = $1",
         id,
-        workspace_id
+        workspace_id,
+        *CLOUD_HOSTED
     )
     .execute(&db)
     .await?;
@@ -320,12 +377,17 @@ pub async fn acknowledge_all_critical_alerts(
          SET
            acknowledged = true,
            acknowledged_workspace = CASE
-             WHEN $1::text IS NOT NULL THEN true
-             ELSE acknowledged_workspace
+             WHEN $2 THEN
+               CASE
+                 WHEN $1::text IS NOT NULL THEN true
+                 ELSE acknowledged_workspace
+               END
+             ELSE true
            END
          WHERE ($1::text IS NOT NULL AND workspace_id = $1)
             OR ($1::text IS NULL)",
-        workspace_id
+        workspace_id,
+        *CLOUD_HOSTED
     )
     .execute(&db)
     .await?;
diff --git a/backend/windmill-api/src/workspaces.rs b/backend/windmill-api/src/workspaces.rs
index c6d6e5301c..bba06b238b 100644
--- a/backend/windmill-api/src/workspaces.rs
+++ b/backend/windmill-api/src/workspaces.rs
@@ -3111,7 +3111,7 @@ pub async fn get_critical_alerts(
     Path(w_id): Path<String>,
     authed: ApiAuthed,
     Query(params): Query<crate::utils::AlertQueryParams>,
-) -> JsonResult<Vec<crate::utils::CriticalAlert>> {
+) -> JsonResult<serde_json::Value> {
     require_admin_or_devops(authed.is_admin, &authed.username, &authed.email, &db).await?;
 
     crate::utils::get_critical_alerts(db, params, Some(w_id)).await
diff --git a/frontend/src/lib/components/Toggle.svelte b/frontend/src/lib/components/Toggle.svelte
index c50b29414a..73638bce9c 100644
--- a/frontend/src/lib/components/Toggle.svelte
+++ b/frontend/src/lib/components/Toggle.svelte
@@ -31,7 +31,7 @@
 
 <label
 	for={id}
-	class="{$$props.class || ''} z-auto inline-flex items-center duration-50 {disabled
+	class="{$$props.class || ''} z-auto flex flex-row items-center duration-50 {disabled
 		? 'grayscale opacity-50'
 		: 'cursor-pointer'}"
 >
diff --git a/frontend/src/lib/components/common/alert/Notification.svelte b/frontend/src/lib/components/common/alert/Notification.svelte
new file mode 100644
index 0000000000..4beca30071
--- /dev/null
+++ b/frontend/src/lib/components/common/alert/Notification.svelte
@@ -0,0 +1,16 @@
+<script lang="ts">
+	export let notificationCount = 0
+	export let notificationLimit: number | undefined = undefined
+</script>
+
+{#if notificationCount > 0}
+	<div
+		class="bg-red-500 text-white text-[0.6rem] rounded-md w-5 h-5 flex items-center justify-center"
+	>
+		{#if notificationLimit && notificationCount > notificationLimit}
+			{`${notificationLimit}+`}
+		{:else}
+			{notificationCount}
+		{/if}
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/common/button/RefreshButton.svelte b/frontend/src/lib/components/common/button/RefreshButton.svelte
new file mode 100644
index 0000000000..a44f0bb4b3
--- /dev/null
+++ b/frontend/src/lib/components/common/button/RefreshButton.svelte
@@ -0,0 +1,34 @@
+<script lang="ts">
+	import { Button } from '$lib/components/common'
+	import { RefreshCw } from 'lucide-svelte'
+
+	import Popover from '$lib/components/Popover.svelte'
+
+	export let loading: boolean
+
+	let buttonHover = false
+</script>
+
+<Popover>
+	<Button
+		on:mouseenter={() => (buttonHover = true)}
+		on:mouseleave={() => (buttonHover = false)}
+		color="light"
+		size="xs2"
+		variant="border"
+		on:click
+	>
+		<RefreshCw class={loading ? 'animate-spin ' : ''} size="14" />
+	</Button>
+	<svelte:fragment slot="text">
+		{#if loading}
+			{#if buttonHover}
+				Stop Refreshing
+			{:else}
+				Refreshing...
+			{/if}
+		{:else}
+			Refresh
+		{/if}
+	</svelte:fragment>
+</Popover>
diff --git a/frontend/src/lib/components/common/layout/List.svelte b/frontend/src/lib/components/common/layout/List.svelte
new file mode 100644
index 0000000000..19c5d062cd
--- /dev/null
+++ b/frontend/src/lib/components/common/layout/List.svelte
@@ -0,0 +1,38 @@
+<script lang="ts">
+	export let horizontal: boolean = false
+	export let gap: 'none' | 'sm' | 'md' | 'lg' = 'sm'
+	export let justify: 'start' | 'center' | 'end' | 'between' = 'start'
+	export let wFull = true
+
+	const gapMap = {
+		none: '',
+		sm: 'gap-2',
+		md: 'gap-4',
+		lg: 'gap-8'
+	}
+
+	const justifyMap = {
+		start: 'justify-start',
+		center: 'justify-center',
+		end: 'justify-end',
+		between: 'justify-between'
+	}
+</script>
+
+{#if horizontal}
+	<div
+		class="flex flex-row h-full {wFull ? 'w-full' : ''} {gapMap[gap]} items-center {justifyMap[
+			justify
+		]}"
+	>
+		<slot />
+	</div>
+{:else}
+	<div
+		class="flex flex-col h-full {wFull ? 'w-full' : ''} {gapMap[gap]} items-center {justifyMap[
+			justify
+		]}"
+	>
+		<slot />
+	</div>
+{/if}
diff --git a/frontend/src/lib/components/common/layout/ListElement.svelte b/frontend/src/lib/components/common/layout/ListElement.svelte
new file mode 100644
index 0000000000..891079ce42
--- /dev/null
+++ b/frontend/src/lib/components/common/layout/ListElement.svelte
@@ -0,0 +1,3 @@
+<div class="w-full flex-grow bg-blue-300">
+	<slot />
+</div>
diff --git a/frontend/src/lib/components/common/modal/Modal.svelte b/frontend/src/lib/components/common/modal/Modal.svelte
index 300499d71a..806f7d33b0 100644
--- a/frontend/src/lib/components/common/modal/Modal.svelte
+++ b/frontend/src/lib/components/common/modal/Modal.svelte
@@ -70,10 +70,12 @@
 				>
 					<div class="flex">
 						<div class="ml-4 text-left flex-1">
-							<h3 class="text-lg font-medium text-primary">
-								{title}
-							</h3>
-							<div class="mt-2 text-sm text-tertiary">
+							<div class="flex flex-row items-center justify-between">
+								<h3>{title}</h3>
+								<slot name="settings" />
+							</div>
+
+							<div class="mt-4 text-sm text-tertiary">
 								<slot />
 							</div>
 						</div>
diff --git a/frontend/src/lib/components/common/modal/Modal2.svelte b/frontend/src/lib/components/common/modal/Modal2.svelte
new file mode 100644
index 0000000000..7d34172237
--- /dev/null
+++ b/frontend/src/lib/components/common/modal/Modal2.svelte
@@ -0,0 +1,110 @@
+<script lang="ts">
+	import Portal from '$lib/components/Portal.svelte'
+
+	import { twMerge } from 'tailwind-merge'
+	import { clickOutside } from '$lib/utils'
+	import { X } from 'lucide-svelte'
+	import List from '$lib/components/common/layout/List.svelte'
+	import { fade } from 'svelte/transition'
+
+	export let title: string
+
+	export let css: any = {}
+	export let target: string = ''
+	export let isOpen = false
+	export let fixedSize: 'xs' | 'sm' | 'md' | 'lg' | 'xl' | 'xxl' = 'md'
+
+	// Add size mapping with custom pixel values
+	const sizeStyles = {
+		xs: { width: '400px', height: '250px' },
+		sm: { width: '600px', height: '400px' },
+		md: { width: '800px', height: '500px' },
+		lg: { width: '1400px', height: '720px' },
+		xl: { width: '1600px', height: '800px' },
+		xxl: { width: '1600px', height: '1000px' }
+	}
+
+	export function close() {
+		isOpen = false
+	}
+
+	export function open() {
+		isOpen = true
+	}
+
+	function handleKeyDown(event: KeyboardEvent) {
+		if (event.key === 'Escape') {
+			event.preventDefault()
+			event.stopPropagation()
+			close()
+		}
+	}
+
+	function fadeFast(node: HTMLElement) {
+		return fade(node, { duration: 200 })
+	}
+</script>
+
+<svelte:window on:keydown={handleKeyDown} />
+
+{#if isOpen}
+	<Portal name="always-mounted" {target}>
+		<div
+			class={'fixed top-0 bottom-0 left-0 right-0 transition-all overflow-auto z-[1100] bg-black bg-opacity-60 w-full h-full'}
+			transition:fadeFast|local
+		>
+			<div class="flex min-h-full items-center justify-center p-8">
+				<div
+					style={`width: ${sizeStyles[fixedSize].width}; height: ${sizeStyles[fixedSize].height}; ${
+						css?.popup?.style || ''
+					}`}
+					class={twMerge(
+						'max-h-screen-80 max-w-screen-80 rounded-lg relative bg-surface pt-2 px-4 pb-4',
+						css?.popup?.class,
+						'wm-modal-form-popup'
+					)}
+					use:clickOutside
+					on:click_outside={() => {
+						close()
+					}}
+				>
+					<List gap="md">
+						<div class="flex w-full">
+							<List horizontal justify="between">
+								<h3>{title}</h3>
+								<div class="grow w-min-0">
+									<List horizontal justify="between">
+										<div class="min-w-0 grow">
+											<slot name="header-left" />
+										</div>
+										<div class="min-w-0 grow-0 justify-end">
+											<List horizontal justify="end">
+												<slot name="header-right" />
+												<div class="w-8">
+													<button
+														on:click={() => {
+															isOpen = false
+														}}
+														class="hover:bg-surface-hover rounded-full w-8 h-8 flex items-center justify-center transition-all"
+													>
+														<X class="text-tertiary " />
+													</button>
+												</div>
+											</List>
+										</div>
+									</List>
+								</div>
+							</List>
+						</div>
+
+						<!-- svelte-ignore a11y-click-events-have-key-events -->
+						<!-- svelte-ignore a11y-no-static-element-interactions -->
+						<div class="w-full flex grow min-h-0" on:click|stopPropagation={() => {}}>
+							<slot />
+						</div>
+					</List>
+				</div>
+			</div>
+		</div>
+	</Portal>
+{/if}
diff --git a/frontend/src/lib/components/common/popup/Popup.svelte b/frontend/src/lib/components/common/popup/Popup.svelte
index 5f209b4e50..a559509d15 100644
--- a/frontend/src/lib/components/common/popup/Popup.svelte
+++ b/frontend/src/lib/components/common/popup/Popup.svelte
@@ -17,6 +17,7 @@
 	export let target: string | HTMLElement | undefined = undefined
 	export let noTransition = false
 	export let popupHover = false
+	export let preventPopupClosingOnClickInside = false
 </script>
 
 <Popover on:close class="leading-none">
@@ -28,6 +29,7 @@
 	<ConditionalPortal condition={shouldUsePortal} {target}>
 		<!-- svelte-ignore a11y-no-static-element-interactions -->
 		<!-- svelte-ignore a11y-mouse-events-have-key-events -->
+		<!-- svelte-ignore a11y-click-events-have-key-events -->
 		<div
 			use:floatingContent
 			class={`z5000 ${floatingClasses}`}
@@ -37,6 +39,7 @@
 			on:mouseleave={() => {
 				popupHover = false
 			}}
+			on:click={(e) => preventPopupClosingOnClickInside && e.stopPropagation()}
 		>
 			{#if !noTransition}
 				<Transition
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
index d6d84c39bd..94675fba0a 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
@@ -1,15 +1,28 @@
 <script lang="ts">
 	import { onMount, onDestroy } from 'svelte'
 	import CriticalAlertModalInner from './CriticalAlertModalInner.svelte'
-	import { SettingService } from '$lib/gen'
+	import { SettingService, type CriticalAlert } from '$lib/gen'
 	import { sendUserToast } from '$lib/toast'
-	import { workspaceStore, isCriticalAlertsUIOpen, devopsRole } from '$lib/stores'
-	import Modal from '../common/modal/Modal.svelte'
+	import {
+		workspaceStore,
+		isCriticalAlertsUIOpen,
+		devopsRole,
+		userStore,
+		superadmin
+	} from '$lib/stores'
+	import Modal2 from '../common/modal/Modal2.svelte'
+	import { Button, Popup } from '$lib/components/common'
+	import List from '$lib/components/common/layout/List.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import { BellOff, Bell, ExternalLink, Settings } from 'lucide-svelte'
+	import { base } from '$lib/base'
+	import Notification from '$lib/components/common/alert/Notification.svelte'
 
 	export let open: boolean = false
 	export let numUnacknowledgedCriticalAlerts: number = 0
-	export let muteSettings
+	export let muteSettings;
 	let workspaceContext = false
+	let childRef;
 
 	$: {
 		setupApiFunctions(workspaceContext)
@@ -68,15 +81,50 @@
 		clearInterval(checkForNewAlertsInterval)
 	})
 
+	async function saveWorkSpaceMuteSetting() {
+		await SettingService.workspaceMuteCriticalAlertsUi({
+			workspace: $workspaceStore!,
+			requestBody: {
+				mute_critical_alerts: muteSettings.workspace
+			}
+		})
+		sendUserToast(
+			`Critical alert UI mute settings changed.\nPlease reload page for UI changes to take effect.`
+		)
+		childRef.refreshAlerts()
+	}
+	async function saveGlobalMuteSetting() {
+		await SettingService.setGlobal({
+			key: 'critical_alert_mute_ui',
+			requestBody: { value: muteSettings.global }
+		})
+		sendUserToast(
+			`Critical alert UI mute settings changed.\nPlease reload page for UI changes to take effect.`
+		)
+		childRef.refreshAlerts()
+	}
+
 	async function updateHasUnacknowledgedCriticalAlerts(sendToast: boolean = false) {
 		if (checkingForNewAlerts) return
 		checkingForNewAlerts = true
 		try {
-			const unacknowledged = await getCriticalAlerts({
+			const params = {
 				page: 1,
-				pageSize: 10,
+				pageSize: 1000,
 				acknowledged: false
-			})
+			}
+			let unacknowledged: CriticalAlert[] = []
+			if (!$devopsRole && $workspaceStore) {
+				const res = await SettingService.workspaceGetCriticalAlerts({
+					...params,
+					workspace: $workspaceStore
+				})
+				unacknowledged = res.alerts ?? []
+			} else {
+				const res = await SettingService.getCriticalAlerts(params)
+				unacknowledged = res.alerts ?? []
+			}
+
 			if (
 				numUnacknowledgedCriticalAlerts === 0 &&
 				unacknowledged.length > 0 &&
@@ -116,14 +164,122 @@
 	}
 </script>
 
-<Modal bind:open title="Critical Alerts" cancelText="Close" style="max-width: 66%;">
+<Modal2 bind:isOpen={open} title="Critical Alerts" target="#content" fixedSize="lg">
+	<svelte:fragment slot="header-left">
+		<Notification notificationCount={numUnacknowledgedCriticalAlerts} notificationLimit={9999} />
+	</svelte:fragment>
+	<svelte:fragment slot="header-right">
+		<List horizontal>
+			{#if $superadmin || $userStore?.is_admin}
+				<Popup
+					floatingConfig={{ strategy: 'absolute', placement: 'bottom-end' }}
+					target="#mute-settings-button"
+					preventPopupClosingOnClickInside={true}
+				>
+					<svelte:fragment slot="button">
+						<div id="mute-settings-button">
+							<Button variant="border" color="light" nonCaptureEvent>
+								{#if muteSettings.global || muteSettings.workspace}
+									<BellOff size="16" />
+								{:else}
+									<Bell size="16" />
+								{/if}
+							</Button>
+						</div>
+					</svelte:fragment>
+					<List justify="start">
+						<div class="w-full">
+							{#if $superadmin}
+								<Toggle
+									on:change={saveGlobalMuteSetting}
+									bind:checked={muteSettings.global}
+									options={{
+										right: 'Automatically acknowledge critical alerts instance wide'
+									}}
+									size="xs"
+									stopPropagation={true}
+								/>
+							{/if}
+						</div>
+
+						<div class="w-full">
+							<Toggle
+								on:change={saveWorkSpaceMuteSetting}
+								bind:checked={muteSettings.workspace}
+								options={{
+									right: 'Automatically acknowledge critical alerts for current workspace'
+								}}
+								size="xs"
+								stopPropagation={true}
+							/>
+						</div>
+					</List>
+				</Popup>
+			{/if}
+
+			{#if $superadmin}
+				<Popup
+					floatingConfig={{ strategy: 'absolute', placement: 'bottom-end' }}
+					target="#settings-button"
+				>
+					<svelte:fragment slot="button">
+						<div id="settings-button">
+							<Button variant="border" color="light" nonCaptureEvent>
+								<Settings size="16" />
+							</Button>
+						</div>
+					</svelte:fragment>
+					<List justify="start" gap="none">
+						<div class="w-full">
+							<Button
+								size="xs"
+								color="light"
+								href="{base}/?workspace=admins#superadmin-settings"
+								target="_blank"
+							>
+								<div class="w-full">
+									<List horizontal justify="between" gap="sm">
+										<div>Instance Critical Alert Settings</div>
+										<ExternalLink size="16" />
+									</List>
+								</div>
+							</Button>
+						</div>
+						<div class="w-full">
+							<Button
+								size="xs"
+								color="light"
+								href="{base}/workspace_settings?tab=error_handler"
+								target="_blank"
+							>
+								Workspace Critical Alert Settings <ExternalLink size="16" />
+							</Button>
+						</div>
+					</List>
+				</Popup>
+			{:else}
+				<Button
+					size="xs"
+					color="light"
+					variant="border"
+					href="{base}/workspace_settings?tab=error_handler"
+					target="_blank"
+				>
+					<List horizontal justify="between" gap="sm">
+						<Settings size="16" />
+						<ExternalLink size="16" />
+					</List>
+				</Button>
+			{/if}
+		</List>
+	</svelte:fragment>
+
 	<CriticalAlertModalInner
 		{numUnacknowledgedCriticalAlerts}
 		{updateHasUnacknowledgedCriticalAlerts}
 		{getCriticalAlerts}
 		{acknowledgeCriticalAlert}
 		{acknowledgeAllCriticalAlerts}
-		{muteSettings}
-		bind:workspaceContext
+		bind:this={childRef}
 	/>
-</Modal>
+</Modal2>
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
index c935f82944..5bb4bbdeb3 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
@@ -1,14 +1,14 @@
 <script lang="ts">
-	import Button from '../common/button/Button.svelte'
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { SettingService } from '$lib/gen'
-	import { CheckCircle2, AlertCircle, RefreshCw, CheckSquare2, AlertTriangle } from 'lucide-svelte'
 	import type { CriticalAlert } from '$lib/gen'
 	import { onMount } from 'svelte'
-	import { devopsRole, workspaceStore, instanceSettingsSelectedTab, superadmin, userStore } from '$lib/stores'
+	import { devopsRole, instanceSettingsSelectedTab, superadmin } from '$lib/stores'
 	import { goto } from '$app/navigation'
-	import { sendUserToast } from '$lib/toast'
-	import Section from '$lib/components/Section.svelte'
+	import List from '$lib/components/common/layout/List.svelte'
+	import RefreshButton from '$lib/components/common/button/RefreshButton.svelte'
+	import CriticalAlertTable from './CriticalAlertTable.svelte'
+	import Alert from '$lib/components/common/alert/Alert.svelte'
 
 	export let updateHasUnacknowledgedCriticalAlerts
 	export let getCriticalAlerts
@@ -16,59 +16,19 @@
 	export let acknowledgeAllCriticalAlerts
 	export let numUnacknowledgedCriticalAlerts
 
-	let alerts: CriticalAlert[] = []
+	let filteredAlerts: CriticalAlert[] = []
 
 	let isRefreshing = false
 	let hasCriticalAlertChannels = true
 
-	export let muteSettings = {
-		workspace: true,
-		global: true
-	}
-
-	$: muteSettings
-	$: {
-		if (
-			initialMuteSettings.workspace !== muteSettings.workspace ||
-			initialMuteSettings.global !== muteSettings.global
-		) {
-			saveMuteSettings()
-		}
-	}
-
-	$: numUnacknowledgedCriticalAlerts >= 0 && getAlerts(true)
-
-	let initialMuteSettings = muteSettings
-
-	async function saveMuteSettings() {
-		if (initialMuteSettings.workspace !== muteSettings.workspace) {
-			// Workspace
-			await SettingService.workspaceMuteCriticalAlertsUi({
-				workspace: $workspaceStore!,
-				requestBody: {
-					mute_critical_alerts: muteSettings.workspace
-				}
-			})
-		}
-		if ($superadmin && initialMuteSettings.global !== muteSettings.global) {
-			// Global
-			await SettingService.setGlobal({
-				key: 'critical_alert_mute_ui',
-				requestBody: { value: muteSettings.global }
-			})
-		}
-		sendUserToast(
-			`Critical alert UI mute settings changed.\nPlease reload page for UI changes to take effect.`
-		)
-		getAlerts(true)
-		initialMuteSettings = { ...muteSettings }
-	}
-
 	$: loading = isRefreshing
 
+	$: if (numUnacknowledgedCriticalAlerts) {
+		refreshAlerts()
+	}
+
 	onMount(() => {
 		refreshAlerts()
-		initialMuteSettings = { ...muteSettings }
 	})
 
 	// Pagination
@@ -77,6 +37,7 @@
 	let hasMore = true
 
 	let hideAcknowledged = false
+	let workspaceContext = false
 
 	async function acknowledgeAll() {
 		await acknowledgeAllCriticalAlerts()
@@ -86,15 +47,14 @@
 	async function fetchAlerts(pageNumber: number) {
 		isRefreshing = true
 		try {
-			const newAlerts = await getCriticalAlerts({
+			const res = await getCriticalAlerts({
 				page: pageNumber,
 				pageSize: pageSize,
 				acknowledged: hideAcknowledged ? false : undefined
 			})
 
-			alerts = newAlerts
-			hasMore = newAlerts.length === pageSize
-			page = pageNumber
+			hasMore = pageNumber < res.total_pages
+			filteredAlerts = res.alerts
 			updateHasUnacknowledgedCriticalAlerts()
 		} finally {
 			setTimeout(() => {
@@ -104,8 +64,11 @@
 	}
 
 	async function getAlerts(reset?: boolean) {
-		if (reset) page = 1
+		if (reset) {
+			page = 1
+		}
 		updateHasUnacknowledgedCriticalAlerts()
+		await getTotalNumber()
 		await fetchAlerts(page)
 	}
 
@@ -119,33 +82,22 @@
 		getAlerts(false)
 	}
 
-	function formatDate(dateString: string | undefined): string {
-		if (!dateString) return ''
-		const date = new Date(dateString)
-		return new Intl.DateTimeFormat('en-US', {
-			year: 'numeric',
-			month: 'short',
-			day: 'numeric',
-			hour: '2-digit',
-			minute: '2-digit',
-			second: '2-digit'
-		}).format(date)
-	}
-
-	async function refreshAlerts() {
+	export async function refreshAlerts() {
 		if ($superadmin) checkCriticalAlertChannels()
 		await getAlerts(true)
 	}
 
 	function goToPreviousPage() {
 		if (page > 1) {
-			fetchAlerts(page - 1)
+			page -= 1
+			fetchAlerts(page)
 		}
 	}
 
 	function goToNextPage() {
 		if (hasMore) {
-			fetchAlerts(page + 1)
+			page += 1
+			fetchAlerts(page)
 		}
 	}
 
@@ -154,163 +106,73 @@
 		instanceSettingsSelectedTab.set('Core')
 	}
 
-	export let workspaceContext = false
-
-	$: {
-		workspaceContextChanged(workspaceContext)
+	function onFiltersChange() {
+		getAlerts(true)
+		getTotalNumber()
 	}
 
-	async function workspaceContextChanged(_ctx) {
-		await getAlerts(true)
+	// Update filter change handlers
+	$: hideAcknowledged, workspaceContext, onFiltersChange()
+
+	let totalNumberOfAlerts = 0
+	async function getTotalNumber() {
+		loading = true
+		const res = await getCriticalAlerts({
+			page: 1,
+			pageSize: 1000,
+			acknowledged: hideAcknowledged ? false : undefined
+		})
+		totalNumberOfAlerts = res.total_rows
+		loading = false
 	}
 </script>
 
-<div>
-	<div class="grid grid-cols-3 gap-4 col-start-3">
-		<div class="pt-1 col-span-2">
-			{#if !hasCriticalAlertChannels && $superadmin}
-				<div class="flex flex-row pb-4">
-					<AlertTriangle color="orange" class="w-6 h-6 mr-2" />
-					<p>
-						No critical alert channels are set up. Go to the
-						<a href="/#superadmin-settings" on:click|preventDefault={goToCoreTab}
-							>Instance Settings</a
-						>
-						page to configure critical alert channels.
-					</p>
-				</div>
-			{/if}
+<List gap="sm">
+	{#if !hasCriticalAlertChannels && $superadmin}
+		<div class="w-full">
+			<Alert title="No critical alert channels are set up" type="warning" size="xs">
+				Go to the
+				<a href="/#superadmin-settings" on:click|preventDefault={goToCoreTab}>Instance Settings</a>
+				page to configure critical alert channels.
+			</Alert>
 		</div>
+	{/if}
 
-		<div class="flex flex-col justify-between col-start-3">
-			<div class="flex flex-row justify-end mt-[-38px] pb-3">
-				<Button
-					color="green"
-					startIcon={{ icon: CheckSquare2 }}
-					size="xs"
-					disabled={numUnacknowledgedCriticalAlerts === 0}
-					on:click={acknowledgeAll}
-				>
-					Acknowledge All</Button
-				>
-			</div>
-
-			{#if $devopsRole}
-				<div class="flex flex-row py-2 pb-3">
-					<Toggle
-						bind:checked={workspaceContext}
-						options={{ right: `Workspace: '${$workspaceStore}'`, left: "Context: 'Global'" }}
-						size="xs"
-					/>
-				</div>
-			{/if}
-
-			{#if $superadmin || $userStore?.is_admin}
-				<Section label="Mute Settings" collapsable={true} small={true}>
-					{#if $superadmin}
-						<div class="flex flex-row pb-1">
-							<Toggle
-								bind:checked={muteSettings.global}
-								options={{ right: 'Mute critical alerts instance wide' }}
-								size="xs"
-							/>
-						</div>
-					{/if}
-
-					<div class="flex flex-row pb-1">
+	<div class="w-full">
+		<List horizontal justify="between">
+			<div class="w-full">
+				<List horizontal justify="start" gap="md">
+					{#if $devopsRole}
 						<Toggle
-							bind:checked={muteSettings.workspace}
-							options={{ right: 'Mute critical alerts for current workspace' }}
+							bind:checked={workspaceContext}
+							options={{ right: `Workspace only` }}
 							size="xs"
 						/>
-					</div>
-				</Section>
-			{/if}
+					{/if}
 
-			<div class="pt-2 flex justify-between items-center">
-				<div class="pr-2">
-					<Toggle
-						bind:checked={hideAcknowledged}
-						on:change={refreshAlerts}
-						options={{ right: 'Hide Acknowledged' }}
-						size="xs"
-					/>
-				</div>
-				<button
-					class="mb-1 p-2 rounded-full hover:bg-gray-200"
-					on:click={refreshAlerts}
-					disabled={loading}
-				>
-					<RefreshCw class={loading ? 'animate-spin ' : ''} size="20" />
-				</button>
+					<Toggle bind:checked={hideAcknowledged} options={{ right: 'Non-Acked only' }} size="xs" />
+				</List>
 			</div>
-		</div>
+
+			<List wFull={false} horizontal gap="md" justify="end">
+				<div class="text-xs text-tertiary whitespace-nowrap"
+					>{`${totalNumberOfAlerts === 1000 ? '1000+' : totalNumberOfAlerts ?? '?'} items`}
+				</div>
+				<RefreshButton {loading} on:click={refreshAlerts} />
+			</List>
+		</List>
 	</div>
 
-	<!-- Table of alerts with scrollable body -->
-	<div class="overflow-y-auto max-h-1/2">
-		<table class="min-w-full w-full">
-			<thead class="bg-gray-600 text-white sticky top-0 z-10">
-				<tr>
-					<th class="w-[60px] px-4 py-2 text-center">Type</th>
-					<th class="px-4 py-2 text-center">Message</th>
-					<th class="w-[150px] px-4 py-2 text-center">Created At</th>
-					{#if $devopsRole}
-						<th class="w-[80px] px-4 py-2 text-center">Workspace</th>
-					{/if}
-					<th class="w-[180px] px-4 py-2 text-center">Acknowledge</th>
-				</tr>
-			</thead>
-			<tbody>
-				{#each alerts as { id, alert_type, message, created_at, acknowledged, workspace_id }}
-					{#if !hideAcknowledged || !acknowledged}
-						<tr class="bg-gray-100 dark:bg-gray-700 dark:text-white text-center">
-							<td class="border px-4 py-2 w-[100px]">
-								{#if alert_type === 'recovered_critical_error'}
-									<span title="Recovered Critical Alert">
-										<CheckCircle2 size="20" color="green" />
-									</span>
-								{:else}
-									<span title="Critical Alert">
-										<AlertCircle size="20" color="red" />
-									</span>
-								{/if}
-							</td>
-							<td class="border px-4 py-2">{message}</td>
-							<!-- Flexible width -->
-							<td class="border px-4 py-2 w-[150px]">{formatDate(created_at)}</td>
-							{#if $devopsRole}
-								<td class="border px-4 py-2 w-[150px]">{workspace_id ? workspace_id : 'global'}</td>
-							{/if}
-							<td class="border px-4 py-2 w-[180px]">
-								<div class="flex justify-center items-center">
-									{#if !acknowledged}
-										<Button
-											color="green"
-											startIcon={{ icon: CheckSquare2 }}
-											size="xs2"
-											on:click={() => {
-												if (id) acknowledgeAlert(id)
-											}}>Acknowledge</Button
-										>
-									{:else}
-										<CheckCircle2 size="20" color="green" />
-									{/if}
-								</div>
-							</td>
-						</tr>
-					{/if}
-				{/each}
-			</tbody>
-		</table>
-	</div>
-	<div class="flex flex-1 pt-2 gap-x-4 justify-end">
-		<Button size="xs2" on:click={goToPreviousPage} disabled={page <= 1}>Previous</Button>
-		<span>Page {page}</span>
-		<Button size="xs2" on:click={goToNextPage} disabled={!hasMore}>Next</Button>
-	</div>
-
-	{#if alerts.length === 0}
-		<p class="text-center text-gray-500 mt-4">No critical alerts available.</p>
-	{/if}
-</div>
+	<CriticalAlertTable
+		alerts={filteredAlerts}
+		{acknowledgeAlert}
+		{hideAcknowledged}
+		{goToNextPage}
+		{goToPreviousPage}
+		bind:page
+		{hasMore}
+		{acknowledgeAll}
+		{numUnacknowledgedCriticalAlerts}
+		{pageSize}
+	/>
+</List>
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertTable.svelte b/frontend/src/lib/components/sidebar/CriticalAlertTable.svelte
new file mode 100644
index 0000000000..82e9fd3e74
--- /dev/null
+++ b/frontend/src/lib/components/sidebar/CriticalAlertTable.svelte
@@ -0,0 +1,146 @@
+<script lang="ts">
+	import Cell from '$lib/components/table/Cell.svelte'
+	import DataTable from '$lib/components/table/DataTable.svelte'
+	import Head from '$lib/components/table/Head.svelte'
+	import Row from '$lib/components/table/Row.svelte'
+	import Button from '$lib/components/common/button/Button.svelte'
+	import { AlertCircle, CheckCircle2 } from 'lucide-svelte'
+	import { devopsRole } from '$lib/stores'
+	import List from '$lib/components/common/layout/List.svelte'
+	import { Skeleton } from '../common'
+
+	export let alerts: any[]
+	export let hideAcknowledged = false
+	export let goToNextPage: () => void
+	export let goToPreviousPage: () => void
+	export let acknowledgeAlert: (id: number) => void
+	export let acknowledgeAll: () => void
+	export let numUnacknowledgedCriticalAlerts: number
+	export let page = 1
+	export let hasMore = true
+	export let pageSize = 0
+
+	let headerHeight = 0
+	let contentHeight = 0
+
+	function formatDate(dateString: string | undefined): string {
+		if (!dateString) return ''
+		const date = new Date(dateString)
+		return new Intl.DateTimeFormat('en-US', {
+			year: 'numeric',
+			month: 'short',
+			day: 'numeric',
+			hour: '2-digit',
+			minute: '2-digit',
+			second: '2-digit'
+		}).format(date)
+	}
+
+	$: availableHeight = (contentHeight - headerHeight - pageSize - 1) / pageSize
+</script>
+
+<div class="relative grow min-h-0 w-full">
+	<DataTable
+		size="xs"
+		paginated
+		on:next={goToNextPage}
+		on:previous={goToPreviousPage}
+		bind:currentPage={page}
+		{hasMore}
+		bind:contentHeight
+	>
+		<Head>
+			<tr bind:clientHeight={headerHeight}>
+				<Cell head first class="min-w-12">&nbsp;</Cell>
+				<Cell head class="min-w-24 w-full">Message</Cell>
+				<Cell head class="min-w-28">Created At</Cell>
+				{#if $devopsRole}
+					<Cell head class="min-w-24">Context</Cell>
+				{/if}
+				<Cell head last class="min-w-36">
+					<List horizontal gap="sm">
+						<span>Acked</span>
+
+						<Button
+							color="green"
+							startIcon={{ icon: CheckCircle2 }}
+							size="xs2"
+							disabled={numUnacknowledgedCriticalAlerts === 0}
+							on:click={acknowledgeAll}
+							title="Acknowledge all"
+						>
+							All</Button
+						>
+					</List>
+				</Cell>
+			</tr>
+		</Head>
+		{#if alerts == undefined}
+			<tbody>
+				{#each new Array(3) as _}
+					<Row>
+						{#each new Array(5) as _}
+							<Cell>
+								<Skeleton layout={[[5]]} />
+							</Cell>
+						{/each}
+					</Row>
+				{/each}
+			</tbody>
+		{:else if alerts.length === 0}
+			<div class="absolute top-0 left-0 w-full h-full center-center">
+				<p class="text-center text-gray-500 mt-4">No critical alerts.</p>
+			</div>
+		{:else}
+			<tbody class="divide-y border-b w-full overflow-y-auto">
+				{#each alerts as { id, alert_type, message, created_at, acknowledged, workspace_id }}
+					{#if !hideAcknowledged || !acknowledged}
+						<Row disabled={acknowledged}>
+							<Cell class="py-0">
+								<div class="flex items-center justify-center" style="height: {availableHeight}px">
+									{#if alert_type === 'recovered_critical_error'}
+										<span title="Recovered Critical Alert">
+											<CheckCircle2 size="20" color="green" />
+										</span>
+									{:else}
+										<span title="Critical Alert">
+											<AlertCircle size="20" color="red" />
+										</span>
+									{/if}
+								</div>
+							</Cell>
+
+							<Cell wrap>
+								<div class="flex-shrink min-w-0 break-words">{message}</div>
+							</Cell>
+							<!-- Flexible width -->
+							<Cell wrap>{formatDate(created_at)}</Cell>
+							{#if $devopsRole}
+								<Cell>{workspace_id ? workspace_id : 'global'}</Cell>
+							{/if}
+							<Cell>
+								<div class="w-full flex justify-center items-center">
+									{#if !acknowledged}
+										<Button
+											color="green"
+											startIcon={{ icon: CheckCircle2 }}
+											size="xs2"
+											on:click={() => {
+												if (id) acknowledgeAlert(id)
+											}}
+											title="Acknowledge"
+										>
+											Acknowledge
+										</Button>
+									{:else}
+										<CheckCircle2 size="20" />
+									{/if}
+								</div>
+							</Cell>
+						</Row>
+					{/if}
+				{/each}
+			</tbody>
+		{/if}
+	</DataTable>
+</div>
diff --git a/frontend/src/lib/components/sidebar/SideBarNotification.svelte b/frontend/src/lib/components/sidebar/SideBarNotification.svelte
index d935769972..4e9ea4ba0f 100644
--- a/frontend/src/lib/components/sidebar/SideBarNotification.svelte
+++ b/frontend/src/lib/components/sidebar/SideBarNotification.svelte
@@ -1,14 +1,12 @@
 <script lang="ts">
+	import Notification from '$lib/components/common/alert/Notification.svelte'
+
 	export let notificationCount = 0
 	export let small: boolean = false
 </script>
 
 {#if !small}
-	<div
-		class="bg-red-500 text-white text-[0.6rem] rounded-md w-5 h-5 flex items-center justify-center"
-	>
-		{notificationCount > 9 ? '9+' : notificationCount}
-	</div>
+	<Notification {notificationCount} notificationLimit={9} />
 {:else}
 	<div class="bg-red-500 rounded-md w-3 h-3 flex items-center justify-center" />
 {/if}
diff --git a/frontend/src/lib/components/table/Cell.svelte b/frontend/src/lib/components/table/Cell.svelte
index 0146ee67c6..ab43a10c2f 100644
--- a/frontend/src/lib/components/table/Cell.svelte
+++ b/frontend/src/lib/components/table/Cell.svelte
@@ -10,6 +10,7 @@
 	export let shouldStopPropagation: boolean = false
 	export let selected = false
 	export let sticky: boolean = false
+	export let wrap: boolean = false
 
 	let Tag = head ? 'th' : 'td'
 
@@ -24,7 +25,8 @@
 		if (shouldStopPropagation) e.stopPropagation()
 	}}
 	class={twMerge(
-		'text-left text-xs text-primary font-normal whitespace-nowrap',
+		'text-left text-xs text-primary font-normal',
+		wrap ? 'break-words' : 'whitespace-nowrap',
 		first ? 'sm:pl-6' : '',
 		last ? 'sm:pr-6' : '',
 
@@ -33,13 +35,13 @@
 
 		numeric ? 'text-right' : '',
 		head ? 'font-semibold ' : '',
-		$$restProps.class,
 		sticky ? `!p-0 sticky ${first ? 'left-0' : 'right-0'}` : 'px-2 py-3.5',
 		size === 'sm' ? 'px-1.5 py-2.5' : '',
 		size === 'lg' ? 'px-3 py-4' : '',
 		size === 'xs' ? 'px-1 py-1.5' : '',
 		selected ? 'bg-blue-50 dark:bg-blue-900/50' : '',
-		'transition-all'
+		'transition-all',
+		$$restProps.class
 	)}
 >
 	{#if sticky}
diff --git a/frontend/src/lib/components/table/DataTable.svelte b/frontend/src/lib/components/table/DataTable.svelte
index f9479ab605..e19520cc2e 100644
--- a/frontend/src/lib/components/table/DataTable.svelte
+++ b/frontend/src/lib/components/table/DataTable.svelte
@@ -9,6 +9,7 @@
 	import Button from '../common/button/Button.svelte'
 	import { ArrowDownIcon, ArrowLeftIcon, ArrowRightIcon } from 'lucide-svelte'
 	import { twMerge } from 'tailwind-merge'
+	import List from '$lib/components/common/layout/List.svelte'
 
 	export let paginated: boolean = false
 	export let currentPage: number = 1
@@ -21,80 +22,87 @@
 	export let shouldHidePagination: boolean = false
 	export let noBorder: boolean = false
 	export let rowCount: number | undefined = undefined
+	export let hasMore: boolean = true
+	export let contentHeight: number = 0
 
+	let footerHeight: number = 0
+	let tableHeight: number = 0
 	const dispatch = createEventDispatcher()
 
 	setContext<DatatableContext>('datatable', {
 		size
 	})
+
+	$: contentHeight = tableHeight - footerHeight
 </script>
 
 <div
-	class={twMerge(
-		'h-full overflow-auto',
-		rounded ? 'rounded-md' : '',
-		noBorder ? 'border-0' : 'border'
-	)}
+	class={twMerge('h-full', rounded ? 'rounded-md' : '', noBorder ? 'border-0' : 'border')}
+	bind:clientHeight={tableHeight}
 >
-	<div class={twMerge('overflow-auto')}>
-		<table class={twMerge('min-w-full divide-y')}>
-			<slot />
-		</table>
-	</div>
-	{#if paginated && !shouldHidePagination}
-		<div
-			class="bg-surface border-t flex flex-row justify-between p-1 items-center gap-2 sticky bottom-0"
-		>
-			<div>
-				{#if rowCount}
-					<span class="text-xs mx-2"> {rowCount} items</span>
-				{/if}
-			</div>
+	<List justify="between" gap="none">
+		<div class="w-full overflow-auto min-h-0 grow">
+			<table class={twMerge('min-w-full divide-y')}>
+				<slot />
+			</table>
+		</div>
+		{#if paginated && !shouldHidePagination}
+			<div
+				class="w-full bg-surface border-t flex flex-row justify-between p-1 items-center gap-2 sticky bottom-0"
+				bind:clientHeight={footerHeight}
+			>
+				<div>
+					{#if rowCount}
+						<span class="text-xs mx-2"> {rowCount} items</span>
+					{/if}
+				</div>
 
-			<div class="flex flex-row gap-2 items-center">
-				<span class="text-xs">
-					Page: {currentPage}
-					{perPage && rowCount ? `/ ${Math.ceil(rowCount / perPage)}` : ''}
-				</span>
+				<div class="flex flex-row gap-2 items-center">
+					<span class="text-xs">
+						Page: {currentPage}
+						{perPage && rowCount ? `/ ${Math.ceil(rowCount / perPage)}` : ''}
+					</span>
 
-				{#if perPage !== undefined}
-					<select class="!text-xs !w-16" bind:value={perPage}>
-						<option value={25}>25</option>
-						<option value={100}>100</option>
-						<option value={1000}>1000</option>
-					</select>
-				{/if}
-				<Button
-					color="light"
-					size="xs2"
-					on:click={() => dispatch('previous')}
-					disabled={currentPage === 1}
-					startIcon={{ icon: ArrowLeftIcon }}
-				>
-					Previous
-				</Button>
-				{#if showNext}
+					{#if perPage !== undefined}
+						<select class="!text-xs !w-16" bind:value={perPage}>
+							<option value={25}>25</option>
+							<option value={100}>100</option>
+							<option value={1000}>1000</option>
+						</select>
+					{/if}
 					<Button
 						color="light"
 						size="xs2"
-						on:click={() => dispatch('next')}
-						endIcon={{ icon: ArrowRightIcon }}
+						on:click={() => dispatch('previous')}
+						disabled={currentPage === 1}
+						startIcon={{ icon: ArrowLeftIcon }}
 					>
-						Next
+						Previous
 					</Button>
-				{/if}
+					{#if showNext}
+						<Button
+							color="light"
+							size="xs2"
+							on:click={() => dispatch('next')}
+							endIcon={{ icon: ArrowRightIcon }}
+							disabled={!hasMore}
+						>
+							Next
+						</Button>
+					{/if}
+				</div>
 			</div>
-		</div>
-	{:else if shouldLoadMore}
-		<div class="bg-surface border-t flex flex-row justify-center py-4 items-center gap-2">
-			<Button
-				color="light"
-				size="xs2"
-				on:click={() => dispatch('loadMore')}
-				endIcon={{ icon: ArrowDownIcon }}
-			>
-				Load {loadMore} more
-			</Button>
-		</div>
-	{/if}
+		{:else if shouldLoadMore}
+			<div class="bg-surface border-t flex flex-row justify-center py-4 items-center gap-2">
+				<Button
+					color="light"
+					size="xs2"
+					on:click={() => dispatch('loadMore')}
+					endIcon={{ icon: ArrowDownIcon }}
+				>
+					Load {loadMore} more
+				</Button>
+			</div>
+		{/if}
+	</List>
 </div>
diff --git a/frontend/src/lib/components/table/Head.svelte b/frontend/src/lib/components/table/Head.svelte
index 56882ba412..7dcb13e1f4 100644
--- a/frontend/src/lib/components/table/Head.svelte
+++ b/frontend/src/lib/components/table/Head.svelte
@@ -1,4 +1,4 @@
-<thead class="bg-surface-secondary sticky top-0">
+<thead class="bg-surface-secondary sticky top-0 z-10">
 	<slot />
 	<div class="absolute top-2 right-2">
 		<slot name="headerAction" />
diff --git a/frontend/src/lib/components/table/Row.svelte b/frontend/src/lib/components/table/Row.svelte
index 19f08bff40..728dde81af 100644
--- a/frontend/src/lib/components/table/Row.svelte
+++ b/frontend/src/lib/components/table/Row.svelte
@@ -5,6 +5,7 @@
 	export let hoverable: boolean = false
 	export let selected: boolean = false
 	export let dividable: boolean = false
+	export let disabled: boolean = false
 	const dispatch = createEventDispatcher()
 </script>
 
@@ -13,7 +14,8 @@
 		hoverable ? 'hover:bg-surface-hover cursor-pointer' : '',
 		selected ? 'bg-blue-50 dark:bg-blue-900/50' : '',
 		'transition-all',
-		dividable ? 'divide-x' : ''
+		dividable ? 'divide-x' : '',
+		disabled ? 'opacity-60' : ''
 	)}
 	on:click={() => {
 		dispatch('click')

From c443c2b3a89e070d9fe7388c5da24cbdacab4c10 Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:10:30 +0100
Subject: [PATCH 14/34] nit: format `cache.rs` (#4845)

---
 backend/windmill-common/src/cache.rs | 177 ++++++++++++++++-----------
 1 file changed, 108 insertions(+), 69 deletions(-)

diff --git a/backend/windmill-common/src/cache.rs b/backend/windmill-common/src/cache.rs
index bb738bddf1..9810e83be5 100644
--- a/backend/windmill-common/src/cache.rs
+++ b/backend/windmill-common/src/cache.rs
@@ -34,24 +34,36 @@ pub mod flow {
     /// If not present, import from the file-system cache or fetch it from the database and write
     /// it to the file system and cache.
     /// This should be preferred over fetching the database directly.
-    pub async fn fetch_script(e: impl PgExecutor<'_>, node: FlowNodeId)
-        -> error::Result<(Option<String>, String)>
-    {
-        fetch(e, node).await.and_then(|Val { lock, code, .. }| Ok((lock, code.ok_or_else(|| {
-            error::Error::InternalErr(format!("Flow node ({:x}) isn't a script node.", node.0))
-        })?)))
+    pub async fn fetch_script(
+        e: impl PgExecutor<'_>,
+        node: FlowNodeId,
+    ) -> error::Result<(Option<String>, String)> {
+        fetch(e, node).await.and_then(|Val { lock, code, .. }| {
+            Ok((
+                lock,
+                code.ok_or_else(|| {
+                    error::Error::InternalErr(format!(
+                        "Flow node ({:x}) isn't a script node.",
+                        node.0
+                    ))
+                })?,
+            ))
+        })
     }
 
     /// Fetch the flow node flow value referenced by `node` from the cache.
     /// If not present, import from the file-system cache or fetch it from the database and write
     /// it to the file system and cache.
     /// This should be preferred over fetching the database directly.
-    pub async fn fetch_flow(e: impl PgExecutor<'_>, node: FlowNodeId)
-        -> error::Result<FlowValue>
-    {
-        fetch(e, node).await.and_then(|Val { flow, .. }| flow.ok_or_else(|| {
-            error::Error::InternalErr(format!("Flow node ({:x}) isn't a flow value node.", node.0))
-        }))
+    pub async fn fetch_flow(e: impl PgExecutor<'_>, node: FlowNodeId) -> error::Result<FlowValue> {
+        fetch(e, node).await.and_then(|Val { flow, .. }| {
+            flow.ok_or_else(|| {
+                error::Error::InternalErr(format!(
+                    "Flow node ({:x}) isn't a flow value node.",
+                    node.0
+                ))
+            })
+        })
     }
 
     /// Fetch the flow node referenced by `node` from the cache.
@@ -62,32 +74,40 @@ pub mod flow {
         // If not present, `get_or_insert_async` will lock the key until the future completes,
         // so only one thread will be able to fetch the data from the database and write it to
         // the file system and cache, hence no race on the file system.
-        CACHE.get_or_insert_async(
-            &node,
-            fs::import_or_insert_with(CACHE_DIR, node.0 as u64, async {
-                sqlx::query!(
-                    "SELECT \
+        CACHE
+            .get_or_insert_async(
+                &node,
+                fs::import_or_insert_with(CACHE_DIR, node.0 as u64, async {
+                    sqlx::query!(
+                        "SELECT \
                         lock AS \"lock: String\", \
                         code AS \"code: String\", \
                         flow::text AS \"flow: Box<str>\" \
                     FROM flow_node WHERE id = $1 LIMIT 1",
-                    node.0,
-                )
-                .fetch_one(e)
-                .await
-                .map_err(Into::into)
-                .and_then(|r| Ok(Val {
-                    lock: r.lock.and_then(|x| if x.is_empty() { None } else { Some(x) }),
-                    code: r.code,
-                    flow: match r.flow {
-                        None => None,
-                        Some(flow) => serde_json::from_str(&flow).map_err(|err| {
-                            error::Error::InternalErr(format!("Unable to parse flow value: {err:?}"))
-                        })?,
-                    }
-                }))
-            })
-        ).await
+                        node.0,
+                    )
+                    .fetch_one(e)
+                    .await
+                    .map_err(Into::into)
+                    .and_then(|r| {
+                        Ok(Val {
+                            lock: r
+                                .lock
+                                .and_then(|x| if x.is_empty() { None } else { Some(x) }),
+                            code: r.code,
+                            flow: match r.flow {
+                                None => None,
+                                Some(flow) => serde_json::from_str(&flow).map_err(|err| {
+                                    error::Error::InternalErr(format!(
+                                        "Unable to parse flow value: {err:?}"
+                                    ))
+                                })?,
+                            },
+                        })
+                    })
+                }),
+            )
+            .await
     }
 
     // ----------------------------------------------------------------------------------------------
@@ -130,7 +150,11 @@ pub mod flow {
             match item {
                 Item::Lock => Ok(self.lock.as_ref().map(|s| s.as_bytes().to_vec())),
                 Item::Code => Ok(self.code.as_ref().map(|s| s.as_bytes().to_vec())),
-                Item::Flow => Ok(self.flow.as_ref().map(|f| serde_json::to_vec(f)).transpose()?),
+                Item::Flow => Ok(self
+                    .flow
+                    .as_ref()
+                    .map(|f| serde_json::to_vec(f))
+                    .transpose()?),
             }
         }
     }
@@ -164,39 +188,44 @@ pub mod script {
     /// If not present, import from the file-system cache or fetch it from the database and write
     /// it to the file system and cache.
     /// This should be preferred over fetching the database directly.
-    pub async fn fetch(e: impl PgExecutor<'_>, hash: ScriptHash, workspace_id: &str)
-        -> error::Result<Val>
-    {
+    pub async fn fetch(
+        e: impl PgExecutor<'_>,
+        hash: ScriptHash,
+        workspace_id: &str,
+    ) -> error::Result<Val> {
         // If not present, `get_or_insert_async` will lock the key until the future completes,
         // so only one thread will be able to fetch the data from the database and write it to
         // the file system and cache, hence no race on the file system.
-        CACHE.get_or_insert_async(
-            &hash,
-            fs::import_or_insert_with(CACHE_DIR, hash.0 as u64, async {
-                sqlx::query!(
-                    "SELECT \
+        CACHE
+            .get_or_insert_async(
+                &hash,
+                fs::import_or_insert_with(CACHE_DIR, hash.0 as u64, async {
+                    sqlx::query!(
+                        "SELECT \
                         lock AS \"lock: String\", \
                         content AS \"code!: String\",
                         language AS \"language: Option<ScriptLang>\", \
                         envs AS \"envs: Vec<String>\", \
                         codebase AS \"codebase: String\" \
                     FROM script WHERE hash = $1 AND workspace_id = $2 LIMIT 1",
-                    hash.0,
-                    workspace_id,
-                )
-                .fetch_one(e)
-                .await
-                .map_err(Into::into)
-                .map(|r| Val {
-                    lock: r.lock.and_then(|x| if x.is_empty() { None } else { Some(x) }),
-                    code: r.code,
-                    language: r.language,
-                    envs: r.envs,
-                    codebase: r.codebase,
-                })
-            })
-        )
-        .await
+                        hash.0,
+                        workspace_id,
+                    )
+                    .fetch_one(e)
+                    .await
+                    .map_err(Into::into)
+                    .map(|r| Val {
+                        lock: r
+                            .lock
+                            .and_then(|x| if x.is_empty() { None } else { Some(x) }),
+                        code: r.code,
+                        language: r.language,
+                        envs: r.envs,
+                        codebase: r.codebase,
+                    })
+                }),
+            )
+            .await
     }
 
     // ----------------------------------------------------------------------------------------------
@@ -230,7 +259,9 @@ pub mod script {
             match item {
                 Item::Lock => self.lock = Some(String::from_utf8(data)?),
                 Item::Code => self.code = String::from_utf8(data)?,
-                Item::Info => (self.language, self.envs, self.codebase) = serde_json::from_slice(&data)?,
+                Item::Info => {
+                    (self.language, self.envs, self.codebase) = serde_json::from_slice(&data)?
+                }
             }
             Ok(())
         }
@@ -239,7 +270,11 @@ pub mod script {
             match item {
                 Item::Lock => Ok(self.lock.as_ref().map(|s| s.as_bytes().to_vec())),
                 Item::Code => Ok(Some(self.code.as_bytes().to_vec())),
-                Item::Info => Ok(Some(serde_json::to_vec(&(&self.language, &self.envs, &self.codebase))?)),
+                Item::Info => Ok(Some(serde_json::to_vec(&(
+                    &self.language,
+                    &self.envs,
+                    &self.codebase,
+                ))?)),
             }
         }
     }
@@ -272,8 +307,7 @@ mod fs {
     }
 
     /// Import or insert a bundle within the given combination of `{root}/{key}/`.
-    pub async fn import_or_insert_with<T, F>(root: &str, key: u64, f: F)
-        -> error::Result<T>
+    pub async fn import_or_insert_with<T, F>(root: &str, key: u64, f: F) -> error::Result<T>
     where
         T: Bundle,
         F: Future<Output = error::Result<T>>,
@@ -287,8 +321,9 @@ mod fs {
                 let mut data = T::default();
                 for item in T::items() {
                     let mut buf = vec![];
-                    let Ok(mut file) = OpenOptions::new().read(true).open(item.path(&path))
-                    else { continue };
+                    let Ok(mut file) = OpenOptions::new().read(true).open(item.path(&path)) else {
+                        continue;
+                    };
                     file.read_to_end(&mut buf)?;
                     data.import(*item, buf)?;
                 }
@@ -299,7 +334,7 @@ mod fs {
                 Ok(data) => return Ok(data),
                 Err(err) => tracing::warn!(
                     "Failed to import from file-system, fetch source..: {path:?}: {err:?}"
-                )
+                ),
             }
         }
         // Cache path doesn't exist or import failed, generate the content.
@@ -308,9 +343,13 @@ mod fs {
             fs::create_dir_all(&path)?;
             // Write the generated data to the file.
             for item in T::items() {
-                let Some(buf) = data.export(*item)?
-                else { continue };
-                let mut file = OpenOptions::new().write(true).create(true).open(item.path(&path))?;
+                let Some(buf) = data.export(*item)? else {
+                    continue;
+                };
+                let mut file = OpenOptions::new()
+                    .write(true)
+                    .create(true)
+                    .open(item.path(&path))?;
                 file.write_all(&buf)?;
             }
             tracing::debug!("Exported to file-system: {:?}", path);

From a7bdeb5fcac39112366e363bf32b063f2f1a35a5 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 5 Dec 2024 12:36:05 +0100
Subject: [PATCH 15/34] chore(main): release 1.435.0 (#4840)

* chore(main): release 1.435.0

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                          | 12 +++++++
 backend/Cargo.lock                    | 48 +++++++++++++--------------
 backend/Cargo.toml                    |  4 +--
 backend/windmill-api/openapi.yaml     |  2 +-
 benchmarks/lib.ts                     |  2 +-
 cli/main.ts                           |  2 +-
 frontend/package-lock.json            |  4 +--
 frontend/package.json                 |  2 +-
 lsp/Pipfile                           |  4 +--
 openflow.openapi.yaml                 |  2 +-
 python-client/wmill/pyproject.toml    |  2 +-
 python-client/wmill_pg/pyproject.toml |  2 +-
 typescript-client/jsr.json            |  2 +-
 typescript-client/package.json        |  2 +-
 version.txt                           |  2 +-
 15 files changed, 52 insertions(+), 40 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29628db02c..f9538d8528 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,17 @@
 # Changelog
 
+## [1.435.0](https://github.com/windmill-labs/windmill/compare/v1.434.2...v1.435.0) (2024-12-05)
+
+
+### Features
+
+* app custom paths ([#4828](https://github.com/windmill-labs/windmill/issues/4828)) ([1ec6c6f](https://github.com/windmill-labs/windmill/commit/1ec6c6f765904361e641d89495890bc87e8544aa))
+
+
+### Bug Fixes
+
+* pass USERPROFILE on windows ([5404ec9](https://github.com/windmill-labs/windmill/commit/5404ec9b48e8d7a0cb27b2319d54f04c94ec6fd0))
+
 ## [1.434.2](https://github.com/windmill-labs/windmill/compare/v1.434.1...v1.434.2) (2024-12-04)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 93e027e005..e672bff710 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10446,7 +10446,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "axum",
@@ -10487,7 +10487,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10573,7 +10573,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10591,7 +10591,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "chrono",
  "serde",
@@ -10604,7 +10604,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "serde",
@@ -10618,7 +10618,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10669,7 +10669,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "regex",
  "serde",
@@ -10683,7 +10683,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10706,7 +10706,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10718,7 +10718,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10727,7 +10727,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10739,7 +10739,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10763,7 +10763,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10774,7 +10774,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10785,7 +10785,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10803,7 +10803,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10820,7 +10820,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10832,7 +10832,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10850,7 +10850,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10871,7 +10871,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10881,7 +10881,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10915,7 +10915,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10925,7 +10925,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.434.2"
+version = "1.435.0"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 6b70463727..efedca1e30 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.434.2"
+version = "1.435.0"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.434.2"
+version = "1.435.0"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 4ec45bbdfa..5d738cc1f4 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.434.2
+  version: 1.435.0
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index da88c5d0aa..93ccba9355 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.434.2";
+export const VERSION = "v1.435.0";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index bf465fc315..e8da61ca9c 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.434.2";
+export const VERSION = "1.435.0";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 237bcb81bd..331d8e0754 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.434.2",
+	"version": "1.435.0",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.434.2",
+			"version": "1.435.0",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.32.1",
diff --git a/frontend/package.json b/frontend/package.json
index 24cf283420..cd7e8ea13c 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.434.2",
+	"version": "1.435.0",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index b65209dcd2..7b74af871b 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.434.2"
-wmill_pg = ">=1.434.2"
+wmill = ">=1.435.0"
+wmill_pg = ">=1.435.0"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 9ed0fede12..220f6b30f0 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.434.2
+  version: 1.435.0
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 1ee961678d..dc4cc79cfb 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.434.2"
+version = "1.435.0"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index 4e41543428..a898c49cf5 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.434.2"
+version = "1.435.0"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index e113d36b82..9376e07041 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.434.2",
+  "version": "1.435.0",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index ac77f8302b..418eea95d1 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.434.2",
+  "version": "1.435.0",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 417684d0b6..f14dc64823 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.434.2
+1.435.0

From 548cfcfbde23ac7ae129e10f6e92d57516e61f20 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 13:00:17 +0100
Subject: [PATCH 16/34] fix: improve critical alerts filters

---
 .../src/lib/components/sidebar/CriticalAlertModal.svelte     | 5 +++--
 .../lib/components/sidebar/CriticalAlertModalInner.svelte    | 2 +-
 powershell-client/WindmillClient/WindmillClient.psd1         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
index 94675fba0a..399e044ee5 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModal.svelte
@@ -20,9 +20,9 @@
 
 	export let open: boolean = false
 	export let numUnacknowledgedCriticalAlerts: number = 0
-	export let muteSettings;
+	export let muteSettings
 	let workspaceContext = false
-	let childRef;
+	let childRef
 
 	$: {
 		setupApiFunctions(workspaceContext)
@@ -275,6 +275,7 @@
 	</svelte:fragment>
 
 	<CriticalAlertModalInner
+		bind:workspaceContext
 		{numUnacknowledgedCriticalAlerts}
 		{updateHasUnacknowledgedCriticalAlerts}
 		{getCriticalAlerts}
diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
index 5bb4bbdeb3..365451a334 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
@@ -37,7 +37,7 @@
 	let hasMore = true
 
 	let hideAcknowledged = false
-	let workspaceContext = false
+	export let workspaceContext = false
 
 	async function acknowledgeAll() {
 		await acknowledgeAllCriticalAlerts()
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index cdcf7c0997..fd2c09cb69 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'WindmillClient.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.434.2'
+    ModuleVersion     = '1.435.0'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()

From 1693f330b5a51bb50294339d13705fc395558104 Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Thu, 5 Dec 2024 13:36:12 +0100
Subject: [PATCH 17/34] Added space after Use simplified builder button (#4848)

---
 frontend/src/lib/components/CronInput.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/CronInput.svelte b/frontend/src/lib/components/CronInput.svelte
index 3ce3caf385..039cc9409a 100644
--- a/frontend/src/lib/components/CronInput.svelte
+++ b/frontend/src/lib/components/CronInput.svelte
@@ -250,7 +250,7 @@
 		</Label>
 
 		{#if !disabled}
-			<div class="flex flex-row gap-2">
+			<div class="flex flex-row gap-2 mb-2">
 				<CronBuilder let:close>
 					<div class="w-full flex flex-col">
 						<div class="w-full flex flex-col gap-1">

From 93319f45bb5dec01de553f53c2cf6a1f7a949ee8 Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Thu, 5 Dec 2024 13:36:23 +0100
Subject: [PATCH 18/34] Fix dead links (#4847)

---
 frontend/src/lib/components/InstanceSettings.svelte         | 2 +-
 frontend/src/lib/components/ScriptBuilder.svelte            | 2 +-
 frontend/src/lib/components/flows/content/FlowInputs.svelte | 2 +-
 frontend/src/lib/components/sidebar/changelogs.ts           | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/lib/components/InstanceSettings.svelte b/frontend/src/lib/components/InstanceSettings.svelte
index 0b509b0814..ea8f9bf889 100644
--- a/frontend/src/lib/components/InstanceSettings.svelte
+++ b/frontend/src/lib/components/InstanceSettings.svelte
@@ -325,7 +325,7 @@
 						<div class="text-secondary pb-4 text-xs"
 							>Setting SMTP unlocks sending emails upon adding new users to the workspace or the
 							instance or sending critical alerts.
-							<a target="_blank" href="https://www.windmill.dev/docs/misc/setup_smtp">Learn more</a
+							<a target="_blank" href="https://www.windmill.dev/docs/advanced/instance_settings#smtp">Learn more</a
 							></div
 						>
 					{:else if category == "Indexer/Search"}
diff --git a/frontend/src/lib/components/ScriptBuilder.svelte b/frontend/src/lib/components/ScriptBuilder.svelte
index 4728ae8294..3b9fddf6cf 100644
--- a/frontend/src/lib/components/ScriptBuilder.svelte
+++ b/frontend/src/lib/components/ScriptBuilder.svelte
@@ -648,7 +648,7 @@
 				<Tab value="triggers">
 					Triggers
 					<Tooltip
-						documentationLink="https://www.windmill.dev/docs/getting_started/trigger_scripts"
+						documentationLink="https://www.windmill.dev/docs/getting_started/triggers"
 					>
 						Configure how this script will be triggered.
 					</Tooltip>
diff --git a/frontend/src/lib/components/flows/content/FlowInputs.svelte b/frontend/src/lib/components/flows/content/FlowInputs.svelte
index fb27580ae5..65c8b137f6 100644
--- a/frontend/src/lib/components/flows/content/FlowInputs.svelte
+++ b/frontend/src/lib/components/flows/content/FlowInputs.svelte
@@ -121,7 +121,7 @@
 				By default, adding a trigger will set the schedule to 15 minutes. To see all ways to trigger
 				a flow, check
 				<a
-					href="https://www.windmill.dev/docs/getting_started/trigger_flows"
+					href="https://www.windmill.dev/docs/getting_started/triggers"
 					target="_blank"
 					class="text-blue-400">Triggering Flows</a
 				>.
diff --git a/frontend/src/lib/components/sidebar/changelogs.ts b/frontend/src/lib/components/sidebar/changelogs.ts
index 8de6be0fe4..0c6be5542e 100644
--- a/frontend/src/lib/components/sidebar/changelogs.ts
+++ b/frontend/src/lib/components/sidebar/changelogs.ts
@@ -22,7 +22,7 @@ const changelogs: Changelog[] = [
 	},
 	{
 		label: 'Critical alert channels',
-		href: 'https://www.windmill.dev/changelog/critical-alert-channels',
+		href: 'https://www.windmill.dev/changelog/critical-alerts',
 		date: '2024-09-01'
 	},
 	{

From 7284f72427019f828723ee546eb15064239ca1f0 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 5 Dec 2024 13:37:44 +0100
Subject: [PATCH 19/34] chore(main): release 1.435.1 (#4846)

* chore(main): release 1.435.1

* Apply automatic changes

* Update WindmillClient.psd1

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++
 backend/Cargo.lock                            | 48 +++++++++----------
 backend/Cargo.toml                            |  4 +-
 backend/windmill-api/openapi.yaml             |  2 +-
 benchmarks/lib.ts                             |  2 +-
 cli/main.ts                                   |  2 +-
 frontend/package-lock.json                    |  4 +-
 frontend/package.json                         |  2 +-
 lsp/Pipfile                                   |  4 +-
 openflow.openapi.yaml                         |  2 +-
 .../WindmillClient/WindmillClient.psd1        |  2 +-
 python-client/wmill/pyproject.toml            |  2 +-
 python-client/wmill_pg/pyproject.toml         |  2 +-
 typescript-client/jsr.json                    |  2 +-
 typescript-client/package.json                |  2 +-
 version.txt                                   |  2 +-
 16 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9538d8528..e305c73393 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.435.1](https://github.com/windmill-labs/windmill/compare/v1.435.0...v1.435.1) (2024-12-05)
+
+
+### Bug Fixes
+
+* improve critical alerts filters ([548cfcf](https://github.com/windmill-labs/windmill/commit/548cfcfbde23ac7ae129e10f6e92d57516e61f20))
+
 ## [1.435.0](https://github.com/windmill-labs/windmill/compare/v1.434.2...v1.435.0) (2024-12-05)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index e672bff710..54758013bc 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10446,7 +10446,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "axum",
@@ -10487,7 +10487,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10573,7 +10573,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10591,7 +10591,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "chrono",
  "serde",
@@ -10604,7 +10604,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "serde",
@@ -10618,7 +10618,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10669,7 +10669,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "regex",
  "serde",
@@ -10683,7 +10683,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10706,7 +10706,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10718,7 +10718,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10727,7 +10727,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10739,7 +10739,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10763,7 +10763,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10774,7 +10774,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10785,7 +10785,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10803,7 +10803,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10820,7 +10820,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10832,7 +10832,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10850,7 +10850,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10871,7 +10871,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10881,7 +10881,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10915,7 +10915,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10925,7 +10925,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.435.0"
+version = "1.435.1"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index efedca1e30..6fdf37998c 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.435.0"
+version = "1.435.1"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.435.0"
+version = "1.435.1"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 5d738cc1f4..089f330cbb 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.435.0
+  version: 1.435.1
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 93ccba9355..86c2e9535f 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.435.0";
+export const VERSION = "v1.435.1";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index e8da61ca9c..632047531b 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.435.0";
+export const VERSION = "1.435.1";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 331d8e0754..13b3a8612a 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.435.0",
+	"version": "1.435.1",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.435.0",
+			"version": "1.435.1",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.32.1",
diff --git a/frontend/package.json b/frontend/package.json
index cd7e8ea13c..260d45e079 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.435.0",
+	"version": "1.435.1",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 7b74af871b..40b1f136b3 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.435.0"
-wmill_pg = ">=1.435.0"
+wmill = ">=1.435.1"
+wmill_pg = ">=1.435.1"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 220f6b30f0..281b578ecc 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.435.0
+  version: 1.435.1
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index fd2c09cb69..f31c6ac7f2 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'WindmillClient.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.435.0'
+    ModuleVersion     = '1.435.1'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index dc4cc79cfb..434f94a351 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.435.0"
+version = "1.435.1"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index a898c49cf5..ce73862ae4 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.435.0"
+version = "1.435.1"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index 9376e07041..d90bf312b9 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.435.0",
+  "version": "1.435.1",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index 418eea95d1..acaf6a59dc 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.435.0",
+  "version": "1.435.1",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index f14dc64823..4e989d00fa 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.435.0
+1.435.1

From 2c934cc3b88e3838d134b62c6be0f7bdbc4406bb Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 14:45:23 +0100
Subject: [PATCH 20/34] improve windows worker

---
 backend/windmill-worker/src/worker.rs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/backend/windmill-worker/src/worker.rs b/backend/windmill-worker/src/worker.rs
index b47f63e4c3..47f2fb393f 100644
--- a/backend/windmill-worker/src/worker.rs
+++ b/backend/windmill-worker/src/worker.rs
@@ -422,10 +422,6 @@ lazy_static::lazy_static! {
         .and_then(|x| x.parse().ok())
         .unwrap_or(false);
 
-    pub static ref USERPROFILE_ENV: String = std::env::var("USERPROFILE").unwrap_or_else(|_| "/tmp".to_string());
-
-
-
 }
 
 #[cfg(windows)]

From 85df359c0a3ec0f790ee320e2d70d04b91dbe9e5 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 15:01:47 +0100
Subject: [PATCH 21/34] improve handling of unexpected toast errors

---
 frontend/src/lib/components/toast.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/toast.ts b/frontend/src/lib/components/toast.ts
index f1f1a84f19..7290df87e5 100644
--- a/frontend/src/lib/components/toast.ts
+++ b/frontend/src/lib/components/toast.ts
@@ -2,7 +2,11 @@
 const pathRegex = /\b(u|f)\/[^\/\s]+\/[^\/\s]+\b/g
 
 export function processMessage(message: string | undefined): string {
-	return (message ?? 'Error without message').replaceAll(pathRegex, (path) => {
+	return (
+		typeof message == 'string'
+			? message ?? 'Error without message'
+			: JSON.stringify(message, null, 2)
+	).replaceAll(pathRegex, (path) => {
 		return `<span class="bg-surface-secondary p-1 text-xs font-mono whitespace-nowrap rounded-md">${path}</span>`
 	})
 }

From b19faa45cd37822874d907abe9ded8eb8b20557b Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 15:17:24 +0100
Subject: [PATCH 22/34] fix compile

---
 backend/windmill-worker/src/rust_executor.rs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/backend/windmill-worker/src/rust_executor.rs b/backend/windmill-worker/src/rust_executor.rs
index 3f5ff3d18e..c6f258d6ac 100644
--- a/backend/windmill-worker/src/rust_executor.rs
+++ b/backend/windmill-worker/src/rust_executor.rs
@@ -403,8 +403,10 @@ pub async fn handle_rust_job(
             .stderr(Stdio::piped());
 
         #[cfg(windows)]
-        run_rust.env("SystemRoot", SYSTEM_ROOT.as_str());
-        run_rust.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+        {
+            run_rust.env("SystemRoot", SYSTEM_ROOT.as_str());
+            run_rust.env("USERPROFILE", crate::USERPROFILE_ENV.as_str());
+        }
 
         start_child_process(run_rust, compiled_executable_name).await?
     };

From 96d4af0254aeb067c0120e7fc7554c79033d36d8 Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Thu, 5 Dec 2024 15:17:41 +0100
Subject: [PATCH 23/34] nit: format `worker_lockfiles.rs` (#4849)

---
 .../windmill-worker/src/worker_lockfiles.rs   | 127 +++++++++++++-----
 1 file changed, 95 insertions(+), 32 deletions(-)

diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index 552e15dce5..71834a9f04 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -606,9 +606,8 @@ pub async fn handle_flow_dependency_job(
         occupancy_metrics,
     )
     .await?;
-    let new_flow_value = sqlx::types::Json(
-        serde_json::value::to_raw_value(&flow).map_err(to_anyhow)?
-    );
+    let new_flow_value =
+        sqlx::types::Json(serde_json::value::to_raw_value(&flow).map_err(to_anyhow)?);
 
     // Re-check cancelation to ensure we don't accidentially override a flow.
     if sqlx::query_scalar!("SELECT canceled FROM queue WHERE id = $1", job.id)
@@ -648,11 +647,20 @@ pub async fn handle_flow_dependency_job(
 
         // Compute a lite version of the flow value (`RawScript` => `FlowScript`).
         let mut value_lite = flow.clone();
-        tx = reduce(tx, &mut value_lite.modules, &job_path, &job.workspace_id, flow.failure_module.as_ref(), flow.same_worker).await?;
+        tx = reduce(
+            tx,
+            &mut value_lite.modules,
+            &job_path,
+            &job.workspace_id,
+            flow.failure_module.as_ref(),
+            flow.same_worker,
+        )
+        .await?;
         sqlx::query!(
             "INSERT INTO flow_version_lite (id, value) VALUES ($1, $2)
              ON CONFLICT (id) DO UPDATE SET value = EXCLUDED.value",
-            version, sqlx::types::Json(to_raw_value(&value_lite)) as sqlx::types::Json<Box<RawValue>>,
+            version,
+            sqlx::types::Json(to_raw_value(&value_lite)) as sqlx::types::Json<Box<RawValue>>,
         )
         .execute(db)
         .await?;
@@ -829,8 +837,12 @@ async fn lock_modules<'c>(
                         occupancy_metrics,
                     ))
                     .await?;
-                    e.value =
-                        FlowModuleValue::WhileloopFlow { modules: nmodules, modules_node, skip_failures }.into()
+                    e.value = FlowModuleValue::WhileloopFlow {
+                        modules: nmodules,
+                        modules_node,
+                        skip_failures,
+                    }
+                    .into()
                 }
                 FlowModuleValue::BranchOne { branches, default, default_node } => {
                     let mut nbranches = vec![];
@@ -878,8 +890,12 @@ async fn lock_modules<'c>(
                         occupancy_metrics,
                     ))
                     .await?;
-                    e.value = FlowModuleValue::BranchOne { branches: nbranches, default: ndefault, default_node }
-                        .into();
+                    e.value = FlowModuleValue::BranchOne {
+                        branches: nbranches,
+                        default: ndefault,
+                        default_node,
+                    }
+                    .into();
                 }
                 _ => (),
             };
@@ -1009,8 +1025,8 @@ async fn insert_flow_node<'c>(
     flow: Option<&Json<Box<RawValue>>>,
 ) -> Result<(sqlx::Transaction<'c, sqlx::Postgres>, FlowNodeId)> {
     let hash = {
-        use std::hash::{DefaultHasher, Hasher, Hash};
-    
+        use std::hash::{DefaultHasher, Hash, Hasher};
+
         let mut hasher = DefaultHasher::new();
         code.hash(&mut hasher);
         lock.hash(&mut hasher);
@@ -1039,7 +1055,12 @@ async fn insert_flow_node<'c>(
         UNION ALL
         SELECT id FROM inserted
         "#,
-        hash, path, workspace_id, code, lock, flow as Option<&Json<Box<RawValue>>>
+        hash,
+        path,
+        workspace_id,
+        code,
+        lock,
+        flow as Option<&Json<Box<RawValue>>>
     )
     .fetch_one(&mut *tx)
     .await?
@@ -1056,7 +1077,15 @@ async fn insert_flow_modules<'c>(
     modules: &mut Vec<FlowModule>,
     modules_node: &mut Option<FlowNodeId>,
 ) -> Result<sqlx::Transaction<'c, sqlx::Postgres>> {
-    tx = Box::pin(reduce(tx, modules, path, workspace_id, failure_module, same_worker)).await?;
+    tx = Box::pin(reduce(
+        tx,
+        modules,
+        path,
+        workspace_id,
+        failure_module,
+        same_worker,
+    ))
+    .await?;
     add_virtual_items_if_necessary(modules);
     if modules.is_empty() || crate::worker_flow::is_simple_modules(modules, failure_module) {
         return Ok(tx);
@@ -1073,7 +1102,7 @@ async fn insert_flow_modules<'c>(
             failure_module: failure_module.cloned(),
             same_worker,
             ..Default::default()
-        })))
+        }))),
     )
     .await?;
     *modules_node = Some(id);
@@ -1090,8 +1119,13 @@ async fn reduce<'c>(
 ) -> Result<sqlx::Transaction<'c, sqlx::Postgres>> {
     use FlowModuleValue::*;
     for module in &mut *modules {
-        let mut val = serde_json::from_str::<FlowModuleValue>(module.value.get())
-            .map_err(|err| Error::InternalErr(format!("reduce: Failed to parse flow module value: {}", err)))?;
+        let mut val =
+            serde_json::from_str::<FlowModuleValue>(module.value.get()).map_err(|err| {
+                Error::InternalErr(format!(
+                    "reduce: Failed to parse flow module value: {}",
+                    err
+                ))
+            })?;
         match &mut val {
             RawScript { .. } => {
                 // In order to avoid an unnecessary `.clone()` of `val`, take ownership of it's content
@@ -1107,9 +1141,14 @@ async fn reduce<'c>(
                     concurrency_time_window_s,
                     is_trigger,
                     ..
-                } = std::mem::replace(&mut val, Identity) else { unreachable!() };
+                } = std::mem::replace(&mut val, Identity)
+                else {
+                    unreachable!()
+                };
                 let id;
-                (tx, id) = insert_flow_node(tx, path, workspace_id, Some(&content), lock.as_ref(), None).await?;
+                (tx, id) =
+                    insert_flow_node(tx, path, workspace_id, Some(&content), lock.as_ref(), None)
+                        .await?;
                 val = FlowScript {
                     input_transforms,
                     id,
@@ -1120,32 +1159,56 @@ async fn reduce<'c>(
                     concurrency_time_window_s,
                     is_trigger,
                 };
-            },
+            }
             ForloopFlow { modules, modules_node, .. }
-            | WhileloopFlow { modules, modules_node, .. }  => {
+            | WhileloopFlow { modules, modules_node, .. } => {
                 tx = insert_flow_modules(
-                    tx, path, workspace_id, failure_module, same_worker,
-                    modules, modules_node
-                ).await?;
+                    tx,
+                    path,
+                    workspace_id,
+                    failure_module,
+                    same_worker,
+                    modules,
+                    modules_node,
+                )
+                .await?;
             }
             BranchOne { branches, default, default_node, .. } => {
                 for branch in branches.iter_mut() {
                     tx = insert_flow_modules(
-                        tx, path, workspace_id, failure_module, same_worker,
-                        &mut branch.modules, &mut branch.modules_node
-                    ).await?;
+                        tx,
+                        path,
+                        workspace_id,
+                        failure_module,
+                        same_worker,
+                        &mut branch.modules,
+                        &mut branch.modules_node,
+                    )
+                    .await?;
                 }
                 tx = insert_flow_modules(
-                    tx, path, workspace_id, failure_module, same_worker, 
-                    default, default_node
-                ).await?;
+                    tx,
+                    path,
+                    workspace_id,
+                    failure_module,
+                    same_worker,
+                    default,
+                    default_node,
+                )
+                .await?;
             }
             BranchAll { branches, .. } => {
                 for branch in branches.iter_mut() {
                     tx = insert_flow_modules(
-                        tx, path, workspace_id, failure_module, same_worker,
-                        &mut branch.modules, &mut branch.modules_node
-                    ).await?;
+                        tx,
+                        path,
+                        workspace_id,
+                        failure_module,
+                        same_worker,
+                        &mut branch.modules,
+                        &mut branch.modules_node,
+                    )
+                    .await?;
                 }
             }
             _ => {}

From a99e63f5435725c42e38b46933ff3caa345002b5 Mon Sep 17 00:00:00 2001
From: wendrul <53628737+wendrul@users.noreply.github.com>
Date: Thu, 5 Dec 2024 16:10:59 +0100
Subject: [PATCH 24/34] fix: job search toast on error (#4851)

---
 frontend/src/lib/components/search/GlobalSearchModal.svelte | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/lib/components/search/GlobalSearchModal.svelte b/frontend/src/lib/components/search/GlobalSearchModal.svelte
index c443a55e8f..d76a25f96c 100644
--- a/frontend/src/lib/components/search/GlobalSearchModal.svelte
+++ b/frontend/src/lib/components/search/GlobalSearchModal.svelte
@@ -244,7 +244,7 @@
 					queryParseErrors = searchResults.query_parse_errors
 					indexMetadata = searchResults.index_metadata
 				} catch (e) {
-					sendUserToast(e, true)
+					sendUserToast(e.body, true)
 				}
 				loadingCompletedRuns = false
 				selectedItem = selectItem(0)

From c67fd8dbb904071e5bfe6483f51a49f48e7c7c02 Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Thu, 5 Dec 2024 10:19:59 -0500
Subject: [PATCH 25/34] removing unneccessary requests to backend (#4852)

---
 .../sidebar/CriticalAlertModalInner.svelte    | 19 +------------------
 1 file changed, 1 insertion(+), 18 deletions(-)

diff --git a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
index 365451a334..6127475cfd 100644
--- a/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
+++ b/frontend/src/lib/components/sidebar/CriticalAlertModalInner.svelte
@@ -2,7 +2,6 @@
 	import Toggle from '$lib/components/Toggle.svelte'
 	import { SettingService } from '$lib/gen'
 	import type { CriticalAlert } from '$lib/gen'
-	import { onMount } from 'svelte'
 	import { devopsRole, instanceSettingsSelectedTab, superadmin } from '$lib/stores'
 	import { goto } from '$app/navigation'
 	import List from '$lib/components/common/layout/List.svelte'
@@ -27,10 +26,6 @@
 		refreshAlerts()
 	}
 
-	onMount(() => {
-		refreshAlerts()
-	})
-
 	// Pagination
 	let page = 1
 	let pageSize = 10
@@ -54,6 +49,7 @@
 			})
 
 			hasMore = pageNumber < res.total_pages
+			totalNumberOfAlerts = res.total_rows
 			filteredAlerts = res.alerts
 			updateHasUnacknowledgedCriticalAlerts()
 		} finally {
@@ -67,8 +63,6 @@
 		if (reset) {
 			page = 1
 		}
-		updateHasUnacknowledgedCriticalAlerts()
-		await getTotalNumber()
 		await fetchAlerts(page)
 	}
 
@@ -108,23 +102,12 @@
 
 	function onFiltersChange() {
 		getAlerts(true)
-		getTotalNumber()
 	}
 
 	// Update filter change handlers
 	$: hideAcknowledged, workspaceContext, onFiltersChange()
 
 	let totalNumberOfAlerts = 0
-	async function getTotalNumber() {
-		loading = true
-		const res = await getCriticalAlerts({
-			page: 1,
-			pageSize: 1000,
-			acknowledged: hideAcknowledged ? false : undefined
-		})
-		totalNumberOfAlerts = res.total_rows
-		loading = false
-	}
 </script>
 
 <List gap="sm">

From 185848ceb184e86d307aaf6f78c0d72ae1e26644 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 5 Dec 2024 16:28:00 +0100
Subject: [PATCH 26/34] chore(main): release 1.435.2 (#4853)

* chore(main): release 1.435.2

* Apply automatic changes

* Update WindmillClient.psd1

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 +++
 backend/Cargo.lock                            | 48 +++++++++----------
 backend/Cargo.toml                            |  4 +-
 backend/windmill-api/openapi.yaml             |  2 +-
 benchmarks/lib.ts                             |  2 +-
 cli/main.ts                                   |  2 +-
 frontend/package-lock.json                    |  4 +-
 frontend/package.json                         |  2 +-
 lsp/Pipfile                                   |  4 +-
 openflow.openapi.yaml                         |  2 +-
 .../WindmillClient/WindmillClient.psd1        |  2 +-
 python-client/wmill/pyproject.toml            |  2 +-
 python-client/wmill_pg/pyproject.toml         |  2 +-
 typescript-client/jsr.json                    |  2 +-
 typescript-client/package.json                |  2 +-
 version.txt                                   |  2 +-
 16 files changed, 48 insertions(+), 41 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e305c73393..94c2ef5cf0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.435.2](https://github.com/windmill-labs/windmill/compare/v1.435.1...v1.435.2) (2024-12-05)
+
+
+### Bug Fixes
+
+* job search toast on error ([#4851](https://github.com/windmill-labs/windmill/issues/4851)) ([a99e63f](https://github.com/windmill-labs/windmill/commit/a99e63f5435725c42e38b46933ff3caa345002b5))
+
 ## [1.435.1](https://github.com/windmill-labs/windmill/compare/v1.435.0...v1.435.1) (2024-12-05)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 54758013bc..dac85d4f09 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10446,7 +10446,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "axum",
@@ -10487,7 +10487,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10573,7 +10573,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "base64 0.22.1",
  "chrono",
@@ -10591,7 +10591,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "chrono",
  "serde",
@@ -10604,7 +10604,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-autoscaling"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "serde",
@@ -10618,7 +10618,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10669,7 +10669,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "regex",
  "serde",
@@ -10683,7 +10683,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10706,7 +10706,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-macros"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "itertools 0.13.0",
  "lazy_static",
@@ -10718,7 +10718,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10727,7 +10727,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10739,7 +10739,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10751,7 +10751,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10763,7 +10763,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10774,7 +10774,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10785,7 +10785,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10803,7 +10803,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10820,7 +10820,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10832,7 +10832,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10850,7 +10850,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10871,7 +10871,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10881,7 +10881,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10915,7 +10915,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10925,7 +10925,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.435.1"
+version = "1.435.2"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 6fdf37998c..3f591dfd84 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.435.1"
+version = "1.435.2"
 authors.workspace = true
 edition.workspace = true
 
@@ -29,7 +29,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.435.1"
+version = "1.435.2"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 089f330cbb..95c06d5aae 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.435.1
+  version: 1.435.2
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index 86c2e9535f..2848c702dc 100644
--- a/benchmarks/lib.ts
+++ b/benchmarks/lib.ts
@@ -2,7 +2,7 @@ import { sleep } from "https://deno.land/x/sleep@v1.2.1/mod.ts";
 import * as windmill from "https://deno.land/x/windmill@v1.174.0/mod.ts";
 import * as api from "https://deno.land/x/windmill@v1.174.0/windmill-api/index.ts";
 
-export const VERSION = "v1.435.1";
+export const VERSION = "v1.435.2";
 
 export async function login(email: string, password: string): Promise<string> {
   return await windmill.UserService.login({
diff --git a/cli/main.ts b/cli/main.ts
index 632047531b..1bad532ef9 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.435.1";
+export const VERSION = "1.435.2";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 13b3a8612a..024b5e634c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.435.1",
+	"version": "1.435.2",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.435.1",
+			"version": "1.435.2",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@anthropic-ai/sdk": "^0.32.1",
diff --git a/frontend/package.json b/frontend/package.json
index 260d45e079..847f5b4ee7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.435.1",
+	"version": "1.435.2",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 40b1f136b3..45bf361b11 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.435.1"
-wmill_pg = ">=1.435.1"
+wmill = ">=1.435.2"
+wmill_pg = ">=1.435.2"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index 281b578ecc..058620949e 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.435.1
+  version: 1.435.2
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index f31c6ac7f2..89cf53b4af 100644
--- a/powershell-client/WindmillClient/WindmillClient.psd1
+++ b/powershell-client/WindmillClient/WindmillClient.psd1
@@ -12,7 +12,7 @@
     RootModule        = 'WindmillClient.psm1'
 
     # Version number of this module.
-    ModuleVersion     = '1.435.1'
+    ModuleVersion     = '1.435.2'
 
     # Supported PSEditions
     # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 434f94a351..14008078cc 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.435.1"
+version = "1.435.2"
 description = "A client library for accessing Windmill server wrapping the Windmill client API"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/python-client/wmill_pg/pyproject.toml b/python-client/wmill_pg/pyproject.toml
index ce73862ae4..9111d7cfb1 100644
--- a/python-client/wmill_pg/pyproject.toml
+++ b/python-client/wmill_pg/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill-pg"
-version = "1.435.1"
+version = "1.435.2"
 description = "An extension client for the wmill client library focused on pg"
 license = "Apache-2.0"
 homepage = "https://windmill.dev"
diff --git a/typescript-client/jsr.json b/typescript-client/jsr.json
index d90bf312b9..0dfcc51a4a 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.435.1",
+  "version": "1.435.2",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index acaf6a59dc..f351d3ae55 100644
--- a/typescript-client/package.json
+++ b/typescript-client/package.json
@@ -1,7 +1,7 @@
 {
   "name": "windmill-client",
   "description": "Windmill SDK client for browsers and Node.js",
-  "version": "1.435.1",
+  "version": "1.435.2",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 4e989d00fa..5b445a69a9 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.435.1
+1.435.2

From cf7278e2457c641ce96697f29ebfabefde9b20bf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 5 Dec 2024 16:40:35 +0100
Subject: [PATCH 27/34] chore(deps-dev): bump @sveltejs/kit from 2.5.0 to 2.9.0
 in /frontend (#4832)

Bumps [@sveltejs/kit](https://github.com/sveltejs/kit/tree/HEAD/packages/kit) from 2.5.0 to 2.9.0.
- [Release notes](https://github.com/sveltejs/kit/releases)
- [Changelog](https://github.com/sveltejs/kit/blob/main/packages/kit/CHANGELOG.md)
- [Commits](https://github.com/sveltejs/kit/commits/@sveltejs/kit@2.9.0/packages/kit)

---
updated-dependencies:
- dependency-name: "@sveltejs/kit"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 frontend/package-lock.json | 66 +++++++++++++++++++++-----------------
 frontend/package.json      |  2 +-
 2 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 024b5e634c..0e2fb04480 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -26,7 +26,7 @@
 				"@popperjs/core": "^2.11.6",
 				"@redocly/json-to-json-schema": "^0.0.1",
 				"@tanstack/svelte-table": "^8.9.9",
-				"@windmill-labs/svelte-dnd-action": "latest",
+				"@windmill-labs/svelte-dnd-action": "*",
 				"@xyflow/svelte": "^0.1.15",
 				"ag-charts-community": "^9.0.1",
 				"ag-charts-enterprise": "^9.0.1",
@@ -88,7 +88,7 @@
 				"@playwright/test": "^1.34.3",
 				"@rgossiaux/svelte-headlessui": "^2.0.0",
 				"@sveltejs/adapter-static": "^3.0.0",
-				"@sveltejs/kit": "^2.0.0",
+				"@sveltejs/kit": "^2.9.0",
 				"@sveltejs/package": "^2.2.2",
 				"@sveltejs/vite-plugin-svelte": "^3.0.0",
 				"@tailwindcss/forms": "^0.5.3",
@@ -3897,10 +3897,11 @@
 			}
 		},
 		"node_modules/@polka/url": {
-			"version": "1.0.0-next.24",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz",
-			"integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==",
-			"dev": true
+			"version": "1.0.0-next.28",
+			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
+			"integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@popperjs/core": {
 			"version": "2.11.8",
@@ -4223,23 +4224,24 @@
 			}
 		},
 		"node_modules/@sveltejs/kit": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.0.tgz",
-			"integrity": "sha512-1uyXvzC2Lu1FZa30T4y5jUAC21R309ZMRG0TPt+PPPbNUoDpy8zSmSNVWYaBWxYDqLGQ5oPNWvjvvF2IjJ1jmA==",
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.9.0.tgz",
+			"integrity": "sha512-W3E7ed3ChB6kPqRs2H7tcHp+Z7oiTFC6m+lLyAQQuyXeqw6LdNuuwEUla+5VM0OGgqQD+cYD6+7Xq80vVm17Vg==",
 			"dev": true,
 			"hasInstallScript": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/cookie": "^0.6.0",
 				"cookie": "^0.6.0",
-				"devalue": "^4.3.2",
-				"esm-env": "^1.0.0",
-				"import-meta-resolve": "^4.0.0",
+				"devalue": "^5.1.0",
+				"esm-env": "^1.2.1",
+				"import-meta-resolve": "^4.1.0",
 				"kleur": "^4.1.5",
 				"magic-string": "^0.30.5",
 				"mrmime": "^2.0.0",
 				"sade": "^1.8.1",
 				"set-cookie-parser": "^2.6.0",
-				"sirv": "^2.0.4",
+				"sirv": "^3.0.0",
 				"tiny-glob": "^0.2.9"
 			},
 			"bin": {
@@ -4249,9 +4251,9 @@
 				"node": ">=18.13"
 			},
 			"peerDependencies": {
-				"@sveltejs/vite-plugin-svelte": "^3.0.0",
+				"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0",
 				"svelte": "^4.0.0 || ^5.0.0-next.0",
-				"vite": "^5.0.3"
+				"vite": "^5.0.3 || ^6.0.0"
 			}
 		},
 		"node_modules/@sveltejs/package": {
@@ -6434,10 +6436,11 @@
 			}
 		},
 		"node_modules/devalue": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.2.tgz",
-			"integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==",
-			"dev": true
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.1.1.tgz",
+			"integrity": "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/devlop": {
 			"version": "1.1.0",
@@ -6990,9 +6993,10 @@
 			}
 		},
 		"node_modules/esm-env": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.0.0.tgz",
-			"integrity": "sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA=="
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.1.tgz",
+			"integrity": "sha512-U9JedYYjCnadUlXk7e1Kr+aENQhtUaoaV9+gZm1T8LC/YBAPJx3NSPIAurFOC0U5vrdSevnUJS2/wUVxGwPhng==",
+			"license": "MIT"
 		},
 		"node_modules/esm-env-robust": {
 			"version": "0.0.3",
@@ -7932,10 +7936,11 @@
 			}
 		},
 		"node_modules/import-meta-resolve": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz",
-			"integrity": "sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+			"integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
 			"dev": true,
+			"license": "MIT",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -9781,6 +9786,7 @@
 			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
 			"integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			}
@@ -11960,17 +11966,18 @@
 			"dev": true
 		},
 		"node_modules/sirv": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
-			"integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.0.tgz",
+			"integrity": "sha512-BPwJGUeDaDCHihkORDchNyyTvWFhcusy1XMmhEVTQTwGeybFbp8YEmB+njbPnth1FibULBSBVwCQni25XlCUDg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@polka/url": "^1.0.0-next.24",
 				"mrmime": "^2.0.0",
 				"totalist": "^3.0.0"
 			},
 			"engines": {
-				"node": ">= 10"
+				"node": ">=18"
 			}
 		},
 		"node_modules/slash": {
@@ -13064,6 +13071,7 @@
 			"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
 			"integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
diff --git a/frontend/package.json b/frontend/package.json
index 847f5b4ee7..15ccede702 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,7 @@
 		"@playwright/test": "^1.34.3",
 		"@rgossiaux/svelte-headlessui": "^2.0.0",
 		"@sveltejs/adapter-static": "^3.0.0",
-		"@sveltejs/kit": "^2.0.0",
+		"@sveltejs/kit": "^2.9.0",
 		"@sveltejs/package": "^2.2.2",
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"@tailwindcss/forms": "^0.5.3",

From 205c1a69f28d6a51a9575bfc258a801b3a895e5d Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Thu, 5 Dec 2024 16:42:04 +0100
Subject: [PATCH 28/34] =?UTF-8?q?Revert=20"chore(deps-dev):=20bump=20@svel?=
 =?UTF-8?q?tejs/kit=20from=202.5.0=20to=202.9.0=20in=20/frontend=20?=
 =?UTF-8?q?=E2=80=A6"=20(#4854)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cf7278e2457c641ce96697f29ebfabefde9b20bf.
---
 frontend/package-lock.json | 66 +++++++++++++++++---------------------
 frontend/package.json      |  2 +-
 2 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 0e2fb04480..024b5e634c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -26,7 +26,7 @@
 				"@popperjs/core": "^2.11.6",
 				"@redocly/json-to-json-schema": "^0.0.1",
 				"@tanstack/svelte-table": "^8.9.9",
-				"@windmill-labs/svelte-dnd-action": "*",
+				"@windmill-labs/svelte-dnd-action": "latest",
 				"@xyflow/svelte": "^0.1.15",
 				"ag-charts-community": "^9.0.1",
 				"ag-charts-enterprise": "^9.0.1",
@@ -88,7 +88,7 @@
 				"@playwright/test": "^1.34.3",
 				"@rgossiaux/svelte-headlessui": "^2.0.0",
 				"@sveltejs/adapter-static": "^3.0.0",
-				"@sveltejs/kit": "^2.9.0",
+				"@sveltejs/kit": "^2.0.0",
 				"@sveltejs/package": "^2.2.2",
 				"@sveltejs/vite-plugin-svelte": "^3.0.0",
 				"@tailwindcss/forms": "^0.5.3",
@@ -3897,11 +3897,10 @@
 			}
 		},
 		"node_modules/@polka/url": {
-			"version": "1.0.0-next.28",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
-			"integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
-			"dev": true,
-			"license": "MIT"
+			"version": "1.0.0-next.24",
+			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz",
+			"integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==",
+			"dev": true
 		},
 		"node_modules/@popperjs/core": {
 			"version": "2.11.8",
@@ -4224,24 +4223,23 @@
 			}
 		},
 		"node_modules/@sveltejs/kit": {
-			"version": "2.9.0",
-			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.9.0.tgz",
-			"integrity": "sha512-W3E7ed3ChB6kPqRs2H7tcHp+Z7oiTFC6m+lLyAQQuyXeqw6LdNuuwEUla+5VM0OGgqQD+cYD6+7Xq80vVm17Vg==",
+			"version": "2.5.0",
+			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.0.tgz",
+			"integrity": "sha512-1uyXvzC2Lu1FZa30T4y5jUAC21R309ZMRG0TPt+PPPbNUoDpy8zSmSNVWYaBWxYDqLGQ5oPNWvjvvF2IjJ1jmA==",
 			"dev": true,
 			"hasInstallScript": true,
-			"license": "MIT",
 			"dependencies": {
 				"@types/cookie": "^0.6.0",
 				"cookie": "^0.6.0",
-				"devalue": "^5.1.0",
-				"esm-env": "^1.2.1",
-				"import-meta-resolve": "^4.1.0",
+				"devalue": "^4.3.2",
+				"esm-env": "^1.0.0",
+				"import-meta-resolve": "^4.0.0",
 				"kleur": "^4.1.5",
 				"magic-string": "^0.30.5",
 				"mrmime": "^2.0.0",
 				"sade": "^1.8.1",
 				"set-cookie-parser": "^2.6.0",
-				"sirv": "^3.0.0",
+				"sirv": "^2.0.4",
 				"tiny-glob": "^0.2.9"
 			},
 			"bin": {
@@ -4251,9 +4249,9 @@
 				"node": ">=18.13"
 			},
 			"peerDependencies": {
-				"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0",
+				"@sveltejs/vite-plugin-svelte": "^3.0.0",
 				"svelte": "^4.0.0 || ^5.0.0-next.0",
-				"vite": "^5.0.3 || ^6.0.0"
+				"vite": "^5.0.3"
 			}
 		},
 		"node_modules/@sveltejs/package": {
@@ -6436,11 +6434,10 @@
 			}
 		},
 		"node_modules/devalue": {
-			"version": "5.1.1",
-			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.1.1.tgz",
-			"integrity": "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==",
-			"dev": true,
-			"license": "MIT"
+			"version": "4.3.2",
+			"resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.2.tgz",
+			"integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==",
+			"dev": true
 		},
 		"node_modules/devlop": {
 			"version": "1.1.0",
@@ -6993,10 +6990,9 @@
 			}
 		},
 		"node_modules/esm-env": {
-			"version": "1.2.1",
-			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.1.tgz",
-			"integrity": "sha512-U9JedYYjCnadUlXk7e1Kr+aENQhtUaoaV9+gZm1T8LC/YBAPJx3NSPIAurFOC0U5vrdSevnUJS2/wUVxGwPhng==",
-			"license": "MIT"
+			"version": "1.0.0",
+			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.0.0.tgz",
+			"integrity": "sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA=="
 		},
 		"node_modules/esm-env-robust": {
 			"version": "0.0.3",
@@ -7936,11 +7932,10 @@
 			}
 		},
 		"node_modules/import-meta-resolve": {
-			"version": "4.1.0",
-			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
-			"integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
+			"version": "4.0.0",
+			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz",
+			"integrity": "sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==",
 			"dev": true,
-			"license": "MIT",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -9786,7 +9781,6 @@
 			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
 			"integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			}
@@ -11966,18 +11960,17 @@
 			"dev": true
 		},
 		"node_modules/sirv": {
-			"version": "3.0.0",
-			"resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.0.tgz",
-			"integrity": "sha512-BPwJGUeDaDCHihkORDchNyyTvWFhcusy1XMmhEVTQTwGeybFbp8YEmB+njbPnth1FibULBSBVwCQni25XlCUDg==",
+			"version": "2.0.4",
+			"resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
+			"integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"@polka/url": "^1.0.0-next.24",
 				"mrmime": "^2.0.0",
 				"totalist": "^3.0.0"
 			},
 			"engines": {
-				"node": ">=18"
+				"node": ">= 10"
 			}
 		},
 		"node_modules/slash": {
@@ -13071,7 +13064,6 @@
 			"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
 			"integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
 			"dev": true,
-			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
diff --git a/frontend/package.json b/frontend/package.json
index 15ccede702..847f5b4ee7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,7 @@
 		"@playwright/test": "^1.34.3",
 		"@rgossiaux/svelte-headlessui": "^2.0.0",
 		"@sveltejs/adapter-static": "^3.0.0",
-		"@sveltejs/kit": "^2.9.0",
+		"@sveltejs/kit": "^2.0.0",
 		"@sveltejs/package": "^2.2.2",
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"@tailwindcss/forms": "^0.5.3",

From c4163aabcd384817b9d4ec1017c257f5da7fadf6 Mon Sep 17 00:00:00 2001
From: Alexander Petric <alpetric@users.noreply.github.com>
Date: Thu, 5 Dec 2024 11:00:20 -0500
Subject: [PATCH 29/34] update version update script to match new pwsh module
 formatting (#4855)

---
 .github/change-versions-mac.sh | 2 +-
 .github/change-versions.sh     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/change-versions-mac.sh b/.github/change-versions-mac.sh
index 2257d348ae..50ec3b17ed 100755
--- a/.github/change-versions-mac.sh
+++ b/.github/change-versions-mac.sh
@@ -16,7 +16,7 @@ sed -i '' -e "/\"version\": /s/: .*,/: \"$VERSION\",/" ${root_dirpath}/frontend/
 sed -i '' -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i '' -e "/^windmill-api =/s/= .*/= \"\\^$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i '' -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill_pg/pyproject.toml
-sed -i '' -e "/^ModuleVersion =/s/= .*/= '$VERSION'/" ${root_dirpath}/powershell-client/WindmillClient/WindmillClient.psd1
+sed -i '' -e "/^[[:space:]]*ModuleVersion[[:space:]]*=/s/= .*/= '$VERSION'/" ${root_dirpath}/powershell-client/WindmillClient/WindmillClient.psd1
 # sed -i '' -e "/^wmill =/s/= .*/= \"\\^$VERSION\"/" python-client/wmill_pg/pyproject.toml
 sed -i '' -e "/^wmill =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile
 sed -i '' -e "/^wmill_pg =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile
diff --git a/.github/change-versions.sh b/.github/change-versions.sh
index 77ecbc6985..699b87b0d7 100755
--- a/.github/change-versions.sh
+++ b/.github/change-versions.sh
@@ -17,7 +17,7 @@ sed -i -e "/\"version\": /s/: .*,/: \"$VERSION\",/" ${root_dirpath}/frontend/pac
 sed -i -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i -e "/^windmill-api =/s/= .*/= \"\\^$VERSION\"/" ${root_dirpath}/python-client/wmill/pyproject.toml
 sed -i -e "/^version =/s/= .*/= \"$VERSION\"/" ${root_dirpath}/python-client/wmill_pg/pyproject.toml
-sed -i -e "/^ModuleVersion =/s/= .*/= '$VERSION'/" ${root_dirpath}/powershell-client/WindmillClient/WindmillClient.psd1
+sed -i -e "/^[[:space:]]*ModuleVersion[[:space:]]*=/s/= .*/= '$VERSION'/" ${root_dirpath}/powershell-client/WindmillClient/WindmillClient.psd1
 # sed -i -e "/^wmill =/s/= .*/= \"\\^$VERSION\"/" ${root_dirpath}/python-client/wmill_pg/pyproject.toml
 sed -i -e "/^wmill =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile
 sed -i -e "/^wmill_pg =/s/= .*/= \">=$VERSION\"/" ${root_dirpath}/lsp/Pipfile

From efd9fbe1ca7b72de499fbc6405ec77f2ef8ff734 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 17:03:49 +0100
Subject: [PATCH 30/34] update svelte-kit to 2.9.0

---
 frontend/package-lock.json         |  64 +++++++++--------
 frontend/package.json              |   2 +-
 frontend/src/app.html              | 108 +++++++++++++++--------------
 frontend/src/routes/+layout.svelte |   2 +
 4 files changed, 94 insertions(+), 82 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index 024b5e634c..ba887fb722 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -88,7 +88,7 @@
 				"@playwright/test": "^1.34.3",
 				"@rgossiaux/svelte-headlessui": "^2.0.0",
 				"@sveltejs/adapter-static": "^3.0.0",
-				"@sveltejs/kit": "^2.0.0",
+				"@sveltejs/kit": "^2.9.0",
 				"@sveltejs/package": "^2.2.2",
 				"@sveltejs/vite-plugin-svelte": "^3.0.0",
 				"@tailwindcss/forms": "^0.5.3",
@@ -3897,10 +3897,11 @@
 			}
 		},
 		"node_modules/@polka/url": {
-			"version": "1.0.0-next.24",
-			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.24.tgz",
-			"integrity": "sha512-2LuNTFBIO0m7kKIQvvPHN6UE63VjpmL9rnEEaOOaiSPbZK+zUOYIzBAWcED+3XYzhYsd/0mD57VdxAEqqV52CQ==",
-			"dev": true
+			"version": "1.0.0-next.28",
+			"resolved": "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz",
+			"integrity": "sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/@popperjs/core": {
 			"version": "2.11.8",
@@ -4223,23 +4224,24 @@
 			}
 		},
 		"node_modules/@sveltejs/kit": {
-			"version": "2.5.0",
-			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.5.0.tgz",
-			"integrity": "sha512-1uyXvzC2Lu1FZa30T4y5jUAC21R309ZMRG0TPt+PPPbNUoDpy8zSmSNVWYaBWxYDqLGQ5oPNWvjvvF2IjJ1jmA==",
+			"version": "2.9.0",
+			"resolved": "https://registry.npmjs.org/@sveltejs/kit/-/kit-2.9.0.tgz",
+			"integrity": "sha512-W3E7ed3ChB6kPqRs2H7tcHp+Z7oiTFC6m+lLyAQQuyXeqw6LdNuuwEUla+5VM0OGgqQD+cYD6+7Xq80vVm17Vg==",
 			"dev": true,
 			"hasInstallScript": true,
+			"license": "MIT",
 			"dependencies": {
 				"@types/cookie": "^0.6.0",
 				"cookie": "^0.6.0",
-				"devalue": "^4.3.2",
-				"esm-env": "^1.0.0",
-				"import-meta-resolve": "^4.0.0",
+				"devalue": "^5.1.0",
+				"esm-env": "^1.2.1",
+				"import-meta-resolve": "^4.1.0",
 				"kleur": "^4.1.5",
 				"magic-string": "^0.30.5",
 				"mrmime": "^2.0.0",
 				"sade": "^1.8.1",
 				"set-cookie-parser": "^2.6.0",
-				"sirv": "^2.0.4",
+				"sirv": "^3.0.0",
 				"tiny-glob": "^0.2.9"
 			},
 			"bin": {
@@ -4249,9 +4251,9 @@
 				"node": ">=18.13"
 			},
 			"peerDependencies": {
-				"@sveltejs/vite-plugin-svelte": "^3.0.0",
+				"@sveltejs/vite-plugin-svelte": "^3.0.0 || ^4.0.0-next.1 || ^5.0.0",
 				"svelte": "^4.0.0 || ^5.0.0-next.0",
-				"vite": "^5.0.3"
+				"vite": "^5.0.3 || ^6.0.0"
 			}
 		},
 		"node_modules/@sveltejs/package": {
@@ -6434,10 +6436,11 @@
 			}
 		},
 		"node_modules/devalue": {
-			"version": "4.3.2",
-			"resolved": "https://registry.npmjs.org/devalue/-/devalue-4.3.2.tgz",
-			"integrity": "sha512-KqFl6pOgOW+Y6wJgu80rHpo2/3H07vr8ntR9rkkFIRETewbf5GaYYcakYfiKz89K+sLsuPkQIZaXDMjUObZwWg==",
-			"dev": true
+			"version": "5.1.1",
+			"resolved": "https://registry.npmjs.org/devalue/-/devalue-5.1.1.tgz",
+			"integrity": "sha512-maua5KUiapvEwiEAe+XnlZ3Rh0GD+qI1J/nb9vrJc3muPXvcF/8gXYTWF76+5DAqHyDUtOIImEuo0YKE9mshVw==",
+			"dev": true,
+			"license": "MIT"
 		},
 		"node_modules/devlop": {
 			"version": "1.1.0",
@@ -6990,9 +6993,10 @@
 			}
 		},
 		"node_modules/esm-env": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.0.0.tgz",
-			"integrity": "sha512-Cf6VksWPsTuW01vU9Mk/3vRue91Zevka5SjyNf3nEpokFRuqt/KjUQoGAwq9qMmhpLTHmXzSIrFRw8zxWzmFBA=="
+			"version": "1.2.1",
+			"resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.1.tgz",
+			"integrity": "sha512-U9JedYYjCnadUlXk7e1Kr+aENQhtUaoaV9+gZm1T8LC/YBAPJx3NSPIAurFOC0U5vrdSevnUJS2/wUVxGwPhng==",
+			"license": "MIT"
 		},
 		"node_modules/esm-env-robust": {
 			"version": "0.0.3",
@@ -7932,10 +7936,11 @@
 			}
 		},
 		"node_modules/import-meta-resolve": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.0.0.tgz",
-			"integrity": "sha512-okYUR7ZQPH+efeuMJGlq4f8ubUgO50kByRPyt/Cy1Io4PSRsPjxME+YlVaCOx+NIToW7hCsZNFJyTPFFKepRSA==",
+			"version": "4.1.0",
+			"resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.1.0.tgz",
+			"integrity": "sha512-I6fiaX09Xivtk+THaMfAwnA3MVA5Big1WHF1Dfx9hFuvNIWpXnorlkzhcQf6ehrqQiiZECRt1poOAkPmer3ruw==",
 			"dev": true,
+			"license": "MIT",
 			"funding": {
 				"type": "github",
 				"url": "https://github.com/sponsors/wooorm"
@@ -9781,6 +9786,7 @@
 			"resolved": "https://registry.npmjs.org/mrmime/-/mrmime-2.0.0.tgz",
 			"integrity": "sha512-eu38+hdgojoyq63s+yTpN4XMBdt5l8HhMhc4VKLO9KM5caLIBvUm4thi7fFaxyTmCKeNnXZ5pAlBwCUnhA09uw==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=10"
 			}
@@ -11960,17 +11966,18 @@
 			"dev": true
 		},
 		"node_modules/sirv": {
-			"version": "2.0.4",
-			"resolved": "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz",
-			"integrity": "sha512-94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==",
+			"version": "3.0.0",
+			"resolved": "https://registry.npmjs.org/sirv/-/sirv-3.0.0.tgz",
+			"integrity": "sha512-BPwJGUeDaDCHihkORDchNyyTvWFhcusy1XMmhEVTQTwGeybFbp8YEmB+njbPnth1FibULBSBVwCQni25XlCUDg==",
 			"dev": true,
+			"license": "MIT",
 			"dependencies": {
 				"@polka/url": "^1.0.0-next.24",
 				"mrmime": "^2.0.0",
 				"totalist": "^3.0.0"
 			},
 			"engines": {
-				"node": ">= 10"
+				"node": ">=18"
 			}
 		},
 		"node_modules/slash": {
@@ -13064,6 +13071,7 @@
 			"resolved": "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz",
 			"integrity": "sha512-sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==",
 			"dev": true,
+			"license": "MIT",
 			"engines": {
 				"node": ">=6"
 			}
diff --git a/frontend/package.json b/frontend/package.json
index 847f5b4ee7..15ccede702 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -22,7 +22,7 @@
 		"@playwright/test": "^1.34.3",
 		"@rgossiaux/svelte-headlessui": "^2.0.0",
 		"@sveltejs/adapter-static": "^3.0.0",
-		"@sveltejs/kit": "^2.0.0",
+		"@sveltejs/kit": "^2.9.0",
 		"@sveltejs/package": "^2.2.2",
 		"@sveltejs/vite-plugin-svelte": "^3.0.0",
 		"@tailwindcss/forms": "^0.5.3",
diff --git a/frontend/src/app.html b/frontend/src/app.html
index 7f93534ddb..718800105a 100644
--- a/frontend/src/app.html
+++ b/frontend/src/app.html
@@ -27,61 +27,63 @@
 	</head>
 	<body data-sveltekit-preload-code="viewport" class="outline-none focus:outline-none">
 		<div style="display: contents">
-			<div id="mainbg" style="position: absolute; bottom: 0; left: 0; width: 100%; height: 100vh">
-			</div>
+			<div id="svelte-global-loader">
+				<div id="mainbg" style="position: absolute; bottom: 0; left: 0; width: 100%; height: 100vh">
+				</div>
 
-			<div style="position: fixed; left: 50%; top: 40%; transform: translate(-50%, -50%)">
-				<svg
-					version="1.1"
-					id="Windmill"
-					xmlns="http://www.w3.org/2000/svg"
-					xmlns:xlink="http://www.w3.org/1999/xlink"
-					x="0px"
-					y="0px"
-					width="128px"
-					height="128px"
-					viewBox="0 0 256 256"
-					style="enable-background: new 0 0 256 256"
-					xml:space="preserve"
-				>
-					<g>
-						<polygon
-							class="st2"
-							points="134.78,14.22 114.31,48.21 101.33,69.75 158.22,69.75 177.97,36.95 191.67,14.22 	"
-						/>
-						<polygon
-							class="st3"
-							points="227.55,69.75 186.61,69.75 101.33,69.75 129.78,119.02 158.16,119.02 228.61,119.02 256,119.02 	"
-						/>
-						<polygon
-							class="st3"
-							points="136.93,132.47 116.46,167.93 73.82,241.78 130.71,241.78 144.9,217.2 180.13,156.18 193.82,132.46 	
+				<div style="position: fixed; left: 50%; top: 40%; transform: translate(-50%, -50%)">
+					<svg
+						version="1.1"
+						id="Windmill"
+						xmlns="http://www.w3.org/2000/svg"
+						xmlns:xlink="http://www.w3.org/1999/xlink"
+						x="0px"
+						y="0px"
+						width="128px"
+						height="128px"
+						viewBox="0 0 256 256"
+						style="enable-background: new 0 0 256 256"
+						xml:space="preserve"
+					>
+						<g>
+							<polygon
+								class="st2"
+								points="134.78,14.22 114.31,48.21 101.33,69.75 158.22,69.75 177.97,36.95 191.67,14.22 	"
+							/>
+							<polygon
+								class="st3"
+								points="227.55,69.75 186.61,69.75 101.33,69.75 129.78,119.02 158.16,119.02 228.61,119.02 256,119.02 	"
+							/>
+							<polygon
+								class="st3"
+								points="136.93,132.47 116.46,167.93 73.82,241.78 130.71,241.78 144.9,217.2 180.13,156.18 193.82,132.46 	
 		"
-						/>
-						<polygon
-							class="st3"
-							points="121.7,131.95 101.23,96.49 58.59,22.63 30.15,71.91 44.34,96.49 79.57,157.5 93.26,181.22 	"
-						/>
-						<polygon
-							class="st2"
-							points="64.81,131.95 25.15,131.21 0,130.74 28.44,180.01 66.73,180.72 93.26,181.21 	"
-						/>
-						<polygon
-							class="st2"
-							points="165.38,181.74 184.58,216.46 196.75,238.47 225.19,189.2 206.66,155.69 193.83,132.46 	"
-						/>
-					</g>
-				</svg>
-				<div
-					id="loading-text"
-					style="
-						text-align: center;
-						margin-top: 30px;
-						color: gray;
-						font-family: Arial, Helvetica, sans-serif;
-					"
-				>
-					Loading...
+							/>
+							<polygon
+								class="st3"
+								points="121.7,131.95 101.23,96.49 58.59,22.63 30.15,71.91 44.34,96.49 79.57,157.5 93.26,181.22 	"
+							/>
+							<polygon
+								class="st2"
+								points="64.81,131.95 25.15,131.21 0,130.74 28.44,180.01 66.73,180.72 93.26,181.21 	"
+							/>
+							<polygon
+								class="st2"
+								points="165.38,181.74 184.58,216.46 196.75,238.47 225.19,189.2 206.66,155.69 193.83,132.46 	"
+							/>
+						</g>
+					</svg>
+					<div
+						id="loading-text"
+						style="
+							text-align: center;
+							margin-top: 30px;
+							color: gray;
+							font-family: Arial, Helvetica, sans-serif;
+						"
+					>
+						Loading...
+					</div>
 				</div>
 			</div>
 			%sveltekit.body%
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 63269d9375..dc715ebca9 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -15,6 +15,8 @@
 		intro: { x: 256 }, // toast intro fly animation settings
 		theme: {} // css var overrides
 	}
+
+	document.getElementById('svelte-global-loader')?.remove()
 </script>
 
 <svelte:head>

From 555851706a2d9834c9da6aa9a49905beec87732e Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 17:17:11 +0100
Subject: [PATCH 31/34] chore update vite to 5.4.11 + adapters

---
 frontend/package-lock.json | 64 ++++++++++++++++++--------------------
 frontend/package.json      |  6 ++--
 2 files changed, 33 insertions(+), 37 deletions(-)

diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index ba887fb722..300cb2649c 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -87,10 +87,10 @@
 				"@hey-api/openapi-ts": "^0.43.0",
 				"@playwright/test": "^1.34.3",
 				"@rgossiaux/svelte-headlessui": "^2.0.0",
-				"@sveltejs/adapter-static": "^3.0.0",
+				"@sveltejs/adapter-static": "^3.0.6",
 				"@sveltejs/kit": "^2.9.0",
 				"@sveltejs/package": "^2.2.2",
-				"@sveltejs/vite-plugin-svelte": "^3.0.0",
+				"@sveltejs/vite-plugin-svelte": "^3.1.2",
 				"@tailwindcss/forms": "^0.5.3",
 				"@tailwindcss/typography": "^0.5.8",
 				"@types/d3": "^7.4.0",
@@ -130,7 +130,7 @@
 				"tailwindcss": "^3.4.1",
 				"tslib": "^2.6.1",
 				"typescript": "^5.1.3",
-				"vite": "^5",
+				"vite": "^5.4.11",
 				"vite-plugin-circular-dependency": "^0.2.1",
 				"vite-plugin-mkcert": "^1.17.5",
 				"yootils": "^0.3.1"
@@ -3584,9 +3584,9 @@
 			}
 		},
 		"node_modules/@jridgewell/sourcemap-codec": {
-			"version": "1.4.15",
-			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.15.tgz",
-			"integrity": "sha512-eF2rxCRulEKXHTRiDrDy6erMYWqNw4LPdQ8UQA4huuxaQsVeRPFl2oM8oDGxMFhJUWZf9McpLtJasDDZb/Bpeg=="
+			"version": "1.5.0",
+			"resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
+			"integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
 		},
 		"node_modules/@jridgewell/trace-mapping": {
 			"version": "0.3.20",
@@ -4215,9 +4215,9 @@
 			}
 		},
 		"node_modules/@sveltejs/adapter-static": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.1.tgz",
-			"integrity": "sha512-6lMvf7xYEJ+oGeR5L8DFJJrowkefTK6ZgA4JiMqoClMkKq0s6yvsd3FZfCFvX1fQ0tpCD7fkuRVHsnUVgsHyNg==",
+			"version": "3.0.6",
+			"resolved": "https://registry.npmjs.org/@sveltejs/adapter-static/-/adapter-static-3.0.6.tgz",
+			"integrity": "sha512-MGJcesnJWj7FxDcB/GbrdYD3q24Uk0PIL4QIX149ku+hlJuj//nxUbb0HxUTpjkecWfHjVveSUnUaQWnPRXlpg==",
 			"dev": true,
 			"peerDependencies": {
 				"@sveltejs/kit": "^2.0.0"
@@ -4279,17 +4279,17 @@
 			}
 		},
 		"node_modules/@sveltejs/vite-plugin-svelte": {
-			"version": "3.0.2",
-			"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-3.0.2.tgz",
-			"integrity": "sha512-MpmF/cju2HqUls50WyTHQBZUV3ovV/Uk8k66AN2gwHogNAG8wnW8xtZDhzNBsFJJuvmq1qnzA5kE7YfMJNFv2Q==",
+			"version": "3.1.2",
+			"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte/-/vite-plugin-svelte-3.1.2.tgz",
+			"integrity": "sha512-Txsm1tJvtiYeLUVRNqxZGKR/mI+CzuIQuc2gn+YCs9rMTowpNZ2Nqt53JdL8KF9bLhAf2ruR/dr9eZCwdTriRA==",
 			"dev": true,
 			"dependencies": {
-				"@sveltejs/vite-plugin-svelte-inspector": "^2.0.0",
+				"@sveltejs/vite-plugin-svelte-inspector": "^2.1.0",
 				"debug": "^4.3.4",
 				"deepmerge": "^4.3.1",
 				"kleur": "^4.1.5",
-				"magic-string": "^0.30.5",
-				"svelte-hmr": "^0.15.3",
+				"magic-string": "^0.30.10",
+				"svelte-hmr": "^0.16.0",
 				"vitefu": "^0.2.5"
 			},
 			"engines": {
@@ -4301,9 +4301,9 @@
 			}
 		},
 		"node_modules/@sveltejs/vite-plugin-svelte-inspector": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-2.0.0.tgz",
-			"integrity": "sha512-gjr9ZFg1BSlIpfZ4PRewigrvYmHWbDrq2uvvPB1AmTWKuM+dI1JXQSUu2pIrYLb/QncyiIGkFDFKTwJ0XqQZZg==",
+			"version": "2.1.0",
+			"resolved": "https://registry.npmjs.org/@sveltejs/vite-plugin-svelte-inspector/-/vite-plugin-svelte-inspector-2.1.0.tgz",
+			"integrity": "sha512-9QX28IymvBlSCqsCll5t0kQVxipsfhFFL+L2t3nTWfXnddYwxBuAEtTtlaVQpRz9c37BhJjltSeY4AJSC03SSg==",
 			"dev": true,
 			"dependencies": {
 				"debug": "^4.3.4"
@@ -8613,14 +8613,11 @@
 			}
 		},
 		"node_modules/magic-string": {
-			"version": "0.30.5",
-			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.5.tgz",
-			"integrity": "sha512-7xlpfBaQaP/T6Vh8MO/EqXSW5En6INHEvEXQiuff7Gku0PWjU3uf6w/j9o7O+SpB5fOAkrI5HeoNgwjEO0pFsA==",
+			"version": "0.30.14",
+			"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.14.tgz",
+			"integrity": "sha512-5c99P1WKTed11ZC0HMJOj6CDIue6F8ySu+bJL+85q1zBEIY8IklrJ1eiKC2NDRh3Ct3FcvmJPyQHb9erXMTJNw==",
 			"dependencies": {
-				"@jridgewell/sourcemap-codec": "^1.4.15"
-			},
-			"engines": {
-				"node": ">=12"
+				"@jridgewell/sourcemap-codec": "^1.5.0"
 			}
 		},
 		"node_modules/map-obj": {
@@ -12649,9 +12646,9 @@
 			}
 		},
 		"node_modules/svelte-hmr": {
-			"version": "0.15.3",
-			"resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.15.3.tgz",
-			"integrity": "sha512-41snaPswvSf8TJUhlkoJBekRrABDXDMdpNpT2tfHIv4JuhgvHqLMhEPGtaQn0BmbNSTkuz2Ed20DF2eHw0SmBQ==",
+			"version": "0.16.0",
+			"resolved": "https://registry.npmjs.org/svelte-hmr/-/svelte-hmr-0.16.0.tgz",
+			"integrity": "sha512-Gyc7cOS3VJzLlfj7wKS0ZnzDVdv3Pn2IuVeJPk9m2skfhcu5bq3wtIZyQGggr7/Iim5rH5cncyQft/kRLupcnA==",
 			"dev": true,
 			"engines": {
 				"node": "^12.20 || ^14.13.1 || >= 16"
@@ -13403,15 +13400,14 @@
 			}
 		},
 		"node_modules/vite": {
-			"version": "5.4.0",
-			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.0.tgz",
-			"integrity": "sha512-5xokfMX0PIiwCMCMb9ZJcMyh5wbBun0zUzKib+L65vAZ8GY9ePZMXxFrHbr/Kyll2+LSCY7xtERPpxkBDKngwg==",
+			"version": "5.4.11",
+			"resolved": "https://registry.npmjs.org/vite/-/vite-5.4.11.tgz",
+			"integrity": "sha512-c7jFQRklXua0mTzneGW9QVyxFjUgwcihC4bXEtujIo2ouWCe1Ajt/amn2PCxYnhYfd5k09JX3SB7OYWFKYqj8Q==",
 			"dev": true,
-			"license": "MIT",
 			"dependencies": {
 				"esbuild": "^0.21.3",
-				"postcss": "^8.4.40",
-				"rollup": "^4.13.0"
+				"postcss": "^8.4.43",
+				"rollup": "^4.20.0"
 			},
 			"bin": {
 				"vite": "bin/vite.js"
diff --git a/frontend/package.json b/frontend/package.json
index 15ccede702..3c4aa926ff 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -21,10 +21,10 @@
 		"@hey-api/openapi-ts": "^0.43.0",
 		"@playwright/test": "^1.34.3",
 		"@rgossiaux/svelte-headlessui": "^2.0.0",
-		"@sveltejs/adapter-static": "^3.0.0",
+		"@sveltejs/adapter-static": "^3.0.6",
 		"@sveltejs/kit": "^2.9.0",
 		"@sveltejs/package": "^2.2.2",
-		"@sveltejs/vite-plugin-svelte": "^3.0.0",
+		"@sveltejs/vite-plugin-svelte": "^3.1.2",
 		"@tailwindcss/forms": "^0.5.3",
 		"@tailwindcss/typography": "^0.5.8",
 		"@types/d3": "^7.4.0",
@@ -64,7 +64,7 @@
 		"tailwindcss": "^3.4.1",
 		"tslib": "^2.6.1",
 		"typescript": "^5.1.3",
-		"vite": "^5",
+		"vite": "^5.4.11",
 		"vite-plugin-circular-dependency": "^0.2.1",
 		"vite-plugin-mkcert": "^1.17.5",
 		"yootils": "^0.3.1"

From 667167a022ed31cb67a6c189cc5bd54b09473f4f Mon Sep 17 00:00:00 2001
From: Lucas Abel <22837557+uael@users.noreply.github.com>
Date: Thu, 5 Dec 2024 17:42:33 +0100
Subject: [PATCH 32/34] fix: fix `flow_node` uniqueness (#4850)

`jsonb` comparison wasn't working as expected, and duplicated entries
were inserted within `flow_node`. To resolve this add a second hash
column, `hash_v2` with a unique default for uniqueness, and use this new
column to ensure unique entries. The previous hash column is left for
backward compatibility. Duplicated entries already insterted will remain
as is without breaking, and only new ones will preserve uniqueness.
---
 ...ca0e75f30faa8c39ad4754bd568ae6f210806.json | 27 ++++++++++++
 ...05135747_fix_flow_node_uniqueness.down.sql |  2 +
 ...1205135747_fix_flow_node_uniqueness.up.sql |  4 ++
 .../windmill-worker/src/worker_lockfiles.rs   | 43 +++++++------------
 4 files changed, 48 insertions(+), 28 deletions(-)
 create mode 100644 backend/.sqlx/query-83cc9e432aea1450f79e9fce04eca0e75f30faa8c39ad4754bd568ae6f210806.json
 create mode 100644 backend/migrations/20241205135747_fix_flow_node_uniqueness.down.sql
 create mode 100644 backend/migrations/20241205135747_fix_flow_node_uniqueness.up.sql

diff --git a/backend/.sqlx/query-83cc9e432aea1450f79e9fce04eca0e75f30faa8c39ad4754bd568ae6f210806.json b/backend/.sqlx/query-83cc9e432aea1450f79e9fce04eca0e75f30faa8c39ad4754bd568ae6f210806.json
new file mode 100644
index 0000000000..4e1242428a
--- /dev/null
+++ b/backend/.sqlx/query-83cc9e432aea1450f79e9fce04eca0e75f30faa8c39ad4754bd568ae6f210806.json
@@ -0,0 +1,27 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "\n        INSERT INTO flow_node (path, workspace_id, hash_v2, lock, code, flow)\n        VALUES ($1, $2, $3, $4, $5, $6)\n        ON CONFLICT (hash_v2) DO UPDATE SET path = EXCLUDED.path -- trivial update to return the id\n        RETURNING id\n        ",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "id",
+        "type_info": "Int8"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Varchar",
+        "Varchar",
+        "Bpchar",
+        "Text",
+        "Text",
+        "Jsonb"
+      ]
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "83cc9e432aea1450f79e9fce04eca0e75f30faa8c39ad4754bd568ae6f210806"
+}
diff --git a/backend/migrations/20241205135747_fix_flow_node_uniqueness.down.sql b/backend/migrations/20241205135747_fix_flow_node_uniqueness.down.sql
new file mode 100644
index 0000000000..7a5d08f3f8
--- /dev/null
+++ b/backend/migrations/20241205135747_fix_flow_node_uniqueness.down.sql
@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE flow_node DROP COLUMN hash_v2;
diff --git a/backend/migrations/20241205135747_fix_flow_node_uniqueness.up.sql b/backend/migrations/20241205135747_fix_flow_node_uniqueness.up.sql
new file mode 100644
index 0000000000..799f33d341
--- /dev/null
+++ b/backend/migrations/20241205135747_fix_flow_node_uniqueness.up.sql
@@ -0,0 +1,4 @@
+-- Add up migration script here
+CREATE SEQUENCE IF NOT EXISTS flow_node_hash_seq;
+ALTER TABLE flow_node ALTER COLUMN hash DROP NOT NULL;
+ALTER TABLE flow_node ADD COLUMN hash_v2 CHAR(64) NOT NULL UNIQUE DEFAULT to_hex(nextval('flow_node_hash_seq'));
diff --git a/backend/windmill-worker/src/worker_lockfiles.rs b/backend/windmill-worker/src/worker_lockfiles.rs
index 71834a9f04..0ea7456ec3 100644
--- a/backend/windmill-worker/src/worker_lockfiles.rs
+++ b/backend/windmill-worker/src/worker_lockfiles.rs
@@ -4,6 +4,7 @@ use std::path::{Component, Path, PathBuf};
 use async_recursion::async_recursion;
 use serde_json::value::RawValue;
 use serde_json::{json, Value};
+use sha2::Digest;
 use sqlx::types::Json;
 use uuid::Uuid;
 use windmill_common::error::Error;
@@ -1025,46 +1026,32 @@ async fn insert_flow_node<'c>(
     flow: Option<&Json<Box<RawValue>>>,
 ) -> Result<(sqlx::Transaction<'c, sqlx::Postgres>, FlowNodeId)> {
     let hash = {
-        use std::hash::{DefaultHasher, Hash, Hasher};
-
-        let mut hasher = DefaultHasher::new();
-        code.hash(&mut hasher);
-        lock.hash(&mut hasher);
-        flow.inspect(|flow| flow.get().hash(&mut hasher));
-        hasher.finish() as i64
+        let mut hasher = sha2::Sha256::new();
+        hasher.update(path);
+        hasher.update(workspace_id);
+        hasher.update(code.unwrap_or(&Default::default()));
+        hasher.update(lock.unwrap_or(&Default::default()));
+        hasher.update(flow.unwrap_or(&Default::default()).get());
+        format!("{:x}", hasher.finalize())
     };
 
     // Insert the flow node if it doesn't exist.
     let id = sqlx::query_scalar!(
         r#"
-        WITH existing AS (
-            SELECT id FROM flow_node
-            WHERE hash = $1 AND path = $2 AND workspace_id = $3
-                AND (code IS NOT DISTINCT FROM $4)
-                AND (lock IS NOT DISTINCT FROM $5)
-                AND (flow IS NOT DISTINCT FROM $6)
-            LIMIT 1
-        ),
-        inserted AS (
-            INSERT INTO flow_node (hash, path, workspace_id, code, lock, flow)
-            VALUES ($1, $2, $3, $4, $5, $6)
-            ON CONFLICT DO NOTHING
-            RETURNING id
-        )
-        SELECT id FROM existing
-        UNION ALL
-        SELECT id FROM inserted
+        INSERT INTO flow_node (path, workspace_id, hash_v2, lock, code, flow)
+        VALUES ($1, $2, $3, $4, $5, $6)
+        ON CONFLICT (hash_v2) DO UPDATE SET path = EXCLUDED.path -- trivial update to return the id
+        RETURNING id
         "#,
-        hash,
         path,
         workspace_id,
-        code,
+        hash,
         lock,
+        code,
         flow as Option<&Json<Box<RawValue>>>
     )
     .fetch_one(&mut *tx)
-    .await?
-    .ok_or(error::Error::InternalErr("Failed to cache".to_string()))?;
+    .await?;
     Ok((tx, FlowNodeId(id)))
 }
 

From 97901182b6755e6b1f4bbbb7ee7f62b334cc7110 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Thu, 5 Dec 2024 17:54:39 +0100
Subject: [PATCH 33/34] nit cache and skip on input node

---
 .../src/lib/components/FlowGraphViewer.svelte |   2 +
 .../components/FlowStatusViewerInner.svelte   |   2 +
 frontend/src/lib/components/Section.svelte    |   4 +-
 frontend/src/lib/components/Toggle.svelte     |   4 +-
 .../flows/content/FlowSettings.svelte         | 104 ++++++++++--------
 .../flows/map/FlowModuleSchemaMap.svelte      |   2 +
 .../components/flows/map/VirtualItem.svelte   |  30 ++++-
 .../lib/components/graph/FlowGraphV2.svelte   |   6 +-
 .../graph/renderers/nodes/InputNode.svelte    |   4 +
 .../[job]/[resume]/[hmac]/+page.svelte        |   2 +
 10 files changed, 104 insertions(+), 56 deletions(-)

diff --git a/frontend/src/lib/components/FlowGraphViewer.svelte b/frontend/src/lib/components/FlowGraphViewer.svelte
index 326e1275b6..f69c1c9450 100644
--- a/frontend/src/lib/components/FlowGraphViewer.svelte
+++ b/frontend/src/lib/components/FlowGraphViewer.svelte
@@ -36,6 +36,8 @@
 		>
 			<FlowGraphV2
 				{triggerNode}
+				earlyStop={flow.value.skip_expr !== undefined}
+				cache={flow.value.cache_ttl !== undefined}
 				path={flow?.path}
 				{download}
 				minHeight={400}
diff --git a/frontend/src/lib/components/FlowStatusViewerInner.svelte b/frontend/src/lib/components/FlowStatusViewerInner.svelte
index 98c6e223eb..53fa3b0af6 100644
--- a/frontend/src/lib/components/FlowStatusViewerInner.svelte
+++ b/frontend/src/lib/components/FlowStatusViewerInner.svelte
@@ -1244,6 +1244,8 @@
 									}
 								}
 							}}
+							earlyStop={job.raw_flow?.skip_expr !== undefined}
+							cache={job.raw_flow?.cache_ttl !== undefined}
 							modules={job.raw_flow?.modules ?? []}
 							failureModule={job.raw_flow?.failure_module}
 							preprocessorModule={job.raw_flow?.preprocessor_module}
diff --git a/frontend/src/lib/components/Section.svelte b/frontend/src/lib/components/Section.svelte
index 43868d170e..cea644eb48 100644
--- a/frontend/src/lib/components/Section.svelte
+++ b/frontend/src/lib/components/Section.svelte
@@ -48,9 +48,7 @@
 			{/if}
 		</h2>
 		<slot name="action" />
-		{#if collapsable && collapsed}
-			<slot name="badge" />
-		{/if}
+		<slot name="badge" />
 	</div>
 	<div class={collapsable && collapsed ? `hidden ${$$props.class}` : `${$$props.class}`}>
 		<slot />
diff --git a/frontend/src/lib/components/Toggle.svelte b/frontend/src/lib/components/Toggle.svelte
index 73638bce9c..068082d2f7 100644
--- a/frontend/src/lib/components/Toggle.svelte
+++ b/frontend/src/lib/components/Toggle.svelte
@@ -104,9 +104,7 @@
 	<slot name="right" />
 </label>
 {#if eeOnly && disabled}
-	<span
-		class="inline-flex text-xs text-primary items-center gap-1 !text-yellow-500 whitespace-nowrap ml-8"
-	>
+	<span class="inline-flex text-xs items-center gap-1 !text-yellow-500 whitespace-nowrap ml-8">
 		<AlertTriangle size={16} />
 		EE only <Tooltip>Enterprise Edition only feature</Tooltip>
 	</span>
diff --git a/frontend/src/lib/components/flows/content/FlowSettings.svelte b/frontend/src/lib/components/flows/content/FlowSettings.svelte
index 51a2410b31..403ac55f1b 100644
--- a/frontend/src/lib/components/flows/content/FlowSettings.svelte
+++ b/frontend/src/lib/components/flows/content/FlowSettings.svelte
@@ -138,7 +138,7 @@
 								right: 'Worker group tag (queue)',
 								rightTooltip:
 									"When a worker group tag is defined at the flow level, any steps inside the flow will run on any worker group that listen to that tag, regardless of the steps tag. If no worker group tags is defined, the flow controls will be executed with the default tag 'flow' and the steps will be executed with their respective tag",
-							rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/worker_groups'
+								rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/worker_groups'
 							}}
 							class="py-1"
 						/>
@@ -185,7 +185,8 @@
 							}}
 							options={{
 								right: 'Cache the results for each possible inputs',
-								rightTooltip: 'When enabled, the flow will cache the results of the flow for each possible set of inputs.',
+								rightTooltip:
+									'When enabled, the flow will cache the results of the flow for each possible set of inputs.',
 								rightDocumentationLink: 'https://www.windmill.dev/docs/flows/cache#cache-flows'
 							}}
 							class="py-1"
@@ -226,7 +227,8 @@
 								rightTooltip:
 									'If the inputs meet the predefined condition, the flow will not run.' +
 									'to decide if the flow should stop early.',
-								rightDocumentationLink: 'https://www.windmill.dev/docs/flows/early_stop#early-stop-for-flow'
+								rightDocumentationLink:
+									'https://www.windmill.dev/docs/flows/early_stop#early-stop-for-flow'
 							}}
 							class="py-1"
 						/>
@@ -316,7 +318,8 @@
 								'Steps will share a folder at `./shared` in which they can store heavier data and ' +
 								'pass them to the next step. Beware that the `./shared` folder is not ' +
 								'preserved across suspends and sleeps.',
-							rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/persistent_storage/within_windmill#shared-directory'
+							rightDocumentationLink:
+								'https://www.windmill.dev/docs/core_concepts/persistent_storage/within_windmill#shared-directory'
 						}}
 						class="py-1"
 					/>
@@ -339,7 +342,8 @@
 						right: 'Make runs invisible to others',
 						rightTooltip:
 							'When this option is enabled, manual executions of this script are invisible to users other than the user running it, including the owner(s). This setting can be overridden when this script is run manually from the advanced menu.',
-						rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/monitor_past_and_future_runs#invisible-runs'
+						rightDocumentationLink:
+							'https://www.windmill.dev/docs/core_concepts/monitor_past_and_future_runs#invisible-runs'
 					}}
 					class="py-1"
 				/>
@@ -365,27 +369,29 @@
 				<!-- Concurrency Section -->
 				{#if customUi?.settingsTabs?.concurrency != false}
 					<div>
-						<Toggle
-							textClass="font-normal text-sm"
-							color="nord"
-							size="xs"
-							disabled={!$enterpriseLicense}
-							checked={Boolean($flowStore.value.concurrent_limit)}
-							on:change={() => {
-								if ($flowStore.value.concurrent_limit) {
-									$flowStore.value.concurrent_limit = undefined
-								} else {
-									$flowStore.value.concurrent_limit = 1
-								}
-							}}
-							options={{
-								right: 'Concurrency limits',
-								rightTooltip: 'Allowed concurrency within a given timeframe',
-								rightDocumentationLink: 'https://www.windmill.dev/docs/flows/concurrency_limit'
-							}}
-							class="py-1"
-							eeOnly={true}
-						/>
+						<div class="flex flex-row items-center gap-2">
+							<Toggle
+								textClass="font-normal text-sm"
+								color="nord"
+								size="xs"
+								disabled={!$enterpriseLicense}
+								checked={Boolean($flowStore.value.concurrent_limit)}
+								on:change={() => {
+									if ($flowStore.value.concurrent_limit) {
+										$flowStore.value.concurrent_limit = undefined
+									} else {
+										$flowStore.value.concurrent_limit = 1
+									}
+								}}
+								options={{
+									right: 'Concurrency limits',
+									rightTooltip: 'Allowed concurrency within a given timeframe',
+									rightDocumentationLink: 'https://www.windmill.dev/docs/flows/concurrency_limit'
+								}}
+								class="py-1"
+								eeOnly={true}
+							/>
+						</div>
 
 						{#if $flowStore.value.concurrent_limit}
 							<div class="flex flex-col gap-4">
@@ -483,28 +489,30 @@
 				</Toggle>
 
 				<div>
-					<Toggle
-						textClass="font-normal text-sm"
-						color="nord"
-						size="xs"
-						disabled={!$enterpriseLicense || isCloudHosted()}
-						checked={Boolean($flowStore.dedicated_worker)}
-						on:change={() => {
-							if ($flowStore.dedicated_worker) {
-								$flowStore.dedicated_worker = undefined
-							} else {
-								$flowStore.dedicated_worker = true
-							}
-						}}
-						options={{
-							right: 'Flow is run on dedicated workers',
-							rightTooltip:
-								'When enabled, the flow will be executed on a dedicated worker.',
-							rightDocumentationLink: 'https://www.windmill.dev/docs/core_concepts/jobs#high-priority-jobs'
-						}}
-						class="py-1"
-						eeOnly={true}
-					/>
+					<div class="flex flex-row items-center gap-2">
+						<Toggle
+							textClass="font-normal text-sm"
+							color="nord"
+							size="xs"
+							disabled={!$enterpriseLicense || isCloudHosted()}
+							checked={Boolean($flowStore.dedicated_worker)}
+							on:change={() => {
+								if ($flowStore.dedicated_worker) {
+									$flowStore.dedicated_worker = undefined
+								} else {
+									$flowStore.dedicated_worker = true
+								}
+							}}
+							options={{
+								right: 'Flow is run on dedicated workers',
+								rightTooltip: 'When enabled, the flow will be executed on a dedicated worker.',
+								rightDocumentationLink:
+									'https://www.windmill.dev/docs/core_concepts/jobs#high-priority-jobs'
+							}}
+							class="py-1"
+							eeOnly={true}
+						/>
+					</div>
 
 					{#if $flowStore.dedicated_worker}
 						<div>
diff --git a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
index 8e53a1030c..9e89f92f73 100644
--- a/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
+++ b/frontend/src/lib/components/flows/map/FlowModuleSchemaMap.svelte
@@ -330,6 +330,8 @@
 
 	<div class="z-10 flex-auto grow bg-surface-secondary" bind:clientHeight={minHeight}>
 		<FlowGraphV2
+			earlyStop={$flowStore.value?.skip_expr !== undefined}
+			cache={$flowStore.value?.cache_ttl !== undefined}
 			triggerNode={true}
 			path={$pathStore}
 			{newFlow}
diff --git a/frontend/src/lib/components/flows/map/VirtualItem.svelte b/frontend/src/lib/components/flows/map/VirtualItem.svelte
index 3f5350b7ed..14263b1a9d 100644
--- a/frontend/src/lib/components/flows/map/VirtualItem.svelte
+++ b/frontend/src/lib/components/flows/map/VirtualItem.svelte
@@ -6,6 +6,9 @@
 	import VirtualItemWrapper from './VirtualItemWrapper.svelte'
 	import type { PropPickerContext } from '$lib/components/prop_picker'
 	import FlowPropPicker from '$lib/components/flows/propPicker/FlowPropPicker.svelte'
+	import Popover from '$lib/components/Popover.svelte'
+	import { fade } from 'svelte/transition'
+	import { Database, Square } from 'lucide-svelte'
 
 	export let label: string | undefined = undefined
 	export let bgColor: string = ''
@@ -19,6 +22,8 @@
 	export let inputJson: Object | undefined = undefined
 	export let prefix = ''
 	export let alwaysPluggable: boolean = false
+	export let cache: boolean = false
+	export let earlyStop: boolean = false
 
 	const { currentStepStore: copilotCurrentStepStore } =
 		getContext<FlowCopilotContext | undefined>('FlowCopilotContext') || {}
@@ -62,7 +67,30 @@
 			</div>
 		{/if}
 	</div>
-
+	<div class="absolute text-sm right-12 -bottom-3 flex flex-row gap-1 z-10">
+		{#if cache}
+			<Popover notClickable>
+				<div
+					transition:fade|local={{ duration: 200 }}
+					class="center-center rounded border bg-surface border-gray-400 text-secondary px-1 py-0.5"
+				>
+					<Database size={12} />
+				</div>
+				<svelte:fragment slot="text">Cached</svelte:fragment>
+			</Popover>
+		{/if}
+		{#if earlyStop}
+			<Popover notClickable>
+				<div
+					transition:fade|local={{ duration: 200 }}
+					class="center-center bg-surface rounded border border-gray-400 text-secondary px-1 py-0.5"
+				>
+					<Square size={12} />
+				</div>
+				<svelte:fragment slot="text">Early stop if condition met</svelte:fragment>
+			</Popover>
+		{/if}
+	</div>
 	{#if inputJson && $flowPropPickerConfig && (Object.keys(inputJson).length > 0 || alwaysPluggable)}
 		<div class="absolute -bottom-[14px] right-[21px] translate-x-[50%] center-center">
 			<FlowPropPicker json={inputJson} {prefix} />
diff --git a/frontend/src/lib/components/graph/FlowGraphV2.svelte b/frontend/src/lib/components/graph/FlowGraphV2.svelte
index 2e46fb309c..48f7fc9430 100644
--- a/frontend/src/lib/components/graph/FlowGraphV2.svelte
+++ b/frontend/src/lib/components/graph/FlowGraphV2.svelte
@@ -57,6 +57,8 @@
 	export let newFlow: boolean = false
 
 	export let insertable = false
+	export let earlyStop: boolean = false
+	export let cache: boolean = false
 	export let scroll = false
 	export let moving: string | undefined = undefined
 
@@ -238,7 +240,9 @@
 			flowModuleStates,
 			selectedId: $selectedId,
 			path,
-			newFlow
+			newFlow,
+			cache,
+			earlyStop
 		},
 		failureModule,
 		preprocessorModule,
diff --git a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
index 30eb352800..bdfcdd30cb 100644
--- a/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
+++ b/frontend/src/lib/components/graph/renderers/nodes/InputNode.svelte
@@ -18,6 +18,8 @@
 		index: number
 		disableAi: boolean
 		disableMoveIds: string[]
+		cache: boolean
+		earlyStop: boolean
 	}
 
 	const { selectedId } = getContext<{
@@ -83,5 +85,7 @@
 		inputJson={filteredInput}
 		prefix="flow_input"
 		alwaysPluggable
+		cache={data.cache}
+		earlyStop={data.earlyStop}
 	/>
 </NodeWrapper>
diff --git a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
index eedeca636c..ca18edfe78 100644
--- a/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
+++ b/frontend/src/routes/approve/[workspace]/[job]/[resume]/[hmac]/+page.svelte
@@ -286,6 +286,8 @@
 				<FlowGraphV2
 					workspace={job.workspace_id}
 					triggerNode={false}
+					earlyStop={job.raw_flow?.skip_expr !== undefined}
+					cache={job.raw_flow?.cache_ttl !== undefined}
 					modules={job.raw_flow?.modules}
 					failureModule={job.raw_flow?.failure_module}
 					preprocessorModule={job.raw_flow?.preprocessor_module}

From b8fd0e38490290d1dace793aec963aa226327cd6 Mon Sep 17 00:00:00 2001
From: Henri Courdent <122811744+hcourdent@users.noreply.github.com>
Date: Thu, 5 Dec 2024 19:19:58 +0100
Subject: [PATCH 34/34] Update changelog nov (#4859)

* Update changelog nov

* Updated link tantivy

* No duplicate
---
 .../src/lib/components/sidebar/changelogs.ts  | 65 +++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/frontend/src/lib/components/sidebar/changelogs.ts b/frontend/src/lib/components/sidebar/changelogs.ts
index 0c6be5542e..478c2dc64b 100644
--- a/frontend/src/lib/components/sidebar/changelogs.ts
+++ b/frontend/src/lib/components/sidebar/changelogs.ts
@@ -5,6 +5,71 @@ export type Changelog = {
 }
 
 const changelogs: Changelog[] = [
+	{
+		label: 'Full text search on jobs and logs',
+		href: 'https://www.windmill.dev/changelog/instant-full-text-search-on-jobs-and-logs',
+		date: '2024-12-05'
+	},
+	{
+		label: 'Force dark/light theme in apps',
+		href: 'https://www.windmill.dev/changelog/force-dark-light-theme',
+		date: '2024-11-28'
+	},
+	{
+		label: 'Kafka triggers',
+		href: 'https://www.windmill.dev/changelog/kafka-triggers',
+		date: '2024-11-18'
+	},
+	{
+		label: 'Critical channels in UI',
+		href: 'https://www.windmill.dev/changelog/critical-channels-ui',
+		date: '2024-11-15'
+	},
+	{
+		label: 'Support for Mistral and Anthropic AI models',
+		href: 'https://www.windmill.dev/changelog/mistral-anthropic-support',
+		date: '2024-11-14'
+	},
+	{
+		label: 'Websocket triggers',
+		href: 'https://www.windmill.dev/changelog/websocket-triggers',
+		date: '2024-11-06'
+	},
+	{
+		label: 'Autoscaling',
+		href: 'https://www.windmill.dev/changelog/autoscaling',
+		date: '2024-10-28'
+	},
+	{
+		label: 'File download helper',
+		href: 'https://www.windmill.dev/changelog/file-download-helper',
+		date: '2024-10-12'
+	},
+	{
+		label: 'Queue metric alerts',
+		href: 'https://www.windmill.dev/changelog/queue-metric-alerts',
+		date: '2024-10-10'
+	},
+	{
+		label: 'Deno 2.0',
+		href: 'https://www.windmill.dev/changelog/deno-2.0',
+		date: '2024-10-10'
+	},
+	{
+		label: 'Move components inside containers with ctrl+click',
+		href: 'https://www.windmill.dev/changelog/move-components-inside-containers-with-ctrl',
+		date: '2024-10-09'
+	},
+	{
+		label: 'Support workers to run natively on Windows',
+		href: 'https://www.windmill.dev/changelog/workers-run-natively-windows',
+		date: '2024-10-03'
+	},
+	{
+		label: 'Quick access menu for faster component insertion',
+		href: 'https://www.windmill.dev/changelog/flow-quick-access-menu',
+		date: '2024-10-03'
+	},
 	{
 		label: 'Custom HTTP routes',
 		href: 'https://www.windmill.dev/changelog/http-routing',