From 24f4a7caaafa93f51669dcf44a3dca09d5b228bb Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 30 Sep 2024 09:52:03 +0200
Subject: [PATCH 1/7] fix: improve allowed domains setting for sso

---
 .../src/lib/components/OAuthSetting.svelte    | 48 +++++++++++++------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/frontend/src/lib/components/OAuthSetting.svelte b/frontend/src/lib/components/OAuthSetting.svelte
index 18ff726f6a29c..9e67ef787cd84 100644
--- a/frontend/src/lib/components/OAuthSetting.svelte
+++ b/frontend/src/lib/components/OAuthSetting.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import { X } from 'lucide-svelte'
 	import CollapseLink from './CollapseLink.svelte'
 	import IconedResourceType from './IconedResourceType.svelte'
 	import Toggle from './Toggle.svelte'
@@ -9,8 +10,6 @@
 
 	$: enabled = value != undefined
 
-	let allowed_domains = value?.['allowed_domains']?.join(', ') ?? ''
-
 	let tenant: string = ''
 	$: name == 'microsoft' && changeTenantId(tenant)
 
@@ -67,19 +66,38 @@
 			{:else if login}
 				<label class="block pb-2">
 					<span class="text-primary font-semibold text-sm">Allowed domains</span>
-					<span class="text-secondary text-xs">Separate domains with commas</span>
-					<input
-						type="text"
-						placeholder="windmill.dev"
-						bind:value={allowed_domains}
-						on:keyup={() => {
-							if (allowed_domains == '') {
-								value['allowed_domains'] = undefined
-							} else {
-								value['allowed_domains'] = allowed_domains.split(',')
-							}
-						}}
-					/>
+					<div class="flex flex-col gap-1">
+						{#each value?.['allowed_domains'] ?? [] as domain}
+							<div class="flex gap-2">
+								<input
+									class="max-w-96 w-full"
+									type="text"
+									bind:value={domain}
+									on:keyup={(e) => {
+										if (domain == '') {
+											value['allowed_domains'] = value['allowed_domains'].filter((d) => d != domain)
+										}
+									}}
+								/>
+								<button
+									class="text-primary text-xs rounded hover:bg-surface-hover"
+									on:click={() => {
+										value['allowed_domains'] = value['allowed_domains'].filter((d) => d != domain)
+									}}
+								>
+									<X size={14} />
+								</button>
+							</div>
+						{/each}
+						<div class="flex gap-2">
+							<button
+								class="text-primary text-sm border rounded p-1"
+								on:click={() => {
+									value['allowed_domains'] = [...(value['allowed_domains'] ?? []), 'mydomain.com']
+								}}>+ Add domain</button
+							>
+						</div>
+					</div>
 				</label>
 			{/if}
 			{#if name == 'google'}

From 87648495808a3edc0fd071e38c9137ccf4ceb0a5 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@windmill.dev>
Date: Mon, 30 Sep 2024 09:55:50 +0200
Subject: [PATCH 2/7] chore(main): release 1.402.3 (#4458)

* chore(main): release 1.402.3

* Apply automatic changes

---------

Co-authored-by: rubenfiszel <rubenfiszel@users.noreply.github.com>
---
 CHANGELOG.md                                  |  7 ++
 backend/Cargo.lock                            | 89 ++++++++++---------
 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, 70 insertions(+), 60 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e5d158df5bc9..848d9a6f106e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## [1.402.3](https://github.com/windmill-labs/windmill/compare/v1.402.2...v1.402.3) (2024-09-30)
+
+
+### Bug Fixes
+
+* improve allowed domains setting for sso ([24f4a7c](https://github.com/windmill-labs/windmill/commit/24f4a7caaafa93f51669dcf44a3dca09d5b228bb))
+
 ## [1.402.2](https://github.com/windmill-labs/windmill/compare/v1.402.1...v1.402.2) (2024-09-28)
 
 
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 743e700e54820..0ee755b3ec722 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -453,7 +453,7 @@ dependencies = [
  "memchr",
  "num",
  "regex",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -2454,7 +2454,7 @@ dependencies = [
  "indexmap 2.5.0",
  "itertools 0.12.1",
  "log",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -4710,7 +4710,7 @@ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
  "bitflags 2.6.0",
  "libc",
- "redox_syscall 0.5.6",
+ "redox_syscall 0.5.7",
 ]
 
 [[package]]
@@ -5457,9 +5457,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "oneshot"
@@ -5672,7 +5675,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.6",
+ "redox_syscall 0.5.7",
  "smallvec",
  "windows-targets 0.52.6",
 ]
@@ -6623,9 +6626,9 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
  "bitflags 2.6.0",
 ]
@@ -6643,14 +6646,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.6"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -6664,13 +6667,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -6693,9 +6696,9 @@ checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "regress"
@@ -8966,7 +8969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d60769b80ad7953d8a7b2c70cdfe722bbcdcac6bccc8ac934c40c034d866fc18"
 dependencies = [
  "byteorder",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
  "utf8-ranges",
 ]
 
@@ -9030,9 +9033,9 @@ dependencies = [
 
 [[package]]
 name = "tempfile"
-version = "3.12.0"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand 2.1.1",
@@ -10382,7 +10385,7 @@ version = "1.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "372d5b87f58ec45c384ba03563b03544dc5fadc3983e434b286913f5b4a9bb6d"
 dependencies = [
- "redox_syscall 0.5.6",
+ "redox_syscall 0.5.7",
  "wasite",
  "web-sys",
 ]
@@ -10426,7 +10429,7 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
 [[package]]
 name = "windmill"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "axum",
@@ -10468,7 +10471,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "argon2",
@@ -10553,7 +10556,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-api-client"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "base64 0.21.7",
  "chrono",
@@ -10571,7 +10574,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-audit"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "chrono",
  "serde",
@@ -10584,7 +10587,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-common"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "async-stream",
@@ -10628,7 +10631,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-git-sync"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "regex",
  "rsmq_async",
@@ -10643,7 +10646,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-indexer"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "bytes",
@@ -10664,7 +10667,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "convert_case 0.6.0",
  "serde",
@@ -10673,7 +10676,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-bash"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10685,7 +10688,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-go"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "gosyn",
@@ -10697,7 +10700,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-graphql"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10709,7 +10712,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-php"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10720,7 +10723,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "itertools 0.13.0",
@@ -10731,7 +10734,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-py-imports"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10749,7 +10752,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-rust"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "convert_case 0.6.0",
@@ -10766,7 +10769,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-sql"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10778,7 +10781,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-ts"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "lazy_static",
@@ -10796,7 +10799,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-wasm"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "getrandom 0.2.15",
@@ -10817,7 +10820,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-parser-yaml"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "serde_json",
@@ -10827,7 +10830,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-queue"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "async-recursion",
@@ -10860,7 +10863,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-sql-datatype-parser-wasm"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "wasm-bindgen",
  "wasm-bindgen-test",
@@ -10870,7 +10873,7 @@ dependencies = [
 
 [[package]]
 name = "windmill-worker"
-version = "1.402.1"
+version = "1.402.3"
 dependencies = [
  "anyhow",
  "async-recursion",
diff --git a/backend/Cargo.toml b/backend/Cargo.toml
index 9084873d16155..9b7a0123c8aef 100644
--- a/backend/Cargo.toml
+++ b/backend/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "windmill"
-version = "1.402.1"
+version = "1.402.3"
 authors.workspace = true
 edition.workspace = true
 
@@ -27,7 +27,7 @@ members = [
 ]
 
 [workspace.package]
-version = "1.402.1"
+version = "1.402.3"
 authors = ["Ruben Fiszel <ruben@windmill.dev>"]
 edition = "2021"
 
diff --git a/backend/windmill-api/openapi.yaml b/backend/windmill-api/openapi.yaml
index 884c195d6eda0..c8c30a7db165a 100644
--- a/backend/windmill-api/openapi.yaml
+++ b/backend/windmill-api/openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.402.1
+  version: 1.402.3
   title: Windmill API
 
   contact:
diff --git a/benchmarks/lib.ts b/benchmarks/lib.ts
index f9ee25ed7b9dd..2d88e6abedbe8 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.402.1";
+export const VERSION = "v1.402.3";
 
 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 8176f4982a5b6..c1aa86cf3e0b0 100644
--- a/cli/main.ts
+++ b/cli/main.ts
@@ -60,7 +60,7 @@ export {
 //   }
 // });
 
-export const VERSION = "1.402.1";
+export const VERSION = "1.402.3";
 
 const command = new Command()
   .name("wmill")
diff --git a/frontend/package-lock.json b/frontend/package-lock.json
index c2cee37b06296..fbfe82be4efdf 100644
--- a/frontend/package-lock.json
+++ b/frontend/package-lock.json
@@ -1,12 +1,12 @@
 {
 	"name": "windmill-components",
-	"version": "1.402.1",
+	"version": "1.402.3",
 	"lockfileVersion": 3,
 	"requires": true,
 	"packages": {
 		"": {
 			"name": "windmill-components",
-			"version": "1.402.1",
+			"version": "1.402.3",
 			"license": "AGPL-3.0",
 			"dependencies": {
 				"@aws-crypto/sha256-js": "^4.0.0",
diff --git a/frontend/package.json b/frontend/package.json
index c37d6e73ed013..b85fc1caba4f7 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "windmill-components",
-	"version": "1.402.1",
+	"version": "1.402.3",
 	"scripts": {
 		"dev": "vite dev",
 		"build": "vite build",
diff --git a/lsp/Pipfile b/lsp/Pipfile
index 99939bae9b00e..8487b85565c82 100644
--- a/lsp/Pipfile
+++ b/lsp/Pipfile
@@ -4,8 +4,8 @@ verify_ssl = true
 name = "pypi"
 
 [packages]
-wmill = ">=1.402.1"
-wmill_pg = ">=1.402.1"
+wmill = ">=1.402.3"
+wmill_pg = ">=1.402.3"
 sendgrid = "*"
 mysql-connector-python = "*"
 pymongo = "*"
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index bd89a12b5f95a..e4600e9528a21 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -1,7 +1,7 @@
 openapi: "3.0.3"
 
 info:
-  version: 1.402.1
+  version: 1.402.3
   title: OpenFlow Spec
   contact:
     name: Ruben Fiszel
diff --git a/powershell-client/WindmillClient/WindmillClient.psd1 b/powershell-client/WindmillClient/WindmillClient.psd1
index 233a3b8b96433..89445c5e22695 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.402.1'
+ModuleVersion = '1.402.3'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
diff --git a/python-client/wmill/pyproject.toml b/python-client/wmill/pyproject.toml
index 624b8547fbaff..57469495370c3 100644
--- a/python-client/wmill/pyproject.toml
+++ b/python-client/wmill/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "wmill"
-version = "1.402.1"
+version = "1.402.3"
 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 47f54770e6181..5e4f589322ccf 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.402.1"
+version = "1.402.3"
 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 5bb7b50319e3c..a4dfd07ee97cf 100644
--- a/typescript-client/jsr.json
+++ b/typescript-client/jsr.json
@@ -1,6 +1,6 @@
 {
   "name": "@windmill/windmill",
-  "version": "1.402.1",
+  "version": "1.402.3",
   "exports": "./src/index.ts",
   "publish": {
     "exclude": ["!src", "./s3Types.ts", "./client.ts"]
diff --git a/typescript-client/package.json b/typescript-client/package.json
index 1114ddf8a1bbb..c6fbf1c41ce84 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.402.1",
+  "version": "1.402.3",
   "author": "Ruben Fiszel",
   "license": "Apache 2.0",
   "devDependencies": {
diff --git a/version.txt b/version.txt
index 0039ebb9d9bcd..cce8c1101ef9b 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-1.402.2
+1.402.3

From cc1a75e11419370cd0a4404ba7409a57d44b3825 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 30 Sep 2024 11:21:58 +0200
Subject: [PATCH 3/7] improve allowed domains change handling

---
 frontend/src/lib/components/OAuthSetting.svelte | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/frontend/src/lib/components/OAuthSetting.svelte b/frontend/src/lib/components/OAuthSetting.svelte
index 9e67ef787cd84..4e84f796ce162 100644
--- a/frontend/src/lib/components/OAuthSetting.svelte
+++ b/frontend/src/lib/components/OAuthSetting.svelte
@@ -75,14 +75,19 @@
 									bind:value={domain}
 									on:keyup={(e) => {
 										if (domain == '') {
-											value['allowed_domains'] = value['allowed_domains'].filter((d) => d != domain)
+											value['allowed_domains'] = value['allowed_domains']?.filter(
+												(d) => d != domain
+											)
 										}
 									}}
 								/>
 								<button
 									class="text-primary text-xs rounded hover:bg-surface-hover"
 									on:click={() => {
-										value['allowed_domains'] = value['allowed_domains'].filter((d) => d != domain)
+										value['allowed_domains'] = value['allowed_domains']?.filter((d) => d != domain)
+										if (value['allowed_domains'].length == 0) {
+											value['allowed_domains'] = undefined
+										}
 									}}
 								>
 									<X size={14} />

From c600a62d28e1735571d8d730d16dabb187cc8b74 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Mon, 30 Sep 2024 12:23:07 +0200
Subject: [PATCH 4/7] send stats when renewing key if last >24h (#4430)

* feat: send stats when renewing key if last >24h

* nits

* fix: sqlx

* nit

* renewal reason

* stats reason

* update ee ref

* Update ee-repo-ref.txt

---------

Co-authored-by: Ruben Fiszel <ruben@windmill.dev>
---
 ...ee6d098a2758d16ede000809bd9a09660b604.json | 20 +++++++++++++++++
 ...0304333536768527525a43bdd45aedffa3c4f.json | 22 +++++++++++++++++++
 backend/Cargo.lock                            |  2 +-
 backend/ee-repo-ref.txt                       |  2 +-
 backend/src/main.rs                           |  3 +--
 backend/windmill-api/Cargo.toml               |  1 -
 backend/windmill-api/src/db.rs                |  8 +------
 backend/windmill-api/src/lib.rs               |  7 ++----
 backend/windmill-api/src/settings.rs          | 19 ++++++++++++----
 backend/windmill-common/Cargo.toml            |  1 +
 backend/windmill-common/src/ee.rs             |  9 +++++++-
 backend/windmill-common/src/lib.rs            |  3 +++
 backend/windmill-common/src/stats_ee.rs       | 15 ++++++++-----
 backend/windmill-common/src/utils.rs          |  9 +++++++-
 backend/windmill-queue/src/jobs.rs            |  1 +
 15 files changed, 93 insertions(+), 29 deletions(-)
 create mode 100644 backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json
 create mode 100644 backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json

diff --git a/backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json b/backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json
new file mode 100644
index 0000000000000..8796b869021a2
--- /dev/null
+++ b/backend/.sqlx/query-19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604.json
@@ -0,0 +1,20 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT created_at FROM metrics WHERE id = 'telemetry' ORDER BY created_at DESC LIMIT 1",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "created_at",
+        "type_info": "Timestamptz"
+      }
+    ],
+    "parameters": {
+      "Left": []
+    },
+    "nullable": [
+      false
+    ]
+  },
+  "hash": "19f0abd79372698f378cb6deea3ee6d098a2758d16ede000809bd9a09660b604"
+}
diff --git a/backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json b/backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json
new file mode 100644
index 0000000000000..4187b628b70b3
--- /dev/null
+++ b/backend/.sqlx/query-6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f.json
@@ -0,0 +1,22 @@
+{
+  "db_name": "PostgreSQL",
+  "query": "SELECT pg_try_advisory_xact_lock($1)",
+  "describe": {
+    "columns": [
+      {
+        "ordinal": 0,
+        "name": "pg_try_advisory_xact_lock",
+        "type_info": "Bool"
+      }
+    ],
+    "parameters": {
+      "Left": [
+        "Int8"
+      ]
+    },
+    "nullable": [
+      null
+    ]
+  },
+  "hash": "6776dc50f184188756ad7fe263b0304333536768527525a43bdd45aedffa3c4f"
+}
diff --git a/backend/Cargo.lock b/backend/Cargo.lock
index 0ee755b3ec722..0dfc4ee4589e6 100644
--- a/backend/Cargo.lock
+++ b/backend/Cargo.lock
@@ -10490,7 +10490,6 @@ dependencies = [
  "chrono",
  "chrono-tz 0.10.0",
  "cookie 0.17.0",
- "crc",
  "cron",
  "datafusion",
  "futures",
@@ -10597,6 +10596,7 @@ dependencies = [
  "bytes",
  "chrono",
  "const_format",
+ "crc",
  "cron",
  "futures-core",
  "gethostname",
diff --git a/backend/ee-repo-ref.txt b/backend/ee-repo-ref.txt
index 994e59747a0f4..44f2972329cd4 100644
--- a/backend/ee-repo-ref.txt
+++ b/backend/ee-repo-ref.txt
@@ -1 +1 @@
-3d37b6c31155265d8d026ae9d6ced0b433078f87
\ No newline at end of file
+0f5f42d2f8f5f1af05c8086f3dc7ad38d83750df
diff --git a/backend/src/main.rs b/backend/src/main.rs
index aa6993cf92d57..0a59e4af07033 100644
--- a/backend/src/main.rs
+++ b/backend/src/main.rs
@@ -745,9 +745,8 @@ Windmill Community Edition {GIT_VERSION}
             Ok(()) as anyhow::Result<()>
         };
 
-        let instance_name = rd_string(8);
         if mode == Mode::Server || mode == Mode::Standalone {
-            schedule_stats(instance_name, &db, &HTTP_CLIENT).await;
+            schedule_stats(&db, &HTTP_CLIENT).await;
         }
 
         #[cfg(feature = "enterprise")]
diff --git a/backend/windmill-api/Cargo.toml b/backend/windmill-api/Cargo.toml
index fd8bedf0f95e4..e4b6b5d71b27a 100644
--- a/backend/windmill-api/Cargo.toml
+++ b/backend/windmill-api/Cargo.toml
@@ -97,7 +97,6 @@ jsonwebtoken = { workspace = true }
 matchit.workspace = true
 
 pin-project.workspace = true
-crc.workspace = true
 http.workspace = true
 async-stream.workspace = true
 ulid.workspace = true
diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs
index 470a21bcccd52..72ef2e168079b 100644
--- a/backend/windmill-api/src/db.rs
+++ b/backend/windmill-api/src/db.rs
@@ -15,6 +15,7 @@ use sqlx::{
     PgConnection, Pool, Postgres,
 };
 use windmill_audit::audit_ee::{AuditAuthor, AuditAuthorable};
+use windmill_common::utils::generate_lock_id;
 use windmill_common::{
     db::{Authable, Authed},
     error::Error,
@@ -29,13 +30,6 @@ async fn current_database(conn: &mut PgConnection) -> Result<String, MigrateErro
         .await?)
 }
 
-// inspired from rails: https://github.com/rails/rails/blob/6e49cc77ab3d16c06e12f93158eaf3e507d4120e/activerecord/lib/active_record/migration.rb#L1308
-fn generate_lock_id(database_name: &str) -> i64 {
-    const CRC_IEEE: crc::Crc<u32> = crc::Crc::<u32>::new(&crc::CRC_32_ISO_HDLC);
-    // 0x3d32ad9e chosen by fair dice roll
-    0x3d32ad9e * (CRC_IEEE.checksum(database_name.as_bytes()) as i64)
-}
-
 struct CustomMigrator {
     inner: PoolConnection<Postgres>,
 }
diff --git a/backend/windmill-api/src/lib.rs b/backend/windmill-api/src/lib.rs
index 97d2865e2e79a..c73972529a895 100644
--- a/backend/windmill-api/src/lib.rs
+++ b/backend/windmill-api/src/lib.rs
@@ -39,9 +39,8 @@ use tower_http::{
     trace::TraceLayer,
 };
 use windmill_common::db::UserDB;
-use windmill_common::utils::rd_string;
 use windmill_common::worker::ALL_TAGS;
-use windmill_common::BASE_URL;
+use windmill_common::{BASE_URL, INSTANCE_NAME};
 
 use crate::scim_ee::has_scim_token;
 use windmill_common::error::AppError;
@@ -373,8 +372,6 @@ pub async fn run_server(
         )
     };
 
-    let instance_name = rd_string(5);
-
     let listener = tokio::net::TcpListener::bind(addr).await.unwrap();
     let port = listener.local_addr().map(|x| x.port()).unwrap_or(8000);
     let ip = listener
@@ -385,7 +382,7 @@ pub async fn run_server(
     let server = axum::serve(listener, app.into_make_service());
 
     tracing::info!(
-        instance = %instance_name,
+        instance = %*INSTANCE_NAME,
         "server started on port={} and addr={}",
         port,
         ip
diff --git a/backend/windmill-api/src/settings.rs b/backend/windmill-api/src/settings.rs
index 395387ebd61d8..8a72a5459a05b 100644
--- a/backend/windmill-api/src/settings.rs
+++ b/backend/windmill-api/src/settings.rs
@@ -24,9 +24,9 @@ use axum::{
 #[cfg(feature = "enterprise")]
 use axum::extract::Query;
 
+use serde::Deserialize;
 #[cfg(feature = "enterprise")]
 use windmill_common::ee::{send_critical_alert, CriticalAlertKind, CriticalErrorChannel};
-use serde::Deserialize;
 use windmill_common::{
     error::{self, JsonResult, Result},
     global_settings::{
@@ -298,7 +298,13 @@ async fn list_global_settings() -> JsonResult<String> {
 
 pub async fn send_stats(Extension(db): Extension<DB>, authed: ApiAuthed) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    windmill_common::stats_ee::send_stats(&"manual".to_string(), &HTTP_CLIENT, &db).await?;
+    windmill_common::stats_ee::send_stats(
+        &HTTP_CLIENT,
+        &db,
+        true,
+        windmill_common::stats_ee::SendStatsReason::Manual,
+    )
+    .await?;
 
     Ok("Sent stats".to_string())
 }
@@ -357,8 +363,13 @@ pub async fn renew_license_key(
     authed: ApiAuthed,
 ) -> Result<String> {
     require_super_admin(&db, &authed.email).await?;
-    windmill_common::stats_ee::send_stats(&"manual".to_string(), &HTTP_CLIENT, &db).await?;
-    let result = windmill_common::ee::renew_license_key(&HTTP_CLIENT, &db, license_key, true).await;
+    let result = windmill_common::ee::renew_license_key(
+        &HTTP_CLIENT,
+        &db,
+        license_key,
+        windmill_common::ee::RenewReason::Manual,
+    )
+    .await;
 
     if result != "success" {
         return Err(error::Error::BadRequest(format!(
diff --git a/backend/windmill-common/Cargo.toml b/backend/windmill-common/Cargo.toml
index 09acf22157919..546c339575162 100644
--- a/backend/windmill-common/Cargo.toml
+++ b/backend/windmill-common/Cargo.toml
@@ -56,6 +56,7 @@ mail-send.workspace = true
 futures-core.workspace = true
 async-stream.workspace = true
 const_format.workspace = true
+crc.workspace = true
 
 [target.'cfg(not(target_env = "msvc"))'.dependencies]
 tikv-jemalloc-ctl = { optional = true, workspace = true }
diff --git a/backend/windmill-common/src/ee.rs b/backend/windmill-common/src/ee.rs
index 2f32756e45617..d2b215a5ad3e7 100644
--- a/backend/windmill-common/src/ee.rs
+++ b/backend/windmill-common/src/ee.rs
@@ -52,12 +52,19 @@ pub async fn schedule_key_renewal(_http_client: &reqwest::Client, _db: &crate::d
     // Implementation is not open source
 }
 
+#[cfg(feature = "enterprise")]
+pub enum RenewReason {
+    Manual,
+    Schedule,
+    OnStart,
+}
+
 #[cfg(feature = "enterprise")]
 pub async fn renew_license_key(
     _http_client: &reqwest::Client,
     _db: &crate::db::DB,
     _key: Option<String>,
-    _manual: bool,
+    _reason: RenewReason,
 ) -> String {
     // Implementation is not open source
     "".to_string()
diff --git a/backend/windmill-common/src/lib.rs b/backend/windmill-common/src/lib.rs
index cd8059251e7bc..0f25e12e46e62 100644
--- a/backend/windmill-common/src/lib.rs
+++ b/backend/windmill-common/src/lib.rs
@@ -95,6 +95,8 @@ lazy_static::lazy_static! {
 
     pub static ref JOB_RETENTION_SECS: Arc<RwLock<i64>> = Arc::new(RwLock::new(0));
 
+    pub static ref INSTANCE_NAME: String = rd_string(5);
+
 }
 
 pub async fn shutdown_signal(
@@ -141,6 +143,7 @@ pub async fn shutdown_signal(
 use tokio::sync::RwLock;
 #[cfg(feature = "prometheus")]
 use tokio::task::JoinHandle;
+use utils::rd_string;
 
 #[cfg(feature = "prometheus")]
 pub async fn serve_metrics(
diff --git a/backend/windmill-common/src/stats_ee.rs b/backend/windmill-common/src/stats_ee.rs
index 48845d5f51698..c6dc9946bfa2e 100644
--- a/backend/windmill-common/src/stats_ee.rs
+++ b/backend/windmill-common/src/stats_ee.rs
@@ -8,11 +8,7 @@ pub async fn get_disable_stats_setting(_db: &DB) -> bool {
     false
 }
 
-pub async fn schedule_stats(
-    _instance_name: String,
-    _db: &DB,
-    _http_client: &reqwest::Client,
-) -> () {
+pub async fn schedule_stats(_db: &DB, _http_client: &reqwest::Client) -> () {
     // stats details are closed source
 }
 
@@ -23,10 +19,17 @@ struct JobsUsage {
     count: i64,
 }
 
+pub enum SendStatsReason {
+    Manual,
+    Schedule,
+    OnStart,
+}
+
 pub async fn send_stats(
-    _instance_name: &String,
     _http_client: &reqwest::Client,
     _db: &DB,
+    _skip_job_usage: bool,
+    _reason: SendStatsReason,
 ) -> Result<()> {
     // stats details are closed source
     Ok(())
diff --git a/backend/windmill-common/src/utils.rs b/backend/windmill-common/src/utils.rs
index 8676878352a8d..d5f9c5c0992e1 100644
--- a/backend/windmill-common/src/utils.rs
+++ b/backend/windmill-common/src/utils.rs
@@ -189,7 +189,7 @@ pub fn calculate_hash(s: &str) -> String {
     format!("{:x}", hasher.finalize())
 }
 
-pub async fn get_uid(db: &DB) -> Result<String> {
+pub async fn get_uid<'c, E: sqlx::Executor<'c, Database = Postgres>>(db: E) -> Result<String> {
     let mut uid = LICENSE_KEY_ID.read().await.clone();
 
     if uid == "" {
@@ -228,6 +228,13 @@ impl std::fmt::Display for Mode {
     }
 }
 
+// inspired from rails: https://github.com/rails/rails/blob/6e49cc77ab3d16c06e12f93158eaf3e507d4120e/activerecord/lib/active_record/migration.rb#L1308
+pub fn generate_lock_id(database_name: &str) -> i64 {
+    const CRC_IEEE: crc::Crc<u32> = crc::Crc::<u32>::new(&crc::CRC_32_ISO_HDLC);
+    // 0x3d32ad9e chosen by fair dice roll
+    0x3d32ad9e * (CRC_IEEE.checksum(database_name.as_bytes()) as i64)
+}
+
 pub async fn send_email(
     subject: &str,
     content: &str,
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index eca874aa630f5..8989e9ce9d4ce 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -482,6 +482,7 @@ where
     }
 }
 
+#[cfg(feature = "enterprise")]
 #[derive(Deserialize)]
 struct RawFlowFailureModule {
     #[cfg(feature = "enterprise")]

From 630ae5d425cd9957d674befd2df96e2befec52a3 Mon Sep 17 00:00:00 2001
From: Ruben Fiszel <ruben@rubenfiszel.com>
Date: Mon, 30 Sep 2024 14:02:31 +0200
Subject: [PATCH 5/7] fix: skip one migration to avoid using md5 for azure
 support

---
 .../create_workspace_without_md5.sql             | 16 ++++++++++++++++
 backend/windmill-api/src/db.rs                   | 16 +++++++++++++---
 2 files changed, 29 insertions(+), 3 deletions(-)
 create mode 100644 backend/custom_migrations/create_workspace_without_md5.sql

diff --git a/backend/custom_migrations/create_workspace_without_md5.sql b/backend/custom_migrations/create_workspace_without_md5.sql
new file mode 100644
index 0000000000000..4a818d66118da
--- /dev/null
+++ b/backend/custom_migrations/create_workspace_without_md5.sql
@@ -0,0 +1,16 @@
+INSERT INTO workspace(id, name, owner) VALUES
+	('admins', 'Admins', 'admin@windmill.dev');
+
+INSERT INTO workspace_settings (workspace_id) VALUES
+	('admins');
+
+INSERT INTO workspace_key
+	(workspace_id, kind, key)
+	VALUES ('admins', 'cloud', array_to_string(
+    array(
+        SELECT chr( (trunc(65 + random() * 25)::int) + 
+                    CASE WHEN random() > 0.5 THEN 32 ELSE 0 END )  -- generates random uppercase/lowercase letters
+        FROM generate_series(1, 32) -- generates 32 characters
+    ),
+    ''
+));
\ No newline at end of file
diff --git a/backend/windmill-api/src/db.rs b/backend/windmill-api/src/db.rs
index 72ef2e168079b..41761d53b9c40 100644
--- a/backend/windmill-api/src/db.rs
+++ b/backend/windmill-api/src/db.rs
@@ -130,9 +130,19 @@ impl Migrate for CustomMigrator {
                 migration.version,
                 migration.description
             );
-            let r = self.inner.apply(migration).await;
-            tracing::info!("Finished applying migration {}", migration.version);
-            r
+            if migration.version == 20221207103910 {
+                tracing::info!("Skipping migration 20221207103910 to avoid using md5");
+                self.inner
+                    .execute(include_str!(
+                        "../../custom_migrations/create_workspace_without_md5.sql"
+                    ))
+                    .await?;
+                return Ok(std::time::Duration::from_secs(0));
+            } else {
+                let r = self.inner.apply(migration).await;
+                tracing::info!("Finished applying migration {}", migration.version);
+                return r;
+            }
         }
         .boxed()
     }

From 0df169e3f996ed54b91569b13cce15d7d019a213 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Mon, 30 Sep 2024 16:30:59 +0200
Subject: [PATCH 6/7] feat: flow step skipping (#4461)

---
 backend/tests/worker.rs                       |  9 +-
 backend/windmill-api/src/flows.rs             |  4 +
 backend/windmill-common/src/flows.rs          |  8 ++
 backend/windmill-queue/src/jobs.rs            |  1 +
 backend/windmill-worker/src/worker_flow.rs    | 45 +++++++---
 .../content/FlowBranchesAllWrapper.svelte     |  8 ++
 .../content/FlowBranchesOneWrapper.svelte     |  8 ++
 .../components/flows/content/FlowLoop.svelte  |  8 +-
 .../flows/content/FlowModuleComponent.svelte  |  4 +
 .../flows/content/FlowModuleSkip.svelte       | 85 +++++++++++++++++++
 .../flows/content/FlowModuleWrapper.svelte    |  6 +-
 .../flows/content/FlowWhileLoop.svelte        |  8 ++
 openflow.openapi.yaml                         |  7 ++
 13 files changed, 185 insertions(+), 16 deletions(-)
 create mode 100644 frontend/src/lib/components/flows/content/FlowModuleSkip.svelte

diff --git a/backend/tests/worker.rs b/backend/tests/worker.rs
index e97c53700a396..ab008ae4c9fc0 100644
--- a/backend/tests/worker.rs
+++ b/backend/tests/worker.rs
@@ -1126,6 +1126,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1166,6 +1167,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                             priority: None,
                             delete_after_use: None,
                             continue_on_error: None,
+                            skip_if: None,
                         }],
                     }
                     .into(),
@@ -1181,6 +1183,7 @@ async fn test_deno_flow(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
             ],
             same_worker: false,
@@ -1286,6 +1289,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1336,6 +1340,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                 priority: None,
                                 delete_after_use: None,
                                 continue_on_error: None,
+                                skip_if: None,
                             },
                             FlowModule {
                                 id: "e".to_string(),
@@ -1372,7 +1377,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                                 priority: None,
                                 delete_after_use: None,
                                 continue_on_error: None,
-
+                                skip_if: None,
                             },
                         ],
                     }.into(),
@@ -1388,6 +1393,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "c".to_string(),
@@ -1431,6 +1437,7 @@ async fn test_deno_flow_same_worker(db: Pool<Postgres>) {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
             ],
             same_worker: true,
diff --git a/backend/windmill-api/src/flows.rs b/backend/windmill-api/src/flows.rs
index 0b5082c6e0cc5..ca9f9944dbe77 100644
--- a/backend/windmill-api/src/flows.rs
+++ b/backend/windmill-api/src/flows.rs
@@ -1176,6 +1176,7 @@ mod tests {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "b".to_string(),
@@ -1205,6 +1206,7 @@ mod tests {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
                 FlowModule {
                     id: "c".to_string(),
@@ -1232,6 +1234,7 @@ mod tests {
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 },
             ],
             failure_module: Some(Box::new(FlowModule {
@@ -1258,6 +1261,7 @@ mod tests {
                 priority: None,
                 delete_after_use: None,
                 continue_on_error: None,
+                skip_if: None,
             })),
             preprocessor_module: None,
             same_worker: false,
diff --git a/backend/windmill-common/src/flows.rs b/backend/windmill-common/src/flows.rs
index a5040a9da3997..958e9f13ef3ae 100644
--- a/backend/windmill-common/src/flows.rs
+++ b/backend/windmill-common/src/flows.rs
@@ -269,6 +269,13 @@ pub struct FlowModule {
     pub delete_after_use: Option<bool>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub continue_on_error: Option<bool>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub skip_if: Option<SkipIf>,
+}
+
+#[derive(Deserialize, Serialize, Debug, Clone)]
+pub struct SkipIf {
+    pub expr: String,
 }
 
 #[derive(Deserialize)]
@@ -631,6 +638,7 @@ pub fn add_virtual_items_if_necessary(modules: &mut Vec<FlowModule>) {
             priority: None,
             delete_after_use: None,
             continue_on_error: None,
+            skip_if: None,
         });
     }
 }
diff --git a/backend/windmill-queue/src/jobs.rs b/backend/windmill-queue/src/jobs.rs
index 8989e9ce9d4ce..c0235c9b2634b 100644
--- a/backend/windmill-queue/src/jobs.rs
+++ b/backend/windmill-queue/src/jobs.rs
@@ -3536,6 +3536,7 @@ pub async fn push<'c, 'd, R: rsmq_async::RsmqConnection + Send + 'c>(
                     priority: None,
                     delete_after_use: None,
                     continue_on_error: None,
+                    skip_if: None,
                 }],
                 same_worker: false,
                 failure_module: None,
diff --git a/backend/windmill-worker/src/worker_flow.rs b/backend/windmill-worker/src/worker_flow.rs
index 6474af6d461a2..c00fd81a443a2 100644
--- a/backend/windmill-worker/src/worker_flow.rs
+++ b/backend/windmill-worker/src/worker_flow.rs
@@ -2210,6 +2210,23 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
 
     drop(resume_messages);
 
+    let is_skipped = if let Some(skip_if) = &module.skip_if {
+        let idcontext = get_transform_context(&flow_job, previous_id.as_str(), &status).await?;
+        compute_bool_from_expr(
+            skip_if.expr.to_string(),
+            arc_flow_job_args.clone(),
+            arc_last_job_result.clone(),
+            None,
+            Some(idcontext.clone()),
+            Some(client),
+            Some((resumes.clone(), resume.clone(), approvers.clone())),
+            None,
+        )
+        .await?
+    } else {
+        false
+    };
+
     let args: windmill_common::error::Result<_> =
         if module.mock.is_some() && module.mock.as_ref().unwrap().enabled {
             let mut hm = HashMap::new();
@@ -2249,7 +2266,16 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
             );
             Ok(Marc::new(hm))
         } else {
-            match &module.get_value() {
+            let value = module.get_value();
+            match &value {
+                Ok(_) if matches!(value, Ok(FlowModuleValue::Identity)) || is_skipped => serde_json::from_str(
+                    &serde_json::to_string(&PreviousResult {
+                        previous_result: Some(&arc_last_job_result),
+                    })
+                    .unwrap(),
+                )
+                .map(Marc::new)
+                .map_err(|e| error::Error::InternalErr(format!("identity: {e:#}"))),
                 Ok(
                     FlowModuleValue::Script { input_transforms, .. }
                     | FlowModuleValue::RawScript { input_transforms, .. }
@@ -2270,16 +2296,7 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
                     )
                     .await
                     .map(Marc::new)
-                }
-                Ok(FlowModuleValue::Identity) => serde_json::from_str(
-                    &serde_json::to_string(&PreviousResult {
-                        previous_result: Some(&arc_last_job_result),
-                    })
-                    .unwrap(),
-                )
-                .map(Marc::new)
-                .map_err(|e| error::Error::InternalErr(format!("identity: {e:#}"))),
-
+                },
                 Ok(_) => Ok(arc_flow_job_args.clone()),
                 Err(e) => {
                     return Err(error::Error::InternalErr(format!(
@@ -2305,6 +2322,7 @@ async fn push_next_flow_job<R: rsmq_async::RsmqConnection + Send + Sync + Clone>
         resumes.clone(),
         resume.clone(),
         approvers.clone(),
+        is_skipped,
     )
     .await?;
     tracing::info!(id = %flow_job.id, root_id = %job_root, "next flow transform computed");
@@ -2971,6 +2989,7 @@ async fn compute_next_flow_transform(
     resumes: Arc<Box<RawValue>>,
     resume: Arc<Box<RawValue>>,
     approvers: Arc<Box<RawValue>>,
+    is_skipped: bool,
 ) -> error::Result<NextFlowTransform> {
     if module.mock.is_some() && module.mock.as_ref().unwrap().enabled {
         return Ok(NextFlowTransform::Continue(
@@ -2997,6 +3016,9 @@ async fn compute_next_flow_transform(
     let delete_after_use = module.delete_after_use.unwrap_or(false);
 
     tracing::debug!(id = %flow_job.id, "computing next flow transform for {:?}", &module.value);
+    if is_skipped {
+        return trivial_next_job(JobPayload::Identity);
+    }
     match &module.get_value()? {
         FlowModuleValue::Identity => trivial_next_job(JobPayload::Identity),
         FlowModuleValue::Flow { path, .. } => {
@@ -3490,6 +3512,7 @@ fn is_simple_modules(modules: &Vec<FlowModule>, flow: &FlowValue) -> bool {
         && modules[0].retry.is_none()
         && modules[0].stop_after_if.is_none()
         && modules[0].stop_after_all_iters_if.is_none()
+        && modules[0].skip_if.is_none()
         && (modules[0].mock.is_none() || modules[0].mock.as_ref().is_some_and(|m| !m.enabled))
         && flow.failure_module.is_none();
     is_simple
diff --git a/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte b/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte
index 1399739a0c2b9..01a14049c7803 100644
--- a/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowBranchesAllWrapper.svelte
@@ -14,10 +14,12 @@
 	import FlowModuleMock from './FlowModuleMock.svelte'
 	import FlowModuleDeleteAfterUse from './FlowModuleDeleteAfterUse.svelte'
 	import { enterpriseLicense } from '$lib/stores'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	export let noEditor: boolean
 	export let flowModule: FlowModule
 	export let previousModule: FlowModule | undefined
+	export let parentModule: FlowModule | undefined
 
 	let value = flowModule.value as BranchAll
 	$: value = flowModule.value as BranchAll
@@ -77,6 +79,7 @@
 					<Pane size={40}>
 						<Tabs bind:selected>
 							<Tab value="early-stop">Early Stop/Break</Tab>
+							<Tab value="skip">Skip</Tab>
 							<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 							<Tab value="sleep">Sleep</Tab>
 							<Tab value="mock">Mock</Tab>
@@ -88,6 +91,11 @@
 											<FlowModuleEarlyStop bind:flowModule />
 										</div>
 									</TabContent>
+									<TabContent value="skip" class="flex flex-col flex-1 h-full">
+										<div class="p-4 overflow-y-auto">
+											<FlowModuleSkip bind:flowModule {parentModule} {previousModule} />
+										</div>
+									</TabContent>
 									<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 										<div class="p-4 overflow-y-auto">
 											<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule />
diff --git a/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte b/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte
index c4fc266b0a4ee..3adfaebe05243 100644
--- a/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowBranchesOneWrapper.svelte
@@ -14,10 +14,12 @@
 	import SplitPanesWrapper from '../../splitPanes/SplitPanesWrapper.svelte'
 	import FlowModuleMock from './FlowModuleMock.svelte'
 	import { enterpriseLicense } from '$lib/stores'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 	// import FlowRetries from './FlowRetries.svelte'
 
 	export let flowModule: FlowModule
 	export let previousModule: FlowModule | undefined
+	export let parentModule: FlowModule | undefined
 	export let noEditor: boolean
 	export let enableAi = false
 
@@ -89,6 +91,7 @@
 					<Pane size={40}>
 						<Tabs bind:selected>
 							<Tab value="early-stop">Early Stop/Break</Tab>
+							<Tab value="skip">Skip</Tab>
 							<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 							<Tab value="sleep">Sleep</Tab>
 							<Tab value="mock">Mock</Tab>
@@ -100,6 +103,11 @@
 											<FlowModuleEarlyStop bind:flowModule />
 										</div>
 									</TabContent>
+									<TabContent value="skip" class="flex flex-col flex-1 h-full">
+										<div class="p-4 overflow-y-auto">
+											<FlowModuleSkip bind:flowModule {parentModule} {previousModule} />
+										</div>
+									</TabContent>
 									<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 										<div class="p-4 overflow-y-auto">
 											<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule />
diff --git a/frontend/src/lib/components/flows/content/FlowLoop.svelte b/frontend/src/lib/components/flows/content/FlowLoop.svelte
index cca4b6d411324..6180d2f0fdb91 100644
--- a/frontend/src/lib/components/flows/content/FlowLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowLoop.svelte
@@ -21,6 +21,7 @@
 	import FlowLoopIterationPreview from '$lib/components/FlowLoopIterationPreview.svelte'
 	import FlowModuleDeleteAfterUse from './FlowModuleDeleteAfterUse.svelte'
 	import IteratorGen from '$lib/components/copilot/IteratorGen.svelte'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	const { previewArgs, flowStateStore, flowStore } =
 		getContext<FlowEditorContext>('FlowEditorContext')
@@ -210,6 +211,7 @@
 				<Tabs bind:selected>
 					<!-- <Tab value="retries">Retries</Tab> -->
 					<Tab value="early-stop">Early Stop/Break</Tab>
+					<Tab value="skip">Skip</Tab>
 					<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 					<Tab value="sleep">Sleep</Tab>
 					<Tab value="mock">Mock</Tab>
@@ -228,7 +230,11 @@
 									<FlowModuleEarlyStop bind:flowModule={mod} />
 								</div>
 							</TabContent>
-
+							<TabContent value="skip" class="flex flex-col flex-1 h-full">
+								<div class="p-4 overflow-y-auto">
+									<FlowModuleSkip bind:flowModule={mod} {parentModule} {previousModule} />
+								</div>
+							</TabContent>
 							<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 								<div class="p-4 overflow-y-auto">
 									<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule={mod} />
diff --git a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
index 8d901be16792f..134e425ad462f 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleComponent.svelte
@@ -47,6 +47,7 @@
 	import { computeFlowStepWarning, initFlowStepWarnings } from '../utils'
 	import { debounce } from '$lib/utils'
 	import { dfs } from '../dfs'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	const {
 		selectedId,
@@ -418,6 +419,7 @@
 										>
 											Early Stop
 										</Tab>
+										<Tab value="skip" active={Boolean(flowModule.skip_if)}>Skip</Tab>
 										<Tab value="suspend" active={Boolean(flowModule.suspend)}>Suspend</Tab>
 										<Tab value="sleep" active={Boolean(flowModule.sleep)}>Sleep</Tab>
 										<Tab value="mock" active={Boolean(flowModule.mock?.enabled)}>Mock</Tab>
@@ -581,6 +583,8 @@
 										</div>
 									{:else if advancedSelected === 'early-stop'}
 										<FlowModuleEarlyStop bind:flowModule />
+									{:else if advancedSelected === 'skip'}
+										<FlowModuleSkip bind:flowModule {parentModule} {previousModule} />
 									{:else if advancedSelected === 'suspend'}
 										<div>
 											<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule />
diff --git a/frontend/src/lib/components/flows/content/FlowModuleSkip.svelte b/frontend/src/lib/components/flows/content/FlowModuleSkip.svelte
new file mode 100644
index 0000000000000..c53d9d1dc30a8
--- /dev/null
+++ b/frontend/src/lib/components/flows/content/FlowModuleSkip.svelte
@@ -0,0 +1,85 @@
+<script lang="ts">
+	import SimpleEditor from '$lib/components/SimpleEditor.svelte'
+	import Toggle from '$lib/components/Toggle.svelte'
+	import PropPickerWrapper from '$lib/components/flows/propPicker/PropPickerWrapper.svelte'
+	import type { FlowModule } from '$lib/gen'
+	import Tooltip from '$lib/components/Tooltip.svelte'
+	import type { FlowEditorContext } from '../types'
+	import { getContext } from 'svelte'
+	import Section from '$lib/components/Section.svelte'
+	import { getStepPropPicker } from '../previousResults'
+
+	const { flowStateStore, flowStore, previewArgs } =
+		getContext<FlowEditorContext>('FlowEditorContext')
+
+	export let flowModule: FlowModule
+	export let parentModule: FlowModule | undefined
+	export let previousModule: FlowModule | undefined
+
+	let editor: SimpleEditor | undefined = undefined
+	$: stepPropPicker = getStepPropPicker(
+		$flowStateStore,
+		parentModule,
+		previousModule,
+		flowModule.id,
+		$flowStore,
+		$previewArgs,
+		false
+	)
+
+	$: isSkipEnabled = Boolean(flowModule.skip_if)
+</script>
+
+<div class="flex flex-col items-start space-y-2 {$$props.class}">
+	<Section label="Skip" class="w-full">
+		<svelte:fragment slot="header">
+			<Tooltip>
+				If the condition is met, the step will behave as an identity step, passing the previous
+				step's result through unchanged.
+			</Tooltip>
+		</svelte:fragment>
+
+		<Toggle
+			checked={isSkipEnabled}
+			on:change={() => {
+				if (isSkipEnabled && flowModule.skip_if) {
+					flowModule.skip_if = undefined
+				} else {
+					flowModule.skip_if = {
+						expr: 'false'
+					}
+				}
+			}}
+			options={{
+				right: 'Skip step if condition is met'
+			}}
+		/>
+
+		<div class="w-full border p-2 flex flex-col {flowModule.skip_if ? '' : 'bg-surface-secondary'}">
+			{#if flowModule.skip_if}
+				<span class="mt-2 text-xs font-bold">Skip condition expression</span>
+				<div class="border w-full">
+					<PropPickerWrapper
+						notSelectable
+						pickableProperties={stepPropPicker.pickableProperties}
+						on:select={({ detail }) => {
+							editor?.insertAtCursor(detail)
+							editor?.focus()
+						}}
+					>
+						<SimpleEditor
+							bind:this={editor}
+							lang="javascript"
+							bind:code={flowModule.skip_if.expr}
+							class="few-lines-editor"
+							extraLib={stepPropPicker.extraLib}
+						/>
+					</PropPickerWrapper>
+				</div>
+			{:else}
+				<span class="mt-2 text-xs font-bold">Skip condition expression</span>
+				<textarea disabled rows="3" class="min-h-[80px]" />
+			{/if}
+		</div>
+	</Section>
+</div>
diff --git a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
index 92250304e89dd..53caf04537d7f 100644
--- a/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
+++ b/frontend/src/lib/components/flows/content/FlowModuleWrapper.svelte
@@ -80,11 +80,11 @@
 	{#if flowModule.value.type === 'forloopflow'}
 		<FlowLoop {noEditor} bind:mod={flowModule} {parentModule} {previousModule} {enableAi} />
 	{:else if flowModule.value.type === 'whileloopflow'}
-		<FlowWhileLoop {noEditor} bind:mod={flowModule} {previousModule} />
+		<FlowWhileLoop {noEditor} bind:mod={flowModule} {previousModule} {parentModule} />
 	{:else if flowModule.value.type === 'branchone'}
-		<FlowBranchesOneWrapper {noEditor} {previousModule} bind:flowModule {enableAi} />
+		<FlowBranchesOneWrapper {noEditor} {previousModule} {parentModule} bind:flowModule {enableAi} />
 	{:else if flowModule.value.type === 'branchall'}
-		<FlowBranchesAllWrapper {noEditor} {previousModule} bind:flowModule />
+		<FlowBranchesAllWrapper {noEditor} {previousModule} {parentModule} bind:flowModule />
 	{:else if flowModule.value.type === 'identity'}
 		{#if $selectedId == 'failure'}
 			<div class="p-4">
diff --git a/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte b/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
index c68e73973bf5c..11f5929592300 100644
--- a/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
@@ -17,11 +17,13 @@
 	import type { FlowModule, Job } from '$lib/gen'
 	import FlowLoopIterationPreview from '$lib/components/FlowLoopIterationPreview.svelte'
 	import FlowModuleDeleteAfterUse from './FlowModuleDeleteAfterUse.svelte'
+	import FlowModuleSkip from './FlowModuleSkip.svelte'
 
 	const { flowStateStore } = getContext<FlowEditorContext>('FlowEditorContext')
 
 	export let mod: FlowModule
 	export let previousModule: FlowModule | undefined
+	export let parentModule: FlowModule | undefined
 	export let noEditor: boolean
 
 	let selected: string = 'early-stop'
@@ -124,6 +126,12 @@
 								</div>
 							</TabContent>
 
+							<TabContent value="skip" class="flex flex-col flex-1 h-full">
+								<div class="p-4 overflow-y-auto">
+									<FlowModuleSkip bind:flowModule={mod} {parentModule} {previousModule} />
+								</div>
+							</TabContent>
+
 							<TabContent value="suspend" class="flex flex-col flex-1 h-full">
 								<div class="p-4 overflow-y-auto">
 									<FlowModuleSuspend previousModuleId={previousModule?.id} bind:flowModule={mod} />
diff --git a/openflow.openapi.yaml b/openflow.openapi.yaml
index e4600e9528a21..d544bcd50e782 100644
--- a/openflow.openapi.yaml
+++ b/openflow.openapi.yaml
@@ -114,6 +114,13 @@ components:
               type: string
           required:
             - expr
+        skip_if:
+          type: object
+          properties:
+            expr:
+              type: string
+          required:
+            - expr
         sleep:
           $ref: "#/components/schemas/InputTransform"
         cache_ttl:

From 161c3fe577b07f945bd60d741d50782e5c271de9 Mon Sep 17 00:00:00 2001
From: HugoCasa <hugo@casademont.ch>
Date: Mon, 30 Sep 2024 16:38:01 +0200
Subject: [PATCH 7/7] flow skip step nit (#4462)

---
 frontend/src/lib/components/flows/content/FlowWhileLoop.svelte | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte b/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
index 11f5929592300..c9363f1359b4c 100644
--- a/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
+++ b/frontend/src/lib/components/flows/content/FlowWhileLoop.svelte
@@ -107,6 +107,7 @@
 				<Tabs bind:selected>
 					<!-- <Tab value="retries">Retries</Tab> -->
 					<Tab value="early-stop">Early Stop/Break</Tab>
+					<Tab value="skip">Skip</Tab>
 					<Tab value="suspend">Suspend/Approval/Prompt</Tab>
 					<Tab value="sleep">Sleep</Tab>
 					<Tab value="mock">Mock</Tab>