From 439c9c6e1f61b40ecd3b4f0fb585c1354124f110 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Fri, 27 Jan 2023 17:09:55 +0200
Subject: [PATCH 001/358] fix: Fix RecycleScroller end index (no-changelog)
 (#5272)

---
 .../src/components/N8nRecycleScroller/RecycleScroller.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
index a9943b12016368..eb4e11f76e4bd9 100644
--- a/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
+++ b/packages/design-system/src/components/N8nRecycleScroller/RecycleScroller.vue
@@ -87,7 +87,7 @@ export default defineComponent({
 			});
 			const index = foundIndex + props.offset;
 
-			return index === -1 ? props.items.length - 1 : index;
+			return foundIndex === -1 ? props.items.length - 1 : index;
 		});
 
 		const visibleItems = computed(() => {

From b9768b3b80d5a6190ff1b7560ef374ecc219bd2f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:26:41 +0000
Subject: [PATCH 002/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.134.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index d67bf6ade3d648..06e5bac8b46bbe 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.133.2",
+  "version": "0.134.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 8c9412767f19ff966602fdcbcc3da19f2c8d630f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:26:54 +0000
Subject: [PATCH 003/358] :arrow_up: Set n8n-workflow@0.134.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 2cd75d60aa4833..758e63684f46e3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,7 +55,7 @@
     "form-data": "^4.0.0",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.133.2",
+    "n8n-workflow": "~0.134.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "pretty-bytes": "^5.6.0",

From 69f38186a56f0c5000bce05c6d210e9bd318e21b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:26:54 +0000
Subject: [PATCH 004/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.15?=
 =?UTF-8?q?2.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 758e63684f46e3..c588b8d2458d52 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.151.2",
+  "version": "0.152.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From f61f83f256f3731222303b82ef6e70b8d7ae8eab Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:27:06 +0000
Subject: [PATCH 005/358] :arrow_up: Set n8n-core@0.152.0 and
 n8n-workflow@0.134.0 on n8n-node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index f41b15b370ed3c..36c3e5eb5705d4 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.151.2",
-    "n8n-workflow": "~0.133.2",
+    "n8n-core": "~0.152.0",
+    "n8n-workflow": "~0.134.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From 77287dc87b1d5ede2ec49e55e7a8fa11088a063a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:27:06 +0000
Subject: [PATCH 006/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@?=
 =?UTF-8?q?0.91.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 36c3e5eb5705d4..49ca5c31e4fb03 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.90.2",
+  "version": "0.91.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From db496f5aaf84ef3e1fd394bbc65e357dd70f4ac2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:27:20 +0000
Subject: [PATCH 007/358] :arrow_up: Set n8n-core@0.152.0 and
 n8n-workflow@0.134.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index f5cb67fdfce913..4f633034b18312 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -758,7 +758,7 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "~0.133.2"
+    "n8n-workflow": "~0.134.0"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
@@ -797,7 +797,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "~0.151.2",
+    "n8n-core": "~0.152.0",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",

From da19e50f83c2258f89de5c6c0d113d42494f2224 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:27:20 +0000
Subject: [PATCH 008/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.211.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4f633034b18312..fb050da457d96e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.210.1",
+  "version": "0.211.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From c8205dd55e9b31b35a3e32462229076dc75067e1 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:28:37 +0000
Subject: [PATCH 009/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-design-sy?=
 =?UTF-8?q?stem@0.52.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/design-system/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 917b91203b3cc9..1727c4a9f7d46e 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "0.51.1",
+  "version": "0.52.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {

From 3906346dc95ddd2cded23af99d24faa680c51ef8 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:28:59 +0000
Subject: [PATCH 010/358] :arrow_up: Set n8n-design-system@0.52.0 and
 n8n-workflow@0.134.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 1041edb9b0e54a..bc7c5e20322f3c 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -59,8 +59,8 @@
     "lodash.set": "^4.3.2",
     "luxon": "^2.3.0",
     "monaco-editor": "^0.33.0",
-    "n8n-design-system": "~0.51.1",
-    "n8n-workflow": "~0.133.2",
+    "n8n-design-system": "~0.52.0",
+    "n8n-workflow": "~0.134.0",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.0.22",
     "prettier": "^2.8.3",

From 966abdc37f83193884aa2147c71b327421b5ab9a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:29:00 +0000
Subject: [PATCH 011/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.179.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index bc7c5e20322f3c..1f2a8db3e1703a 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.178.1",
+  "version": "0.179.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 5f867d1b45643764f3918d108dfc8891c95892f6 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:33:48 +0000
Subject: [PATCH 012/358] :arrow_up: Set n8n-core@0.152.0,
 n8n-editor-ui@0.179.0, n8n-nodes-base@0.211.0 and n8n-workflow@0.134.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index c769d88d59d0c1..b9c1977cd76eec 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -165,10 +165,10 @@
     "lodash.unset": "^4.5.2",
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
-    "n8n-core": "~0.151.2",
-    "n8n-editor-ui": "~0.178.1",
-    "n8n-nodes-base": "~0.210.1",
-    "n8n-workflow": "~0.133.2",
+    "n8n-core": "~0.152.0",
+    "n8n-editor-ui": "~0.179.0",
+    "n8n-nodes-base": "~0.211.0",
+    "n8n-workflow": "~0.134.0",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 97126a3a5671c168577b828f449e56f6905a424e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 15:33:49 +0000
Subject: [PATCH 013/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.213.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index b9c1977cd76eec..98fe5c97b59861 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.212.1",
+  "version": "0.213.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 731ce96621eb7cd94995a820a1fd2d2edc8c4a0a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 27 Jan 2023 10:19:06 -0600
Subject: [PATCH 014/358] :books: Update CHANGELOG.md and main package.json to
 0.213.0

---
 CHANGELOG.md   | 33 +++++++++++++++++++++++++++++++++
 package.json   |  2 +-
 pnpm-lock.yaml | 22 +++++++++++-----------
 3 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 135c170d7ecdde..4d124452bb022a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,36 @@
+# [0.213.0](https://github.com/n8n-io/n8n/compare/n8n@0.212.1...n8n@0.213.0) (2023-01-27)
+
+
+### Bug Fixes
+
+* **core:** Do not crash express app on unhandled rejected promises ([#5252](https://github.com/n8n-io/n8n/issues/5252)) ([7e229a3](https://github.com/n8n-io/n8n/commit/7e229a3d38990022172d4df98afd3dc31dca6e63))
+* **core:** Handle missing binary metadata in download urls ([#5242](https://github.com/n8n-io/n8n/issues/5242)) ([21579a8](https://github.com/n8n-io/n8n/commit/21579a8a2af53f3fb4174afc2013cfad43511a31))
+* **core:** Upsert credentials and workflows in the import: commands ([#5231](https://github.com/n8n-io/n8n/issues/5231)) ([259296c](https://github.com/n8n-io/n8n/commit/259296c5c940bd5dcebec5ad3c9acc99a7923b8f))
+* **core:** Validate numeric IDs in the public API ([#5251](https://github.com/n8n-io/n8n/issues/5251)) ([68e4083](https://github.com/n8n-io/n8n/commit/68e4083bbdb8200966dc9e702bed9ca5cbc1cdf4))
+* **editor:** Do not request workflow data twice when opening a workflow ([#5246](https://github.com/n8n-io/n8n/issues/5246)) ([901e94d](https://github.com/n8n-io/n8n/commit/901e94dc01c4b352301053990f197eda48c30b41))
+* **editor:** Execution list micro optimization ([#5244](https://github.com/n8n-io/n8n/issues/5244)) ([a1710fb](https://github.com/n8n-io/n8n/commit/a1710fbd272a0f3980a8f323bbccf58806e9b900))
+* **editor:** Fix node authentication options ordering and hiding options based on node version ([#5268](https://github.com/n8n-io/n8n/issues/5268)) ([7d74181](https://github.com/n8n-io/n8n/commit/7d7418140eb03da6014ff8ac51668fc427d10c33))
+* **editor:** Fix save modal appearing after duplicating a workflow ([#5247](https://github.com/n8n-io/n8n/issues/5247)) ([c711c53](https://github.com/n8n-io/n8n/commit/c711c53ad6b044b8f90a237d6d8d1ce631359dc3))
+* **editor:** Prevent workflow execution list infinite no network error ([#5230](https://github.com/n8n-io/n8n/issues/5230)) ([0d33329](https://github.com/n8n-io/n8n/commit/0d33329bc87b705760fdc70ccb39374cbd71f6f6))
+* Extension being too eager and making calls when it shouldn't ([#5232](https://github.com/n8n-io/n8n/issues/5232)) ([09bdd96](https://github.com/n8n-io/n8n/commit/09bdd96d290166cced6faf5da4dda83d6d270aa3))
+* **Google Drive Node:** Use the correct mimetype on converted downloads ([#5240](https://github.com/n8n-io/n8n/issues/5240)) ([58d0890](https://github.com/n8n-io/n8n/commit/58d0890dc319c918183fd81999dc87ea9c4732fd))
+* **HelpScout Node:** Fix tag search not working when getting all conversations ([#5239](https://github.com/n8n-io/n8n/issues/5239)) ([6d36782](https://github.com/n8n-io/n8n/commit/6d36782463cda1d211270ecf9bd1a8cccca22cdc))
+* **Notion (Beta) Node:** Fix create database page with multiple relation IDs not working ([#5260](https://github.com/n8n-io/n8n/issues/5260)) ([8ce85e3](https://github.com/n8n-io/n8n/commit/8ce85e37592da061164db18af52852e8ed1d2046))
+
+
+### Features
+
+* **core:** Add LDAP support ([#3835](https://github.com/n8n-io/n8n/issues/3835)) ([0c70a40](https://github.com/n8n-io/n8n/commit/0c70a4031702d3c770968d5679d2900def7225a8))
+* **editor:** Adjust Google sign-in button to adhere to the guidelines ([#5248](https://github.com/n8n-io/n8n/issues/5248)) ([73cbddc](https://github.com/n8n-io/n8n/commit/73cbddcb2dc046f1795740a5dd2258577df4d049))
+* **editor:** Simplify NDV by moving authentication details to credentials modal ([#5067](https://github.com/n8n-io/n8n/issues/5067)) ([b321c5e](https://github.com/n8n-io/n8n/commit/b321c5e4ec5aefa605991861db68efc860e0f122))
+* **GitLab Node:** Add file operations (create, delete, edit, get, list) ([#5167](https://github.com/n8n-io/n8n/issues/5167)) ([cedf2e0](https://github.com/n8n-io/n8n/commit/cedf2e012c7309cd225f9810d30315c851bcab3a))
+* HTML node ([#5107](https://github.com/n8n-io/n8n/issues/5107)) ([74e6f5d](https://github.com/n8n-io/n8n/commit/74e6f5d190d010831fc2ef98afdd9dff3dc93b3c))
+* Improve workflow list performance using RecycleScroller and on-demand sharing data loading ([#5181](https://github.com/n8n-io/n8n/issues/5181)) ([874c735](https://github.com/n8n-io/n8n/commit/874c735d0af81c3c81cf82fb9bdf1232608d6400)), closes [#5125](https://github.com/n8n-io/n8n/issues/5125)
+* **Jira Software Node:** Use resource locator component ([#5090](https://github.com/n8n-io/n8n/issues/5090)) ([237b1d8](https://github.com/n8n-io/n8n/commit/237b1d8614ffd19215eaee6a0cb9422a16cf0a5c))
+* **Send Email Node:** Overhaul ([832fb87](https://github.com/n8n-io/n8n/commit/832fb87954d480ed46913c8b0f8067c96db28aab))
+
+
+
 ## [0.212.1](https://github.com/n8n-io/n8n/compare/n8n@0.212.0...n8n@0.212.1) (2023-01-23)
 
 ### Bug Fixes
diff --git a/package.json b/package.json
index 373c2843503a58..ff0f3e858d5b77 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.212.1",
+  "version": "0.213.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 5fc0335535f567..7bbbbf612ee207 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -195,10 +195,10 @@ importers:
       lodash.unset: ^4.5.2
       luxon: ^3.1.0
       mysql2: ~2.3.3
-      n8n-core: ~0.151.2
-      n8n-editor-ui: ~0.178.1
-      n8n-nodes-base: ~0.210.1
-      n8n-workflow: ~0.133.2
+      n8n-core: ~0.152.0
+      n8n-editor-ui: ~0.179.0
+      n8n-nodes-base: ~0.211.0
+      n8n-workflow: ~0.134.0
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
       oauth-1.0a: ^2.2.6
@@ -391,7 +391,7 @@ importers:
       form-data: ^4.0.0
       lodash.get: ^4.4.2
       mime-types: ^2.1.27
-      n8n-workflow: ~0.133.2
+      n8n-workflow: ~0.134.0
       oauth-1.0a: ^2.2.6
       p-cancelable: ^2.0.0
       pretty-bytes: ^5.6.0
@@ -570,8 +570,8 @@ importers:
       lodash.set: ^4.3.2
       luxon: ^2.3.0
       monaco-editor: ^0.33.0
-      n8n-design-system: ~0.51.1
-      n8n-workflow: ~0.133.2
+      n8n-design-system: ~0.52.0
+      n8n-workflow: ~0.134.0
       normalize-wheel: ^1.0.1
       pinia: ^2.0.22
       prettier: ^2.8.3
@@ -697,8 +697,8 @@ importers:
       change-case: ^4.1.1
       fast-glob: ^3.2.5
       inquirer: ^7.0.1
-      n8n-core: ~0.151.2
-      n8n-workflow: ~0.133.2
+      n8n-core: ~0.152.0
+      n8n-workflow: ~0.134.0
       oauth-1.0a: ^2.2.6
       replace-in-file: ^6.0.0
       request: ^2.88.2
@@ -790,8 +790,8 @@ importers:
       mqtt: 4.2.6
       mssql: ^8.1.2
       mysql2: ~2.3.0
-      n8n-core: ~0.151.2
-      n8n-workflow: ~0.133.2
+      n8n-core: ~0.152.0
+      n8n-workflow: ~0.134.0
       node-html-markdown: ^1.1.3
       node-ssh: ^12.0.0
       nodemailer: ^6.7.1

From 911d656f995a9a7f50db7e97ae25fcc3230ae4a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 30 Jan 2023 09:32:04 +0100
Subject: [PATCH 015/358] fix(editor): Handling router errors when navigation
 is canceled by user (#5271)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🔨 Handling router errors in main sidebar, removing unused code
* 🔨 Handling router errors in modals
---
 .../editor-ui/src/components/MainSidebar.vue  | 75 ++++---------------
 .../src/components/WorkflowShareModal.ee.vue  |  7 +-
 2 files changed, 19 insertions(+), 63 deletions(-)

diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index 229f826fd9c5b0..b76dcdf874d713 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -104,15 +104,7 @@ import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { workflowRun } from '@/mixins/workflowRun';
 
 import mixins from 'vue-typed-mixins';
-import {
-	MODAL_CANCEL,
-	MODAL_CLOSE,
-	MODAL_CONFIRMED,
-	ABOUT_MODAL_KEY,
-	VERSIONS_MODAL_KEY,
-	VIEWS,
-	PLACEHOLDER_EMPTY_WORKFLOW_ID,
-} from '@/constants';
+import { ABOUT_MODAL_KEY, VERSIONS_MODAL_KEY, VIEWS } from '@/constants';
 import { userHelpers } from '@/mixins/userHelpers';
 import { debounceHelper } from '@/mixins/debounce';
 import Vue from 'vue';
@@ -123,6 +115,7 @@ import { useUsersStore } from '@/stores/users';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useRootStore } from '@/stores/n8nRootStore';
 import { useVersionsStore } from '@/stores/versions';
+import { isNavigationFailure, NavigationFailureType, Route } from 'vue-router';
 
 export default mixins(
 	genericHelpers,
@@ -371,25 +364,25 @@ export default mixins(
 			switch (key) {
 				case 'workflows': {
 					if (this.$router.currentRoute.name !== VIEWS.WORKFLOWS) {
-						this.$router.push({ name: VIEWS.WORKFLOWS });
+						this.goToRoute({ name: VIEWS.WORKFLOWS });
 					}
 					break;
 				}
 				case 'templates': {
 					if (this.$router.currentRoute.name !== VIEWS.TEMPLATES) {
-						this.$router.push({ name: VIEWS.TEMPLATES });
+						this.goToRoute({ name: VIEWS.TEMPLATES });
 					}
 					break;
 				}
 				case 'credentials': {
 					if (this.$router.currentRoute.name !== VIEWS.CREDENTIALS) {
-						this.$router.push({ name: VIEWS.CREDENTIALS });
+						this.goToRoute({ name: VIEWS.CREDENTIALS });
 					}
 					break;
 				}
 				case 'executions': {
 					if (this.$router.currentRoute.name !== VIEWS.EXECUTIONS) {
-						this.$router.push({ name: VIEWS.EXECUTIONS });
+						this.goToRoute({ name: VIEWS.EXECUTIONS });
 					}
 					break;
 				}
@@ -398,7 +391,7 @@ export default mixins(
 					if (defaultRoute) {
 						const routeProps = this.$router.resolve({ name: defaultRoute });
 						if (this.$router.currentRoute.name !== defaultRoute) {
-							this.$router.push(routeProps.route.path);
+							this.goToRoute(routeProps.route.path);
 						}
 					}
 					break;
@@ -419,55 +412,13 @@ export default mixins(
 					break;
 			}
 		},
-		async createNewWorkflow(): Promise<void> {
-			const result = this.uiStore.stateIsDirty;
-			if (result) {
-				const confirmModal = await this.confirmModal(
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-					'warning',
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
-					true,
-				);
-				if (confirmModal === MODAL_CONFIRMED) {
-					const saved = await this.saveCurrentWorkflow({}, false);
-					if (saved) await this.settingsStore.fetchPromptsData();
-					if (this.$router.currentRoute.name === VIEWS.NEW_WORKFLOW) {
-						this.$root.$emit('newWorkflow');
-					} else {
-						this.$router.push({ name: VIEWS.NEW_WORKFLOW });
-					}
-					this.$showMessage({
-						title: this.$locale.baseText('mainSidebar.showMessage.handleSelect2.title'),
-						type: 'success',
-					});
-				} else if (confirmModal === MODAL_CANCEL) {
-					this.uiStore.stateIsDirty = false;
-					if (this.$router.currentRoute.name === VIEWS.NEW_WORKFLOW) {
-						this.$root.$emit('newWorkflow');
-					} else {
-						this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
-						this.$router.push({ name: VIEWS.NEW_WORKFLOW });
-					}
-					this.$showMessage({
-						title: this.$locale.baseText('mainSidebar.showMessage.handleSelect2.title'),
-						type: 'success',
-					});
-				} else if (confirmModal === MODAL_CLOSE) {
-					return;
-				}
-			} else {
-				if (this.$router.currentRoute.name !== VIEWS.NEW_WORKFLOW) {
-					this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
-					this.$router.push({ name: VIEWS.NEW_WORKFLOW });
+		goToRoute(route: string | { name: string }) {
+			this.$router.push(route).catch((failure) => {
+				// Catch navigation failures caused by route guards
+				if (!isNavigationFailure(failure)) {
+					console.error(failure);
 				}
-				this.$showMessage({
-					title: this.$locale.baseText('mainSidebar.showMessage.handleSelect3.title'),
-					type: 'success',
-				});
-			}
-			this.$titleReset();
+			});
 		},
 		findFirstAccessibleSettingsRoute() {
 			// Get all settings rotes by filtering them by pageCategory property
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 3f5961b06619ac..15f2c6f15b6057 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -155,6 +155,7 @@ import { useWorkflowsEEStore } from '@/stores/workflows.ee';
 import { ITelemetryTrackProperties } from 'n8n-workflow';
 import { useUsageStore } from '@/stores/usage';
 import { BaseTextKey } from '@/plugins/i18n';
+import { isNavigationFailure } from 'vue-router';
 
 export default mixins(showMessage).extend({
 	name: 'workflow-share-modal',
@@ -427,7 +428,11 @@ export default mixins(showMessage).extend({
 			await this.usersStore.fetchUsers();
 		},
 		goToUsersSettings() {
-			this.$router.push({ name: VIEWS.USERS_SETTINGS });
+			this.$router.push({ name: VIEWS.USERS_SETTINGS }).catch((failure) => {
+				if (!isNavigationFailure(failure)) {
+					console.error(failure);
+				}
+			});
 			this.modalBus.$emit('close');
 		},
 		trackTelemetry(data: ITelemetryTrackProperties) {

From dbcbe595ccec2075b5aded5cb00b11aafd61db02 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 30 Jan 2023 11:02:05 +0100
Subject: [PATCH 016/358] ci(core): Fix docker nightly/custom image build
 (no-changelog) (#5284)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ci(core): Copy patches dir to Docker (no-changelog)

* Update patch

* Update package-lock

* reapply the patch

* skip patchedDependencies after the frontend is built

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 docker/images/n8n-custom/Dockerfile | 2 ++
 patches/element-ui@2.15.12.patch    | 3 +--
 pnpm-lock.yaml                      | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/docker/images/n8n-custom/Dockerfile b/docker/images/n8n-custom/Dockerfile
index 6f49901cdced8b..76ee6ded63d80c 100644
--- a/docker/images/n8n-custom/Dockerfile
+++ b/docker/images/n8n-custom/Dockerfile
@@ -6,6 +6,7 @@ FROM n8nio/base:${NODE_VERSION} as builder
 COPY turbo.json package.json .npmrc pnpm-lock.yaml pnpm-workspace.yaml tsconfig.json ./
 COPY scripts ./scripts
 COPY packages ./packages
+COPY patches ./patches
 
 RUN apk add --update libc6-compat jq
 RUN corepack enable && corepack prepare --activate
@@ -15,6 +16,7 @@ USER node
 RUN pnpm install --frozen-lockfile
 RUN pnpm build
 RUN rm -rf node_modules
+RUN jq 'del(.pnpm.patchedDependencies)' package.json > package.json.tmp; mv package.json.tmp package.json
 RUN jq '{name: .name, version: .version}' packages/editor-ui/package.json > editor-ui.tmp; mv editor-ui.tmp packages/editor-ui/package.json
 RUN jq '{name: .name, version: .version}' packages/design-system/package.json > design-system.tmp; mv design-system.tmp packages/design-system/package.json
 RUN NODE_ENV=production pnpm install --prod --no-optional
diff --git a/patches/element-ui@2.15.12.patch b/patches/element-ui@2.15.12.patch
index 1b598f92bc4c09..3f7ef6e50a9156 100644
--- a/patches/element-ui@2.15.12.patch
+++ b/patches/element-ui@2.15.12.patch
@@ -130,7 +130,7 @@ index 6209b8b7f21c6eea447dd4671b7c4cfc1ef5e9c2..a26772af8dcdcbc0e3a6058bda30c7f9
      if (reference.nodeType === 1) {
        Object(dom_["off"])(reference, 'mouseenter', this.show);
 diff --git a/packages/popover/src/main.vue b/packages/popover/src/main.vue
-index ab5d060182c2e671989f1aba190c85a074d2c754..d87f1b592d7d408d185229b9f9e29070ec2c6fe8 100644
+index ab5d060182c2e671989f1aba190c85a074d2c754..8b464ad39a78ac6efead5f687d977500642e45dc 100644
 --- a/packages/popover/src/main.vue
 +++ b/packages/popover/src/main.vue
 @@ -98,16 +98,9 @@ export default {
@@ -217,7 +217,6 @@ index ab5d060182c2e671989f1aba190c85a074d2c754..d87f1b592d7d408d185229b9f9e29070
    }
  };
  </script>
-\ No newline at end of file
 diff --git a/packages/tooltip/src/main.js b/packages/tooltip/src/main.js
 index dc930ec58d42328a4d62cddb22fd513db31793cf..d9a6afc80d27ea89b838a47f395e249131c1370c 100644
 --- a/packages/tooltip/src/main.js
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 7bbbbf612ee207..81c68eca183bfc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -15,7 +15,7 @@ overrides:
 
 patchedDependencies:
   element-ui@2.15.12:
-    hash: aaa3sc7bmwb4jwg35ga5npx4he
+    hash: prckukfdop5sl2her6de25cod4
     path: patches/element-ui@2.15.12.patch
 
 importers:
@@ -474,7 +474,7 @@ importers:
       webpack: ^4.46.0
       xss: ^1.0.14
     dependencies:
-      element-ui: 2.15.12_aaa3sc7bmwb4jwg35ga5npx4he_vue@2.7.14
+      element-ui: 2.15.12_chf3rdrkdm2au7cxasektiaxfy_vue@2.7.14
       markdown-it: 13.0.1
       markdown-it-emoji: 2.0.2
       markdown-it-link-attributes: 4.0.1
@@ -10915,7 +10915,7 @@ packages:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
-  /element-ui/2.15.12_aaa3sc7bmwb4jwg35ga5npx4he_vue@2.7.14:
+  /element-ui/2.15.12_chf3rdrkdm2au7cxasektiaxfy_vue@2.7.14:
     resolution: {integrity: sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==}
     peerDependencies:
       vue: ^2.5.17

From 5b9c650e55c4cc089b14bf8f5322157a4f70f1f0 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Mon, 30 Jan 2023 12:20:33 +0100
Subject: [PATCH 017/358] test: Add unit testing to nodes (no-changelog)
 (#4890)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🧪 Add base for building unit testing within nodes

* Improve helper functions

* 🧪 If node test

* 🧪 Airtable node test

* 🧪 If node test improvements

* 🧪 Airtable node test improvements

* ♻️ cleanup node unit tests

* ♻️ refactor getting node result data to use helper method

* :zap: removed unused variables

* ♻️ Helper to read json files

---------

Co-authored-by: Marcus <marcus@n8n.io>
Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../test/nodes/Airtable/Airtable.node.test.ts |  64 ++++++
 .../test/nodes/Airtable/workflow.json         |  63 ++++++
 .../nodes-base/test/nodes/ExecuteWorkflow.ts  |  24 +++
 packages/nodes-base/test/nodes/Helpers.ts     | 183 ++++++++++++++++
 .../nodes-base/test/nodes/If/If.node.test.ts  |  58 +++++
 .../nodes-base/test/nodes/If/workflow.json    | 115 ++++++++++
 .../nodes-base/test/nodes/Set/SetNode.test.ts | 200 ++++++++++++++++++
 .../test/nodes/Start/StartNode.test.ts        |  48 +++++
 packages/nodes-base/test/nodes/types.ts       |  17 ++
 9 files changed, 772 insertions(+)
 create mode 100644 packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
 create mode 100644 packages/nodes-base/test/nodes/Airtable/workflow.json
 create mode 100644 packages/nodes-base/test/nodes/ExecuteWorkflow.ts
 create mode 100644 packages/nodes-base/test/nodes/Helpers.ts
 create mode 100644 packages/nodes-base/test/nodes/If/If.node.test.ts
 create mode 100644 packages/nodes-base/test/nodes/If/workflow.json
 create mode 100644 packages/nodes-base/test/nodes/Set/SetNode.test.ts
 create mode 100644 packages/nodes-base/test/nodes/Start/StartNode.test.ts
 create mode 100644 packages/nodes-base/test/nodes/types.ts

diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
new file mode 100644
index 00000000000000..cb03648804a243
--- /dev/null
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -0,0 +1,64 @@
+import { INodeType } from 'n8n-workflow';
+import { executeWorkflow } from '../ExecuteWorkflow';
+import * as Helpers from '../Helpers';
+import { WorkflowTestData } from '../types';
+import nock from 'nock';
+
+import { ManualTrigger } from '../../../nodes/ManualTrigger/ManualTrigger.node';
+import { Airtable } from '../../../nodes/Airtable/Airtable.node';
+
+const records = [
+	{
+		id: 'rec2BWBoyS5QsS7pT',
+		createdTime: '2022-08-25T08:22:34.000Z',
+		fields: {
+			name: 'Tim',
+			email: 'tim@email.com',
+		},
+	},
+];
+
+describe('Execute Airtable Node', () => {
+	beforeEach(() => {
+		nock.disableNetConnect();
+		nock('https://api.airtable.com/v0')
+			.get('/appIaXXdDqS5ORr4V/tbljyBEdYzCPF0NDh?pageSize=100')
+			.reply(200, { records });
+	});
+
+	afterEach(() => {
+		nock.restore();
+	});
+
+	const tests: Array<WorkflowTestData> = [
+		{
+			description: 'List Airtable Records',
+			input: {
+				workflowData: Helpers.readJsonFileSync('test/nodes/Airtable/workflow.json'),
+			},
+			output: {
+				nodeData: {
+					Airtable: [[...records]],
+				},
+			},
+		},
+	];
+
+	const nodes: INodeType[] = [new ManualTrigger(), new Airtable()];
+	const nodeTypes = Helpers.setup(nodes);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			// execute workflow
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			// check if result node data matches expected test data
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/test/nodes/Airtable/workflow.json b/packages/nodes-base/test/nodes/Airtable/workflow.json
new file mode 100644
index 00000000000000..43b959b92e249f
--- /dev/null
+++ b/packages/nodes-base/test/nodes/Airtable/workflow.json
@@ -0,0 +1,63 @@
+{
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f857c37f-36c1-4c9c-9b5f-f6ef49db67e3",
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				820,
+				380
+			]
+		},
+		{
+			"parameters": {
+				"operation": "list",
+				"application": {
+					"__rl": true,
+					"value": "https://airtable.com/appIaXXdDqS5ORr4V/tbljyBEdYzCPF0NDh/viwInsMdsxffad0aU",
+					"mode": "url",
+					"__regex": "https://airtable.com/([a-zA-Z0-9]{2,})"
+				},
+				"table": {
+					"__rl": true,
+					"value": "https://airtable.com/appIaXXdDqS5ORr4V/tbljyBEdYzCPF0NDh/viwInsMdsxffad0aU",
+					"mode": "url",
+					"__regex": "https://airtable.com/[a-zA-Z0-9]{2,}/([a-zA-Z0-9]{2,})"
+				},
+				"additionalOptions": {}
+			},
+			"id": "5654d3b3-fe83-4988-889b-94f107d41807",
+			"name": "Airtable",
+			"type": "n8n-nodes-base.airtable",
+			"typeVersion": 1,
+			"position": [
+				1020,
+				380
+			],
+			"credentials": {
+				"airtableApi": {
+					"id": "20",
+					"name": "Airtable account"
+				}
+			}
+		}
+	],
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Airtable",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
new file mode 100644
index 00000000000000..a9b62a35ab7865
--- /dev/null
+++ b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
@@ -0,0 +1,24 @@
+import { WorkflowExecute } from 'n8n-core';
+import { createDeferredPromise, INodeTypes, IRun, Workflow } from 'n8n-workflow';
+import * as Helpers from './Helpers';
+
+export async function executeWorkflow(testData, nodeTypes: INodeTypes) {
+	const executionMode = 'manual';
+	const workflowInstance = new Workflow({
+		id: 'test',
+		nodes: testData.input.workflowData.nodes,
+		connections: testData.input.workflowData.connections,
+		active: false,
+		nodeTypes,
+	});
+
+	const waitPromise = await createDeferredPromise<IRun>();
+	const nodeExecutionOrder: string[] = [];
+	const additionalData = Helpers.WorkflowExecuteAdditionalData(waitPromise, nodeExecutionOrder);
+
+	const workflowExecute = new WorkflowExecute(additionalData, executionMode);
+
+	const executionData = await workflowExecute.run(workflowInstance);
+	const result = await waitPromise.promise();
+	return { executionData, result, nodeExecutionOrder };
+}
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
new file mode 100644
index 00000000000000..5c5ab95fe05ea0
--- /dev/null
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -0,0 +1,183 @@
+import { readFileSync } from 'fs';
+import { Credentials } from 'n8n-core';
+import {
+	ICredentialDataDecryptedObject,
+	ICredentialsHelper,
+	IDeferredPromise,
+	IExecuteWorkflowInfo,
+	IHttpRequestHelper,
+	IHttpRequestOptions,
+	ILogger,
+	INode,
+	INodeCredentialsDetails,
+	INodeType,
+	INodeTypeData,
+	INodeTypes,
+	IRun,
+	ITaskData,
+	IVersionedNodeType,
+	IWorkflowBase,
+	IWorkflowExecuteAdditionalData,
+	LoggerProxy,
+	NodeHelpers,
+	WorkflowHooks,
+} from 'n8n-workflow';
+import { WorkflowTestData } from './types';
+
+export class CredentialsHelper extends ICredentialsHelper {
+	async authenticate(
+		credentials: ICredentialDataDecryptedObject,
+		typeName: string,
+		requestParams: IHttpRequestOptions,
+	): Promise<IHttpRequestOptions> {
+		return requestParams;
+	}
+
+	async preAuthentication(
+		helpers: IHttpRequestHelper,
+		credentials: ICredentialDataDecryptedObject,
+		typeName: string,
+		node: INode,
+		credentialsExpired: boolean,
+	): Promise<ICredentialDataDecryptedObject | undefined> {
+		return undefined;
+	}
+
+	getParentTypes(name: string): string[] {
+		return [];
+	}
+
+	async getDecrypted(
+		nodeCredentials: INodeCredentialsDetails,
+		type: string,
+	): Promise<ICredentialDataDecryptedObject> {
+		return {};
+	}
+
+	async getCredentials(
+		nodeCredentials: INodeCredentialsDetails,
+		type: string,
+	): Promise<Credentials> {
+		return new Credentials({ id: null, name: '' }, '', [], '');
+	}
+
+	async updateCredentials(
+		nodeCredentials: INodeCredentialsDetails,
+		type: string,
+		data: ICredentialDataDecryptedObject,
+	): Promise<void> {}
+}
+
+export function WorkflowExecuteAdditionalData(
+	waitPromise: IDeferredPromise<IRun>,
+	nodeExecutionOrder: string[],
+): IWorkflowExecuteAdditionalData {
+	const hookFunctions = {
+		nodeExecuteAfter: [
+			async (nodeName: string, data: ITaskData): Promise<void> => {
+				nodeExecutionOrder.push(nodeName);
+			},
+		],
+		workflowExecuteAfter: [
+			async (fullRunData: IRun): Promise<void> => {
+				waitPromise.resolve(fullRunData);
+			},
+		],
+	};
+
+	const workflowData: IWorkflowBase = {
+		name: '',
+		createdAt: new Date(),
+		updatedAt: new Date(),
+		active: true,
+		nodes: [],
+		connections: {},
+	};
+
+	return {
+		credentialsHelper: new CredentialsHelper(''),
+		hooks: new WorkflowHooks(hookFunctions, 'trigger', '1', workflowData),
+		executeWorkflow: async (workflowInfo: IExecuteWorkflowInfo): Promise<any> => {},
+		sendMessageToUI: (message: string) => {},
+		restApiUrl: '',
+		encryptionKey: 'test',
+		timezone: 'America/New_York',
+		webhookBaseUrl: 'webhook',
+		webhookWaitingBaseUrl: 'webhook-waiting',
+		webhookTestBaseUrl: 'webhook-test',
+		userId: '123',
+	};
+}
+
+class NodeTypesClass implements INodeTypes {
+	nodeTypes: INodeTypeData = {};
+	getByName(nodeType: string): INodeType | IVersionedNodeType {
+		return this.nodeTypes[nodeType].type;
+	}
+
+	addNode(nodeTypeName: string, nodeType: INodeType | IVersionedNodeType) {
+		const loadedNode = {
+			[nodeTypeName]: {
+				sourcePath: '',
+				type: nodeType,
+			},
+		};
+		this.nodeTypes = {
+			...this.nodeTypes,
+			...loadedNode,
+		};
+		//Object.assign(this.nodeTypes, loadedNode);
+	}
+
+	getByNameAndVersion(nodeType: string, version?: number): INodeType {
+		return NodeHelpers.getVersionedNodeType(this.nodeTypes[nodeType].type, version);
+	}
+}
+
+let nodeTypesInstance: NodeTypesClass | undefined;
+
+export function NodeTypes(): NodeTypesClass {
+	if (nodeTypesInstance === undefined) {
+		nodeTypesInstance = new NodeTypesClass();
+	}
+	return nodeTypesInstance;
+}
+
+export function setup(nodes: INodeType[]) {
+	const nodeTypes = NodeTypes();
+	for (const node of nodes) {
+		nodeTypes.addNode('n8n-nodes-base.' + node.description.name, node);
+	}
+	const fakeLogger = {
+		log: () => {},
+		debug: () => {},
+		verbose: () => {},
+		info: () => {},
+		warn: () => {},
+		error: () => {},
+	} as ILogger;
+	LoggerProxy.init(fakeLogger);
+	return nodeTypes;
+}
+
+export function getResultNodeData(result: IRun, testData: WorkflowTestData) {
+	return Object.keys(testData.output.nodeData).map((nodeName) => {
+		if (result.data.resultData.runData[nodeName] === undefined) {
+			throw new Error(`Data for node "${nodeName}" is missing!`);
+		}
+		const resultData = result.data.resultData.runData[nodeName].map((nodeData) => {
+			if (nodeData.data === undefined) {
+				return null;
+			}
+			return nodeData.data.main[0]!.map((entry) => entry.json);
+		});
+		return {
+			nodeName,
+			resultData,
+		};
+	});
+}
+
+export function readJsonFileSync(path: string) {
+	return JSON.parse(readFileSync(path, 'utf-8'));
+}
diff --git a/packages/nodes-base/test/nodes/If/If.node.test.ts b/packages/nodes-base/test/nodes/If/If.node.test.ts
new file mode 100644
index 00000000000000..5c141755476c88
--- /dev/null
+++ b/packages/nodes-base/test/nodes/If/If.node.test.ts
@@ -0,0 +1,58 @@
+import { INodeType } from 'n8n-workflow';
+import * as Helpers from '../Helpers';
+import { WorkflowTestData } from '../types';
+
+import { ManualTrigger } from '../../../nodes/ManualTrigger/ManualTrigger.node';
+import { Set } from '../../../nodes/Set/Set.node';
+import { If } from '../../../nodes/If/If.node';
+import { NoOp } from '../../../nodes/NoOp/NoOp.node';
+import { Code } from '../../../nodes/Code/Code.node';
+
+import { executeWorkflow } from '../ExecuteWorkflow';
+
+describe('Execute If Node', () => {
+	const tests: Array<WorkflowTestData> = [
+		{
+			description: 'should execute IF node true/false boolean',
+			input: {
+				workflowData: Helpers.readJsonFileSync('test/nodes/If/workflow.json'),
+			},
+			output: {
+				nodeData: {
+					'On True': [
+						[
+							{
+								value: true,
+							},
+						],
+					],
+					'On False': [
+						[
+							{
+								value: false,
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodes: INodeType[] = [new ManualTrigger(), new Code(), new Set(), new If(), new NoOp()];
+	const nodeTypes = Helpers.setup(nodes);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			// execute workflow
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			// check if result node data matches expected test data
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/test/nodes/If/workflow.json b/packages/nodes-base/test/nodes/If/workflow.json
new file mode 100644
index 00000000000000..9a33888f5a9119
--- /dev/null
+++ b/packages/nodes-base/test/nodes/If/workflow.json
@@ -0,0 +1,115 @@
+{
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "47003824-c11f-4ae3-80a5-0e1a6d840b21",
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				720,
+				460
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $json[\"value\"] }}",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "5420fe7d-a216-44e0-b91f-188ba5b6a340",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				1160,
+				460
+			]
+		},
+		{
+			"parameters": {},
+			"id": "52d58f32-7faf-4874-afff-e6842bd02430",
+			"name": "On False",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				1400,
+				580
+			]
+		},
+		{
+			"parameters": {},
+			"id": "9be683ac-cd3f-4ba1-8fa4-052102c3d891",
+			"name": "On True",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				1400,
+				340
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  { value: true },\n  { value: false }\n];"
+			},
+			"id": "5b3207e7-37e3-43c8-a4da-1ffebb0de134",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				940,
+				460
+			]
+		}
+	],
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "On True",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/test/nodes/Set/SetNode.test.ts b/packages/nodes-base/test/nodes/Set/SetNode.test.ts
new file mode 100644
index 00000000000000..75407df9bfed9f
--- /dev/null
+++ b/packages/nodes-base/test/nodes/Set/SetNode.test.ts
@@ -0,0 +1,200 @@
+import { INodeType } from 'n8n-workflow';
+import * as Helpers from '../Helpers';
+import { Start } from '../../../nodes/Start/Start.node';
+import { Set } from '../../../nodes/Set/Set.node';
+import { executeWorkflow } from '../ExecuteWorkflow';
+import { WorkflowTestData } from '../types';
+
+describe('Execute Set Node', () => {
+	const tests: Array<WorkflowTestData> = [
+		{
+			description: 'should set value',
+			input: {
+				workflowData: {
+					nodes: [
+						{
+							id: 'uuid-1',
+							parameters: {},
+							name: 'Start',
+							type: 'n8n-nodes-base.start',
+							typeVersion: 1,
+							position: [100, 300],
+						},
+						{
+							id: 'uuid-2',
+							parameters: {
+								values: {
+									number: [
+										{
+											name: 'value1',
+											value: 1,
+										},
+									],
+								},
+							},
+							name: 'Set',
+							type: 'n8n-nodes-base.set',
+							typeVersion: 1,
+							position: [280, 300],
+						},
+					],
+					connections: {
+						Start: {
+							main: [
+								[
+									{
+										node: 'Set',
+										type: 'main',
+										index: 0,
+									},
+								],
+							],
+						},
+					},
+				},
+			},
+			output: {
+				nodeExecutionOrder: ['Start', 'Set'],
+				nodeData: {
+					Set: [
+						[
+							{
+								value1: 1,
+							},
+						],
+					],
+				},
+			},
+		},
+
+		{
+			description: 'should set multiple values',
+			input: {
+				workflowData: {
+					nodes: [
+						{
+							id: 'uuid-1',
+							parameters: {},
+							name: 'Start',
+							type: 'n8n-nodes-base.start',
+							typeVersion: 1,
+							position: [100, 300],
+						},
+						{
+							id: 'uuid-2',
+							parameters: {
+								values: {
+									number: [
+										{
+											name: 'value1',
+											value: 1,
+										},
+									],
+									boolean: [
+										{
+											name: 'value2',
+											value: true,
+										},
+									],
+								},
+							},
+							name: 'Set',
+							type: 'n8n-nodes-base.set',
+							typeVersion: 1,
+							position: [280, 300],
+						},
+						{
+							id: 'uuid-3',
+							parameters: {
+								values: {
+									number: [
+										{
+											name: 'value1',
+											value: 2,
+										},
+									],
+									boolean: [
+										{
+											name: 'value2',
+											value: false,
+										},
+									],
+								},
+							},
+							name: 'Set1',
+							type: 'n8n-nodes-base.set',
+							typeVersion: 1,
+							position: [280, 300],
+						},
+					],
+					connections: {
+						Start: {
+							main: [
+								[
+									{
+										node: 'Set',
+										type: 'main',
+										index: 0,
+									},
+								],
+							],
+						},
+						Set: {
+							main: [
+								[
+									{
+										node: 'Set1',
+										type: 'main',
+										index: 0,
+									},
+								],
+							],
+						},
+					},
+				},
+			},
+			output: {
+				nodeExecutionOrder: ['Start', 'Set'],
+				nodeData: {
+					Set: [
+						[
+							{
+								value1: 1,
+								value2: true,
+							},
+						],
+					],
+					Set1: [
+						[
+							{
+								value1: 2,
+								value2: false,
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodes: INodeType[] = [new Start(), new Set()];
+	const nodeTypes = Helpers.setup(nodes);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			// execute workflow
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			// check if result node data matches expected test data
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			// Check if other data has correct value
+			expect(result.finished).toEqual(true);
+			expect(result.data.executionData!.contextData).toEqual({});
+			expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
+		});
+	}
+});
diff --git a/packages/nodes-base/test/nodes/Start/StartNode.test.ts b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
new file mode 100644
index 00000000000000..5c9ccf8c6cf7bd
--- /dev/null
+++ b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
@@ -0,0 +1,48 @@
+import { INodeType } from 'n8n-workflow';
+import * as Helpers from '../Helpers';
+import { Start } from '../../../nodes/Start/Start.node';
+import { WorkflowTestData } from '../types';
+import { executeWorkflow } from '../ExecuteWorkflow';
+
+describe('Execute Start Node', () => {
+	const tests: Array<WorkflowTestData> = [
+		{
+			description: 'should run start node',
+			input: {
+				workflowData: {
+					nodes: [
+						{
+							id: 'uuid-1',
+							parameters: {},
+							name: 'Start',
+							type: 'n8n-nodes-base.start',
+							typeVersion: 1,
+							position: [100, 300],
+						},
+					],
+					connections: {},
+				},
+			},
+			output: {
+				nodeExecutionOrder: ['Start'],
+				nodeData: {},
+			},
+		},
+	];
+
+	const nodes: INodeType[] = [new Start()];
+	const nodeTypes = Helpers.setup(nodes);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			// execute workflow
+			const { result, nodeExecutionOrder } = await executeWorkflow(testData, nodeTypes);
+			// Check if the nodes did execute in the correct order
+			expect(nodeExecutionOrder).toEqual(testData.output.nodeExecutionOrder);
+			// Check if other data has correct value
+			expect(result.finished).toEqual(true);
+			expect(result.data.executionData!.contextData).toEqual({});
+			expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
+		});
+	}
+});
diff --git a/packages/nodes-base/test/nodes/types.ts b/packages/nodes-base/test/nodes/types.ts
new file mode 100644
index 00000000000000..37ffd12aea03bc
--- /dev/null
+++ b/packages/nodes-base/test/nodes/types.ts
@@ -0,0 +1,17 @@
+import { INode, IConnections } from 'n8n-workflow';
+
+export interface WorkflowTestData {
+	description: string;
+	input: {
+		workflowData: {
+			nodes: INode[];
+			connections: IConnections;
+		};
+	};
+	output: {
+		nodeExecutionOrder?: string[];
+		nodeData: {
+			[key: string]: any[][];
+		};
+	};
+}

From 6092f6c41ee28f3482675b940b1fdc600ae29971 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Mon, 30 Jan 2023 14:42:08 +0300
Subject: [PATCH 018/358] feat(editor): Add mapping support for data paths
 (#5191)

* feat: add data path flag

* chore: update types

* feat: use path for data

* feat: add support for multiple values

* fix: handle if not prev node

* fix: update node

* fix: handle multi part path

* feat: add support for multiple vals for field

* feat: add support for table transforms

* feat: use dot notation

* feat: fix bug where brackets removed

* fix: handle dots, fix unit tests

* test: update snapshot

* test: fix tests

* test: add test for edge case
---
 .../src/components/ParameterInputFull.vue     |  23 +-
 .../editor-ui/src/components/RunDataJson.vue  |  13 +-
 .../src/components/RunDataSchema.test.ts      |  19 +
 .../src/components/RunDataSchemaItem.vue      |   8 +-
 .../editor-ui/src/components/RunDataTable.vue |  30 +-
 .../__snapshots__/RunDataSchema.test.ts.snap  | 520 +++++++++++++++++-
 .../src/utils/__tests__/typesUtils.test.ts    |  77 ++-
 packages/editor-ui/src/utils/mappingUtils.ts  |  31 ++
 packages/editor-ui/src/utils/typesUtils.ts    |   3 +-
 .../CompareDatasets/CompareDatasets.node.ts   |   4 +
 .../nodes/ItemLists/ItemLists.node.ts         |   9 +
 .../nodes/ItemLists/summarize.operation.ts    |   5 +
 .../nodes-base/nodes/Merge/v2/MergeV2.node.ts |   2 +
 packages/workflow/src/Interfaces.ts           |   1 +
 14 files changed, 679 insertions(+), 66 deletions(-)
 create mode 100644 packages/editor-ui/src/utils/mappingUtils.ts

diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 3c8e3821ae5c0a..f286a7e82f7ed6 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -229,12 +229,31 @@ export default mixins(showMessage).extend({
 			}
 		},
 		onDrop(data: string) {
-			this.forceShowExpression = true;
+			const useDataPath = !!this.parameter.requiresDataPath && data.startsWith('{{ $json');
+			if (!useDataPath) {
+				this.forceShowExpression = true;
+			}
 			setTimeout(() => {
 				if (this.node) {
 					const prevValue = this.isResourceLocator ? this.value.value : this.value;
 					let updatedValue: string;
-					if (typeof prevValue === 'string' && prevValue.startsWith('=') && prevValue.length > 1) {
+					if (useDataPath) {
+						const newValue = data
+							.replace('{{ $json', '')
+							.replace(new RegExp('^\\.'), '')
+							.replace(new RegExp('}}$'), '')
+							.trim();
+
+						if (prevValue && this.parameter.requiresDataPath === 'multiple') {
+							updatedValue = `${prevValue}, ${newValue}`;
+						} else {
+							updatedValue = newValue;
+						}
+					} else if (
+						typeof prevValue === 'string' &&
+						prevValue.startsWith('=') &&
+						prevValue.length > 1
+					) {
 						updatedValue = `${prevValue} ${data}`;
 					} else {
 						updatedValue = `=${data}`;
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index e7981a72ca1869..15a6c0289ca0a3 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -79,6 +79,7 @@ import { externalHooks } from '@/mixins/externalHooks';
 import { mapStores } from 'pinia';
 import { useNDVStore } from '@/stores/ndv';
 import MappingPill from './MappingPill.vue';
+import { getMappedExpression } from '@/utils/mappingUtils';
 
 const runDataJsonActions = () => import('@/components/RunDataJsonActions.vue');
 
@@ -169,11 +170,13 @@ export default mixins(externalHooks).extend({
 			return shorten(el.dataset.name || '', 16, 2);
 		},
 		getJsonParameterPath(path: string): string {
-			const convertedPath = convertPath(path);
-			return `{{ ${convertedPath.replace(
-				/^(\["?\d"?])/,
-				this.distanceFromActive === 1 ? '$json' : `$node["${this.node!.name}"].json`,
-			)} }}`;
+			const subPath = path.replace(/^(\["?\d"?])/, ''); // remove item position
+
+			return getMappedExpression({
+				nodeName: this.node.name,
+				distanceFromActive: this.distanceFromActive,
+				path: subPath,
+			});
 		},
 		onDragStart(el: HTMLElement) {
 			if (el && el.dataset.path) {
diff --git a/packages/editor-ui/src/components/RunDataSchema.test.ts b/packages/editor-ui/src/components/RunDataSchema.test.ts
index f9c5fe295db448..ff71b2aa003463 100644
--- a/packages/editor-ui/src/components/RunDataSchema.test.ts
+++ b/packages/editor-ui/src/components/RunDataSchema.test.ts
@@ -60,4 +60,23 @@ describe('RunDataJsonSchema.vue', () => {
 		});
 		expect(container).toMatchSnapshot();
 	});
+
+	it('renders schema with spaces and dots', () => {
+		renderOptions.props.data = [
+			{
+				'hello world': [
+					{
+						test: {
+							'more to think about': 1,
+						},
+						'test.how': 'ignore',
+					},
+				],
+			},
+		];
+		const { container } = render(RunDataJsonSchema, renderOptions, (vue) => {
+			vue.use(PiniaVuePlugin);
+		});
+		expect(container).toMatchSnapshot();
+	});
 });
diff --git a/packages/editor-ui/src/components/RunDataSchemaItem.vue b/packages/editor-ui/src/components/RunDataSchemaItem.vue
index fde51fed48f058..e6457fe93ab50e 100644
--- a/packages/editor-ui/src/components/RunDataSchemaItem.vue
+++ b/packages/editor-ui/src/components/RunDataSchemaItem.vue
@@ -2,6 +2,7 @@
 import { computed } from 'vue';
 import { INodeUi, Schema } from '@/Interface';
 import { checkExhaustive, shorten } from '@/utils';
+import { getMappedExpression } from '@/utils/mappingUtils';
 
 type Props = {
 	schema: Schema;
@@ -35,7 +36,12 @@ const text = computed(() =>
 );
 
 const getJsonParameterPath = (path: string): string =>
-	`{{ ${props.distanceFromActive === 1 ? '$json' : `$node["${props.node!.name}"].json`}${path} }}`;
+	getMappedExpression({
+		nodeName: props.node!.name,
+		distanceFromActive: props.distanceFromActive,
+		path,
+	});
+
 const transitionDelay = (i: number) => `${i * 0.033}s`;
 
 const getIconBySchemaType = (type: Schema['type']): string => {
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index fc103f6e27bff7..3f2c1e5b7c5b07 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -170,6 +170,7 @@ import { mapStores } from 'pinia';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
 import MappingPill from './MappingPill.vue';
+import { getMappedExpression } from '@/utils/mappingUtils';
 
 const MAX_COLUMNS_LIMIT = 40;
 
@@ -315,11 +316,11 @@ export default mixins(externalHooks).extend({
 				return '';
 			}
 
-			if (this.distanceFromActive === 1) {
-				return `{{ $json["${column}"] }}`;
-			}
-
-			return `{{ $node["${this.node.name}"].json["${column}"] }}`;
+			return getMappedExpression({
+				nodeName: this.node.name,
+				distanceFromActive: this.distanceFromActive,
+				path: [column],
+			});
 		},
 		getPathNameFromTarget(el: HTMLElement) {
 			if (!el) {
@@ -343,21 +344,12 @@ export default mixins(externalHooks).extend({
 			if (!this.node) {
 				return '';
 			}
-
-			const expr = path.reduce((accu: string, key: string | number) => {
-				if (typeof key === 'number') {
-					return `${accu}[${key}]`;
-				}
-
-				return `${accu}["${key}"]`;
-			}, '');
 			const column = this.tableData.columns[colIndex];
-
-			if (this.distanceFromActive === 1) {
-				return `{{ $json["${column}"]${expr} }}`;
-			}
-
-			return `{{ $node["${this.node.name}"].json["${column}"]${expr} }}`;
+			return getMappedExpression({
+				nodeName: this.node.name,
+				distanceFromActive: this.distanceFromActive,
+				path: [column, ...path],
+			});
 		},
 		isEmpty(value: unknown): boolean {
 			return (
diff --git a/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
index ca3faf29b15a76..aac0e13b91e200 100644
--- a/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
@@ -33,9 +33,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   class="label"
                   data-depth="1"
                   data-name="name"
-                  data-path="[\\"name\\"]"
+                  data-path=".name"
                   data-target="mappable"
-                  data-value="{{ $json[\\"name\\"] }}"
+                  data-value="{{ $json.name }}"
                 >
                   <font-awesome-icon-stub
                     icon="font"
@@ -70,9 +70,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   class="label"
                   data-depth="1"
                   data-name="age"
-                  data-path="[\\"age\\"]"
+                  data-path=".age"
                   data-target="mappable"
-                  data-value="{{ $json[\\"age\\"] }}"
+                  data-value="{{ $json.age }}"
                 >
                   <font-awesome-icon-stub
                     icon="hashtag"
@@ -107,9 +107,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                   class="label"
                   data-depth="1"
                   data-name="hobbies"
-                  data-path="[\\"hobbies\\"]"
+                  data-path=".hobbies"
                   data-target="mappable"
-                  data-value="{{ $json[\\"hobbies\\"] }}"
+                  data-value="{{ $json.hobbies }}"
                 >
                   <font-awesome-icon-stub
                     icon="list"
@@ -152,9 +152,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                       class="label"
                       data-depth="2"
                       data-name="string[0]"
-                      data-path="[\\"hobbies\\"][0]"
+                      data-path=".hobbies[0]"
                       data-target="mappable"
-                      data-value="{{ $json[\\"hobbies\\"][0] }}"
+                      data-value="{{ $json.hobbies[0] }}"
                     >
                       <font-awesome-icon-stub
                         icon="font"
@@ -191,9 +191,9 @@ exports[`RunDataJsonSchema.vue > renders schema for data 1`] = `
                       class="label"
                       data-depth="2"
                       data-name="string[1]"
-                      data-path="[\\"hobbies\\"][1]"
+                      data-path=".hobbies[1]"
                       data-target="mappable"
-                      data-value="{{ $json[\\"hobbies\\"][1] }}"
+                      data-value="{{ $json.hobbies[1] }}"
                     >
                       <font-awesome-icon-stub
                         icon="font"
@@ -259,3 +259,503 @@ exports[`RunDataJsonSchema.vue > renders schema for empty data 1`] = `
   </div>
 </div>
 `;
+
+exports[`RunDataJsonSchema.vue > renders schema with spaces 1`] = `
+<div>
+  <div
+    class="_schemaWrapper_1mtap_1"
+  >
+    <div
+      class=""
+    >
+      <div
+        class="_schema_1mtap_1"
+      >
+        <div
+          class="_item_14xdy_1"
+        >
+          <!---->
+          <!---->
+          <!---->
+          <!---->
+          <div
+            class="_sub_14xdy_14"
+          >
+            <div
+              class="_item_14xdy_1"
+              style="transition-delay: 0s;"
+            >
+              <div
+                class="_pill_14xdy_51 _mappable_14xdy_70"
+                title="array"
+              >
+                <span
+                  class="_label_14xdy_89"
+                  data-depth="1"
+                  data-name="hello world"
+                  data-path="[\\"hello world\\"]"
+                  data-target="mappable"
+                  data-value="{{ $json[\\"hello world\\"] }}"
+                >
+                  <font-awesome-icon-stub
+                    icon="list"
+                    size="sm"
+                  />
+                  <!---->
+                  <span
+                    class=""
+                  >
+                    hello world
+                  </span>
+                </span>
+              </div>
+              <!---->
+              <input
+                checked="checked"
+                id="array-0-0"
+                type="checkbox"
+              />
+              <label
+                class="_toggle_14xdy_20"
+                for="array-0-0"
+              >
+                <font-awesome-icon-stub
+                  icon="angle-up"
+                />
+              </label>
+              <div
+                class="_sub_14xdy_14"
+              >
+                <div
+                  class="_item_14xdy_1"
+                  style="transition-delay: 0s;"
+                >
+                  <div
+                    class="_pill_14xdy_51 _mappable_14xdy_70"
+                    title="object"
+                  >
+                    <span
+                      class="_label_14xdy_89"
+                      data-depth="2"
+                      data-name="object[0]"
+                      data-path="[\\"hello world\\"][0]"
+                      data-target="mappable"
+                      data-value="{{ $json[\\"hello world\\"][0] }}"
+                    >
+                      <font-awesome-icon-stub
+                        icon="cube"
+                        size="sm"
+                      />
+                      <span>
+                        hello world
+                      </span>
+                      <span
+                        class="_arrayIndex_14xdy_94"
+                      >
+                        [0]
+                      </span>
+                    </span>
+                  </div>
+                  <!---->
+                  <input
+                    checked="checked"
+                    id="object-1-0"
+                    type="checkbox"
+                  />
+                  <label
+                    class="_toggle_14xdy_20"
+                    for="object-1-0"
+                  >
+                    <font-awesome-icon-stub
+                      icon="angle-up"
+                    />
+                  </label>
+                  <div
+                    class="_sub_14xdy_14"
+                  >
+                    <div
+                      class="_item_14xdy_1"
+                      style="transition-delay: 0s;"
+                    >
+                      <div
+                        class="_pill_14xdy_51 _mappable_14xdy_70"
+                        title="object"
+                      >
+                        <span
+                          class="_label_14xdy_89"
+                          data-depth="3"
+                          data-name="test"
+                          data-path="[\\"hello world\\"][0].test"
+                          data-target="mappable"
+                          data-value="{{ $json[\\"hello world\\"][0].test }}"
+                        >
+                          <font-awesome-icon-stub
+                            icon="cube"
+                            size="sm"
+                          />
+                          <!---->
+                          <span
+                            class=""
+                          >
+                            test
+                          </span>
+                        </span>
+                      </div>
+                      <!---->
+                      <input
+                        checked="checked"
+                        id="object-2-0"
+                        type="checkbox"
+                      />
+                      <label
+                        class="_toggle_14xdy_20"
+                        for="object-2-0"
+                      >
+                        <font-awesome-icon-stub
+                          icon="angle-up"
+                        />
+                      </label>
+                      <div
+                        class="_sub_14xdy_14"
+                      >
+                        <div
+                          class="_item_14xdy_1"
+                          style="transition-delay: 0s;"
+                        >
+                          <div
+                            class="_pill_14xdy_51 _mappable_14xdy_70"
+                            title="number"
+                          >
+                            <span
+                              class="_label_14xdy_89"
+                              data-depth="4"
+                              data-name="more to think about"
+                              data-path="[\\"hello world\\"][0].test[\\"more to think about\\"]"
+                              data-target="mappable"
+                              data-value="{{ $json[\\"hello world\\"][0].test[\\"more to think about\\"] }}"
+                            >
+                              <font-awesome-icon-stub
+                                icon="hashtag"
+                                size="sm"
+                              />
+                              <!---->
+                              <span
+                                class=""
+                              >
+                                more to think about
+                              </span>
+                            </span>
+                          </div>
+                          <span
+                            class="_text_14xdy_100"
+                          >
+                            1
+                          </span>
+                          <!---->
+                          <!---->
+                          <!---->
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_item_14xdy_1"
+                      style="transition-delay: 0.033s;"
+                    >
+                      <div
+                        class="_pill_14xdy_51 _mappable_14xdy_70"
+                        title="string"
+                      >
+                        <span
+                          class="_label_14xdy_89"
+                          data-depth="3"
+                          data-name="test.how"
+                          data-path="[\\"hello world\\"][0][\\"test.how\\"]"
+                          data-target="mappable"
+                          data-value="{{ $json[\\"hello world\\"][0][\\"test.how\\"] }}"
+                        >
+                          <font-awesome-icon-stub
+                            icon="font"
+                            size="sm"
+                          />
+                          <!---->
+                          <span
+                            class=""
+                          >
+                            test.how
+                          </span>
+                        </span>
+                      </div>
+                      <span
+                        class="_text_14xdy_100"
+                      >
+                        ignore
+                      </span>
+                      <!---->
+                      <!---->
+                      <!---->
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="teleporter hidden"
+        data-v-d4e6e290=""
+      />
+    </div>
+  </div>
+</div>
+`;
+
+exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
+<div>
+  <div
+    class="_schemaWrapper_1mtap_1"
+  >
+    <div
+      class=""
+    >
+      <div
+        class="_schema_1mtap_1"
+      >
+        <div
+          class="_item_14xdy_1"
+        >
+          <!---->
+          <!---->
+          <!---->
+          <!---->
+          <div
+            class="_sub_14xdy_14"
+          >
+            <div
+              class="_item_14xdy_1"
+              style="transition-delay: 0s;"
+            >
+              <div
+                class="_pill_14xdy_51 _mappable_14xdy_70"
+                title="array"
+              >
+                <span
+                  class="_label_14xdy_89"
+                  data-depth="1"
+                  data-name="hello world"
+                  data-path="[\\"hello world\\"]"
+                  data-target="mappable"
+                  data-value="{{ $json[\\"hello world\\"] }}"
+                >
+                  <font-awesome-icon-stub
+                    icon="list"
+                    size="sm"
+                  />
+                  <!---->
+                  <span
+                    class=""
+                  >
+                    hello world
+                  </span>
+                </span>
+              </div>
+              <!---->
+              <input
+                checked="checked"
+                id="array-0-0"
+                type="checkbox"
+              />
+              <label
+                class="_toggle_14xdy_20"
+                for="array-0-0"
+              >
+                <font-awesome-icon-stub
+                  icon="angle-up"
+                />
+              </label>
+              <div
+                class="_sub_14xdy_14"
+              >
+                <div
+                  class="_item_14xdy_1"
+                  style="transition-delay: 0s;"
+                >
+                  <div
+                    class="_pill_14xdy_51 _mappable_14xdy_70"
+                    title="object"
+                  >
+                    <span
+                      class="_label_14xdy_89"
+                      data-depth="2"
+                      data-name="object[0]"
+                      data-path="[\\"hello world\\"][0]"
+                      data-target="mappable"
+                      data-value="{{ $json[\\"hello world\\"][0] }}"
+                    >
+                      <font-awesome-icon-stub
+                        icon="cube"
+                        size="sm"
+                      />
+                      <span>
+                        hello world
+                      </span>
+                      <span
+                        class="_arrayIndex_14xdy_94"
+                      >
+                        [0]
+                      </span>
+                    </span>
+                  </div>
+                  <!---->
+                  <input
+                    checked="checked"
+                    id="object-1-0"
+                    type="checkbox"
+                  />
+                  <label
+                    class="_toggle_14xdy_20"
+                    for="object-1-0"
+                  >
+                    <font-awesome-icon-stub
+                      icon="angle-up"
+                    />
+                  </label>
+                  <div
+                    class="_sub_14xdy_14"
+                  >
+                    <div
+                      class="_item_14xdy_1"
+                      style="transition-delay: 0s;"
+                    >
+                      <div
+                        class="_pill_14xdy_51 _mappable_14xdy_70"
+                        title="object"
+                      >
+                        <span
+                          class="_label_14xdy_89"
+                          data-depth="3"
+                          data-name="test"
+                          data-path="[\\"hello world\\"][0].test"
+                          data-target="mappable"
+                          data-value="{{ $json[\\"hello world\\"][0].test }}"
+                        >
+                          <font-awesome-icon-stub
+                            icon="cube"
+                            size="sm"
+                          />
+                          <!---->
+                          <span
+                            class=""
+                          >
+                            test
+                          </span>
+                        </span>
+                      </div>
+                      <!---->
+                      <input
+                        checked="checked"
+                        id="object-2-0"
+                        type="checkbox"
+                      />
+                      <label
+                        class="_toggle_14xdy_20"
+                        for="object-2-0"
+                      >
+                        <font-awesome-icon-stub
+                          icon="angle-up"
+                        />
+                      </label>
+                      <div
+                        class="_sub_14xdy_14"
+                      >
+                        <div
+                          class="_item_14xdy_1"
+                          style="transition-delay: 0s;"
+                        >
+                          <div
+                            class="_pill_14xdy_51 _mappable_14xdy_70"
+                            title="number"
+                          >
+                            <span
+                              class="_label_14xdy_89"
+                              data-depth="4"
+                              data-name="more to think about"
+                              data-path="[\\"hello world\\"][0].test[\\"more to think about\\"]"
+                              data-target="mappable"
+                              data-value="{{ $json[\\"hello world\\"][0].test[\\"more to think about\\"] }}"
+                            >
+                              <font-awesome-icon-stub
+                                icon="hashtag"
+                                size="sm"
+                              />
+                              <!---->
+                              <span
+                                class=""
+                              >
+                                more to think about
+                              </span>
+                            </span>
+                          </div>
+                          <span
+                            class="_text_14xdy_100"
+                          >
+                            1
+                          </span>
+                          <!---->
+                          <!---->
+                          <!---->
+                        </div>
+                      </div>
+                    </div>
+                    <div
+                      class="_item_14xdy_1"
+                      style="transition-delay: 0.033s;"
+                    >
+                      <div
+                        class="_pill_14xdy_51 _mappable_14xdy_70"
+                        title="string"
+                      >
+                        <span
+                          class="_label_14xdy_89"
+                          data-depth="3"
+                          data-name="test.how"
+                          data-path="[\\"hello world\\"][0][\\"test.how\\"]"
+                          data-target="mappable"
+                          data-value="{{ $json[\\"hello world\\"][0][\\"test.how\\"] }}"
+                        >
+                          <font-awesome-icon-stub
+                            icon="font"
+                            size="sm"
+                          />
+                          <!---->
+                          <span
+                            class=""
+                          >
+                            test.how
+                          </span>
+                        </span>
+                      </div>
+                      <span
+                        class="_text_14xdy_100"
+                      >
+                        ignore
+                      </span>
+                      <!---->
+                      <!---->
+                      <!---->
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div
+        class="teleporter hidden"
+        data-v-d4e6e290=""
+      />
+    </div>
+  </div>
+</div>
+`;
diff --git a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
index 3807d42f6b86df..569b98d4085d58 100644
--- a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
@@ -257,10 +257,31 @@ describe('Utils', () => {
 							type: 'array',
 							key: 'people',
 							value: [
-								{ type: 'string', value: 'Joe', key: '0', path: '["people"][0]' },
-								{ type: 'string', value: 'John', key: '1', path: '["people"][1]' },
+								{ type: 'string', value: 'Joe', key: '0', path: '.people[0]' },
+								{ type: 'string', value: 'John', key: '1', path: '.people[1]' },
 							],
-							path: '["people"]',
+							path: '.people',
+						},
+					],
+					path: '',
+				},
+			],
+			[
+				{ 'with space': [], 'with.dot': 'test' },
+				{
+					type: 'object',
+					value: [
+						{
+							type: 'array',
+							key: 'with space',
+							value: [],
+							path: '["with space"]',
+						},
+						{
+							type: 'string',
+							key: 'with.dot',
+							value: 'test',
+							path: '["with.dot"]',
 						},
 					],
 					path: '',
@@ -278,8 +299,8 @@ describe('Utils', () => {
 							type: 'object',
 							key: '0',
 							value: [
-								{ type: 'string', key: 'name', value: 'John', path: '[0]["name"]' },
-								{ type: 'number', key: 'age', value: '22', path: '[0]["age"]' },
+								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
+								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
 							],
 							path: '[0]',
 						},
@@ -287,8 +308,8 @@ describe('Utils', () => {
 							type: 'object',
 							key: '1',
 							value: [
-								{ type: 'string', key: 'name', value: 'Joe', path: '[1]["name"]' },
-								{ type: 'number', key: 'age', value: '33', path: '[1]["age"]' },
+								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
+								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
 							],
 							path: '[1]',
 						},
@@ -308,16 +329,16 @@ describe('Utils', () => {
 							type: 'object',
 							key: '0',
 							value: [
-								{ type: 'string', key: 'name', value: 'John', path: '[0]["name"]' },
-								{ type: 'number', key: 'age', value: '22', path: '[0]["age"]' },
+								{ type: 'string', key: 'name', value: 'John', path: '[0].name' },
+								{ type: 'number', key: 'age', value: '22', path: '[0].age' },
 								{
 									type: 'array',
 									key: 'hobbies',
 									value: [
-										{ type: 'string', key: '0', value: 'surfing', path: '[0]["hobbies"][0]' },
-										{ type: 'string', key: '1', value: 'traveling', path: '[0]["hobbies"][1]' },
+										{ type: 'string', key: '0', value: 'surfing', path: '[0].hobbies[0]' },
+										{ type: 'string', key: '1', value: 'traveling', path: '[0].hobbies[1]' },
 									],
-									path: '[0]["hobbies"]',
+									path: '[0].hobbies',
 								},
 							],
 							path: '[0]',
@@ -326,16 +347,16 @@ describe('Utils', () => {
 							type: 'object',
 							key: '1',
 							value: [
-								{ type: 'string', key: 'name', value: 'Joe', path: '[1]["name"]' },
-								{ type: 'number', key: 'age', value: '33', path: '[1]["age"]' },
+								{ type: 'string', key: 'name', value: 'Joe', path: '[1].name' },
+								{ type: 'number', key: 'age', value: '33', path: '[1].age' },
 								{
 									type: 'array',
 									key: 'hobbies',
 									value: [
-										{ type: 'string', key: '0', value: 'skateboarding', path: '[1]["hobbies"][0]' },
-										{ type: 'string', key: '1', value: 'gaming', path: '[1]["hobbies"][1]' },
+										{ type: 'string', key: '0', value: 'skateboarding', path: '[1].hobbies[0]' },
+										{ type: 'string', key: '1', value: 'gaming', path: '[1].hobbies[1]' },
 									],
-									path: '[1]["hobbies"]',
+									path: '[1].hobbies',
 								},
 							],
 							path: '[1]',
@@ -381,8 +402,8 @@ describe('Utils', () => {
 									type: 'object',
 									key: '0',
 									value: [
-										{ type: 'string', key: 'name', value: 'John', path: '[0][0]["name"]' },
-										{ type: 'number', key: 'age', value: '22', path: '[0][0]["age"]' },
+										{ type: 'string', key: 'name', value: 'John', path: '[0][0].name' },
+										{ type: 'number', key: 'age', value: '22', path: '[0][0].age' },
 									],
 									path: '[0][0]',
 								},
@@ -390,8 +411,8 @@ describe('Utils', () => {
 									type: 'object',
 									key: '1',
 									value: [
-										{ type: 'string', key: 'name', value: 'Joe', path: '[0][1]["name"]' },
-										{ type: 'number', key: 'age', value: '33', path: '[0][1]["age"]' },
+										{ type: 'string', key: 'name', value: 'Joe', path: '[0][1].name' },
+										{ type: 'number', key: 'age', value: '33', path: '[0][1].age' },
 									],
 									path: '[0][1]',
 								},
@@ -430,16 +451,16 @@ describe('Utils', () => {
 													type: 'string',
 													key: '0',
 													value: '2022-11-22T00:00:00.000Z',
-													path: '[0]["dates"][0][0]',
+													path: '[0].dates[0][0]',
 												},
 												{
 													type: 'string',
 													key: '1',
 													value: '2022-11-23T00:00:00.000Z',
-													path: '[0]["dates"][0][1]',
+													path: '[0].dates[0][1]',
 												},
 											],
-											path: '[0]["dates"][0]',
+											path: '[0].dates[0]',
 										},
 										{
 											type: 'array',
@@ -449,19 +470,19 @@ describe('Utils', () => {
 													type: 'string',
 													key: '0',
 													value: '2022-12-22T00:00:00.000Z',
-													path: '[0]["dates"][1][0]',
+													path: '[0].dates[1][0]',
 												},
 												{
 													type: 'string',
 													key: '1',
 													value: '2022-12-23T00:00:00.000Z',
-													path: '[0]["dates"][1][1]',
+													path: '[0].dates[1][1]',
 												},
 											],
-											path: '[0]["dates"][1]',
+											path: '[0].dates[1]',
 										},
 									],
-									path: '[0]["dates"]',
+									path: '[0].dates',
 								},
 							],
 							path: '[0]',
diff --git a/packages/editor-ui/src/utils/mappingUtils.ts b/packages/editor-ui/src/utils/mappingUtils.ts
new file mode 100644
index 00000000000000..32889597f8f169
--- /dev/null
+++ b/packages/editor-ui/src/utils/mappingUtils.ts
@@ -0,0 +1,31 @@
+export function generatePath(root: string, path: Array<string | number>): string {
+	return path.reduce((accu: string, part: string | number) => {
+		if (typeof part === 'number') {
+			return `${accu}[${part}]`;
+		}
+
+		if (part.includes(' ') || part.includes('.')) {
+			return `${accu}["${part}"]`;
+		}
+
+		return `${accu}.${part}`;
+	}, root);
+}
+
+export function getMappedExpression({
+	nodeName,
+	distanceFromActive,
+	path,
+}: {
+	nodeName: string;
+	distanceFromActive: number;
+	path: Array<string | number> | string;
+}) {
+	const root = distanceFromActive === 1 ? '$json' : generatePath('$node', [nodeName, 'json']);
+
+	if (typeof path === 'string') {
+		return `{{ ${root}${path} }}`;
+	}
+
+	return `{{ ${generatePath(root, path)} }}`;
+}
diff --git a/packages/editor-ui/src/utils/typesUtils.ts b/packages/editor-ui/src/utils/typesUtils.ts
index b1692cb51283e9..52f3010b1c3a71 100644
--- a/packages/editor-ui/src/utils/typesUtils.ts
+++ b/packages/editor-ui/src/utils/typesUtils.ts
@@ -2,6 +2,7 @@ import dateformat from 'dateformat';
 import { IDataObject, jsonParse } from 'n8n-workflow';
 import { Schema, Optional, Primitives } from '@/Interface';
 import { isObj } from '@/utils/typeGuards';
+import { generatePath } from '@/utils/mappingUtils';
 
 /*
 	Constants and utility functions than can be used to manipulate different data types and objects
@@ -231,7 +232,7 @@ export const getSchema = (input: Optional<Primitives | object>, path = ''): Sche
 					type: 'object',
 					value: Object.entries(input).map(([k, v]) => ({
 						key: k,
-						...getSchema(v, path + `["${k}"]`),
+						...getSchema(v, generatePath(path, [k])),
 					})),
 					path,
 				};
diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
index 497e9b9db48524..4acc603164d129 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
@@ -52,6 +52,7 @@ export class CompareDatasets implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 							{
 								displayName: 'Input B Field',
@@ -61,6 +62,7 @@ export class CompareDatasets implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 						],
 					},
@@ -126,6 +128,7 @@ export class CompareDatasets implements INodeType {
 						resolve: ['mix'],
 					},
 				},
+				requiresDataPath: 'multiple',
 			},
 			{
 				displayName: 'Options',
@@ -143,6 +146,7 @@ export class CompareDatasets implements INodeType {
 						hint: 'Enter the field names as text, separated by commas',
 						description:
 							"Fields that shouldn't be included when checking whether two items are the same",
+						requiresDataPath: 'multiple',
 					},
 					{
 						displayName: 'Fuzzy Compare',
diff --git a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
index e4fc5d8ea258d6..d7aa9b384634ac 100644
--- a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
@@ -139,6 +139,7 @@ export class ItemLists implements INodeType {
 					},
 				},
 				description: 'The name of the input field to break out into separate items',
+				requiresDataPath: 'single',
 			},
 			{
 				displayName: 'Include',
@@ -197,6 +198,7 @@ export class ItemLists implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 						],
 					},
@@ -256,6 +258,7 @@ export class ItemLists implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 							{
 								displayName: 'Rename Field',
@@ -276,6 +279,7 @@ export class ItemLists implements INodeType {
 								default: '',
 								description:
 									'The name of the field to put the aggregated data in. Leave blank to use the input field name.',
+								requiresDataPath: 'single',
 							},
 						],
 					},
@@ -346,6 +350,7 @@ export class ItemLists implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 						],
 					},
@@ -382,6 +387,7 @@ export class ItemLists implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 						],
 					},
@@ -453,6 +459,7 @@ export class ItemLists implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 						],
 					},
@@ -488,6 +495,7 @@ export class ItemLists implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 						],
 					},
@@ -544,6 +552,7 @@ export class ItemLists implements INodeType {
 								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 								placeholder: 'e.g. id',
 								hint: ' Enter the field name as text',
+								requiresDataPath: 'single',
 							},
 							{
 								displayName: 'Order',
diff --git a/packages/nodes-base/nodes/ItemLists/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/summarize.operation.ts
index 1a793cbfa15688..24d8f6fc6a27b1 100644
--- a/packages/nodes-base/nodes/ItemLists/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/summarize.operation.ts
@@ -123,6 +123,7 @@ export const description: INodeProperties[] = [
 								aggregation: [...NUMERICAL_AGGREGATIONS, 'countUnique', 'count'],
 							},
 						},
+						requiresDataPath: 'single',
 					},
 					{
 						displayName: 'Field',
@@ -138,6 +139,7 @@ export const description: INodeProperties[] = [
 								aggregation: NUMERICAL_AGGREGATIONS,
 							},
 						},
+						requiresDataPath: 'single',
 					},
 					{
 						displayName: 'Field',
@@ -153,6 +155,7 @@ export const description: INodeProperties[] = [
 								aggregation: ['countUnique', 'count'],
 							},
 						},
+						requiresDataPath: 'single',
 					},
 					// ----------------------------------------------------------------------------------------------------------
 					{
@@ -245,6 +248,7 @@ export const description: INodeProperties[] = [
 				'/options.outputFormat': ['singleItem'],
 			},
 		},
+		requiresDataPath: 'multiple',
 	},
 	{
 		displayName: 'Fields to Group By',
@@ -261,6 +265,7 @@ export const description: INodeProperties[] = [
 				'/options.outputFormat': ['singleItem'],
 			},
 		},
+		requiresDataPath: 'multiple',
 	},
 	// ----------------------------------------------------------------------------------------------------------
 	{
diff --git a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
index 4865c0b1962d83..de3ee69cbdfbd3 100644
--- a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
+++ b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
@@ -122,6 +122,7 @@ const versionDescription: INodeTypeDescription = {
 							// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 							placeholder: 'e.g. id',
 							hint: ' Enter the field name as text',
+							requiresDataPath: 'single',
 						},
 						{
 							displayName: 'Input 2 Field',
@@ -131,6 +132,7 @@ const versionDescription: INodeTypeDescription = {
 							// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
 							placeholder: 'e.g. id',
 							hint: ' Enter the field name as text',
+							requiresDataPath: 'single',
 						},
 					],
 				},
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index adb7ac8230c2f4..eb74598da8387c 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1039,6 +1039,7 @@ export interface INodeProperties {
 	>;
 	extractValue?: INodePropertyValueExtractor;
 	modes?: INodePropertyMode[];
+	requiresDataPath?: 'single' | 'multiple';
 }
 
 export interface INodePropertyModeTypeOptions {

From ae998ea123d7aabcbcf6fbb2da183ea8e02e0f17 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 30 Jan 2023 13:05:54 +0100
Subject: [PATCH 019/358] ci(editor): Update RunDataSchema test (no-changelog)
 (#5287)

ci(editor-ui): Update RunDataSchema test (no-changelog)
---
 .../__snapshots__/RunDataSchema.test.ts.snap  | 306 ++----------------
 1 file changed, 28 insertions(+), 278 deletions(-)

diff --git a/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap b/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
index aac0e13b91e200..f15e0bd5a2b993 100644
--- a/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
+++ b/packages/editor-ui/src/components/__snapshots__/RunDataSchema.test.ts.snap
@@ -260,287 +260,37 @@ exports[`RunDataJsonSchema.vue > renders schema for empty data 1`] = `
 </div>
 `;
 
-exports[`RunDataJsonSchema.vue > renders schema with spaces 1`] = `
-<div>
-  <div
-    class="_schemaWrapper_1mtap_1"
-  >
-    <div
-      class=""
-    >
-      <div
-        class="_schema_1mtap_1"
-      >
-        <div
-          class="_item_14xdy_1"
-        >
-          <!---->
-          <!---->
-          <!---->
-          <!---->
-          <div
-            class="_sub_14xdy_14"
-          >
-            <div
-              class="_item_14xdy_1"
-              style="transition-delay: 0s;"
-            >
-              <div
-                class="_pill_14xdy_51 _mappable_14xdy_70"
-                title="array"
-              >
-                <span
-                  class="_label_14xdy_89"
-                  data-depth="1"
-                  data-name="hello world"
-                  data-path="[\\"hello world\\"]"
-                  data-target="mappable"
-                  data-value="{{ $json[\\"hello world\\"] }}"
-                >
-                  <font-awesome-icon-stub
-                    icon="list"
-                    size="sm"
-                  />
-                  <!---->
-                  <span
-                    class=""
-                  >
-                    hello world
-                  </span>
-                </span>
-              </div>
-              <!---->
-              <input
-                checked="checked"
-                id="array-0-0"
-                type="checkbox"
-              />
-              <label
-                class="_toggle_14xdy_20"
-                for="array-0-0"
-              >
-                <font-awesome-icon-stub
-                  icon="angle-up"
-                />
-              </label>
-              <div
-                class="_sub_14xdy_14"
-              >
-                <div
-                  class="_item_14xdy_1"
-                  style="transition-delay: 0s;"
-                >
-                  <div
-                    class="_pill_14xdy_51 _mappable_14xdy_70"
-                    title="object"
-                  >
-                    <span
-                      class="_label_14xdy_89"
-                      data-depth="2"
-                      data-name="object[0]"
-                      data-path="[\\"hello world\\"][0]"
-                      data-target="mappable"
-                      data-value="{{ $json[\\"hello world\\"][0] }}"
-                    >
-                      <font-awesome-icon-stub
-                        icon="cube"
-                        size="sm"
-                      />
-                      <span>
-                        hello world
-                      </span>
-                      <span
-                        class="_arrayIndex_14xdy_94"
-                      >
-                        [0]
-                      </span>
-                    </span>
-                  </div>
-                  <!---->
-                  <input
-                    checked="checked"
-                    id="object-1-0"
-                    type="checkbox"
-                  />
-                  <label
-                    class="_toggle_14xdy_20"
-                    for="object-1-0"
-                  >
-                    <font-awesome-icon-stub
-                      icon="angle-up"
-                    />
-                  </label>
-                  <div
-                    class="_sub_14xdy_14"
-                  >
-                    <div
-                      class="_item_14xdy_1"
-                      style="transition-delay: 0s;"
-                    >
-                      <div
-                        class="_pill_14xdy_51 _mappable_14xdy_70"
-                        title="object"
-                      >
-                        <span
-                          class="_label_14xdy_89"
-                          data-depth="3"
-                          data-name="test"
-                          data-path="[\\"hello world\\"][0].test"
-                          data-target="mappable"
-                          data-value="{{ $json[\\"hello world\\"][0].test }}"
-                        >
-                          <font-awesome-icon-stub
-                            icon="cube"
-                            size="sm"
-                          />
-                          <!---->
-                          <span
-                            class=""
-                          >
-                            test
-                          </span>
-                        </span>
-                      </div>
-                      <!---->
-                      <input
-                        checked="checked"
-                        id="object-2-0"
-                        type="checkbox"
-                      />
-                      <label
-                        class="_toggle_14xdy_20"
-                        for="object-2-0"
-                      >
-                        <font-awesome-icon-stub
-                          icon="angle-up"
-                        />
-                      </label>
-                      <div
-                        class="_sub_14xdy_14"
-                      >
-                        <div
-                          class="_item_14xdy_1"
-                          style="transition-delay: 0s;"
-                        >
-                          <div
-                            class="_pill_14xdy_51 _mappable_14xdy_70"
-                            title="number"
-                          >
-                            <span
-                              class="_label_14xdy_89"
-                              data-depth="4"
-                              data-name="more to think about"
-                              data-path="[\\"hello world\\"][0].test[\\"more to think about\\"]"
-                              data-target="mappable"
-                              data-value="{{ $json[\\"hello world\\"][0].test[\\"more to think about\\"] }}"
-                            >
-                              <font-awesome-icon-stub
-                                icon="hashtag"
-                                size="sm"
-                              />
-                              <!---->
-                              <span
-                                class=""
-                              >
-                                more to think about
-                              </span>
-                            </span>
-                          </div>
-                          <span
-                            class="_text_14xdy_100"
-                          >
-                            1
-                          </span>
-                          <!---->
-                          <!---->
-                          <!---->
-                        </div>
-                      </div>
-                    </div>
-                    <div
-                      class="_item_14xdy_1"
-                      style="transition-delay: 0.033s;"
-                    >
-                      <div
-                        class="_pill_14xdy_51 _mappable_14xdy_70"
-                        title="string"
-                      >
-                        <span
-                          class="_label_14xdy_89"
-                          data-depth="3"
-                          data-name="test.how"
-                          data-path="[\\"hello world\\"][0][\\"test.how\\"]"
-                          data-target="mappable"
-                          data-value="{{ $json[\\"hello world\\"][0][\\"test.how\\"] }}"
-                        >
-                          <font-awesome-icon-stub
-                            icon="font"
-                            size="sm"
-                          />
-                          <!---->
-                          <span
-                            class=""
-                          >
-                            test.how
-                          </span>
-                        </span>
-                      </div>
-                      <span
-                        class="_text_14xdy_100"
-                      >
-                        ignore
-                      </span>
-                      <!---->
-                      <!---->
-                      <!---->
-                    </div>
-                  </div>
-                </div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-      <div
-        class="teleporter hidden"
-        data-v-d4e6e290=""
-      />
-    </div>
-  </div>
-</div>
-`;
-
 exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
 <div>
   <div
-    class="_schemaWrapper_1mtap_1"
+    class="schemaWrapper"
   >
     <div
       class=""
     >
       <div
-        class="_schema_1mtap_1"
+        class="schema"
       >
         <div
-          class="_item_14xdy_1"
+          class="item"
         >
           <!---->
           <!---->
           <!---->
           <!---->
           <div
-            class="_sub_14xdy_14"
+            class="sub"
           >
             <div
-              class="_item_14xdy_1"
+              class="item"
               style="transition-delay: 0s;"
             >
               <div
-                class="_pill_14xdy_51 _mappable_14xdy_70"
+                class="pill mappable"
                 title="array"
               >
                 <span
-                  class="_label_14xdy_89"
+                  class="label"
                   data-depth="1"
                   data-name="hello world"
                   data-path="[\\"hello world\\"]"
@@ -566,7 +316,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                 type="checkbox"
               />
               <label
-                class="_toggle_14xdy_20"
+                class="toggle"
                 for="array-0-0"
               >
                 <font-awesome-icon-stub
@@ -574,18 +324,18 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                 />
               </label>
               <div
-                class="_sub_14xdy_14"
+                class="sub"
               >
                 <div
-                  class="_item_14xdy_1"
+                  class="item"
                   style="transition-delay: 0s;"
                 >
                   <div
-                    class="_pill_14xdy_51 _mappable_14xdy_70"
+                    class="pill mappable"
                     title="object"
                   >
                     <span
-                      class="_label_14xdy_89"
+                      class="label"
                       data-depth="2"
                       data-name="object[0]"
                       data-path="[\\"hello world\\"][0]"
@@ -600,7 +350,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         hello world
                       </span>
                       <span
-                        class="_arrayIndex_14xdy_94"
+                        class="arrayIndex"
                       >
                         [0]
                       </span>
@@ -613,7 +363,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                     type="checkbox"
                   />
                   <label
-                    class="_toggle_14xdy_20"
+                    class="toggle"
                     for="object-1-0"
                   >
                     <font-awesome-icon-stub
@@ -621,18 +371,18 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                     />
                   </label>
                   <div
-                    class="_sub_14xdy_14"
+                    class="sub"
                   >
                     <div
-                      class="_item_14xdy_1"
+                      class="item"
                       style="transition-delay: 0s;"
                     >
                       <div
-                        class="_pill_14xdy_51 _mappable_14xdy_70"
+                        class="pill mappable"
                         title="object"
                       >
                         <span
-                          class="_label_14xdy_89"
+                          class="label"
                           data-depth="3"
                           data-name="test"
                           data-path="[\\"hello world\\"][0].test"
@@ -658,7 +408,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         type="checkbox"
                       />
                       <label
-                        class="_toggle_14xdy_20"
+                        class="toggle"
                         for="object-2-0"
                       >
                         <font-awesome-icon-stub
@@ -666,18 +416,18 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         />
                       </label>
                       <div
-                        class="_sub_14xdy_14"
+                        class="sub"
                       >
                         <div
-                          class="_item_14xdy_1"
+                          class="item"
                           style="transition-delay: 0s;"
                         >
                           <div
-                            class="_pill_14xdy_51 _mappable_14xdy_70"
+                            class="pill mappable"
                             title="number"
                           >
                             <span
-                              class="_label_14xdy_89"
+                              class="label"
                               data-depth="4"
                               data-name="more to think about"
                               data-path="[\\"hello world\\"][0].test[\\"more to think about\\"]"
@@ -697,7 +447,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                             </span>
                           </div>
                           <span
-                            class="_text_14xdy_100"
+                            class="text"
                           >
                             1
                           </span>
@@ -708,15 +458,15 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                       </div>
                     </div>
                     <div
-                      class="_item_14xdy_1"
+                      class="item"
                       style="transition-delay: 0.033s;"
                     >
                       <div
-                        class="_pill_14xdy_51 _mappable_14xdy_70"
+                        class="pill mappable"
                         title="string"
                       >
                         <span
-                          class="_label_14xdy_89"
+                          class="label"
                           data-depth="3"
                           data-name="test.how"
                           data-path="[\\"hello world\\"][0][\\"test.how\\"]"
@@ -736,7 +486,7 @@ exports[`RunDataJsonSchema.vue > renders schema with spaces and dots 1`] = `
                         </span>
                       </div>
                       <span
-                        class="_text_14xdy_100"
+                        class="text"
                       >
                         ignore
                       </span>

From eda3b8aba0145f5dce4106a842245ff7836a4f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 30 Jan 2023 13:09:09 +0100
Subject: [PATCH 020/358] ci: Re-enable CI jobs on nodejs 14.x (no-changelog)
 (#5153)

Revert "ci: Disable CI jobs on nodejs 14.x (no-changelog) (#5132)"

This reverts commit b3adcbd8134442a2b644fb50f2508df1299ab4b8.
---
 .github/workflows/ci-master.yml        | 2 +-
 .github/workflows/ci-pull-requests.yml | 2 +-
 .github/workflows/e2e-tests.yml        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci-master.yml b/.github/workflows/ci-master.yml
index cbfe0df95a92bd..e3ef37b1809862 100644
--- a/.github/workflows/ci-master.yml
+++ b/.github/workflows/ci-master.yml
@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [14.x, 16.x]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index f659b259e0d899..130e1753bdb6e1 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -10,7 +10,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [14.x, 16.x]
 
     steps:
       - uses: actions/checkout@v3
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index bb6b52cd0d5703..232d0f508bf40c 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -31,7 +31,7 @@ jobs:
 
     strategy:
       matrix:
-        node-version: [16.x]
+        node-version: [14.x, 16.x]
 
     steps:
       - name: Call Start URL - optionally

From b2f59c3f39762387d6f921c725997c21e2a4ea09 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Mon, 30 Jan 2023 14:28:59 +0200
Subject: [PATCH 021/358] feat: Add multiple workflows text search filtering
 E2E test scenarios (no-changelog) (#5276)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

feat: Add multiple workflows text search filtering E2E test scenarios

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 cypress/e2e/1-workflows.cy.ts | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/cypress/e2e/1-workflows.cy.ts b/cypress/e2e/1-workflows.cy.ts
index 5d0a3cc8066b6e..303ec68b5a2bfe 100644
--- a/cypress/e2e/1-workflows.cy.ts
+++ b/cypress/e2e/1-workflows.cy.ts
@@ -11,6 +11,8 @@ const lastName = randLastName();
 const WorkflowsPage = new WorkflowsPageClass();
 const WorkflowPage = new WorkflowPageClass();
 
+const multipleWorkflowsCount = 5;
+
 describe('Workflows', () => {
 	before(() => {
 		cy.resetAll();
@@ -38,31 +40,39 @@ describe('Workflows', () => {
 		WorkflowPage.getters.workflowTags().should('contain.text', 'some-tag-2');
 	});
 
-	it('should create a new workflow using add workflow button', () => {
+	it('should create multiple new workflows using add workflow button', () => {
 		WorkflowsPage.getters.newWorkflowButtonCard().should('not.exist');
-		WorkflowsPage.getters.createWorkflowButton().click();
 
-		cy.createFixtureWorkflow('Test_workflow_2.json', `Add Workflow Button Workflow ${uuid()}`);
+		[...Array(multipleWorkflowsCount).keys()].forEach(() => {
+			cy.visit(WorkflowsPage.url);
+			WorkflowsPage.getters.createWorkflowButton().click();
+
+			cy.createFixtureWorkflow('Test_workflow_2.json', `My New Workflow ${uuid()}`);
 
-		WorkflowPage.getters.workflowTags().should('contain.text', 'other-tag-1');
-		WorkflowPage.getters.workflowTags().should('contain.text', 'other-tag-2');
+			WorkflowPage.getters.workflowTags().should('contain.text', 'other-tag-1');
+			WorkflowPage.getters.workflowTags().should('contain.text', 'other-tag-2');
+		});
 	});
 
 	it('should search for a workflow', () => {
+		// One Result
 		WorkflowsPage.getters.searchBar().type('Empty State Card Workflow');
-
 		WorkflowsPage.getters.workflowCards().should('have.length', 1);
 		WorkflowsPage.getters
 			.workflowCard('Empty State Card Workflow')
 			.should('contain.text', 'Empty State Card Workflow');
 
-		WorkflowsPage.getters.searchBar().clear().type('Add Workflow Button Workflow');
+		// Multiple Results
+		WorkflowsPage.getters.searchBar().clear().type('My New Workflow');
+		WorkflowsPage.getters.workflowCards().should('have.length', multipleWorkflowsCount);
+		WorkflowsPage.getters.workflowCard('My New Workflow').should('contain.text', 'My New Workflow');
 
-		WorkflowsPage.getters.workflowCards().should('have.length', 1);
-		WorkflowsPage.getters
-			.workflowCard('Add Workflow Button Workflow')
-			.should('contain.text', 'Add Workflow Button Workflow');
+		// All Results
+		WorkflowsPage.getters.searchBar().clear().type('Workflow');
+		WorkflowsPage.getters.workflowCards().should('have.length', multipleWorkflowsCount + 1);
+		WorkflowsPage.getters.workflowCard('Workflow').should('contain.text', 'Workflow');
 
+		// No Results
 		WorkflowsPage.getters.searchBar().clear().type('Some non-existent workflow');
 		WorkflowsPage.getters.workflowCards().should('not.exist');
 
@@ -70,7 +80,7 @@ describe('Workflows', () => {
 	});
 
 	it('should delete all the workflows', () => {
-		WorkflowsPage.getters.workflowCards().should('have.length', 2);
+		WorkflowsPage.getters.workflowCards().should('have.length', multipleWorkflowsCount + 1);
 
 		WorkflowsPage.getters.workflowCards().each(($el) => {
 			const workflowName = $el.find('[data-test-id="workflow-card-name"]').text();

From 72249e0de803184d019b1cba587a7c905bf68f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 30 Jan 2023 14:42:30 +0100
Subject: [PATCH 022/358] refactor(core): Load and validate all config at
 startup (no-changelog) (#5283)

---
 packages/cli/src/CredentialsOverwrites.ts     |  9 +--
 packages/cli/src/Db.ts                        | 35 ++++------
 packages/cli/src/GenericHelpers.ts            | 68 +------------------
 packages/cli/src/Server.ts                    | 40 +++--------
 .../email/UserManagementMailer.ts             |  5 +-
 packages/cli/src/WaitTracker.ts               |  6 +-
 packages/cli/src/WorkflowRunnerProcess.ts     |  3 +-
 packages/cli/src/commands/db/revert.ts        |  2 +-
 packages/cli/src/commands/execute.ts          |  2 +-
 packages/cli/src/commands/executeBatch.ts     |  2 +-
 packages/cli/src/commands/start.ts            |  6 +-
 packages/cli/src/commands/webhook.ts          |  2 +-
 packages/cli/src/commands/worker.ts           |  2 +-
 packages/cli/src/config/index.ts              | 45 +++++++++---
 packages/cli/src/databases/config.ts          | 13 ++--
 .../cli/src/executions/executions.service.ts  |  3 +-
 16 files changed, 80 insertions(+), 163 deletions(-)

diff --git a/packages/cli/src/CredentialsOverwrites.ts b/packages/cli/src/CredentialsOverwrites.ts
index 414f3eb349e5df..c3a5702df113f9 100644
--- a/packages/cli/src/CredentialsOverwrites.ts
+++ b/packages/cli/src/CredentialsOverwrites.ts
@@ -1,18 +1,15 @@
+import config from '@/config';
 import type { ICredentialDataDecryptedObject, ICredentialTypes } from 'n8n-workflow';
 import { deepCopy, LoggerProxy as Logger, jsonParse } from 'n8n-workflow';
 import type { ICredentialsOverwrite } from '@/Interfaces';
-import * as GenericHelpers from '@/GenericHelpers';
 
 class CredentialsOverwritesClass {
 	private overwriteData: ICredentialsOverwrite = {};
 
 	private resolvedTypes: string[] = [];
 
-	constructor(private credentialTypes: ICredentialTypes) {}
-
-	async init() {
-		const data = (await GenericHelpers.getConfigValue('credentials.overwrite.data')) as string;
-
+	constructor(private credentialTypes: ICredentialTypes) {
+		const data = config.getEnv('credentials.overwrite.data');
 		const overwriteData = jsonParse<ICredentialsOverwrite>(data, {
 			errorMessage: 'The credentials-overwrite is not valid JSON.',
 		});
diff --git a/packages/cli/src/Db.ts b/packages/cli/src/Db.ts
index 76bdd1e9057810..68ff6a0adaf38f 100644
--- a/packages/cli/src/Db.ts
+++ b/packages/cli/src/Db.ts
@@ -14,7 +14,6 @@ import type {
 import { DataSource as Connection } from 'typeorm';
 import type { TlsOptions } from 'tls';
 import type { DatabaseType, IDatabaseCollections } from '@/Interfaces';
-import * as GenericHelpers from '@/GenericHelpers';
 
 import config from '@/config';
 
@@ -44,17 +43,13 @@ export function linkRepository<Entity extends ObjectLiteral>(
 	return connection.getRepository(entityClass);
 }
 
-export async function getConnectionOptions(dbType: DatabaseType): Promise<ConnectionOptions> {
+export function getConnectionOptions(dbType: DatabaseType): ConnectionOptions {
 	switch (dbType) {
 		case 'postgresdb':
-			const sslCa = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.ca')) as string;
-			const sslCert = (await GenericHelpers.getConfigValue(
-				'database.postgresdb.ssl.cert',
-			)) as string;
-			const sslKey = (await GenericHelpers.getConfigValue('database.postgresdb.ssl.key')) as string;
-			const sslRejectUnauthorized = (await GenericHelpers.getConfigValue(
-				'database.postgresdb.ssl.rejectUnauthorized',
-			)) as boolean;
+			const sslCa = config.getEnv('database.postgresdb.ssl.ca');
+			const sslCert = config.getEnv('database.postgresdb.ssl.cert');
+			const sslKey = config.getEnv('database.postgresdb.ssl.key');
+			const sslRejectUnauthorized = config.getEnv('database.postgresdb.ssl.rejectUnauthorized');
 
 			let ssl: TlsOptions | undefined;
 			if (sslCa !== '' || sslCert !== '' || sslKey !== '' || !sslRejectUnauthorized) {
@@ -68,7 +63,7 @@ export async function getConnectionOptions(dbType: DatabaseType): Promise<Connec
 
 			return {
 				...getPostgresConnectionOptions(),
-				...(await getOptionOverrides('postgresdb')),
+				...getOptionOverrides('postgresdb'),
 				ssl,
 			};
 
@@ -76,7 +71,7 @@ export async function getConnectionOptions(dbType: DatabaseType): Promise<Connec
 		case 'mysqldb':
 			return {
 				...(dbType === 'mysqldb' ? getMysqlConnectionOptions() : getMariaDBConnectionOptions()),
-				...(await getOptionOverrides('mysqldb')),
+				...getOptionOverrides('mysqldb'),
 				timezone: 'Z', // set UTC as default
 			};
 
@@ -93,17 +88,13 @@ export async function init(
 ): Promise<IDatabaseCollections> {
 	if (isInitialized) return collections;
 
-	const dbType = (await GenericHelpers.getConfigValue('database.type')) as DatabaseType;
-	const connectionOptions = testConnectionOptions ?? (await getConnectionOptions(dbType));
+	const dbType = config.getEnv('database.type');
+	const connectionOptions = testConnectionOptions ?? getConnectionOptions(dbType);
 
-	let loggingOption: LoggerOptions = (await GenericHelpers.getConfigValue(
-		'database.logging.enabled',
-	)) as boolean;
+	let loggingOption: LoggerOptions = config.getEnv('database.logging.enabled');
 
 	if (loggingOption) {
-		const optionsString = (
-			(await GenericHelpers.getConfigValue('database.logging.options')) as string
-		).replace(/\s+/g, '');
+		const optionsString = config.getEnv('database.logging.options').replace(/\s+/g, '');
 
 		if (optionsString === 'all') {
 			loggingOption = optionsString;
@@ -112,9 +103,7 @@ export async function init(
 		}
 	}
 
-	const maxQueryExecutionTime = (await GenericHelpers.getConfigValue(
-		'database.logging.maxQueryExecutionTime',
-	)) as string;
+	const maxQueryExecutionTime = config.getEnv('database.logging.maxQueryExecutionTime');
 
 	Object.assign(connectionOptions, {
 		entities: Object.values(entities),
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 90810af1a57eab..e3940a620b7c34 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -5,22 +5,19 @@
 /* eslint-disable no-underscore-dangle */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import type express from 'express';
-import { readFile as fsReadFile } from 'fs/promises';
 import type {
 	ExecutionError,
-	IDataObject,
 	INode,
 	IRunExecutionData,
 	Workflow,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import { validate } from 'class-validator';
+import { Like } from 'typeorm';
 import config from '@/config';
 import * as Db from '@/Db';
 import type { ICredentialsDb, IExecutionDb, IExecutionFlattedDb, IWorkflowDb } from '@/Interfaces';
 import * as ResponseHelper from '@/ResponseHelper';
-// eslint-disable-next-line import/order
-import { Like } from 'typeorm';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { TagEntity } from '@db/entities/TagEntity';
@@ -28,7 +25,6 @@ import type { User } from '@db/entities/User';
 
 /**
  * Returns the base URL n8n is reachable from
- *
  */
 export function getBaseUrl(): string {
 	const protocol = config.getEnv('protocol');
@@ -44,73 +40,11 @@ export function getBaseUrl(): string {
 
 /**
  * Returns the session id if one is set
- *
  */
 export function getSessionId(req: express.Request): string | undefined {
 	return req.headers.sessionid as string | undefined;
 }
 
-/**
- * Extracts configuration schema for key
- */
-function extractSchemaForKey(configKey: string, configSchema: IDataObject): IDataObject {
-	const configKeyParts = configKey.split('.');
-
-	// eslint-disable-next-line no-restricted-syntax
-	for (const key of configKeyParts) {
-		if (configSchema[key] === undefined) {
-			throw new Error(`Key "${key}" of ConfigKey "${configKey}" does not exist`);
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		} else if ((configSchema[key]! as IDataObject)._cvtProperties === undefined) {
-			configSchema = configSchema[key] as IDataObject;
-		} else {
-			configSchema = (configSchema[key] as IDataObject)._cvtProperties as IDataObject;
-		}
-	}
-	return configSchema;
-}
-
-/**
- * Gets value from config with support for "_FILE" environment variables
- *
- * @param {string} configKey The key of the config data to get
- */
-export async function getConfigValue(
-	configKey: string,
-): Promise<string | boolean | number | undefined> {
-	// Get the environment variable
-	const configSchema = config.getSchema();
-	// @ts-ignore
-	const currentSchema = extractSchemaForKey(configKey, configSchema._cvtProperties as IDataObject);
-	// Check if environment variable is defined for config key
-	if (currentSchema.env === undefined) {
-		// No environment variable defined, so return value from config
-		// @ts-ignore
-		return config.getEnv(configKey);
-	}
-
-	// Check if special file environment variable exists
-	const fileEnvironmentVariable = process.env[`${currentSchema.env}_FILE`];
-	if (fileEnvironmentVariable === undefined) {
-		// Does not exist, so return value from config
-		// @ts-ignore
-		return config.getEnv(configKey);
-	}
-
-	let data;
-	try {
-		data = await fsReadFile(fileEnvironmentVariable, 'utf8');
-	} catch (error) {
-		if (error.code === 'ENOENT') {
-			throw new Error(`The file "${fileEnvironmentVariable}" could not be found.`);
-		}
-
-		throw error;
-	}
-
-	return data;
-}
-
 /**
  * Generate a unique name for a workflow or credentials entity.
  *
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 257d6e20450524..37875490feb03a 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -409,23 +409,17 @@ class Server extends AbstractServer {
 		// Check for basic auth credentials if activated
 		const basicAuthActive = config.getEnv('security.basicAuth.active');
 		if (basicAuthActive) {
-			const basicAuthUser = (await GenericHelpers.getConfigValue(
-				'security.basicAuth.user',
-			)) as string;
+			const basicAuthUser = config.getEnv('security.basicAuth.user');
 			if (basicAuthUser === '') {
 				throw new Error('Basic auth is activated but no user got defined. Please set one!');
 			}
 
-			const basicAuthPassword = (await GenericHelpers.getConfigValue(
-				'security.basicAuth.password',
-			)) as string;
+			const basicAuthPassword = config.getEnv('security.basicAuth.password');
 			if (basicAuthPassword === '') {
 				throw new Error('Basic auth is activated but no password got defined. Please set one!');
 			}
 
-			const basicAuthHashEnabled = (await GenericHelpers.getConfigValue(
-				'security.basicAuth.hash',
-			)) as boolean;
+			const basicAuthHashEnabled = config.getEnv('security.basicAuth.hash') as boolean;
 
 			let validPassword: null | string = null;
 
@@ -483,31 +477,19 @@ class Server extends AbstractServer {
 		// Check for and validate JWT if configured
 		const jwtAuthActive = config.getEnv('security.jwtAuth.active');
 		if (jwtAuthActive) {
-			const jwtAuthHeader = (await GenericHelpers.getConfigValue(
-				'security.jwtAuth.jwtHeader',
-			)) as string;
+			const jwtAuthHeader = config.getEnv('security.jwtAuth.jwtHeader');
 			if (jwtAuthHeader === '') {
 				throw new Error('JWT auth is activated but no request header was defined. Please set one!');
 			}
-			const jwksUri = (await GenericHelpers.getConfigValue('security.jwtAuth.jwksUri')) as string;
+			const jwksUri = config.getEnv('security.jwtAuth.jwksUri');
 			if (jwksUri === '') {
 				throw new Error('JWT auth is activated but no JWK Set URI was defined. Please set one!');
 			}
-			const jwtHeaderValuePrefix = (await GenericHelpers.getConfigValue(
-				'security.jwtAuth.jwtHeaderValuePrefix',
-			)) as string;
-			const jwtIssuer = (await GenericHelpers.getConfigValue(
-				'security.jwtAuth.jwtIssuer',
-			)) as string;
-			const jwtNamespace = (await GenericHelpers.getConfigValue(
-				'security.jwtAuth.jwtNamespace',
-			)) as string;
-			const jwtAllowedTenantKey = (await GenericHelpers.getConfigValue(
-				'security.jwtAuth.jwtAllowedTenantKey',
-			)) as string;
-			const jwtAllowedTenant = (await GenericHelpers.getConfigValue(
-				'security.jwtAuth.jwtAllowedTenant',
-			)) as string;
+			const jwtHeaderValuePrefix = config.getEnv('security.jwtAuth.jwtHeaderValuePrefix');
+			const jwtIssuer = config.getEnv('security.jwtAuth.jwtIssuer');
+			const jwtNamespace = config.getEnv('security.jwtAuth.jwtNamespace');
+			const jwtAllowedTenantKey = config.getEnv('security.jwtAuth.jwtAllowedTenantKey');
+			const jwtAllowedTenant = config.getEnv('security.jwtAuth.jwtAllowedTenant');
 
 			// eslint-disable-next-line no-inner-declarations
 			function isTenantAllowed(decodedToken: object): boolean {
@@ -1456,7 +1438,7 @@ export async function start(): Promise<void> {
 	const binaryDataConfig = config.getEnv('binaryDataManager');
 	const diagnosticInfo: IDiagnosticInfo = {
 		basicAuthActive: config.getEnv('security.basicAuth.active'),
-		databaseType: (await GenericHelpers.getConfigValue('database.type')) as DatabaseType,
+		databaseType: config.getEnv('database.type'),
 		disableProductionWebhooksOnMainProcess: config.getEnv(
 			'endpoints.disableProductionWebhooksOnMainProcess',
 		),
diff --git a/packages/cli/src/UserManagement/email/UserManagementMailer.ts b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
index 67cc4ec6e28f62..2c9ef671981778 100644
--- a/packages/cli/src/UserManagement/email/UserManagementMailer.ts
+++ b/packages/cli/src/UserManagement/email/UserManagementMailer.ts
@@ -2,7 +2,6 @@ import { existsSync } from 'fs';
 import { readFile } from 'fs/promises';
 import Handlebars from 'handlebars';
 import { join as pathJoin } from 'path';
-import * as GenericHelpers from '@/GenericHelpers';
 import config from '@/config';
 import type {
 	InviteEmailData,
@@ -23,9 +22,7 @@ async function getTemplate(
 ): Promise<Template> {
 	let template = templates[templateName];
 	if (!template) {
-		const templateOverride = (await GenericHelpers.getConfigValue(
-			`userManagement.emails.templates.${templateName}`,
-		)) as string;
+		const templateOverride = config.getEnv(`userManagement.emails.templates.${templateName}`);
 
 		let markup;
 		if (templateOverride && existsSync(templateOverride)) {
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index c11e2d9feb56ef..98b292df73a89e 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -14,12 +14,11 @@ import type { FindManyOptions, ObjectLiteral } from 'typeorm';
 import { LessThanOrEqual } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 
+import config from '@/config';
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
-import * as GenericHelpers from '@/GenericHelpers';
 import * as ActiveExecutions from '@/ActiveExecutions';
 import type {
-	DatabaseType,
 	IExecutionFlattedDb,
 	IExecutionsStopData,
 	IWorkflowExecutionDataProcess,
@@ -63,7 +62,8 @@ export class WaitTrackerClass {
 				waitTill: 'ASC',
 			},
 		};
-		const dbType = (await GenericHelpers.getConfigValue('database.type')) as DatabaseType;
+
+		const dbType = config.getEnv('database.type');
 		if (dbType === 'sqlite') {
 			// This is needed because of issue in TypeORM <> SQLite:
 			// https://github.com/typeorm/typeorm/issues/2286
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 7f0e0d3a8820d5..5beb4c7469c018 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -108,8 +108,7 @@ class WorkflowRunnerProcess {
 		const credentialTypes = CredentialTypes(loadNodesAndCredentials);
 
 		// Load the credentials overwrites if any exist
-		const credentialsOverwrites = CredentialsOverwrites(credentialTypes);
-		await credentialsOverwrites.init();
+		CredentialsOverwrites(credentialTypes);
 
 		// Load all external hooks
 		const externalHooks = ExternalHooks();
diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts
index 858aefc4050f35..7ad1964e7db7d1 100644
--- a/packages/cli/src/commands/db/revert.ts
+++ b/packages/cli/src/commands/db/revert.ts
@@ -28,7 +28,7 @@ export class DbRevertMigrationCommand extends Command {
 		try {
 			const dbType = config.getEnv('database.type');
 			const connectionOptions: ConnectionOptions = {
-				...(await getConnectionOptions(dbType)),
+				...getConnectionOptions(dbType),
 				subscribers: [],
 				synchronize: false,
 				migrationsRun: false,
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index 7972b0925a7f3e..7b299cde6f21e2 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -130,7 +130,7 @@ export class Execute extends Command {
 		const credentialTypes = CredentialTypes(loadNodesAndCredentials);
 
 		// Load the credentials overwrites if any exist
-		await CredentialsOverwrites(credentialTypes).init();
+		CredentialsOverwrites(credentialTypes);
 
 		// Load all external hooks
 		const externalHooks = ExternalHooks();
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index 6c99813af0324c..61021746d17366 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -318,7 +318,7 @@ export class ExecuteBatch extends Command {
 		const credentialTypes = CredentialTypes(loadNodesAndCredentials);
 
 		// Load the credentials overwrites if any exist
-		await CredentialsOverwrites(credentialTypes).init();
+		CredentialsOverwrites(credentialTypes);
 
 		// Load all external hooks
 		const externalHooks = ExternalHooks();
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 716e2e11565871..590307c26f4a34 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -28,7 +28,6 @@ import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { NodeTypes } from '@/NodeTypes';
 import { InternalHooksManager } from '@/InternalHooksManager';
 import * as Server from '@/Server';
-import type { DatabaseType } from '@/Interfaces';
 import * as TestWebhooks from '@/TestWebhooks';
 import { WaitTracker } from '@/WaitTracker';
 
@@ -279,7 +278,7 @@ export class Start extends Command {
 			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
 
 			// Load the credentials overwrites if any exist
-			await CredentialsOverwrites(credentialTypes).init();
+			CredentialsOverwrites(credentialTypes);
 
 			await loadNodesAndCredentials.generateTypesForFrontend();
 
@@ -341,8 +340,7 @@ export class Start extends Command {
 				);
 			}
 
-			const dbType = (await GenericHelpers.getConfigValue('database.type')) as DatabaseType;
-
+			const dbType = config.getEnv('database.type');
 			if (dbType === 'sqlite') {
 				const shouldRunVacuum = config.getEnv('database.sqlite.executeVacuumOnStartup');
 				if (shouldRunVacuum) {
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index 2caccd5942949c..ed47095c66f64c 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -128,7 +128,7 @@ export class Webhook extends Command {
 			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
 
 			// Load the credentials overwrites if any exist
-			await CredentialsOverwrites(credentialTypes).init();
+			CredentialsOverwrites(credentialTypes);
 
 			// Load all external hooks
 			const externalHooks = ExternalHooks();
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 231a1899e53da8..895ed3988ad9dd 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -285,7 +285,7 @@ export class Worker extends Command {
 				const credentialTypes = CredentialTypes(loadNodesAndCredentials);
 
 				// Load the credentials overwrites if any exist
-				await CredentialsOverwrites(credentialTypes).init();
+				CredentialsOverwrites(credentialTypes);
 
 				// Load all external hooks
 				const externalHooks = ExternalHooks();
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 56a3f01288e972..8ba066139c2cfe 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -1,11 +1,9 @@
-/* eslint-disable @typescript-eslint/naming-convention */
-/* eslint-disable @typescript-eslint/unbound-method */
-/* eslint-disable no-console */
 import convict from 'convict';
 import dotenv from 'dotenv';
 import { tmpdir } from 'os';
-import { mkdtempSync } from 'fs';
+import { mkdtempSync, readFileSync } from 'fs';
 import { join } from 'path';
+import { LoggerProxy as Logger } from 'n8n-workflow';
 import { schema } from './schema';
 import { inTest, inE2ETests } from '@/constants';
 
@@ -19,8 +17,7 @@ if (inE2ETests) {
 		EXTERNAL_FRONTEND_HOOKS_URLS: '',
 		N8N_PERSONALIZATION_ENABLED: 'false',
 	};
-}
-if (inTest) {
+} else if (inTest) {
 	process.env.N8N_PUBLIC_API_DISABLED = 'true';
 	process.env.N8N_PUBLIC_API_SWAGGERUI_DISABLED = 'true';
 } else {
@@ -33,20 +30,46 @@ if (inE2ETests) {
 	config.set('enterprise.features.sharing', true);
 }
 
+// eslint-disable-next-line @typescript-eslint/unbound-method
 config.getEnv = config.get;
 
-if (!inE2ETests) {
+// Load overwrites when not in tests
+if (!inE2ETests && !inTest) {
 	// Overwrite default configuration with settings which got defined in
 	// optional configuration files
 	const { N8N_CONFIG_FILES } = process.env;
 	if (N8N_CONFIG_FILES !== undefined) {
 		const configFiles = N8N_CONFIG_FILES.split(',');
-		if (!inTest) {
-			console.log(`\nLoading configuration overwrites from:\n - ${configFiles.join('\n - ')}\n`);
-		}
-
+		Logger.debug('Loading config overwrites', configFiles);
 		config.loadFile(configFiles);
 	}
+
+	// Overwrite config from files defined in "_FILE" environment variables
+	const overwrites = Object.entries(process.env).reduce<Record<string, string>>(
+		(acc, [envName, fileName]) => {
+			if (envName.endsWith('_FILE') && fileName) {
+				const key = envName.replace(/_FILE$/, '');
+				// @ts-ignore
+				if (key in config._env) {
+					let value: string;
+					try {
+						value = readFileSync(fileName, 'utf8').trim();
+					} catch (error) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+						if (error.code === 'ENOENT') {
+							throw new Error(`The file "${fileName}" could not be found.`);
+						}
+						throw error;
+					}
+					Logger.debug('Loading config overwrite', { fileName });
+					acc[key] = value;
+				}
+			}
+			return acc;
+		},
+		{},
+	);
+	config.load(overwrites);
 }
 
 config.validate({
diff --git a/packages/cli/src/databases/config.ts b/packages/cli/src/databases/config.ts
index 87087218702dc9..739c2138e3bed1 100644
--- a/packages/cli/src/databases/config.ts
+++ b/packages/cli/src/databases/config.ts
@@ -10,7 +10,6 @@ import { postgresMigrations } from './migrations/postgresdb';
 import { sqliteMigrations } from './migrations/sqlite';
 import type { DatabaseType } from '@/Interfaces';
 import config from '@/config';
-import { getConfigValue } from '@/GenericHelpers';
 
 const entitiesDir = path.resolve(__dirname, 'entities');
 
@@ -43,12 +42,12 @@ const getDBConnectionOptions = (dbType: DatabaseType) => {
 	};
 };
 
-export const getOptionOverrides = async (dbType: 'postgresdb' | 'mysqldb') => ({
-	database: (await getConfigValue(`database.${dbType}.database`)) as string,
-	host: (await getConfigValue(`database.${dbType}.host`)) as string,
-	port: (await getConfigValue(`database.${dbType}.port`)) as number,
-	username: (await getConfigValue(`database.${dbType}.user`)) as string,
-	password: (await getConfigValue(`database.${dbType}.password`)) as string,
+export const getOptionOverrides = (dbType: 'postgresdb' | 'mysqldb') => ({
+	database: config.getEnv(`database.${dbType}.database`),
+	host: config.getEnv(`database.${dbType}.host`),
+	port: config.getEnv(`database.${dbType}.port`),
+	username: config.getEnv(`database.${dbType}.user`),
+	password: config.getEnv(`database.${dbType}.password`),
 });
 
 export const getSqliteConnectionOptions = (): SqliteConnectionOptions => ({
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index 3ebda21d2b80d1..fe1e857d771cc8 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -12,7 +12,6 @@ import config from '@/config';
 import type { User } from '@db/entities/User';
 import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
 import type {
-	DatabaseType,
 	IExecutionFlattedResponse,
 	IExecutionResponse,
 	IExecutionsListResponse,
@@ -70,7 +69,7 @@ export class ExecutionsService {
 		countFilter: IDataObject,
 		user: User,
 	): Promise<{ count: number; estimated: boolean }> {
-		const dbType = (await GenericHelpers.getConfigValue('database.type')) as DatabaseType;
+		const dbType = config.getEnv('database.type');
 		const filteredFields = Object.keys(countFilter).filter((field) => field !== 'id');
 
 		// For databases other than Postgres, do a regular count

From c93664a57c6f252044264b09876e9b474740f6e8 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Mon, 30 Jan 2023 15:57:36 +0200
Subject: [PATCH 023/358] fix(editor): Add SMTP info translation link slot
 (#5288)

---
 packages/editor-ui/src/plugins/i18n/locales/en.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 08db286bd1d21e..818c8ffb7c15cb 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -1118,7 +1118,8 @@
 	"settings.users.setupMyAccount": "Set up my owner account",
 	"settings.users.setupToInviteUsers": "To invite users, set up your own account",
 	"settings.users.setupToInviteUsersInfo": "Invited users won’t be able to see workflows and credentials of other users unless you upgrade. <a href=\"https://docs.n8n.io/user-management/\" target=\"_blank\">More info</a> <br /> <br />",
-	"settings.users.setupSMTPInfo": "You will need details of an <a href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\" target=\"_blank\">SMTP server</a> to complete the setup.",
+	"settings.users.setupSMTPInfo": "You will need details of an {link} to complete the setup.",
+	"settings.users.setupSMTPInfo.link": "SMTP server",
 	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\">Instructions</a>",
 	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\">Instructions</a>",
 	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user",

From e125e6764c1f02dde6def8a709f2b6770d21d6a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 30 Jan 2023 17:04:15 +0100
Subject: [PATCH 024/358] fix(n8n Trigger Node): Use the new icon for N8N
 Trigger node (no-changelog) (#5290)

---
 packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg b/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg
index e2e67c20fbc9fa..17ba54479a678f 100644
--- a/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg
+++ b/packages/nodes-base/nodes/N8nTrigger/n8nTrigger.svg
@@ -1 +1,3 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="5 5 55 55"><path d="M50.28 17.26c-2.39 0-4.4 1.64-4.97 3.86h-7.15c-2.8 0-5.08 2.28-5.08 5.08 0 1.4-1.14 2.54-2.54 2.54h-1.02a5.138 5.138 0 00-4.97-3.86c-2.39 0-4.4 1.64-4.97 3.86H15.5a5.138 5.138 0 00-4.97-3.86c-2.83 0-5.13 2.3-5.13 5.13s2.3 5.13 5.13 5.13c2.39 0 4.4-1.64 4.97-3.86h4.08a5.138 5.138 0 004.97 3.86 5.13 5.13 0 004.95-3.81h1.03c1.4 0 2.54 1.14 2.54 2.54 0 2.8 2.28 5.09 5.08 5.09h1.66a5.138 5.138 0 004.97 3.86c2.83 0 5.13-2.3 5.13-5.13s-2.3-5.13-5.13-5.13c-2.39 0-4.4 1.64-4.97 3.86h-1.66c-1.4 0-2.54-1.14-2.54-2.54 0-1.53-.68-2.9-1.76-3.84a5.092 5.092 0 001.76-3.84c0-1.4 1.14-2.54 2.54-2.54h7.15a5.138 5.138 0 004.97 3.86c2.83 0 5.13-2.3 5.13-5.13s-2.29-5.13-5.12-5.13zM10.54 32.61a2.59 2.59 0 11.001-5.181 2.59 2.59 0 01-.001 5.181zm14.02 0a2.59 2.59 0 112.59-2.59c0 1.43-1.17 2.59-2.59 2.59zm20.24 2.5a2.59 2.59 0 11-.001 5.181 2.59 2.59 0 01.001-5.181zm5.48-10.13a2.59 2.59 0 11.001-5.181 2.59 2.59 0 01-.001 5.181z" fill="#ff6d5a"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 230 120" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M204 48C192.817 48 183.42 40.3514 180.756 30H153.248C147.382 30 142.376 34.241 141.412 40.0272L140.425 45.9456C139.489 51.5648 136.646 56.4554 132.626 60C136.646 63.5446 139.489 68.4352 140.425 74.0544L141.412 79.9728C142.376 85.759 147.382 90 153.248 90H156.756C159.42 79.6486 168.817 72 180 72C193.255 72 204 82.7452 204 96C204 109.255 193.255 120 180 120C168.817 120 159.42 112.351 156.756 102H153.248C141.516 102 131.504 93.5181 129.575 81.9456L128.588 76.0272C127.624 70.241 122.618 66 116.752 66H107.244C104.58 76.3514 95.183 84 84 84C72.817 84 63.4204 76.3514 60.7561 66H47.2439C44.5796 76.3514 35.183 84 24 84C10.7452 84 0 73.2548 0 60C0 46.7452 10.7452 36 24 36C35.183 36 44.5796 43.6486 47.2439 54H60.7561C63.4204 43.6486 72.817 36 84 36C95.183 36 104.58 43.6486 107.244 54H116.752C122.618 54 127.624 49.759 128.588 43.9728L129.575 38.0544C131.504 26.4819 141.516 18 153.248 18L180.756 18C183.42 7.64864 192.817 0 204 0C217.255 0 228 10.7452 228 24C228 37.2548 217.255 48 204 48ZM204 36C210.627 36 216 30.6274 216 24C216 17.3726 210.627 12 204 12C197.373 12 192 17.3726 192 24C192 30.6274 197.373 36 204 36ZM24 72C30.6274 72 36 66.6274 36 60C36 53.3726 30.6274 48 24 48C17.3726 48 12 53.3726 12 60C12 66.6274 17.3726 72 24 72ZM96 60C96 66.6274 90.6274 72 84 72C77.3726 72 72 66.6274 72 60C72 53.3726 77.3726 48 84 48C90.6274 48 96 53.3726 96 60ZM192 96C192 102.627 186.627 108 180 108C173.373 108 168 102.627 168 96C168 89.3726 173.373 84 180 84C186.627 84 192 89.3726 192 96Z" fill="#EA4B71"/>
+</svg>

From 6c8570adcc2c5ef71789e4a79a55023bbd3c0144 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Mon, 30 Jan 2023 17:23:46 +0100
Subject: [PATCH 025/358] docs(Postgres Node): Remove overkill notice for
 postgres & paireditem (#5291)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

📝 Remove notice about pairedItem
---
 packages/nodes-base/nodes/Postgres/Postgres.node.ts | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 362557021a63c1..a840cddb7620af 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -81,18 +81,6 @@ export class Postgres implements INodeType {
 				description:
 					'The SQL query to execute. You can use n8n expressions or $1 and $2 in conjunction with query parameters.',
 			},
-			{
-				displayName:
-					'Due to the behavior of the Multiple Queries mode, if you want to use the PairedItem feature, you need to use either the independent or the transaction mode under Additional Fields.',
-				name: 'pairedItemsNotice',
-				type: 'notice',
-				displayOptions: {
-					show: {
-						operation: ['executeQuery'],
-					},
-				},
-				default: '',
-			},
 			// ----------------------------------
 			//         insert
 			// ----------------------------------

From 4bd9ed675eb382879de8ac83d658bed2b88e2518 Mon Sep 17 00:00:00 2001
From: freya <freya@n8n.io>
Date: Mon, 30 Jan 2023 16:34:26 +0000
Subject: [PATCH 026/358] refactor: Clean up workflow stats test file (#5282)

* :hammer: - Use .spyOn for UserManagment

* :hammer: - Remove a no longer needed test

* :hammer: - Refactored and cleaned up workflowstats tests

* :hammer: - Clean up unused imports / lines
---
 packages/cli/test/unit/Events.test.ts | 75 ++++++---------------------
 1 file changed, 17 insertions(+), 58 deletions(-)

diff --git a/packages/cli/test/unit/Events.test.ts b/packages/cli/test/unit/Events.test.ts
index 532b2a1dbc4cda..258be2d172ab9e 100644
--- a/packages/cli/test/unit/Events.test.ts
+++ b/packages/cli/test/unit/Events.test.ts
@@ -1,10 +1,11 @@
+import { LoggerProxy, WorkflowExecuteMode } from 'n8n-workflow';
+import { QueryFailedError } from 'typeorm';
 import config from '@/config';
-import { InternalHooksManager } from '@/InternalHooksManager';
+import { Db } from '@/index';
 import { nodeFetchedData, workflowExecutionCompleted } from '@/events/WorkflowStatistics';
-import { LoggerProxy, WorkflowExecuteMode } from 'n8n-workflow';
+import { InternalHooksManager } from '@/InternalHooksManager';
 import { getLogger } from '@/Logger';
-import { StatisticsNames } from '@db/entities/WorkflowStatistics';
-import { QueryFailedError } from 'typeorm';
+import  * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
 
 const FAKE_USER_ID = 'abcde-fghij';
 
@@ -22,31 +23,15 @@ jest.spyOn(InternalHooksManager, 'getInstance').mockImplementation((...args) =>
 jest.mock('@/Db', () => {
 	return {
 		collections: {
-			Workflow: {
-				update: jest.fn(({ id, dataLoaded }, updateArgs) => {
-					if (id === '1') return { affected: 1 };
-					return { affected: 0 };
-				}),
-			},
 			WorkflowStatistics: {
-				// Have made a tech debt ticket to refactor this test suite for later
-				insert: jest.fn(({ count, name, workflowId }) => {
-					if (workflowId === '-1') throw new QueryFailedError('test error', [], '');
-					else if (name === StatisticsNames.dataLoaded && workflowId === '2')
-						throw new QueryFailedError('test error 2', [], '');
-					return null;
-				}),
+				insert: jest.fn((...args) => {}),
 				update: jest.fn((...args) => {}),
 			},
 		},
 	};
 });
-jest.mock('@/UserManagement/UserManagementHelper', () => {
-	return {
-		getWorkflowOwner: jest.fn((workflowId) => {
-			return { id: FAKE_USER_ID };
-		}),
-	};
+jest.spyOn(UserManagementHelper, 'getWorkflowOwner').mockImplementation(async (workflowId) => {
+	return { id: FAKE_USER_ID };
 });
 
 describe('Events', () => {
@@ -69,25 +54,6 @@ describe('Events', () => {
 	afterEach(() => {});
 
 	describe('workflowExecutionCompleted', () => {
-		test('should fail with an invalid workflowId', async () => {
-			const workflow = {
-				id: 'abcde',
-				name: '',
-				active: false,
-				createdAt: new Date(),
-				updatedAt: new Date(),
-				nodes: [],
-				connections: {},
-			};
-			const runData = {
-				finished: true,
-				data: { resultData: { runData: {} } },
-				mode: 'internal' as WorkflowExecuteMode,
-				startedAt: new Date(),
-			};
-			await workflowExecutionCompleted(workflow, runData);
-		});
-
 		test('should create metrics for production successes', async () => {
 			// Call the function with a production success result, ensure metrics hook gets called
 			const workflow = {
@@ -135,9 +101,12 @@ describe('Events', () => {
 		});
 
 		test('should not send metrics for updated entries', async () => {
-			// Call the function with the id that causes insert to fail, ensure update is called *and* metrics aren't sent
+			// Call the function with a fail insert, ensure update is called *and* metrics aren't sent
+			Db.collections.WorkflowStatistics.insert.mockImplementationOnce((...args) => {
+				throw new QueryFailedError('invalid insert', [], '');
+			});
 			const workflow = {
-				id: '-1',
+				id: '1',
 				name: '',
 				active: false,
 				createdAt: new Date(),
@@ -157,19 +126,6 @@ describe('Events', () => {
 	});
 
 	describe('nodeFetchedData', () => {
-		test('should fail with an invalid workflowId', async () => {
-			const workflowId = 'abcde';
-			const node = {
-				id: 'abcde',
-				name: 'test node',
-				typeVersion: 1,
-				type: '',
-				position: [0, 0] as [number, number],
-				parameters: {},
-			};
-			await nodeFetchedData(workflowId, node);
-		});
-
 		test('should create metrics when the db is updated', async () => {
 			// Call the function with a production success result, ensure metrics hook gets called
 			const workflowId = '1';
@@ -222,7 +178,10 @@ describe('Events', () => {
 
 		test('should not send metrics for entries that already have the flag set', async () => {
 			// Fetch data for workflow 2 which is set up to not be altered in the mocks
-			const workflowId = '2';
+			Db.collections.WorkflowStatistics.insert.mockImplementationOnce((...args) => {
+				throw new QueryFailedError('invalid insert', [], '');
+			});
+			const workflowId = '1';
 			const node = {
 				id: 'abcde',
 				name: 'test node',

From 5cb7e5007de7374f8ee6e6fbe1c5a8138af2d065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 30 Jan 2023 17:38:31 +0100
Subject: [PATCH 027/358] feat(core): Export OpenAPI spec for external tools
 (#5294)

The generated spec is available at /api/v1/openapi.yml
---
 packages/cli/src/PublicApi/index.ts | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/PublicApi/index.ts
index 26f9757a21776c..d7054d892953bb 100644
--- a/packages/cli/src/PublicApi/index.ts
+++ b/packages/cli/src/PublicApi/index.ts
@@ -49,6 +49,10 @@ async function createApiRouter(
 		);
 	}
 
+	apiController.get(`/${publicApiEndpoint}/${version}/openapi.yml`, (req, res) => {
+		res.sendFile(openApiSpecPath);
+	});
+
 	apiController.use(
 		`/${publicApiEndpoint}/${version}`,
 		express.json(),

From 766501723b424dd105935177e4be649b6218b1c1 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 30 Jan 2023 18:20:50 +0100
Subject: [PATCH 028/358] refactor(editor): Upgrade to jsPlumb 5 (#4989)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* WIP: Nodeview

* Replace types

* Finish N8nPlus endpoint type

* Working on connector

* Apply prettier

* Fixed prettier issues

* Debugging rendering

* Fixed connectorrs position recalc

* Fix snapping and output labels, WIP dragging

* Fix N8nPlus endpoint rendering issues

* Cleanup

* Fix undo/redo and canvas add button position, cleanup

* Cleanup

* Revert accidental CLI changes

* Fix pnpm-lock

* Address bugs that came up during review

* Reset CLI package from master

* Various fixes

* Fix run items label toggling

* Linter fixes

* Fix stalk size for larger run items label

* Remove comment

* Correctly reset workspace after renaming the node

* Fix canvas e2e tests

* Fix undo/redo tests

* Fix stalk positioning and triggering of endpoint overlays

* Repaint connections on pin removal

* Limit repaintings

* Unbind jsPlumb events on deactivation

* Fix jsPlumb managment of Sticky and minor memort managment improvments

* Address rest of PR points

* Lint fix

* Copy patches folder to docker

* Fix e2e tests

* set allowNonAppliedPatches to allow build

* fix(editor): Handling router errors when navigation is canceled by user (#5271)

* 🔨 Handling router errors in main sidebar, removing unused code
* 🔨 Handling router errors in modals

* ci(core): Fix docker nightly/custom image build (no-changelog) (#5284)

* ci(core): Copy patches dir to Docker (no-changelog)

* Update patch

* Update package-lock

* reapply the patch

* skip patchedDependencies after the frontend is built

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>

* Fix connector hover state on success

* Remove allowNonAppliedPatches from package.json

---------

Co-authored-by: Milorad FIlipović <milorad@n8n.io>
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 cypress/e2e/10-undo-redo.cy.ts                |  12 +-
 cypress/e2e/12-canvas.cy.ts                   |  12 +-
 cypress/e2e/2-credentials.cy.ts               |   2 +-
 cypress/e2e/5-ndv.cy.ts                       |   4 +-
 cypress/pages/workflow.ts                     |   7 +-
 cypress/support/commands.ts                   |   2 +-
 package.json                                  |   1 +
 packages/editor-ui/package.json               |   6 +-
 packages/editor-ui/src/Interface.ts           | 118 ---
 packages/editor-ui/src/components/Node.vue    | 282 ++++--
 .../editor-ui/src/components/NodeSettings.vue |   2 +-
 packages/editor-ui/src/components/Sticky.vue  |  16 +-
 packages/editor-ui/src/main.ts                |   2 +-
 packages/editor-ui/src/mixins/mouseSelect.ts  |   4 +-
 packages/editor-ui/src/mixins/nodeBase.ts     | 206 ++--
 packages/editor-ui/src/mixins/nodeHelpers.ts  |   2 +-
 packages/editor-ui/src/models/history.ts      |  61 +-
 .../src/plugins/N8nCustomConnectorType.js     | 896 ------------------
 .../editor-ui/src/plugins/PlusEndpointType.js | 518 ----------
 .../plugins/connectors/N8nCustomConnector.ts  | 586 ++++++++++++
 .../endpoints/N8nPlusEndpointRenderer.ts      |  37 +
 .../plugins/endpoints/N8nPlusEndpointType.ts  | 183 ++++
 packages/editor-ui/src/stores/canvas.ts       | 133 ++-
 packages/editor-ui/src/stores/ui.ts           |   3 +
 packages/editor-ui/src/stores/workflows.ts    |   4 +-
 packages/editor-ui/src/utils/canvasUtils.ts   |   8 +-
 packages/editor-ui/src/utils/nodeViewUtils.ts | 284 +++---
 .../editor-ui/src/views/CanvasAddButton.vue   |   4 +-
 packages/editor-ui/src/views/NodeView.vue     | 525 +++++-----
 pnpm-lock.yaml                                |  56 +-
 30 files changed, 1732 insertions(+), 2244 deletions(-)
 delete mode 100644 packages/editor-ui/src/plugins/N8nCustomConnectorType.js
 delete mode 100644 packages/editor-ui/src/plugins/PlusEndpointType.js
 create mode 100644 packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
 create mode 100644 packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointRenderer.ts
 create mode 100644 packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts

diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 515cc611902b90..e76091b5533821 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -39,11 +39,9 @@ describe('Undo/Redo', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
-		WorkflowPage.getters.nodeConnections().first().trigger('mouseover', { force: true });
-		cy.get('.connection-actions .add').invoke('show');
-		cy.get('.connection-actions .add').should('be.visible');
-		cy.get('.connection-actions .add').click();
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
+		WorkflowPage.getters.nodeConnections().realHover();
+		cy.get('.connection-actions .add').filter(':visible').click();
+		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME, false);
 		WorkflowPage.actions.zoomToFit();
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 3);
@@ -141,8 +139,8 @@ describe('Undo/Redo', () => {
 	it('should undo/redo deleting a connection by pressing delete button', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters.nodeConnections().first().trigger('mouseover', { force: true });
-		cy.get('.connection-actions .delete').click();
+		WorkflowPage.getters.nodeConnections().realHover();
+		cy.get('.connection-actions .delete').filter(':visible').should('be.visible').click();
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 062412e8887a05..3651ce163a661e 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -61,11 +61,9 @@ describe('Canvas Actions', () => {
 	it('should add note between two connected nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters.nodeConnections().first().trigger('mouseover', { force: true });
-		cy.get('.connection-actions .add').as('AddNodeConnectionButton');
-		cy.get('@AddNodeConnectionButton').invoke('show');
-		cy.get('@AddNodeConnectionButton').should('be.visible').click();
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.getters.nodeConnections().first().realHover();
+		cy.get('.connection-actions .add').filter(':visible').should('be.visible').click()
+		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, false);
 		WorkflowPage.getters.canvasNodes().should('have.length', 3);
 		WorkflowPage.getters.nodeConnections().should('have.length', 2);
 		// And last node should be pushed to the right
@@ -219,8 +217,8 @@ describe('Canvas Actions', () => {
 	it('should delete connections by pressing the delete button', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters.nodeConnections().first().trigger('mouseover', { force: true });
-		cy.get('.connection-actions .delete').click();
+		WorkflowPage.getters.nodeConnections().first().realHover();
+		cy.get('.connection-actions .delete').filter(':visible').should('be.visible').click();
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 4430acf0704c46..f94a11571d777a 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -151,7 +151,7 @@ describe('Credentials', () => {
 	it('should correctly render required and optional credentials', () => {
 		workflowPage.actions.visit();
 		cy.waitForLoad();
-		workflowPage.actions.addNodeToCanvas(PIPEDRIVE_NODE_NAME, true);
+		workflowPage.actions.addNodeToCanvas(PIPEDRIVE_NODE_NAME, true, true);
 		cy.get('body').type('{downArrow}');
 		cy.get('body').type('{enter}');
 		// Select incoming authentication
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index d4829945507aab..9fead48e51a4cb 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -53,7 +53,7 @@ describe('NDV', () => {
 	});
 
 	it('should show correct validation state for resource locator params', () => {
-		workflowPage.actions.addNodeToCanvas('Typeform', true);
+		workflowPage.actions.addNodeToCanvas('Typeform', true, false);
 		ndv.getters.container().should('be.visible');
 		cy.get('.has-issues').should('have.length', 0);
 		cy.get('[class*=hasIssues]').should('have.length', 0);
@@ -66,7 +66,7 @@ describe('NDV', () => {
 
 	it('should show validation errors only after blur or re-opening of NDV', () => {
 		workflowPage.actions.addNodeToCanvas('Manual Trigger');
-		workflowPage.actions.addNodeToCanvas('Airtable', true);
+		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
 		ndv.getters.container().should('be.visible');
 		cy.get('.has-issues').should('have.length', 0);
 		ndv.getters.parameterInput('table').find('input').eq(1).focus().blur();
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 98f408e0ed9325..67a16c44214171 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -92,8 +92,11 @@ export class WorkflowPage extends BasePage {
 			this.getters.nodeCreatorSearchBar().type('{enter}');
 			cy.get('body').type('{esc}');
 		},
-		addNodeToCanvas: (nodeDisplayName: string, preventNdvClose?: boolean) => {
-			this.getters.nodeCreatorPlusButton().click();
+		addNodeToCanvas: (nodeDisplayName: string, plusButtonClick = true, preventNdvClose?: boolean) => {
+			if (plusButtonClick) {
+				this.getters.nodeCreatorPlusButton().click();
+			}
+
 			this.getters.nodeCreatorSearchBar().type(nodeDisplayName);
 			this.getters.nodeCreatorSearchBar().type('{enter}');
 
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index beb5f17c9d227f..9a686ab2d03837 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -23,7 +23,7 @@
 //
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-
+import "cypress-real-events";
 import { WorkflowsPage, SigninPage, SignupPage } from '../pages';
 import { N8N_AUTH_COOKIE } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
diff --git a/package.json b/package.json
index ff0f3e858d5b77..7011e19246db69 100644
--- a/package.json
+++ b/package.json
@@ -43,6 +43,7 @@
     "@types/node": "^16.11.22",
     "cross-env": "^7.0.3",
     "cypress": "^10.0.3",
+    "cypress-real-events": "^1.7.6",
     "jest": "^29.3.1",
     "jest-environment-jsdom": "^29.3.1",
     "jest-mock": "^29.3.1",
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 1f2a8db3e1703a..cfb1a01aa1bc48 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -39,6 +39,11 @@
     "@fortawesome/free-regular-svg-icons": "^6.1.1",
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/vue-fontawesome": "^2.0.2",
+    "@jsplumb/browser-ui": "^5.13.2",
+    "@jsplumb/common": "^5.13.2",
+    "@jsplumb/connector-bezier": "^5.13.2",
+    "@jsplumb/core": "^5.13.2",
+    "@jsplumb/util": "^5.13.2",
     "axios": "^0.21.1",
     "codemirror-lang-html-n8n": "^1.0.0",
     "codemirror-lang-n8n-expression": "^0.1.0",
@@ -50,7 +55,6 @@
     "humanize-duration": "^3.27.2",
     "jquery": "^3.4.1",
     "jsonpath": "^1.1.1",
-    "jsplumb": "2.15.4",
     "lodash-es": "^4.17.21",
     "lodash.camelcase": "^4.3.0",
     "lodash.debounce": "^4.0.8",
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 260820b8f6deba..fdded1ad3a90a3 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1,17 +1,6 @@
 import { CREDENTIAL_EDIT_MODAL_KEY } from './constants';
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { IMenuItem } from 'n8n-design-system';
-import {
-	jsPlumbInstance,
-	DragOptions,
-	DropOptions,
-	ElementGroupRef,
-	Endpoint,
-	EndpointOptions,
-	EndpointRectangle,
-	EndpointRectangleOptions,
-	EndpointSpec,
-} from 'jsplumb';
 import {
 	GenericValue,
 	IConnections,
@@ -47,98 +36,6 @@ import { BulkCommand, Undoable } from '@/models/history';
 
 export * from 'n8n-design-system/types';
 
-declare module 'jsplumb' {
-	interface PaintStyle {
-		stroke?: string;
-		fill?: string;
-		strokeWidth?: number;
-		outlineStroke?: string;
-		outlineWidth?: number;
-	}
-
-	// Extend jsPlumb Anchor interface
-	interface Anchor {
-		lastReturnValue: number[];
-	}
-
-	interface Connection {
-		__meta?: {
-			sourceNodeName: string;
-			sourceOutputIndex: number;
-			targetNodeName: string;
-			targetOutputIndex: number;
-		};
-		canvas?: HTMLElement;
-		connector?: {
-			setTargetEndpoint: (endpoint: Endpoint) => void;
-			resetTargetEndpoint: () => void;
-			bounds: {
-				minX: number;
-				maxX: number;
-				minY: number;
-				maxY: number;
-			};
-		};
-
-		// bind(event: string, (connection: Connection): void;): void;
-		bind(event: string, callback: Function): void;
-		removeOverlay(name: string): void;
-		removeOverlays(): void;
-		setParameter(name: string, value: any): void;
-		setPaintStyle(arg0: PaintStyle): void;
-		addOverlay(arg0: any[]): void;
-		setConnector(arg0: any[]): void;
-		getUuids(): [string, string];
-	}
-
-	interface Endpoint {
-		endpoint: any;
-		elementId: string;
-		__meta?: {
-			nodeName: string;
-			nodeId: string;
-			index: number;
-			totalEndpoints: number;
-		};
-		getUuid(): string;
-		getOverlay(name: string): any;
-		repaint(params?: object): void;
-	}
-
-	interface N8nPlusEndpoint extends Endpoint {
-		setSuccessOutput(message: string): void;
-		clearSuccessOutput(): void;
-	}
-
-	interface Overlay {
-		setVisible(visible: boolean): void;
-		setLocation(location: number): void;
-		canvas?: HTMLElement;
-	}
-
-	interface OnConnectionBindInfo {
-		originalSourceEndpoint: Endpoint;
-		originalTargetEndpoint: Endpoint;
-		getParameters(): { index: number };
-	}
-}
-
-// EndpointOptions from jsplumb seems incomplete and wrong so we define an own one
-export type IEndpointOptions = Omit<EndpointOptions, 'endpoint' | 'dragProxy'> & {
-	endpointStyle: EndpointStyle;
-	endpointHoverStyle: EndpointStyle;
-	endpoint?: EndpointSpec | string;
-	dragAllowedWhenFull?: boolean;
-	dropOptions?: DropOptions & {
-		tolerance: string;
-	};
-	dragProxy?:
-		| string
-		| string[]
-		| EndpointSpec
-		| [EndpointRectangle, EndpointRectangleOptions & { strokeWidth: number }];
-};
-
 export type EndpointStyle = {
 	width?: number;
 	height?: number;
@@ -152,21 +49,6 @@ export type EndpointStyle = {
 	hoverMessage?: string;
 };
 
-export type IDragOptions = DragOptions & {
-	grid: [number, number];
-	filter: string;
-};
-
-export type IJsPlumbInstance = Omit<jsPlumbInstance, 'addEndpoint' | 'draggable'> & {
-	clearDragSelection: () => void;
-	addEndpoint(
-		el: ElementGroupRef,
-		params?: IEndpointOptions,
-		referenceParams?: IEndpointOptions,
-	): Endpoint | Endpoint[];
-	draggable(el: {}, options?: IDragOptions): IJsPlumbInstance;
-};
-
 export interface IUpdateInformation {
 	name: string;
 	key?: string;
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index dd7fa242993cb2..c50c2a3107e47d 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -1,5 +1,12 @@
 <template>
-	<div class="node-wrapper" :style="nodePosition" :id="nodeId" data-test-id="canvas-node">
+	<div
+		class="node-wrapper"
+		:style="nodePosition"
+		:id="nodeId"
+		data-test-id="canvas-node"
+		:ref="data.name"
+		:data-name="data.name"
+	>
 		<div class="select-background" v-show="isSelected"></div>
 		<div
 			:class="{
@@ -7,8 +14,6 @@
 				'touch-active': isTouchActive,
 				'is-touch-device': isTouchDevice,
 			}"
-			:data-name="data.name"
-			:ref="data.name"
 		>
 			<div
 				:class="nodeClass"
@@ -515,7 +520,6 @@ export default mixins(
 						this.data.name,
 						!this.data.disabled,
 						this.data.disabled === true,
-						this,
 					),
 				);
 				this.$telemetry.track('User clicked node hover button', {
@@ -698,6 +702,7 @@ export default mixins(
 
 			.items-count {
 				font-size: var(--font-size-s);
+				padding: 0;
 			}
 		}
 
@@ -807,20 +812,33 @@ export default mixins(
 		}
 	}
 }
-
+.dot-output-endpoint:hover circle {
+	fill: var(--color-primary);
+}
 /** connector */
 .jtk-connector {
 	z-index: 3;
 }
 
+.jtk-floating-endpoint {
+	opacity: 0;
+}
+
 .jtk-connector path {
 	transition: stroke 0.1s ease-in-out;
 }
 
-.jtk-connector.success {
+.jtk-overlay {
+	z-index: 3;
+}
+.jtk-connector {
 	z-index: 4;
 }
-
+.node-input-endpoint-label,
+.node-output-endpoint-label,
+.connection-run-items-label {
+	z-index: 5;
+}
 .jtk-connector.jtk-hover {
 	z-index: 6;
 }
@@ -828,30 +846,25 @@ export default mixins(
 .jtk-endpoint.plus-endpoint {
 	z-index: 6;
 }
-
 .jtk-endpoint.dot-output-endpoint {
 	z-index: 7;
-}
-
-.jtk-overlay {
-	z-index: 7;
+	overflow: auto;
 }
 
 .disabled-linethrough {
 	z-index: 8;
 }
 
-.jtk-connector.jtk-dragging {
-	z-index: 8;
-}
-
 .jtk-drag-active.dot-output-endpoint,
 .jtk-drag-active.rect-input-endpoint {
 	z-index: 9;
 }
+.rect-input-endpoint > * {
+	pointer-events: none;
+}
 
 .connection-actions {
-	z-index: 10;
+	z-index: 100;
 }
 
 .node-options {
@@ -861,88 +874,207 @@ export default mixins(
 .drop-add-node-label {
 	z-index: 10;
 }
+
+.jtk-connector.success:not(.jtk-hover) {
+	path:not(.jtk-connector-outline) {
+		stroke: var(--color-success-light);
+	}
+	path[jtk-overlay-id='endpoint-arrow'],
+	path[jtk-overlay-id='midpoint-arrow'] {
+		fill: var(--color-success-light);
+	}
+}
 </style>
 
 <style lang="scss">
-$--stalklength: 40px;
-$--box-size-medium: 24px;
-$--box-size-small: 18px;
+:root {
+	--endpoint-size-small: 14px;
+	--endpoint-size-medium: 18px;
+	--stalk-size: 40px;
+	--stalk-success-size: 87px;
+	--stalk-long-size: 127px;
+	--plus-endpoint-box-size: 24px;
+	--plus-endpoint-box-size-small: 17px;
+}
 
-.plus-endpoint {
-	cursor: pointer;
+.plus-svg-circle {
+	z-index: 111;
+	circle {
+		stroke: var(--color-foreground-xdark);
+		stroke-width: 2px;
+		fill: var(--color-foreground-xdark);
+	}
 
-	.plus-stalk {
-		border-top: 2px solid var(--color-foreground-dark);
-		position: absolute;
-		width: $--stalklength;
-		height: 0;
-		right: 100%;
-		top: calc(50% - 1px);
-		pointer-events: none;
+	&:hover {
+		circle {
+			stroke: var(--color-primary);
+			fill: var(--color-primary);
+		}
+	}
+}
+.plus-stalk {
+	width: calc(var(--stalk-size) + 2px);
+	border: 1px solid var(--color-foreground-dark);
+	margin-left: calc(var(--stalk-size) / 2);
+	z-index: 3;
+	&.ep-success {
+		border-color: var(--color-success-light);
 
-		.connection-run-items-label {
-			position: relative;
-			width: 100%;
+		&:after {
+			content: attr(data-label);
+			position: absolute;
+			left: 0;
+			right: 0;
+			bottom: 100%;
+			margin: auto;
+			margin-bottom: 2px;
+			text-align: center;
 
-			span {
-				display: none;
-				left: calc(50% + 4px);
-			}
+			line-height: 1.3em;
+			font-size: var(--font-size-s);
+			font-weight: var(--font-weight-regular);
+			color: var(--color-success);
 		}
 	}
+}
+.connection-run-items-label {
+	// Disable points events so that the label does not block the connection
+	// mouse over event.
+	pointer-events: none;
+	span {
+		border-radius: 7px;
+		background-color: hsla(
+			var(--color-canvas-background-h),
+			var(--color-canvas-background-s),
+			var(--color-canvas-background-l),
+			0.85
+		);
+		line-height: 1.3em;
+		padding: 0px 3px;
+		white-space: nowrap;
+		font-size: var(--font-size-s);
+		font-weight: var(--font-weight-regular);
+		color: var(--color-success);
+		margin-top: -15px;
+
+		&.floating {
+			position: absolute;
+			top: -6px;
+			transform: translateX(-50%);
+		}
+	}
+}
+
+.connection-input-name-label {
+	position: relative;
 
-	.plus-container {
-		color: var(--color-foreground-xdark);
-		border: 2px solid var(--color-foreground-xdark);
-		background-color: var(--color-background-xlight);
-		border-radius: var(--border-radius-base);
-		height: $--box-size-medium;
-		width: $--box-size-medium;
-
-		display: inline-flex;
-		align-items: center;
-		justify-content: center;
-		font-size: var(--font-size-2xs);
+	span {
 		position: absolute;
+		top: -10px;
+		left: -60px;
+	}
+}
 
-		top: 0;
-		right: 0;
+.plus-endpoint {
+	cursor: pointer;
+	z-index: 10;
+	margin-left: calc((var(--stalk-size) + var(--plus-endpoint-box-size) / 2) - 1px);
+	g {
+		fill: var(--color-background-xlight);
 		pointer-events: none;
+	}
 
-		&.small {
-			height: $--box-size-small;
-			width: $--box-size-small;
-			font-size: 8px;
+	&:hover {
+		path {
+			fill: var(--color-primary);
 		}
-
-		.fa-plus {
-			width: 1em;
+		rect {
+			stroke: var(--color-primary);
 		}
 	}
+	path {
+		fill: var(--color-foreground-xdark);
+	}
+	rect {
+		stroke: var(--color-foreground-xdark);
+	}
 
-	.drop-hover-message {
-		font-weight: var(--font-weight-bold);
-		font-size: var(--font-size-2xs);
-		line-height: var(--font-line-height-regular);
-		color: var(--color-text-light);
-
-		position: absolute;
-		top: -6px;
-		left: calc(100% + 8px);
-		width: 200px;
-		display: none;
+	&.small {
+		margin-left: calc((var(--stalk-size) + var(--plus-endpoint-box-size-small) / 2));
+		g {
+			transform: scale(0.75);
+			transform-origin: center;
+		}
+		rect {
+			stroke-width: 2.5;
+		}
+	}
+	&:hover .plus-container {
+		color: var(--color-primary);
+		border: 2px solid var(--color-primary);
+	}
+	&:hover .drop-hover-message {
+		display: block;
 	}
 
-	&.hidden > * {
+	&.hidden {
 		display: none;
 	}
+}
 
-	&.success .plus-stalk {
-		border-color: var(--color-success-light);
+.node-input-endpoint-label,
+.node-output-endpoint-label {
+	background-color: hsla(
+		var(--color-canvas-background-h),
+		var(--color-canvas-background-s),
+		var(--color-canvas-background-l),
+		0.85
+	);
+	border-radius: 7px;
+	font-size: 0.7em;
+	padding: 2px;
+	white-space: nowrap;
+}
 
-		span {
-			display: inline;
-		}
+.node-output-endpoint-label {
+	margin-left: calc(var(--endpoint-size-small) + var(--spacing-3xs));
+}
+.node-input-endpoint-label {
+	text-align: right;
+	margin-left: -25px;
+
+	&--moved {
+		margin-left: -40px;
+	}
+}
+.hover-message.jtk-overlay {
+	--hover-message-width: 110px;
+	font-weight: var(--font-weight-bold);
+	font-size: var(--font-size-2xs);
+	line-height: var(--font-line-height-regular);
+	color: var(--color-text-light);
+	width: var(--hover-message-width);
+	margin-left: calc(
+		(var(--hover-message-width) / 2) + var(--stalk-size) + var(--plus-endpoint-box-size) +
+			var(--spacing-2xs)
+	);
+	opacity: 0;
+	pointer-events: none;
+	&.small {
+		margin-left: calc(
+			(var(--hover-message-width) / 2) + var(--stalk-size) + var(--plus-endpoint-box-size-small) +
+				var(--spacing-2xs)
+		);
+	}
+	&.visible {
+		pointer-events: all;
+		opacity: 1;
 	}
 }
+.ep-success {
+	--stalk-size: var(--stalk-success-size);
+}
+.long-stalk {
+	--stalk-size: var(--stalk-long-size);
+}
 </style>
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 0e2fb766839e7e..e533e20f8c0500 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -549,7 +549,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		},
 		nameChanged(name: string) {
 			if (this.node) {
-				this.historyStore.pushCommandToUndo(new RenameNodeCommand(this.node.name, name, this));
+				this.historyStore.pushCommandToUndo(new RenameNodeCommand(this.node.name, name));
 			}
 			// @ts-ignore
 			this.valueChanged({
diff --git a/packages/editor-ui/src/components/Sticky.vue b/packages/editor-ui/src/components/Sticky.vue
index 683719837bec16..922e9b734cd8b9 100644
--- a/packages/editor-ui/src/components/Sticky.vue
+++ b/packages/editor-ui/src/components/Sticky.vue
@@ -1,5 +1,11 @@
 <template>
-	<div class="sticky-wrapper" :style="stickyPosition" :id="nodeId" ref="sticky">
+	<div
+		class="sticky-wrapper"
+		:id="nodeId"
+		:ref="data.name"
+		:style="stickyPosition"
+		:data-name="data.name"
+	>
 		<div
 			:class="{
 				'sticky-default': true,
@@ -11,8 +17,6 @@
 			<div class="select-sticky-background" v-show="isSelected" />
 			<div
 				class="sticky-box"
-				:data-name="data.name"
-				:ref="data.name"
 				@click.left="mouseLeftClick"
 				v-touch:start="touchStart"
 				v-touch:end="touchEnd"
@@ -186,9 +190,6 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 			if (!this.isSelected && this.node) {
 				this.$emit('nodeSelected', this.node.name, false, true);
 			}
-			if (this.node) {
-				this.instance.destroyDraggable(this.node.id); // todo avoid destroying if possible
-			}
 		},
 		onResize({ height, width, dX, dY }: { width: number; height: number; dX: number; dY: number }) {
 			if (!this.node) {
@@ -202,7 +203,6 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 		},
 		onResizeEnd() {
 			this.isResizing = false;
-			this.__makeInstanceDraggable(this.data);
 		},
 		setParameters(params: { content?: string; height?: number; width?: number }) {
 			if (this.node) {
@@ -252,8 +252,6 @@ export default mixins(externalHooks, nodeBase, nodeHelpers, workflowHelpers).ext
 	position: absolute;
 
 	.sticky-default {
-		position: absolute;
-
 		.sticky-box {
 			width: 100%;
 			height: 100%;
diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index fec0a3605ead97..980bae1a06f1fd 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -7,7 +7,7 @@ import 'prismjs';
 import 'prismjs/themes/prism.css';
 import 'vue-prism-editor/dist/VuePrismEditor.css';
 import 'vue-json-pretty/lib/styles.css';
-
+import '@jsplumb/browser-ui/css/jsplumbtoolkit.css';
 import 'n8n-design-system/css/index.scss';
 import './n8n-theme.scss';
 
diff --git a/packages/editor-ui/src/mixins/mouseSelect.ts b/packages/editor-ui/src/mixins/mouseSelect.ts
index a2435ee26ef0aa..89b0d6a54c5103 100644
--- a/packages/editor-ui/src/mixins/mouseSelect.ts
+++ b/packages/editor-ui/src/mixins/mouseSelect.ts
@@ -203,12 +203,12 @@ export const mouseSelect = mixins(deviceSupportHelpers).extend({
 		nodeDeselected(node: INodeUi) {
 			this.uiStore.removeNodeFromSelection(node);
 			// @ts-ignore
-			this.instance.removeFromDragSelection(node.id);
+			this.instance.removeFromDragSelection(this.$refs[`node-${node.id}`][0].$el);
 		},
 		nodeSelected(node: INodeUi) {
 			this.uiStore.addSelectedNode(node);
 			// @ts-ignore
-			this.instance.addToDragSelection(node.id);
+			this.instance.addToDragSelection(this.$refs[`node-${node.id}`][0].$el);
 		},
 		deselectAllNodes() {
 			// @ts-ignore
diff --git a/packages/editor-ui/src/mixins/nodeBase.ts b/packages/editor-ui/src/mixins/nodeBase.ts
index 71558f4290a8a2..b90ac49ff13bd2 100644
--- a/packages/editor-ui/src/mixins/nodeBase.ts
+++ b/packages/editor-ui/src/mixins/nodeBase.ts
@@ -1,18 +1,19 @@
 import { PropType } from 'vue';
 import mixins from 'vue-typed-mixins';
-import { IJsPlumbInstance, IEndpointOptions, INodeUi, XYPosition } from '@/Interface';
+import { INodeUi } from '@/Interface';
 import { deviceSupportHelpers } from '@/mixins/deviceSupportHelpers';
-import { NO_OP_NODE_TYPE, STICKY_NODE_TYPE } from '@/constants';
+import { NO_OP_NODE_TYPE } from '@/constants';
 
 import { INodeTypeDescription } from 'n8n-workflow';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
+import { EndpointOptions } from '@jsplumb/core';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
-import { getStyleTokenValue } from '@/utils';
 import { useHistoryStore } from '@/stores/history';
-import { MoveNodeCommand } from '@/models/history';
+import { useCanvasStore } from '@/stores/canvas';
 
 export const nodeBase = mixins(deviceSupportHelpers).extend({
 	mounted() {
@@ -27,7 +28,7 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 		}
 	},
 	computed: {
-		...mapStores(useNodeTypesStore, useUIStore, useWorkflowsStore, useHistoryStore),
+		...mapStores(useNodeTypesStore, useUIStore, useCanvasStore, useWorkflowsStore, useHistoryStore),
 		data(): INodeUi | null {
 			return this.workflowsStore.getNodeByName(this.name);
 		},
@@ -40,7 +41,7 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 			type: String,
 		},
 		instance: {
-			type: Object as PropType<IJsPlumbInstance>,
+			type: Object as PropType<BrowserJsPlumbInstance>,
 		},
 		isReadOnly: {
 			type: Boolean,
@@ -79,18 +80,15 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 				const anchorPosition =
 					NodeViewUtils.ANCHOR_POSITIONS.input[nodeTypeData.inputs.length][index];
 
-				const newEndpointData: IEndpointOptions = {
+				const newEndpointData: EndpointOptions = {
 					uuid: NodeViewUtils.getInputEndpointUUID(this.nodeId, index),
 					anchor: anchorPosition,
 					maxConnections: -1,
 					endpoint: 'Rectangle',
-					endpointStyle: NodeViewUtils.getInputEndpointStyle(
-						nodeTypeData,
-						'--color-foreground-xdark',
-					),
-					endpointHoverStyle: NodeViewUtils.getInputEndpointStyle(nodeTypeData, '--color-primary'),
-					isSource: false,
-					isTarget: !this.isReadOnly && nodeTypeData.inputs.length > 1, // only enabled for nodes with multiple inputs.. otherwise attachment handled by connectionDrag event in NodeView,
+					paintStyle: NodeViewUtils.getInputEndpointStyle(nodeTypeData, '--color-foreground-xdark'),
+					hoverPaintStyle: NodeViewUtils.getInputEndpointStyle(nodeTypeData, '--color-primary'),
+					source: false,
+					target: !this.isReadOnly && nodeTypeData.inputs.length > 1, // only enabled for nodes with multiple inputs.. otherwise attachment handled by connectionDrag event in NodeView,
 					parameters: {
 						nodeId: this.nodeId,
 						type: inputName,
@@ -99,20 +97,17 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 					enabled: !this.isReadOnly, // enabled in default case to allow dragging
 					cssClass: 'rect-input-endpoint',
 					dragAllowedWhenFull: true,
-					dropOptions: {
-						tolerance: 'touch',
-						hoverClass: 'dropHover',
-					},
+					hoverClass: 'dropHover',
 				};
 
+				const endpoint = this.instance?.addEndpoint(
+					this.$refs[this.data.name] as Element,
+					newEndpointData,
+				);
 				if (nodeTypeData.inputNames) {
 					// Apply input names if they got set
-					newEndpointData.overlays = [
-						NodeViewUtils.getInputNameOverlay(nodeTypeData.inputNames[index]),
-					];
+					endpoint.addOverlay(NodeViewUtils.getInputNameOverlay(nodeTypeData.inputNames[index]));
 				}
-
-				const endpoint = this.instance.addEndpoint(this.nodeId, newEndpointData);
 				if (!Array.isArray(endpoint)) {
 					endpoint.__meta = {
 						nodeName: node.name,
@@ -133,6 +128,9 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 				// 	this.instance.makeTarget(this.nodeId, newEndpointData);
 				// }
 			});
+			if (nodeTypeData.inputs.length === 0) {
+				this.instance.manage(this.$refs[this.data.name] as Element);
+			}
 		},
 		__addOutputEndpoints(node: INodeUi, nodeTypeData: INodeTypeDescription) {
 			let index;
@@ -153,37 +151,46 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 				const anchorPosition =
 					NodeViewUtils.ANCHOR_POSITIONS.output[nodeTypeData.outputs.length][index];
 
-				const newEndpointData: IEndpointOptions = {
+				const newEndpointData: EndpointOptions = {
 					uuid: NodeViewUtils.getOutputEndpointUUID(this.nodeId, index),
 					anchor: anchorPosition,
 					maxConnections: -1,
-					endpoint: 'Dot',
-					endpointStyle: NodeViewUtils.getOutputEndpointStyle(
+
+					endpoint: {
+						type: 'Dot',
+						options: {
+							radius: nodeTypeData && nodeTypeData.outputs.length > 2 ? 7 : 9,
+						},
+					},
+					paintStyle: NodeViewUtils.getOutputEndpointStyle(
 						nodeTypeData,
 						'--color-foreground-xdark',
 					),
-					endpointHoverStyle: NodeViewUtils.getOutputEndpointStyle(nodeTypeData, '--color-primary'),
-					isSource: true,
-					isTarget: false,
+					hoverPaintStyle: NodeViewUtils.getOutputEndpointStyle(nodeTypeData, '--color-primary'),
+					source: true,
+					target: false,
 					enabled: !this.isReadOnly,
 					parameters: {
 						nodeId: this.nodeId,
 						type: inputName,
 						index,
 					},
+					hoverClass: 'dot-output-endpoint-hover',
+					connectionsDirected: true,
 					cssClass: 'dot-output-endpoint',
 					dragAllowedWhenFull: false,
-					dragProxy: ['Rectangle', { width: 1, height: 1, strokeWidth: 0 }],
 				};
 
+				const endpoint = this.instance.addEndpoint(
+					this.$refs[this.data.name] as Element,
+					newEndpointData,
+				);
 				if (nodeTypeData.outputNames) {
 					// Apply output names if they got set
-					newEndpointData.overlays = [
-						NodeViewUtils.getOutputNameOverlay(nodeTypeData.outputNames[index]),
-					];
+					const overlaySpec = NodeViewUtils.getOutputNameOverlay(nodeTypeData.outputNames[index]);
+					const overlay = endpoint.addOverlay(overlaySpec);
 				}
 
-				const endpoint = this.instance.addEndpoint(this.nodeId, { ...newEndpointData });
 				if (!Array.isArray(endpoint)) {
 					endpoint.__meta = {
 						nodeName: node.name,
@@ -194,26 +201,28 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 				}
 
 				if (!this.isReadOnly) {
-					const plusEndpointData: IEndpointOptions = {
+					const plusEndpointData: EndpointOptions = {
 						uuid: NodeViewUtils.getOutputEndpointUUID(this.nodeId, index),
 						anchor: anchorPosition,
 						maxConnections: -1,
-						endpoint: 'N8nPlus',
-						isSource: true,
-						isTarget: false,
+						endpoint: {
+							type: 'N8nPlus',
+							options: {
+								dimensions: 24,
+								connectedEndpoint: endpoint,
+								showOutputLabel: nodeTypeData.outputs.length === 1,
+								size: nodeTypeData.outputs.length >= 3 ? 'small' : 'medium',
+								hoverMessage: this.$locale.baseText('nodeBase.clickToAddNodeOrDragToConnect'),
+							},
+						},
+						source: true,
+						target: false,
 						enabled: !this.isReadOnly,
-						endpointStyle: {
-							fill: getStyleTokenValue('--color-xdark'),
+						paintStyle: {
 							outlineStroke: 'none',
-							hover: false,
-							showOutputLabel: nodeTypeData.outputs.length === 1,
-							size: nodeTypeData.outputs.length >= 3 ? 'small' : 'medium',
-							hoverMessage: this.$locale.baseText('nodeBase.clickToAddNodeOrDragToConnect'),
 						},
-						endpointHoverStyle: {
-							fill: getStyleTokenValue('--color-primary'),
+						hoverPaintStyle: {
 							outlineStroke: 'none',
-							hover: true, // hack to distinguish hover state
 						},
 						parameters: {
 							nodeId: this.nodeId,
@@ -222,10 +231,12 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 						},
 						cssClass: 'plus-draggable-endpoint',
 						dragAllowedWhenFull: false,
-						dragProxy: ['Rectangle', { width: 1, height: 1, strokeWidth: 0 }],
 					};
+					const plusEndpoint = this.instance.addEndpoint(
+						this.$refs[this.data.name] as Element,
+						plusEndpointData,
+					);
 
-					const plusEndpoint = this.instance.addEndpoint(this.nodeId, plusEndpointData);
 					if (!Array.isArray(plusEndpoint)) {
 						plusEndpoint.__meta = {
 							nodeName: node.name,
@@ -237,105 +248,12 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 				}
 			});
 		},
-		__makeInstanceDraggable(node: INodeUi) {
-			// TODO: This caused problems with displaying old information
-			//       https://github.com/jsplumb/katavorio/wiki
-			//       https://jsplumb.github.io/jsplumb/home.html
-			// Make nodes draggable
-			this.instance.draggable(this.nodeId, {
-				grid: [NodeViewUtils.GRID_SIZE, NodeViewUtils.GRID_SIZE],
-				start: (params: { e: MouseEvent }) => {
-					if (this.isReadOnly === true) {
-						// Do not allow to move nodes in readOnly mode
-						return false;
-					}
-					// @ts-ignore
-					this.dragging = true;
-
-					const isSelected = this.uiStore.isNodeSelected(this.data.name);
-					const nodeName = this.data.name;
-					if (this.data.type === STICKY_NODE_TYPE && !isSelected) {
-						setTimeout(() => {
-							this.$emit('nodeSelected', nodeName, false, true);
-						}, 0);
-					}
-
-					if (params.e && !isSelected) {
-						// Only the node which gets dragged directly gets an event, for all others it is
-						// undefined. So check if the currently dragged node is selected and if not clear
-						// the drag-selection.
-						this.instance.clearDragSelection();
-						this.uiStore.resetSelectedNodes();
-					}
-
-					this.uiStore.addActiveAction('dragActive');
-					return true;
-				},
-				stop: (params: { e: MouseEvent }) => {
-					// @ts-ignore
-					this.dragging = false;
-					if (this.uiStore.isActionActive('dragActive')) {
-						const moveNodes = this.uiStore.getSelectedNodes.slice();
-						const selectedNodeNames = moveNodes.map((node: INodeUi) => node.name);
-						if (!selectedNodeNames.includes(this.data.name)) {
-							// If the current node is not in selected add it to the nodes which
-							// got moved manually
-							moveNodes.push(this.data);
-						}
-
-						if (moveNodes.length > 1) {
-							this.historyStore.startRecordingUndo();
-						}
-						// This does for some reason just get called once for the node that got clicked
-						// even though "start" and "drag" gets called for all. So lets do for now
-						// some dirty DOM query to get the new positions till I have more time to
-						// create a proper solution
-						let newNodePosition: XYPosition;
-						moveNodes.forEach((node: INodeUi) => {
-							const element = document.getElementById(node.id);
-							if (element === null) {
-								return;
-							}
-
-							newNodePosition = [
-								parseInt(element.style.left!.slice(0, -2), 10),
-								parseInt(element.style.top!.slice(0, -2), 10),
-							];
-
-							const updateInformation = {
-								name: node.name,
-								properties: {
-									// @ts-ignore, draggable does not have definitions
-									position: newNodePosition,
-								},
-							};
-							const oldPosition = node.position;
-							if (oldPosition[0] !== newNodePosition[0] || oldPosition[1] !== newNodePosition[1]) {
-								this.historyStore.pushCommandToUndo(
-									new MoveNodeCommand(node.name, oldPosition, newNodePosition, this),
-								);
-								this.workflowsStore.updateNodeProperties(updateInformation);
-								this.$emit('moved', node);
-							}
-						});
-						if (moveNodes.length > 1) {
-							this.historyStore.stopRecordingUndo();
-						}
-					}
-				},
-				filter: '.node-description, .node-description .node-name, .node-description .node-subtitle',
-			});
-		},
 		__addNode(node: INodeUi) {
-			let nodeTypeData = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-			if (!nodeTypeData) {
-				// If node type is not know use by default the base.noOp data to display it
-				nodeTypeData = this.nodeTypesStore.getNodeType(NO_OP_NODE_TYPE);
-			}
+			const nodeTypeData = (this.nodeTypesStore.getNodeType(node.type, node.typeVersion) ??
+				this.nodeTypesStore.getNodeType(NO_OP_NODE_TYPE)) as INodeTypeDescription;
 
 			this.__addInputEndpoints(node, nodeTypeData);
 			this.__addOutputEndpoints(node, nodeTypeData);
-			this.__makeInstanceDraggable(node);
 		},
 		touchEnd(e: MouseEvent) {
 			if (this.isTouchDevice) {
diff --git a/packages/editor-ui/src/mixins/nodeHelpers.ts b/packages/editor-ui/src/mixins/nodeHelpers.ts
index 8676443d1a0b63..f0914069cf9954 100644
--- a/packages/editor-ui/src/mixins/nodeHelpers.ts
+++ b/packages/editor-ui/src/mixins/nodeHelpers.ts
@@ -505,7 +505,7 @@ export const nodeHelpers = mixins(restApi).extend({
 				this.updateNodeCredentialIssues(node);
 				if (trackHistory) {
 					this.historyStore.pushCommandToUndo(
-						new EnableNodeToggleCommand(node.name, oldState === true, node.disabled === true, this),
+						new EnableNodeToggleCommand(node.name, oldState === true, node.disabled === true),
 					);
 				}
 			}
diff --git a/packages/editor-ui/src/models/history.ts b/packages/editor-ui/src/models/history.ts
index 2afaf117f94307..761391a3123517 100644
--- a/packages/editor-ui/src/models/history.ts
+++ b/packages/editor-ui/src/models/history.ts
@@ -21,17 +21,16 @@ export enum COMMANDS {
 // this timeout in between canvas actions
 // (0 is usually enough but leaving this just in case)
 const CANVAS_ACTION_TIMEOUT = 10;
+export const historyBus = new Vue();
 
 export abstract class Undoable {}
 
 export abstract class Command extends Undoable {
 	readonly name: string;
-	eventBus: Vue;
 
-	constructor(name: string, eventBus: Vue) {
+	constructor(name: string) {
 		super();
 		this.name = name;
-		this.eventBus = eventBus;
 	}
 	abstract getReverseCommand(): Command;
 	abstract isEqualTo(anotherCommand: Command): boolean;
@@ -52,15 +51,15 @@ export class MoveNodeCommand extends Command {
 	oldPosition: XYPosition;
 	newPosition: XYPosition;
 
-	constructor(nodeName: string, oldPosition: XYPosition, newPosition: XYPosition, eventBus: Vue) {
-		super(COMMANDS.MOVE_NODE, eventBus);
+	constructor(nodeName: string, oldPosition: XYPosition, newPosition: XYPosition) {
+		super(COMMANDS.MOVE_NODE);
 		this.nodeName = nodeName;
 		this.newPosition = newPosition;
 		this.oldPosition = oldPosition;
 	}
 
 	getReverseCommand(): Command {
-		return new MoveNodeCommand(this.nodeName, this.newPosition, this.oldPosition, this.eventBus);
+		return new MoveNodeCommand(this.nodeName, this.newPosition, this.oldPosition);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -76,7 +75,7 @@ export class MoveNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			this.eventBus.$root.$emit('nodeMove', {
+			historyBus.$emit('nodeMove', {
 				nodeName: this.nodeName,
 				position: this.oldPosition,
 			});
@@ -88,13 +87,13 @@ export class MoveNodeCommand extends Command {
 export class AddNodeCommand extends Command {
 	node: INodeUi;
 
-	constructor(node: INodeUi, eventBus: Vue) {
-		super(COMMANDS.ADD_NODE, eventBus);
+	constructor(node: INodeUi) {
+		super(COMMANDS.ADD_NODE);
 		this.node = node;
 	}
 
 	getReverseCommand(): Command {
-		return new RemoveNodeCommand(this.node, this.eventBus);
+		return new RemoveNodeCommand(this.node);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -103,7 +102,7 @@ export class AddNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			this.eventBus.$root.$emit('revertAddNode', { node: this.node });
+			historyBus.$emit('revertAddNode', { node: this.node });
 			resolve();
 		});
 	}
@@ -112,13 +111,13 @@ export class AddNodeCommand extends Command {
 export class RemoveNodeCommand extends Command {
 	node: INodeUi;
 
-	constructor(node: INodeUi, eventBus: Vue) {
-		super(COMMANDS.REMOVE_NODE, eventBus);
+	constructor(node: INodeUi) {
+		super(COMMANDS.REMOVE_NODE);
 		this.node = node;
 	}
 
 	getReverseCommand(): Command {
-		return new AddNodeCommand(this.node, this.eventBus);
+		return new AddNodeCommand(this.node);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -127,7 +126,7 @@ export class RemoveNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			this.eventBus.$root.$emit('revertRemoveNode', { node: this.node });
+			historyBus.$emit('revertRemoveNode', { node: this.node });
 			resolve();
 		});
 	}
@@ -136,13 +135,13 @@ export class RemoveNodeCommand extends Command {
 export class AddConnectionCommand extends Command {
 	connectionData: [IConnection, IConnection];
 
-	constructor(connectionData: [IConnection, IConnection], eventBus: Vue) {
-		super(COMMANDS.ADD_CONNECTION, eventBus);
+	constructor(connectionData: [IConnection, IConnection]) {
+		super(COMMANDS.ADD_CONNECTION);
 		this.connectionData = connectionData;
 	}
 
 	getReverseCommand(): Command {
-		return new RemoveConnectionCommand(this.connectionData, this.eventBus);
+		return new RemoveConnectionCommand(this.connectionData);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -157,7 +156,7 @@ export class AddConnectionCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			this.eventBus.$root.$emit('revertAddConnection', { connection: this.connectionData });
+			historyBus.$emit('revertAddConnection', { connection: this.connectionData });
 			resolve();
 		});
 	}
@@ -166,13 +165,13 @@ export class AddConnectionCommand extends Command {
 export class RemoveConnectionCommand extends Command {
 	connectionData: [IConnection, IConnection];
 
-	constructor(connectionData: [IConnection, IConnection], eventBus: Vue) {
-		super(COMMANDS.REMOVE_CONNECTION, eventBus);
+	constructor(connectionData: [IConnection, IConnection]) {
+		super(COMMANDS.REMOVE_CONNECTION);
 		this.connectionData = connectionData;
 	}
 
 	getReverseCommand(): Command {
-		return new AddConnectionCommand(this.connectionData, this.eventBus);
+		return new AddConnectionCommand(this.connectionData);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -188,7 +187,7 @@ export class RemoveConnectionCommand extends Command {
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
 			setTimeout(() => {
-				this.eventBus.$root.$emit('revertRemoveConnection', { connection: this.connectionData });
+				historyBus.$emit('revertRemoveConnection', { connection: this.connectionData });
 				resolve();
 			}, CANVAS_ACTION_TIMEOUT);
 		});
@@ -200,15 +199,15 @@ export class EnableNodeToggleCommand extends Command {
 	oldState: boolean;
 	newState: boolean;
 
-	constructor(nodeName: string, oldState: boolean, newState: boolean, eventBus: Vue) {
-		super(COMMANDS.ENABLE_NODE_TOGGLE, eventBus);
+	constructor(nodeName: string, oldState: boolean, newState: boolean) {
+		super(COMMANDS.ENABLE_NODE_TOGGLE);
 		this.nodeName = nodeName;
 		this.newState = newState;
 		this.oldState = oldState;
 	}
 
 	getReverseCommand(): Command {
-		return new EnableNodeToggleCommand(this.nodeName, this.newState, this.oldState, this.eventBus);
+		return new EnableNodeToggleCommand(this.nodeName, this.newState, this.oldState);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -219,7 +218,7 @@ export class EnableNodeToggleCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			this.eventBus.$root.$emit('enableNodeToggle', {
+			historyBus.$emit('enableNodeToggle', {
 				nodeName: this.nodeName,
 				isDisabled: this.oldState,
 			});
@@ -232,14 +231,14 @@ export class RenameNodeCommand extends Command {
 	currentName: string;
 	newName: string;
 
-	constructor(currentName: string, newName: string, eventBus: Vue) {
-		super(COMMANDS.RENAME_NODE, eventBus);
+	constructor(currentName: string, newName: string) {
+		super(COMMANDS.RENAME_NODE);
 		this.currentName = currentName;
 		this.newName = newName;
 	}
 
 	getReverseCommand(): Command {
-		return new RenameNodeCommand(this.newName, this.currentName, this.eventBus);
+		return new RenameNodeCommand(this.newName, this.currentName);
 	}
 
 	isEqualTo(anotherCommand: Command): boolean {
@@ -252,7 +251,7 @@ export class RenameNodeCommand extends Command {
 
 	async revert(): Promise<void> {
 		return new Promise<void>((resolve) => {
-			this.eventBus.$root.$emit('revertRenameNode', {
+			historyBus.$emit('revertRenameNode', {
 				currentName: this.currentName,
 				newName: this.newName,
 			});
diff --git a/packages/editor-ui/src/plugins/N8nCustomConnectorType.js b/packages/editor-ui/src/plugins/N8nCustomConnectorType.js
deleted file mode 100644
index d4bee2467258ca..00000000000000
--- a/packages/editor-ui/src/plugins/N8nCustomConnectorType.js
+++ /dev/null
@@ -1,896 +0,0 @@
-/**
- * Custom connector type
- * Based on jsplumb Flowchart and Bezier types
- *
- * Source GitHub repository:
- * https://github.com/jsplumb/jsplumb
- *
- * Source files:
- * https://github.com/jsplumb/jsplumb/blob/fb5fce52794fa52306825bdaa62bf3855cdfd7e0/src/connectors-flowchart.js
- * https://github.com/jsplumb/jsplumb/blob/fb5fce52794fa52306825bdaa62bf3855cdfd7e0/src/connectors-bezier.js
- *
- *
- * All 1.x.x and 2.x.x versions of jsPlumb Community edition, and so also the
- * content of this file, are dual-licensed under both MIT and GPLv2.
- *
- * 				MIT LICENSE
- *
- * Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * ===============================================================================
- *         GNU GENERAL PUBLIC LICENSE
- *            Version 2, June 1991
- *
- *  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- *  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *  Everyone is permitted to copy and distribute verbatim copies
- *  of this license document, but changing it is not allowed.
- *
- *           Preamble
- *
- *   The licenses for most software are designed to take away your
- * freedom to share and change it.  By contrast, the GNU General Public
- * License is intended to guarantee your freedom to share and change free
- * software--to make sure the software is free for all its users.  This
- * General Public License applies to most of the Free Software
- * Foundation's software and to any other program whose authors commit to
- * using it.  (Some other Free Software Foundation software is covered by
- * the GNU Lesser General Public License instead.)  You can apply it to
- * your programs, too.
- *
- *   When we speak of free software, we are referring to freedom, not
- * price.  Our General Public Licenses are designed to make sure that you
- * have the freedom to distribute copies of free software (and charge for
- * this service if you wish), that you receive source code or can get it
- * if you want it, that you can change the software or use pieces of it
- * in new free programs; and that you know you can do these things.
- *
- *   To protect your rights, we need to make restrictions that forbid
- * anyone to deny you these rights or to ask you to surrender the rights.
- * These restrictions translate to certain responsibilities for you if you
- * distribute copies of the software, or if you modify it.
- *
- *   For example, if you distribute copies of such a program, whether
- * gratis or for a fee, you must give the recipients all the rights that
- * you have.  You must make sure that they, too, receive or can get the
- * source code.  And you must show them these terms so they know their
- * rights.
- *
- *   We protect your rights with two steps: (1) copyright the software, and
- * (2) offer you this license which gives you legal permission to copy,
- * distribute and/or modify the software.
- *
- *   Also, for each author's protection and ours, we want to make certain
- * that everyone understands that there is no warranty for this free
- * software.  If the software is modified by someone else and passed on, we
- * want its recipients to know that what they have is not the original, so
- * that any problems introduced by others will not reflect on the original
- * authors' reputations.
- *
- *   Finally, any free program is threatened constantly by software
- * patents.  We wish to avoid the danger that redistributors of a free
- * program will individually obtain patent licenses, in effect making the
- * program proprietary.  To prevent this, we have made it clear that any
- * patent must be licensed for everyone's free use or not licensed at all.
- *
- *   The precise terms and conditions for copying, distribution and
- * modification follow.
- *
- *         GNU GENERAL PUBLIC LICENSE
- *    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *   0. This License applies to any program or other work which contains
- * a notice placed by the copyright holder saying it may be distributed
- * under the terms of this General Public License.  The "Program", below,
- * refers to any such program or work, and a "work based on the Program"
- * means either the Program or any derivative work under copyright law:
- * that is to say, a work containing the Program or a portion of it,
- * either verbatim or with modifications and/or translated into another
- * language.  (Hereinafter, translation is included without limitation in
- * the term "modification".)  Each licensee is addressed as "you".
- *
- * Activities other than copying, distribution and modification are not
- * covered by this License; they are outside its scope.  The act of
- * running the Program is not restricted, and the output from the Program
- * is covered only if its contents constitute a work based on the
- * Program (independent of having been made by running the Program).
- * Whether that is true depends on what the Program does.
- *
- *   1. You may copy and distribute verbatim copies of the Program's
- * source code as you receive it, in any medium, provided that you
- * conspicuously and appropriately publish on each copy an appropriate
- * copyright notice and disclaimer of warranty; keep intact all the
- * notices that refer to this License and to the absence of any warranty;
- * and give any other recipients of the Program a copy of this License
- * along with the Program.
- *
- * You may charge a fee for the physical act of transferring a copy, and
- * you may at your option offer warranty protection in exchange for a fee.
- *
- *   2. You may modify your copy or copies of the Program or any portion
- * of it, thus forming a work based on the Program, and copy and
- * distribute such modifications or work under the terms of Section 1
- * above, provided that you also meet all of these conditions:
- *
- *     a) You must cause the modified files to carry prominent notices
- *     stating that you changed the files and the date of any change.
- *
- *     b) You must cause any work that you distribute or publish, that in
- *     whole or in part contains or is derived from the Program or any
- *     part thereof, to be licensed as a whole at no charge to all third
- *     parties under the terms of this License.
- *
- *     c) If the modified program normally reads commands interactively
- *     when run, you must cause it, when started running for such
- *     interactive use in the most ordinary way, to print or display an
- *     announcement including an appropriate copyright notice and a
- *     notice that there is no warranty (or else, saying that you provide
- *     a warranty) and that users may redistribute the program under
- *     these conditions, and telling the user how to view a copy of this
- *     License.  (Exception: if the Program itself is interactive but
- *     does not normally print such an announcement, your work based on
- *     the Program is not required to print an announcement.)
- *
- * These requirements apply to the modified work as a whole.  If
- * identifiable sections of that work are not derived from the Program,
- * and can be reasonably considered independent and separate works in
- * themselves, then this License, and its terms, do not apply to those
- * sections when you distribute them as separate works.  But when you
- * distribute the same sections as part of a whole which is a work based
- * on the Program, the distribution of the whole must be on the terms of
- * this License, whose permissions for other licensees extend to the
- * entire whole, and thus to each and every part regardless of who wrote it.
- *
- * Thus, it is not the intent of this section to claim rights or contest
- * your rights to work written entirely by you; rather, the intent is to
- * exercise the right to control the distribution of derivative or
- * collective works based on the Program.
- *
- * In addition, mere aggregation of another work not based on the Program
- * with the Program (or with a work based on the Program) on a volume of
- * a storage or distribution medium does not bring the other work under
- * the scope of this License.
- *
- *   3. You may copy and distribute the Program (or a work based on it,
- * under Section 2) in object code or executable form under the terms of
- * Sections 1 and 2 above provided that you also do one of the following:
- *
- *     a) Accompany it with the complete corresponding machine-readable
- *     source code, which must be distributed under the terms of Sections
- *     1 and 2 above on a medium customarily used for software interchange; or,
- *
- *     b) Accompany it with a written offer, valid for at least three
- *     years, to give any third party, for a charge no more than your
- *     cost of physically performing source distribution, a complete
- *     machine-readable copy of the corresponding source code, to be
- *     distributed under the terms of Sections 1 and 2 above on a medium
- *     customarily used for software interchange; or,
- *
- *     c) Accompany it with the information you received as to the offer
- *     to distribute corresponding source code.  (This alternative is
- *     allowed only for noncommercial distribution and only if you
- *     received the program in object code or executable form with such
- *     an offer, in accord with Subsection b above.)
- *
- * The source code for a work means the preferred form of the work for
- * making modifications to it.  For an executable work, complete source
- * code means all the source code for all modules it contains, plus any
- * associated interface definition files, plus the scripts used to
- * control compilation and installation of the executable.  However, as a
- * special exception, the source code distributed need not include
- * anything that is normally distributed (in either source or binary
- * form) with the major components (compiler, kernel, and so on) of the
- * operating system on which the executable runs, unless that component
- * itself accompanies the executable.
- *
- * If distribution of executable or object code is made by offering
- * access to copy from a designated place, then offering equivalent
- * access to copy the source code from the same place counts as
- * distribution of the source code, even though third parties are not
- * compelled to copy the source along with the object code.
- *
- *   4. You may not copy, modify, sublicense, or distribute the Program
- * except as expressly provided under this License.  Any attempt
- * otherwise to copy, modify, sublicense or distribute the Program is
- * void, and will automatically terminate your rights under this License.
- * However, parties who have received copies, or rights, from you under
- * this License will not have their licenses terminated so long as such
- * parties remain in full compliance.
- *
- *   5. You are not required to accept this License, since you have not
- * signed it.  However, nothing else grants you permission to modify or
- * distribute the Program or its derivative works.  These actions are
- * prohibited by law if you do not accept this License.  Therefore, by
- * modifying or distributing the Program (or any work based on the
- * Program), you indicate your acceptance of this License to do so, and
- * all its terms and conditions for copying, distributing or modifying
- * the Program or works based on it.
- *
- *   6. Each time you redistribute the Program (or any work based on the
- * Program), the recipient automatically receives a license from the
- * original licensor to copy, distribute or modify the Program subject to
- * these terms and conditions.  You may not impose any further
- * restrictions on the recipients' exercise of the rights granted herein.
- * You are not responsible for enforcing compliance by third parties to
- * this License.
- *
- *   7. If, as a consequence of a court judgment or allegation of patent
- * infringement or for any other reason (not limited to patent issues),
- * conditions are imposed on you (whether by court order, agreement or
- * otherwise) that contradict the conditions of this License, they do not
- * excuse you from the conditions of this License.  If you cannot
- * distribute so as to satisfy simultaneously your obligations under this
- * License and any other pertinent obligations, then as a consequence you
- * may not distribute the Program at all.  For example, if a patent
- * license would not permit royalty-free redistribution of the Program by
- * all those who receive copies directly or indirectly through you, then
- * the only way you could satisfy both it and this License would be to
- * refrain entirely from distribution of the Program.
- *
- * If any portion of this section is held invalid or unenforceable under
- * any particular circumstance, the balance of the section is intended to
- * apply and the section as a whole is intended to apply in other
- * circumstances.
- *
- * It is not the purpose of this section to induce you to infringe any
- * patents or other property right claims or to contest validity of any
- * such claims; this section has the sole purpose of protecting the
- * integrity of the free software distribution system, which is
- * implemented by public license practices.  Many people have made
- * generous contributions to the wide range of software distributed
- * through that system in reliance on consistent application of that
- * system; it is up to the author/donor to decide if he or she is willing
- * to distribute software through any other system and a licensee cannot
- * impose that choice.
- *
- * This section is intended to make thoroughly clear what is believed to
- * be a consequence of the rest of this License.
- *
- *   8. If the distribution and/or use of the Program is restricted in
- * certain countries either by patents or by copyrighted interfaces, the
- * original copyright holder who places the Program under this License
- * may add an explicit geographical distribution limitation excluding
- * those countries, so that distribution is permitted only in or among
- * countries not thus excluded.  In such case, this License incorporates
- * the limitation as if written in the body of this License.
- *
- *   9. The Free Software Foundation may publish revised and/or new versions
- * of the General Public License from time to time.  Such new versions will
- * be similar in spirit to the present version, but may differ in detail to
- * address new problems or concerns.
- *
- * Each version is given a distinguishing version number.  If the Program
- * specifies a version number of this License which applies to it and "any
- * later version", you have the option of following the terms and conditions
- * either of that version or of any later version published by the Free
- * Software Foundation.  If the Program does not specify a version number of
- * this License, you may choose any version ever published by the Free Software
- * Foundation.
- *
- *   10. If you wish to incorporate parts of the Program into other free
- * programs whose distribution conditions are different, write to the author
- * to ask for permission.  For software which is copyrighted by the Free
- * Software Foundation, write to the Free Software Foundation; we sometimes
- * make exceptions for this.  Our decision will be guided by the two goals
- * of preserving the free status of all derivatives of our free software and
- * of promoting the sharing and reuse of software generally.
- *
- *           NO WARRANTY
- *
- *   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
- * FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
- * OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
- * PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
- * OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
- * TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
- * PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
- * REPAIR OR CORRECTION.
- *
- *   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
- * WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
- * REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
- * INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
- * OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
- * TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
- * YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
- * PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- */
-(function () {
-	'use strict';
-	var root = window,
-		_jp = root.jsPlumb,
-		_ju = root.jsPlumbUtil,
-		_jg = root.Biltong;
-	var STRAIGHT = 'Straight';
-	var ARC = 'Arc';
-
-	/**
-	 * Custom connector type
-	 *
-	 * @param stub {number} length of stub segments in flowchart
-	 * @param getEndpointOffset {Function} callback to offset stub length based on endpoint in flowchart
-	 * @param midpoint {number} float percent of halfway point of segments in flowchart
-	 * @param loopbackVerticalLength {number} height of vertical segment when looping in flowchart
-	 * @param cornerRadius {number} radius of flowchart connectors
-	 * @param loopbackMinimum {number} minimum threshold before looping behavior takes effect in flowchart
-	 * @param targetGap {number} gap between connector and target endpoint in both flowchart and bezier
-	 */
-	const N8nCustom = function (params) {
-		params = params || {};
-		this.type = 'N8nCustom';
-
-		params.stub = params.stub == null ? 30 : params.stub;
-
-		var _super = _jp.Connectors.AbstractConnector.apply(this, arguments),
-			minorAnchor = 0, // seems to be angle at which connector leaves endpoint
-			majorAnchor = 0, // translates to curviness of bezier curve
-			segments,
-			midpoint = params.midpoint == null ? 0.5 : params.midpoint,
-			alwaysRespectStubs = params.alwaysRespectStubs === true,
-			loopbackVerticalLength = params.loopbackVerticalLength || 0,
-			lastx = null,
-			lasty = null,
-			cornerRadius = params.cornerRadius != null ? params.cornerRadius : 0,
-			loopbackMinimum = params.loopbackMinimum || 100,
-			curvinessCoeffient = 0.4,
-			zBezierOffset = 40,
-			targetGap = params.targetGap || 0,
-			stub = params.stub || 0;
-
-		/**
-		 * Set target endpoint
-		 * (to override default behavior tracking mouse when dragging mouse)
-		 * @param {Endpoint} endpoint
-		 */
-		this.setTargetEndpoint = function (endpoint) {
-			this.overrideTargetEndpoint = endpoint;
-		};
-
-		/**
-		 * reset target endpoint overriding default behavior
-		 */
-		this.resetTargetEndpoint = function () {
-			this.overrideTargetEndpoint = null;
-		};
-
-		this._compute = function (originalPaintInfo, connParams) {
-			const paintInfo = _getPaintInfo(connParams, {
-				targetGap,
-				stub,
-				overrideTargetEndpoint: this.overrideTargetEndpoint,
-				getEndpointOffset: params.getEndpointOffset,
-			});
-			Object.keys(paintInfo).forEach((key) => {
-				// override so that bounding box is calculated correctly wheen target override is set
-				originalPaintInfo[key] = paintInfo[key];
-			});
-
-			if (paintInfo.tx < 0) {
-				this._computeFlowchart(paintInfo);
-			} else {
-				this._computeBezier(paintInfo);
-			}
-		};
-
-		this._computeBezier = function (paintInfo) {
-			var sp = paintInfo.sourcePos,
-				tp = paintInfo.targetPos,
-				_w = Math.abs(sp[0] - tp[0]) - paintInfo.targetGap,
-				_h = Math.abs(sp[1] - tp[1]);
-
-			var _CP,
-				_CP2,
-				_sx = sp[0] < tp[0] ? _w : 0,
-				_sy = sp[1] < tp[1] ? _h : 0,
-				_tx = sp[0] < tp[0] ? 0 : _w,
-				_ty = sp[1] < tp[1] ? 0 : _h;
-
-			if (paintInfo.ySpan <= 20 || (paintInfo.ySpan <= 100 && paintInfo.xSpan <= 100)) {
-				majorAnchor = 0.1;
-			} else {
-				majorAnchor = paintInfo.xSpan * curvinessCoeffient + zBezierOffset;
-			}
-
-			_CP = _findControlPoint(
-				[_sx, _sy],
-				sp,
-				tp,
-				paintInfo.sourceEndpoint,
-				paintInfo.targetEndpoint,
-				paintInfo.so,
-				paintInfo.to,
-				majorAnchor,
-				minorAnchor,
-			);
-			_CP2 = _findControlPoint(
-				[_tx, _ty],
-				tp,
-				sp,
-				paintInfo.targetEndpoint,
-				paintInfo.sourceEndpoint,
-				paintInfo.to,
-				paintInfo.so,
-				majorAnchor,
-				minorAnchor,
-			);
-
-			_super.addSegment(this, 'Bezier', {
-				x1: _sx,
-				y1: _sy,
-				x2: _tx,
-				y2: _ty,
-				cp1x: _CP[0],
-				cp1y: _CP[1],
-				cp2x: _CP2[0],
-				cp2y: _CP2[1],
-			});
-		};
-
-		/**
-		 * helper method to add a segment.
-		 */
-		const addFlowchartSegment = function (segments, x, y, paintInfo) {
-			if (lastx === x && lasty === y) {
-				return;
-			}
-			var lx = lastx == null ? paintInfo.sx : lastx,
-				ly = lasty == null ? paintInfo.sy : lasty,
-				o = lx === x ? 'v' : 'h';
-
-			lastx = x;
-			lasty = y;
-			segments.push([lx, ly, x, y, o]);
-		};
-
-		this._computeFlowchart = function (paintInfo) {
-			segments = [];
-			lastx = null;
-			lasty = null;
-
-			// calculate Stubs.
-			var stubs = calcualteStubSegment(paintInfo, { alwaysRespectStubs });
-
-			// add the start stub segment. use stubs for loopback as it will look better, with the loop spaced
-			// away from the element.
-			addFlowchartSegment(segments, stubs[0], stubs[1], paintInfo);
-
-			// compute the rest of the line
-			var p = calculateLineSegment(paintInfo, stubs, {
-				midpoint,
-				loopbackMinimum,
-				loopbackVerticalLength,
-			});
-			if (p) {
-				for (var i = 0; i < p.length; i++) {
-					addFlowchartSegment(segments, p[i][0], p[i][1], paintInfo);
-				}
-			}
-
-			// line to end stub
-			addFlowchartSegment(segments, stubs[2], stubs[3], paintInfo);
-
-			// end stub to end (common)
-			addFlowchartSegment(segments, paintInfo.tx, paintInfo.ty, paintInfo);
-
-			// write out the segments.
-			writeFlowchartSegments(_super, this, segments, paintInfo, cornerRadius);
-		};
-	};
-
-	_jp.Connectors.N8nCustom = N8nCustom;
-	_ju.extend(_jp.Connectors.N8nCustom, _jp.Connectors.AbstractConnector);
-
-	function _findControlPoint(
-		point,
-		sourceAnchorPosition,
-		targetAnchorPosition,
-		sourceEndpoint,
-		targetEndpoint,
-		soo,
-		too,
-		majorAnchor,
-		minorAnchor,
-	) {
-		// determine if the two anchors are perpendicular to each other in their orientation.  we swap the control
-		// points around if so (code could be tightened up)
-		var perpendicular = soo[0] !== too[0] || soo[1] === too[1],
-			p = [];
-
-		if (!perpendicular) {
-			if (soo[0] === 0) {
-				p.push(
-					sourceAnchorPosition[0] < targetAnchorPosition[0]
-						? point[0] + minorAnchor
-						: point[0] - minorAnchor,
-				);
-			} else {
-				p.push(point[0] - majorAnchor * soo[0]);
-			}
-
-			if (soo[1] === 0) {
-				p.push(
-					sourceAnchorPosition[1] < targetAnchorPosition[1]
-						? point[1] + minorAnchor
-						: point[1] - minorAnchor,
-				);
-			} else {
-				p.push(point[1] + majorAnchor * too[1]);
-			}
-		} else {
-			if (too[0] === 0) {
-				p.push(
-					targetAnchorPosition[0] < sourceAnchorPosition[0]
-						? point[0] + minorAnchor
-						: point[0] - minorAnchor,
-				);
-			} else {
-				p.push(point[0] + majorAnchor * too[0]);
-			}
-
-			if (too[1] === 0) {
-				p.push(
-					targetAnchorPosition[1] < sourceAnchorPosition[1]
-						? point[1] + minorAnchor
-						: point[1] - minorAnchor,
-				);
-			} else {
-				p.push(point[1] + majorAnchor * soo[1]);
-			}
-		}
-
-		return p;
-	}
-
-	function sgn(n) {
-		return n < 0 ? -1 : n === 0 ? 0 : 1;
-	}
-
-	function getFlowchartSegmentDirections(segment) {
-		return [sgn(segment[2] - segment[0]), sgn(segment[3] - segment[1])];
-	}
-
-	function getSegmentLength(s) {
-		return Math.sqrt(Math.pow(s[0] - s[2], 2) + Math.pow(s[1] - s[3], 2));
-	}
-
-	function _cloneArray(a) {
-		var _a = [];
-		_a.push.apply(_a, a);
-		return _a;
-	}
-
-	function writeFlowchartSegments(_super, conn, segments, paintInfo, cornerRadius) {
-		var current = null,
-			next,
-			currentDirection,
-			nextDirection;
-		for (var i = 0; i < segments.length - 1; i++) {
-			current = current || _cloneArray(segments[i]);
-			next = _cloneArray(segments[i + 1]);
-
-			currentDirection = getFlowchartSegmentDirections(current);
-			nextDirection = getFlowchartSegmentDirections(next);
-
-			if (cornerRadius > 0 && current[4] !== next[4]) {
-				var minSegLength = Math.min(getSegmentLength(current), getSegmentLength(next));
-				var radiusToUse = Math.min(cornerRadius, minSegLength / 2);
-
-				current[2] -= currentDirection[0] * radiusToUse;
-				current[3] -= currentDirection[1] * radiusToUse;
-				next[0] += nextDirection[0] * radiusToUse;
-				next[1] += nextDirection[1] * radiusToUse;
-
-				var ac =
-						(currentDirection[1] === nextDirection[0] && nextDirection[0] === 1) ||
-						(currentDirection[1] === nextDirection[0] &&
-							nextDirection[0] === 0 &&
-							currentDirection[0] !== nextDirection[1]) ||
-						(currentDirection[1] === nextDirection[0] && nextDirection[0] === -1),
-					sgny = next[1] > current[3] ? 1 : -1,
-					sgnx = next[0] > current[2] ? 1 : -1,
-					sgnEqual = sgny === sgnx,
-					cx = (sgnEqual && ac) || (!sgnEqual && !ac) ? next[0] : current[2],
-					cy = (sgnEqual && ac) || (!sgnEqual && !ac) ? current[3] : next[1];
-
-				_super.addSegment(conn, STRAIGHT, {
-					x1: current[0],
-					y1: current[1],
-					x2: current[2],
-					y2: current[3],
-				});
-
-				_super.addSegment(conn, ARC, {
-					r: radiusToUse,
-					x1: current[2],
-					y1: current[3],
-					x2: next[0],
-					y2: next[1],
-					cx: cx,
-					cy: cy,
-					ac: ac,
-				});
-			} else {
-				// dx + dy are used to adjust for line width.
-				var dx =
-						current[2] === current[0]
-							? 0
-							: current[2] > current[0]
-							? paintInfo.lw / 2
-							: -(paintInfo.lw / 2),
-					dy =
-						current[3] === current[1]
-							? 0
-							: current[3] > current[1]
-							? paintInfo.lw / 2
-							: -(paintInfo.lw / 2);
-
-				_super.addSegment(conn, STRAIGHT, {
-					x1: current[0] - dx,
-					y1: current[1] - dy,
-					x2: current[2] + dx,
-					y2: current[3] + dy,
-				});
-			}
-			current = next;
-		}
-		if (next != null) {
-			// last segment
-			_super.addSegment(conn, STRAIGHT, {
-				x1: next[0],
-				y1: next[1],
-				x2: next[2],
-				y2: next[3],
-			});
-		}
-	}
-
-	const lineCalculators = {
-		opposite: function (paintInfo, { axis, startStub, endStub, idx, midx, midy }) {
-			var pi = paintInfo,
-				comparator = pi['is' + axis.toUpperCase() + 'GreaterThanStubTimes2'];
-
-			if (
-				!comparator ||
-				(pi.so[idx] === 1 && startStub > endStub) ||
-				(pi.so[idx] === -1 && startStub < endStub)
-			) {
-				return {
-					x: [
-						[startStub, midy],
-						[endStub, midy],
-					],
-					y: [
-						[midx, startStub],
-						[midx, endStub],
-					],
-				}[axis];
-			} else if (
-				(pi.so[idx] === 1 && startStub < endStub) ||
-				(pi.so[idx] === -1 && startStub > endStub)
-			) {
-				return {
-					x: [
-						[midx, pi.sy],
-						[midx, pi.ty],
-					],
-					y: [
-						[pi.sx, midy],
-						[pi.tx, midy],
-					],
-				}[axis];
-			}
-		},
-	};
-
-	const stubCalculators = {
-		opposite: function (paintInfo, { axis, alwaysRespectStubs }) {
-			var pi = paintInfo,
-				idx = axis === 'x' ? 0 : 1,
-				areInProximity = {
-					x: function () {
-						return (
-							(pi.so[idx] === 1 &&
-								((pi.startStubX > pi.endStubX && pi.tx > pi.startStubX) ||
-									(pi.sx > pi.endStubX && pi.tx > pi.sx))) ||
-							(pi.so[idx] === -1 &&
-								((pi.startStubX < pi.endStubX && pi.tx < pi.startStubX) ||
-									(pi.sx < pi.endStubX && pi.tx < pi.sx)))
-						);
-					},
-					y: function () {
-						return (
-							(pi.so[idx] === 1 &&
-								((pi.startStubY > pi.endStubY && pi.ty > pi.startStubY) ||
-									(pi.sy > pi.endStubY && pi.ty > pi.sy))) ||
-							(pi.so[idx] === -1 &&
-								((pi.startStubY < pi.endStubY && pi.ty < pi.startStubY) ||
-									(pi.sy < pi.endStubY && pi.ty < pi.sy)))
-						);
-					},
-				};
-
-			if (!alwaysRespectStubs && areInProximity[axis]()) {
-				return {
-					x: [
-						(paintInfo.sx + paintInfo.tx) / 2,
-						paintInfo.startStubY,
-						(paintInfo.sx + paintInfo.tx) / 2,
-						paintInfo.endStubY,
-					],
-					y: [
-						paintInfo.startStubX,
-						(paintInfo.sy + paintInfo.ty) / 2,
-						paintInfo.endStubX,
-						(paintInfo.sy + paintInfo.ty) / 2,
-					],
-				}[axis];
-			} else {
-				return [paintInfo.startStubX, paintInfo.startStubY, paintInfo.endStubX, paintInfo.endStubY];
-			}
-		},
-	};
-
-	function calcualteStubSegment(paintInfo, { alwaysRespectStubs }) {
-		return stubCalculators['opposite'](paintInfo, {
-			axis: paintInfo.sourceAxis,
-			alwaysRespectStubs,
-		});
-	}
-
-	function calculateLineSegment(
-		paintInfo,
-		stubs,
-		{ midpoint, loopbackVerticalLength, loopbackMinimum },
-	) {
-		const axis = paintInfo.sourceAxis,
-			idx = paintInfo.sourceAxis === 'x' ? 0 : 1,
-			oidx = paintInfo.sourceAxis === 'x' ? 1 : 0,
-			startStub = stubs[idx],
-			otherStartStub = stubs[oidx],
-			endStub = stubs[idx + 2],
-			otherEndStub = stubs[oidx + 2];
-
-		const diffX = paintInfo.endStubX - paintInfo.startStubX;
-		const diffY = paintInfo.endStubY - paintInfo.startStubY;
-		const direction = -1; // vertical direction of loop, always below source
-
-		var midx = paintInfo.startStubX + (paintInfo.endStubX - paintInfo.startStubX) * midpoint,
-			midy;
-
-		if (diffY >= 0 || diffX < -1 * loopbackMinimum) {
-			// loop backward behavior
-			midy = paintInfo.startStubY - (diffX < 0 ? direction * loopbackVerticalLength : 0);
-		} else {
-			// original flowchart behavior
-			midy = paintInfo.startStubY + (paintInfo.endStubY - paintInfo.startStubY) * midpoint;
-		}
-
-		return lineCalculators['opposite'](paintInfo, {
-			axis,
-			startStub,
-			otherStartStub,
-			endStub,
-			otherEndStub,
-			idx,
-			oidx,
-			midx,
-			midy,
-		});
-	}
-
-	function _getPaintInfo(params, { targetGap, stub, overrideTargetEndpoint, getEndpointOffset }) {
-		let { targetPos, targetEndpoint } = params;
-
-		if (overrideTargetEndpoint) {
-			targetPos = overrideTargetEndpoint.anchor.getCurrentLocation();
-			targetEndpoint = overrideTargetEndpoint;
-		}
-
-		const sourceGap = 0;
-
-		stub = stub || 0;
-		const sourceStub = _ju.isArray(stub) ? stub[0] : stub;
-		const targetStub = _ju.isArray(stub) ? stub[1] : stub;
-
-		var segment = _jg.quadrant(params.sourcePos, targetPos),
-			swapX = targetPos[0] < params.sourcePos[0],
-			swapY = targetPos[1] < params.sourcePos[1],
-			lw = params.strokeWidth || 1,
-			so = params.sourceEndpoint.anchor.getOrientation(params.sourceEndpoint), // source orientation
-			to = targetEndpoint.anchor.getOrientation(targetEndpoint), // target orientation
-			x = swapX ? targetPos[0] : params.sourcePos[0],
-			y = swapY ? targetPos[1] : params.sourcePos[1],
-			w = Math.abs(targetPos[0] - params.sourcePos[0]),
-			h = Math.abs(targetPos[1] - params.sourcePos[1]);
-
-		// if either anchor does not have an orientation set, we derive one from their relative
-		// positions.  we fix the axis to be the one in which the two elements are further apart, and
-		// point each anchor at the other element.  this is also used when dragging a new connection.
-		if ((so[0] === 0 && so[1] === 0) || (to[0] === 0 && to[1] === 0)) {
-			var index = w > h ? 0 : 1,
-				oIndex = [1, 0][index];
-			so = [];
-			to = [];
-			so[index] = params.sourcePos[index] > targetPos[index] ? -1 : 1;
-			to[index] = params.sourcePos[index] > targetPos[index] ? 1 : -1;
-			so[oIndex] = 0;
-			to[oIndex] = 0;
-		}
-
-		const sx = swapX ? w + sourceGap * so[0] : sourceGap * so[0],
-			sy = swapY ? h + sourceGap * so[1] : sourceGap * so[1],
-			tx = swapX ? targetGap * to[0] : w + targetGap * to[0],
-			ty = swapY ? targetGap * to[1] : h + targetGap * to[1],
-			oProduct = so[0] * to[0] + so[1] * to[1];
-
-		const sourceStubWithOffset =
-			sourceStub +
-			(getEndpointOffset && params.sourceEndpoint ? getEndpointOffset(params.sourceEndpoint) : 0);
-		const targetStubWithOffset =
-			targetStub + (getEndpointOffset && targetEndpoint ? getEndpointOffset(targetEndpoint) : 0);
-
-		// same as paintinfo generated by jsplumb AbstractConnector type
-		var result = {
-			sx: sx,
-			sy: sy,
-			tx: tx,
-			ty: ty,
-			lw: lw,
-			xSpan: Math.abs(tx - sx),
-			ySpan: Math.abs(ty - sy),
-			mx: (sx + tx) / 2,
-			my: (sy + ty) / 2,
-			so: so,
-			to: to,
-			x: x,
-			y: y,
-			w: w,
-			h: h,
-			segment: segment,
-			startStubX: sx + so[0] * sourceStubWithOffset,
-			startStubY: sy + so[1] * sourceStubWithOffset,
-			endStubX: tx + to[0] * targetStubWithOffset,
-			endStubY: ty + to[1] * targetStubWithOffset,
-			isXGreaterThanStubTimes2: Math.abs(sx - tx) > sourceStubWithOffset + targetStubWithOffset,
-			isYGreaterThanStubTimes2: Math.abs(sy - ty) > sourceStubWithOffset + targetStubWithOffset,
-			opposite: oProduct === -1,
-			perpendicular: oProduct === 0,
-			orthogonal: oProduct === 1,
-			sourceAxis: so[0] === 0 ? 'y' : 'x',
-			points: [x, y, w, h, sx, sy, tx, ty],
-			stubs: [sourceStubWithOffset, targetStubWithOffset],
-			anchorOrientation: 'opposite', // always opposite since our endpoints are always opposite (source orientation is left (1) and target orientaiton is right (-1))
-
-			/** custom keys added */
-			sourceEndpoint: params.sourceEndpoint,
-			targetEndpoint: targetEndpoint,
-			sourcePos: params.sourcePos,
-			targetPos: targetEndpoint.anchor.getCurrentLocation(),
-			targetGap,
-		};
-
-		return result;
-	}
-}).call(typeof window !== 'undefined' ? window : this);
diff --git a/packages/editor-ui/src/plugins/PlusEndpointType.js b/packages/editor-ui/src/plugins/PlusEndpointType.js
deleted file mode 100644
index 6e97c54193a22f..00000000000000
--- a/packages/editor-ui/src/plugins/PlusEndpointType.js
+++ /dev/null
@@ -1,518 +0,0 @@
-/**
- * Custom Plus Endpoint
- * Based on jsplumb Blank Endpoint type
- *
- * Source GitHub repository:
- * https://github.com/jsplumb/jsplumb
- *
- * Source files:
- * https://github.com/jsplumb/jsplumb/blob/fb5fce52794fa52306825bdaa62bf3855cdfd7e0/src/defaults.js#L1230
- *
- * All 1.x.x and 2.x.x versions of jsPlumb Community edition, and so also the
- * content of this file, are dual-licensed under both MIT and GPLv2.
- *
- * 				MIT LICENSE
- *
- * Copyright (c) 2010 - 2014 jsPlumb, http://jsplumbtoolkit.com/
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files (the
- * "Software"), to deal in the Software without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Software, and to
- * permit persons to whom the Software is furnished to do so, subject to
- * the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- *
- * ===============================================================================
- *         GNU GENERAL PUBLIC LICENSE
- *            Version 2, June 1991
- *
- *  Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- *  51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- *  Everyone is permitted to copy and distribute verbatim copies
- *  of this license document, but changing it is not allowed.
- *
- *           Preamble
- *
- *   The licenses for most software are designed to take away your
- * freedom to share and change it.  By contrast, the GNU General Public
- * License is intended to guarantee your freedom to share and change free
- * software--to make sure the software is free for all its users.  This
- * General Public License applies to most of the Free Software
- * Foundation's software and to any other program whose authors commit to
- * using it.  (Some other Free Software Foundation software is covered by
- * the GNU Lesser General Public License instead.)  You can apply it to
- * your programs, too.
- *
- *   When we speak of free software, we are referring to freedom, not
- * price.  Our General Public Licenses are designed to make sure that you
- * have the freedom to distribute copies of free software (and charge for
- * this service if you wish), that you receive source code or can get it
- * if you want it, that you can change the software or use pieces of it
- * in new free programs; and that you know you can do these things.
- *
- *   To protect your rights, we need to make restrictions that forbid
- * anyone to deny you these rights or to ask you to surrender the rights.
- * These restrictions translate to certain responsibilities for you if you
- * distribute copies of the software, or if you modify it.
- *
- *   For example, if you distribute copies of such a program, whether
- * gratis or for a fee, you must give the recipients all the rights that
- * you have.  You must make sure that they, too, receive or can get the
- * source code.  And you must show them these terms so they know their
- * rights.
- *
- *   We protect your rights with two steps: (1) copyright the software, and
- * (2) offer you this license which gives you legal permission to copy,
- * distribute and/or modify the software.
- *
- *   Also, for each author's protection and ours, we want to make certain
- * that everyone understands that there is no warranty for this free
- * software.  If the software is modified by someone else and passed on, we
- * want its recipients to know that what they have is not the original, so
- * that any problems introduced by others will not reflect on the original
- * authors' reputations.
- *
- *   Finally, any free program is threatened constantly by software
- * patents.  We wish to avoid the danger that redistributors of a free
- * program will individually obtain patent licenses, in effect making the
- * program proprietary.  To prevent this, we have made it clear that any
- * patent must be licensed for everyone's free use or not licensed at all.
- *
- *   The precise terms and conditions for copying, distribution and
- * modification follow.
- *
- *         GNU GENERAL PUBLIC LICENSE
- *    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
- *
- *   0. This License applies to any program or other work which contains
- * a notice placed by the copyright holder saying it may be distributed
- * under the terms of this General Public License.  The "Program", below,
- * refers to any such program or work, and a "work based on the Program"
- * means either the Program or any derivative work under copyright law:
- * that is to say, a work containing the Program or a portion of it,
- * either verbatim or with modifications and/or translated into another
- * language.  (Hereinafter, translation is included without limitation in
- * the term "modification".)  Each licensee is addressed as "you".
- *
- * Activities other than copying, distribution and modification are not
- * covered by this License; they are outside its scope.  The act of
- * running the Program is not restricted, and the output from the Program
- * is covered only if its contents constitute a work based on the
- * Program (independent of having been made by running the Program).
- * Whether that is true depends on what the Program does.
- *
- *   1. You may copy and distribute verbatim copies of the Program's
- * source code as you receive it, in any medium, provided that you
- * conspicuously and appropriately publish on each copy an appropriate
- * copyright notice and disclaimer of warranty; keep intact all the
- * notices that refer to this License and to the absence of any warranty;
- * and give any other recipients of the Program a copy of this License
- * along with the Program.
- *
- * You may charge a fee for the physical act of transferring a copy, and
- * you may at your option offer warranty protection in exchange for a fee.
- *
- *   2. You may modify your copy or copies of the Program or any portion
- * of it, thus forming a work based on the Program, and copy and
- * distribute such modifications or work under the terms of Section 1
- * above, provided that you also meet all of these conditions:
- *
- *     a) You must cause the modified files to carry prominent notices
- *     stating that you changed the files and the date of any change.
- *
- *     b) You must cause any work that you distribute or publish, that in
- *     whole or in part contains or is derived from the Program or any
- *     part thereof, to be licensed as a whole at no charge to all third
- *     parties under the terms of this License.
- *
- *     c) If the modified program normally reads commands interactively
- *     when run, you must cause it, when started running for such
- *     interactive use in the most ordinary way, to print or display an
- *     announcement including an appropriate copyright notice and a
- *     notice that there is no warranty (or else, saying that you provide
- *     a warranty) and that users may redistribute the program under
- *     these conditions, and telling the user how to view a copy of this
- *     License.  (Exception: if the Program itself is interactive but
- *     does not normally print such an announcement, your work based on
- *     the Program is not required to print an announcement.)
- *
- * These requirements apply to the modified work as a whole.  If
- * identifiable sections of that work are not derived from the Program,
- * and can be reasonably considered independent and separate works in
- * themselves, then this License, and its terms, do not apply to those
- * sections when you distribute them as separate works.  But when you
- * distribute the same sections as part of a whole which is a work based
- * on the Program, the distribution of the whole must be on the terms of
- * this License, whose permissions for other licensees extend to the
- * entire whole, and thus to each and every part regardless of who wrote it.
- *
- * Thus, it is not the intent of this section to claim rights or contest
- * your rights to work written entirely by you; rather, the intent is to
- * exercise the right to control the distribution of derivative or
- * collective works based on the Program.
- *
- * In addition, mere aggregation of another work not based on the Program
- * with the Program (or with a work based on the Program) on a volume of
- * a storage or distribution medium does not bring the other work under
- * the scope of this License.
- *
- *   3. You may copy and distribute the Program (or a work based on it,
- * under Section 2) in object code or executable form under the terms of
- * Sections 1 and 2 above provided that you also do one of the following:
- *
- *     a) Accompany it with the complete corresponding machine-readable
- *     source code, which must be distributed under the terms of Sections
- *     1 and 2 above on a medium customarily used for software interchange; or,
- *
- *     b) Accompany it with a written offer, valid for at least three
- *     years, to give any third party, for a charge no more than your
- *     cost of physically performing source distribution, a complete
- *     machine-readable copy of the corresponding source code, to be
- *     distributed under the terms of Sections 1 and 2 above on a medium
- *     customarily used for software interchange; or,
- *
- *     c) Accompany it with the information you received as to the offer
- *     to distribute corresponding source code.  (This alternative is
- *     allowed only for noncommercial distribution and only if you
- *     received the program in object code or executable form with such
- *     an offer, in accord with Subsection b above.)
- *
- * The source code for a work means the preferred form of the work for
- * making modifications to it.  For an executable work, complete source
- * code means all the source code for all modules it contains, plus any
- * associated interface definition files, plus the scripts used to
- * control compilation and installation of the executable.  However, as a
- * special exception, the source code distributed need not include
- * anything that is normally distributed (in either source or binary
- * form) with the major components (compiler, kernel, and so on) of the
- * operating system on which the executable runs, unless that component
- * itself accompanies the executable.
- *
- * If distribution of executable or object code is made by offering
- * access to copy from a designated place, then offering equivalent
- * access to copy the source code from the same place counts as
- * distribution of the source code, even though third parties are not
- * compelled to copy the source along with the object code.
- *
- *   4. You may not copy, modify, sublicense, or distribute the Program
- * except as expressly provided under this License.  Any attempt
- * otherwise to copy, modify, sublicense or distribute the Program is
- * void, and will automatically terminate your rights under this License.
- * However, parties who have received copies, or rights, from you under
- * this License will not have their licenses terminated so long as such
- * parties remain in full compliance.
- *
- *   5. You are not required to accept this License, since you have not
- * signed it.  However, nothing else grants you permission to modify or
- * distribute the Program or its derivative works.  These actions are
- * prohibited by law if you do not accept this License.  Therefore, by
- * modifying or distributing the Program (or any work based on the
- * Program), you indicate your acceptance of this License to do so, and
- * all its terms and conditions for copying, distributing or modifying
- * the Program or works based on it.
- *
- *   6. Each time you redistribute the Program (or any work based on the
- * Program), the recipient automatically receives a license from the
- * original licensor to copy, distribute or modify the Program subject to
- * these terms and conditions.  You may not impose any further
- * restrictions on the recipients' exercise of the rights granted herein.
- * You are not responsible for enforcing compliance by third parties to
- * this License.
- *
- *   7. If, as a consequence of a court judgment or allegation of patent
- * infringement or for any other reason (not limited to patent issues),
- * conditions are imposed on you (whether by court order, agreement or
- * otherwise) that contradict the conditions of this License, they do not
- * excuse you from the conditions of this License.  If you cannot
- * distribute so as to satisfy simultaneously your obligations under this
- * License and any other pertinent obligations, then as a consequence you
- * may not distribute the Program at all.  For example, if a patent
- * license would not permit royalty-free redistribution of the Program by
- * all those who receive copies directly or indirectly through you, then
- * the only way you could satisfy both it and this License would be to
- * refrain entirely from distribution of the Program.
- *
- * If any portion of this section is held invalid or unenforceable under
- * any particular circumstance, the balance of the section is intended to
- * apply and the section as a whole is intended to apply in other
- * circumstances.
- *
- * It is not the purpose of this section to induce you to infringe any
- * patents or other property right claims or to contest validity of any
- * such claims; this section has the sole purpose of protecting the
- * integrity of the free software distribution system, which is
- * implemented by public license practices.  Many people have made
- * generous contributions to the wide range of software distributed
- * through that system in reliance on consistent application of that
- * system; it is up to the author/donor to decide if he or she is willing
- * to distribute software through any other system and a licensee cannot
- * impose that choice.
- *
- * This section is intended to make thoroughly clear what is believed to
- * be a consequence of the rest of this License.
- *
- *   8. If the distribution and/or use of the Program is restricted in
- * certain countries either by patents or by copyrighted interfaces, the
- * original copyright holder who places the Program under this License
- * may add an explicit geographical distribution limitation excluding
- * those countries, so that distribution is permitted only in or among
- * countries not thus excluded.  In such case, this License incorporates
- * the limitation as if written in the body of this License.
- *
- *   9. The Free Software Foundation may publish revised and/or new versions
- * of the General Public License from time to time.  Such new versions will
- * be similar in spirit to the present version, but may differ in detail to
- * address new problems or concerns.
- *
- * Each version is given a distinguishing version number.  If the Program
- * specifies a version number of this License which applies to it and "any
- * later version", you have the option of following the terms and conditions
- * either of that version or of any later version published by the Free
- * Software Foundation.  If the Program does not specify a version number of
- * this License, you may choose any version ever published by the Free Software
- * Foundation.
- *
- *   10. If you wish to incorporate parts of the Program into other free
- * programs whose distribution conditions are different, write to the author
- * to ask for permission.  For software which is copyrighted by the Free
- * Software Foundation, write to the Free Software Foundation; we sometimes
- * make exceptions for this.  Our decision will be guided by the two goals
- * of preserving the free status of all derivatives of our free software and
- * of promoting the sharing and reuse of software generally.
- *
- *           NO WARRANTY
- *
- *   11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
- * FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
- * OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
- * PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
- * OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
- * TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
- * PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
- * REPAIR OR CORRECTION.
- *
- *   12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
- * WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
- * REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
- * INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
- * OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
- * TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
- * YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
- * PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGES.
- *
- */
-(function () {
-	'use strict';
-	var root = window,
-		_jp = root.jsPlumb,
-		_ju = root.jsPlumbUtil;
-
-	var DOMElementEndpoint = function (params) {
-		_jp.jsPlumbUIComponent.apply(this, arguments);
-		this._jsPlumb.displayElements = [];
-	};
-	_ju.extend(DOMElementEndpoint, _jp.jsPlumbUIComponent, {
-		getDisplayElements: function () {
-			return this._jsPlumb.displayElements;
-		},
-		appendDisplayElement: function (el) {
-			this._jsPlumb.displayElements.push(el);
-		},
-	});
-
-	/*
-	 * Class: Endpoints.N8nPlus
-	 */
-	_jp.Endpoints.N8nPlus = function (params) {
-		const _super = _jp.Endpoints.AbstractEndpoint.apply(this, arguments);
-		this.type = 'N8nPlus';
-		this.label = '';
-		this.labelOffset = 0;
-		this.size = 'medium';
-		this.showOutputLabel = true;
-
-		const boxSize = {
-			medium: 24,
-			small: 18,
-		};
-		const stalkLength = 40;
-
-		DOMElementEndpoint.apply(this, arguments);
-
-		var clazz = params.cssClass ? ' ' + params.cssClass : '';
-
-		this.canvas = _jp.createElement(
-			'div',
-			{
-				display: 'block',
-				background: 'transparent',
-				position: 'absolute',
-			},
-			this._jsPlumb.instance.endpointClass + clazz + ' plus-endpoint',
-		);
-
-		this.canvas.innerHTML = `
-			<div class="plus-stalk">
-				<div class="connection-run-items-label">
-					<span class="floating"></span>
-				</div>
-			</div>
-
-			<div class="plus-container">
-				<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="plus" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512" class="svg-inline--fa fa-plus">
-					<path fill="currentColor" d="M416 208H272V64c0-17.67-14.33-32-32-32h-32c-17.67 0-32 14.33-32 32v144H32c-17.67 0-32 14.33-32 32v32c0 17.67 14.33 32 32 32h144v144c0 17.67 14.33 32 32 32h32c17.67 0 32-14.33 32-32V304h144c17.67 0 32-14.33 32-32v-32c0-17.67-14.33-32-32-32z" class=""></path>
-				</svg>
-				<div class="drop-hover-message">
-					Click to add node</br>
-					or drag to connect
-				</div>
-			</div>
-		`;
-
-		this.canvas.addEventListener('click', (e) => {
-			this._jsPlumb.instance.fire('plusEndpointClick', params.endpoint, e);
-		});
-
-		this._jsPlumb.instance.appendElement(this.canvas);
-
-		const container = this.canvas.querySelector('.plus-container');
-		const message = container.querySelector('.drop-hover-message');
-		const plusStalk = this.canvas.querySelector('.plus-stalk');
-		const successOutput = this.canvas.querySelector('.plus-stalk span');
-
-		this.setSuccessOutput = (label) => {
-			this.canvas.classList.add('success');
-			if (this.showOutputLabel) {
-				successOutput.textContent = label;
-				this.label = label;
-				this.labelOffset = successOutput.offsetWidth;
-
-				plusStalk.style.width = `${stalkLength + this.labelOffset}px`;
-				if (this._jsPlumb && this._jsPlumb.instance && !this._jsPlumb.instance.isSuspendDrawing()) {
-					params.endpoint.repaint(); // force rerender to move plus hoverable/draggable space
-				}
-			}
-		};
-
-		this.clearSuccessOutput = () => {
-			this.canvas.classList.remove('success');
-			successOutput.textContent = '';
-			this.label = '';
-			this.labelOffset = 0;
-			plusStalk.style.width = `${stalkLength}px`;
-			params.endpoint.repaint();
-		};
-
-		const isDragging = () => {
-			const endpoint = params.endpoint;
-			const plusConnections = endpoint.connections;
-
-			if (plusConnections.length) {
-				return !!plusConnections.find(
-					(conn) => conn && conn.targetId && conn.targetId.startsWith('jsPlumb'),
-				);
-			}
-
-			return false;
-		};
-
-		const hasEndpointConnections = () => {
-			const endpoint = params.endpoint;
-			const plusConnections = endpoint.connections;
-
-			if (plusConnections.length >= 1) {
-				return true;
-			}
-
-			const allConnections = this._jsPlumb.instance.getConnections({
-				source: endpoint.elementId,
-			}); // includes connections from other output endpoints like dot
-
-			return !!allConnections.find((connection) => {
-				if (
-					!connection ||
-					!connection.endpoints ||
-					!connection.endpoints.length ||
-					!connection.endpoints[0]
-				) {
-					return false;
-				}
-
-				const sourceEndpoint = connection.endpoints[0];
-				return sourceEndpoint === endpoint || sourceEndpoint.getUuid() === endpoint.getUuid();
-			});
-		};
-
-		this.paint = function (style, anchor) {
-			if (hasEndpointConnections()) {
-				this.canvas.classList.add('hidden');
-			} else {
-				this.canvas.classList.remove('hidden');
-				container.style.color = style.fill;
-				container.style['border-color'] = style.fill;
-				message.style.display = style.hover ? 'inline' : 'none';
-			}
-			_ju.sizeElement(this.canvas, this.x, this.y, this.w, this.h);
-		};
-
-		this._compute = (anchorPoint, orientation, endpointStyle, connectorPaintStyle) => {
-			this.size = endpointStyle.size || this.size;
-			this.showOutputLabel = !!endpointStyle.showOutputLabel;
-
-			if (this.hoverMessage !== endpointStyle.hoverMessage) {
-				this.hoverMessage = endpointStyle.hoverMessage;
-				message.innerHTML = endpointStyle.hoverMessage;
-			}
-
-			if (this.size !== 'medium') {
-				container.classList.add(this.size);
-			}
-
-			setTimeout(() => {
-				if (this.label && !this.labelOffset) {
-					// if label is hidden, offset is 0 so recalculate
-					this.setSuccessOutput(this.label);
-				}
-			}, 0);
-
-			const defaultPosition = [
-				anchorPoint[0] + stalkLength + this.labelOffset,
-				anchorPoint[1] - boxSize[this.size] / 2,
-				boxSize[this.size],
-				boxSize[this.size],
-			];
-
-			if (isDragging()) {
-				return defaultPosition;
-			}
-
-			if (hasEndpointConnections()) {
-				return [0, 0, 0, 0]; // remove hoverable box from view
-			}
-
-			return defaultPosition;
-		};
-	};
-	_ju.extend(_jp.Endpoints.N8nPlus, [_jp.Endpoints.AbstractEndpoint, DOMElementEndpoint], {
-		cleanup: function () {
-			if (this.canvas && this.canvas.parentNode) {
-				this.canvas.parentNode.removeChild(this.canvas);
-			}
-		},
-	});
-	_jp.Endpoints.svg.N8nPlus = _jp.Endpoints.N8nPlus;
-})();
diff --git a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
new file mode 100644
index 00000000000000..a8f01f61d3dd38
--- /dev/null
+++ b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
@@ -0,0 +1,586 @@
+import { PointXY, log, extend, quadrant } from '@jsplumb/util';
+
+import {
+	Connection,
+	ArcSegment,
+	AbstractConnector,
+	ConnectorComputeParams,
+	PaintGeometry,
+	Endpoint,
+	StraightSegment,
+	Orientation,
+} from '@jsplumb/core';
+import { AnchorPlacement, ConnectorOptions, Geometry, PaintAxis } from '@jsplumb/common';
+import { BezierSegment } from '@jsplumb/connector-bezier';
+import { isArray } from 'lodash';
+import { deepCopy } from 'n8n-workflow';
+
+export interface N8nConnectorOptions extends ConnectorOptions {}
+interface N8nConnectorPaintGeometry extends PaintGeometry {
+	sourceEndpoint: Endpoint;
+	targetEndpoint: Endpoint;
+	sourcePos: AnchorPlacement;
+	targetPos: AnchorPlacement;
+	targetGap: number;
+	lw: number;
+}
+
+type FlowchartSegment = [number, number, number, number, string];
+type StubPositions = [number, number, number, number];
+
+const lineCalculators = {
+	opposite(
+		paintInfo: PaintGeometry,
+		{
+			axis,
+			startStub,
+			endStub,
+			idx,
+			midx,
+			midy,
+		}: {
+			axis: 'x' | 'y';
+			startStub: number;
+			endStub: number;
+			idx: number;
+			midx: number;
+			midy: number;
+		},
+	) {
+		const pi = paintInfo,
+			comparator = pi[('is' + axis.toUpperCase() + 'GreaterThanStubTimes2') as keyof PaintGeometry];
+
+		if (
+			!comparator ||
+			(pi.so[idx] === 1 && startStub > endStub) ||
+			(pi.so[idx] === -1 && startStub < endStub)
+		) {
+			return {
+				x: [
+					[startStub, midy],
+					[endStub, midy],
+				],
+				y: [
+					[midx, startStub],
+					[midx, endStub],
+				],
+			}[axis];
+		} else if (
+			(pi.so[idx] === 1 && startStub < endStub) ||
+			(pi.so[idx] === -1 && startStub > endStub)
+		) {
+			return {
+				x: [
+					[midx, pi.sy],
+					[midx, pi.ty],
+				],
+				y: [
+					[pi.sx, midy],
+					[pi.tx, midy],
+				],
+			}[axis];
+		}
+	},
+};
+
+const stubCalculators = {
+	opposite(
+		paintInfo: PaintGeometry,
+		{ axis, alwaysRespectStubs }: { axis: 'x' | 'y'; alwaysRespectStubs: boolean },
+	): StubPositions {
+		const pi = paintInfo,
+			idx = axis === 'x' ? 0 : 1,
+			areInProximity = {
+				x() {
+					return (
+						(pi.so[idx] === 1 &&
+							((pi.startStubX > pi.endStubX && pi.tx > pi.startStubX) ||
+								(pi.sx > pi.endStubX && pi.tx > pi.sx))) ||
+						(pi.so[idx] === -1 &&
+							((pi.startStubX < pi.endStubX && pi.tx < pi.startStubX) ||
+								(pi.sx < pi.endStubX && pi.tx < pi.sx)))
+					);
+				},
+				y() {
+					return (
+						(pi.so[idx] === 1 &&
+							((pi.startStubY > pi.endStubY && pi.ty > pi.startStubY) ||
+								(pi.sy > pi.endStubY && pi.ty > pi.sy))) ||
+						(pi.so[idx] === -1 &&
+							((pi.startStubY < pi.endStubY && pi.ty < pi.startStubY) ||
+								(pi.sy < pi.endStubY && pi.ty < pi.sy)))
+					);
+				},
+			};
+
+		if (!alwaysRespectStubs && areInProximity[axis]()) {
+			return {
+				x: [
+					(paintInfo.sx + paintInfo.tx) / 2,
+					paintInfo.startStubY,
+					(paintInfo.sx + paintInfo.tx) / 2,
+					paintInfo.endStubY,
+				] as StubPositions,
+				y: [
+					paintInfo.startStubX,
+					(paintInfo.sy + paintInfo.ty) / 2,
+					paintInfo.endStubX,
+					(paintInfo.sy + paintInfo.ty) / 2,
+				] as StubPositions,
+			}[axis];
+		} else {
+			return [
+				paintInfo.startStubX,
+				paintInfo.startStubY,
+				paintInfo.endStubX,
+				paintInfo.endStubY,
+			] as StubPositions;
+		}
+	},
+};
+
+export class N8nConnector extends AbstractConnector {
+	static type = 'N8nConnector';
+	type = N8nConnector.type;
+
+	majorAnchor: number;
+	minorAnchor: number;
+	midpoint: number;
+	alwaysRespectStubs: boolean;
+	loopbackVerticalLength: number;
+	lastx: number | null;
+	lasty: number | null;
+	cornerRadius: number;
+	loopbackMinimum: number;
+	curvinessCoefficient: number;
+	zBezierOffset: number;
+	targetGap: number;
+	overrideTargetEndpoint: Endpoint | null;
+	getEndpointOffset: Function | null;
+	private internalSegments: FlowchartSegment[] = [];
+
+	constructor(public connection: Connection, params: N8nConnectorOptions) {
+		super(connection, params);
+		params = params || {};
+		this.minorAnchor = 0; // seems to be angle at which connector leaves endpoint
+		this.majorAnchor = 0; // translates to curviness of bezier curve
+		this.stub = params.stub || 0;
+		this.midpoint = 0.5;
+		this.alwaysRespectStubs = params.alwaysRespectStubs === true;
+		this.loopbackVerticalLength = params.loopbackVerticalLength || 0;
+		this.lastx = null;
+		this.lasty = null;
+		this.cornerRadius = params.cornerRadius !== null ? params.cornerRadius : 0;
+		this.loopbackMinimum = params.loopbackMinimum || 100;
+		this.curvinessCoefficient = 0.4;
+		this.zBezierOffset = 40;
+		this.targetGap = params.targetGap || 0;
+		this.stub = params.stub || 0;
+		this.overrideTargetEndpoint = params.overrideTargetEndpoint || null;
+		this.getEndpointOffset = params.getEndpointOffset || null;
+	}
+
+	getDefaultStubs(): [number, number] {
+		return [30, 30];
+	}
+
+	sgn(n: number) {
+		return n < 0 ? -1 : n === 0 ? 0 : 1;
+	}
+
+	getFlowchartSegmentDirections(segment: FlowchartSegment): [number, number] {
+		return [this.sgn(segment[2] - segment[0]), this.sgn(segment[3] - segment[1])];
+	}
+
+	getSegmentLength(s: FlowchartSegment) {
+		return Math.sqrt(Math.pow(s[0] - s[2], 2) + Math.pow(s[1] - s[3], 2));
+	}
+
+	protected _findControlPoint(
+		point: PointXY,
+		sourceAnchorPosition: AnchorPlacement,
+		targetAnchorPosition: AnchorPlacement,
+		soo: [number, number],
+		too: [number, number],
+	): PointXY {
+		// determine if the two anchors are perpendicular to each other in their orientation.  we swap the control
+		// points around if so (code could be tightened up)
+		const perpendicular = soo[0] !== too[0] || soo[1] === too[1],
+			p: PointXY = {
+				x: 0,
+				y: 0,
+			};
+
+		if (!perpendicular) {
+			if (soo[0] === 0) {
+				p.x =
+					sourceAnchorPosition.curX < targetAnchorPosition.curX
+						? point.x + this.minorAnchor
+						: point.x - this.minorAnchor;
+			} else {
+				p.x = point.x - this.majorAnchor * soo[0];
+			}
+			if (soo[1] === 0) {
+				p.y =
+					sourceAnchorPosition.curY < targetAnchorPosition.curY
+						? point.y + this.minorAnchor
+						: point.y - this.minorAnchor;
+			} else {
+				p.y = point.y + this.majorAnchor * too[1];
+			}
+		} else {
+			if (too[0] === 0) {
+				p.x =
+					targetAnchorPosition.curX < sourceAnchorPosition.curX
+						? point.x + this.minorAnchor
+						: point.x - this.minorAnchor;
+			} else {
+				p.x = point.x + this.majorAnchor * too[0];
+			}
+
+			if (too[1] === 0) {
+				p.y =
+					targetAnchorPosition.curY < sourceAnchorPosition.curY
+						? point.y + this.minorAnchor
+						: point.y - this.minorAnchor;
+			} else {
+				p.y = point.y + this.majorAnchor * soo[1];
+			}
+		}
+
+		return p;
+	}
+
+	writeFlowchartSegments(paintInfo: N8nConnectorPaintGeometry) {
+		let current: FlowchartSegment = null;
+		let next: FlowchartSegment = null;
+		let currentDirection: [number, number];
+		let nextDirection: [number, number];
+
+		for (let i = 0; i < this.internalSegments.length - 1; i++) {
+			current = current || (deepCopy(this.internalSegments[i]) as FlowchartSegment);
+			next = deepCopy(this.internalSegments[i + 1]) as FlowchartSegment;
+
+			currentDirection = this.getFlowchartSegmentDirections(current);
+			nextDirection = this.getFlowchartSegmentDirections(next);
+
+			if (this.cornerRadius > 0 && current[4] !== next[4]) {
+				const minSegLength = Math.min(this.getSegmentLength(current), this.getSegmentLength(next));
+				const radiusToUse = Math.min(this.cornerRadius, minSegLength / 2);
+
+				current[2] -= currentDirection[0] * radiusToUse;
+				current[3] -= currentDirection[1] * radiusToUse;
+				next[0] += nextDirection[0] * radiusToUse;
+				next[1] += nextDirection[1] * radiusToUse;
+
+				const ac =
+						(currentDirection[1] === nextDirection[0] && nextDirection[0] === 1) ||
+						(currentDirection[1] === nextDirection[0] &&
+							nextDirection[0] === 0 &&
+							currentDirection[0] !== nextDirection[1]) ||
+						(currentDirection[1] === nextDirection[0] && nextDirection[0] === -1),
+					sgny = next[1] > current[3] ? 1 : -1,
+					sgnx = next[0] > current[2] ? 1 : -1,
+					sgnEqual = sgny === sgnx,
+					cx = (sgnEqual && ac) || (!sgnEqual && !ac) ? next[0] : current[2],
+					cy = (sgnEqual && ac) || (!sgnEqual && !ac) ? current[3] : next[1];
+
+				this._addSegment(StraightSegment, {
+					x1: current[0],
+					y1: current[1],
+					x2: current[2],
+					y2: current[3],
+				});
+
+				this._addSegment(ArcSegment, {
+					r: radiusToUse,
+					x1: current[2],
+					y1: current[3],
+					x2: next[0],
+					y2: next[1],
+					cx,
+					cy,
+					ac,
+				});
+			} else {
+				// dx + dy are used to adjust for line width.
+				const dx =
+						current[2] === current[0]
+							? 0
+							: current[2] > current[0]
+							? paintInfo.lw / 2
+							: -(paintInfo.lw / 2),
+					dy =
+						current[3] === current[1]
+							? 0
+							: current[3] > current[1]
+							? paintInfo.lw / 2
+							: -(paintInfo.lw / 2);
+
+				this._addSegment(StraightSegment, {
+					x1: current[0] - dx,
+					y1: current[1] - dy,
+					x2: current[2] + dx,
+					y2: current[3] + dy,
+				});
+			}
+			current = next;
+		}
+		if (next !== null) {
+			// last segment
+			this._addSegment(StraightSegment, {
+				x1: next[0],
+				y1: next[1],
+				x2: next[2],
+				y2: next[3],
+			});
+		}
+	}
+
+	calculateStubSegment(paintInfo: PaintGeometry): StubPositions {
+		return stubCalculators['opposite'](paintInfo, {
+			axis: paintInfo.sourceAxis,
+			alwaysRespectStubs: this.alwaysRespectStubs,
+		});
+	}
+
+	calculateLineSegment(paintInfo: PaintGeometry, stubs: StubPositions) {
+		const axis = paintInfo.sourceAxis;
+		const idx = paintInfo.sourceAxis === 'x' ? 0 : 1;
+		const startStub = stubs[idx];
+		const endStub = stubs[idx + 2];
+
+		const diffX = paintInfo.endStubX - paintInfo.startStubX;
+		const diffY = paintInfo.endStubY - paintInfo.startStubY;
+		const direction = -1; // vertical direction of loop, always below source
+
+		const midx = paintInfo.startStubX + (paintInfo.endStubX - paintInfo.startStubX) * this.midpoint;
+		let midy: number;
+
+		if (diffY >= 0 || diffX < -1 * this.loopbackMinimum) {
+			// loop backward behavior
+			midy = paintInfo.startStubY - (diffX < 0 ? direction * this.loopbackVerticalLength : 0);
+		} else {
+			// original flowchart behavior
+			midy = paintInfo.startStubY + (paintInfo.endStubY - paintInfo.startStubY) * this.midpoint;
+		}
+		return lineCalculators['opposite'](paintInfo, { axis, startStub, endStub, idx, midx, midy });
+	}
+
+	_getPaintInfo(params: ConnectorComputeParams): N8nConnectorPaintGeometry {
+		let targetPos = params.targetPos;
+		let targetEndpoint: Endpoint = params.targetEndpoint;
+		if (this.overrideTargetEndpoint) {
+			targetPos = this.overrideTargetEndpoint._anchor.computedPosition as AnchorPlacement;
+			targetEndpoint = this.overrideTargetEndpoint;
+		}
+
+		this.stub = this.stub || 0;
+		const sourceGap = 0;
+		const sourceStub = isArray(this.stub) ? this.stub[0] : this.stub;
+		const targetStub = isArray(this.stub) ? this.stub[1] : this.stub;
+		const segment = quadrant(params.sourcePos, targetPos);
+		const swapX = targetPos.curX < params.sourcePos.curX;
+		const swapY = targetPos.curY < params.sourcePos.curY;
+		const lw = params.strokeWidth || 1;
+		const x = swapX ? targetPos.curX : params.sourcePos.curX;
+		const y = swapY ? targetPos.curY : params.sourcePos.curY;
+		const w = Math.abs(targetPos.curX - params.sourcePos.curX);
+		const h = Math.abs(targetPos.curY - params.sourcePos.curY);
+		let so: Orientation = [params.sourcePos.ox, params.sourcePos.oy];
+		let to: Orientation = [targetPos.ox, targetPos.oy];
+
+		// if either anchor does not have an orientation set, we derive one from their relative
+		// positions.  we fix the axis to be the one in which the two elements are further apart, and
+		// point each anchor at the other element.  this is also used when dragging a new connection.
+		if ((so[0] === 0 && so[1] === 0) || (to[0] === 0 && to[1] === 0)) {
+			const index = w > h ? 'curX' : 'curY';
+			const indexNum = w > h ? 0 : 1;
+			const oIndex = [1, 0][indexNum];
+			so = [];
+			to = [];
+			so[indexNum] = params.sourcePos[index] > targetPos[index] ? -1 : 1;
+			to[indexNum] = params.sourcePos[index] > targetPos[index] ? 1 : -1;
+			so[oIndex] = 0;
+			to[oIndex] = 0;
+		}
+
+		const sx = swapX ? w + sourceGap * so[0] : sourceGap * so[0],
+			sy = swapY ? h + sourceGap * so[1] : sourceGap * so[1],
+			tx = swapX ? this.targetGap * to[0] : w + this.targetGap * to[0],
+			ty = swapY ? this.targetGap * to[1] : h + this.targetGap * to[1],
+			oProduct = so[0] * to[0] + so[1] * to[1];
+
+		const sourceStubWithOffset =
+			sourceStub +
+			(this.getEndpointOffset && params.sourceEndpoint
+				? this.getEndpointOffset(params.sourceEndpoint)
+				: 0);
+
+		const targetStubWithOffset =
+			targetStub +
+			(this.getEndpointOffset && targetEndpoint ? this.getEndpointOffset(targetEndpoint) : 0);
+
+		// same as paintinfo generated by jsplumb AbstractConnector type
+		const result = {
+			sx,
+			sy,
+			tx,
+			ty,
+			lw,
+			xSpan: Math.abs(tx - sx),
+			ySpan: Math.abs(ty - sy),
+			mx: (sx + tx) / 2,
+			my: (sy + ty) / 2,
+			so,
+			to,
+			x,
+			y,
+			w,
+			h,
+			segment,
+			startStubX: sx + so[0] * sourceStubWithOffset,
+			startStubY: sy + so[1] * sourceStubWithOffset,
+			endStubX: tx + to[0] * targetStubWithOffset,
+			endStubY: ty + to[1] * targetStubWithOffset,
+			isXGreaterThanStubTimes2: Math.abs(sx - tx) > sourceStubWithOffset + targetStubWithOffset,
+			isYGreaterThanStubTimes2: Math.abs(sy - ty) > sourceStubWithOffset + targetStubWithOffset,
+			opposite: oProduct === -1,
+			perpendicular: oProduct === 0,
+			orthogonal: oProduct === 1,
+			sourceAxis: so[0] === 0 ? 'y' : ('x' as PaintAxis),
+			points: [x, y, w, h, sx, sy, tx, ty] as [
+				number,
+				number,
+				number,
+				number,
+				number,
+				number,
+				number,
+				number,
+			],
+			stubs: [sourceStubWithOffset, targetStubWithOffset] as [number, number],
+			anchorOrientation: 'opposite', // always opposite since our endpoints are always opposite (source orientation is left (1) and target orientation is right (-1))
+
+			/** custom keys added */
+			sourceEndpoint: params.sourceEndpoint,
+			targetEndpoint,
+			sourcePos: params.sourcePos,
+			targetPos,
+			targetGap: this.targetGap,
+		};
+
+		return result;
+	}
+
+	_compute(originalPaintInfo: PaintGeometry, connParams: ConnectorComputeParams) {
+		const paintInfo = this._getPaintInfo(connParams);
+		// Set the type of key as key of paintInfo
+		// TODO: Check if this is the best way to do this
+		// Object.assign(originalPaintInfo, paintInfo);
+		Object.keys(paintInfo).forEach((key) => {
+			if (key === undefined) return;
+			// override so that bounding box is calculated correctly when target override is set
+			originalPaintInfo[key as keyof PaintGeometry] = paintInfo[key as keyof PaintGeometry];
+		});
+
+		try {
+			if (paintInfo.tx < 0) {
+				this._computeFlowchart(paintInfo);
+			} else {
+				this._computeBezier(paintInfo);
+			}
+		} catch (error) {}
+	}
+	/**
+	 * Set target endpoint
+	 * (to override default behavior tracking mouse when dragging mouse)
+	 * @param {Endpoint} endpoint
+	 */
+	setTargetEndpoint(endpoint: Endpoint) {
+		this.overrideTargetEndpoint = endpoint;
+	}
+	resetTargetEndpoint() {
+		this.overrideTargetEndpoint = null;
+	}
+	_computeBezier(paintInfo: N8nConnectorPaintGeometry) {
+		const sp = paintInfo.sourcePos;
+		const tp = paintInfo.targetPos;
+		const _w = Math.abs(sp.curX - tp.curX) - this.targetGap;
+		const _h = Math.abs(sp.curY - tp.curY);
+		const _sx = sp.curX < tp.curX ? _w : 0;
+		const _sy = sp.curY < tp.curY ? _h : 0;
+		const _tx = sp.curX < tp.curX ? 0 : _w;
+		const _ty = sp.curY < tp.curY ? 0 : _h;
+
+		if (paintInfo.ySpan <= 20 || (paintInfo.ySpan <= 100 && paintInfo.xSpan <= 100)) {
+			this.majorAnchor = 0.1;
+		} else {
+			this.majorAnchor = paintInfo.xSpan * this.curvinessCoefficient + this.zBezierOffset;
+		}
+
+		const _CP = this._findControlPoint({ x: _sx, y: _sy }, sp, tp, paintInfo.so, paintInfo.to);
+		const _CP2 = this._findControlPoint({ x: _tx, y: _ty }, tp, sp, paintInfo.to, paintInfo.so);
+
+		const bezRes = {
+			x1: _sx,
+			y1: _sy,
+			x2: _tx,
+			y2: _ty,
+			cp1x: _CP.x,
+			cp1y: _CP.y,
+			cp2x: _CP2.x,
+			cp2y: _CP2.y,
+		};
+		this._addSegment(BezierSegment, bezRes);
+	}
+
+	addFlowchartSegment(x: number, y: number, paintInfo: PaintGeometry) {
+		if (this.lastx === x && this.lasty === y) {
+			return;
+		}
+		const lx = this.lastx === null ? paintInfo.sx : this.lastx;
+		const ly = this.lasty === null ? paintInfo.sy : this.lasty;
+		const o = lx === x ? 'v' : 'h';
+
+		this.lastx = x;
+		this.lasty = y;
+		this.internalSegments.push([lx, ly, x, y, o]);
+	}
+
+	_computeFlowchart(paintInfo: N8nConnectorPaintGeometry) {
+		this.segments = [];
+		this.lastx = null;
+		this.lasty = null;
+
+		this.internalSegments = [];
+
+		// calculate Stubs.
+		const stubs = this.calculateStubSegment(paintInfo);
+
+		// add the start stub segment. use stubs for loopback as it will look better, with the loop spaced
+		// away from the element.
+		this.addFlowchartSegment(stubs[0], stubs[1], paintInfo);
+
+		// compute the rest of the line
+		const p = this.calculateLineSegment(paintInfo, stubs);
+		if (p) {
+			for (let i = 0; i < p.length; i++) {
+				this.addFlowchartSegment(p[i][0], p[i][1], paintInfo);
+			}
+		}
+
+		// line to end stub
+		this.addFlowchartSegment(stubs[2], stubs[3], paintInfo);
+
+		// end stub to end (common)
+		this.addFlowchartSegment(paintInfo.tx, paintInfo.ty, paintInfo);
+
+		// write out the segments.
+		this.writeFlowchartSegments(paintInfo);
+	}
+
+	transformGeometry(g: Geometry, dx: number, dy: number): Geometry {
+		return g;
+	}
+}
diff --git a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointRenderer.ts b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointRenderer.ts
new file mode 100644
index 00000000000000..07b528ee72b309
--- /dev/null
+++ b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointRenderer.ts
@@ -0,0 +1,37 @@
+import { registerEndpointRenderer, svg } from '@jsplumb/browser-ui';
+import { N8nPlusEndpoint } from './N8nPlusEndpointType';
+
+export const register = () => {
+	registerEndpointRenderer<N8nPlusEndpoint>(N8nPlusEndpoint.type, {
+		makeNode: (ep: N8nPlusEndpoint) => {
+			const group = svg.node('g');
+			const containerBorder = svg.node('rect', {
+				rx: 3,
+				'stroke-width': 2,
+				fillOpacity: 0,
+				height: ep.params.dimensions - 2,
+				width: ep.params.dimensions - 2,
+				y: 1,
+				x: 1,
+			});
+			const plusPath = svg.node('path', {
+				d: 'm16.40655,10.89837l-3.30491,0l0,-3.30491c0,-0.40555 -0.32889,-0.73443 -0.73443,-0.73443l-0.73443,0c-0.40554,0 -0.73442,0.32888 -0.73442,0.73443l0,3.30491l-3.30491,0c-0.40555,0 -0.73443,0.32888 -0.73443,0.73442l0,0.73443c0,0.40554 0.32888,0.73443 0.73443,0.73443l3.30491,0l0,3.30491c0,0.40554 0.32888,0.73442 0.73442,0.73442l0.73443,0c0.40554,0 0.73443,-0.32888 0.73443,-0.73442l0,-3.30491l3.30491,0c0.40554,0 0.73442,-0.32889 0.73442,-0.73443l0,-0.73443c0,-0.40554 -0.32888,-0.73442 -0.73442,-0.73442z',
+			});
+			if (ep.params.size !== 'medium') {
+				ep.addClass(ep.params.size);
+			}
+			group.appendChild(containerBorder);
+			group.appendChild(plusPath);
+
+			ep.setupOverlays();
+			ep.setVisible(false);
+			return group;
+		},
+
+		updateNode: (ep: N8nPlusEndpoint) => {
+			const ifNoConnections = ep.getConnections().length === 0;
+
+			ep.setIsVisible(ifNoConnections);
+		},
+	});
+};
diff --git a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
new file mode 100644
index 00000000000000..6793149250be14
--- /dev/null
+++ b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
@@ -0,0 +1,183 @@
+import { EndpointHandler, Endpoint, EndpointRepresentation, Overlay } from '@jsplumb/core';
+import { AnchorPlacement, EndpointRepresentationParams } from '@jsplumb/common';
+import {
+	createElement,
+	EVENT_ENDPOINT_MOUSEOVER,
+	EVENT_ENDPOINT_MOUSEOUT,
+	EVENT_ENDPOINT_CLICK,
+	EVENT_CONNECTION_ABORT,
+} from '@jsplumb/browser-ui';
+
+export type ComputedN8nPlusEndpoint = [number, number, number, number, number];
+interface N8nPlusEndpointParams extends EndpointRepresentationParams {
+	dimensions: number;
+	connectedEndpoint: Endpoint;
+	hoverMessage: string;
+	size: 'small' | 'medium';
+	showOutputLabel: boolean;
+}
+export const PlusStalkOverlay = 'plus-stalk';
+export const HoverMessageOverlay = 'hover-message';
+
+export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpoint> {
+	params: N8nPlusEndpointParams;
+	label: string;
+	stalkOverlay: Overlay | null;
+	messageOverlay: Overlay | null;
+
+	constructor(endpoint: Endpoint, params: N8nPlusEndpointParams) {
+		super(endpoint, params);
+
+		this.params = params;
+
+		this.label = '';
+		this.stalkOverlay = null;
+		this.messageOverlay = null;
+
+		this.unbindEvents();
+		this.bindEvents();
+	}
+
+	static type = 'N8nPlus';
+	type = N8nPlusEndpoint.type;
+
+	setupOverlays() {
+		this.clearOverlays();
+		this.endpoint.instance.setSuspendDrawing(true);
+		this.stalkOverlay = this.endpoint.addOverlay({
+			type: 'Custom',
+			options: {
+				id: PlusStalkOverlay,
+				create: () => {
+					const stalk = createElement('div', {}, `${PlusStalkOverlay} ${this.params.size}`);
+					return stalk;
+				},
+			},
+		});
+		this.messageOverlay = this.endpoint.addOverlay({
+			type: 'Custom',
+			options: {
+				id: HoverMessageOverlay,
+				location: 0.5,
+				create: () => {
+					const hoverMessage = createElement('p', {}, `${HoverMessageOverlay} ${this.params.size}`);
+					hoverMessage.innerHTML = this.params.hoverMessage;
+					return hoverMessage;
+				},
+			},
+		});
+		this.endpoint.instance.setSuspendDrawing(false);
+	}
+	bindEvents() {
+		this.instance.bind(EVENT_ENDPOINT_MOUSEOVER, this.setHoverMessageVisible);
+		this.instance.bind(EVENT_ENDPOINT_MOUSEOUT, this.unsetHoverMessageVisible);
+		this.instance.bind(EVENT_ENDPOINT_CLICK, this.fireClickEvent);
+		this.instance.bind(EVENT_CONNECTION_ABORT, this.setStalkLabels);
+	}
+	unbindEvents() {
+		this.instance.unbind(EVENT_ENDPOINT_MOUSEOVER, this.setHoverMessageVisible);
+		this.instance.unbind(EVENT_ENDPOINT_MOUSEOUT, this.unsetHoverMessageVisible);
+		this.instance.unbind(EVENT_ENDPOINT_CLICK, this.fireClickEvent);
+		this.instance.unbind(EVENT_CONNECTION_ABORT, this.setStalkLabels);
+	}
+	setStalkLabels = () => {
+		if (!this.endpoint) return;
+
+		const stalkOverlay = this.endpoint.getOverlay(PlusStalkOverlay);
+		const messageOverlay = this.endpoint.getOverlay(HoverMessageOverlay);
+		if (stalkOverlay && messageOverlay) {
+			// Increase the size of the stalk overlay if the label is too long
+			const fnKey = this.label.length > 10 ? 'add' : 'remove';
+			this.instance[`${fnKey}OverlayClass`](stalkOverlay, 'long-stalk');
+			this.instance[`${fnKey}OverlayClass`](messageOverlay, 'long-stalk');
+			this[`${fnKey}Class`]('long-stalk');
+
+			if (this.label) {
+				// @ts-expect-error: Overlay interface is missing the `canvas` property
+				stalkOverlay.canvas.setAttribute('data-label', this.label);
+			}
+		}
+	};
+	fireClickEvent = (endpoint: Endpoint) => {
+		if (endpoint === this.endpoint) {
+			this.instance.fire('plusEndpointClick', this.endpoint);
+		}
+	};
+	setHoverMessageVisible = (endpoint: Endpoint) => {
+		if (endpoint === this.endpoint && this.messageOverlay) {
+			this.instance.addOverlayClass(this.messageOverlay, 'visible');
+		}
+	};
+	unsetHoverMessageVisible = (endpoint: Endpoint) => {
+		if (endpoint === this.endpoint && this.messageOverlay) {
+			this.instance.removeOverlayClass(this.messageOverlay, 'visible');
+		}
+	};
+	clearOverlays() {
+		Object.keys(this.endpoint.getOverlays()).forEach((key) => {
+			this.endpoint.removeOverlay(key);
+		});
+		this.stalkOverlay = null;
+		this.messageOverlay = null;
+	}
+	getConnections() {
+		const connections = [
+			...this.endpoint.connections,
+			...this.params.connectedEndpoint.connections,
+		];
+
+		return connections;
+	}
+	setIsVisible(visible: boolean) {
+		this.instance.setSuspendDrawing(true);
+		Object.keys(this.endpoint.getOverlays()).forEach((overlay) => {
+			this.endpoint.getOverlays()[overlay].setVisible(visible);
+		});
+
+		this.setVisible(visible);
+
+		// Re-trigger the success state if label is set
+		if (visible && this.label) {
+			this.setSuccessOutput(this.label);
+		}
+		this.instance.setSuspendDrawing(false);
+	}
+
+	setSuccessOutput(label: string) {
+		this.endpoint.addClass('ep-success');
+		if (this.params.showOutputLabel) {
+			this.label = label;
+			this.setStalkLabels();
+		}
+	}
+
+	clearSuccessOutput() {
+		this.endpoint.removeOverlay('successOutputOverlay');
+		this.endpoint.removeClass('ep-success');
+		this.label = '';
+		this.setStalkLabels();
+	}
+}
+
+export const N8nPlusEndpointHandler: EndpointHandler<N8nPlusEndpoint, ComputedN8nPlusEndpoint> = {
+	type: N8nPlusEndpoint.type,
+	cls: N8nPlusEndpoint,
+	compute: (ep: N8nPlusEndpoint, anchorPoint: AnchorPlacement): ComputedN8nPlusEndpoint => {
+		const x = anchorPoint.curX - ep.params.dimensions / 2;
+		const y = anchorPoint.curY - ep.params.dimensions / 2;
+		const w = ep.params.dimensions;
+		const h = ep.params.dimensions;
+
+		ep.x = x;
+		ep.y = y;
+		ep.w = w;
+		ep.h = h;
+
+		ep.addClass('plus-endpoint');
+		return [x, y, w, h, ep.params.dimensions];
+	},
+
+	getParams: (ep: N8nPlusEndpoint): N8nPlusEndpointParams => {
+		return ep.params;
+	},
+};
diff --git a/packages/editor-ui/src/stores/canvas.ts b/packages/editor-ui/src/stores/canvas.ts
index 665bedfa2587e5..53d4ea2e9700d2 100644
--- a/packages/editor-ui/src/stores/canvas.ts
+++ b/packages/editor-ui/src/stores/canvas.ts
@@ -1,29 +1,44 @@
 import { computed, ref } from 'vue';
 import { defineStore } from 'pinia';
-import { jsPlumb } from 'jsplumb';
 import { v4 as uuid } from 'uuid';
 import normalizeWheel from 'normalize-wheel';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useUIStore } from '@/stores/ui';
+import { useHistoryStore } from '@/stores/history';
 import { INodeUi, XYPosition } from '@/Interface';
 import { scaleBigger, scaleReset, scaleSmaller } from '@/utils';
-import { START_NODE_TYPE } from '@/constants';
-import '@/plugins/N8nCustomConnectorType';
-import '@/plugins/PlusEndpointType';
+import { START_NODE_TYPE, STICKY_NODE_TYPE } from '@/constants';
+import type {
+	BeforeStartEventParams,
+	BrowserJsPlumbInstance,
+	DragStopEventParams,
+} from '@jsplumb/browser-ui';
+import { newInstance } from '@jsplumb/browser-ui';
+import { N8nPlusEndpointHandler } from '@/plugins/endpoints/N8nPlusEndpointType';
+import * as N8nPlusEndpointRenderer from '@/plugins/endpoints/N8nPlusEndpointRenderer';
+import { N8nConnector } from '@/plugins/connectors/N8nCustomConnector';
+import { EndpointFactory, Connectors } from '@jsplumb/core';
+import { MoveNodeCommand } from '@/models/history';
 import {
 	DEFAULT_PLACEHOLDER_TRIGGER_BUTTON,
 	getMidCanvasPosition,
 	getNewNodePosition,
 	getZoomToFit,
 	PLACEHOLDER_TRIGGER_NODE_SIZE,
+	CONNECTOR_FLOWCHART_TYPE,
+	GRID_SIZE,
 } from '@/utils/nodeViewUtils';
+import { PointXY } from '@jsplumb/util';
 
 export const useCanvasStore = defineStore('canvas', () => {
 	const workflowStore = useWorkflowsStore();
 	const nodeTypesStore = useNodeTypesStore();
 	const uiStore = useUIStore();
-	const jsPlumbInstance = jsPlumb.getInstance();
+	const historyStore = useHistoryStore();
+
+	const jsPlumbInstance = ref<BrowserJsPlumbInstance>();
+	const isDragging = ref<boolean>(false);
 
 	const nodes = computed<INodeUi[]>(() => workflowStore.allNodes);
 	const triggerNodes = computed<INodeUi[]>(() =>
@@ -35,6 +50,10 @@ export const useCanvasStore = defineStore('canvas', () => {
 	const nodeViewScale = ref<number>(1);
 	const canvasAddButtonPosition = ref<XYPosition>([1, 1]);
 
+	Connectors.register(N8nConnector.type, N8nConnector);
+	N8nPlusEndpointRenderer.register();
+	EndpointFactory.registerHandler(N8nPlusEndpointHandler);
+
 	const setRecenteredCanvasAddButtonPosition = (offset?: XYPosition) => {
 		const position = getMidCanvasPosition(nodeViewScale.value, offset || [0, 0]);
 
@@ -59,7 +78,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 
 	const setZoomLevel = (zoomLevel: number, offset: XYPosition) => {
 		nodeViewScale.value = zoomLevel;
-		jsPlumbInstance.setZoom(zoomLevel);
+		jsPlumbInstance.value?.setZoom(zoomLevel);
 		uiStore.nodeViewOffsetPosition = offset;
 	};
 
@@ -122,8 +141,106 @@ export const useCanvasStore = defineStore('canvas', () => {
 		wheelMoveWorkflow(e);
 	};
 
+	function initInstance(container: Element) {
+		// Make sure to clean-up previous instance if it exists
+		if (jsPlumbInstance.value) {
+			jsPlumbInstance.value.destroy();
+			jsPlumbInstance.value.reset();
+			jsPlumbInstance.value = undefined;
+		}
+
+		jsPlumbInstance.value = newInstance({
+			container,
+			connector: CONNECTOR_FLOWCHART_TYPE,
+			resizeObserver: false,
+			dragOptions: {
+				cursor: 'pointer',
+				grid: { w: GRID_SIZE, h: GRID_SIZE },
+				start: (params: BeforeStartEventParams) => {
+					const draggedNode = params.drag.getDragElement();
+					const nodeName = draggedNode.getAttribute('data-name');
+					if (!nodeName) return;
+					isDragging.value = true;
+
+					const isSelected = uiStore.isNodeSelected(nodeName);
+
+					if (params.e && !isSelected) {
+						// Only the node which gets dragged directly gets an event, for all others it is
+						// undefined. So check if the currently dragged node is selected and if not clear
+						// the drag-selection.
+						jsPlumbInstance.value?.clearDragSelection();
+						uiStore.resetSelectedNodes();
+					}
+
+					uiStore.addActiveAction('dragActive');
+					return true;
+				},
+				stop: (params: DragStopEventParams) => {
+					const draggedNode = params.drag.getDragElement();
+					const nodeName = draggedNode.getAttribute('data-name');
+					if (!nodeName) return;
+					const nodeData = workflowStore.getNodeByName(nodeName);
+					isDragging.value = false;
+					if (uiStore.isActionActive('dragActive') && nodeData) {
+						const moveNodes = uiStore.getSelectedNodes.slice();
+						const selectedNodeNames = moveNodes.map((node: INodeUi) => node.name);
+						if (!selectedNodeNames.includes(nodeData.name)) {
+							// If the current node is not in selected add it to the nodes which
+							// got moved manually
+							moveNodes.push(nodeData);
+						}
+
+						if (moveNodes.length > 1) {
+							historyStore.startRecordingUndo();
+						}
+						// This does for some reason just get called once for the node that got clicked
+						// even though "start" and "drag" gets called for all. So lets do for now
+						// some dirty DOM query to get the new positions till I have more time to
+						// create a proper solution
+						let newNodePosition: XYPosition;
+						moveNodes.forEach((node: INodeUi) => {
+							const element = document.getElementById(node.id);
+							if (element === null) {
+								return;
+							}
+
+							newNodePosition = [
+								parseInt(element.style.left!.slice(0, -2), 10),
+								parseInt(element.style.top!.slice(0, -2), 10),
+							];
+
+							const updateInformation = {
+								name: node.name,
+								properties: {
+									position: newNodePosition,
+								},
+							};
+							const oldPosition = node.position;
+							if (oldPosition[0] !== newNodePosition[0] || oldPosition[1] !== newNodePosition[1]) {
+								historyStore.pushCommandToUndo(
+									new MoveNodeCommand(node.name, oldPosition, newNodePosition),
+								);
+								workflowStore.updateNodeProperties(updateInformation);
+							}
+						});
+						if (moveNodes.length > 1) {
+							historyStore.stopRecordingUndo();
+						}
+					}
+				},
+				filter: '.node-description, .node-description .node-name, .node-description .node-subtitle',
+			},
+		});
+		jsPlumbInstance.value?.setDragConstrainFunction((pos: PointXY) => {
+			const isReadOnly = uiStore.isReadOnlyView;
+			if (isReadOnly) {
+				// Do not allow to move nodes in readOnly mode
+				return null;
+			}
+			return pos;
+		});
+	}
 	return {
-		jsPlumbInstance,
 		isDemo,
 		nodeViewScale,
 		canvasAddButtonPosition,
@@ -135,5 +252,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 		zoomOut,
 		zoomToFit,
 		wheelScroll,
+		initInstance,
+		jsPlumbInstance,
 	};
 });
diff --git a/packages/editor-ui/src/stores/ui.ts b/packages/editor-ui/src/stores/ui.ts
index 16528708046430..d209736176a1ff 100644
--- a/packages/editor-ui/src/stores/ui.ts
+++ b/packages/editor-ui/src/stores/ui.ts
@@ -251,6 +251,9 @@ export const useUIStore = defineStore(STORES.UI, {
 			return (id: string) =>
 				this.fakeDoorFeatures.find((fakeDoor) => fakeDoor.id.toString() === id);
 		},
+		isReadOnlyView(): boolean {
+			return ![VIEWS.WORKFLOW, VIEWS.NEW_WORKFLOW].includes(this.currentView as VIEWS);
+		},
 		isNodeView(): boolean {
 			return [
 				VIEWS.NEW_WORKFLOW.toString(),
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index e32f1d61833dc3..cec309b81ef16c 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -195,7 +195,9 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 		},
 		getNodeById() {
 			return (nodeId: string): INodeUi | undefined =>
-				this.workflow.nodes.find((node: INodeUi) => node.id === nodeId);
+				this.workflow.nodes.find((node: INodeUi) => {
+					return node.id === nodeId;
+				});
 		},
 		nodesIssuesExist(): boolean {
 			for (const node of this.workflow.nodes) {
diff --git a/packages/editor-ui/src/utils/canvasUtils.ts b/packages/editor-ui/src/utils/canvasUtils.ts
index 5d0c90cde92d0a..a0a61158f03501 100644
--- a/packages/editor-ui/src/utils/canvasUtils.ts
+++ b/packages/editor-ui/src/utils/canvasUtils.ts
@@ -1,7 +1,7 @@
 import { MAIN_HEADER_TABS, VIEWS } from '@/constants';
 import { IZoomConfig } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows';
-import { OnConnectionBindInfo } from 'jsplumb';
+import { ConnectionDetachedParams } from '@jsplumb/core';
 import { IConnection } from 'n8n-workflow';
 import { Route } from 'vue-router';
 
@@ -94,10 +94,10 @@ export const getNodeViewTab = (route: Route): string | null => {
 };
 
 export const getConnectionInfo = (
-	connection: OnConnectionBindInfo,
+	connection: ConnectionDetachedParams,
 ): [IConnection, IConnection] | null => {
-	const sourceInfo = connection.sourceEndpoint.getParameters();
-	const targetInfo = connection.targetEndpoint.getParameters();
+	const sourceInfo = connection.sourceEndpoint.parameters;
+	const targetInfo = connection.targetEndpoint.parameters;
 	const sourceNode = useWorkflowsStore().getNodeById(sourceInfo.nodeId);
 	const targetNode = useWorkflowsStore().getNodeById(targetInfo.nodeId);
 
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/editor-ui/src/utils/nodeViewUtils.ts
index 31d662d11b14b6..9b8e5d8e0e4146 100644
--- a/packages/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.ts
@@ -1,7 +1,11 @@
-import { closestNumberDivisibleBy, getStyleTokenValue, isNumber } from '@/utils';
+import { getStyleTokenValue } from '@/utils/htmlUtils';
+import { isNumber } from '@/utils';
 import { NODE_OUTPUT_DEFAULT_KEY, STICKY_NODE_TYPE, QUICKSTART_NOTE_NAME } from '@/constants';
 import { EndpointStyle, IBounds, INodeUi, XYPosition } from '@/Interface';
-import { AnchorArraySpec, Connection, Endpoint, Overlay, OverlaySpec, PaintStyle } from 'jsplumb';
+import { ArrayAnchorSpec, ConnectorSpec, OverlaySpec, PaintStyle } from '@jsplumb/common';
+import { Endpoint, Connection } from '@jsplumb/core';
+import { N8nConnector } from '@/plugins/connectors/N8nCustomConnector';
+import { closestNumberDivisibleBy } from '@/utils';
 import {
 	IConnection,
 	INode,
@@ -10,6 +14,7 @@ import {
 	NodeInputConnections,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import { EVENT_CONNECTION_MOUSEOUT, EVENT_CONNECTION_MOUSEOVER } from '@jsplumb/browser-ui';
 
 /*
 	Canvas constants and functions.
@@ -24,8 +29,7 @@ export const OVERLAY_RUN_ITEMS_ID = 'run-items-label';
 export const OVERLAY_CONNECTION_ACTIONS_ID = 'connection-actions';
 export const JSPLUMB_FLOWCHART_STUB = 26;
 export const OVERLAY_INPUT_NAME_LABEL = 'input-name-label';
-export const OVERLAY_INPUT_NAME_LABEL_POSITION = [-3, 0.5];
-export const OVERLAY_INPUT_NAME_LABEL_POSITION_MOVED = [-4.5, 0.5];
+export const OVERLAY_INPUT_NAME_MOVED_CLASS = 'node-input-endpoint-label--moved';
 export const OVERLAY_OUTPUT_NAME_LABEL = 'output-name-label';
 export const GRID_SIZE = 20;
 
@@ -69,9 +73,9 @@ export const WELCOME_STICKY_NODE = {
 	},
 };
 
-export const CONNECTOR_FLOWCHART_TYPE = [
-	'N8nCustom',
-	{
+export const CONNECTOR_FLOWCHART_TYPE: ConnectorSpec = {
+	type: N8nConnector.type,
+	options: {
 		cornerRadius: 12,
 		stub: JSPLUMB_FLOWCHART_STUB + 10,
 		targetGap: 4,
@@ -91,7 +95,7 @@ export const CONNECTOR_FLOWCHART_TYPE = [
 			return index * indexOffset + labelOffset + outputsOffset;
 		},
 	},
-];
+};
 
 export const CONNECTOR_PAINT_STYLE_DEFAULT: PaintStyle = {
 	stroke: getStyleTokenValue('--color-foreground-dark'),
@@ -110,15 +114,10 @@ export const CONNECTOR_PAINT_STYLE_PRIMARY = {
 	stroke: getStyleTokenValue('--color-primary'),
 };
 
-export const CONNECTOR_PAINT_STYLE_SUCCESS = {
-	...CONNECTOR_PAINT_STYLE_DEFAULT,
-	stroke: getStyleTokenValue('--color-success-light'),
-};
-
 export const CONNECTOR_ARROW_OVERLAYS: OverlaySpec[] = [
-	[
-		'Arrow',
-		{
+	{
+		type: 'Arrow',
+		options: {
 			id: OVERLAY_ENDPOINT_ARROW_ID,
 			location: 1,
 			width: 12,
@@ -126,10 +125,10 @@ export const CONNECTOR_ARROW_OVERLAYS: OverlaySpec[] = [
 			length: 10,
 			visible: true,
 		},
-	],
-	[
-		'Arrow',
-		{
+	},
+	{
+		type: 'Arrow',
+		options: {
 			id: OVERLAY_MIDPOINT_ARROW_ID,
 			location: 0.5,
 			width: 12,
@@ -137,12 +136,12 @@ export const CONNECTOR_ARROW_OVERLAYS: OverlaySpec[] = [
 			length: 10,
 			visible: false,
 		},
-	],
+	},
 ];
 
 export const ANCHOR_POSITIONS: {
 	[key: string]: {
-		[key: number]: AnchorArraySpec[];
+		[key: number]: ArrayAnchorSpec[];
 	};
 } = {
 	input: {
@@ -194,33 +193,42 @@ export const getInputEndpointStyle = (
 	lineWidth: 0,
 });
 
-export const getInputNameOverlay = (label: string): OverlaySpec => [
-	'Label',
-	{
+export const getInputNameOverlay = (labelText: string): OverlaySpec => ({
+	type: 'Custom',
+	options: {
 		id: OVERLAY_INPUT_NAME_LABEL,
-		location: OVERLAY_INPUT_NAME_LABEL_POSITION,
-		label,
-		cssClass: 'node-input-endpoint-label',
 		visible: true,
+		create: (component: Endpoint) => {
+			const label = document.createElement('div');
+			label.innerHTML = labelText;
+			label.classList.add('node-input-endpoint-label');
+			return label;
+		},
 	},
-];
+});
 
-export const getOutputEndpointStyle = (nodeTypeData: INodeTypeDescription, color: string) => ({
-	radius: nodeTypeData && nodeTypeData.outputs.length > 2 ? 7 : 9,
+export const getOutputEndpointStyle = (
+	nodeTypeData: INodeTypeDescription,
+	color: string,
+): PaintStyle => ({
+	strokeWidth: nodeTypeData && nodeTypeData.outputs.length > 2 ? 7 : 9,
 	fill: getStyleTokenValue(color),
 	outlineStroke: 'none',
 });
 
-export const getOutputNameOverlay = (label: string): OverlaySpec => [
-	'Label',
-	{
+export const getOutputNameOverlay = (labelText: string): OverlaySpec => ({
+	type: 'Custom',
+	options: {
 		id: OVERLAY_OUTPUT_NAME_LABEL,
-		location: [1.9, 0.5],
-		label,
-		cssClass: 'node-output-endpoint-label',
 		visible: true,
+		create: (component: Endpoint) => {
+			const label = document.createElement('div');
+			label.innerHTML = labelText;
+			label.classList.add('node-output-endpoint-label');
+			return label;
+		},
 	},
-];
+});
 
 export const addOverlays = (connection: Connection, overlays: OverlaySpec[]) => {
 	overlays.forEach((overlay: OverlaySpec) => {
@@ -302,25 +310,34 @@ export const showOrHideMidpointArrow = (connection: Connection) => {
 	if (!connection || !connection.endpoints || connection.endpoints.length !== 2) {
 		return;
 	}
-
 	const hasItemsLabel = !!getOverlay(connection, OVERLAY_RUN_ITEMS_ID);
 
 	const sourceEndpoint = connection.endpoints[0];
 	const targetEndpoint = connection.endpoints[1];
-
-	const sourcePosition = sourceEndpoint.anchor.lastReturnValue[0];
-	const targetPosition = targetEndpoint.anchor.lastReturnValue
-		? targetEndpoint.anchor.lastReturnValue[0]
-		: sourcePosition + 1; // lastReturnValue is null when moving connections from node to another
+	const sourcePosition = sourceEndpoint._anchor.computedPosition?.curX ?? 0;
+	const targetPosition = targetEndpoint._anchor.computedPosition?.curX ?? sourcePosition + 1;
 
 	const minimum = hasItemsLabel ? 150 : 0;
 	const isBackwards = sourcePosition >= targetPosition;
 	const isTooLong = Math.abs(sourcePosition - targetPosition) >= minimum;
+	const isActionsOverlayHovered = getOverlay(
+		connection,
+		OVERLAY_CONNECTION_ACTIONS_ID,
+	)?.component.isHover();
+	const isConnectionHovered = connection.isHover();
 
 	const arrow = getOverlay(connection, OVERLAY_MIDPOINT_ARROW_ID);
+	const isArrowVisible =
+		isBackwards &&
+		isTooLong &&
+		!isActionsOverlayHovered &&
+		!isConnectionHovered &&
+		!connection.instance.isConnectionBeingDragged;
+
 	if (arrow) {
-		arrow.setVisible(isBackwards && isTooLong);
+		arrow.setVisible(isArrowVisible);
 		arrow.setLocation(hasItemsLabel ? 0.6 : 0.5);
+		connection.instance.repaint(arrow.canvas);
 	}
 };
 
@@ -329,8 +346,8 @@ export const getConnectorLengths = (connection: Connection): [number, number] =>
 		return [0, 0];
 	}
 	const bounds = connection.connector.bounds;
-	const diffX = Math.abs(bounds.maxX - bounds.minX);
-	const diffY = Math.abs(bounds.maxY - bounds.minY);
+	const diffX = Math.abs(bounds.xmax - bounds.xmin);
+	const diffY = Math.abs(bounds.ymax - bounds.ymin);
 
 	return [diffX, diffY];
 };
@@ -339,36 +356,30 @@ const isLoopingBackwards = (connection: Connection) => {
 	const sourceEndpoint = connection.endpoints[0];
 	const targetEndpoint = connection.endpoints[1];
 
-	const sourcePosition = sourceEndpoint.anchor.lastReturnValue[0];
-	const targetPosition = targetEndpoint.anchor.lastReturnValue[0];
+	const sourcePosition = sourceEndpoint._anchor.computedPosition?.curX ?? 0;
+	const targetPosition = targetEndpoint._anchor.computedPosition?.curX ?? 0;
 
 	return targetPosition - sourcePosition < -1 * LOOPBACK_MINIMUM;
 };
 
 export const showOrHideItemsLabel = (connection: Connection) => {
-	if (!connection || !connection.connector) {
-		return;
-	}
+	if (!connection?.connector) return;
 
 	const overlay = getOverlay(connection, OVERLAY_RUN_ITEMS_ID);
-	if (!overlay) {
-		return;
-	}
+	if (!overlay) return;
 
 	const actionsOverlay = getOverlay(connection, OVERLAY_CONNECTION_ACTIONS_ID);
-	if (actionsOverlay && actionsOverlay.visible) {
+	const isActionsOverlayHovered = actionsOverlay?.component.isHover();
+
+	if (isActionsOverlayHovered) {
 		overlay.setVisible(false);
 		return;
 	}
 
 	const [diffX, diffY] = getConnectorLengths(connection);
+	const isHidden = diffX < MIN_X_TO_SHOW_OUTPUT_LABEL && diffY < MIN_Y_TO_SHOW_OUTPUT_LABEL;
 
-	if (diffX < MIN_X_TO_SHOW_OUTPUT_LABEL && diffY < MIN_Y_TO_SHOW_OUTPUT_LABEL) {
-		overlay.setVisible(false);
-	} else {
-		overlay.setVisible(true);
-	}
-
+	overlay.setVisible(!isHidden);
 	const innerElement = overlay.canvas && overlay.canvas.querySelector('span');
 	if (innerElement) {
 		if (diffY === 0 || isLoopingBackwards(connection)) {
@@ -503,22 +514,27 @@ export const getBackgroundStyles = (
 	return styles;
 };
 
-export const hideConnectionActions = (connection: Connection | null) => {
-	if (connection && connection.connector) {
-		hideOverlay(connection, OVERLAY_CONNECTION_ACTIONS_ID);
-		showOrHideItemsLabel(connection);
-		showOrHideMidpointArrow(connection);
-	}
+export const hideConnectionActions = (connection: Connection) => {
+	connection.instance.setSuspendDrawing(true);
+	hideOverlay(connection, OVERLAY_CONNECTION_ACTIONS_ID);
+	showOrHideMidpointArrow(connection);
+	showOrHideItemsLabel(connection);
+	connection.instance.setSuspendDrawing(false);
+	(connection.endpoints || []).forEach((endpoint) => {
+		connection.instance.repaint(endpoint.element);
+	});
 };
 
-export const showConnectionActions = (connection: Connection | null) => {
-	if (connection && connection.connector) {
-		showOverlay(connection, OVERLAY_CONNECTION_ACTIONS_ID);
-		hideOverlay(connection, OVERLAY_RUN_ITEMS_ID);
-		if (!getOverlay(connection, OVERLAY_RUN_ITEMS_ID)) {
-			hideOverlay(connection, OVERLAY_MIDPOINT_ARROW_ID);
-		}
+export const showConnectionActions = (connection: Connection) => {
+	showOverlay(connection, OVERLAY_CONNECTION_ACTIONS_ID);
+	hideOverlay(connection, OVERLAY_RUN_ITEMS_ID);
+	if (!getOverlay(connection, OVERLAY_RUN_ITEMS_ID)) {
+		hideOverlay(connection, OVERLAY_MIDPOINT_ARROW_ID);
 	}
+
+	(connection.endpoints || []).forEach((endpoint) => {
+		connection.instance.repaint(endpoint.element);
+	});
 };
 
 export const getOutputSummary = (data: ITaskData[], nodeConnections: NodeInputConnections) => {
@@ -586,11 +602,9 @@ export const getOutputSummary = (data: ITaskData[], nodeConnections: NodeInputCo
 
 export const resetConnection = (connection: Connection) => {
 	connection.removeOverlay(OVERLAY_RUN_ITEMS_ID);
-	connection.setPaintStyle(CONNECTOR_PAINT_STYLE_DEFAULT);
+	connection.removeClass('success');
 	showOrHideMidpointArrow(connection);
-	if (connection.canvas) {
-		connection.canvas.classList.remove('success');
-	}
+	connection.setPaintStyle(CONNECTOR_PAINT_STYLE_DEFAULT);
 };
 
 export const getRunItemsLabel = (output: { total: number; iterations: number }): string => {
@@ -604,27 +618,36 @@ export const addConnectionOutputSuccess = (
 	connection: Connection,
 	output: { total: number; iterations: number },
 ) => {
-	connection.setPaintStyle(CONNECTOR_PAINT_STYLE_SUCCESS);
-	if (connection.canvas) {
-		connection.canvas.classList.add('success');
-	}
-
+	connection.addClass('success');
 	if (getOverlay(connection, OVERLAY_RUN_ITEMS_ID)) {
 		connection.removeOverlay(OVERLAY_RUN_ITEMS_ID);
 	}
 
-	connection.addOverlay([
-		'Label',
-		{
+	const overlay = connection.addOverlay({
+		type: 'Custom',
+		options: {
 			id: OVERLAY_RUN_ITEMS_ID,
-			label: `<span>${getRunItemsLabel(output)}</span>`,
-			cssClass: 'connection-run-items-label',
+			create() {
+				const container = document.createElement('div');
+				const span = document.createElement('span');
+
+				container.classList.add('connection-run-items-label');
+				span.classList.add('floating');
+				span.innerHTML = getRunItemsLabel(output);
+				container.appendChild(span);
+				return container;
+			},
 			location: 0.5,
 		},
-	]);
+	});
 
+	overlay.setVisible(true);
 	showOrHideItemsLabel(connection);
 	showOrHideMidpointArrow(connection);
+
+	(connection.endpoints || []).forEach((endpoint) => {
+		connection.instance.repaint(endpoint.element);
+	});
 };
 
 const getContentDimensions = (): { editorWidth: number; editorHeight: number } => {
@@ -677,9 +700,10 @@ export const getZoomToFit = (
 };
 
 export const showDropConnectionState = (connection: Connection, targetEndpoint?: Endpoint) => {
-	if (connection && connection.connector) {
+	if (connection?.connector) {
+		const connector = connection.connector as N8nConnector;
 		if (targetEndpoint) {
-			connection.connector.setTargetEndpoint(targetEndpoint);
+			connector.setTargetEndpoint(targetEndpoint);
 		}
 		connection.setPaintStyle(CONNECTOR_PAINT_STYLE_PRIMARY);
 		hideOverlay(connection, OVERLAY_DROP_NODE_ID);
@@ -687,31 +711,33 @@ export const showDropConnectionState = (connection: Connection, targetEndpoint?:
 };
 
 export const showPullConnectionState = (connection: Connection) => {
-	if (connection && connection.connector) {
-		connection.connector.resetTargetEndpoint();
+	if (connection?.connector) {
+		const connector = connection.connector as N8nConnector;
+		connector.resetTargetEndpoint();
 		connection.setPaintStyle(CONNECTOR_PAINT_STYLE_PULL);
 		showOverlay(connection, OVERLAY_DROP_NODE_ID);
 	}
 };
 
 export const resetConnectionAfterPull = (connection: Connection) => {
-	if (connection && connection.connector) {
-		connection.connector.resetTargetEndpoint();
+	if (connection?.connector) {
+		const connector = connection.connector as N8nConnector;
+		connector.resetTargetEndpoint();
 		connection.setPaintStyle(CONNECTOR_PAINT_STYLE_DEFAULT);
 	}
 };
 
-export const resetInputLabelPosition = (targetEndpoint: Endpoint) => {
+export const resetInputLabelPosition = (targetEndpoint: Connection | Endpoint) => {
 	const inputNameOverlay = getOverlay(targetEndpoint, OVERLAY_INPUT_NAME_LABEL);
 	if (inputNameOverlay) {
-		inputNameOverlay.setLocation(OVERLAY_INPUT_NAME_LABEL_POSITION);
+		targetEndpoint.instance.removeOverlayClass(inputNameOverlay, OVERLAY_INPUT_NAME_MOVED_CLASS);
 	}
 };
 
 export const moveBackInputLabelPosition = (targetEndpoint: Endpoint) => {
 	const inputNameOverlay = getOverlay(targetEndpoint, OVERLAY_INPUT_NAME_LABEL);
 	if (inputNameOverlay) {
-		inputNameOverlay.setLocation(OVERLAY_INPUT_NAME_LABEL_POSITION_MOVED);
+		targetEndpoint.instance.addOverlayClass(inputNameOverlay, OVERLAY_INPUT_NAME_MOVED_CLASS);
 	}
 };
 
@@ -720,36 +746,42 @@ export const addConnectionActionsOverlay = (
 	onDelete: Function,
 	onAdd: Function,
 ) => {
-	if (getOverlay(connection, OVERLAY_CONNECTION_ACTIONS_ID)) {
-		return; // avoid free floating actions when moving connection from one node to another
-	}
-	connection.addOverlay([
-		'Label',
-		{
+	const overlay = connection.addOverlay({
+		type: 'Custom',
+		options: {
 			id: OVERLAY_CONNECTION_ACTIONS_ID,
-			label: `<div class="add">${getIcon('plus')}</div> <div class="delete">${getIcon(
-				'trash',
-			)}</div>`,
-			cssClass: OVERLAY_CONNECTION_ACTIONS_ID,
-			visible: false,
-			events: {
-				mousedown: (overlay: Overlay, event: MouseEvent) => {
-					const element = event.target as HTMLElement;
-					if (
-						element.classList.contains('delete') ||
-						(element.parentElement && element.parentElement.classList.contains('delete'))
-					) {
-						onDelete();
-					} else if (
-						element.classList.contains('add') ||
-						(element.parentElement && element.parentElement.classList.contains('add'))
-					) {
-						onAdd();
-					}
-				},
+			create: (component: Connection) => {
+				const div = document.createElement('div');
+				const addButton = document.createElement('button');
+				const deleteButton = document.createElement('button');
+
+				div.classList.add(OVERLAY_CONNECTION_ACTIONS_ID);
+				addButton.classList.add('add');
+				deleteButton.classList.add('delete');
+
+				addButton.innerHTML = getIcon('plus');
+				deleteButton.innerHTML = getIcon('trash');
+
+				addButton.addEventListener('click', () => onAdd());
+				deleteButton.addEventListener('click', () => onDelete());
+
+				// We have to manually trigger connection mouse events because the overlay
+				// is not part of the connection element
+				div.addEventListener('mouseout', () =>
+					connection.instance.fire(EVENT_CONNECTION_MOUSEOUT, component),
+				);
+				div.addEventListener('mouseover', () =>
+					connection.instance.fire(EVENT_CONNECTION_MOUSEOVER, component),
+				);
+
+				div.appendChild(addButton);
+				div.appendChild(deleteButton);
+				return div;
 			},
 		},
-	]);
+	});
+
+	overlay.setVisible(false);
 };
 
 export const getOutputEndpointUUID = (nodeId: string, outputIndex: number) => {
diff --git a/packages/editor-ui/src/views/CanvasAddButton.vue b/packages/editor-ui/src/views/CanvasAddButton.vue
index 7d9015e0d50a9a..4db9df4c5ea634 100644
--- a/packages/editor-ui/src/views/CanvasAddButton.vue
+++ b/packages/editor-ui/src/views/CanvasAddButton.vue
@@ -1,6 +1,6 @@
 <template>
 	<div
-		:class="$style.container"
+		:class="$style.canvasAddButton"
 		:style="containerCssVars"
 		ref="container"
 		data-test-id="canvas-add-button"
@@ -44,7 +44,7 @@ const containerCssVars = computed(() => ({
 </script>
 
 <style lang="scss" module>
-.container {
+.canvasAddButton {
 	display: flex;
 	flex-direction: column;
 	align-items: center;
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 7f83dfee51b9cb..95b36221e4393a 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1,7 +1,7 @@
 <template>
 	<div :class="$style['content']">
 		<div
-			class="node-view-root"
+			class="node-view-root do-not-select"
 			id="node-view-root"
 			data-test-id="node-view-root"
 			@dragover="onDragOver"
@@ -37,10 +37,11 @@
 						v-show="showCanvasAddButton"
 						:showTooltip="!containsTrigger && showTriggerMissingTooltip"
 						:position="canvasStore.canvasAddButtonPosition"
+						ref="canvasAddButton"
 						@hook:mounted="canvasStore.setRecenteredCanvasAddButtonPosition"
 						data-test-id="canvas-add-button"
 					/>
-					<div v-for="nodeData in nodes" :key="nodeData.id">
+					<template v-for="nodeData in nodes">
 						<node
 							v-if="nodeData.type !== STICKY_NODE_TYPE"
 							@duplicateNode="duplicateNode"
@@ -51,6 +52,7 @@
 							@runWorkflow="onRunNode"
 							@moved="onNodeMoved"
 							@run="onNodeRun"
+							:ref="`node-${nodeData.id}`"
 							:key="`${nodeData.id}_node`"
 							:name="nodeData.name"
 							:isReadOnly="isReadOnly"
@@ -74,6 +76,7 @@
 							@nodeSelected="nodeSelectedByName"
 							@removeNode="(name) => removeNode(name, true)"
 							:key="`${nodeData.id}_sticky`"
+							:ref="`node-${nodeData.id}`"
 							:name="nodeData.name"
 							:isReadOnly="isReadOnly"
 							:instance="instance"
@@ -82,7 +85,7 @@
 							:gridSize="GRID_SIZE"
 							:hideActions="pullConnActive"
 						/>
-					</div>
+					</template>
 				</div>
 			</div>
 			<node-details-view
@@ -157,15 +160,21 @@
 </template>
 
 <script lang="ts">
-import Vue from 'vue';
+import Vue, { ComponentInstance } from 'vue';
 import { mapStores } from 'pinia';
-import type {
-	OnConnectionBindInfo,
-	Connection,
+
+import {
 	Endpoint,
-	N8nPlusEndpoint,
-	jsPlumbInstance,
-} from 'jsplumb';
+	Connection,
+	EVENT_CONNECTION,
+	ConnectionEstablishedParams,
+	EVENT_CONNECTION_DETACHED,
+	EVENT_CONNECTION_MOVED,
+	INTERCEPT_BEFORE_DROP,
+	BeforeDropParams,
+	ConnectionDetachedParams,
+	ConnectionMovedParams,
+} from '@jsplumb/core';
 import type { MessageBoxInputData } from 'element-ui/types/message-box';
 
 import {
@@ -206,7 +215,6 @@ import Node from '@/components/Node.vue';
 import NodeSettings from '@/components/NodeSettings.vue';
 import Sticky from '@/components/Sticky.vue';
 import CanvasAddButton from './CanvasAddButton.vue';
-
 import mixins from 'vue-typed-mixins';
 import { v4 as uuid } from 'uuid';
 import {
@@ -275,7 +283,20 @@ import {
 	RemoveConnectionCommand,
 	RemoveNodeCommand,
 	RenameNodeCommand,
+	historyBus,
 } from '@/models/history';
+import {
+	EVENT_ENDPOINT_MOUSEOVER,
+	EVENT_ENDPOINT_MOUSEOUT,
+	EVENT_DRAG_MOVE,
+	EVENT_CONNECTION_DRAG,
+	EVENT_CONNECTION_ABORT,
+	EVENT_CONNECTION_MOUSEOUT,
+	EVENT_CONNECTION_MOUSEOVER,
+	BrowserJsPlumbInstance,
+	ready,
+} from '@jsplumb/browser-ui';
+import { N8nPlusEndpoint } from '@/plugins/endpoints/N8nPlusEndpointType';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -313,7 +334,6 @@ export default mixins(
 	},
 	setup() {
 		const { registerCustomAction, unregisterCustomAction } = useGlobalLinkActions();
-
 		return {
 			registerCustomAction,
 			unregisterCustomAction,
@@ -563,7 +583,7 @@ export default mixins(
 		nodeViewScale(): number {
 			return this.canvasStore.nodeViewScale;
 		},
-		instance(): jsPlumbInstance {
+		instance(): BrowserJsPlumbInstance {
 			return this.canvasStore.jsPlumbInstance;
 		},
 	},
@@ -587,7 +607,10 @@ export default mixins(
 			isExecutionPreview: false,
 			showTriggerMissingTooltip: false,
 			workflowData: null as INewWorkflowData | null,
+			activeConnection: null as null | Connection,
 			isProductionExecutionPreview: false,
+			enterTimer: undefined as undefined | ReturnType<typeof setTimeout>,
+			exitTimer: undefined as undefined | ReturnType<typeof setTimeout>,
 			// jsplumb automatically deletes all loose connections which is in turn recorded
 			// in undo history as a user action.
 			// This should prevent automatically removed connections from populating undo stack
@@ -1488,7 +1511,7 @@ export default mixins(
 					}
 				}
 
-				return this.importWorkflowData(workflowData!, false, 'paste');
+				return this.importWorkflowData(workflowData!, 'paste', false);
 			}
 		},
 
@@ -1516,9 +1539,8 @@ export default mixins(
 		// Imports the given workflow data into the current workflow
 		async importWorkflowData(
 			workflowData: IWorkflowToShare,
-			// eslint-disable-next-line @typescript-eslint/default-param-last
-			importTags = true,
 			source: string,
+			importTags = true,
 		): Promise<void> {
 			// eslint-disable-line @typescript-eslint/default-param-last
 			// If it is JSON check if it looks on the first look like data we can use
@@ -2032,14 +2054,14 @@ export default mixins(
 			this.historyStore.stopRecordingUndo();
 		},
 		initNodeView() {
-			this.instance.importDefaults({
-				Connector: NodeViewUtils.CONNECTOR_FLOWCHART_TYPE,
-				Endpoint: ['Dot', { radius: 5 }],
-				DragOptions: { cursor: 'pointer', zIndex: 5000 },
-				PaintStyle: NodeViewUtils.CONNECTOR_PAINT_STYLE_DEFAULT,
-				HoverPaintStyle: NodeViewUtils.CONNECTOR_PAINT_STYLE_PRIMARY,
-				ConnectionOverlays: NodeViewUtils.CONNECTOR_ARROW_OVERLAYS,
-				Container: '#node-view',
+			this.instance?.importDefaults({
+				endpoint: {
+					type: 'Dot',
+					options: { radius: 5 },
+				},
+				paintStyle: NodeViewUtils.CONNECTOR_PAINT_STYLE_DEFAULT,
+				hoverPaintStyle: NodeViewUtils.CONNECTOR_PAINT_STYLE_PRIMARY,
+				connectionOverlays: NodeViewUtils.CONNECTOR_ARROW_OVERLAYS,
 			});
 
 			const insertNodeAfterSelected = (info: {
@@ -2067,7 +2089,7 @@ export default mixins(
 				this.onToggleNodeCreator({ source: info.eventSource, createNodeActive: true });
 			};
 
-			this.instance.bind('connectionAborted', (connection) => {
+			this.instance.bind(EVENT_CONNECTION_ABORT, (connection: Connection) => {
 				try {
 					if (this.dropPrevented) {
 						this.dropPrevented = false;
@@ -2075,10 +2097,10 @@ export default mixins(
 					}
 
 					if (this.pullConnActiveNodeName) {
-						const sourceNode = this.workflowsStore.getNodeById(connection.sourceId);
+						const sourceNode = this.workflowsStore.getNodeById(connection.parameters.nodeId);
 						if (sourceNode) {
 							const sourceNodeName = sourceNode.name;
-							const outputIndex = connection.getParameters().index;
+							const outputIndex = connection.parameters.index;
 
 							this.connectTwoNodes(
 								sourceNodeName,
@@ -2093,8 +2115,8 @@ export default mixins(
 					}
 
 					insertNodeAfterSelected({
-						sourceId: connection.sourceId,
-						index: connection.getParameters().index,
+						sourceId: connection.parameters.nodeId,
+						index: connection.parameters.index,
 						eventSource: 'node_connection_drop',
 					});
 				} catch (e) {
@@ -2102,11 +2124,10 @@ export default mixins(
 				}
 			});
 
-			this.instance.bind('beforeDrop', (info) => {
+			this.instance.bind(INTERCEPT_BEFORE_DROP, (info: BeforeDropParams) => {
 				try {
-					const sourceInfo = info.connection.endpoints[0].getParameters();
-					// @ts-ignore
-					const targetInfo = info.dropEndpoint.getParameters();
+					const sourceInfo = info.connection.endpoints[0].parameters;
+					const targetInfo = info.dropEndpoint.parameters;
 
 					const sourceNodeName = this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name || '';
 					const targetNodeName = this.workflowsStore.getNodeById(targetInfo.nodeId)?.name || '';
@@ -2127,13 +2148,10 @@ export default mixins(
 				}
 			});
 
-			// only one set of visible actions should be visible at the same time
-			let activeConnection: null | Connection = null;
-
-			this.instance.bind('connection', (info: OnConnectionBindInfo) => {
+			this.instance.bind(EVENT_CONNECTION, (info: ConnectionEstablishedParams) => {
 				try {
-					const sourceInfo = info.sourceEndpoint.getParameters();
-					const targetInfo = info.targetEndpoint.getParameters();
+					const sourceInfo = info.sourceEndpoint.parameters;
+					const targetInfo = info.targetEndpoint.parameters;
 
 					const sourceNodeName = this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name;
 					const targetNodeName = this.workflowsStore.getNodeById(targetInfo.nodeId)?.name;
@@ -2148,86 +2166,6 @@ export default mixins(
 					}
 
 					NodeViewUtils.resetConnection(info.connection);
-
-					if (!this.isReadOnly) {
-						let exitTimer: NodeJS.Timeout | undefined;
-						let enterTimer: NodeJS.Timeout | undefined;
-						info.connection.bind('mouseover', (connection: Connection) => {
-							try {
-								if (exitTimer !== undefined) {
-									clearTimeout(exitTimer);
-									exitTimer = undefined;
-								}
-
-								if (enterTimer) {
-									return;
-								}
-
-								if (!info.connection || info.connection === activeConnection) {
-									return;
-								}
-
-								NodeViewUtils.hideConnectionActions(activeConnection);
-
-								enterTimer = setTimeout(() => {
-									enterTimer = undefined;
-									if (info.connection) {
-										activeConnection = info.connection;
-										NodeViewUtils.showConnectionActions(info.connection);
-									}
-								}, 150);
-							} catch (e) {
-								console.error(e); // eslint-disable-line no-console
-							}
-						});
-
-						info.connection.bind('mouseout', (connection: Connection) => {
-							try {
-								if (exitTimer) {
-									return;
-								}
-
-								if (enterTimer) {
-									clearTimeout(enterTimer);
-									enterTimer = undefined;
-								}
-
-								if (!info.connection || activeConnection !== info.connection) {
-									return;
-								}
-
-								exitTimer = setTimeout(() => {
-									exitTimer = undefined;
-
-									if (info.connection && activeConnection === info.connection) {
-										NodeViewUtils.hideConnectionActions(activeConnection);
-										activeConnection = null;
-									}
-								}, 500);
-							} catch (e) {
-								console.error(e); // eslint-disable-line no-console
-							}
-						});
-
-						NodeViewUtils.addConnectionActionsOverlay(
-							info.connection,
-							() => {
-								activeConnection = null;
-								this.__deleteJSPlumbConnection(info.connection);
-							},
-							() => {
-								setTimeout(() => {
-									insertNodeAfterSelected({
-										sourceId: info.sourceId,
-										index: sourceInfo.index,
-										connection: info.connection,
-										eventSource: 'node_connection_action',
-									});
-								}, 150);
-							},
-						);
-					}
-
 					NodeViewUtils.moveBackInputLabelPosition(info.targetEndpoint);
 
 					const connectionData: [IConnection, IConnection] = [
@@ -2247,26 +2185,105 @@ export default mixins(
 						connection: connectionData,
 						setStateDirty: true,
 					});
+					this.dropPrevented = true;
 					if (!this.suspendRecordingDetachedConnections) {
-						this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData, this));
+						this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
+					}
+					if (!this.isReadOnly) {
+						NodeViewUtils.addConnectionActionsOverlay(
+							info.connection,
+							() => {
+								this.activeConnection = null;
+								this.__deleteJSPlumbConnection(info.connection);
+							},
+							() => {
+								insertNodeAfterSelected({
+									sourceId: info.sourceEndpoint.parameters.nodeId,
+									index: sourceInfo.index,
+									connection: info.connection,
+									eventSource: 'node_connection_action',
+								});
+							},
+						);
 					}
 				} catch (e) {
 					console.error(e); // eslint-disable-line no-console
 				}
 			});
 
-			this.instance.bind('connectionMoved', (info) => {
+			this.instance.bind(EVENT_DRAG_MOVE, () => {
+				this.instance?.connections.forEach((connection) => {
+					NodeViewUtils.showOrHideItemsLabel(connection);
+					NodeViewUtils.showOrHideMidpointArrow(connection);
+
+					Object.values(connection.overlays).forEach((overlay) => {
+						if (!overlay.canvas) return;
+						this.instance?.repaint(overlay.canvas);
+					});
+				});
+			});
+			this.instance.bind(EVENT_CONNECTION_MOUSEOVER, (connection: Connection) => {
+				try {
+					if (this.exitTimer !== undefined) {
+						clearTimeout(this.exitTimer);
+						this.exitTimer = undefined;
+					}
+
+					if (
+						this.isReadOnly ||
+						this.enterTimer ||
+						!connection ||
+						connection === this.activeConnection
+					)
+						return;
+
+					if (this.activeConnection) NodeViewUtils.hideConnectionActions(this.activeConnection);
+
+					this.enterTimer = setTimeout(() => {
+						this.enterTimer = undefined;
+						if (connection) {
+							NodeViewUtils.showConnectionActions(connection);
+							this.activeConnection = connection;
+						}
+					}, 150);
+				} catch (e) {
+					console.error(e); // eslint-disable-line no-console
+				}
+			});
+			this.instance.bind(EVENT_CONNECTION_MOUSEOUT, (connection: Connection) => {
+				try {
+					if (this.exitTimer) return;
+
+					if (this.enterTimer) {
+						clearTimeout(this.enterTimer);
+						this.enterTimer = undefined;
+					}
+
+					if (this.isReadOnly || !connection || this.activeConnection?.id !== connection.id) return;
+
+					this.exitTimer = setTimeout(() => {
+						this.exitTimer = undefined;
+
+						if (connection && this.activeConnection === connection) {
+							NodeViewUtils.hideConnectionActions(this.activeConnection);
+							this.activeConnection = null;
+						}
+					}, 500);
+				} catch (e) {
+					console.error(e); // eslint-disable-line no-console
+				}
+			});
+
+			this.instance.bind(EVENT_CONNECTION_MOVED, (info: ConnectionMovedParams) => {
 				try {
 					// When a connection gets moved from one node to another it for some reason
 					// calls the "connection" event but not the "connectionDetached" one. So we listen
 					// additionally to the "connectionMoved" event and then only delete the existing connection.
 
-					NodeViewUtils.resetInputLabelPosition(info.originalTargetEndpoint);
+					NodeViewUtils.resetInputLabelPosition(info.connection);
 
-					// @ts-ignore
-					const sourceInfo = info.originalSourceEndpoint.getParameters();
-					// @ts-ignore
-					const targetInfo = info.originalTargetEndpoint.getParameters();
+					const sourceInfo = info.connection.parameters;
+					const targetInfo = info.originalEndpoint.parameters;
 
 					const connectionInfo = [
 						{
@@ -2286,8 +2303,18 @@ export default mixins(
 					console.error(e); // eslint-disable-line no-console
 				}
 			});
-
-			this.instance.bind('connectionDetached', async (info) => {
+			this.instance.bind(EVENT_ENDPOINT_MOUSEOVER, (endpoint: Endpoint, mouse) => {
+				// This event seems bugged. It gets called constantly even when the mouse is not over the endpoint
+				// if the endpoint has a connection attached to it. So we need to check if the mouse is actually over
+				// the endpoint.
+				if (!endpoint.isTarget || mouse.target !== endpoint.endpoint.canvas) return;
+				this.instance.setHover(endpoint, true);
+			});
+			this.instance.bind(EVENT_ENDPOINT_MOUSEOUT, (endpoint: Endpoint) => {
+				if (!endpoint.isTarget) return;
+				this.instance.setHover(endpoint, false);
+			});
+			this.instance.bind(EVENT_CONNECTION_DETACHED, async (info: ConnectionDetachedParams) => {
 				try {
 					const connectionInfo: [IConnection, IConnection] | null = getConnectionInfo(info);
 					NodeViewUtils.resetInputLabelPosition(info.targetEndpoint);
@@ -2297,14 +2324,12 @@ export default mixins(
 					if (this.pullConnActiveNodeName) {
 						// establish new connection when dragging connection from one node to another
 						this.historyStore.startRecordingUndo();
-						const sourceNode = this.workflowsStore.getNodeById(info.connection.sourceId);
+						const sourceNode = this.workflowsStore.getNodeById(info.connection.parameters.nodeId);
 						const sourceNodeName = sourceNode.name;
-						const outputIndex = info.connection.getParameters().index;
+						const outputIndex = info.connection.parameters.index;
 
 						if (connectionInfo) {
-							this.historyStore.pushCommandToUndo(
-								new RemoveConnectionCommand(connectionInfo, this),
-							);
+							this.historyStore.pushCommandToUndo(new RemoveConnectionCommand(connectionInfo));
 						}
 						this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0, true);
 						this.pullConnActiveNodeName = null;
@@ -2324,26 +2349,27 @@ export default mixins(
 					console.error(e); // eslint-disable-line no-console
 				}
 			});
-
-			// @ts-ignore
-			this.instance.bind('connectionDrag', (connection: Connection) => {
+			this.instance.bind(EVENT_CONNECTION_DRAG, (connection: Connection) => {
+				// The overlays are visible by default so we need to hide the midpoint arrow
+				// manually
+				connection.overlays['midpoint-arrow']?.setVisible(false);
 				try {
 					this.pullConnActiveNodeName = null;
 					this.pullConnActive = true;
 					this.newNodeInsertPosition = null;
 					NodeViewUtils.resetConnection(connection);
 
-					const nodes = [...document.querySelectorAll('.node-default')];
+					const nodes = [...document.querySelectorAll('.node-wrapper')];
 
 					const onMouseMove = (e: MouseEvent | TouchEvent) => {
 						if (!connection) {
 							return;
 						}
 
-						const element = document.querySelector('.jtk-endpoint.dropHover');
+						const element = document.querySelector('.jtk-endpoint.jtk-drag-hover');
 						if (element) {
-							// @ts-ignore
-							NodeViewUtils.showDropConnectionState(connection, element._jsPlumb);
+							const endpoint = element.jtk.endpoint;
+							NodeViewUtils.showDropConnectionState(connection, endpoint);
 							return;
 						}
 
@@ -2360,7 +2386,7 @@ export default mixins(
 										this.pullConnActiveNodeName = node.name;
 										const endpointUUID = this.getInputEndpointUUID(nodeName, 0);
 										if (endpointUUID) {
-											const endpoint = this.instance.getEndpoint(endpointUUID);
+											const endpoint = this.instance?.getEndpoint(endpointUUID);
 
 											NodeViewUtils.showDropConnectionState(connection, endpoint);
 
@@ -2395,8 +2421,17 @@ export default mixins(
 					console.error(e); // eslint-disable-line no-console
 				}
 			});
-
-			// @ts-ignore
+			this.instance.bind(
+				[EVENT_CONNECTION_DRAG, EVENT_CONNECTION_ABORT, EVENT_CONNECTION_DETACHED],
+				(connection: Connection) => {
+					Object.values(this.instance?.endpointsByElement)
+						.flatMap((endpoints) => Object.values(endpoints))
+						.filter((endpoint) => endpoint.endpoint.type === 'N8nPlus')
+						.forEach((endpoint) =>
+							setTimeout(() => endpoint.instance.revalidate(endpoint.element), 0),
+						);
+				},
+			);
 			this.instance.bind('plusEndpointClick', (endpoint: Endpoint) => {
 				if (endpoint && endpoint.__meta) {
 					insertNodeAfterSelected({
@@ -2555,10 +2590,8 @@ export default mixins(
 				}
 
 				const uuid: [string, string] = [outputUuid, inputUuid];
-
 				// Create connections in DOM
-				// @ts-ignore
-				this.instance.connect({
+				this.instance?.connect({
 					uuids: uuid,
 					detachable: !this.isReadOnly,
 				});
@@ -2581,15 +2614,12 @@ export default mixins(
 				if (!sourceNode || !targetNode) {
 					return;
 				}
-
-				// @ts-ignore
-				const connections = this.instance.getConnections({
+				const connections = this.instance?.getConnections({
 					source: sourceNode.id,
 					target: targetNode.id,
 				});
 
-				// @ts-ignore
-				connections.forEach((connectionInstance) => {
+				connections.forEach((connectionInstance: Connection) => {
 					if (connectionInstance.__meta) {
 						// Only delete connections from specific indexes (if it can be determined by meta)
 						if (
@@ -2611,13 +2641,8 @@ export default mixins(
 			// it visibly stays behind free floating without a connection.
 			connection.removeOverlays();
 
-			const sourceEndpoint = connection.endpoints && connection.endpoints[0];
 			this.pullConnActiveNodeName = null; // prevent new connections when connectionDetached is triggered
-			this.instance.deleteConnection(connection); // on delete, triggers connectionDetached event which applies mutation to store
-			if (sourceEndpoint) {
-				const endpoints = this.instance.getEndpoints(sourceEndpoint.elementId);
-				endpoints.forEach((endpoint: Endpoint) => endpoint.repaint()); // repaint both circle and plus endpoint
-			}
+			this.instance?.deleteConnection(connection); // on delete, triggers connectionDetached event which applies mutation to store
 			if (trackHistory && connection.__meta) {
 				const connectionData: [IConnection, IConnection] = [
 					{
@@ -2635,18 +2660,14 @@ export default mixins(
 				this.historyStore.pushCommandToUndo(removeCommand);
 			}
 		},
-		__removeConnectionByConnectionInfo(
-			info: OnConnectionBindInfo,
-			removeVisualConnection = false,
-			trackHistory = false,
-		) {
+		__removeConnectionByConnectionInfo(info, removeVisualConnection = false, trackHistory = false) {
 			const connectionInfo: [IConnection, IConnection] | null = getConnectionInfo(info);
 
 			if (connectionInfo) {
 				if (removeVisualConnection) {
 					this.__deleteJSPlumbConnection(info.connection, trackHistory);
 				} else if (trackHistory) {
-					this.historyStore.pushCommandToUndo(new RemoveConnectionCommand(connectionInfo, this));
+					this.historyStore.pushCommandToUndo(new RemoveConnectionCommand(connectionInfo));
 				}
 				this.workflowsStore.removeConnection({ connection: connectionInfo });
 			}
@@ -2751,7 +2772,7 @@ export default mixins(
 			const targetEndpoint = NodeViewUtils.getInputEndpointUUID(targetId, targetInputIndex);
 
 			// @ts-ignore
-			const connections = this.instance.getConnections({
+			const connections = this.instance?.getConnections({
 				source: sourceId,
 				target: targetId,
 			}) as Connection[];
@@ -2763,14 +2784,19 @@ export default mixins(
 		},
 		getJSPlumbEndpoints(nodeName: string): Endpoint[] {
 			const node = this.workflowsStore.getNodeByName(nodeName);
-			return this.instance.getEndpoints(node !== null ? node.id : '');
+			const nodeEls: Element = (this.$refs[`node-${node?.id}`] as ComponentInstance[])[0]
+				.$el as Element;
+
+			const endpoints = this.instance?.getEndpoints(nodeEls);
+
+			return endpoints as Endpoint[];
 		},
 		getPlusEndpoint(nodeName: string, outputIndex: number): Endpoint | undefined {
 			const endpoints = this.getJSPlumbEndpoints(nodeName);
-			// @ts-ignore
 			return endpoints.find(
 				(endpoint: Endpoint) =>
-					endpoint.type === 'N8nPlus' && endpoint.__meta && endpoint.__meta.index === outputIndex,
+					// @ts-ignore
+					endpoint.endpoint.type === 'N8nPlus' && endpoint?.__meta?.index === outputIndex,
 			);
 		},
 		getIncomingOutgoingConnections(nodeName: string): {
@@ -2781,12 +2807,12 @@ export default mixins(
 
 			if (node) {
 				// @ts-ignore
-				const outgoing = this.instance.getConnections({
+				const outgoing = this.instance?.getConnections({
 					source: node.id,
 				});
 
 				// @ts-ignore
-				const incoming = this.instance.getConnections({
+				const incoming = this.instance?.getConnections({
 					target: node.id,
 				}) as Connection[];
 
@@ -2823,8 +2849,7 @@ export default mixins(
 			const sourceId = sourceNode !== null ? sourceNode.id : '';
 
 			if (data === null || data.length === 0 || waiting) {
-				// @ts-ignore
-				const outgoing = this.instance.getConnections({
+				const outgoing = this.instance?.getConnections({
 					source: sourceId,
 				}) as Connection[];
 
@@ -2833,8 +2858,7 @@ export default mixins(
 				});
 				const endpoints = this.getJSPlumbEndpoints(sourceNodeName);
 				endpoints.forEach((endpoint: Endpoint) => {
-					// @ts-ignore
-					if (endpoint.type === 'N8nPlus') {
+					if (endpoint.endpoint.type === 'N8nPlus') {
 						(endpoint.endpoint as N8nPlusEndpoint).clearSuccessOutput();
 					}
 				});
@@ -2875,6 +2899,7 @@ export default mixins(
 							);
 							if (endpoint && endpoint.endpoint) {
 								const output = outputMap[sourceOutputIndex][NODE_OUTPUT_DEFAULT_KEY][0];
+
 								if (output && output.total > 0) {
 									(endpoint.endpoint as N8nPlusEndpoint).setSuccessOutput(
 										NodeViewUtils.getRunItemsLabel(output),
@@ -2963,7 +2988,7 @@ export default mixins(
 							);
 
 							if (waitForNewConnection) {
-								this.instance.setSuspendDrawing(false, true);
+								this.instance?.setSuspendDrawing(false, true);
 								waitForNewConnection = false;
 							}
 						}, 100); // just to make it clear to users that this is a new connection
@@ -2973,14 +2998,10 @@ export default mixins(
 
 			setTimeout(() => {
 				// Suspend drawing
-				this.instance.setSuspendDrawing(true);
-
-				// Remove all endpoints and the connections in jsplumb
-				this.instance.removeAllEndpoints(node.id);
-
-				// Remove the draggable
-				// @ts-ignore
-				this.instance.destroyDraggable(node.id);
+				this.instance?.setSuspendDrawing(true);
+				(this.instance?.endpointsByElement[node.id] || [])
+					.flat()
+					.forEach((endpoint) => this.instance?.deleteEndpoint(endpoint));
 
 				// Remove the connections in data
 				this.workflowsStore.removeAllNodeConnection(node);
@@ -2989,13 +3010,13 @@ export default mixins(
 
 				if (!waitForNewConnection) {
 					// Now it can draw again
-					this.instance.setSuspendDrawing(false, true);
+					this.instance?.setSuspendDrawing(false, true);
 				}
 
 				// Remove node from selected index if found in it
 				this.uiStore.removeNodeFromSelection(node);
 				if (trackHistory) {
-					this.historyStore.pushCommandToUndo(new RemoveNodeCommand(node, this));
+					this.historyStore.pushCommandToUndo(new RemoveNodeCommand(node));
 				}
 			}, 0); // allow other events to finish like drag stop
 			if (trackHistory && trackBulk) {
@@ -3069,7 +3090,7 @@ export default mixins(
 			workflow.renameNode(currentName, newName);
 
 			if (trackHistory) {
-				this.historyStore.pushCommandToUndo(new RenameNodeCommand(currentName, newName, this));
+				this.historyStore.pushCommandToUndo(new RenameNodeCommand(currentName, newName));
 			}
 
 			// Update also last selected node and execution data
@@ -3104,18 +3125,12 @@ export default mixins(
 		deleteEveryEndpoint() {
 			// Check as it does not exist on first load
 			if (this.instance) {
-				const nodes = this.workflowsStore.allNodes;
-				nodes.forEach((node: INodeUi) => {
-					try {
-						// important to prevent memory leak
-						// @ts-ignore
-						this.instance.destroyDraggable(node.id);
-					} catch (e) {
-						console.error(e);
-					}
-				});
+				this.instance?.reset();
+				Object.values(this.instance?.endpointsByElement)
+					.flatMap((endpoint) => endpoint)
+					.forEach((endpoint) => endpoint.destroy());
 
-				this.instance.deleteEveryEndpoint();
+				this.instance.deleteEveryConnection({ fireEvent: true });
 			}
 		},
 		matchCredentials(node: INodeUi) {
@@ -3241,7 +3256,7 @@ export default mixins(
 
 				this.workflowsStore.addNode(node);
 				if (trackHistory) {
-					this.historyStore.pushCommandToUndo(new AddNodeCommand(node, this));
+					this.historyStore.pushCommandToUndo(new AddNodeCommand(node));
 				}
 			});
 
@@ -3249,7 +3264,7 @@ export default mixins(
 			await Vue.nextTick();
 
 			// Suspend drawing
-			this.instance.setSuspendDrawing(true);
+			this.instance?.setSuspendDrawing(true);
 
 			// Load the connections
 			if (connections !== undefined) {
@@ -3285,9 +3300,8 @@ export default mixins(
 					}
 				}
 			}
-
 			// Now it can draw again
-			this.instance.setSuspendDrawing(false, true);
+			this.instance?.setSuspendDrawing(false, true);
 		},
 		async addNodesToWorkflow(data: IWorkflowDataUpdate): Promise<IWorkflowDataUpdate> {
 			// Because nodes with the same name maybe already exist, it could
@@ -3412,6 +3426,7 @@ export default mixins(
 				tempWorkflow.connectionsBySourceNode,
 				true,
 			);
+
 			this.historyStore.stopRecordingUndo();
 
 			this.uiStore.stateIsDirty = true;
@@ -3458,7 +3473,6 @@ export default mixins(
 				}
 
 				// Keep only the connection to node which get also exported
-				// @ts-ignore
 				typeConnections = {};
 				for (type of Object.keys(connections)) {
 					for (sourceIndex = 0; sourceIndex < connections[type].length; sourceIndex++) {
@@ -3508,14 +3522,12 @@ export default mixins(
 						// Ignore all errors
 					});
 			}
-
 			this.workflowsStore.removeAllConnections({ setStateDirty: false });
 			this.workflowsStore.removeAllNodes({ setStateDirty: false, removePinData: true });
 
 			// Reset workflow execution data
 			this.workflowsStore.setWorkflowExecutionData(null);
 			this.workflowsStore.resetAllNodesIssues();
-			// vm.$forceUpdate();
 
 			this.workflowsStore.setActive(false);
 			this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
@@ -3622,12 +3634,12 @@ export default mixins(
 			} catch (e) {}
 		},
 		async onImportWorkflowDataEvent(data: IDataObject) {
-			await this.importWorkflowData(data.data as IWorkflowDataUpdate, undefined, 'file');
+			await this.importWorkflowData(data.data as IWorkflowDataUpdate, 'file');
 		},
 		async onImportWorkflowUrlEvent(data: IDataObject) {
 			const workflowData = await this.getWorkflowDataFromUrl(data.url as string);
 			if (workflowData !== undefined) {
-				await this.importWorkflowData(workflowData, undefined, 'url');
+				await this.importWorkflowData(workflowData, 'url');
 			}
 		},
 		addPinDataConnections(pinData: IPinData) {
@@ -3638,7 +3650,7 @@ export default mixins(
 				}
 
 				// @ts-ignore
-				const connections = this.instance.getConnections({
+				const connections = this.instance?.getConnections({
 					source: node.id,
 				}) as Connection[];
 
@@ -3658,11 +3670,13 @@ export default mixins(
 				}
 
 				// @ts-ignore
-				const connections = this.instance.getConnections({
+				const connections = this.instance?.getConnections({
 					source: node.id,
 				}) as Connection[];
 
+				this.instance.setSuspendDrawing(true);
 				connections.forEach(NodeViewUtils.resetConnection);
+				this.instance.setSuspendDrawing(false, true);
 			});
 		},
 		onToggleNodeCreator({
@@ -3738,10 +3752,10 @@ export default mixins(
 		},
 		onMoveNode({ nodeName, position }: { nodeName: string; position: XYPosition }): void {
 			this.workflowsStore.updateNodeProperties({ name: nodeName, properties: { position } });
+			const node = this.workflowsStore.getNodeByName(nodeName);
 			setTimeout(() => {
-				const node = this.workflowsStore.getNodeByName(nodeName);
 				if (node) {
-					this.instance.repaintEverything();
+					this.instance?.repaintEverything();
 					this.onNodeMoved(node);
 				}
 			}, 0);
@@ -3780,12 +3794,12 @@ export default mixins(
 		},
 	},
 	async mounted() {
+		this.resetWorkspace();
+		this.canvasStore.initInstance(this.$refs.nodeView as HTMLElement);
 		this.$titleReset();
 		window.addEventListener('message', this.onPostMessageReceived);
 
 		this.startLoading();
-		this.resetWorkspace();
-
 		const loadPromises = [
 			this.loadActiveWorkflows(),
 			this.loadCredentials(),
@@ -3806,8 +3820,7 @@ export default mixins(
 			);
 			return;
 		}
-
-		this.instance.ready(async () => {
+		ready(async () => {
 			try {
 				try {
 					this.initNodeView();
@@ -3879,6 +3892,7 @@ export default mixins(
 		}
 		this.uiStore.addFirstStepOnLoad = false;
 
+		this.initNodeView();
 		document.addEventListener('keydown', this.keyDown);
 		document.addEventListener('keyup', this.keyUp);
 		window.addEventListener('message', this.onPostMessageReceived);
@@ -3886,13 +3900,13 @@ export default mixins(
 		this.$root.$on('newWorkflow', this.newWorkflow);
 		this.$root.$on('importWorkflowData', this.onImportWorkflowDataEvent);
 		this.$root.$on('importWorkflowUrl', this.onImportWorkflowUrlEvent);
-		this.$root.$on('nodeMove', this.onMoveNode);
-		this.$root.$on('revertAddNode', this.onRevertAddNode);
-		this.$root.$on('revertRemoveNode', this.onRevertRemoveNode);
-		this.$root.$on('revertAddConnection', this.onRevertAddConnection);
-		this.$root.$on('revertRemoveConnection', this.onRevertRemoveConnection);
-		this.$root.$on('revertRenameNode', this.onRevertNameChange);
-		this.$root.$on('enableNodeToggle', this.onRevertEnableToggle);
+		historyBus.$on('nodeMove', this.onMoveNode);
+		historyBus.$on('revertAddNode', this.onRevertAddNode);
+		historyBus.$on('revertRemoveNode', this.onRevertRemoveNode);
+		historyBus.$on('revertAddConnection', this.onRevertAddConnection);
+		historyBus.$on('revertRemoveConnection', this.onRevertRemoveConnection);
+		historyBus.$on('revertRenameNode', this.onRevertNameChange);
+		historyBus.$on('enableNodeToggle', this.onRevertEnableToggle);
 
 		dataPinningEventBus.$on('pin-data', this.addPinDataConnections);
 		dataPinningEventBus.$on('unpin-data', this.removePinDataConnections);
@@ -3908,20 +3922,23 @@ export default mixins(
 		this.$root.$off('newWorkflow', this.newWorkflow);
 		this.$root.$off('importWorkflowData', this.onImportWorkflowDataEvent);
 		this.$root.$off('importWorkflowUrl', this.onImportWorkflowUrlEvent);
-		this.$root.$off('nodeMove', this.onMoveNode);
-		this.$root.$off('revertAddNode', this.onRevertAddNode);
-		this.$root.$off('revertRemoveNode', this.onRevertRemoveNode);
-		this.$root.$off('revertAddConnection', this.onRevertAddConnection);
-		this.$root.$off('revertRemoveConnection', this.onRevertRemoveConnection);
-		this.$root.$off('revertRenameNode', this.onRevertNameChange);
-		this.$root.$off('enableNodeToggle', this.onRevertEnableToggle);
+		historyBus.$off('nodeMove', this.onMoveNode);
+		historyBus.$off('revertAddNode', this.onRevertAddNode);
+		historyBus.$off('revertRemoveNode', this.onRevertRemoveNode);
+		historyBus.$off('revertAddConnection', this.onRevertAddConnection);
+		historyBus.$off('revertRemoveConnection', this.onRevertRemoveConnection);
+		historyBus.$off('revertRenameNode', this.onRevertNameChange);
+		historyBus.$off('enableNodeToggle', this.onRevertEnableToggle);
 
 		dataPinningEventBus.$off('pin-data', this.addPinDataConnections);
 		dataPinningEventBus.$off('unpin-data', this.removePinDataConnections);
 		nodeViewEventBus.$off('saveWorkflow', this.saveCurrentWorkflowExternal);
+		this.instance.unbind();
 	},
 	destroyed() {
 		this.resetWorkspace();
+		this.instance.unbind();
+		this.instance.destroy();
 		this.uiStore.stateIsDirty = false;
 		window.removeEventListener('message', this.onPostMessageReceived);
 		this.$root.$off('newWorkflow', this.newWorkflow);
@@ -4016,40 +4033,6 @@ export default mixins(
 </style>
 
 <style lang="scss">
-.connection-run-items-label {
-	span {
-		border-radius: 7px;
-		background-color: hsla(
-			var(--color-canvas-background-h),
-			var(--color-canvas-background-s),
-			var(--color-canvas-background-l),
-			0.85
-		);
-		line-height: 1.3em;
-		padding: 0px 3px;
-		white-space: nowrap;
-		font-size: var(--font-size-s);
-		font-weight: var(--font-weight-regular);
-		color: var(--color-success);
-	}
-
-	.floating {
-		position: absolute;
-		top: -22px;
-		transform: translateX(-50%);
-	}
-}
-
-.connection-input-name-label {
-	position: relative;
-
-	span {
-		position: absolute;
-		top: -10px;
-		left: -60px;
-	}
-}
-
 .drop-add-node-label {
 	color: var(--color-text-dark);
 	font-weight: 600;
@@ -4058,30 +4041,12 @@ export default mixins(
 	background-color: #ffffff55;
 }
 
-.node-input-endpoint-label,
-.node-output-endpoint-label {
-	background-color: hsla(
-		var(--color-canvas-background-h),
-		var(--color-canvas-background-s),
-		var(--color-canvas-background-l),
-		0.85
-	);
-	border-radius: 7px;
-	font-size: 0.7em;
-	padding: 2px;
-	white-space: nowrap;
-}
-
-.node-input-endpoint-label {
-	text-align: right;
-}
-
 .connection-actions {
 	&:hover {
 		display: block !important;
 	}
 
-	> div {
+	> button {
 		color: var(--color-foreground-xdark);
 		border: 2px solid var(--color-foreground-xdark);
 		background-color: var(--color-background-xlight);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 81c68eca183bfc..fbc5b0fcd93970 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -28,6 +28,7 @@ importers:
       '@types/node': ^16.11.22
       cross-env: ^7.0.3
       cypress: ^10.0.3
+      cypress-real-events: ^1.7.6
       jest: ^29.3.1
       jest-environment-jsdom: ^29.3.1
       jest-mock: ^29.3.1
@@ -52,6 +53,7 @@ importers:
       '@types/node': 16.11.65
       cross-env: 7.0.3
       cypress: 10.11.0
+      cypress-real-events: 1.7.6_cypress@10.11.0
       jest: 29.3.1_@types+node@16.11.65
       jest-environment-jsdom: 29.3.1
       jest-mock: 29.3.1
@@ -532,6 +534,11 @@ importers:
       '@fortawesome/free-regular-svg-icons': ^6.1.1
       '@fortawesome/free-solid-svg-icons': ^5.15.3
       '@fortawesome/vue-fontawesome': ^2.0.2
+      '@jsplumb/browser-ui': ^5.13.2
+      '@jsplumb/common': ^5.13.2
+      '@jsplumb/connector-bezier': ^5.13.2
+      '@jsplumb/core': ^5.13.2
+      '@jsplumb/util': ^5.13.2
       '@pinia/testing': ^0.0.14
       '@testing-library/jest-dom': ^5.16.5
       '@testing-library/vue': ^5.8.3
@@ -561,7 +568,6 @@ importers:
       jquery: ^3.4.1
       jshint: ^2.9.7
       jsonpath: ^1.1.1
-      jsplumb: 2.15.4
       lodash-es: ^4.17.21
       lodash.camelcase: ^4.3.0
       lodash.debounce: ^4.0.8
@@ -614,6 +620,11 @@ importers:
       '@fortawesome/free-regular-svg-icons': 6.2.0
       '@fortawesome/free-solid-svg-icons': 5.15.4
       '@fortawesome/vue-fontawesome': 2.0.8_dh3wzfumpzw6zsszdpw5cxouqy
+      '@jsplumb/browser-ui': 5.13.2
+      '@jsplumb/common': 5.13.2
+      '@jsplumb/connector-bezier': 5.13.2
+      '@jsplumb/core': 5.13.2
+      '@jsplumb/util': 5.13.2
       axios: 0.21.4
       codemirror-lang-html-n8n: 1.0.0
       codemirror-lang-n8n-expression: 0.1.0_zyklskjzaprvz25ee7sq7godcq
@@ -625,7 +636,6 @@ importers:
       humanize-duration: 3.27.3
       jquery: 3.6.1
       jsonpath: 1.1.1
-      jsplumb: 2.15.4
       lodash-es: 4.17.21
       lodash.camelcase: 4.3.0
       lodash.debounce: 4.0.8
@@ -2071,7 +2081,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
+      '@babel/helper-plugin-utils': 7.19.0
     dev: true
 
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.19.3:
@@ -3711,6 +3721,34 @@ packages:
   /@jsdevtools/ono/7.1.3:
     resolution: {integrity: sha512-4JQNk+3mVzK3xh2rqd6RB4J46qUR19azEHBneZyTZM+c456qOrbbM/5xcR8huNCCcbVt7+UmizG6GuUvPvKUYg==}
 
+  /@jsplumb/browser-ui/5.13.2:
+    resolution: {integrity: sha512-BZ76kPtxESMIdhcCtWXPdICMudJyBVzDxaKY4jlne93Zq1T2ErfpNQ3E6f3JZfvoyvlNbKgh0udYkZ7Yg7BmIQ==}
+    dependencies:
+      '@jsplumb/core': 5.13.2
+    dev: false
+
+  /@jsplumb/common/5.13.2:
+    resolution: {integrity: sha512-ZX/EvvYi4HBkRVtsuSSAa/AuAz4p2wr3RrRz6l+r8yeElzX3lrrBx/fkERY2qwZPkKcOoLCr5ezZ7sslVMnl0Q==}
+    dependencies:
+      '@jsplumb/util': 5.13.2
+    dev: false
+
+  /@jsplumb/connector-bezier/5.13.2:
+    resolution: {integrity: sha512-AALmOvkiP3ouGag6TGkBcd7SbCewPNwsKu9gku9AZqIq+fFu321zJ2IpfoyCFgkoFFSQjJ9jo1sWBbD3gnEXrg==}
+    dependencies:
+      '@jsplumb/core': 5.13.2
+    dev: false
+
+  /@jsplumb/core/5.13.2:
+    resolution: {integrity: sha512-IODXQzhpq9QEzGKhPir6+ea8m4KeU3gzJsYjIu8oqSQ4jDhvEYF7TvSfeaNgy9sUAMt3OoKCqxCS4ga9J7LS5A==}
+    dependencies:
+      '@jsplumb/common': 5.13.2
+    dev: false
+
+  /@jsplumb/util/5.13.2:
+    resolution: {integrity: sha512-POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g==}
+    dev: false
+
   /@kafkajs/confluent-schema-registry/1.0.6:
     resolution: {integrity: sha512-NrZL1peOIlmlLKvheQcJAx9PHdnc4kaW+9+Yt4jXUfbbYR9EFNCZt6yApI4SwlFilaiZieReM6XslWy1LZAvoQ==}
     dependencies:
@@ -10253,6 +10291,14 @@ packages:
     resolution: {integrity: sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==}
     dev: true
 
+  /cypress-real-events/1.7.6_cypress@10.11.0:
+    resolution: {integrity: sha512-yP6GnRrbm6HK5q4DH6Nnupz37nOfZu/xn1xFYqsE2o4G73giPWQOdu6375QYpwfU1cvHNCgyD2bQ2hPH9D7NMw==}
+    peerDependencies:
+      cypress: ^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x
+    dependencies:
+      cypress: 10.11.0
+    dev: true
+
   /cypress/10.11.0:
     resolution: {integrity: sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==}
     engines: {node: '>=12.0.0'}
@@ -15088,10 +15134,6 @@ packages:
       semver: 7.3.8
     dev: false
 
-  /jsplumb/2.15.4:
-    resolution: {integrity: sha512-QssfhXe0YRxY4V2WHPmKwsE3bPHNj4Vts9oinys66ci+4m9lJvFDcEMDygqueiSFL8Jb8CnFyQC9fvL+YHJS7g==}
-    dev: false
-
   /jsprim/1.4.2:
     resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
     engines: {node: '>=0.6.0'}

From c6bc57b4cb1f7b647f167a7c18f6c6397e5d1c95 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 31 Jan 2023 10:12:38 +0300
Subject: [PATCH 029/358] feat(editor): Continue to show mapping tooltip after
 dismiss (#5289)

* feat: Continue to show mapping tooltip after dismiss

* feat(editor): Append expressions in fixed values when mapping

* Revert "feat(editor): Append expressions in fixed values when mapping"

f0d395876c560751d406d18602150063ab0c6a8b
---
 packages/editor-ui/src/components/ParameterInputFull.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index f286a7e82f7ed6..ef994e507dc638 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -329,7 +329,6 @@ export default mixins(showMessage).extend({
 			}, 200);
 		},
 		onMappingTooltipDismissed() {
-			window.localStorage.setItem(LOCAL_STORAGE_MAPPING_FLAG, 'true');
 			this.localStorageMappingFlag = true;
 		},
 	},

From a8637a0bc6ac19859ce1ff468d0404ac73bc70bb Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Tue, 31 Jan 2023 09:25:08 +0100
Subject: [PATCH 030/358] fix(Set Node): Fix behaviour when selecting
 continueOnFail & PairedItem (#5257)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛 Fix bug on continueOnFail with pairedItem

* 🐛  Fix pairedItem continueOnFail for the Set Node

* 🎨  Add the ExpressionExtensionError back

* :zap: import fix

---------

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 packages/core/src/NodeExecuteFunctions.ts | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index c21da5fc2e7374..f1fe6adb95b6ae 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -70,6 +70,7 @@ import {
 	OAuth2GrantType,
 	deepCopy,
 	fileTypeFromMimeType,
+	ExpressionError,
 } from 'n8n-workflow';
 
 import { Agent } from 'https';
@@ -1806,12 +1807,15 @@ export function getNodeParameter(
 			additionalKeys,
 			executeData,
 		);
-
 		cleanupParameterData(returnData);
 	} catch (e) {
-		if (e.context) e.context.parameter = parameterName;
-		e.cause = value;
-		throw e;
+		if (e instanceof ExpressionError && node.continueOnFail && node.name === 'Set') {
+			returnData = [{ name: undefined, value: undefined }];
+		} else {
+			if (e.context) e.context.parameter = parameterName;
+			e.cause = value;
+			throw e;
+		}
 	}
 
 	// This is outside the try/catch because it throws errors with proper messages

From 36b1e6ef1572aec4d905b29a999e4d5f4c72e826 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Tue, 31 Jan 2023 04:17:45 -0500
Subject: [PATCH 031/358] feat(Notion Node): Add image block (#5237)

---
 packages/nodes-base/nodes/Notion/Blocks.ts    | 19 +++++++++++++++++++
 .../nodes/Notion/GenericFunctions.ts          | 19 ++++++++++++++++---
 2 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/packages/nodes-base/nodes/Notion/Blocks.ts b/packages/nodes-base/nodes/Notion/Blocks.ts
index c7398011932741..1947cfa7c2398e 100644
--- a/packages/nodes-base/nodes/Notion/Blocks.ts
+++ b/packages/nodes-base/nodes/Notion/Blocks.ts
@@ -471,6 +471,21 @@ const textContent = (displayOptions: IDisplayOptions): INodeProperties[] => [
 	},
 ];
 
+const imageBlock = (type: string): INodeProperties[] => [
+	{
+		displayName: 'Image URL',
+		name: 'url',
+		type: 'string',
+		displayOptions: {
+			show: {
+				type: [type],
+			},
+		},
+		default: '',
+		description: 'Image file reference',
+	},
+];
+
 const block = (blockType: string): INodeProperties[] => {
 	const data: INodeProperties[] = [];
 	switch (blockType) {
@@ -503,6 +518,9 @@ const block = (blockType: string): INodeProperties[] => {
 		case 'child_page':
 			data.push(...title(blockType));
 			break;
+		case 'image':
+			data.push(...imageBlock(blockType));
+			break;
 		default:
 			data.push(
 				...richText({
@@ -573,6 +591,7 @@ export const blocks = (resource: string, operation: string): INodeProperties[] =
 					...block('child_page'),
 					...block('bulleted_list_item'),
 					...block('numbered_list_item'),
+					...block('image'),
 				],
 			},
 		],
diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
index b1cf56232d6761..949c540e3b7d7f 100644
--- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
@@ -154,6 +154,10 @@ export function getBlockTypes() {
 			name: 'Numbered List Item',
 			value: 'numbered_list_item',
 		},
+		{
+			name: 'Image',
+			value: 'image',
+		},
 	];
 }
 
@@ -252,6 +256,15 @@ function getTexts(
 	return results;
 }
 
+function getTextBlocks(block: IDataObject) {
+	return {
+		text:
+			block.richText === false
+				? formatText(block.textContent as string).text
+				: getTexts(((block.text as IDataObject).text as any) || []),
+	};
+}
+
 export function formatBlocks(blocks: IDataObject[]) {
 	const results = [];
 	for (const block of blocks) {
@@ -260,9 +273,9 @@ export function formatBlocks(blocks: IDataObject[]) {
 			type: block.type,
 			[block.type as string]: {
 				...(block.type === 'to_do' ? { checked: block.checked } : {}),
-				// prettier-ignore
-
-				text: (block.richText === false) ? formatText(block.textContent as string).text : getTexts((block.text as IDataObject).text as any || []),
+				...(block.type === 'image' ? { type: 'external', external: { url: block.url } } : {}),
+				// prettier-ignore,
+				...(!['to_do', 'image'].includes(block.type as string) ? getTextBlocks(block) : {}),
 			},
 		});
 	}

From 1d85e232e56ee42ee435f71f8d1dc36c6321cb8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 31 Jan 2023 10:44:45 +0100
Subject: [PATCH 032/358] refactor(core): Luxon dependency update (#5301)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⬆️ Updating Luxon version to 3.1
* ⬆️ Updating `pnpm-lock` file
---
 packages/editor-ui/package.json  |  2 +-
 packages/nodes-base/package.json |  2 +-
 packages/workflow/package.json   |  2 +-
 pnpm-lock.yaml                   | 21 ++++++++-------------
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index cfb1a01aa1bc48..2a0d066bf3f3a5 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -61,7 +61,7 @@
     "lodash.get": "^4.4.2",
     "lodash.orderby": "^4.6.0",
     "lodash.set": "^4.3.2",
-    "luxon": "^2.3.0",
+    "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
     "n8n-design-system": "~0.52.0",
     "n8n-workflow": "~0.134.0",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index fb050da457d96e..ac4bb9b45c4030 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -789,7 +789,7 @@
     "lodash.set": "^4.3.2",
     "lodash.unset": "^4.5.2",
     "lossless-json": "^1.0.4",
-    "luxon": "~2.3.0",
+    "luxon": "^3.1.0",
     "mailparser": "^3.2.0",
     "moment": "~2.29.2",
     "moment-timezone": "^0.5.28",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 06e5bac8b46bbe..3148493bfedd18 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -59,7 +59,7 @@
     "lodash.isequal": "^4.5.0",
     "lodash.merge": "^4.6.2",
     "lodash.set": "^4.3.2",
-    "luxon": "~2.3.0",
+    "luxon": "^3.1.0",
     "recast": "^0.21.5",
     "transliteration": "^2.3.5",
     "xml2js": "^0.4.23"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index fbc5b0fcd93970..939a2482d162f1 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -476,7 +476,7 @@ importers:
       webpack: ^4.46.0
       xss: ^1.0.14
     dependencies:
-      element-ui: 2.15.12_chf3rdrkdm2au7cxasektiaxfy_vue@2.7.14
+      element-ui: 2.15.12_prckukfdop5sl2her6de25cod4_vue@2.7.14
       markdown-it: 13.0.1
       markdown-it-emoji: 2.0.2
       markdown-it-link-attributes: 4.0.1
@@ -574,7 +574,7 @@ importers:
       lodash.get: ^4.4.2
       lodash.orderby: ^4.6.0
       lodash.set: ^4.3.2
-      luxon: ^2.3.0
+      luxon: ^3.1.0
       monaco-editor: ^0.33.0
       n8n-design-system: ~0.52.0
       n8n-workflow: ~0.134.0
@@ -642,7 +642,7 @@ importers:
       lodash.get: 4.4.2
       lodash.orderby: 4.6.0
       lodash.set: 4.3.2
-      luxon: 2.3.2
+      luxon: 3.1.1
       monaco-editor: 0.33.0
       n8n-design-system: link:../design-system
       n8n-workflow: link:../workflow
@@ -792,7 +792,7 @@ importers:
       lodash.set: ^4.3.2
       lodash.unset: ^4.5.2
       lossless-json: ^1.0.4
-      luxon: ~2.3.0
+      luxon: ^3.1.0
       mailparser: ^3.2.0
       moment: ~2.29.2
       moment-timezone: ^0.5.28
@@ -852,7 +852,7 @@ importers:
       lodash.set: 4.3.2
       lodash.unset: 4.5.2
       lossless-json: 1.0.5
-      luxon: 2.3.2
+      luxon: 3.1.1
       mailparser: 3.5.0
       moment: 2.29.4
       moment-timezone: 0.5.37
@@ -935,7 +935,7 @@ importers:
       lodash.isequal: ^4.5.0
       lodash.merge: ^4.6.2
       lodash.set: ^4.3.2
-      luxon: ~2.3.0
+      luxon: ^3.1.0
       recast: ^0.21.5
       transliteration: ^2.3.5
       xml2js: ^0.4.23
@@ -948,7 +948,7 @@ importers:
       lodash.isequal: 4.5.0
       lodash.merge: 4.6.2
       lodash.set: 4.3.2
-      luxon: 2.3.2
+      luxon: 3.1.1
       recast: 0.21.5
       transliteration: 2.3.5
       xml2js: 0.4.23
@@ -10961,7 +10961,7 @@ packages:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
     dev: true
 
-  /element-ui/2.15.12_chf3rdrkdm2au7cxasektiaxfy_vue@2.7.14:
+  /element-ui/2.15.12_prckukfdop5sl2her6de25cod4_vue@2.7.14:
     resolution: {integrity: sha512-Y5FMT2BPOindU2GkDEQ5ZKUVxDawKONRNMh2eL3uBx1FOtvUJ+L6IxXLVsNxq4WnaX/UnVNgWXebl7DobygZMg==}
     peerDependencies:
       vue: ^2.5.17
@@ -15762,11 +15762,6 @@ packages:
     resolution: {integrity: sha512-Pn9cox5CsMYngeDbmChANltQl+5pi6XmTrraMSzhPmMBbmgcxmqWry0U3PGapCU1yB4/LqCcom7qhHZiF/jGfQ==}
     dev: false
 
-  /luxon/2.3.2:
-    resolution: {integrity: sha512-MlAQQVMFhGk4WUA6gpfsy0QycnKP0+NlCBJRVRNPxxSIbjrCbQ65nrpJD3FVyJNZLuJ0uoqL57ye6BmDYgHaSw==}
-    engines: {node: '>=12'}
-    dev: false
-
   /luxon/3.1.1:
     resolution: {integrity: sha512-Ah6DloGmvseB/pX1cAmjbFvyU/pKuwQMQqz7d0yvuDlVYLTs2WeDHQMpC8tGjm1da+BriHROW/OEIT/KfYg6xw==}
     engines: {node: '>=12'}

From c7e9a4375f4747908f70891c03ace97a868dc0af Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Tue, 31 Jan 2023 11:09:33 +0100
Subject: [PATCH 033/358] refactor: Reduce payload size when fetching workflows
 to prevent memory issues (#5293)

---
 packages/cli/src/executions/executions.service.ts | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index fe1e857d771cc8..8a5ad8b82b40c1 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -223,8 +223,19 @@ export class ExecutionsService {
 			});
 		}
 
-		let query = Db.collections.Execution.createQueryBuilder()
-			.select()
+		// Omit `data` from the Execution since it is the largest and not necesary for the list.
+		let query = Db.collections.Execution.createQueryBuilder('execution')
+			.select([
+				'execution.id',
+				'execution.finished',
+				'execution.mode',
+				'execution.retryOf',
+				'execution.retrySuccessId',
+				'execution.waitTill',
+				'execution.startedAt',
+				'execution.stoppedAt',
+				'execution.workflowData',
+			])
 			.orderBy('id', 'DESC')
 			.take(limit)
 			.where(findWhere);

From 448c295314b4e4842ff0352e03ba1f12025f47c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 31 Jan 2023 13:23:04 +0100
Subject: [PATCH 034/358] feat(FTP Node): Stream binary data for uploads and
 downloads (#5296)

---
 packages/nodes-base/nodes/Ftp/Ftp.node.ts | 90 ++++++++++++++---------
 1 file changed, 54 insertions(+), 36 deletions(-)

diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index b17f929b088d36..35f97207d4aa94 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions } from 'n8n-core';
+import { BINARY_ENCODING } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -10,7 +11,12 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { createWriteStream } from 'fs';
 import { basename, dirname } from 'path';
+import type { Readable } from 'stream';
+import { pipeline } from 'stream';
+import { promisify } from 'util';
+import { file as tmpFile } from 'tmp-promise';
 
 import ftpClient from 'promise-ftp';
 import sftpClient from 'ssh2-sftp-client';
@@ -33,6 +39,8 @@ interface ReturnFtpItem {
 	path: string;
 }
 
+const streamPipeline = promisify(pipeline);
+
 async function callRecursiveList(
 	path: string,
 	client: sftpClient | ftpClient,
@@ -580,18 +588,22 @@ export class Ftp implements INodeType {
 
 					if (operation === 'download') {
 						const path = this.getNodeParameter('path', i) as string;
+						const binaryFile = await tmpFile({ prefix: 'n8n-sftp-' });
+						try {
+							await sftp!.get(path, createWriteStream(binaryFile.path));
 
-						responseData = await sftp!.get(path);
-
-						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+							const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+							const filePathDownload = this.getNodeParameter('path', i) as string;
 
-						const filePathDownload = this.getNodeParameter('path', i) as string;
-						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-							responseData as Buffer,
-							filePathDownload,
-						);
+							items[i].binary![dataPropertyNameDownload] = await this.helpers.copyBinaryFile(
+								binaryFile.path,
+								filePathDownload,
+							);
 
-						returnItems.push(items[i]);
+							returnItems.push(items[i]);
+						} finally {
+							await binaryFile.cleanup();
+						}
 					}
 
 					if (operation === 'upload') {
@@ -609,8 +621,8 @@ export class Ftp implements INodeType {
 							}
 
 							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[propertyNameUpload] === undefined) {
+							const itemBinaryData = item.binary[propertyNameUpload];
+							if (itemBinaryData === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
 									`No binary data property "${propertyNameUpload}" does not exists on item!`,
@@ -618,8 +630,13 @@ export class Ftp implements INodeType {
 								);
 							}
 
-							const buffer = await this.helpers.getBinaryDataBuffer(i, propertyNameUpload);
-							await sftp!.put(buffer, remotePath);
+							let uploadData: Buffer | Readable;
+							if (itemBinaryData.id) {
+								uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+							} else {
+								uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+							}
+							await sftp!.put(uploadData, remotePath);
 						} else {
 							// Is text file
 							const buffer = Buffer.from(this.getNodeParameter('fileContent', i) as string, 'utf8');
@@ -669,27 +686,23 @@ export class Ftp implements INodeType {
 
 					if (operation === 'download') {
 						const path = this.getNodeParameter('path', i) as string;
+						const binaryFile = await tmpFile({ prefix: 'n8n-sftp-' });
+						try {
+							const stream = await ftp!.get(path);
+							await streamPipeline(stream, createWriteStream(binaryFile.path));
 
-						responseData = await ftp!.get(path);
-
-						// Convert readable stream to buffer so that can be displayed properly
-						const chunks = [];
-						for await (const chunk of responseData) {
-							chunks.push(chunk);
-						}
+							const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
+							const filePathDownload = this.getNodeParameter('path', i) as string;
 
-						// @ts-ignore
-						responseData = Buffer.concat(chunks);
-
-						const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
-
-						const filePathDownload = this.getNodeParameter('path', i) as string;
-						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-							responseData,
-							filePathDownload,
-						);
+							items[i].binary![dataPropertyNameDownload] = await this.helpers.copyBinaryFile(
+								binaryFile.path,
+								filePathDownload,
+							);
 
-						returnItems.push(items[i]);
+							returnItems.push(items[i]);
+						} finally {
+							await binaryFile.cleanup();
+						}
 					}
 
 					if (operation === 'rename') {
@@ -718,8 +731,8 @@ export class Ftp implements INodeType {
 							}
 
 							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[propertyNameUpload] === undefined) {
+							const itemBinaryData = item.binary[propertyNameUpload];
+							if (itemBinaryData === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
 									`No binary data property "${propertyNameUpload}" does not exists on item!`,
@@ -727,15 +740,20 @@ export class Ftp implements INodeType {
 								);
 							}
 
-							const buffer = await this.helpers.getBinaryDataBuffer(i, propertyNameUpload);
+							let uploadData: Buffer | Readable;
+							if (itemBinaryData.id) {
+								uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+							} else {
+								uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+							}
 
 							try {
-								await ftp!.put(buffer, remotePath);
+								await ftp!.put(uploadData, remotePath);
 							} catch (error) {
 								if (error.code === 553) {
 									// Create directory
 									await ftp!.mkdir(dirPath, true);
-									await ftp!.put(buffer, remotePath);
+									await ftp!.put(uploadData, remotePath);
 								} else {
 									throw new NodeApiError(this.getNode(), error);
 								}

From 6f7421f970b12e870c7d84b0f559b06678e3d42a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 31 Jan 2023 14:03:31 +0100
Subject: [PATCH 035/358] feat(SSH Node): Stream binary data for uploads and
 downloads (#5305)

---
 packages/nodes-base/nodes/Ssh/Ssh.node.ts | 32 ++++++++++++++---------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 6c64dedb865965..5d28ba8861775e 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -1,4 +1,5 @@
 import type { IExecuteFunctions } from 'n8n-core';
+import { BINARY_ENCODING } from 'n8n-core';
 
 import type {
 	IDataObject,
@@ -8,11 +9,13 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { readFile, rm, writeFile } from 'fs/promises';
+import { rm, writeFile } from 'fs/promises';
 
-import { file } from 'tmp-promise';
+import { file as tmpFile } from 'tmp-promise';
 
+import type { Config } from 'node-ssh';
 import { NodeSSH } from 'node-ssh';
+import type { Readable } from 'stream';
 
 export class Ssh implements INodeType {
 	description: INodeTypeDescription = {
@@ -268,16 +271,16 @@ export class Ssh implements INodeType {
 			} else if (authentication === 'privateKey') {
 				const credentials = await this.getCredentials('sshPrivateKey');
 
-				const { path } = await file({ prefix: 'n8n-ssh-' });
+				const { path } = await tmpFile({ prefix: 'n8n-ssh-' });
 				temporaryFiles.push(path);
 				await writeFile(path, credentials.privateKey as string);
 
-				const options = {
+				const options: Config = {
 					host: credentials.host as string,
 					username: credentials.username as string,
 					port: credentials.port as number,
 					privateKey: path,
-				} as any;
+				};
 
 				if (credentials.passphrase) {
 					options.passphrase = credentials.passphrase as string;
@@ -306,7 +309,7 @@ export class Ssh implements INodeType {
 							const dataPropertyNameDownload = this.getNodeParameter('binaryPropertyName', i);
 							const parameterPath = this.getNodeParameter('path', i) as string;
 
-							const { path } = await file({ prefix: 'n8n-ssh-' });
+							const { path } = await tmpFile({ prefix: 'n8n-ssh-' });
 							temporaryFiles.push(path);
 
 							await ssh.getFile(path, parameterPath);
@@ -328,10 +331,8 @@ export class Ssh implements INodeType {
 
 							items[i] = newItem;
 
-							const data = await readFile(path);
-
-							items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-								data,
+							items[i].binary![dataPropertyNameDownload] = await this.helpers.copyBinaryFile(
+								path,
 								parameterPath,
 							);
 						}
@@ -360,11 +361,16 @@ export class Ssh implements INodeType {
 								);
 							}
 
-							const dataBuffer = await this.helpers.getBinaryDataBuffer(i, propertyNameUpload);
+							let uploadData: Buffer | Readable;
+							if (binaryData.id) {
+								uploadData = this.helpers.getBinaryStream(binaryData.id);
+							} else {
+								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
+							}
 
-							const { path } = await file({ prefix: 'n8n-ssh-' });
+							const { path } = await tmpFile({ prefix: 'n8n-ssh-' });
 							temporaryFiles.push(path);
-							await writeFile(path, dataBuffer);
+							await writeFile(path, uploadData);
 
 							await ssh.putFile(
 								path,

From b61453d8e69b53e72b311f68ce77ebaed4831f25 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Tue, 31 Jan 2023 14:18:23 +0100
Subject: [PATCH 036/358] fix(core): Allow listing users when logged in
 (no-changelog) (#5308)

---
 packages/cli/src/middlewares/auth.ts | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/packages/cli/src/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
index 539b05a12d2ec3..4cff1e84b20488 100644
--- a/packages/cli/src/middlewares/auth.ts
+++ b/packages/cli/src/middlewares/auth.ts
@@ -126,11 +126,7 @@ export const setupAuthMiddlewares = (
 			`/${restEndpoint}/ldap/sync`,
 			`/${restEndpoint}/ldap/test-connection`,
 		];
-		const getRestrictedUrls = [
-			`/${restEndpoint}/users`,
-			`/${restEndpoint}/ldap/sync`,
-			`/${restEndpoint}/ldap/config`,
-		];
+		const getRestrictedUrls = [`/${restEndpoint}/ldap/sync`, `/${restEndpoint}/ldap/config`];
 		const putRestrictedUrls = [`/${restEndpoint}/ldap/config`];
 		const trimmedUrl = req.url.endsWith('/') ? req.url.slice(0, -1) : req.url;
 		if (

From 88c7ef29c84e0e9cfce32b97b8921bd5af38db02 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:26:19 +0300
Subject: [PATCH 037/358] feat(editor): Append expressions in fixed values when
 mapping to string/json inputs (#5300)

feat(editor): Append expressions in fixed values when mapping
---
 packages/editor-ui/src/components/ParameterInputFull.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index ef994e507dc638..0861eef123dfd3 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -255,6 +255,8 @@ export default mixins(showMessage).extend({
 						prevValue.length > 1
 					) {
 						updatedValue = `${prevValue} ${data}`;
+					} else if (prevValue && ['string', 'json'].includes(this.parameter.type)) {
+						updatedValue = `=${prevValue} ${data}`;
 					} else {
 						updatedValue = `=${data}`;
 					}

From 07b941a043f8aac761af63fd5327f45cbff7d275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Tue, 31 Jan 2023 15:19:43 +0100
Subject: [PATCH 038/358] fix(editor): Fix `json` field completions while
 typing (#5309)

:bug: Fix `json` field completions while typing
---
 .../completions/jsonField.completions.ts               | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
index a6e636ed31f4f6..416950a80f5953 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
@@ -234,7 +234,10 @@ export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 			jsonOutput: IDataObject,
 			matcher: string, // e.g. `$input.first().json` or `x` (user-defined variable)
 		) {
-			if (preCursor.text.endsWith('.json[') || preCursor.text.endsWith(`${matcher}[`)) {
+			if (
+				/\.json\[/.test(preCursor.text) ||
+				new RegExp(`(${escape(matcher)})\\[`).test(preCursor.text)
+			) {
 				const options: Completion[] = Object.keys(jsonOutput)
 					.map((field) => `${matcher}['${field}']`)
 					.map((label) => ({
@@ -248,7 +251,10 @@ export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 				};
 			}
 
-			if (preCursor.text.endsWith('.json.') || preCursor.text.endsWith(`${matcher}.`)) {
+			if (
+				/\.json\./.test(preCursor.text) ||
+				new RegExp(`(${escape(matcher)})\.`).test(preCursor.text)
+			) {
 				const options: Completion[] = Object.keys(jsonOutput)
 					.filter(isAllowedInDotNotation)
 					.map((field) => `${matcher}.${field}`)

From 2b1f15150f5d069629ed34522be26f5503756614 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 31 Jan 2023 17:20:33 +0300
Subject: [PATCH 039/358] feat(editor): Roll out schema view (#5310)

feat(editor): roll out schema view
---
 packages/editor-ui/src/components/RunData.vue | 2 +-
 packages/editor-ui/src/stores/ndv.ts          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index a2513e3de3468e..5ff5e96cc0e8ea 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -657,7 +657,7 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 				defaults.push({ label: this.$locale.baseText('runData.binary'), value: 'binary' });
 			}
 
-			if (this.isPaneTypeInput && window.posthog?.isFeatureEnabled?.('schema-view')) {
+			if (this.isPaneTypeInput) {
 				defaults.unshift({ label: this.$locale.baseText('runData.schema'), value: 'schema' });
 			}
 
diff --git a/packages/editor-ui/src/stores/ndv.ts b/packages/editor-ui/src/stores/ndv.ts
index 2b74fe00444cca..79d0550c1986aa 100644
--- a/packages/editor-ui/src/stores/ndv.ts
+++ b/packages/editor-ui/src/stores/ndv.ts
@@ -11,7 +11,7 @@ export const useNDVStore = defineStore(STORES.NDV, {
 		mainPanelDimensions: {},
 		sessionId: '',
 		input: {
-			displayMode: window.posthog?.isFeatureEnabled?.('schema-view') ? 'schema' : 'table',
+			displayMode: 'schema',
 			nodeName: undefined,
 			run: undefined,
 			branch: undefined,

From d87ff130a44d4542d1b068ed50c37071a14496b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 31 Jan 2023 16:12:21 +0100
Subject: [PATCH 040/358] feat(Write Binary File Node): Stream binary data for
 writes (#5306)

---
 .../WriteBinaryFile/WriteBinaryFile.node.ts    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index 3f84fb82ac2373..9b07c512139bcf 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -1,8 +1,10 @@
 import type { IExecuteFunctions } from 'n8n-core';
+import { BINARY_ENCODING } from 'n8n-core';
 import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import { writeFile as fsWriteFile } from 'fs/promises';
+import type { Readable } from 'stream';
 
 export class WriteBinaryFile implements INodeType {
 	description: INodeTypeDescription = {
@@ -81,8 +83,8 @@ export class WriteBinaryFile implements INodeType {
 						{ itemIndex },
 					);
 				}
-
-				if (item.binary[dataPropertyName] === undefined) {
+				const itemBinaryData = item.binary[dataPropertyName];
+				if (itemBinaryData === undefined) {
 					throw new NodeOperationError(
 						this.getNode(),
 						`The binary property "${dataPropertyName}" does not exist. So no file can be written!`,
@@ -98,13 +100,15 @@ export class WriteBinaryFile implements INodeType {
 				};
 				Object.assign(newItem.json, item.json);
 
-				const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-					itemIndex,
-					dataPropertyName,
-				);
+				let fileContent: Buffer | Readable;
+				if (itemBinaryData.id) {
+					fileContent = this.helpers.getBinaryStream(itemBinaryData.id);
+				} else {
+					fileContent = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+				}
 
 				// Write the file to disk
-				await fsWriteFile(fileName, binaryDataBuffer, { encoding: 'binary', flag });
+				await fsWriteFile(fileName, fileContent, { encoding: 'binary', flag });
 
 				if (item.binary !== undefined) {
 					// Create a shallow copy of the binary data so that the old

From 409a9ea3573ded3156142c2662a501d7d6f5e475 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Tue, 31 Jan 2023 20:39:20 +0100
Subject: [PATCH 041/358] fix: Add paired item to the most used nodes (#5220)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* PairedItem for N8n training

* Add paired item to ftp node

* Add paired item to rocketChat

* Add pairedItem to pushOver

* Add paired item to Matrix

* Add pairedItem to theHive

* Add paired item to Snowflake

* Add paired item to PhilipsHue

* Add pairedItem to supabase

* Add paired item to Odoo

* fix odoo & add paired item to grist

* add pairedItem to Linkedin

* add pairedItem Zulip

* add pairedItem PhatomBuster

* add pairedItem to TodoistV2

* Add pairedItem HomeAssistant

* Add pairedItem to DropContact

* Add pairedItem to Aws SES

* Add pairedItem to microsoftOutlook

* Add pairedItem to AwsS3

* Add pairedItem to Aws DynamoDB

* 🐛 fix Dropcontact enrich operation paired item support

* 🐛 fix Dropcontact insert/update operation paired items

* 🐛 fix Supabase paired item support

* 🐛 fix Supabase paired item support

* 🐛 fix N8nTrainingCustomerDatastore paired item support

* 🎨 remove unused imports

* 🐛 fix MicrosoftOutlook paired item support

* 🐛 fix AwsS3 paired item support

---------

Co-authored-by: Marcus <marcus@n8n.io>
---
 .../nodes/Aws/DynamoDB/AwsDynamoDB.node.ts    |  19 +-
 .../nodes-base/nodes/Aws/S3/AwsS3.node.ts     |  83 ++++--
 .../nodes-base/nodes/Aws/SES/AwsSes.node.ts   |  23 +-
 .../nodes/Dropcontact/Dropcontact.node.ts     |  50 +++-
 .../nodes/Dropcontact/GenericFunction.ts      |  10 +-
 packages/nodes-base/nodes/Ftp/Ftp.node.ts     |  72 +++--
 packages/nodes-base/nodes/Grist/Grist.node.ts |  20 +-
 .../nodes/HomeAssistant/HomeAssistant.node.ts |  19 +-
 .../nodes/LinkedIn/LinkedIn.node.ts           |  22 +-
 .../nodes-base/nodes/Matrix/Matrix.node.ts    |  21 +-
 .../Outlook/MicrosoftOutlook.node.ts          | 250 ++++++++++++++----
 .../N8nTrainingCustomerDatastore.node.ts      |  19 +-
 .../N8nTrainingCustomerMessenger.node.ts      |  17 +-
 packages/nodes-base/nodes/Odoo/Odoo.node.ts   |  23 +-
 .../nodes/Phantombuster/Phantombuster.node.ts |  21 +-
 .../nodes/PhilipsHue/PhilipsHue.node.ts       |  15 +-
 .../nodes/Pushover/Pushover.node.ts           |  20 +-
 .../nodes/Rocketchat/Rocketchat.node.ts       |  20 +-
 .../nodes/Snowflake/Snowflake.node.ts         |  27 +-
 .../nodes/Supabase/GenericFunctions.ts        |   9 +
 .../nodes/Supabase/Supabase.node.ts           |  82 +++++-
 .../nodes-base/nodes/TheHive/TheHive.node.ts  |  20 +-
 .../nodes/Todoist/v2/TodoistV2.node.ts        |  31 ++-
 packages/nodes-base/nodes/Zulip/Zulip.node.ts |  21 +-
 24 files changed, 661 insertions(+), 253 deletions(-)

diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
index d6f882a3cb8456..87e8d6d9e6fe1c 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
@@ -91,7 +91,7 @@ export class AwsDynamoDB implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 
 		let responseData;
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 
 		for (let i = 0; i < items.length; i++) {
 			try {
@@ -391,14 +391,19 @@ export class AwsDynamoDB implements INodeType {
 							responseData = responseData.map(simplify);
 						}
 					}
-
-					Array.isArray(responseData)
-						? returnData.push(...responseData)
-						: returnData.push(responseData);
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 
@@ -406,6 +411,6 @@ export class AwsDynamoDB implements INodeType {
 			}
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index 712ba806271c9f..04838794ba51de 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -12,7 +12,6 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
-	JsonObject,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -84,7 +83,7 @@ export class AwsS3 implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const qs: IDataObject = {};
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
@@ -150,8 +149,11 @@ export class AwsS3 implements INodeType {
 							qs,
 							headers,
 						);
-
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 
 					// https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteBucket.html
@@ -167,7 +169,11 @@ export class AwsS3 implements INodeType {
 							{},
 							headers,
 						);
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListBuckets.html
@@ -194,7 +200,11 @@ export class AwsS3 implements INodeType {
 							);
 							responseData = responseData.slice(0, qs.limit);
 						}
-						returnData.push.apply(returnData, responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
@@ -263,11 +273,11 @@ export class AwsS3 implements INodeType {
 							);
 							responseData = responseData.ListBucketResult.Contents;
 						}
-						if (Array.isArray(responseData)) {
-							returnData.push.apply(returnData, responseData);
-						} else {
-							returnData.push(responseData);
-						}
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 				}
 				if (resource === 'folder') {
@@ -306,7 +316,11 @@ export class AwsS3 implements INodeType {
 							{},
 							region,
 						);
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_DeleteObjects.html
 					if (operation === 'delete') {
@@ -386,7 +400,11 @@ export class AwsS3 implements INodeType {
 
 							responseData = { deleted: responseData.DeleteResult.Deleted };
 						}
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
 					if (operation === 'getAll') {
@@ -446,7 +464,11 @@ export class AwsS3 implements INodeType {
 							if (qs.limit) {
 								responseData = responseData.splice(0, qs.limit as number);
 							}
-							returnData.push.apply(returnData, responseData);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 						}
 					}
 				}
@@ -554,7 +576,11 @@ export class AwsS3 implements INodeType {
 							{},
 							region,
 						);
-						returnData.push(responseData.CopyObjectResult);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData.CopyObjectResult),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_GetObject.html
 					if (operation === 'download') {
@@ -647,8 +673,11 @@ export class AwsS3 implements INodeType {
 							{},
 							region,
 						);
-
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html
 					if (operation === 'getAll') {
@@ -710,7 +739,11 @@ export class AwsS3 implements INodeType {
 							if (qs.limit) {
 								responseData = responseData.splice(0, qs.limit as number);
 							}
-							returnData.push.apply(returnData, responseData);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 						}
 					}
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_PutObject.html
@@ -863,12 +896,20 @@ export class AwsS3 implements INodeType {
 								region,
 							);
 						}
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: (error as JsonObject).message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
@@ -878,7 +919,7 @@ export class AwsS3 implements INodeType {
 			// For file downloads the files get attached to the existing items
 			return this.prepareOutputData(items);
 		} else {
-			return [this.helpers.returnJsonArray(returnData)];
+			return this.prepareOutputData(returnData);
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index 79b24ed03a65bf..6cbe0158f6082f 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -817,7 +817,7 @@ export class AwsSes implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
@@ -1281,23 +1281,24 @@ export class AwsSes implements INodeType {
 						responseData = responseData.UpdateTemplateResponse;
 					}
 				}
-
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else {
-					if (responseData !== undefined) {
-						returnData.push(responseData as IDataObject);
-					}
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
index a53356b93231f7..84d6ac5493ba47 100644
--- a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
+++ b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
@@ -8,7 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { dropcontactApiRequest } from './GenericFunction';
+import { dropcontactApiRequest, mapPairedItemsFrom } from './GenericFunction';
 
 export class Dropcontact implements INodeType {
 	description: INodeTypeDescription = {
@@ -246,7 +246,7 @@ export class Dropcontact implements INodeType {
 		const operation = this.getNodeParameter('operation', 0);
 
 		let responseData: any;
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 
 		if (resource === 'contact') {
 			if (operation === 'enrich') {
@@ -278,7 +278,13 @@ export class Dropcontact implements INodeType {
 
 				if (!responseData.success) {
 					if (this.continueOnFail()) {
-						returnData.push({ error: responseData.reason || 'invalid request' });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ error: responseData.reason || 'invalid request' }),
+							{
+								itemData: mapPairedItemsFrom(entryData),
+							},
+						);
+						returnData.push(...executionData);
 					} else {
 						throw new NodeApiError(this.getNode(), {
 							error: responseData.reason || 'invalid request',
@@ -300,7 +306,13 @@ export class Dropcontact implements INodeType {
 					);
 					if (!responseData.success) {
 						if (this.continueOnFail()) {
-							responseData.push({ error: responseData.reason });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: responseData.reason }),
+								{
+									itemData: mapPairedItemsFrom(entryData),
+								},
+							);
+							returnData.push(...executionData);
 						} else {
 							throw new NodeApiError(this.getNode(), {
 								error: responseData.reason,
@@ -308,10 +320,22 @@ export class Dropcontact implements INodeType {
 							});
 						}
 					} else {
-						returnData.push(...responseData.data);
+						responseData.data.forEach((d: IDataObject, index: number) => {
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(d),
+								{ itemData: { item: index } },
+							);
+							returnData.push(...executionData);
+						});
 					}
 				} else {
-					returnData.push(responseData);
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData),
+						{
+							itemData: mapPairedItemsFrom(entryData),
+						},
+					);
+					returnData.push(...executionData);
 				}
 			}
 
@@ -327,18 +351,26 @@ export class Dropcontact implements INodeType {
 					)) as { request_id: string; error: string; success: boolean };
 					if (!responseData.success) {
 						if (this.continueOnFail()) {
-							responseData.push({ error: responseData.reason || 'invalid request' });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: responseData.reason || 'invalid request' }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 						} else {
 							throw new NodeApiError(this.getNode(), {
 								error: responseData.reason || 'invalid request',
 							});
 						}
 					}
-					returnData.push(...responseData.data);
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData.data),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				}
 			}
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts b/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
index bd140a958f7317..271ebf6c7cc633 100644
--- a/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
+++ b/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, IPairedItemData } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
@@ -32,3 +32,11 @@ export async function dropcontactApiRequest(
 
 	return this.helpers.requestWithAuthentication.call(this, 'dropcontactApi', options);
 }
+
+export function mapPairedItemsFrom<T>(iterable: Iterable<T> | ArrayLike<T>): IPairedItemData[] {
+	return Array.from(iterable, (_, i) => i).map((index) => {
+		return {
+			item: index,
+		};
+	});
+}
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index 35f97207d4aa94..b6c04851bee33c 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -543,17 +543,19 @@ export class Ftp implements INodeType {
 
 						if (recursive) {
 							responseData = await callRecursiveList(path, sftp!, normalizeSFtpItem);
-							returnItems.push.apply(
-								returnItems,
+							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
+								{ itemData: { item: i } },
 							);
+							returnItems.push.apply(returnItems, executionData);
 						} else {
 							responseData = await sftp!.list(path);
 							responseData.forEach((item) => normalizeSFtpItem(item, path));
-							returnItems.push.apply(
-								returnItems,
+							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
+								{ itemData: { item: i } },
 							);
+							returnItems.push.apply(returnItems, executionData);
 						}
 					}
 
@@ -566,8 +568,11 @@ export class Ftp implements INodeType {
 						} else {
 							responseData = await sftp!.delete(path);
 						}
-
-						returnItems.push({ json: { success: true } });
+						const executionData = this.helpers.constructExecutionMetaData(
+							[{ json: { success: true } }],
+							{ itemData: { item: i } },
+						);
+						returnItems.push(...executionData);
 					}
 
 					if (operation === 'rename') {
@@ -582,8 +587,11 @@ export class Ftp implements INodeType {
 						}
 
 						responseData = await sftp!.rename(oldPath, newPath);
-
-						returnItems.push({ json: { success: true } });
+						const executionData = this.helpers.constructExecutionMetaData(
+							[{ json: { success: true } }],
+							{ itemData: { item: i } },
+						);
+						returnItems.push(...executionData);
 					}
 
 					if (operation === 'download') {
@@ -600,7 +608,11 @@ export class Ftp implements INodeType {
 								filePathDownload,
 							);
 
-							returnItems.push(items[i]);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(items[i]),
+								{ itemData: { item: i } },
+							);
+							returnItems.push(...executionData);
 						} finally {
 							await binaryFile.cleanup();
 						}
@@ -643,7 +655,11 @@ export class Ftp implements INodeType {
 							await sftp!.put(buffer, remotePath);
 						}
 
-						returnItems.push(items[i]);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(items[i]),
+							{ itemData: { item: i } },
+						);
+						returnItems.push(...executionData);
 					}
 				}
 
@@ -655,19 +671,21 @@ export class Ftp implements INodeType {
 
 						if (recursive) {
 							responseData = await callRecursiveList(path, ftp!, normalizeFtpItem);
-							returnItems.push.apply(
-								returnItems,
+							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
+								{ itemData: { item: i } },
 							);
+							returnItems.push.apply(returnItems, executionData);
 						} else {
 							responseData = await ftp!.list(path);
 							responseData.forEach((item) =>
 								normalizeFtpItem(item as ftpClient.ListingElement, path),
 							);
-							returnItems.push.apply(
-								returnItems,
+							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(responseData as unknown as IDataObject[]),
+								{ itemData: { item: i } },
 							);
+							returnItems.push.apply(returnItems, executionData);
 						}
 					}
 
@@ -680,8 +698,11 @@ export class Ftp implements INodeType {
 						} else {
 							responseData = await ftp!.delete(path);
 						}
-
-						returnItems.push({ json: { success: true } });
+						const executionData = this.helpers.constructExecutionMetaData(
+							[{ json: { success: true } }],
+							{ itemData: { item: i } },
+						);
+						returnItems.push(...executionData);
 					}
 
 					if (operation === 'download') {
@@ -699,7 +720,11 @@ export class Ftp implements INodeType {
 								filePathDownload,
 							);
 
-							returnItems.push(items[i]);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(items[i]),
+								{ itemData: { item: i } },
+							);
+							returnItems.push(...executionData);
 						} finally {
 							await binaryFile.cleanup();
 						}
@@ -711,8 +736,11 @@ export class Ftp implements INodeType {
 						const newPath = this.getNodeParameter('newPath', i) as string;
 
 						responseData = await ftp!.rename(oldPath, newPath);
-
-						returnItems.push({ json: { success: true } });
+						const executionData = this.helpers.constructExecutionMetaData(
+							[{ json: { success: true } }],
+							{ itemData: { item: i } },
+						);
+						returnItems.push(...executionData);
 					}
 
 					if (operation === 'upload') {
@@ -773,7 +801,11 @@ export class Ftp implements INodeType {
 								}
 							}
 						}
-						returnItems.push(items[i]);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(items[i]),
+							{ itemData: { item: i } },
+						);
+						returnItems.push(...executionData);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index 21d136458de9d0..c529165f1749c3 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -116,7 +116,7 @@ export class Grist implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		let responseData;
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 
 		const operation = this.getNodeParameter('operation', 0);
 
@@ -247,17 +247,23 @@ export class Grist implements INodeType {
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
+
 					continue;
 				}
 				throw error;
 			}
-
-			Array.isArray(responseData)
-				? returnData.push(...responseData)
-				: returnData.push(responseData);
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData),
+				{ itemData: { item: i } },
+			);
+			returnData.push(...executionData);
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
index 2e03f9e42bbf10..ddc69e1e53da84 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -180,7 +180,7 @@ export class HomeAssistant implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
@@ -442,22 +442,27 @@ export class HomeAssistant implements INodeType {
 					if (resource === 'cameraProxy' && operation === 'get') {
 						items[i].json = { error: error.message };
 					} else {
-						returnData.push({ error: error.message });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ error: error.message }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 					continue;
 				}
 				throw error;
 			}
-
-			Array.isArray(responseData)
-				? returnData.push(...responseData)
-				: returnData.push(responseData);
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData),
+				{ itemData: { item: i } },
+			);
+			returnData.push(...executionData);
 		}
 
 		if (resource === 'cameraProxy' && operation === 'getScreenshot') {
 			return this.prepareOutputData(items);
 		} else {
-			return [this.helpers.returnJsonArray(returnData)];
+			return this.prepareOutputData(returnData);
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index bd2e8308439e60..07ae1ba6d6d570 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -1,6 +1,5 @@
 import type { IExecuteFunctions } from 'n8n-core';
 import type {
-	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -70,7 +69,7 @@ export class LinkedIn implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
@@ -256,21 +255,24 @@ export class LinkedIn implements INodeType {
 						responseData = await linkedInApiRequest.call(this, 'POST', endpoint, body);
 					}
 				}
-
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else {
-					returnData.push(responseData as IDataObject);
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index f89ac3a1e2ca32..46edec80f11437 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -138,27 +138,30 @@ export class Matrix implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData() as IDataObject[];
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 
 		for (let i = 0; i < items.length; i++) {
 			try {
 				const responseData = await handleMatrixCall.call(this, items[i], i, resource, operation);
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else {
-					returnData.push(responseData as IDataObject);
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
-
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
index 85955898c497b7..a99cc502fb460a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
@@ -131,7 +131,7 @@ export class MicrosoftOutlook implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
 		let responseData;
@@ -145,11 +145,18 @@ export class MicrosoftOutlook implements INodeType {
 					try {
 						const messageId = this.getNodeParameter('messageId', i) as string;
 						responseData = await microsoftApiRequest.call(this, 'DELETE', `/messages/${messageId}`);
-
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -182,17 +189,29 @@ export class MicrosoftOutlook implements INodeType {
 						if (additionalFields.dataPropertyAttachmentsPrefixName) {
 							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
 							const data = await downloadAttachments.call(this, responseData, prefix);
-							returnData.push.apply(returnData, data as unknown as IDataObject[]);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(data),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 						} else {
-							returnData.push(responseData);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 						}
 
 						if (additionalFields.dataPropertyAttachmentsPrefixName) {
-							return [returnData as INodeExecutionData[]];
+							return [returnData];
 						}
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -217,10 +236,18 @@ export class MicrosoftOutlook implements INodeType {
 							body,
 							{},
 						);
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -256,10 +283,18 @@ export class MicrosoftOutlook implements INodeType {
 
 						responseData = await microsoftApiRequest.call(this, 'POST', '/messages', body, {});
 
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -289,11 +324,18 @@ export class MicrosoftOutlook implements INodeType {
 							'POST',
 							`/messages/${messageId}/send`,
 						);
-
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -354,10 +396,18 @@ export class MicrosoftOutlook implements INodeType {
 							await microsoftApiRequest.call(this, 'POST', `/messages/${responseData.id}/send`);
 						}
 
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -452,13 +502,25 @@ export class MicrosoftOutlook implements INodeType {
 						if (additionalFields.dataPropertyAttachmentsPrefixName) {
 							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
 							const data = await downloadAttachments.call(this, responseData, prefix);
-							returnData.push.apply(returnData, data as unknown as IDataObject[]);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(data),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 						} else {
-							returnData.push.apply(returnData, responseData);
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray(responseData),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 						}
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -466,7 +528,7 @@ export class MicrosoftOutlook implements INodeType {
 				}
 
 				if (additionalFields.dataPropertyAttachmentsPrefixName) {
-					return [returnData as INodeExecutionData[]];
+					return [returnData];
 				}
 			}
 
@@ -485,10 +547,18 @@ export class MicrosoftOutlook implements INodeType {
 							`/messages/${messageId}/move`,
 							body,
 						);
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -536,10 +606,18 @@ export class MicrosoftOutlook implements INodeType {
 						};
 
 						responseData = await microsoftApiRequest.call(this, 'POST', '/sendMail', body, {});
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -647,10 +725,18 @@ export class MicrosoftOutlook implements INodeType {
 								{},
 							);
 						}
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -740,10 +826,18 @@ export class MicrosoftOutlook implements INodeType {
 							undefined,
 							qs,
 						);
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -783,10 +877,18 @@ export class MicrosoftOutlook implements INodeType {
 							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
 							responseData = responseData.value;
 						}
-						returnData.push.apply(returnData, responseData as IDataObject[]);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -821,10 +923,18 @@ export class MicrosoftOutlook implements INodeType {
 						}
 
 						responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -841,10 +951,18 @@ export class MicrosoftOutlook implements INodeType {
 							'DELETE',
 							`/mailFolders/${folderId}`,
 						);
-						returnData.push({ success: true });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: true }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -872,10 +990,18 @@ export class MicrosoftOutlook implements INodeType {
 							{},
 							qs,
 						);
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -911,10 +1037,18 @@ export class MicrosoftOutlook implements INodeType {
 							responseData = await microsoftApiRequest.call(this, 'GET', '/mailFolders', {}, qs);
 							responseData = responseData.value;
 						}
-						returnData.push.apply(returnData, responseData as IDataObject[]);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -956,10 +1090,18 @@ export class MicrosoftOutlook implements INodeType {
 							);
 							responseData = responseData.value;
 						}
-						returnData.push.apply(returnData, responseData as IDataObject[]);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -983,10 +1125,18 @@ export class MicrosoftOutlook implements INodeType {
 							`/mailFolders/${folderId}`,
 							body,
 						);
-						returnData.push(responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.message });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
 						throw error;
@@ -1025,11 +1175,19 @@ export class MicrosoftOutlook implements INodeType {
 							responseData = await microsoftApiRequest.call(this, 'GET', endpoint, undefined, qs);
 							responseData = responseData.value;
 						}
-						returnData.push.apply(returnData, responseData as IDataObject[]);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 				} catch (error) {
 					if (this.continueOnFail()) {
-						returnData.push({ error: error.message });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ error: error.message }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 						continue;
 					}
 					throw error;
@@ -1043,7 +1201,7 @@ export class MicrosoftOutlook implements INodeType {
 		) {
 			return this.prepareOutputData(items);
 		} else {
-			return [this.helpers.returnJsonArray(returnData)];
+			return this.prepareOutputData(returnData);
 		}
 	}
 }
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
index aa5742831bb650..bb2cf787a70716 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
@@ -1,11 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type {
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
+import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
 
 const data = [
 	{
@@ -116,7 +111,7 @@ export class N8nTrainingCustomerDatastore implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const operation = this.getNodeParameter('operation', 0);
 		let responseData;
@@ -138,11 +133,15 @@ export class N8nTrainingCustomerDatastore implements INodeType {
 			}
 
 			if (Array.isArray(responseData)) {
-				returnData.push.apply(returnData, responseData as IDataObject[]);
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push.apply(returnData, executionData);
 			} else if (responseData !== undefined) {
-				returnData.push(responseData as IDataObject);
+				returnData.push({ json: responseData });
 			}
 		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
index 1c13a24e0fd0a5..fc53cd38b9e864 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
@@ -1,11 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type {
-	IDataObject,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
+import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
 
 export class N8nTrainingCustomerMessenger implements INodeType {
 	description: INodeTypeDescription = {
@@ -43,7 +38,7 @@ export class N8nTrainingCustomerMessenger implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		let responseData;
 
@@ -53,9 +48,13 @@ export class N8nTrainingCustomerMessenger implements INodeType {
 			const message = this.getNodeParameter('message', i) as string;
 
 			responseData = { output: `Sent message to customer ${customerId}:  ${message}` };
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData),
+				{ itemData: { item: i } },
+			);
 
-			returnData.push(responseData);
+			returnData.push(...executionData);
 		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 84dec321c1bd83..4425f32b8a5f6e 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -11,7 +11,6 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
-	JsonObject,
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
@@ -298,7 +297,7 @@ export class Odoo implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		let items = this.getInputData();
 		items = deepCopy(items);
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		let responseData;
 
 		const resource = this.getNodeParameter('resource', 0);
@@ -745,21 +744,27 @@ export class Odoo implements INodeType {
 						);
 					}
 				}
-
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData);
-				} else if (responseData !== undefined) {
-					returnData.push(responseData);
+				if (responseData !== undefined) {
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: (error as JsonObject).message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
+
 					continue;
 				}
 				throw error;
 			}
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 6bee0891854f4d..791f258f8d0811 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -102,7 +102,7 @@ export class Phantombuster implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
 		let responseData;
@@ -247,20 +247,23 @@ export class Phantombuster implements INodeType {
 						}
 					}
 				}
-
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else if (responseData !== undefined) {
-					returnData.push(responseData as IDataObject);
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index b00e2abadfcba6..75b6a3d75d9fec 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -1,7 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
 import type {
-	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -88,7 +87,7 @@ export class PhilipsHue implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
@@ -176,12 +175,12 @@ export class PhilipsHue implements INodeType {
 					);
 				}
 			}
+			const executionData = this.helpers.constructExecutionMetaData(
+				this.helpers.returnJsonArray(responseData),
+				{ itemData: { item: i } },
+			);
+			returnData.push(...executionData);
 		}
-		if (Array.isArray(responseData)) {
-			returnData.push.apply(returnData, responseData as IDataObject[]);
-		} else if (responseData !== undefined) {
-			returnData.push(responseData as IDataObject);
-		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index 980238c1e53bfa..e68d546060fb00 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -298,7 +298,7 @@ export class Pushover implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
@@ -372,21 +372,25 @@ export class Pushover implements INodeType {
 						}
 
 						responseData = await pushoverApiRequest.call(this, 'POST', '/messages.json', body);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
-		if (Array.isArray(responseData)) {
-			returnData.push.apply(returnData, responseData as IDataObject[]);
-		} else if (responseData !== undefined) {
-			returnData.push(responseData as IDataObject);
-		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index 18f41491ee77ff..842fb9250543ec 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -372,7 +372,7 @@ export class Rocketchat implements INodeType {
 		const items = this.getInputData();
 		const length = items.length;
 		let responseData;
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const resource = this.getNodeParameter('resource', 0);
 		const operation = this.getNodeParameter('operation', 0);
 		for (let i = 0; i < length; i++) {
@@ -478,20 +478,24 @@ export class Rocketchat implements INodeType {
 						);
 					}
 				}
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else if (responseData !== undefined) {
-					returnData.push(responseData as IDataObject);
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
 
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index ea53aa36e99ea2..ab0ee55f0a9d36 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -160,7 +160,7 @@ export class Snowflake implements INodeType {
 		const credentials = (await this.getCredentials(
 			'snowflake',
 		)) as unknown as snowflake.ConnectionOptions;
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		let responseData;
 
 		const connection = snowflake.createConnection(credentials);
@@ -178,7 +178,11 @@ export class Snowflake implements INodeType {
 			for (let i = 0; i < items.length; i++) {
 				const query = this.getNodeParameter('query', i) as string;
 				responseData = await execute(connection, query, []);
-				returnData.push.apply(returnData, responseData as IDataObject[]);
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			}
 		}
 
@@ -196,7 +200,13 @@ export class Snowflake implements INodeType {
 			const data = copyInputItems(items, columns);
 			const binds = data.map((element) => Object.values(element));
 			await execute(connection, query, binds as unknown as snowflake.InsertBinds);
-			returnData.push.apply(returnData, data);
+			data.forEach((d, i) => {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(d),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			});
 		}
 
 		if (operation === 'update') {
@@ -221,11 +231,16 @@ export class Snowflake implements INodeType {
 			for (let i = 0; i < binds.length; i++) {
 				await execute(connection, query, binds[i] as unknown as snowflake.InsertBinds);
 			}
-			returnData.push.apply(returnData, data);
+			data.forEach((d, i) => {
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(d),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			});
 		}
 
 		await destroy(connection);
-
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
index 35ffacc422d354..c90b775c142a5a 100644
--- a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
@@ -13,6 +13,7 @@ import type {
 	ICredentialTestFunctions,
 	IDataObject,
 	INodeProperties,
+	IPairedItemData,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -322,3 +323,11 @@ export async function validateCredentials(
 
 	return this.helpers.request(options);
 }
+
+export function mapPairedItemsFrom<T>(iterable: Iterable<T> | ArrayLike<T>): IPairedItemData[] {
+	return Array.from(iterable, (_, i) => i).map((index) => {
+		return {
+			item: index,
+		};
+	});
+}
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index 3e5a7197d1a0e2..2129ead358ebf9 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
@@ -18,6 +18,7 @@ import {
 	buildGetQuery,
 	buildOrQuery,
 	buildQuery,
+	mapPairedItemsFrom,
 	supabaseApiRequest,
 	validateCredentials,
 } from './GenericFunctions';
@@ -121,7 +122,7 @@ export class Supabase implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
 		const resource = this.getNodeParameter('resource', 0);
@@ -155,14 +156,28 @@ export class Supabase implements INodeType {
 					records.push(record);
 				}
 				const endpoint = `/${tableId}`;
-				let createdRow;
 
 				try {
-					createdRow = await supabaseApiRequest.call(this, 'POST', endpoint, records);
-					returnData.push(...createdRow);
+					const createdRows: IDataObject[] = await supabaseApiRequest.call(
+						this,
+						'POST',
+						endpoint,
+						records,
+					);
+					createdRows.forEach((row, i) => {
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(row),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
+					});
 				} catch (error) {
 					if (this.continueOnFail()) {
-						returnData.push({ error: error.description });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ error: error.description }),
+							{ itemData: mapPairedItemsFrom(records) },
+						);
+						returnData.push(...executionData);
 					} else {
 						throw error;
 					}
@@ -207,11 +222,21 @@ export class Supabase implements INodeType {
 						rows = await supabaseApiRequest.call(this, 'DELETE', endpoint, {}, qs);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.description });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.description }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+
 							continue;
 						}
+						throw error;
 					}
-					returnData.push(...rows);
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(rows),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				}
 			}
 
@@ -237,11 +262,21 @@ export class Supabase implements INodeType {
 						rows = await supabaseApiRequest.call(this, 'GET', endpoint, {}, qs);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.description });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.message }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+
 							continue;
 						}
+						throw error;
 					}
-					returnData.push(...rows);
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(rows),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				}
 			}
 
@@ -280,13 +315,23 @@ export class Supabase implements INodeType {
 
 					try {
 						rows = await supabaseApiRequest.call(this, 'GET', endpoint, {}, qs);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(rows),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.description });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.description }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
+
 							continue;
 						}
+						throw error;
 					}
-					returnData.push(...rows);
 				}
 			}
 
@@ -346,16 +391,25 @@ export class Supabase implements INodeType {
 
 					try {
 						updatedRow = await supabaseApiRequest.call(this, 'PATCH', endpoint, record, qs);
-						returnData.push(...updatedRow);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(updatedRow),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
-							returnData.push({ error: error.description });
+							const executionData = this.helpers.constructExecutionMetaData(
+								this.helpers.returnJsonArray({ error: error.description }),
+								{ itemData: { item: i } },
+							);
+							returnData.push(...executionData);
 							continue;
 						}
+						throw error;
 					}
 				}
 			}
 		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index f750f671862467..5df283dbbb2786 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -313,7 +313,7 @@ export class TheHive implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
 		let responseData;
@@ -1954,19 +1954,23 @@ export class TheHive implements INodeType {
 					}
 				}
 
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else if (responseData !== undefined) {
-					returnData.push(responseData as IDataObject);
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index fd67bbfc13ed38..a8b6e25bbf91ce 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -697,7 +697,7 @@ export class TodoistV2 implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const service = new TodoistService();
 		let responseData;
@@ -712,23 +712,40 @@ export class TodoistV2 implements INodeType {
 						i,
 					);
 				}
-				if (Array.isArray(responseData?.data)) {
-					returnData.push.apply(returnData, responseData?.data as IDataObject[]);
+
+				if (responseData !== undefined && Array.isArray(responseData?.data)) {
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData.data as IDataObject[]),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 				} else {
 					if (responseData?.hasOwnProperty('success')) {
-						returnData.push({ success: responseData.success });
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray({ success: responseData.success }),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					} else {
-						returnData.push(responseData?.data as IDataObject);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData?.data as IDataObject),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index c50c37fa7feaa7..f2840bdc40b968 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -126,7 +126,7 @@ export class Zulip implements INodeType {
 
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
-		const returnData: IDataObject[] = [];
+		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		let responseData;
 		const resource = this.getNodeParameter('resource', 0);
@@ -464,20 +464,23 @@ export class Zulip implements INodeType {
 						responseData = await zulipApiRequest.call(this, 'DELETE', `/users/${userId}`, body);
 					}
 				}
-
-				if (Array.isArray(responseData)) {
-					returnData.push.apply(returnData, responseData as IDataObject[]);
-				} else {
-					returnData.push(responseData as IDataObject);
-				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
-					returnData.push({ error: error.message });
+					const executionData = this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray({ error: error.message }),
+						{ itemData: { item: i } },
+					);
+					returnData.push(...executionData);
 					continue;
 				}
 				throw error;
 			}
 		}
-		return [this.helpers.returnJsonArray(returnData)];
+		return this.prepareOutputData(returnData);
 	}
 }

From 0de6dc92d76dde0b5dd2143da82ca4c0a3c5e157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 1 Feb 2023 11:15:00 +0100
Subject: [PATCH 042/358] fix(core): Revert back to console logging in config
 (no-changelog) (#5319)

broke in https://github.com/n8n-io/n8n/pull/5283
---
 packages/cli/src/config/index.ts | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 8ba066139c2cfe..06d3b7027929ce 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -3,7 +3,6 @@ import dotenv from 'dotenv';
 import { tmpdir } from 'os';
 import { mkdtempSync, readFileSync } from 'fs';
 import { join } from 'path';
-import { LoggerProxy as Logger } from 'n8n-workflow';
 import { schema } from './schema';
 import { inTest, inE2ETests } from '@/constants';
 
@@ -40,7 +39,7 @@ if (!inE2ETests && !inTest) {
 	const { N8N_CONFIG_FILES } = process.env;
 	if (N8N_CONFIG_FILES !== undefined) {
 		const configFiles = N8N_CONFIG_FILES.split(',');
-		Logger.debug('Loading config overwrites', configFiles);
+		console.debug('Loading config overwrites', configFiles);
 		config.loadFile(configFiles);
 	}
 
@@ -61,7 +60,7 @@ if (!inE2ETests && !inTest) {
 						}
 						throw error;
 					}
-					Logger.debug('Loading config overwrite', { fileName });
+					console.debug('Loading config overwrite', { fileName });
 					acc[key] = value;
 				}
 			}

From 2b579871b2b0d5d10c8ecdff0cf0eb4052c2bf65 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Wed, 1 Feb 2023 13:49:17 +0000
Subject: [PATCH 043/358] fix(YouTube Node): Update description for channel id
 (no-changelog) (#5321)

update description for channel id
---
 packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
index 4661b86abb75db..7475c23920d6fd 100644
--- a/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/ChannelDescription.ts
@@ -229,7 +229,7 @@ export const channelFields: INodeProperties[] = [
 				resource: ['channel'],
 			},
 		},
-		description: 'ID of the video',
+		description: 'ID of the channel',
 		default: '',
 	},
 	{

From 3bb16900867b3994585eb2a62310e617f123c257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 1 Feb 2023 14:49:49 +0100
Subject: [PATCH 044/358] feat(YouTube Node): Switch upload operation over to
 streaming and resumable uploads api (#5320)

---
 .../nodes/Google/YouTube/YouTube.node.ts      | 161 +++++++++---------
 1 file changed, 78 insertions(+), 83 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 6c8c6d81f5cb4f..78a10cc13120c2 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -1,5 +1,5 @@
 import type { IExecuteFunctions } from 'n8n-core';
-
+import { BINARY_ENCODING } from 'n8n-core';
 import type {
 	IDataObject,
 	ILoadOptionsFunctions,
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
+import type { Readable } from 'stream';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
 
@@ -24,6 +25,8 @@ import { videoCategoryFields, videoCategoryOperations } from './VideoCategoryDes
 
 import { countriesCodes } from './CountryCodes';
 
+const UPLOAD_CHUNK_SIZE = 1024 * 1024;
+
 export class YouTube implements INodeType {
 	description: INodeTypeDescription = {
 		displayName: 'YouTube',
@@ -851,8 +854,6 @@ export class YouTube implements INodeType {
 						const options = this.getNodeParameter('options', i);
 						const binaryProperty = this.getNodeParameter('binaryProperty', i);
 
-						let mimeType;
-
 						// Is binary file to upload
 						const item = items[i];
 
@@ -862,7 +863,8 @@ export class YouTube implements INodeType {
 							});
 						}
 
-						if (item.binary[binaryProperty] === undefined) {
+						const binaryData = item.binary[binaryProperty];
+						if (binaryData === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
 								`No binary data property "${binaryProperty}" does not exists on item!`,
@@ -870,99 +872,92 @@ export class YouTube implements INodeType {
 							);
 						}
 
-						if (item.binary[binaryProperty].mimeType) {
-							mimeType = item.binary[binaryProperty].mimeType;
+						let mimeType: string;
+						let contentLength: number;
+						let fileContent: Buffer | Readable;
+
+						if (binaryData.mimeType) {
+							mimeType = binaryData.mimeType;
 						}
 
-						const body = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
+						if (binaryData.id) {
+							// Stream data in 256KB chunks, and upload the via the resumable upload api
+							fileContent = this.helpers.getBinaryStream(binaryData.id, UPLOAD_CHUNK_SIZE);
+							const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
+							contentLength = metadata.fileSize;
+							mimeType = binaryData.mimeType;
+						} else {
+							fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
+							contentLength = fileContent.length;
+							mimeType = binaryData.mimeType;
+						}
 
-						const requestOptions = {
-							headers: {
-								'Content-Type': mimeType,
+						const payload = {
+							snippet: {
+								title,
+								categoryId,
+								description: options.description,
+								tags: (options.tags as string)?.split(','),
+								defaultLanguage: options.defaultLanguage,
+							},
+							status: {
+								privacyStatus: options.privacyStatus,
+								embeddable: options.embeddable,
+								publicStatsViewable: options.publicStatsViewable,
+								publishAt: options.publishAt,
+								selfDeclaredMadeForKids: options.selfDeclaredMadeForKids,
+								license: options.license,
+							},
+							recordingDetails: {
+								recordingDate: options.recordingDate,
 							},
-							json: false,
 						};
 
-						const response = await googleApiRequest.call(
+						const resumableUpload = await googleApiRequest.call(
 							this,
 							'POST',
 							'/upload/youtube/v3/videos',
-							body,
-							qs,
+							payload,
+							{
+								uploadType: 'resumable',
+								part: 'snippet,status,recordingDetails',
+								notifySubscribers: options.notifySubscribers ?? false,
+							},
 							undefined,
-							requestOptions,
-						);
-
-						const { id } = JSON.parse(response);
-
-						qs.part = 'snippet, status, recordingDetails';
-
-						const data = {
-							id,
-							snippet: {
-								title,
-								categoryId,
+							{
+								headers: {
+									'X-Upload-Content-Length': contentLength,
+									'X-Upload-Content-Type': mimeType,
+								},
+								json: true,
+								resolveWithFullResponse: true,
 							},
-							status: {},
-							recordingDetails: {},
-						};
-
-						if (options.description) {
-							//@ts-ignore
-							data.snippet.description = options.description as string;
-						}
-
-						if (options.privacyStatus) {
-							//@ts-ignore
-							data.status.privacyStatus = options.privacyStatus as string;
-						}
-
-						if (options.tags) {
-							//@ts-ignore
-							data.snippet.tags = (options.tags as string).split(',');
-						}
-
-						if (options.embeddable) {
-							//@ts-ignore
-							data.status.embeddable = options.embeddable as boolean;
-						}
-
-						if (options.publicStatsViewable) {
-							//@ts-ignore
-							data.status.publicStatsViewable = options.publicStatsViewable as boolean;
-						}
-
-						if (options.publishAt) {
-							//@ts-ignore
-							data.status.publishAt = options.publishAt as string;
-						}
-
-						if (options.recordingDate) {
-							//@ts-ignore
-							data.recordingDetails.recordingDate = options.recordingDate as string;
-						}
-
-						if (options.selfDeclaredMadeForKids) {
-							//@ts-ignore
-							data.status.selfDeclaredMadeForKids = options.selfDeclaredMadeForKids as boolean;
-						}
-
-						if (options.license) {
-							//@ts-ignore
-							data.status.license = options.license as string;
-						}
-
-						if (options.defaultLanguage) {
-							//@ts-ignore
-							data.snippet.defaultLanguage = options.defaultLanguage as string;
-						}
+						);
 
-						if (options.notifySubscribers) {
-							qs.notifySubscribers = options.notifySubscribers;
-							delete options.notifySubscribers;
+						const uploadUrl = resumableUpload.headers.location;
+
+						let uploadId;
+						let offset = 0;
+						for await (const chunk of fileContent) {
+							const nextOffset = offset + Number(chunk.length);
+							try {
+								const response = await this.helpers.httpRequest({
+									method: 'PUT',
+									url: uploadUrl,
+									headers: {
+										'Content-Length': chunk.length,
+										'Content-Range': `bytes ${offset}-${nextOffset - 1}/${contentLength}`,
+									},
+									body: chunk,
+								});
+								uploadId = response.id;
+							} catch (error) {
+								if (error.response?.status !== 308) throw error;
+							}
+							offset = nextOffset;
 						}
 
-						responseData = await googleApiRequest.call(this, 'PUT', '/youtube/v3/videos', data, qs);
+						responseData = { uploadId, ...resumableUpload.body };
 					}
 					//https://developers.google.com/youtube/v3/docs/playlists/update
 					if (operation === 'update') {

From b27a60b66568c1cce00f38eec2dd1b6425a5a9c6 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <janober@users.noreply.github.com>
Date: Wed, 1 Feb 2023 08:25:43 -0600
Subject: [PATCH 045/358] fix(core): Fix value resolution in declarative node
 design (#5217)

---
 packages/workflow/src/RoutingNode.ts       |  6 ++--
 packages/workflow/test/RoutingNode.test.ts | 35 ++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/packages/workflow/src/RoutingNode.ts b/packages/workflow/src/RoutingNode.ts
index 932ef81e7df38e..cef5391e6b5910 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/workflow/src/RoutingNode.ts
@@ -180,7 +180,7 @@ export class RoutingNode {
 						runIndex,
 						executeData,
 						{ $credentials: credentials, $version: this.node.typeVersion },
-						true,
+						false,
 					) as string | NodeParameterValue;
 
 					const tempOptions = this.getRequestOptionsFromParameters(
@@ -380,7 +380,7 @@ export class RoutingNode {
 							$value: parameterValue,
 							$version: this.node.typeVersion,
 						},
-						true,
+						false,
 					) as string;
 					// eslint-disable-next-line @typescript-eslint/no-explicit-any
 					(returnItem as Record<string, any>)[key] = propertyValue;
@@ -725,7 +725,7 @@ export class RoutingNode {
 							runIndex,
 							executeSingleFunctions.getExecuteData(),
 							{ ...additionalKeys, $value: value },
-							true,
+							false,
 						) as string;
 					}
 
diff --git a/packages/workflow/test/RoutingNode.test.ts b/packages/workflow/test/RoutingNode.test.ts
index 7eb9a1f9be40da..ab9c55df10152e 100644
--- a/packages/workflow/test/RoutingNode.test.ts
+++ b/packages/workflow/test/RoutingNode.test.ts
@@ -176,6 +176,8 @@ describe('RoutingNode', () => {
 							value2: 'v2',
 							value3: 'v3',
 							value4: 4,
+							value6: 'value1,value2',
+							value7: 'value3,value4',
 							lowerLevel: {
 								lowLevelValue1: 1,
 								lowLevelValue2: 'llv2',
@@ -334,6 +336,35 @@ describe('RoutingNode', () => {
 									},
 								},
 							},
+
+							// Test resolve of value and properties including as objects
+							{
+								displayName: 'Value 6',
+								name: 'value6',
+								type: 'string',
+								routing: {
+									send: {
+										property: '={{ `value${5+1}A` }}',
+										type: 'query',
+										value: '={{$value.toUpperCase()}}',
+									},
+								},
+								default: '',
+							},
+							{
+								displayName: 'Value 7',
+								name: 'value7',
+								type: 'string',
+								routing: {
+									send: {
+										property: '={{ `value${6+1}B` }}',
+										type: 'body',
+										value: "={{$value.split(',')}}",
+									},
+								},
+								default: '',
+							},
+
 							{
 								displayName: 'Lower Level',
 								name: 'lowerLevel',
@@ -509,10 +540,12 @@ describe('RoutingNode', () => {
 								name: 'cSName1',
 								value: 'cSValue1',
 							},
+							value6A: 'VALUE1,VALUE2',
 						},
 						body: {
 							value1: 'v1',
 							'topLevel.value2': 'v2',
+							value7B: ['value3', 'value4'],
 							lowerLevel: {
 								value3: 'v3',
 							},
@@ -543,6 +576,8 @@ describe('RoutingNode', () => {
 									value2: 'v2',
 									value3: 'v3',
 									value4: 4,
+									value6: 'value1,value2',
+									value7: 'value3,value4',
 									lowerLevel: {
 										lowLevelValue1: 1,
 										lowLevelValue2: 'llv2',

From 87ceb6f4b8ed1838b874639f176b421e0292b576 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <janober@users.noreply.github.com>
Date: Wed, 1 Feb 2023 08:26:13 -0600
Subject: [PATCH 046/358] feat(core): Simplify pagination in declarative node
 design (#5161)

* feat(core): Add pagination to declarative node design

* :zap: Actually make it work

* :zap: Remove rootProperty

* :zap: Fix typo

* :zap: Add support to overwrite url

---------

Co-authored-by: Omar Ajoue <krynble@gmail.com>
---
 packages/workflow/src/Interfaces.ts  |  12 ++-
 packages/workflow/src/RoutingNode.ts | 131 ++++++++++++++++++++++-----
 2 files changed, 117 insertions(+), 26 deletions(-)

diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index eb74598da8387c..ed7346d8a2406c 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -185,6 +185,7 @@ export interface IRequestOptionsSimplifiedAuth {
 	body?: IDataObject;
 	headers?: IDataObject;
 	qs?: IDataObject;
+	url?: string;
 	skipSslCertificateValidation?: boolean | string;
 }
 
@@ -529,6 +530,7 @@ export interface IN8nHttpFullResponse {
 
 export interface IN8nRequestOperations {
 	pagination?:
+		| IN8nRequestOperationPaginationGeneric
 		| IN8nRequestOperationPaginationOffset
 		| ((
 				this: IExecutePaginationFunctions,
@@ -539,7 +541,15 @@ export interface IN8nRequestOperations {
 export interface IN8nRequestOperationPaginationBase {
 	type: string;
 	properties: {
-		[key: string]: string | number;
+		[key: string]: unknown;
+	};
+}
+
+export interface IN8nRequestOperationPaginationGeneric extends IN8nRequestOperationPaginationBase {
+	type: 'generic';
+	properties: {
+		continue: boolean | string;
+		request: IRequestOptionsSimplifiedAuth;
 	};
 }
 
diff --git a/packages/workflow/src/RoutingNode.ts b/packages/workflow/src/RoutingNode.ts
index cef5391e6b5910..727fe5efca208b 100644
--- a/packages/workflow/src/RoutingNode.ts
+++ b/packages/workflow/src/RoutingNode.ts
@@ -422,28 +422,13 @@ export class RoutingNode {
 		return [];
 	}
 
-	async rawRoutingRequest(
+	async postProcessResponseData(
 		executeSingleFunctions: IExecuteSingleFunctions,
+		responseData: IN8nHttpFullResponse,
 		requestData: DeclarativeRestApiSettings.ResultOptions,
 		itemIndex: number,
 		runIndex: number,
-		credentialType?: string,
-		credentialsDecrypted?: ICredentialsDecrypted,
 	): Promise<INodeExecutionData[]> {
-		let responseData: IN8nHttpFullResponse;
-		requestData.options.returnFullResponse = true;
-		if (credentialType) {
-			responseData = (await executeSingleFunctions.helpers.httpRequestWithAuthentication.call(
-				executeSingleFunctions,
-				credentialType,
-				requestData.options as IHttpRequestOptions,
-				{ credentialsDecrypted },
-			)) as IN8nHttpFullResponse;
-		} else {
-			responseData = (await executeSingleFunctions.helpers.httpRequest(
-				requestData.options as IHttpRequestOptions,
-			)) as IN8nHttpFullResponse;
-		}
 		let returnData: INodeExecutionData[] = [
 			{
 				json: responseData.body as IDataObject,
@@ -482,6 +467,30 @@ export class RoutingNode {
 		return returnData;
 	}
 
+	async rawRoutingRequest(
+		executeSingleFunctions: IExecuteSingleFunctions,
+		requestData: DeclarativeRestApiSettings.ResultOptions,
+		credentialType?: string,
+		credentialsDecrypted?: ICredentialsDecrypted,
+	): Promise<IN8nHttpFullResponse> {
+		let responseData: IN8nHttpFullResponse;
+		requestData.options.returnFullResponse = true;
+		if (credentialType) {
+			responseData = (await executeSingleFunctions.helpers.httpRequestWithAuthentication.call(
+				executeSingleFunctions,
+				credentialType,
+				requestData.options as IHttpRequestOptions,
+				{ credentialsDecrypted },
+			)) as IN8nHttpFullResponse;
+		} else {
+			responseData = (await executeSingleFunctions.helpers.httpRequest(
+				requestData.options as IHttpRequestOptions,
+			)) as IN8nHttpFullResponse;
+		}
+
+		return responseData;
+	}
+
 	async makeRoutingRequest(
 		requestData: DeclarativeRestApiSettings.ResultOptions,
 		executeSingleFunctions: IExecuteSingleFunctions,
@@ -505,10 +514,16 @@ export class RoutingNode {
 				return this.rawRoutingRequest(
 					executeSingleFunctions,
 					requestOptions,
-					itemIndex,
-					runIndex,
 					credentialType,
 					credentialsDecrypted,
+				).then(async (data) =>
+					this.postProcessResponseData(
+						executeSingleFunctions,
+						data,
+						requestData,
+						itemIndex,
+						runIndex,
+					),
 				);
 			},
 		};
@@ -524,14 +539,68 @@ export class RoutingNode {
 				);
 			} else {
 				// Pagination via JSON properties
-				const { properties } = requestOperations.pagination;
 				responseData = [];
 				if (!requestData.options.qs) {
 					requestData.options.qs = {};
 				}
 
 				// Different predefined pagination types
-				if (requestOperations.pagination.type === 'offset') {
+				if (requestOperations.pagination.type === 'generic') {
+					let tempResponseData: IN8nHttpFullResponse;
+					let tempResponseItems: INodeExecutionData[];
+					let makeAdditionalRequest: boolean;
+					let paginateRequestData: IHttpRequestOptions;
+
+					const additionalKeys = {
+						$request: requestData.options,
+						$response: {} as IN8nHttpFullResponse,
+						$version: this.node.typeVersion,
+					};
+
+					do {
+						additionalKeys.$request = requestData.options;
+
+						paginateRequestData = this.getParameterValue(
+							requestOperations.pagination.properties.request as unknown as NodeParameterValueType,
+							itemIndex,
+							runIndex,
+							executeSingleFunctions.getExecuteData(),
+							additionalKeys,
+							false,
+						) as object as IHttpRequestOptions;
+
+						// Make the HTTP request
+						tempResponseData = await this.rawRoutingRequest(
+							executeSingleFunctions,
+							{ ...requestData, options: { ...requestData.options, ...paginateRequestData } },
+							credentialType,
+							credentialsDecrypted,
+						);
+
+						additionalKeys.$response = tempResponseData;
+
+						tempResponseItems = await this.postProcessResponseData(
+							executeSingleFunctions,
+							tempResponseData,
+							requestData,
+							itemIndex,
+							runIndex,
+						);
+
+						responseData.push(...tempResponseItems);
+
+						makeAdditionalRequest = this.getParameterValue(
+							requestOperations.pagination.properties.continue,
+							itemIndex,
+							runIndex,
+							executeSingleFunctions.getExecuteData(),
+							additionalKeys,
+							false,
+						) as boolean;
+					} while (makeAdditionalRequest);
+				} else if (requestOperations.pagination.type === 'offset') {
+					const { properties } = requestOperations.pagination;
+
 					const optionsType = properties.type === 'body' ? 'body' : 'qs';
 					if (properties.type === 'body' && !requestData.options.body) {
 						requestData.options.body = {};
@@ -555,10 +624,16 @@ export class RoutingNode {
 						tempResponseData = await this.rawRoutingRequest(
 							executeSingleFunctions,
 							requestData,
-							itemIndex,
-							runIndex,
 							credentialType,
 							credentialsDecrypted,
+						).then(async (data) =>
+							this.postProcessResponseData(
+								executeSingleFunctions,
+								data,
+								requestData,
+								itemIndex,
+								runIndex,
+							),
 						);
 
 						(requestData.options[optionsType] as IDataObject)[properties.offsetParameter] =
@@ -594,10 +669,16 @@ export class RoutingNode {
 			responseData = await this.rawRoutingRequest(
 				executeSingleFunctions,
 				requestData,
-				itemIndex,
-				runIndex,
 				credentialType,
 				credentialsDecrypted,
+			).then(async (data) =>
+				this.postProcessResponseData(
+					executeSingleFunctions,
+					data,
+					requestData,
+					itemIndex,
+					runIndex,
+				),
 			);
 		}
 		return responseData;

From 6a93aed3a2c428633fdf922df73203d3d41a7bb6 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Wed, 1 Feb 2023 16:50:35 +0100
Subject: [PATCH 047/358] fix(editor): Stop unsaved changes popup display when
 navigating away from an untouched workflow (#5259)

* fix(editor): Stop unsaved changes popup showing up after loading a workflow

* fix(editor): Fix unsaved change confirmation display
---
 .../ExecutionsView/ExecutionsList.vue         |  49 ++++----
 packages/editor-ui/src/stores/workflows.ts    |  12 +-
 packages/editor-ui/src/utils/canvasUtils.ts   |  19 ++-
 packages/editor-ui/src/views/NodeView.vue     | 118 +++++++-----------
 4 files changed, 79 insertions(+), 119 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index 660031ed3704d6..64faf60e559499 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -24,6 +24,7 @@
 <script lang="ts">
 import ExecutionsSidebar from '@/components/ExecutionsView/ExecutionsSidebar.vue';
 import {
+	MAIN_HEADER_TABS,
 	MODAL_CANCEL,
 	MODAL_CLOSE,
 	MODAL_CONFIRMED,
@@ -121,36 +122,34 @@ export default mixins(
 		},
 	},
 	async beforeRouteLeave(to, from, next) {
-		const nextTab = getNodeViewTab(to);
-		// When leaving for a page that's not a workflow view tab, ask to save changes
-		if (!nextTab) {
-			const result = this.uiStore.stateIsDirty;
-			if (result) {
-				const confirmModal = await this.confirmModal(
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-					'warning',
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
-					true,
-				);
+		if (getNodeViewTab(to) === MAIN_HEADER_TABS.WORKFLOW) {
+			next();
+			return;
+		}
+		if (this.uiStore.stateIsDirty) {
+			const confirmModal = await this.confirmModal(
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
+				'warning',
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
+				true,
+			);
 
-				if (confirmModal === MODAL_CONFIRMED) {
-					const saved = await this.saveCurrentWorkflow({}, false);
-					if (saved) this.settingsStore.fetchPromptsData();
-					this.uiStore.stateIsDirty = false;
-					next();
-				} else if (confirmModal === MODAL_CANCEL) {
-					this.uiStore.stateIsDirty = false;
-					next();
-				} else if (confirmModal === MODAL_CLOSE) {
-					next(false);
+			if (confirmModal === MODAL_CONFIRMED) {
+				const saved = await this.saveCurrentWorkflow({}, false);
+				if (saved) {
+					await this.settingsStore.fetchPromptsData();
 				}
-			} else {
+				this.uiStore.stateIsDirty = false;
+				next();
+			} else if (confirmModal === MODAL_CANCEL) {
+				this.uiStore.stateIsDirty = false;
 				next();
 			}
+		} else {
+			next();
 		}
-		next();
 	},
 	async mounted() {
 		this.loading = true;
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index cec309b81ef16c..af5d5992e12304 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -315,7 +315,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 		},
 
 		setWorkflowName(data: { newName: string; setStateDirty: boolean }): void {
-			if (data.setStateDirty === true) {
+			if (data.setStateDirty) {
 				const uiStore = useUIStore();
 				uiStore.stateIsDirty = true;
 			}
@@ -532,16 +532,12 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			dataPinningEventBus.$emit('unpin-data', { [payload.node.name]: undefined });
 		},
 
-		addConnection(data: { connection: IConnection[]; setStateDirty: boolean }): void {
+		addConnection(data: { connection: IConnection[] }): void {
 			if (data.connection.length !== 2) {
 				// All connections need two entries
 				// TODO: Check if there is an error or whatever that is supposed to be returned
 				return;
 			}
-			const uiStore = useUIStore();
-			if (data.setStateDirty === true) {
-				uiStore.stateIsDirty = true;
-			}
 
 			const sourceData: IConnection = data.connection[0];
 			const destinationData: IConnection = data.connection[1];
@@ -626,7 +622,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 		},
 
 		removeAllConnections(data: { setStateDirty: boolean }): void {
-			if (data && data.setStateDirty === true) {
+			if (data && data.setStateDirty) {
 				const uiStore = useUIStore();
 				uiStore.stateIsDirty = true;
 			}
@@ -771,7 +767,7 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 		},
 
 		removeAllNodes(data: { setStateDirty: boolean; removePinData: boolean }): void {
-			if (data.setStateDirty === true) {
+			if (data.setStateDirty) {
 				const uiStore = useUIStore();
 				uiStore.stateIsDirty = true;
 			}
diff --git a/packages/editor-ui/src/utils/canvasUtils.ts b/packages/editor-ui/src/utils/canvasUtils.ts
index a0a61158f03501..258a0b3e9cdf48 100644
--- a/packages/editor-ui/src/utils/canvasUtils.ts
+++ b/packages/editor-ui/src/utils/canvasUtils.ts
@@ -76,19 +76,14 @@ export const closestNumberDivisibleBy = (inputNumber: number, divisibleBy: numbe
 };
 
 export const getNodeViewTab = (route: Route): string | null => {
-	const routeMeta = route.meta;
-	if (routeMeta && routeMeta.nodeView === true) {
+	if (route.meta?.nodeView) {
 		return MAIN_HEADER_TABS.WORKFLOW;
-	} else {
-		const executionTabRoutes = [
-			VIEWS.WORKFLOW_EXECUTIONS.toString(),
-			VIEWS.EXECUTION_PREVIEW.toString(),
-			VIEWS.EXECUTION_HOME.toString(),
-		];
-
-		if (executionTabRoutes.includes(route.name || '')) {
-			return MAIN_HEADER_TABS.EXECUTIONS;
-		}
+	} else if (
+		[VIEWS.WORKFLOW_EXECUTIONS, VIEWS.EXECUTION_PREVIEW, VIEWS.EXECUTION_HOME]
+			.map(String)
+			.includes(String(route.name))
+	) {
+		return MAIN_HEADER_TABS.EXECUTIONS;
 	}
 	return null;
 };
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 95b36221e4393a..302ad710f0a347 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -402,55 +402,45 @@ export default mixins(
 		},
 	},
 	async beforeRouteLeave(to, from, next) {
-		const nextTab = getNodeViewTab(to);
-		// Only react if leaving workflow tab and going to a separate page
-		if (!nextTab) {
-			// Skip check if in the middle of template import
-			if (from.name === VIEWS.TEMPLATE_IMPORT) {
-				next();
-				return;
-			}
-			// Make sure workflow id is empty when leaving the editor
-			this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
-			const result = this.uiStore.stateIsDirty;
-			if (result) {
-				const confirmModal = await this.confirmModal(
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
-					'warning',
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
-					this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
-					true,
-				);
-
-				if (confirmModal === MODAL_CONFIRMED) {
-					const saved = await this.saveCurrentWorkflow({}, false);
-					if (saved) await this.settingsStore.fetchPromptsData();
-					this.uiStore.stateIsDirty = false;
-
-					if (from.name === VIEWS.NEW_WORKFLOW) {
-						// Replace the current route with the new workflow route
-						// before navigating to the new route when saving new workflow.
-						this.$router.replace(
-							{ name: VIEWS.WORKFLOW, params: { name: this.currentWorkflow } },
-							() => {
-								// We can't use next() here since vue-router
-								// would prevent the navigation with an error
-								this.$router.push(to as RawLocation);
-							},
-						);
-					} else {
-						next();
-					}
-				} else if (confirmModal === MODAL_CANCEL) {
-					await this.resetWorkspace();
-					this.uiStore.stateIsDirty = false;
+		if (getNodeViewTab(to) === MAIN_HEADER_TABS.EXECUTIONS || from.name === VIEWS.TEMPLATE_IMPORT) {
+			next();
+			return;
+		}
+		// Make sure workflow id is empty when leaving the editor
+		this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
+		if (this.uiStore.stateIsDirty) {
+			const confirmModal = await this.confirmModal(
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.headline'),
+				'warning',
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.confirmButtonText'),
+				this.$locale.baseText('generic.unsavedWork.confirmMessage.cancelButtonText'),
+				true,
+			);
+			if (confirmModal === MODAL_CONFIRMED) {
+				const saved = await this.saveCurrentWorkflow({}, false);
+				if (saved) {
+					await this.settingsStore.fetchPromptsData();
+				}
+				this.uiStore.stateIsDirty = false;
 
+				if (from.name === VIEWS.NEW_WORKFLOW) {
+					// Replace the current route with the new workflow route
+					// before navigating to the new route when saving new workflow.
+					this.$router.replace(
+						{ name: VIEWS.WORKFLOW, params: { name: this.currentWorkflow } },
+						() => {
+							// We can't use next() here since vue-router
+							// would prevent the navigation with an error
+							this.$router.push(to as RawLocation);
+						},
+					);
+				} else {
 					next();
-				} else if (confirmModal === MODAL_CLOSE) {
-					next(false);
 				}
-			} else {
+			} else if (confirmModal === MODAL_CANCEL) {
+				await this.resetWorkspace();
+				this.uiStore.stateIsDirty = false;
 				next();
 			}
 		} else {
@@ -1979,8 +1969,9 @@ export default mixins(
 			sourceNodeOutputIndex: number,
 			targetNodeName: string,
 			targetNodeOuputIndex: number,
-			trackHistory = false,
 		) {
+			this.uiStore.stateIsDirty = true;
+
 			if (
 				this.getConnection(
 					sourceNodeName,
@@ -2039,17 +2030,11 @@ export default mixins(
 
 					const targetNodeName = lastSelectedConnection.__meta.targetNodeName;
 					const targetOutputIndex = lastSelectedConnection.__meta.targetOutputIndex;
-					this.connectTwoNodes(
-						newNodeData.name,
-						0,
-						targetNodeName,
-						targetOutputIndex,
-						trackHistory,
-					);
+					this.connectTwoNodes(newNodeData.name, 0, targetNodeName, targetOutputIndex);
 				}
 
 				// Connect active node to the newly created one
-				this.connectTwoNodes(lastSelectedNode.name, outputIndex, newNodeData.name, 0, trackHistory);
+				this.connectTwoNodes(lastSelectedNode.name, outputIndex, newNodeData.name, 0);
 			}
 			this.historyStore.stopRecordingUndo();
 		},
@@ -2102,13 +2087,7 @@ export default mixins(
 							const sourceNodeName = sourceNode.name;
 							const outputIndex = connection.parameters.index;
 
-							this.connectTwoNodes(
-								sourceNodeName,
-								outputIndex,
-								this.pullConnActiveNodeName,
-								0,
-								true,
-							);
+							this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
 							this.pullConnActiveNodeName = null;
 						}
 						return;
@@ -2181,10 +2160,6 @@ export default mixins(
 						},
 					];
 
-					this.workflowsStore.addConnection({
-						connection: connectionData,
-						setStateDirty: true,
-					});
 					this.dropPrevented = true;
 					if (!this.suspendRecordingDetachedConnections) {
 						this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
@@ -2331,7 +2306,7 @@ export default mixins(
 						if (connectionInfo) {
 							this.historyStore.pushCommandToUndo(new RemoveConnectionCommand(connectionInfo));
 						}
-						this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0, true);
+						this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
 						this.pullConnActiveNodeName = null;
 						await this.$nextTick();
 						this.historyStore.stopRecordingUndo();
@@ -2553,7 +2528,7 @@ export default mixins(
 			window.addEventListener('beforeunload', (e) => {
 				if (this.isDemo) {
 					return;
-				} else if (this.uiStore.stateIsDirty === true) {
+				} else if (this.uiStore.stateIsDirty) {
 					const confirmationMessage = this.$locale.baseText(
 						'nodeView.itLooksLikeYouHaveBeenEditingSomething',
 					);
@@ -2595,12 +2570,8 @@ export default mixins(
 					uuids: uuid,
 					detachable: !this.isReadOnly,
 				});
-			} else {
-				const connectionProperties = { connection, setStateDirty: false };
-				// When nodes get connected it gets saved automatically to the storage
-				// so if we do not connect we have to save the connection manually
-				this.workflowsStore.addConnection(connectionProperties);
 			}
+			this.workflowsStore.addConnection({ connection });
 
 			setTimeout(() => {
 				this.addPinDataConnections(this.workflowsStore.pinData);
@@ -2984,7 +2955,6 @@ export default mixins(
 								sourceNodeOutputIndex,
 								targetNodeName,
 								targetNodeOuputIndex,
-								trackHistory,
 							);
 
 							if (waitForNewConnection) {

From 43b4a8a5892a833538db3557e2a890d79448afce Mon Sep 17 00:00:00 2001
From: Simon <65854503+OpenSourceSimon@users.noreply.github.com>
Date: Wed, 1 Feb 2023 16:50:52 +0100
Subject: [PATCH 048/358] fix: Update app screenshot in README to match latest
 design (no-changelog) (#5314)

* Updated screenshot in README

* Updated screenshot in README

* Remove shadow from the screenshot
---
 assets/n8n-screenshot.png | Bin 58781 -> 229352 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/assets/n8n-screenshot.png b/assets/n8n-screenshot.png
index c4ac33df003cdcfad4ee79e16e167b279f6efc97..fa696d95acc03cbb403b35b1040655be7bf5c553 100644
GIT binary patch
literal 229352
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%0Aa+jumwahh7YGYevK~
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

literal 58781
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%0D%On1kb)qxA9aXUCAP#J
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


From 59f290fe854767c6bf5c01ce9a0fb537297d82b2 Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Wed, 1 Feb 2023 12:34:53 -0500
Subject: [PATCH 049/358] feat(Salesforce Node): Add HasOptedOutOfEmail field
 to lead resource (#5235)

---
 .../nodes/Salesforce/LeadDescription.ts          | 16 ++++++++++++++++
 .../nodes-base/nodes/Salesforce/LeadInterface.ts |  1 +
 .../nodes/Salesforce/Salesforce.node.ts          |  6 ++++++
 3 files changed, 23 insertions(+)

diff --git a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
index 14f66d8bfe0de0..297adf136acc65 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadDescription.ts
@@ -235,6 +235,14 @@ export const leadFields: INodeProperties[] = [
 				default: '',
 				description: 'First name of the lead. Limited to 40 characters.',
 			},
+			{
+				displayName: 'Has Opted Out of Email',
+				name: 'hasOptedOutOfEmail',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the lead doesn’t want to receive email from Salesforce (true) or does (false). Label is Email Opt Out.',
+			},
 			{
 				displayName: 'Industry',
 				name: 'industry',
@@ -496,6 +504,14 @@ export const leadFields: INodeProperties[] = [
 				default: '',
 				description: 'First name of the lead. Limited to 40 characters.',
 			},
+			{
+				displayName: 'Has Opted Out of Email',
+				name: 'hasOptedOutOfEmail',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether the lead doesn’t want to receive email from Salesforce (true) or does (false). Label is Email Opt Out.',
+			},
 			{
 				displayName: 'Industry',
 				name: 'industry',
diff --git a/packages/nodes-base/nodes/Salesforce/LeadInterface.ts b/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
index 35434e099a31ed..fca3e2be5da704 100644
--- a/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
+++ b/packages/nodes-base/nodes/Salesforce/LeadInterface.ts
@@ -24,4 +24,5 @@ export interface ILead {
 	IsUnreadByOwner?: boolean;
 	NumberOfEmployees?: number;
 	MobilePhone?: string;
+	HasOptedOutOfEmail?: boolean;
 }
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 993b8ec8070da1..5e647ab4115795 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -1081,6 +1081,9 @@ export class Salesforce implements INodeType {
 							Company: company,
 							LastName: lastname,
 						};
+						if (additionalFields.hasOptedOutOfEmail !== undefined) {
+							body.HasOptedOutOfEmail = additionalFields.hasOptedOutOfEmail as boolean;
+						}
 						if (additionalFields.email !== undefined) {
 							body.Email = additionalFields.email as string;
 						}
@@ -1185,6 +1188,9 @@ export class Salesforce implements INodeType {
 								{ itemIndex: i },
 							);
 						}
+						if (updateFields.hasOptedOutOfEmail !== undefined) {
+							body.HasOptedOutOfEmail = updateFields.hasOptedOutOfEmail as boolean;
+						}
 						if (updateFields.lastname !== undefined) {
 							body.LastName = updateFields.lastname as string;
 						}

From ec7575b0321edf6e21e5ba5fb4094e9a36e65571 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Wed, 1 Feb 2023 18:05:21 +0000
Subject: [PATCH 050/358] fix(core): Fix oauth2 client credentials not always
 working (#5327)

fix oauth client credentials not working as expected
---
 packages/core/src/NodeExecuteFunctions.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index f1fe6adb95b6ae..8cb90f43392c3b 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -1029,7 +1029,10 @@ export async function requestOAuth2(
 	let oauthTokenData = credentials.oauthTokenData as clientOAuth2.Data;
 
 	// if it's the first time using the credentials, get the access token and save it into the DB.
-	if (credentials.grantType === OAuth2GrantType.clientCredentials && oauthTokenData === undefined) {
+	if (
+		credentials.grantType === OAuth2GrantType.clientCredentials &&
+		(oauthTokenData === undefined || Object.keys(oauthTokenData).length === 0)
+	) {
 		const { data } = await getClientCredentialsToken(oAuthClient, credentials);
 
 		// Find the credentials

From 78bbe2ba27990127b1b6a6333361f35e2d3e7a65 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Wed, 1 Feb 2023 22:53:05 +0100
Subject: [PATCH 051/358] fix(Schedule Trigger Node): Change scheduler
 behaviour for intervals days and hours (#5133)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🐛Fix scheduler for intervals days and week

* ♻️ Simplify and move recurrency rules outside trigger node

* Remove async and promise from recurency rule

* Update correctly the Static data when using recurrency Rule

* Fix logic when recurrency is activated

* 🎨 Remove useless staticData fix(passed by reference)

* 🐛 remove duplicted hour cronJob leading to 2 executions

* More fixes, handles multiple execution

* 🐛 fixing dayOfYear recurency check

* 🐛 fix recurency check for hours/days should not equal lastExecution

* Add month interval to the scheduler

* Fix flawed logic for comparing interval

* 🚨 Fix lint issue type

---------

Co-authored-by: Marcus <marcus@n8n.io>
---
 .../nodes/Schedule/GenericFunctions.ts        |  57 +++++++
 .../nodes/Schedule/ScheduleTrigger.node.ts    | 152 ++++++++++++++----
 .../nodes/Schedule/SchedulerInterface.ts      |   6 +
 3 files changed, 181 insertions(+), 34 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Schedule/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Schedule/SchedulerInterface.ts

diff --git a/packages/nodes-base/nodes/Schedule/GenericFunctions.ts b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
new file mode 100644
index 00000000000000..15b753656cdc8a
--- /dev/null
+++ b/packages/nodes-base/nodes/Schedule/GenericFunctions.ts
@@ -0,0 +1,57 @@
+import type { IRecurencyRule } from './SchedulerInterface';
+import moment from 'moment';
+
+export function recurencyCheck(
+	recurrency: IRecurencyRule,
+	recurrencyRules: number[],
+	timezone: string,
+): boolean {
+	const recurrencyRuleIndex = recurrency.index;
+	const intervalSize = recurrency.intervalSize;
+	const typeInterval = recurrency.typeInterval;
+
+	const lastExecution =
+		recurrencyRuleIndex !== undefined ? recurrencyRules[recurrencyRuleIndex] : undefined;
+
+	if (
+		intervalSize &&
+		recurrencyRuleIndex !== undefined &&
+		(typeInterval === 'weeks' || typeInterval === 'undefined')
+	) {
+		if (
+			lastExecution === undefined || // First time executing this rule
+			moment.tz(timezone).week() === (intervalSize + lastExecution) % 52 || // not first time, but minimum interval has passed
+			moment.tz(timezone).week() === lastExecution // Trigger on multiple days in the same week
+		) {
+			recurrencyRules[recurrencyRuleIndex] = moment.tz(timezone).week();
+			return true;
+		}
+	} else if (intervalSize && recurrencyRuleIndex !== undefined && typeInterval === 'days') {
+		if (
+			lastExecution === undefined ||
+			moment.tz(timezone).dayOfYear() === (intervalSize + lastExecution) % 365
+		) {
+			recurrencyRules[recurrencyRuleIndex] = moment.tz(timezone).dayOfYear();
+			return true;
+		}
+	} else if (intervalSize && recurrencyRuleIndex !== undefined && typeInterval === 'hours') {
+		if (
+			lastExecution === undefined ||
+			moment.tz(timezone).hour() === (intervalSize + lastExecution) % 24
+		) {
+			recurrencyRules[recurrencyRuleIndex] = moment.tz(timezone).hour();
+			return true;
+		}
+	} else if (intervalSize && recurrencyRuleIndex !== undefined && typeInterval === 'months') {
+		if (
+			lastExecution === undefined ||
+			moment.tz(timezone).month() === (intervalSize + lastExecution) % 12
+		) {
+			recurrencyRules[recurrencyRuleIndex] = moment.tz(timezone).month();
+			return true;
+		}
+	} else {
+		return true;
+	}
+	return false;
+}
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
index a5e3be9ba7df87..bbf7de5015a967 100644
--- a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
+++ b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
@@ -4,6 +4,8 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import { CronJob } from 'cron';
 import moment from 'moment';
+import type { IRecurencyRule } from './SchedulerInterface';
+import { recurencyCheck } from './GenericFunctions';
 
 export class ScheduleTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -416,7 +418,7 @@ export class ScheduleTrigger implements INodeType {
 		if (!staticData.recurrencyRules) {
 			staticData.recurrencyRules = [];
 		}
-		const executeTrigger = (recurrencyRuleIndex?: number, weeksInterval?: number) => {
+		const executeTrigger = async (recurency: IRecurencyRule) => {
 			const resultData = {
 				timestamp: moment.tz(timezone).toISOString(true),
 				'Readable date': moment.tz(timezone).format('MMMM Do YYYY, h:mm:ss a'),
@@ -430,24 +432,13 @@ export class ScheduleTrigger implements INodeType {
 				Second: moment.tz(timezone).format('ss'),
 				Timezone: moment.tz(timezone).format('z Z'),
 			};
-			const lastExecutionWeekNumber =
-				recurrencyRuleIndex !== undefined
-					? staticData.recurrencyRules[recurrencyRuleIndex]
-					: undefined;
 
-			// Checks if have the right week interval, handles new years as well
-			if (weeksInterval && recurrencyRuleIndex !== undefined) {
-				if (
-					lastExecutionWeekNumber === undefined || // First time executing this rule
-					moment.tz(timezone).week() >= weeksInterval + lastExecutionWeekNumber || // not first time, but minimum interval has passed
-					moment.tz(timezone).week() + 52 >= weeksInterval + lastExecutionWeekNumber // not first time, correct interval but year has passed
-				) {
-					staticData.recurrencyRules[recurrencyRuleIndex] = moment.tz(timezone).week();
+			if (!recurency.activated) {
+				this.emit([this.helpers.returnJsonArray([resultData])]);
+			} else {
+				if (recurencyCheck(recurency, staticData.recurrencyRules, timezone)) {
 					this.emit([this.helpers.returnJsonArray([resultData])]);
 				}
-				// There is no else block here since we don't want to emit anything now
-			} else {
-				this.emit([this.helpers.returnJsonArray([resultData])]);
 			}
 		};
 
@@ -456,7 +447,13 @@ export class ScheduleTrigger implements INodeType {
 			if (interval[i].field === 'cronExpression') {
 				const cronExpression = interval[i].expression as string;
 				try {
-					const cronJob = new CronJob(cronExpression, executeTrigger, undefined, true, timezone);
+					const cronJob = new CronJob(
+						cronExpression,
+						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
 					cronJobs.push(cronJob);
 				} catch (error) {
 					throw new NodeOperationError(this.getNode(), 'Invalid cron expression', {
@@ -468,34 +465,86 @@ export class ScheduleTrigger implements INodeType {
 			if (interval[i].field === 'seconds') {
 				const seconds = interval[i].secondsInterval as number;
 				intervalValue *= seconds;
-				const intervalObj = setInterval(executeTrigger, intervalValue) as NodeJS.Timeout;
+				const intervalObj = setInterval(
+					async () => executeTrigger({ activated: false } as IRecurencyRule),
+					intervalValue,
+				) as NodeJS.Timeout;
 				intervalArr.push(intervalObj);
 			}
 
 			if (interval[i].field === 'minutes') {
 				const minutes = interval[i].minutesInterval as number;
 				intervalValue *= 60 * minutes;
-				const intervalObj = setInterval(executeTrigger, intervalValue);
+				const intervalObj = setInterval(
+					async () => executeTrigger({ activated: false } as IRecurencyRule),
+					intervalValue,
+				) as NodeJS.Timeout;
 				intervalArr.push(intervalObj);
 			}
 
 			if (interval[i].field === 'hours') {
-				const hour = interval[i].hoursInterval?.toString() as string;
+				const hour = interval[i].hoursInterval as number;
 				const minute = interval[i].triggerAtMinute?.toString() as string;
-				const cronTimes: string[] = [minute, `*/${hour}`, '*', '*', '*'];
+				const cronTimes: string[] = [minute, '*', '*', '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
-				const cronJob = new CronJob(cronExpression, executeTrigger, undefined, true, timezone);
-				cronJobs.push(cronJob);
+				if (hour === 1) {
+					const cronJob = new CronJob(
+						cronExpression,
+						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
+					cronJobs.push(cronJob);
+				} else {
+					const cronJob = new CronJob(
+						cronExpression,
+						async () =>
+							executeTrigger({
+								activated: true,
+								index: i,
+								intervalSize: hour,
+								typeInterval: 'hours',
+							} as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
+					cronJobs.push(cronJob);
+				}
 			}
 
 			if (interval[i].field === 'days') {
-				const day = interval[i].daysInterval?.toString() as string;
+				const day = interval[i].daysInterval as number;
 				const hour = interval[i].triggerAtHour?.toString() as string;
 				const minute = interval[i].triggerAtMinute?.toString() as string;
-				const cronTimes: string[] = [minute, hour, `*/${day}`, '*', '*'];
+				const cronTimes: string[] = [minute, hour, '*', '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
-				const cronJob = new CronJob(cronExpression, executeTrigger, undefined, true, timezone);
-				cronJobs.push(cronJob);
+				if (day === 1) {
+					const cronJob = new CronJob(
+						cronExpression,
+						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
+					cronJobs.push(cronJob);
+				} else {
+					const cronJob = new CronJob(
+						cronExpression,
+						async () =>
+							executeTrigger({
+								activated: true,
+								index: i,
+								intervalSize: day,
+								typeInterval: 'days',
+							} as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
+					cronJobs.push(cronJob);
+				}
 			}
 
 			if (interval[i].field === 'weeks') {
@@ -507,12 +556,24 @@ export class ScheduleTrigger implements INodeType {
 				const cronTimes: string[] = [minute, hour, '*', '*', day];
 				const cronExpression = cronTimes.join(' ');
 				if (week === 1) {
-					const cronJob = new CronJob(cronExpression, executeTrigger, undefined, true, timezone);
+					const cronJob = new CronJob(
+						cronExpression,
+						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
 					cronJobs.push(cronJob);
 				} else {
 					const cronJob = new CronJob(
 						cronExpression,
-						() => executeTrigger(i, week),
+						async () =>
+							executeTrigger({
+								activated: true,
+								index: i,
+								intervalSize: week,
+								typeInterval: 'weeks',
+							} as IRecurencyRule),
 						undefined,
 						true,
 						timezone,
@@ -522,14 +583,37 @@ export class ScheduleTrigger implements INodeType {
 			}
 
 			if (interval[i].field === 'months') {
-				const month = interval[i].monthsInterval?.toString() as string;
+				const month = interval[i].monthsInterval;
 				const day = interval[i].triggerAtDayOfMonth?.toString() as string;
 				const hour = interval[i].triggerAtHour?.toString() as string;
 				const minute = interval[i].triggerAtMinute?.toString() as string;
-				const cronTimes: string[] = [minute, hour, day, `*/${month}`, '*'];
+				const cronTimes: string[] = [minute, hour, day, '*', '*'];
 				const cronExpression: string = cronTimes.join(' ');
-				const cronJob = new CronJob(cronExpression, executeTrigger, undefined, true, timezone);
-				cronJobs.push(cronJob);
+				if (month === 1) {
+					const cronJob = new CronJob(
+						cronExpression,
+						async () => executeTrigger({ activated: false } as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
+					cronJobs.push(cronJob);
+				} else {
+					const cronJob = new CronJob(
+						cronExpression,
+						async () =>
+							executeTrigger({
+								activated: true,
+								index: i,
+								intervalSize: month,
+								typeInterval: 'months',
+							} as IRecurencyRule),
+						undefined,
+						true,
+						timezone,
+					);
+					cronJobs.push(cronJob);
+				}
 			}
 		}
 
@@ -543,7 +627,7 @@ export class ScheduleTrigger implements INodeType {
 		}
 
 		async function manualTriggerFunction() {
-			executeTrigger();
+			void executeTrigger({ activated: false } as IRecurencyRule);
 		}
 
 		return {
diff --git a/packages/nodes-base/nodes/Schedule/SchedulerInterface.ts b/packages/nodes-base/nodes/Schedule/SchedulerInterface.ts
new file mode 100644
index 00000000000000..b2aec0d7485854
--- /dev/null
+++ b/packages/nodes-base/nodes/Schedule/SchedulerInterface.ts
@@ -0,0 +1,6 @@
+export interface IRecurencyRule {
+	activated: boolean;
+	index?: number;
+	intervalSize?: number;
+	typeInterval?: string;
+}

From 8f5f1c3aa520576215e16a8cc1a8beadae5f142a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 2 Feb 2023 01:00:24 +0100
Subject: [PATCH 052/358] fix(Mailchimp Trigger Node): Fix webhook recreation
 (#5328)

---
 packages/cli/src/workflows/workflows.services.ts |  8 ++++++--
 .../nodes/Mailchimp/MailchimpTrigger.node.ts     | 16 +++++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 7bc0b38f9360a3..902896ac127fc8 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -1,6 +1,6 @@
 import { validate as jsonSchemaValidate } from 'jsonschema';
 import type { INode, IPinData, JsonObject } from 'n8n-workflow';
-import { jsonParse, LoggerProxy, Workflow } from 'n8n-workflow';
+import { NodeApiError, jsonParse, LoggerProxy, Workflow } from 'n8n-workflow';
 import type { FindOptionsWhere } from 'typeorm';
 import { In } from 'typeorm';
 import pick from 'lodash.pick';
@@ -336,8 +336,12 @@ export class WorkflowsService {
 				// Also set it in the returned data
 				updatedWorkflow.active = false;
 
+				let message;
+				if (error instanceof NodeApiError) message = error.description;
+				message = message ?? (error as Error).message;
+
 				// Now return the original error for UI to display
-				throw new ResponseHelper.BadRequestError((error as Error).message);
+				throw new ResponseHelper.BadRequestError(message);
 			}
 		}
 
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 8496778bbd8091..524edc6def38ae 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -165,13 +165,8 @@ export class MailchimpTrigger implements INodeType {
 			// select them easily
 			async getLists(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
-				let lists, response;
-				try {
-					response = await mailchimpApiRequest.call(this, '/lists', 'GET');
-					lists = response.lists;
-				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
-				}
+				const response = await mailchimpApiRequest.call(this, '/lists', 'GET');
+				const lists = response.lists;
 				for (const list of lists) {
 					const listName = list.name;
 					const listId = list.id;
@@ -200,8 +195,11 @@ export class MailchimpTrigger implements INodeType {
 				try {
 					await mailchimpApiRequest.call(this, endpoint, 'GET');
 				} catch (error) {
-					if (error.statusCode === 404) {
-						return false;
+					if (error instanceof NodeApiError && error.cause && 'isAxiosError' in error.cause) {
+						if (error.cause.statusCode === 404) {
+							return false;
+						}
+						throw error;
 					}
 					throw new NodeApiError(this.getNode(), error);
 				}

From 96ec5bc880e23c1916322d68e8aeaaa8176db2aa Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 2 Feb 2023 09:05:14 +0100
Subject: [PATCH 053/358] refactor(editor): Fix duplicate NodeView keys when
 navigating between routes (no-changelog) (#5325)

* refactor(editor): Fix duplicate NodeView keys when navigating between routes (no-changelog)

* Prettier fixes

* Use computed to export jsPlumb instance from canvas

* Force jsPlumb computed instance type
---
 packages/editor-ui/src/mixins/mouseSelect.ts |  4 ++--
 packages/editor-ui/src/stores/canvas.ts      | 22 +++++++++++---------
 packages/editor-ui/src/views/NodeView.vue    | 15 ++++++-------
 3 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/packages/editor-ui/src/mixins/mouseSelect.ts b/packages/editor-ui/src/mixins/mouseSelect.ts
index 89b0d6a54c5103..ef062c699a8219 100644
--- a/packages/editor-ui/src/mixins/mouseSelect.ts
+++ b/packages/editor-ui/src/mixins/mouseSelect.ts
@@ -203,12 +203,12 @@ export const mouseSelect = mixins(deviceSupportHelpers).extend({
 		nodeDeselected(node: INodeUi) {
 			this.uiStore.removeNodeFromSelection(node);
 			// @ts-ignore
-			this.instance.removeFromDragSelection(this.$refs[`node-${node.id}`][0].$el);
+			this.instance.removeFromDragSelection(this.instance.getManagedElement(node?.id));
 		},
 		nodeSelected(node: INodeUi) {
 			this.uiStore.addSelectedNode(node);
 			// @ts-ignore
-			this.instance.addToDragSelection(this.$refs[`node-${node.id}`][0].$el);
+			this.instance.addToDragSelection(this.instance.getManagedElement(node?.id));
 		},
 		deselectAllNodes() {
 			// @ts-ignore
diff --git a/packages/editor-ui/src/stores/canvas.ts b/packages/editor-ui/src/stores/canvas.ts
index 53d4ea2e9700d2..d4bb7333fdbf9a 100644
--- a/packages/editor-ui/src/stores/canvas.ts
+++ b/packages/editor-ui/src/stores/canvas.ts
@@ -8,7 +8,7 @@ import { useUIStore } from '@/stores/ui';
 import { useHistoryStore } from '@/stores/history';
 import { INodeUi, XYPosition } from '@/Interface';
 import { scaleBigger, scaleReset, scaleSmaller } from '@/utils';
-import { START_NODE_TYPE, STICKY_NODE_TYPE } from '@/constants';
+import { START_NODE_TYPE } from '@/constants';
 import type {
 	BeforeStartEventParams,
 	BrowserJsPlumbInstance,
@@ -37,7 +37,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 	const uiStore = useUIStore();
 	const historyStore = useHistoryStore();
 
-	const jsPlumbInstance = ref<BrowserJsPlumbInstance>();
+	const jsPlumbInstanceRef = ref<BrowserJsPlumbInstance>();
 	const isDragging = ref<boolean>(false);
 
 	const nodes = computed<INodeUi[]>(() => workflowStore.allNodes);
@@ -78,7 +78,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 
 	const setZoomLevel = (zoomLevel: number, offset: XYPosition) => {
 		nodeViewScale.value = zoomLevel;
-		jsPlumbInstance.value?.setZoom(zoomLevel);
+		jsPlumbInstanceRef.value?.setZoom(zoomLevel);
 		uiStore.nodeViewOffsetPosition = offset;
 	};
 
@@ -143,13 +143,13 @@ export const useCanvasStore = defineStore('canvas', () => {
 
 	function initInstance(container: Element) {
 		// Make sure to clean-up previous instance if it exists
-		if (jsPlumbInstance.value) {
-			jsPlumbInstance.value.destroy();
-			jsPlumbInstance.value.reset();
-			jsPlumbInstance.value = undefined;
+		if (jsPlumbInstanceRef.value) {
+			jsPlumbInstanceRef.value.destroy();
+			jsPlumbInstanceRef.value.reset();
+			jsPlumbInstanceRef.value = undefined;
 		}
 
-		jsPlumbInstance.value = newInstance({
+		jsPlumbInstanceRef.value = newInstance({
 			container,
 			connector: CONNECTOR_FLOWCHART_TYPE,
 			resizeObserver: false,
@@ -168,7 +168,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 						// Only the node which gets dragged directly gets an event, for all others it is
 						// undefined. So check if the currently dragged node is selected and if not clear
 						// the drag-selection.
-						jsPlumbInstance.value?.clearDragSelection();
+						jsPlumbInstanceRef.value?.clearDragSelection();
 						uiStore.resetSelectedNodes();
 					}
 
@@ -231,7 +231,7 @@ export const useCanvasStore = defineStore('canvas', () => {
 				filter: '.node-description, .node-description .node-name, .node-description .node-subtitle',
 			},
 		});
-		jsPlumbInstance.value?.setDragConstrainFunction((pos: PointXY) => {
+		jsPlumbInstanceRef.value?.setDragConstrainFunction((pos: PointXY) => {
 			const isReadOnly = uiStore.isReadOnlyView;
 			if (isReadOnly) {
 				// Do not allow to move nodes in readOnly mode
@@ -240,6 +240,8 @@ export const useCanvasStore = defineStore('canvas', () => {
 			return pos;
 		});
 	}
+
+	const jsPlumbInstance = computed(() => jsPlumbInstanceRef.value as BrowserJsPlumbInstance);
 	return {
 		isDemo,
 		nodeViewScale,
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 302ad710f0a347..9021a13f00f979 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -52,7 +52,6 @@
 							@runWorkflow="onRunNode"
 							@moved="onNodeMoved"
 							@run="onNodeRun"
-							:ref="`node-${nodeData.id}`"
 							:key="`${nodeData.id}_node`"
 							:name="nodeData.name"
 							:isReadOnly="isReadOnly"
@@ -76,7 +75,6 @@
 							@nodeSelected="nodeSelectedByName"
 							@removeNode="(name) => removeNode(name, true)"
 							:key="`${nodeData.id}_sticky`"
-							:ref="`node-${nodeData.id}`"
 							:name="nodeData.name"
 							:isReadOnly="isReadOnly"
 							:instance="instance"
@@ -406,8 +404,6 @@ export default mixins(
 			next();
 			return;
 		}
-		// Make sure workflow id is empty when leaving the editor
-		this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
 		if (this.uiStore.stateIsDirty) {
 			const confirmModal = await this.confirmModal(
 				this.$locale.baseText('generic.unsavedWork.confirmMessage.message'),
@@ -418,6 +414,8 @@ export default mixins(
 				true,
 			);
 			if (confirmModal === MODAL_CONFIRMED) {
+				// Make sure workflow id is empty when leaving the editor
+				this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
 				const saved = await this.saveCurrentWorkflow({}, false);
 				if (saved) {
 					await this.settingsStore.fetchPromptsData();
@@ -439,6 +437,7 @@ export default mixins(
 					next();
 				}
 			} else if (confirmModal === MODAL_CANCEL) {
+				this.workflowsStore.setWorkflowId(PLACEHOLDER_EMPTY_WORKFLOW_ID);
 				await this.resetWorkspace();
 				this.uiStore.stateIsDirty = false;
 				next();
@@ -2755,12 +2754,10 @@ export default mixins(
 		},
 		getJSPlumbEndpoints(nodeName: string): Endpoint[] {
 			const node = this.workflowsStore.getNodeByName(nodeName);
-			const nodeEls: Element = (this.$refs[`node-${node?.id}`] as ComponentInstance[])[0]
-				.$el as Element;
-
-			const endpoints = this.instance?.getEndpoints(nodeEls);
+			const nodeEl = this.instance.getManagedElement(node?.id);
 
-			return endpoints as Endpoint[];
+			const endpoints = this.instance?.getEndpoints(nodeEl);
+			return endpoints;
 		},
 		getPlusEndpoint(nodeName: string, outputIndex: number): Endpoint | undefined {
 			const endpoints = this.getJSPlumbEndpoints(nodeName);

From f9ecc34b10544e787f7034e89068aa6c9356fa04 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Thu, 2 Feb 2023 08:32:35 +0000
Subject: [PATCH 054/358] fix(Linear Node): Fix pagination issue for get all
 issues (#5324)

---
 packages/nodes-base/nodes/Linear/Queries.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/Linear/Queries.ts b/packages/nodes-base/nodes/Linear/Queries.ts
index 861b404d3fb664..0bd897a0bdfe74 100644
--- a/packages/nodes-base/nodes/Linear/Queries.ts
+++ b/packages/nodes-base/nodes/Linear/Queries.ts
@@ -122,8 +122,8 @@ export const query = {
 		}`;
 	},
 	getIssues() {
-		return `query Issue ($first: Int){
-					issues (first: $first){
+		return `query Issue ($first: Int, $after: String){
+					issues (first: $first, after: $after){
 						nodes {
 						id,
 						title,
@@ -149,6 +149,10 @@ export const query = {
 							name
 						}
 					}
+					pageInfo {
+						hasNextPage
+						endCursor
+					}
 				}
 			}`;
 	},

From 0f228a60baab3f04cd661cfe27f4060ecb457030 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 2 Feb 2023 10:11:36 +0100
Subject: [PATCH 055/358] refactor(Code Node): Remove disallowed syntax checks
 (#5332)

:fire: Remove disallowed syntax checks in Code node
---
 packages/nodes-base/nodes/Code/Sandbox.ts | 24 -----------------------
 1 file changed, 24 deletions(-)

diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index d136ced620dd83..9f946eb1d5e4cd 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -48,30 +48,6 @@ export class Sandbox extends NodeVM {
 	private async runCodeAllItems() {
 		const script = `module.exports = async function() {${this.jsCode}\n}()`;
 
-		const match = script.match(
-			/(?<disallowedSyntax>\)\.item(?!Matching)|\$input\.item(?!Matching)|\$json|\$binary|\$itemIndex)/,
-		); // disallow .item but tolerate .itemMatching
-
-		if (match?.groups?.disallowedSyntax) {
-			const { disallowedSyntax } = match.groups;
-
-			const lineNumber =
-				this.jsCode.split('\n').findIndex((line) => {
-					return line.includes(disallowedSyntax) && !line.startsWith('//') && !line.startsWith('*');
-				}) + 1;
-
-			const disallowedSyntaxFound = lineNumber !== 0;
-
-			if (disallowedSyntaxFound) {
-				throw new ValidationError({
-					message: `Can't use ${disallowedSyntax} here`,
-					description: "This is only available in 'Run Once for Each Item' mode",
-					itemIndex: this.itemIndex,
-					lineNumber,
-				});
-			}
-		}
-
 		let executionResult;
 
 		try {

From 52dea08003d314841d261533391e05d688dd1fe4 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 2 Feb 2023 12:08:17 +0100
Subject: [PATCH 056/358] fix(editor): Set max width for executions list
 (#5302)

---
 packages/editor-ui/src/App.vue                               | 3 +++
 packages/editor-ui/src/components/ExecutionsList.vue         | 2 ++
 packages/editor-ui/src/components/layouts/PageViewLayout.vue | 3 ++-
 packages/editor-ui/src/views/NodeView.vue                    | 3 ++-
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index d3c4fde265467c..358717f13a9678 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -241,9 +241,12 @@ export default mixins(showMessage, userHelpers, restApi, historyHelper).extend({
 }
 
 .content {
+	display: flex;
 	grid-area: content;
 	overflow: auto;
 	height: 100vh;
+	width: 100%;
+	justify-content: center;
 }
 
 .header {
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index 18c4b7c343603f..dd07f9069499ff 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -927,6 +927,8 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 	grid-template-rows: 1fr 0;
 	position: relative;
 	height: 100%;
+	width: 100%;
+	max-width: 1280px;
 }
 
 .execList {
diff --git a/packages/editor-ui/src/components/layouts/PageViewLayout.vue b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
index 28912f319ebffc..bc670f2b512225 100644
--- a/packages/editor-ui/src/components/layouts/PageViewLayout.vue
+++ b/packages/editor-ui/src/components/layouts/PageViewLayout.vue
@@ -33,6 +33,8 @@ export default Vue.extend({
 .wrapper {
 	display: flex;
 	height: 100%;
+	width: 100%;
+	max-width: 1280px;
 	justify-content: center;
 	box-sizing: border-box;
 	background: var(--color-gray-light);
@@ -43,7 +45,6 @@ export default Vue.extend({
 }
 
 .container {
-	max-width: 1280px;
 	display: flex;
 	justify-content: center;
 	align-items: center;
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 9021a13f00f979..7e3bc49ce6e1c7 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -4055,7 +4055,8 @@ export default mixins(
 	position: relative;
 	display: flex;
 	overflow: auto;
-	height: 100vh;
+	height: 100%;
+	width: 100%;
 }
 
 .shake {

From ee210e8507ce06f7052328f28ba14451f51b3db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:15:46 +0100
Subject: [PATCH 057/358] feat(core): Set custom Cache-Control headers for
 static assets (#5322)

---
 packages/cli/src/Server.ts | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 37875490feb03a..beb458cac36cd7 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -35,6 +35,7 @@ import { createHmac } from 'crypto';
 import { promisify } from 'util';
 import cookieParser from 'cookie-parser';
 import express from 'express';
+import type { ServeStaticOptions } from 'serve-static';
 import type { FindManyOptions } from 'typeorm';
 import { In } from 'typeorm';
 import type { AxiosRequestConfig } from 'axios';
@@ -1416,8 +1417,22 @@ class Server extends AbstractServer {
 			);
 		}
 
+		const staticOptions: ServeStaticOptions = {
+			cacheControl: false,
+			setHeaders: (res: express.Response, path: string) => {
+				const isIndex = path === pathJoin(GENERATED_STATIC_DIR, 'index.html');
+				const cacheControl = isIndex
+					? 'no-cache, no-store, must-revalidate'
+					: 'max-age=86400, immutable';
+				res.header('Cache-Control', cacheControl);
+			},
+		};
 		if (!config.getEnv('endpoints.disableUi')) {
-			this.app.use('/', express.static(GENERATED_STATIC_DIR), express.static(EDITOR_UI_DIST_DIR));
+			this.app.use(
+				'/',
+				express.static(GENERATED_STATIC_DIR, staticOptions),
+				express.static(EDITOR_UI_DIST_DIR, staticOptions),
+			);
 
 			const startTime = new Date().toUTCString();
 			this.app.use('/index.html', (req, res, next) => {
@@ -1425,7 +1440,7 @@ class Server extends AbstractServer {
 				next();
 			});
 		} else {
-			this.app.use('/', express.static(GENERATED_STATIC_DIR));
+			this.app.use('/', express.static(GENERATED_STATIC_DIR, staticOptions));
 		}
 	}
 }

From 6d811f0d9f503905ed74938f97f193c7c3d8e7a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 2 Feb 2023 12:35:38 +0100
Subject: [PATCH 058/358] feat(editor): Completions for extensions in
 expression editor (#5130)

* :fire: Remove test extensions

* :construction: Add test description

* :blue_book: Expand types

* :zap: Export extensions

* :zap: Export collection

* :zap: Mark all proxies

* :pencil2: Rename for clarity

* :zap: Export from barrel

* :sparkles: Create datatype completions

* :zap: Mount datatype completions

* :test_tube: Adjust tests

* :zap: Add `path` prop

* :fire: Remove `()` from completion labels

* :zap: Filter out completions for pseudo-proxies

* :bug: Fix method error

* :zap: Add metrics

* :pencil2: Improve naming

* :sparkles: Start completion on empty resolvable

* :sparkles: Implement completion previews

* :zap: Break out completion manager

* :zap: Implement in expression editor modal

* :pencil2: Improve naming

* :zap: Filter out irrelevant completions

* :sparkles: Add preview hint

* :pencil2: Improve comments

* :art: Style preview hint

* :zap: Expand `hasNoParams`

* :zap: Add spacing for readability

* :zap: Add error codes

* :pencil2: Add comment

* :bug: Fix Esc behavior

* :zap: Parse Unicode

* :zap: Throw on invalid `DateTime`

* :zap: Fix second root completion detection

* :zap: Switch message at completable prefix position

* :bug: Fix function names for non-dev build

* :bug: Fix `json` handling

* :fire: Comment out previews

* :recycle: Apply feedback

* :fire: Remove extensions

* :truck: Rename extensions

* :zap: Adjust some implementations

* :fire: Remove dummy extensions

* :bug: Fix object regex

* :recycle: Apply feedback

* :pencil2: Fix typos

* :pencil2: Add `fn is not a function` message

* :fire: Remove check

* :sparkles: Add `isNotEmpty` for objects

* :truck: Rename `global` to `alpha`

* :fire: Remove `encrypt`

* :zap: Restore `is not a function` error

* :zap: Support `week` on `extract()`

* :test_tube: Fix tests

* :zap: Add validation to some string extensions

* :zap: Validate number arrays in some extensions

* :test_tube: Fix tests

* :pencil2: Improve error message

* :rewind: Revert extensions framework changes

* :broom: Previews cleanup

* :zap: Condense blank completions

* :zap: Refactor dollar completions

* :zap: Refactor non-dollar completions

* :zap: Refactor Luxon completions

* :zap: Refactor datatype completions

* :zap: Use `DATETIMEUNIT_MAP`

* :pencil2: Update test description

* :rewind: Revert "Use `DATETIMEUNIT_MAP`"

This reverts commit 472a77df5cd789905d162f3c3db02ac767b89b4e.

* :test_tube: Add tests

* :recycle: Restore generic extensions

* :fire: Remove logs

* :test_tube: Expand tests

* :sparkles: Add `Math` completions

* :pencil2: List breaking change

* :zap: Add doc tooltips

* :bug: Fix node selector regex

* :bug: Fix `context` resolution

* :bug: Allow dollar completions in args

* :zap: Make numeric array methods context-dependent

* :pencil: Adjust docs

* :bug: Fix selector ref

* :zap: Surface error for valid URL

* :bug: Disallow whitespace in `isEmail` check

* :test_tube: Fix test for `isUrl`

* :zap: Add comma validator in `toFloat`

* :zap: Add validation to `$jmespath()`

* :rewind: Revert valid URL error

* :zap: Adjust `$jmespath()` validation

* :test_tube: Adjust `isUrl` test

* :zap: Remove `{}` and `[]` from compact

* :pencil2: Update docs

* :truck: Rename `stripTags` to `removeTags`

* :zap: Do not inject whitespace inside resolvable

* :zap: Make completions aware of `()`

* :pencil2: Add note

* :zap: Update sorting

* :zap: Hide active node name from node selector

* :fire: Remove `length()` and its aliases

* :zap: Validate non-zero for `chunk`

* :pencil2: Reword all error messages

* :bug: Fix `$now` and `$today`

* :zap: Simplify with `stripExcessParens`

* :zap: Fold luxon into datatype

* :test_tube: Clean up tests

* :fire: Remove tests for removed methods

* :shirt: Fix type

* :arrow_up: Upgrade lang pack

* :rewind: Undo change to `vitest` command

* :fire: Remove unused method

* :zap: Separate `return` line

* :pencil2: Improve description

* :test_tube: Expand tests for initial-only completions

* :test_tube: Add bracket-aware completions

* :zap: Make check for `all()` stricter

* :pencil2: Adjust explanatory comments

* :fire: Remove unneded copy

* :fire: Remove outdated comment

* :zap: Make naming consistent

* :pencil2: Update comments

* :zap: Improve URL scheme check

* :pencil2: Add comment

* :truck: Move extension

* :pencil2: Update `BREAKING-CHANGES.md`

* :pencil2: Update upcoming version

* :pencil2: Fix grammar

* :pencil2: Shorten message

* :bug: Fix `Esc` behavior

* :bug: Fix `isNumeric`

* :sparkles: Support native methods

* :test_tube: Skip Pinia tests

* :pencil2: Shorten description

* :fire: Remove outdated comment

* :test_tube: Unskip Pinia tests

* :pencil2: Add comments

* :test_tube: Expand tests to natives

* :pencil2: Add clarifying comments

* :zap: Use `setTimeout` to make telemetry non-blocking

* :bug: Account for no active node in cred modal

* :sparkles: Resolve without workflow

* :fire: Remove `Esc` handling on NDV

* :zap: Use `isDateTime`

* :truck: Move `unique` to next phase

This array extension takes optional args.

* :zap: Merge export

* :test_tube: Fix tests

* :rewind: Restore check

* :pencil2: Make breaking change description more accurate

* :test_tube: Fix e2e tests
---
 cypress/e2e/11-inline-expression-editor.cy.ts |  10 +-
 cypress/e2e/9-expression-editor-modal.cy.ts   |  30 +-
 packages/cli/BREAKING-CHANGES.md              |  10 +
 packages/editor-ui/package.json               |   2 +-
 .../src/components/ExpressionEdit.vue         |   1 +
 .../ExpressionEditorModalInput.vue            |  50 ++-
 .../components/ExpressionParameterInput.vue   |   4 +
 .../InlineExpressionEditorInput.vue           |  46 ++-
 .../src/components/ParameterInput.vue         |   1 +
 .../ResourceLocator/ResourceLocator.vue       |   1 +
 .../editor-ui/src/mixins/completionManager.ts |  76 ++++
 .../editor-ui/src/mixins/expressionManager.ts | 113 +++---
 .../editor-ui/src/mixins/workflowHelpers.ts   |   1 +
 .../__tests__/alpha.completions.test.ts       |  30 --
 .../completions/__tests__/completions.test.ts | 360 ++++++++++++++++++
 .../__tests__/luxon.completions.test.ts       |  37 --
 .../codemirror/completions/__tests__/mock.ts  | 331 ++++++++++++++++
 .../__tests__/proxy.completions.test.ts       | 146 -------
 .../completions/__tests__/proxyMocks.ts       |  97 -----
 .../__tests__/root.completions.test.ts        |  80 ----
 .../completions/alpha.completions.ts          |  50 ---
 .../completions/blank.completions.ts          |  24 ++
 .../completions/bracketAccess.completions.ts  |  74 ++++
 .../completions/datatype.completions.ts       | 308 +++++++++++++++
 .../completions/dollar.completions.ts         |  79 ++++
 .../completions/luxon.completions.ts          |  84 ----
 .../completions/nonDollar.completions.ts      |  44 +++
 .../completions/proxy.completions.ts          | 106 ------
 .../completions/root.completions.ts           |  60 ---
 .../plugins/codemirror/completions/types.ts   |   8 +
 .../plugins/codemirror/completions/utils.ts   | 103 ++++-
 .../inputHandlers/expression.inputHandler.ts  |  17 +-
 .../src/plugins/codemirror/n8nLang.ts         |  21 +-
 packages/editor-ui/src/plugins/i18n/index.ts  |   3 +-
 .../src/plugins/i18n/locales/en.json          |   2 +
 packages/editor-ui/src/types/expressions.ts   |   2 +-
 packages/workflow/package.json                |   1 +
 packages/workflow/src/Expression.ts           |  44 ++-
 packages/workflow/src/ExpressionError.ts      |   7 +
 .../src/Extensions/ArrayExtensions.ts         | 190 ++++++---
 .../workflow/src/Extensions/DateExtensions.ts | 129 +++----
 .../src/Extensions/ExpressionExtension.ts     |  12 +-
 .../workflow/src/Extensions/Extensions.ts     |  10 +-
 .../src/Extensions/NumberExtensions.ts        |  62 +--
 .../src/Extensions/ObjectExtensions.ts        |  65 +++-
 .../src/Extensions/StringExtensions.ts        | 267 ++++++++++---
 packages/workflow/src/Extensions/index.ts     |   3 +
 .../src/NativeMethods/String.methods.ts       |  13 +
 packages/workflow/src/NativeMethods/index.ts  |   5 +
 packages/workflow/src/WorkflowDataProxy.ts    |  28 +-
 packages/workflow/src/index.ts                |   5 +
 .../ArrayExtensions.test.ts                   |  61 +--
 .../DateExtensions.test.ts                    |   5 -
 .../ExpressionExtension.test.ts               |  46 ++-
 .../GenericExtensions.test.ts                 |   4 +-
 .../NumberExtensions.test.ts                  |  30 +-
 .../StringExtensions.test.ts                  | 100 +----
 pnpm-lock.yaml                                |  11 +-
 58 files changed, 2269 insertions(+), 1240 deletions(-)
 create mode 100644 packages/editor-ui/src/mixins/completionManager.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/__tests__/alpha.completions.test.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/__tests__/luxon.completions.test.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxy.completions.test.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxyMocks.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/__tests__/root.completions.test.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/alpha.completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/blank.completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/luxon.completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/proxy.completions.ts
 delete mode 100644 packages/editor-ui/src/plugins/codemirror/completions/root.completions.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/types.ts
 create mode 100644 packages/workflow/src/NativeMethods/String.methods.ts
 create mode 100644 packages/workflow/src/NativeMethods/index.ts

diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index 655c87f1145348..cbc4736e2b54de 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -36,12 +36,16 @@ describe('Inline expression editor', () => {
 
 	it('should resolve object resolvables', () => {
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{} a: 1');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Object: \{"a":1\}\]$/);
+		WorkflowPage.getters
+			.inlineExpressionEditorInput()
+			.type('{ a: 1 }', { parseSpecialCharSequences: false });
+		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Object: \{"a": 1\}\]$/);
 		WorkflowPage.getters.inlineExpressionEditorInput().clear();
 
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
-		WorkflowPage.getters.inlineExpressionEditorInput().type('{{} a: 1 }.a{del}{del}');
+		WorkflowPage.getters
+			.inlineExpressionEditorInput()
+			.type('{ a: 1 }.a', { parseSpecialCharSequences: false });
 		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^1$/);
 	});
 
diff --git a/cypress/e2e/9-expression-editor-modal.cy.ts b/cypress/e2e/9-expression-editor-modal.cy.ts
index 19bf0dd3ab150d..1a8909872de5f0 100644
--- a/cypress/e2e/9-expression-editor-modal.cy.ts
+++ b/cypress/e2e/9-expression-editor-modal.cy.ts
@@ -17,49 +17,45 @@ describe('Expression editor modal', () => {
 	});
 
 	it('should resolve primitive resolvables', () => {
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('1 + 2');
+		WorkflowPage.getters.expressionModalInput().type('{{ 1 + 2');
 		WorkflowPage.getters.expressionModalOutput().contains(/^3$/);
 		WorkflowPage.getters.expressionModalInput().clear();
 
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('"ab" + "cd"');
+		WorkflowPage.getters.expressionModalInput().type('{{ "ab" + "cd"');
 		WorkflowPage.getters.expressionModalOutput().contains(/^abcd$/);
 
 		WorkflowPage.getters.expressionModalInput().clear();
 
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('true && false');
+		WorkflowPage.getters.expressionModalInput().type('{{ true && false');
 		WorkflowPage.getters.expressionModalOutput().contains(/^false$/);
 	});
 
 	it('should resolve object resolvables', () => {
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('{{} a: 1');
-		WorkflowPage.getters.expressionModalOutput().contains(/^\[Object: \{"a":1\}\]$/);
+		WorkflowPage.getters
+			.expressionModalInput()
+			.type('{{ { a : 1 }', { parseSpecialCharSequences: false });
+		WorkflowPage.getters.expressionModalOutput().contains(/^\[Object: \{"a": 1\}\]$/);
 
 		WorkflowPage.getters.expressionModalInput().clear();
 
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('{{} a: 1 }.a{del}{del}');
+		WorkflowPage.getters
+			.expressionModalInput()
+			.type('{{ { a : 1 }.a', { parseSpecialCharSequences: false });
 		WorkflowPage.getters.expressionModalOutput().contains(/^1$/);
 	});
 
 	it('should resolve array resolvables', () => {
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('[1, 2, 3]');
+		WorkflowPage.getters.expressionModalInput().type('{{ [1, 2, 3]');
 		WorkflowPage.getters.expressionModalOutput().contains(/^\[Array: \[1,2,3\]\]$/);
 
 		WorkflowPage.getters.expressionModalInput().clear();
 
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('[1, 2, 3][0]');
+		WorkflowPage.getters.expressionModalInput().type('{{ [1, 2, 3][0]');
 		WorkflowPage.getters.expressionModalOutput().contains(/^1$/);
 	});
 
 	it('should resolve $parameter[]', () => {
-		WorkflowPage.getters.expressionModalInput().type('{{');
-		WorkflowPage.getters.expressionModalInput().type('$parameter["operation"]');
+		WorkflowPage.getters.expressionModalInput().type('{{ $parameter["operation"]');
 		WorkflowPage.getters.expressionModalOutput().contains(/^get$/);
 	});
 });
diff --git a/packages/cli/BREAKING-CHANGES.md b/packages/cli/BREAKING-CHANGES.md
index d762f824da579b..624ddacb42db02 100644
--- a/packages/cli/BREAKING-CHANGES.md
+++ b/packages/cli/BREAKING-CHANGES.md
@@ -2,6 +2,16 @@
 
 This list shows all the versions which include breaking changes and how to upgrade.
 
+## 0.214.0
+
+### What changed?
+
+Invalid Luxon datetimes no longer resolve to `null`. Now they throw the error `invalid DateTime`.
+
+### When is action necessary?
+
+If you are relying on the above behavior, review your workflow to ensure you handle invalid Luxon datetimes.
+
 ## 0.202.0
 
 ### What changed?
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 2a0d066bf3f3a5..0caf329d6cb688 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -46,7 +46,7 @@
     "@jsplumb/util": "^5.13.2",
     "axios": "^0.21.1",
     "codemirror-lang-html-n8n": "^1.0.0",
-    "codemirror-lang-n8n-expression": "^0.1.0",
+    "codemirror-lang-n8n-expression": "^0.2.0",
     "dateformat": "^3.0.3",
     "esprima-next": "5.8.4",
     "fast-json-stable-stringify": "^2.1.0",
diff --git a/packages/editor-ui/src/components/ExpressionEdit.vue b/packages/editor-ui/src/components/ExpressionEdit.vue
index 2baf3f9900d9c9..32daae6fda8bb5 100644
--- a/packages/editor-ui/src/components/ExpressionEdit.vue
+++ b/packages/editor-ui/src/components/ExpressionEdit.vue
@@ -46,6 +46,7 @@
 							<ExpressionEditorModalInput
 								:value="value"
 								:isReadOnly="isReadOnly"
+								:path="path"
 								@change="valueChanged"
 								@close="closeDialog"
 								ref="inputFieldExpression"
diff --git a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
index e471c0ed951656..a5b49355d1a446 100644
--- a/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
+++ b/packages/editor-ui/src/components/ExpressionEditorModal/ExpressionEditorModalInput.vue
@@ -1,30 +1,34 @@
 <template>
-	<div ref="root" class="ph-no-capture" @keydown.stop @keydown.esc="onClose"></div>
+	<div ref="root" class="ph-no-capture" @keydown.stop></div>
 </template>
 
 <script lang="ts">
 import mixins from 'vue-typed-mixins';
-import { EditorView } from '@codemirror/view';
-import { EditorState } from '@codemirror/state';
+import { EditorView, keymap } from '@codemirror/view';
+import { EditorState, Prec } from '@codemirror/state';
 import { history } from '@codemirror/commands';
 
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { expressionManager } from '@/mixins/expressionManager';
+import { completionManager } from '@/mixins/completionManager';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import { n8nLang } from '@/plugins/codemirror/n8nLang';
 import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
 import { inputTheme } from './theme';
-
-import type { IVariableItemSelected } from '@/Interface';
 import { forceParse } from '@/utils/forceParse';
 import { autocompletion } from '@codemirror/autocomplete';
 
-export default mixins(expressionManager, workflowHelpers).extend({
+import type { IVariableItemSelected } from '@/Interface';
+
+export default mixins(expressionManager, completionManager, workflowHelpers).extend({
 	name: 'ExpressionEditorModalInput',
 	props: {
 		value: {
 			type: String,
 		},
+		path: {
+			type: String,
+		},
 		isReadOnly: {
 			type: Boolean,
 		},
@@ -38,6 +42,20 @@ export default mixins(expressionManager, workflowHelpers).extend({
 		const extensions = [
 			inputTheme(),
 			autocompletion(),
+			Prec.highest(
+				keymap.of([
+					{
+						any: (_: EditorView, event: KeyboardEvent) => {
+							if (event.key === 'Escape') {
+								event.stopPropagation();
+								this.$emit('close');
+							}
+
+							return false;
+						},
+					},
+				]),
+			),
 			n8nLang(),
 			history(),
 			expressionInputHandler(),
@@ -50,14 +68,17 @@ export default mixins(expressionManager, workflowHelpers).extend({
 				highlighter.removeColor(this.editor, this.plaintextSegments);
 				highlighter.addColor(this.editor, this.resolvableSegments);
 
-				setTimeout(() => this.editor?.focus()); // prevent blur on paste
-
 				setTimeout(() => {
-					this.$emit('change', {
-						value: this.unresolvedExpression,
-						segments: this.displayableSegments,
-					});
-				}, this.evaluationDelay);
+					this.editor?.focus(); // prevent blur on paste
+					try {
+						this.trackCompletion(viewUpdate, this.path);
+					} catch {}
+				});
+
+				this.$emit('change', {
+					value: this.unresolvedExpression,
+					segments: this.displayableSegments,
+				});
 			}),
 		];
 
@@ -86,9 +107,6 @@ export default mixins(expressionManager, workflowHelpers).extend({
 		this.editor?.destroy();
 	},
 	methods: {
-		onClose() {
-			this.$emit('close');
-		},
 		itemSelected({ variable }: IVariableItemSelected) {
 			if (!this.editor || this.isReadOnly) return;
 
diff --git a/packages/editor-ui/src/components/ExpressionParameterInput.vue b/packages/editor-ui/src/components/ExpressionParameterInput.vue
index b4a1471c4f4b18..51e58eef9dc9d4 100644
--- a/packages/editor-ui/src/components/ExpressionParameterInput.vue
+++ b/packages/editor-ui/src/components/ExpressionParameterInput.vue
@@ -15,6 +15,7 @@
 				:isReadOnly="isReadOnly"
 				:targetItem="hoveringItem"
 				:isSingleLine="isForRecordLocator"
+				:path="path"
 				@focus="onFocus"
 				@blur="onBlur"
 				@change="onChange"
@@ -93,6 +94,9 @@ export default Vue.extend({
 		};
 	},
 	props: {
+		path: {
+			type: String,
+		},
 		value: {
 			type: String,
 		},
diff --git a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
index 7358e7ea0da723..fde32c76ded991 100644
--- a/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
+++ b/packages/editor-ui/src/components/InlineExpressionEditor/InlineExpressionEditorInput.vue
@@ -5,9 +5,10 @@
 <script lang="ts">
 import mixins from 'vue-typed-mixins';
 import { mapStores } from 'pinia';
-import { EditorView } from '@codemirror/view';
-import { EditorState } from '@codemirror/state';
+import { EditorView, keymap } from '@codemirror/view';
+import { EditorState, Prec } from '@codemirror/state';
 import { history } from '@codemirror/commands';
+import { autocompletion, completionStatus } from '@codemirror/autocomplete';
 
 import { useNDVStore } from '@/stores/ndv';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
@@ -15,10 +16,10 @@ import { expressionManager } from '@/mixins/expressionManager';
 import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import { inputTheme } from './theme';
-import { autocompletion, ifIn } from '@codemirror/autocomplete';
 import { n8nLang } from '@/plugins/codemirror/n8nLang';
+import { completionManager } from '@/mixins/completionManager';
 
-export default mixins(expressionManager, workflowHelpers).extend({
+export default mixins(completionManager, expressionManager, workflowHelpers).extend({
 	name: 'InlineExpressionEditorInput',
 	props: {
 		value: {
@@ -32,11 +33,9 @@ export default mixins(expressionManager, workflowHelpers).extend({
 			type: Boolean,
 			default: false,
 		},
-	},
-	data() {
-		return {
-			cursorPosition: 0,
-		};
+		path: {
+			type: String,
+		},
 	},
 	watch: {
 		value(newValue) {
@@ -77,6 +76,19 @@ export default mixins(expressionManager, workflowHelpers).extend({
 	mounted() {
 		const extensions = [
 			inputTheme({ isSingleLine: this.isSingleLine }),
+			Prec.highest(
+				keymap.of([
+					{
+						any(view: EditorView, event: KeyboardEvent) {
+							if (event.key === 'Escape' && completionStatus(view.state) !== null) {
+								event.stopPropagation();
+							}
+
+							return false;
+						},
+					},
+				]),
+			),
 			autocompletion(),
 			n8nLang(),
 			history(),
@@ -94,14 +106,16 @@ export default mixins(expressionManager, workflowHelpers).extend({
 				highlighter.removeColor(this.editor, this.plaintextSegments);
 				highlighter.addColor(this.editor, this.resolvableSegments);
 
-				this.cursorPosition = viewUpdate.view.state.selection.ranges[0].from;
-
 				setTimeout(() => {
-					this.$emit('change', {
-						value: this.unresolvedExpression,
-						segments: this.displayableSegments,
-					});
-				}, this.evaluationDelay);
+					try {
+						this.trackCompletion(viewUpdate, this.path);
+					} catch {}
+				});
+
+				this.$emit('change', {
+					value: this.unresolvedExpression,
+					segments: this.displayableSegments,
+				});
 			}),
 		];
 
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index f46debb344ce9f..fba845a65f2459 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -38,6 +38,7 @@
 				:value="expressionDisplayValue"
 				:title="displayTitle"
 				:isReadOnly="isReadOnly"
+				:path="path"
 				@valueChanged="expressionUpdated"
 				@modalOpenerClick="openExpressionEditorModal"
 				@focus="setFocus"
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 35324aca5b2141..1d892ca04ff389 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -81,6 +81,7 @@
 								<ExpressionParameterInput
 									v-if="isValueExpression || forceShowExpression"
 									:value="expressionDisplayValue"
+									:path="path"
 									isForRecordLocator
 									@valueChanged="onInputChange"
 									@modalOpenerClick="$emit('modalOpenerClick')"
diff --git a/packages/editor-ui/src/mixins/completionManager.ts b/packages/editor-ui/src/mixins/completionManager.ts
new file mode 100644
index 00000000000000..ba4c39dbfd4b87
--- /dev/null
+++ b/packages/editor-ui/src/mixins/completionManager.ts
@@ -0,0 +1,76 @@
+import mixins from 'vue-typed-mixins';
+import { ExpressionExtensions } from 'n8n-workflow';
+import { EditorView, ViewUpdate } from '@codemirror/view';
+
+import { expressionManager } from './expressionManager';
+
+export const completionManager = mixins(expressionManager).extend({
+	data() {
+		return {
+			editor: {} as EditorView,
+		};
+	},
+	computed: {
+		expressionExtensionsCategories() {
+			return ExpressionExtensions.reduce<Record<string, string | undefined>>((acc, cur) => {
+				for (const fnName of Object.keys(cur.functions)) {
+					acc[fnName] = cur.typeName;
+				}
+
+				return acc;
+			}, {});
+		},
+	},
+	methods: {
+		trackCompletion(viewUpdate: ViewUpdate, parameterPath: string) {
+			const completionTx = viewUpdate.transactions.find((tx) => tx.isUserEvent('input.complete'));
+
+			if (!completionTx) return;
+
+			let completion = '';
+			let completionBase = '';
+
+			viewUpdate.changes.iterChanges((_: number, __: number, fromB: number, toB: number) => {
+				completion = this.editor.state.doc.slice(fromB, toB).toString();
+
+				const index = this.findCompletionBaseStartIndex(fromB);
+
+				completionBase = this.editor.state.doc
+					.slice(index, fromB - 1)
+					.toString()
+					.trim();
+			});
+
+			const category = this.expressionExtensionsCategories[completion];
+
+			const payload = {
+				instance_id: this.rootStore.instanceId,
+				node_type: this.ndvStore.activeNode?.type,
+				field_name: parameterPath,
+				field_type: 'expression',
+				context: completionBase,
+				inserted_text: completion,
+				category: category ?? 'n/a', // only applicable if expression extension completion
+			};
+
+			this.$telemetry.track('User autocompleted code', payload);
+		},
+
+		findCompletionBaseStartIndex(fromIndex: number) {
+			const INDICATORS = [
+				' $', // proxy
+				'{ ', // primitive
+			];
+
+			const doc = this.editor.state.doc.toString();
+
+			for (let index = fromIndex; index > 0; index--) {
+				if (INDICATORS.some((indicator) => indicator === doc[index] + doc[index + 1])) {
+					return index + 1;
+				}
+			}
+
+			return -1;
+		},
+	},
+});
diff --git a/packages/editor-ui/src/mixins/expressionManager.ts b/packages/editor-ui/src/mixins/expressionManager.ts
index 09632813cd3b7a..f687cbc17d0037 100644
--- a/packages/editor-ui/src/mixins/expressionManager.ts
+++ b/packages/editor-ui/src/mixins/expressionManager.ts
@@ -1,4 +1,5 @@
 import mixins from 'vue-typed-mixins';
+import { Expression, ExpressionExtensions } from 'n8n-workflow';
 import { mapStores } from 'pinia';
 import { ensureSyntaxTree } from '@codemirror/language';
 
@@ -19,8 +20,7 @@ export const expressionManager = mixins(workflowHelpers).extend({
 	},
 	data() {
 		return {
-			editor: null as EditorView | null,
-			errorsInSuccession: 0,
+			editor: {} as EditorView,
 		};
 	},
 	watch: {
@@ -56,13 +56,19 @@ export const expressionManager = mixins(workflowHelpers).extend({
 			return this.segments.filter((s): s is Plaintext => s.kind === 'plaintext');
 		},
 
+		expressionExtensionNames(): Set<string> {
+			return new Set(
+				ExpressionExtensions.reduce<string[]>((acc, cur) => {
+					return [...acc, ...Object.keys(cur.functions)];
+				}, []),
+			);
+		},
+
 		htmlSegments(): Html[] {
 			return this.segments.filter((s): s is Html => s.kind !== 'resolvable');
 		},
 
 		segments(): Segment[] {
-			if (!this.editor) return [];
-
 			const rawSegments: RawSegment[] = [];
 
 			const fullTree = ensureSyntaxTree(
@@ -76,76 +82,49 @@ export const expressionManager = mixins(workflowHelpers).extend({
 			}
 
 			fullTree.cursor().iterate((node) => {
-				if (!this.editor || node.type.name === 'Program') return;
+				if (node.type.name === 'Program') return;
 
 				rawSegments.push({
 					from: node.from,
 					to: node.to,
 					text: this.editor.state.sliceDoc(node.from, node.to),
-					type: node.type.name,
+					token: node.type.name,
 				});
 			});
 
 			return rawSegments.reduce<Segment[]>((acc, segment) => {
-				const { from, to, text, type } = segment;
-
-				if (type === 'Resolvable') {
-					const { resolved, error, fullError } = this.resolve(text, this.hoveringItem);
+				const { from, to, text, token } = segment;
 
-					acc.push({ kind: 'resolvable', from, to, resolvable: text, resolved, error, fullError });
+				if (token === 'Plaintext') {
+					acc.push({ kind: 'plaintext', from, to, plaintext: text });
 
 					return acc;
 				}
 
-				acc.push({ kind: 'plaintext', from, to, plaintext: text });
+				const { resolved, error, fullError } = this.resolve(text, this.hoveringItem);
+
+				acc.push({ kind: 'resolvable', from, to, resolvable: text, resolved, error, fullError });
 
 				return acc;
 			}, []);
 		},
 
-		evaluationDelay() {
-			const DEFAULT_EVALUATION_DELAY = 300; // ms
-
-			const prevErrorsInSuccession = this.errorsInSuccession;
-
-			if (this.resolvableSegments.filter((s) => s.error).length > 0) {
-				this.errorsInSuccession += 1;
-			} else {
-				this.errorsInSuccession = 0;
-			}
-
-			const addsNewError = this.errorsInSuccession > prevErrorsInSuccession;
-
-			let delay = DEFAULT_EVALUATION_DELAY;
-
-			if (addsNewError && this.errorsInSuccession > 1 && this.errorsInSuccession < 5) {
-				delay = DEFAULT_EVALUATION_DELAY * this.errorsInSuccession;
-			} else if (addsNewError && this.errorsInSuccession >= 5) {
-				delay = 0;
-			}
-
-			return delay;
-		},
-
 		/**
-		 * Some segments are conditionally displayed, i.e. not displayed when they are
-		 * _part_ of the result, but displayed when they are the _entire_ result.
+		 * Segments to display in the output of an expression editor.
+		 *
+		 * Some segments are not displayed when they are _part_ of the result,
+		 * but displayed when they are the _entire_ result:
+		 *
+		 * - `This is a {{ [] }} test` displays as `This is a test`.
+		 * - `{{ [] }}` displays as `[Array: []]`.
 		 *
-		 * Example:
-		 * - Expression `This is a {{ [] }} test` is displayed as `This is a test`.
-		 * - Expression `{{ [] }}` is displayed as `[Array: []]`.
+		 * Some segments display differently based on context:
 		 *
-		 * Conditionally displayed segments:
-		 * - `[Array: []]`
-		 * - `[empty]` (from `''`, not from `undefined`)
+		 * Date displays as
+		 * - `Mon Nov 14 2022 17:26:13 GMT+0100 (CST)` when part of the result
+		 * - `[Object: "2022-11-14T17:26:13.130Z"]` when the entire result
 		 *
-		 * Exceptionally, for two segments, display differs based on context:
-		 * - Date is displayed as
-		 *   - `Mon Nov 14 2022 17:26:13 GMT+0100 (CST)` when part of the result
-		 *   - `[Object: "2022-11-14T17:26:13.130Z"]` when the entire result
-		 * - Non-empty array is displayed as
-		 *   - `1,2,3` when part of the result
-		 *   - `[Array: [1, 2, 3]]` when the entire result
+		 * Only needed in order to mimic behavior of `ParameterInputHint`.
 		 */
 		displayableSegments(): Segment[] {
 			return this.segments
@@ -191,12 +170,17 @@ export const expressionManager = mixins(workflowHelpers).extend({
 			};
 
 			try {
-				result.resolved = this.resolveExpression('=' + resolvable, undefined, {
-					targetItem: targetItem ?? undefined,
-					inputNodeName: this.ndvStore.ndvInputNodeName,
-					inputRunIndex: this.ndvStore.ndvInputRunIndex,
-					inputBranchIndex: this.ndvStore.ndvInputBranchIndex,
-				});
+				if (!useNDVStore().activeNode) {
+					// e.g. credential modal
+					result.resolved = Expression.resolveWithoutWorkflow(resolvable);
+				} else {
+					result.resolved = this.resolveExpression('=' + resolvable, undefined, {
+						targetItem: targetItem ?? undefined,
+						inputNodeName: this.ndvStore.ndvInputNodeName,
+						inputRunIndex: this.ndvStore.ndvInputRunIndex,
+						inputBranchIndex: this.ndvStore.ndvInputBranchIndex,
+					});
+				}
 			} catch (error) {
 				result.resolved = `[${error.message}]`;
 				result.error = true;
@@ -212,7 +196,10 @@ export const expressionManager = mixins(workflowHelpers).extend({
 			}
 
 			if (result.resolved === undefined) {
-				result.resolved = this.$locale.baseText('expressionModalInput.undefined');
+				result.resolved = this.isUncalledExpressionExtension(resolvable)
+					? this.$locale.baseText('expressionEditor.uncalledFunction')
+					: this.$locale.baseText('expressionModalInput.undefined');
+
 				result.error = true;
 			}
 
@@ -222,5 +209,15 @@ export const expressionManager = mixins(workflowHelpers).extend({
 
 			return result;
 		},
+
+		isUncalledExpressionExtension(resolvable: string) {
+			const end = resolvable
+				.replace(/^{{|}}$/g, '')
+				.trim()
+				.split('.')
+				.pop();
+
+			return end !== undefined && this.expressionExtensionNames.has(end);
+		},
 	},
 });
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.ts b/packages/editor-ui/src/mixins/workflowHelpers.ts
index 46a4a9656699d0..647c9c1a26d8b4 100644
--- a/packages/editor-ui/src/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/mixins/workflowHelpers.ts
@@ -82,6 +82,7 @@ export function resolveParameter(
 
 	const inputName = 'main';
 	const activeNode = useNDVStore().activeNode;
+
 	const workflow = getCurrentWorkflow();
 	const workflowRunData = useWorkflowsStore().getWorkflowRunData;
 	let parentNode = workflow.getParentNodes(activeNode!.name, inputName, 1);
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/alpha.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/alpha.completions.test.ts
deleted file mode 100644
index 234bc5246a0eaa..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/alpha.completions.test.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { alphaCompletions } from '../alpha.completions';
-import { CompletionContext } from '@codemirror/autocomplete';
-import { EditorState } from '@codemirror/state';
-
-const EXPLICIT = false;
-
-test('should return alphabetic char completion options: D', () => {
-	const doc = '{{ D }}';
-	const position = doc.indexOf('D') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = alphaCompletions(context);
-
-	if (!result) throw new Error('Expected D completion options');
-
-	const { options, from } = result;
-
-	expect(options.map((o) => o.label)).toEqual(['DateTime']);
-	expect(from).toEqual(position - 1);
-});
-
-test('should not return alphabetic char completion options: $input.D', () => {
-	const doc = '{{ $input.D }}';
-	const position = doc.indexOf('D') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = alphaCompletions(context);
-
-	expect(result).toBeNull();
-});
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
new file mode 100644
index 00000000000000..4e9ab0148e584e
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
@@ -0,0 +1,360 @@
+import { createTestingPinia } from '@pinia/testing';
+import { setActivePinia } from 'pinia';
+import { DateTime } from 'luxon';
+
+import * as workflowHelpers from '@/mixins/workflowHelpers';
+import { dollarOptions } from '@/plugins/codemirror/completions/dollar.completions';
+import * as utils from '@/plugins/codemirror/completions/utils';
+import {
+	extensions,
+	luxonInstanceOptions,
+	luxonStaticOptions,
+	natives,
+} from '@/plugins/codemirror/completions/datatype.completions';
+
+import { mockNodes, mockProxy } from './mock';
+import { CompletionContext, CompletionSource, CompletionResult } from '@codemirror/autocomplete';
+import { EditorState } from '@codemirror/state';
+import { n8nLang } from '@/plugins/codemirror/n8nLang';
+
+beforeEach(() => {
+	setActivePinia(createTestingPinia());
+	vi.spyOn(utils, 'receivesNoBinaryData').mockReturnValue(true); // hide $binary
+	vi.spyOn(utils, 'isSplitInBatchesAbsent').mockReturnValue(false); // show context
+	vi.spyOn(utils, 'hasActiveNode').mockReturnValue(true);
+});
+
+describe('No completions', () => {
+	test('should not return completions mid-word: {{ "ab|c" }}', () => {
+		expect(completions('{{ "ab|c" }}')).toBeNull();
+	});
+
+	test('should not return completions for isolated dot: {{ "abc. |" }}', () => {
+		expect(completions('{{ "abc. |" }}')).toBeNull();
+	});
+});
+
+describe('Top-level completions', () => {
+	test('should return dollar completions for blank position: {{ | }}', () => {
+		expect(completions('{{ | }}')).toHaveLength(dollarOptions().length);
+	});
+
+	test('should return DateTime completion for: {{ D| }}', () => {
+		const found = completions('{{ D| }}');
+
+		if (!found) throw new Error('Expected to find completion');
+
+		expect(found).toHaveLength(1);
+		expect(found[0].label).toBe('DateTime');
+	});
+
+	test('should return Math completion for: {{ M| }}', () => {
+		const found = completions('{{ M| }}');
+
+		if (!found) throw new Error('Expected to find completion');
+
+		expect(found).toHaveLength(1);
+		expect(found[0].label).toBe('Math');
+	});
+
+	test('should return dollar completions for: {{ $| }}', () => {
+		expect(completions('{{ $| }}')).toHaveLength(dollarOptions().length);
+	});
+
+	test('should return node selector completions for: {{ $(| }}', () => {
+		const initialState = { workflows: { workflow: { nodes: mockNodes } } };
+
+		setActivePinia(createTestingPinia({ initialState }));
+
+		expect(completions('{{ $(| }}')).toHaveLength(mockNodes.length);
+	});
+});
+
+describe('Luxon method completions', () => {
+	const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
+
+	test('should return class completions for: {{ DateTime.| }}', () => {
+		// @ts-expect-error Spied function is mistyped
+		resolveParameterSpy.mockReturnValueOnce(DateTime);
+
+		expect(completions('{{ DateTime.| }}')).toHaveLength(luxonStaticOptions().length);
+	});
+
+	test('should return instance completions for: {{ $now.| }}', () => {
+		// @ts-expect-error Spied function is mistyped
+		resolveParameterSpy.mockReturnValueOnce(DateTime.now());
+
+		expect(completions('{{ $now.| }}')).toHaveLength(
+			luxonInstanceOptions().length + extensions('date').length,
+		);
+	});
+
+	test('should return instance completions for: {{ $today.| }}', () => {
+		// @ts-expect-error Spied function is mistyped
+		resolveParameterSpy.mockReturnValueOnce(DateTime.now());
+
+		expect(completions('{{ $today.| }}')).toHaveLength(
+			luxonInstanceOptions().length + extensions('date').length,
+		);
+	});
+});
+
+describe('Resolution-based completions', () => {
+	const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
+
+	describe('literals', () => {
+		test('should return completions for string literal: {{ "abc".| }}', () => {
+			// @ts-expect-error Spied function is mistyped
+			resolveParameterSpy.mockReturnValueOnce('abc');
+
+			expect(completions('{{ "abc".| }}')).toHaveLength(
+				natives('string').length + extensions('string').length,
+			);
+		});
+
+		test('should return completions for number literal: {{ (123).| }}', () => {
+			// @ts-expect-error Spied function is mistyped
+			resolveParameterSpy.mockReturnValueOnce(123);
+
+			expect(completions('{{ (123).| }}')).toHaveLength(
+				natives('number').length + extensions('number').length,
+			);
+		});
+
+		test('should return completions for array literal: {{ [1, 2, 3].| }}', () => {
+			// @ts-expect-error Spied function is mistyped
+			resolveParameterSpy.mockReturnValueOnce([1, 2, 3]);
+
+			expect(completions('{{ [1, 2, 3].| }}')).toHaveLength(
+				natives('array').length + extensions('array').length,
+			);
+		});
+
+		test('should return completions for object literal', () => {
+			const object = { a: 1 };
+
+			resolveParameterSpy.mockReturnValueOnce(object);
+
+			expect(completions('{{ ({ a: 1 }).| }}')).toHaveLength(
+				Object.keys(object).length + natives('object').length + extensions('object').length,
+			);
+		});
+	});
+
+	describe('bracket-aware completions', () => {
+		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
+		const { $input } = mockProxy;
+
+		test('should return bracket-aware completions for: {{ $input.item.json.str.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item.json.str);
+
+			const found = completions('{{ $input.item.json.str.|() }}');
+
+			if (!found) throw new Error('Expected to find completions');
+
+			expect(found).toHaveLength(extensions('string').length);
+			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
+		});
+
+		test('should return bracket-aware completions for: {{ $input.item.json.num.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item.json.num);
+
+			const found = completions('{{ $input.item.json.num.|() }}');
+
+			if (!found) throw new Error('Expected to find completions');
+
+			expect(found).toHaveLength(extensions('number').length);
+			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
+		});
+
+		test('should return bracket-aware completions for: {{ $input.item.json.arr.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item.json.arr);
+
+			const found = completions('{{ $input.item.json.arr.|() }}');
+
+			if (!found) throw new Error('Expected to find completions');
+
+			expect(found).toHaveLength(extensions('array').length);
+			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
+		});
+	});
+
+	describe('references', () => {
+		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
+		const { $input, $ } = mockProxy;
+
+		test('should return completions for: {{ $input.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input);
+
+			expect(completions('{{ $input.| }}')).toHaveLength(Reflect.ownKeys($input).length);
+		});
+
+		test("should return completions for: {{ $('nodeName').| }}", () => {
+			resolveParameterSpy.mockReturnValue($('Rename'));
+
+			expect(completions('{{ $("Rename").| }}')).toHaveLength(
+				Reflect.ownKeys($('Rename')).length - ['pairedItem'].length,
+			);
+		});
+
+		test('should return completions for: {{ $input.item.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item);
+
+			const found = completions('{{ $input.item.| }}');
+
+			if (!found) throw new Error('Expected to find completion');
+
+			expect(found).toHaveLength(1);
+			expect(found[0].label).toBe('json');
+		});
+
+		test('should return completions for: {{ $input.first().| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.first());
+
+			const found = completions('{{ $input.first().| }}');
+
+			if (!found) throw new Error('Expected to find completion');
+
+			expect(found).toHaveLength(1);
+			expect(found[0].label).toBe('json');
+		});
+
+		test('should return completions for: {{ $input.last().| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.last());
+
+			const found = completions('{{ $input.last().| }}');
+
+			if (!found) throw new Error('Expected to find completion');
+
+			expect(found).toHaveLength(1);
+			expect(found[0].label).toBe('json');
+		});
+
+		test('should return no completions for: {{ $input.all().| }}', () => {
+			// @ts-expect-error
+			resolveParameterSpy.mockReturnValue([$input.item]);
+
+			expect(completions('{{ $input.all().| }}')).toBeNull();
+		});
+
+		test("should return completions for: '{{ $input.item.| }}'", () => {
+			resolveParameterSpy.mockReturnValue($input.item.json);
+
+			expect(completions('{{ $input.item.| }}')).toHaveLength(
+				Object.keys($input.item.json).length + extensions('object').length,
+			);
+		});
+
+		test("should return completions for: '{{ $input.first().| }}'", () => {
+			resolveParameterSpy.mockReturnValue($input.first().json);
+
+			expect(completions('{{ $input.first().| }}')).toHaveLength(
+				Object.keys($input.first().json).length + extensions('object').length,
+			);
+		});
+
+		test("should return completions for: '{{ $input.last().| }}'", () => {
+			resolveParameterSpy.mockReturnValue($input.last().json);
+
+			expect(completions('{{ $input.last().| }}')).toHaveLength(
+				Object.keys($input.last().json).length + extensions('object').length,
+			);
+		});
+
+		test("should return completions for: '{{ $input.all()[0].| }}'", () => {
+			resolveParameterSpy.mockReturnValue($input.all()[0].json);
+
+			expect(completions('{{ $input.all()[0].| }}')).toHaveLength(
+				Object.keys($input.all()[0].json).length + extensions('object').length,
+			);
+		});
+
+		test('should return completions for: {{ $input.item.json.str.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item.json.str);
+
+			expect(completions('{{ $input.item.json.str.| }}')).toHaveLength(extensions('string').length);
+		});
+
+		test('should return completions for: {{ $input.item.json.num.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item.json.num);
+
+			expect(completions('{{ $input.item.json.num.| }}')).toHaveLength(extensions('number').length);
+		});
+
+		test('should return completions for: {{ $input.item.json.arr.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item.json.arr);
+
+			expect(completions('{{ $input.item.json.arr.| }}')).toHaveLength(extensions('array').length);
+		});
+
+		test('should return completions for: {{ $input.item.json.obj.| }}', () => {
+			resolveParameterSpy.mockReturnValue($input.item.json.obj);
+
+			expect(completions('{{ $input.item.json.obj.| }}')).toHaveLength(
+				Object.keys($input.item.json.obj).length + extensions('object').length,
+			);
+		});
+	});
+
+	describe('bracket access', () => {
+		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
+		const { $input } = mockProxy;
+
+		['{{ $input.item.json[| }}', '{{ $json[| }}'].forEach((expression) => {
+			test(`should return completions for: ${expression}`, () => {
+				resolveParameterSpy.mockReturnValue($input.item.json);
+
+				const found = completions(expression);
+
+				if (!found) throw new Error('Expected to find completions');
+
+				expect(found).toHaveLength(Object.keys($input.item.json).length);
+				expect(found.map((c) => c.label).every((l) => l.endsWith(']')));
+			});
+		});
+
+		["{{ $input.item.json['obj'][| }}", "{{ $json['obj'][| }}"].forEach((expression) => {
+			test(`should return completions for: ${expression}`, () => {
+				resolveParameterSpy.mockReturnValue($input.item.json.obj);
+
+				const found = completions(expression);
+
+				if (!found) throw new Error('Expected to find completions');
+
+				expect(found).toHaveLength(Object.keys($input.item.json.obj).length);
+				expect(found.map((c) => c.label).every((l) => l.endsWith(']')));
+			});
+		});
+	});
+});
+
+export function completions(docWithCursor: string) {
+	const cursorPosition = docWithCursor.indexOf('|');
+
+	const doc = docWithCursor.slice(0, cursorPosition) + docWithCursor.slice(cursorPosition + 1);
+
+	const state = EditorState.create({
+		doc,
+		selection: { anchor: cursorPosition },
+		extensions: [n8nLang()],
+	});
+
+	const context = new CompletionContext(state, cursorPosition, false);
+
+	for (const completionSource of state.languageDataAt<CompletionSource>(
+		'autocomplete',
+		cursorPosition,
+	)) {
+		const result = completionSource(context);
+
+		if (isCompletionResult(result)) return result.options;
+	}
+
+	return null;
+}
+
+function isCompletionResult(
+	candidate: ReturnType<CompletionSource>,
+): candidate is CompletionResult {
+	return candidate !== null && 'from' in candidate && 'options' in candidate;
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/luxon.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/luxon.completions.test.ts
deleted file mode 100644
index ffd13032e2609b..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/luxon.completions.test.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-import { CompletionContext } from '@codemirror/autocomplete';
-import { EditorState } from '@codemirror/state';
-import { dateTimeOptions, nowTodayOptions, luxonCompletions } from '../luxon.completions';
-
-const EXPLICIT = false;
-
-test('should return luxon completion options: $now, $today', () => {
-	['$now', '$today'].forEach((luxonVar) => {
-		const doc = `{{ ${luxonVar}. }}`;
-		const position = doc.indexOf('.') + 1;
-		const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-		const result = luxonCompletions(context);
-
-		if (!result) throw new Error(`Expected luxon ${luxonVar} completion options`);
-
-		const { options, from } = result;
-
-		expect(options.map((o) => o.label)).toEqual(nowTodayOptions().map((o) => o.label));
-		expect(from).toEqual(position);
-	});
-});
-
-test('should return luxon completion options: DateTime', () => {
-	const doc = '{{ DateTime. }}';
-	const position = doc.indexOf('.') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = luxonCompletions(context);
-
-	if (!result) throw new Error('Expected luxon completion options');
-
-	const { options, from } = result;
-
-	expect(options.map((o) => o.label)).toEqual(dateTimeOptions().map((o) => o.label));
-	expect(from).toEqual(position);
-});
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
new file mode 100644
index 00000000000000..811e4276af4ff8
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/mock.ts
@@ -0,0 +1,331 @@
+import { v4 as uuidv4 } from 'uuid';
+import {
+	INode,
+	IConnections,
+	IRunExecutionData,
+	Workflow,
+	IExecuteData,
+	WorkflowDataProxy,
+	INodeType,
+	INodeTypeData,
+	INodeTypes,
+	IVersionedNodeType,
+	NodeHelpers,
+} from 'n8n-workflow';
+
+class NodeTypesClass implements INodeTypes {
+	nodeTypes: INodeTypeData = {
+		'test.set': {
+			sourcePath: '',
+			type: {
+				description: {
+					displayName: 'Set',
+					name: 'set',
+					group: ['input'],
+					version: 1,
+					description: 'Sets a value',
+					defaults: {
+						name: 'Set',
+						color: '#0000FF',
+					},
+					inputs: ['main'],
+					outputs: ['main'],
+					properties: [
+						{
+							displayName: 'Value1',
+							name: 'value1',
+							type: 'string',
+							default: 'default-value1',
+						},
+						{
+							displayName: 'Value2',
+							name: 'value2',
+							type: 'string',
+							default: 'default-value2',
+						},
+					],
+				},
+			},
+		},
+	};
+
+	getByName(nodeType: string): INodeType | IVersionedNodeType {
+		return this.nodeTypes[nodeType].type;
+	}
+
+	getByNameAndVersion(nodeType: string, version?: number): INodeType {
+		return NodeHelpers.getVersionedNodeType(this.nodeTypes[nodeType].type, version);
+	}
+}
+
+const nodes: INode[] = [
+	{
+		name: 'Start',
+		type: 'test.set',
+		parameters: {},
+		typeVersion: 1,
+		id: 'uuid-1',
+		position: [100, 200],
+	},
+	{
+		name: 'Function',
+		type: 'test.set',
+		parameters: {
+			functionCode:
+				'// Code here will run only once, no matter how many input items there are.\n// More info and help: https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.function/\nconst { DateTime, Duration, Interval } = require("luxon");\n\nconst data = [\n  {\n  "length": 105\n  },\n  {\n  "length": 160\n  },\n  {\n  "length": 121\n  },\n  {\n  "length": 275\n  },\n  {\n  "length": 950\n  },\n];\n\nreturn data.map(fact => ({json: fact}));',
+		},
+		typeVersion: 1,
+		id: 'uuid-2',
+		position: [280, 200],
+	},
+	{
+		name: 'Rename',
+		type: 'test.set',
+		parameters: {
+			value1: 'data',
+			value2: 'initialName',
+		},
+		typeVersion: 1,
+		id: 'uuid-3',
+		position: [460, 200],
+	},
+	{
+		name: 'End',
+		type: 'test.set',
+		parameters: {},
+		typeVersion: 1,
+		id: 'uuid-4',
+		position: [640, 200],
+	},
+];
+
+const connections: IConnections = {
+	Start: {
+		main: [
+			[
+				{
+					node: 'Function',
+					type: 'main',
+					index: 0,
+				},
+			],
+		],
+	},
+	Function: {
+		main: [
+			[
+				{
+					node: 'Rename',
+					type: 'main',
+					index: 0,
+				},
+			],
+		],
+	},
+	Rename: {
+		main: [
+			[
+				{
+					node: 'End',
+					type: 'main',
+					index: 0,
+				},
+			],
+		],
+	},
+};
+
+const runExecutionData: IRunExecutionData = {
+	resultData: {
+		runData: {
+			Start: [
+				{
+					startTime: 1,
+					executionTime: 1,
+					data: {
+						main: [
+							[
+								{
+									json: {},
+								},
+							],
+						],
+					},
+					source: [],
+				},
+			],
+			Function: [
+				{
+					startTime: 1,
+					executionTime: 1,
+					data: {
+						main: [
+							[
+								{
+									json: { initialName: 105, str: 'abc' },
+									pairedItem: { item: 0 },
+								},
+								{
+									json: { initialName: 160 },
+									pairedItem: { item: 0 },
+								},
+								{
+									json: { initialName: 121 },
+									pairedItem: { item: 0 },
+								},
+								{
+									json: { initialName: 275 },
+									pairedItem: { item: 0 },
+								},
+								{
+									json: { initialName: 950 },
+									pairedItem: { item: 0 },
+								},
+							],
+						],
+					},
+					source: [
+						{
+							previousNode: 'Start',
+						},
+					],
+				},
+			],
+			Rename: [
+				{
+					startTime: 1,
+					executionTime: 1,
+					data: {
+						main: [
+							[
+								{
+									json: { data: 105 },
+									pairedItem: { item: 0 },
+								},
+								{
+									json: { data: 160 },
+									pairedItem: { item: 1 },
+								},
+								{
+									json: { data: 121 },
+									pairedItem: { item: 2 },
+								},
+								{
+									json: { data: 275 },
+									pairedItem: { item: 3 },
+								},
+								{
+									json: { data: 950 },
+									pairedItem: { item: 4 },
+								},
+							],
+						],
+					},
+					source: [
+						{
+							previousNode: 'Function',
+						},
+					],
+				},
+			],
+			End: [
+				{
+					startTime: 1,
+					executionTime: 1,
+					data: {
+						main: [
+							[
+								{
+									json: {
+										data: 105,
+										str: 'abc',
+										num: 123,
+										arr: [1, 2, 3],
+										obj: { a: 'hello' },
+									},
+									pairedItem: { item: 0 },
+								},
+								{
+									json: { data: 160 },
+									pairedItem: { item: 1 },
+								},
+								{
+									json: { data: 121 },
+									pairedItem: { item: 2 },
+								},
+								{
+									json: { data: 275 },
+									pairedItem: { item: 3 },
+								},
+								{
+									json: { data: 950 },
+									pairedItem: { item: 4 },
+								},
+							],
+						],
+					},
+					source: [
+						{
+							previousNode: 'Rename',
+						},
+					],
+				},
+			],
+		},
+	},
+};
+
+const workflow = new Workflow({
+	id: '123',
+	name: 'test workflow',
+	nodes,
+	connections,
+	active: false,
+	nodeTypes: new NodeTypesClass(),
+});
+
+const lastNodeName = 'End';
+
+const lastNodeConnectionInputData =
+	runExecutionData.resultData.runData[lastNodeName][0].data!.main[0];
+
+const executeData: IExecuteData = {
+	data: runExecutionData.resultData.runData[lastNodeName][0].data!,
+	node: nodes.find((node) => node.name === lastNodeName) as INode,
+	source: {
+		main: runExecutionData.resultData.runData[lastNodeName][0].source!,
+	},
+};
+
+const dataProxy = new WorkflowDataProxy(
+	workflow,
+	runExecutionData,
+	0,
+	0,
+	lastNodeName,
+	lastNodeConnectionInputData || [],
+	{},
+	'manual',
+	'America/New_York',
+	{},
+	executeData,
+);
+
+export const mockProxy = dataProxy.getDataProxy();
+
+export const mockNodes = [
+	{
+		id: uuidv4(),
+		name: 'Manual',
+		position: [0, 0],
+		type: 'n8n-nodes-base.manualTrigger',
+		typeVersion: 1,
+	},
+	{
+		id: uuidv4(),
+		name: 'Set',
+		position: [0, 0],
+		type: 'n8n-nodes-base.set',
+		typeVersion: 1,
+	},
+];
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxy.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxy.completions.test.ts
deleted file mode 100644
index ec5ad40b586f85..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxy.completions.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-import { proxyCompletions } from '../proxy.completions';
-import { CompletionContext } from '@codemirror/autocomplete';
-import { EditorState } from '@codemirror/state';
-import { setActivePinia } from 'pinia';
-import { createTestingPinia } from '@pinia/testing';
-import { vi } from 'vitest';
-import { v4 as uuidv4 } from 'uuid';
-import * as workflowHelpers from '@/mixins/workflowHelpers';
-import {
-	executionProxy,
-	inputProxy,
-	itemProxy,
-	nodeSelectorProxy,
-	prevNodeProxy,
-	workflowProxy,
-} from './proxyMocks';
-import { IDataObject } from 'n8n-workflow';
-
-const EXPLICIT = false;
-
-beforeEach(() => {
-	setActivePinia(createTestingPinia());
-});
-
-function testCompletionOptions(proxy: IDataObject, toResolve: string) {
-	vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(proxy);
-
-	const doc = `{{ ${toResolve}. }}`;
-	const position = doc.indexOf('.') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = proxyCompletions(context);
-
-	if (!result) throw new Error(`Expected ${toResolve} completion options`);
-
-	const { options: actual, from } = result;
-
-	expect(actual.map((o) => o.label)).toEqual(Reflect.ownKeys(proxy));
-	expect(from).toEqual(position);
-}
-
-// input proxy
-
-test('should return proxy completion options: $input', () => {
-	testCompletionOptions(inputProxy, '$input');
-});
-
-// item proxy
-
-test('should return proxy completion options: $input.first()', () => {
-	testCompletionOptions(itemProxy, '$input.first()');
-});
-
-test('should return proxy completion options: $input.last()', () => {
-	testCompletionOptions(itemProxy, '$input.last()');
-});
-
-test('should return proxy completion options: $input.item', () => {
-	testCompletionOptions(itemProxy, '$input.item');
-});
-
-test('should return proxy completion options: $input.all()[0]', () => {
-	testCompletionOptions(itemProxy, '$input.all()[0]');
-});
-
-// json proxy
-
-test('should return proxy completion options: $json', () => {
-	testCompletionOptions(workflowProxy, '$json');
-});
-
-// prevNode proxy
-
-test('should return proxy completion options: $prevNode', () => {
-	testCompletionOptions(prevNodeProxy, '$prevNode');
-});
-
-// execution proxy
-
-test('should return proxy completion options: $execution', () => {
-	testCompletionOptions(executionProxy, '$execution');
-});
-
-// workflow proxy
-
-test('should return proxy completion options: $workflow', () => {
-	testCompletionOptions(workflowProxy, '$workflow');
-});
-
-// node selector proxy
-
-test('should return proxy completion options: $()', () => {
-	const firstNodeName = 'Manual';
-	const secondNodeName = 'Set';
-
-	const nodes = [
-		{
-			id: uuidv4(),
-			name: firstNodeName,
-			position: [0, 0],
-			type: 'n8n-nodes-base.manualTrigger',
-			typeVersion: 1,
-		},
-		{
-			id: uuidv4(),
-			name: secondNodeName,
-			position: [0, 0],
-			type: 'n8n-nodes-base.set',
-			typeVersion: 1,
-		},
-	];
-
-	const connections = {
-		Manual: {
-			main: [
-				[
-					{
-						node: 'Set',
-						type: 'main',
-						index: 0,
-					},
-				],
-			],
-		},
-	};
-
-	const initialState = { workflows: { workflow: { nodes, connections } } };
-
-	setActivePinia(createTestingPinia({ initialState }));
-
-	testCompletionOptions(nodeSelectorProxy, "$('Set')");
-});
-
-// no proxy
-
-test('should not return completion options for non-existing proxies', () => {
-	vi.spyOn(workflowHelpers, 'resolveParameter').mockReturnValueOnce(null);
-
-	const doc = '{{ $hello. }}';
-	const position = doc.indexOf('.') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = proxyCompletions(context);
-
-	expect(result).toBeNull();
-});
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxyMocks.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxyMocks.ts
deleted file mode 100644
index 8748203a85b2a1..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/proxyMocks.ts
+++ /dev/null
@@ -1,97 +0,0 @@
-export const inputProxy = new Proxy(
-	{},
-	{
-		ownKeys() {
-			return ['all', 'context', 'first', 'item', 'last', 'params'];
-		},
-		get(_, property) {
-			if (property === 'all') return [];
-			if (property === 'context') return {};
-			if (property === 'first') return {};
-			if (property === 'item') return {};
-			if (property === 'last') return {};
-			if (property === 'params') return {};
-
-			return undefined;
-		},
-	},
-);
-
-export const nodeSelectorProxy = new Proxy(
-	{},
-	{
-		ownKeys() {
-			return ['all', 'context', 'first', 'item', 'last', 'params', 'itemMatching'];
-		},
-		get(_, property) {
-			if (property === 'all') return [];
-			if (property === 'context') return {};
-			if (property === 'first') return {};
-			if (property === 'item') return {};
-			if (property === 'last') return {};
-			if (property === 'params') return {};
-			if (property === 'itemMatching') return {};
-
-			return undefined;
-		},
-	},
-);
-
-export const itemProxy = new Proxy(
-	{ json: {} },
-	{
-		get(_, property) {
-			if (property === 'json') return {};
-
-			return undefined;
-		},
-	},
-);
-
-export const prevNodeProxy = new Proxy(
-	{},
-	{
-		ownKeys() {
-			return ['name', 'outputIndex', 'runIndex'];
-		},
-		get(_, property) {
-			if (property === 'name') return '';
-			if (property === 'outputIndex') return 0;
-			if (property === 'runIndex') return 0;
-
-			return undefined;
-		},
-	},
-);
-
-export const executionProxy = new Proxy(
-	{},
-	{
-		ownKeys() {
-			return ['id', 'mode', 'resumeUrl'];
-		},
-		get(_, property) {
-			if (property === 'id') return '';
-			if (property === 'mode') return '';
-			if (property === 'resumeUrl') return '';
-
-			return undefined;
-		},
-	},
-);
-
-export const workflowProxy = new Proxy(
-	{},
-	{
-		ownKeys() {
-			return ['active', 'id', 'name'];
-		},
-		get(_, property) {
-			if (property === 'active') return false;
-			if (property === 'id') return '';
-			if (property === 'name') return '';
-
-			return undefined;
-		},
-	},
-);
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/root.completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/root.completions.test.ts
deleted file mode 100644
index 87c38da079627f..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/root.completions.test.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-import { rootCompletions } from '../root.completions';
-import { CompletionContext } from '@codemirror/autocomplete';
-import { EditorState } from '@codemirror/state';
-import { setActivePinia } from 'pinia';
-import { createTestingPinia } from '@pinia/testing';
-import { v4 as uuidv4 } from 'uuid';
-import { i18n } from '@/plugins/i18n';
-
-const EXPLICIT = false;
-
-test('should return completion options: $', () => {
-	setActivePinia(createTestingPinia());
-
-	const doc = '{{ $ }}';
-	const position = doc.indexOf('$') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = rootCompletions(context);
-
-	if (!result) throw new Error('Expected dollar-sign completion options');
-
-	const { options, from } = result;
-
-	const rootKeys = [...Object.keys(i18n.rootVars), '$parameter'].sort((a, b) => a.localeCompare(b));
-	expect(options.map((o) => o.label)).toEqual(rootKeys);
-	expect(from).toEqual(position - 1);
-});
-
-test('should return completion options: $(', () => {
-	const firstNodeName = 'Manual Trigger';
-	const secondNodeName = 'Set';
-
-	const nodes = [
-		{
-			id: uuidv4(),
-			name: firstNodeName,
-			position: [0, 0],
-			type: 'n8n-nodes-base.manualTrigger',
-			typeVersion: 1,
-		},
-		{
-			id: uuidv4(),
-			name: secondNodeName,
-			position: [0, 0],
-			type: 'n8n-nodes-base.set',
-			typeVersion: 1,
-		},
-	];
-
-	const initialState = { workflows: { workflow: { nodes } } };
-
-	setActivePinia(createTestingPinia({ initialState }));
-
-	const doc = '{{ $( }}';
-	const position = doc.indexOf('(') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = rootCompletions(context);
-
-	if (!result) throw new Error('Expected dollar-sign-selector completion options');
-
-	const { options, from } = result;
-
-	expect(options).toHaveLength(nodes.length);
-	expect(options[0].label).toEqual(`$('${firstNodeName}')`);
-	expect(options[1].label).toEqual(`$('${secondNodeName}')`);
-	expect(from).toEqual(position - 2);
-});
-
-test('should not return completion options for regular strings', () => {
-	setActivePinia(createTestingPinia());
-
-	const doc = '{{ hello }}';
-	const position = doc.indexOf('o') + 1;
-	const context = new CompletionContext(EditorState.create({ doc }), position, EXPLICIT);
-
-	const result = rootCompletions(context);
-
-	expect(result).toBeNull();
-});
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/alpha.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/alpha.completions.ts
deleted file mode 100644
index 1cae6151e58f10..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/alpha.completions.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-import { i18n } from '@/plugins/i18n';
-import { longestCommonPrefix } from './utils';
-import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-
-/**
- * Completions from alphabetic char, e.g. `D` -> `DateTime`.
- */
-export function alphaCompletions(context: CompletionContext): CompletionResult | null {
-	const word = context.matchBefore(/(\s+)D[ateTim]*/);
-
-	if (!word) return null;
-
-	if (word.from === word.to && !context.explicit) return null;
-
-	let options = generateOptions();
-
-	const userInput = word.text.trim();
-
-	if (userInput !== '' && userInput !== '$') {
-		options = options.filter((o) => o.label.startsWith(userInput) && userInput !== o.label);
-	}
-
-	return {
-		from: word.to - userInput.length,
-		options,
-		filter: false,
-		getMatch(completion: Completion) {
-			const lcp = longestCommonPrefix([userInput, completion.label]);
-
-			return [0, lcp.length];
-		},
-	};
-}
-
-function generateOptions() {
-	const emptyKeys = ['DateTime'];
-
-	return emptyKeys.map((key) => {
-		const option: Completion = {
-			label: key,
-			type: key.endsWith('()') ? 'function' : 'keyword',
-		};
-
-		const info = i18n.rootVars[key];
-
-		if (info) option.info = info;
-
-		return option;
-	});
-}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/blank.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/blank.completions.ts
new file mode 100644
index 00000000000000..eed640f644227d
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/blank.completions.ts
@@ -0,0 +1,24 @@
+import { dollarOptions } from './dollar.completions';
+import type { CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+import { stripExcessParens } from './utils';
+
+/**
+ * Completions offered at the blank position: `{{ | }}`
+ */
+export function blankCompletions(context: CompletionContext): CompletionResult | null {
+	const word = context.matchBefore(/\{\{\s/);
+
+	if (!word) return null;
+
+	if (word.from === word.to && !context.explicit) return null;
+
+	const afterCursor = context.state.sliceDoc(context.pos, context.pos + ' }}'.length);
+
+	if (afterCursor !== ' }}') return null;
+
+	return {
+		from: word.to,
+		options: dollarOptions().map(stripExcessParens(context)),
+		filter: false,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
new file mode 100644
index 00000000000000..4c3254b4b62ae3
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
@@ -0,0 +1,74 @@
+import { resolveParameter } from '@/mixins/workflowHelpers';
+import { prefixMatch, longestCommonPrefix } from './utils';
+import type { IDataObject } from 'n8n-workflow';
+import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+import type { Resolved } from './types';
+
+/**
+ * Resolution-based completions offered at the start of bracket access notation.
+ *
+ * - `$json[|`
+ * - `$input.item.json[|`
+ * - `$json['field'][|`
+ * - `$json.myObj[|`
+ * - `$('Test').last().json.myArr[|`
+ * - `$input.first().json.myStr[|`
+ */
+export function bracketAccessCompletions(context: CompletionContext): CompletionResult | null {
+	const word = context.matchBefore(/\$[\S\s]*\[.*/);
+
+	if (!word) return null;
+
+	if (word.from === word.to && !context.explicit) return null;
+
+	const skipBracketAccessCompletions = ['$input[', '$now[', '$today['];
+
+	if (skipBracketAccessCompletions.includes(word.text)) return null;
+
+	const base = word.text.substring(0, word.text.lastIndexOf('['));
+	const tail = word.text.split('[').pop() ?? '';
+
+	let resolved: Resolved;
+
+	try {
+		resolved = resolveParameter(`={{ ${base} }}`);
+	} catch (_) {
+		return null;
+	}
+
+	if (resolved === null || resolved === undefined) return null;
+
+	let options = bracketAccessOptions(resolved);
+
+	if (tail !== '') {
+		options = options.filter((o) => prefixMatch(o.label, tail));
+	}
+
+	if (options.length === 0) return null;
+
+	return {
+		from: word.to - tail.length,
+		options,
+		filter: false,
+		getMatch(completion: Completion) {
+			const lcp = longestCommonPrefix(tail, completion.label);
+
+			return [0, lcp.length];
+		},
+	};
+}
+
+function bracketAccessOptions(resolved: IDataObject) {
+	const SKIP = new Set(['__ob__', 'pairedItem']);
+
+	return Object.keys(resolved)
+		.filter((key) => !SKIP.has(key))
+		.map((key) => {
+			const isNumber = !isNaN(parseInt(key)); // array or string index
+
+			return {
+				label: isNumber ? `${key}]` : `'${key}']`,
+				type: 'keyword',
+			};
+		});
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
new file mode 100644
index 00000000000000..1f25ed8f330bb9
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -0,0 +1,308 @@
+import { ExpressionExtensions, NativeMethods, IDataObject } from 'n8n-workflow';
+import { DateTime } from 'luxon';
+import { i18n } from '@/plugins/i18n';
+import { resolveParameter } from '@/mixins/workflowHelpers';
+import {
+	setRank,
+	hasNoParams,
+	prefixMatch,
+	isAllowedInDotNotation,
+	isSplitInBatchesAbsent,
+	longestCommonPrefix,
+	splitBaseTail,
+	isPseudoParam,
+	stripExcessParens,
+} from './utils';
+import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+import type { ExtensionTypeName, FnToDoc, Resolved } from './types';
+
+/**
+ * Resolution-based completions offered according to datatype.
+ */
+export function datatypeCompletions(context: CompletionContext): CompletionResult | null {
+	const word = context.matchBefore(DATATYPE_REGEX);
+
+	if (!word) return null;
+
+	if (word.from === word.to && !context.explicit) return null;
+
+	const [base, tail] = splitBaseTail(word.text);
+
+	let options: Completion[] = [];
+
+	if (base === 'DateTime') {
+		options = luxonStaticOptions().map(stripExcessParens(context));
+	} else {
+		let resolved: Resolved;
+
+		try {
+			resolved = resolveParameter(`={{ ${base} }}`);
+		} catch (_) {
+			return null;
+		}
+
+		if (resolved === null) return null;
+
+		try {
+			options = datatypeOptions(resolved, base).map(stripExcessParens(context));
+		} catch (_) {
+			return null;
+		}
+	}
+
+	if (options.length === 0) return null;
+
+	if (tail !== '') {
+		options = options.filter((o) => prefixMatch(o.label, tail));
+	}
+
+	return {
+		from: word.to - tail.length,
+		options,
+		filter: false,
+		getMatch(completion: Completion) {
+			const lcp = longestCommonPrefix(tail, completion.label);
+
+			return [0, lcp.length];
+		},
+	};
+}
+
+function datatypeOptions(resolved: Resolved, toResolve: string) {
+	if (resolved === null) return [];
+
+	if (typeof resolved === 'number') {
+		return [...natives('number'), ...extensions('number')];
+	}
+
+	if (typeof resolved === 'string') {
+		return [...natives('string'), ...extensions('string')];
+	}
+
+	if (['$now', '$today'].includes(toResolve)) {
+		return [...luxonInstanceOptions(), ...extensions('date')];
+	}
+
+	if (resolved instanceof Date) {
+		return [...natives('date'), ...extensions('date')];
+	}
+
+	if (Array.isArray(resolved)) {
+		if (/all\(.*?\)/.test(toResolve)) return [];
+
+		const arrayMethods = [...natives('array'), ...extensions('array')];
+
+		if (resolved.length > 0 && resolved.some((i) => typeof i !== 'number')) {
+			const NUMBER_ONLY_ARRAY_EXTENSIONS = new Set(['max()', 'min()', 'sum()', 'average()']);
+
+			return arrayMethods.filter((m) => !NUMBER_ONLY_ARRAY_EXTENSIONS.has(m.label));
+		}
+
+		return arrayMethods;
+	}
+
+	if (typeof resolved === 'object') {
+		return objectOptions(toResolve, resolved);
+	}
+
+	return [];
+}
+
+export const natives = (typeName: ExtensionTypeName): Completion[] => {
+	const natives = NativeMethods.find((ee) => ee.typeName.toLowerCase() === typeName);
+
+	if (!natives) return [];
+
+	return toOptions(natives.functions, typeName);
+};
+
+export const extensions = (typeName: ExtensionTypeName) => {
+	const extensions = ExpressionExtensions.find((ee) => ee.typeName.toLowerCase() === typeName);
+
+	if (!extensions) return [];
+
+	const fnToDoc = Object.entries(extensions.functions).reduce<FnToDoc>((acc, [fnName, fn]) => {
+		if (fn.length !== 1) return acc; // @TODO_NEXT_PHASE: Remove to allow extensions which take args
+
+		return { ...acc, [fnName]: { doc: fn.doc } };
+	}, {});
+
+	return toOptions(fnToDoc, typeName);
+};
+
+export const toOptions = (fnToDoc: FnToDoc, typeName: ExtensionTypeName) => {
+	return Object.entries(fnToDoc)
+		.sort((a, b) => a[0].localeCompare(b[0]))
+		.map(([fnName, fn]) => {
+			const option: Completion = {
+				label: fnName + '()',
+				type: 'function',
+			};
+
+			option.info = () => {
+				const tooltipContainer = document.createElement('div');
+
+				if (!fn.doc?.description) return null;
+
+				tooltipContainer.style.display = 'flex';
+				tooltipContainer.style.flexDirection = 'column';
+				tooltipContainer.style.paddingTop = 'var(--spacing-4xs)';
+				tooltipContainer.style.paddingBottom = 'var(--spacing-4xs)';
+
+				const header = document.createElement('div');
+				header.style.marginBottom = 'var(--spacing-2xs)';
+
+				const typeNameSpan = document.createElement('span');
+				typeNameSpan.innerHTML = typeName.slice(0, 1).toUpperCase() + typeName.slice(1) + '.';
+
+				const functionNameSpan = document.createElement('span');
+				functionNameSpan.innerHTML = fn.doc.name + '()';
+				functionNameSpan.style.fontWeight = 'var(--font-weight-bold)';
+
+				const returnTypeSpan = document.createElement('span');
+				returnTypeSpan.innerHTML = ': ' + fn.doc.returnType;
+
+				header.appendChild(typeNameSpan);
+				header.appendChild(functionNameSpan);
+				header.appendChild(returnTypeSpan);
+
+				tooltipContainer.appendChild(header);
+				tooltipContainer.appendChild(document.createTextNode(fn.doc.description));
+
+				return tooltipContainer;
+			};
+
+			return option;
+		});
+};
+
+const objectOptions = (toResolve: string, resolved: IDataObject) => {
+	const rank = setRank(['item', 'all', 'first', 'last']);
+	const SKIP = new Set(['__ob__', 'pairedItem']);
+
+	if (isSplitInBatchesAbsent()) SKIP.add('context');
+
+	const name = toResolve.startsWith('$(') ? '$()' : toResolve;
+
+	if (['$input', '$()'].includes(name) && hasNoParams(toResolve)) SKIP.add('params');
+
+	let rawKeys = Object.keys(resolved);
+
+	if (name === '$()') {
+		rawKeys = Reflect.ownKeys(resolved) as string[];
+	}
+
+	if (toResolve === 'Math') {
+		const descriptors = Object.getOwnPropertyDescriptors(Math);
+		rawKeys = Object.keys(descriptors).sort((a, b) => a.localeCompare(b));
+	}
+
+	const localKeys = rank(rawKeys)
+		.filter((key) => !SKIP.has(key) && isAllowedInDotNotation(key) && !isPseudoParam(key))
+		.map((key) => {
+			ensureKeyCanBeResolved(resolved, key);
+
+			const isFunction = typeof resolved[key] === 'function';
+
+			const option: Completion = {
+				label: isFunction ? key + '()' : key,
+				type: isFunction ? 'function' : 'keyword',
+			};
+
+			const infoKey = [name, key].join('.');
+			const info = i18n.proxyVars[infoKey];
+
+			if (info) option.info = info;
+
+			return option;
+		});
+
+	const skipObjectExtensions =
+		resolved.isProxy ||
+		resolved.json ||
+		/json('])?$/.test(toResolve) ||
+		toResolve === '$execution' ||
+		toResolve.endsWith('params') ||
+		toResolve === 'Math';
+
+	if (skipObjectExtensions) return [...localKeys, ...natives('object')];
+
+	return [...localKeys, ...natives('object'), ...extensions('object')];
+};
+
+function ensureKeyCanBeResolved(obj: IDataObject, key: string) {
+	try {
+		obj[key];
+	} catch (error) {
+		// e.g. attempt to access disconnected node with `$()`
+		throw new Error('Cannot generate options', { cause: error });
+	}
+}
+
+/**
+ * Methods and fields defined on a Luxon `DateTime` class instance.
+ */
+export const luxonInstanceOptions = () => {
+	const SKIP = new Set(['constructor', 'get', 'invalidExplanation', 'invalidReason']);
+
+	return Object.entries(Object.getOwnPropertyDescriptors(DateTime.prototype))
+		.filter(([key]) => !SKIP.has(key))
+		.sort(([a], [b]) => a.localeCompare(b))
+		.map(([key, descriptor]) => {
+			const isFunction = typeof descriptor.value === 'function';
+
+			const option: Completion = {
+				label: isFunction ? key + '()' : key,
+				type: isFunction ? 'function' : 'keyword',
+			};
+
+			const info = i18n.luxonInstance[key];
+
+			if (info) option.info = info;
+
+			return option;
+		});
+};
+
+/**
+ * Methods defined on a Luxon `DateTime` class.
+ */
+export const luxonStaticOptions = () => {
+	const SKIP = new Set(['prototype', 'name', 'length', 'invalid']);
+
+	return Object.keys(Object.getOwnPropertyDescriptors(DateTime))
+		.filter((key) => !SKIP.has(key) && !key.includes('_'))
+		.sort((a, b) => a.localeCompare(b))
+		.map((key) => {
+			const option: Completion = {
+				label: key + '()',
+				type: 'function',
+			};
+
+			const info = i18n.luxonStatic[key];
+
+			if (info) option.info = info;
+
+			return option;
+		});
+};
+
+const regexes = {
+	generalRef: /\$[^$]+\.([^{\s])*/, // $input. or $json. or similar ones
+	selectorRef: /\$\(['"][\S\s]+['"]\)\.([^{\s])*/, // $('nodeName').
+
+	numberLiteral: /\((\d+)\.?(\d*)\)\.([^{\s])*/, // (123). or (123.4).
+	stringLiteral: /(".+"|('.+'))\.([^{\s])*/, // 'abc'. or "abc".
+	dateLiteral: /\(?new Date\(\(?.*?\)\)?\.([^{\s])*/, // new Date(). or (new Date()).
+	arrayLiteral: /(\[.+\])\.([^{\s])*/, // [1, 2, 3].
+	objectLiteral: /\(\{.*\}\)\.([^{\s])*/, // ({}).
+
+	mathGlobal: /Math\.([^{\s])*/, // Math.
+	datetimeGlobal: /DateTime\.[^.}]*/, // DateTime.
+};
+
+const DATATYPE_REGEX = new RegExp(
+	Object.values(regexes)
+		.map((regex) => regex.source)
+		.join('|'),
+);
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
new file mode 100644
index 00000000000000..01c4eb1fee5fa6
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/dollar.completions.ts
@@ -0,0 +1,79 @@
+import { i18n } from '@/plugins/i18n';
+import {
+	autocompletableNodeNames,
+	receivesNoBinaryData,
+	longestCommonPrefix,
+	setRank,
+	prefixMatch,
+	stripExcessParens,
+	hasActiveNode,
+} from './utils';
+import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+
+/**
+ * Completions offered at the dollar position: `$|`
+ */
+export function dollarCompletions(context: CompletionContext): CompletionResult | null {
+	const word = context.matchBefore(/\$[^$]*/);
+
+	if (!word) return null;
+
+	if (word.from === word.to && !context.explicit) return null;
+
+	let options = dollarOptions().map(stripExcessParens(context));
+
+	const userInput = word.text;
+
+	if (userInput !== '$') {
+		options = options.filter((o) => prefixMatch(o.label, userInput));
+	}
+
+	if (options.length === 0) return null;
+
+	return {
+		from: word.to - userInput.length,
+		options,
+		filter: false,
+		getMatch(completion: Completion) {
+			const lcp = longestCommonPrefix(userInput, completion.label);
+
+			return [0, lcp.length];
+		},
+	};
+}
+
+export function dollarOptions() {
+	const rank = setRank(['$json', '$input']);
+	const SKIP = new Set();
+	const DOLLAR_FUNCTIONS = ['$jmespath'];
+
+	if (!hasActiveNode()) return []; // e.g. credential modal
+
+	if (receivesNoBinaryData()) SKIP.add('$binary');
+
+	const keys = Object.keys(i18n.rootVars).sort((a, b) => a.localeCompare(b));
+
+	return rank(keys)
+		.filter((key) => !SKIP.has(key))
+		.map((key) => {
+			const isFunction = DOLLAR_FUNCTIONS.includes(key);
+
+			const option: Completion = {
+				label: isFunction ? key + '()' : key,
+				type: isFunction ? 'function' : 'keyword',
+			};
+
+			const info = i18n.rootVars[key];
+
+			if (info) option.info = info;
+
+			return option;
+		})
+		.concat(
+			autocompletableNodeNames().map((nodeName) => ({
+				label: `$('${nodeName}')`,
+				type: 'keyword',
+				info: i18n.baseText('codeNodeEditor.completer.$()', { interpolate: { nodeName } }),
+			})),
+		);
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/luxon.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/luxon.completions.ts
deleted file mode 100644
index 3f9e4bc8c8f93d..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/luxon.completions.ts
+++ /dev/null
@@ -1,84 +0,0 @@
-import { i18n } from '@/plugins/i18n';
-import { longestCommonPrefix } from './utils';
-import { DateTime } from 'luxon';
-import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-
-export function luxonCompletions(context: CompletionContext): CompletionResult | null {
-	const word = context.matchBefore(/(DateTime|\$(now|today)*)\.(\w|\.|\(|\))*/); //
-
-	if (!word) return null;
-
-	if (word.from === word.to && !context.explicit) return null;
-
-	const toResolve = word.text.endsWith('.')
-		? word.text.slice(0, -1)
-		: word.text.split('.').slice(0, -1).join('.');
-
-	let options = generateOptions(toResolve);
-
-	const userInputTail = word.text.split('.').pop();
-
-	if (userInputTail === undefined) return null;
-
-	if (userInputTail !== '') {
-		options = options.filter((o) => o.label.startsWith(userInputTail) && userInputTail !== o.label);
-	}
-
-	return {
-		from: word.to - userInputTail.length,
-		options,
-		filter: false,
-		getMatch(completion: Completion) {
-			const lcp = longestCommonPrefix([userInputTail, completion.label]);
-
-			return [0, lcp.length];
-		},
-	};
-}
-
-function generateOptions(toResolve: string): Completion[] {
-	if (toResolve === '$now' || toResolve === '$today') return nowTodayOptions();
-	if (toResolve === 'DateTime') return dateTimeOptions();
-
-	return [];
-}
-
-export const nowTodayOptions = () => {
-	const SKIP_SET = new Set(['constructor', 'get']);
-
-	const entries = Object.entries(Object.getOwnPropertyDescriptors(DateTime.prototype))
-		.filter(([key]) => !SKIP_SET.has(key))
-		.sort(([a], [b]) => a.localeCompare(b));
-
-	return entries.map(([key, descriptor]) => {
-		const isFunction = typeof descriptor.value === 'function';
-
-		const option: Completion = {
-			label: isFunction ? `${key}()` : key,
-			type: isFunction ? 'function' : 'keyword',
-		};
-
-		const info = i18n.luxonInstance[key];
-
-		if (info) option.info = info;
-
-		return option;
-	});
-};
-
-export const dateTimeOptions = () => {
-	const SKIP_SET = new Set(['prototype', 'name', 'length']);
-
-	const keys = Object.keys(Object.getOwnPropertyDescriptors(DateTime))
-		.filter((key) => !SKIP_SET.has(key) && !key.includes('_'))
-		.sort((a, b) => a.localeCompare(b));
-
-	return keys.map((key) => {
-		const option: Completion = { label: `${key}()`, type: 'function' };
-		const info = i18n.luxonStatic[key];
-
-		if (info) option.info = info;
-
-		return option;
-	});
-};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
new file mode 100644
index 00000000000000..2223025c07d16a
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
@@ -0,0 +1,44 @@
+import { i18n } from '@/plugins/i18n';
+import type { CompletionContext, CompletionResult } from '@codemirror/autocomplete';
+import { prefixMatch } from './utils';
+
+/**
+ * Completions offered at the initial position for any char other than `$`.
+ *
+ * Currently only `D...` for `DateTime` and `M...` for `Math`
+ */
+export function nonDollarCompletions(context: CompletionContext): CompletionResult | null {
+	const dateTime = /(\s+)D[ateTim]*/;
+	const math = /(\s+)M[ath]*/;
+
+	const combinedRegex = new RegExp([dateTime.source, math.source].join('|'));
+
+	const word = context.matchBefore(combinedRegex);
+
+	if (!word) return null;
+
+	if (word.from === word.to && !context.explicit) return null;
+
+	const userInput = word.text.trim();
+
+	const nonDollarOptions = [
+		{
+			label: 'DateTime',
+			type: 'keyword',
+			info: i18n.rootVars.DateTime,
+		},
+		{
+			label: 'Math',
+			type: 'keyword',
+			info: i18n.rootVars.DateTime,
+		},
+	];
+
+	const options = nonDollarOptions.filter((o) => prefixMatch(o.label, userInput));
+
+	return {
+		from: word.to - userInput.length,
+		filter: false,
+		options,
+	};
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/proxy.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/proxy.completions.ts
deleted file mode 100644
index c59befc0f93107..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/proxy.completions.ts
+++ /dev/null
@@ -1,106 +0,0 @@
-import { i18n } from '@/plugins/i18n';
-import { resolveParameter } from '@/mixins/workflowHelpers';
-import { isAllowedInDotNotation, longestCommonPrefix } from './utils';
-import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { IDataObject } from 'n8n-workflow';
-import type { Word } from '@/types/completions';
-
-/**
- * Completions from proxies to their content.
- */
-export function proxyCompletions(context: CompletionContext): CompletionResult | null {
-	const word = context.matchBefore(
-		/\$(input|\(.+\)|prevNode|parameter|json|execution|workflow)*(\.|\[)(\w|\W)*/,
-	);
-
-	if (!word) return null;
-
-	if (word.from === word.to && !context.explicit) return null;
-
-	const toResolve = word.text.endsWith('.')
-		? word.text.slice(0, -1)
-		: word.text.split('.').slice(0, -1).join('.');
-
-	let options: Completion[] = [];
-
-	try {
-		const proxy = resolveParameter(`={{ ${toResolve} }}`);
-
-		if (!proxy || typeof proxy !== 'object' || Array.isArray(proxy)) return null;
-
-		options = generateOptions(toResolve, proxy, word);
-	} catch (_) {
-		return null;
-	}
-
-	let userInputTail = '';
-
-	const delimiter = word.text.includes('json[') ? 'json[' : '.';
-
-	userInputTail = word.text.split(delimiter).pop() as string;
-
-	if (userInputTail !== '') {
-		options = options.filter((o) => o.label.startsWith(userInputTail) && userInputTail !== o.label);
-	}
-
-	return {
-		from: word.to - userInputTail.length,
-		options,
-		filter: false,
-		getMatch(completion: Completion) {
-			const lcp = longestCommonPrefix([userInputTail, completion.label]);
-
-			return [0, lcp.length];
-		},
-	};
-}
-
-function generateOptions(toResolve: string, proxy: IDataObject, word: Word): Completion[] {
-	const SKIP_SET = new Set(['__ob__', 'pairedItem']);
-
-	if (word.text.includes('json[')) {
-		return Object.keys(proxy.json as object)
-			.filter((key) => !SKIP_SET.has(key))
-			.map((key) => {
-				return {
-					label: `'${key}']`,
-					type: 'keyword',
-				};
-			});
-	}
-
-	const proxyName = toResolve.startsWith('$(') ? '$()' : toResolve;
-
-	return (Reflect.ownKeys(proxy) as string[])
-		.filter((key) => {
-			if (word.text.endsWith('json.')) return !SKIP_SET.has(key) && isAllowedInDotNotation(key);
-
-			return !SKIP_SET.has(key);
-		})
-		.map((key) => {
-			ensureKeyCanBeResolved(proxy, key);
-
-			const isFunction = typeof proxy[key] === 'function';
-
-			const option: Completion = {
-				label: isFunction ? `${key}()` : key,
-				type: isFunction ? 'function' : 'keyword',
-			};
-
-			const infoKey = [proxyName, key].join('.');
-			const info = i18n.proxyVars[infoKey];
-
-			if (info) option.info = info;
-
-			return option;
-		});
-}
-
-function ensureKeyCanBeResolved(proxy: IDataObject, key: string) {
-	try {
-		proxy[key];
-	} catch (error) {
-		// e.g. attempting to access non-parent node with `$()`
-		throw new Error('Cannot generate options', { cause: error });
-	}
-}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/root.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/root.completions.ts
deleted file mode 100644
index 8525041f8f1bd5..00000000000000
--- a/packages/editor-ui/src/plugins/codemirror/completions/root.completions.ts
+++ /dev/null
@@ -1,60 +0,0 @@
-import { i18n } from '@/plugins/i18n';
-import { autocompletableNodeNames, longestCommonPrefix } from './utils';
-import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-
-/**
- * Completions from `$` to proxies.
- */
-export function rootCompletions(context: CompletionContext): CompletionResult | null {
-	const word = context.matchBefore(/\$\w*[^.]*/);
-
-	if (!word) return null;
-
-	if (word.from === word.to && !context.explicit) return null;
-
-	let options = generateOptions();
-
-	const { text: userInput } = word;
-
-	if (userInput !== '' && userInput !== '$') {
-		options = options.filter((o) => o.label.startsWith(userInput) && userInput !== o.label);
-	}
-
-	return {
-		from: word.to - userInput.length,
-		options,
-		filter: false,
-		getMatch(completion: Completion) {
-			const lcp = longestCommonPrefix([userInput, completion.label]);
-
-			return [0, lcp.length];
-		},
-	};
-}
-
-function generateOptions() {
-	const rootKeys = [...Object.keys(i18n.rootVars), '$parameter'].sort((a, b) => a.localeCompare(b));
-
-	const options: Completion[] = rootKeys.map((key) => {
-		const option: Completion = {
-			label: key,
-			type: key.endsWith('()') ? 'function' : 'keyword',
-		};
-
-		const info = i18n.rootVars[key];
-
-		if (info) option.info = info;
-
-		return option;
-	});
-
-	options.push(
-		...autocompletableNodeNames().map((nodeName) => ({
-			label: `$('${nodeName}')`,
-			type: 'keyword',
-			info: i18n.baseText('codeNodeEditor.completer.$()', { interpolate: { nodeName } }),
-		})),
-	);
-
-	return options;
-}
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/types.ts b/packages/editor-ui/src/plugins/codemirror/completions/types.ts
new file mode 100644
index 00000000000000..ae286b7cffd077
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/types.ts
@@ -0,0 +1,8 @@
+import { resolveParameter } from '@/mixins/workflowHelpers';
+import type { DocMetadata } from 'n8n-workflow';
+
+export type Resolved = ReturnType<typeof resolveParameter>;
+
+export type ExtensionTypeName = 'number' | 'string' | 'date' | 'array' | 'object';
+
+export type FnToDoc = { [fnName: string]: { doc?: DocMetadata } };
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
index a359b3be219847..beff5f4a6b5529 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/utils.ts
@@ -1,14 +1,24 @@
 import { NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION } from '@/components/CodeNodeEditor/constants';
+import { SPLIT_IN_BATCHES_NODE_TYPE } from '@/constants';
 import { useWorkflowsStore } from '@/stores/workflows';
+import { resolveParameter } from '@/mixins/workflowHelpers';
+import { useNDVStore } from '@/stores/ndv';
+import type { Completion, CompletionContext } from '@codemirror/autocomplete';
 
-export function autocompletableNodeNames() {
-	return useWorkflowsStore()
-		.allNodes.filter((node) => !NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION.includes(node.type))
-		.map((node) => node.name);
+/**
+ * Split user input into base (to resolve) and tail (to filter).
+ */
+export function splitBaseTail(userInput: string): [string, string] {
+	const parts = userInput.split('.');
+	const tail = parts.pop() ?? '';
+
+	return [parts.join('.'), tail];
 }
 
-export const longestCommonPrefix = (strings: string[]) => {
-	if (strings.length === 0) return '';
+export function longestCommonPrefix(...strings: string[]) {
+	if (strings.length < 2) {
+		throw new Error('Expected at least two strings');
+	}
 
 	return strings.reduce((acc, next) => {
 		let i = 0;
@@ -19,13 +29,90 @@ export const longestCommonPrefix = (strings: string[]) => {
 
 		return acc.slice(0, i);
 	});
+}
+
+export const prefixMatch = (first: string, second: string) =>
+	first.startsWith(second) && first !== second;
+
+/**
+ * Make a function to bring selected elements to the start of an array, in order.
+ */
+export const setRank = (selected: string[]) => (full: string[]) => {
+	const fullCopy = [...full];
+
+	[...selected].reverse().forEach((s) => {
+		const index = fullCopy.indexOf(s);
+
+		if (index !== -1) fullCopy.unshift(fullCopy.splice(index, 1)[0]);
+	});
+
+	return fullCopy;
+};
+
+export const isPseudoParam = (candidate: string) => {
+	const PSEUDO_PARAMS = ['notice']; // user input disallowed
+
+	return PSEUDO_PARAMS.includes(candidate);
 };
 
 /**
- * Whether a string may be used as a key in object dot notation access.
+ * Whether a string may be used as a key in object dot access notation.
  */
 export const isAllowedInDotNotation = (str: string) => {
-	const DOT_NOTATION_BANNED_CHARS = /^(\d)|[\\ `!@#$%^&*()_+\-=[\]{};':"\\|,.<>?~]/g;
+	const DOT_NOTATION_BANNED_CHARS = /^(\d)|[\\ `!@#$%^&*()+\-=[\]{};':"\\|,.<>?~]/g;
 
 	return !DOT_NOTATION_BANNED_CHARS.test(str);
 };
+
+// ----------------------------------
+//      resolution-based utils
+// ----------------------------------
+
+export function receivesNoBinaryData() {
+	return resolveParameter('={{ $binary }}')?.data === undefined;
+}
+
+export function hasNoParams(toResolve: string) {
+	const params = resolveParameter(`={{ ${toResolve}.params }}`);
+
+	if (!params) return true;
+
+	const paramKeys = Object.keys(params);
+
+	return paramKeys.length === 1 && isPseudoParam(paramKeys[0]);
+}
+
+// ----------------------------------
+//        state-based utils
+// ----------------------------------
+
+export const hasActiveNode = () => useNDVStore().activeNode?.name !== undefined;
+
+export const isSplitInBatchesAbsent = () =>
+	!useWorkflowsStore().workflow.nodes.some((node) => node.type === SPLIT_IN_BATCHES_NODE_TYPE);
+
+export function autocompletableNodeNames() {
+	return useWorkflowsStore()
+		.allNodes.filter((node) => {
+			const activeNodeName = useNDVStore().activeNode?.name;
+
+			return (
+				!NODE_TYPES_EXCLUDED_FROM_AUTOCOMPLETION.includes(node.type) && node.name !== activeNodeName
+			);
+		})
+		.map((node) => node.name);
+}
+
+/**
+ * Remove excess parens from an option label when the cursor is already
+ * followed by parens, e.g. `$json.myStr.|()` -> `isNumeric`
+ */
+export const stripExcessParens = (context: CompletionContext) => (option: Completion) => {
+	const followedByParens = context.state.sliceDoc(context.pos, context.pos + 2) === '()';
+
+	if (option.label.endsWith('()') && followedByParens) {
+		option.label = option.label.slice(0, '()'.length * -1);
+	}
+
+	return option;
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/inputHandlers/expression.inputHandler.ts b/packages/editor-ui/src/plugins/codemirror/inputHandlers/expression.inputHandler.ts
index 2020812e7a1e77..01f07b5bfec5d1 100644
--- a/packages/editor-ui/src/plugins/codemirror/inputHandlers/expression.inputHandler.ts
+++ b/packages/editor-ui/src/plugins/codemirror/inputHandlers/expression.inputHandler.ts
@@ -1,4 +1,9 @@
-import { closeBrackets, completionStatus, insertBracket } from '@codemirror/autocomplete';
+import {
+	closeBrackets,
+	completionStatus,
+	insertBracket,
+	startCompletion,
+} from '@codemirror/autocomplete';
 import { codePointAt, codePointSize, Extension } from '@codemirror/state';
 import { EditorView } from '@codemirror/view';
 
@@ -59,6 +64,8 @@ const handler = EditorView.inputHandler.of((view, from, to, insert) => {
 			selection: { anchor: cursor + 1 },
 		});
 
+		startCompletion(view);
+
 		return true;
 	}
 
@@ -68,7 +75,13 @@ const handler = EditorView.inputHandler.of((view, from, to, insert) => {
 		view.state.sliceDoc(cursor - 1, cursor) === '{' &&
 		view.state.sliceDoc(cursor, cursor + 1) === '}';
 
-	if (isBraceSetup) {
+	const { head } = view.state.selection.main;
+
+	const isInsideResolvable =
+		view.state.sliceDoc(0, head).includes('{{') &&
+		view.state.sliceDoc(head, view.state.doc.length).includes('}}');
+
+	if (isBraceSetup && !isInsideResolvable) {
 		view.dispatch({ changes: { from: cursor, insert: ' ' } });
 
 		return true;
diff --git a/packages/editor-ui/src/plugins/codemirror/n8nLang.ts b/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
index 439a2a384cf8d9..b72c332ab7d163 100644
--- a/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
+++ b/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
@@ -4,10 +4,11 @@ import { parseMixed } from '@lezer/common';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
 import { ifIn } from '@codemirror/autocomplete';
 
-import { proxyCompletions } from './completions/proxy.completions';
-import { rootCompletions } from './completions/root.completions';
-import { luxonCompletions } from './completions/luxon.completions';
-import { alphaCompletions } from './completions/alpha.completions';
+import { blankCompletions } from './completions/blank.completions';
+import { bracketAccessCompletions } from './completions/bracketAccess.completions';
+import { datatypeCompletions } from './completions/datatype.completions';
+import { dollarCompletions } from './completions/dollar.completions';
+import { nonDollarCompletions } from './completions/nonDollar.completions';
 
 const n8nParserWithNestedJsParser = n8nParser.configure({
 	wrap: parseMixed((node) => {
@@ -22,12 +23,16 @@ const n8nParserWithNestedJsParser = n8nParser.configure({
 const n8nLanguage = LRLanguage.define({ parser: n8nParserWithNestedJsParser });
 
 export function n8nLang() {
-	const options = [alphaCompletions, rootCompletions, proxyCompletions, luxonCompletions].map(
-		(group) => n8nLanguage.data.of({ autocomplete: ifIn(['Resolvable'], group) }),
-	);
+	const options = [
+		blankCompletions,
+		bracketAccessCompletions,
+		datatypeCompletions,
+		dollarCompletions,
+		nonDollarCompletions,
+	].map((group) => n8nLanguage.data.of({ autocomplete: ifIn(['Resolvable'], group) }));
 
 	return new LanguageSupport(n8nLanguage, [
-		n8nLanguage.data.of({ closeBrackets: { brackets: ['{'] } }),
+		n8nLanguage.data.of({ closeBrackets: { brackets: ['{', '('] } }),
 		...options,
 	]);
 }
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index b855c4c44f4982..1655f6d331213f 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -330,10 +330,11 @@ export class I18nClass {
 		$binary: this.baseText('codeNodeEditor.completer.binary'),
 		$execution: this.baseText('codeNodeEditor.completer.$execution'),
 		$input: this.baseText('codeNodeEditor.completer.$input'),
-		'$jmespath()': this.baseText('codeNodeEditor.completer.$jmespath'),
+		$jmespath: this.baseText('codeNodeEditor.completer.$jmespath'),
 		$json: this.baseText('codeNodeEditor.completer.json'),
 		$itemIndex: this.baseText('codeNodeEditor.completer.$itemIndex'),
 		$now: this.baseText('codeNodeEditor.completer.$now'),
+		$parameter: this.baseText('codeNodeEditor.completer.$parameter'),
 		$prevNode: this.baseText('codeNodeEditor.completer.$prevNode'),
 		$runIndex: this.baseText('codeNodeEditor.completer.$runIndex'),
 		$today: this.baseText('codeNodeEditor.completer.$today'),
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 818c8ffb7c15cb..f255b124750087 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -123,6 +123,7 @@
 	"codeNodeEditor.completer.$itemIndex": "The position of the current item in the list of items",
 	"codeNodeEditor.completer.$jmespath": "Evaluate a JMESPath expression",
 	"codeNodeEditor.completer.$now": "The current timestamp (as a Luxon object)",
+	"codeNodeEditor.completer.$parameter": "The parameters of the current node",
 	"codeNodeEditor.completer.$prevNode": "The node providing the input data for this run",
 	"codeNodeEditor.completer.$prevNode.name": "The name of the node providing the input data for this run",
 	"codeNodeEditor.completer.$prevNode.outputIndex": "The output connector of the node providing input data for this run",
@@ -499,6 +500,7 @@
 	"expressionEdit.expression": "Expression",
 	"expressionEdit.resultOfItem1": "Result of item 1",
 	"expressionEdit.variableSelector": "Variable Selector",
+	"expressionEditor.uncalledFunction": "[this is a function, please add ()]",
 	"expressionModalInput.empty": "[empty]",
 	"expressionModalInput.undefined": "[undefined]",
 	"expressionModalInput.null": "null",
diff --git a/packages/editor-ui/src/types/expressions.ts b/packages/editor-ui/src/types/expressions.ts
index 39a0ee771c7768..d1a9168e3353b6 100644
--- a/packages/editor-ui/src/types/expressions.ts
+++ b/packages/editor-ui/src/types/expressions.ts
@@ -1,6 +1,6 @@
 type Range = { from: number; to: number };
 
-export type RawSegment = { text: string; type: string } & Range;
+export type RawSegment = { text: string; token: string } & Range;
 
 export type Segment = Plaintext | Resolvable;
 
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 3148493bfedd18..1ac58efbdbcd8f 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -61,6 +61,7 @@
     "lodash.set": "^4.3.2",
     "luxon": "^3.1.0",
     "recast": "^0.21.5",
+    "title-case": "^3.0.3",
     "transliteration": "^2.3.5",
     "xml2js": "^0.4.23"
   }
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index e1c1b0114edfde..084c308e19174f 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -34,6 +34,10 @@ tmpl.tmpl.errorHandler = (error: Error) => {
 		if (error.context.failExecution) {
 			throw error;
 		}
+
+		if (typeof process === 'undefined' && error.clientOnly) {
+			throw error;
+		}
 	}
 };
 
@@ -44,6 +48,10 @@ export class Expression {
 		this.workflow = workflow;
 	}
 
+	static resolveWithoutWorkflow(expression: string) {
+		return tmpl.tmpl(expression, {});
+	}
+
 	/**
 	 * Converts an object to a string in a way to make it clear that
 	 * the value comes from an object
@@ -51,7 +59,16 @@ export class Expression {
 	 */
 	convertObjectValueToString(value: object): string {
 		const typeName = Array.isArray(value) ? 'Array' : 'Object';
-		return `[${typeName}: ${JSON.stringify(value)}]`;
+
+		if (DateTime.isDateTime(value) && value.invalidReason !== null) {
+			throw new Error('invalid DateTime');
+		}
+
+		const result = JSON.stringify(value)
+			.replace(/,"/g, ', "') // spacing for
+			.replace(/":/g, '": '); // readability
+
+		return `[${typeName}: ${result}]`;
 	}
 
 	/**
@@ -268,7 +285,11 @@ export class Expression {
 		const returnValue = this.renderExpression(extendedExpression, data);
 		if (typeof returnValue === 'function') {
 			if (returnValue.name === '$') throw new Error('invalid syntax');
-			throw new Error('This is a function. Please add ()');
+
+			if (returnValue.name === 'DateTime')
+				throw new Error('this is a DateTime, please access its methods');
+
+			throw new Error('this is a function, please add ()');
 		} else if (typeof returnValue === 'string') {
 			return returnValue;
 		} else if (returnValue !== null && typeof returnValue === 'object') {
@@ -293,6 +314,10 @@ export class Expression {
 				if (error.context.failExecution) {
 					throw error;
 				}
+
+				if (typeof process === 'undefined' && error.clientOnly) {
+					throw error;
+				}
 			}
 
 			// Syntax errors resolve to `Error` on the frontend and `null` on the backend.
@@ -305,6 +330,19 @@ export class Expression {
 			) {
 				throw new Error('invalid syntax');
 			}
+
+			if (
+				typeof process === 'undefined' &&
+				error instanceof Error &&
+				error.name === 'TypeError' &&
+				error.message.endsWith('is not a function')
+			) {
+				const match = error.message.match(/(?<msg>[^.]+is not a function)/);
+
+				if (!match?.groups?.msg) return null;
+
+				throw new Error(match.groups.msg);
+			}
 		}
 		return null;
 	}
@@ -325,7 +363,7 @@ export class Expression {
 
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				if (!output?.code) {
-					throw new ExpressionExtensionError('Failed to extend syntax');
+					throw new ExpressionExtensionError('invalid syntax');
 				}
 
 				let text = output.code;
diff --git a/packages/workflow/src/ExpressionError.ts b/packages/workflow/src/ExpressionError.ts
index f0972aa4f3105d..c7540ccd6fc920 100644
--- a/packages/workflow/src/ExpressionError.ts
+++ b/packages/workflow/src/ExpressionError.ts
@@ -5,6 +5,8 @@ import { ExecutionBaseError } from './NodeErrors';
  * Class for instantiating an expression error
  */
 export class ExpressionError extends ExecutionBaseError {
+	clientOnly = false;
+
 	constructor(
 		message: string,
 		options?: {
@@ -13,6 +15,7 @@ export class ExpressionError extends ExecutionBaseError {
 			description?: string;
 			descriptionTemplate?: string;
 			failExecution?: boolean;
+			clientOnly?: boolean; // whether to throw error only on frontend
 			functionality?: 'pairedItem';
 			itemIndex?: number;
 			messageTemplate?: string;
@@ -28,6 +31,10 @@ export class ExpressionError extends ExecutionBaseError {
 			this.description = options.description;
 		}
 
+		if (options?.clientOnly) {
+			this.clientOnly = options.clientOnly;
+		}
+
 		this.context.failExecution = !!options?.failExecution;
 
 		const allowedKeys = [
diff --git a/packages/workflow/src/Extensions/ArrayExtensions.ts b/packages/workflow/src/Extensions/ArrayExtensions.ts
index 6ff73d516c80cf..236b219523ea57 100644
--- a/packages/workflow/src/Extensions/ArrayExtensions.ts
+++ b/packages/workflow/src/Extensions/ArrayExtensions.ts
@@ -87,11 +87,11 @@ function first(value: unknown[]): unknown {
 	return value[0];
 }
 
-function isBlank(value: unknown[]): boolean {
+function isEmpty(value: unknown[]): boolean {
 	return value.length === 0;
 }
 
-function isPresent(value: unknown[]): boolean {
+function isNotEmpty(value: unknown[]): boolean {
 	return value.length > 0;
 }
 
@@ -99,10 +99,6 @@ function last(value: unknown[]): unknown {
 	return value[value.length - 1];
 }
 
-function length(value: unknown[]): number {
-	return Array.isArray(value) ? value.length : 0;
-}
-
 function pluck(value: unknown[], extraArgs: unknown[]): unknown[] {
 	if (!Array.isArray(extraArgs)) {
 		throw new ExpressionError('arguments must be passed to pluck');
@@ -121,7 +117,7 @@ function pluck(value: unknown[], extraArgs: unknown[]): unknown[] {
 	}) as unknown[];
 }
 
-function random(value: unknown[]): unknown {
+function randomItem(value: unknown[]): unknown {
 	const len = value === undefined ? 0 : value.length;
 	return len ? value[Math.floor(Math.random() * len)] : undefined;
 }
@@ -149,7 +145,15 @@ function unique(value: unknown[], extraArgs: string[]): unknown[] {
 	}, []);
 }
 
+const ensureNumberArray = (arr: unknown[], { fnName }: { fnName: string }) => {
+	if (arr.some((i) => typeof i !== 'number')) {
+		throw new ExpressionExtensionError(`${fnName}(): all array elements must be numbers`);
+	}
+};
+
 function sum(value: unknown[]): number {
+	ensureNumberArray(value, { fnName: 'sum' });
+
 	return value.reduce((p: number, c: unknown) => {
 		if (typeof c === 'string') {
 			return p + parseFloat(c);
@@ -162,6 +166,8 @@ function sum(value: unknown[]): number {
 }
 
 function min(value: unknown[]): number {
+	ensureNumberArray(value, { fnName: 'min' });
+
 	return Math.min(
 		...value.map((v) => {
 			if (typeof v === 'string') {
@@ -176,6 +182,8 @@ function min(value: unknown[]): number {
 }
 
 function max(value: unknown[]): number {
+	ensureNumberArray(value, { fnName: 'max' });
+
 	return Math.max(
 		...value.map((v) => {
 			if (typeof v === 'string') {
@@ -190,6 +198,8 @@ function max(value: unknown[]): number {
 }
 
 export function average(value: unknown[]) {
+	ensureNumberArray(value, { fnName: 'average' });
+
 	// This would usually be NaN but I don't think users
 	// will expect that
 	if (value.length === 0) {
@@ -200,7 +210,11 @@ export function average(value: unknown[]) {
 
 function compact(value: unknown[]): unknown[] {
 	return value
-		.filter((v) => v !== null && v !== undefined)
+		.filter((v) => {
+			if (v && typeof v === 'object' && Object.keys(v).length === 0) return false;
+
+			return v !== null && v !== undefined && v !== 'nil' && v !== '';
+		})
 		.map((v) => {
 			if (typeof v === 'object' && v !== null) {
 				return oCompact(v);
@@ -213,7 +227,7 @@ function smartJoin(value: unknown[], extraArgs: string[]): object {
 	const [keyField, valueField] = extraArgs;
 	if (!keyField || !valueField || typeof keyField !== 'string' || typeof valueField !== 'string') {
 		throw new ExpressionExtensionError(
-			'smartJoin requires 2 arguments: keyField and nameField. e.g. .smartJoin("name", "value")',
+			'smartJoin(): expected two string args, e.g. .smartJoin("name", "value")',
 		);
 	}
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-return
@@ -229,8 +243,8 @@ function smartJoin(value: unknown[], extraArgs: string[]): object {
 
 function chunk(value: unknown[], extraArgs: number[]) {
 	const [chunkSize] = extraArgs;
-	if (typeof chunkSize !== 'number') {
-		throw new ExpressionExtensionError('chunk requires 1 parameter: chunkSize. e.g. .chunk(5)');
+	if (typeof chunkSize !== 'number' || chunkSize === 0) {
+		throw new ExpressionExtensionError('chunk(): expected non-zero numeric arg, e.g. .chunk(5)');
 	}
 	const chunks: unknown[][] = [];
 	for (let i = 0; i < value.length; i += chunkSize) {
@@ -241,30 +255,10 @@ function chunk(value: unknown[], extraArgs: number[]) {
 	return chunks;
 }
 
-function filter(value: unknown[], extraArgs: unknown[]): unknown[] {
-	const [field, term] = extraArgs as [string | (() => void), unknown | string];
-	if (typeof field !== 'string' && typeof field !== 'function') {
-		throw new ExpressionExtensionError(
-			'filter requires 1 or 2 arguments: (field and term), (term and [optional keepOrRemove "keep" or "remove" default "keep"] (for string arrays)), or function. e.g. .filter("type", "home") or .filter((i) => i.type === "home") or .filter("home", [optional keepOrRemove]) (for string arrays)',
-		);
-	}
-	if (value.every((i) => typeof i === 'string') && typeof field === 'string') {
-		return (value as string[]).filter((i) =>
-			term === 'remove' ? !i.includes(field) : i.includes(field),
-		);
-	} else if (typeof field === 'string') {
-		return value.filter(
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-			(v) => typeof v === 'object' && v !== null && field in v && (v as any)[field] === term,
-		);
-	}
-	return value.filter(field);
-}
-
 function renameKeys(value: unknown[], extraArgs: string[]): unknown[] {
 	if (extraArgs.length === 0 || extraArgs.length % 2 !== 0) {
 		throw new ExpressionExtensionError(
-			'renameKeys requires an even amount of arguments: from1, to1 [, from2, to2, ...]. e.g. .renameKeys("name", "title")',
+			'renameKeys(): expected an even amount of args: from1, to1 [, from2, to2, ...]. e.g. .renameKeys("name", "title")',
 		);
 	}
 	return value.map((v) => {
@@ -291,7 +285,7 @@ function merge(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	const [others] = extraArgs;
 	if (!Array.isArray(others)) {
 		throw new ExpressionExtensionError(
-			'merge requires 1 argument that is an array. e.g. .merge([{ id: 1, otherValue: 3 }])',
+			'merge(): expected array arg, e.g. .merge([{ id: 1, otherValue: 3 }])',
 		);
 	}
 	const listLength = value.length > others.length ? value.length : others.length;
@@ -314,9 +308,7 @@ function merge(value: unknown[], extraArgs: unknown[][]): unknown[] {
 function union(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	const [others] = extraArgs;
 	if (!Array.isArray(others)) {
-		throw new ExpressionExtensionError(
-			'union requires 1 argument that is an array. e.g. .union([1, 2, 3, 4])',
-		);
+		throw new ExpressionExtensionError('union(): expected array arg, e.g. .union([1, 2, 3, 4])');
 	}
 	const newArr: unknown[] = Array.from(value);
 	for (const v of others) {
@@ -331,7 +323,7 @@ function difference(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	const [others] = extraArgs;
 	if (!Array.isArray(others)) {
 		throw new ExpressionExtensionError(
-			'difference requires 1 argument that is an array. e.g. .difference([1, 2, 3, 4])',
+			'difference(): expected array arg, e.g. .difference([1, 2, 3, 4])',
 		);
 	}
 	const newArr: unknown[] = [];
@@ -347,7 +339,7 @@ function intersection(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	const [others] = extraArgs;
 	if (!Array.isArray(others)) {
 		throw new ExpressionExtensionError(
-			'difference requires 1 argument that is an array. e.g. .difference([1, 2, 3, 4])',
+			'intersection(): expected array arg, e.g. .intersection([1, 2, 3, 4])',
 		);
 	}
 	const newArr: unknown[] = [];
@@ -364,27 +356,129 @@ function intersection(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	return unique(newArr, []);
 }
 
+average.doc = {
+	name: 'average',
+	description: 'Returns the mean average of all values in the array',
+	returnType: 'number',
+};
+
+compact.doc = {
+	name: 'compact',
+	description: 'Removes all empty values from the array',
+	returnType: 'array',
+};
+
+isEmpty.doc = {
+	name: 'isEmpty',
+	description: 'Checks if the array doesn’t have any elements',
+	returnType: 'boolean',
+};
+
+isNotEmpty.doc = {
+	name: 'isNotEmpty',
+	description: 'Checks if the array has elements',
+	returnType: 'boolean',
+};
+
+first.doc = {
+	name: 'first',
+	description: 'Returns the first element of the array',
+	returnType: 'array item',
+};
+
+last.doc = {
+	name: 'last',
+	description: 'Returns the last element of the array',
+	returnType: 'array item',
+};
+
+max.doc = {
+	name: 'max',
+	description: 'Gets the maximum value from a number-only array',
+	returnType: 'number',
+};
+
+min.doc = {
+	name: 'min',
+	description: 'Gets the minimum value from a number-only array',
+	returnType: 'number',
+};
+
+randomItem.doc = {
+	name: 'randomItem',
+	description: 'Returns a random element from an array',
+	returnType: 'number',
+};
+
+sum.doc = {
+	name: 'sum',
+	description: 'Returns the total sum all the values in an array of parsable numbers',
+	returnType: 'number',
+};
+
+// @TODO_NEXT_PHASE: Surface extensions below which take args
+
+chunk.doc = {
+	name: 'chunk',
+	returnType: 'array',
+};
+
+difference.doc = {
+	name: 'difference',
+	returnType: 'array',
+};
+
+intersection.doc = {
+	name: 'intersection',
+	returnType: 'array',
+};
+
+merge.doc = {
+	name: 'merge',
+	returnType: 'array',
+};
+
+pluck.doc = {
+	name: 'pluck',
+	returnType: 'array',
+};
+
+renameKeys.doc = {
+	name: 'renameKeys',
+	returnType: 'array',
+};
+
+smartJoin.doc = {
+	name: 'smartJoin',
+	returnType: 'array',
+};
+
+union.doc = {
+	name: 'union',
+	returnType: 'array',
+};
+
+unique.doc = {
+	name: 'unique',
+	returnType: 'array item',
+	aliases: ['removeDuplicates'],
+};
+
 export const arrayExtensions: ExtensionMap = {
 	typeName: 'Array',
 	functions: {
-		count: length,
-		duplicates: unique,
-		filter,
+		removeDuplicates: unique,
 		first,
 		last,
-		length,
 		pluck,
 		unique,
-		random,
-		randomItem: random,
-		remove: unique,
-		size: length,
+		randomItem,
 		sum,
 		min,
 		max,
 		average,
-		isPresent,
-		isBlank,
+		isNotEmpty,
+		isEmpty,
 		compact,
 		smartJoin,
 		chunk,
diff --git a/packages/workflow/src/Extensions/DateExtensions.ts b/packages/workflow/src/Extensions/DateExtensions.ts
index a7c2d6cf62aea7..eaae9a71d01032 100644
--- a/packages/workflow/src/Extensions/DateExtensions.ts
+++ b/packages/workflow/src/Extensions/DateExtensions.ts
@@ -1,14 +1,7 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/explicit-member-accessibility */
-import type {
-	DateTimeFormatOptions,
-	DateTimeUnit,
-	Duration,
-	DurationLike,
-	DurationObjectUnits,
-	LocaleOptions,
-} from 'luxon';
 import { DateTime } from 'luxon';
+import type { DateTimeUnit, DurationLike, DurationObjectUnits, LocaleOptions } from 'luxon';
 import type { ExtensionMap } from './Extensions';
 
 type DurationUnit =
@@ -23,6 +16,7 @@ type DurationUnit =
 	| 'years';
 type DatePart =
 	| 'day'
+	| 'week'
 	| 'month'
 	| 'year'
 	| 'hour'
@@ -103,7 +97,7 @@ function endOfMonth(date: Date | DateTime): Date {
 }
 
 function extract(inputDate: Date | DateTime, extraArgs: DatePart[]): number | Date {
-	const [part] = extraArgs;
+	let [part] = extraArgs;
 	let date = inputDate;
 	if (isDateTime(date)) {
 		date = date.toJSDate();
@@ -117,6 +111,10 @@ function extract(inputDate: Date | DateTime, extraArgs: DatePart[]): number | Da
 		return Math.floor(diff / (1000 * 60 * 60 * 24));
 	}
 
+	if (part === 'week') {
+		part = 'weekNumber';
+	}
+
 	return DateTime.fromJSDate(date).get((DATETIMEUNIT_MAP[part] as keyof DateTime) || part);
 }
 
@@ -194,73 +192,60 @@ function plus(date: Date | DateTime, extraArgs: unknown[]): Date | DateTime {
 	return DateTime.fromJSDate(date).plus(generateDurationObject(durationValue, unit)).toJSDate();
 }
 
-function toLocaleString(date: Date | DateTime, extraArgs: unknown[]): string {
-	const [locale, dateFormat = { timeStyle: 'short', dateStyle: 'short' }] = extraArgs as [
-		string | undefined,
-		DateTimeFormatOptions,
-	];
+endOfMonth.doc = {
+	name: 'endOfMonth',
+	returnType: 'Date',
+	description: 'Transforms a date to the last possible moment that lies within the month',
+};
 
-	if (isDateTime(date)) {
-		return date.toLocaleString(dateFormat, { locale });
-	}
-	return DateTime.fromJSDate(date).toLocaleString(dateFormat, { locale });
-}
+isDst.doc = {
+	name: 'isDst',
+	returnType: 'boolean',
+	description: 'Checks if a Date is within Daylight Savings Time',
+};
 
-function toTimeFromNow(date: Date | DateTime): string {
-	let diffObj: Duration;
-	if (isDateTime(date)) {
-		diffObj = date.diffNow();
-	} else {
-		diffObj = DateTime.fromJSDate(date).diffNow();
-	}
+isWeekend.doc = {
+	name: 'isWeekend',
+	returnType: 'boolean',
+	description: 'Checks if the Date falls on a Saturday or Sunday',
+};
 
-	const as = (unit: DurationUnit) => {
-		return Math.round(Math.abs(diffObj.as(unit)));
-	};
+// @TODO_NEXT_PHASE: Surface extensions below which take args
 
-	if (as('years')) {
-		return `${as('years')} years ago`;
-	}
-	if (as('months')) {
-		return `${as('months')} months ago`;
-	}
-	if (as('weeks')) {
-		return `${as('weeks')} weeks ago`;
-	}
-	if (as('days')) {
-		return `${as('days')} days ago`;
-	}
-	if (as('hours')) {
-		return `${as('hours')} hours ago`;
-	}
-	if (as('minutes')) {
-		return `${as('minutes')} minutes ago`;
-	}
-	if (as('seconds') && as('seconds') > 10) {
-		return `${as('seconds')} seconds ago`;
-	}
-	return 'just now';
-}
+beginningOf.doc = {
+	name: 'beginningOf',
+	returnType: 'Date',
+};
 
-function timeTo(date: Date | DateTime, extraArgs: unknown[]): Duration {
-	const [diff = new Date().toISOString(), unit = 'seconds'] = extraArgs as [string, DurationUnit];
-	const diffDate = new Date(diff);
-	if (isDateTime(date)) {
-		return date.diff(DateTime.fromJSDate(diffDate), DURATION_MAP[unit] || unit);
-	}
-	return DateTime.fromJSDate(date).diff(DateTime.fromJSDate(diffDate), DURATION_MAP[unit] || unit);
-}
+extract.doc = {
+	name: 'extract',
+	returnType: 'number',
+};
 
-function toDate(date: Date | DateTime) {
-	if (isDateTime(date)) {
-		return date.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).toJSDate();
-	}
-	let datetime = DateTime.fromJSDate(date);
-	if (date.getTimezoneOffset() === 0) {
-		datetime = datetime.setZone('UTC');
-	}
-	return datetime.set({ hour: 0, minute: 0, second: 0, millisecond: 0 }).toJSDate();
-}
+format.doc = {
+	name: 'format',
+	returnType: '(?)',
+};
+
+isBetween.doc = {
+	name: 'isBetween',
+	returnType: 'boolean',
+};
+
+isInLast.doc = {
+	name: 'isInLast',
+	returnType: 'boolean',
+};
+
+minus.doc = {
+	name: 'minus',
+	returnType: 'Date',
+};
+
+plus.doc = {
+	name: 'plus',
+	returnType: 'Date',
+};
 
 export const dateExtensions: ExtensionMap = {
 	typeName: 'Date',
@@ -274,10 +259,6 @@ export const dateExtensions: ExtensionMap = {
 		isWeekend,
 		minus,
 		plus,
-		toTimeFromNow,
-		timeTo,
 		format,
-		toLocaleString,
-		toDate,
 	},
 };
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 30f9bebe2a03cb..51a9c8f63e4952 100644
--- a/packages/workflow/src/Extensions/ExpressionExtension.ts
+++ b/packages/workflow/src/Extensions/ExpressionExtension.ts
@@ -11,15 +11,15 @@ import { objectExtensions } from './ObjectExtensions';
 
 const EXPRESSION_EXTENDER = 'extend';
 
-function isBlank(value: unknown) {
+function isEmpty(value: unknown) {
 	return value === null || value === undefined || !value;
 }
 
-function isPresent(value: unknown) {
-	return !isBlank(value);
+function isNotEmpty(value: unknown) {
+	return !isEmpty(value);
 }
 
-const EXTENSION_OBJECTS = [
+export const EXTENSION_OBJECTS = [
 	arrayExtensions,
 	dateExtensions,
 	numberExtensions,
@@ -29,8 +29,8 @@ const EXTENSION_OBJECTS = [
 
 // eslint-disable-next-line @typescript-eslint/ban-types
 const genericExtensions: Record<string, Function> = {
-	isBlank,
-	isPresent,
+	isEmpty,
+	isNotEmpty,
 };
 
 const EXPRESSION_EXTENSION_METHODS = Array.from(
diff --git a/packages/workflow/src/Extensions/Extensions.ts b/packages/workflow/src/Extensions/Extensions.ts
index 460567d0ebb01a..ca4d2ff011ede4 100644
--- a/packages/workflow/src/Extensions/Extensions.ts
+++ b/packages/workflow/src/Extensions/Extensions.ts
@@ -1,5 +1,13 @@
 export interface ExtensionMap {
 	typeName: string;
 	// eslint-disable-next-line @typescript-eslint/ban-types
-	functions: Record<string, Function>;
+	functions: Record<string, Function & { doc?: DocMetadata }>;
 }
+
+export type DocMetadata = {
+	name: string;
+	returnType: string;
+	description?: string;
+	aliases?: string[];
+	args?: unknown[];
+};
diff --git a/packages/workflow/src/Extensions/NumberExtensions.ts b/packages/workflow/src/Extensions/NumberExtensions.ts
index b1c85fed44aff8..f344b843baa98b 100644
--- a/packages/workflow/src/Extensions/NumberExtensions.ts
+++ b/packages/workflow/src/Extensions/NumberExtensions.ts
@@ -13,26 +13,6 @@ function format(value: number, extraArgs: unknown[]): string {
 	return new Intl.NumberFormat(locales, config).format(value);
 }
 
-function isBlank(value: number): boolean {
-	return typeof value !== 'number';
-}
-
-function isPresent(value: number): boolean {
-	return !isBlank(value);
-}
-
-function random(value: number): number {
-	return Math.floor(Math.random() * value);
-}
-
-function isTrue(value: number) {
-	return value === 1;
-}
-
-function isFalse(value: number) {
-	return value === 0;
-}
-
 function isEven(value: number) {
 	return value % 2 === 0;
 }
@@ -54,19 +34,49 @@ function round(value: number, extraArgs: number[]) {
 	return +value.toFixed(decimalPlaces);
 }
 
+ceil.doc = {
+	name: 'ceil',
+	description: 'Rounds up a number to a whole number',
+	returnType: 'number',
+};
+
+floor.doc = {
+	name: 'floor',
+	description: 'Rounds down a number to a whole number',
+	returnType: 'number',
+};
+
+isEven.doc = {
+	name: 'isEven',
+	description: 'Returns true if the number is even. Only works on whole numbers.',
+	returnType: 'boolean',
+};
+
+isOdd.doc = {
+	name: 'isOdd',
+	description: 'Returns true if the number is odd. Only works on whole numbers.',
+	returnType: 'boolean',
+};
+
+// @TODO_NEXT_PHASE: Surface extensions below which take args
+
+format.doc = {
+	name: 'format',
+	returnType: 'string',
+};
+
+round.doc = {
+	name: 'round',
+	returnType: 'number',
+};
+
 export const numberExtensions: ExtensionMap = {
 	typeName: 'Number',
 	functions: {
 		ceil,
 		floor,
 		format,
-		random,
 		round,
-		isBlank,
-		isPresent,
-		isTrue,
-		isNotTrue: isFalse,
-		isFalse,
 		isEven,
 		isOdd,
 	},
diff --git a/packages/workflow/src/Extensions/ObjectExtensions.ts b/packages/workflow/src/Extensions/ObjectExtensions.ts
index b3ef5dde57b1f4..a83316e426cd1d 100644
--- a/packages/workflow/src/Extensions/ObjectExtensions.ts
+++ b/packages/workflow/src/Extensions/ObjectExtensions.ts
@@ -4,7 +4,7 @@ import type { ExtensionMap } from './Extensions';
 export function merge(value: object, extraArgs: unknown[]): unknown {
 	const [other] = extraArgs;
 	if (typeof other !== 'object' || !other) {
-		throw new ExpressionExtensionError('argument of merge must be an object');
+		throw new ExpressionExtensionError('merge(): expected object arg');
 	}
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	const newObject: any = { ...value };
@@ -21,6 +21,10 @@ function isEmpty(value: object): boolean {
 	return Object.keys(value).length === 0;
 }
 
+function isNotEmpty(value: object): boolean {
+	return !isEmpty(value);
+}
+
 function hasField(value: object, extraArgs: string[]): boolean {
 	const [name] = extraArgs;
 	return name in value;
@@ -40,7 +44,7 @@ function removeField(value: object, extraArgs: string[]): object {
 function removeFieldsContaining(value: object, extraArgs: string[]): object {
 	const [match] = extraArgs;
 	if (typeof match !== 'string') {
-		throw new ExpressionExtensionError('argument of removeFieldsContaining must be an string');
+		throw new ExpressionExtensionError('removeFieldsContaining(): expected string arg');
 	}
 	const newObject = { ...value };
 	for (const [key, val] of Object.entries(value)) {
@@ -55,7 +59,7 @@ function removeFieldsContaining(value: object, extraArgs: string[]): object {
 function keepFieldsContaining(value: object, extraArgs: string[]): object {
 	const [match] = extraArgs;
 	if (typeof match !== 'string') {
-		throw new ExpressionExtensionError('argument of keepFieldsContaining must be an string');
+		throw new ExpressionExtensionError('argument of keepFieldsContaining must be a string');
 	}
 	const newObject = { ...value };
 	for (const [key, val] of Object.entries(value)) {
@@ -71,8 +75,9 @@ export function compact(value: object): object {
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	const newObj: any = {};
 	for (const [key, val] of Object.entries(value)) {
-		if (val !== null && val !== undefined) {
+		if (val !== null && val !== undefined && val !== 'nil' && val !== '') {
 			if (typeof val === 'object') {
+				if (Object.keys(val as object).length === 0) continue;
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
 				newObj[key] = compact(val);
 			} else {
@@ -89,10 +94,62 @@ export function urlEncode(value: object) {
 	return new URLSearchParams(value as Record<string, string>).toString();
 }
 
+isEmpty.doc = {
+	name: 'isEmpty',
+	description: 'Checks if the Object has no key-value pairs',
+	returnType: 'boolean',
+};
+
+isNotEmpty.doc = {
+	name: 'isNotEmpty',
+	description: 'Checks if the Object has key-value pairs',
+	returnType: 'boolean',
+};
+
+compact.doc = {
+	name: 'compact',
+	description: 'Removes empty values from an Object',
+	returnType: 'boolean',
+};
+
+urlEncode.doc = {
+	name: 'urlEncode',
+	description: 'Transforms an Object into a URL parameter list. Only top-level keys are supported.',
+	returnType: 'string',
+};
+
+// @TODO_NEXT_PHASE: Surface extensions below which take args
+
+merge.doc = {
+	name: 'merge',
+	returnType: 'object',
+};
+
+hasField.doc = {
+	name: 'hasField',
+	returnType: 'boolean',
+};
+
+removeField.doc = {
+	name: 'removeField',
+	returnType: 'object',
+};
+
+removeFieldsContaining.doc = {
+	name: 'removeFieldsContaining',
+	returnType: 'object',
+};
+
+keepFieldsContaining.doc = {
+	name: 'keepFieldsContaining',
+	returnType: 'object',
+};
+
 export const objectExtensions: ExtensionMap = {
 	typeName: 'Object',
 	functions: {
 		isEmpty,
+		isNotEmpty,
 		merge,
 		hasField,
 		removeField,
diff --git a/packages/workflow/src/Extensions/StringExtensions.ts b/packages/workflow/src/Extensions/StringExtensions.ts
index e0ce8cb4d33713..505a3e20e7e6ca 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -1,5 +1,6 @@
 /* eslint-disable @typescript-eslint/unbound-method */
 // import { createHash } from 'crypto';
+import { titleCase } from 'title-case';
 import * as ExpressionError from '../ExpressionError';
 import type { ExtensionMap } from './Extensions';
 import CryptoJS from 'crypto-js';
@@ -34,20 +35,17 @@ const URL_REGEXP =
 const CHAR_TEST_REGEXP = /\p{L}/u;
 const PUNC_TEST_REGEXP = /[!?.]/;
 
-const TRUE_VALUES = ['true', '1', 't', 'yes', 'y'];
-const FALSE_VALUES = ['false', '0', 'f', 'no', 'n'];
-
-function encrypt(value: string, extraArgs?: unknown): string {
-	const [format = 'MD5'] = extraArgs as string[];
-	if (format.toLowerCase() === 'base64') {
+function hash(value: string, extraArgs?: unknown): string {
+	const [algorithm = 'MD5'] = extraArgs as string[];
+	if (algorithm.toLowerCase() === 'base64') {
 		// We're using a library instead of btoa because btoa only
 		// works on ASCII
 		return encode(value);
 	}
-	const hashFunction = hashFunctions[format.toLowerCase()];
+	const hashFunction = hashFunctions[algorithm.toLowerCase()];
 	if (!hashFunction) {
 		throw new ExpressionError.ExpressionExtensionError(
-			`Unknown encrypt type ${format}. Available types are: ${Object.keys(hashFunctions)
+			`Unknown algorithm ${algorithm}. Available algorithms are: ${Object.keys(hashFunctions)
 				.map((s) => s.toUpperCase())
 				.join(', ')}, and Base64.`,
 		);
@@ -56,24 +54,12 @@ function encrypt(value: string, extraArgs?: unknown): string {
 	// return createHash(format).update(value.toString()).digest('hex');
 }
 
-function getOnlyFirstCharacters(value: string, extraArgs: number[]): string {
-	const [end] = extraArgs;
-
-	if (typeof end !== 'number') {
-		throw new ExpressionError.ExpressionExtensionError(
-			'getOnlyFirstCharacters() requires a argument',
-		);
-	}
-
-	return value.slice(0, end);
-}
-
-function isBlank(value: string): boolean {
+function isEmpty(value: string): boolean {
 	return value === '';
 }
 
-function isPresent(value: string): boolean {
-	return !isBlank(value);
+function isNotEmpty(value: string): boolean {
+	return !isEmpty(value);
 }
 
 function length(value: string): number {
@@ -122,16 +108,18 @@ function removeMarkdown(value: string): string {
 	return output;
 }
 
-function sayHi(value: string) {
-	return `hi ${value}`;
-}
-
-function stripTags(value: string): string {
+function removeTags(value: string): string {
 	return value.replace(/<[^>]*>?/gm, '');
 }
 
 function toDate(value: string): Date {
-	return new Date(value.toString());
+	const date = new Date(value.toString());
+
+	if (date.toString() === 'Invalid Date') {
+		throw new ExpressionError.ExpressionExtensionError('cannot convert to date');
+	}
+
+	return date;
 }
 
 function urlDecode(value: string, extraArgs: boolean[]): string {
@@ -152,11 +140,29 @@ function urlEncode(value: string, extraArgs: boolean[]): string {
 
 function toInt(value: string, extraArgs: Array<number | undefined>) {
 	const [radix] = extraArgs;
-	return parseInt(value.replace(CURRENCY_REGEXP, ''), radix);
+	const int = parseInt(value.replace(CURRENCY_REGEXP, ''), radix);
+
+	if (isNaN(int)) {
+		throw new ExpressionError.ExpressionExtensionError('cannot convert to integer');
+	}
+
+	return int;
 }
 
 function toFloat(value: string) {
-	return parseFloat(value.replace(CURRENCY_REGEXP, ''));
+	if (value.includes(',')) {
+		throw new ExpressionError.ExpressionExtensionError(
+			'cannot convert to float, expected . as decimal separator',
+		);
+	}
+
+	const float = parseFloat(value.replace(CURRENCY_REGEXP, ''));
+
+	if (isNaN(float)) {
+		throw new ExpressionError.ExpressionExtensionError('cannot convert to float');
+	}
+
+	return float;
 }
 
 function quote(value: string, extraArgs: string[]) {
@@ -166,15 +172,9 @@ function quote(value: string, extraArgs: string[]) {
 		.replace(new RegExp(`\\${quoteChar}`, 'g'), `\\${quoteChar}`)}${quoteChar}`;
 }
 
-function isTrue(value: string) {
-	return TRUE_VALUES.includes(value.toLowerCase());
-}
-
-function isFalse(value: string) {
-	return FALSE_VALUES.includes(value.toLowerCase());
-}
-
 function isNumeric(value: string) {
+	if (value.includes(' ')) return false;
+
 	return !isNaN(value as unknown as number) && !isNaN(parseFloat(value));
 }
 
@@ -185,7 +185,18 @@ function isUrl(value: string) {
 	} catch (_error) {
 		return false;
 	}
-	return url.protocol === 'http:' || url.protocol === 'https:';
+
+	// URL constructor tolerates missing `//` after protocol so check manually
+	for (const scheme of ['http:', 'https:']) {
+		if (
+			url.protocol === scheme &&
+			value.slice(scheme.length, scheme.length + '//'.length) === '//'
+		) {
+			return true;
+		}
+	}
+
+	return false;
 }
 
 function isDomain(value: string) {
@@ -193,15 +204,22 @@ function isDomain(value: string) {
 }
 
 function isEmail(value: string) {
-	return EMAIL_REGEXP.test(value);
-}
+	const result = EMAIL_REGEXP.test(value);
 
-function stripSpecialChars(value: string) {
-	return transliterate(value, { unknown: '?' });
+	// email regex is loose so check manually for now
+	if (result && value.includes(' ')) {
+		return false;
+	}
+
+	return result;
 }
 
 function toTitleCase(value: string) {
-	return value.replace(/\w\S*/g, (v) => v.charAt(0).toLocaleUpperCase() + v.slice(1));
+	return titleCase(value);
+}
+
+function replaceSpecialChars(value: string) {
+	return transliterate(value, { unknown: '?' });
 }
 
 function toSentenceCase(value: string) {
@@ -265,16 +283,153 @@ function extractUrl(value: string) {
 	return matched[0];
 }
 
+removeMarkdown.doc = {
+	name: 'removeMarkdown',
+	description: 'Removes Markdown formatting from a string',
+	returnType: 'string',
+};
+
+removeTags.doc = {
+	name: 'removeTags',
+	description: 'Removes tags, such as HTML or XML, from a string',
+	returnType: 'string',
+};
+
+toDate.doc = {
+	name: 'toDate',
+	description: 'Converts a string to a date',
+	returnType: 'Date',
+};
+
+toFloat.doc = {
+	name: 'toFloat',
+	description: 'Converts a string to a decimal number',
+	returnType: 'number',
+	aliases: ['toDecimalNumber'],
+};
+
+toInt.doc = {
+	name: 'toInt',
+	description: 'Converts a string to an integer',
+	returnType: 'number',
+	aliases: ['toWholeNumber'],
+};
+
+toSentenceCase.doc = {
+	name: 'toSentenceCase',
+	description: 'Formats a string to sentence case. Example: "This is a sentence"',
+	returnType: 'string',
+};
+
+toSnakeCase.doc = {
+	name: 'toSnakeCase',
+	description: 'Formats a string to snake case. Example: "this_is_snake_case"',
+	returnType: 'string',
+};
+
+toTitleCase.doc = {
+	name: 'toTitleCase',
+	description: 'Formats a string to title case. Example: "This Is a Title"',
+	returnType: 'string',
+};
+
+urlDecode.doc = {
+	name: 'urlDecode',
+	description:
+		'Decodes a URL-encoded string. It decodes any percent-encoded characters in the input string, and replaces them with their original characters.',
+	returnType: 'string',
+};
+
+replaceSpecialChars.doc = {
+	name: 'replaceSpecialChars',
+	description: 'Replaces non-ASCII characters in a string with an ASCII representation',
+	returnType: 'string',
+};
+
+length.doc = {
+	name: 'length',
+	description: 'Returns the character count of a string',
+	returnType: 'number',
+};
+
+isDomain.doc = {
+	name: 'isDomain',
+	description: 'Checks if a string is a domain',
+	returnType: 'boolean',
+};
+
+isEmail.doc = {
+	name: 'isEmail',
+	description: 'Checks if a string is an email',
+	returnType: 'boolean',
+};
+
+isNumeric.doc = {
+	name: 'isEmail',
+	description: 'Checks if a string only contains digits',
+	returnType: 'boolean',
+};
+
+isUrl.doc = {
+	name: 'isUrl',
+	description: 'Checks if a string is a valid URL',
+	returnType: 'boolean',
+};
+
+isEmpty.doc = {
+	name: 'isEmpty',
+	description: 'Checks if a string is empty',
+	returnType: 'boolean',
+};
+
+isNotEmpty.doc = {
+	name: 'isNotEmpty',
+	description: 'Checks if a string has content',
+	returnType: 'boolean',
+};
+
+extractEmail.doc = {
+	name: 'extractEmail',
+	description: 'Extracts an email from a string. Returns undefined if none is found.',
+	returnType: 'string',
+};
+
+extractDomain.doc = {
+	name: 'extractDomain',
+	description:
+		'Extracts a domain from a string containing a valid URL. Returns undefined if none is found.',
+	returnType: 'string',
+};
+
+extractUrl.doc = {
+	name: 'extractUrl',
+	description: 'Extracts a URL from a string. Returns undefined if none is found.',
+	returnType: 'string',
+};
+
+// @TODO_NEXT_PHASE: Surface extensions below which take args
+
+hash.doc = {
+	name: 'hash',
+	returnType: 'string',
+};
+
+urlEncode.doc = {
+	name: 'urlEncode',
+	returnType: 'string',
+};
+
+quote.doc = {
+	name: 'quote',
+	returnType: 'string',
+};
+
 export const stringExtensions: ExtensionMap = {
 	typeName: 'String',
 	functions: {
-		encrypt,
-		hash: encrypt,
-		getOnlyFirstCharacters,
+		hash,
 		removeMarkdown,
-		sayHi,
-		stripTags,
-		toBoolean: isTrue,
+		removeTags,
 		toDate,
 		toDecimalNumber: toFloat,
 		toFloat,
@@ -286,18 +441,14 @@ export const stringExtensions: ExtensionMap = {
 		urlDecode,
 		urlEncode,
 		quote,
-		stripSpecialChars,
+		replaceSpecialChars,
 		length,
 		isDomain,
 		isEmail,
-		isTrue,
-		isFalse,
-		isNotTrue: isFalse,
 		isNumeric,
 		isUrl,
-		isURL: isUrl,
-		isBlank,
-		isPresent,
+		isEmpty,
+		isNotEmpty,
 		extractEmail,
 		extractDomain,
 		extractUrl,
diff --git a/packages/workflow/src/Extensions/index.ts b/packages/workflow/src/Extensions/index.ts
index 9bc07b1e8ba677..ff4f5be15a5d64 100644
--- a/packages/workflow/src/Extensions/index.ts
+++ b/packages/workflow/src/Extensions/index.ts
@@ -4,4 +4,7 @@ export {
 	hasExpressionExtension,
 	hasNativeMethod,
 	extendTransform,
+	EXTENSION_OBJECTS as ExpressionExtensions,
 } from './ExpressionExtension';
+
+export type { DocMetadata } from './Extensions';
diff --git a/packages/workflow/src/NativeMethods/String.methods.ts b/packages/workflow/src/NativeMethods/String.methods.ts
new file mode 100644
index 00000000000000..f8a92737747998
--- /dev/null
+++ b/packages/workflow/src/NativeMethods/String.methods.ts
@@ -0,0 +1,13 @@
+export const stringMethods = {
+	typeName: 'String',
+	functions: {
+		// @TODO_NEXT_PHASE: Populate below and cover other datatypes
+		// trim: {
+		// 	doc: {
+		// 		name: 'trim',
+		// 		description: 'Removes whitespace from both ends of a string and returns a new string',
+		// 		returnType: 'string',
+		// 	},
+		// },
+	},
+};
diff --git a/packages/workflow/src/NativeMethods/index.ts b/packages/workflow/src/NativeMethods/index.ts
new file mode 100644
index 00000000000000..dbc5785b52de12
--- /dev/null
+++ b/packages/workflow/src/NativeMethods/index.ts
@@ -0,0 +1,5 @@
+import { stringMethods } from './String.methods';
+
+const NATIVE_METHODS = [stringMethods];
+
+export { NATIVE_METHODS as NativeMethods };
diff --git a/packages/workflow/src/WorkflowDataProxy.ts b/packages/workflow/src/WorkflowDataProxy.ts
index d80966c9954903..ec7224fe48c50d 100644
--- a/packages/workflow/src/WorkflowDataProxy.ts
+++ b/packages/workflow/src/WorkflowDataProxy.ts
@@ -126,7 +126,7 @@ export class WorkflowDataProxy {
 		const that = this;
 		const node = this.workflow.nodes[nodeName];
 
-		if (!that.runExecutionData?.executionData && that.connectionInputData.length > 1) {
+		if (!that.runExecutionData?.executionData && that.connectionInputData.length > 0) {
 			return {}; // incoming connection has pinned data, so stub context object
 		}
 
@@ -158,6 +158,7 @@ export class WorkflowDataProxy {
 					};
 				},
 				get(target, name, receiver) {
+					if (name === 'isProxy') return true;
 					// eslint-disable-next-line no-param-reassign
 					name = name.toString();
 					const contextData = NodeHelpers.getContext(that.runExecutionData!, 'node', node);
@@ -179,6 +180,7 @@ export class WorkflowDataProxy {
 				},
 				// eslint-disable-next-line @typescript-eslint/no-unused-vars
 				get(target, name, receiver) {
+					if (name === 'isProxy') return true;
 					name = name.toString();
 					return that.selfData[name];
 				},
@@ -207,6 +209,7 @@ export class WorkflowDataProxy {
 				};
 			},
 			get(target, name, receiver) {
+				if (name === 'isProxy') return true;
 				name = name.toString();
 
 				let returnValue: NodeParameterValueType;
@@ -379,6 +382,7 @@ export class WorkflowDataProxy {
 			{ binary: undefined, data: undefined, json: undefined },
 			{
 				get(target, name, receiver) {
+					if (name === 'isProxy') return true;
 					name = name.toString();
 
 					if (!node) {
@@ -455,6 +459,8 @@ export class WorkflowDataProxy {
 			{},
 			{
 				get(target, name, receiver) {
+					if (name === 'isProxy') return true;
+
 					if (
 						typeof process === 'undefined' || // env vars are inaccessible to frontend
 						process.env.N8N_BLOCK_ENV_ACCESS_IN_NODE === 'true'
@@ -490,6 +496,8 @@ export class WorkflowDataProxy {
 					};
 				},
 				get(target, name, receiver) {
+					if (name === 'isProxy') return true;
+
 					if (!that.executeData?.source) {
 						// Means the previous node did not get executed yet
 						return undefined;
@@ -535,6 +543,8 @@ export class WorkflowDataProxy {
 					};
 				},
 				get(target, name, receiver) {
+					if (name === 'isProxy') return true;
+
 					if (allowedValues.includes(name.toString())) {
 						const value = that.workflow[name as keyof typeof target];
 
@@ -567,6 +577,8 @@ export class WorkflowDataProxy {
 			{},
 			{
 				get(target, name, receiver) {
+					if (name === 'isProxy') return true;
+
 					const nodeName = name.toString();
 
 					if (that.workflow.getNode(nodeName) === null) {
@@ -607,6 +619,14 @@ export class WorkflowDataProxy {
 
 		// replacing proxies with the actual data.
 		const jmespathWrapper = (data: IDataObject | IDataObject[], query: string) => {
+			if (typeof data !== 'object' || typeof query !== 'string') {
+				throw new ExpressionError('expected two arguments (Object, string) for this function', {
+					runIndex: that.runIndex,
+					itemIndex: that.itemIndex,
+					clientOnly: true,
+				});
+			}
+
 			if (!Array.isArray(data) && typeof data === 'object') {
 				return jmespath.search({ ...data }, query);
 			}
@@ -939,6 +959,8 @@ export class WorkflowDataProxy {
 							];
 						},
 						get(target, property, receiver) {
+							if (property === 'isProxy') return true;
+
 							if (['pairedItem', 'itemMatching', 'item'].includes(property as string)) {
 								const pairedItemMethod = (itemIndex?: number) => {
 									if (itemIndex === undefined) {
@@ -1059,6 +1081,8 @@ export class WorkflowDataProxy {
 						};
 					},
 					get(target, property, receiver) {
+						if (property === 'isProxy') return true;
+
 						if (property === 'item') {
 							return that.connectionInputData[that.itemIndex];
 						}
@@ -1214,6 +1238,8 @@ export class WorkflowDataProxy {
 
 		return new Proxy(base, {
 			get(target, name, receiver) {
+				if (name === 'isProxy') return true;
+
 				if (['$data', '$json'].includes(name as string)) {
 					return that.nodeDataGetter(that.activeNodeName, true)?.json;
 				}
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 86a5de4d5543ac..9e8b53d552e4d8 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -28,3 +28,8 @@ export {
 	isINodePropertyCollectionList,
 	isINodePropertyOptionsList,
 } from './type-guards';
+
+export { ExpressionExtensions } from './Extensions';
+export { NativeMethods } from './NativeMethods';
+
+export type { DocMetadata } from './Extensions';
diff --git a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
index bd696b3f90d4cf..b3e3748e1bbd28 100644
--- a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
@@ -6,16 +6,12 @@ import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
 	describe('Array Data Transformation Functions', () => {
-		test('.random() should work correctly on an array', () => {
-			expect(evaluate('={{ [1,2,3].random() }}')).not.toBeUndefined();
-		});
-
-		test('.randomItem() alias should work correctly on an array', () => {
+		test('.randomItem() should work correctly on an array', () => {
 			expect(evaluate('={{ [1,2,3].randomItem() }}')).not.toBeUndefined();
 		});
 
-		test('.isPresent() should work correctly on an array', () => {
-			expect(evaluate('={{ [1,2,3, "imhere"].isPresent() }}')).toEqual(true);
+		test('.isNotEmpty() should work correctly on an array', () => {
+			expect(evaluate('={{ [1,2,3, "imhere"].isNotEmpty() }}')).toEqual(true);
 		});
 
 		test('.pluck() should work correctly on an array', () => {
@@ -46,24 +42,12 @@ describe('Data Transformation Functions', () => {
 			);
 		});
 
-		test('.isBlank() should work correctly on an array', () => {
-			expect(evaluate('={{ [].isBlank() }}')).toEqual(true);
-		});
-
-		test('.isBlank() should work correctly on an array', () => {
-			expect(evaluate('={{ [1].isBlank() }}')).toEqual(false);
-		});
-
-		test('.length() should work correctly on an array', () => {
-			expect(evaluate('={{ [].length() }}')).toEqual(0);
-		});
-
-		test('.count() should work correctly on an array', () => {
-			expect(evaluate('={{ [1].count() }}')).toEqual(1);
+		test('.isEmpty() should work correctly on an array', () => {
+			expect(evaluate('={{ [].isEmpty() }}')).toEqual(true);
 		});
 
-		test('.size() should work correctly on an array', () => {
-			expect(evaluate('={{ [1,2].size() }}')).toEqual(2);
+		test('.isEmpty() should work correctly on an array', () => {
+			expect(evaluate('={{ [1].isEmpty() }}')).toEqual(false);
 		});
 
 		test('.last() should work correctly on an array', () => {
@@ -74,12 +58,6 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ ["repeat","repeat","a","b","c"].first() }}')).toEqual('repeat');
 		});
 
-		test('.filter() should work correctly on an array', () => {
-			expect(evaluate('={{ ["repeat","repeat","a","b","c"].filter("repeat") }}')).toEqual(
-				expect.arrayContaining(['repeat', 'repeat']),
-			);
-		});
-
 		test('.merge() should work correctly on an array', () => {
 			expect(
 				evaluate(
@@ -115,26 +93,22 @@ describe('Data Transformation Functions', () => {
 
 		test('.sum() should work on an array of numbers', () => {
 			expect(evaluate('={{ [1, 2, 3, 4, 5, 6].sum() }}')).toEqual(21);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, 6].sum() }}')).toEqual(21);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, "bad"].sum() }}')).toBeNaN();
+			expect(() => evaluate('={{ ["1", 2, 3, 4, 5, "bad"].sum() }}')).toThrow();
 		});
 
 		test('.average() should work on an array of numbers', () => {
 			expect(evaluate('={{ [1, 2, 3, 4, 5, 6].average() }}')).toEqual(3.5);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, 6].average() }}')).toEqual(3.5);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, "bad"].average() }}')).toBeNaN();
+			expect(() => evaluate('={{ ["1", 2, 3, 4, 5, "bad"].average() }}')).toThrow();
 		});
 
 		test('.min() should work on an array of numbers', () => {
 			expect(evaluate('={{ [1, 2, 3, 4, 5, 6].min() }}')).toEqual(1);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, 6].min() }}')).toEqual(1);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, "bad"].min() }}')).toBeNaN();
+			expect(() => evaluate('={{ ["1", 2, 3, 4, 5, "bad"].min() }}')).toThrow();
 		});
 
 		test('.max() should work on an array of numbers', () => {
 			expect(evaluate('={{ [1, 2, 3, 4, 5, 6].max() }}')).toEqual(6);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, 6].max() }}')).toEqual(6);
-			expect(evaluate('={{ ["1", 2, 3, 4, 5, "bad"].max() }}')).toBeNaN();
+			expect(() => evaluate('={{ ["1", 2, 3, 4, 5, "bad"].max() }}')).toThrow();
 		});
 
 		test('.union() should work on an array of objects', () => {
@@ -181,18 +155,5 @@ describe('Data Transformation Functions', () => {
 				[16, 17, 18, 19, 20],
 			]);
 		});
-
-		test('.filter() should work on a list of strings', () => {
-			expect(
-				evaluate(
-					'={{ ["i am a test string", "i should be kept", "i should be removed test"].filter("test", "remove") }}',
-				),
-			).toEqual(['i should be kept']);
-			expect(
-				evaluate(
-					'={{ ["i am a test string", "i should be kept test", "i should be removed"].filter("test") }}',
-				),
-			).toEqual(['i am a test string', 'i should be kept test']);
-		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
index 0dcaea24b06183..c6aa4b0e3a3618 100644
--- a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
@@ -14,11 +14,6 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 23).isWeekend() }}')).toBe(false);
 		});
 
-		test('.toTimeFromNow() should work correctly on a date', () => {
-			const JUST_NOW_STRING_RESULT = 'just now';
-			expect(evaluate('={{DateTime.now().toTimeFromNow()}}')).toEqual(JUST_NOW_STRING_RESULT);
-		});
-
 		test('.beginningOf("week") should work correctly on a date', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 20).beginningOf("week") }}')).toEqual(
 				DateTime.local(2023, 1, 16, { zone: TEST_TIMEZONE }).toJSDate(),
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index 0e6b7b08899537..1a253ee2f5bfe6 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -8,19 +8,19 @@ import { evaluate } from './Helpers';
 
 describe('Expression Extension Transforms', () => {
 	describe('extend() transform', () => {
-		test('Basic transform with .isBlank', () => {
-			expect(extendTransform('"".isBlank()')!.code).toEqual('extend("", "isBlank", [])');
+		test('Basic transform with .isEmpty', () => {
+			expect(extendTransform('"".isEmpty()')!.code).toEqual('extend("", "isEmpty", [])');
 		});
 
-		test('Chained transform with .sayHi.getOnlyFirstCharacters', () => {
-			expect(extendTransform('"".sayHi().getOnlyFirstCharacters(2)')!.code).toEqual(
-				'extend(extend("", "sayHi", []), "getOnlyFirstCharacters", [2])',
+		test('Chained transform with .toSnakeCase.toSentenceCase', () => {
+			expect(extendTransform('"".toSnakeCase().toSentenceCase(2)')!.code).toEqual(
+				'extend(extend("", "toSnakeCase", []), "toSentenceCase", [2])',
 			);
 		});
 
-		test('Chained transform with native functions .sayHi.trim.getOnlyFirstCharacters', () => {
-			expect(extendTransform('"aaa ".sayHi().trim().getOnlyFirstCharacters(2)')!.code).toEqual(
-				'extend(extend("aaa ", "sayHi", []).trim(), "getOnlyFirstCharacters", [2])',
+		test('Chained transform with native functions .toSnakeCase.trim.toSentenceCase', () => {
+			expect(extendTransform('"aaa ".toSnakeCase().trim().toSentenceCase(2)')!.code).toEqual(
+				'extend(extend("aaa ", "toSnakeCase", []).trim(), "toSentenceCase", [2])',
 			);
 		});
 	});
@@ -36,19 +36,21 @@ describe('tmpl Expression Parser', () => {
 		});
 
 		test('Multiple expression', () => {
-			expect(splitExpression('{{ "test".sayHi() }} you have ${{ (100).format() }}.')).toEqual([
-				{ type: 'text', text: '' },
-				{ type: 'code', text: ' "test".sayHi() ', hasClosingBrackets: true },
-				{ type: 'text', text: ' you have $' },
-				{ type: 'code', text: ' (100).format() ', hasClosingBrackets: true },
-				{ type: 'text', text: '.' },
-			]);
+			expect(splitExpression('{{ "test".toSnakeCase() }} you have ${{ (100).format() }}.')).toEqual(
+				[
+					{ type: 'text', text: '' },
+					{ type: 'code', text: ' "test".toSnakeCase() ', hasClosingBrackets: true },
+					{ type: 'text', text: ' you have $' },
+					{ type: 'code', text: ' (100).format() ', hasClosingBrackets: true },
+					{ type: 'text', text: '.' },
+				],
+			);
 		});
 
 		test('Unclosed expression', () => {
-			expect(splitExpression('{{ "test".sayHi() }} you have ${{ (100).format()')).toEqual([
+			expect(splitExpression('{{ "test".toSnakeCase() }} you have ${{ (100).format()')).toEqual([
 				{ type: 'text', text: '' },
-				{ type: 'code', text: ' "test".sayHi() ', hasClosingBrackets: true },
+				{ type: 'code', text: ' "test".toSnakeCase() ', hasClosingBrackets: true },
 				{ type: 'text', text: ' you have $' },
 				{ type: 'code', text: ' (100).format()', hasClosingBrackets: false },
 			]);
@@ -75,14 +77,16 @@ describe('tmpl Expression Parser', () => {
 
 		test('Multiple expression', () => {
 			expect(
-				joinExpression(splitExpression('{{ "test".sayHi() }} you have ${{ (100).format() }}.')),
-			).toEqual('{{ "test".sayHi() }} you have ${{ (100).format() }}.');
+				joinExpression(
+					splitExpression('{{ "test".toSnakeCase() }} you have ${{ (100).format() }}.'),
+				),
+			).toEqual('{{ "test".toSnakeCase() }} you have ${{ (100).format() }}.');
 		});
 
 		test('Unclosed expression', () => {
 			expect(
-				joinExpression(splitExpression('{{ "test".sayHi() }} you have ${{ (100).format()')),
-			).toEqual('{{ "test".sayHi() }} you have ${{ (100).format()');
+				joinExpression(splitExpression('{{ "test".toSnakeCase() }} you have ${{ (100).format()')),
+			).toEqual('{{ "test".toSnakeCase() }} you have ${{ (100).format()');
 		});
 
 		test('Escaped opening bracket', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/GenericExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/GenericExtensions.test.ts
index 0ebebce6e05856..2f0838d663bf33 100644
--- a/packages/workflow/test/ExpressionExtensions/GenericExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/GenericExtensions.test.ts
@@ -2,8 +2,8 @@ import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
 	describe('Genric Data Transformation Functions', () => {
-		test('.isBlank() should work correctly on undefined', () => {
-			expect(evaluate('={{(undefined).isBlank()}}')).toEqual(true);
+		test('.isEmpty() should work correctly on undefined', () => {
+			expect(evaluate('={{(undefined).isEmpty()}}')).toEqual(true);
 		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
index 9dbd6c78a9d435..8452efa2df11fb 100644
--- a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
@@ -7,20 +7,6 @@ import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
 	describe('Number Data Transformation Functions', () => {
-		test('.random() should work correctly on a number', () => {
-			expect(evaluate('={{ Number(100).random() }}')).not.toBeUndefined();
-		});
-
-		test('.isBlank() should work correctly on a number', () => {
-			expect(evaluate('={{ Number(100).isBlank() }}')).toEqual(false);
-		});
-
-		test('.isPresent() should work correctly on a number', () => {
-			expect(evaluate('={{ Number(100).isPresent() }}')).toEqual(
-				numberExtensions.functions.isPresent(100),
-			);
-		});
-
 		test('.format() should work correctly on a number', () => {
 			expect(evaluate('={{ Number(100).format() }}')).toEqual(
 				numberExtensions.functions.format(100, []),
@@ -48,18 +34,6 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ (NaN).round(3) }}')).toBeNaN();
 		});
 
-		test('.isTrue() should work on a number', () => {
-			expect(evaluate('={{ (1).isTrue() }}')).toEqual(true);
-			expect(evaluate('={{ (0).isTrue() }}')).toEqual(false);
-			expect(evaluate('={{ (NaN).isTrue() }}')).toEqual(false);
-		});
-
-		test('.isFalse() should work on a number', () => {
-			expect(evaluate('={{ (1).isFalse() }}')).toEqual(false);
-			expect(evaluate('={{ (0).isFalse() }}')).toEqual(true);
-			expect(evaluate('={{ (NaN).isFalse() }}')).toEqual(false);
-		});
-
 		test('.isOdd() should work on a number', () => {
 			expect(evaluate('={{ (9).isOdd() }}')).toEqual(true);
 			expect(evaluate('={{ (8).isOdd() }}')).toEqual(false);
@@ -77,8 +51,8 @@ describe('Data Transformation Functions', () => {
 
 	describe('Multiple expressions', () => {
 		test('Basic multiple expressions', () => {
-			expect(evaluate('={{ "Test".sayHi() }} you have ${{ (100).format() }}.')).toEqual(
-				'hi Test you have $100.',
+			expect(evaluate('={{ "test abc".toSnakeCase() }} you have ${{ (100).format() }}.')).toEqual(
+				'test_abc you have $100.',
 			);
 		});
 	});
diff --git a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
index bc80d89c1cca85..11230cb2055559 100644
--- a/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/StringExtensions.test.ts
@@ -8,47 +8,25 @@ import { evaluate } from './Helpers';
 
 describe('Data Transformation Functions', () => {
 	describe('String Data Transformation Functions', () => {
-		test('.isBlank() should work correctly on a string that is not empty', () => {
-			expect(evaluate('={{"NotBlank".isBlank()}}')).toEqual(false);
+		test('.isEmpty() should work correctly on a string that is not empty', () => {
+			expect(evaluate('={{"NotBlank".isEmpty()}}')).toEqual(false);
 		});
 
-		test('.isBlank() should work correctly on a string that is empty', () => {
-			expect(evaluate('={{"".isBlank()}}')).toEqual(true);
+		test('.isEmpty() should work correctly on a string that is empty', () => {
+			expect(evaluate('={{"".isEmpty()}}')).toEqual(true);
 		});
 
-		test('.getOnlyFirstCharacters() should work correctly on a string', () => {
-			expect(evaluate('={{"myNewField".getOnlyFirstCharacters(5)}}')).toEqual('myNew');
-
-			expect(evaluate('={{"myNewField".getOnlyFirstCharacters(10)}}')).toEqual('myNewField');
-
-			expect(
-				evaluate('={{"myNewField".getOnlyFirstCharacters(5).length >= "myNewField".length}}'),
-			).toEqual(false);
-
-			expect(evaluate('={{DateTime.now().toLocaleString().getOnlyFirstCharacters(2)}}')).toEqual(
-				stringExtensions.functions.getOnlyFirstCharacters(
-					// @ts-ignore
-					dateExtensions.functions.toLocaleString(new Date(), []),
-					[2],
-				),
-			);
-		});
-
-		test('.sayHi() should work correctly on a string', () => {
-			expect(evaluate('={{ "abc".sayHi() }}')).toEqual('hi abc');
-		});
-
-		test('.encrypt() should work correctly on a string', () => {
-			expect(evaluate('={{ "12345".encrypt("sha256") }}')).toEqual(
-				stringExtensions.functions.encrypt('12345', ['sha256']),
+		test('.hash() should work correctly on a string', () => {
+			expect(evaluate('={{ "12345".hash("sha256") }}')).toEqual(
+				stringExtensions.functions.hash('12345', ['sha256']),
 			);
 
-			expect(evaluate('={{ "12345".encrypt("sha256") }}')).not.toEqual(
-				stringExtensions.functions.encrypt('12345', ['MD5']),
+			expect(evaluate('={{ "12345".hash("sha256") }}')).not.toEqual(
+				stringExtensions.functions.hash('12345', ['MD5']),
 			);
 
-			expect(evaluate('={{ "12345".encrypt("MD5") }}')).toEqual(
-				stringExtensions.functions.encrypt('12345', ['MD5']),
+			expect(evaluate('={{ "12345".hash("MD5") }}')).toEqual(
+				stringExtensions.functions.hash('12345', ['MD5']),
 			);
 
 			expect(evaluate('={{ "12345".hash("sha256") }}')).toEqual(
@@ -74,8 +52,8 @@ describe('Data Transformation Functions', () => {
 			);
 		});
 
-		test('.stripTags should work correctly on a string', () => {
-			expect(evaluate('={{ "<html><head>test</head></html>".stripTags() }}')).toEqual('test');
+		test('.removeTags should work correctly on a string', () => {
+			expect(evaluate('={{ "<html><head>test</head></html>".removeTags() }}')).toEqual('test');
 		});
 
 		test('.removeMarkdown should work correctly on a string', () => {
@@ -92,48 +70,6 @@ describe('Data Transformation Functions', () => {
 			);
 		});
 
-		test('.toBoolean should work correctly on a string', () => {
-			const validTrue = ['y', 'yes', 't', 'true', '1', 'YES'];
-			for (const v of validTrue) {
-				expect(evaluate(`={{ "${v}".toBoolean() }}`)).toEqual(true);
-			}
-
-			const validFalse = ['n', 'no', 'f', 'false', '0', 'NO'];
-			for (const v of validFalse) {
-				expect(evaluate(`={{ "${v}".toBoolean() }}`)).toEqual(false);
-			}
-
-			expect(evaluate('={{ "maybe".toBoolean() }}')).toEqual(false);
-		});
-
-		test('.isTrue should work correctly on a string', () => {
-			const validTrue = ['y', 'yes', 't', 'true', '1', 'YES'];
-			for (const v of validTrue) {
-				expect(evaluate(`={{ "${v}".isTrue() }}`)).toEqual(true);
-			}
-
-			const validFalse = ['n', 'no', 'f', 'false', '0', 'NO'];
-			for (const v of validFalse) {
-				expect(evaluate(`={{ "${v}".isTrue() }}`)).toEqual(false);
-			}
-
-			expect(evaluate('={{ "maybe".isTrue() }}')).toEqual(false);
-		});
-
-		test('.isFalse should work correctly on a string', () => {
-			const validTrue = ['y', 'yes', 't', 'true', '1', 'YES'];
-			for (const v of validTrue) {
-				expect(evaluate(`={{ "${v}".isFalse() }}`)).toEqual(false);
-			}
-
-			const validFalse = ['n', 'no', 'f', 'false', '0', 'NO'];
-			for (const v of validFalse) {
-				expect(evaluate(`={{ "${v}".isFalse() }}`)).toEqual(true);
-			}
-
-			expect(evaluate('={{ "maybe".isFalse() }}')).toEqual(false);
-		});
-
 		test('.toFloat should work correctly on a string', () => {
 			expect(evaluate('={{ "1.1".toFloat() }}')).toEqual(1.1);
 			expect(evaluate('={{ "1.1".toDecimalNumber() }}')).toEqual(1.1);
@@ -185,16 +121,6 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ "i am a test".toSentenceCase() }}')).toEqual('I am a test');
 		});
 
-		test('.toTitleCase should work on a string', () => {
-			expect(
-				evaluate(
-					'={{ "i am a test! i have multiple types of Punctuation. or do i?".toTitleCase() }}',
-				),
-			).toEqual('I Am A Test! I Have Multiple Types Of Punctuation. Or Do I?');
-			expect(evaluate('={{ "i am a test!".toTitleCase() }}')).toEqual('I Am A Test!');
-			expect(evaluate('={{ "i am a test".toTitleCase() }}')).toEqual('I Am A Test');
-		});
-
 		test('.extractUrl should work on a string', () => {
 			expect(
 				evaluate(
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 939a2482d162f1..b91a464d27bc2c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -558,7 +558,7 @@ importers:
       axios: ^0.21.1
       c8: ^7.12.0
       codemirror-lang-html-n8n: ^1.0.0
-      codemirror-lang-n8n-expression: ^0.1.0
+      codemirror-lang-n8n-expression: ^0.2.0
       dateformat: ^3.0.3
       esprima-next: 5.8.4
       fast-json-stable-stringify: ^2.1.0
@@ -627,7 +627,7 @@ importers:
       '@jsplumb/util': 5.13.2
       axios: 0.21.4
       codemirror-lang-html-n8n: 1.0.0
-      codemirror-lang-n8n-expression: 0.1.0_zyklskjzaprvz25ee7sq7godcq
+      codemirror-lang-n8n-expression: 0.2.0_zyklskjzaprvz25ee7sq7godcq
       dateformat: 3.0.3
       esprima-next: 5.8.4
       fast-json-stable-stringify: 2.1.0
@@ -937,6 +937,7 @@ importers:
       lodash.set: ^4.3.2
       luxon: ^3.1.0
       recast: ^0.21.5
+      title-case: ^3.0.3
       transliteration: ^2.3.5
       xml2js: ^0.4.23
     dependencies:
@@ -950,6 +951,7 @@ importers:
       lodash.set: 4.3.2
       luxon: 3.1.1
       recast: 0.21.5
+      title-case: 3.0.3
       transliteration: 2.3.5
       xml2js: 0.4.23
     devDependencies:
@@ -9441,8 +9443,8 @@ packages:
       '@lezer/lr': 1.2.3
     dev: false
 
-  /codemirror-lang-n8n-expression/0.1.0_zyklskjzaprvz25ee7sq7godcq:
-    resolution: {integrity: sha512-20ss5p0koTu5bfivr1sBHYs7cpjWT2JhVB5gn7TX9WWPt+v/9p9tEcYSOyL/sm+OFuWh698Cgnmrba4efQnMCQ==}
+  /codemirror-lang-n8n-expression/0.2.0_zyklskjzaprvz25ee7sq7godcq:
+    resolution: {integrity: sha512-kdlpzevdCpWcpbNcwES9YZy+rDFwWOdO6Z78SWxT6jMhCPmdHQmO+gJ39aXAXlUI7OGLfOBtg1/ONxPjRpEIYQ==}
     dependencies:
       '@codemirror/autocomplete': 6.4.0_wo7q3lvweq5evsu423o7qzum5i
       '@codemirror/language': 6.2.1
@@ -20972,7 +20974,6 @@ packages:
     resolution: {integrity: sha512-e1zGYRvbffpcHIrnuqT0Dh+gEJtDaxDSoG4JAIpq4oDFyooziLBIiYQv0GBT4FUAnUop5uZ1hiIAj7oAF6sOCA==}
     dependencies:
       tslib: 2.4.0
-    dev: true
 
   /tlds/1.231.0:
     resolution: {integrity: sha512-L7UQwueHSkGxZHQBXHVmXW64oi+uqNtzFt2x6Ssk7NVnpIbw16CRs4eb/jmKOZ9t2JnqZ/b3Cfvo97lnXqKrhw==}

From 04c058a34e7c306141592691fa646ef6480bbc03 Mon Sep 17 00:00:00 2001
From: Ashish Ahuja <54350798+avainfotech2019@users.noreply.github.com>
Date: Thu, 2 Feb 2023 17:48:11 +0530
Subject: [PATCH 059/358] feat(OpenAI Node): Add frequency-penalty and
 presence-penalty (#5137)

---
 .../nodes/OpenAi/TextDescription.ts           | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/packages/nodes-base/nodes/OpenAi/TextDescription.ts b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
index dc55a5ef659930..e79acfe142c276 100644
--- a/packages/nodes-base/nodes/OpenAi/TextDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/TextDescription.ts
@@ -379,6 +379,21 @@ const sharedOperations: INodeProperties[] = [
 					},
 				},
 			},
+			{
+				displayName: 'Frequency Penalty',
+				name: 'frequency_penalty',
+				default: 0,
+				typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+				description:
+					"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+				type: 'number',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'frequency_penalty',
+					},
+				},
+			},
 			{
 				displayName: 'Maximum Number of Tokens',
 				name: 'maxTokens',
@@ -415,6 +430,21 @@ const sharedOperations: INodeProperties[] = [
 					},
 				},
 			},
+			{
+				displayName: 'Presence Penalty',
+				name: 'presence_penalty',
+				default: 0,
+				typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+				description:
+					"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+				type: 'number',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'presence_penalty',
+					},
+				},
+			},
 			{
 				displayName: 'Sampling Temperature',
 				name: 'temperature',

From 3b5e1d127fe049934a0a32310ed408cd129b2d7d Mon Sep 17 00:00:00 2001
From: Paras Daryanani <parasdaryanani@users.noreply.github.com>
Date: Thu, 2 Feb 2023 12:26:56 +0000
Subject: [PATCH 060/358] fix(Invoice Ninja Node): Fix line items not being
 correctly set for quotes and invoices (#5304)

---
 .../nodes/InvoiceNinja/InvoiceNinja.node.ts   | 28 ++++++++++++++++---
 .../nodes/InvoiceNinja/QuoteInterface.ts      |  2 ++
 .../nodes/InvoiceNinja/invoiceInterface.ts    |  2 ++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index 74032ba884c2cf..54e668a1af261a 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -472,15 +472,25 @@ export class InvoiceNinja implements INodeType {
 									cost: itemValue.cost as number,
 									notes: itemValue.description as string,
 									product_key: itemValue.service as string,
-									qty: itemValue.hours as number,
 									tax_rate1: itemValue.taxRate1 as number,
 									tax_rate2: itemValue.taxRate2 as number,
 									tax_name1: itemValue.taxName1 as string,
 									tax_name2: itemValue.taxName2 as string,
 								};
+								if (apiVersion === 'v4') {
+									item.qty = itemValue.hours as number;
+								}
+								if (apiVersion === 'v5') {
+									item.quantity = itemValue.hours as number;
+								}
 								invoiceItems.push(item);
 							}
-							body.invoice_items = invoiceItems;
+							if (apiVersion === 'v4') {
+								body.invoice_items = invoiceItems;
+							}
+							if (apiVersion === 'v5') {
+								body.line_items = invoiceItems;
+							}
 						}
 						responseData = await invoiceNinjaApiRequest.call(
 							this,
@@ -902,15 +912,25 @@ export class InvoiceNinja implements INodeType {
 									cost: itemValue.cost as number,
 									notes: itemValue.description as string,
 									product_key: itemValue.service as string,
-									qty: itemValue.hours as number,
 									tax_rate1: itemValue.taxRate1 as number,
 									tax_rate2: itemValue.taxRate2 as number,
 									tax_name1: itemValue.taxName1 as string,
 									tax_name2: itemValue.taxName2 as string,
 								};
+								if (apiVersion === 'v4') {
+									item.qty = itemValue.hours as number;
+								}
+								if (apiVersion === 'v5') {
+									item.quantity = itemValue.hours as number;
+								}
 								invoiceItems.push(item);
 							}
-							body.invoice_items = invoiceItems;
+							if (apiVersion === 'v4') {
+								body.invoice_items = invoiceItems;
+							}
+							if (apiVersion === 'v5') {
+								body.line_items = invoiceItems;
+							}
 						}
 						responseData = await invoiceNinjaApiRequest.call(
 							this,
diff --git a/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts b/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts
index 7b053b8accebdf..f1e5329e414679 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/QuoteInterface.ts
@@ -3,6 +3,7 @@ export interface IItem {
 	notes?: string;
 	product_key?: string;
 	qty?: number;
+	quantity?: number;
 	tax_rate1?: number;
 	tax_rate2?: number;
 	tax_name1?: string;
@@ -20,6 +21,7 @@ export interface IQuote {
 	email?: string;
 	invoice_date?: string;
 	invoice_items?: IItem[];
+	line_items?: IItem[];
 	invoice_number?: string;
 	invoice_status_id?: number;
 	is_amount_discount?: boolean;
diff --git a/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts b/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts
index ab61e4fd9636b5..22a8728ae422e1 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/invoiceInterface.ts
@@ -3,6 +3,7 @@ export interface IItem {
 	notes?: string;
 	product_key?: string;
 	qty?: number;
+	quantity?: number;
 	tax_rate1?: number;
 	tax_rate2?: number;
 	tax_name1?: string;
@@ -20,6 +21,7 @@ export interface IInvoice {
 	due_date?: string;
 	invoice_date?: string;
 	invoice_items?: IItem[];
+	line_items?: IItem[];
 	invoice_number?: string;
 	invoice_status_id?: number;
 	is_amount_discount?: boolean;

From 8b09e986542f00675197bc8e003c332e8926779f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 2 Feb 2023 14:00:16 +0100
Subject: [PATCH 061/358] feat(editor): Adjust HTML editor component for use in
 params (#5285)

* :sparkles: Adjust HTML editor component

* :recycle: Apply feedback

* :recycle: Apply feedback

* :fire: Remove unused ndv store refs
---
 .../src/components/HtmlEditor/HtmlEditor.vue  | 55 +++++++++++++++++--
 .../src/components/HtmlEditor/theme.ts        |  5 ++
 .../src/components/ParameterInput.vue         |  8 ++-
 .../src/components/ParameterOptions.vue       | 14 ++---
 .../src/plugins/i18n/locales/en.json          |  1 +
 .../nodes-base/nodes/Mailgun/Mailgun.node.ts  |  1 +
 6 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 9ebb7749134a65..895e79caf287f1 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -36,11 +36,20 @@ export default mixins(expressionManager).extend({
 	props: {
 		html: {
 			type: String,
+			required: true,
 		},
 		isReadOnly: {
 			type: Boolean,
 			default: false,
 		},
+		rows: {
+			type: Number,
+			default: -1,
+		},
+		disableExpressionColoring: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -72,8 +81,8 @@ export default mixins(expressionManager).extend({
 				EditorView.updateListener.of((viewUpdate: ViewUpdate) => {
 					if (!viewUpdate.docChanged) return;
 
-					highlighter.removeColor(this.editor, this.htmlSegments);
-					highlighter.addColor(this.editor, this.resolvableSegments);
+					this.getHighlighter()?.removeColor(this.editor, this.htmlSegments);
+					this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
 
 					this.$emit('valueChanged', this.doc);
 				}),
@@ -144,7 +153,31 @@ export default mixins(expressionManager).extend({
 			return root;
 		},
 
+		isMissingHtmlTags() {
+			const zerothSection = this.sections.at(0);
+
+			return (
+				!zerothSection?.content.trim().startsWith('<html') &&
+				!zerothSection?.content.trim().endsWith('</html>')
+			);
+		},
+
 		format() {
+			if (this.sections.length === 1 && this.isMissingHtmlTags()) {
+				const zerothSection = this.sections.at(0) as Section;
+
+				const formatted = prettier
+					.format(zerothSection.content, {
+						parser: 'html',
+						plugins: [htmlParser],
+					})
+					.trim();
+
+				return this.editor.dispatch({
+					changes: { from: 0, to: this.doc.length, insert: formatted },
+				});
+			}
+
 			const formatted = [];
 
 			for (const { kind, content } of this.sections) {
@@ -185,20 +218,34 @@ export default mixins(expressionManager).extend({
 				}
 			}
 
+			if (formatted.length === 0) return;
+
 			this.editor.dispatch({
 				changes: { from: 0, to: this.doc.length, insert: formatted.join('\n\n') },
 			});
 		},
+
+		getHighlighter() {
+			if (this.disableExpressionColoring) return;
+
+			return highlighter;
+		},
 	},
 
 	mounted() {
 		htmlEditorEventBus.$on('format-html', this.format);
 
-		const state = EditorState.create({ doc: this.html, extensions: this.extensions });
+		let doc = this.html;
+
+		if (this.html === '' && this.rows > 0) {
+			doc = '\n'.repeat(this.rows - 1);
+		}
+
+		const state = EditorState.create({ doc, extensions: this.extensions });
 
 		this.editor = new EditorView({ parent: this.root(), state });
 
-		highlighter.addColor(this.editor, this.resolvableSegments);
+		this.getHighlighter()?.addColor(this.editor, this.resolvableSegments);
 	},
 
 	destroyed() {
diff --git a/packages/editor-ui/src/components/HtmlEditor/theme.ts b/packages/editor-ui/src/components/HtmlEditor/theme.ts
index f0460af5014282..5c2a9845c149d3 100644
--- a/packages/editor-ui/src/components/HtmlEditor/theme.ts
+++ b/packages/editor-ui/src/components/HtmlEditor/theme.ts
@@ -18,6 +18,9 @@ export const theme = [
 		'.cm-cursor, .cm-dropCursor': {
 			borderLeftColor: 'var(--color-code-caret)',
 		},
+		'&.cm-editor.cm-focused': {
+			outline: '0',
+		},
 		'&.cm-focused .cm-selectionBackgroundm .cm-selectionBackground, .cm-content ::selection': {
 			backgroundColor: 'var(--color-code-selection)',
 		},
@@ -30,6 +33,8 @@ export const theme = [
 		'.cm-gutters': {
 			backgroundColor: 'var(--color-code-gutterBackground)',
 			color: 'var(--color-code-gutterForeground)',
+			borderTopLeftRadius: 'var(--border-radius-base)',
+			borderBottomLeftRadius: 'var(--border-radius-base)',
 		},
 		'.cm-scroller': {
 			overflow: 'auto',
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index fba845a65f2459..358e34902dffd3 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -81,9 +81,11 @@
 				/>
 
 				<html-editor
-					v-else-if="getArgument('editor') === 'htmlEditor' && isHtmlNode(node)"
+					v-else-if="getArgument('editor') === 'htmlEditor'"
 					:html="node.parameters.html"
 					:isReadOnly="isReadOnly"
+					:rows="getArgument('rows')"
+					:disableExpressionColoring="!isHtmlNode(node)"
 					@valueChanged="valueChangedDebounced"
 				/>
 
@@ -353,8 +355,8 @@ import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { hasExpressionMapping, isValueExpression, isResourceLocatorValue } from '@/utils';
 
 import mixins from 'vue-typed-mixins';
-import { CUSTOM_API_CALL_KEY } from '@/constants';
-import { CODE_NODE_TYPE, HTML_NODE_TYPE } from '@/constants';
+import { CUSTOM_API_CALL_KEY, HTML_NODE_TYPE } from '@/constants';
+import { CODE_NODE_TYPE } from '@/constants';
 import { PropType } from 'vue';
 import { debounceHelper } from '@/mixins/debounce';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/components/ParameterOptions.vue b/packages/editor-ui/src/components/ParameterOptions.vue
index 220b3ac21c7d05..abf0c2e2d0143a 100644
--- a/packages/editor-ui/src/components/ParameterOptions.vue
+++ b/packages/editor-ui/src/components/ParameterOptions.vue
@@ -28,9 +28,6 @@
 import { NodeParameterValueType } from 'n8n-workflow';
 import Vue, { PropType } from 'vue';
 import { isValueExpression, isResourceLocatorValue } from '@/utils';
-import { useNDVStore } from '@/stores/ndv';
-import { mapStores } from 'pinia';
-import { HTML_NODE_TYPE } from '@/constants';
 
 export default Vue.extend({
 	name: 'parameter-options',
@@ -54,13 +51,15 @@ export default Vue.extend({
 		},
 	},
 	computed: {
-		...mapStores(useNDVStore),
 		isDefault(): boolean {
 			return this.parameter.default === this.value;
 		},
 		isValueExpression(): boolean {
 			return isValueExpression(this.parameter, this.value);
 		},
+		isHtmlEditor(): boolean {
+			return this.getArgument('editor') === 'htmlEditor';
+		},
 		shouldShowOptions(): boolean {
 			if (this.isReadOnly === true) {
 				return false;
@@ -95,13 +94,10 @@ export default Vue.extend({
 			return !!this.getArgument('loadOptionsMethod') || !!this.getArgument('loadOptions');
 		},
 		actions(): Array<{ label: string; value: string; disabled?: boolean }> {
-			if (
-				this.ndvStore.activeNode?.type === HTML_NODE_TYPE &&
-				this.ndvStore.activeNode?.parameters.operation === 'generateHtmlTemplate'
-			) {
+			if (this.isHtmlEditor && !this.isValueExpression) {
 				return [
 					{
-						label: 'Format HTML',
+						label: this.$locale.baseText('parameterInput.formatHtml'),
 						value: 'formatHtml',
 					},
 				];
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index f255b124750087..adb35b22604f1b 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -878,6 +878,7 @@
 	"parameterInput.error": "ERROR",
 	"parameterInput.expression": "Expression",
 	"parameterInput.fixed": "Fixed",
+	"parameterInput.formatHtml": "Format HTML",
 	"parameterInput.issues": "Issues",
 	"parameterInput.loadingOptions": "Loading options...",
 	"parameterInput.openEditWindow": "Open Edit Window",
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index ee615d49a70f67..fc45a8ff4dbe8e 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -85,6 +85,7 @@ export class Mailgun implements INodeType {
 				type: 'string',
 				typeOptions: {
 					rows: 5,
+					editor: 'htmlEditor',
 				},
 				default: '',
 				description: 'HTML text message of email',

From 6cba652ff9ce1dfffe463188e5665e0c22f6fda0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 2 Feb 2023 14:01:55 +0100
Subject: [PATCH 062/358] fix(core): Load config values from files using
 `_FILE` env variables (no-changelog) (#5335)

This broke in https://github.com/n8n-io/n8n/pull/5283/
---
 packages/cli/src/config/index.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 06d3b7027929ce..3804ab2b00a8d9 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -47,9 +47,11 @@ if (!inE2ETests && !inTest) {
 	const overwrites = Object.entries(process.env).reduce<Record<string, string>>(
 		(acc, [envName, fileName]) => {
 			if (envName.endsWith('_FILE') && fileName) {
-				const key = envName.replace(/_FILE$/, '');
+				const configEnvName = envName.replace(/_FILE$/, '');
 				// @ts-ignore
-				if (key in config._env) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+				const key = config._env[configEnvName]?.[0] as string;
+				if (key) {
 					let value: string;
 					try {
 						value = readFileSync(fileName, 'utf8').trim();

From e58bc41d241b3f4a1701191f69e5eadad969bc5f Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 2 Feb 2023 14:53:08 +0100
Subject: [PATCH 063/358] feat(core): Fix populating of node custom api call
 options (#5303)

* feat(core): Fix populating of node custom api call options

* lint fixes

* Adress PR comments

* Add e2e test and only inject custom API options for latest version

* Make sure to injectCustomApiCallOption for the latest version of node
---
 cypress/e2e/5-ndv.cy.ts                       | 12 ++++
 cypress/pages/ndv.ts                          |  1 +
 packages/cli/src/api/nodeTypes.api.ts         | 62 +------------------
 packages/core/src/Constants.ts                |  2 +
 packages/core/src/DirectoryLoader.ts          | 54 ++++++++++++++--
 .../Node/NodeCreator/TriggerHelperPanel.vue   | 19 +-----
 .../editor-ui/src/components/NodeSettings.vue |  6 +-
 packages/editor-ui/src/stores/nodeCreator.ts  |  7 ++-
 8 files changed, 78 insertions(+), 85 deletions(-)

diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 9fead48e51a4cb..f535ab363870fe 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -87,4 +87,16 @@ describe('NDV', () => {
 			cy.get('[class*=hasIssues]').should('have.length', 1);
 		});
 	});
+
+	it('should show http node hint if node has custom api option', () => {
+		workflowPage.actions.addNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addNodeToCanvas('Slack', true, true);
+		ndv.getters.httpRequestNotice().should('not.exist');
+		ndv.getters.parameterInput('operation').click();
+		ndv.getters.parameterInput('operation').contains('Custom API').click();
+		ndv.getters.httpRequestNotice().should('be.visible');
+		ndv.getters.parameterInput('operation').click();
+		ndv.getters.parameterInput('operation').contains('Post').click();
+		ndv.getters.httpRequestNotice().should('not.exist');
+	});
 });
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index ba38b940652e8c..3761db326f3b90 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -27,6 +27,7 @@ export class NDV extends BasePage {
 		parameterInput: (parameterName: string) => cy.getByTestId(`parameter-input-${parameterName}`),
 		nodeNameContainer: () => cy.getByTestId('node-title-container'),
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
+		httpRequestNotice: () => cy.getByTestId('node-parameters-http-notice'),
 	};
 
 	actions = {
diff --git a/packages/cli/src/api/nodeTypes.api.ts b/packages/cli/src/api/nodeTypes.api.ts
index 1e0eb7c6227b43..6c55d195661bee 100644
--- a/packages/cli/src/api/nodeTypes.api.ts
+++ b/packages/cli/src/api/nodeTypes.api.ts
@@ -2,69 +2,13 @@ import express from 'express';
 import { readFile } from 'fs/promises';
 import get from 'lodash.get';
 
-import type { ICredentialType, INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
+import type { INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
 
-import { CredentialTypes } from '@/CredentialTypes';
 import config from '@/config';
 import { NodeTypes } from '@/NodeTypes';
 import * as ResponseHelper from '@/ResponseHelper';
 import { getNodeTranslationPath } from '@/TranslationHelpers';
 
-function isOAuth(credType: ICredentialType) {
-	return (
-		Array.isArray(credType.extends) &&
-		credType.extends.some((parentType) =>
-			['oAuth2Api', 'googleOAuth2Api', 'oAuth1Api'].includes(parentType),
-		)
-	);
-}
-
-/**
- * Whether any of the node's credential types may be used to
- * make a request from a node other than itself.
- */
-function supportsProxyAuth(description: INodeTypeDescription) {
-	if (!description.credentials) return false;
-
-	const credentialTypes = CredentialTypes();
-
-	return description.credentials.some(({ name }) => {
-		const credType = credentialTypes.getByName(name);
-
-		if (credType.authenticate !== undefined) return true;
-
-		return isOAuth(credType);
-	});
-}
-
-const CUSTOM_API_CALL_NAME = 'Custom API Call';
-const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
-
-/**
- * Inject a `Custom API Call` option into `resource` and `operation`
- * parameters in a node that supports proxy auth.
- */
-function injectCustomApiCallOption(description: INodeTypeDescription) {
-	if (!supportsProxyAuth(description)) return description;
-
-	description.properties.forEach((p) => {
-		if (
-			['resource', 'operation'].includes(p.name) &&
-			Array.isArray(p.options) &&
-			p.options[p.options.length - 1].name !== CUSTOM_API_CALL_NAME
-		) {
-			p.options.push({
-				name: CUSTOM_API_CALL_NAME,
-				value: CUSTOM_API_CALL_KEY,
-			});
-		}
-
-		return p;
-	});
-
-	return description;
-}
-
 export const nodeTypesController = express.Router();
 
 // Returns node information based on node names and versions
@@ -78,7 +22,7 @@ nodeTypesController.post(
 		if (defaultLocale === 'en') {
 			return nodeInfos.reduce<INodeTypeDescription[]>((acc, { name, version }) => {
 				const { description } = NodeTypes().getByNameAndVersion(name, version);
-				acc.push(injectCustomApiCallOption(description));
+				acc.push(description);
 				return acc;
 			}, []);
 		}
@@ -103,7 +47,7 @@ nodeTypesController.post(
 				// ignore - no translation exists at path
 			}
 
-			nodeTypes.push(injectCustomApiCallOption(description));
+			nodeTypes.push(description);
 		}
 
 		const nodeTypes: INodeTypeDescription[] = [];
diff --git a/packages/core/src/Constants.ts b/packages/core/src/Constants.ts
index 6d2fe993213366..45c1741dd020e0 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/Constants.ts
@@ -11,6 +11,8 @@ export const PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
 export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
 export const TUNNEL_SUBDOMAIN_ENV = 'N8N_TUNNEL_SUBDOMAIN';
 export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
+export const CUSTOM_API_CALL_NAME = 'Custom API Call';
+export const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
 
 export const RESPONSE_ERROR_MESSAGES = {
 	NO_ENCRYPTION_KEY: 'Encryption key is missing or was not set',
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 0682cfec7c9a9e..0af2f534f230d2 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -15,7 +15,7 @@ import type {
 	IVersionedNodeType,
 	KnownNodesAndCredentials,
 } from 'n8n-workflow';
-import { CUSTOM_NODES_CATEGORY } from './Constants';
+import { CUSTOM_NODES_CATEGORY, CUSTOM_API_CALL_KEY, CUSTOM_API_CALL_NAME } from './Constants';
 import type { n8n } from './Interfaces';
 import { loadClassInIsolation } from './ClassLoader';
 
@@ -54,6 +54,48 @@ export abstract class DirectoryLoader {
 		return path.resolve(this.directory, file);
 	}
 
+	/**
+	 * Whether any of the node's credential types may be used to
+	 * make a request from a node other than itself.
+	 */
+	private supportsProxyAuth(description: INodeTypeDescription) {
+		if (!description.credentials) return false;
+
+		return description.credentials.some(({ name }) => {
+			const credType = this.credentialTypes[name].type;
+
+			if (credType.authenticate !== undefined) return true;
+
+			return (
+				Array.isArray(credType.extends) &&
+				credType.extends.some((parentType) =>
+					['oAuth2Api', 'googleOAuth2Api', 'oAuth1Api'].includes(parentType),
+				)
+			);
+		});
+	}
+
+	/**
+	 * Inject a `Custom API Call` option into `resource` and `operation`
+	 * parameters in a node that supports proxy auth.
+	 */
+	private injectCustomApiCallOption(description: INodeTypeDescription) {
+		if (!this.supportsProxyAuth(description)) return;
+
+		description.properties.forEach((p) => {
+			if (
+				['resource', 'operation'].includes(p.name) &&
+				Array.isArray(p.options) &&
+				p.options[p.options.length - 1].name !== CUSTOM_API_CALL_NAME
+			) {
+				p.options.push({
+					name: CUSTOM_API_CALL_NAME,
+					value: CUSTOM_API_CALL_KEY,
+				});
+			}
+		});
+	}
+
 	protected loadNodeFromFile(packageName: string, nodeName: string, filePath: string) {
 		let tempNode: INodeType | IVersionedNodeType;
 		let nodeVersion = 1;
@@ -89,6 +131,7 @@ export abstract class DirectoryLoader {
 
 			const currentVersionNode = tempNode.nodeVersions[tempNode.currentVersion];
 			this.addCodex({ node: currentVersionNode, filePath, isCustom: packageName === 'CUSTOM' });
+			this.injectCustomApiCallOption(currentVersionNode.description);
 			nodeVersion = tempNode.currentVersion;
 
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
@@ -99,10 +142,11 @@ export abstract class DirectoryLoader {
 			}
 		} else {
 			// Short renaming to avoid type issues
-			const tmpNode = tempNode;
-			nodeVersion = Array.isArray(tmpNode.description.version)
-				? tmpNode.description.version.slice(-1)[0]
-				: tmpNode.description.version;
+
+			this.injectCustomApiCallOption(tempNode.description);
+			nodeVersion = Array.isArray(tempNode.description.version)
+				? tempNode.description.version.slice(-1)[0]
+				: tempNode.description.version;
 		}
 
 		this.known.nodes[fullNodeName] = {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
index ad6d2dfaa7dbd9..3ce89f63d167cf 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
@@ -233,7 +233,7 @@ const telemetry = instance?.proxy.$telemetry;
 const { categorizedItems: allNodes, isTriggerNode } = useNodeTypesStore();
 const containsAPIAction = computed(
 	() =>
-		state.latestNodeData?.properties.some((p) =>
+		activeNodeActions.value?.properties.some((p) =>
 			p.options?.find((o) => o.name === CUSTOM_API_CALL_NAME),
 		) === true,
 );
@@ -338,27 +338,10 @@ function getCustomAPICallHintLocale(key: string) {
 		interpolate: { nodeNameTitle },
 	});
 }
-// The nodes.json doesn't contain API CALL option so we need to fetch the node detail
-// to determine if need to render the API CALL hint
-async function fetchNodeDetails() {
-	if (!state.activeNodeActions) return;
-
-	const { getNodesInformation } = useNodeTypesStore();
-	const { version, name } = state.activeNodeActions;
-	const payload = {
-		name,
-		version: Array.isArray(version) ? version?.slice(-1)[0] : version,
-	} as INodeTypeNameVersion;
-
-	const nodesInfo = await getNodesInformation([payload], false);
-
-	state.latestNodeData = nodesInfo[0];
-}
 
 function setActiveActionsNodeType(nodeType: INodeTypeDescription | null) {
 	state.activeNodeActions = nodeType;
 	setShowTabs(false);
-	fetchNodeDetails();
 
 	if (nodeType) trackActionsView();
 }
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index e533e20f8c0500..b1673a6f132179 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -116,7 +116,11 @@
 					</n8n-text>
 				</div>
 
-				<div v-if="isCustomApiCallSelected(nodeValues)" class="parameter-item parameter-notice">
+				<div
+					v-if="isCustomApiCallSelected(nodeValues)"
+					class="parameter-item parameter-notice"
+					data-test-id="node-parameters-http-notice"
+				>
 					<n8n-notice
 						:content="
 							$locale.baseText('nodeSettings.useTheHttpRequestNode', {
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index 5604b01ef28d97..f7485247337fb2 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -56,9 +56,12 @@ const customNodeActionsParsers: {
 	},
 };
 
-function filterSinglePlaceholderAction(actions: INodeActionTypeDescription[]) {
+function filterActions(actions: INodeActionTypeDescription[]) {
 	return actions.filter(
 		(action: INodeActionTypeDescription, _: number, arr: INodeActionTypeDescription[]) => {
+			const isApiCall = action.actionKey === CUSTOM_API_CALL_KEY;
+			if (isApiCall) return false;
+
 			const isPlaceholderTriggerAction = action.actionKey === PLACEHOLDER_RECOMMENDED_ACTION_KEY;
 			return !isPlaceholderTriggerAction || (isPlaceholderTriggerAction && arr.length > 1);
 		},
@@ -339,7 +342,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 
 			const filteredNodes = Object.values(mergedNodes).map((node) => ({
 				...node,
-				actions: filterSinglePlaceholderAction(node.actions || []),
+				actions: filterActions(node.actions || []),
 			}));
 
 			return filteredNodes;

From 93a2dac0639382d12ac0a8efb34cd2436258cc6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 2 Feb 2023 15:34:29 +0100
Subject: [PATCH 064/358] fix(core): Fix env file config loading (no-changelog)
 (#5339)

* fix(core): Do not trim config values read from files (no-changelog)

* do not use config.load. it does not work
---
 packages/cli/src/config/index.ts | 42 ++++++++++++++------------------
 1 file changed, 18 insertions(+), 24 deletions(-)

diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index 3804ab2b00a8d9..a797125c17afbe 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -44,33 +44,27 @@ if (!inE2ETests && !inTest) {
 	}
 
 	// Overwrite config from files defined in "_FILE" environment variables
-	const overwrites = Object.entries(process.env).reduce<Record<string, string>>(
-		(acc, [envName, fileName]) => {
-			if (envName.endsWith('_FILE') && fileName) {
-				const configEnvName = envName.replace(/_FILE$/, '');
-				// @ts-ignore
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-				const key = config._env[configEnvName]?.[0] as string;
-				if (key) {
-					let value: string;
-					try {
-						value = readFileSync(fileName, 'utf8').trim();
-					} catch (error) {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-						if (error.code === 'ENOENT') {
-							throw new Error(`The file "${fileName}" could not be found.`);
-						}
-						throw error;
+	Object.entries(process.env).forEach(([envName, fileName]) => {
+		if (envName.endsWith('_FILE') && fileName) {
+			const configEnvName = envName.replace(/_FILE$/, '');
+			// @ts-ignore
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+			const key = config._env[configEnvName]?.[0] as string;
+			if (key) {
+				let value: string;
+				try {
+					value = readFileSync(fileName, 'utf8');
+				} catch (error) {
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+					if (error.code === 'ENOENT') {
+						throw new Error(`The file "${fileName}" could not be found.`);
 					}
-					console.debug('Loading config overwrite', { fileName });
-					acc[key] = value;
+					throw error;
 				}
+				config.set(key, value);
 			}
-			return acc;
-		},
-		{},
-	);
-	config.load(overwrites);
+		}
+	});
 }
 
 config.validate({

From 6ca49f9d5474d37281681ea571fa74e43828ca84 Mon Sep 17 00:00:00 2001
From: freya <freya@n8n.io>
Date: Thu, 2 Feb 2023 15:27:00 +0000
Subject: [PATCH 065/358] fix(core): Prevent shared user details being saved
 alongside execution data (#5334)

* :hammer: - Remove `shared` key from execution save data

* :shirt: - Using import type where needed

* remove console.log

* :hammer: - Create new clean workflowData instead of removing shared

If IWorkflowBase changes in future, TS will error out here ensuring it's kept up to date

* :hammer: - use lodash.pick for less verbosity

* :hammer: - fix lodash imports
---
 .../cli/src/WorkflowExecuteAdditionalData.ts   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 451cb681437977..c81d08c691d52d 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -41,6 +41,7 @@ import {
 	WorkflowHooks,
 } from 'n8n-workflow';
 
+import pick from 'lodash.pick';
 import { LessThanOrEqual } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 import config from '@/config';
@@ -583,13 +584,28 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						}
 					}
 
+					// Although it is treated as IWorkflowBase here, it's being instantiated elsewhere with properties that may be sensitive
+					// As a result, we should create an IWorkflowBase object with only the data we want to save in it.
+					const pristineWorkflowData: IWorkflowBase = pick(this.workflowData, [
+						'id',
+						'name',
+						'active',
+						'createdAt',
+						'updatedAt',
+						'nodes',
+						'connections',
+						'settings',
+						'staticData',
+						'pinData',
+					]);
+
 					const fullExecutionData: IExecutionDb = {
 						data: fullRunData.data,
 						mode: fullRunData.mode,
 						finished: fullRunData.finished ? fullRunData.finished : false,
 						startedAt: fullRunData.startedAt,
 						stoppedAt: fullRunData.stoppedAt,
-						workflowData: this.workflowData,
+						workflowData: pristineWorkflowData,
 						waitTill: fullRunData.waitTill,
 					};
 

From b5154d9be5e3adccbdcbb0ad748ed869ba75d4cc Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 2 Feb 2023 17:01:45 +0100
Subject: [PATCH 066/358] fix: Prevent unnecessarily touching updatedAt when
 n8n starts (#5340)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Include MariaDB in exception list

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
---
 packages/cli/src/ActiveWorkflowRunner.ts      |  3 ++-
 .../cli/src/workflows/workflows.services.ts   | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 4332fe1ada19aa..14961f2c5ba309 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -63,6 +63,7 @@ import { NodeTypes } from '@/NodeTypes';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExternalHooks } from '@/ExternalHooks';
 import { whereClause } from './UserManagement/UserManagementHelper';
+import { WorkflowsService } from './workflows/workflows.services';
 
 const WEBHOOK_PROD_UNREGISTERED_HINT =
 	"The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
@@ -867,7 +868,7 @@ export class ActiveWorkflowRunner {
 					workflowInstance.getPollNodes().length +
 					WebhookHelpers.getWorkflowWebhooks(workflowInstance, additionalData, undefined, true)
 						.length;
-				await Db.collections.Workflow.update(workflowInstance.id, { triggerCount });
+				await WorkflowsService.updateWorkflowTriggerCount(workflowInstance.id, triggerCount);
 			}
 		} catch (error) {
 			// There was a problem activating the workflow
diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 902896ac127fc8..3b5fd2d928bee1 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -1,7 +1,7 @@
 import { validate as jsonSchemaValidate } from 'jsonschema';
 import type { INode, IPinData, JsonObject } from 'n8n-workflow';
 import { NodeApiError, jsonParse, LoggerProxy, Workflow } from 'n8n-workflow';
-import type { FindOptionsWhere } from 'typeorm';
+import type { FindOptionsWhere, UpdateResult } from 'typeorm';
 import { In } from 'typeorm';
 import pick from 'lodash.pick';
 import { v4 as uuid } from 'uuid';
@@ -459,4 +459,21 @@ export class WorkflowsService {
 
 		return sharedWorkflow.workflow;
 	}
+
+	static async updateWorkflowTriggerCount(id: string, triggerCount: number): Promise<UpdateResult> {
+		const qb = Db.collections.Workflow.createQueryBuilder('workflow');
+		return qb
+			.update()
+			.set({
+				triggerCount,
+				updatedAt: () => {
+					if (['mysqldb', 'mariadb'].includes(config.getEnv('database.type'))) {
+						return 'updatedAt';
+					}
+					return '"updatedAt"';
+				},
+			})
+			.where('id = :id', { id })
+			.execute();
+	}
 }

From 616074158c10a1928299d7213c58eeb076a664e1 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 2 Feb 2023 20:03:45 +0100
Subject: [PATCH 067/358] fix(core): Revert custom API option injecting (#5345)

Revert "feat(core): Fix populating of node custom api call options (#5303)"

This reverts commit e58bc41d241b3f4a1701191f69e5eadad969bc5f.
---
 cypress/e2e/5-ndv.cy.ts                       | 12 ----
 cypress/pages/ndv.ts                          |  1 -
 packages/cli/src/api/nodeTypes.api.ts         | 62 ++++++++++++++++++-
 packages/core/src/Constants.ts                |  2 -
 packages/core/src/DirectoryLoader.ts          | 54 ++--------------
 .../Node/NodeCreator/TriggerHelperPanel.vue   | 19 +++++-
 .../editor-ui/src/components/NodeSettings.vue |  6 +-
 packages/editor-ui/src/stores/nodeCreator.ts  |  7 +--
 8 files changed, 85 insertions(+), 78 deletions(-)

diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index f535ab363870fe..9fead48e51a4cb 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -87,16 +87,4 @@ describe('NDV', () => {
 			cy.get('[class*=hasIssues]').should('have.length', 1);
 		});
 	});
-
-	it('should show http node hint if node has custom api option', () => {
-		workflowPage.actions.addNodeToCanvas('Manual Trigger');
-		workflowPage.actions.addNodeToCanvas('Slack', true, true);
-		ndv.getters.httpRequestNotice().should('not.exist');
-		ndv.getters.parameterInput('operation').click();
-		ndv.getters.parameterInput('operation').contains('Custom API').click();
-		ndv.getters.httpRequestNotice().should('be.visible');
-		ndv.getters.parameterInput('operation').click();
-		ndv.getters.parameterInput('operation').contains('Post').click();
-		ndv.getters.httpRequestNotice().should('not.exist');
-	});
 });
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 3761db326f3b90..ba38b940652e8c 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -27,7 +27,6 @@ export class NDV extends BasePage {
 		parameterInput: (parameterName: string) => cy.getByTestId(`parameter-input-${parameterName}`),
 		nodeNameContainer: () => cy.getByTestId('node-title-container'),
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
-		httpRequestNotice: () => cy.getByTestId('node-parameters-http-notice'),
 	};
 
 	actions = {
diff --git a/packages/cli/src/api/nodeTypes.api.ts b/packages/cli/src/api/nodeTypes.api.ts
index 6c55d195661bee..1e0eb7c6227b43 100644
--- a/packages/cli/src/api/nodeTypes.api.ts
+++ b/packages/cli/src/api/nodeTypes.api.ts
@@ -2,13 +2,69 @@ import express from 'express';
 import { readFile } from 'fs/promises';
 import get from 'lodash.get';
 
-import type { INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
+import type { ICredentialType, INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
 
+import { CredentialTypes } from '@/CredentialTypes';
 import config from '@/config';
 import { NodeTypes } from '@/NodeTypes';
 import * as ResponseHelper from '@/ResponseHelper';
 import { getNodeTranslationPath } from '@/TranslationHelpers';
 
+function isOAuth(credType: ICredentialType) {
+	return (
+		Array.isArray(credType.extends) &&
+		credType.extends.some((parentType) =>
+			['oAuth2Api', 'googleOAuth2Api', 'oAuth1Api'].includes(parentType),
+		)
+	);
+}
+
+/**
+ * Whether any of the node's credential types may be used to
+ * make a request from a node other than itself.
+ */
+function supportsProxyAuth(description: INodeTypeDescription) {
+	if (!description.credentials) return false;
+
+	const credentialTypes = CredentialTypes();
+
+	return description.credentials.some(({ name }) => {
+		const credType = credentialTypes.getByName(name);
+
+		if (credType.authenticate !== undefined) return true;
+
+		return isOAuth(credType);
+	});
+}
+
+const CUSTOM_API_CALL_NAME = 'Custom API Call';
+const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
+
+/**
+ * Inject a `Custom API Call` option into `resource` and `operation`
+ * parameters in a node that supports proxy auth.
+ */
+function injectCustomApiCallOption(description: INodeTypeDescription) {
+	if (!supportsProxyAuth(description)) return description;
+
+	description.properties.forEach((p) => {
+		if (
+			['resource', 'operation'].includes(p.name) &&
+			Array.isArray(p.options) &&
+			p.options[p.options.length - 1].name !== CUSTOM_API_CALL_NAME
+		) {
+			p.options.push({
+				name: CUSTOM_API_CALL_NAME,
+				value: CUSTOM_API_CALL_KEY,
+			});
+		}
+
+		return p;
+	});
+
+	return description;
+}
+
 export const nodeTypesController = express.Router();
 
 // Returns node information based on node names and versions
@@ -22,7 +78,7 @@ nodeTypesController.post(
 		if (defaultLocale === 'en') {
 			return nodeInfos.reduce<INodeTypeDescription[]>((acc, { name, version }) => {
 				const { description } = NodeTypes().getByNameAndVersion(name, version);
-				acc.push(description);
+				acc.push(injectCustomApiCallOption(description));
 				return acc;
 			}, []);
 		}
@@ -47,7 +103,7 @@ nodeTypesController.post(
 				// ignore - no translation exists at path
 			}
 
-			nodeTypes.push(description);
+			nodeTypes.push(injectCustomApiCallOption(description));
 		}
 
 		const nodeTypes: INodeTypeDescription[] = [];
diff --git a/packages/core/src/Constants.ts b/packages/core/src/Constants.ts
index 45c1741dd020e0..6d2fe993213366 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/Constants.ts
@@ -11,8 +11,6 @@ export const PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
 export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
 export const TUNNEL_SUBDOMAIN_ENV = 'N8N_TUNNEL_SUBDOMAIN';
 export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
-export const CUSTOM_API_CALL_NAME = 'Custom API Call';
-export const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
 
 export const RESPONSE_ERROR_MESSAGES = {
 	NO_ENCRYPTION_KEY: 'Encryption key is missing or was not set',
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 0af2f534f230d2..0682cfec7c9a9e 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -15,7 +15,7 @@ import type {
 	IVersionedNodeType,
 	KnownNodesAndCredentials,
 } from 'n8n-workflow';
-import { CUSTOM_NODES_CATEGORY, CUSTOM_API_CALL_KEY, CUSTOM_API_CALL_NAME } from './Constants';
+import { CUSTOM_NODES_CATEGORY } from './Constants';
 import type { n8n } from './Interfaces';
 import { loadClassInIsolation } from './ClassLoader';
 
@@ -54,48 +54,6 @@ export abstract class DirectoryLoader {
 		return path.resolve(this.directory, file);
 	}
 
-	/**
-	 * Whether any of the node's credential types may be used to
-	 * make a request from a node other than itself.
-	 */
-	private supportsProxyAuth(description: INodeTypeDescription) {
-		if (!description.credentials) return false;
-
-		return description.credentials.some(({ name }) => {
-			const credType = this.credentialTypes[name].type;
-
-			if (credType.authenticate !== undefined) return true;
-
-			return (
-				Array.isArray(credType.extends) &&
-				credType.extends.some((parentType) =>
-					['oAuth2Api', 'googleOAuth2Api', 'oAuth1Api'].includes(parentType),
-				)
-			);
-		});
-	}
-
-	/**
-	 * Inject a `Custom API Call` option into `resource` and `operation`
-	 * parameters in a node that supports proxy auth.
-	 */
-	private injectCustomApiCallOption(description: INodeTypeDescription) {
-		if (!this.supportsProxyAuth(description)) return;
-
-		description.properties.forEach((p) => {
-			if (
-				['resource', 'operation'].includes(p.name) &&
-				Array.isArray(p.options) &&
-				p.options[p.options.length - 1].name !== CUSTOM_API_CALL_NAME
-			) {
-				p.options.push({
-					name: CUSTOM_API_CALL_NAME,
-					value: CUSTOM_API_CALL_KEY,
-				});
-			}
-		});
-	}
-
 	protected loadNodeFromFile(packageName: string, nodeName: string, filePath: string) {
 		let tempNode: INodeType | IVersionedNodeType;
 		let nodeVersion = 1;
@@ -131,7 +89,6 @@ export abstract class DirectoryLoader {
 
 			const currentVersionNode = tempNode.nodeVersions[tempNode.currentVersion];
 			this.addCodex({ node: currentVersionNode, filePath, isCustom: packageName === 'CUSTOM' });
-			this.injectCustomApiCallOption(currentVersionNode.description);
 			nodeVersion = tempNode.currentVersion;
 
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
@@ -142,11 +99,10 @@ export abstract class DirectoryLoader {
 			}
 		} else {
 			// Short renaming to avoid type issues
-
-			this.injectCustomApiCallOption(tempNode.description);
-			nodeVersion = Array.isArray(tempNode.description.version)
-				? tempNode.description.version.slice(-1)[0]
-				: tempNode.description.version;
+			const tmpNode = tempNode;
+			nodeVersion = Array.isArray(tmpNode.description.version)
+				? tmpNode.description.version.slice(-1)[0]
+				: tmpNode.description.version;
 		}
 
 		this.known.nodes[fullNodeName] = {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
index 3ce89f63d167cf..ad6d2dfaa7dbd9 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
@@ -233,7 +233,7 @@ const telemetry = instance?.proxy.$telemetry;
 const { categorizedItems: allNodes, isTriggerNode } = useNodeTypesStore();
 const containsAPIAction = computed(
 	() =>
-		activeNodeActions.value?.properties.some((p) =>
+		state.latestNodeData?.properties.some((p) =>
 			p.options?.find((o) => o.name === CUSTOM_API_CALL_NAME),
 		) === true,
 );
@@ -338,10 +338,27 @@ function getCustomAPICallHintLocale(key: string) {
 		interpolate: { nodeNameTitle },
 	});
 }
+// The nodes.json doesn't contain API CALL option so we need to fetch the node detail
+// to determine if need to render the API CALL hint
+async function fetchNodeDetails() {
+	if (!state.activeNodeActions) return;
+
+	const { getNodesInformation } = useNodeTypesStore();
+	const { version, name } = state.activeNodeActions;
+	const payload = {
+		name,
+		version: Array.isArray(version) ? version?.slice(-1)[0] : version,
+	} as INodeTypeNameVersion;
+
+	const nodesInfo = await getNodesInformation([payload], false);
+
+	state.latestNodeData = nodesInfo[0];
+}
 
 function setActiveActionsNodeType(nodeType: INodeTypeDescription | null) {
 	state.activeNodeActions = nodeType;
 	setShowTabs(false);
+	fetchNodeDetails();
 
 	if (nodeType) trackActionsView();
 }
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index b1673a6f132179..e533e20f8c0500 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -116,11 +116,7 @@
 					</n8n-text>
 				</div>
 
-				<div
-					v-if="isCustomApiCallSelected(nodeValues)"
-					class="parameter-item parameter-notice"
-					data-test-id="node-parameters-http-notice"
-				>
+				<div v-if="isCustomApiCallSelected(nodeValues)" class="parameter-item parameter-notice">
 					<n8n-notice
 						:content="
 							$locale.baseText('nodeSettings.useTheHttpRequestNode', {
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index f7485247337fb2..5604b01ef28d97 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -56,12 +56,9 @@ const customNodeActionsParsers: {
 	},
 };
 
-function filterActions(actions: INodeActionTypeDescription[]) {
+function filterSinglePlaceholderAction(actions: INodeActionTypeDescription[]) {
 	return actions.filter(
 		(action: INodeActionTypeDescription, _: number, arr: INodeActionTypeDescription[]) => {
-			const isApiCall = action.actionKey === CUSTOM_API_CALL_KEY;
-			if (isApiCall) return false;
-
 			const isPlaceholderTriggerAction = action.actionKey === PLACEHOLDER_RECOMMENDED_ACTION_KEY;
 			return !isPlaceholderTriggerAction || (isPlaceholderTriggerAction && arr.length > 1);
 		},
@@ -342,7 +339,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 
 			const filteredNodes = Object.values(mergedNodes).map((node) => ({
 				...node,
-				actions: filterActions(node.actions || []),
+				actions: filterSinglePlaceholderAction(node.actions || []),
 			}));
 
 			return filteredNodes;

From 56326cb317a04c0de38ade91a56a3819ef444538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 3 Feb 2023 11:27:24 +0100
Subject: [PATCH 068/358] fix(core): Use custom cache control only on editor-ui
 assets (no-changelog) (#5346)

---
 packages/cli/src/Server.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index beb458cac36cd7..cc4b05a9742e69 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1430,7 +1430,7 @@ class Server extends AbstractServer {
 		if (!config.getEnv('endpoints.disableUi')) {
 			this.app.use(
 				'/',
-				express.static(GENERATED_STATIC_DIR, staticOptions),
+				express.static(GENERATED_STATIC_DIR),
 				express.static(EDITOR_UI_DIST_DIR, staticOptions),
 			);
 
@@ -1440,7 +1440,7 @@ class Server extends AbstractServer {
 				next();
 			});
 		} else {
-			this.app.use('/', express.static(GENERATED_STATIC_DIR, staticOptions));
+			this.app.use('/', express.static(GENERATED_STATIC_DIR));
 		}
 	}
 }

From 4dab2fec49716c0fbc6bcbde0b4a4ede25754a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 3 Feb 2023 12:50:08 +0100
Subject: [PATCH 069/358] fix(core): Add missing schema keys for LDAP
 (no-changelog) (#5348)

---
 packages/cli/src/config/schema.ts  | 11 +++++++++++
 packages/cli/src/config/types.d.ts |  2 --
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index ec64920097e0e3..cf1091bdae4281 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -983,6 +983,17 @@ export const schema = {
 		},
 	},
 
+	ldap: {
+		loginEnabled: {
+			format: Boolean,
+			default: false,
+		},
+		loginLabel: {
+			format: String,
+			default: '',
+		},
+	},
+
 	hiringBanner: {
 		enabled: {
 			doc: 'Whether hiring banner in browser console is enabled.',
diff --git a/packages/cli/src/config/types.d.ts b/packages/cli/src/config/types.d.ts
index 84ece88a3d6f18..4dfd71a6b75fc5 100644
--- a/packages/cli/src/config/types.d.ts
+++ b/packages/cli/src/config/types.d.ts
@@ -81,8 +81,6 @@ type ExceptionPaths = {
 	'nodes.include': string[] | undefined;
 	'userManagement.isInstanceOwnerSetUp': boolean;
 	'userManagement.skipInstanceOwnerSetup': boolean;
-	'ldap.loginLabel': string;
-	'ldap.loginEnabled': boolean;
 };
 
 // -----------------------------------

From 6985500a7d14e21b629de0ee9e3006622e3774bc Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Fri, 3 Feb 2023 13:14:59 +0100
Subject: [PATCH 070/358] fix(core): Fix populating of node custom api call
 options (#5347)

* feat(core): Fix populating of node custom api call options

* lint fixes

* Adress PR comments

* Add e2e test and only inject custom API options for latest version

* Make sure to injectCustomApiCallOption for the latest version of node

* feat(cli): Move apiCallOption injection to LoadNodesAndCredentials and add e2e tests to check for custom nodes credentials

* Load nodes and credentials fixtures from a single place

* Console warning if credential is invalid during customApiOptions injection
---
 cypress/e2e/2-credentials.cy.ts               | 22 ++++++-
 cypress/e2e/4-node-creator.cy.ts              | 16 +----
 cypress/e2e/5-ndv.cy.ts                       |  2 +
 cypress/fixtures/Custom_credential.json       | 19 ++++++
 .../Custom_node_custom_credential.json        | 57 +++++++++++++++++
 .../fixtures/Custom_node_n8n_credential.json  | 57 +++++++++++++++++
 cypress/pages/ndv.ts                          |  1 +
 cypress/support/commands.ts                   |  4 +-
 cypress/support/e2e.ts                        | 27 ++++++++
 packages/cli/src/LoadNodesAndCredentials.ts   | 64 ++++++++++++++++++-
 packages/cli/src/api/nodeTypes.api.ts         | 62 +-----------------
 packages/cli/src/constants.ts                 |  2 +
 packages/core/src/DirectoryLoader.ts          |  8 +--
 .../Node/NodeCreator/TriggerHelperPanel.vue   | 19 +-----
 .../editor-ui/src/components/NodeSettings.vue |  6 +-
 packages/editor-ui/src/stores/nodeCreator.ts  |  7 +-
 16 files changed, 269 insertions(+), 104 deletions(-)
 create mode 100644 cypress/fixtures/Custom_credential.json
 create mode 100644 cypress/fixtures/Custom_node_custom_credential.json
 create mode 100644 cypress/fixtures/Custom_node_n8n_credential.json

diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index f94a11571d777a..0249ab0bbdec9f 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -1,4 +1,3 @@
-import { HTTP_REQUEST_NODE_TYPE } from './../../packages/editor-ui/src/constants';
 import {
 	NEW_NOTION_ACCOUNT_NAME,
 	NOTION_NODE_NAME,
@@ -6,7 +5,6 @@ import {
 	HTTP_REQUEST_NODE_NAME,
 	NEW_QUERY_AUTH_ACCOUNT_NAME,
 } from './../constants';
-import { visit } from 'recast';
 import {
 	DEFAULT_USER_EMAIL,
 	DEFAULT_USER_PASSWORD,
@@ -252,4 +250,24 @@ describe('Credentials', () => {
 		credentialsModal.actions.fillCredentialsForm();
 		workflowPage.getters.nodeCredentialsSelect().should('contain', NEW_QUERY_AUTH_ACCOUNT_NAME);
 	});
+
+	it('should render custom node with n8n credential', () => {
+		workflowPage.actions.visit();
+		workflowPage.actions.addNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addNodeToCanvas('E2E Node with native n8n credential', true, true);
+		workflowPage.getters.nodeCredentialsLabel().click();
+		cy.contains('Create New Credential').click();
+		credentialsModal.getters.editCredentialModal().should('be.visible');
+		credentialsModal.getters.editCredentialModal().should('contain.text', 'Notion API');
+	})
+
+	it('should render custom node with custom credential', () => {
+		workflowPage.actions.visit();
+		workflowPage.actions.addNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addNodeToCanvas('E2E Node with custom credential', true, true);
+		workflowPage.getters.nodeCredentialsLabel().click();
+		cy.contains('Create New Credential').click();
+		credentialsModal.getters.editCredentialModal().should('be.visible');
+		credentialsModal.getters.editCredentialModal().should('contain.text', 'Custom E2E Credential');
+	})
 });
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 84eb2d5f383cb2..e70fddc777d20d 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,6 +1,5 @@
 import { NodeCreator } from '../pages/features/node-creator';
 import { INodeTypeDescription } from 'n8n-workflow';
-import CustomNodeFixture from '../fixtures/Custom_node.json';
 import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
 import { randFirstName, randLastName } from '@ngneat/falso';
 
@@ -19,20 +18,6 @@ describe('Node Creator', () => {
 	beforeEach(() => {
 		cy.signin({ email, password });
 
-		cy.intercept('GET', '/types/nodes.json', (req) => {
-			// Delete caching headers so that we can intercept the request
-			['etag', 'if-none-match', 'if-modified-since'].forEach((header) => {
-				delete req.headers[header];
-			});
-
-			req.continue((res) => {
-				const nodes = res.body as INodeTypeDescription[];
-
-				nodes.push(CustomNodeFixture as INodeTypeDescription);
-				res.send(nodes);
-			});
-		}).as('nodesIntercept');
-
 		cy.visit(nodeCreatorFeature.url);
 		cy.waitForLoad();
 	});
@@ -153,6 +138,7 @@ describe('Node Creator', () => {
 	});
 
 	it('should render and select community node', () => {
+		cy.intercept('GET', '/types/nodes.json').as('nodesIntercept');
 		cy.wait('@nodesIntercept').then(() => {
 			const customCategory = 'Custom Category';
 			const customNode = 'E2E Node';
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 9fead48e51a4cb..d5208e60d25e7c 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -9,11 +9,13 @@ describe('NDV', () => {
 	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
+
 		workflowsPage.actions.createWorkflowFromCard();
 		workflowPage.actions.renameWorkflow(uuid());
 		workflowPage.actions.saveWorkflowOnButtonClick();
 	});
 
+
 	it('should show up when double clicked on a node and close when Back to canvas clicked', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
 		workflowPage.getters.canvasNodes().first().dblclick();
diff --git a/cypress/fixtures/Custom_credential.json b/cypress/fixtures/Custom_credential.json
new file mode 100644
index 00000000000000..b30439765f8232
--- /dev/null
+++ b/cypress/fixtures/Custom_credential.json
@@ -0,0 +1,19 @@
+{
+	"name": "customE2eCredential",
+	"displayName": "Custom E2E Credential",
+	"properties": [{
+		"displayName": "API Key",
+		"name": "apiKey",
+		"type": "string",
+		"default": "",
+		"required": false
+	}],
+	"authenticate": {
+		"type": "generic",
+		"properties": {
+			"qs": {
+				"auth": "={{$credentials.apiKey}}"
+			}
+		}
+	}
+}
diff --git a/cypress/fixtures/Custom_node_custom_credential.json b/cypress/fixtures/Custom_node_custom_credential.json
new file mode 100644
index 00000000000000..642309f99d90e1
--- /dev/null
+++ b/cypress/fixtures/Custom_node_custom_credential.json
@@ -0,0 +1,57 @@
+{
+	"properties": [
+		{
+			"displayName": "Test property",
+			"name": "testProp",
+			"type": "string",
+			"required": true,
+			"noDataExpression": false,
+			"default": "Some default"
+		},
+		{
+			"displayName": "Resource",
+			"name": "resource",
+			"type": "options",
+			"noDataExpression": true,
+			"options": [
+				{
+					"name": "option1",
+					"value": "option1"
+				},
+				{
+					"name": "option2",
+					"value": "option2"
+				},
+				{
+					"name": "option3",
+					"value": "option3"
+				},
+				{
+					"name": "option4",
+					"value": "option4"
+				}
+			],
+			"default": "option2"
+		}
+	],
+	"displayName": "E2E Node with custom credential",
+	"name": "@e2e/n8n-nodes-e2e-custom-credential",
+	"group": ["transform"],
+	"codex": {
+		"categories": ["Custom Category"]
+	},
+	"version": 1,
+	"description": "Demonstrate rendering of node with custom credential",
+	"defaults": {
+		"name": "E2E Node with custom credential"
+	},
+	"inputs": ["main"],
+	"outputs": ["main"],
+	"icon": "fa:network-wired",
+	"credentials": [
+		{
+			"name": "customE2eCredential",
+			"required": true
+		}
+	]
+}
diff --git a/cypress/fixtures/Custom_node_n8n_credential.json b/cypress/fixtures/Custom_node_n8n_credential.json
new file mode 100644
index 00000000000000..9b8a5575074148
--- /dev/null
+++ b/cypress/fixtures/Custom_node_n8n_credential.json
@@ -0,0 +1,57 @@
+{
+	"properties": [
+		{
+			"displayName": "Test property",
+			"name": "testProp",
+			"type": "string",
+			"required": true,
+			"noDataExpression": false,
+			"default": "Some default"
+		},
+		{
+			"displayName": "Resource",
+			"name": "resource",
+			"type": "options",
+			"noDataExpression": true,
+			"options": [
+				{
+					"name": "option1",
+					"value": "option1"
+				},
+				{
+					"name": "option2",
+					"value": "option2"
+				},
+				{
+					"name": "option3",
+					"value": "option3"
+				},
+				{
+					"name": "option4",
+					"value": "option4"
+				}
+			],
+			"default": "option2"
+		}
+	],
+	"displayName": "E2E Node with native n8n credential",
+	"name": "@e2e/n8n-nodes-e2e-credential",
+	"group": ["transform"],
+	"codex": {
+		"categories": ["Custom Category"]
+	},
+	"version": 1,
+	"description": "Demonstrate rendering of node with native credential",
+	"defaults": {
+		"name": "E2E Node with native n8n credential"
+	},
+	"inputs": ["main"],
+	"outputs": ["main"],
+	"icon": "fa:network-wired",
+	"credentials": [
+		{
+			"name": "notionApi",
+			"required": true
+		}
+	]
+}
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index ba38b940652e8c..3761db326f3b90 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -27,6 +27,7 @@ export class NDV extends BasePage {
 		parameterInput: (parameterName: string) => cy.getByTestId(`parameter-input-${parameterName}`),
 		nodeNameContainer: () => cy.getByTestId('node-title-container'),
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
+		httpRequestNotice: () => cy.getByTestId('node-parameters-http-notice'),
 	};
 
 	actions = {
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 9a686ab2d03837..a5d9cd24a84df1 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -57,8 +57,8 @@ Cypress.Commands.add(
 );
 
 Cypress.Commands.add('waitForLoad', () => {
-	cy.getByTestId('node-view-loader').should('not.exist', { timeout: 10000 });
-	cy.get('.el-loading-mask').should('not.exist', { timeout: 10000 });
+	cy.getByTestId('node-view-loader', { timeout: 10000 }).should('not.exist');
+	cy.get('.el-loading-mask', { timeout: 10000 }).should('not.exist');
 });
 
 Cypress.Commands.add('signin', ({ email, password }) => {
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index aeef4e42b00c55..3977b482107ae0 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -14,3 +14,30 @@
 // ***********************************************************
 
 import './commands';
+import CustomNodeFixture from '../fixtures/Custom_node.json';
+import CustomNodeWithN8nCredentialFixture from '../fixtures/Custom_node_n8n_credential.json';
+import CustomNodeWithCustomCredentialFixture from '../fixtures/Custom_node_custom_credential.json';
+import CustomCredential from '../fixtures/Custom_credential.json';
+
+// Load custom nodes and credentials fixtures
+beforeEach(() => {
+	cy.intercept('GET', '/types/nodes.json', (req) => {
+		req.continue((res) => {
+			const nodes = res.body;
+
+			res.headers['cache-control'] = 'no-cache, no-store';
+			nodes.push(CustomNodeFixture, CustomNodeWithN8nCredentialFixture, CustomNodeWithCustomCredentialFixture);
+			res.send(nodes);
+		});
+	}).as('nodesIntercept');
+
+	cy.intercept('GET', '/types/credentials.json', (req) => {
+		req.continue((res) => {
+			const credentials = res.body;
+
+			res.headers['cache-control'] = 'no-cache, no-store';
+			credentials.push(CustomCredential);
+			res.send(credentials);
+		});
+	}).as('credentialsIntercept');
+})
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 6fc511f2a0eb42..e2718a26ce35fa 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -12,6 +12,7 @@ import type {
 	ILogger,
 	INodesAndCredentials,
 	KnownNodesAndCredentials,
+	INodeTypeDescription,
 	LoadedNodesAndCredentials,
 } from 'n8n-workflow';
 import { LoggerProxy, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
@@ -29,7 +30,13 @@ import config from '@/config';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { InstalledNodes } from '@db/entities/InstalledNodes';
 import { executeCommand } from '@/CommunityNodes/helpers';
-import { CLI_DIR, GENERATED_STATIC_DIR, RESPONSE_ERROR_MESSAGES } from '@/constants';
+import {
+	CLI_DIR,
+	GENERATED_STATIC_DIR,
+	RESPONSE_ERROR_MESSAGES,
+	CUSTOM_API_CALL_KEY,
+	CUSTOM_API_CALL_NAME,
+} from '@/constants';
 import {
 	persistInstalledPackageData,
 	removePackageFromDatabase,
@@ -66,6 +73,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		await this.loadNodesFromBasePackages();
 		await this.loadNodesFromDownloadedPackages();
 		await this.loadNodesFromCustomDirectories();
+		this.injectCustomApiCallOptions();
 	}
 
 	async generateTypesForFrontend() {
@@ -307,6 +315,60 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		}
 	}
 
+	/**
+	 * Whether any of the node's credential types may be used to
+	 * make a request from a node other than itself.
+	 */
+	private supportsProxyAuth(description: INodeTypeDescription) {
+		if (!description.credentials) return false;
+
+		return description.credentials.some(({ name }) => {
+			const credType = this.types.credentials.find((t) => t.name === name);
+			if (!credType) {
+				LoggerProxy.warn(
+					`Failed to load Custom API options for the node "${description.name}": Unknown credential name "${name}"`,
+				);
+				return false;
+			}
+			if (credType.authenticate !== undefined) return true;
+
+			return (
+				Array.isArray(credType.extends) &&
+				credType.extends.some((parentType) =>
+					['oAuth2Api', 'googleOAuth2Api', 'oAuth1Api'].includes(parentType),
+				)
+			);
+		});
+	}
+
+	/**
+	 * Inject a `Custom API Call` option into `resource` and `operation`
+	 * parameters in a latest-version node that supports proxy auth.
+	 */
+	private injectCustomApiCallOptions() {
+		this.types.nodes.forEach((node: INodeTypeDescription) => {
+			const isLatestVersion =
+				node.defaultVersion === undefined || node.defaultVersion === node.version;
+
+			if (isLatestVersion) {
+				if (!this.supportsProxyAuth(node)) return;
+
+				node.properties.forEach((p) => {
+					if (
+						['resource', 'operation'].includes(p.name) &&
+						Array.isArray(p.options) &&
+						p.options[p.options.length - 1].name !== CUSTOM_API_CALL_NAME
+					) {
+						p.options.push({
+							name: CUSTOM_API_CALL_NAME,
+							value: CUSTOM_API_CALL_KEY,
+						});
+					}
+				});
+			}
+		});
+	}
+
 	private unloadNodes(installedNodes: InstalledNodes[]): void {
 		installedNodes.forEach((installedNode) => {
 			delete this.loaded.nodes[installedNode.type];
diff --git a/packages/cli/src/api/nodeTypes.api.ts b/packages/cli/src/api/nodeTypes.api.ts
index 1e0eb7c6227b43..6c55d195661bee 100644
--- a/packages/cli/src/api/nodeTypes.api.ts
+++ b/packages/cli/src/api/nodeTypes.api.ts
@@ -2,69 +2,13 @@ import express from 'express';
 import { readFile } from 'fs/promises';
 import get from 'lodash.get';
 
-import type { ICredentialType, INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
+import type { INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
 
-import { CredentialTypes } from '@/CredentialTypes';
 import config from '@/config';
 import { NodeTypes } from '@/NodeTypes';
 import * as ResponseHelper from '@/ResponseHelper';
 import { getNodeTranslationPath } from '@/TranslationHelpers';
 
-function isOAuth(credType: ICredentialType) {
-	return (
-		Array.isArray(credType.extends) &&
-		credType.extends.some((parentType) =>
-			['oAuth2Api', 'googleOAuth2Api', 'oAuth1Api'].includes(parentType),
-		)
-	);
-}
-
-/**
- * Whether any of the node's credential types may be used to
- * make a request from a node other than itself.
- */
-function supportsProxyAuth(description: INodeTypeDescription) {
-	if (!description.credentials) return false;
-
-	const credentialTypes = CredentialTypes();
-
-	return description.credentials.some(({ name }) => {
-		const credType = credentialTypes.getByName(name);
-
-		if (credType.authenticate !== undefined) return true;
-
-		return isOAuth(credType);
-	});
-}
-
-const CUSTOM_API_CALL_NAME = 'Custom API Call';
-const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
-
-/**
- * Inject a `Custom API Call` option into `resource` and `operation`
- * parameters in a node that supports proxy auth.
- */
-function injectCustomApiCallOption(description: INodeTypeDescription) {
-	if (!supportsProxyAuth(description)) return description;
-
-	description.properties.forEach((p) => {
-		if (
-			['resource', 'operation'].includes(p.name) &&
-			Array.isArray(p.options) &&
-			p.options[p.options.length - 1].name !== CUSTOM_API_CALL_NAME
-		) {
-			p.options.push({
-				name: CUSTOM_API_CALL_NAME,
-				value: CUSTOM_API_CALL_KEY,
-			});
-		}
-
-		return p;
-	});
-
-	return description;
-}
-
 export const nodeTypesController = express.Router();
 
 // Returns node information based on node names and versions
@@ -78,7 +22,7 @@ nodeTypesController.post(
 		if (defaultLocale === 'en') {
 			return nodeInfos.reduce<INodeTypeDescription[]>((acc, { name, version }) => {
 				const { description } = NodeTypes().getByNameAndVersion(name, version);
-				acc.push(injectCustomApiCallOption(description));
+				acc.push(description);
 				return acc;
 			}, []);
 		}
@@ -103,7 +47,7 @@ nodeTypesController.post(
 				// ignore - no translation exists at path
 			}
 
-			nodeTypes.push(injectCustomApiCallOption(description));
+			nodeTypes.push(description);
 		}
 
 		const nodeTypes: INodeTypeDescription[] = [];
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 4169b7c69a0c31..9084784aa339e5 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -12,6 +12,8 @@ export const inProduction = NODE_ENV === 'production';
 export const inDevelopment = !NODE_ENV || NODE_ENV === 'development';
 export const inTest = NODE_ENV === 'test';
 export const inE2ETests = E2E_TESTS === 'true';
+export const CUSTOM_API_CALL_NAME = 'Custom API Call';
+export const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
 
 export const CLI_DIR = resolve(__dirname, '..');
 export const TEMPLATES_DIR = join(CLI_DIR, 'templates');
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 0682cfec7c9a9e..85528dcc07c62f 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -99,10 +99,10 @@ export abstract class DirectoryLoader {
 			}
 		} else {
 			// Short renaming to avoid type issues
-			const tmpNode = tempNode;
-			nodeVersion = Array.isArray(tmpNode.description.version)
-				? tmpNode.description.version.slice(-1)[0]
-				: tmpNode.description.version;
+
+			nodeVersion = Array.isArray(tempNode.description.version)
+				? tempNode.description.version.slice(-1)[0]
+				: tempNode.description.version;
 		}
 
 		this.known.nodes[fullNodeName] = {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
index ad6d2dfaa7dbd9..3ce89f63d167cf 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
@@ -233,7 +233,7 @@ const telemetry = instance?.proxy.$telemetry;
 const { categorizedItems: allNodes, isTriggerNode } = useNodeTypesStore();
 const containsAPIAction = computed(
 	() =>
-		state.latestNodeData?.properties.some((p) =>
+		activeNodeActions.value?.properties.some((p) =>
 			p.options?.find((o) => o.name === CUSTOM_API_CALL_NAME),
 		) === true,
 );
@@ -338,27 +338,10 @@ function getCustomAPICallHintLocale(key: string) {
 		interpolate: { nodeNameTitle },
 	});
 }
-// The nodes.json doesn't contain API CALL option so we need to fetch the node detail
-// to determine if need to render the API CALL hint
-async function fetchNodeDetails() {
-	if (!state.activeNodeActions) return;
-
-	const { getNodesInformation } = useNodeTypesStore();
-	const { version, name } = state.activeNodeActions;
-	const payload = {
-		name,
-		version: Array.isArray(version) ? version?.slice(-1)[0] : version,
-	} as INodeTypeNameVersion;
-
-	const nodesInfo = await getNodesInformation([payload], false);
-
-	state.latestNodeData = nodesInfo[0];
-}
 
 function setActiveActionsNodeType(nodeType: INodeTypeDescription | null) {
 	state.activeNodeActions = nodeType;
 	setShowTabs(false);
-	fetchNodeDetails();
 
 	if (nodeType) trackActionsView();
 }
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index e533e20f8c0500..b1673a6f132179 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -116,7 +116,11 @@
 					</n8n-text>
 				</div>
 
-				<div v-if="isCustomApiCallSelected(nodeValues)" class="parameter-item parameter-notice">
+				<div
+					v-if="isCustomApiCallSelected(nodeValues)"
+					class="parameter-item parameter-notice"
+					data-test-id="node-parameters-http-notice"
+				>
 					<n8n-notice
 						:content="
 							$locale.baseText('nodeSettings.useTheHttpRequestNode', {
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index 5604b01ef28d97..f7485247337fb2 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -56,9 +56,12 @@ const customNodeActionsParsers: {
 	},
 };
 
-function filterSinglePlaceholderAction(actions: INodeActionTypeDescription[]) {
+function filterActions(actions: INodeActionTypeDescription[]) {
 	return actions.filter(
 		(action: INodeActionTypeDescription, _: number, arr: INodeActionTypeDescription[]) => {
+			const isApiCall = action.actionKey === CUSTOM_API_CALL_KEY;
+			if (isApiCall) return false;
+
 			const isPlaceholderTriggerAction = action.actionKey === PLACEHOLDER_RECOMMENDED_ACTION_KEY;
 			return !isPlaceholderTriggerAction || (isPlaceholderTriggerAction && arr.length > 1);
 		},
@@ -339,7 +342,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 
 			const filteredNodes = Object.values(mergedNodes).map((node) => ({
 				...node,
-				actions: filterSinglePlaceholderAction(node.actions || []),
+				actions: filterActions(node.actions || []),
 			}));
 
 			return filteredNodes;

From 51b560b3f407f50221591bf182744b1534bfe99b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 3 Feb 2023 13:53:51 +0100
Subject: [PATCH 071/358] fix(core): Error reporter should log all error on an
 error-chain (no-changelog) (#5342)

---
 packages/workflow/src/ErrorReporterProxy.ts | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/packages/workflow/src/ErrorReporterProxy.ts b/packages/workflow/src/ErrorReporterProxy.ts
index 46ca6c56e977ea..6f7251d7375ad1 100644
--- a/packages/workflow/src/ErrorReporterProxy.ts
+++ b/packages/workflow/src/ErrorReporterProxy.ts
@@ -12,8 +12,15 @@ interface ErrorReporter {
 }
 
 const instance: ErrorReporter = {
-	report: (error) =>
-		error instanceof Error && Logger.error(`${error.constructor.name}: ${error.message}`),
+	report: (error) => {
+		if (error instanceof Error) {
+			let e = error;
+			do {
+				Logger.error(`${e.constructor.name}: ${e.message}`);
+				e = e.cause as Error;
+			} while (e);
+		}
+	},
 };
 
 export function init(errorReporter: ErrorReporter) {

From 50cb75706b73c7349e48956a2e8556b0a2de1e24 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 3 Feb 2023 13:57:50 +0100
Subject: [PATCH 072/358] fix(editor): Workflow executions view is broken
 (#5341)

fix(editor): WF level execution layout
---
 .../editor-ui/src/components/ExecutionsView/ExecutionsList.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index 64faf60e559499..c0246589d827e9 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -669,6 +669,7 @@ export default mixins(
 .container {
 	display: flex;
 	height: 100%;
+	width: 100%;
 }
 
 .content {

From 338b354ef1600903833c9939a8618d1989534e0b Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 3 Feb 2023 14:00:22 +0100
Subject: [PATCH 073/358] fix(editor): Change executions title to match menu
 (#5349)

* fix(editor): Prevent content moving between pages

* fix(editor): Change execution page title
---
 .../src/components/ExecutionsList.vue         | 20 +++++++++++--------
 .../src/plugins/i18n/locales/en.json          |  2 +-
 .../editor-ui/src/views/TemplatesView.vue     | 14 ++++++-------
 3 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index dd07f9069499ff..e511e98ec02136 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -1,13 +1,7 @@
 <template>
 	<div :class="$style.execListWrapper">
 		<div :class="$style.execList">
-			<n8n-heading tag="h1" size="2xlarge">
-				{{
-					`${$locale.baseText('executionsList.workflowExecutions')} ${combinedExecutions.length}/${
-						finishedExecutionsCountEstimated === true ? '~' : ''
-					}${combinedExecutionsCount}`
-				}}
-			</n8n-heading>
+			<n8n-heading tag="h1" size="2xlarge">{{ this.pageTitle }}</n8n-heading>
 			<div :class="$style.filters">
 				<span :class="$style.filterItem">{{ $locale.baseText('executionsList.filters') }}:</span>
 				<n8n-select
@@ -276,6 +270,7 @@ import mixins from 'vue-typed-mixins';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
+import { setPageTitle } from '@/utils';
 
 type ExecutionStatus = 'failed' | 'success' | 'waiting' | 'running' | 'unknown';
 
@@ -311,6 +306,9 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				workflows: [] as IWorkflowShortResponse[],
 			};
 		},
+		mounted() {
+			setPageTitle(`n8n - ${this.pageTitle}`);
+		},
 		async created() {
 			await this.loadWorkflows();
 			await this.refreshData();
@@ -404,6 +402,9 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				}
 				return filter;
 			},
+			pageTitle() {
+				return this.$locale.baseText('executionsList.workflowExecutions');
+			},
 		},
 		methods: {
 			closeDialog() {
@@ -935,7 +936,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 	position: relative;
 	height: 100%;
 	overflow: auto;
-	padding: var(--spacing-3xl) var(--spacing-xl) var(--spacing-3xl) var(--spacing-xl);
+	padding: var(--spacing-l) var(--spacing-l) 0;
+	@media (min-width: 1200px) {
+		padding: var(--spacing-2xl) var(--spacing-2xl) 0;
+	}
 }
 
 .selectionOptions {
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index adb35b22604f1b..c3154dfa568777 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -484,7 +484,7 @@
 	"executionsList.unknown": "Unknown",
 	"executionsList.unsavedWorkflow": "[UNSAVED WORKFLOW]",
 	"executionsList.waiting": "Waiting",
-	"executionsList.workflowExecutions": "Workflow Executions",
+	"executionsList.workflowExecutions": "All Executions",
 	"executionsList.view": "View",
 	"executionsList.stop": "Stop",
 	"executionsList.statusTooltipText.theWorkflowIsWaitingIndefinitely": "The workflow is waiting indefinitely for an incoming webhook call.",
diff --git a/packages/editor-ui/src/views/TemplatesView.vue b/packages/editor-ui/src/views/TemplatesView.vue
index 9d159f6e98aba3..9a7f5323124e79 100644
--- a/packages/editor-ui/src/views/TemplatesView.vue
+++ b/packages/editor-ui/src/views/TemplatesView.vue
@@ -35,17 +35,17 @@ export default Vue.extend({
 <style lang="scss" module>
 .template {
 	display: flex;
-	padding: var(--spacing-3xl) var(--spacing-xl) var(--spacing-4xl) var(--spacing-xl);
+	width: 100%;
+	max-width: 1280px;
+	padding: var(--spacing-l) var(--spacing-l) 0;
+	justify-content: center;
+	@media (min-width: 1200px) {
+		padding: var(--spacing-2xl) var(--spacing-2xl) 0;
+	}
 }
 
 .container {
 	width: 100%;
-	max-width: 1024px;
-	margin: 0 auto;
-
-	@media (max-width: $breakpoint-md) {
-		width: 900px;
-	}
 }
 
 .header {

From bf3ba59331fb104a25629cecfeb8ac45d3ae23b7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:34:56 +0000
Subject: [PATCH 074/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.135.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 1ac58efbdbcd8f..03fe098b1c10ed 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.134.0",
+  "version": "0.135.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From c35d5a96c09883bad5ea4b906eab404788e6a6c8 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:35:07 +0000
Subject: [PATCH 075/358] :arrow_up: Set n8n-workflow@0.135.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index c588b8d2458d52..b5b048802b5996 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,7 +55,7 @@
     "form-data": "^4.0.0",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.134.0",
+    "n8n-workflow": "~0.135.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "pretty-bytes": "^5.6.0",

From 4c69d73423386f1bfdb99589cf1e5e3548c2baa5 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:35:07 +0000
Subject: [PATCH 076/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.15?=
 =?UTF-8?q?3.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index b5b048802b5996..5be8864bbceeb1 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.152.0",
+  "version": "0.153.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 168c8625018fb919304b1ee3a604c72fced92765 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:35:18 +0000
Subject: [PATCH 077/358] :arrow_up: Set n8n-core@0.153.0 and
 n8n-workflow@0.135.0 on n8n-node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 49ca5c31e4fb03..8db647e3611119 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.152.0",
-    "n8n-workflow": "~0.134.0",
+    "n8n-core": "~0.153.0",
+    "n8n-workflow": "~0.135.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From 015ce8f89ffd152e79929c7939cf73de74bda035 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:35:18 +0000
Subject: [PATCH 078/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@?=
 =?UTF-8?q?0.92.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 8db647e3611119..05feabfe58ace5 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.91.0",
+  "version": "0.92.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 078c8680186c8b627d4450b63e65266941149009 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:35:29 +0000
Subject: [PATCH 079/358] :arrow_up: Set n8n-core@0.153.0 and
 n8n-workflow@0.135.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index ac4bb9b45c4030..63f6d132a9e920 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -758,7 +758,7 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "~0.134.0"
+    "n8n-workflow": "~0.135.0"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
@@ -797,7 +797,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "~0.152.0",
+    "n8n-core": "~0.153.0",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",

From bbfdb0b6b847094b4af770acd3f96017bfdc362c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:35:29 +0000
Subject: [PATCH 080/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.212.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 63f6d132a9e920..e2954c72c19f4f 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.211.0",
+  "version": "0.212.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From c01182f13f5aa96845e12fc0e8068b4bc5f7812f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:36:25 +0000
Subject: [PATCH 081/358] :arrow_up: Set n8n-workflow@0.135.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 0caf329d6cb688..318c9cf2d912b6 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -64,7 +64,7 @@
     "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
     "n8n-design-system": "~0.52.0",
-    "n8n-workflow": "~0.134.0",
+    "n8n-workflow": "~0.135.0",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.0.22",
     "prettier": "^2.8.3",

From 3d100df9e78093affeea6946d454fd768de5b407 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:36:26 +0000
Subject: [PATCH 082/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.180.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 318c9cf2d912b6..1570b3b3d3c102 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.179.0",
+  "version": "0.180.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 26cc16ad908687534eb6c7b73d6714d3eb52bdd6 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:38:41 +0000
Subject: [PATCH 083/358] :arrow_up: Set n8n-core@0.153.0,
 n8n-editor-ui@0.180.0, n8n-nodes-base@0.212.0 and n8n-workflow@0.135.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 98fe5c97b59861..1e7a6b6948f8da 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -165,10 +165,10 @@
     "lodash.unset": "^4.5.2",
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
-    "n8n-core": "~0.152.0",
-    "n8n-editor-ui": "~0.179.0",
-    "n8n-nodes-base": "~0.211.0",
-    "n8n-workflow": "~0.134.0",
+    "n8n-core": "~0.153.0",
+    "n8n-editor-ui": "~0.180.0",
+    "n8n-nodes-base": "~0.212.0",
+    "n8n-workflow": "~0.135.0",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 90b373621ff2f3cf6c83cd0e178227969921aedd Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 14:38:42 +0000
Subject: [PATCH 084/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.214.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 1e7a6b6948f8da..f55e15c30f3ef9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.213.0",
+  "version": "0.214.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 8a224c0c899cf0cfff728516595560f0f47d1c9f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 3 Feb 2023 08:42:50 -0600
Subject: [PATCH 085/358] :books: Update CHANGELOG.md and main package.json to
 0.214.0

---
 CHANGELOG.md   | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 package.json   |  2 +-
 pnpm-lock.yaml | 20 ++++++++++----------
 3 files changed, 59 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d124452bb022a..3d65bafb596de6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,51 @@
+# [0.214.0](https://github.com/n8n-io/n8n/compare/n8n@0.213.0...n8n@0.214.0) (2023-02-03)
+
+
+### Bug Fixes
+
+* Add paired item to the most used nodes ([#5220](https://github.com/n8n-io/n8n/issues/5220)) ([409a9ea](https://github.com/n8n-io/n8n/commit/409a9ea3573ded3156142c2662a501d7d6f5e475))
+* **core:** Fix oauth2 client credentials not always working ([#5327](https://github.com/n8n-io/n8n/issues/5327)) ([ec7575b](https://github.com/n8n-io/n8n/commit/ec7575b0321edf6e21e5ba5fb4094e9a36e65571))
+* **core:** Fix populating of node custom api call options ([#5347](https://github.com/n8n-io/n8n/issues/5347)) ([6985500](https://github.com/n8n-io/n8n/commit/6985500a7d14e21b629de0ee9e3006622e3774bc))
+* **core:** Fix value resolution in declarative node design ([#5217](https://github.com/n8n-io/n8n/issues/5217)) ([b27a60b](https://github.com/n8n-io/n8n/commit/b27a60b66568c1cce00f38eec2dd1b6425a5a9c6))
+* **core:** Prevent shared user details being saved alongside execution data ([#5334](https://github.com/n8n-io/n8n/issues/5334)) ([6ca49f9](https://github.com/n8n-io/n8n/commit/6ca49f9d5474d37281681ea571fa74e43828ca84))
+* **core:** Revert custom API option injecting ([#5345](https://github.com/n8n-io/n8n/issues/5345)) ([6160741](https://github.com/n8n-io/n8n/commit/616074158c10a1928299d7213c58eeb076a664e1)), closes [#5303](https://github.com/n8n-io/n8n/issues/5303)
+* **editor:** Add SMTP info translation link slot ([#5288](https://github.com/n8n-io/n8n/issues/5288)) ([c93664a](https://github.com/n8n-io/n8n/commit/c93664a57c6f252044264b09876e9b474740f6e8))
+* **editor:** Change executions title to match menu ([#5349](https://github.com/n8n-io/n8n/issues/5349)) ([338b354](https://github.com/n8n-io/n8n/commit/338b354ef1600903833c9939a8618d1989534e0b))
+* **editor:** Fix `json` field completions while typing ([#5309](https://github.com/n8n-io/n8n/issues/5309)) ([07b941a](https://github.com/n8n-io/n8n/commit/07b941a043f8aac761af63fd5327f45cbff7d275))
+* **editor:** Handling router errors when navigation is canceled by user ([#5271](https://github.com/n8n-io/n8n/issues/5271)) ([911d656](https://github.com/n8n-io/n8n/commit/911d656f995a9a7f50db7e97ae25fcc3230ae4a5))
+* **editor:** Set max width for executions list ([#5302](https://github.com/n8n-io/n8n/issues/5302)) ([52dea08](https://github.com/n8n-io/n8n/commit/52dea08003d314841d261533391e05d688dd1fe4))
+* **editor:** Stop unsaved changes popup display when navigating away from an untouched workflow ([#5259](https://github.com/n8n-io/n8n/issues/5259)) ([6a93aed](https://github.com/n8n-io/n8n/commit/6a93aed3a2c428633fdf922df73203d3d41a7bb6))
+* **editor:** Workflow executions view is broken ([#5341](https://github.com/n8n-io/n8n/issues/5341)) ([50cb757](https://github.com/n8n-io/n8n/commit/50cb75706b73c7349e48956a2e8556b0a2de1e24))
+* **Invoice Ninja Node:** Fix line items not being correctly set for quotes and invoices ([#5304](https://github.com/n8n-io/n8n/issues/5304)) ([3b5e1d1](https://github.com/n8n-io/n8n/commit/3b5e1d127fe049934a0a32310ed408cd129b2d7d))
+* **Linear Node:** Fix pagination issue for get all issues ([#5324](https://github.com/n8n-io/n8n/issues/5324)) ([f9ecc34](https://github.com/n8n-io/n8n/commit/f9ecc34b10544e787f7034e89068aa6c9356fa04))
+* **Mailchimp Trigger Node:** Fix webhook recreation ([#5328](https://github.com/n8n-io/n8n/issues/5328)) ([8f5f1c3](https://github.com/n8n-io/n8n/commit/8f5f1c3aa520576215e16a8cc1a8beadae5f142a))
+* Prevent unnecessarily touching updatedAt when n8n starts ([#5340](https://github.com/n8n-io/n8n/issues/5340)) ([b5154d9](https://github.com/n8n-io/n8n/commit/b5154d9be5e3adccbdcbb0ad748ed869ba75d4cc))
+* **Schedule Trigger Node:** Change scheduler behaviour for intervals days and hours ([#5133](https://github.com/n8n-io/n8n/issues/5133)) ([78bbe2b](https://github.com/n8n-io/n8n/commit/78bbe2ba27990127b1b6a6333361f35e2d3e7a65))
+* **Set Node:** Fix behaviour when selecting continueOnFail & PairedItem ([#5257](https://github.com/n8n-io/n8n/issues/5257)) ([a8637a0](https://github.com/n8n-io/n8n/commit/a8637a0bc6ac19859ce1ff468d0404ac73bc70bb))
+
+
+### Features
+
+* **core:** Export OpenAPI spec for external tools ([#5294](https://github.com/n8n-io/n8n/issues/5294)) ([5cb7e50](https://github.com/n8n-io/n8n/commit/5cb7e5007de7374f8ee6e6fbe1c5a8138af2d065))
+* **core:** Fix populating of node custom api call options ([#5303](https://github.com/n8n-io/n8n/issues/5303)) ([e58bc41](https://github.com/n8n-io/n8n/commit/e58bc41d241b3f4a1701191f69e5eadad969bc5f))
+* **core:** Set custom Cache-Control headers for static assets ([#5322](https://github.com/n8n-io/n8n/issues/5322)) ([ee210e8](https://github.com/n8n-io/n8n/commit/ee210e8507ce06f7052328f28ba14451f51b3db4))
+* **core:** Simplify pagination in declarative node design ([#5161](https://github.com/n8n-io/n8n/issues/5161)) ([87ceb6f](https://github.com/n8n-io/n8n/commit/87ceb6f4b8ed1838b874639f176b421e0292b576))
+* **editor:** Add mapping support for data paths ([#5191](https://github.com/n8n-io/n8n/issues/5191)) ([6092f6c](https://github.com/n8n-io/n8n/commit/6092f6c41ee28f3482675b940b1fdc600ae29971))
+* **editor:** Adjust HTML editor component for use in params ([#5285](https://github.com/n8n-io/n8n/issues/5285)) ([8b09e98](https://github.com/n8n-io/n8n/commit/8b09e986542f00675197bc8e003c332e8926779f))
+* **editor:** Append expressions in fixed values when mapping to string/json inputs ([#5300](https://github.com/n8n-io/n8n/issues/5300)) ([88c7ef2](https://github.com/n8n-io/n8n/commit/88c7ef29c84e0e9cfce32b97b8921bd5af38db02))
+* **editor:** Completions for extensions in expression editor ([#5130](https://github.com/n8n-io/n8n/issues/5130)) ([6d811f0](https://github.com/n8n-io/n8n/commit/6d811f0d9f503905ed74938f97f193c7c3d8e7a2))
+* **editor:** Continue to show mapping tooltip after dismiss ([#5289](https://github.com/n8n-io/n8n/issues/5289)) ([c6bc57b](https://github.com/n8n-io/n8n/commit/c6bc57b4cb1f7b647f167a7c18f6c6397e5d1c95))
+* **editor:** Roll out schema view ([#5310](https://github.com/n8n-io/n8n/issues/5310)) ([2b1f151](https://github.com/n8n-io/n8n/commit/2b1f15150f5d069629ed34522be26f5503756614))
+* **FTP Node:** Stream binary data for uploads and downloads ([#5296](https://github.com/n8n-io/n8n/issues/5296)) ([448c295](https://github.com/n8n-io/n8n/commit/448c295314b4e4842ff0352e03ba1f12025f47c9))
+* **Notion Node:** Add image block ([#5237](https://github.com/n8n-io/n8n/issues/5237)) ([36b1e6e](https://github.com/n8n-io/n8n/commit/36b1e6ef1572aec4d905b29a999e4d5f4c72e826))
+* **OpenAI Node:** Add frequency-penalty and presence-penalty ([#5137](https://github.com/n8n-io/n8n/issues/5137)) ([04c058a](https://github.com/n8n-io/n8n/commit/04c058a34e7c306141592691fa646ef6480bbc03))
+* **Salesforce Node:** Add HasOptedOutOfEmail field to lead resource ([#5235](https://github.com/n8n-io/n8n/issues/5235)) ([59f290f](https://github.com/n8n-io/n8n/commit/59f290fe854767c6bf5c01ce9a0fb537297d82b2))
+* **SSH Node:** Stream binary data for uploads and downloads ([#5305](https://github.com/n8n-io/n8n/issues/5305)) ([6f7421f](https://github.com/n8n-io/n8n/commit/6f7421f970b12e870c7d84b0f559b06678e3d42a))
+* **Write Binary File Node:** Stream binary data for writes ([#5306](https://github.com/n8n-io/n8n/issues/5306)) ([d87ff13](https://github.com/n8n-io/n8n/commit/d87ff130a44d4542d1b068ed50c37071a14496b8))
+* **YouTube Node:** Switch upload operation over to streaming and resumable uploads api ([#5320](https://github.com/n8n-io/n8n/issues/5320)) ([3bb1690](https://github.com/n8n-io/n8n/commit/3bb16900867b3994585eb2a62310e617f123c257))
+
+
+
 # [0.213.0](https://github.com/n8n-io/n8n/compare/n8n@0.212.1...n8n@0.213.0) (2023-01-27)
 
 
diff --git a/package.json b/package.json
index 7011e19246db69..a2b2a6674b6148 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.213.0",
+  "version": "0.214.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b91a464d27bc2c..b74a24fec97f4c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -197,10 +197,10 @@ importers:
       lodash.unset: ^4.5.2
       luxon: ^3.1.0
       mysql2: ~2.3.3
-      n8n-core: ~0.152.0
-      n8n-editor-ui: ~0.179.0
-      n8n-nodes-base: ~0.211.0
-      n8n-workflow: ~0.134.0
+      n8n-core: ~0.153.0
+      n8n-editor-ui: ~0.180.0
+      n8n-nodes-base: ~0.212.0
+      n8n-workflow: ~0.135.0
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
       oauth-1.0a: ^2.2.6
@@ -393,7 +393,7 @@ importers:
       form-data: ^4.0.0
       lodash.get: ^4.4.2
       mime-types: ^2.1.27
-      n8n-workflow: ~0.134.0
+      n8n-workflow: ~0.135.0
       oauth-1.0a: ^2.2.6
       p-cancelable: ^2.0.0
       pretty-bytes: ^5.6.0
@@ -577,7 +577,7 @@ importers:
       luxon: ^3.1.0
       monaco-editor: ^0.33.0
       n8n-design-system: ~0.52.0
-      n8n-workflow: ~0.134.0
+      n8n-workflow: ~0.135.0
       normalize-wheel: ^1.0.1
       pinia: ^2.0.22
       prettier: ^2.8.3
@@ -707,8 +707,8 @@ importers:
       change-case: ^4.1.1
       fast-glob: ^3.2.5
       inquirer: ^7.0.1
-      n8n-core: ~0.152.0
-      n8n-workflow: ~0.134.0
+      n8n-core: ~0.153.0
+      n8n-workflow: ~0.135.0
       oauth-1.0a: ^2.2.6
       replace-in-file: ^6.0.0
       request: ^2.88.2
@@ -800,8 +800,8 @@ importers:
       mqtt: 4.2.6
       mssql: ^8.1.2
       mysql2: ~2.3.0
-      n8n-core: ~0.152.0
-      n8n-workflow: ~0.134.0
+      n8n-core: ~0.153.0
+      n8n-workflow: ~0.135.0
       node-html-markdown: ^1.1.3
       node-ssh: ^12.0.0
       nodemailer: ^6.7.1

From 4df69428f1e1e440aadddddb019cf559fd824a28 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Fri, 3 Feb 2023 17:04:37 +0100
Subject: [PATCH 086/358] feat(Slack Node): Revamp the node with more
 functionalities in a new version (#4587)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 🔥 Remove useless tooltips

* Slack change additional fields to Options in node

* 🥅 Add error handeling for out of Scope request

* ♻️ Refactor channel visibility

* ♻️ refactor user ressource

* Update user profile

* 🔥 remove JSON parameter

* 🔥 remove attchmant json and block json

* 🎨 refactors message post

* 🎨 refactor ts property into timestamps

* 🎨 change action name for messages

* ✨ add new operation to message ressouce

* ✨ add search backend logic + channel RLC

* 🎨 improve timestamp description and plaecholder

* 🎨 change timestamp disaplay name

* ✨ add RLC for channels

* ✨ add versioning

* 🐛 Fix imports for versioning

* ✨ Add RLC for users when sending messages

* ✨ RLC for user presence

* ✨ Add json builder for slack blocks

* 🐛 Fix option in search query

* Add loadoption for search in channels

* Fix indentation issue

* ✨ Add more scopes to Oauth2

* 🐛 Fix lint issue

* 🐛 oauth fix

* ✨ Merge user and user profile

* ✨ Improve reactions and star resource

* ⚡️Merges ephemeral operation into one

* ⚡️Merge image and emoji in profile picture

* 🐛Fix bug for replying to messages

* ⚡️Add username type to User Rlc

* 🐛 Fix typo

* 🎨 Improves tooltip and naming for ephemeral messages

* 🎨 Improve display name and description

* ⚡️Add the ability to delete within username channel

* 🎨 Add informations on how to use the emojis and add doc

* 🎨 Fix typos and improve display names

* ✨ Improve FE validation for timestamp

* 🎨 Change block description

* 🚨 Fix linting

* 🚨 More lint fixes

* 🐛 Fix timestamps bug

* 🐛 Fix timestamp not showing up

* 🐛 More small fixes

* 🐛 Fix logic error

* Add searchable to slack rlc channels and users

* Fix lint rules

* ⚡️Message Search -> fix limit request using qs count

* ⚡️Message Search -> sort by relevance use qs score

* Fix messages by username rlc

* 🐛 fix messages search all operation

* Add error when using username with ephemeral message

* 🎨 fix linting errors

* 🎨 send message ephemeral error message improvement

---------

Co-authored-by: Marcus <marcus@n8n.io>
---
 .../credentials/SlackOAuth2Api.credentials.ts |    7 +
 packages/nodes-base/nodes/Slack/Slack.node.ts | 1414 +---------------
 .../Slack/{ => V1}/ChannelDescription.ts      |    0
 .../nodes/Slack/{ => V1}/FileDescription.ts   |    0
 .../nodes/Slack/{ => V1}/GenericFunctions.ts  |    0
 .../Slack/{ => V1}/MessageDescription.ts      |    0
 .../nodes/Slack/{ => V1}/MessageInterface.ts  |    0
 .../Slack/{ => V1}/ReactionDescription.ts     |    0
 .../nodes-base/nodes/Slack/V1/SlackV1.node.ts | 1397 +++++++++++++++
 .../nodes/Slack/{ => V1}/StarDescription.ts   |    0
 .../nodes/Slack/{ => V1}/UserDescription.ts   |    0
 .../Slack/{ => V1}/UserGroupDescription.ts    |    0
 .../Slack/{ => V1}/UserProfileDescription.ts  |    0
 .../nodes/Slack/V2/ChannelDescription.ts      | 1495 +++++++++++++++++
 .../nodes/Slack/V2/FileDescription.ts         |  286 ++++
 .../nodes/Slack/V2/GenericFunctions.ts        |  137 ++
 .../nodes/Slack/V2/MessageDescription.ts      | 1138 +++++++++++++
 .../nodes/Slack/V2/MessageInterface.ts        |    5 +
 .../nodes/Slack/V2/ReactionDescription.ts     |  131 ++
 .../nodes-base/nodes/Slack/V2/SlackV2.node.ts | 1342 +++++++++++++++
 .../nodes/Slack/V2/StarDescription.ts         |  268 +++
 .../nodes/Slack/V2/UserDescription.ts         |  297 ++++
 .../nodes/Slack/V2/UserGroupDescription.ts    |  329 ++++
 23 files changed, 6857 insertions(+), 1389 deletions(-)
 rename packages/nodes-base/nodes/Slack/{ => V1}/ChannelDescription.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/FileDescription.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/GenericFunctions.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/MessageDescription.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/MessageInterface.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/ReactionDescription.ts (100%)
 create mode 100644 packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
 rename packages/nodes-base/nodes/Slack/{ => V1}/StarDescription.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/UserDescription.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/UserGroupDescription.ts (100%)
 rename packages/nodes-base/nodes/Slack/{ => V1}/UserProfileDescription.ts (100%)
 create mode 100644 packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/FileDescription.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/MessageInterface.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/StarDescription.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/UserDescription.ts
 create mode 100644 packages/nodes-base/nodes/Slack/V2/UserGroupDescription.ts

diff --git a/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts b/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
index 1ad0ab12788416..8aef0a103e0a94 100644
--- a/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
+++ b/packages/nodes-base/credentials/SlackOAuth2Api.credentials.ts
@@ -68,5 +68,12 @@ export class SlackOAuth2Api implements ICredentialType {
 			type: 'hidden',
 			default: 'body',
 		},
+		{
+			displayName:
+				'If you get an Invalid Scopes error, make sure you add the correct one <a target="_blank" href="https://docs.n8n.io/integrations/builtin/credentials/slack/#using-oauth">here</a> to your Slack integration',
+			name: 'notice',
+			type: 'notice',
+			default: '',
+		},
 	];
 }
diff --git a/packages/nodes-base/nodes/Slack/Slack.node.ts b/packages/nodes-base/nodes/Slack/Slack.node.ts
index 12a4524dd92859..febdacc7f3b167 100644
--- a/packages/nodes-base/nodes/Slack/Slack.node.ts
+++ b/packages/nodes-base/nodes/Slack/Slack.node.ts
@@ -1,1391 +1,27 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type {
-	IDataObject,
-	ILoadOptionsFunctions,
-	INodeExecutionData,
-	INodePropertyOptions,
-	INodeType,
-	INodeTypeDescription,
-	JsonObject,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import { channelFields, channelOperations } from './ChannelDescription';
-import { messageFields, messageOperations } from './MessageDescription';
-import { starFields, starOperations } from './StarDescription';
-import { fileFields, fileOperations } from './FileDescription';
-import { reactionFields, reactionOperations } from './ReactionDescription';
-import { userGroupFields, userGroupOperations } from './UserGroupDescription';
-import { userFields, userOperations } from './UserDescription';
-import { userProfileFields, userProfileOperations } from './UserProfileDescription';
-import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
-import type { IAttachment } from './MessageInterface';
-
-import moment from 'moment';
-
-interface Attachment {
-	fields: {
-		item?: object[];
-	};
-}
-
-interface Text {
-	type?: string;
-	text?: string;
-	emoji?: boolean;
-	verbatim?: boolean;
-}
-
-interface Confirm {
-	title?: Text;
-	text?: Text;
-	confirm?: Text;
-	deny?: Text;
-	style?: string;
-}
-
-interface Element {
-	type?: string;
-	text?: Text;
-	action_id?: string;
-	url?: string;
-	value?: string;
-	style?: string;
-	confirm?: Confirm;
-}
-
-interface Block {
-	type?: string;
-	elements?: Element[];
-	block_id?: string;
-	text?: Text;
-	fields?: Text[];
-	accessory?: Element;
-}
-
-export class Slack implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Slack',
-		name: 'slack',
-		icon: 'file:slack.svg',
-		group: ['output'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume Slack API',
-		defaults: {
-			name: 'Slack',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [
-			{
-				name: 'slackApi',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['accessToken'],
-					},
-				},
-			},
-			{
-				name: 'slackOAuth2Api',
-				required: true,
-				displayOptions: {
-					show: {
-						authentication: ['oAuth2'],
-					},
-				},
-			},
-		],
-		properties: [
-			{
-				displayName: 'Authentication',
-				name: 'authentication',
-				type: 'options',
-				options: [
-					{
-						name: 'Access Token',
-						value: 'accessToken',
-					},
-					{
-						name: 'OAuth2',
-						value: 'oAuth2',
-					},
-				],
-				default: 'accessToken',
-			},
-
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Channel',
-						value: 'channel',
-					},
-					{
-						name: 'File',
-						value: 'file',
-					},
-					{
-						name: 'Message',
-						value: 'message',
-					},
-					{
-						name: 'Reaction',
-						value: 'reaction',
-					},
-					{
-						name: 'Star',
-						value: 'star',
-					},
-					{
-						name: 'User',
-						value: 'user',
-					},
-					{
-						name: 'User Group',
-						value: 'userGroup',
-					},
-					{
-						name: 'User Profile',
-						value: 'userProfile',
-					},
-				],
-				default: 'message',
-			},
-
-			...channelOperations,
-			...channelFields,
-			...messageOperations,
-			...messageFields,
-			...starOperations,
-			...starFields,
-			...fileOperations,
-			...fileFields,
-			...reactionOperations,
-			...reactionFields,
-			...userOperations,
-			...userFields,
-			...userGroupOperations,
-			...userGroupFields,
-			...userProfileOperations,
-			...userProfileFields,
-		],
-	};
-
-	methods = {
-		loadOptions: {
-			// Get all the users to display them to user so that he can
-			// select them easily
-			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const users = await slackApiRequestAllItems.call(this, 'members', 'GET', '/users.list');
-				for (const user of users) {
-					const userName = user.name;
-					const userId = user.id;
-					returnData.push({
-						name: userName,
-						value: userId,
-					});
-				}
-
-				returnData.sort((a, b) => {
-					if (a.name < b.name) {
-						return -1;
-					}
-					if (a.name > b.name) {
-						return 1;
-					}
-					return 0;
-				});
-
-				return returnData;
-			},
-			// Get all the users to display them to user so that he can
-			// select them easily
-			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const qs = { types: 'public_channel,private_channel', limit: 1000 };
-				const channels = await slackApiRequestAllItems.call(
-					this,
-					'channels',
-					'GET',
-					'/conversations.list',
-					{},
-					qs,
-				);
-				for (const channel of channels) {
-					const channelName = channel.name;
-					const channelId = channel.id;
-					returnData.push({
-						name: channelName,
-						value: channelId,
-					});
-				}
-
-				returnData.sort((a, b) => {
-					if (a.name < b.name) {
-						return -1;
-					}
-					if (a.name > b.name) {
-						return 1;
-					}
-					return 0;
-				});
-
-				return returnData;
-			},
-			// Get all the team fields to display them to user so that he can
-			// select them easily
-			async getTeamFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
-				const returnData: INodePropertyOptions[] = [];
-				const {
-					profile: { fields },
-				} = await slackApiRequest.call(this, 'GET', '/team.profile.get');
-				for (const field of fields) {
-					const fieldName = field.label;
-					const fieldId = field.id;
-					returnData.push({
-						name: fieldName,
-						value: fieldId,
-					});
-				}
-				return returnData;
-			},
-		},
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const returnData: INodeExecutionData[] = [];
-		const length = items.length;
-		let qs: IDataObject;
-		let responseData;
-		const authentication = this.getNodeParameter('authentication', 0) as string;
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-
-		for (let i = 0; i < length; i++) {
-			try {
-				responseData = {
-					error: 'Resource ' + resource + ' / operation ' + operation + ' not found!',
-				};
-				qs = {};
-				if (resource === 'channel') {
-					//https://api.slack.com/methods/conversations.archive
-					if (operation === 'archive') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const body: IDataObject = {
-							channel,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.archive',
-							body,
-							qs,
-						);
-					}
-					//https://api.slack.com/methods/conversations.close
-					if (operation === 'close') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const body: IDataObject = {
-							channel,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.close',
-							body,
-							qs,
-						);
-					}
-					//https://api.slack.com/methods/conversations.create
-					if (operation === 'create') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const body: IDataObject = {
-							name: channel,
-						};
-						if (additionalFields.isPrivate) {
-							body.is_private = additionalFields.isPrivate as boolean;
-						}
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.create',
-							body,
-							qs,
-						);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.kick
-					if (operation === 'kick') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const userId = this.getNodeParameter('userId', i) as string;
-						const body: IDataObject = {
-							channel,
-							user: userId,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.kick',
-							body,
-							qs,
-						);
-					}
-					//https://api.slack.com/methods/conversations.join
-					if (operation === 'join') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const body: IDataObject = {
-							channel,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.join',
-							body,
-							qs,
-						);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.info
-					if (operation === 'get') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						qs.channel = channel;
-						responseData = await slackApiRequest.call(this, 'POST', '/conversations.info', {}, qs);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.list
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const filters = this.getNodeParameter('filters', i);
-						if (filters.types) {
-							qs.types = (filters.types as string[]).join(',');
-						}
-						if (filters.excludeArchived) {
-							qs.exclude_archived = filters.excludeArchived as boolean;
-						}
-						if (returnAll) {
-							responseData = await slackApiRequestAllItems.call(
-								this,
-								'channels',
-								'GET',
-								'/conversations.list',
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await slackApiRequest.call(this, 'GET', '/conversations.list', {}, qs);
-							responseData = responseData.channels;
-						}
-					}
-					//https://api.slack.com/methods/conversations.history
-					if (operation === 'history') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const filters = this.getNodeParameter('filters', i);
-						qs.channel = channel;
-						if (filters.inclusive) {
-							qs.inclusive = filters.inclusive as boolean;
-						}
-						if (filters.latest) {
-							qs.latest = new Date(filters.latest as string).getTime() / 1000;
-						}
-						if (filters.oldest) {
-							qs.oldest = new Date(filters.oldest as string).getTime() / 1000;
-						}
-						if (returnAll) {
-							responseData = await slackApiRequestAllItems.call(
-								this,
-								'messages',
-								'GET',
-								'/conversations.history',
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await slackApiRequest.call(
-								this,
-								'GET',
-								'/conversations.history',
-								{},
-								qs,
-							);
-							responseData = responseData.messages;
-						}
-					}
-					//https://api.slack.com/methods/conversations.invite
-					if (operation === 'invite') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const userIds = (this.getNodeParameter('userIds', i) as string[]).join(',');
-						const body: IDataObject = {
-							channel,
-							users: userIds,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.invite',
-							body,
-							qs,
-						);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.leave
-					if (operation === 'leave') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const body: IDataObject = {
-							channel,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.leave',
-							body,
-							qs,
-						);
-					}
-					//https://api.slack.com/methods/conversations.members
-					if (operation === 'member') {
-						const returnAll = this.getNodeParameter('returnAll', 0);
-						const resolveData = this.getNodeParameter('resolveData', 0);
-						qs.channel = this.getNodeParameter('channelId', i) as string;
-						if (returnAll) {
-							responseData = await slackApiRequestAllItems.call(
-								this,
-								'members',
-								'GET',
-								'/conversations.members',
-								{},
-								qs,
-							);
-							responseData = responseData.map((member: string) => ({ member }));
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await slackApiRequest.call(
-								this,
-								'GET',
-								'/conversations.members',
-								{},
-								qs,
-							);
-							responseData = responseData.members.map((member: string) => ({ member }));
-						}
-
-						if (resolveData) {
-							const data: IDataObject[] = [];
-							for (const { member } of responseData) {
-								const { user } = await slackApiRequest.call(
-									this,
-									'GET',
-									'/users.info',
-									{},
-									{ user: member },
-								);
-								data.push(user);
-							}
-							responseData = data;
-						}
-					}
-					//https://api.slack.com/methods/conversations.open
-					if (operation === 'open') {
-						const options = this.getNodeParameter('options', i);
-						const body: IDataObject = {};
-						if (options.channelId) {
-							body.channel = options.channelId as string;
-						}
-						if (options.returnIm) {
-							body.return_im = options.returnIm as boolean;
-						}
-						if (options.users) {
-							body.users = (options.users as string[]).join(',');
-						}
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.open',
-							body,
-							qs,
-						);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.rename
-					if (operation === 'rename') {
-						const channel = this.getNodeParameter('channelId', i) as IDataObject;
-						const name = this.getNodeParameter('name', i) as IDataObject;
-						const body: IDataObject = {
-							channel,
-							name,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.rename',
-							body,
-							qs,
-						);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.replies
-					if (operation === 'replies') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const ts = this.getNodeParameter('ts', i) as string;
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const filters = this.getNodeParameter('filters', i);
-						qs.channel = channel;
-						qs.ts = ts;
-						if (filters.inclusive) {
-							qs.inclusive = filters.inclusive as boolean;
-						}
-						if (filters.latest) {
-							qs.latest = new Date(filters.latest as string).getTime() / 1000;
-						}
-						if (filters.oldest) {
-							qs.oldest = new Date(filters.oldest as string).getTime() / 1000;
-						}
-						if (returnAll) {
-							responseData = await slackApiRequestAllItems.call(
-								this,
-								'messages',
-								'GET',
-								'/conversations.replies',
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await slackApiRequest.call(
-								this,
-								'GET',
-								'/conversations.replies',
-								{},
-								qs,
-							);
-							responseData = responseData.messages;
-						}
-					}
-					//https://api.slack.com/methods/conversations.setPurpose
-					if (operation === 'setPurpose') {
-						const channel = this.getNodeParameter('channelId', i) as IDataObject;
-						const purpose = this.getNodeParameter('purpose', i) as IDataObject;
-						const body: IDataObject = {
-							channel,
-							purpose,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.setPurpose',
-							body,
-							qs,
-						);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.setTopic
-					if (operation === 'setTopic') {
-						const channel = this.getNodeParameter('channelId', i) as IDataObject;
-						const topic = this.getNodeParameter('topic', i) as IDataObject;
-						const body: IDataObject = {
-							channel,
-							topic,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.setTopic',
-							body,
-							qs,
-						);
-						responseData = responseData.channel;
-					}
-					//https://api.slack.com/methods/conversations.unarchive
-					if (operation === 'unarchive') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const body: IDataObject = {
-							channel,
-						};
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/conversations.unarchive',
-							body,
-							qs,
-						);
-					}
-				}
-				if (resource === 'message') {
-					//https://api.slack.com/methods/chat.postMessage
-					if (['post', 'postEphemeral'].includes(operation)) {
-						const channel = this.getNodeParameter('channel', i) as string;
-						const { sendAsUser } = this.getNodeParameter('otherOptions', i) as IDataObject;
-						const text = this.getNodeParameter('text', i) as string;
-						const body: IDataObject = {
-							channel,
-							text,
-						};
-
-						let action = 'postMessage';
-
-						if (operation === 'postEphemeral') {
-							body.user = this.getNodeParameter('user', i) as string;
-							action = 'postEphemeral';
-						}
-
-						const jsonParameters = this.getNodeParameter('jsonParameters', i);
-
-						if (authentication === 'accessToken' && sendAsUser !== '') {
-							body.username = sendAsUser;
-						}
-
-						if (!jsonParameters) {
-							const attachments = this.getNodeParameter(
-								'attachments',
-								i,
-								[],
-							) as unknown as Attachment[];
-							const blocksUi = (this.getNodeParameter('blocksUi', i, []) as IDataObject)
-								.blocksValues as IDataObject[];
-
-							// The node does save the fields data differently than the API
-							// expects so fix the data befre we send the request
-							for (const attachment of attachments) {
-								if (attachment.fields !== undefined) {
-									if (attachment.fields.item !== undefined) {
-										// Move the field-content up
-										// @ts-ignore
-										attachment.fields = attachment.fields.item;
-									} else {
-										// If it does not have any items set remove it
-										// @ts-ignore
-										delete attachment.fields;
-									}
-								}
-							}
-							body.attachments = attachments;
-
-							if (blocksUi) {
-								const blocks: Block[] = [];
-								for (const blockUi of blocksUi) {
-									const block: Block = {};
-									const elements: Element[] = [];
-									block.block_id = blockUi.blockId as string;
-									block.type = blockUi.type as string;
-									if (block.type === 'actions') {
-										const elementsUi = (blockUi.elementsUi as IDataObject)
-											.elementsValues as IDataObject[];
-										if (elementsUi) {
-											for (const elementUi of elementsUi) {
-												const element: Element = {};
-												if (elementUi.actionId === '') {
-													throw new NodeOperationError(this.getNode(), 'Action ID must be set', {
-														itemIndex: i,
-													});
-												}
-												if (elementUi.text === '') {
-													throw new NodeOperationError(this.getNode(), 'Text must be set', {
-														itemIndex: i,
-													});
-												}
-												element.action_id = elementUi.actionId as string;
-												element.type = elementUi.type as string;
-												element.text = {
-													text: elementUi.text as string,
-													type: 'plain_text',
-													emoji: elementUi.emoji as boolean,
-												};
-												if (elementUi.url) {
-													element.url = elementUi.url as string;
-												}
-												if (elementUi.value) {
-													element.value = elementUi.value as string;
-												}
-												if (elementUi.style !== 'default') {
-													element.style = elementUi.style as string;
-												}
-												const confirmUi = (elementUi.confirmUi as IDataObject)
-													.confirmValue as IDataObject;
-												if (confirmUi) {
-													const confirm: Confirm = {};
-													const titleUi = (confirmUi.titleUi as IDataObject)
-														.titleValue as IDataObject;
-													const textUi = (confirmUi.textUi as IDataObject).textValue as IDataObject;
-													const confirmTextUi = (confirmUi.confirmTextUi as IDataObject)
-														.confirmValue as IDataObject;
-													const denyUi = (confirmUi.denyUi as IDataObject).denyValue as IDataObject;
-													const style = confirmUi.style as string;
-													if (titleUi) {
-														confirm.title = {
-															type: 'plain_text',
-															text: titleUi.text as string,
-															emoji: titleUi.emoji as boolean,
-														};
-													}
-													if (textUi) {
-														confirm.text = {
-															type: 'plain_text',
-															text: textUi.text as string,
-															emoji: textUi.emoji as boolean,
-														};
-													}
-													if (confirmTextUi) {
-														confirm.confirm = {
-															type: 'plain_text',
-															text: confirmTextUi.text as string,
-															emoji: confirmTextUi.emoji as boolean,
-														};
-													}
-													if (denyUi) {
-														confirm.deny = {
-															type: 'plain_text',
-															text: denyUi.text as string,
-															emoji: denyUi.emoji as boolean,
-														};
-													}
-													if (style !== 'default') {
-														confirm.style = style;
-													}
-													element.confirm = confirm;
-												}
-												elements.push(element);
-											}
-											block.elements = elements;
-										}
-									} else if (block.type === 'section') {
-										const textUi = (blockUi.textUi as IDataObject).textValue as IDataObject;
-										if (textUi) {
-											const textData: Text = {};
-											if (textUi.type === 'plainText') {
-												textData.type = 'plain_text';
-												textData.emoji = textUi.emoji as boolean;
-											} else {
-												textData.type = 'mrkdwn';
-												textData.verbatim = textUi.verbatim as boolean;
-											}
-											textData.text = textUi.text as string;
-											block.text = textData;
-										} else {
-											throw new NodeOperationError(
-												this.getNode(),
-												'Property text must be defined',
-												{ itemIndex: i },
-											);
-										}
-										const fieldsUi = (blockUi.fieldsUi as IDataObject)
-											.fieldsValues as IDataObject[];
-										if (fieldsUi) {
-											const fields: Text[] = [];
-											for (const fieldUi of fieldsUi) {
-												const field: Text = {};
-												if (fieldUi.type === 'plainText') {
-													field.type = 'plain_text';
-													field.emoji = fieldUi.emoji as boolean;
-												} else {
-													field.type = 'mrkdwn';
-													field.verbatim = fieldUi.verbatim as boolean;
-												}
-												field.text = fieldUi.text as string;
-												fields.push(field);
-											}
-											// If not fields were added then it's not needed to send the property
-											if (fields.length > 0) {
-												block.fields = fields;
-											}
-										}
-										const accessoryUi = (blockUi.accessoryUi as IDataObject)
-											.accessoriesValues as IDataObject;
-										if (accessoryUi) {
-											const accessory: Element = {};
-											if (accessoryUi.type === 'button') {
-												accessory.type = 'button';
-												accessory.text = {
-													text: accessoryUi.text as string,
-													type: 'plain_text',
-													emoji: accessoryUi.emoji as boolean,
-												};
-												if (accessoryUi.url) {
-													accessory.url = accessoryUi.url as string;
-												}
-												if (accessoryUi.value) {
-													accessory.value = accessoryUi.value as string;
-												}
-												if (accessoryUi.style !== 'default') {
-													accessory.style = accessoryUi.style as string;
-												}
-												const confirmUi = (accessoryUi.confirmUi as IDataObject)
-													.confirmValue as IDataObject;
-												if (confirmUi) {
-													const confirm: Confirm = {};
-													const titleUi = (confirmUi.titleUi as IDataObject)
-														.titleValue as IDataObject;
-													const textUiFromConfirm = (confirmUi.textUi as IDataObject)
-														.textValue as IDataObject;
-													const confirmTextUi = (confirmUi.confirmTextUi as IDataObject)
-														.confirmValue as IDataObject;
-													const denyUi = (confirmUi.denyUi as IDataObject).denyValue as IDataObject;
-													const style = confirmUi.style as string;
-													if (titleUi) {
-														confirm.title = {
-															type: 'plain_text',
-															text: titleUi.text as string,
-															emoji: titleUi.emoji as boolean,
-														};
-													}
-													if (textUiFromConfirm) {
-														confirm.text = {
-															type: 'plain_text',
-															text: textUiFromConfirm.text as string,
-															emoji: textUiFromConfirm.emoji as boolean,
-														};
-													}
-													if (confirmTextUi) {
-														confirm.confirm = {
-															type: 'plain_text',
-															text: confirmTextUi.text as string,
-															emoji: confirmTextUi.emoji as boolean,
-														};
-													}
-													if (denyUi) {
-														confirm.deny = {
-															type: 'plain_text',
-															text: denyUi.text as string,
-															emoji: denyUi.emoji as boolean,
-														};
-													}
-													if (style !== 'default') {
-														confirm.style = style;
-													}
-													accessory.confirm = confirm;
-												}
-											}
-											block.accessory = accessory;
-										}
-									}
-									blocks.push(block);
-								}
-								body.blocks = blocks;
-							}
-						} else {
-							const attachmentsJson = this.getNodeParameter('attachmentsJson', i, '') as string;
-							const blocksJson = this.getNodeParameter('blocksJson', i, []) as string;
-							if (attachmentsJson !== '' && validateJSON(attachmentsJson) === undefined) {
-								throw new NodeOperationError(this.getNode(), 'Attachments it is not a valid json', {
-									itemIndex: i,
-								});
-							}
-							if (blocksJson !== '' && validateJSON(blocksJson) === undefined) {
-								throw new NodeOperationError(this.getNode(), 'Blocks it is not a valid json', {
-									itemIndex: i,
-								});
-							}
-							if (attachmentsJson !== '') {
-								body.attachments = attachmentsJson;
-							}
-							if (blocksJson !== '') {
-								body.blocks = blocksJson;
-							}
-						}
-
-						// Add all the other options to the request
-						const otherOptions = this.getNodeParameter('otherOptions', i) as IDataObject;
-						Object.assign(body, otherOptions);
-						responseData = await slackApiRequest.call(this, 'POST', `/chat.${action}`, body, qs);
-					}
-					//https://api.slack.com/methods/chat.update
-					if (operation === 'update') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const text = this.getNodeParameter('text', i) as string;
-						const ts = this.getNodeParameter('ts', i) as string;
-						const attachments = this.getNodeParameter(
-							'attachments',
-							i,
-							[],
-						) as unknown as IAttachment[];
-						const body: IDataObject = {
-							channel,
-							text,
-							ts,
-						};
-
-						// The node does save the fields data differently than the API
-						// expects so fix the data befre we send the request
-						for (const attachment of attachments) {
-							if (attachment.fields !== undefined) {
-								if (attachment.fields.item !== undefined) {
-									// Move the field-content up
-									// @ts-ignore
-									attachment.fields = attachment.fields.item;
-								} else {
-									// If it does not have any items set remove it
-									// @ts-ignore
-									delete attachment.fields;
-								}
-							}
-						}
-						body.attachments = attachments;
-
-						const jsonParameters = this.getNodeParameter('jsonParameters', i, false);
-						if (jsonParameters) {
-							const blocksJson = this.getNodeParameter('blocksJson', i, []) as string;
-
-							if (blocksJson !== '' && validateJSON(blocksJson) === undefined) {
-								throw new NodeOperationError(this.getNode(), 'Blocks it is not a valid json', {
-									itemIndex: i,
-								});
-							}
-							if (blocksJson !== '') {
-								body.blocks = blocksJson;
-							}
-
-							const attachmentsJson = this.getNodeParameter('attachmentsJson', i, '') as string;
-
-							if (attachmentsJson !== '' && validateJSON(attachmentsJson) === undefined) {
-								throw new NodeOperationError(this.getNode(), 'Attachments it is not a valid json', {
-									itemIndex: i,
-								});
-							}
-
-							if (attachmentsJson !== '') {
-								body.attachments = attachmentsJson;
-							}
-						}
-
-						// Add all the other options to the request
-						const updateFields = this.getNodeParameter('updateFields', i);
-						Object.assign(body, updateFields);
-						responseData = await slackApiRequest.call(this, 'POST', '/chat.update', body, qs);
-					}
-					//https://api.slack.com/methods/chat.delete
-					if (operation === 'delete') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const timestamp = this.getNodeParameter('timestamp', i) as string;
-						const body: IDataObject = {
-							channel,
-							ts: timestamp,
-						};
-						// Add all the other options to the request
-						responseData = await slackApiRequest.call(this, 'POST', '/chat.delete', body, qs);
-					}
-					//https://api.slack.com/methods/chat.getPermalink
-					if (operation === 'getPermalink') {
-						const channel = this.getNodeParameter('channelId', i) as string;
-						const timestamp = this.getNodeParameter('timestamp', i) as string;
-						const query = {
-							channel,
-							message_ts: timestamp,
-						};
-						responseData = await slackApiRequest.call(this, 'GET', '/chat.getPermalink', {}, query);
-					}
-				}
-				if (resource === 'reaction') {
-					const channel = this.getNodeParameter('channelId', i) as string;
-					const timestamp = this.getNodeParameter('timestamp', i) as string;
-					//https://api.slack.com/methods/reactions.add
-					if (operation === 'add') {
-						const name = this.getNodeParameter('name', i) as string;
-						const body: IDataObject = {
-							channel,
-							name,
-							timestamp,
-						};
-						responseData = await slackApiRequest.call(this, 'POST', '/reactions.add', body, qs);
-					}
-					//https://api.slack.com/methods/reactions.remove
-					if (operation === 'remove') {
-						const name = this.getNodeParameter('name', i) as string;
-						const body: IDataObject = {
-							channel,
-							name,
-							timestamp,
-						};
-						responseData = await slackApiRequest.call(this, 'POST', '/reactions.remove', body, qs);
-					}
-					//https://api.slack.com/methods/reactions.get
-					if (operation === 'get') {
-						qs.channel = channel;
-						qs.timestamp = timestamp;
-						responseData = await slackApiRequest.call(this, 'GET', '/reactions.get', {}, qs);
-					}
-				}
-				if (resource === 'star') {
-					//https://api.slack.com/methods/stars.add
-					if (operation === 'add') {
-						const options = this.getNodeParameter('options', i);
-						const body: IDataObject = {};
-						if (options.channelId) {
-							body.channel = options.channelId as string;
-						}
-						if (options.fileId) {
-							body.file = options.fileId as string;
-						}
-						if (options.fileComment) {
-							body.file_comment = options.fileComment as string;
-						}
-						if (options.timestamp) {
-							body.timestamp = options.timestamp as string;
-						}
-						responseData = await slackApiRequest.call(this, 'POST', '/stars.add', body, qs);
-					}
-					//https://api.slack.com/methods/stars.remove
-					if (operation === 'delete') {
-						const options = this.getNodeParameter('options', i);
-						const body: IDataObject = {};
-						if (options.channelId) {
-							body.channel = options.channelId as string;
-						}
-						if (options.fileId) {
-							body.file = options.fileId as string;
-						}
-						if (options.fileComment) {
-							body.file_comment = options.fileComment as string;
-						}
-						if (options.timestamp) {
-							body.timestamp = options.timestamp as string;
-						}
-						responseData = await slackApiRequest.call(this, 'POST', '/stars.remove', body, qs);
-					}
-					//https://api.slack.com/methods/stars.list
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						if (returnAll) {
-							responseData = await slackApiRequestAllItems.call(
-								this,
-								'items',
-								'GET',
-								'/stars.list',
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await slackApiRequest.call(this, 'GET', '/stars.list', {}, qs);
-							responseData = responseData.items;
-						}
-					}
-				}
-				if (resource === 'file') {
-					//https://api.slack.com/methods/files.upload
-					if (operation === 'upload') {
-						const options = this.getNodeParameter('options', i);
-						const binaryData = this.getNodeParameter('binaryData', i);
-						const body: IDataObject = {};
-						if (options.channelIds) {
-							body.channels = (options.channelIds as string[]).join(',');
-						}
-						if (options.fileName) {
-							body.filename = options.fileName as string;
-						}
-						if (options.initialComment) {
-							body.initial_comment = options.initialComment as string;
-						}
-						if (options.threadTs) {
-							body.thread_ts = options.threadTs as string;
-						}
-						if (options.title) {
-							body.title = options.title as string;
-						}
-						if (binaryData) {
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							if (
-								items[i].binary === undefined ||
-								//@ts-ignore
-								items[i].binary[binaryPropertyName] === undefined
-							) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
-									{ itemIndex: i },
-								);
-							}
-							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-								i,
-								binaryPropertyName,
-							);
-							body.file = {
-								//@ts-ignore
-								value: binaryDataBuffer,
-								options: {
-									//@ts-ignore
-									filename: items[i].binary[binaryPropertyName].fileName,
-									//@ts-ignore
-									contentType: items[i].binary[binaryPropertyName].mimeType,
-								},
-							};
-							responseData = await slackApiRequest.call(
-								this,
-								'POST',
-								'/files.upload',
-								{},
-								qs,
-								{ 'Content-Type': 'multipart/form-data' },
-								{ formData: body },
-							);
-							responseData = responseData.file;
-						} else {
-							const fileContent = this.getNodeParameter('fileContent', i) as string;
-							body.content = fileContent;
-							responseData = await slackApiRequest.call(
-								this,
-								'POST',
-								'/files.upload',
-								body,
-								qs,
-								{ 'Content-Type': 'application/x-www-form-urlencoded' },
-								{ form: body },
-							);
-							responseData = responseData.file;
-						}
-					}
-					//https://api.slack.com/methods/files.list
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						const filters = this.getNodeParameter('filters', i);
-						if (filters.channelId) {
-							qs.channel = filters.channelId as string;
-						}
-						if (filters.showFilesHidden) {
-							qs.show_files_hidden_by_limit = filters.showFilesHidden as boolean;
-						}
-						if (filters.tsFrom) {
-							qs.ts_from = filters.tsFrom as string;
-						}
-						if (filters.tsTo) {
-							qs.ts_to = filters.tsTo as string;
-						}
-						if (filters.types) {
-							qs.types = (filters.types as string[]).join(',');
-						}
-						if (filters.userId) {
-							qs.user = filters.userId as string;
-						}
-						if (returnAll) {
-							responseData = await slackApiRequestAllItems.call(
-								this,
-								'files',
-								'GET',
-								'/files.list',
-								{},
-								qs,
-							);
-						} else {
-							qs.count = this.getNodeParameter('limit', i);
-							responseData = await slackApiRequest.call(this, 'GET', '/files.list', {}, qs);
-							responseData = responseData.files;
-						}
-					}
-					//https://api.slack.com/methods/files.info
-					if (operation === 'get') {
-						const fileId = this.getNodeParameter('fileId', i) as string;
-						qs.file = fileId;
-						responseData = await slackApiRequest.call(this, 'GET', '/files.info', {}, qs);
-						responseData = responseData.file;
-					}
-				}
-				if (resource === 'user') {
-					//https://api.slack.com/methods/users.info
-					if (operation === 'info') {
-						qs.user = this.getNodeParameter('user', i) as string;
-						responseData = await slackApiRequest.call(this, 'GET', '/users.info', {}, qs);
-						responseData = responseData.user;
-					}
-					//https://api.slack.com/methods/users.list
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-						if (returnAll) {
-							responseData = await slackApiRequestAllItems.call(
-								this,
-								'members',
-								'GET',
-								'/users.list',
-								{},
-								qs,
-							);
-						} else {
-							qs.limit = this.getNodeParameter('limit', i);
-							responseData = await slackApiRequest.call(this, 'GET', '/users.list', {}, qs);
-							responseData = responseData.members;
-						}
-					}
-					//https://api.slack.com/methods/users.getPresence
-					if (operation === 'getPresence') {
-						qs.user = this.getNodeParameter('user', i) as string;
-						responseData = await slackApiRequest.call(this, 'GET', '/users.getPresence', {}, qs);
-					}
-				}
-				if (resource === 'userGroup') {
-					//https://api.slack.com/methods/usergroups.create
-					if (operation === 'create') {
-						const name = this.getNodeParameter('name', i) as string;
-
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const body: IDataObject = {
-							name,
-						};
-
-						Object.assign(body, additionalFields);
-
-						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.create', body, qs);
-
-						responseData = responseData.usergroup;
-					}
-					//https://api.slack.com/methods/usergroups.enable
-					if (operation === 'enable') {
-						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
-
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const body: IDataObject = {
-							usergroup: userGroupId,
-						};
-
-						Object.assign(body, additionalFields);
-
-						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.enable', body, qs);
-
-						responseData = responseData.usergroup;
-					}
-					//https://api.slack.com/methods/usergroups.disable
-					if (operation === 'disable') {
-						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
-
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const body: IDataObject = {
-							usergroup: userGroupId,
-						};
-
-						Object.assign(body, additionalFields);
-
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/usergroups.disable',
-							body,
-							qs,
-						);
-
-						responseData = responseData.usergroup;
-					}
-
-					//https://api.slack.com/methods/usergroups.list
-					if (operation === 'getAll') {
-						const returnAll = this.getNodeParameter('returnAll', i);
-
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						responseData = await slackApiRequest.call(
-							this,
-							'GET',
-							'/usergroups.list',
-							{},
-							additionalFields,
-						);
-
-						responseData = responseData.usergroups;
-
-						if (!returnAll) {
-							const limit = this.getNodeParameter('limit', i);
-
-							responseData = responseData.slice(0, limit);
-						}
-					}
-
-					//https://api.slack.com/methods/usergroups.update
-					if (operation === 'update') {
-						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
-
-						const updateFields = this.getNodeParameter('updateFields', i);
-
-						const body: IDataObject = {
-							usergroup: userGroupId,
-						};
-
-						Object.assign(body, updateFields);
-
-						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.update', body, qs);
-
-						responseData = responseData.usergroup;
-					}
-				}
-				if (resource === 'userProfile') {
-					//https://api.slack.com/methods/users.profile.set
-					if (operation === 'update') {
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						const timezone = this.getTimezone();
-
-						const body: IDataObject = {};
-
-						Object.assign(body, additionalFields);
-
-						if (body.status_expiration === undefined) {
-							body.status_expiration = 0;
-						} else {
-							body.status_expiration = moment.tz(body.status_expiration as string, timezone).unix();
-						}
-
-						if (body.customFieldUi) {
-							const customFields = (body.customFieldUi as IDataObject)
-								.customFieldValues as IDataObject[];
-
-							body.fields = {};
-
-							for (const customField of customFields) {
-								//@ts-ignore
-								body.fields[customField.id] = {
-									value: customField.value,
-									alt: customField.alt,
-								};
-							}
-						}
-
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/users.profile.set',
-							{ profile: body },
-							qs,
-						);
-
-						responseData = responseData.profile;
-					}
-					//https://api.slack.com/methods/users.profile.get
-					if (operation === 'get') {
-						const additionalFields = this.getNodeParameter('additionalFields', i);
-
-						responseData = await slackApiRequest.call(
-							this,
-							'POST',
-							'/users.profile.get',
-							undefined,
-							additionalFields,
-						);
-
-						responseData = responseData.profile;
-					}
-				}
-
-				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
-					{ itemData: { item: i } },
-				);
-				returnData.push(...executionData);
-			} catch (error) {
-				if (this.continueOnFail()) {
-					returnData.push({ json: { error: (error as JsonObject).message } });
-					continue;
-				}
-				throw error;
-			}
-		}
-		return this.prepareOutputData(returnData);
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { SlackV1 } from './V1/SlackV1.node';
+
+import { SlackV2 } from './V2/SlackV2.node';
+
+export class Slack extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Slack',
+			name: 'slack',
+			icon: 'file:slack.svg',
+			group: ['output'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Consume Slack API',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new SlackV1(baseDescription),
+			2: new SlackV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/Slack/ChannelDescription.ts b/packages/nodes-base/nodes/Slack/V1/ChannelDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/ChannelDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/ChannelDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/FileDescription.ts b/packages/nodes-base/nodes/Slack/V1/FileDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/FileDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/FileDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/GenericFunctions.ts
rename to packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
diff --git a/packages/nodes-base/nodes/Slack/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V1/MessageDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/MessageDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/MessageDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/MessageInterface.ts b/packages/nodes-base/nodes/Slack/V1/MessageInterface.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/MessageInterface.ts
rename to packages/nodes-base/nodes/Slack/V1/MessageInterface.ts
diff --git a/packages/nodes-base/nodes/Slack/ReactionDescription.ts b/packages/nodes-base/nodes/Slack/V1/ReactionDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/ReactionDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/ReactionDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
new file mode 100644
index 00000000000000..261129648e631b
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
@@ -0,0 +1,1397 @@
+import type { IExecuteFunctions } from 'n8n-core';
+
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import { channelFields, channelOperations } from './ChannelDescription';
+import { messageFields, messageOperations } from './MessageDescription';
+import { starFields, starOperations } from './StarDescription';
+import { fileFields, fileOperations } from './FileDescription';
+import { reactionFields, reactionOperations } from './ReactionDescription';
+import { userGroupFields, userGroupOperations } from './UserGroupDescription';
+import { userFields, userOperations } from './UserDescription';
+import { userProfileFields, userProfileOperations } from './UserProfileDescription';
+import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
+import type { IAttachment } from './MessageInterface';
+
+import moment from 'moment';
+
+interface Attachment {
+	fields: {
+		item?: object[];
+	};
+}
+
+interface Text {
+	type?: string;
+	text?: string;
+	emoji?: boolean;
+	verbatim?: boolean;
+}
+
+interface Confirm {
+	title?: Text;
+	text?: Text;
+	confirm?: Text;
+	deny?: Text;
+	style?: string;
+}
+
+interface Element {
+	type?: string;
+	text?: Text;
+	action_id?: string;
+	url?: string;
+	value?: string;
+	style?: string;
+	confirm?: Confirm;
+}
+
+interface Block {
+	type?: string;
+	elements?: Element[];
+	block_id?: string;
+	text?: Text;
+	fields?: Text[];
+	accessory?: Element;
+}
+
+export class SlackV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 1,
+			defaults: {
+				name: 'Slack',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'slackApi',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['accessToken'],
+						},
+					},
+				},
+				{
+					name: 'slackOAuth2Api',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['oAuth2'],
+						},
+					},
+				},
+			],
+			properties: [
+				{
+					displayName: 'Authentication',
+					name: 'authentication',
+					type: 'options',
+					options: [
+						{
+							name: 'Access Token',
+							value: 'accessToken',
+						},
+						{
+							name: 'OAuth2',
+							value: 'oAuth2',
+						},
+					],
+					default: 'accessToken',
+				},
+
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Channel',
+							value: 'channel',
+						},
+						{
+							name: 'File',
+							value: 'file',
+						},
+						{
+							name: 'Message',
+							value: 'message',
+						},
+						{
+							name: 'Reaction',
+							value: 'reaction',
+						},
+						{
+							name: 'Star',
+							value: 'star',
+						},
+						{
+							name: 'User',
+							value: 'user',
+						},
+						{
+							name: 'User Group',
+							value: 'userGroup',
+						},
+						{
+							name: 'User Profile',
+							value: 'userProfile',
+						},
+					],
+					default: 'message',
+				},
+
+				...channelOperations,
+				...channelFields,
+				...messageOperations,
+				...messageFields,
+				...starOperations,
+				...starFields,
+				...fileOperations,
+				...fileFields,
+				...reactionOperations,
+				...reactionFields,
+				...userOperations,
+				...userFields,
+				...userGroupOperations,
+				...userGroupFields,
+				...userProfileOperations,
+				...userProfileFields,
+			],
+		};
+	}
+
+	methods = {
+		loadOptions: {
+			// Get all the users to display them to user so that he can
+			// select them easily
+			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const users = await slackApiRequestAllItems.call(this, 'members', 'GET', '/users.list');
+				for (const user of users) {
+					const userName = user.name;
+					const userId = user.id;
+					returnData.push({
+						name: userName,
+						value: userId,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					if (a.name < b.name) {
+						return -1;
+					}
+					if (a.name > b.name) {
+						return 1;
+					}
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the users to display them to user so that he can
+			// select them easily
+			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = { types: 'public_channel,private_channel', limit: 1000 };
+				const channels = await slackApiRequestAllItems.call(
+					this,
+					'channels',
+					'GET',
+					'/conversations.list',
+					{},
+					qs,
+				);
+				for (const channel of channels) {
+					const channelName = channel.name;
+					const channelId = channel.id;
+					returnData.push({
+						name: channelName,
+						value: channelId,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					if (a.name < b.name) {
+						return -1;
+					}
+					if (a.name > b.name) {
+						return 1;
+					}
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the team fields to display them to user so that he can
+			// select them easily
+			async getTeamFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const {
+					profile: { fields },
+				} = await slackApiRequest.call(this, 'GET', '/team.profile.get');
+				for (const field of fields) {
+					const fieldName = field.label;
+					const fieldId = field.id;
+					returnData.push({
+						name: fieldName,
+						value: fieldId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		let qs: IDataObject;
+		let responseData;
+		const authentication = this.getNodeParameter('authentication', 0) as string;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		for (let i = 0; i < length; i++) {
+			try {
+				responseData = {
+					error: 'Resource ' + resource + ' / operation ' + operation + ' not found!',
+				};
+				qs = {};
+				if (resource === 'channel') {
+					//https://api.slack.com/methods/conversations.archive
+					if (operation === 'archive') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.archive',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.close
+					if (operation === 'close') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.close',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.create
+					if (operation === 'create') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+						const body: IDataObject = {
+							name: channel,
+						};
+						if (additionalFields.isPrivate) {
+							body.is_private = additionalFields.isPrivate as boolean;
+						}
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.create',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.kick
+					if (operation === 'kick') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const userId = this.getNodeParameter('userId', i) as string;
+						const body: IDataObject = {
+							channel,
+							user: userId,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.kick',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.join
+					if (operation === 'join') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.join',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.info
+					if (operation === 'get') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						qs.channel = channel;
+						responseData = await slackApiRequest.call(this, 'POST', '/conversations.info', {}, qs);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						if (filters.types) {
+							qs.types = (filters.types as string[]).join(',');
+						}
+						if (filters.excludeArchived) {
+							qs.exclude_archived = filters.excludeArchived as boolean;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'channels',
+								'GET',
+								'/conversations.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/conversations.list', {}, qs);
+							responseData = responseData.channels;
+						}
+					}
+					//https://api.slack.com/methods/conversations.history
+					if (operation === 'history') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						qs.channel = channel;
+						if (filters.inclusive) {
+							qs.inclusive = filters.inclusive as boolean;
+						}
+						if (filters.latest) {
+							qs.latest = new Date(filters.latest as string).getTime() / 1000;
+						}
+						if (filters.oldest) {
+							qs.oldest = new Date(filters.oldest as string).getTime() / 1000;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'messages',
+								'GET',
+								'/conversations.history',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(
+								this,
+								'GET',
+								'/conversations.history',
+								{},
+								qs,
+							);
+							responseData = responseData.messages;
+						}
+					}
+					//https://api.slack.com/methods/conversations.invite
+					if (operation === 'invite') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const userIds = (this.getNodeParameter('userIds', i) as string[]).join(',');
+						const body: IDataObject = {
+							channel,
+							users: userIds,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.invite',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.leave
+					if (operation === 'leave') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.leave',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.members
+					if (operation === 'member') {
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const resolveData = this.getNodeParameter('resolveData', 0);
+						qs.channel = this.getNodeParameter('channelId', i) as string;
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'members',
+								'GET',
+								'/conversations.members',
+								{},
+								qs,
+							);
+							responseData = responseData.map((member: string) => ({ member }));
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(
+								this,
+								'GET',
+								'/conversations.members',
+								{},
+								qs,
+							);
+							responseData = responseData.members.map((member: string) => ({ member }));
+						}
+
+						if (resolveData) {
+							const data: IDataObject[] = [];
+							for (const { member } of responseData) {
+								const { user } = await slackApiRequest.call(
+									this,
+									'GET',
+									'/users.info',
+									{},
+									{ user: member },
+								);
+								data.push(user);
+							}
+							responseData = data;
+						}
+					}
+					//https://api.slack.com/methods/conversations.open
+					if (operation === 'open') {
+						const options = this.getNodeParameter('options', i);
+						const body: IDataObject = {};
+						if (options.channelId) {
+							body.channel = options.channelId as string;
+						}
+						if (options.returnIm) {
+							body.return_im = options.returnIm as boolean;
+						}
+						if (options.users) {
+							body.users = (options.users as string[]).join(',');
+						}
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.open',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.rename
+					if (operation === 'rename') {
+						const channel = this.getNodeParameter('channelId', i) as IDataObject;
+						const name = this.getNodeParameter('name', i) as IDataObject;
+						const body: IDataObject = {
+							channel,
+							name,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.rename',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.replies
+					if (operation === 'replies') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const ts = this.getNodeParameter('ts', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						qs.channel = channel;
+						qs.ts = ts;
+						if (filters.inclusive) {
+							qs.inclusive = filters.inclusive as boolean;
+						}
+						if (filters.latest) {
+							qs.latest = new Date(filters.latest as string).getTime() / 1000;
+						}
+						if (filters.oldest) {
+							qs.oldest = new Date(filters.oldest as string).getTime() / 1000;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'messages',
+								'GET',
+								'/conversations.replies',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(
+								this,
+								'GET',
+								'/conversations.replies',
+								{},
+								qs,
+							);
+							responseData = responseData.messages;
+						}
+					}
+					//https://api.slack.com/methods/conversations.setPurpose
+					if (operation === 'setPurpose') {
+						const channel = this.getNodeParameter('channelId', i) as IDataObject;
+						const purpose = this.getNodeParameter('purpose', i) as IDataObject;
+						const body: IDataObject = {
+							channel,
+							purpose,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.setPurpose',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.setTopic
+					if (operation === 'setTopic') {
+						const channel = this.getNodeParameter('channelId', i) as IDataObject;
+						const topic = this.getNodeParameter('topic', i) as IDataObject;
+						const body: IDataObject = {
+							channel,
+							topic,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.setTopic',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.unarchive
+					if (operation === 'unarchive') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.unarchive',
+							body,
+							qs,
+						);
+					}
+				}
+				if (resource === 'message') {
+					//https://api.slack.com/methods/chat.postMessage
+					if (['post', 'postEphemeral'].includes(operation)) {
+						const channel = this.getNodeParameter('channel', i) as string;
+						const { sendAsUser } = this.getNodeParameter('otherOptions', i) as IDataObject;
+						const text = this.getNodeParameter('text', i) as string;
+						const body: IDataObject = {
+							channel,
+							text,
+						};
+
+						let action = 'postMessage';
+
+						if (operation === 'postEphemeral') {
+							body.user = this.getNodeParameter('user', i) as string;
+							action = 'postEphemeral';
+						}
+
+						const jsonParameters = this.getNodeParameter('jsonParameters', i);
+
+						if (authentication === 'accessToken' && sendAsUser !== '') {
+							body.username = sendAsUser;
+						}
+
+						if (!jsonParameters) {
+							const attachments = this.getNodeParameter(
+								'attachments',
+								i,
+								[],
+							) as unknown as Attachment[];
+							const blocksUi = (this.getNodeParameter('blocksUi', i, []) as IDataObject)
+								.blocksValues as IDataObject[];
+
+							// The node does save the fields data differently than the API
+							// expects so fix the data befre we send the request
+							for (const attachment of attachments) {
+								if (attachment.fields !== undefined) {
+									if (attachment.fields.item !== undefined) {
+										// Move the field-content up
+										// @ts-ignore
+										attachment.fields = attachment.fields.item;
+									} else {
+										// If it does not have any items set remove it
+										// @ts-ignore
+										delete attachment.fields;
+									}
+								}
+							}
+							body.attachments = attachments;
+
+							if (blocksUi) {
+								const blocks: Block[] = [];
+								for (const blockUi of blocksUi) {
+									const block: Block = {};
+									const elements: Element[] = [];
+									block.block_id = blockUi.blockId as string;
+									block.type = blockUi.type as string;
+									if (block.type === 'actions') {
+										const elementsUi = (blockUi.elementsUi as IDataObject)
+											.elementsValues as IDataObject[];
+										if (elementsUi) {
+											for (const elementUi of elementsUi) {
+												const element: Element = {};
+												if (elementUi.actionId === '') {
+													throw new NodeOperationError(this.getNode(), 'Action ID must be set', {
+														itemIndex: i,
+													});
+												}
+												if (elementUi.text === '') {
+													throw new NodeOperationError(this.getNode(), 'Text must be set', {
+														itemIndex: i,
+													});
+												}
+												element.action_id = elementUi.actionId as string;
+												element.type = elementUi.type as string;
+												element.text = {
+													text: elementUi.text as string,
+													type: 'plain_text',
+													emoji: elementUi.emoji as boolean,
+												};
+												if (elementUi.url) {
+													element.url = elementUi.url as string;
+												}
+												if (elementUi.value) {
+													element.value = elementUi.value as string;
+												}
+												if (elementUi.style !== 'default') {
+													element.style = elementUi.style as string;
+												}
+												const confirmUi = (elementUi.confirmUi as IDataObject)
+													.confirmValue as IDataObject;
+												if (confirmUi) {
+													const confirm: Confirm = {};
+													const titleUi = (confirmUi.titleUi as IDataObject)
+														.titleValue as IDataObject;
+													const textUi = (confirmUi.textUi as IDataObject).textValue as IDataObject;
+													const confirmTextUi = (confirmUi.confirmTextUi as IDataObject)
+														.confirmValue as IDataObject;
+													const denyUi = (confirmUi.denyUi as IDataObject).denyValue as IDataObject;
+													const style = confirmUi.style as string;
+													if (titleUi) {
+														confirm.title = {
+															type: 'plain_text',
+															text: titleUi.text as string,
+															emoji: titleUi.emoji as boolean,
+														};
+													}
+													if (textUi) {
+														confirm.text = {
+															type: 'plain_text',
+															text: textUi.text as string,
+															emoji: textUi.emoji as boolean,
+														};
+													}
+													if (confirmTextUi) {
+														confirm.confirm = {
+															type: 'plain_text',
+															text: confirmTextUi.text as string,
+															emoji: confirmTextUi.emoji as boolean,
+														};
+													}
+													if (denyUi) {
+														confirm.deny = {
+															type: 'plain_text',
+															text: denyUi.text as string,
+															emoji: denyUi.emoji as boolean,
+														};
+													}
+													if (style !== 'default') {
+														confirm.style = style;
+													}
+													element.confirm = confirm;
+												}
+												elements.push(element);
+											}
+											block.elements = elements;
+										}
+									} else if (block.type === 'section') {
+										const textUi = (blockUi.textUi as IDataObject).textValue as IDataObject;
+										if (textUi) {
+											// eslint-disable-next-line @typescript-eslint/no-shadow
+											const text: Text = {};
+											if (textUi.type === 'plainText') {
+												text.type = 'plain_text';
+												text.emoji = textUi.emoji as boolean;
+											} else {
+												text.type = 'mrkdwn';
+												text.verbatim = textUi.verbatim as boolean;
+											}
+											text.text = textUi.text as string;
+											block.text = text;
+										} else {
+											throw new NodeOperationError(
+												this.getNode(),
+												'Property text must be defined',
+												{ itemIndex: i },
+											);
+										}
+										const fieldsUi = (blockUi.fieldsUi as IDataObject)
+											.fieldsValues as IDataObject[];
+										if (fieldsUi) {
+											const fields: Text[] = [];
+											for (const fieldUi of fieldsUi) {
+												const field: Text = {};
+												if (fieldUi.type === 'plainText') {
+													field.type = 'plain_text';
+													field.emoji = fieldUi.emoji as boolean;
+												} else {
+													field.type = 'mrkdwn';
+													field.verbatim = fieldUi.verbatim as boolean;
+												}
+												field.text = fieldUi.text as string;
+												fields.push(field);
+											}
+											// If not fields were added then it's not needed to send the property
+											if (fields.length > 0) {
+												block.fields = fields;
+											}
+										}
+										const accessoryUi = (blockUi.accessoryUi as IDataObject)
+											.accessoriesValues as IDataObject;
+										if (accessoryUi) {
+											const accessory: Element = {};
+											if (accessoryUi.type === 'button') {
+												accessory.type = 'button';
+												accessory.text = {
+													text: accessoryUi.text as string,
+													type: 'plain_text',
+													emoji: accessoryUi.emoji as boolean,
+												};
+												if (accessoryUi.url) {
+													accessory.url = accessoryUi.url as string;
+												}
+												if (accessoryUi.value) {
+													accessory.value = accessoryUi.value as string;
+												}
+												if (accessoryUi.style !== 'default') {
+													accessory.style = accessoryUi.style as string;
+												}
+												const confirmUi = (accessoryUi.confirmUi as IDataObject)
+													.confirmValue as IDataObject;
+												if (confirmUi) {
+													const confirm: Confirm = {};
+													const titleUi = (confirmUi.titleUi as IDataObject)
+														.titleValue as IDataObject;
+													// eslint-disable-next-line @typescript-eslint/no-shadow
+													const textUi = (confirmUi.textUi as IDataObject).textValue as IDataObject;
+													const confirmTextUi = (confirmUi.confirmTextUi as IDataObject)
+														.confirmValue as IDataObject;
+													const denyUi = (confirmUi.denyUi as IDataObject).denyValue as IDataObject;
+													const style = confirmUi.style as string;
+													if (titleUi) {
+														confirm.title = {
+															type: 'plain_text',
+															text: titleUi.text as string,
+															emoji: titleUi.emoji as boolean,
+														};
+													}
+													if (textUi) {
+														confirm.text = {
+															type: 'plain_text',
+															text: textUi.text as string,
+															emoji: textUi.emoji as boolean,
+														};
+													}
+													if (confirmTextUi) {
+														confirm.confirm = {
+															type: 'plain_text',
+															text: confirmTextUi.text as string,
+															emoji: confirmTextUi.emoji as boolean,
+														};
+													}
+													if (denyUi) {
+														confirm.deny = {
+															type: 'plain_text',
+															text: denyUi.text as string,
+															emoji: denyUi.emoji as boolean,
+														};
+													}
+													if (style !== 'default') {
+														confirm.style = style;
+													}
+													accessory.confirm = confirm;
+												}
+											}
+											block.accessory = accessory;
+										}
+									}
+									blocks.push(block);
+								}
+								body.blocks = blocks;
+							}
+						} else {
+							const attachmentsJson = this.getNodeParameter('attachmentsJson', i, '') as string;
+							const blocksJson = this.getNodeParameter('blocksJson', i, []) as string;
+							if (attachmentsJson !== '' && validateJSON(attachmentsJson) === undefined) {
+								throw new NodeOperationError(this.getNode(), 'Attachments it is not a valid json', {
+									itemIndex: i,
+								});
+							}
+							if (blocksJson !== '' && validateJSON(blocksJson) === undefined) {
+								throw new NodeOperationError(this.getNode(), 'Blocks it is not a valid json', {
+									itemIndex: i,
+								});
+							}
+							if (attachmentsJson !== '') {
+								body.attachments = attachmentsJson;
+							}
+							if (blocksJson !== '') {
+								body.blocks = blocksJson;
+							}
+						}
+
+						// Add all the other options to the request
+						const otherOptions = this.getNodeParameter('otherOptions', i) as IDataObject;
+						Object.assign(body, otherOptions);
+						responseData = await slackApiRequest.call(this, 'POST', `/chat.${action}`, body, qs);
+					}
+					//https://api.slack.com/methods/chat.update
+					if (operation === 'update') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const text = this.getNodeParameter('text', i) as string;
+						const ts = this.getNodeParameter('ts', i) as string;
+						const attachments = this.getNodeParameter(
+							'attachments',
+							i,
+							[],
+						) as unknown as IAttachment[];
+						const body: IDataObject = {
+							channel,
+							text,
+							ts,
+						};
+
+						// The node does save the fields data differently than the API
+						// expects so fix the data befre we send the request
+						for (const attachment of attachments) {
+							if (attachment.fields !== undefined) {
+								if (attachment.fields.item !== undefined) {
+									// Move the field-content up
+									// @ts-ignore
+									attachment.fields = attachment.fields.item;
+								} else {
+									// If it does not have any items set remove it
+									// @ts-ignore
+									delete attachment.fields;
+								}
+							}
+						}
+						body.attachments = attachments;
+
+						const jsonParameters = this.getNodeParameter('jsonParameters', i, false);
+						if (jsonParameters) {
+							const blocksJson = this.getNodeParameter('blocksJson', i, []) as string;
+
+							if (blocksJson !== '' && validateJSON(blocksJson) === undefined) {
+								throw new NodeOperationError(this.getNode(), 'Blocks it is not a valid json', {
+									itemIndex: i,
+								});
+							}
+							if (blocksJson !== '') {
+								body.blocks = blocksJson;
+							}
+
+							const attachmentsJson = this.getNodeParameter('attachmentsJson', i, '') as string;
+
+							if (attachmentsJson !== '' && validateJSON(attachmentsJson) === undefined) {
+								throw new NodeOperationError(this.getNode(), 'Attachments it is not a valid json', {
+									itemIndex: i,
+								});
+							}
+
+							if (attachmentsJson !== '') {
+								body.attachments = attachmentsJson;
+							}
+						}
+
+						// Add all the other options to the request
+						const updateFields = this.getNodeParameter('updateFields', i);
+						Object.assign(body, updateFields);
+						responseData = await slackApiRequest.call(this, 'POST', '/chat.update', body, qs);
+					}
+					//https://api.slack.com/methods/chat.delete
+					if (operation === 'delete') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const timestamp = this.getNodeParameter('timestamp', i) as string;
+						const body: IDataObject = {
+							channel,
+							ts: timestamp,
+						};
+						// Add all the other options to the request
+						responseData = await slackApiRequest.call(this, 'POST', '/chat.delete', body, qs);
+					}
+					//https://api.slack.com/methods/chat.getPermalink
+					if (operation === 'getPermalink') {
+						const channel = this.getNodeParameter('channelId', i) as string;
+						const timestamp = this.getNodeParameter('timestamp', i) as string;
+						// eslint-disable-next-line @typescript-eslint/no-shadow
+						const qs = {
+							channel,
+							message_ts: timestamp,
+						};
+						responseData = await slackApiRequest.call(this, 'GET', '/chat.getPermalink', {}, qs);
+					}
+				}
+				if (resource === 'reaction') {
+					const channel = this.getNodeParameter('channelId', i) as string;
+					const timestamp = this.getNodeParameter('timestamp', i) as string;
+					//https://api.slack.com/methods/reactions.add
+					if (operation === 'add') {
+						const name = this.getNodeParameter('name', i) as string;
+						const body: IDataObject = {
+							channel,
+							name,
+							timestamp,
+						};
+						responseData = await slackApiRequest.call(this, 'POST', '/reactions.add', body, qs);
+					}
+					//https://api.slack.com/methods/reactions.remove
+					if (operation === 'remove') {
+						const name = this.getNodeParameter('name', i) as string;
+						const body: IDataObject = {
+							channel,
+							name,
+							timestamp,
+						};
+						responseData = await slackApiRequest.call(this, 'POST', '/reactions.remove', body, qs);
+					}
+					//https://api.slack.com/methods/reactions.get
+					if (operation === 'get') {
+						qs.channel = channel;
+						qs.timestamp = timestamp;
+						responseData = await slackApiRequest.call(this, 'GET', '/reactions.get', {}, qs);
+					}
+				}
+				if (resource === 'star') {
+					//https://api.slack.com/methods/stars.add
+					if (operation === 'add') {
+						const options = this.getNodeParameter('options', i);
+						const body: IDataObject = {};
+						if (options.channelId) {
+							body.channel = options.channelId as string;
+						}
+						if (options.fileId) {
+							body.file = options.fileId as string;
+						}
+						if (options.fileComment) {
+							body.file_comment = options.fileComment as string;
+						}
+						if (options.timestamp) {
+							body.timestamp = options.timestamp as string;
+						}
+						responseData = await slackApiRequest.call(this, 'POST', '/stars.add', body, qs);
+					}
+					//https://api.slack.com/methods/stars.remove
+					if (operation === 'delete') {
+						const options = this.getNodeParameter('options', i);
+						const body: IDataObject = {};
+						if (options.channelId) {
+							body.channel = options.channelId as string;
+						}
+						if (options.fileId) {
+							body.file = options.fileId as string;
+						}
+						if (options.fileComment) {
+							body.file_comment = options.fileComment as string;
+						}
+						if (options.timestamp) {
+							body.timestamp = options.timestamp as string;
+						}
+						responseData = await slackApiRequest.call(this, 'POST', '/stars.remove', body, qs);
+					}
+					//https://api.slack.com/methods/stars.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'items',
+								'GET',
+								'/stars.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/stars.list', {}, qs);
+							responseData = responseData.items;
+						}
+					}
+				}
+				if (resource === 'file') {
+					//https://api.slack.com/methods/files.upload
+					if (operation === 'upload') {
+						const options = this.getNodeParameter('options', i);
+						const binaryData = this.getNodeParameter('binaryData', i);
+						const body: IDataObject = {};
+						if (options.channelIds) {
+							body.channels = (options.channelIds as string[]).join(',');
+						}
+						if (options.fileName) {
+							body.filename = options.fileName as string;
+						}
+						if (options.initialComment) {
+							body.initial_comment = options.initialComment as string;
+						}
+						if (options.threadTs) {
+							body.thread_ts = options.threadTs as string;
+						}
+						if (options.title) {
+							body.title = options.title as string;
+						}
+						if (binaryData) {
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							if (
+								items[i].binary === undefined ||
+								//@ts-ignore
+								items[i].binary[binaryPropertyName] === undefined
+							) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									{ itemIndex: i },
+								);
+							}
+							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+								i,
+								binaryPropertyName,
+							);
+							body.file = {
+								//@ts-ignore
+								value: binaryDataBuffer,
+								options: {
+									//@ts-ignore
+									filename: items[i].binary[binaryPropertyName].fileName,
+									//@ts-ignore
+									contentType: items[i].binary[binaryPropertyName].mimeType,
+								},
+							};
+							responseData = await slackApiRequest.call(
+								this,
+								'POST',
+								'/files.upload',
+								{},
+								qs,
+								{ 'Content-Type': 'multipart/form-data' },
+								{ formData: body },
+							);
+							responseData = responseData.file;
+						} else {
+							const fileContent = this.getNodeParameter('fileContent', i) as string;
+							body.content = fileContent;
+							responseData = await slackApiRequest.call(
+								this,
+								'POST',
+								'/files.upload',
+								body,
+								qs,
+								{ 'Content-Type': 'application/x-www-form-urlencoded' },
+								{ form: body },
+							);
+							responseData = responseData.file;
+						}
+					}
+					//https://api.slack.com/methods/files.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						if (filters.channelId) {
+							qs.channel = filters.channelId as string;
+						}
+						if (filters.showFilesHidden) {
+							qs.show_files_hidden_by_limit = filters.showFilesHidden as boolean;
+						}
+						if (filters.tsFrom) {
+							qs.ts_from = filters.tsFrom as string;
+						}
+						if (filters.tsTo) {
+							qs.ts_to = filters.tsTo as string;
+						}
+						if (filters.types) {
+							qs.types = (filters.types as string[]).join(',');
+						}
+						if (filters.userId) {
+							qs.user = filters.userId as string;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'files',
+								'GET',
+								'/files.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.count = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/files.list', {}, qs);
+							responseData = responseData.files;
+						}
+					}
+					//https://api.slack.com/methods/files.info
+					if (operation === 'get') {
+						const fileId = this.getNodeParameter('fileId', i) as string;
+						qs.file = fileId;
+						responseData = await slackApiRequest.call(this, 'GET', '/files.info', {}, qs);
+						responseData = responseData.file;
+					}
+				}
+				if (resource === 'user') {
+					//https://api.slack.com/methods/users.info
+					if (operation === 'info') {
+						qs.user = this.getNodeParameter('user', i) as string;
+						responseData = await slackApiRequest.call(this, 'GET', '/users.info', {}, qs);
+						responseData = responseData.user;
+					}
+					//https://api.slack.com/methods/users.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'members',
+								'GET',
+								'/users.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/users.list', {}, qs);
+							responseData = responseData.members;
+						}
+					}
+					//https://api.slack.com/methods/users.getPresence
+					if (operation === 'getPresence') {
+						qs.user = this.getNodeParameter('user', i) as string;
+						responseData = await slackApiRequest.call(this, 'GET', '/users.getPresence', {}, qs);
+					}
+				}
+				if (resource === 'userGroup') {
+					//https://api.slack.com/methods/usergroups.create
+					if (operation === 'create') {
+						const name = this.getNodeParameter('name', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {
+							name,
+						};
+
+						Object.assign(body, additionalFields);
+
+						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.create', body, qs);
+
+						responseData = responseData.usergroup;
+					}
+					//https://api.slack.com/methods/usergroups.enable
+					if (operation === 'enable') {
+						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {
+							usergroup: userGroupId,
+						};
+
+						Object.assign(body, additionalFields);
+
+						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.enable', body, qs);
+
+						responseData = responseData.usergroup;
+					}
+					//https://api.slack.com/methods/usergroups.disable
+					if (operation === 'disable') {
+						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const body: IDataObject = {
+							usergroup: userGroupId,
+						};
+
+						Object.assign(body, additionalFields);
+
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/usergroups.disable',
+							body,
+							qs,
+						);
+
+						responseData = responseData.usergroup;
+					}
+
+					//https://api.slack.com/methods/usergroups.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						// eslint-disable-next-line @typescript-eslint/no-shadow
+						const qs: IDataObject = {};
+
+						Object.assign(qs, additionalFields);
+
+						responseData = await slackApiRequest.call(this, 'GET', '/usergroups.list', {}, qs);
+
+						responseData = responseData.usergroups;
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i);
+
+							responseData = responseData.slice(0, limit);
+						}
+					}
+
+					//https://api.slack.com/methods/usergroups.update
+					if (operation === 'update') {
+						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
+
+						const updateFields = this.getNodeParameter('updateFields', i);
+
+						const body: IDataObject = {
+							usergroup: userGroupId,
+						};
+
+						Object.assign(body, updateFields);
+
+						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.update', body, qs);
+
+						responseData = responseData.usergroup;
+					}
+				}
+				if (resource === 'userProfile') {
+					//https://api.slack.com/methods/users.profile.set
+					if (operation === 'update') {
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						const timezone = this.getTimezone();
+
+						const body: IDataObject = {};
+
+						Object.assign(body, additionalFields);
+
+						if (body.status_expiration === undefined) {
+							body.status_expiration = 0;
+						} else {
+							body.status_expiration = moment.tz(body.status_expiration as string, timezone).unix();
+						}
+
+						if (body.customFieldUi) {
+							const customFields = (body.customFieldUi as IDataObject)
+								.customFieldValues as IDataObject[];
+
+							body.fields = {};
+
+							for (const customField of customFields) {
+								//@ts-ignore
+								body.fields[customField.id] = {
+									value: customField.value,
+									alt: customField.alt,
+								};
+							}
+						}
+
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/users.profile.set',
+							{ profile: body },
+							qs,
+						);
+
+						responseData = responseData.profile;
+					}
+					//https://api.slack.com/methods/users.profile.get
+					if (operation === 'get') {
+						const additionalFields = this.getNodeParameter('additionalFields', i);
+
+						// eslint-disable-next-line @typescript-eslint/no-shadow
+						const qs: IDataObject = {};
+
+						Object.assign(qs, additionalFields);
+
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/users.profile.get',
+							undefined,
+							qs,
+						);
+
+						responseData = responseData.profile;
+					}
+				}
+
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: (error as JsonObject).message } });
+					continue;
+				}
+				throw error;
+			}
+		}
+		return this.prepareOutputData(returnData);
+	}
+}
diff --git a/packages/nodes-base/nodes/Slack/StarDescription.ts b/packages/nodes-base/nodes/Slack/V1/StarDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/StarDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/StarDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/UserDescription.ts b/packages/nodes-base/nodes/Slack/V1/UserDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/UserDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/UserDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/UserGroupDescription.ts b/packages/nodes-base/nodes/Slack/V1/UserGroupDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/UserGroupDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/UserGroupDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/UserProfileDescription.ts b/packages/nodes-base/nodes/Slack/V1/UserProfileDescription.ts
similarity index 100%
rename from packages/nodes-base/nodes/Slack/UserProfileDescription.ts
rename to packages/nodes-base/nodes/Slack/V1/UserProfileDescription.ts
diff --git a/packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts b/packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts
new file mode 100644
index 00000000000000..2f74d8e379253c
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/ChannelDescription.ts
@@ -0,0 +1,1495 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const channelOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+			},
+		},
+		options: [
+			{
+				name: 'Archive',
+				value: 'archive',
+				description: 'Archives a conversation',
+				action: 'Archive a channel',
+			},
+			{
+				name: 'Close',
+				value: 'close',
+				description: 'Closes a direct message or multi-person direct message',
+				action: 'Close a channel',
+			},
+			{
+				name: 'Create',
+				value: 'create',
+				description: 'Initiates a public or private channel-based conversation',
+				action: 'Create a channel',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get information about a channel',
+				action: 'Get a channel',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many channels in a Slack team',
+				action: 'Get many channels',
+			},
+			{
+				name: 'History',
+				value: 'history',
+				description: "Get a conversation's history of messages and events",
+				action: 'Get the history of a channel',
+			},
+			{
+				name: 'Invite',
+				value: 'invite',
+				description: 'Invite a user to a channel',
+				action: 'Invite a user to a channel',
+			},
+			{
+				name: 'Join',
+				value: 'join',
+				description: 'Joins an existing conversation',
+				action: 'Join a channel',
+			},
+			{
+				name: 'Kick',
+				value: 'kick',
+				description: 'Removes a user from a channel',
+				action: 'Kick a user from a channel',
+			},
+			{
+				name: 'Leave',
+				value: 'leave',
+				description: 'Leaves a conversation',
+				action: 'Leave a channel',
+			},
+			{
+				name: 'Member',
+				value: 'member',
+				description: 'List members of a conversation',
+				action: 'Get members of a channel',
+			},
+			{
+				name: 'Open',
+				value: 'open',
+				description: 'Opens or resumes a direct message or multi-person direct message',
+				action: 'Open a channel',
+			},
+			{
+				name: 'Rename',
+				value: 'rename',
+				description: 'Renames a conversation',
+				action: 'Rename a channel',
+			},
+			{
+				name: 'Replies',
+				value: 'replies',
+				description: 'Get a thread of messages posted to a channel',
+				action: 'Get a thread of messages posted to a channel',
+			},
+			{
+				name: 'Set Purpose',
+				value: 'setPurpose',
+				description: 'Sets the purpose for a conversation',
+				action: 'Set the purpose of a channel',
+			},
+			{
+				name: 'Set Topic',
+				value: 'setTopic',
+				description: 'Sets the topic for a conversation',
+				action: 'Set the topic of a channel',
+			},
+			{
+				name: 'Unarchive',
+				value: 'unarchive',
+				description: 'Unarchives a conversation',
+				action: 'Unarchive a channel',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const channelFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:archive                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		description: 'The Slack channel to archive',
+		displayOptions: {
+			show: {
+				operation: ['archive'],
+				resource: ['channel'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:close                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['close'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to close',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:create                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'string',
+		default: '',
+		placeholder: 'Channel name',
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Channel Visibility',
+		name: 'channelVisibility',
+		type: 'options',
+		default: 'public',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['channel'],
+			},
+		},
+		options: [
+			{
+				name: 'Public Channel',
+				value: 'public',
+			},
+			{
+				name: 'Private Channel',
+				value: 'private',
+			},
+		],
+		description:
+			'Whether to create a Public or a Private Slack channel. <a href="https://slack.com/help/articles/360017938993-What-is-a-channel">More info</a>.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:invite                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['invite'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to invite to',
+	},
+	{
+		displayName: 'User Names or IDs',
+		name: 'userIds',
+		type: 'multiOptions',
+		typeOptions: {
+			loadOptionsMethod: 'getUsers',
+		},
+		default: [],
+		displayOptions: {
+			show: {
+				operation: ['invite'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description:
+			'The ID of the user to invite into channel. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  channel:get                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['get'],
+				resource: ['channel'],
+			},
+		},
+		description: 'The Slack channel to get',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['get'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Num of Members',
+				name: 'includeNumMembers',
+				type: 'boolean',
+				default: false,
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  channel:kick                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['kick'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to kick the user from',
+	},
+	{
+		displayName: 'User Name or ID',
+		name: 'userId',
+		type: 'options',
+		description:
+			'Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+		typeOptions: {
+			loadOptionsMethod: 'getUsers',
+		},
+		displayOptions: {
+			show: {
+				operation: ['kick'],
+				resource: ['channel'],
+			},
+		},
+		default: '',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  channel:join                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		description: 'The Slack channel to join',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['join'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:getAll                             */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Exclude Archived',
+				name: 'excludeArchived',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to exclude archived channels from the list',
+			},
+			{
+				displayName: 'Types',
+				name: 'types',
+				type: 'multiOptions',
+				options: [
+					{
+						name: 'Public Channel',
+						value: 'public_channel',
+					},
+					{
+						name: 'Private Channel',
+						value: 'private_channel',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'mpim',
+						value: 'mpim',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'im',
+						value: 'im',
+					},
+				],
+				default: ['public_channel'],
+				description: 'Mix and match channel types',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:history                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['history'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to get the history from',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['history'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['history'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['history'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Inclusive',
+				name: 'inclusive',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to include messages with latest or oldest timestamp in results only when either timestamp is specified',
+			},
+			{
+				displayName: 'Latest',
+				name: 'latest',
+				type: 'dateTime',
+				default: '',
+				description: 'End of time range of messages to include in results',
+			},
+			{
+				displayName: 'Oldest',
+				name: 'oldest',
+				type: 'dateTime',
+				default: '',
+				description: 'Start of time range of messages to include in results',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:leave                               */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['leave'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to leave from',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                  channel:member                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		description: 'The Slack channel to get the members from',
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['member'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['member'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		typeOptions: {
+			minValue: 1,
+		},
+		description: 'Max number of results to return',
+		default: 100,
+		placeholder: 'Limit',
+		displayOptions: {
+			show: {
+				operation: ['member'],
+				resource: ['channel'],
+				returnAll: [false],
+			},
+		},
+	},
+	{
+		displayName: 'Resolve Data',
+		name: 'resolveData',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['member'],
+			},
+		},
+		description:
+			'Whether to resolve the data automatically. By default the response only contain the ID to resource.',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:open                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['open'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Channel ID',
+				name: 'channelId',
+				type: 'string',
+				default: '',
+				description:
+					"Resume a conversation by supplying an im or mpim's ID. Or provide the users field instead.",
+			},
+			{
+				displayName: 'Return IM',
+				name: 'returnIm',
+				type: 'boolean',
+				default: false,
+				description: 'Whether you want the full IM channel definition in the response',
+			},
+			{
+				displayName: 'User Names or IDs',
+				name: 'users',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				default: [],
+				description:
+					'If only one user is included, this creates a 1:1 DM. The ordering of the users is preserved whenever a multi-person direct message is returned. Supply a channel when not supplying users. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:rename                              */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['rename'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to rename',
+	},
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: ['rename'],
+				resource: ['channel'],
+			},
+		},
+		default: '',
+		required: true,
+		description: 'New name for conversation',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 channel:replies                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['replies'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to replies to',
+	},
+	{
+		displayName: 'Message Timestamp',
+		name: 'ts',
+		type: 'number',
+		default: undefined,
+		displayOptions: {
+			show: {
+				operation: ['replies'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'Timestamp of the message to reply',
+		placeholder: '1663233118.856619',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['replies'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['replies'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['channel'],
+				operation: ['replies'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Inclusive',
+				name: 'inclusive',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to include messages with latest or oldest timestamp in results only when either timestamp is specified',
+			},
+			{
+				displayName: 'Latest',
+				name: 'latest',
+				type: 'string',
+				default: '',
+				description: 'End of time range of messages to include in results',
+			},
+			{
+				displayName: 'Oldest',
+				name: 'oldest',
+				type: 'string',
+				default: '',
+				description: 'Start of time range of messages to include in results',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:setPurpose                          */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['setPurpose'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to set the purpose of',
+	},
+	{
+		displayName: 'Purpose',
+		name: 'purpose',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: ['setPurpose'],
+				resource: ['channel'],
+			},
+		},
+		default: '',
+		required: true,
+		description: 'A new, specialer purpose',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:setTopic                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['setTopic'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to set the topic of',
+	},
+	{
+		displayName: 'Topic',
+		name: 'topic',
+		type: 'string',
+		displayOptions: {
+			show: {
+				operation: ['setTopic'],
+				resource: ['channel'],
+			},
+		},
+		default: '',
+		required: true,
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                channel:unarchive                           */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['unarchive'],
+				resource: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to unarchive',
+	},
+];
diff --git a/packages/nodes-base/nodes/Slack/V2/FileDescription.ts b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
new file mode 100644
index 00000000000000..fdd1aaf9beec17
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/FileDescription.ts
@@ -0,0 +1,286 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const fileOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['file'],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'get',
+				action: 'Get a file',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get & filters team files',
+				action: 'Get many files',
+			},
+			{
+				name: 'Upload',
+				value: 'upload',
+				description: 'Create or upload an existing file',
+				action: 'Upload a file',
+			},
+		],
+		default: 'upload',
+	},
+];
+
+export const fileFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                file:upload                                 */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Binary Data',
+		name: 'binaryData',
+		type: 'boolean',
+		default: false,
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+			},
+		},
+		description: 'Whether the data to upload should be taken from binary field',
+	},
+	{
+		displayName: 'File Content',
+		name: 'fileContent',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+				binaryData: [false],
+			},
+		},
+		placeholder: '',
+	},
+	{
+		displayName: 'Binary Property',
+		name: 'binaryPropertyName',
+		type: 'string',
+		default: 'data',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+				binaryData: [true],
+			},
+		},
+		placeholder: '',
+		description: 'Name of the binary property which contains the data for the file to be uploaded',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['upload'],
+				resource: ['file'],
+			},
+		},
+		default: {},
+		description: 'Other options to set',
+		placeholder: 'Add options',
+		options: [
+			{
+				displayName: 'Channel Names or IDs',
+				name: 'channelIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getChannels',
+				},
+				default: [],
+				description:
+					'The channels to send the file to. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'File Name',
+				name: 'fileName',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Initial Comment',
+				name: 'initialComment',
+				type: 'string',
+				default: '',
+				description: 'The message text introducing the file in specified channels',
+			},
+			{
+				displayName: 'Thread Timestamp',
+				name: 'threadTs',
+				type: 'string',
+				default: '',
+				description:
+					"Provide another message's Timestamp value to upload this file as a reply. Never use a reply's Timestamp value; use its parent instead.",
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				default: '',
+			},
+		],
+	},
+
+	/* ----------------------------------------------------------------------- */
+	/*                                 file:getAll                             */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Filters',
+		name: 'filters',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['file'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Field',
+		options: [
+			{
+				displayName: 'Channel Name or ID',
+				name: 'channelId',
+				type: 'options',
+				default: '',
+				typeOptions: {
+					loadOptionsMethod: 'getChannels',
+				},
+				description:
+					'Channel containing the file to be listed. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Show Files Hidden By Limit',
+				name: 'showFilesHidden',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to show truncated file info for files hidden due to being too old, and the team who owns the file being over the file limit',
+			},
+			{
+				displayName: 'Message Timestamp From',
+				name: 'tsFrom',
+				type: 'string',
+				default: '',
+				description: 'Filter files created after this timestamp (inclusive)',
+			},
+			{
+				displayName: 'Message Timestamp To',
+				name: 'tsTo',
+				type: 'string',
+				default: '',
+				description: 'Filter files created before this timestamp (inclusive)',
+			},
+			{
+				displayName: 'Types',
+				name: 'types',
+				type: 'multiOptions',
+				options: [
+					{
+						name: 'All',
+						value: 'all',
+					},
+					{
+						name: 'Google Docs',
+						value: 'gdocs',
+					},
+					{
+						name: 'Images',
+						value: 'images',
+					},
+					{
+						name: 'PDFs',
+						value: 'pdfs',
+					},
+					{
+						name: 'Snippets',
+						value: 'snippets',
+					},
+					{
+						name: 'Spaces',
+						value: 'spaces',
+					},
+					{
+						// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+						name: 'zips',
+						value: 'zips',
+					},
+				],
+				default: ['all'],
+				description: 'Filter files by type',
+			},
+			{
+				displayName: 'User Name or ID',
+				name: 'userId',
+				type: 'options',
+				default: '',
+				typeOptions: {
+					loadOptionsMethod: 'getUsers',
+				},
+				description:
+					'Filter files created by a single user. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+		],
+	},
+
+	/* ----------------------------------------------------------------------- */
+	/*                                 file:get                                */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'File ID',
+		name: 'fileId',
+		type: 'string',
+		displayOptions: {
+			show: {
+				resource: ['file'],
+				operation: ['get'],
+			},
+		},
+		default: '',
+	},
+];
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
new file mode 100644
index 00000000000000..02cb92d7ea2fb6
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -0,0 +1,137 @@
+import type { OptionsWithUri } from 'request';
+import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
+import type { IDataObject, IOAuth2Options } from 'n8n-workflow';
+
+import { NodeOperationError } from 'n8n-workflow';
+
+import _ from 'lodash';
+
+export async function slackApiRequest(
+	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
+	method: string,
+	resource: string,
+	body: object = {},
+	query: object = {},
+	headers: {} | undefined = undefined,
+	option: {} = {},
+	// tslint:disable-next-line:no-any
+): Promise<any> {
+	const authenticationMethod = this.getNodeParameter('authentication', 0, 'accessToken') as string;
+	let options: OptionsWithUri = {
+		method,
+		headers: headers ?? {
+			'Content-Type': 'application/json; charset=utf-8',
+		},
+		body,
+		qs: query,
+		uri: `https://slack.com/api${resource}`,
+		json: true,
+	};
+	options = Object.assign({}, options, option);
+	if (Object.keys(body).length === 0) {
+		delete options.body;
+	}
+	if (Object.keys(query).length === 0) {
+		delete options.qs;
+	}
+
+	const oAuth2Options: IOAuth2Options = {
+		tokenType: 'Bearer',
+		property: 'authed_user.access_token',
+	};
+
+	const credentialType = authenticationMethod === 'accessToken' ? 'slackApi' : 'slackOAuth2Api';
+	const response = await this.helpers.requestWithAuthentication.call(
+		this,
+		credentialType,
+		options,
+		{
+			oauth2: oAuth2Options,
+		},
+	);
+
+	if (response.ok === false) {
+		if (response.error === 'paid_teams_only') {
+			throw new NodeOperationError(
+				this.getNode(),
+				`Your current Slack plan does not include the resource '${
+					this.getNodeParameter('resource', 0) as string
+				}'`,
+				{
+					description:
+						'Hint: Upgrate to the Slack plan that includes the funcionality you want to use.',
+				},
+			);
+		} else if (response.error === 'missing_scope') {
+			throw new NodeOperationError(
+				this.getNode(),
+				'Your Slack credential is missing required Oauth Scopes',
+				{
+					description: `Add the following scope(s) to your Slack App: ${response.needed}`,
+				},
+			);
+		}
+		throw new NodeOperationError(
+			this.getNode(),
+			'Slack error response: ' + JSON.stringify(response.error),
+		);
+	}
+	if (response.ts !== undefined) {
+		Object.assign(response, { message_timestamp: response.ts });
+		delete response.ts;
+	}
+	return response;
+}
+
+export async function slackApiRequestAllItems(
+	this: IExecuteFunctions | ILoadOptionsFunctions,
+	propertyName: string,
+	method: string,
+	endpoint: string,
+	// tslint:disable-next-line:no-any
+	body: any = {},
+	query: IDataObject = {},
+	// tslint:disable-next-line:no-any
+): Promise<any> {
+	const returnData: IDataObject[] = [];
+	let responseData;
+	query.page = 1;
+	//if the endpoint uses legacy pagination use count
+	//https://api.slack.com/docs/pagination#classic
+	if (endpoint.includes('files.list')) {
+		query.count = 100;
+	} else {
+		query.limit = 100;
+	}
+	do {
+		responseData = await slackApiRequest.call(this, method, endpoint, body, query);
+		query.cursor = _.get(responseData, 'response_metadata.next_cursor');
+		query.page++;
+		returnData.push.apply(
+			returnData,
+			responseData[propertyName].matches ?? responseData[propertyName],
+		);
+	} while (
+		(responseData.response_metadata?.next_cursor !== undefined &&
+			responseData.response_metadata.next_cursor !== '' &&
+			responseData.response_metadata.next_cursor !== null) ||
+		(responseData.paging?.pages !== undefined &&
+			responseData.paging.page !== undefined &&
+			responseData.paging.page < responseData.paging.pages) ||
+		(responseData[propertyName].paging?.pages !== undefined &&
+			responseData[propertyName].paging.page !== undefined &&
+			responseData[propertyName].paging.page < responseData[propertyName].paging.pages)
+	);
+	return returnData;
+}
+
+// tslint:disable-next-line:no-any
+export function validateJSON(json: string | undefined): any {
+	let result;
+	try {
+		result = JSON.parse(json!);
+	} catch (exception) {
+		result = undefined;
+	}
+	return result;
+}
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
new file mode 100644
index 00000000000000..a948941be6f9b4
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -0,0 +1,1138 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const messageOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+			},
+		},
+		options: [
+			{
+				name: 'Delete',
+				value: 'delete',
+				action: 'Delete a message',
+			},
+			{
+				name: 'Get Permalink',
+				value: 'getPermalink',
+				action: 'Get a message permalink',
+			},
+			{
+				name: 'Search',
+				value: 'search',
+				action: 'Search for messages',
+			},
+			{
+				name: 'Send',
+				value: 'post',
+				action: 'Send a message',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update a message',
+			},
+		],
+		default: 'post',
+	},
+];
+
+export const messageFields: INodeProperties[] = [
+	/* ----------------------------------------------------------------------- */
+	/*                                 message:getPermalink
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		description: 'The Slack channel to get the message permalink from',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['getPermalink'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+	},
+	{
+		displayName: 'Message Timestamp',
+		name: 'timestamp',
+		required: true,
+		type: 'number',
+		default: undefined,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['getPermalink'],
+			},
+		},
+		description: 'Timestamp of the message to message',
+		placeholder: '1663233118.856619',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                          message:post                                      */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Send Message To',
+		name: 'select',
+		type: 'options',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['post'],
+			},
+		},
+		options: [
+			{
+				name: 'Channel',
+				value: 'channel',
+			},
+			{
+				name: 'User',
+				value: 'user',
+			},
+		],
+		default: '',
+		placeholder: 'Select...',
+	},
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+				select: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to send to',
+	},
+	{
+		displayName: 'User',
+		name: 'user',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a user...',
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+				select: ['user'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a user...',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack User ID',
+						},
+					},
+				],
+				placeholder: 'U123AB45JGM',
+			},
+			{
+				displayName: 'By username',
+				name: 'username',
+				type: 'string',
+				placeholder: '@username',
+			},
+		],
+	},
+	{
+		displayName: 'Message Type',
+		name: 'messageType',
+		type: 'options',
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+			},
+		},
+		description:
+			'Whether to send a simple text message, or use Slack’s Blocks UI builder for more sophisticated messages that include form fields, sections and more',
+		options: [
+			{
+				name: 'Simple Text Message',
+				value: 'text',
+				description: 'Supports basic Markdown',
+			},
+			{
+				name: 'Blocks',
+				value: 'block',
+				description:
+					"Combine text, buttons, form elements, dividers and more in Slack 's visual builder",
+			},
+			{
+				name: 'Attachments',
+				value: 'attachment',
+			},
+		],
+		default: 'text',
+	},
+	{
+		displayName: 'Message Text',
+		name: 'text',
+		type: 'string',
+		default: '',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+				messageType: ['text'],
+			},
+		},
+		description:
+			'The message text to post. Supports <a href="https://api.slack.com/reference/surfaces/formatting">markdown</a> by default - this can be disabled in "Options".',
+	},
+	{
+		displayName: 'Blocks',
+		name: 'blocksUi',
+		type: 'string',
+		required: true,
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+				messageType: ['block'],
+			},
+		},
+		typeOptions: {
+			rows: 3,
+		},
+		description:
+			"Enter the JSON output from Slack's visual Block Kit Builder here. You can then use expressions to add variable content to your blocks. To create blocks, use <a target='_blank' href='https://app.slack.com/block-kit-builder'>Slack's Block Kit Builder</a>",
+		hint: "To create blocks, use <a target='_blank' href='https://app.slack.com/block-kit-builder'>Slack's Block Kit Builder</a>",
+		default: '',
+	},
+	{
+		displayName: 'This is a legacy Slack feature. Slack advises to instead use Blocks.',
+		name: 'noticeAttachments',
+		type: 'notice',
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+				messageType: ['attachment'],
+			},
+		},
+		default: '',
+	},
+	{
+		displayName: 'Attachments',
+		name: 'attachments',
+		type: 'collection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add attachment',
+		},
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+				messageType: ['attachment'],
+			},
+		},
+		default: {}, // TODO: Remove comment: has to make default array for the main property, check where that happens in UI
+		placeholder: 'Add attachment item',
+		options: [
+			{
+				displayName: 'Fallback Text',
+				name: 'fallback',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'Required plain-text summary of the attachment',
+			},
+			{
+				displayName: 'Text',
+				name: 'text',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Title',
+				name: 'title',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Title Link',
+				name: 'title_link',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Color',
+				name: 'color',
+				type: 'color',
+				default: '#ff0000',
+				description: 'Color of the line left of text',
+			},
+			{
+				displayName: 'Pretext',
+				name: 'pretext',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'Text which appears before the message block',
+			},
+			{
+				displayName: 'Author Name',
+				name: 'author_name',
+				type: 'string',
+				default: '',
+				description: 'Name that should appear',
+			},
+			{
+				displayName: 'Author Link',
+				name: 'author_link',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Author Icon',
+				name: 'author_icon',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'Icon which should appear for the user',
+			},
+			{
+				displayName: 'Image URL',
+				name: 'image_url',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Thumbnail URL',
+				name: 'thumb_url',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+			},
+			{
+				displayName: 'Footer',
+				name: 'footer',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'Text of footer to add',
+			},
+			{
+				displayName: 'Footer Icon',
+				name: 'footer_icon',
+				type: 'string',
+				typeOptions: {
+					alwaysOpenEditWindow: true,
+				},
+				default: '',
+				description: 'Icon which should appear next to footer',
+			},
+			{
+				displayName: 'Message Timestamp',
+				name: 'ts',
+				type: 'number',
+				default: 0,
+				description: 'Timestamp of the message to post',
+				placeholder: '1663233118.856619',
+			},
+			{
+				displayName: 'Fields',
+				name: 'fields',
+				placeholder: 'Add Fields',
+				description: 'Fields to add to message',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'item',
+						displayName: 'Item',
+						values: [
+							{
+								displayName: 'Title',
+								name: 'title',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+							},
+							{
+								displayName: 'Short',
+								name: 'short',
+								type: 'boolean',
+								default: true,
+								description: 'Whether items can be displayed next to each other',
+							},
+						],
+					},
+				],
+			},
+		],
+	},
+	{
+		displayName: 'Options',
+		name: 'otherOptions',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['post'],
+				resource: ['message'],
+			},
+		},
+		default: {},
+		description: 'Other options to set',
+		placeholder: 'Add options',
+		options: [
+			{
+				displayName: 'Custom Bot Profile Photo',
+				name: 'botProfile',
+				type: 'fixedCollection',
+				default: {
+					imageValues: [
+						{
+							profilePhotoType: '',
+						},
+					],
+				},
+				description:
+					'Set an image or an emoji as the Profile Photo (avatar) of the bot sending the message. Will not be used if sending message as a user.',
+				options: [
+					{
+						name: 'imageValues',
+						displayName: 'Add Bot Profile Photo',
+						values: [
+							{
+								displayName: 'Profile Photo Type',
+								name: 'profilePhotoType',
+								type: 'options',
+								options: [
+									{
+										name: 'Image URL',
+										value: 'image',
+									},
+									{
+										name: 'Emoji Code',
+										value: 'emoji',
+									},
+								],
+								default: '',
+								placeholder: 'Select a type…',
+							},
+							{
+								displayName: 'Emoji Code',
+								name: 'icon_emoji',
+								type: 'string',
+								default: '',
+								displayOptions: {
+									show: {
+										profilePhotoType: ['emoji'],
+									},
+								},
+								description:
+									'Only used if sending message as a bot. Use emoji codes like +1, not an actual emoji like 👍. <a target="_blank" href=" https://www.webfx.com/tools/emoji-cheat-sheet/">List of common emoji codes</a>',
+							},
+							{
+								displayName: 'Image URL',
+								name: 'icon_url',
+								type: 'string',
+								default: '',
+								displayOptions: {
+									show: {
+										profilePhotoType: ['image'],
+									},
+								},
+								description: 'Only used if sending message as a bot',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Link User and Channel Names',
+				name: 'link_names',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to turn @users and #channels in message text into clickable links',
+			},
+			{
+				displayName: 'Reply to a Message',
+				name: 'thread_ts',
+				type: 'fixedCollection',
+				default: {},
+				placeholder: 'Reply to a Message',
+				description: "Provide another message's Timestamp value to make this message a reply",
+				options: [
+					{
+						displayName: 'Reply to a Message',
+						name: 'replyValues',
+						values: [
+							{
+								displayName: 'Message Timestamp to Reply To',
+								name: 'thread_ts',
+								type: 'number',
+								default: undefined,
+								placeholder: '1663233118.856619',
+								description:
+									'Message timestamps are included in output data of Slack nodes, abbreviated to ts',
+							},
+							{
+								displayName: 'Reply to Thread',
+								name: 'reply_broadcast',
+								type: 'boolean',
+								default: false,
+								description:
+									'Whether the reply should be made visible to everyone in the channel or conversation',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Use Markdown?',
+				name: 'mrkdwn',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to use Slack Markdown to format the message',
+			},
+			{
+				displayName: 'Unfurl Links',
+				name: 'unfurl_links',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to enable unfurling of primarily text-based content',
+			},
+			{
+				displayName: 'Unfurl Media',
+				name: 'unfurl_media',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to disable unfurling of media content',
+			},
+			{
+				displayName: 'Send as Ephemeral Message',
+				name: 'ephemeral',
+				type: 'fixedCollection',
+				default: {},
+				displayOptions: {
+					show: {
+						'/select': ['channel'],
+					},
+				},
+				placeholder: 'Send as Ephemeral Message',
+				description: 'Whether to send a temporary, ephemeral message',
+				options: [
+					{
+						displayName: 'Send as Ephemeral Message',
+						name: 'ephemeralValues',
+						values: [
+							{
+								displayName: 'User to Send',
+								name: 'user',
+								type: 'resourceLocator',
+								default: { mode: 'list', value: '' },
+								placeholder: 'Select a user...',
+								modes: [
+									{
+										displayName: 'From List',
+										name: 'list',
+										type: 'list',
+										placeholder: 'Select a user...',
+										typeOptions: {
+											searchListMethod: 'getUsers',
+											searchable: true,
+										},
+									},
+									{
+										displayName: 'By ID',
+										name: 'id',
+										type: 'string',
+										validation: [
+											{
+												type: 'regex',
+												properties: {
+													regex: '[a-zA-Z0-9]{2,}',
+													errorMessage: 'Not a valid Slack User ID',
+												},
+											},
+										],
+										placeholder: 'U123AB45JGM',
+									},
+								],
+							},
+							{
+								displayName: 'Send as Ephemeral Message',
+								name: 'ephemeral',
+								type: 'boolean',
+								default: true,
+								description: 'Whether to send a temporary, ephemeral message',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Send as Ephemeral Message',
+				name: 'ephemeral',
+				type: 'boolean',
+				displayOptions: {
+					show: {
+						'/select': ['user'],
+					},
+				},
+				default: true,
+				description: 'Whether to send a temporary, ephemeral message',
+			},
+			{
+				displayName: 'Send as User',
+				name: 'sendAsUser',
+				type: 'string',
+				displayOptions: {
+					show: {
+						'/authentication': ['accessToken'],
+					},
+				},
+				default: '',
+				description:
+					'The message will be sent from this username (i.e. as if this individual sent the message). Add chat:write.customize scope on Slack API',
+			},
+		],
+	},
+
+	/* ----------------------------------------------------------------------- */
+	/*                                 message:update                          */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['update'],
+			},
+		},
+		description: 'The Slack channel to update the message from',
+	},
+	{
+		displayName: 'Message Timestamp',
+		name: 'ts',
+		required: true,
+		type: 'number',
+		default: undefined,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['update'],
+			},
+		},
+		description: 'Timestamp of the message to update',
+		placeholder: '1663233118.856619',
+	},
+	{
+		displayName: 'Message Text',
+		name: 'text',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['update'],
+			},
+		},
+		description:
+			'The message text to update. Supports <a href="https://api.slack.com/reference/surfaces/formatting/">markdown</a> by default - this can be disabled in "Options".',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Link User and Channel Names',
+				name: 'link_names',
+				type: 'boolean',
+				default: false,
+				description: 'Whether to find and link channel names and usernames',
+			},
+			{
+				displayName: 'Parse',
+				name: 'parse',
+				type: 'options',
+				options: [
+					{
+						name: 'Client',
+						value: 'client',
+					},
+					{
+						name: 'Full',
+						value: 'full',
+					},
+					{
+						name: 'None',
+						value: 'none',
+					},
+				],
+				default: 'client',
+				description: 'Change how messages are treated',
+			},
+		],
+	},
+
+	/* ----------------------------------------------------------------------- */
+	/*                                 message:delete
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'Delete Message From',
+		name: 'select',
+		type: 'options',
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['delete'],
+			},
+		},
+		options: [
+			{
+				name: 'Channel',
+				value: 'channel',
+			},
+			{
+				name: 'User',
+				value: 'user',
+			},
+		],
+		default: '',
+		placeholder: 'Select...',
+	},
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		displayOptions: {
+			show: {
+				operation: ['delete'],
+				resource: ['message'],
+				select: ['channel'],
+			},
+		},
+		required: true,
+		description: 'The Slack channel to delete the message from',
+	},
+	{
+		displayName: 'User',
+		name: 'user',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a user...',
+		displayOptions: {
+			show: {
+				operation: ['delete'],
+				resource: ['message'],
+				select: ['user'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a user...',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack User ID',
+						},
+					},
+				],
+				placeholder: 'U123AB45JGM',
+			},
+		],
+	},
+	{
+		displayName: 'Message Timestamp',
+		name: 'timestamp',
+		required: true,
+		type: 'number',
+		default: undefined,
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['delete'],
+			},
+		},
+		description: 'Timestamp of the message to delete',
+		placeholder: '1663233118.856619',
+	},
+
+	/* ----------------------------------------------------------------------- */
+	/*                                 message:search
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'Search Query',
+		name: 'query',
+		type: 'string',
+		description: 'The text to search for within messages',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['search'],
+			},
+		},
+	},
+	{
+		displayName: 'Sort By',
+		name: 'sort',
+		description: 'How search results should be sorted. You can sort by.',
+		type: 'options',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				name: 'Newest',
+				value: 'desc',
+			},
+			{
+				name: 'Oldest',
+				value: 'asc',
+			},
+			{
+				name: 'Relevance Score',
+				value: 'relevance',
+			},
+		],
+		default: 'desc',
+	},
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['search'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['search'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 50,
+		},
+		default: 25,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['message'],
+				operation: ['search'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Search in Channel',
+				name: 'searchChannel',
+				type: 'multiOptions',
+				description:
+					'Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>',
+				default: [],
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					loadOptionsMethod: 'getChannelsName',
+				},
+			},
+		],
+		default: {},
+	},
+];
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageInterface.ts b/packages/nodes-base/nodes/Slack/V2/MessageInterface.ts
new file mode 100644
index 00000000000000..69c7b9cb4ba3eb
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/MessageInterface.ts
@@ -0,0 +1,5 @@
+export interface IAttachment {
+	fields: {
+		item?: object[];
+	};
+}
diff --git a/packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts b/packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts
new file mode 100644
index 00000000000000..10d6823e72061e
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/ReactionDescription.ts
@@ -0,0 +1,131 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const reactionOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['reaction'],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Adds a reaction to a message',
+				action: 'Add a reaction',
+			},
+			{
+				name: 'Get',
+				value: 'get',
+				description: 'Get the reactions of a message',
+				action: 'Get a reaction',
+			},
+			{
+				name: 'Remove',
+				value: 'remove',
+				description: 'Remove a reaction of a message',
+				action: 'Remove a reaction',
+			},
+		],
+		default: 'add',
+	},
+];
+
+export const reactionFields: INodeProperties[] = [
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+		required: true,
+		displayOptions: {
+			show: {
+				resource: ['reaction'],
+				operation: ['add', 'get', 'remove'],
+			},
+		},
+		description: 'The Slack channel to get the reactions from',
+	},
+	{
+		displayName: 'Message Timestamp',
+		name: 'timestamp',
+		required: true,
+		type: 'number',
+		default: undefined,
+		displayOptions: {
+			show: {
+				resource: ['reaction'],
+				operation: ['add', 'get', 'remove'],
+			},
+		},
+		description: 'Timestamp of the message to add, get or remove',
+		placeholder: '1663233118.856619',
+	},
+	{
+		displayName: 'Emoji Code',
+		name: 'name',
+		type: 'string',
+		required: true,
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['reaction'],
+				operation: ['add', 'remove'],
+			},
+		},
+		description:
+			'Emoji code to use for the message reaction. Use emoji codes like +1, not an actual emoji like 👍. <a target="_blank" href=" https://www.webfx.com/tools/emoji-cheat-sheet/">List of common emoji codes</a>',
+		placeholder: '+1',
+	},
+];
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
new file mode 100644
index 00000000000000..6304df6bf1e8d2
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -0,0 +1,1342 @@
+/* eslint-disable n8n-nodes-base/node-filename-against-convention */
+import type { IExecuteFunctions } from 'n8n-core';
+
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	INodeListSearchItems,
+	INodeListSearchResult,
+	INodeParameterResourceLocator,
+	INodePropertyOptions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+	JsonObject,
+} from 'n8n-workflow';
+
+import { NodeOperationError } from 'n8n-workflow';
+
+import { channelFields, channelOperations } from './ChannelDescription';
+import { messageFields, messageOperations } from './MessageDescription';
+import { starFields, starOperations } from './StarDescription';
+import { fileFields, fileOperations } from './FileDescription';
+import { reactionFields, reactionOperations } from './ReactionDescription';
+import { userGroupFields, userGroupOperations } from './UserGroupDescription';
+import { userFields, userOperations } from './UserDescription';
+import { slackApiRequest, slackApiRequestAllItems, validateJSON } from './GenericFunctions';
+
+import moment from 'moment';
+
+export class SlackV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 2,
+			defaults: {
+				name: 'Slack',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [
+				{
+					name: 'slackApi',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['accessToken'],
+						},
+					},
+				},
+				{
+					name: 'slackOAuth2Api',
+					required: true,
+					displayOptions: {
+						show: {
+							authentication: ['oAuth2'],
+						},
+					},
+				},
+			],
+			properties: [
+				{
+					displayName: 'Authentication',
+					name: 'authentication',
+					type: 'options',
+					options: [
+						{
+							name: 'Access Token',
+							value: 'accessToken',
+						},
+						{
+							name: 'OAuth2',
+							value: 'oAuth2',
+						},
+					],
+					default: 'accessToken',
+				},
+
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Channel',
+							value: 'channel',
+						},
+						{
+							name: 'File',
+							value: 'file',
+						},
+						{
+							name: 'Message',
+							value: 'message',
+						},
+						{
+							name: 'Reaction',
+							value: 'reaction',
+						},
+						{
+							name: 'Star',
+							value: 'star',
+						},
+						{
+							name: 'User',
+							value: 'user',
+						},
+						{
+							name: 'User Group',
+							value: 'userGroup',
+						},
+					],
+					default: 'message',
+				},
+
+				...channelOperations,
+				...channelFields,
+				...messageOperations,
+				...messageFields,
+				...starOperations,
+				...starFields,
+				...fileOperations,
+				...fileFields,
+				...reactionOperations,
+				...reactionFields,
+				...userOperations,
+				...userFields,
+				...userGroupOperations,
+				...userGroupFields,
+			],
+		};
+	}
+
+	methods = {
+		listSearch: {
+			async getChannels(
+				this: ILoadOptionsFunctions,
+				filter?: string,
+			): Promise<INodeListSearchResult> {
+				const qs = { types: 'public_channel,private_channel', limit: 1000 };
+				const channels = (await slackApiRequestAllItems.call(
+					this,
+					'channels',
+					'GET',
+					'/conversations.list',
+					{},
+					qs,
+				)) as Array<{ id: string; name: string }>;
+				const results: INodeListSearchItems[] = channels
+					.map((c) => ({
+						name: c.name,
+						value: c.id,
+					}))
+					.filter(
+						(c) =>
+							!filter ||
+							c.name.toLowerCase().includes(filter.toLowerCase()) ||
+							c.value?.toString() === filter,
+					)
+					.sort((a, b) => {
+						if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
+						if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
+						return 0;
+					});
+				return { results };
+			},
+			async getUsers(this: ILoadOptionsFunctions, filter?: string): Promise<INodeListSearchResult> {
+				const users = (await slackApiRequestAllItems.call(
+					this,
+					'members',
+					'GET',
+					'/users.list',
+				)) as Array<{ id: string; name: string }>;
+				const results: INodeListSearchItems[] = users
+					.map((c) => ({
+						name: c.name,
+						value: c.id,
+					}))
+					.filter(
+						(c) =>
+							!filter ||
+							c.name.toLowerCase().includes(filter.toLowerCase()) ||
+							c.value?.toString() === filter,
+					)
+					.sort((a, b) => {
+						if (a.name.toLowerCase() < b.name.toLowerCase()) return -1;
+						if (a.name.toLowerCase() > b.name.toLowerCase()) return 1;
+						return 0;
+					});
+				return { results };
+			},
+		},
+		loadOptions: {
+			// Get all the users to display them to user so that he can
+			// select them easily
+			async getUsers(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const users = await slackApiRequestAllItems.call(this, 'members', 'GET', '/users.list');
+				for (const user of users) {
+					const userName = user.name;
+					const userId = user.id;
+					returnData.push({
+						name: userName,
+						value: userId,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					if (a.name < b.name) {
+						return -1;
+					}
+					if (a.name > b.name) {
+						return 1;
+					}
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the users to display them to user so that he can
+			// select them easily
+			async getChannels(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = { types: 'public_channel,private_channel', limit: 1000 };
+				const channels = await slackApiRequestAllItems.call(
+					this,
+					'channels',
+					'GET',
+					'/conversations.list',
+					{},
+					qs,
+				);
+				for (const channel of channels) {
+					const channelName = channel.name;
+					const channelId = channel.id;
+					returnData.push({
+						name: channelName,
+						value: channelId,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					if (a.name < b.name) {
+						return -1;
+					}
+					if (a.name > b.name) {
+						return 1;
+					}
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the users to display them to user so that he can
+			// select them easily
+			async getChannelsName(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const qs = { types: 'public_channel,private_channel', limit: 1000 };
+				const channels = await slackApiRequestAllItems.call(
+					this,
+					'channels',
+					'GET',
+					'/conversations.list',
+					{},
+					qs,
+				);
+				for (const channel of channels) {
+					const channelName = channel.name;
+					returnData.push({
+						name: channelName,
+						value: channelName,
+					});
+				}
+
+				returnData.sort((a, b) => {
+					if (a.name < b.name) {
+						return -1;
+					}
+					if (a.name > b.name) {
+						return 1;
+					}
+					return 0;
+				});
+
+				return returnData;
+			},
+			// Get all the team fields to display them to user so that he can
+			// select them easily
+			async getTeamFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				const returnData: INodePropertyOptions[] = [];
+				const {
+					profile: { fields },
+				} = await slackApiRequest.call(this, 'GET', '/team.profile.get');
+				for (const field of fields) {
+					const fieldName = field.label;
+					const fieldId = field.id;
+					returnData.push({
+						name: fieldName,
+						value: fieldId,
+					});
+				}
+				return returnData;
+			},
+		},
+	};
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const returnData: INodeExecutionData[] = [];
+		const length = items.length;
+		let qs: IDataObject;
+		let responseData;
+		const authentication = this.getNodeParameter('authentication', 0) as string;
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+
+		for (let i = 0; i < length; i++) {
+			try {
+				responseData = {
+					error: 'Resource ' + resource + ' / operation ' + operation + ' not found!',
+				};
+				qs = {};
+				if (resource === 'channel') {
+					//https://api.slack.com/methods/conversations.archive
+					if (operation === 'archive') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.archive',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.close
+					if (operation === 'close') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.close',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.create
+					if (operation === 'create') {
+						let channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						channel = channel[0] === '#' ? channel.slice(1) : channel;
+						const channelVisibility = this.getNodeParameter('channelVisibility', i) as string;
+						const body: IDataObject = {
+							name: channel,
+							is_private: channelVisibility === 'private' ? true : false,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.create',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.kick
+					if (operation === 'kick') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const userId = this.getNodeParameter('userId', i) as string;
+						const body: IDataObject = {
+							channel,
+							user: userId,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.kick',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.join
+					if (operation === 'join') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.join',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.info
+					if (operation === 'get') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						qs.channel = channel;
+						responseData = await slackApiRequest.call(this, 'POST', '/conversations.info', {}, qs);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						if (filters.types) {
+							qs.types = (filters.types as string[]).join(',');
+						}
+						if (filters.excludeArchived) {
+							qs.exclude_archived = filters.excludeArchived as boolean;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'channels',
+								'GET',
+								'/conversations.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/conversations.list', {}, qs);
+							responseData = responseData.channels;
+						}
+					}
+					//https://api.slack.com/methods/conversations.history
+					if (operation === 'history') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						qs.channel = channel;
+						if (filters.inclusive) {
+							qs.inclusive = filters.inclusive as boolean;
+						}
+						if (filters.latest) {
+							qs.latest = new Date(filters.latest as string).getTime() / 1000;
+						}
+						if (filters.oldest) {
+							qs.oldest = new Date(filters.oldest as string).getTime() / 1000;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'messages',
+								'GET',
+								'/conversations.history',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(
+								this,
+								'GET',
+								'/conversations.history',
+								{},
+								qs,
+							);
+							responseData = responseData.messages;
+						}
+					}
+					//https://api.slack.com/methods/conversations.invite
+					if (operation === 'invite') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const userIds = (this.getNodeParameter('userIds', i) as string[]).join(',');
+						const body: IDataObject = {
+							channel,
+							users: userIds,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.invite',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.leave
+					if (operation === 'leave') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.leave',
+							body,
+							qs,
+						);
+					}
+					//https://api.slack.com/methods/conversations.members
+					if (operation === 'member') {
+						const returnAll = this.getNodeParameter('returnAll', 0);
+						const resolveData = this.getNodeParameter('resolveData', 0);
+						qs.channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'members',
+								'GET',
+								'/conversations.members',
+								{},
+								qs,
+							);
+							responseData = responseData.map((member: string) => ({ member }));
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(
+								this,
+								'GET',
+								'/conversations.members',
+								{},
+								qs,
+							);
+							responseData = responseData.members.map((member: string) => ({ member }));
+						}
+
+						if (resolveData) {
+							const data: IDataObject[] = [];
+							for (const { member } of responseData) {
+								const { user } = await slackApiRequest.call(
+									this,
+									'GET',
+									'/users.info',
+									{},
+									{ user: member },
+								);
+								data.push(user);
+							}
+							responseData = data;
+						}
+					}
+					//https://api.slack.com/methods/conversations.open
+					if (operation === 'open') {
+						const options = this.getNodeParameter('options', i);
+						const body: IDataObject = {};
+						if (options.channelId) {
+							body.channel = options.channelId as string;
+						}
+						if (options.returnIm) {
+							body.return_im = options.returnIm as boolean;
+						}
+						if (options.users) {
+							body.users = (options.users as string[]).join(',');
+						}
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.open',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.rename
+					if (operation === 'rename') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as IDataObject;
+						const name = this.getNodeParameter('name', i) as IDataObject;
+						const body: IDataObject = {
+							channel,
+							name,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.rename',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.replies
+					if (operation === 'replies') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const ts = this.getNodeParameter('ts', i)?.toString() as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						qs.channel = channel;
+						qs.ts = ts;
+						if (filters.inclusive) {
+							qs.inclusive = filters.inclusive as boolean;
+						}
+						if (filters.latest) {
+							qs.latest = new Date(filters.latest as string).getTime() / 1000;
+						}
+						if (filters.oldest) {
+							qs.oldest = new Date(filters.oldest as string).getTime() / 1000;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'messages',
+								'GET',
+								'/conversations.replies',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(
+								this,
+								'GET',
+								'/conversations.replies',
+								{},
+								qs,
+							);
+							responseData = responseData.messages;
+						}
+					}
+					//https://api.slack.com/methods/conversations.setPurpose
+					if (operation === 'setPurpose') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as IDataObject;
+						const purpose = this.getNodeParameter('purpose', i) as IDataObject;
+						const body: IDataObject = {
+							channel,
+							purpose,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.setPurpose',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.setTopic
+					if (operation === 'setTopic') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as IDataObject;
+						const topic = this.getNodeParameter('topic', i) as IDataObject;
+						const body: IDataObject = {
+							channel,
+							topic,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.setTopic',
+							body,
+							qs,
+						);
+						responseData = responseData.channel;
+					}
+					//https://api.slack.com/methods/conversations.unarchive
+					if (operation === 'unarchive') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const body: IDataObject = {
+							channel,
+						};
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/conversations.unarchive',
+							body,
+							qs,
+						);
+					}
+				}
+				if (resource === 'message') {
+					//https://api.slack.com/methods/chat.postMessage
+					if (operation === 'post') {
+						const select = this.getNodeParameter('select', i) as string;
+						const messageType = this.getNodeParameter('messageType', i) as string;
+						let target =
+							select === 'channel'
+								? (this.getNodeParameter('channelId', i, undefined, {
+										extractValue: true,
+								  }) as string)
+								: (this.getNodeParameter('user', i, undefined, {
+										extractValue: true,
+								  }) as string);
+						// @ts-ignore
+						if (select === 'user' && this.getNodeParameter('user', i).mode === 'username') {
+							target = target.slice(0, 1) === '@' ? target : `@${target}`;
+						}
+						const { sendAsUser } = this.getNodeParameter('otherOptions', i) as IDataObject;
+						let content: IDataObject = {};
+						switch (messageType) {
+							case 'text':
+								content = { text: this.getNodeParameter('text', i) as string };
+								break;
+							case 'block':
+								content = JSON.parse(this.getNodeParameter('blocksUi', i) as string);
+								break;
+							case 'attachment':
+								content = { attachments: this.getNodeParameter('attachments', i) } as IDataObject;
+								break;
+							default:
+								throw new NodeOperationError(
+									this.getNode(),
+									`The message type "${messageType}" is not known!`,
+								);
+						}
+						const body: IDataObject = {
+							channel: target,
+							...content,
+						};
+						if (authentication === 'accessToken' && sendAsUser !== '' && sendAsUser !== undefined) {
+							body.username = sendAsUser;
+						}
+						// Add all the other options to the request
+						const otherOptions = this.getNodeParameter('otherOptions', i) as IDataObject;
+						let action = 'postMessage';
+						if (otherOptions.ephemeral) {
+							const ephemeral = otherOptions.ephemeral as IDataObject;
+							if (select === 'channel') {
+								const ephemeralValues = ephemeral.ephemeralValues as IDataObject;
+								const userRlc = ephemeralValues.user as INodeParameterResourceLocator;
+								body.user =
+									userRlc.value?.toString().slice(0, 1) !== '@' && userRlc.mode === 'username'
+										? `@${userRlc.value}`
+										: userRlc.value;
+								action = 'postEphemeral';
+							} else if (select === 'user') {
+								body.user = target;
+								action = 'postEphemeral';
+							}
+						}
+						//@ts-ignore
+						const replyValues = otherOptions.thread_ts?.replyValues as IDataObject;
+						Object.assign(body, replyValues);
+						delete otherOptions.thread_ts;
+						delete otherOptions.ephemeral;
+						if (otherOptions.botProfile) {
+							const botProfile = otherOptions.botProfile as IDataObject;
+							const botProfileValues = botProfile.imageValues as IDataObject;
+							Object.assign(
+								body,
+								botProfileValues.profilePhotoType === 'image'
+									? { icon_url: botProfileValues.icon_url }
+									: { icon_emoji: botProfileValues.icon_emoji },
+							);
+						}
+						delete otherOptions.botProfile;
+						Object.assign(body, otherOptions);
+						if (
+							select === 'user' &&
+							action === 'postEphemeral' &&
+							(this.getNodeParameter('user', i) as INodeParameterResourceLocator)?.mode ===
+								'username'
+						) {
+							throw new NodeOperationError(
+								this.getNode(),
+								'You cannot send ephemeral messages using User type "By username". Please use "From List" or "By ID".',
+							);
+						} else {
+							responseData = await slackApiRequest.call(this, 'POST', `/chat.${action}`, body, qs);
+						}
+					}
+					//https://api.slack.com/methods/chat.update
+					if (operation === 'update') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const text = this.getNodeParameter('text', i) as string;
+						const ts = this.getNodeParameter('ts', i)?.toString() as string;
+						const body: IDataObject = {
+							channel,
+							text,
+							ts,
+						};
+
+						const jsonParameters = this.getNodeParameter('jsonParameters', i, false);
+						if (jsonParameters) {
+							const blocksJson = this.getNodeParameter('blocksJson', i, []) as string;
+
+							if (blocksJson !== '' && validateJSON(blocksJson) === undefined) {
+								throw new NodeOperationError(this.getNode(), 'Blocks it is not a valid json', {
+									itemIndex: i,
+								});
+							}
+							if (blocksJson !== '') {
+								body.blocks = blocksJson;
+							}
+						}
+						// Add all the other options to the request
+						const updateFields = this.getNodeParameter('updateFields', i);
+						Object.assign(body, updateFields);
+						responseData = await slackApiRequest.call(this, 'POST', '/chat.update', body, qs);
+					}
+					//https://api.slack.com/methods/chat.delete
+					if (operation === 'delete') {
+						const select = this.getNodeParameter('select', i) as string;
+						let target =
+							select === 'channel'
+								? (this.getNodeParameter('channelId', i, undefined, {
+										extractValue: true,
+								  }) as string)
+								: (this.getNodeParameter('user', i, undefined, {
+										extractValue: true,
+								  }) as string);
+						// @ts-ignore
+						if (select === 'user' && this.getNodeParameter('user', i).mode === 'username') {
+							target = target.slice(0, 1) === '@' ? target : `@${target}`;
+						}
+						const timestamp = this.getNodeParameter('timestamp', i)?.toString() as string;
+						const body: IDataObject = {
+							channel: target,
+							ts: timestamp,
+						};
+						// Add all the other options to the request
+						responseData = await slackApiRequest.call(this, 'POST', '/chat.delete', body, qs);
+					}
+					//https://api.slack.com/methods/chat.getPermalink
+					if (operation === 'getPermalink') {
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const timestamp = this.getNodeParameter('timestamp', i)?.toString() as string;
+						qs = {
+							channel,
+							message_ts: timestamp,
+						};
+						responseData = await slackApiRequest.call(this, 'GET', '/chat.getPermalink', {}, qs);
+					}
+					//https://api.slack.com/methods/search.messages
+					if (operation === 'search') {
+						let query = this.getNodeParameter('query', i) as string;
+						const sort = this.getNodeParameter('sort', i) as string;
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const options = this.getNodeParameter('options', i);
+						if (options.searchChannel) {
+							const channel = options.searchChannel as IDataObject[];
+							for (const channelItem of channel) {
+								query += ` in:${channelItem}`;
+							}
+						}
+						qs = {
+							query,
+							sort: sort === 'relevance' ? 'score' : 'timestamp',
+							sort_dir: sort === 'asc' ? 'asc' : 'desc',
+						};
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'messages',
+								'GET',
+								'/search.messages',
+								{},
+								qs,
+							);
+						} else {
+							qs.count = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'POST', '/search.messages', {}, qs);
+							responseData = responseData.messages.matches;
+						}
+					}
+				}
+				if (resource === 'reaction') {
+					const channel = this.getNodeParameter(
+						'channelId',
+						i,
+						{},
+						{ extractValue: true },
+					) as string;
+					const timestamp = this.getNodeParameter('timestamp', i)?.toString() as string;
+					//https://api.slack.com/methods/reactions.add
+					if (operation === 'add') {
+						const name = this.getNodeParameter('name', i) as string;
+						const body: IDataObject = {
+							channel,
+							name,
+							timestamp,
+						};
+						responseData = await slackApiRequest.call(this, 'POST', '/reactions.add', body, qs);
+					}
+					//https://api.slack.com/methods/reactions.remove
+					if (operation === 'remove') {
+						const name = this.getNodeParameter('name', i) as string;
+						const body: IDataObject = {
+							channel,
+							name,
+							timestamp,
+						};
+						responseData = await slackApiRequest.call(this, 'POST', '/reactions.remove', body, qs);
+					}
+					//https://api.slack.com/methods/reactions.get
+					if (operation === 'get') {
+						qs.channel = channel;
+						qs.timestamp = timestamp;
+						responseData = await slackApiRequest.call(this, 'GET', '/reactions.get', {}, qs);
+					}
+				}
+				if (resource === 'star') {
+					//https://api.slack.com/methods/stars.add
+					if (operation === 'add') {
+						const options = this.getNodeParameter('options', i);
+						const target = this.getNodeParameter('target', i) as string;
+						const channel = this.getNodeParameter(
+							'channelId',
+							i,
+							{},
+							{ extractValue: true },
+						) as string;
+						const body: IDataObject = {};
+						body.channel = channel;
+
+						if (target === 'message') {
+							const timestamp = this.getNodeParameter('timestamp', i)?.toString() as string;
+							body.timestamp = timestamp;
+						}
+						if (target === 'file') {
+							const file = this.getNodeParameter('fileId', i) as string;
+							body.file = file;
+						}
+						if (options.fileComment) {
+							body.file_comment = options.fileComment as string;
+						}
+						responseData = await slackApiRequest.call(this, 'POST', '/stars.add', body, qs);
+					}
+					//https://api.slack.com/methods/stars.remove
+					if (operation === 'delete') {
+						const options = this.getNodeParameter('options', i);
+						const body: IDataObject = {};
+						if (options.channelId) {
+							body.channel = options.channelId as string;
+						}
+						if (options.fileId) {
+							body.file = options.fileId as string;
+						}
+						if (options.fileComment) {
+							body.file_comment = options.fileComment as string;
+						}
+						if (options.timestamp) {
+							body.timestamp = options.timestamp as string;
+						}
+						responseData = await slackApiRequest.call(this, 'POST', '/stars.remove', body, qs);
+					}
+					//https://api.slack.com/methods/stars.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'items',
+								'GET',
+								'/stars.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/stars.list', {}, qs);
+							responseData = responseData.items;
+						}
+					}
+				}
+				if (resource === 'file') {
+					//https://api.slack.com/methods/files.upload
+					if (operation === 'upload') {
+						const options = this.getNodeParameter('options', i);
+						const binaryData = this.getNodeParameter('binaryData', i);
+						const body: IDataObject = {};
+						if (options.channelIds) {
+							body.channels = (options.channelIds as string[]).join(',');
+						}
+						if (options.fileName) {
+							body.filename = options.fileName as string;
+						}
+						if (options.initialComment) {
+							body.initial_comment = options.initialComment as string;
+						}
+						if (options.threadTs) {
+							body.thread_ts = options.threadTs as string;
+						}
+						if (options.title) {
+							body.title = options.title as string;
+						}
+						if (binaryData) {
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							if (
+								items[i].binary === undefined ||
+								//@ts-ignore
+								items[i].binary[binaryPropertyName] === undefined
+							) {
+								throw new NodeOperationError(
+									this.getNode(),
+									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									{ itemIndex: i },
+								);
+							}
+							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+								i,
+								binaryPropertyName,
+							);
+							body.file = {
+								//@ts-ignore
+								value: binaryDataBuffer,
+								options: {
+									//@ts-ignore
+									filename: items[i].binary[binaryPropertyName].fileName,
+									//@ts-ignore
+									contentType: items[i].binary[binaryPropertyName].mimeType,
+								},
+							};
+							responseData = await slackApiRequest.call(
+								this,
+								'POST',
+								'/files.upload',
+								{},
+								qs,
+								{ 'Content-Type': 'multipart/form-data' },
+								{ formData: body },
+							);
+							responseData = responseData.file;
+						} else {
+							const fileContent = this.getNodeParameter('fileContent', i) as string;
+							body.content = fileContent;
+							responseData = await slackApiRequest.call(
+								this,
+								'POST',
+								'/files.upload',
+								body,
+								qs,
+								{ 'Content-Type': 'application/x-www-form-urlencoded' },
+								{ form: body },
+							);
+							responseData = responseData.file;
+						}
+					}
+					//https://api.slack.com/methods/files.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						const filters = this.getNodeParameter('filters', i);
+						if (filters.channelId) {
+							qs.channel = filters.channelId as string;
+						}
+						if (filters.showFilesHidden) {
+							qs.show_files_hidden_by_limit = filters.showFilesHidden as boolean;
+						}
+						if (filters.tsFrom) {
+							qs.ts_from = filters.tsFrom as string;
+						}
+						if (filters.tsTo) {
+							qs.ts_to = filters.tsTo as string;
+						}
+						if (filters.types) {
+							qs.types = (filters.types as string[]).join(',');
+						}
+						if (filters.userId) {
+							qs.user = filters.userId as string;
+						}
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'files',
+								'GET',
+								'/files.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.count = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/files.list', {}, qs);
+							responseData = responseData.files;
+						}
+					}
+					//https://api.slack.com/methods/files.info
+					if (operation === 'get') {
+						const fileId = this.getNodeParameter('fileId', i) as string;
+						qs.file = fileId;
+						responseData = await slackApiRequest.call(this, 'GET', '/files.info', {}, qs);
+						responseData = responseData.file;
+					}
+				}
+				if (resource === 'user') {
+					//https://api.slack.com/methods/users.info
+					if (operation === 'info') {
+						qs.user = this.getNodeParameter('user', i, undefined, { extractValue: true }) as string;
+						responseData = await slackApiRequest.call(this, 'GET', '/users.info', {}, qs);
+						responseData = responseData.user;
+					}
+					//https://api.slack.com/methods/users.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+						if (returnAll) {
+							responseData = await slackApiRequestAllItems.call(
+								this,
+								'members',
+								'GET',
+								'/users.list',
+								{},
+								qs,
+							);
+						} else {
+							qs.limit = this.getNodeParameter('limit', i);
+							responseData = await slackApiRequest.call(this, 'GET', '/users.list', {}, qs);
+							responseData = responseData.members;
+						}
+					}
+					//https://api.slack.com/methods/users.getPresence
+					if (operation === 'getPresence') {
+						qs.user = this.getNodeParameter('user', i, undefined, { extractValue: true }) as string;
+						responseData = await slackApiRequest.call(this, 'GET', '/users.getPresence', {}, qs);
+					}
+					if (operation === 'updateProfile') {
+						const options = this.getNodeParameter('options', i);
+						const timezone = this.getTimezone();
+
+						const body: IDataObject = {};
+						let status;
+						if (options.status) {
+							// @ts-ignore
+							status = options.status?.set_status[0] as IDataObject;
+							if (status.status_expiration === undefined) {
+								status.status_expiration = 0;
+							} else {
+								status.status_expiration = moment
+									.tz(status.status_expiration as string, timezone)
+									.unix();
+							}
+							Object.assign(body, status);
+							delete options.status;
+						}
+
+						if (options.customFieldUi) {
+							const customFields = (options.customFieldUi as IDataObject)
+								.customFieldValues as IDataObject[];
+
+							options.fields = {};
+
+							for (const customField of customFields) {
+								//@ts-ignore
+								options.fields[customField.id] = {
+									value: customField.value,
+									alt: customField.alt,
+								};
+							}
+						}
+						Object.assign(body, options);
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/users.profile.set',
+							{ profile: body },
+							qs,
+						);
+
+						responseData = responseData.profile;
+					}
+				}
+				if (resource === 'userGroup') {
+					//https://api.slack.com/methods/usergroups.create
+					if (operation === 'create') {
+						const name = this.getNodeParameter('name', i) as string;
+
+						const options = this.getNodeParameter('options', i);
+
+						const body: IDataObject = {
+							name,
+						};
+
+						Object.assign(body, options);
+
+						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.create', body, qs);
+
+						responseData = responseData.usergroup;
+					}
+					//https://api.slack.com/methods/usergroups.enable
+					if (operation === 'enable') {
+						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
+
+						const options = this.getNodeParameter('options', i);
+
+						const body: IDataObject = {
+							usergroup: userGroupId,
+						};
+
+						Object.assign(body, options);
+
+						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.enable', body, qs);
+
+						responseData = responseData.usergroup;
+					}
+					//https://api.slack.com/methods/usergroups.disable
+					if (operation === 'disable') {
+						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
+
+						const options = this.getNodeParameter('options', i);
+
+						const body: IDataObject = {
+							usergroup: userGroupId,
+						};
+
+						Object.assign(body, options);
+
+						responseData = await slackApiRequest.call(
+							this,
+							'POST',
+							'/usergroups.disable',
+							body,
+							qs,
+						);
+
+						responseData = responseData.usergroup;
+					}
+
+					//https://api.slack.com/methods/usergroups.list
+					if (operation === 'getAll') {
+						const returnAll = this.getNodeParameter('returnAll', i);
+
+						const options = this.getNodeParameter('options', i);
+
+						Object.assign(qs, options);
+
+						responseData = await slackApiRequest.call(this, 'GET', '/usergroups.list', {}, qs);
+
+						responseData = responseData.usergroups;
+
+						if (!returnAll) {
+							const limit = this.getNodeParameter('limit', i);
+
+							responseData = responseData.slice(0, limit);
+						}
+					}
+
+					//https://api.slack.com/methods/usergroups.update
+					if (operation === 'update') {
+						const userGroupId = this.getNodeParameter('userGroupId', i) as string;
+
+						const updateFields = this.getNodeParameter('updateFields', i);
+
+						const body: IDataObject = {
+							usergroup: userGroupId,
+						};
+
+						Object.assign(body, updateFields);
+
+						responseData = await slackApiRequest.call(this, 'POST', '/usergroups.update', body, qs);
+
+						responseData = responseData.usergroup;
+					}
+				}
+				const executionData = this.helpers.constructExecutionMetaData(
+					this.helpers.returnJsonArray(responseData),
+					{ itemData: { item: i } },
+				);
+				returnData.push(...executionData);
+			} catch (error) {
+				if (this.continueOnFail()) {
+					returnData.push({ json: { error: (error as JsonObject).message } });
+					continue;
+				}
+				throw error;
+			}
+		}
+		return this.prepareOutputData(returnData);
+	}
+}
diff --git a/packages/nodes-base/nodes/Slack/V2/StarDescription.ts b/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
new file mode 100644
index 00000000000000..d600202a9b5752
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/StarDescription.ts
@@ -0,0 +1,268 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const starOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['star'],
+			},
+		},
+		options: [
+			{
+				name: 'Add',
+				value: 'add',
+				description: 'Add a star to an item',
+				action: 'Add a star',
+			},
+			{
+				name: 'Delete',
+				value: 'delete',
+				description: 'Delete a star from an item',
+				action: 'Delete a star',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get many stars of autenticated user',
+				action: 'Get many stars',
+			},
+		],
+		default: 'add',
+	},
+];
+
+export const starFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                star:add                                    */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Item to Add Star',
+		name: 'target',
+		type: 'options',
+		required: true,
+		description: 'Choose whether to add a star to a message or a file',
+		default: '',
+		placeholder: 'Select...',
+		displayOptions: {
+			show: {
+				operation: ['add'],
+				resource: ['star'],
+			},
+		},
+		options: [
+			{
+				name: 'Message',
+				value: 'message',
+			},
+			{
+				name: 'File',
+				value: 'file',
+			},
+		],
+	},
+	{
+		displayName: 'Channel',
+		name: 'channelId',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a channel...',
+		description: 'The Slack channel to add a star to',
+		displayOptions: {
+			show: {
+				resource: ['star'],
+				operation: ['add'],
+				target: ['message', 'file'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a channel...',
+				typeOptions: {
+					searchListMethod: 'getChannels',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack Channel ID',
+						},
+					},
+				],
+				placeholder: 'C0122KQ70S7E',
+			},
+			{
+				displayName: 'By URL',
+				name: 'url',
+				type: 'string',
+				placeholder: 'https://app.slack.com/client/TS9594PZK/B0556F47Z3A',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: 'http(s)?://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+							errorMessage: 'Not a valid Slack Channel URL',
+						},
+					},
+				],
+				extractValue: {
+					type: 'regex',
+					regex: 'https://app.slack.com/client/.*/([a-zA-Z0-9]{2,})',
+				},
+			},
+		],
+	},
+	{
+		displayName: 'File ID',
+		name: 'fileId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				resource: ['star'],
+				operation: ['add'],
+				target: ['file'],
+			},
+		},
+		description: 'File to add star to',
+	},
+	{
+		displayName: 'Message Timestamp',
+		name: 'timestamp',
+		type: 'number',
+		default: undefined,
+		displayOptions: {
+			show: {
+				resource: ['star'],
+				operation: ['add'],
+				target: ['message'],
+			},
+		},
+		description: 'Timestamp of the message to add',
+		placeholder: '1663233118.856619',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['add'],
+				resource: ['star'],
+			},
+		},
+		default: {},
+		description: 'Options to set',
+		placeholder: 'Add options',
+		options: [
+			{
+				displayName: 'File Comment',
+				name: 'fileComment',
+				type: 'string',
+				default: '',
+				description: 'File comment to add star to',
+			},
+		],
+	},
+
+	/* ----------------------------------------------------------------------- */
+	/*                                 star:delete                             */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				operation: ['delete'],
+				resource: ['star'],
+			},
+		},
+		default: {},
+		description: 'Options to set',
+		placeholder: 'Add options',
+		options: [
+			{
+				displayName: 'Channel Name or ID',
+				name: 'channelId',
+				type: 'options',
+				typeOptions: {
+					loadOptionsMethod: 'getChannels',
+				},
+				default: '',
+				description:
+					'Channel to add star to, or channel where the message to add star to was posted (used with timestamp). Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'File ID',
+				name: 'fileId',
+				type: 'string',
+				default: '',
+				description: 'File to add star to',
+			},
+			{
+				displayName: 'File Comment',
+				name: 'fileComment',
+				type: 'string',
+				default: '',
+				description: 'File comment to add star to',
+			},
+			{
+				displayName: 'Message Timestamp',
+				name: 'timestamp',
+				type: 'number',
+				default: 0,
+				description: 'Timestamp of the message to delete',
+				placeholder: '1663233118.856619',
+			},
+		],
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                 star:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['star'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['star'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+];
diff --git a/packages/nodes-base/nodes/Slack/V2/UserDescription.ts b/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
new file mode 100644
index 00000000000000..1ced8d7dae10d5
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/UserDescription.ts
@@ -0,0 +1,297 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const userOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['user'],
+			},
+		},
+		options: [
+			{
+				name: 'Get',
+				value: 'info',
+				description: 'Get information about a user',
+				action: 'Get information about a user',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				description: 'Get a list of many users',
+				action: 'Get many users',
+			},
+			{
+				name: "Get User's Status",
+				value: 'getPresence',
+				description: 'Get online status of a user',
+				action: "Get a user's presence status",
+			},
+			{
+				name: "Update User's Profile",
+				value: 'updateProfile',
+				description: "Update a user's profile",
+				action: "Update a user's profile",
+			},
+		],
+		default: 'info',
+	},
+];
+
+export const userFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                user:info                                   */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User',
+		name: 'user',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a user...',
+		description: 'The ID of the user to get information about',
+		displayOptions: {
+			show: {
+				operation: ['info'],
+				resource: ['user'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a user...',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack User ID',
+						},
+					},
+				],
+				placeholder: 'U123AB45JGM',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                 user:getAll                                */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['getAll'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 100,
+		},
+		default: 50,
+		description: 'Max number of results to return',
+	},
+
+	/* -------------------------------------------------------------------------- */
+	/*                                user:getPresence                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'User',
+		name: 'user',
+		type: 'resourceLocator',
+		default: { mode: 'list', value: '' },
+		placeholder: 'Select a user...',
+		description: 'The ID of the user to get the online status of',
+		displayOptions: {
+			show: {
+				operation: ['getPresence'],
+				resource: ['user'],
+			},
+		},
+		modes: [
+			{
+				displayName: 'From List',
+				name: 'list',
+				type: 'list',
+				placeholder: 'Select a user...',
+				typeOptions: {
+					searchListMethod: 'getUsers',
+					searchable: true,
+				},
+			},
+			{
+				displayName: 'By ID',
+				name: 'id',
+				type: 'string',
+				validation: [
+					{
+						type: 'regex',
+						properties: {
+							regex: '[a-zA-Z0-9]{2,}',
+							errorMessage: 'Not a valid Slack User ID',
+						},
+					},
+				],
+				placeholder: 'U123AB45JGM',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                user:update user profile                     */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['user'],
+				operation: ['updateProfile'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Custom Fields',
+				name: 'customFieldUi',
+				placeholder: 'Add Custom Fields',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				options: [
+					{
+						name: 'customFieldValues',
+						displayName: 'Custom Field',
+						values: [
+							{
+								displayName: 'Field Name or ID',
+								name: 'id',
+								type: 'options',
+								typeOptions: {
+									loadOptionsMethod: 'getTeamFields',
+								},
+								default: '',
+								description:
+									'ID of the field to set. Choose from the list, or specify an ID using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+							},
+							{
+								displayName: 'Field Value',
+								name: 'value',
+								type: 'string',
+								default: '',
+								description: 'Value of the field to set',
+							},
+							{
+								displayName: 'Alt',
+								name: 'alt',
+								type: 'string',
+								default: '',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'Email',
+				name: 'email',
+				type: 'string',
+				placeholder: 'name@email.com',
+				default: '',
+				description: 'This field can only be changed by admins for users on paid teams',
+			},
+			{
+				displayName: 'First Name',
+				name: 'first_name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Last Name',
+				name: 'last_name',
+				type: 'string',
+				default: '',
+			},
+			{
+				displayName: 'Set Status',
+				name: 'status',
+				type: 'fixedCollection',
+				typeOptions: {
+					multipleValues: true,
+				},
+				default: {},
+				placeholder: 'Set Status',
+				options: [
+					{
+						displayName: 'Set Status',
+						name: 'set_status',
+						values: [
+							{
+								displayName: 'Status Emoji',
+								name: 'status_emoji',
+								type: 'string',
+								default: '',
+								description:
+									'Is a string referencing an emoji enabled for the Slack team, such as :mountain_railway:',
+							},
+							{
+								displayName: 'Status Expiration',
+								name: 'status_expiration',
+								type: 'dateTime',
+								default: '',
+								description:
+									'The number of minutes to wait until this status expires and is cleared. Optional.',
+							},
+							{
+								displayName: 'Status Text',
+								name: 'status_text',
+								type: 'string',
+								default: '',
+								description: 'Allows up to 100 characters, though we strongly encourage brevity',
+							},
+						],
+					},
+				],
+			},
+			{
+				displayName: 'User ID',
+				name: 'user',
+				type: 'string',
+				default: '',
+				description:
+					'ID of user to change. This argument may only be specified by team admins on paid teams.',
+			},
+		],
+	},
+];
diff --git a/packages/nodes-base/nodes/Slack/V2/UserGroupDescription.ts b/packages/nodes-base/nodes/Slack/V2/UserGroupDescription.ts
new file mode 100644
index 00000000000000..08727b5cb2d3f5
--- /dev/null
+++ b/packages/nodes-base/nodes/Slack/V2/UserGroupDescription.ts
@@ -0,0 +1,329 @@
+import type { INodeProperties } from 'n8n-workflow';
+
+export const userGroupOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['userGroup'],
+			},
+		},
+		options: [
+			{
+				name: 'Create',
+				value: 'create',
+				action: 'Create a user group',
+			},
+			{
+				name: 'Disable',
+				value: 'disable',
+				action: 'Disable a user group',
+			},
+			{
+				name: 'Enable',
+				value: 'enable',
+				action: 'Enable a user group',
+			},
+			{
+				name: 'Get Many',
+				value: 'getAll',
+				action: 'Get many user groups',
+			},
+			{
+				name: 'Update',
+				value: 'update',
+				action: 'Update a user group',
+			},
+		],
+		default: 'create',
+	},
+];
+
+export const userGroupFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                                userGroup:create                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Name',
+		name: 'name',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['create'],
+				resource: ['userGroup'],
+			},
+		},
+		required: true,
+		description: 'A name for the User Group. Must be unique among User Groups.',
+	},
+	{
+		displayName: 'Options',
+		name: 'Options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['userGroup'],
+				operation: ['create'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Channel Names or IDs',
+				name: 'channelIds',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getChannels',
+				},
+				default: [],
+				description:
+					'A comma-separated string of encoded channel IDs for which the User Group uses as a default. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'A short description of the User Group',
+			},
+			{
+				displayName: 'Handle',
+				name: 'handle',
+				type: 'string',
+				default: '',
+				description: 'A mention handle. Must be unique among channels, users and User Groups.',
+			},
+			{
+				displayName: 'Include Count',
+				name: 'include_count',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to include the number of users in each User Group',
+			},
+		],
+	},
+	/* ----------------------------------------------------------------------- */
+	/*                                 userGroup:disable                       */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'User Group ID',
+		name: 'userGroupId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['disable'],
+				resource: ['userGroup'],
+			},
+		},
+		required: true,
+		description: 'The encoded ID of the User Group to update',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['userGroup'],
+				operation: ['disable'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Count',
+				name: 'include_count',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to include the number of users in each User Group',
+			},
+		],
+	},
+	/* ----------------------------------------------------------------------- */
+	/*                                 userGroup:enable                        */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'User Group ID',
+		name: 'userGroupId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['enable'],
+				resource: ['userGroup'],
+			},
+		},
+		required: true,
+		description: 'The encoded ID of the User Group to update',
+	},
+	{
+		displayName: 'Options',
+		name: 'option',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['userGroup'],
+				operation: ['enable'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Count',
+				name: 'include_count',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to include the number of users in each User Group',
+			},
+		],
+	},
+	/* -------------------------------------------------------------------------- */
+	/*                                userGroup:getAll                            */
+	/* -------------------------------------------------------------------------- */
+	{
+		displayName: 'Return All',
+		name: 'returnAll',
+		type: 'boolean',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['userGroup'],
+			},
+		},
+		default: false,
+		description: 'Whether to return all results or only up to a given limit',
+	},
+	{
+		displayName: 'Limit',
+		name: 'limit',
+		type: 'number',
+		displayOptions: {
+			show: {
+				operation: ['getAll'],
+				resource: ['userGroup'],
+				returnAll: [false],
+			},
+		},
+		typeOptions: {
+			minValue: 1,
+			maxValue: 500,
+		},
+		default: 100,
+		description: 'Max number of results to return',
+	},
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['userGroup'],
+				operation: ['getAll'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Include Count',
+				name: 'include_count',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to include the number of users in each User Group',
+			},
+			{
+				displayName: 'Include Disabled',
+				name: 'include_disabled',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to include disabled User Groups',
+			},
+			{
+				displayName: 'Include Users',
+				name: 'include_users',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to include the list of users for each User Group',
+			},
+		],
+	},
+	/* ----------------------------------------------------------------------- */
+	/*                                 userGroup:update                        */
+	/* ----------------------------------------------------------------------- */
+	{
+		displayName: 'User Group ID',
+		name: 'userGroupId',
+		type: 'string',
+		default: '',
+		displayOptions: {
+			show: {
+				operation: ['update'],
+				resource: ['userGroup'],
+			},
+		},
+		required: true,
+		description: 'The encoded ID of the User Group to update',
+	},
+	{
+		displayName: 'Update Fields',
+		name: 'updateFields',
+		type: 'collection',
+		placeholder: 'Add Field',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['userGroup'],
+				operation: ['update'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Channel Names or IDs',
+				name: 'channels',
+				type: 'multiOptions',
+				typeOptions: {
+					loadOptionsMethod: 'getChannels',
+				},
+				default: [],
+				description:
+					'A comma-separated string of encoded channel IDs for which the User Group uses as a default. Choose from the list, or specify IDs using an <a href="https://docs.n8n.io/code-examples/expressions/">expression</a>.',
+			},
+			{
+				displayName: 'Description',
+				name: 'description',
+				type: 'string',
+				default: '',
+				description: 'A short description of the User Group',
+			},
+			{
+				displayName: 'Handle',
+				name: 'handle',
+				type: 'string',
+				default: '',
+				description: 'A mention handle. Must be unique among channels, users and User Groups.',
+			},
+			{
+				displayName: 'Include Count',
+				name: 'include_count',
+				type: 'boolean',
+				default: true,
+				description: 'Whether to include the number of users in each User Group',
+			},
+			{
+				displayName: 'Name',
+				name: 'name',
+				type: 'string',
+				default: '',
+				description: 'A name for the User Group. Must be unique among User Groups.',
+			},
+		],
+	},
+];

From 8d9b64e26ee8f890db3e2e9b2fa32072eb5dd7f4 Mon Sep 17 00:00:00 2001
From: Simon <65854503+OpenSourceSimon@users.noreply.github.com>
Date: Fri, 3 Feb 2023 17:25:02 +0100
Subject: [PATCH 087/358] fix: Improve README (no-changelog) (#5354)

---
 README.md | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 360c7e7621241b..336ea39e741fb4 100644
--- a/README.md
+++ b/README.md
@@ -21,9 +21,9 @@ n8n has 200+ different nodes to automate workflows. The list can be found on:
 
 ## Documentation
 
-The official n8n documentation can be found under: [https://docs.n8n.io](https://docs.n8n.io)
+The official n8n documentation can be found on our [documentation website](https://docs.n8n.io)
 
-Additional information and example workflows on the n8n.io website: [https://n8n.io](https://n8n.io)
+Additional information and example workflows on the [n8n.io website](https://n8n.io)
 
 The release notes can be found [here](https://docs.n8n.io/reference/release-notes/) and the list of breaking
 changes [here](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-CHANGES.md).
@@ -36,14 +36,18 @@ changes [here](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-C
   [how to run n8n in **Docker**](https://docs.n8n.io/hosting/installation/docker/)
 
 ## Start
+You can try n8n without installing it using npx. You must have [Node.js](https://nodejs.org/en/) installed. 
+From the terminal, run:
 
-Execute: `npx n8n`
+`npx n8n`
+
+This command will download everything that is needed to start n8n. You can then access n8n and start building workflows by opening [http://localhost:5678](http://localhost:5678).
 
 ## n8n cloud
 
 Sign-up for an [n8n cloud](https://www.n8n.io/cloud/) account.
 
-While n8n cloud and n8n are the same in terms of features, n8 cloud provides certain conveniences such as:
+While n8n cloud and n8n are the same in terms of features, n8n cloud provides certain conveniences such as:
 
 - Not having to set up and maintain your n8n instance
 - Managed OAuth for authentication

From 20356ba8c80196f9562e073c1a55d55a4d6c37b0 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 6 Feb 2023 09:49:18 +0100
Subject: [PATCH 088/358] fix(editor): Fix merge node connectors (#5364)

* fix(editor): Fix merge node connectors

* Set `stateIsDirty` from `EVENT_CONNECTION` hook
---
 packages/editor-ui/src/stores/workflows.ts | 1 -
 packages/editor-ui/src/views/NodeView.vue  | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index af5d5992e12304..43d9260f8c6006 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -538,7 +538,6 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 				// TODO: Check if there is an error or whatever that is supposed to be returned
 				return;
 			}
-
 			const sourceData: IConnection = data.connection[0];
 			const destinationData: IConnection = data.connection[1];
 
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 7e3bc49ce6e1c7..22ee4d36794b0c 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -2088,6 +2088,7 @@ export default mixins(
 
 							this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
 							this.pullConnActiveNodeName = null;
+							this.dropPrevented = true;
 						}
 						return;
 					}
@@ -2160,6 +2161,8 @@ export default mixins(
 					];
 
 					this.dropPrevented = true;
+					this.workflowsStore.addConnection({ connection: connectionData });
+					this.uiStore.stateIsDirty = true;
 					if (!this.suspendRecordingDetachedConnections) {
 						this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
 					}

From 9b628ddc343f0a40c7ddaab93d5258ac949a4ea2 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 6 Feb 2023 10:22:57 +0100
Subject: [PATCH 089/358] fix(editor): Fix multiple-output endpoints success
 style after connection is detached (#5366)

---
 packages/editor-ui/src/components/Node.vue             | 10 +++++++---
 .../src/plugins/endpoints/N8nPlusEndpointType.ts       |  4 ++++
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index c50c2a3107e47d..6f57fba76fe848 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -892,6 +892,7 @@ export default mixins(
 	--endpoint-size-medium: 18px;
 	--stalk-size: 40px;
 	--stalk-success-size: 87px;
+	--stalk-success-size-without-label: 40px;
 	--stalk-long-size: 127px;
 	--plus-endpoint-box-size: 24px;
 	--plus-endpoint-box-size-small: 17px;
@@ -1037,7 +1038,7 @@ export default mixins(
 }
 
 .node-output-endpoint-label {
-	margin-left: calc(var(--endpoint-size-small) + var(--spacing-3xs));
+	margin-left: calc(var(--endpoint-size-small) + var(--spacing-2xs));
 }
 .node-input-endpoint-label {
 	text-align: right;
@@ -1071,10 +1072,13 @@ export default mixins(
 		opacity: 1;
 	}
 }
+.long-stalk {
+	--stalk-size: var(--stalk-long-size);
+}
 .ep-success {
 	--stalk-size: var(--stalk-success-size);
 }
-.long-stalk {
-	--stalk-size: var(--stalk-long-size);
+.ep-success--without-label {
+	--stalk-size: var(--stalk-success-size-without-label);
 }
 </style>
diff --git a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
index 6793149250be14..8ad5c72943eb10 100644
--- a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
+++ b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
@@ -148,12 +148,16 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 		if (this.params.showOutputLabel) {
 			this.label = label;
 			this.setStalkLabels();
+			return;
 		}
+
+		this.endpoint.addClass('ep-success--without-label');
 	}
 
 	clearSuccessOutput() {
 		this.endpoint.removeOverlay('successOutputOverlay');
 		this.endpoint.removeClass('ep-success');
+		this.endpoint.removeClass('ep-success--without-label');
 		this.label = '';
 		this.setStalkLabels();
 	}

From e4458b48e005667ae903ee6965e1a299546267f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 6 Feb 2023 10:26:12 +0100
Subject: [PATCH 090/358] fix(editor): Fix mapping to empty expression input
 (#5367)

:bug: Fix mapping to empty expression input
---
 packages/editor-ui/src/components/ParameterInputFull.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 0861eef123dfd3..4d015a82946945 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -256,7 +256,7 @@ export default mixins(showMessage).extend({
 					) {
 						updatedValue = `${prevValue} ${data}`;
 					} else if (prevValue && ['string', 'json'].includes(this.parameter.type)) {
-						updatedValue = `=${prevValue} ${data}`;
+						updatedValue = prevValue === '=' ? `=${data}` : `=${prevValue} ${data}`;
 					} else {
 						updatedValue = `=${data}`;
 					}

From a115baa1ac2af84c462be48cbc575d7905f74f64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 6 Feb 2023 12:43:50 +0100
Subject: [PATCH 091/358] fix(core): CORS middleware should not process the
 entire handler chain on OPTIONS requests (no-changelog) (#5368)

fix(core): CORS middleware should not process the entire handler chain on OPTIONS requests
---
 packages/cli/src/middlewares/cors.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/middlewares/cors.ts b/packages/cli/src/middlewares/cors.ts
index 8b20f5ee681408..a6c33dd55d4e5a 100644
--- a/packages/cli/src/middlewares/cors.ts
+++ b/packages/cli/src/middlewares/cors.ts
@@ -11,5 +11,10 @@ export const corsMiddleware: RequestHandler = (req, res, next) => {
 			'Origin, X-Requested-With, Content-Type, Accept, sessionid',
 		);
 	}
-	next();
+
+	if (req.method === 'OPTIONS') {
+		res.writeHead(204).end();
+	} else {
+		next();
+	}
 };

From 4c115f4353005941dae6ec9defe71a2e41a34376 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 13:12:55 +0000
Subject: [PATCH 092/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.212.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index e2954c72c19f4f..80938bffaeb4ea 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.212.0",
+  "version": "0.212.1",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From c006b7617e04a8ebdf4a727ca5ab5c53ab213dee Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 13:14:13 +0000
Subject: [PATCH 093/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.180.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 1570b3b3d3c102..9e2d4ec539cdc0 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.180.0",
+  "version": "0.180.1",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 5ede2180e602a66adaaa3e4911445a223364235c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 13:16:11 +0000
Subject: [PATCH 094/358] :arrow_up: Set n8n-editor-ui@0.180.1 and
 n8n-nodes-base@0.212.1 on n8n

---
 packages/cli/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index f55e15c30f3ef9..959031510a34ae 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -166,8 +166,8 @@
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
     "n8n-core": "~0.153.0",
-    "n8n-editor-ui": "~0.180.0",
-    "n8n-nodes-base": "~0.212.0",
+    "n8n-editor-ui": "~0.180.1",
+    "n8n-nodes-base": "~0.212.1",
     "n8n-workflow": "~0.135.0",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",

From 6b7408d255463c92d6ebea3f18ea5a0f56f58415 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 13:16:12 +0000
Subject: [PATCH 095/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.214.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 959031510a34ae..27fcfdd0dedf24 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.0",
+  "version": "0.214.1",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 5dd291cd004267263fc38712cf382650485d625e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 07:18:13 -0600
Subject: [PATCH 096/358] :books: Update CHANGELOG.md and main package.json to
 0.214.1

---
 CHANGELOG.md | 16 ++++++++++++++++
 package.json |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d65bafb596de6..c0908dd4faacdc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,19 @@
+## [0.214.1](https://github.com/n8n-io/n8n/compare/n8n@0.214.0...n8n@0.214.1) (2023-02-06)
+
+
+### Bug Fixes
+
+* **editor:** Fix mapping to empty expression input ([#5367](https://github.com/n8n-io/n8n/issues/5367)) ([e4458b4](https://github.com/n8n-io/n8n/commit/e4458b48e005667ae903ee6965e1a299546267f0))
+* **editor:** Fix merge node connectors ([#5364](https://github.com/n8n-io/n8n/issues/5364)) ([20356ba](https://github.com/n8n-io/n8n/commit/20356ba8c80196f9562e073c1a55d55a4d6c37b0))
+* **editor:** Fix multiple-output endpoints success style after connection is detached ([#5366](https://github.com/n8n-io/n8n/issues/5366)) ([9b628dd](https://github.com/n8n-io/n8n/commit/9b628ddc343f0a40c7ddaab93d5258ac949a4ea2))
+
+
+### Features
+
+* **Slack Node:** Revamp the node with more functionalities in a new version ([#4587](https://github.com/n8n-io/n8n/issues/4587)) ([4df6942](https://github.com/n8n-io/n8n/commit/4df69428f1e1e440aadddddb019cf559fd824a28))
+
+
+
 # [0.214.0](https://github.com/n8n-io/n8n/compare/n8n@0.213.0...n8n@0.214.0) (2023-02-03)
 
 
diff --git a/package.json b/package.json
index a2b2a6674b6148..cefee514e2913c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.0",
+  "version": "0.214.1",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {

From 8e428c71335e77e0dc32ec61b4680793db47a5b4 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 07:52:25 -0600
Subject: [PATCH 097/358] fix: Upgrade versions in pnpm-lock.yaml
 (no-changelog)

---
 pnpm-lock.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index b74a24fec97f4c..3dc447b27d6c3a 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -198,8 +198,8 @@ importers:
       luxon: ^3.1.0
       mysql2: ~2.3.3
       n8n-core: ~0.153.0
-      n8n-editor-ui: ~0.180.0
-      n8n-nodes-base: ~0.212.0
+      n8n-editor-ui: ~0.180.1
+      n8n-nodes-base: ~0.212.1
       n8n-workflow: ~0.135.0
       nodemailer: ^6.7.1
       nodemon: ^2.0.2

From 9a7f3da4a31b7c34885c09d992e1dfc02894675b Mon Sep 17 00:00:00 2001
From: Valya <68596159+valya@users.noreply.github.com>
Date: Mon, 6 Feb 2023 15:14:57 +0000
Subject: [PATCH 098/358] test: Automatically load workflow nodes in node tests
 (#5380)

test: automatically load workflow nodes in node tests
---
 .../test/nodes/Airtable/Airtable.node.test.ts |  3 +-
 packages/nodes-base/test/nodes/Helpers.ts     | 41 +++++++++++++++++--
 .../nodes-base/test/nodes/If/If.node.test.ts  |  3 +-
 .../nodes-base/test/nodes/Set/SetNode.test.ts |  3 +-
 .../test/nodes/Start/StartNode.test.ts        |  3 +-
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
index cb03648804a243..f5ef28a7a9a57e 100644
--- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -44,8 +44,7 @@ describe('Execute Airtable Node', () => {
 		},
 	];
 
-	const nodes: INodeType[] = [new ManualTrigger(), new Airtable()];
-	const nodeTypes = Helpers.setup(nodes);
+	const nodeTypes = Helpers.setup(tests);
 
 	for (const testData of tests) {
 		test(testData.description, async () => {
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 5c5ab95fe05ea0..da548f700219c6 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -1,5 +1,5 @@
 import { readFileSync } from 'fs';
-import { Credentials } from 'n8n-core';
+import { Credentials, loadClassInIsolation } from 'n8n-core';
 import {
 	ICredentialDataDecryptedObject,
 	ICredentialsHelper,
@@ -18,11 +18,13 @@ import {
 	IVersionedNodeType,
 	IWorkflowBase,
 	IWorkflowExecuteAdditionalData,
+	LoadingDetails,
 	LoggerProxy,
 	NodeHelpers,
 	WorkflowHooks,
 } from 'n8n-workflow';
 import { WorkflowTestData } from './types';
+import path from 'path';
 
 export class CredentialsHelper extends ICredentialsHelper {
 	async authenticate(
@@ -143,11 +145,42 @@ export function NodeTypes(): NodeTypesClass {
 	return nodeTypesInstance;
 }
 
-export function setup(nodes: INodeType[]) {
+let knownNodes: Record<string, LoadingDetails> | null = null;
+
+const loadKnownNodes = (): Record<string, LoadingDetails> => {
+	if (knownNodes === null) {
+		knownNodes = JSON.parse(readFileSync('dist/known/nodes.json').toString());
+	}
+	return knownNodes!;
+};
+
+export function setup(testData: Array<WorkflowTestData> | WorkflowTestData) {
+	if (!Array.isArray(testData)) {
+		testData = [testData];
+	}
+
+	const knownNodes = loadKnownNodes();
+
 	const nodeTypes = NodeTypes();
-	for (const node of nodes) {
-		nodeTypes.addNode('n8n-nodes-base.' + node.description.name, node);
+	const nodeNames = Array.from(
+		new Set(testData.flatMap((data) => data.input.workflowData.nodes.map((n) => n.type))),
+	);
+
+	for (const nodeName of nodeNames) {
+		if (!nodeName.startsWith('n8n-nodes-base.')) {
+			throw new Error(`Unknown node type: ${nodeName}`);
+		}
+		const loadInfo = knownNodes[nodeName.replace('n8n-nodes-base.', '')];
+		if (!loadInfo) {
+			throw new Error(`Unknown node type: ${nodeName}`);
+		}
+		const node = loadClassInIsolation(
+			path.join(process.cwd(), loadInfo.sourcePath),
+			loadInfo.className,
+		) as INodeType;
+		nodeTypes.addNode(nodeName, node);
 	}
+
 	const fakeLogger = {
 		log: () => {},
 		debug: () => {},
diff --git a/packages/nodes-base/test/nodes/If/If.node.test.ts b/packages/nodes-base/test/nodes/If/If.node.test.ts
index 5c141755476c88..6efeab840d7f65 100644
--- a/packages/nodes-base/test/nodes/If/If.node.test.ts
+++ b/packages/nodes-base/test/nodes/If/If.node.test.ts
@@ -38,8 +38,7 @@ describe('Execute If Node', () => {
 		},
 	];
 
-	const nodes: INodeType[] = [new ManualTrigger(), new Code(), new Set(), new If(), new NoOp()];
-	const nodeTypes = Helpers.setup(nodes);
+	const nodeTypes = Helpers.setup(tests);
 
 	for (const testData of tests) {
 		test(testData.description, async () => {
diff --git a/packages/nodes-base/test/nodes/Set/SetNode.test.ts b/packages/nodes-base/test/nodes/Set/SetNode.test.ts
index 75407df9bfed9f..fc4370831e35ba 100644
--- a/packages/nodes-base/test/nodes/Set/SetNode.test.ts
+++ b/packages/nodes-base/test/nodes/Set/SetNode.test.ts
@@ -177,8 +177,7 @@ describe('Execute Set Node', () => {
 		},
 	];
 
-	const nodes: INodeType[] = [new Start(), new Set()];
-	const nodeTypes = Helpers.setup(nodes);
+	const nodeTypes = Helpers.setup(tests);
 
 	for (const testData of tests) {
 		test(testData.description, async () => {
diff --git a/packages/nodes-base/test/nodes/Start/StartNode.test.ts b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
index 5c9ccf8c6cf7bd..06c536c9cb8a0c 100644
--- a/packages/nodes-base/test/nodes/Start/StartNode.test.ts
+++ b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
@@ -30,8 +30,7 @@ describe('Execute Start Node', () => {
 		},
 	];
 
-	const nodes: INodeType[] = [new Start()];
-	const nodeTypes = Helpers.setup(nodes);
+	const nodeTypes = Helpers.setup(tests);
 
 	for (const testData of tests) {
 		test(testData.description, async () => {

From 31130d5257f253d9be21fe62d668231e27ecbd52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Mon, 6 Feb 2023 16:29:10 +0100
Subject: [PATCH 099/358] fix(editor): Fix resolvable highlighting for HTML
 editor (#5379)

:bug: Fix resolvable highlighting for HTML editor
---
 packages/editor-ui/src/mixins/expressionManager.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/editor-ui/src/mixins/expressionManager.ts b/packages/editor-ui/src/mixins/expressionManager.ts
index f687cbc17d0037..845afc7f878e2f 100644
--- a/packages/editor-ui/src/mixins/expressionManager.ts
+++ b/packages/editor-ui/src/mixins/expressionManager.ts
@@ -95,15 +95,15 @@ export const expressionManager = mixins(workflowHelpers).extend({
 			return rawSegments.reduce<Segment[]>((acc, segment) => {
 				const { from, to, text, token } = segment;
 
-				if (token === 'Plaintext') {
-					acc.push({ kind: 'plaintext', from, to, plaintext: text });
+				if (token === 'Resolvable') {
+					const { resolved, error, fullError } = this.resolve(text, this.hoveringItem);
+
+					acc.push({ kind: 'resolvable', from, to, resolvable: text, resolved, error, fullError });
 
 					return acc;
 				}
 
-				const { resolved, error, fullError } = this.resolve(text, this.hoveringItem);
-
-				acc.push({ kind: 'resolvable', from, to, resolvable: text, resolved, error, fullError });
+				acc.push({ kind: 'plaintext', from, to, plaintext: text });
 
 				return acc;
 			}, []);

From 03afd3c7cf80e89f1195b1e54746b3335dc9f3d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Mon, 6 Feb 2023 16:33:59 +0100
Subject: [PATCH 100/358] test(editor): Improve canvas e2e tests reliability
 (#5376)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✔️ Improving reliability of connection actions hover
---
 cypress/e2e/10-undo-redo.cy.ts | 11 ++++-------
 cypress/e2e/12-canvas.cy.ts    |  6 ++----
 cypress/pages/workflow.ts      |  5 +++++
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index e76091b5533821..3222b533ab9403 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -38,17 +38,14 @@ describe('Undo/Redo', () => {
 	it('should undo/redo adding node in the middle', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
-		WorkflowPage.getters.nodeConnections().realHover();
-		cy.get('.connection-actions .add').filter(':visible').click();
-		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME, false);
+		WorkflowPage.actions.addNodeBetweenFirstTwoNodes(CODE_NODE_NAME);
 		WorkflowPage.actions.zoomToFit();
 		WorkflowPage.actions.hitUndo();
+		WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
+		WorkflowPage.getters.nodeConnections().should('have.length', 1);
+		WorkflowPage.actions.hitRedo();
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 3);
 		WorkflowPage.getters.nodeConnections().should('have.length', 2);
-		WorkflowPage.actions.hitRedo();
-		WorkflowPage.getters.canvasNodes().should('have.have.length', 4);
-		WorkflowPage.getters.nodeConnections().should('have.length', 3);
 	});
 
 	it('should undo/redo deleting node using delete button', () => {
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 3651ce163a661e..113d0541707468 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -61,9 +61,7 @@ describe('Canvas Actions', () => {
 	it('should add note between two connected nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.getters.nodeConnections().first().realHover();
-		cy.get('.connection-actions .add').filter(':visible').should('be.visible').click()
-		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, false);
+		WorkflowPage.actions.addNodeBetweenFirstTwoNodes(SET_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.length', 3);
 		WorkflowPage.getters.nodeConnections().should('have.length', 2);
 		// And last node should be pushed to the right
@@ -218,7 +216,7 @@ describe('Canvas Actions', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.nodeConnections().first().realHover();
-		cy.get('.connection-actions .delete').filter(':visible').should('be.visible').click();
+		cy.get('.connection-actions .delete').first().click({ force: true });
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 67a16c44214171..f17ad0144ce76e 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -170,5 +170,10 @@ export class WorkflowPage extends BasePage {
 		executeWorkflow: () => {
 			this.getters.executeWorkflowButton().click();
 		},
+		addNodeBetweenFirstTwoNodes: (nodeName: string) => {
+			this.getters.nodeConnections().first().realHover();
+			cy.get('.connection-actions .add').first().click({ force: true });
+			this.actions.addNodeToCanvas(nodeName, false);
+		},
 	};
 }

From 6482688ee04621744451c67f6d6e3292e925bb8d Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 6 Feb 2023 18:33:59 +0100
Subject: [PATCH 101/358] fix(editor): Correctly show OAuth reconnect button
 (#5384)

---
 .../src/components/CredentialEdit/CredentialConfig.vue        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index a3f22a23e24e45..d3f132c4eba240 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -40,12 +40,12 @@
 			:buttonTitle="$locale.baseText('credentialEdit.credentialConfig.reconnectOAuth2Credential')"
 			@click="$emit('oauth')"
 		>
-			<template #button>
+			<template #button v-if="isGoogleOAuthType">
 				<p
 					v-text="`${$locale.baseText('credentialEdit.credentialConfig.reconnect')}:`"
 					:class="$style.googleReconnectLabel"
 				/>
-				<GoogleAuthButton v-if="isGoogleOAuthType" @click="$emit('oauth')" />
+				<GoogleAuthButton @click="$emit('oauth')" />
 			</template>
 		</banner>
 

From bdaad556ca11be9f22ef7a5627e98bb51d0b24a8 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 17:56:11 +0000
Subject: [PATCH 102/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.212.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 80938bffaeb4ea..e50d1f27d35318 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.212.1",
+  "version": "0.212.2",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 85391629dc11c59d90968222ae1a4c0f136b9dce Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 17:57:07 +0000
Subject: [PATCH 103/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.180.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 9e2d4ec539cdc0..2c4708001490bb 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.180.1",
+  "version": "0.180.2",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 7ec3d93435fb8f580922edde757e73e1b2af738f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 17:59:09 +0000
Subject: [PATCH 104/358] :arrow_up: Set n8n-editor-ui@0.180.2 and
 n8n-nodes-base@0.212.2 on n8n

---
 packages/cli/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 27fcfdd0dedf24..c25e9cb379f50e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -166,8 +166,8 @@
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
     "n8n-core": "~0.153.0",
-    "n8n-editor-ui": "~0.180.1",
-    "n8n-nodes-base": "~0.212.1",
+    "n8n-editor-ui": "~0.180.2",
+    "n8n-nodes-base": "~0.212.2",
     "n8n-workflow": "~0.135.0",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",

From 91d9f2d2025610aeb7547c52c086700af317d9ae Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 17:59:09 +0000
Subject: [PATCH 105/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.214.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index c25e9cb379f50e..450b42c4758c90 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.1",
+  "version": "0.214.2",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 9efcf19082413e3a886144e4c178f80f5e24ee27 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Mon, 6 Feb 2023 12:35:55 -0600
Subject: [PATCH 106/358] :books: Update CHANGELOG.md and main package.json to
 0.214.2

---
 CHANGELOG.md   | 10 ++++++++++
 package.json   |  2 +-
 pnpm-lock.yaml |  6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0908dd4faacdc..babe44a3281c2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [0.214.2](https://github.com/n8n-io/n8n/compare/n8n@0.214.1...n8n@0.214.2) (2023-02-06)
+
+
+### Bug Fixes
+
+* **editor:** Correctly show OAuth reconnect button ([#5384](https://github.com/n8n-io/n8n/issues/5384)) ([6482688](https://github.com/n8n-io/n8n/commit/6482688ee04621744451c67f6d6e3292e925bb8d))
+* **editor:** Fix resolvable highlighting for HTML editor ([#5379](https://github.com/n8n-io/n8n/issues/5379)) ([31130d5](https://github.com/n8n-io/n8n/commit/31130d5257f253d9be21fe62d668231e27ecbd52))
+
+
+
 ## [0.214.1](https://github.com/n8n-io/n8n/compare/n8n@0.214.0...n8n@0.214.1) (2023-02-06)
 
 
diff --git a/package.json b/package.json
index cefee514e2913c..7c10921722918a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.1",
+  "version": "0.214.2",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dc447b27d6c3a..d01f240c21474e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -198,8 +198,8 @@ importers:
       luxon: ^3.1.0
       mysql2: ~2.3.3
       n8n-core: ~0.153.0
-      n8n-editor-ui: ~0.180.1
-      n8n-nodes-base: ~0.212.1
+      n8n-editor-ui: ~0.180.2
+      n8n-nodes-base: ~0.212.2
       n8n-workflow: ~0.135.0
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
@@ -6908,7 +6908,7 @@ packages:
       vite: ^3.0.0 || ^4.0.0
       vue: ^2.7.0-0
     dependencies:
-      vite: 4.0.4_sass@1.57.1
+      vite: 4.0.4_sass@1.55.0+terser@5.16.1
       vue: 2.7.14
     dev: true
 

From db49f052bc3791d4279ff8b35a1507069cedb8db Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 7 Feb 2023 07:47:37 +0300
Subject: [PATCH 107/358] test: Add data mapping test (#5372)

* test: add tests for pinning

* test: add test for value

* test: add pinned data tests

* test: refactor into ndv

* refactor: move to ndv

* refactor: rename node

* test: fix test

* test: fix refactor

* test: remove unused id

* test: update test

* test: chain rename input

* test: refactor invoking text

* test: fix ndv tests

* test: move test id

* test: add tests for mapping

* test: update selectors

* test: add mapping

* test: remove wait

* test: add back line removed by mistake

* test: refactor to support both in/output displays

* test: add display mode switching

* test: fix drop

* chore: clean up change

* refactor: add draganddrop

* fix: fix drag and drop

* test: add mapping test for second value

* test: update text

* test: update param
---
 cypress/e2e/10-undo-redo.cy.ts                |  6 +--
 cypress/e2e/12-canvas.cy.ts                   |  4 +-
 cypress/e2e/14-mapping.cy.ts                  | 37 ++++++++++++++++++
 cypress/e2e/5-ndv.cy.ts                       |  2 +-
 cypress/pages/canvas-node.ts                  | 15 ++++++++
 cypress/pages/index.ts                        |  1 +
 cypress/pages/ndv.ts                          | 38 ++++++++++++++++---
 cypress/support/commands.ts                   | 21 +++++++++-
 cypress/support/index.ts                      |  3 +-
 .../editor-ui/src/components/InputPanel.vue   |  1 +
 packages/editor-ui/src/components/RunData.vue |  2 +-
 11 files changed, 116 insertions(+), 14 deletions(-)
 create mode 100644 cypress/e2e/14-mapping.cy.ts
 create mode 100644 cypress/pages/canvas-node.ts

diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 3222b533ab9403..28c99ac31372c5 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -116,7 +116,7 @@ describe('Undo/Redo', () => {
 	it('should undo/redo moving nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', 50, 150);
+		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
 		WorkflowPage.getters
 			.canvasNodes()
 			.last()
@@ -148,7 +148,7 @@ describe('Undo/Redo', () => {
 	it('should undo/redo deleting a connection by moving it away', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		cy.drag('.rect-input-endpoint.jtk-endpoint-connected', 0, -100);
+		cy.drag('.rect-input-endpoint.jtk-endpoint-connected', [0, -100]);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.nodeConnections().should('have.length', 1);
@@ -266,7 +266,7 @@ describe('Undo/Redo', () => {
 		WorkflowPage.actions.hitDisableNodeShortcut();
 		// Move first one
 		WorkflowPage.getters.canvasNodes().first().click();
-		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', 50, 150);
+		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
 		// Delete the set node
 		WorkflowPage.getters.canvasNodeByName(SET_NODE_NAME).click().click();
 		cy.get('body').type('{backspace}');
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 113d0541707468..343b63354c7337 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -117,7 +117,7 @@ describe('Canvas Actions', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.zoomToFit();
-		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', 50, 150);
+		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
 		WorkflowPage.getters
 			.canvasNodes()
 			.last()
@@ -223,7 +223,7 @@ describe('Canvas Actions', () => {
 	it('should delete a connection by moving it away from endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		cy.drag('.rect-input-endpoint.jtk-endpoint-connected', 0, -100);
+		cy.drag('.rect-input-endpoint.jtk-endpoint-connected', [0, -100]);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
new file mode 100644
index 00000000000000..6c24da45fc4428
--- /dev/null
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -0,0 +1,37 @@
+import { WorkflowPage, NDV, CanvasNode } from '../pages';
+
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+const canvasNode = new CanvasNode();
+
+describe('Data mapping', () => {
+	before(() => {
+		cy.resetAll();
+		cy.skipSetup();
+	});
+
+	beforeEach(() => {
+		workflowPage.actions.visit();
+	});
+
+	it('Should be able to map expressions from table header', () => {
+		cy.fixture('Test_workflow-actions_paste-data.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+		canvasNode.actions.openNode('Set');
+		ndv.actions.executePrevious();
+		ndv.actions.switchInputMode('Table');
+		ndv.getters.inputDataContainer().get('table', { timeout: 10000 }).should('exist');
+
+		ndv.getters.nodeParameters().find('input[placeholder*="Add Value"]').click();
+		ndv.getters.nodeParameters().find('.el-select-dropdown__list li:nth-child(3)').should('have.text', 'String').click();
+		ndv.getters.parameterInput('name').should('have.length', 1).find('input').should('have.value', 'propertyName');
+		ndv.getters.parameterInput('value').should('have.length', 1).find('input').should('have.value', '');
+
+		ndv.actions.mapDataFromHeader(1, 'value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.timestamp }}');
+
+		ndv.actions.mapDataFromHeader(2, 'value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.timestamp }} {{ $json["Readable date"] }}');
+	});
+});
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index d5208e60d25e7c..c0e12a6ba2bb7a 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -42,7 +42,7 @@ describe('NDV', () => {
 			});
 		});
 
-		ndv.getters.runDataDisplayMode().should('have.length.at.least', 1).and('be.visible');
+		ndv.getters.outputDisplayMode().should('have.length.at.least', 1).and('be.visible');
 	});
 
 	it('should change input', () => {
diff --git a/cypress/pages/canvas-node.ts b/cypress/pages/canvas-node.ts
new file mode 100644
index 00000000000000..e0506d15f801e5
--- /dev/null
+++ b/cypress/pages/canvas-node.ts
@@ -0,0 +1,15 @@
+import { BasePage } from './base';
+
+export class CanvasNode extends BasePage {
+	getters = {
+		nodes: () => cy.getByTestId('canvas-node'),
+		nodeByName: (nodeName: string) =>
+			this.getters.nodes().filter(`:contains("${nodeName}")`),
+	};
+
+	actions = {
+		openNode: (nodeName: string) => {
+			this.getters.nodeByName(nodeName).dblclick();
+		},
+	};
+}
diff --git a/cypress/pages/index.ts b/cypress/pages/index.ts
index 07849aa6cce85e..870fbaa58c6c99 100644
--- a/cypress/pages/index.ts
+++ b/cypress/pages/index.ts
@@ -8,3 +8,4 @@ export * from './modals';
 export * from './settings-users';
 export * from './settings-log-streaming';
 export * from './ndv';
+export * from './canvas-node';
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 3761db326f3b90..9842c724d07cfa 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -11,8 +11,9 @@ export class NDV extends BasePage {
 		inputPanel: () => cy.getByTestId('ndv-input-panel'),
 		outputPanel: () => cy.getByTestId('output-panel'),
 		inputDataContainer: () => this.getters.inputPanel().findChildByTestId('ndv-data-container'),
+		inputDisplayMode: () => this.getters.inputPanel().getByTestId('ndv-run-data-display-mode'),
 		outputDataContainer: () => this.getters.outputPanel().findChildByTestId('ndv-data-container'),
-		runDataDisplayMode: () => cy.getByTestId('ndv-run-data-display-mode'),
+		outputDisplayMode: () => this.getters.outputPanel().getByTestId('ndv-run-data-display-mode'),
 		digital: () => cy.getByTestId('ndv-run-data-display-mode'),
 		pinDataButton: () => cy.getByTestId('ndv-pin-data'),
 		editPinnedDataButton: () => cy.getByTestId('ndv-edit-pinned-data'),
@@ -22,11 +23,17 @@ export class NDV extends BasePage {
 		outputTableRows: () => this.getters.outputDataContainer().find('table tr'),
 		outputTableHeaders: () => this.getters.outputDataContainer().find('table thead th'),
 		outputTableRow: (row: number) => this.getters.outputTableRows().eq(row),
-		outputTbodyCell: (row: number, cell: number) =>
-			this.getters.outputTableRow(row).find('td').eq(cell),
+		outputTbodyCell: (row: number, col: number) => this.getters.outputTableRow(row).find('td').eq(col),
+		inputTableRows: () => this.getters.outputDataContainer().find('table tr'),
+		inputTableHeaders: () => this.getters.outputDataContainer().find('table thead th'),
+		inputTableRow: (row: number) => this.getters.outputTableRows().eq(row),
+		inputTbodyCell: (row: number, col: number) => this.getters.outputTableRow(row).find('td').eq(col),
+		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input'),
+		nodeParameters: () => cy.getByTestId('node-parameters'),
 		parameterInput: (parameterName: string) => cy.getByTestId(`parameter-input-${parameterName}`),
 		nodeNameContainer: () => cy.getByTestId('node-title-container'),
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
+		executePrevious: () => cy.getByTestId('execute-previous-node'),
 		httpRequestNotice: () => cy.getByTestId('node-parameters-http-notice'),
 	};
 
@@ -57,12 +64,33 @@ export class NDV extends BasePage {
 			this.getters.parameterInput(parameterName).type(content);
 		},
 		selectOptionInParameterDropdown: (parameterName: string, content: string) => {
-			this.getters.parameterInput(parameterName).find('.option-headline').contains(content).click();
+			this.getters
+				.parameterInput(parameterName)
+				.find('.option-headline')
+				.contains(content)
+				.click();
 		},
 		rename: (newName: string) => {
 			this.getters.nodeNameContainer().click();
-			this.getters.nodeRenameInput().should('be.visible').type('{selectall}').type(newName);
+			this.getters.nodeRenameInput()
+				.should('be.visible')
+				.type('{selectall}')
+				.type(newName);
 			cy.get('body').type('{enter}');
 		},
+		executePrevious: () => {
+			this.getters.executePrevious().click();
+		},
+		mapDataFromHeader: (col: number, parameterName: string) => {
+			const draggable = `[data-test-id="ndv-input-panel"] [data-test-id="ndv-data-container"] table th:nth-child(${col})`;
+			const droppable = `[data-test-id="parameter-input-${parameterName}"]`;
+			cy.draganddrop(draggable, droppable);
+		},
+		switchInputMode: (type: 'Schema' | 'Table' | 'JSON' | 'Binary') => {
+			this.getters.inputDisplayMode().find('label').contains(type).click();
+		},
+		switchOutputMode: (type: 'Schema' | 'Table' | 'JSON' | 'Binary') => {
+			this.getters.outputDisplayMode().find('label').contains(type).click();
+		},
 	};
 }
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index a5d9cd24a84df1..eade8241158e82 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -173,7 +173,8 @@ Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) =>
 	});
 });
 
-Cypress.Commands.add('drag', (selector, xDiff, yDiff) => {
+Cypress.Commands.add('drag', (selector, pos) => {
+	const [xDiff, yDiff] = pos;
 	const element = cy.get(selector);
 	element.should('exist');
 
@@ -188,3 +189,21 @@ Cypress.Commands.add('drag', (selector, xDiff, yDiff) => {
 	});
 	element.trigger('mouseup');
 });
+
+Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
+	cy.get(draggableSelector).should('exist');
+	cy.get(droppableSelector).should('exist');
+
+	const droppableEl = Cypress.$(droppableSelector)[0];
+	const coords = droppableEl.getBoundingClientRect();
+
+	const pageX = coords.left + coords.width / 2;
+	const pageY = coords.top + coords.height / 2;
+
+	cy.get(draggableSelector).realMouseDown();
+	cy.get(droppableSelector).realMouseMove(pageX, pageY)
+		.realHover()
+		.realMouseUp();
+});
+
+
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index abcdbd8d70f4d2..f0417ce8cc1c59 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -32,7 +32,8 @@ declare global {
 			grantBrowserPermissions(...permissions: string[]): void;
 			readClipboard(): Chainable<string>;
 			paste(pastePayload: string): void;
-			drag(selector: string, xDiff: number, yDiff: number): void;
+			drag(selector: string, target: [number, number]): void;
+			draganddrop(selector: string, target: string): void;
 		}
 	}
 }
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 07946edc4716d4..3bb7b2458e27bb 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -85,6 +85,7 @@
 						:label="$locale.baseText('ndv.input.noOutputData.executePrevious')"
 						@execute="onNodeExecute"
 						telemetrySource="inputs"
+						data-test-id="execute-previous-node"
 					/>
 				</n8n-tooltip>
 				<n8n-text v-if="!readOnly" tag="div" size="small">
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index 5ff5e96cc0e8ea..f48ee8f1916c51 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -172,7 +172,7 @@
 		</div>
 
 		<div :class="$style['data-container']" ref="dataContainer" data-test-id="ndv-data-container">
-			<div v-if="isExecuting" :class="$style.center">
+			<div v-if="isExecuting" :class="$style.center" data-test-id="ndv-executing">
 				<div :class="$style.spinner"><n8n-spinner type="ring" /></div>
 				<n8n-text>{{ executingMessage }}</n8n-text>
 			</div>

From 26b69b5ffc308185b82d50b9cb0239f7ea9e55f9 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 7 Feb 2023 11:27:37 +0200
Subject: [PATCH 108/358] test(Item Lists Node): Unit tests (no-changelog)

---
 package.json                                  |   2 +-
 .../ItemLists/test/node/ItemLists.test.ts     |   5 +
 .../test/node/workflow.aggregateItems.json    | 223 +++++++++++
 .../ItemLists/test/node/workflow.limit.json   |  97 +++++
 .../test/node/workflow.removeDuplicates.json  | 177 +++++++++
 .../ItemLists/test/node/workflow.sort.json    | 216 +++++++++++
 .../test/node/workflow.splitOutItems.json     | 360 ++++++++++++++++++
 .../test/node/workflow.summarize.json         | 299 +++++++++++++++
 .../nodes-base/test/nodes/ExecuteWorkflow.ts  |   3 +-
 packages/nodes-base/test/nodes/Helpers.ts     |  71 +++-
 10 files changed, 1450 insertions(+), 3 deletions(-)
 create mode 100644 packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts
 create mode 100644 packages/nodes-base/nodes/ItemLists/test/node/workflow.aggregateItems.json
 create mode 100644 packages/nodes-base/nodes/ItemLists/test/node/workflow.limit.json
 create mode 100644 packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates.json
 create mode 100644 packages/nodes-base/nodes/ItemLists/test/node/workflow.sort.json
 create mode 100644 packages/nodes-base/nodes/ItemLists/test/node/workflow.splitOutItems.json
 create mode 100644 packages/nodes-base/nodes/ItemLists/test/node/workflow.summarize.json

diff --git a/package.json b/package.json
index 7c10921722918a..b859df9a600245 100644
--- a/package.json
+++ b/package.json
@@ -77,4 +77,4 @@
       "element-ui@2.15.12": "patches/element-ui@2.15.12.patch"
     }
   }
-}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts b/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts
new file mode 100644
index 00000000000000..715ee90b71b0c6
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/ItemLists.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test ItemLists Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.aggregateItems.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.aggregateItems.json
new file mode 100644
index 00000000000000..9024d37b34b57a
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.aggregateItems.json
@@ -0,0 +1,223 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-440, 260]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, char: 'a'},\n  {id: 2, char: 'b'},\n  {id: 3, char: 'c'},\n  {id: 4, char: 'd'},\n  {id: 5, char: 'e'},\n];"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 260]
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"fieldsToAggregate": {
+					"fieldToAggregate": [
+						{
+							"fieldToAggregate": "id",
+							"renameField": true,
+							"outputFieldName": "data"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "d95ca3a3-fb43-4037-846e-b87103dec1a3",
+			"name": "fields aggregate and rename",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 0]
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"aggregate": "aggregateAllItemData"
+			},
+			"id": "4c1bc7be-7611-418d-aad5-8642b1cc0781",
+			"name": "aggregate all fields into list",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 320]
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"aggregate": "aggregateAllItemData",
+				"include": "specifiedFields",
+				"fieldsToInclude": {
+					"fields": [
+						{
+							"fieldName": "id"
+						}
+					]
+				}
+			},
+			"id": "951de23c-2018-437b-961e-8ae7d7fd1a82",
+			"name": "aggregate selected fields into list",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 500]
+		},
+		{
+			"parameters": {
+				"operation": "aggregateItems",
+				"aggregate": "aggregateAllItemData",
+				"destinationFieldName": "output",
+				"include": "allFieldsExcept",
+				"fieldsToExclude": {
+					"fields": [
+						{
+							"fieldName": "char"
+						}
+					]
+				}
+			},
+			"id": "b62c02ee-5edb-473d-a755-7fb8700641fa",
+			"name": "aggregate all fields except selected into list",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 700]
+		}
+	],
+	"pinData": {
+		"fields aggregate and rename": [
+			{
+				"json": {
+					"data": [1, 2, 3, 4, 5]
+				}
+			}
+		],
+		"aggregate all fields into list": [
+			{
+				"json": {
+					"data": [
+						{
+							"id": 1,
+							"char": "a"
+						},
+						{
+							"id": 2,
+							"char": "b"
+						},
+						{
+							"id": 3,
+							"char": "c"
+						},
+						{
+							"id": 4,
+							"char": "d"
+						},
+						{
+							"id": 5,
+							"char": "e"
+						}
+					]
+				}
+			}
+		],
+		"aggregate selected fields into list": [
+			{
+				"json": {
+					"data": [
+						{
+							"id": 1
+						},
+						{
+							"id": 2
+						},
+						{
+							"id": 3
+						},
+						{
+							"id": 4
+						},
+						{
+							"id": 5
+						}
+					]
+				}
+			}
+		],
+		"aggregate all fields except selected into list": [
+			{
+				"json": {
+					"output": [
+						{
+							"id": 1
+						},
+						{
+							"id": 2
+						},
+						{
+							"id": 3
+						},
+						{
+							"id": 4
+						},
+						{
+							"id": 5
+						}
+					]
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "fields aggregate and rename",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "aggregate all fields into list",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "aggregate selected fields into list",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "aggregate all fields except selected into list",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "9bf7c52b-b118-4dad-bfef-7db41828393b",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.limit.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.limit.json
new file mode 100644
index 00000000000000..f1d18040e26d18
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.limit.json
@@ -0,0 +1,97 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "bd7af0bb-de39-44b4-ac11-eb1d22f5e8d7",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [260, 180]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {entry: 1},\n  {entry: 2},\n  {entry: 3},\n  {entry: 4},\n  {entry: 5},\n];"
+			},
+			"id": "21185d7a-f0c1-49a0-9c2d-f0f198ceea7e",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [520, 180]
+		},
+		{
+			"parameters": {
+				"operation": "limit"
+			},
+			"id": "7cc02cc4-1f5f-489a-81e2-4c96b3bdf221",
+			"name": "Item Lists limit first",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [740, 80]
+		},
+		{
+			"parameters": {
+				"operation": "limit",
+				"keep": "lastItems"
+			},
+			"id": "2bf79d53-7a0b-4716-aa09-55ad43d306ae",
+			"name": "Item Lists limit last",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [740, 300]
+		}
+	],
+	"pinData": {
+		"Item Lists limit first": [
+			{
+				"json": {
+					"entry": 1
+				}
+			}
+		],
+		"Item Lists limit last": [
+			{
+				"json": {
+					"entry": 5
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists limit first",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists limit last",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "5036d554-1ba4-4b5f-ba9f-1de6df09e807",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates.json
new file mode 100644
index 00000000000000..723deb2240c7ed
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.removeDuplicates.json
@@ -0,0 +1,177 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "c36aef04-b8ee-4f50-938b-ec64c4f78c97",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [860, 340]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {entry: 1, data: 'a', char: 'a'},\n  {entry: 1, data: 'b', char: 'a'},\n  {entry: 1, data: 'a', char: 'a'},\n  {entry: 4, data: 'd', char: 'a'},\n  {entry: 5, data: 'e', char: 'a'},\n];"
+			},
+			"id": "79f44614-aaf8-421a-9cad-2d92445a5dd5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1120, 340]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates",
+				"compare": "allFieldsExcept",
+				"fieldsToExclude": {
+					"fields": [
+						{
+							"fieldName": "data"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "c1f69c55-caba-4d44-b209-445f4bef3756",
+			"name": "Item Lists remove duplicates exclude",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [1320, 340]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates",
+				"compare": "selectedFields",
+				"fieldsToCompare": {
+					"fields": [
+						{
+							"fieldName": "char"
+						}
+					]
+				},
+				"options": {
+					"removeOtherFields": true
+				}
+			},
+			"id": "7b9f0a7c-25f0-4d1f-b30f-666ddcaf5d98",
+			"name": "Item Lists remove duplicates selected",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [1340, 560]
+		},
+		{
+			"parameters": {
+				"operation": "removeDuplicates"
+			},
+			"id": "9762644f-34cb-48ca-b8a3-e0aa0ca05d4a",
+			"name": "Item Lists remove duplicates",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [1320, 120]
+		}
+	],
+	"pinData": {
+		"Item Lists remove duplicates selected": [
+			{
+				"json": {
+					"char": "a"
+				}
+			}
+		],
+		"Item Lists remove duplicates exclude": [
+			{
+				"json": {
+					"entry": 1,
+					"data": "a",
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"entry": 4,
+					"data": "d",
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"entry": 5,
+					"data": "e",
+					"char": "a"
+				}
+			}
+		],
+		"Item Lists remove duplicates": [
+			{
+				"json": {
+					"entry": 1,
+					"data": "a",
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"entry": 1,
+					"data": "b",
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"entry": 4,
+					"data": "d",
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"entry": 5,
+					"data": "e",
+					"char": "a"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists remove duplicates",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists remove duplicates exclude",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists remove duplicates selected",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "9b7b1482-ceaa-4878-8091-d6fbfbe58a79",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.sort.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.sort.json
new file mode 100644
index 00000000000000..2f95bee14e5773
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.sort.json
@@ -0,0 +1,216 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-440, 300]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 3, char: 'c'},\n  {id: 4, char: 'd'},\n  {id: 5, char: 'e'},\n  {id: 1, char: 'a'},\n  {id: 2, char: 'b'},\n];"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 300]
+		},
+		{
+			"parameters": {
+				"operation": "sort",
+				"sortFieldsUi": {
+					"sortField": [
+						{
+							"fieldName": "char",
+							"order": "descending"
+						},
+						{
+							"fieldName": "id",
+							"order": "descending"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "20031848-2374-45b2-98db-69d7b8d055ad",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 300]
+		},
+		{
+			"parameters": {
+				"operation": "sort",
+				"sortFieldsUi": {
+					"sortField": [
+						{
+							"fieldName": "id"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "93dd8c32-21e1-4762-a340-b3e8c6866811",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 120]
+		},
+		{
+			"parameters": {
+				"operation": "sort",
+				"type": "code",
+				"code": "// The two items to compare are in the variables a and b\n// Access the fields in a.json and b.json\n// Return -1 if a should go before b\n// Return 1 if b should go before a\n// Return 0 if there's no difference\n\nfieldName = 'id';\n\nif (a.json[fieldName] < b.json[fieldName]) {\n\t\treturn -1;\n}\nif (a.json[fieldName] > b.json[fieldName]) {\n\t\treturn 1;\n}\nreturn 0;"
+			},
+			"id": "112c72e6-b5d9-4d6d-87fc-2621fbaa5bf7",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 500]
+		}
+	],
+	"pinData": {
+		"Item Lists": [
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			}
+		],
+		"Item Lists1": [
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			},
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			}
+		],
+		"Item Lists2": [
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "6f896427-a3be-44bc-898f-c1a6f58fa1e1",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.splitOutItems.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.splitOutItems.json
new file mode 100644
index 00000000000000..2e398783ff8422
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.splitOutItems.json
@@ -0,0 +1,360 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-400, 400]
+		},
+		{
+			"parameters": {
+				"jsCode": "return { \ndata:[\n  {id: 3, char: 'c'},\n  {id: 4, char: 'd'},\n  {id: 5, char: 'e'},\n  {id: 1, char: 'a'},\n  {id: 2, char: 'b'},\n],\ndata2: [\n  {text: 'foo'},\n],\ndata3: [\n  {text: 'bar'},\n],\n};"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 400]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {}
+			},
+			"id": "e7eac465-8fe6-498c-9942-ebd47df537c1",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 160]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"include": "allOtherFields",
+				"options": {}
+			},
+			"id": "09b7fe15-dbad-4ca6-bf1e-3093139d14e5",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 320]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"include": "selectedOtherFields",
+				"fieldsToInclude": {
+					"fields": [
+						{
+							"fieldName": "data3"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "7ea63dc7-8141-4233-af47-9894919c7fe4",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 480]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {
+					"destinationFieldName": "output"
+				}
+			},
+			"id": "89c3c1b4-9577-480a-931f-3b34450b23cb",
+			"name": "Item Lists3",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [80, 660]
+		}
+	],
+	"pinData": {
+		"Item Lists": [
+			{
+				"json": {
+					"id": 3,
+					"char": "c"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"char": "d"
+				}
+			},
+			{
+				"json": {
+					"id": 5,
+					"char": "e"
+				}
+			},
+			{
+				"json": {
+					"id": 1,
+					"char": "a"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"char": "b"
+				}
+			}
+		],
+		"Item Lists1": [
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 3,
+						"char": "c"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 4,
+						"char": "d"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 5,
+						"char": "e"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 1,
+						"char": "a"
+					}
+				}
+			},
+			{
+				"json": {
+					"data2": [
+						{
+							"text": "foo"
+						}
+					],
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 2,
+						"char": "b"
+					}
+				}
+			}
+		],
+		"Item Lists2": [
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 3,
+						"char": "c"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 4,
+						"char": "d"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 5,
+						"char": "e"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 1,
+						"char": "a"
+					}
+				}
+			},
+			{
+				"json": {
+					"data3": [
+						{
+							"text": "bar"
+						}
+					],
+					"data": {
+						"id": 2,
+						"char": "b"
+					}
+				}
+			}
+		],
+		"Item Lists3": [
+			{
+				"json": {
+					"output": {
+						"id": 3,
+						"char": "c"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 4,
+						"char": "d"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 5,
+						"char": "e"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 1,
+						"char": "a"
+					}
+				}
+			},
+			{
+				"json": {
+					"output": {
+						"id": 2,
+						"char": "b"
+					}
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "9230f580-6f41-47c9-9949-bf258fc3fa47",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ItemLists/test/node/workflow.summarize.json b/packages/nodes-base/nodes/ItemLists/test/node/workflow.summarize.json
new file mode 100644
index 00000000000000..75f008cc2ce56c
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/test/node/workflow.summarize.json
@@ -0,0 +1,299 @@
+{
+	"name": "itemLists test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "6c90bf81-0c0e-4c5f-9f0c-297f06d9668a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [-400, 420]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    category: 'red',\n    text: 'foo',\n    char: 'a',\n    value: 1,\n  },\n  {\n    category: 'blue',\n    text: 'spam',\n    char: 'b',\n    value: 2,\n  },\n  {\n    category: 'green',\n    text: 'bar',\n    char: 'c',\n    value: 3,\n  },\n  {\n    category: 'red',\n    text: 'foo',\n    char: 'a',\n    value: 4,\n  },\n  {\n    category: 'red',\n    text: 'bar',\n    char: 'a',\n    value: 5,\n  },\n  {\n    category: 'blue',\n    text: 'foo',\n    char: 'a',\n    value: 6,\n  },\n  {\n    category: 'blue',\n    text: 'foo',\n    char: 'a',\n    value: 7,\n  },\n];"
+			},
+			"id": "2e0011d5-c6a0-4a40-ab8c-9d011cde40d5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [-180, 420]
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "append",
+							"field": "char"
+						},
+						{
+							"field": "char"
+						},
+						{
+							"aggregation": "countUnique",
+							"field": "char"
+						},
+						{
+							"aggregation": "concatenate",
+							"field": "char",
+							"separateBy": ", "
+						}
+					]
+				},
+				"fieldsToSplitBy": "category, text",
+				"options": {}
+			},
+			"id": "1dedf668-b766-4283-9efd-90db28404f0b",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [40, 220]
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "append",
+							"field": "char"
+						},
+						{
+							"field": "char"
+						},
+						{
+							"aggregation": "countUnique",
+							"field": "char"
+						},
+						{
+							"aggregation": "concatenate",
+							"field": "char",
+							"separateBy": ", "
+						}
+					]
+				},
+				"fieldsToSplitBy": "category, text",
+				"options": {
+					"outputFormat": "singleItem"
+				}
+			},
+			"id": "8fd0f819-226c-4b29-87c7-b724dd72605c",
+			"name": "Item Lists1",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [40, 420]
+		},
+		{
+			"parameters": {
+				"operation": "summarize",
+				"fieldsToSummarize": {
+					"values": [
+						{
+							"aggregation": "average",
+							"field": "value"
+						},
+						{
+							"aggregation": "max",
+							"field": "value"
+						},
+						{
+							"aggregation": "min",
+							"field": "value"
+						},
+						{
+							"aggregation": "max",
+							"field": "value"
+						},
+						{
+							"aggregation": "sum",
+							"field": "value"
+						},
+						{
+							"aggregation": "append",
+							"field": "value"
+						}
+					]
+				},
+				"fieldsToSplitBy": "category",
+				"options": {}
+			},
+			"id": "33e0367d-42d9-4f82-8fc8-8e2019aa3734",
+			"name": "Item Lists2",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [40, 620]
+		}
+	],
+	"pinData": {
+		"Item Lists": [
+			{
+				"json": {
+					"category": "red",
+					"text": "foo",
+					"appended_char": ["a", "a"],
+					"count_char": 2,
+					"unique_count_char": 1,
+					"concatenated_char": "a, a"
+				}
+			},
+			{
+				"json": {
+					"category": "red",
+					"text": "bar",
+					"appended_char": ["a"],
+					"count_char": 1,
+					"unique_count_char": 1,
+					"concatenated_char": "a"
+				}
+			},
+			{
+				"json": {
+					"category": "blue",
+					"text": "spam",
+					"appended_char": ["b"],
+					"count_char": 1,
+					"unique_count_char": 1,
+					"concatenated_char": "b"
+				}
+			},
+			{
+				"json": {
+					"category": "blue",
+					"text": "foo",
+					"appended_char": ["a", "a"],
+					"count_char": 2,
+					"unique_count_char": 1,
+					"concatenated_char": "a, a"
+				}
+			},
+			{
+				"json": {
+					"category": "green",
+					"text": "bar",
+					"appended_char": ["c"],
+					"count_char": 1,
+					"unique_count_char": 1,
+					"concatenated_char": "c"
+				}
+			}
+		],
+		"Item Lists1": [
+			{
+				"json": {
+					"red": {
+						"foo": {
+							"appended_char": ["a", "a"],
+							"count_char": 2,
+							"unique_count_char": 1,
+							"concatenated_char": "a, a"
+						},
+						"bar": {
+							"appended_char": ["a"],
+							"count_char": 1,
+							"unique_count_char": 1,
+							"concatenated_char": "a"
+						}
+					},
+					"blue": {
+						"spam": {
+							"appended_char": ["b"],
+							"count_char": 1,
+							"unique_count_char": 1,
+							"concatenated_char": "b"
+						},
+						"foo": {
+							"appended_char": ["a", "a"],
+							"count_char": 2,
+							"unique_count_char": 1,
+							"concatenated_char": "a, a"
+						}
+					},
+					"green": {
+						"bar": {
+							"appended_char": ["c"],
+							"count_char": 1,
+							"unique_count_char": 1,
+							"concatenated_char": "c"
+						}
+					}
+				}
+			}
+		],
+		"Item Lists2": [
+			{
+				"json": {
+					"category": "red",
+					"average_value": 3.3333333333333335,
+					"max_value": 5,
+					"min_value": 1,
+					"sum_value": 10,
+					"appended_value": [1, 4, 5]
+				}
+			},
+			{
+				"json": {
+					"category": "blue",
+					"average_value": 5,
+					"max_value": 7,
+					"min_value": 2,
+					"sum_value": 15,
+					"appended_value": [2, 6, 7]
+				}
+			},
+			{
+				"json": {
+					"category": "green",
+					"average_value": 3,
+					"max_value": 3,
+					"min_value": 3,
+					"sum_value": 3,
+					"appended_value": [3]
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Item Lists2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "bee0d911-844d-4fe6-bd52-a1716dd74dd8",
+	"id": "105",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
index a9b62a35ab7865..cf0b5dd01e1f8d 100644
--- a/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
+++ b/packages/nodes-base/test/nodes/ExecuteWorkflow.ts
@@ -1,8 +1,9 @@
 import { WorkflowExecute } from 'n8n-core';
 import { createDeferredPromise, INodeTypes, IRun, Workflow } from 'n8n-workflow';
 import * as Helpers from './Helpers';
+import type { WorkflowTestData } from './types';
 
-export async function executeWorkflow(testData, nodeTypes: INodeTypes) {
+export async function executeWorkflow(testData: WorkflowTestData, nodeTypes: INodeTypes) {
 	const executionMode = 'manual';
 	const workflowInstance = new Workflow({
 		id: 'test',
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index da548f700219c6..5b9bf78069869f 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -1,8 +1,9 @@
-import { readFileSync } from 'fs';
+import { readFileSync, readdirSync } from 'fs';
 import { Credentials, loadClassInIsolation } from 'n8n-core';
 import {
 	ICredentialDataDecryptedObject,
 	ICredentialsHelper,
+	IDataObject,
 	IDeferredPromise,
 	IExecuteWorkflowInfo,
 	IHttpRequestHelper,
@@ -23,6 +24,7 @@ import {
 	NodeHelpers,
 	WorkflowHooks,
 } from 'n8n-workflow';
+import { executeWorkflow } from './ExecuteWorkflow';
 import { WorkflowTestData } from './types';
 import path from 'path';
 
@@ -214,3 +216,70 @@ export function getResultNodeData(result: IRun, testData: WorkflowTestData) {
 export function readJsonFileSync(path: string) {
 	return JSON.parse(readFileSync(path, 'utf-8'));
 }
+
+export const equalityTest = async (testData: WorkflowTestData, types: INodeTypes) => {
+	// execute workflow
+	const { result } = await executeWorkflow(testData, types);
+
+	// check if result node data matches expected test data
+	const resultNodeData = getResultNodeData(result, testData);
+
+	resultNodeData.forEach(({ nodeName, resultData }) => {
+		return expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+	});
+
+	expect(result.finished).toEqual(true);
+};
+
+export const workflowToTests = (workflowFiles: string[]) => {
+	const testCases: WorkflowTestData[] = [];
+	for (const filePath of workflowFiles) {
+		const description = filePath.replace('.json', '');
+		const workflowData = readJsonFileSync(filePath);
+		if (workflowData.pinData === undefined) {
+			throw new Error('Workflow data does not contain pinData');
+		}
+		const nodeData = Object.keys(workflowData.pinData).reduce(
+			(acc, key) => {
+				const data = (workflowData.pinData[key] as IDataObject[]).map((item) => item.json);
+				acc[key] = [data as IDataObject[]];
+				return acc;
+			},
+			{} as {
+				[key: string]: IDataObject[][];
+			},
+		);
+
+		delete workflowData.pinData;
+
+		const input = { workflowData };
+		const output = { nodeData };
+
+		testCases.push({ description, input, output });
+	}
+	return testCases;
+};
+
+export const testWorkflows = (workflows: string[]) => {
+	const tests = workflowToTests(workflows);
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => equalityTest(testData, nodeTypes));
+	}
+};
+
+export const getWorkflowFilenames = (dirname: string) => {
+	const workflows: string[] = [];
+
+	const filenames = readdirSync(dirname);
+	const testFolder = dirname.split(`${path.sep}nodes-base${path.sep}`)[1];
+	filenames.forEach((file) => {
+		if (file.includes('.json')) {
+			workflows.push(path.join(testFolder, file));
+		}
+	});
+
+	return workflows;
+};

From 58b0cf66b5b1ea461ce869a248b8d65d0013ae21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 7 Feb 2023 12:10:16 +0100
Subject: [PATCH 109/358] fix(core): Do not block app startup by telemetry
 (no-changelog) (#5387)

---
 packages/cli/src/Server.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index cc4b05a9742e69..6cc6fe24ae7deb 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1494,10 +1494,11 @@ export async function start(): Promise<void> {
 	// Set up event handling
 	initEvents();
 
-	const workflow = await Db.collections.Workflow.findOne({
+	void Db.collections.Workflow.findOne({
 		select: ['createdAt'],
 		order: { createdAt: 'ASC' },
 		where: {},
-	});
-	await InternalHooksManager.getInstance().onServerStarted(diagnosticInfo, workflow?.createdAt);
+	}).then(async (workflow) =>
+		InternalHooksManager.getInstance().onServerStarted(diagnosticInfo, workflow?.createdAt),
+	);
 }

From dd652c0b0d0fa820b3339b747cc175dda648290b Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Tue, 7 Feb 2023 12:41:44 +0100
Subject: [PATCH 110/358] ci: Add E2E test for scheduled trigger (#5391)

* scheduler e2e test and switch to main mode

* adjust e2e options

* rolling back config changes
---
 cypress/e2e/15-scheduler-node.cy.ts | 75 +++++++++++++++++++++++++++++
 packages/cli/src/config/index.ts    |  1 +
 2 files changed, 76 insertions(+)
 create mode 100644 cypress/e2e/15-scheduler-node.cy.ts

diff --git a/cypress/e2e/15-scheduler-node.cy.ts b/cypress/e2e/15-scheduler-node.cy.ts
new file mode 100644
index 00000000000000..65dae8f4d7e1df
--- /dev/null
+++ b/cypress/e2e/15-scheduler-node.cy.ts
@@ -0,0 +1,75 @@
+import { WorkflowPage, WorkflowsPage, NDV } from '../pages';
+
+const workflowsPage = new WorkflowsPage();
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+
+describe('Schedule Trigger node', async () => {
+	beforeEach(() => {
+		cy.resetAll();
+		cy.skipSetup();
+	});
+
+	it('should execute and return the execution timestamp', () => {
+		cy.visit(workflowsPage.url);
+
+		workflowsPage.actions.createWorkflowFromCard();
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
+		workflowPage.actions.openNode('Schedule Trigger');
+		ndv.actions.execute();
+		ndv.getters.outputPanel().contains('timestamp');
+		ndv.getters.backToCanvas().click();
+	});
+
+	it('should execute once per second when activated', () => {
+		cy.visit(workflowsPage.url);
+
+		workflowsPage.actions.createWorkflowFromCard();
+		workflowPage.actions.renameWorkflow('Schedule Trigger Workflow');
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
+		workflowPage.actions.openNode('Schedule Trigger');
+
+		cy.getByTestId('parameter-input-field').click();
+		cy.getByTestId('parameter-input-field')
+			.find('.el-select-dropdown')
+			.find('.option-headline')
+			.contains('Seconds')
+			.click();
+		cy.getByTestId('parameter-input-secondsInterval').clear().type('1');
+
+		ndv.getters.backToCanvas().click();
+		workflowPage.actions.saveWorkflowOnButtonClick();
+		workflowPage.actions.activateWorkflow();
+		workflowPage.getters.activatorSwitch().should('have.class', 'is-checked');
+
+		cy.request("GET", '/rest/workflows').then((response) => {
+			expect(response.status).to.eq(200);
+			expect(response.body.data).to.have.length(1);
+			const workflowId = response.body.data[0].id.toString();
+			expect(workflowId).to.not.be.empty;
+			return workflowId;
+		}).then((workflowId) => {
+			cy.wait(1200);
+			cy.request("GET", '/rest/executions').then((response) => {
+				expect(response.status).to.eq(200);
+				expect(response.body.data.results.length).to.be.greaterThan(0);
+				const matchingExecutions = response.body.data.results.filter((execution: any) => execution.workflowId === workflowId);
+				expect(matchingExecutions).to.have.length(1);
+				return workflowId;
+			}).then((workflowId) => {
+				cy.wait(1200);
+				cy.request("GET", '/rest/executions').then((response) => {
+					expect(response.status).to.eq(200);
+					expect(response.body.data.results.length).to.be.greaterThan(0);
+					const matchingExecutions = response.body.data.results.filter((execution: any) => execution.workflowId === workflowId);
+					expect(matchingExecutions).to.have.length(2);
+				}).then(()=>{
+					workflowPage.actions.activateWorkflow();
+					workflowPage.getters.activatorSwitch().should('not.have.class', 'is-checked');
+					cy.visit(workflowsPage.url);
+					workflowsPage.actions.deleteWorkFlow('Schedule Trigger Workflow');
+				});
+			});
+		});
+	});
+});
diff --git a/packages/cli/src/config/index.ts b/packages/cli/src/config/index.ts
index a797125c17afbe..b2ed5a245e73c9 100644
--- a/packages/cli/src/config/index.ts
+++ b/packages/cli/src/config/index.ts
@@ -11,6 +11,7 @@ if (inE2ETests) {
 	process.env = {
 		E2E_TESTS: 'true',
 		N8N_USER_FOLDER: mkdtempSync(join(tmpdir(), 'n8n-e2e-')),
+		EXECUTIONS_PROCESS: 'main',
 		N8N_DIAGNOSTICS_ENABLED: 'false',
 		N8N_PUBLIC_API_DISABLED: 'true',
 		EXTERNAL_FRONTEND_HOOKS_URLS: '',

From 3a435f7057ac4e48945bd1b3a4efea0397f026a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 7 Feb 2023 15:14:59 +0100
Subject: [PATCH 111/358] fix(core): Disable transactions on sqlite migrations
 that use `PRAGMA foreign_keys` (#5392)

`PRAGMA foreign_keys` is [a no-op within a sqlite transaction](https://www.sqlite.org/pragma.html#pragma_foreign_keys).
This causes cascade deletes to happen when we create a new user table, and drop the old user table.
---
 .../migrations/sqlite/1652367743993-AddUserSettings.ts         | 2 ++
 .../migrations/sqlite/1652905585850-AddAPIKeyColumn.ts         | 3 +++
 .../sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts      | 3 +++
 3 files changed, 8 insertions(+)

diff --git a/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts b/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts
index 780a4cc6449e58..111e3545bc1b45 100644
--- a/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1652367743993-AddUserSettings.ts
@@ -5,6 +5,8 @@ import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
 export class AddUserSettings1652367743993 implements MigrationInterface {
 	name = 'AddUserSettings1652367743993';
 
+	transaction = false;
+
 	public async up(queryRunner: QueryRunner): Promise<void> {
 		logMigrationStart(this.name);
 
diff --git a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts b/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts
index 0013980a9a5b5f..3ec1d85c989759 100644
--- a/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1652905585850-AddAPIKeyColumn.ts
@@ -1,9 +1,12 @@
 import { MigrationInterface, QueryRunner } from 'typeorm';
 import config from '@/config';
 import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+
 export class AddAPIKeyColumn1652905585850 implements MigrationInterface {
 	name = 'AddAPIKeyColumn1652905585850';
 
+	transaction = false;
+
 	async up(queryRunner: QueryRunner): Promise<void> {
 		logMigrationStart(this.name);
 
diff --git a/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts b/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts
index 448a29b9b265db..d9f0fd2d6c7371 100644
--- a/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1673268682475-DeleteExecutionsWithWorkflows.ts
@@ -3,6 +3,9 @@ import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/mi
 
 export class DeleteExecutionsWithWorkflows1673268682475 implements MigrationInterface {
 	name = 'DeleteExecutionsWithWorkflows1673268682475';
+
+	transaction = false;
+
 	public async up(queryRunner: QueryRunner): Promise<void> {
 		logMigrationStart(this.name);
 		const tablePrefix = getTablePrefix();

From 7e2f2f7453a50d0fbf483b17d3aa4e758b49489d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 7 Feb 2023 15:49:35 +0100
Subject: [PATCH 112/358] refactor(core): Add unit tests for all external auth
 middlewares (no-changelog) (#5386)

---
 package.json                                  |   5 +-
 packages/cli/package.json                     |   9 +-
 packages/cli/src/Server.ts                    | 153 +------
 packages/cli/src/api/workflowStats.api.ts     |   2 +-
 packages/cli/src/middlewares/basicAuth.ts     |  57 +++
 .../cli/src/middlewares/externalJWTAuth.ts    |  89 ++++
 .../test/unit/middlewares/basicAuth.test.ts   |  42 ++
 .../unit/middlewares/externalJWTAuth.test.ts  |  47 ++
 packages/nodes-base/package.json              |   4 +-
 pnpm-lock.yaml                                | 426 +++++++++---------
 10 files changed, 464 insertions(+), 370 deletions(-)
 create mode 100644 packages/cli/src/middlewares/basicAuth.ts
 create mode 100644 packages/cli/src/middlewares/externalJWTAuth.ts
 create mode 100644 packages/cli/test/unit/middlewares/basicAuth.test.ts
 create mode 100644 packages/cli/test/unit/middlewares/externalJWTAuth.test.ts

diff --git a/package.json b/package.json
index b859df9a600245..c1cf9d3c291856 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "@n8n_io/eslint-config": "*",
     "@ngneat/falso": "^6.1.0",
     "@types/jest": "^29.2.2",
-    "@types/node": "^16.11.22",
+    "@types/supertest": "^2.0.12",
     "cross-env": "^7.0.3",
     "cypress": "^10.0.3",
     "cypress-real-events": "^1.7.6",
@@ -53,7 +53,7 @@
     "rimraf": "^3.0.2",
     "run-script-os": "^1.0.7",
     "start-server-and-test": "^1.14.0",
-    "supertest": "^6.2.2",
+    "supertest": "^6.3.3",
     "ts-jest": "^29.0.3",
     "tsc-watch": "^5.0.3",
     "turbo": "1.6.3",
@@ -65,6 +65,7 @@
       "vue-demi"
     ],
     "overrides": {
+      "@types/node": "^16.18.12",
       "browserslist": "^4.21.4",
       "ejs": "^3.1.8",
       "fork-ts-checker-webpack-plugin": "^6.0.4",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 450b42c4758c90..f159277ed7fd19 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -63,7 +63,7 @@
   "devDependencies": {
     "@apidevtools/swagger-cli": "4.0.0",
     "@oclif/dev-cli": "^1.22.2",
-    "@types/basic-auth": "^1.1.2",
+    "@types/basic-auth": "^1.1.3",
     "@types/bcryptjs": "^2.4.2",
     "@types/body-parser-xml": "^2.0.2",
     "@types/compression": "1.0.1",
@@ -72,7 +72,7 @@
     "@types/cookie-parser": "^1.4.2",
     "@types/express": "^4.17.6",
     "@types/json-diff": "^0.5.1",
-    "@types/jsonwebtoken": "^9.0.0",
+    "@types/jsonwebtoken": "^9.0.1",
     "@types/localtunnel": "^1.9.0",
     "@types/lodash.get": "^4.4.6",
     "@types/lodash.intersection": "^4.4.7",
@@ -94,16 +94,15 @@
     "@types/send": "^0.17.1",
     "@types/shelljs": "^0.8.11",
     "@types/superagent": "4.1.13",
-    "@types/supertest": "^2.0.11",
     "@types/swagger-ui-express": "^4.1.3",
     "@types/syslog-client": "^1.1.2",
     "@types/uuid": "^8.3.2",
     "@types/validator": "^13.7.0",
     "@types/yamljs": "^0.2.31",
     "concurrently": "^5.1.0",
+    "mock-jwks": "^1.0.9",
     "nodemon": "^2.0.2",
     "run-script-os": "^1.0.7",
-    "supertest": "^6.2.2",
     "ts-node": "^9.1.1",
     "tsc-alias": "^1.7.0",
     "tsconfig-paths": "^3.14.1"
@@ -147,7 +146,7 @@
     "json-diff": "^0.5.4",
     "jsonschema": "^1.4.1",
     "jsonwebtoken": "^9.0.0",
-    "jwks-rsa": "~1.12.1",
+    "jwks-rsa": "^3.0.1",
     "ldapts": "^4.2.2",
     "localtunnel": "^2.0.0",
     "lodash.get": "^4.4.2",
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 6cc6fe24ae7deb..f9382fba1ae929 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -42,9 +42,6 @@ import type { AxiosRequestConfig } from 'axios';
 import axios from 'axios';
 import type { RequestOptions } from 'oauth-1.0a';
 import clientOAuth1 from 'oauth-1.0a';
-// IMPORTANT! Do not switch to anther bcrypt library unless really necessary and
-// tested with all possible systems like Windows, Alpine on ARM, FreeBSD, ...
-import { compare } from 'bcryptjs';
 
 import {
 	BinaryDataManager,
@@ -68,9 +65,6 @@ import type {
 } from 'n8n-workflow';
 import { LoggerProxy, jsonParse } from 'n8n-workflow';
 
-import basicAuth from 'basic-auth';
-import jwt from 'jsonwebtoken';
-import jwks from 'jwks-rsa';
 // @ts-ignore
 import timezones from 'google-timezones-json';
 import history from 'connect-history-api-fallback';
@@ -166,6 +160,8 @@ import { ldapController } from './Ldap/routes/ldap.controller.ee';
 import { getLdapLoginLabel, isLdapEnabled, isLdapLoginEnabled } from './Ldap/helpers';
 import { AbstractServer } from './AbstractServer';
 import { configureMetrics } from './metrics';
+import { setupBasicAuth } from './middlewares/basicAuth';
+import { setupExternalJWTAuth } from './middlewares/externalJWTAuth';
 
 const exec = promisify(callbackExec);
 
@@ -408,150 +404,13 @@ class Server extends AbstractServer {
 		const authIgnoreRegex = new RegExp(`^\/(${ignoredEndpoints.join('|')})\/?.*$`);
 
 		// Check for basic auth credentials if activated
-		const basicAuthActive = config.getEnv('security.basicAuth.active');
-		if (basicAuthActive) {
-			const basicAuthUser = config.getEnv('security.basicAuth.user');
-			if (basicAuthUser === '') {
-				throw new Error('Basic auth is activated but no user got defined. Please set one!');
-			}
-
-			const basicAuthPassword = config.getEnv('security.basicAuth.password');
-			if (basicAuthPassword === '') {
-				throw new Error('Basic auth is activated but no password got defined. Please set one!');
-			}
-
-			const basicAuthHashEnabled = config.getEnv('security.basicAuth.hash') as boolean;
-
-			let validPassword: null | string = null;
-
-			this.app.use(
-				async (req: express.Request, res: express.Response, next: express.NextFunction) => {
-					// Skip basic auth for a few listed endpoints or when instance owner has been setup
-					if (
-						authIgnoreRegex.exec(req.url) ||
-						config.getEnv('userManagement.isInstanceOwnerSetUp')
-					) {
-						return next();
-					}
-					const realm = 'n8n - Editor UI';
-					const basicAuthData = basicAuth(req);
-
-					if (basicAuthData === undefined) {
-						// Authorization data is missing
-						return ResponseHelper.basicAuthAuthorizationError(
-							res,
-							realm,
-							'Authorization is required!',
-						);
-					}
-
-					if (basicAuthData.name === basicAuthUser) {
-						if (basicAuthHashEnabled) {
-							if (
-								validPassword === null &&
-								(await compare(basicAuthData.pass, basicAuthPassword))
-							) {
-								// Password is valid so save for future requests
-								validPassword = basicAuthData.pass;
-							}
-
-							if (validPassword === basicAuthData.pass && validPassword !== null) {
-								// Provided hash is correct
-								return next();
-							}
-						} else if (basicAuthData.pass === basicAuthPassword) {
-							// Provided password is correct
-							return next();
-						}
-					}
-
-					// Provided authentication data is wrong
-					return ResponseHelper.basicAuthAuthorizationError(
-						res,
-						realm,
-						'Authorization data is wrong!',
-					);
-				},
-			);
+		if (config.getEnv('security.basicAuth.active')) {
+			await setupBasicAuth(this.app, config, authIgnoreRegex);
 		}
 
 		// Check for and validate JWT if configured
-		const jwtAuthActive = config.getEnv('security.jwtAuth.active');
-		if (jwtAuthActive) {
-			const jwtAuthHeader = config.getEnv('security.jwtAuth.jwtHeader');
-			if (jwtAuthHeader === '') {
-				throw new Error('JWT auth is activated but no request header was defined. Please set one!');
-			}
-			const jwksUri = config.getEnv('security.jwtAuth.jwksUri');
-			if (jwksUri === '') {
-				throw new Error('JWT auth is activated but no JWK Set URI was defined. Please set one!');
-			}
-			const jwtHeaderValuePrefix = config.getEnv('security.jwtAuth.jwtHeaderValuePrefix');
-			const jwtIssuer = config.getEnv('security.jwtAuth.jwtIssuer');
-			const jwtNamespace = config.getEnv('security.jwtAuth.jwtNamespace');
-			const jwtAllowedTenantKey = config.getEnv('security.jwtAuth.jwtAllowedTenantKey');
-			const jwtAllowedTenant = config.getEnv('security.jwtAuth.jwtAllowedTenant');
-
-			// eslint-disable-next-line no-inner-declarations
-			function isTenantAllowed(decodedToken: object): boolean {
-				if (jwtNamespace === '' || jwtAllowedTenantKey === '' || jwtAllowedTenant === '') {
-					return true;
-				}
-
-				for (const [k, v] of Object.entries(decodedToken)) {
-					if (k === jwtNamespace) {
-						for (const [kn, kv] of Object.entries(v)) {
-							if (kn === jwtAllowedTenantKey && kv === jwtAllowedTenant) {
-								return true;
-							}
-						}
-					}
-				}
-
-				return false;
-			}
-
-			// eslint-disable-next-line consistent-return
-			this.app.use((req: express.Request, res: express.Response, next: express.NextFunction) => {
-				if (authIgnoreRegex.exec(req.url)) {
-					return next();
-				}
-
-				let token = req.header(jwtAuthHeader) as string;
-				if (token === undefined || token === '') {
-					return ResponseHelper.jwtAuthAuthorizationError(res, 'Missing token');
-				}
-				if (jwtHeaderValuePrefix !== '' && token.startsWith(jwtHeaderValuePrefix)) {
-					token = token.replace(`${jwtHeaderValuePrefix} `, '').trimLeft();
-				}
-
-				const jwkClient = jwks({ cache: true, jwksUri });
-				// eslint-disable-next-line @typescript-eslint/ban-types
-				function getKey(header: any, callback: Function) {
-					jwkClient.getSigningKey(header.kid, (err: Error, key: any) => {
-						// eslint-disable-next-line @typescript-eslint/no-throw-literal
-						if (err) throw ResponseHelper.jwtAuthAuthorizationError(res, err.message);
-
-						const signingKey = key.publicKey || key.rsaPublicKey;
-						callback(null, signingKey);
-					});
-				}
-
-				const jwtVerifyOptions: jwt.VerifyOptions = {
-					issuer: jwtIssuer !== '' ? jwtIssuer : undefined,
-					ignoreExpiration: false,
-				};
-
-				jwt.verify(token, getKey, jwtVerifyOptions, (err: jwt.VerifyErrors, decoded: object) => {
-					if (err) {
-						ResponseHelper.jwtAuthAuthorizationError(res, 'Invalid token');
-					} else if (!isTenantAllowed(decoded)) {
-						ResponseHelper.jwtAuthAuthorizationError(res, 'Tenant not allowed');
-					} else {
-						next();
-					}
-				});
-			});
+		if (config.getEnv('security.jwtAuth.active')) {
+			await setupExternalJWTAuth(this.app, config, authIgnoreRegex);
 		}
 
 		// ----------------------------------------
diff --git a/packages/cli/src/api/workflowStats.api.ts b/packages/cli/src/api/workflowStats.api.ts
index 983162174286b9..b8b23a9803dfe0 100644
--- a/packages/cli/src/api/workflowStats.api.ts
+++ b/packages/cli/src/api/workflowStats.api.ts
@@ -38,7 +38,7 @@ async function checkWorkflowId(workflowId: string, user: User): Promise<boolean>
 }
 
 /**
- * Initialise Logger if needed
+ * Initialize Logger if needed
  */
 workflowStatsController.use((req, res, next) => {
 	try {
diff --git a/packages/cli/src/middlewares/basicAuth.ts b/packages/cli/src/middlewares/basicAuth.ts
new file mode 100644
index 00000000000000..7e41972fed20bd
--- /dev/null
+++ b/packages/cli/src/middlewares/basicAuth.ts
@@ -0,0 +1,57 @@
+import type { Application } from 'express';
+import basicAuth from 'basic-auth';
+// IMPORTANT! Do not switch to anther bcrypt library unless really necessary and
+// tested with all possible systems like Windows, Alpine on ARM, FreeBSD, ...
+import { compare } from 'bcryptjs';
+import type { Config } from '@/config';
+import { basicAuthAuthorizationError } from '@/ResponseHelper';
+
+export const setupBasicAuth = async (app: Application, config: Config, authIgnoreRegex: RegExp) => {
+	const basicAuthUser = config.getEnv('security.basicAuth.user');
+	if (basicAuthUser === '') {
+		throw new Error('Basic auth is activated but no user got defined. Please set one!');
+	}
+
+	const basicAuthPassword = config.getEnv('security.basicAuth.password');
+	if (basicAuthPassword === '') {
+		throw new Error('Basic auth is activated but no password got defined. Please set one!');
+	}
+
+	const basicAuthHashEnabled = config.getEnv('security.basicAuth.hash');
+
+	let validPassword: null | string = null;
+
+	app.use(async (req, res, next) => {
+		// Skip basic auth for a few listed endpoints or when instance owner has been setup
+		if (authIgnoreRegex.exec(req.url) || config.getEnv('userManagement.isInstanceOwnerSetUp')) {
+			return next();
+		}
+		const realm = 'n8n - Editor UI';
+		const basicAuthData = basicAuth(req);
+
+		if (basicAuthData === undefined) {
+			// Authorization data is missing
+			return basicAuthAuthorizationError(res, realm, 'Authorization is required!');
+		}
+
+		if (basicAuthData.name === basicAuthUser) {
+			if (basicAuthHashEnabled) {
+				if (validPassword === null && (await compare(basicAuthData.pass, basicAuthPassword))) {
+					// Password is valid so save for future requests
+					validPassword = basicAuthData.pass;
+				}
+
+				if (validPassword === basicAuthData.pass && validPassword !== null) {
+					// Provided hash is correct
+					return next();
+				}
+			} else if (basicAuthData.pass === basicAuthPassword) {
+				// Provided password is correct
+				return next();
+			}
+		}
+
+		// Provided authentication data is wrong
+		return basicAuthAuthorizationError(res, realm, 'Authorization data is wrong!');
+	});
+};
diff --git a/packages/cli/src/middlewares/externalJWTAuth.ts b/packages/cli/src/middlewares/externalJWTAuth.ts
new file mode 100644
index 00000000000000..91f622312d95ed
--- /dev/null
+++ b/packages/cli/src/middlewares/externalJWTAuth.ts
@@ -0,0 +1,89 @@
+import type { Application } from 'express';
+import jwt from 'jsonwebtoken';
+import jwks from 'jwks-rsa';
+import type { Config } from '@/config';
+import { jwtAuthAuthorizationError } from '@/ResponseHelper';
+
+export const setupExternalJWTAuth = async (
+	app: Application,
+	config: Config,
+	authIgnoreRegex: RegExp,
+) => {
+	const jwtAuthHeader = config.getEnv('security.jwtAuth.jwtHeader');
+	if (jwtAuthHeader === '') {
+		throw new Error('JWT auth is activated but no request header was defined. Please set one!');
+	}
+
+	const jwksUri = config.getEnv('security.jwtAuth.jwksUri');
+	if (jwksUri === '') {
+		throw new Error('JWT auth is activated but no JWK Set URI was defined. Please set one!');
+	}
+
+	const jwtHeaderValuePrefix = config.getEnv('security.jwtAuth.jwtHeaderValuePrefix');
+	const jwtIssuer = config.getEnv('security.jwtAuth.jwtIssuer');
+	const jwtNamespace = config.getEnv('security.jwtAuth.jwtNamespace');
+	const jwtAllowedTenantKey = config.getEnv('security.jwtAuth.jwtAllowedTenantKey');
+	const jwtAllowedTenant = config.getEnv('security.jwtAuth.jwtAllowedTenant');
+
+	// eslint-disable-next-line no-inner-declarations
+	function isTenantAllowed(decodedToken: object): boolean {
+		if (jwtNamespace === '' || jwtAllowedTenantKey === '' || jwtAllowedTenant === '') {
+			return true;
+		}
+
+		for (const [k, v] of Object.entries(decodedToken)) {
+			if (k === jwtNamespace) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+				for (const [kn, kv] of Object.entries(v)) {
+					if (kn === jwtAllowedTenantKey && kv === jwtAllowedTenant) {
+						return true;
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	// eslint-disable-next-line consistent-return
+	app.use((req, res, next) => {
+		if (authIgnoreRegex.exec(req.url)) {
+			return next();
+		}
+
+		let token = req.header(jwtAuthHeader) as string;
+		if (token === undefined || token === '') {
+			return jwtAuthAuthorizationError(res, 'Missing token');
+		}
+
+		if (jwtHeaderValuePrefix !== '' && token.startsWith(jwtHeaderValuePrefix)) {
+			token = token.replace(`${jwtHeaderValuePrefix} `, '').trimStart();
+		}
+
+		const jwkClient = jwks({ cache: true, jwksUri });
+		const getKey: jwt.GetPublicKeyOrSecret = (header, callbackFn) => {
+			// eslint-disable-next-line @typescript-eslint/no-throw-literal
+			if (!header.kid) throw jwtAuthAuthorizationError(res, 'No JWT key found');
+			jwkClient.getSigningKey(header.kid, (error, key) => {
+				// eslint-disable-next-line @typescript-eslint/no-throw-literal
+				if (error) throw jwtAuthAuthorizationError(res, error.message);
+				callbackFn(null, key?.getPublicKey());
+			});
+		};
+
+		const jwtVerifyOptions: jwt.VerifyOptions = {
+			issuer: jwtIssuer !== '' ? jwtIssuer : undefined,
+			ignoreExpiration: false,
+		};
+
+		jwt.verify(token, getKey, jwtVerifyOptions, (error: jwt.VerifyErrors, decoded: object) => {
+			if (error) {
+				jwtAuthAuthorizationError(res, 'Invalid token');
+			} else if (!isTenantAllowed(decoded)) {
+				jwtAuthAuthorizationError(res, 'Tenant not allowed');
+			} else {
+				next();
+			}
+		});
+	});
+};
diff --git a/packages/cli/test/unit/middlewares/basicAuth.test.ts b/packages/cli/test/unit/middlewares/basicAuth.test.ts
new file mode 100644
index 00000000000000..d4d952c7cdd884
--- /dev/null
+++ b/packages/cli/test/unit/middlewares/basicAuth.test.ts
@@ -0,0 +1,42 @@
+import express from 'express';
+import request from 'supertest';
+import config from '@/config';
+import { setupBasicAuth } from '@/middlewares/basicAuth';
+
+describe('Basic Auth Middleware', () => {
+	let app: express.Application;
+
+	beforeAll(() => {
+		app = express();
+		config.set('security.basicAuth', { user: 'jim', password: 'n8n', hash: false });
+		setupBasicAuth(app, config, new RegExp('^/skip-auth'));
+		app.get('/test', (req, res) => res.send({ auth: true }));
+		app.get('/skip-auth', (req, res) => res.send({ auth: false }));
+	});
+
+	it('should not block calls to /skip-auth', async () => {
+		const response = await request(app).get('/skip-auth');
+		expect(response.statusCode).toEqual(200);
+		expect(response.headers).not.toHaveProperty('www-authenticate');
+		expect(response.body).toEqual({ auth: false });
+	});
+
+	it('should block calls to /test if auth is absent', async () => {
+		const response = await request(app).get('/test');
+		expect(response.statusCode).toEqual(401);
+		expect(response.headers).toHaveProperty('www-authenticate');
+	});
+
+	it('should block calls to /test if auth is invalid', async () => {
+		const response = await request(app).get('/test').auth('user', 'invalid');
+		expect(response.statusCode).toEqual(401);
+		expect(response.headers).toHaveProperty('www-authenticate');
+	});
+
+	it('should allow access to /test if basic auth header is valid', async () => {
+		const response = await request(app).get('/test').auth('jim', 'n8n');
+		expect(response.statusCode).toEqual(200);
+		expect(response.headers).not.toHaveProperty('www-authenticate');
+		expect(response.body).toEqual({ auth: true });
+	});
+});
diff --git a/packages/cli/test/unit/middlewares/externalJWTAuth.test.ts b/packages/cli/test/unit/middlewares/externalJWTAuth.test.ts
new file mode 100644
index 00000000000000..42b2b19af488f7
--- /dev/null
+++ b/packages/cli/test/unit/middlewares/externalJWTAuth.test.ts
@@ -0,0 +1,47 @@
+import express from 'express';
+import request from 'supertest';
+import createJWKSMock from 'mock-jwks';
+import config from '@/config';
+import { setupExternalJWTAuth } from '@/middlewares/externalJWTAuth';
+
+const testJWKUri = 'https://n8n.test/';
+const jwksMock = createJWKSMock(testJWKUri);
+
+describe('External JWT Auth Middleware', () => {
+	let app: express.Application;
+
+	beforeAll(() => {
+		app = express();
+		config.set('security.jwtAuth.jwtHeader', 'Authorization');
+		config.set('security.jwtAuth.jwtHeaderValuePrefix', 'Bearer');
+		config.set('security.jwtAuth.jwtIssuer', 'n8n');
+		config.set('security.jwtAuth.jwksUri', `${testJWKUri}.well-known/jwks.json`);
+		setupExternalJWTAuth(app, config, new RegExp('^/skip-auth'));
+		app.get('/test', (req, res) => res.send({ auth: true }));
+		app.get('/skip-auth', (req, res) => res.send({ auth: false }));
+
+		jwksMock.start();
+	});
+
+	it('should not block calls to /skip-auth', async () => {
+		const response = await request(app).get('/skip-auth');
+		expect(response.statusCode).toEqual(200);
+		expect(response.body).toEqual({ auth: false });
+	});
+
+	it('should block calls to /test if auth is absent', async () =>
+		request(app).get('/test').expect(403));
+
+	it('should block calls to /test if auth is invalid', async () => {
+		const token = jwksMock.token({ iss: 'invalid' });
+		const response = await request(app).get('/test').set('Authorization', `Bearer ${token}`);
+		expect(response.statusCode).toEqual(403);
+	});
+
+	it('should allow access to /test if JWT auth header is valid', async () => {
+		const token = jwksMock.token({ iss: 'n8n' });
+		const response = await request(app).get('/test').set('Authorization', `Bearer ${token}`);
+		expect(response.statusCode).toEqual(200);
+		expect(response.body).toEqual({ auth: true });
+	});
+});
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index e50d1f27d35318..43db4411d4292c 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -730,7 +730,7 @@
   "devDependencies": {
     "@types/amqplib": "^0.10.1",
     "@types/aws4": "^1.5.1",
-    "@types/basic-auth": "^1.1.2",
+    "@types/basic-auth": "^1.1.3",
     "@types/cheerio": "^0.22.15",
     "@types/cron": "~1.7.1",
     "@types/eventsource": "^1.1.2",
@@ -738,7 +738,7 @@
     "@types/formidable": "^1.0.31",
     "@types/gm": "^1.18.2",
     "@types/imap-simple": "^4.2.0",
-    "@types/jsonwebtoken": "^9.0.0",
+    "@types/jsonwebtoken": "^9.0.1",
     "@types/lodash.set": "^4.3.6",
     "@types/lossless-json": "^1.0.0",
     "@types/mailparser": "^2.7.3",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d01f240c21474e..69ca8293f952da 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -5,6 +5,7 @@ onlyBuiltDependencies:
   - vue-demi
 
 overrides:
+  '@types/node': ^16.18.12
   browserslist: ^4.21.4
   ejs: ^3.1.8
   fork-ts-checker-webpack-plugin: ^6.0.4
@@ -25,7 +26,7 @@ importers:
       '@n8n_io/eslint-config': '*'
       '@ngneat/falso': ^6.1.0
       '@types/jest': ^29.2.2
-      '@types/node': ^16.11.22
+      '@types/supertest': ^2.0.12
       cross-env: ^7.0.3
       cypress: ^10.0.3
       cypress-real-events: ^1.7.6
@@ -39,7 +40,7 @@ importers:
       rimraf: ^3.0.2
       run-script-os: ^1.0.7
       start-server-and-test: ^1.14.0
-      supertest: ^6.2.2
+      supertest: ^6.3.3
       ts-jest: ^29.0.3
       tsc-watch: ^5.0.3
       turbo: 1.6.3
@@ -50,11 +51,11 @@ importers:
       '@n8n_io/eslint-config': link:packages/@n8n_io/eslint-config
       '@ngneat/falso': 6.1.0
       '@types/jest': 29.2.2
-      '@types/node': 16.11.65
+      '@types/supertest': 2.0.12
       cross-env: 7.0.3
       cypress: 10.11.0
       cypress-real-events: 1.7.6_cypress@10.11.0
-      jest: 29.3.1_@types+node@16.11.65
+      jest: 29.3.1
       jest-environment-jsdom: 29.3.1
       jest-mock: 29.3.1
       nock: 13.2.9
@@ -63,7 +64,7 @@ importers:
       rimraf: 3.0.2
       run-script-os: 1.1.6
       start-server-and-test: 1.14.0
-      supertest: 6.3.0
+      supertest: 6.3.3
       ts-jest: 29.0.3_s73gpqhbuwbfokcbq32jn3f4zi
       tsc-watch: 5.0.3_typescript@4.8.4
       turbo: 1.6.3
@@ -110,7 +111,7 @@ importers:
       '@rudderstack/rudder-sdk-node': 1.0.6
       '@sentry/integrations': ^7.28.1
       '@sentry/node': ^7.28.1
-      '@types/basic-auth': ^1.1.2
+      '@types/basic-auth': ^1.1.3
       '@types/bcryptjs': ^2.4.2
       '@types/body-parser-xml': ^2.0.2
       '@types/compression': 1.0.1
@@ -119,7 +120,7 @@ importers:
       '@types/cookie-parser': ^1.4.2
       '@types/express': ^4.17.6
       '@types/json-diff': ^0.5.1
-      '@types/jsonwebtoken': ^9.0.0
+      '@types/jsonwebtoken': ^9.0.1
       '@types/localtunnel': ^1.9.0
       '@types/lodash.get': ^4.4.6
       '@types/lodash.intersection': ^4.4.7
@@ -141,7 +142,6 @@ importers:
       '@types/send': ^0.17.1
       '@types/shelljs': ^0.8.11
       '@types/superagent': 4.1.13
-      '@types/supertest': ^2.0.11
       '@types/swagger-ui-express': ^4.1.3
       '@types/syslog-client': ^1.1.2
       '@types/uuid': ^8.3.2
@@ -179,7 +179,7 @@ importers:
       json-diff: ^0.5.4
       jsonschema: ^1.4.1
       jsonwebtoken: 9.0.0
-      jwks-rsa: ~1.12.1
+      jwks-rsa: ^3.0.1
       ldapts: ^4.2.2
       localtunnel: ^2.0.0
       lodash.get: ^4.4.2
@@ -196,6 +196,7 @@ importers:
       lodash.uniqby: ^4.7.0
       lodash.unset: ^4.5.2
       luxon: ^3.1.0
+      mock-jwks: ^1.0.9
       mysql2: ~2.3.3
       n8n-core: ~0.153.0
       n8n-editor-ui: ~0.180.2
@@ -223,7 +224,6 @@ importers:
       source-map-support: ^0.5.21
       sqlite3: ^5.1.4
       sse-channel: ^4.0.0
-      supertest: ^6.2.2
       swagger-ui-express: ^4.3.0
       syslog-client: ^1.1.1
       ts-node: ^9.1.1
@@ -274,7 +274,7 @@ importers:
       json-diff: 0.5.5
       jsonschema: 1.4.1
       jsonwebtoken: 9.0.0
-      jwks-rsa: 1.12.3
+      jwks-rsa: 3.0.1
       ldapts: 4.2.2
       localtunnel: 2.0.2
       lodash.get: 4.4.2
@@ -336,7 +336,7 @@ importers:
       '@types/cookie-parser': 1.4.3
       '@types/express': 4.17.14
       '@types/json-diff': 0.5.2
-      '@types/jsonwebtoken': 9.0.0
+      '@types/jsonwebtoken': 9.0.1
       '@types/localtunnel': 1.9.0
       '@types/lodash.get': 4.4.7
       '@types/lodash.intersection': 4.4.7
@@ -358,16 +358,15 @@ importers:
       '@types/send': 0.17.1
       '@types/shelljs': 0.8.11
       '@types/superagent': 4.1.13
-      '@types/supertest': 2.0.12
       '@types/swagger-ui-express': 4.1.3
       '@types/syslog-client': 1.1.2
       '@types/uuid': 8.3.4
       '@types/validator': 13.7.7
       '@types/yamljs': 0.2.31
       concurrently: 5.3.0
+      mock-jwks: 1.0.9_nock@13.2.9
       nodemon: 2.0.20
       run-script-os: 1.1.6
-      supertest: 6.3.0
       ts-node: 9.1.1_typescript@4.9.4
       tsc-alias: 1.7.1
       tsconfig-paths: 3.14.1
@@ -737,7 +736,7 @@ importers:
       '@kafkajs/confluent-schema-registry': 1.0.6
       '@types/amqplib': ^0.10.1
       '@types/aws4': ^1.5.1
-      '@types/basic-auth': ^1.1.2
+      '@types/basic-auth': ^1.1.3
       '@types/cheerio': ^0.22.15
       '@types/cron': ~1.7.1
       '@types/eventsource': ^1.1.2
@@ -746,7 +745,7 @@ importers:
       '@types/gm': ^1.18.2
       '@types/imap-simple': ^4.2.0
       '@types/js-nacl': ^1.3.0
-      '@types/jsonwebtoken': ^9.0.0
+      '@types/jsonwebtoken': ^9.0.1
       '@types/lodash.set': ^4.3.6
       '@types/lossless-json': ^1.0.0
       '@types/mailparser': ^2.7.3
@@ -893,7 +892,7 @@ importers:
       '@types/formidable': 1.2.5
       '@types/gm': 1.18.12
       '@types/imap-simple': 4.2.5
-      '@types/jsonwebtoken': 9.0.0
+      '@types/jsonwebtoken': 9.0.1
       '@types/lodash.set': 4.3.7
       '@types/lossless-json': 1.0.1
       '@types/mailparser': 2.7.4
@@ -3422,7 +3421,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       chalk: 4.1.2
       jest-message-util: 29.3.1
       jest-util: 29.3.1
@@ -3443,14 +3442,14 @@ packages:
       '@jest/test-result': 29.3.1
       '@jest/transform': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       ci-info: 3.5.0
       exit: 0.1.2
       graceful-fs: 4.2.10
       jest-changed-files: 29.2.0
-      jest-config: 29.3.1_@types+node@16.11.65
+      jest-config: 29.3.1_@types+node@16.18.12
       jest-haste-map: 29.3.1
       jest-message-util: 29.3.1
       jest-regex-util: 29.2.0
@@ -3477,7 +3476,7 @@ packages:
     dependencies:
       '@jest/fake-timers': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       jest-mock: 29.3.1
     dev: true
 
@@ -3504,7 +3503,7 @@ packages:
     dependencies:
       '@jest/types': 29.3.1
       '@sinonjs/fake-timers': 9.1.2
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       jest-message-util: 29.3.1
       jest-mock: 29.3.1
       jest-util: 29.3.1
@@ -3537,7 +3536,7 @@ packages:
       '@jest/transform': 29.3.1
       '@jest/types': 29.3.1
       '@jridgewell/trace-mapping': 0.3.16
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
       exit: 0.1.2
@@ -3647,7 +3646,7 @@ packages:
     dependencies:
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       '@types/yargs': 15.0.15
       chalk: 4.1.2
     dev: true
@@ -3659,7 +3658,7 @@ packages:
       '@jest/schemas': 29.0.0
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       '@types/yargs': 17.0.19
       chalk: 4.1.2
     dev: true
@@ -4865,7 +4864,7 @@ packages:
       '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
       '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
       '@storybook/ui': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/webpack': 4.41.33
       autoprefixer: 9.8.8
       babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
@@ -5081,7 +5080,7 @@ packages:
       '@babel/register': 7.18.9_@babel+core@7.20.12
       '@storybook/node-logger': 6.5.15
       '@storybook/semver': 7.3.2
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/pretty-hrtime': 1.0.1
       babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
       babel-plugin-macros: 3.1.0
@@ -5152,7 +5151,7 @@ packages:
       '@babel/register': 7.18.9_@babel+core@7.20.12
       '@storybook/node-logger': 6.5.15
       '@storybook/semver': 7.3.2
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/pretty-hrtime': 1.0.1
       babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
       babel-plugin-macros: 3.1.0
@@ -5223,7 +5222,7 @@ packages:
       '@storybook/semver': 7.3.2
       '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
       '@storybook/telemetry': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/node-fetch': 2.6.2
       '@types/pretty-hrtime': 1.0.1
       '@types/webpack': 4.41.33
@@ -5391,7 +5390,7 @@ packages:
       '@storybook/node-logger': 6.5.15
       '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
       '@storybook/ui': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/webpack': 4.41.33
       babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
       case-sensitive-paths-webpack-plugin: 2.4.0
@@ -5725,7 +5724,7 @@ packages:
       '@storybook/csf': 0.0.2--canary.4566f4d.1
       '@storybook/docs-tools': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
       '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/webpack-env': 1.18.0
       babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
       core-js: 3.27.1
@@ -5832,7 +5831,7 @@ packages:
   /@types/amqplib/0.10.1:
     resolution: {integrity: sha512-j6ANKT79ncUDnAs/+9r9eDujxbeJoTjoVu33gHHcaPfmLQaMhvfbH2GqSe8KUM444epAp1Vl3peVOQfZk3UIqA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/aria-query/4.2.2:
@@ -5842,13 +5841,13 @@ packages:
   /@types/asn1/0.2.0:
     resolution: {integrity: sha512-5TMxIpYbIA9c1J0hYQjQDX3wr+rTgQEAXaW2BI8ECM8FO53wSW4HFZplTalrKSHuZUc76NtXcePRhwuOHqGD5g==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: false
 
   /@types/aws4/1.11.2:
     resolution: {integrity: sha512-x0f96eBPrCCJzJxdPbUvDFRva4yPpINJzTuXXpmS2j9qLUpF2nyGzvXPlRziuGbCsPukwY4JfuO+8xwsoZLzGw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/babel__core/7.1.19:
@@ -5883,7 +5882,7 @@ packages:
   /@types/basic-auth/1.1.3:
     resolution: {integrity: sha512-W3rv6J0IGlxqgE2eQ2pTb0gBjaGtejQpJ6uaCjz3UQ65+TFTPC5/lAE+POfx1YLdjtxvejJzsIAfd3MxWiVmfg==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/bcryptjs/2.4.2:
@@ -5900,7 +5899,7 @@ packages:
       '@types/body-parser': 1.19.2
       '@types/connect': 3.4.35
       '@types/express-serve-static-core': 4.17.31
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/xml2js': 0.4.11
     dev: true
 
@@ -5908,7 +5907,7 @@ packages:
     resolution: {integrity: sha512-ALYone6pm6QmwZoAgeyNksccT9Q4AWZQ6PvfwR37GT6r6FWUPguq6sUmNGSMV2Wr761oQoBxwGGa6DR5o1DC9g==}
     dependencies:
       '@types/connect': 3.4.35
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
 
   /@types/caseless/0.12.2:
     resolution: {integrity: sha512-6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w==}
@@ -5927,7 +5926,7 @@ packages:
   /@types/cheerio/0.22.31:
     resolution: {integrity: sha512-Kt7Cdjjdi2XWSfrZ53v4Of0wG3ZcmaegFXjMmz9tfNrZSkzzo36G0AL1YqSdcIA78Etjt6E609pt5h1xnQkPUw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/compression/1.0.1:
@@ -5939,20 +5938,20 @@ packages:
   /@types/concat-stream/2.0.0:
     resolution: {integrity: sha512-t3YCerNM7NTVjLuICZo5gYAXYoDvpuuTceCcFQWcDQz26kxUR5uIWolxbIR5jRNIXpMqhOpW/b8imCR1LEmuJw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/connect-history-api-fallback/1.3.5:
     resolution: {integrity: sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==}
     dependencies:
       '@types/express-serve-static-core': 4.17.31
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/connect/3.4.35:
     resolution: {integrity: sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
 
   /@types/convict/4.2.1:
     resolution: {integrity: sha512-2cd51m3i0yeY1i3dKxcqJKeS5Q4jZnjP37OseoNeIX1OM0AhmGPuuYmwJ9OqtsU35YrREQxdb2VeX5sM3cwGMQ==}
@@ -5971,7 +5970,7 @@ packages:
   /@types/cron/1.7.3:
     resolution: {integrity: sha512-iPmUXyIJG1Js+ldPYhOQcYU3kCAQ2FWrSkm1FJPoii2eYSn6wEW6onPukNTT0bfiflexNSRPl6KWmAIqS+36YA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       moment: 2.29.4
     dev: true
 
@@ -5986,7 +5985,7 @@ packages:
   /@types/es-aggregate-error/1.0.2:
     resolution: {integrity: sha512-erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: false
 
   /@types/eslint-scope/3.7.4:
@@ -6015,26 +6014,13 @@ packages:
     resolution: {integrity: sha512-F3K4oyM12o8W9jxuJmW+1sc8kdw0Hj0t+26urwkcolPJTgkfppEfIdftdcXmUU2QPBIwcrYO6diqgIqgCDf1FA==}
     dev: true
 
-  /@types/express-jwt/0.0.42:
-    resolution: {integrity: sha512-WszgUddvM1t5dPpJ3LhWNH8kfNN8GPIBrAGxgIYXVCEGx6Bx4A036aAuf/r5WH9DIEdlmp7gHOYvSM6U87B0ag==}
-    dependencies:
-      '@types/express': 4.17.14
-      '@types/express-unless': 0.5.3
-    dev: false
-
   /@types/express-serve-static-core/4.17.31:
     resolution: {integrity: sha512-DxMhY+NAsTwMMFHBTtJFNp5qiHKJ7TeqOo23zVEM9alT1Ml27Q3xcTH0xwxn7Q0BbMcVEJOs/7aQtUWupUQN3Q==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/qs': 6.9.7
       '@types/range-parser': 1.2.4
 
-  /@types/express-unless/0.5.3:
-    resolution: {integrity: sha512-TyPLQaF6w8UlWdv4gj8i46B+INBVzURBNRahCozCSXfsK2VTlL1wNyTlMKw817VHygBtlcl5jfnPadlydr06Yw==}
-    dependencies:
-      '@types/express': 4.17.14
-    dev: false
-
   /@types/express/4.17.14:
     resolution: {integrity: sha512-TEbt+vaPFQ+xpxFLFssxUDXj5cWCxZJjIcB7Yg0k0GMHGtgtQgpvx/MUQUeAkNbA9AAGrwkAsoeItdTgS7FMyg==}
     dependencies:
@@ -6050,44 +6036,44 @@ packages:
   /@types/formidable/1.2.5:
     resolution: {integrity: sha512-zu3mQJa4hDNubEMViSj937602XdDGzK7Q5pJ5QmLUbNxclbo9tZGt5jtwM352ssZ+pqo5V4H14TBvT/ALqQQcA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/ftp/0.3.33:
     resolution: {integrity: sha512-L7wFlX3t9GsGgNS0oxLt6zbAZZGgsdptMmciL4cdxHmbL3Hz4Lysh8YqAR34eHsJ1uacJITcZBBDl5XpQlxPpQ==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/generic-pool/3.1.11:
     resolution: {integrity: sha512-3mcD3ewmaKPbiAZglGj8We4ohlSMfw/xS+bbYUhTv/ALgqrrtJjyL4Ju9IgapXooBCTFEew5LAKQqzZV6/43xg==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/glob/8.0.0:
     resolution: {integrity: sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==}
     dependencies:
       '@types/minimatch': 5.1.2
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
     dev: true
 
   /@types/gm/1.18.12:
     resolution: {integrity: sha512-k3Gd15Ywy75FiFQUsrqpKD42rhMdHaETyw2zjK9u3xbrH1c7nS+npSb19yjPCqR8KxeL7vw2zJF4Kl2bAca0aQ==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/graceful-fs/4.1.5:
     resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/graceful-fs/4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
     dev: true
 
   /@types/hast/2.3.4:
@@ -6108,13 +6094,13 @@ packages:
     resolution: {integrity: sha512-Sfu70sdFXzVIhivsflpanlED8gZr4VRzz2AVU9i1ARU8gskr9nDd4tVGkqYtxfwajQfZDklkXbeHSOZYEeJmTQ==}
     dependencies:
       '@types/imap': 0.8.35
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/imap/0.8.35:
     resolution: {integrity: sha512-4Tk8lGFvRFYCEaHxb2BZFZPs2XiYBSboEbb1Kq1oBqA2aRqPV0pjzyXGpMKi9jILsDPlrG7s0EFnnh8qb3h3ww==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/inquirer/6.5.0:
@@ -6169,7 +6155,7 @@ packages:
   /@types/jsdom/20.0.1:
     resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/tough-cookie': 4.0.2
       parse5: 7.1.1
     dev: true
@@ -6189,11 +6175,10 @@ packages:
     resolution: {integrity: sha512-v7qlPA0VpKUlEdhghbDqRoKMxFB3h3Ch688TApBJ6v+XLDdvWCGLJIYiPKGZnS6MAOie+IorCfNYVHOPIHSWwQ==}
     dev: true
 
-  /@types/jsonwebtoken/9.0.0:
-    resolution: {integrity: sha512-mM4TkDpA9oixqg1Fv2vVpOFyIVLJjm5x4k0V+K/rEsizfjD7Tk7LKk3GTtbB7KCfP0FEHQtsZqFxYA0+sijNVg==}
+  /@types/jsonwebtoken/9.0.1:
+    resolution: {integrity: sha512-c5ltxazpWabia/4UzhIoaDcIza4KViOQhdbjRlfcIGVnsE3c3brkz9Z+F/EeJIECOQP7W7US2hNE930cWWkPiw==}
     dependencies:
-      '@types/node': 16.11.65
-    dev: true
+      '@types/node': 16.18.12
 
   /@types/linkify-it/3.0.2:
     resolution: {integrity: sha512-HZQYqbiFVWufzCwexrvh694SOim8z2d+xJl5UNamcvQFejLY/2YUtzXHYi3cHdI7PMlS8ejH2slRAOJQ32aNbA==}
@@ -6317,7 +6302,7 @@ packages:
   /@types/mailparser/2.7.4:
     resolution: {integrity: sha512-JGIV4RtcjBO1jsD0RTDoXOmm1zzHr07rWPmNREBBM1oAjjfy99Ne4Y7s/akVSZoksm/JWQMcFQ42LbsufHRVfg==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/markdown-it-emoji/2.0.2:
@@ -6367,7 +6352,7 @@ packages:
   /@types/mssql/6.0.8:
     resolution: {integrity: sha512-N3dr3o1c6EXhHhhNRaKpLTdAoXT/s6qDEJET5FID2gFCj58vIV9q/7RtkvYdE6ntpkJF5F9hpURhxT/oC62yLw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/tedious': 4.0.9
     dev: true
 
@@ -6380,35 +6365,24 @@ packages:
   /@types/node-fetch/2.6.2:
     resolution: {integrity: sha512-DHqhlq5jeESLy19TYhLakJ07kNumXWjcDdxXsLUMJZ6ue8VZJj4kLPQVE/2mdHh3xZziNF1xppu5lwmS53HR+A==}
     dependencies:
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       form-data: 3.0.1
 
   /@types/node-ssh/7.0.1:
     resolution: {integrity: sha512-98EuH7UQl/WWwwDxpbANQ76HwBdzcSnC9zLSdrtVW7jjYeOTQ6TxBygbGwzZR4ho1agbd941UnHCdrXz2sS8JQ==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/ssh2': 1.11.6
       '@types/ssh2-streams': 0.1.9
     dev: true
 
-  /@types/node/14.18.33:
-    resolution: {integrity: sha512-qelS/Ra6sacc4loe/3MSjXNL1dNQ/GjxNHVzuChwMfmk7HuycRLVQN2qNY3XahK+fZc5E2szqQSKUyAF0E+2bg==}
-    dev: true
-
-  /@types/node/16.11.65:
-    resolution: {integrity: sha512-Vfz7wGMOr4jbQGiQHVJm8VjeQwM9Ya7mHe9LtQ264/Epf5n1KiZShOFqk++nBzw6a/ubgYdB9Od7P+MH/LjoWw==}
-
-  /@types/node/16.18.11:
-    resolution: {integrity: sha512-3oJbGBUWuS6ahSnEq1eN2XrCyf4YsWI8OyCvo7c64zQJNplk3mO84t53o8lfTk+2ji59g5ycfc6qQ3fdHliHuA==}
-
-  /@types/node/18.11.18:
-    resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==}
-    dev: true
+  /@types/node/16.18.12:
+    resolution: {integrity: sha512-vzLe5NaNMjIE3mcddFVGlAXN1LEWueUsMsOJWaT6wWMJGyljHAWHznqfnKUQWGzu7TLPrGvWdNAsvQYW+C0xtw==}
 
   /@types/nodemailer/6.4.6:
     resolution: {integrity: sha512-pD6fL5GQtUKvD2WnPmg5bC2e8kWCAPDwMPmHe/ohQbW+Dy0EcHgZ2oCSuPlWNqk74LS5BVMig1SymQbFMPPK3w==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/normalize-package-data/2.4.1:
@@ -6430,14 +6404,14 @@ packages:
   /@types/parseurl/1.3.1:
     resolution: {integrity: sha512-sAfjGAYgJ/MZsk95f3ByThfJgasZk1hWJROghBwfKnLLNANEAG/WHckAcT6HNqx2sHwVlci7OAX7k1KYpOcgMw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/passport-jwt/3.0.7:
     resolution: {integrity: sha512-qRQ4qlww1Yhs3IaioDKrsDNmKy6gLDLgFsGwpCnc2YqWovO2Oxu9yCQdWHMJafQ7UIuOba4C4/TNXcGkQfEjlQ==}
     dependencies:
       '@types/express': 4.17.14
-      '@types/jsonwebtoken': 9.0.0
+      '@types/jsonwebtoken': 9.0.1
       '@types/passport-strategy': 0.2.35
     dev: true
 
@@ -6475,7 +6449,7 @@ packages:
     dependencies:
       '@types/bluebird': 3.5.37
       '@types/ftp': 0.3.33
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/promise-ftp-common': 1.1.0
     dev: true
 
@@ -6492,7 +6466,7 @@ packages:
   /@types/redis/2.8.32:
     resolution: {integrity: sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/replacestream/4.0.1:
@@ -6509,7 +6483,7 @@ packages:
     resolution: {integrity: sha512-whjk1EDJPcAR2kYHRbFl/lKeeKYTi05A15K9bnLInCVroNDCtXce57xKdI0/rQaA3K+6q0eFyUBPmqfSndUZdQ==}
     dependencies:
       '@types/caseless': 0.12.2
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/tough-cookie': 4.0.2
       form-data: 2.5.1
     dev: true
@@ -6528,20 +6502,20 @@ packages:
     resolution: {integrity: sha512-Cwo8LE/0rnvX7kIIa3QHCkcuF21c05Ayb0ZfxPiv0W8VRiZiNW/WuRupHKpqqGVGf7SUA44QSOUKaEd9lIrd/Q==}
     dependencies:
       '@types/mime': 1.3.2
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/serve-static/1.15.0:
     resolution: {integrity: sha512-z5xyF6uh8CbjAu9760KDKsH2FcDxZ2tFCsA4HIMWE6IkiYMXfVoa+4f9KX+FN0ZLsaMw1WNG2ETLA6N+/YA+cg==}
     dependencies:
       '@types/mime': 3.0.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
 
   /@types/shelljs/0.8.11:
     resolution: {integrity: sha512-x9yaMvEh5BEaZKeVQC4vp3l+QoFj3BXcd4aYfuKSzIIyihjdVARAadYy3SMNIz0WCCdS2vB9JL/U6GQk5PaxQw==}
     dependencies:
       '@types/glob': 8.0.0
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/showdown/1.9.4:
@@ -6560,7 +6534,7 @@ packages:
     resolution: {integrity: sha512-hf7YoxKjdk22VtKBR7/vCSYSv/YyHhbkTiZ+Dk/UnC83GMYOFaXbZktt0cIP98rmhk4V8nGpbpEivV4y6GUFNw==}
     dependencies:
       '@types/generic-pool': 3.1.11
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/source-list-map/0.1.2:
@@ -6576,13 +6550,13 @@ packages:
   /@types/ssh2-streams/0.1.9:
     resolution: {integrity: sha512-I2J9jKqfmvXLR5GomDiCoHrEJ58hAOmFrekfFqmCFd+A6gaEStvWnPykoWUwld1PNg4G5ag1LwdA+Lz1doRJqg==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/ssh2/1.11.6:
     resolution: {integrity: sha512-8Mf6bhzYYBLEB/G6COux7DS/F5bCWwojv/qFo2yH/e4cLzAavJnxvFXrYW59iKfXdhG6OmzJcXDasgOb/s0rxw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/stack-utils/2.0.1:
@@ -6593,7 +6567,7 @@ packages:
     resolution: {integrity: sha512-YIGelp3ZyMiH0/A09PMAORO0EBGlF5xIKfDpK74wdYvWUs2o96b5CItJcWPdH409b7SAXIIG6p8NdU/4U2Maww==}
     dependencies:
       '@types/cookiejar': 2.1.2
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/supertest/2.0.12:
@@ -6612,7 +6586,7 @@ packages:
   /@types/syslog-client/1.1.2:
     resolution: {integrity: sha512-X8MwGedXYNmYltPDaZQCM9X6cSdfFbJZWhrU81gWKsg+Q6mSgRWs/12Mq9nHaUV4wqMYDNrnytbwbMUiVnWegw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/tapable/1.0.8:
@@ -6622,7 +6596,7 @@ packages:
   /@types/tedious/4.0.9:
     resolution: {integrity: sha512-ipwFvfy9b2m0gjHsIX0D6NAAwGCKokzf5zJqUZHUGt+7uWVlBIy6n2eyMgiKQ8ChLFVxic/zwQUhjLYNzbHDRA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/testing-library__jest-dom/5.14.5:
@@ -6634,7 +6608,7 @@ packages:
   /@types/through/0.0.30:
     resolution: {integrity: sha512-FvnCJljyxhPM3gkRgWmxmDZyAQSiBQQWLI0A0VFL0K7W1oRUrPJSqNO0NvTnLkBcotdlp3lKvaT0JrnyRDkzOg==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/tmp/0.2.3:
@@ -6656,7 +6630,7 @@ packages:
   /@types/tunnel/0.0.3:
     resolution: {integrity: sha512-sOUTGn6h1SfQ+gbgqC364jLFBw2lnFqkgF3q0WovEHRLMrVD1sd5aufqi/aJObLekJO+Aq5z646U4Oxy6shXMA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: false
 
   /@types/uglify-js/3.17.1:
@@ -6700,7 +6674,7 @@ packages:
   /@types/webpack-sources/3.2.0:
     resolution: {integrity: sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==}
     dependencies:
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/source-list-map': 0.1.2
       source-map: 0.7.4
     dev: true
@@ -6708,7 +6682,7 @@ packages:
   /@types/webpack/4.41.33:
     resolution: {integrity: sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==}
     dependencies:
-      '@types/node': 16.18.11
+      '@types/node': 16.18.12
       '@types/tapable': 1.0.8
       '@types/uglify-js': 3.17.1
       '@types/webpack-sources': 3.2.0
@@ -6719,14 +6693,14 @@ packages:
   /@types/whatwg-url/8.2.2:
     resolution: {integrity: sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/webidl-conversions': 7.0.0
     dev: false
 
   /@types/xml2js/0.4.11:
     resolution: {integrity: sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
 
   /@types/yamljs/0.2.31:
@@ -6752,7 +6726,7 @@ packages:
   /@types/yauzl/2.10.0:
     resolution: {integrity: sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
     dev: true
     optional: true
 
@@ -8147,14 +8121,6 @@ packages:
     transitivePeerDependencies:
       - debug
 
-  /axios/0.21.4_debug@4.3.4:
-    resolution: {integrity: sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==}
-    dependencies:
-      follow-redirects: 1.15.2_debug@4.3.4
-    transitivePeerDependencies:
-      - debug
-    dev: false
-
   /axios/0.27.2:
     resolution: {integrity: sha512-t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ==}
     dependencies:
@@ -8407,6 +8373,11 @@ packages:
   /base64-js/1.5.1:
     resolution: {integrity: sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==}
 
+  /base64-url/2.3.3:
+    resolution: {integrity: sha512-dLMhIsK7OplcDauDH/tZLvK7JmUZK3A7KiQpjNzsBrM6Etw7hzNI1tLEywqJk9NnwkgWuFKSlx/IUO7vF6Mo8Q==}
+    engines: {node: '>=6'}
+    dev: true
+
   /basic-auth/2.0.1:
     resolution: {integrity: sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==}
     engines: {node: '>= 0.8'}
@@ -8686,7 +8657,6 @@ packages:
 
   /buffer-equal-constant-time/1.0.1:
     resolution: {integrity: sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==}
-    dev: false
 
   /buffer-equal/1.0.1:
     resolution: {integrity: sha512-QoV3ptgEaQpvVwbXdSO39iqPQTCxSF7A5U99AxbHYqUdCizL/lH2Z0A2y6nbZucxMEOtNyZfG2s6gsVugGpKkg==}
@@ -9931,8 +9901,8 @@ packages:
     resolution: {integrity: sha512-YZ3GUyn/o8gfKJlnlX7g7xq4gyO6OSuhGPKaaGssGB2qgDUS0gPgtTvoyZLTt9Ab6dC4hfc9dV5arkvc/OCmrw==}
     engines: {node: '>= 0.6'}
 
-  /cookiejar/2.1.3:
-    resolution: {integrity: sha512-JxbCBUdrfr6AQjOXrxoTvAMJO4HBTUIlBzslcJPAz+/KT8yk53fXun51u+RenNYvad/+Vc2DIz5o9UxlCDymFQ==}
+  /cookiejar/2.1.4:
+    resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
     dev: true
 
   /copy-concurrently/1.0.5:
@@ -10308,7 +10278,7 @@ packages:
     dependencies:
       '@cypress/request': 2.88.10
       '@cypress/xvfb': 1.2.4_supports-color@8.1.1
-      '@types/node': 14.18.33
+      '@types/node': 16.18.12
       '@types/sinonjs__fake-timers': 8.1.1
       '@types/sizzle': 2.3.3
       arch: 2.2.0
@@ -10700,8 +10670,8 @@ packages:
       - supports-color
     dev: true
 
-  /dezalgo/1.0.3:
-    resolution: {integrity: sha512-K7i4zNfT2kgQz3GylDw40ot9GAE47sFZ9EXHFSPP6zONLgH6kWXE0KWJchkbQJLBkRazq4APwZ4OwiFFlT95OQ==}
+  /dezalgo/1.0.4:
+    resolution: {integrity: sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==}
     dependencies:
       asap: 2.0.6
       wrappy: 1.0.2
@@ -10936,7 +10906,6 @@ packages:
     resolution: {integrity: sha512-nagl3RYrbNv6kQkeJIpt6NJZy8twLB/2vtz6yN9Z4vRKHN4/QZJIEbqohALSgwKdnksuY3k5Addp5lg8sVoVcQ==}
     dependencies:
       safe-buffer: 5.2.1
-    dev: false
 
   /editorconfig/0.15.3:
     resolution: {integrity: sha512-M9wIMFx96vq0R4F+gRpY3o2exzb8hEj/n9S8unZtHSvYjibBp/iMufSzvmOcV/laG0ZtuTVGtiJggPOSW2r93g==}
@@ -11116,7 +11085,7 @@ packages:
       is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
       is-weakref: 1.0.2
-      object-inspect: 1.12.2
+      object-inspect: 1.12.3
       object-keys: 1.1.1
       object.assign: 4.1.4
       regexp.prototype.flags: 1.4.3
@@ -12333,18 +12302,6 @@ packages:
     dependencies:
       debug: 4.3.2
 
-  /follow-redirects/1.15.2_debug@4.3.4:
-    resolution: {integrity: sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==}
-    engines: {node: '>=4.0'}
-    peerDependencies:
-      debug: '*'
-    peerDependenciesMeta:
-      debug:
-        optional: true
-    dependencies:
-      debug: 4.3.4
-    dev: false
-
   /for-each/0.3.3:
     resolution: {integrity: sha512-jqYfLp7mo9vIyQf8ykW2v7A+2N4QjeCeI5+Dz9XraiO1ign81wjiH7Fb9vSOWvQfNtmSa4H2RoQTrrXivdUZmw==}
     dependencies:
@@ -12443,13 +12400,13 @@ packages:
     deprecated: 'Please upgrade to latest, formidable@v2 or formidable@v3! Check these notes: https://bit.ly/2ZEqIau'
     dev: false
 
-  /formidable/2.0.1:
-    resolution: {integrity: sha512-rjTMNbp2BpfQShhFbR3Ruk3qk2y9jKpvMW78nJgx8QKtxjDVrwbZG+wvDOmVbifHyOUOQJXxqEy6r0faRrPzTQ==}
+  /formidable/2.1.2:
+    resolution: {integrity: sha512-CM3GuJ57US06mlpQ47YcunuUZ9jpm8Vx+P2CGt2j7HpgkKZO/DJYQ0Bobim8G6PFQmK5lOqOOdUXboU+h73A4g==}
     dependencies:
-      dezalgo: 1.0.3
+      dezalgo: 1.0.4
       hexoid: 1.0.0
       once: 1.4.0
-      qs: 6.9.3
+      qs: 6.11.0
     dev: true
 
   /formstream/1.1.1:
@@ -14329,7 +14286,7 @@ packages:
       '@jest/expect': 29.3.1
       '@jest/test-result': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
@@ -14348,7 +14305,7 @@ packages:
       - supports-color
     dev: true
 
-  /jest-cli/29.3.1_@types+node@16.11.65:
+  /jest-cli/29.3.1:
     resolution: {integrity: sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -14365,7 +14322,7 @@ packages:
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 29.3.1_@types+node@16.11.65
+      jest-config: 29.3.1
       jest-util: 29.3.1
       jest-validate: 29.3.1
       prompts: 2.4.2
@@ -14376,7 +14333,7 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config/29.3.1_@types+node@16.11.65:
+  /jest-config/29.3.1:
     resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
@@ -14391,7 +14348,45 @@ packages:
       '@babel/core': 7.19.3
       '@jest/test-sequencer': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      babel-jest: 29.3.1_@babel+core@7.19.3
+      chalk: 4.1.2
+      ci-info: 3.5.0
+      deepmerge: 4.2.2
+      glob: 7.2.3
+      graceful-fs: 4.2.10
+      jest-circus: 29.3.1
+      jest-environment-node: 29.3.1
+      jest-get-type: 29.2.0
+      jest-regex-util: 29.2.0
+      jest-resolve: 29.3.1
+      jest-runner: 29.3.1
+      jest-util: 29.3.1
+      jest-validate: 29.3.1
+      micromatch: 4.0.5
+      parse-json: 5.2.0
+      pretty-format: 29.3.1
+      slash: 3.0.0
+      strip-json-comments: 3.1.1
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jest-config/29.3.1_@types+node@16.18.12:
+    resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    peerDependencies:
+      '@types/node': '*'
+      ts-node: '>=9.0.0'
+    peerDependenciesMeta:
+      '@types/node':
+        optional: true
+      ts-node:
+        optional: true
+    dependencies:
+      '@babel/core': 7.19.3
+      '@jest/test-sequencer': 29.3.1
+      '@jest/types': 29.3.1
+      '@types/node': 16.18.12
       babel-jest: 29.3.1_@babel+core@7.19.3
       chalk: 4.1.2
       ci-info: 3.5.0
@@ -14456,7 +14451,7 @@ packages:
       '@jest/fake-timers': 29.3.1
       '@jest/types': 29.3.1
       '@types/jsdom': 20.0.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       jest-mock: 29.3.1
       jest-util: 29.3.1
       jsdom: 20.0.2
@@ -14473,7 +14468,7 @@ packages:
       '@jest/environment': 29.3.1
       '@jest/fake-timers': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       jest-mock: 29.3.1
       jest-util: 29.3.1
     dev: true
@@ -14489,7 +14484,7 @@ packages:
     dependencies:
       '@jest/types': 26.6.2
       '@types/graceful-fs': 4.1.6
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.10
@@ -14512,7 +14507,7 @@ packages:
     dependencies:
       '@jest/types': 29.3.1
       '@types/graceful-fs': 4.1.5
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       anymatch: 3.1.2
       fb-watchman: 2.0.2
       graceful-fs: 4.2.10
@@ -14563,7 +14558,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       jest-util: 29.3.1
     dev: true
 
@@ -14623,7 +14618,7 @@ packages:
       '@jest/test-result': 29.3.1
       '@jest/transform': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.10
@@ -14654,7 +14649,7 @@ packages:
       '@jest/test-result': 29.3.1
       '@jest/transform': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
@@ -14677,7 +14672,7 @@ packages:
     resolution: {integrity: sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==}
     engines: {node: '>= 10.14.2'}
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       graceful-fs: 4.2.10
     dev: true
 
@@ -14718,7 +14713,7 @@ packages:
     engines: {node: '>= 10.14.2'}
     dependencies:
       '@jest/types': 26.6.2
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       chalk: 4.1.2
       graceful-fs: 4.2.10
       is-ci: 2.0.0
@@ -14730,7 +14725,7 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@jest/types': 29.3.1
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       chalk: 4.1.2
       ci-info: 3.7.1
       graceful-fs: 4.2.10
@@ -14755,7 +14750,7 @@ packages:
     dependencies:
       '@jest/test-result': 29.3.1
       '@jest/types': 29.3.1
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
@@ -14767,7 +14762,7 @@ packages:
     resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       merge-stream: 2.0.0
       supports-color: 7.2.0
     dev: true
@@ -14776,7 +14771,7 @@ packages:
     resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
@@ -14785,13 +14780,13 @@ packages:
     resolution: {integrity: sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       jest-util: 29.3.1
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest/29.3.1_@types+node@16.11.65:
+  /jest/29.3.1:
     resolution: {integrity: sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -14804,7 +14799,7 @@ packages:
       '@jest/core': 29.3.1
       '@jest/types': 29.3.1
       import-local: 3.1.0
-      jest-cli: 29.3.1_@types+node@16.11.65
+      jest-cli: 29.3.1
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
@@ -14830,6 +14825,10 @@ packages:
     resolution: {integrity: sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ==}
     dev: false
 
+  /jose/4.11.2:
+    resolution: {integrity: sha512-njj0VL2TsIxCtgzhO+9RRobBvws4oYyCM8TpvoUQwl/MbIM3NFJRR9+e6x0sS5xXaP1t6OCBkaBME98OV9zU5A==}
+    dev: false
+
   /jquery/3.6.1:
     resolution: {integrity: sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw==}
     dev: false
@@ -15134,7 +15133,6 @@ packages:
       lodash: 4.17.21
       ms: 2.1.3
       semver: 7.3.8
-    dev: false
 
   /jsprim/1.4.2:
     resolution: {integrity: sha512-P2bSOMAc/ciLz6DzgjVlGJP9+BrJWu5UDGK70C2iweC5QBIeFf0ZXRvGjEj2uYgrY2MkAAhsSWHDWlFtEroZWw==}
@@ -15178,7 +15176,6 @@ packages:
       buffer-equal-constant-time: 1.0.1
       ecdsa-sig-formatter: 1.0.11
       safe-buffer: 5.2.1
-    dev: false
 
   /jwa/2.0.0:
     resolution: {integrity: sha512-jrZ2Qx916EA+fq9cEAeCROWPTfCwi1IVHqT2tapuqLEVVDKFDENFw1oL+MwrTvH6msKxsd1YTDVw6uKEcsrLEA==}
@@ -15188,19 +15185,16 @@ packages:
       safe-buffer: 5.2.1
     dev: false
 
-  /jwks-rsa/1.12.3:
-    resolution: {integrity: sha512-cFipFDeYYaO9FhhYJcZWX/IyZgc0+g316rcHnDpT2dNRNIE/lMOmWKKqp09TkJoYlNFzrEVODsR4GgXJMgWhnA==}
+  /jwks-rsa/3.0.1:
+    resolution: {integrity: sha512-UUOZ0CVReK1QVU3rbi9bC7N5/le8ziUj0A2ef1Q0M7OPD2KvjEYizptqIxGIo6fSLYDkqBrazILS18tYuRc8gw==}
+    engines: {node: '>=14'}
     dependencies:
-      '@types/express-jwt': 0.0.42
-      axios: 0.21.4_debug@4.3.4
+      '@types/express': 4.17.14
+      '@types/jsonwebtoken': 9.0.1
       debug: 4.3.4
-      http-proxy-agent: 4.0.1
-      https-proxy-agent: 5.0.1
-      jsonwebtoken: 9.0.0
+      jose: 4.11.2
       limiter: 1.1.5
       lru-memoizer: 2.1.4
-      ms: 2.1.3
-      proxy-from-env: 1.1.0
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -15210,7 +15204,6 @@ packages:
     dependencies:
       jwa: 1.4.1
       safe-buffer: 5.2.1
-    dev: false
 
   /jws/4.0.0:
     resolution: {integrity: sha512-KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==}
@@ -15310,7 +15303,7 @@ packages:
     engines: {node: '>=14'}
     dependencies:
       '@types/asn1': 0.2.0
-      '@types/node': 16.11.65
+      '@types/node': 16.18.12
       '@types/uuid': 9.0.0
       asn1: 0.2.6
       debug: 4.3.4
@@ -16290,6 +16283,18 @@ packages:
       ufo: 1.0.1
     dev: true
 
+  /mock-jwks/1.0.9_nock@13.2.9:
+    resolution: {integrity: sha512-kshOXv5h5hA5bGR0Mb2S24GFdKkFvrWoRTv3phLRKH/HRu/UoPUx0zJLAorOE8SmFtGsfOTPFD7jfQD5Y9ZlZA==}
+    peerDependencies:
+      nock: ^11 || ^12 || ^13
+    dependencies:
+      base64-url: 2.3.3
+      jsonwebtoken: 9.0.0
+      nock: 13.2.9
+      node-forge: 1.3.1
+      node-rsa: 1.1.1
+    dev: true
+
   /mock-require/3.0.3:
     resolution: {integrity: sha512-lLzfLHcyc10MKQnNUCv7dMcoY/2Qxd6wJfbqCcVk3LDb8An4hF6ohk5AztrvgKhJCqj36uyzi/p5se+tvyD+Wg==}
     engines: {node: '>=4.3.0'}
@@ -16632,6 +16637,11 @@ packages:
       whatwg-url: 5.0.0
     dev: true
 
+  /node-forge/1.3.1:
+    resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
+    engines: {node: '>= 6.13.0'}
+    dev: true
+
   /node-gyp-build-optional-packages/5.0.3:
     resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==}
     hasBin: true
@@ -16728,7 +16738,6 @@ packages:
     resolution: {integrity: sha512-Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==}
     dependencies:
       asn1: 0.2.6
-    dev: false
 
   /node-ssh/12.0.5:
     resolution: {integrity: sha512-uN2GTGdBRUUKkZmcNBr9OM+xKL6zq74emnkSyb1TshBdVWegj3boue6QallQeqZzo7YGVheP5gAovUL+8hZSig==}
@@ -16935,9 +16944,6 @@ packages:
       kind-of: 3.2.2
     dev: true
 
-  /object-inspect/1.12.2:
-    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
-
   /object-inspect/1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
 
@@ -18479,11 +18485,6 @@ packages:
     resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
     engines: {node: '>=0.6'}
 
-  /qs/6.9.3:
-    resolution: {integrity: sha512-EbZYNarm6138UKKq46tdx08Yo/q9ZhFoAXAI1meAFd2GtbRDhbZY2WQSICskT0c5q99aFzLG1D4nvTk9tqfXIw==}
-    engines: {node: '>=0.6'}
-    dev: true
-
   /query-string/7.1.1:
     resolution: {integrity: sha512-MplouLRDHBZSG9z7fpuAAcI7aAYjDLhtsiVZsevsfaHWDS2IDdORKbSd1kWUA+V4zyva/HZoSfpwnYMMQDhb0w==}
     engines: {node: '>=6'}
@@ -20557,17 +20558,16 @@ packages:
       inline-style-parser: 0.1.1
     dev: true
 
-  /superagent/8.0.2:
-    resolution: {integrity: sha512-QtYZ9uaNAMexI7XWl2vAXAh0j4q9H7T0WVEI/y5qaUB3QLwxo+voUgCQ217AokJzUTIVOp0RTo7fhZrwhD7A2Q==}
+  /superagent/8.0.9:
+    resolution: {integrity: sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==}
     engines: {node: '>=6.4.0 <13 || >=14'}
-    deprecated: Please use v8.0.0 until https://github.com/visionmedia/superagent/issues/1743 is resolved
     dependencies:
       component-emitter: 1.3.0
-      cookiejar: 2.1.3
+      cookiejar: 2.1.4
       debug: 4.3.4
       fast-safe-stringify: 2.1.1
       form-data: 4.0.0
-      formidable: 2.0.1
+      formidable: 2.1.2
       methods: 1.1.2
       mime: 2.6.0
       qs: 6.11.0
@@ -20576,12 +20576,12 @@ packages:
       - supports-color
     dev: true
 
-  /supertest/6.3.0:
-    resolution: {integrity: sha512-QgWju1cNoacP81Rv88NKkQ4oXTzGg0eNZtOoxp1ROpbS4OHY/eK5b8meShuFtdni161o5X0VQvgo7ErVyKK+Ow==}
+  /supertest/6.3.3:
+    resolution: {integrity: sha512-EMCG6G8gDu5qEqRQ3JjjPs6+FYT1a7Hv5ApHvtSghmOFJYtsU5S+pSb6Y2EUeCEY3CmEL3mmQ8YWlPOzQomabA==}
     engines: {node: '>=6.4.0'}
     dependencies:
       methods: 1.1.2
-      superagent: 8.0.2
+      superagent: 8.0.9
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -21196,7 +21196,7 @@ packages:
       '@babel/core': 7.19.3
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
-      jest: 29.3.1_@types+node@16.11.65
+      jest: 29.3.1
       jest-util: 29.3.1
       json5: 2.2.1
       lodash.memoize: 4.1.2
@@ -22114,7 +22114,7 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite-node/0.27.2_7rfoeown37vwv4fneiebr6nt2u:
+  /vite-node/0.27.2_lydj4ordo26cwwlynpu7uqrnl4:
     resolution: {integrity: sha512-IDwuVhslF10qCnWOGJui7/2KksAOBHi+UbVo6Pqt4f5lgn+kS2sVvYDsETRG5PSuslisGB5CFGvb9I6FQgymBQ==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
@@ -22126,7 +22126,7 @@ packages:
       picocolors: 1.0.0
       source-map: 0.6.1
       source-map-support: 0.5.21
-      vite: 4.0.4_7rfoeown37vwv4fneiebr6nt2u
+      vite: 4.0.4_lydj4ordo26cwwlynpu7uqrnl4
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -22137,7 +22137,7 @@ packages:
       - terser
     dev: true
 
-  /vite-node/0.27.2_ovmyjmuuyckt3r3gpaexj2onji:
+  /vite-node/0.27.2_uuaiuqsfc4gpri2fkjqkscjfse:
     resolution: {integrity: sha512-IDwuVhslF10qCnWOGJui7/2KksAOBHi+UbVo6Pqt4f5lgn+kS2sVvYDsETRG5PSuslisGB5CFGvb9I6FQgymBQ==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
@@ -22149,7 +22149,7 @@ packages:
       picocolors: 1.0.0
       source-map: 0.6.1
       source-map-support: 0.5.21
-      vite: 4.0.4_ovmyjmuuyckt3r3gpaexj2onji
+      vite: 4.0.4_uuaiuqsfc4gpri2fkjqkscjfse
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -22168,7 +22168,7 @@ packages:
       monaco-editor: 0.33.0
     dev: true
 
-  /vite/4.0.4_7rfoeown37vwv4fneiebr6nt2u:
+  /vite/4.0.4_lydj4ordo26cwwlynpu7uqrnl4:
     resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -22193,7 +22193,7 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
@@ -22204,7 +22204,7 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /vite/4.0.4_ovmyjmuuyckt3r3gpaexj2onji:
+  /vite/4.0.4_sass@1.55.0+terser@5.16.1:
     resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -22229,17 +22229,17 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 18.11.18
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
       rollup: 3.10.0
-      sass: 1.57.1
+      sass: 1.55.0
+      terser: 5.16.1
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vite/4.0.4_sass@1.55.0+terser@5.16.1:
+  /vite/4.0.4_sass@1.57.1:
     resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -22268,13 +22268,12 @@ packages:
       postcss: 8.4.21
       resolve: 1.22.1
       rollup: 3.10.0
-      sass: 1.55.0
-      terser: 5.16.1
+      sass: 1.57.1
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vite/4.0.4_sass@1.57.1:
+  /vite/4.0.4_uuaiuqsfc4gpri2fkjqkscjfse:
     resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -22299,6 +22298,7 @@ packages:
       terser:
         optional: true
     dependencies:
+      '@types/node': 16.18.12
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
@@ -22332,7 +22332,7 @@ packages:
     dependencies:
       '@types/chai': 4.3.4
       '@types/chai-subset': 1.3.3
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       acorn: 8.8.1
       acorn-walk: 8.2.0
       cac: 6.7.14
@@ -22346,8 +22346,8 @@ packages:
       tinybench: 2.3.1
       tinypool: 0.3.0
       tinyspy: 1.0.2
-      vite: 4.0.4_ovmyjmuuyckt3r3gpaexj2onji
-      vite-node: 0.27.2_ovmyjmuuyckt3r3gpaexj2onji
+      vite: 4.0.4_uuaiuqsfc4gpri2fkjqkscjfse
+      vite-node: 0.27.2_uuaiuqsfc4gpri2fkjqkscjfse
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -22382,7 +22382,7 @@ packages:
     dependencies:
       '@types/chai': 4.3.4
       '@types/chai-subset': 1.3.3
-      '@types/node': 18.11.18
+      '@types/node': 16.18.12
       acorn: 8.8.1
       acorn-walk: 8.2.0
       cac: 6.7.14
@@ -22395,8 +22395,8 @@ packages:
       tinybench: 2.3.1
       tinypool: 0.3.0
       tinyspy: 1.0.2
-      vite: 4.0.4_7rfoeown37vwv4fneiebr6nt2u
-      vite-node: 0.27.2_7rfoeown37vwv4fneiebr6nt2u
+      vite: 4.0.4_lydj4ordo26cwwlynpu7uqrnl4
+      vite-node: 0.27.2_lydj4ordo26cwwlynpu7uqrnl4
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less

From d05203db3055ef012e494877e5d32d00c458cd26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 7 Feb 2023 16:34:08 +0100
Subject: [PATCH 113/358] test(editor): Enable adding nodes in between any two
 nodes on canvas in e2e tests (no-changelog) (#5393)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡ Adding source and target test data to connection HTML elements
* ⚡ Using new action to add node on the connection
* 🔥 Removing leftover log
* 🔥 Removing leftover test action
* 👌 Refactoring to address PR feedback
---
 cypress/e2e/10-undo-redo.cy.ts                |  2 +-
 cypress/e2e/12-canvas.cy.ts                   | 11 ++++++----
 cypress/pages/workflow.ts                     | 16 ++++++++++----
 packages/editor-ui/src/utils/nodeViewUtils.ts | 22 ++++++++++++++-----
 packages/editor-ui/src/views/NodeView.vue     |  9 ++++++++
 5 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 28c99ac31372c5..541da069c48322 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -38,7 +38,7 @@ describe('Undo/Redo', () => {
 	it('should undo/redo adding node in the middle', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeBetweenFirstTwoNodes(CODE_NODE_NAME);
+		WorkflowPage.actions.addNodeBetweenNodes(SCHEDULE_TRIGGER_NODE_NAME, CODE_NODE_NAME, SET_NODE_NAME)
 		WorkflowPage.actions.zoomToFit();
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 343b63354c7337..c88e62035d089a 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -3,6 +3,7 @@ import {
 	CODE_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
 	SET_NODE_NAME,
+	HTTP_REQUEST_NODE_NAME,
 } from './../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
@@ -61,14 +62,16 @@ describe('Canvas Actions', () => {
 	it('should add note between two connected nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeBetweenFirstTwoNodes(SET_NODE_NAME);
-		WorkflowPage.getters.canvasNodes().should('have.length', 3);
-		WorkflowPage.getters.nodeConnections().should('have.length', 2);
+		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.actions.zoomToFit();
+		WorkflowPage.actions.addNodeBetweenNodes(CODE_NODE_NAME, SET_NODE_NAME, HTTP_REQUEST_NODE_NAME);
+		WorkflowPage.getters.canvasNodes().should('have.length', 4);
+		WorkflowPage.getters.nodeConnections().should('have.length', 3);
 		// And last node should be pushed to the right
 		WorkflowPage.getters
 			.canvasNodes()
 			.last()
-			.should('have.attr', 'style', 'left: 640px; top: 260px;');
+			.should('have.attr', 'style', 'left: 860px; top: 260px;');
 	});
 
 	it('should delete node using node action button', () => {
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index f17ad0144ce76e..d1e90e815cf417 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -80,6 +80,10 @@ export class WorkflowPage extends BasePage {
 		nodeCreatorItems: () => cy.getByTestId('item-iterator-item'),
 		ndvParameters: () => cy.getByTestId('parameter-item'),
 		nodeCredentialsLabel: () => cy.getByTestId('credentials-label'),
+		getConnectionBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
+			cy.get(`.jtk-connector[data-source-node="${sourceNodeName}"][data-target-node="${targetNodeName}"]`),
+		getConnectionActionsBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
+			cy.get(`.connection-actions[data-source-node="${sourceNodeName}"][data-target-node="${targetNodeName}"]`),
 	};
 	actions = {
 		visit: () => {
@@ -170,10 +174,14 @@ export class WorkflowPage extends BasePage {
 		executeWorkflow: () => {
 			this.getters.executeWorkflowButton().click();
 		},
-		addNodeBetweenFirstTwoNodes: (nodeName: string) => {
-			this.getters.nodeConnections().first().realHover();
-			cy.get('.connection-actions .add').first().click({ force: true });
-			this.actions.addNodeToCanvas(nodeName, false);
+		addNodeBetweenNodes: (sourceNodeName: string, targetNodeName: string, newNodeName: string) => {
+			this.getters.getConnectionBetweenNodes(sourceNodeName, targetNodeName).first().realHover();
+			this.getters.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName).find('.add').first().click({ force: true });
+			this.actions.addNodeToCanvas(newNodeName, false);
+		},
+		deleteNodeBetweenNodes: (sourceNodeName: string, targetNodeName: string, newNodeName: string) => {
+			this.getters.getConnectionBetweenNodes(sourceNodeName, targetNodeName).first().realHover();
+			this.getters.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName).find('.delete').first().click({ force: true });
 		},
 	};
 }
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/editor-ui/src/utils/nodeViewUtils.ts
index 9b8e5d8e0e4146..b3a4f50fcc7a5d 100644
--- a/packages/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.ts
@@ -3,7 +3,7 @@ import { isNumber } from '@/utils';
 import { NODE_OUTPUT_DEFAULT_KEY, STICKY_NODE_TYPE, QUICKSTART_NOTE_NAME } from '@/constants';
 import { EndpointStyle, IBounds, INodeUi, XYPosition } from '@/Interface';
 import { ArrayAnchorSpec, ConnectorSpec, OverlaySpec, PaintStyle } from '@jsplumb/common';
-import { Endpoint, Connection } from '@jsplumb/core';
+import { Endpoint, Connection, ConnectionEstablishedParams } from '@jsplumb/core';
 import { N8nConnector } from '@/plugins/connectors/N8nCustomConnector';
 import { closestNumberDivisibleBy } from '@/utils';
 import {
@@ -741,6 +741,21 @@ export const moveBackInputLabelPosition = (targetEndpoint: Endpoint) => {
 	}
 };
 
+export const addConnectionTestData = (
+	source: HTMLElement,
+	target: HTMLElement,
+	el: HTMLElement | undefined,
+) => {
+	// TODO: Only do this if running in test mode
+	const sourceNodeName = source.getAttribute('data-name')?.toString();
+	const targetNodeName = target.getAttribute('data-name')?.toString();
+
+	if (el && sourceNodeName && targetNodeName) {
+		el.setAttribute('data-source-node', sourceNodeName);
+		el.setAttribute('data-target-node', targetNodeName);
+	}
+};
+
 export const addConnectionActionsOverlay = (
 	connection: Connection,
 	onDelete: Function,
@@ -756,15 +771,13 @@ export const addConnectionActionsOverlay = (
 				const deleteButton = document.createElement('button');
 
 				div.classList.add(OVERLAY_CONNECTION_ACTIONS_ID);
+				addConnectionTestData(component.source, component.target, div);
 				addButton.classList.add('add');
 				deleteButton.classList.add('delete');
-
 				addButton.innerHTML = getIcon('plus');
 				deleteButton.innerHTML = getIcon('trash');
-
 				addButton.addEventListener('click', () => onAdd());
 				deleteButton.addEventListener('click', () => onDelete());
-
 				// We have to manually trigger connection mouse events because the overlay
 				// is not part of the connection element
 				div.addEventListener('mouseout', () =>
@@ -773,7 +786,6 @@ export const addConnectionActionsOverlay = (
 				div.addEventListener('mouseover', () =>
 					connection.instance.fire(EVENT_CONNECTION_MOUSEOVER, component),
 				);
-
 				div.appendChild(addButton);
 				div.appendChild(deleteButton);
 				return div;
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 22ee4d36794b0c..6f82056eb03b63 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -2182,6 +2182,15 @@ export default mixins(
 								});
 							},
 						);
+						setTimeout(() => {
+							NodeViewUtils.addConnectionTestData(
+								info.source,
+								info.target,
+								'canvas' in info.connection.connector
+									? (info.connection.connector.canvas as HTMLElement)
+									: undefined,
+							);
+						}, 0);
 					}
 				} catch (e) {
 					console.error(e); // eslint-disable-line no-console

From c8245b9f872fd2c85ecaaa0da426b3ef9cb03113 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Tue, 7 Feb 2023 17:40:36 +0100
Subject: [PATCH 114/358] fix: Error workflow now correctly checks for
 subworkflow permissions (#5390)

---
 packages/cli/src/WorkflowHelpers.ts | 53 ++++++++++-------------------
 1 file changed, 18 insertions(+), 35 deletions(-)

diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index 5f6f2e0e7a9777..c4e19b89a56784 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -29,8 +29,9 @@ import { WorkflowRunner } from '@/WorkflowRunner';
 import config from '@/config';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { User } from '@db/entities/User';
-import { getWorkflowOwner, whereClause } from '@/UserManagement/UserManagementHelper';
+import { whereClause } from '@/UserManagement/UserManagementHelper';
 import omit from 'lodash.omit';
+import { PermissionChecker } from './UserManagement/PermissionChecker';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
 
@@ -94,30 +95,7 @@ export async function executeErrorWorkflow(
 ): Promise<void> {
 	// Wrap everything in try/catch to make sure that no errors bubble up and all get caught here
 	try {
-		let workflowData: WorkflowEntity | null = null;
-		if (workflowId !== workflowErrorData.workflow.id) {
-			// To make this code easier to understand, we split it in 2 parts:
-			// 1) Fetch the owner of the errored workflows and then
-			// 2) if now instance owner, then check if the user has access to the
-			//    triggered workflow.
-
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			const user = await getWorkflowOwner(workflowErrorData.workflow.id!);
-
-			if (user.globalRole.name === 'owner') {
-				workflowData = await Db.collections.Workflow.findOneBy({ id: workflowId });
-			} else {
-				const sharedWorkflowData = await Db.collections.SharedWorkflow.findOne({
-					where: { workflowId, userId: user.id },
-					relations: ['workflow'],
-				});
-				if (sharedWorkflowData) {
-					workflowData = sharedWorkflowData.workflow;
-				}
-			}
-		} else {
-			workflowData = await Db.collections.Workflow.findOneBy({ id: workflowId });
-		}
+		const workflowData = await Db.collections.Workflow.findOneBy({ id: workflowId });
 
 		if (workflowData === null) {
 			// The error workflow could not be found
@@ -129,15 +107,6 @@ export async function executeErrorWorkflow(
 			return;
 		}
 
-		const user = await getWorkflowOwner(workflowId);
-		if (user.id !== runningUser.id) {
-			// The error workflow could not be found
-			Logger.warn(
-				`An attempt to execute workflow ID ${workflowId} as error workflow was blocked due to wrong permission`,
-			);
-			return;
-		}
-
 		const executionMode = 'error';
 		const nodeTypes = NodeTypes();
 
@@ -152,6 +121,20 @@ export async function executeErrorWorkflow(
 			settings: workflowData.settings,
 		});
 
+		try {
+			await PermissionChecker.checkSubworkflowExecutePolicy(
+				workflowInstance,
+				runningUser.id,
+				workflowErrorData.workflow.id,
+			);
+		} catch (error) {
+			Logger.info('Error workflow execution blocked due to subworkflow settings', {
+				erroredWorkflowId: workflowErrorData.workflow.id,
+				errorWorkflowId: workflowId,
+			});
+			return;
+		}
+
 		let node: INode;
 		let workflowStartNode: INode | undefined;
 		for (const nodeName of Object.keys(workflowInstance.nodes)) {
@@ -204,7 +187,7 @@ export async function executeErrorWorkflow(
 			executionMode,
 			executionData: runExecutionData,
 			workflowData,
-			userId: user.id,
+			userId: runningUser.id,
 		};
 
 		const workflowRunner = new WorkflowRunner();

From 9fb1fa1d79f9c09444245878f4faaacf89012275 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Tue, 7 Feb 2023 17:51:11 +0100
Subject: [PATCH 115/358] ci: Add E2E tests for Webhook node (#5402)

* scheduler e2e test and switch to main mode

* adjust e2e options

* rolling back config changes

* webhook e2e tests and disable cypress retries on openmode

* cleanup
---
 cypress.config.js                  |   2 +-
 cypress/e2e/16-webhook-node.cy.ts  | 344 +++++++++++++++++++++++++++++
 cypress/support/binaryTestFiles.ts |   1 +
 3 files changed, 346 insertions(+), 1 deletion(-)
 create mode 100644 cypress/e2e/16-webhook-node.cy.ts
 create mode 100644 cypress/support/binaryTestFiles.ts

diff --git a/cypress.config.js b/cypress.config.js
index 59128107ca4195..357875df43198c 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -5,7 +5,7 @@ const BASE_URL = 'http://localhost:5678';
 
 module.exports = defineConfig({
 	retries: {
-		openMode: 1,
+		openMode: 0,
 		runMode: 3,
 	},
 	e2e: {
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
new file mode 100644
index 00000000000000..119ebdd3b4af33
--- /dev/null
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -0,0 +1,344 @@
+import { WorkflowPage, WorkflowsPage, NDV, CredentialsModal } from '../pages';
+import { v4 as uuid } from 'uuid';
+import { cowBase64 } from '../support/binaryTestFiles';
+
+const workflowsPage = new WorkflowsPage();
+const workflowPage = new WorkflowPage();
+const ndv = new NDV();
+const credentialsModal = new CredentialsModal();
+
+const webhookWorkflowName = 'Webhook Workflow';
+const waitForWebhook = 500;
+
+interface SimpleWebhookCallOptions {
+	method: string;
+	webhookPath: string;
+	responseCode?: number;
+	respondWith?: string;
+	executeNow?: boolean;
+	responseData?: string;
+	authentication?: string;
+}
+
+const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
+	const { 
+		authentication,
+		method,
+		webhookPath,
+		responseCode,
+		respondWith,
+		responseData,
+		executeNow = true,
+		} = options;
+
+	cy.visit(workflowsPage.url);
+
+	workflowsPage.actions.createWorkflowFromCard();
+	workflowPage.actions.renameWorkflow(webhookWorkflowName);
+	workflowPage.actions.addInitialNodeToCanvas('Webhook');
+	workflowPage.actions.openNode('Webhook');
+
+	cy.getByTestId('parameter-input-httpMethod').click();
+	cy.getByTestId('parameter-input-httpMethod')
+		.find('.el-select-dropdown')
+		.find('.option-headline')
+		.contains(method)
+		.click();
+	cy.getByTestId('parameter-input-path')
+		.find('.parameter-input')
+		.find('input')
+		.clear()
+		.type(webhookPath);
+	
+	if (authentication) {
+		cy.getByTestId('parameter-input-authentication').click();
+		cy.getByTestId('parameter-input-authentication')
+		.find('.el-select-dropdown')
+		.find('.option-headline')
+		.contains(authentication)
+		.click();
+	}
+
+	if (responseCode) {
+		cy.getByTestId('parameter-input-responseCode')
+		.find('.parameter-input')
+		.find('input')
+		.clear()
+		.type(responseCode.toString());
+	}
+	
+	if (respondWith) {
+		cy.getByTestId('parameter-input-responseMode').click();
+		cy.getByTestId('parameter-input-responseMode')
+		.find('.el-select-dropdown')
+		.find('.option-headline')
+		.contains(respondWith)
+		.click();
+	}
+
+	if (responseData) {
+		cy.getByTestId('parameter-input-responseData').click();
+		cy.getByTestId('parameter-input-responseData')
+		.find('.el-select-dropdown')
+		.find('.option-headline')
+		.contains(responseData)
+		.click();
+	}
+
+	if (executeNow) { 
+		ndv.actions.execute();
+		cy.wait(waitForWebhook);
+
+		cy.request(method, '/webhook-test/'+ webhookPath).then((response) => {
+			expect(response.status).to.eq(200);
+			ndv.getters.outputPanel().contains('headers');
+		});
+	}
+};
+
+describe('Webhook Trigger node', async () => {
+	before(() => {
+		cy.resetAll();
+		cy.skipSetup();
+	});
+
+	afterEach(() => {
+		cy.visit(workflowsPage.url);
+		workflowsPage.actions.deleteWorkFlow(webhookWorkflowName);
+	});
+
+	it('should listen for a GET request', () => {
+		simpleWebhookCall({method: 'GET', webhookPath: uuid(), executeNow: true});
+	});
+
+	it('should listen for a POST request', () => {
+		simpleWebhookCall({method: 'POST', webhookPath: uuid(), executeNow: true});
+	});
+
+	it('should listen for a DELETE request', () => {
+		simpleWebhookCall({method: 'DELETE', webhookPath: uuid(), executeNow: true});
+	});
+	it('should listen for a HEAD request', () => {
+		simpleWebhookCall({method: 'HEAD', webhookPath: uuid(), executeNow: true});
+	});
+	it('should listen for a PATCH request', () => {
+		simpleWebhookCall({method: 'PATCH', webhookPath: uuid(), executeNow: true});
+	});
+	it('should listen for a PUT request', () => {
+		simpleWebhookCall({method: 'PUT', webhookPath: uuid(), executeNow: true});
+	});
+
+	it('should listen for a GET request and respond with Respond to Webhook node', () => {
+		const webhookPath = uuid();
+		simpleWebhookCall({
+			method: 'GET',
+			webhookPath,
+			executeNow: false,
+			respondWith: 'Respond to Webhook',
+		});
+
+		ndv.getters.backToCanvas().click();
+		
+		workflowPage.actions.addNodeToCanvas('Set');
+		workflowPage.actions.openNode('Set');
+		cy.get('.add-option').click();
+		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
+		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('MyValue');
+		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
+		ndv.getters.backToCanvas().click();
+		
+		workflowPage.actions.addNodeToCanvas('Respond to Webhook');
+
+		workflowPage.actions.executeWorkflow();
+		cy.wait(waitForWebhook);
+	
+		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+			expect(response.status).to.eq(200);
+			expect(response.body.MyValue).to.eq(1234);
+		});
+	});
+
+	it('should listen for a GET request and respond custom status code 201', () => {
+		const webhookPath = uuid();
+		simpleWebhookCall({
+			method: 'GET',
+			webhookPath,
+			executeNow: false,
+			responseCode: 201,
+		});
+
+		ndv.actions.execute();
+		cy.wait(waitForWebhook);
+	
+		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+			expect(response.status).to.eq(201);
+		});
+	});
+
+	it('should listen for a GET request and respond with last node', () => {
+		const webhookPath = uuid();
+		simpleWebhookCall({
+			method: 'GET',
+			webhookPath,
+			executeNow: false,
+			respondWith: 'Last Node',
+		});
+		ndv.getters.backToCanvas().click();
+		
+		workflowPage.actions.addNodeToCanvas('Set');
+		workflowPage.actions.openNode('Set');
+		cy.get('.add-option').click();
+		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
+		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('MyValue');
+		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
+		ndv.getters.backToCanvas().click();
+		
+		workflowPage.actions.executeWorkflow();
+		cy.wait(waitForWebhook);
+	
+		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+			expect(response.status).to.eq(200);
+			expect(response.body.MyValue).to.eq(1234);
+		});
+	});
+
+	it('should listen for a GET request and respond with last node binary data', () => {
+		const webhookPath = uuid();
+		simpleWebhookCall({
+			method: 'GET',
+			webhookPath,
+			executeNow: false,
+			respondWith: 'Last Node',
+			responseData: 'First Entry Binary',
+		});
+		ndv.getters.backToCanvas().click();
+		
+		workflowPage.actions.addNodeToCanvas('Set');
+		workflowPage.actions.openNode('Set');
+		cy.get('.add-option').click();
+		cy.get('.add-option').find('.el-select-dropdown__item').contains('String').click();
+		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('data');
+		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().find('input').invoke('val', cowBase64).trigger('blur');
+		ndv.getters.backToCanvas().click();
+		
+
+		workflowPage.actions.addNodeToCanvas('Move Binary Data');
+		workflowPage.actions.zoomToFit();
+
+		workflowPage.actions.openNode('Move Binary Data');
+		cy.getByTestId('parameter-input-mode').click();
+		cy.getByTestId('parameter-input-mode')
+			.find('.el-select-dropdown')
+			.find('.option-headline')
+			.contains('JSON to Binary')
+			.click();
+		ndv.getters.backToCanvas().click();
+		
+		workflowPage.actions.executeWorkflow();
+		cy.wait(waitForWebhook);
+	
+		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+			expect(response.status).to.eq(200);
+			expect(Object.keys(response.body).includes('data')).to.be.true;
+		});
+	});
+
+	it('should listen for a GET request and respond with an empty body', () => {
+		const webhookPath = uuid();
+		simpleWebhookCall({
+			method: 'GET',
+			webhookPath,
+			executeNow: false,
+			respondWith: 'Last Node',
+			responseData: 'No Response Body',
+		});
+		ndv.actions.execute();
+		cy.wait(waitForWebhook);
+		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+			expect(response.status).to.eq(200);
+			expect(response.body.MyValue).to.be.undefined;
+		});
+	});
+
+	it('should listen for a GET request with Basic Authentication', () => {
+		const webhookPath = uuid();
+		simpleWebhookCall({
+			method: 'GET',
+			webhookPath,
+			executeNow: false,
+			authentication: 'Basic Auth',
+		});
+		// add credentials
+		workflowPage.getters.nodeCredentialsSelect().click();
+		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		credentialsModal.getters.credentialsEditModal().should('be.visible');
+		credentialsModal.actions.fillCredentialsForm();
+
+		ndv.actions.execute();
+		cy.wait(waitForWebhook);
+		cy.request({
+			method: 'GET',
+			url: '/webhook-test/'+ webhookPath,
+			auth: {
+				'user': 'username',
+				'pass': 'password',
+			},
+			failOnStatusCode: false,
+		})
+		.then((response) => {
+			expect(response.status).to.eq(403);
+		}).then(() => {
+			cy.request({
+				method: 'GET',
+				url: '/webhook-test/'+ webhookPath,
+				auth: {
+					'user': 'test',
+					'pass': 'test',
+				},
+				failOnStatusCode: true,
+			}).then((response) => {
+				expect(response.status).to.eq(200);
+			});
+		});
+	});
+
+	it('should listen for a GET request with Header Authentication', () => {
+		const webhookPath = uuid();
+		simpleWebhookCall({
+			method: 'GET',
+			webhookPath,
+			executeNow: false,
+			authentication: 'Header Auth',
+		});
+		// add credentials
+		workflowPage.getters.nodeCredentialsSelect().click();
+		workflowPage.getters.nodeCredentialsSelect().find('li').last().click();
+		credentialsModal.getters.credentialsEditModal().should('be.visible');
+		credentialsModal.actions.fillCredentialsForm();
+
+		ndv.actions.execute();
+		cy.wait(waitForWebhook);
+		cy.request({
+			method: 'GET',
+			url: '/webhook-test/'+ webhookPath,
+			headers: {
+				test: 'wrong',
+			},
+			failOnStatusCode: false,
+		})
+		.then((response) => {
+			expect(response.status).to.eq(403);
+		}).then(() => {
+			cy.request({
+				method: 'GET',
+				url: '/webhook-test/'+ webhookPath,
+				headers: {
+					test: 'test',
+				},
+				failOnStatusCode: true,
+			}).then((response) => {
+				expect(response.status).to.eq(200);
+			});
+		});
+	});
+});
diff --git a/cypress/support/binaryTestFiles.ts b/cypress/support/binaryTestFiles.ts
new file mode 100644
index 00000000000000..bb42cd2101ca82
--- /dev/null
+++ b/cypress/support/binaryTestFiles.ts
@@ -0,0 +1 @@
+export const cowBase64 = "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"

From 4d87711ace4982d51ade836c9f7da6fda679e225 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 7 Feb 2023 19:32:25 +0200
Subject: [PATCH 116/358] test(Merge Node): Unit tests (no-changelog)

---
 .../nodes/Merge/test/node/Merge.test.ts       |   5 +
 .../Merge/test/node/workflow.append.json      | 123 +++++
 .../test/node/workflow.chooseBranch.json      | 174 +++++++
 .../node/workflow.combine.mergeByFields.json  | 486 ++++++++++++++++++
 .../workflow.combine.mergeByPosition.json     | 219 ++++++++
 .../test/node/workflow.combine.multiplex.json | 259 ++++++++++
 6 files changed, 1266 insertions(+)
 create mode 100644 packages/nodes-base/nodes/Merge/test/node/Merge.test.ts
 create mode 100644 packages/nodes-base/nodes/Merge/test/node/workflow.append.json
 create mode 100644 packages/nodes-base/nodes/Merge/test/node/workflow.chooseBranch.json
 create mode 100644 packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json
 create mode 100644 packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByPosition.json
 create mode 100644 packages/nodes-base/nodes/Merge/test/node/workflow.combine.multiplex.json

diff --git a/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts b/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts
new file mode 100644
index 00000000000000..207f2af4953131
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/Merge.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Merge Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.append.json b/packages/nodes-base/nodes/Merge/test/node/workflow.append.json
new file mode 100644
index 00000000000000..1ef23c8961a8f6
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.append.json
@@ -0,0 +1,123 @@
+{
+	"name": "merge tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "9f880c6f-b5e0-4453-b1d7-550beb1febe8",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 380]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1},\n  {id: 2},\n  {id: 3}, \n];"
+			},
+			"id": "263d9c7f-32d4-4112-b271-73d09b73809a",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1020, 220]
+		},
+		{
+			"parameters": {},
+			"id": "82ff69e1-596b-48dd-b724-388ef454a822",
+			"name": "Merge",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1280, 360]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 4},\n  {id: 5},\n  {id: 6}, \n];"
+			},
+			"id": "3defcf5a-ec5e-4d23-a1f6-a99b7362a241",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1040, 540]
+		}
+	],
+	"pinData": {
+		"Merge": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			},
+			{
+				"json": {
+					"id": 4
+				}
+			},
+			{
+				"json": {
+					"id": 5
+				}
+			},
+			{
+				"json": {
+					"id": 6
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "7082c0c9-60ab-4bcb-adbd-89e56e0bddd6",
+	"id": "107",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.chooseBranch.json b/packages/nodes-base/nodes/Merge/test/node/workflow.chooseBranch.json
new file mode 100644
index 00000000000000..2444642e45a55d
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.chooseBranch.json
@@ -0,0 +1,174 @@
+{
+	"name": "merge tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "9f880c6f-b5e0-4453-b1d7-550beb1febe8",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 380]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1},\n  {id: 2},\n  {id: 3}, \n];"
+			},
+			"id": "263d9c7f-32d4-4112-b271-73d09b73809a",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1020, 220]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 4},\n  {id: 5},\n  {id: 6}, \n];"
+			},
+			"id": "3defcf5a-ec5e-4d23-a1f6-a99b7362a241",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1040, 540]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch"
+			},
+			"id": "7120cd6f-29f3-4f5b-aa25-babebd6335d3",
+			"name": "Merge",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1300, 240]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "input2"
+			},
+			"id": "5dbe68d4-bf2f-40ea-a9ae-ee83b4030fa5",
+			"name": "Merge1",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1300, 380]
+		},
+		{
+			"parameters": {
+				"mode": "chooseBranch",
+				"output": "empty"
+			},
+			"id": "3b2885c3-5c2e-4972-910a-50ff8e173d11",
+			"name": "Merge2",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1300, 520]
+		}
+	],
+	"pinData": {
+		"Merge": [
+			{
+				"json": {
+					"id": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3
+				}
+			}
+		],
+		"Merge1": [
+			{
+				"json": {
+					"id": 4
+				}
+			},
+			{
+				"json": {
+					"id": 5
+				}
+			},
+			{
+				"json": {
+					"id": 6
+				}
+			}
+		],
+		"Merge2": [
+			{
+				"json": {}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "dc43b494-33dc-4671-9004-e5e53170732c",
+	"id": "107",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json
new file mode 100644
index 00000000000000..aecdcd27126b03
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByFields.json
@@ -0,0 +1,486 @@
+{
+	"name": "merge tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "9f880c6f-b5e0-4453-b1d7-550beb1febe8",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [700, 660]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, data: 'a', input: 1, text: 'foo'},\n  {id: 2, data: 'b', input: 1, text: 'foo'},\n];"
+			},
+			"id": "263d9c7f-32d4-4112-b271-73d09b73809a",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [900, 540]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, data: 'c', input: 2, tag: 'second'},\n  {id: 2, data: 'd', input: 2, tag: 'second'},\n  {id: 3, data: 'e', input: 2, tag: 'second'},\n];"
+			},
+			"id": "3defcf5a-ec5e-4d23-a1f6-a99b7362a241",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [900, 780]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "7120cd6f-29f3-4f5b-aa25-babebd6335d3",
+			"name": "Merge",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 140]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepNonMatches",
+				"options": {}
+			},
+			"id": "1d6973e5-0716-4d47-85ef-298d3f86bb9d",
+			"name": "Merge1",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 280]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "keepEverything",
+				"options": {}
+			},
+			"id": "dd75b8c0-21bf-460f-9920-644a467ed356",
+			"name": "Merge2",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 420]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "enrichInput1",
+				"options": {}
+			},
+			"id": "3545877d-6e4f-437e-b91f-4c792d714e73",
+			"name": "Merge3",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 560]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"joinMode": "enrichInput2",
+				"options": {}
+			},
+			"id": "4b6ac099-6e6f-4e91-bcfe-74d7524fad54",
+			"name": "Merge4",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 740]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"outputDataFrom": "input1",
+				"options": {}
+			},
+			"id": "fb4fef36-26ea-4fc0-b6e9-a4b2781c94fa",
+			"name": "Merge5",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 900]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"outputDataFrom": "input2",
+				"options": {}
+			},
+			"id": "0b4fbaaa-cf0b-4da5-b35f-da3f49409965",
+			"name": "Merge6",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 1040]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"options": {
+					"clashHandling": {
+						"values": {
+							"resolveClash": "addSuffix"
+						}
+					}
+				}
+			},
+			"id": "25489a7a-74c1-48d5-a03d-1bbd2aba2abe",
+			"name": "Merge7",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1320, 1200]
+		}
+	],
+	"pinData": {
+		"Merge": [
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			}
+		],
+		"Merge1": [
+			{
+				"json": {
+					"id": 3,
+					"data": "e",
+					"input": 2,
+					"tag": "second",
+					"_source": "input2"
+				}
+			}
+		],
+		"Merge2": [
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": "e",
+					"input": 2,
+					"tag": "second"
+				}
+			}
+		],
+		"Merge3": [
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			}
+		],
+		"Merge4": [
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2,
+					"text": "foo",
+					"tag": "second"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": "e",
+					"input": 2,
+					"tag": "second"
+				}
+			}
+		],
+		"Merge5": [
+			{
+				"json": {
+					"id": 1,
+					"data": "a",
+					"input": 1,
+					"text": "foo"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "b",
+					"input": 1,
+					"text": "foo"
+				}
+			}
+		],
+		"Merge6": [
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2,
+					"tag": "second"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2,
+					"tag": "second"
+				}
+			}
+		],
+		"Merge7": [
+			{
+				"json": {
+					"id_1": 1,
+					"data_1": "a",
+					"input_1": 1,
+					"text_1": "foo",
+					"id_2": 1,
+					"data_2": "c",
+					"input_2": 2,
+					"tag_2": "second"
+				}
+			},
+			{
+				"json": {
+					"id_1": 2,
+					"data_1": "b",
+					"input_1": 1,
+					"text_1": "foo",
+					"id_2": 2,
+					"data_2": "d",
+					"input_2": 2,
+					"tag_2": "second"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge5",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge6",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge3",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge4",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge5",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge6",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge7",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "8bad6701-bb00-4617-b1d5-bd24145eadaf",
+	"id": "107",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByPosition.json b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByPosition.json
new file mode 100644
index 00000000000000..8de01308712bb2
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.mergeByPosition.json
@@ -0,0 +1,219 @@
+{
+	"name": "merge tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "9f880c6f-b5e0-4453-b1d7-550beb1febe8",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [840, 360]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, data: 'a', input: 1},\n  {id: 2, data: 'b', input: 1},\n];"
+			},
+			"id": "263d9c7f-32d4-4112-b271-73d09b73809a",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1040, 200]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, data: 'c', input: 2},\n  {id: 2, data: 'd', input: 2},\n  {id: 3, data: 'e', input: 2},\n];"
+			},
+			"id": "3defcf5a-ec5e-4d23-a1f6-a99b7362a241",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1060, 520]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {
+					"clashHandling": {
+						"values": {
+							"resolveClash": "addSuffix"
+						}
+					}
+				}
+			},
+			"id": "7120cd6f-29f3-4f5b-aa25-babebd6335d3",
+			"name": "Merge",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1260, 200]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {
+					"clashHandling": {
+						"values": {
+							"resolveClash": "preferInput1"
+						}
+					}
+				}
+			},
+			"id": "b40fdf2e-7527-4954-84fe-464a762f8957",
+			"name": "Merge1",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1260, 380]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "mergeByPosition",
+				"options": {
+					"clashHandling": {
+						"values": {
+							"resolveClash": "preferInput2"
+						}
+					},
+					"includeUnpaired": true
+				}
+			},
+			"id": "daca2305-691a-45c2-9010-34a9ef5a783f",
+			"name": "Merge2",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1260, 540]
+		}
+	],
+	"pinData": {
+		"Merge": [
+			{
+				"json": {
+					"id_1": 1,
+					"data_1": "a",
+					"input_1": 1,
+					"id_2": 1,
+					"data_2": "c",
+					"input_2": 2
+				}
+			},
+			{
+				"json": {
+					"id_1": 2,
+					"data_1": "b",
+					"input_1": 1,
+					"id_2": 2,
+					"data_2": "d",
+					"input_2": 2
+				}
+			}
+		],
+		"Merge1": [
+			{
+				"json": {
+					"id": 1,
+					"data": "a",
+					"input": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "b",
+					"input": 1
+				}
+			}
+		],
+		"Merge2": [
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": "e",
+					"input": 2
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "c61ce62f-d995-46bb-900a-8b3edf95a858",
+	"id": "107",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/Merge/test/node/workflow.combine.multiplex.json b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.multiplex.json
new file mode 100644
index 00000000000000..9a2cf2cf590acd
--- /dev/null
+++ b/packages/nodes-base/nodes/Merge/test/node/workflow.combine.multiplex.json
@@ -0,0 +1,259 @@
+{
+	"name": "merge tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "9f880c6f-b5e0-4453-b1d7-550beb1febe8",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 380]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, data: 'a', input: 1},\n  {id: 2, data: 'b', input: 1},\n];"
+			},
+			"id": "263d9c7f-32d4-4112-b271-73d09b73809a",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1020, 220]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {id: 1, data: 'c', input: 2},\n  {id: 2, data: 'd', input: 2},\n];"
+			},
+			"id": "3defcf5a-ec5e-4d23-a1f6-a99b7362a241",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [1040, 540]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {
+					"clashHandling": {
+						"values": {
+							"resolveClash": "addSuffix"
+						}
+					}
+				}
+			},
+			"id": "7120cd6f-29f3-4f5b-aa25-babebd6335d3",
+			"name": "Merge",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1260, 220]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {
+					"clashHandling": {
+						"values": {
+							"resolveClash": "preferInput1"
+						}
+					}
+				}
+			},
+			"id": "1ec4a466-432d-43f8-b6c0-3cc02cf32f6f",
+			"name": "Merge1",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1260, 360]
+		},
+		{
+			"parameters": {
+				"mode": "combine",
+				"combinationMode": "multiplex",
+				"options": {
+					"clashHandling": {
+						"values": {
+							"resolveClash": "preferInput2"
+						}
+					}
+				}
+			},
+			"id": "fb671be6-b476-4302-984f-0c973839581b",
+			"name": "Merge2",
+			"type": "n8n-nodes-base.merge",
+			"typeVersion": 2,
+			"position": [1260, 500]
+		}
+	],
+	"pinData": {
+		"Merge": [
+			{
+				"json": {
+					"id_1": 1,
+					"data_1": "a",
+					"input_1": 1,
+					"id_2": 1,
+					"data_2": "c",
+					"input_2": 2
+				}
+			},
+			{
+				"json": {
+					"id_1": 1,
+					"data_1": "a",
+					"input_1": 1,
+					"id_2": 2,
+					"data_2": "d",
+					"input_2": 2
+				}
+			},
+			{
+				"json": {
+					"id_1": 2,
+					"data_1": "b",
+					"input_1": 1,
+					"id_2": 1,
+					"data_2": "c",
+					"input_2": 2
+				}
+			},
+			{
+				"json": {
+					"id_1": 2,
+					"data_1": "b",
+					"input_1": 1,
+					"id_2": 2,
+					"data_2": "d",
+					"input_2": 2
+				}
+			}
+		],
+		"Merge1": [
+			{
+				"json": {
+					"id": 1,
+					"data": "a",
+					"input": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "b",
+					"input": 1
+				}
+			},
+			{
+				"json": {
+					"id": 1,
+					"data": "a",
+					"input": 1
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "b",
+					"input": 1
+				}
+			}
+		],
+		"Merge2": [
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2
+				}
+			},
+			{
+				"json": {
+					"id": 1,
+					"data": "c",
+					"input": 2
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "d",
+					"input": 2
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Merge",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge1",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Merge2",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "0cab5d94-90b7-4024-ad58-af9cafb46a21",
+	"id": "107",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}

From d8865aa917c7b09f0734d95d978fe3db909e85ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 8 Feb 2023 10:41:36 +0100
Subject: [PATCH 117/358] test: Add e2e for data transformation expressions
 (#5375)

* :test_tube: Add e2e for data transormation expressions

* :recycle: Apply feedback
---
 .../14-data-transformation-expressions.cy.ts  | 120 ++++++++++++++++++
 cypress/pages/ndv.ts                          |   6 +
 cypress/pages/workflow.ts                     |   3 +-
 3 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 cypress/e2e/14-data-transformation-expressions.cy.ts

diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
new file mode 100644
index 00000000000000..ab59eef826ece0
--- /dev/null
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -0,0 +1,120 @@
+import { WorkflowPage, NDV } from '../pages';
+
+const wf = new WorkflowPage();
+const ndv = new NDV();
+
+describe('Data transformation expressions', () => {
+	before(() => {
+		cy.resetAll();
+		cy.skipSetup();
+		cy.waitForLoad();
+	});
+
+	it('$json + native string methods', () => {
+		wf.actions.visit();
+
+		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
+		ndv.actions.setPinnedData([{ myStr: 'Monday' }]);
+		ndv.actions.close();
+		addSet();
+
+		const input = '{{$json.myStr.toLowerCase() + " is " + "today".toUpperCase()';
+		const output = 'monday is TODAY';
+
+		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.actions.execute();
+		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+	});
+
+	it('$json + n8n string methods', () => {
+		wf.actions.visit();
+
+		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
+		ndv.actions.setPinnedData([{ myStr: 'hello@n8n.io is an email' }]);
+		ndv.actions.close();
+		addSet();
+
+		const input = '{{$json.myStr.extractEmail() + " " + $json.myStr.isEmpty()';
+		const output = 'hello@n8n.io false';
+
+		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.actions.execute();
+		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+	});
+
+	it('$json + native numeric methods', () => {
+		wf.actions.visit();
+
+		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
+		ndv.actions.setPinnedData([{ myNum: 9.123 }]);
+		ndv.actions.close();
+		addSet();
+
+		const input = '{{$json.myNum.toPrecision(3)';
+		const output = '9.12';
+
+		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.actions.execute();
+		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+	});
+
+	it('$json + n8n numeric methods', () => {
+		wf.actions.visit();
+
+		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
+		ndv.actions.setPinnedData([{ myStr: 'hello@n8n.io is an email' }]);
+		ndv.actions.close();
+		addSet();
+
+		const input = '{{$json.myStr.extractEmail() + " " + $json.myStr.isEmpty()';
+		const output = 'hello@n8n.io false';
+
+		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.actions.execute();
+		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+	});
+
+	it('$json + native array methods', () => {
+		wf.actions.visit();
+
+		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
+		ndv.actions.setPinnedData([{ myArr: [1, 2, 3] }]);
+		ndv.actions.close();
+		addSet();
+
+		const input = '{{$json.myArr.includes(1) + " " + $json.myArr.at(2)';
+		const output = 'true 3';
+
+		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.actions.execute();
+		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+	});
+
+	it('$json + n8n array methods', () => {
+		wf.actions.visit();
+
+		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
+		ndv.actions.setPinnedData([{ myArr: [1, 2, 3] }]);
+		ndv.actions.close();
+		addSet();
+
+		const input = '{{$json.myArr.first() + " " + $json.myArr.last()';
+		const output = '1 3';
+
+		ndv.getters.inlineExpressionEditorInput().clear().type(input);
+		ndv.actions.execute();
+		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+	});
+});
+
+// ----------------------------------
+//             utils
+// ----------------------------------
+
+const addSet = () => {
+	wf.actions.addNodeToCanvas('Set', true, true);
+	ndv.getters.parameterInput('keepOnlySet').find('div[role=switch]').click(); // shorten output
+	cy.get('input[placeholder="Add Value"]').click();
+	cy.get('span').contains('String').click();
+	ndv.getters.nthParam(3).contains('Expression').invoke('show').click(); // Values to Set > String > Value
+};
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 9842c724d07cfa..74febf8c001752 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -35,6 +35,8 @@ export class NDV extends BasePage {
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
 		executePrevious: () => cy.getByTestId('execute-previous-node'),
 		httpRequestNotice: () => cy.getByTestId('node-parameters-http-notice'),
+		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input'),
+		nthParam: (n: number) => cy.getByTestId('node-parameters').find('.parameter-item').eq(n),
 	};
 
 	actions = {
@@ -50,6 +52,10 @@ export class NDV extends BasePage {
 		close: () => {
 			this.getters.backToCanvas().click();
 		},
+		openInlineExpressionEditor: () => {
+			cy.contains('Expression').invoke('show').click();
+			this.getters.inlineExpressionEditorInput().click();
+		},
 		setPinnedData: (data: object) => {
 			this.getters.editPinnedDataButton().click();
 
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index d1e90e815cf417..e8e8a99489067d 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -90,10 +90,11 @@ export class WorkflowPage extends BasePage {
 			cy.visit(this.url);
 			cy.waitForLoad();
 		},
-		addInitialNodeToCanvas: (nodeDisplayName: string) => {
+		addInitialNodeToCanvas: (nodeDisplayName: string, { keepNdvOpen } = { keepNdvOpen: false }) => {
 			this.getters.canvasPlusButton().click();
 			this.getters.nodeCreatorSearchBar().type(nodeDisplayName);
 			this.getters.nodeCreatorSearchBar().type('{enter}');
+			if (keepNdvOpen) return;
 			cy.get('body').type('{esc}');
 		},
 		addNodeToCanvas: (nodeDisplayName: string, plusButtonClick = true, preventNdvClose?: boolean) => {

From 5e3e70b83bf905c39f23a213f953bc42d7eed357 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Wed, 8 Feb 2023 10:42:22 +0100
Subject: [PATCH 118/358] feat: Change desktop UM experience (#5312)

* refactor: Hide prompt for desktop

* feat: add email field to personalization modal

* fix: update survey interfaces

* chore: enable personalization survey email key display condition

* feat: add users page upsell for desktop client

* feat: disable UM on desktop where possible

* refactor: Have a single function to decide whether UM is enabled

* feat: update community nodes upsell link

---------

Co-authored-by: Alex Grozav <alex@grozav.com>
Co-authored-by: krynble <omar@n8n.io>
Co-authored-by: freyamade <freya@n8n.io>
---
 packages/cli/src/Interfaces.ts                |  1 +
 packages/cli/src/Server.ts                    |  3 +-
 .../UserManagement/UserManagementHelper.ts    | 25 +++++----
 .../cli/src/controllers/users.controller.ts   |  4 +-
 packages/cli/src/middlewares/auth.ts          |  4 +-
 .../src/components/N8nActionBox/ActionBox.vue |  1 +
 packages/editor-ui/src/Interface.ts           |  1 +
 .../CredentialEdit/CredentialSharing.ee.vue   | 10 +++-
 .../src/components/FeatureComingSoon.vue      |  2 +-
 .../components/MainHeader/WorkflowDetails.vue | 10 +++-
 .../src/components/PersonalizationModal.vue   | 11 ++++
 .../src/components/WorkflowShareModal.ee.vue  | 28 ++++------
 packages/editor-ui/src/constants.ts           |  1 +
 .../src/plugins/i18n/locales/en.json          | 23 ++++++--
 packages/editor-ui/src/router.ts              |  7 ++-
 packages/editor-ui/src/stores/ui.ts           |  9 +++
 packages/editor-ui/src/stores/users.ts        | 11 +++-
 .../src/views/SettingsCommunityNodesView.vue  | 55 +++++++++++++------
 .../editor-ui/src/views/SettingsUsersView.vue | 35 +++++++++++-
 19 files changed, 177 insertions(+), 64 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index c0ad0d33eebe2f..3044528ec5f011 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -571,6 +571,7 @@ export interface IN8nUISettings {
 }
 
 export interface IPersonalizationSurveyAnswers {
+	email: string | null;
 	codingSkill: string | null;
 	companyIndustry: string[];
 	companySize: string | null;
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index f9382fba1ae929..55938909a26407 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -303,7 +303,8 @@ class Server extends AbstractServer {
 			showSetupOnFirstLoad:
 				config.getEnv('userManagement.disabled') === false &&
 				config.getEnv('userManagement.isInstanceOwnerSetUp') === false &&
-				config.getEnv('userManagement.skipInstanceOwnerSetup') === false,
+				config.getEnv('userManagement.skipInstanceOwnerSetup') === false &&
+				config.getEnv('deployment.type').startsWith('desktop_') === false,
 		});
 
 		// refresh enterprise status
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
index 3660ed1374e237..a38a6ed3104b93 100644
--- a/packages/cli/src/UserManagement/UserManagementHelper.ts
+++ b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -37,10 +37,20 @@ export function isEmailSetUp(): boolean {
 }
 
 export function isUserManagementEnabled(): boolean {
-	return (
-		!config.getEnv('userManagement.disabled') ||
-		config.getEnv('userManagement.isInstanceOwnerSetUp')
-	);
+	// This can be simplified but readability is more important here
+
+	if (config.getEnv('userManagement.isInstanceOwnerSetUp')) {
+		// Short circuit - if owner is set up, UM cannot be disabled.
+		// Users must reset their instance in order to do so.
+		return true;
+	}
+
+	// UM is disabled for desktop by default
+	if (config.getEnv('deployment.type').startsWith('desktop_')) {
+		return false;
+	}
+
+	return config.getEnv('userManagement.disabled') ? false : true;
 }
 
 export function isSharingEnabled(): boolean {
@@ -51,13 +61,6 @@ export function isSharingEnabled(): boolean {
 	);
 }
 
-export function isUserManagementDisabled(): boolean {
-	return (
-		config.getEnv('userManagement.disabled') &&
-		!config.getEnv('userManagement.isInstanceOwnerSetUp')
-	);
-}
-
 export async function getRoleId(scope: Role['scope'], name: Role['name']): Promise<Role['id']> {
 	return Db.collections.Role.findOneOrFail({
 		select: ['id'],
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index 19893dd59e5b5a..a71682ffb4e12b 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -13,7 +13,7 @@ import {
 	getInstanceBaseUrl,
 	hashPassword,
 	isEmailSetUp,
-	isUserManagementDisabled,
+	isUserManagementEnabled,
 	sanitizeUser,
 	validatePassword,
 } from '@/UserManagement/UserManagementHelper';
@@ -94,7 +94,7 @@ export class UsersController {
 	@Post('/')
 	async sendEmailInvites(req: UserRequest.Invite) {
 		// TODO: this should be checked in the middleware rather than here
-		if (isUserManagementDisabled()) {
+		if (!isUserManagementEnabled()) {
 			this.logger.debug(
 				'Request to send email invite(s) to user(s) failed because user management is disabled',
 			);
diff --git a/packages/cli/src/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
index 4cff1e84b20488..a0c13d4f2176ac 100644
--- a/packages/cli/src/middlewares/auth.ts
+++ b/packages/cli/src/middlewares/auth.ts
@@ -13,7 +13,7 @@ import {
 	isAuthenticatedRequest,
 	isAuthExcluded,
 	isPostUsersId,
-	isUserManagementDisabled,
+	isUserManagementEnabled,
 } from '@/UserManagement/UserManagementHelper';
 import type { Repository } from 'typeorm';
 import type { User } from '@db/entities/User';
@@ -101,7 +101,7 @@ export const setupAuthMiddlewares = (
 		}
 
 		// skip authentication if user management is disabled
-		if (isUserManagementDisabled()) {
+		if (!isUserManagementEnabled()) {
 			req.user = await userRepository.findOneOrFail({
 				relations: ['globalRole'],
 				where: {},
diff --git a/packages/design-system/src/components/N8nActionBox/ActionBox.vue b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
index aa5004e13253e6..57b626ba201b03 100644
--- a/packages/design-system/src/components/N8nActionBox/ActionBox.vue
+++ b/packages/design-system/src/components/N8nActionBox/ActionBox.vue
@@ -106,6 +106,7 @@ export default Vue.extend({
 
 .heading {
 	margin-bottom: var(--spacing-l);
+	text-align: center;
 }
 
 .description {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index fdded1ad3a90a3..d3dad5022e51e3 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -509,6 +509,7 @@ export type IPersonalizationSurveyAnswersV3 = {
 	automationGoalSm?: string[] | null;
 	automationGoalSmOther?: string | null;
 	usageModes?: string[] | null;
+	email?: string | null;
 };
 
 export type IPersonalizationLatestVersion = IPersonalizationSurveyAnswersV3;
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 181ecec2028776..2012311bdca712 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -89,6 +89,7 @@ import { useUIStore } from '@/stores/ui';
 import { useCredentialsStore } from '@/stores/credentials';
 import { useUsageStore } from '@/stores/usage';
 import { EnterpriseEditionFeature, VIEWS } from '@/constants';
+import { BaseTextKey } from '@/plugins/i18n';
 
 export default mixins(showMessage).extend({
 	name: 'CredentialSharing',
@@ -179,9 +180,14 @@ export default mixins(showMessage).extend({
 			this.modalBus.$emit('close');
 		},
 		goToUpgrade() {
-			let linkUrl = this.$locale.baseText(this.uiStore.contextBasedTranslationKeys.upgradeLinkUrl);
-			if (linkUrl.includes('subscription')) {
+			const linkUrlTranslationKey = this.uiStore.contextBasedTranslationKeys
+				.upgradeLinkUrl as BaseTextKey;
+			let linkUrl = this.$locale.baseText(linkUrlTranslationKey);
+
+			if (linkUrlTranslationKey.endsWith('.upgradeLinkUrl')) {
 				linkUrl = `${this.usageStore.viewPlansUrl}&source=credential_sharing`;
+			} else if (linkUrlTranslationKey.endsWith('.desktop')) {
+				linkUrl = `${linkUrl}&utm_campaign=upgrade-credentials-sharing`;
 			}
 
 			window.open(linkUrl, '_blank');
diff --git a/packages/editor-ui/src/components/FeatureComingSoon.vue b/packages/editor-ui/src/components/FeatureComingSoon.vue
index 9c7624d953a989..b14c895535e7f4 100644
--- a/packages/editor-ui/src/components/FeatureComingSoon.vue
+++ b/packages/editor-ui/src/components/FeatureComingSoon.vue
@@ -1,5 +1,5 @@
 <template>
-	<div v-if="this.featureInfo" :class="[$style.container]">
+	<div v-if="featureInfo" :class="[$style.container]">
 		<div v-if="showTitle" class="mb-2xl">
 			<n8n-heading size="2xlarge">
 				{{ $locale.baseText(featureInfo.featureName) }}
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 8f05381a8d77f1..02e054fe7f96bf 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -154,6 +154,7 @@ import { useTagsStore } from '@/stores/tags';
 import { getWorkflowPermissions, IPermissions } from '@/permissions';
 import { useUsersStore } from '@/stores/users';
 import { useUsageStore } from '@/stores/usage';
+import { BaseTextKey } from '@/plugins/i18n';
 
 const hasChanged = (prev: string[], curr: string[]) => {
 	if (prev.length !== curr.length) {
@@ -522,9 +523,14 @@ export default mixins(workflowHelpers, titleChange).extend({
 			}
 		},
 		goToUpgrade() {
-			let linkUrl = this.$locale.baseText(this.contextBasedTranslationKeys.upgradeLinkUrl);
-			if (linkUrl.includes('subscription')) {
+			const linkUrlTranslationKey = this.uiStore.contextBasedTranslationKeys
+				.upgradeLinkUrl as BaseTextKey;
+			let linkUrl = this.$locale.baseText(linkUrlTranslationKey);
+
+			if (linkUrlTranslationKey.endsWith('.upgradeLinkUrl')) {
 				linkUrl = `${this.usageStore.viewPlansUrl}&source=workflow_sharing`;
+			} else if (linkUrlTranslationKey.endsWith('.desktop')) {
+				linkUrl = `${linkUrl}&utm_campaign=upgrade-workflow-sharing`;
 			}
 
 			window.open(linkUrl, '_blank');
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 52200ccb2e48eb..7751ae46d10e8f 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -92,6 +92,7 @@ import {
 	NOT_SURE_YET_GOAL,
 	AUTOMATION_GOAL_OTHER_KEY,
 	COMPANY_TYPE_KEY,
+	EMAIL_KEY,
 	SAAS_COMPANY_TYPE,
 	ECOMMERCE_COMPANY_TYPE,
 	MSP_INDUSTRY,
@@ -155,6 +156,16 @@ export default mixins(showMessage, workflowHelpers).extend({
 		...mapStores(useRootStore, useSettingsStore, useUIStore, useUsersStore),
 		survey() {
 			const survey: IFormInputs = [
+				{
+					name: EMAIL_KEY,
+					properties: {
+						label: this.$locale.baseText('personalizationModal.yourEmailAddress'),
+						type: 'text',
+						placeholder: this.$locale.baseText('personalizationModal.email'),
+					},
+					shouldDisplay: () =>
+						this.settingsStore.isDesktopDeployment && !this.usersStore.currentUser?.firstName,
+				},
 				{
 					name: COMPANY_TYPE_KEY,
 					properties: {
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 15f2c6f15b6057..8c20cd5ef3284f 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -115,18 +115,6 @@
 				>
 					{{ $locale.baseText('workflows.shareModal.save') }}
 				</n8n-button>
-
-				<template #fallback>
-					<n8n-link :to="uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.linkUrl">
-						<n8n-button :loading="loading" size="medium">
-							{{
-								$locale.baseText(
-									uiStore.contextBasedTranslationKeys.workflows.sharing.unavailable.button,
-								)
-							}}
-						</n8n-button>
-					</n8n-link>
-				</template>
 			</enterprise-edition>
 		</template>
 	</Modal>
@@ -198,6 +186,11 @@ export default mixins(showMessage).extend({
 		isSharingEnabled(): boolean {
 			return this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing);
 		},
+		fallbackLinkUrl(): string {
+			return `${this.$locale.baseText(
+				this.uiStore.contextBasedTranslationKeys.upgradeLinkUrl as BaseTextKey,
+			)}${true ? '&utm_campaign=upgrade-workflow-sharing' : ''}`;
+		},
 		modalTitle(): string {
 			return this.$locale.baseText(
 				this.isSharingEnabled
@@ -444,11 +437,14 @@ export default mixins(showMessage).extend({
 			});
 		},
 		goToUpgrade() {
-			let linkUrl = this.$locale.baseText(
-				this.uiStore.contextBasedTranslationKeys.upgradeLinkUrl as BaseTextKey,
-			);
-			if (linkUrl.includes('subscription')) {
+			const linkUrlTranslationKey = this.uiStore.contextBasedTranslationKeys
+				.upgradeLinkUrl as BaseTextKey;
+			let linkUrl = this.$locale.baseText(linkUrlTranslationKey);
+
+			if (linkUrlTranslationKey.endsWith('.upgradeLinkUrl')) {
 				linkUrl = `${this.usageStore.viewPlansUrl}&source=workflow_sharing`;
+			} else if (linkUrlTranslationKey.endsWith('.desktop')) {
+				linkUrl = `${linkUrl}&utm_campaign=upgrade-workflow-sharing`;
 			}
 
 			window.open(linkUrl, '_blank');
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 83f51cf41473f7..57ef72952e5d8e 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -176,6 +176,7 @@ export const INSTANCE_ID_HEADER = 'n8n-instance-id';
 export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
 
 /** PERSONALIZATION SURVEY */
+export const EMAIL_KEY = 'email';
 export const WORK_AREA_KEY = 'workArea';
 export const FINANCE_WORK_AREA = 'finance';
 export const IT_ENGINEERING_WORK_AREA = 'IT-Engineering';
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index c3154dfa568777..a9645dc8984ee6 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -513,10 +513,6 @@
 	"fakeDoor.settings.sso.actionBox.title": "We’re working on this (as a paid feature)",
 	"fakeDoor.settings.sso.actionBox.title.cloud": "We’re working on this",
 	"fakeDoor.settings.sso.actionBox.description": "SSO will offer a secured and convenient way to access n8n using your existing credentials (Google, Github, Keycloak…)",
-	"fakeDoor.settings.users.name": "Users",
-	"fakeDoor.settings.users.actionBox.title": "Upgrade to add users",
-	"fakeDoor.settings.users.actionBox.description": "Create multiple users on our higher plans and share workflows and credentials to collaborate",
-	"fakeDoor.settings.users.actionBox.button": "Upgrade now",
 	"fakeDoor.actionBox.button.label": "Join the list",
 	"fixedCollectionParameter.choose": "Choose...",
 	"fixedCollectionParameter.currentlyNoItemsExist": "Currently no items exist",
@@ -949,6 +945,8 @@
 	"personalizationModal.leadGeneration": "Lead generation, enrichment, routing",
 	"personalizationModal.customerCommunication": "Customer communication",
 	"personalizationModal.customerActions": "Actions when lead changes status",
+	"personalizationModal.yourEmailAddress": "Your email address",
+	"personalizationModal.email": "Enter your email..",
 	"personalizationModal.adCampaign": "Ad campaign management",
 	"personalizationModal.reporting": "Reporting",
 	"personalizationModal.dataSynching": "Data syncing",
@@ -1552,9 +1550,24 @@
 	"contextual.workflows.sharing.unavailable.button": "View plans",
 	"contextual.workflows.sharing.unavailable.button.cloud": "Upgrade now",
 	"contextual.workflows.sharing.unavailable.button.desktop": "View plans",
+
+	"contextual.users.settings.unavailable.title": "Upgrade to add users",
+	"contextual.users.settings.unavailable.title.cloud": "Upgrade to add users",
+	"contextual.users.settings.unavailable.title.desktop": "Upgrade to add users",
+	"contextual.users.settings.unavailable.description": "Create multiple users on our higher plans and share workflows and credentials to collaborate",
+	"contextual.users.settings.unavailable.description.cloud": "Create multiple users on our higher plans and share workflows and credentials to collaborate",
+	"contextual.users.settings.unavailable.description.desktop": "Create multiple users on our higher plans and share workflows and credentials to collaborate",
+	"contextual.users.settings.unavailable.button": "View plans",
+	"contextual.users.settings.unavailable.button.cloud": "Upgrade now",
+	"contextual.users.settings.unavailable.button.desktop": "View plans",
+
+	"contextual.communityNodes.unavailable.description.desktop": "Community nodes feature is unavailable on desktop. Please choose one of our available self-hosting plans.",
+	"contextual.communityNodes.unavailable.button.desktop": "View plans",
+
 	"contextual.upgradeLinkUrl": "https://subscription.n8n.io/",
 	"contextual.upgradeLinkUrl.cloud": "https://app.n8n.cloud/manage?edition=cloud",
-	"contextual.upgradeLinkUrl.desktop": "https://n8n.io/pricing",
+	"contextual.upgradeLinkUrl.desktop": "https://n8n.io/pricing/?utm_source=n8n-internal&utm_medium=desktop",
+
 	"settings.ldap": "LDAP",
 	"settings.ldap.infoTip": "Learn more about <a href='https://docs.n8n.io/user-management/ldap/' target='_blank'>LDAP in the Docs</a>",
 	"settings.ldap.save": "Save connection",
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index e5b067fb0fadfa..5e08c994e46f8d 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -35,6 +35,7 @@ import { EnterpriseEditionFeature, VIEWS } from './constants';
 import { useSettingsStore } from './stores/settings';
 import { useTemplatesStore } from './stores/templates';
 import SettingsUsageAndPlanVue from './views/SettingsUsageAndPlan.vue';
+import { useUsersStore } from '@/stores/users';
 
 Vue.use(Router);
 
@@ -507,7 +508,11 @@ const router = new Router({
 							deny: {
 								shouldDeny: () => {
 									const settingsStore = useSettingsStore();
-									return settingsStore.isUserManagementEnabled === false;
+
+									return (
+										settingsStore.isUserManagementEnabled === false &&
+										!(settingsStore.isCloudDeployment || settingsStore.isDesktopDeployment)
+									);
 								},
 							},
 						},
diff --git a/packages/editor-ui/src/stores/ui.ts b/packages/editor-ui/src/stores/ui.ts
index d209736176a1ff..5915acdd43aa6c 100644
--- a/packages/editor-ui/src/stores/ui.ts
+++ b/packages/editor-ui/src/stores/ui.ts
@@ -207,6 +207,15 @@ export const useUIStore = defineStore(STORES.UI, {
 						},
 					},
 				},
+				users: {
+					settings: {
+						unavailable: {
+							title: `contextual.users.settings.unavailable.title${contextKey}`,
+							description: `contextual.users.settings.unavailable.description${contextKey}`,
+							button: `contextual.users.settings.unavailable.button${contextKey}`,
+						},
+					},
+				},
 			};
 		},
 		getLastSelectedNode(): INodeUi | null {
diff --git a/packages/editor-ui/src/stores/users.ts b/packages/editor-ui/src/stores/users.ts
index bead449155e29a..93e8304e0fc997 100644
--- a/packages/editor-ui/src/stores/users.ts
+++ b/packages/editor-ui/src/stores/users.ts
@@ -19,11 +19,12 @@ import {
 	validatePasswordToken,
 	validateSignupToken,
 } from '@/api/users';
-import { EnterpriseEditionFeature, PERSONALIZATION_MODAL_KEY, STORES } from '@/constants';
-import {
+import { PERSONALIZATION_MODAL_KEY, STORES } from '@/constants';
+import type {
 	ICredentialsResponse,
 	IInviteResponse,
 	IPersonalizationLatestVersion,
+	IRole,
 	IUser,
 	IUserResponse,
 	IUsersState,
@@ -41,6 +42,9 @@ const isDefaultUser = (user: IUserResponse | null) =>
 
 const isPendingUser = (user: IUserResponse | null) => Boolean(user && user.isPending);
 
+const isInstanceOwner = (user: IUserResponse | null) =>
+	Boolean(user?.globalRole?.name === ROLE.Owner);
+
 export const useUsersStore = defineStore(STORES.USERS, {
 	state: (): IUsersState => ({
 		currentUserId: null,
@@ -56,6 +60,9 @@ export const useUsersStore = defineStore(STORES.USERS, {
 		isDefaultUser(): boolean {
 			return isDefaultUser(this.currentUser);
 		},
+		isInstanceOwner(): boolean {
+			return isInstanceOwner(this.currentUser);
+		},
 		getUserById(state) {
 			return (userId: string): IUser | null => state.users[userId];
 		},
diff --git a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
index cfa3591b6734b8..d67426dd9b558e 100644
--- a/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
+++ b/packages/editor-ui/src/views/SettingsCommunityNodesView.vue
@@ -35,14 +35,10 @@
 			<n8n-action-box
 				:heading="$locale.baseText('settings.communityNodes.empty.title')"
 				:description="getEmptyStateDescription"
-				:buttonText="
-					shouldShowInstallButton
-						? $locale.baseText('settings.communityNodes.empty.installPackageLabel')
-						: ''
-				"
+				:buttonText="getEmptyStateButtonText"
 				:calloutText="actionBoxConfig.calloutText"
 				:calloutTheme="actionBoxConfig.calloutTheme"
-				@click="openInstallModal"
+				@click="onClickEmptyStateButton"
 			/>
 		</div>
 		<div :class="$style.cardsContainer" v-else>
@@ -70,6 +66,7 @@ import { useCommunityNodesStore } from '@/stores/communityNodes';
 import { useUIStore } from '@/stores/ui';
 import { mapStores } from 'pinia';
 import { useSettingsStore } from '@/stores/settings';
+import { BaseTextKey } from '@/plugins/i18n';
 
 const PACKAGE_COUNT_THRESHOLD = 31;
 
@@ -129,8 +126,13 @@ export default mixins(showMessage).extend({
 	},
 	computed: {
 		...mapStores(useCommunityNodesStore, useSettingsStore, useUIStore),
-		getEmptyStateDescription() {
+		getEmptyStateDescription(): string {
 			const packageCount = this.communityNodesStore.availablePackageCount;
+
+			if (this.settingsStore.isDesktopDeployment) {
+				return this.$locale.baseText('contextual.communityNodes.unavailable.description.desktop');
+			}
+
 			return packageCount < PACKAGE_COUNT_THRESHOLD
 				? this.$locale.baseText('settings.communityNodes.empty.description.no-packages', {
 						interpolate: {
@@ -144,18 +146,23 @@ export default mixins(showMessage).extend({
 						},
 				  });
 		},
-		shouldShowInstallButton() {
-			return !this.settingsStore.isDesktopDeployment && this.settingsStore.isNpmAvailable;
-		},
-		actionBoxConfig() {
+		getEmptyStateButtonText(): string {
 			if (this.settingsStore.isDesktopDeployment) {
-				return {
-					calloutText: this.$locale.baseText('settings.communityNodes.notAvailableOnDesktop'),
-					calloutTheme: 'warning',
-					hideButton: true,
-				};
+				return this.$locale.baseText('contextual.communityNodes.unavailable.button.desktop');
 			}
 
+			return this.shouldShowInstallButton
+				? this.$locale.baseText('settings.communityNodes.empty.installPackageLabel')
+				: '';
+		},
+		shouldShowInstallButton(): boolean {
+			return this.settingsStore.isDesktopDeployment || this.settingsStore.isNpmAvailable;
+		},
+		actionBoxConfig(): {
+			calloutText: string;
+			calloutTheme: 'warning' | string;
+			hideButton: boolean;
+		} {
 			if (!this.settingsStore.isNpmAvailable) {
 				return {
 					calloutText: this.$locale.baseText('settings.communityNodes.npmUnavailable.warning', {
@@ -184,7 +191,21 @@ export default mixins(showMessage).extend({
 		},
 	},
 	methods: {
-		openInstallModal(event: MouseEvent) {
+		onClickEmptyStateButton(): void {
+			if (this.settingsStore.isDesktopDeployment) {
+				return this.goToUpgrade();
+			}
+
+			this.openInstallModal();
+		},
+		goToUpgrade(): void {
+			const linkUrl = `${this.$locale.baseText(
+				'contextual.upgradeLinkUrl.desktop',
+			)}&utm_campaign=upgrade-community-nodes&selfHosted=true`;
+
+			window.open(linkUrl, '_blank');
+		},
+		openInstallModal(): void {
 			const telemetryPayload = {
 				is_empty_state: this.communityNodesStore.getInstalledPackages.length === 0,
 			};
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index 354c503d0ba1b7..fd91306964978a 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -10,7 +10,23 @@
 				/>
 			</div>
 		</div>
-		<div v-if="usersStore.showUMSetupWarning" :class="$style.setupInfoContainer">
+		<div v-if="!settingsStore.isUserManagementEnabled" :class="$style.setupInfoContainer">
+			<n8n-action-box
+				:heading="
+					$locale.baseText(uiStore.contextBasedTranslationKeys.users.settings.unavailable.title)
+				"
+				:description="
+					$locale.baseText(
+						uiStore.contextBasedTranslationKeys.users.settings.unavailable.description,
+					)
+				"
+				:buttonText="
+					$locale.baseText(uiStore.contextBasedTranslationKeys.users.settings.unavailable.button)
+				"
+				@click="goToUpgrade"
+			/>
+		</div>
+		<div v-else-if="usersStore.showUMSetupWarning" :class="$style.setupInfoContainer">
 			<n8n-action-box
 				:heading="$locale.baseText('settings.users.setupToInviteUsers')"
 				:buttonText="$locale.baseText('settings.users.setupMyAccount')"
@@ -53,6 +69,8 @@ import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
 import { useUsersStore } from '@/stores/users';
+import { BaseTextKey } from '@/plugins/i18n';
+import { useUsageStore } from '@/stores/usage';
 
 export default mixins(showMessage, copyPaste).extend({
 	name: 'SettingsUsersView',
@@ -66,7 +84,7 @@ export default mixins(showMessage, copyPaste).extend({
 		}
 	},
 	computed: {
-		...mapStores(useSettingsStore, useUIStore, useUsersStore),
+		...mapStores(useSettingsStore, useUIStore, useUsersStore, useUsageStore),
 		isSharingEnabled() {
 			return this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing);
 		},
@@ -135,6 +153,19 @@ export default mixins(showMessage, copyPaste).extend({
 				});
 			}
 		},
+		goToUpgrade() {
+			const linkUrlTranslationKey = this.uiStore.contextBasedTranslationKeys
+				.upgradeLinkUrl as BaseTextKey;
+			let linkUrl = this.$locale.baseText(linkUrlTranslationKey);
+
+			if (linkUrlTranslationKey.endsWith('.upgradeLinkUrl')) {
+				linkUrl = `${this.usageStore.viewPlansUrl}&source=users`;
+			} else if (linkUrlTranslationKey.endsWith('.desktop')) {
+				linkUrl = `${linkUrl}&utm_campaign=upgrade-users`;
+			}
+
+			window.open(linkUrl, '_blank');
+		},
 	},
 });
 </script>

From d469a98073434f2d9af4452ae6585c9bf2696093 Mon Sep 17 00:00:00 2001
From: Cornelius Suermann <cornelius@n8n.io>
Date: Wed, 8 Feb 2023 11:48:38 +0100
Subject: [PATCH 119/358] feat: Add tracking code to hiring link (no-changelog)
 (#3530)

---
 packages/editor-ui/src/constants.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 57ef72952e5d8e..1c4eb47cad037e 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -286,7 +286,7 @@ export const HIRING_BANNER = `
                                                         ///////////
                                                           //////
 
-Love n8n? Help us build the future of automation! https://n8n.io/careers
+Love n8n? Help us build the future of automation! https://n8n.io/careers?utm_source=n8n_user&utm_medium=console_output
 `;
 
 export const NODE_TYPE_COUNT_MAPPER = {

From d7b3923c2f5e02680170b132ba0e7cc59cb67cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Wed, 8 Feb 2023 12:41:33 +0100
Subject: [PATCH 120/358] feat(editor): Add `Object` global completions (#5407)

* :pencil2: Add i18n info

* :zap: Mount i18n keys

* :pencil2: Fix typos in tests

* :sparkles: Add `Object` global completion

* :sparkles: Add `Object` global options completions

* :test_tube: Add tests
---
 .../completions/__tests__/completions.test.ts | 24 +++++++++++++++++--
 .../completions/datatype.completions.ts       | 21 ++++++++++++++++
 .../completions/nonDollar.completions.ts      | 10 ++++----
 packages/editor-ui/src/plugins/i18n/index.ts  |  7 ++++++
 .../src/plugins/i18n/locales/en.json          |  4 ++++
 5 files changed, 60 insertions(+), 6 deletions(-)

diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
index 4e9ab0148e584e..61683cd9ee0495 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
@@ -57,6 +57,15 @@ describe('Top-level completions', () => {
 		expect(found[0].label).toBe('Math');
 	});
 
+	test('should return Object completion for: {{ O| }}', () => {
+		const found = completions('{{ O| }}');
+
+		if (!found) throw new Error('Expected to find completion');
+
+		expect(found).toHaveLength(1);
+		expect(found[0].label).toBe('Object');
+	});
+
 	test('should return dollar completions for: {{ $| }}', () => {
 		expect(completions('{{ $| }}')).toHaveLength(dollarOptions().length);
 	});
@@ -130,6 +139,17 @@ describe('Resolution-based completions', () => {
 			);
 		});
 
+		test('should return completions for Object methods: {{ Object.values({ abc: 123 }).| }}', () => {
+			// @ts-expect-error Spied function is mistyped
+			resolveParameterSpy.mockReturnValueOnce([123]);
+
+			const found = completions('{{ Object.values({ abc: 123 }).| }}');
+
+			if (!found) throw new Error('Expected to find completion');
+
+			expect(found).toHaveLength(natives('array').length + extensions('array').length);
+		});
+
 		test('should return completions for object literal', () => {
 			const object = { a: 1 };
 
@@ -145,7 +165,7 @@ describe('Resolution-based completions', () => {
 		const resolveParameterSpy = vi.spyOn(workflowHelpers, 'resolveParameter');
 		const { $input } = mockProxy;
 
-		test('should return bracket-aware completions for: {{ $input.item.json.str.| }}', () => {
+		test('should return bracket-aware completions for: {{ $input.item.json.str.|() }}', () => {
 			resolveParameterSpy.mockReturnValue($input.item.json.str);
 
 			const found = completions('{{ $input.item.json.str.|() }}');
@@ -156,7 +176,7 @@ describe('Resolution-based completions', () => {
 			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
 		});
 
-		test('should return bracket-aware completions for: {{ $input.item.json.num.| }}', () => {
+		test('should return bracket-aware completions for: {{ $input.item.json.num.|() }}', () => {
 			resolveParameterSpy.mockReturnValue($input.item.json.num);
 
 			const found = completions('{{ $input.item.json.num.|() }}');
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
index 1f25ed8f330bb9..72d93075a87991 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -32,6 +32,8 @@ export function datatypeCompletions(context: CompletionContext): CompletionResul
 
 	if (base === 'DateTime') {
 		options = luxonStaticOptions().map(stripExcessParens(context));
+	} else if (base === 'Object') {
+		options = objectGlobalOptions().map(stripExcessParens(context));
 	} else {
 		let resolved: Resolved;
 
@@ -287,6 +289,24 @@ export const luxonStaticOptions = () => {
 		});
 };
 
+/**
+ * Methods defined on the global `Object`.
+ */
+export const objectGlobalOptions = () => {
+	return ['assign', 'entries', 'keys', 'values'].map((key) => {
+		const option: Completion = {
+			label: key + '()',
+			type: 'function',
+		};
+
+		const info = i18n.globalObject[key];
+
+		if (info) option.info = info;
+
+		return option;
+	});
+};
+
 const regexes = {
 	generalRef: /\$[^$]+\.([^{\s])*/, // $input. or $json. or similar ones
 	selectorRef: /\$\(['"][\S\s]+['"]\)\.([^{\s])*/, // $('nodeName').
@@ -299,6 +319,7 @@ const regexes = {
 
 	mathGlobal: /Math\.([^{\s])*/, // Math.
 	datetimeGlobal: /DateTime\.[^.}]*/, // DateTime.
+	objectGlobal: /Object\.(\w+\(.*\)\.[^{\s]*)?/, // Object. or Object.method(arg).
 };
 
 const DATATYPE_REGEX = new RegExp(
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
index 2223025c07d16a..c9757babf09ac5 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/nonDollar.completions.ts
@@ -4,14 +4,13 @@ import { prefixMatch } from './utils';
 
 /**
  * Completions offered at the initial position for any char other than `$`.
- *
- * Currently only `D...` for `DateTime` and `M...` for `Math`
  */
 export function nonDollarCompletions(context: CompletionContext): CompletionResult | null {
 	const dateTime = /(\s+)D[ateTim]*/;
 	const math = /(\s+)M[ath]*/;
+	const object = /(\s+)O[bject]*/;
 
-	const combinedRegex = new RegExp([dateTime.source, math.source].join('|'));
+	const combinedRegex = new RegExp([dateTime.source, math.source, object.source].join('|'));
 
 	const word = context.matchBefore(combinedRegex);
 
@@ -30,7 +29,10 @@ export function nonDollarCompletions(context: CompletionContext): CompletionResu
 		{
 			label: 'Math',
 			type: 'keyword',
-			info: i18n.rootVars.DateTime,
+		},
+		{
+			label: 'Object',
+			type: 'keyword',
 		},
 	];
 
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index 1655f6d331213f..d3b3f590826d4b 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -368,6 +368,13 @@ export class I18nClass {
 		'$workflow.name': this.baseText('codeNodeEditor.completer.$workflow.name'),
 	};
 
+	globalObject: Record<string, string | undefined> = {
+		assign: this.baseText('codeNodeEditor.completer.globalObject.assign'),
+		entries: this.baseText('codeNodeEditor.completer.globalObject.entries'),
+		keys: this.baseText('codeNodeEditor.completer.globalObject.keys'),
+		values: this.baseText('codeNodeEditor.completer.globalObject.values'),
+	};
+
 	luxonInstance: Record<string, string | undefined> = {
 		// getters
 		isValid: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.isValid'),
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index a9645dc8984ee6..3e80d5d83cc173 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -135,6 +135,10 @@
 	"codeNodeEditor.completer.$workflow.id": "The ID of the workflow",
 	"codeNodeEditor.completer.$workflow.name": "The name of the workflow",
 	"codeNodeEditor.completer.binary": "The item's binary (file) data",
+	"codeNodeEditor.completer.globalObject.assign": "Copy of the object containing all enumerable own properties",
+	"codeNodeEditor.completer.globalObject.entries": "The object's keys and values",
+	"codeNodeEditor.completer.globalObject.keys": "The object's keys",
+	"codeNodeEditor.completer.globalObject.values": "The object's values",
 	"codeNodeEditor.completer.json": "The item's JSON data. When in doubt, use this",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromFormat": "Create a DateTime from an input string and format string.",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromHTTP": "Create a DateTime from an HTTP header date",

From f44b4b131462e55d4c850ae52d3472e0ffaf4517 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Wed, 8 Feb 2023 12:15:36 +0000
Subject: [PATCH 121/358] test(Split In Batches Node): Add test for Split in
 Batches node (no-changelog) (#5381)

---
 .../test/SplitInBatches.node.test.ts          |   4 +
 .../test/SplitInBatches.workflow.json         | 178 ++++++++++++++++++
 .../test/nodes/Airtable/Airtable.node.test.ts |   4 -
 .../nodes-base/test/nodes/If/If.node.test.ts  |   8 -
 .../nodes-base/test/nodes/Set/SetNode.test.ts |   3 -
 .../test/nodes/Start/StartNode.test.ts        |   2 -
 6 files changed, 182 insertions(+), 17 deletions(-)
 create mode 100644 packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts
 create mode 100644 packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.workflow.json

diff --git a/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts
new file mode 100644
index 00000000000000..21e55f4fd89e3b
--- /dev/null
+++ b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Execute SplitInBatches Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.workflow.json b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.workflow.json
new file mode 100644
index 00000000000000..8f3ade4e26f649
--- /dev/null
+++ b/packages/nodes-base/nodes/SplitInBatches/test/SplitInBatches.workflow.json
@@ -0,0 +1,178 @@
+{
+	"name": "Split in Batches Test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "86b8149f-b0a0-489c-bb62-e59142988996",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [400, 220]
+		},
+		{
+			"parameters": {
+				"batchSize": 1,
+				"options": {}
+			},
+			"id": "30c5546e-bdcc-44ff-bfca-89c5fb97b678",
+			"name": "Split In Batches",
+			"type": "n8n-nodes-base.splitInBatches",
+			"typeVersion": 1,
+			"position": [1100, 220]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "data[0]",
+							"value": "n8n"
+						},
+						{
+							"name": "data[1]",
+							"value": "test"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "92d386b8-60be-4f8b-801c-b6459ec206f7",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [640, 220]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {}
+			},
+			"id": "74b7e63e-a9f8-4a82-9e1f-7b2429d9118d",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [860, 220]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $node[\"Split In Batches\"].context[\"noItemsLeft\"] }}",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "a5f68369-4e70-4f16-b260-3c8b74517993",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [1280, 220]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "maxRunIndex",
+							"value": "={{ $node[\"Split In Batches\"].context[\"maxRunIndex\"] }}"
+						},
+						{
+							"value": "={{ $node[\"Split In Batches\"].context[\"currentRunIndex\"] }}"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "1f44eb0a-5fb7-43a7-8281-84a8a7ec8464",
+			"name": "Output",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [1480, 200]
+		}
+	],
+	"pinData": {
+		"Output": [
+			{
+				"json": {
+					"data": "test",
+					"maxRunIndex": 2,
+					"propertyName": 1
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Split In Batches": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "Split In Batches",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "Output",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Split In Batches",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "de1a454e-43e9-4c2d-b786-18da5d97940f",
+	"id": "389",
+	"meta": {
+		"instanceId": "REMOVED"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
index f5ef28a7a9a57e..706ac41d955c3e 100644
--- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -1,12 +1,8 @@
-import { INodeType } from 'n8n-workflow';
 import { executeWorkflow } from '../ExecuteWorkflow';
 import * as Helpers from '../Helpers';
 import { WorkflowTestData } from '../types';
 import nock from 'nock';
 
-import { ManualTrigger } from '../../../nodes/ManualTrigger/ManualTrigger.node';
-import { Airtable } from '../../../nodes/Airtable/Airtable.node';
-
 const records = [
 	{
 		id: 'rec2BWBoyS5QsS7pT',
diff --git a/packages/nodes-base/test/nodes/If/If.node.test.ts b/packages/nodes-base/test/nodes/If/If.node.test.ts
index 6efeab840d7f65..eabff38aa351b5 100644
--- a/packages/nodes-base/test/nodes/If/If.node.test.ts
+++ b/packages/nodes-base/test/nodes/If/If.node.test.ts
@@ -1,13 +1,5 @@
-import { INodeType } from 'n8n-workflow';
 import * as Helpers from '../Helpers';
 import { WorkflowTestData } from '../types';
-
-import { ManualTrigger } from '../../../nodes/ManualTrigger/ManualTrigger.node';
-import { Set } from '../../../nodes/Set/Set.node';
-import { If } from '../../../nodes/If/If.node';
-import { NoOp } from '../../../nodes/NoOp/NoOp.node';
-import { Code } from '../../../nodes/Code/Code.node';
-
 import { executeWorkflow } from '../ExecuteWorkflow';
 
 describe('Execute If Node', () => {
diff --git a/packages/nodes-base/test/nodes/Set/SetNode.test.ts b/packages/nodes-base/test/nodes/Set/SetNode.test.ts
index fc4370831e35ba..390e5fa02374c0 100644
--- a/packages/nodes-base/test/nodes/Set/SetNode.test.ts
+++ b/packages/nodes-base/test/nodes/Set/SetNode.test.ts
@@ -1,7 +1,4 @@
-import { INodeType } from 'n8n-workflow';
 import * as Helpers from '../Helpers';
-import { Start } from '../../../nodes/Start/Start.node';
-import { Set } from '../../../nodes/Set/Set.node';
 import { executeWorkflow } from '../ExecuteWorkflow';
 import { WorkflowTestData } from '../types';
 
diff --git a/packages/nodes-base/test/nodes/Start/StartNode.test.ts b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
index 06c536c9cb8a0c..3c29c006ca61bc 100644
--- a/packages/nodes-base/test/nodes/Start/StartNode.test.ts
+++ b/packages/nodes-base/test/nodes/Start/StartNode.test.ts
@@ -1,6 +1,4 @@
-import { INodeType } from 'n8n-workflow';
 import * as Helpers from '../Helpers';
-import { Start } from '../../../nodes/Start/Start.node';
 import { WorkflowTestData } from '../types';
 import { executeWorkflow } from '../ExecuteWorkflow';
 

From e82bc50fd1d4edca97493bf1f27dacb07950205b Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Wed, 8 Feb 2023 12:16:17 +0000
Subject: [PATCH 122/358] test(Switch Node): Add test for switch node
 (no-changelog) (#5378)

---
 .../test/switch.expression.workflow.json      | 225 ++++++++++++++++
 .../nodes/Switch/test/switch.node.test.ts     |   4 +
 .../Switch/test/switch.rules.workflow.json    | 242 ++++++++++++++++++
 3 files changed, 471 insertions(+)
 create mode 100644 packages/nodes-base/nodes/Switch/test/switch.expression.workflow.json
 create mode 100644 packages/nodes-base/nodes/Switch/test/switch.node.test.ts
 create mode 100644 packages/nodes-base/nodes/Switch/test/switch.rules.workflow.json

diff --git a/packages/nodes-base/nodes/Switch/test/switch.expression.workflow.json b/packages/nodes-base/nodes/Switch/test/switch.expression.workflow.json
new file mode 100644
index 00000000000000..8f6d6aed4323dc
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/test/switch.expression.workflow.json
@@ -0,0 +1,225 @@
+{
+	"name": "review node unit tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "fb04a728-d2b9-4b98-8d3b-3762b0a60c43",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-7020,
+				1700
+			]
+		},
+		{
+			"parameters": {
+				"mode": "expression",
+				"output": "={{ $json.data }}"
+			},
+			"id": "6addcb47-5a9d-4a02-a915-b3b60b2ffad3",
+			"name": "Switch",
+			"type": "n8n-nodes-base.switch",
+			"typeVersion": 1,
+			"position": [
+				-6460,
+				1700
+			]
+		},
+		{
+			"parameters": {
+				"values": {
+					"number": [
+						{
+							"name": "data[0]"
+						},
+						{
+							"name": "data[1]",
+							"value": 1
+						},
+						{
+							"name": "data[2]",
+							"value": 2
+						},
+						{
+							"name": "data[3]",
+							"value": 3
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "b1f9468e-4604-48ff-a851-4041b224f9a5",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				-6840,
+				1700
+			]
+		},
+		{
+			"parameters": {},
+			"id": "66650986-03a4-4cd7-a7c9-3792218cb2f5",
+			"name": "Output 0",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-6180,
+				1460
+			]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {}
+			},
+			"id": "808579aa-9da2-4c6b-bdd6-387119593d97",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [
+				-6660,
+				1700
+			]
+		},
+		{
+			"parameters": {},
+			"id": "dd764387-3ff7-4a6c-8451-3a0511f80415",
+			"name": "Output 1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-6180,
+				1620
+			]
+		},
+		{
+			"parameters": {},
+			"id": "02561ebf-8054-4d12-98b1-e099bcb20b34",
+			"name": "Output 2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-6180,
+				1780
+			]
+		},
+		{
+			"parameters": {},
+			"id": "bfaaacd7-956c-4e6f-bc40-f6459bc43faa",
+			"name": "Output 3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-6180,
+				1940
+			]
+		}
+	],
+	"pinData": {
+		"Output 0": [
+			{
+				"json": {
+					"data": 0
+				}
+			}
+		],
+		"Output 1": [
+			{
+				"json": {
+					"data": 1
+				}
+			}
+		],
+		"Output 2": [
+			{
+				"json": {
+					"data": 2
+				}
+			}
+		],
+		"Output 3": [
+			{
+				"json": {
+					"data": 3
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Switch": {
+			"main": [
+				[
+					{
+						"node": "Output 0",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Output 1",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Output 2",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Output 3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "Switch",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "d9f4d9b1-a282-473e-a527-f1e6c3b5bb89",
+	"id": "182",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/Switch/test/switch.node.test.ts b/packages/nodes-base/nodes/Switch/test/switch.node.test.ts
new file mode 100644
index 00000000000000..030f9fa24e4d25
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/test/switch.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Execute Switch Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Switch/test/switch.rules.workflow.json b/packages/nodes-base/nodes/Switch/test/switch.rules.workflow.json
new file mode 100644
index 00000000000000..9af12f0c4c76ac
--- /dev/null
+++ b/packages/nodes-base/nodes/Switch/test/switch.rules.workflow.json
@@ -0,0 +1,242 @@
+{
+	"name": "review node unit tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "ec017d65-ca3c-4df3-ba84-e79da16c05b3",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-8460,
+				1740
+			]
+		},
+		{
+			"parameters": {
+				"values": {
+					"number": [
+						{
+							"name": "data[0]"
+						},
+						{
+							"name": "data[1]",
+							"value": 1
+						},
+						{
+							"name": "data[2]",
+							"value": 2
+						},
+						{
+							"name": "data[3]",
+							"value": 3
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "1a799394-e0a8-459f-b9a6-0b656e315df6",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				-8280,
+				1740
+			]
+		},
+		{
+			"parameters": {},
+			"id": "56138ddd-b0b7-429e-b740-37da602fd250",
+			"name": "Output 0",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-7640,
+				1500
+			]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {}
+			},
+			"id": "a2af4a95-866c-44ac-9a58-0eb94fe6a27a",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [
+				-8100,
+				1740
+			]
+		},
+		{
+			"parameters": {},
+			"id": "55dd8064-5ed1-49ab-9c9a-5de8266b0c87",
+			"name": "Output 1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-7640,
+				1660
+			]
+		},
+		{
+			"parameters": {},
+			"id": "605a11b1-6fe2-48cc-944f-0f8d89cff669",
+			"name": "Output 2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-7640,
+				1820
+			]
+		},
+		{
+			"parameters": {},
+			"id": "6615c351-46ba-4013-b49b-9f44f5195a2e",
+			"name": "Output 3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-7640,
+				1980
+			]
+		},
+		{
+			"parameters": {
+				"value1": "={{ $json.data }}",
+				"rules": {
+					"rules": [
+						{
+							"operation": "equal"
+						},
+						{
+							"operation": "equal",
+							"value2": 1,
+							"output": 1
+						},
+						{
+							"operation": "equal",
+							"value2": 2,
+							"output": 2
+						}
+					]
+				},
+				"fallbackOutput": 3
+			},
+			"id": "176e3656-28fb-45b9-9ac5-385c4c544d9e",
+			"name": "Switch",
+			"type": "n8n-nodes-base.switch",
+			"typeVersion": 1,
+			"position": [
+				-7900,
+				1740
+			]
+		}
+	],
+	"pinData": {
+		"Output 0": [
+			{
+				"json": {
+					"data": 0
+				}
+			}
+		],
+		"Output 1": [
+			{
+				"json": {
+					"data": 1
+				}
+			}
+		],
+		"Output 2": [
+			{
+				"json": {
+					"data": 2
+				}
+			}
+		],
+		"Output 3": [
+			{
+				"json": {
+					"data": 3
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "Switch",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Switch": {
+			"main": [
+				[
+					{
+						"node": "Output 0",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Output 1",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Output 2",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Output 3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "962a14d7-c5a6-4e29-96f3-6208877d3d45",
+	"id": "182",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file

From ce732b42c82cd2d8ed2e11589e830a412fa7f55c Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Wed, 8 Feb 2023 12:17:02 +0000
Subject: [PATCH 123/358] test(Execute Command Node): Unit tests (no-changelog)
 (#5374)

---
 .../test/ExecuteCommand.node.test.ts          |   4 +
 .../nodes/ExecuteCommand/test/workflow.json   | 142 ++++++++++++++++++
 2 files changed, 146 insertions(+)
 create mode 100644 packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts
 create mode 100644 packages/nodes-base/nodes/ExecuteCommand/test/workflow.json

diff --git a/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts b/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts
new file mode 100644
index 00000000000000..28f8018e110f5e
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteCommand/test/ExecuteCommand.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Execute Execute Command Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/ExecuteCommand/test/workflow.json b/packages/nodes-base/nodes/ExecuteCommand/test/workflow.json
new file mode 100644
index 00000000000000..d43ede558da89f
--- /dev/null
+++ b/packages/nodes-base/nodes/ExecuteCommand/test/workflow.json
@@ -0,0 +1,142 @@
+{
+	"name": "Execute Command Test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "9f813425-3fe0-49b6-9fc6-a1779bdb71e3",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [200, 420]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "data[0]",
+							"value": "n8n"
+						},
+						{
+							"name": "data[1]",
+							"value": "test"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "cf02f88c-e64d-4831-9d5b-954ad21ca3ae",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [360, 420]
+		},
+		{
+			"parameters": {
+				"fieldToSplitOut": "data",
+				"options": {}
+			},
+			"id": "364b8576-cb5d-4ca5-b497-e3437b45831a",
+			"name": "Item Lists",
+			"type": "n8n-nodes-base.itemLists",
+			"typeVersion": 1,
+			"position": [520, 420]
+		},
+		{
+			"parameters": {
+				"command": "=echo {{ $json.data }}"
+			},
+			"id": "73854e53-324d-46f8-a222-9a9897807307",
+			"name": "EC Once",
+			"type": "n8n-nodes-base.executeCommand",
+			"typeVersion": 1,
+			"position": [700, 300]
+		},
+		{
+			"parameters": {
+				"executeOnce": false,
+				"command": "=echo {{ $json.data }}"
+			},
+			"id": "b47ec541-6e85-489f-b925-2f9a77681f18",
+			"name": "EC All",
+			"type": "n8n-nodes-base.executeCommand",
+			"typeVersion": 1,
+			"position": [700, 540]
+		}
+	],
+	"pinData": {
+		"EC Once": [
+			{
+				"json": {
+					"exitCode": 0,
+					"stderr": "",
+					"stdout": "n8n"
+				}
+			}
+		],
+		"EC All": [
+			{
+				"json": {
+					"exitCode": 0,
+					"stderr": "",
+					"stdout": "n8n"
+				}
+			},
+			{
+				"json": {
+					"exitCode": 0,
+					"stderr": "",
+					"stdout": "test"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Item Lists",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Item Lists": {
+			"main": [
+				[
+					{
+						"node": "EC Once",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "EC All",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "de1a454e-43e9-4c2d-b786-18da5d97940f",
+	"id": "389",
+	"meta": {
+		"instanceId": "REMOVED"
+	},
+	"tags": []
+}

From b16d9d0f8c131594772eff2544fe52f4d2704308 Mon Sep 17 00:00:00 2001
From: Giulio Andreini <g.andreini@gmail.com>
Date: Wed, 8 Feb 2023 13:33:57 +0100
Subject: [PATCH 124/358] docs(Google Sheets Node): Description updates for
 fields (no-changelog) (#5277)

---
 .../v2/actions/sheet/commonDescription.ts     | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
index 8a78f894a539d4..726745fde1eb7b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/commonDescription.ts
@@ -64,9 +64,8 @@ export const dataLocationOnSheet: INodeProperties[] = [
 							minValue: 1,
 						},
 						default: 1,
-						description:
-							'Index of the row which contains the keys. Starts at 1. The incoming node data is matched to the keys for assignment. The matching is case sensitive.',
-						hint: 'From start of range. First row is row 1',
+						description: "Index is relative to the set 'Range', first row index is 1",
+						hint: 'Index of the row which contains the column names',
 						displayOptions: {
 							show: {
 								rangeDefinition: ['specifyRange'],
@@ -81,9 +80,8 @@ export const dataLocationOnSheet: INodeProperties[] = [
 							minValue: 1,
 						},
 						default: 2,
-						description:
-							'Index of the first row which contains the actual data and not the keys. Starts with 1.',
-						hint: 'From start of range. First row is row 1',
+						description: "Index is relative to the set 'Range', first row index is 1",
+						hint: 'Index of first row which contains the actual data',
 						displayOptions: {
 							show: {
 								rangeDefinition: ['specifyRange'],
@@ -131,9 +129,8 @@ export const locationDefine: INodeProperties[] = [
 							minValue: 1,
 						},
 						default: 1,
-						description:
-							'Index of the row which contains the keys. Starts at 1. The incoming node data is matched to the keys for assignment. The matching is case sensitive.',
-						hint: 'From start of range. First row is row 1',
+						description: "Index is relative to the set 'Range', first row index is 1",
+						hint: 'Index of the row which contains the column names',
 					},
 					{
 						displayName: 'First Data Row',
@@ -143,9 +140,8 @@ export const locationDefine: INodeProperties[] = [
 							minValue: 1,
 						},
 						default: 2,
-						description:
-							'Index of the first row which contains the actual data and not the keys. Starts with 1.',
-						hint: 'From start of range. First row is row 1',
+						description: "Index is relative to the set 'Range', first row index is 1",
+						hint: 'Index of first row which contains the actual data',
 					},
 				],
 			},

From aeaa6636201f0ad98603d1abd602bdf6072e8a11 Mon Sep 17 00:00:00 2001
From: Bram Kn <bram@knitco.nl>
Date: Wed, 8 Feb 2023 13:36:05 +0100
Subject: [PATCH 125/358] feat(HubSpot Trigger Node): Add conversation events
 (#5408)

---
 .../nodes/Hubspot/HubspotTrigger.node.ts      | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 6d1668841e305f..da60ba00917727 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -109,6 +109,32 @@ export class HubspotTrigger implements INodeType {
 										description:
 											"To get notified if a specified property is changed for any contact in a customer's account",
 									},
+									{
+										name: 'Conversation Creation',
+										value: 'conversation.creation',
+										description: 'To get notified if a new thread is created in an account',
+									},
+									{
+										name: 'Conversation Deletion',
+										value: 'conversation.deletion',
+										description:
+											'To get notified if a thread is archived or soft-deleted in an account',
+									},
+									{
+										name: 'Conversation New Message',
+										value: 'conversation.newMessage',
+										description: 'To get notified if a new message on a thread has been received',
+									},
+									{
+										name: 'Conversation Privacy Deletion',
+										value: 'conversation.privacyDeletion',
+										description: 'To get notified if a thread is permanently deleted in an account',
+									},
+									{
+										name: 'Conversation Property Change',
+										value: 'conversation.propertyChange',
+										description: 'To get notified if a property on a thread has been changed',
+									},
 									{
 										name: 'Deal Created',
 										value: 'deal.creation',

From 333a817a8ef202d4133f2796b066e6a8ec414719 Mon Sep 17 00:00:00 2001
From: Kirill <chertkov.k@gmail.com>
Date: Wed, 8 Feb 2023 15:37:15 +0300
Subject: [PATCH 126/358] fix(ActiveCampaign Node): Fix additional fields not
 being sent when updating account contacts (#5216)

---
 .../nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index f4828bf52b2e41..2cbadde818fe82 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -506,7 +506,7 @@ export class ActiveCampaign implements INodeType {
 				} else if (resource === 'accountContact') {
 					if (operation === 'create') {
 						// ----------------------------------
-						//         account:create
+						//         accountContact:create
 						// ----------------------------------
 
 						requestMethod = 'POST';
@@ -521,7 +521,7 @@ export class ActiveCampaign implements INodeType {
 						} as IDataObject;
 
 						const additionalFields = this.getNodeParameter('additionalFields', i);
-						addAdditionalFields(body.account as IDataObject, additionalFields);
+						addAdditionalFields(body.accountContact as IDataObject, additionalFields);
 					} else if (operation === 'update') {
 						// ----------------------------------
 						//         accountContact:update

From 389e4af4d927cb027b73ffc278bfc1347e0217bd Mon Sep 17 00:00:00 2001
From: Giulio Andreini <g.andreini@gmail.com>
Date: Wed, 8 Feb 2023 13:39:07 +0100
Subject: [PATCH 127/358] docs(Spreadsheet File Node): Update descriptions and
 Alias (no-changelog) (#5357)

---
 .../nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json  | 2 +-
 .../nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
index 97c34100ce9516..5eb36aaa977a0f 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.json
@@ -17,7 +17,7 @@
 			}
 		]
 	},
-	"alias": ["CSV", "Spreadsheet"],
+	"alias": ["CSV", "Spreadsheet", "Excel", "xls", "xlsx", "ods"],
 	"subcategories": {
 		"Core Nodes": ["Files"]
 	}
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
index d2bf2282598d88..8d55b5b12f968d 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
@@ -45,7 +45,7 @@ export class SpreadsheetFile implements INodeType {
 		icon: 'fa:table',
 		group: ['transform'],
 		version: 1,
-		description: 'Reads and writes data from a spreadsheet file',
+		description: 'Reads and writes data from a spreadsheet file like CSV, XLS, ODS, etc',
 		defaults: {
 			name: 'Spreadsheet File',
 			color: '#2244FF',

From 14d1743595d3d12f7971ca78612031423ac2e1ac Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Wed, 8 Feb 2023 14:48:28 +0100
Subject: [PATCH 128/358] test(editor): Add canvas dragging tests
 (no-changelog) (#5406)

* WIP

* Fix undo/redo tests and add canvas tests

* Cleanup

* Cleanup

* Use drag and draganddrop commands

* Fix hanging CI run

* Undo redo spec
---
 cypress/constants.ts                      |   4 +
 cypress/e2e/12-canvas.cy.ts               | 119 +++++++++++++++++++++-
 cypress/pages/workflow.ts                 |  14 +++
 cypress/support/commands.ts               |  22 ++--
 packages/editor-ui/src/mixins/nodeBase.ts |  16 ++-
 5 files changed, 162 insertions(+), 13 deletions(-)

diff --git a/cypress/constants.ts b/cypress/constants.ts
index 26740bfb8b2c75..5118696bc81d3e 100644
--- a/cypress/constants.ts
+++ b/cypress/constants.ts
@@ -4,9 +4,13 @@ export const DEFAULT_USER_EMAIL = 'nathan@n8n.io';
 export const DEFAULT_USER_PASSWORD = 'CypressTest123';
 
 export const MANUAL_TRIGGER_NODE_NAME = 'Manual Trigger';
+export const MANUAL_TRIGGER_NODE_DISPLAY_NAME = 'When clicking "Execute Workflow"';
 export const SCHEDULE_TRIGGER_NODE_NAME = 'Schedule Trigger';
 export const CODE_NODE_NAME = 'Code';
 export const SET_NODE_NAME = 'Set';
+export const IF_NODE_NAME = 'IF';
+export const MERGE_NODE_NAME = 'Merge';
+export const SWITCH_NODE_NAME = 'Switch';
 export const GMAIL_NODE_NAME = 'Gmail';
 export const TRELLO_NODE_NAME = 'Trello';
 export const NOTION_NODE_NAME = 'Notion';
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index c88e62035d089a..ac0bbd7bad992e 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -1,8 +1,12 @@
 import {
 	MANUAL_TRIGGER_NODE_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
 	CODE_NODE_NAME,
 	SCHEDULE_TRIGGER_NODE_NAME,
 	SET_NODE_NAME,
+	SWITCH_NODE_NAME,
+	IF_NODE_NAME,
+	MERGE_NODE_NAME,
 	HTTP_REQUEST_NODE_NAME,
 } from './../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
@@ -33,12 +37,125 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.executeWorkflowButton().should('be.visible');
 	});
 
+	it('should connect and disconnect a simple node', () => {
+		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.getters.nodeViewBackground().click(600, 200, { force: true });
+		cy.get('.jtk-connector').should('have.length', 1);
+		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+
+		// Change connection from Set to Set1
+		cy.draganddrop(
+			WorkflowPage.getters.getEndpointSelector('input', SET_NODE_NAME),
+			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`)
+		)
+
+		WorkflowPage.getters.canvasNodeInputEndpointByName(`${SET_NODE_NAME}1`).should('have.class', 'jtk-endpoint-connected');
+
+		cy.get('.jtk-connector').should('have.length', 1);
+		// Disconnect Set1
+		cy.drag(WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`), [-200, 100])
+		cy.get('.jtk-connector').should('have.length', 0);
+	});
+
 	it('should add first step', () => {
 		WorkflowPage.getters.canvasPlusButton().should('be.visible');
 		WorkflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().should('have.length', 1);
 	});
 
+	it('should add a node via plus endpoint drag', () => {
+		WorkflowPage.getters.canvasPlusButton().should('be.visible');
+		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME, true);
+
+		cy.drag(WorkflowPage.getters.getEndpointSelector('plus', SCHEDULE_TRIGGER_NODE_NAME), [100, 100])
+
+		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+		WorkflowPage.actions.addNodeToCanvas(IF_NODE_NAME, false);
+		WorkflowPage.getters.nodeViewBackground().click({ force: true });
+	});
+
+	it('should add switch node and test connections', () => {
+		WorkflowPage.actions.addNodeToCanvas(SWITCH_NODE_NAME, true);
+
+		// Switch has 4 output endpoints
+		for (let i = 0; i < 4; i++) {
+			WorkflowPage.getters.canvasNodePlusEndpointByName(SWITCH_NODE_NAME, i).click({ force: true })
+			WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
+			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, false);
+			WorkflowPage.actions.zoomToFit();
+		}
+		WorkflowPage.actions.saveWorkflowOnButtonClick();
+		cy.reload()
+		cy.waitForLoad();
+		// Make sure all connections are there after reload
+		for (let i = 0; i < 4; i++) {
+			const setName = `${SET_NODE_NAME}${i > 0 ? i : ''}`;
+			WorkflowPage.getters.canvasNodeInputEndpointByName(setName).should('have.class', 'jtk-endpoint-connected');
+		}
+	});
+
+	it('should add merge node and test connections', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		for (let i = 0; i < 2; i++) {
+			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, true);
+			WorkflowPage.getters.nodeViewBackground().click(600 + i * 100, 200, { force: true });
+		}
+		WorkflowPage.actions.zoomToFit();
+
+		WorkflowPage.actions.addNodeToCanvas(MERGE_NODE_NAME);
+		WorkflowPage.actions.zoomToFit();
+
+		// Connect manual to Set1
+		cy.draganddrop(
+			WorkflowPage.getters.getEndpointSelector('output', MANUAL_TRIGGER_NODE_DISPLAY_NAME),
+			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`)
+		)
+
+		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 2);
+
+		// Connect Set1 and Set2 to merge
+		cy.draganddrop(
+			WorkflowPage.getters.getEndpointSelector('plus', SET_NODE_NAME),
+			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 0)
+		)
+		cy.draganddrop(
+			WorkflowPage.getters.getEndpointSelector('plus', `${SET_NODE_NAME}1`),
+			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 1)
+		)
+
+		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 4);
+
+		// Make sure all connections are there after save & reload
+		WorkflowPage.actions.saveWorkflowOnButtonClick();
+		cy.reload()
+		cy.waitForLoad();
+
+		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 4);
+		WorkflowPage.actions.executeWorkflow();
+		// If the merged set nodes are connected and executed correctly, there should be 2 items in the output of merge node
+		cy.get('[data-label="2 items"]').should('be.visible');
+	});
+
+	it('should add nodes and check execution success', () => {
+		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		for (let i = 0; i < 3; i++) {
+			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, true);
+		}
+		WorkflowPage.actions.zoomToFit();
+		WorkflowPage.actions.executeWorkflow();
+
+		cy.get('.jtk-connector.success').should('have.length', 3);
+		cy.get('.data-count').should('have.length', 4);
+		cy.get('.plus-draggable-endpoint').should('have.class', 'ep-success');
+
+		WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME);
+		WorkflowPage.actions.zoomToFit();
+
+		cy.get('.plus-draggable-endpoint').filter(':visible').should('not.have.class', 'ep-success');
+		cy.get('.jtk-connector.success').should('have.length', 3);
+		cy.get('.jtk-connector').should('have.length', 4);
+	})
+
 	it('should add a connected node using plus endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		cy.get('.plus-endpoint').should('be.visible').click();
@@ -226,7 +343,7 @@ describe('Canvas Actions', () => {
 	it('should delete a connection by moving it away from endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		cy.drag('.rect-input-endpoint.jtk-endpoint-connected', [0, -100]);
+		cy.drag(WorkflowPage.getters.getEndpointSelector('input', CODE_NODE_NAME), [0, -100]);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
 	});
 
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index e8e8a99489067d..80ef05b3ccc49b 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -24,6 +24,18 @@ export class WorkflowPage extends BasePage {
 		canvasNodes: () => cy.getByTestId('canvas-node'),
 		canvasNodeByName: (nodeName: string) =>
 			this.getters.canvasNodes().filter(`:contains("${nodeName}")`),
+		getEndpointSelector: (type: 'input' | 'output' | 'plus', nodeName: string, index = 0) => {
+			return `[data-endpoint-name='${nodeName}'][data-endpoint-type='${type}'][data-input-index='${index}']`
+		},
+		canvasNodeInputEndpointByName: (nodeName: string, index = 0) => {
+			return cy.get(this.getters.getEndpointSelector('input', nodeName, index));
+		},
+		canvasNodeOutputEndpointByName: (nodeName: string, index = 0) => {
+			return cy.get(this.getters.getEndpointSelector('output', nodeName, index));
+		},
+		canvasNodePlusEndpointByName: (nodeName: string, index = 0) => {
+			return cy.get(this.getters.getEndpointSelector('plus', nodeName, index));
+		},
 		successToast: () => cy.get('.el-notification .el-icon-success').parent(),
 		errorToast: () => cy.get('.el-notification .el-icon-error'),
 		activatorSwitch: () => cy.getByTestId('workflow-activate-switch'),
@@ -122,7 +134,9 @@ export class WorkflowPage extends BasePage {
 			this.getters.workflowMenu().click();
 		},
 		saveWorkflowOnButtonClick: () => {
+			this.getters.saveButton().should('contain', 'Save');
 			this.getters.saveButton().click();
+			this.getters.saveButton().should('contain', 'Saved')
 		},
 		saveWorkflowUsingKeyboardShortcut: () => {
 			cy.get('body').type('{meta}', { release: false }).type('s');
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index eade8241158e82..c5e9f898ce61fb 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -187,23 +187,27 @@ Cypress.Commands.add('drag', (selector, pos) => {
 		pageY: originalLocation.top + yDiff,
 		force: true,
 	});
-	element.trigger('mouseup');
+	element.trigger('mouseup', { force: true });
 });
 
 Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 	cy.get(draggableSelector).should('exist');
 	cy.get(droppableSelector).should('exist');
 
-	const droppableEl = Cypress.$(droppableSelector)[0];
-	const coords = droppableEl.getBoundingClientRect();
+	cy.get(droppableSelector).first().then(([$el]) => {
+		const coords = $el.getBoundingClientRect();
 
-	const pageX = coords.left + coords.width / 2;
-	const pageY = coords.top + coords.height / 2;
+		const pageX = coords.left + coords.width / 2;
+		const pageY = coords.top + coords.height / 2;
 
-	cy.get(draggableSelector).realMouseDown();
-	cy.get(droppableSelector).realMouseMove(pageX, pageY)
-		.realHover()
-		.realMouseUp();
+		// We can't use realMouseDown here because it hangs headless run
+		cy.get(draggableSelector).trigger('mousedown');
+		// We don't chain these commands to make sure cy.get is re-trying correctly
+		cy.get(droppableSelector).realMouseMove(pageX, pageY)
+		cy.get(droppableSelector).realHover()
+		cy.get(droppableSelector).realMouseUp();
+		cy.get(draggableSelector).realMouseUp();
+	})
 });
 
 
diff --git a/packages/editor-ui/src/mixins/nodeBase.ts b/packages/editor-ui/src/mixins/nodeBase.ts
index b90ac49ff13bd2..10e9f3b0d8c34f 100644
--- a/packages/editor-ui/src/mixins/nodeBase.ts
+++ b/packages/editor-ui/src/mixins/nodeBase.ts
@@ -10,7 +10,7 @@ import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { BrowserJsPlumbInstance } from '@jsplumb/browser-ui';
-import { EndpointOptions } from '@jsplumb/core';
+import { Endpoint, EndpointOptions } from '@jsplumb/core';
 import * as NodeViewUtils from '@/utils/nodeViewUtils';
 import { useHistoryStore } from '@/stores/history';
 import { useCanvasStore } from '@/stores/canvas';
@@ -60,6 +60,14 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 		},
 	},
 	methods: {
+		__addEndpointTestingData(endpoint: Endpoint, type: string, inputIndex: number) {
+			if (window?.Cypress && 'canvas' in endpoint.endpoint) {
+				const canvas = endpoint.endpoint.canvas;
+				this.instance.setAttribute(canvas, 'data-endpoint-name', this.data.name);
+				this.instance.setAttribute(canvas, 'data-input-index', inputIndex.toString());
+				this.instance.setAttribute(canvas, 'data-endpoint-type', type);
+			}
+		},
 		__addInputEndpoints(node: INodeUi, nodeTypeData: INodeTypeDescription) {
 			// Add Inputs
 			let index;
@@ -104,6 +112,7 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 					this.$refs[this.data.name] as Element,
 					newEndpointData,
 				);
+				this.__addEndpointTestingData(endpoint, 'input', index);
 				if (nodeTypeData.inputNames) {
 					// Apply input names if they got set
 					endpoint.addOverlay(NodeViewUtils.getInputNameOverlay(nodeTypeData.inputNames[index]));
@@ -155,7 +164,6 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 					uuid: NodeViewUtils.getOutputEndpointUUID(this.nodeId, index),
 					anchor: anchorPosition,
 					maxConnections: -1,
-
 					endpoint: {
 						type: 'Dot',
 						options: {
@@ -185,10 +193,11 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 					this.$refs[this.data.name] as Element,
 					newEndpointData,
 				);
+				this.__addEndpointTestingData(endpoint, 'output', index);
 				if (nodeTypeData.outputNames) {
 					// Apply output names if they got set
 					const overlaySpec = NodeViewUtils.getOutputNameOverlay(nodeTypeData.outputNames[index]);
-					const overlay = endpoint.addOverlay(overlaySpec);
+					endpoint.addOverlay(overlaySpec);
 				}
 
 				if (!Array.isArray(endpoint)) {
@@ -236,6 +245,7 @@ export const nodeBase = mixins(deviceSupportHelpers).extend({
 						this.$refs[this.data.name] as Element,
 						plusEndpointData,
 					);
+					this.__addEndpointTestingData(plusEndpoint, 'plus', index);
 
 					if (!Array.isArray(plusEndpoint)) {
 						plusEndpoint.__meta = {

From 269691aa1bc4350083eddb2e125624b8e461760c Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Wed, 8 Feb 2023 15:20:17 +0100
Subject: [PATCH 129/358] test(IF Node): Unit tests (no-changelog) (#5404)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡️move test files

* ⚡️IF boolean tests

* ⚡️IF string tests

* ✅ IF number tests

* ✅ IF date-time tests

* 🎨 update Test name to make more sense
---
 .../nodes-base/nodes/If/test/IF.boolean.json  | 306 ++++++
 .../nodes/If/test/IF.date-time.json           | 221 ++++
 .../nodes-base/nodes/If/test/IF.number.json   | 616 +++++++++++
 .../nodes-base/nodes/If/test/IF.string.json   | 976 ++++++++++++++++++
 .../nodes-base/nodes/If/test/If.node.test.ts  |   5 +
 .../nodes-base/test/nodes/If/If.node.test.ts  |  49 -
 .../nodes-base/test/nodes/If/workflow.json    | 115 ---
 7 files changed, 2124 insertions(+), 164 deletions(-)
 create mode 100644 packages/nodes-base/nodes/If/test/IF.boolean.json
 create mode 100644 packages/nodes-base/nodes/If/test/IF.date-time.json
 create mode 100644 packages/nodes-base/nodes/If/test/IF.number.json
 create mode 100644 packages/nodes-base/nodes/If/test/IF.string.json
 create mode 100644 packages/nodes-base/nodes/If/test/If.node.test.ts
 delete mode 100644 packages/nodes-base/test/nodes/If/If.node.test.ts
 delete mode 100644 packages/nodes-base/test/nodes/If/workflow.json

diff --git a/packages/nodes-base/nodes/If/test/IF.boolean.json b/packages/nodes-base/nodes/If/test/IF.boolean.json
new file mode 100644
index 00000000000000..f655af488857d5
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/IF.boolean.json
@@ -0,0 +1,306 @@
+{
+	"name": "If node unit test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "cc223c0f-eae7-4647-907a-8e44f1762442",
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-2440,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  { value: true, value2: false },\n  { value: false, value2: true },\n];"
+			},
+			"id": "2aa0a57b-b25a-4293-b7bf-fc240d4d21f4",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				-2240,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $json[\"value\"] }}",
+							"value2": true
+						},
+						{
+							"value1": "={{ $json.value2 }}",
+							"value2": true
+						}
+					]
+				},
+				"combineOperation": "any"
+			},
+			"id": "44d65f81-a358-4ec3-bea6-9760b1dba386",
+			"name": "IF ANY",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2000,
+				700
+			],
+			"alwaysOutputData": false
+		},
+		{
+			"parameters": {},
+			"id": "db5d7a75-18d4-4721-bb81-1a9f8f4fce01",
+			"name": "On True ANY",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-1760,
+				620
+			]
+		},
+		{
+			"parameters": {},
+			"id": "033fe413-65fe-413d-87d7-53358c8e43a1",
+			"name": "On False ANY",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-1760,
+				800
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $json[\"value\"] }}",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "787d9236-d7eb-442b-afef-91e6066b925c",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2000,
+				340
+			]
+		},
+		{
+			"parameters": {},
+			"id": "c46df596-7cec-4a67-a50c-240e992f5c4d",
+			"name": "On True",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-1760,
+				260
+			]
+		},
+		{
+			"parameters": {},
+			"id": "86510ba2-8744-4383-b5a0-5c6b67625cd8",
+			"name": "On False",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-1760,
+				420
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"boolean": [
+						{
+							"value1": "={{ $json[\"value\"] }}",
+							"operation": "notEqual",
+							"value2": true
+						}
+					]
+				}
+			},
+			"id": "2b031214-fff5-475b-88f9-a091a48bcc1e",
+			"name": "IF Not Equal",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-1420,
+				520
+			]
+		},
+		{
+			"parameters": {},
+			"id": "da080483-32b2-429c-8d06-61e40a86c8d5",
+			"name": "On True Not Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-1180,
+				420
+			]
+		},
+		{
+			"parameters": {},
+			"id": "d373dd92-dede-4629-ab23-61e1dd89bc46",
+			"name": "On False Not Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-1180,
+				600
+			]
+		}
+	],
+	"pinData": {
+		"On True": [
+			{
+				"json": {
+					"value": true,
+					"value2": false
+				}
+			}
+		],
+		"On False": [
+			{
+				"json": {
+					"value": false,
+					"value2": true
+				}
+			}
+		],
+		"On True Not Equal": [
+			{
+				"json": {
+					"value": false,
+					"value2": true
+				}
+			}
+		],
+		"On False Not Equal": [
+			{
+				"json": {
+					"value": true,
+					"value2": false
+				}
+			}
+		],
+		"On True ANY": [
+			{
+				"json": {
+					"value": true,
+					"value2": false
+				}
+			},
+			{
+				"json": {
+					"value": false,
+					"value2": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF ANY",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Not Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF ANY": {
+			"main": [
+				[
+					{
+						"node": "On True ANY",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False ANY",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "On True",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Not Equal": {
+			"main": [
+				[
+					{
+						"node": "On True Not Equal",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Not Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "5d748d36-ca05-4f7a-b253-70c42e5473ca",
+	"id": "181",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/If/test/IF.date-time.json b/packages/nodes-base/nodes/If/test/IF.date-time.json
new file mode 100644
index 00000000000000..f09004c46b3b45
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/IF.date-time.json
@@ -0,0 +1,221 @@
+{
+	"name": "If node unit tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "711fa21c-4ac2-4eed-9c35-a79edf18e8af",
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				140,
+				1560
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  { dayOne: '2023-01-01T00:00:00.000-05:00', dayTwo: '2023-01-02T00:00:00.000-05:00' },\n  { dayOne: '2023-01-02T00:00:00.000-05:00', dayTwo: '2023-01-01T00:00:00.000-05:00' },\n];"
+			},
+			"id": "c5d906bc-909a-45d9-a990-9ea6279cc807",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				340,
+				1560
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"dateTime": [
+						{
+							"value1": "={{ $json.dayOne }}",
+							"value2": "={{ $json.dayTwo }}"
+						}
+					]
+				}
+			},
+			"id": "10431f40-d47d-4bd9-8dd6-d4dbb35d626b",
+			"name": "IF Occured After",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				560,
+				1440
+			]
+		},
+		{
+			"parameters": {},
+			"id": "2727a2f7-2bda-469b-a548-8df82de433e2",
+			"name": "On False Occured After",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				980,
+				1460
+			]
+		},
+		{
+			"parameters": {},
+			"id": "40baaffe-9769-4b15-b09f-3553e37f90a5",
+			"name": "On True Occured After",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				760,
+				1420
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"dateTime": [
+						{
+							"value1": "={{ $json.dayOne }}",
+							"operation": "before",
+							"value2": "={{ $json.dayTwo }}"
+						}
+					]
+				}
+			},
+			"id": "29ff421d-d7c5-4cc6-8830-73c0abf1c13f",
+			"name": "IF Occured Before",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				560,
+				1680
+			]
+		},
+		{
+			"parameters": {},
+			"id": "3347b52a-e513-4900-ab9a-bbcc7a6ec063",
+			"name": "On True Occured Before",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				760,
+				1660
+			]
+		},
+		{
+			"parameters": {},
+			"id": "d8401e15-f6e5-4347-b885-54798494cb1b",
+			"name": "On False Occured Before",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				980,
+				1700
+			]
+		}
+	],
+	"pinData": {
+		"On True Occured After": [
+			{
+				"json": {
+					"dayOne": "2023-01-02T00:00:00.000-05:00",
+					"dayTwo": "2023-01-01T00:00:00.000-05:00"
+				}
+			}
+		],
+		"On False Occured After": [
+			{
+				"json": {
+					"dayOne": "2023-01-01T00:00:00.000-05:00",
+					"dayTwo": "2023-01-02T00:00:00.000-05:00"
+				}
+			}
+		],
+		"On True Occured Before": [
+			{
+				"json": {
+					"dayOne": "2023-01-01T00:00:00.000-05:00",
+					"dayTwo": "2023-01-02T00:00:00.000-05:00"
+				}
+			}
+		],
+		"On False Occured Before": [
+			{
+				"json": {
+					"dayOne": "2023-01-02T00:00:00.000-05:00",
+					"dayTwo": "2023-01-01T00:00:00.000-05:00"
+				}
+			}
+		]
+	},
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "IF Occured After",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Occured Before",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Occured After": {
+			"main": [
+				[
+					{
+						"node": "On True Occured After",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Occured After",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Occured Before": {
+			"main": [
+				[
+					{
+						"node": "On True Occured Before",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Occured Before",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "78121a47-2013-4f79-b0bd-b4d607dc82bf",
+	"id": "181",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/If/test/IF.number.json b/packages/nodes-base/nodes/If/test/IF.number.json
new file mode 100644
index 00000000000000..9e835e4620f5cc
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/IF.number.json
@@ -0,0 +1,616 @@
+{
+	"name": "If node unit tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "11d2c2c8-5690-45e5-a863-8750191acaa7",
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-5180,
+				3020
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  { value: 1 },\n  { value: 2 },\n];"
+			},
+			"id": "77e63f88-e5fc-4662-af2e-6947a4768cf3",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				-4980,
+				3020
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"value2": 2
+						}
+					]
+				}
+			},
+			"id": "861e29f8-ae3d-4a67-8367-5811b021c129",
+			"name": "IF Smaller",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				2480
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"operation": "smallerEqual",
+							"value2": 2
+						}
+					]
+				}
+			},
+			"id": "b5ac7784-9d70-4df9-8451-8157e8ff23e6",
+			"name": "IF Smaller or Equal",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				2660
+			]
+		},
+		{
+			"parameters": {},
+			"id": "4f5336b3-de6d-4174-b186-f5040af0fa47",
+			"name": "On True Smaller",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4560,
+				2460
+			]
+		},
+		{
+			"parameters": {},
+			"id": "f5128cec-4faa-4408-9b00-68d995bd0723",
+			"name": "On False Smaller",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4320,
+				2500
+			]
+		},
+		{
+			"parameters": {},
+			"id": "ccf77a6c-e168-4ca3-9ade-ac13d04016f6",
+			"name": "On True Smaller or Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4560,
+				2640
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"operation": "equal",
+							"value2": 1
+						}
+					]
+				}
+			},
+			"id": "d276e794-56bc-4c7c-ab96-a2822ad75b3a",
+			"name": "IF Equal",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				2840
+			]
+		},
+		{
+			"parameters": {},
+			"id": "bad938c1-2faf-4aef-8059-9d1a33257fbf",
+			"name": "On True Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4560,
+				2820
+			]
+		},
+		{
+			"parameters": {},
+			"id": "8ff56c84-4a44-440c-a5cf-8659879b1bb3",
+			"name": "On False Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4320,
+				2860
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"operation": "notEqual",
+							"value2": 1
+						}
+					]
+				}
+			},
+			"id": "bda97a18-aca7-437f-9920-96089067c43c",
+			"name": "IF Not Equal",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				3020
+			]
+		},
+		{
+			"parameters": {},
+			"id": "7f3a01bd-24c5-43fd-bc1e-8087301f9745",
+			"name": "On True Not Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4560,
+				3000
+			]
+		},
+		{
+			"parameters": {},
+			"id": "f956db17-cd53-4222-94ed-100d91dc0c5a",
+			"name": "On False Not Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4320,
+				3040
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"operation": "larger",
+							"value2": 1
+						}
+					]
+				}
+			},
+			"id": "eb01c8b7-43fb-4716-8247-69eabb47ff6b",
+			"name": "IF Larger",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				3200
+			]
+		},
+		{
+			"parameters": {},
+			"id": "81b6e68d-2536-424d-908f-5bf6f4ee090d",
+			"name": "On True Larger",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4560,
+				3180
+			]
+		},
+		{
+			"parameters": {},
+			"id": "d7881e80-93bf-45ba-b831-02534daaa65f",
+			"name": "On False Larger",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4320,
+				3220
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"operation": "largerEqual",
+							"value2": 1
+						}
+					]
+				}
+			},
+			"id": "e328bd99-269b-4f33-aed8-1d9c3289b0ec",
+			"name": "IF Larger or Equal",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				3400
+			]
+		},
+		{
+			"parameters": {},
+			"id": "e673c174-15b9-4992-b870-6ba127890e47",
+			"name": "On True Larger or Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4560,
+				3380
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"operation": "isEmpty"
+						}
+					]
+				}
+			},
+			"id": "d42fa33b-2f5e-4c20-a48a-0a9bec2ad847",
+			"name": "IF Is Empty",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				3600
+			]
+		},
+		{
+			"parameters": {},
+			"id": "c59fcd54-5b4f-4c68-9ead-8803ac1c9094",
+			"name": "On False  Is Empty",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4320,
+				3620
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"number": [
+						{
+							"value1": "={{ $json.value }}",
+							"operation": "isNotEmpty"
+						}
+					]
+				}
+			},
+			"id": "c70d2625-996c-46a0-9c34-f2a1da4a29e5",
+			"name": "IF Is Not Empty",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-4760,
+				3780
+			]
+		},
+		{
+			"parameters": {},
+			"id": "2430fb5e-8d25-4b70-a517-753e1e32f579",
+			"name": "On True Is Not Empty",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-4560,
+				3760
+			]
+		}
+	],
+	"pinData": {
+		"On True Smaller": [
+			{
+				"json": {
+					"value": 1
+				}
+			}
+		],
+		"On False Smaller": [
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		],
+		"On True Smaller or Equal": [
+			{
+				"json": {
+					"value": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		],
+		"On True Equal": [
+			{
+				"json": {
+					"value": 1
+				}
+			}
+		],
+		"On False Equal": [
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		],
+		"On True Not Equal": [
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		],
+		"On False Not Equal": [
+			{
+				"json": {
+					"value": 1
+				}
+			}
+		],
+		"On True Larger": [
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		],
+		"On False Larger": [
+			{
+				"json": {
+					"value": 1
+				}
+			}
+		],
+		"On True Larger or Equal": [
+			{
+				"json": {
+					"value": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		],
+		"On False  Is Empty": [
+			{
+				"json": {
+					"value": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		],
+		"On True Is Not Empty": [
+			{
+				"json": {
+					"value": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2
+				}
+			}
+		]
+	},
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "IF Smaller",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Smaller or Equal",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Equal",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Not Equal",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Larger",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Larger or Equal",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Is Empty",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Is Not Empty",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Smaller": {
+			"main": [
+				[
+					{
+						"node": "On True Smaller",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Smaller",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Smaller or Equal": {
+			"main": [
+				[
+					{
+						"node": "On True Smaller or Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Equal": {
+			"main": [
+				[
+					{
+						"node": "On True Equal",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Not Equal": {
+			"main": [
+				[
+					{
+						"node": "On True Not Equal",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Not Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Larger": {
+			"main": [
+				[
+					{
+						"node": "On True Larger",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Larger",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Larger or Equal": {
+			"main": [
+				[
+					{
+						"node": "On True Larger or Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Is Empty": {
+			"main": [
+				[],
+				[
+					{
+						"node": "On False  Is Empty",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Is Not Empty": {
+			"main": [
+				[
+					{
+						"node": "On True Is Not Empty",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "ec60bcbc-afef-4aae-91e2-65ffef88234b",
+	"id": "181",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/If/test/IF.string.json b/packages/nodes-base/nodes/If/test/IF.string.json
new file mode 100644
index 00000000000000..15c8089924ff2d
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/IF.string.json
@@ -0,0 +1,976 @@
+{
+	"name": "If node unit tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "38a682ce-6cde-4f90-bfd0-a80c61e2b22d",
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-3120,
+				600
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  { name: \"Elon Musk\" },\n  { name: \"Arnold Schwarzenegger\"},\n];"
+			},
+			"id": "a35687af-99c1-43b2-aa43-955fcd87ff81",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				-2920,
+				600
+			]
+		},
+		{
+			"parameters": {},
+			"id": "466a0b11-7826-4ba9-9563-9ac5d6d08457",
+			"name": "On True",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				-500
+			]
+		},
+		{
+			"parameters": {},
+			"id": "91363030-4550-4ee2-9dea-f3adad8c1190",
+			"name": "On False",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				-460
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "contains",
+							"value2": "Elon"
+						}
+					]
+				}
+			},
+			"id": "93db20a4-9781-4de1-a298-87e885a21f31",
+			"name": "IF Contains",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				-480
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "notContains",
+							"value2": "Elon"
+						}
+					]
+				}
+			},
+			"id": "9f286ba6-f2a6-4aa1-895a-65992c1d5eae",
+			"name": "IF Not Contains",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				-300
+			]
+		},
+		{
+			"parameters": {},
+			"id": "45be466f-da36-40da-993c-fb6f3de313e2",
+			"name": "On True Contains",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				-320
+			]
+		},
+		{
+			"parameters": {},
+			"id": "578dc9f0-0224-475e-89bb-af8b474c5d4e",
+			"name": "On False Contains",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				-280
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "endsWith",
+							"value2": "Musk"
+						}
+					]
+				}
+			},
+			"id": "715f2210-7dd0-47e9-bcd7-3a62728d993e",
+			"name": "IF Ends With",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				-120
+			]
+		},
+		{
+			"parameters": {},
+			"id": "847291c1-3040-4289-a8f9-a23e82b8ff85",
+			"name": "On True Ends With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				-140
+			]
+		},
+		{
+			"parameters": {},
+			"id": "bb312b9d-5bda-4869-a790-932a85374bf1",
+			"name": "On False Ends With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				-100
+			]
+		},
+		{
+			"parameters": {},
+			"id": "1f507ed5-1602-40c0-ba3d-7b0095f1c346",
+			"name": "On True Not Ends With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				20
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "notEndsWith",
+							"value2": "Musk"
+						}
+					]
+				}
+			},
+			"id": "c9423daa-de29-4f05-9dde-5b90006fe1a0",
+			"name": "IF Not Ends With",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				40
+			]
+		},
+		{
+			"parameters": {},
+			"id": "ad89d258-3fc4-4f96-93f4-0c4c4d0b4aca",
+			"name": "On False Not Ends With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				60
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"value2": "Elon Musk"
+						}
+					]
+				}
+			},
+			"id": "ac91ef56-3bab-42db-b800-13f53be03a43",
+			"name": "IF Equal",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				240
+			]
+		},
+		{
+			"parameters": {},
+			"id": "db00d63e-0e74-4d89-a8f4-4de3492fe5e6",
+			"name": "On True Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				220
+			]
+		},
+		{
+			"parameters": {},
+			"id": "3314da40-e56a-4a6b-932e-8a31335f2535",
+			"name": "On False Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				260
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "notEqual",
+							"value2": "Elon Musk"
+						}
+					]
+				}
+			},
+			"id": "765195fc-6cba-4918-89b8-ad5ca456e89e",
+			"name": "IF Not Equal",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				420
+			]
+		},
+		{
+			"parameters": {},
+			"id": "e720d65f-13f5-4888-ab14-8b022b2fc08e",
+			"name": "On True Not Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				400
+			]
+		},
+		{
+			"parameters": {},
+			"id": "f14a2032-b734-4f40-84a3-42426eec932e",
+			"name": "On False Not Equal",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				440
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "regex",
+							"value2": "([E])"
+						}
+					]
+				}
+			},
+			"id": "caa56347-323c-4671-abae-71a0d6586315",
+			"name": "IF Regex",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				600
+			]
+		},
+		{
+			"parameters": {},
+			"id": "5a83ee44-5b71-472d-8a6c-ee3fddd78482",
+			"name": "On True Regex",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				580
+			]
+		},
+		{
+			"parameters": {},
+			"id": "a82388fc-6b93-4327-bb99-da6b0b0824cd",
+			"name": "On False Regex",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				620
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "notRegex",
+							"value2": "([E])"
+						}
+					]
+				}
+			},
+			"id": "6139ed77-889d-4b89-8c2f-c26601ffb54a",
+			"name": "IF Not Regex",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				780
+			]
+		},
+		{
+			"parameters": {},
+			"id": "f61258e3-44aa-4fd5-9602-a135ad4a8e6b",
+			"name": "On True Not Regex",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				760
+			]
+		},
+		{
+			"parameters": {},
+			"id": "d547895d-5dd2-4fba-9076-dbd21db7559d",
+			"name": "On False Not Regex",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				800
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "startsWith",
+							"value2": "Elon"
+						}
+					]
+				}
+			},
+			"id": "45ea72ae-6ee0-492f-9f6c-237b95c5516f",
+			"name": "IF Starts With",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				980
+			]
+		},
+		{
+			"parameters": {},
+			"id": "7102319b-10d2-46af-a04f-84dcee678038",
+			"name": "On True Starts With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				960
+			]
+		},
+		{
+			"parameters": {},
+			"id": "1f986310-a6b1-40a5-aff3-c595b414c3cd",
+			"name": "On False Starts With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				1000
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "notStartsWith",
+							"value2": "Elon"
+						}
+					]
+				}
+			},
+			"id": "16513014-99f8-4d36-b5ef-1c8c28aa1d1d",
+			"name": "IF Not Starts With",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				1180
+			]
+		},
+		{
+			"parameters": {},
+			"id": "31b15c96-9075-4892-baa1-683d7ce802d1",
+			"name": "On True Not Starts With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				1160
+			]
+		},
+		{
+			"parameters": {},
+			"id": "33786edf-86af-4769-9fa2-f8ba78b67588",
+			"name": "On False Not Starts With",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				1200
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "isEmpty"
+						}
+					]
+				}
+			},
+			"id": "7e90e29c-186c-4c22-a7a9-e1a7a620a53f",
+			"name": "IF Is Empty",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				1380
+			]
+		},
+		{
+			"parameters": {},
+			"id": "adde8115-8279-43e6-b5b3-211378ccb56a",
+			"name": "On False Is Empty",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2220,
+				1400
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.name }}",
+							"operation": "isNotEmpty"
+						}
+					]
+				}
+			},
+			"id": "2e0f102e-b1a0-42c3-a523-47095233b357",
+			"name": "IF Is Not Empty",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-2660,
+				1560
+			]
+		},
+		{
+			"parameters": {},
+			"id": "37a9085f-89e0-4b15-93a9-69f583330f2b",
+			"name": "On True Is Not Empty",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-2460,
+				1540
+			]
+		}
+	],
+	"pinData": {
+		"On True": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On False": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On True Contains": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On False Contains": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On True Ends With": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On False Ends With": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On True Not Ends With": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On False Not Ends With": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On True Equal": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On False Equal": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On True Not Equal": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On False Not Equal": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On True Regex": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On False Regex": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On True Not Regex": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On False Not Regex": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On True Starts With": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On False Starts With": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On True Not Starts With": [
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On False Not Starts With": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			}
+		],
+		"On False Is Empty": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			},
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		],
+		"On True Is Not Empty": [
+			{
+				"json": {
+					"name": "Elon Musk"
+				}
+			},
+			{
+				"json": {
+					"name": "Arnold Schwarzenegger"
+				}
+			}
+		]
+	},
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "IF Contains",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Not Contains",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Ends With",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Not Ends With",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Equal",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Not Equal",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Regex",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Not Regex",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Starts With",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Not Starts With",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Is Empty",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "IF Is Not Empty",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Contains": {
+			"main": [
+				[
+					{
+						"node": "On True",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Not Contains": {
+			"main": [
+				[
+					{
+						"node": "On True Contains",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Contains",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Ends With": {
+			"main": [
+				[
+					{
+						"node": "On True Ends With",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Ends With",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Not Ends With": {
+			"main": [
+				[
+					{
+						"node": "On True Not Ends With",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Not Ends With",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Equal": {
+			"main": [
+				[
+					{
+						"node": "On True Equal",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Not Equal": {
+			"main": [
+				[
+					{
+						"node": "On True Not Equal",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Not Equal",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Regex": {
+			"main": [
+				[
+					{
+						"node": "On True Regex",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Regex",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Not Regex": {
+			"main": [
+				[
+					{
+						"node": "On True Not Regex",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Not Regex",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Starts With": {
+			"main": [
+				[
+					{
+						"node": "On True Starts With",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Starts With",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Not Starts With": {
+			"main": [
+				[
+					{
+						"node": "On True Not Starts With",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "On False Not Starts With",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Is Empty": {
+			"main": [
+				[],
+				[
+					{
+						"node": "On False Is Empty",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF Is Not Empty": {
+			"main": [
+				[
+					{
+						"node": "On True Is Not Empty",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "76683cf0-dd49-4220-b196-88d8b37c7207",
+	"id": "181",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/If/test/If.node.test.ts b/packages/nodes-base/nodes/If/test/If.node.test.ts
new file mode 100644
index 00000000000000..d30d7f20dffe07
--- /dev/null
+++ b/packages/nodes-base/nodes/If/test/If.node.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test IF Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/test/nodes/If/If.node.test.ts b/packages/nodes-base/test/nodes/If/If.node.test.ts
deleted file mode 100644
index eabff38aa351b5..00000000000000
--- a/packages/nodes-base/test/nodes/If/If.node.test.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-import * as Helpers from '../Helpers';
-import { WorkflowTestData } from '../types';
-import { executeWorkflow } from '../ExecuteWorkflow';
-
-describe('Execute If Node', () => {
-	const tests: Array<WorkflowTestData> = [
-		{
-			description: 'should execute IF node true/false boolean',
-			input: {
-				workflowData: Helpers.readJsonFileSync('test/nodes/If/workflow.json'),
-			},
-			output: {
-				nodeData: {
-					'On True': [
-						[
-							{
-								value: true,
-							},
-						],
-					],
-					'On False': [
-						[
-							{
-								value: false,
-							},
-						],
-					],
-				},
-			},
-		},
-	];
-
-	const nodeTypes = Helpers.setup(tests);
-
-	for (const testData of tests) {
-		test(testData.description, async () => {
-			// execute workflow
-			const { result } = await executeWorkflow(testData, nodeTypes);
-
-			// check if result node data matches expected test data
-			const resultNodeData = Helpers.getResultNodeData(result, testData);
-			resultNodeData.forEach(({ nodeName, resultData }) =>
-				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
-			);
-
-			expect(result.finished).toEqual(true);
-		});
-	}
-});
diff --git a/packages/nodes-base/test/nodes/If/workflow.json b/packages/nodes-base/test/nodes/If/workflow.json
deleted file mode 100644
index 9a33888f5a9119..00000000000000
--- a/packages/nodes-base/test/nodes/If/workflow.json
+++ /dev/null
@@ -1,115 +0,0 @@
-{
-	"meta": {
-		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
-	},
-	"nodes": [
-		{
-			"parameters": {},
-			"id": "47003824-c11f-4ae3-80a5-0e1a6d840b21",
-			"name": "On clicking 'execute'",
-			"type": "n8n-nodes-base.manualTrigger",
-			"typeVersion": 1,
-			"position": [
-				720,
-				460
-			]
-		},
-		{
-			"parameters": {
-				"conditions": {
-					"boolean": [
-						{
-							"value1": "={{ $json[\"value\"] }}",
-							"value2": true
-						}
-					]
-				}
-			},
-			"id": "5420fe7d-a216-44e0-b91f-188ba5b6a340",
-			"name": "IF",
-			"type": "n8n-nodes-base.if",
-			"typeVersion": 1,
-			"position": [
-				1160,
-				460
-			]
-		},
-		{
-			"parameters": {},
-			"id": "52d58f32-7faf-4874-afff-e6842bd02430",
-			"name": "On False",
-			"type": "n8n-nodes-base.noOp",
-			"typeVersion": 1,
-			"position": [
-				1400,
-				580
-			]
-		},
-		{
-			"parameters": {},
-			"id": "9be683ac-cd3f-4ba1-8fa4-052102c3d891",
-			"name": "On True",
-			"type": "n8n-nodes-base.noOp",
-			"typeVersion": 1,
-			"position": [
-				1400,
-				340
-			]
-		},
-		{
-			"parameters": {
-				"jsCode": "return [\n  { value: true },\n  { value: false }\n];"
-			},
-			"id": "5b3207e7-37e3-43c8-a4da-1ffebb0de134",
-			"name": "Code",
-			"type": "n8n-nodes-base.code",
-			"typeVersion": 1,
-			"position": [
-				940,
-				460
-			]
-		}
-	],
-	"connections": {
-		"On clicking 'execute'": {
-			"main": [
-				[
-					{
-						"node": "Code",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		},
-		"IF": {
-			"main": [
-				[
-					{
-						"node": "On True",
-						"type": "main",
-						"index": 0
-					}
-				],
-				[
-					{
-						"node": "On False",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		},
-		"Code": {
-			"main": [
-				[
-					{
-						"node": "IF",
-						"type": "main",
-						"index": 0
-					}
-				]
-			]
-		}
-	}
-}

From 1f924e3c3d7bdb4ac080f807f1c74a3549232857 Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Wed, 8 Feb 2023 18:04:11 +0100
Subject: [PATCH 130/358] test(Set Node): Add tests for Set Node (no-changelog)
 (#5409)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡️move test files

* ✅ set node test workflow

---------

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../nodes/Set/test/Set.node.test.ts           |   4 +
 .../nodes/Set/test/Set.workflow.json          | 320 ++++++++++++++++++
 .../nodes-base/test/nodes/Set/SetNode.test.ts | 196 -----------
 3 files changed, 324 insertions(+), 196 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Set/test/Set.node.test.ts
 create mode 100644 packages/nodes-base/nodes/Set/test/Set.workflow.json
 delete mode 100644 packages/nodes-base/test/nodes/Set/SetNode.test.ts

diff --git a/packages/nodes-base/nodes/Set/test/Set.node.test.ts b/packages/nodes-base/nodes/Set/test/Set.node.test.ts
new file mode 100644
index 00000000000000..9c794fa420b994
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/Set.node.test.ts
@@ -0,0 +1,4 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Set Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Set/test/Set.workflow.json b/packages/nodes-base/nodes/Set/test/Set.workflow.json
new file mode 100644
index 00000000000000..6a6fac706e46fc
--- /dev/null
+++ b/packages/nodes-base/nodes/Set/test/Set.workflow.json
@@ -0,0 +1,320 @@
+{
+	"name": "Set Node Test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "90ddfdf0-973b-4b4f-b082-0e013b70629a",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				900,
+				2560
+			]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "string",
+							"value": "foo"
+						}
+					],
+					"boolean": [
+						{
+							"name": "boolean",
+							"value": true
+						}
+					],
+					"number": [
+						{
+							"name": "number",
+							"value": 1
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "b46b7da8-3c0f-4111-bb3f-973fd2827dc4",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				1380,
+				2200
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  { nested: { foo: \"bar\" }, list: [\"foo\" ] }\n]"
+			},
+			"id": "a7e51ac7-734a-4652-bb02-d9f0a4d8410b",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				1120,
+				2560
+			]
+		},
+		{
+			"parameters": {
+				"keepOnlySet": true,
+				"values": {
+					"string": [
+						{
+							"name": "string",
+							"value": "foo"
+						}
+					],
+					"boolean": [
+						{
+							"name": "boolean",
+							"value": true
+						}
+					],
+					"number": [
+						{
+							"name": "number",
+							"value": 1
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "3744306e-7a23-486f-881c-accf3a81e08a",
+			"name": "Set Keep Only Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				1380,
+				2380
+			]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "list[1]",
+							"value": "bar"
+						}
+					],
+					"boolean": [
+						{
+							"name": "list[2]",
+							"value": true
+						}
+					],
+					"number": [
+						{
+							"name": "list[3]",
+							"value": 1
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "60ab031b-f5e2-4aa7-9427-6379f3a75550",
+			"name": "Set to Array",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				1380,
+				2940
+			]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nested.string",
+							"value": "foo"
+						}
+					],
+					"boolean": [
+						{
+							"name": "nested.boolean",
+							"value": true
+						}
+					],
+					"number": [
+						{
+							"name": "nested.number",
+							"value": 1
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "24e0d35a-f2d4-4121-8cf1-7eb9ab2ed79e",
+			"name": "Set to Object",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				1380,
+				2560
+			]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "nested.string",
+							"value": "foo"
+						}
+					],
+					"boolean": [
+						{
+							"name": "nested.boolean",
+							"value": true
+						}
+					],
+					"number": [
+						{
+							"name": "nested.number",
+							"value": 1
+						}
+					]
+				},
+				"options": {
+					"dotNotation": false
+				}
+			},
+			"id": "e9c34a76-28ac-455a-8f77-1d6118b01291",
+			"name": "Set Disable Dot Notation",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				1380,
+				2740
+			]
+		}
+	],
+	"pinData": {
+		"Set": [
+			{
+				"json": {
+					"nested": {
+						"foo": "bar"
+					},
+					"list": [
+						"foo"
+					],
+					"boolean": true,
+					"number": 1,
+					"string": "foo"
+				}
+			}
+		],
+		"Set Keep Only Set": [
+			{
+				"json": {
+					"boolean": true,
+					"number": 1,
+					"string": "foo"
+				}
+			}
+		],
+		"Set to Object": [
+			{
+				"json": {
+					"nested": {
+						"foo": "bar",
+						"boolean": true,
+						"number": 1,
+						"string": "foo"
+					},
+					"list": [
+						"foo"
+					]
+				}
+			}
+		],
+		"Set Disable Dot Notation": [
+			{
+				"json": {
+					"nested": {
+						"foo": "bar"
+					},
+					"list": [
+						"foo"
+					],
+					"nested.boolean": true,
+					"nested.number": 1,
+					"nested.string": "foo"
+				}
+			}
+		],
+		"Set to Array": [
+			{
+				"json": {
+					"nested": {
+						"foo": "bar"
+					},
+					"list": [
+						"foo",
+						"bar",
+						true,
+						1
+					]
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set Keep Only Set",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set to Object",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set to Array",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Set Disable Dot Notation",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "de6493c7-31ec-40b4-ad2e-44bca10515c0",
+	"id": "183",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/test/nodes/Set/SetNode.test.ts b/packages/nodes-base/test/nodes/Set/SetNode.test.ts
deleted file mode 100644
index 390e5fa02374c0..00000000000000
--- a/packages/nodes-base/test/nodes/Set/SetNode.test.ts
+++ /dev/null
@@ -1,196 +0,0 @@
-import * as Helpers from '../Helpers';
-import { executeWorkflow } from '../ExecuteWorkflow';
-import { WorkflowTestData } from '../types';
-
-describe('Execute Set Node', () => {
-	const tests: Array<WorkflowTestData> = [
-		{
-			description: 'should set value',
-			input: {
-				workflowData: {
-					nodes: [
-						{
-							id: 'uuid-1',
-							parameters: {},
-							name: 'Start',
-							type: 'n8n-nodes-base.start',
-							typeVersion: 1,
-							position: [100, 300],
-						},
-						{
-							id: 'uuid-2',
-							parameters: {
-								values: {
-									number: [
-										{
-											name: 'value1',
-											value: 1,
-										},
-									],
-								},
-							},
-							name: 'Set',
-							type: 'n8n-nodes-base.set',
-							typeVersion: 1,
-							position: [280, 300],
-						},
-					],
-					connections: {
-						Start: {
-							main: [
-								[
-									{
-										node: 'Set',
-										type: 'main',
-										index: 0,
-									},
-								],
-							],
-						},
-					},
-				},
-			},
-			output: {
-				nodeExecutionOrder: ['Start', 'Set'],
-				nodeData: {
-					Set: [
-						[
-							{
-								value1: 1,
-							},
-						],
-					],
-				},
-			},
-		},
-
-		{
-			description: 'should set multiple values',
-			input: {
-				workflowData: {
-					nodes: [
-						{
-							id: 'uuid-1',
-							parameters: {},
-							name: 'Start',
-							type: 'n8n-nodes-base.start',
-							typeVersion: 1,
-							position: [100, 300],
-						},
-						{
-							id: 'uuid-2',
-							parameters: {
-								values: {
-									number: [
-										{
-											name: 'value1',
-											value: 1,
-										},
-									],
-									boolean: [
-										{
-											name: 'value2',
-											value: true,
-										},
-									],
-								},
-							},
-							name: 'Set',
-							type: 'n8n-nodes-base.set',
-							typeVersion: 1,
-							position: [280, 300],
-						},
-						{
-							id: 'uuid-3',
-							parameters: {
-								values: {
-									number: [
-										{
-											name: 'value1',
-											value: 2,
-										},
-									],
-									boolean: [
-										{
-											name: 'value2',
-											value: false,
-										},
-									],
-								},
-							},
-							name: 'Set1',
-							type: 'n8n-nodes-base.set',
-							typeVersion: 1,
-							position: [280, 300],
-						},
-					],
-					connections: {
-						Start: {
-							main: [
-								[
-									{
-										node: 'Set',
-										type: 'main',
-										index: 0,
-									},
-								],
-							],
-						},
-						Set: {
-							main: [
-								[
-									{
-										node: 'Set1',
-										type: 'main',
-										index: 0,
-									},
-								],
-							],
-						},
-					},
-				},
-			},
-			output: {
-				nodeExecutionOrder: ['Start', 'Set'],
-				nodeData: {
-					Set: [
-						[
-							{
-								value1: 1,
-								value2: true,
-							},
-						],
-					],
-					Set1: [
-						[
-							{
-								value1: 2,
-								value2: false,
-							},
-						],
-					],
-				},
-			},
-		},
-	];
-
-	const nodeTypes = Helpers.setup(tests);
-
-	for (const testData of tests) {
-		test(testData.description, async () => {
-			// execute workflow
-			const { result } = await executeWorkflow(testData, nodeTypes);
-
-			// check if result node data matches expected test data
-			const resultNodeData = Helpers.getResultNodeData(result, testData);
-			resultNodeData.forEach(({ nodeName, resultData }) =>
-				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
-			);
-
-			// Check if other data has correct value
-			expect(result.finished).toEqual(true);
-			expect(result.data.executionData!.contextData).toEqual({});
-			expect(result.data.executionData!.nodeExecutionStack).toEqual([]);
-		});
-	}
-});

From f23fb9269660721aadd34cbb5bb958d7aaf0bcb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 8 Feb 2023 18:57:43 +0100
Subject: [PATCH 131/358] fix(core): Stop copying icons to cache (#5419)

Fixes

- https://github.com/n8n-io/n8n/issues/4973
- https://github.com/n8n-io/n8n/issues/5274
- https://community.n8n.io/t/starting-n8n-fails-with-ebusy-error/21243
- https://community.n8n.io/t/problem-executing-workflow-ebusy-resource-busy-or-locked-copyfile/21280

Replaces

- https://github.com/n8n-io/n8n/pull/5052
- https://github.com/n8n-io/n8n/pull/5401
---
 packages/cli/src/LoadNodesAndCredentials.ts | 120 +++++++++-----------
 packages/cli/src/NodeTypes.ts               |  11 +-
 packages/cli/src/Server.ts                  |  42 ++++---
 packages/core/bin/generate-ui-types         |   5 +-
 packages/core/src/DirectoryLoader.ts        |  21 ++--
 packages/workflow/src/NodeHelpers.ts        |  40 ++++---
 6 files changed, 116 insertions(+), 123 deletions(-)

diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index e2718a26ce35fa..21d7666c4c5c3a 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -18,13 +18,7 @@ import type {
 import { LoggerProxy, ErrorReporterProxy as ErrorReporter } from 'n8n-workflow';
 
 import { createWriteStream } from 'fs';
-import {
-	access as fsAccess,
-	copyFile,
-	mkdir,
-	readdir as fsReaddir,
-	stat as fsStat,
-} from 'fs/promises';
+import { access as fsAccess, mkdir, readdir as fsReaddir, stat as fsStat } from 'fs/promises';
 import path from 'path';
 import config from '@/config';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
@@ -50,6 +44,8 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 
 	types: Types = { nodes: [], credentials: [] };
 
+	loaders: Record<string, DirectoryLoader> = {};
+
 	excludeNodes = config.getEnv('nodes.exclude');
 
 	includeNodes = config.getEnv('nodes.include');
@@ -73,6 +69,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		await this.loadNodesFromBasePackages();
 		await this.loadNodesFromDownloadedPackages();
 		await this.loadNodesFromCustomDirectories();
+		await this.postProcessLoaders();
 		this.injectCustomApiCallOptions();
 	}
 
@@ -117,7 +114,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		await writeStaticJSON('credentials', this.types.credentials);
 	}
 
-	async loadNodesFromBasePackages() {
+	private async loadNodesFromBasePackages() {
 		const nodeModulesPath = await this.getNodeModulesPath();
 		const nodePackagePaths = await this.getN8nNodePackages(nodeModulesPath);
 
@@ -126,7 +123,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		}
 	}
 
-	async loadNodesFromDownloadedPackages(): Promise<void> {
+	private async loadNodesFromDownloadedPackages(): Promise<void> {
 		const nodePackages = [];
 		try {
 			// Read downloaded nodes and credentials
@@ -160,24 +157,23 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		return customDirectories;
 	}
 
-	async loadNodesFromCustomDirectories(): Promise<void> {
+	private async loadNodesFromCustomDirectories(): Promise<void> {
 		for (const directory of this.getCustomDirectories()) {
 			await this.runDirectoryLoader(CustomDirectoryLoader, directory);
 		}
 	}
 
 	/**
-	 * Returns all the names of the packages which could
-	 * contain n8n nodes
-	 *
+	 * Returns all the names of the packages which could contain n8n nodes
 	 */
-	async getN8nNodePackages(baseModulesPath: string): Promise<string[]> {
+	private async getN8nNodePackages(baseModulesPath: string): Promise<string[]> {
 		const getN8nNodePackagesRecursive = async (relativePath: string): Promise<string[]> => {
 			const results: string[] = [];
 			const nodeModulesPath = `${baseModulesPath}/${relativePath}`;
-			for (const file of await fsReaddir(nodeModulesPath)) {
-				const isN8nNodesPackage = file.indexOf('n8n-nodes-') === 0;
-				const isNpmScopedPackage = file.indexOf('@') === 0;
+			const nodeModules = await fsReaddir(nodeModulesPath);
+			for (const nodeModule of nodeModules) {
+				const isN8nNodesPackage = nodeModule.indexOf('n8n-nodes-') === 0;
+				const isNpmScopedPackage = nodeModule.indexOf('@') === 0;
 				if (!isN8nNodesPackage && !isNpmScopedPackage) {
 					continue;
 				}
@@ -185,10 +181,10 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 					continue;
 				}
 				if (isN8nNodesPackage) {
-					results.push(`${baseModulesPath}/${relativePath}${file}`);
+					results.push(`${baseModulesPath}/${relativePath}${nodeModule}`);
 				}
 				if (isNpmScopedPackage) {
-					results.push(...(await getN8nNodePackagesRecursive(`${relativePath}${file}/`)));
+					results.push(...(await getN8nNodePackagesRecursive(`${relativePath}${nodeModule}/`)));
 				}
 			}
 			return results;
@@ -392,62 +388,50 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 	) {
 		const loader = new constructor(dir, this.excludeNodes, this.includeNodes);
 		await loader.loadAll();
+		this.loaders[dir] = loader;
+		return loader;
+	}
 
-		// list of node & credential types that will be sent to the frontend
-		const { types } = loader;
-		this.types.nodes = this.types.nodes.concat(types.nodes);
-		this.types.credentials = this.types.credentials.concat(types.credentials);
-
-		// Copy over all icons and set `iconUrl` for the frontend
-		const iconPromises = Object.entries(types).flatMap(([typeName, typesArr]) =>
-			typesArr.map((type) => {
-				if (!type.icon?.startsWith('file:')) return;
-				const icon = type.icon.substring(5);
-				const iconUrl = `icons/${typeName}/${type.name}${path.extname(icon)}`;
-				delete type.icon;
-				type.iconUrl = iconUrl;
-				const source = path.join(dir, icon);
-				const destination = path.join(GENERATED_STATIC_DIR, iconUrl);
-				return mkdir(path.dirname(destination), { recursive: true }).then(async () =>
-					copyFile(source, destination),
-				);
-			}),
-		);
-
-		await Promise.all(iconPromises);
-
-		// Nodes and credentials that have been loaded immediately
-		for (const nodeTypeName in loader.nodeTypes) {
-			this.loaded.nodes[nodeTypeName] = loader.nodeTypes[nodeTypeName];
-		}
+	async postProcessLoaders() {
+		this.types.nodes = [];
+		this.types.credentials = [];
+		for (const [dir, loader] of Object.entries(this.loaders)) {
+			// list of node & credential types that will be sent to the frontend
+			const { types } = loader;
+			this.types.nodes = this.types.nodes.concat(types.nodes);
+			this.types.credentials = this.types.credentials.concat(types.credentials);
+
+			// Nodes and credentials that have been loaded immediately
+			for (const nodeTypeName in loader.nodeTypes) {
+				this.loaded.nodes[nodeTypeName] = loader.nodeTypes[nodeTypeName];
+			}
 
-		for (const credentialTypeName in loader.credentialTypes) {
-			this.loaded.credentials[credentialTypeName] = loader.credentialTypes[credentialTypeName];
-		}
+			for (const credentialTypeName in loader.credentialTypes) {
+				this.loaded.credentials[credentialTypeName] = loader.credentialTypes[credentialTypeName];
+			}
 
-		// Nodes and credentials that will be lazy loaded
-		if (loader instanceof PackageDirectoryLoader) {
-			const { packageName, known } = loader;
+			// Nodes and credentials that will be lazy loaded
+			if (loader instanceof PackageDirectoryLoader) {
+				const { packageName, known } = loader;
 
-			for (const type in known.nodes) {
-				const { className, sourcePath } = known.nodes[type];
-				this.known.nodes[type] = {
-					className,
-					sourcePath: path.join(dir, sourcePath),
-				};
-			}
+				for (const type in known.nodes) {
+					const { className, sourcePath } = known.nodes[type];
+					this.known.nodes[type] = {
+						className,
+						sourcePath: path.join(dir, sourcePath),
+					};
+				}
 
-			for (const type in known.credentials) {
-				const { className, sourcePath, nodesToTestWith } = known.credentials[type];
-				this.known.credentials[type] = {
-					className,
-					sourcePath: path.join(dir, sourcePath),
-					nodesToTestWith: nodesToTestWith?.map((nodeName) => `${packageName}.${nodeName}`),
-				};
+				for (const type in known.credentials) {
+					const { className, sourcePath, nodesToTestWith } = known.credentials[type];
+					this.known.credentials[type] = {
+						className,
+						sourcePath: path.join(dir, sourcePath),
+						nodesToTestWith: nodesToTestWith?.map((nodeName) => `${packageName}.${nodeName}`),
+					};
+				}
 			}
 		}
-
-		return loader;
 	}
 
 	private async getNodeModulesPath(): Promise<string> {
diff --git a/packages/cli/src/NodeTypes.ts b/packages/cli/src/NodeTypes.ts
index b81f2c1e5f6d55..232d978e229856 100644
--- a/packages/cli/src/NodeTypes.ts
+++ b/packages/cli/src/NodeTypes.ts
@@ -17,7 +17,7 @@ class NodeTypesClass implements INodeTypes {
 		// eslint-disable-next-line no-restricted-syntax
 		for (const nodeTypeData of Object.values(this.loadedNodes)) {
 			const nodeType = NodeHelpers.getVersionedNodeType(nodeTypeData.type);
-			this.applySpecialNodeParameters(nodeType);
+			NodeHelpers.applySpecialNodeParameters(nodeType);
 		}
 	}
 
@@ -57,20 +57,13 @@ class NodeTypesClass implements INodeTypes {
 		if (type in knownNodes) {
 			const { className, sourcePath } = knownNodes[type];
 			const loaded: INodeType = loadClassInIsolation(sourcePath, className);
-			this.applySpecialNodeParameters(loaded);
+			NodeHelpers.applySpecialNodeParameters(loaded);
 			loadedNodes[type] = { sourcePath, type: loaded };
 			return loadedNodes[type];
 		}
 		throw new Error(`${RESPONSE_ERROR_MESSAGES.NO_NODE}: ${type}`);
 	}
 
-	private applySpecialNodeParameters(nodeType: INodeType) {
-		const applyParameters = NodeHelpers.getSpecialNodeParameters(nodeType);
-		if (applyParameters.length) {
-			nodeType.description.properties.unshift(...applyParameters);
-		}
-	}
-
 	private get loadedNodes() {
 		return this.nodesAndCredentials.loaded.nodes;
 	}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 55938909a26407..9f4eca54c401b9 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -122,7 +122,6 @@ import {
 import { getInstance as getMailerInstance } from '@/UserManagement/email';
 import * as Db from '@/Db';
 import type {
-	DatabaseType,
 	ICredentialsDb,
 	ICredentialsOverwrite,
 	IDiagnosticInfo,
@@ -139,10 +138,10 @@ import {
 } from '@/CredentialsHelper';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
 import { CredentialTypes } from '@/CredentialTypes';
-import * as GenericHelpers from '@/GenericHelpers';
 import { NodeTypes } from '@/NodeTypes';
 import * as Push from '@/Push';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
 import * as ResponseHelper from '@/ResponseHelper';
 import type { WaitTrackerClass } from '@/WaitTracker';
 import { WaitTracker } from '@/WaitTracker';
@@ -176,6 +175,8 @@ class Server extends AbstractServer {
 
 	presetCredentialsLoaded: boolean;
 
+	loadNodesAndCredentials: LoadNodesAndCredentialsClass;
+
 	nodeTypes: INodeTypes;
 
 	credentialTypes: ICredentialTypes;
@@ -185,6 +186,7 @@ class Server extends AbstractServer {
 
 		this.nodeTypes = NodeTypes();
 		this.credentialTypes = CredentialTypes();
+		this.loadNodesAndCredentials = LoadNodesAndCredentials();
 
 		this.activeExecutionsInstance = ActiveExecutions.getInstance();
 		this.waitTracker = WaitTracker();
@@ -1265,7 +1267,7 @@ class Server extends AbstractServer {
 
 						CredentialsOverwrites().setData(body);
 
-						await LoadNodesAndCredentials().generateTypesForFrontend();
+						await this.loadNodesAndCredentials.generateTypesForFrontend();
 
 						this.presetCredentialsLoaded = true;
 
@@ -1277,17 +1279,31 @@ class Server extends AbstractServer {
 			);
 		}
 
-		const staticOptions: ServeStaticOptions = {
-			cacheControl: false,
-			setHeaders: (res: express.Response, path: string) => {
-				const isIndex = path === pathJoin(GENERATED_STATIC_DIR, 'index.html');
-				const cacheControl = isIndex
-					? 'no-cache, no-store, must-revalidate'
-					: 'max-age=86400, immutable';
-				res.header('Cache-Control', cacheControl);
-			},
-		};
 		if (!config.getEnv('endpoints.disableUi')) {
+			const staticOptions: ServeStaticOptions = {
+				cacheControl: false,
+				setHeaders: (res: express.Response, path: string) => {
+					const isIndex = path === pathJoin(GENERATED_STATIC_DIR, 'index.html');
+					const cacheControl = isIndex
+						? 'no-cache, no-store, must-revalidate'
+						: 'max-age=86400, immutable';
+					res.header('Cache-Control', cacheControl);
+				},
+			};
+
+			for (const [dir, loader] of Object.entries(this.loadNodesAndCredentials.loaders)) {
+				const pathPrefix = `/icons/${loader.packageName}`;
+				this.app.use(`${pathPrefix}/*/*.(svg|png)`, async (req, res) => {
+					const filePath = pathResolve(dir, req.originalUrl.substring(pathPrefix.length + 1));
+					try {
+						await fsAccess(filePath);
+						res.sendFile(filePath);
+					} catch {
+						res.sendStatus(404);
+					}
+				});
+			}
+
 			this.app.use(
 				'/',
 				express.static(GENERATED_STATIC_DIR),
diff --git a/packages/core/bin/generate-ui-types b/packages/core/bin/generate-ui-types
index e57dd4885b6cca..ba7b020b6afc4e 100755
--- a/packages/core/bin/generate-ui-types
+++ b/packages/core/bin/generate-ui-types
@@ -18,10 +18,7 @@ LoggerProxy.init({
 	const nodeTypes = Object.values(loader.nodeTypes)
 		.map((data) => {
 			const nodeType = NodeHelpers.getVersionedNodeType(data.type);
-			const applyParameters = NodeHelpers.getSpecialNodeParameters(nodeType);
-			if (applyParameters.length) {
-				nodeType.description.properties.unshift(...applyParameters);
-			}
+			NodeHelpers.applySpecialNodeParameters(nodeType);
 			return data.type;
 		})
 		.flatMap((nodeData) => {
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 85528dcc07c62f..6b150dab4f5e23 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -48,19 +48,21 @@ export abstract class DirectoryLoader {
 		protected readonly includeNodes: string[] = [],
 	) {}
 
+	abstract packageName: string;
 	abstract loadAll(): Promise<void>;
 
 	protected resolvePath(file: string) {
 		return path.resolve(this.directory, file);
 	}
 
-	protected loadNodeFromFile(packageName: string, nodeName: string, filePath: string) {
+	protected loadNodeFromFile(nodeName: string, filePath: string) {
 		let tempNode: INodeType | IVersionedNodeType;
 		let nodeVersion = 1;
+		const isCustom = this.packageName === 'CUSTOM';
 
 		try {
 			tempNode = loadClassInIsolation(filePath, nodeName);
-			this.addCodex({ node: tempNode, filePath, isCustom: packageName === 'CUSTOM' });
+			this.addCodex({ node: tempNode, filePath, isCustom });
 		} catch (error) {
 			Logger.error(
 				`Error loading node "${nodeName}" from: "${filePath}" - ${(error as Error).message}`,
@@ -68,7 +70,7 @@ export abstract class DirectoryLoader {
 			throw error;
 		}
 
-		const fullNodeName = `${packageName}.${tempNode.description.name}`;
+		const fullNodeName = `${this.packageName}.${tempNode.description.name}`;
 
 		if (this.includeNodes.length && !this.includeNodes.includes(fullNodeName)) {
 			return;
@@ -88,12 +90,12 @@ export abstract class DirectoryLoader {
 			}
 
 			const currentVersionNode = tempNode.nodeVersions[tempNode.currentVersion];
-			this.addCodex({ node: currentVersionNode, filePath, isCustom: packageName === 'CUSTOM' });
+			this.addCodex({ node: currentVersionNode, filePath, isCustom });
 			nodeVersion = tempNode.currentVersion;
 
 			if (currentVersionNode.hasOwnProperty('executeSingle')) {
 				Logger.warn(
-					`"executeSingle" will get deprecated soon. Please update the code of node "${packageName}.${nodeName}" to use "execute" instead!`,
+					`"executeSingle" will get deprecated soon. Please update the code of node "${this.packageName}.${nodeName}" to use "execute" instead!`,
 					{ filePath },
 				);
 			}
@@ -236,7 +238,8 @@ export abstract class DirectoryLoader {
 		if (obj.icon?.startsWith('file:')) {
 			const iconPath = path.join(path.dirname(filePath), obj.icon.substring(5));
 			const relativePath = path.relative(this.directory, iconPath);
-			obj.icon = `file:${relativePath}`;
+			obj.iconUrl = `icons/${this.packageName}/${relativePath}`;
+			delete obj.icon;
 		}
 	}
 }
@@ -246,6 +249,8 @@ export abstract class DirectoryLoader {
  * e.g. `~/.n8n/custom`
  */
 export class CustomDirectoryLoader extends DirectoryLoader {
+	packageName = 'CUSTOM';
+
 	override async loadAll() {
 		const filePaths = await glob('**/*.@(node|credentials).js', {
 			cwd: this.directory,
@@ -256,7 +261,7 @@ export class CustomDirectoryLoader extends DirectoryLoader {
 			const [fileName, type] = path.parse(filePath).name.split('.');
 
 			if (type === 'node') {
-				this.loadNodeFromFile('CUSTOM', fileName, filePath);
+				this.loadNodeFromFile(fileName, filePath);
 			} else if (type === 'credentials') {
 				this.loadCredentialFromFile(fileName, filePath);
 			}
@@ -300,7 +305,7 @@ export class PackageDirectoryLoader extends DirectoryLoader {
 				const filePath = this.resolvePath(node);
 				const [nodeName] = path.parse(node).name.split('.');
 
-				this.loadNodeFromFile(this.packageName, nodeName, filePath);
+				this.loadNodeFromFile(nodeName, filePath);
 			}
 		}
 
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 33ea1cf708e0c8..59c02e760c0791 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -230,31 +230,29 @@ export const cronNodeOptions: INodePropertyCollection[] = [
 	},
 ];
 
+const specialNodeParameters: INodeProperties[] = [
+	{
+		displayName: 'Poll Times',
+		name: 'pollTimes',
+		type: 'fixedCollection',
+		typeOptions: {
+			multipleValues: true,
+			multipleValueButtonText: 'Add Poll Time',
+		},
+		default: { item: [{ mode: 'everyMinute' }] },
+		description: 'Time at which polling should occur',
+		placeholder: 'Add Poll Time',
+		options: cronNodeOptions,
+	},
+];
+
 /**
- * Gets special parameters which should be added to nodeTypes depending
- * on their type or configuration
- *
+ * Apply special parameters which should be added to nodeTypes depending on their type or configuration
  */
-export function getSpecialNodeParameters(nodeType: INodeType): INodeProperties[] {
+export function applySpecialNodeParameters(nodeType: INodeType): void {
 	if (nodeType.description.polling === true) {
-		return [
-			{
-				displayName: 'Poll Times',
-				name: 'pollTimes',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-					multipleValueButtonText: 'Add Poll Time',
-				},
-				default: { item: [{ mode: 'everyMinute' }] },
-				description: 'Time at which polling should occur',
-				placeholder: 'Add Poll Time',
-				options: cronNodeOptions,
-			},
-		];
+		nodeType.description.properties.unshift(...specialNodeParameters);
 	}
-
-	return [];
 }
 
 /**

From 9c1f827dad694820726313f4d6b4bd6c26fadf6c Mon Sep 17 00:00:00 2001
From: Valya <68596159+valya@users.noreply.github.com>
Date: Wed, 8 Feb 2023 18:26:07 +0000
Subject: [PATCH 132/358] feat(core): Live reload node/credential descriptions
 in development (no-changelog) (#4939)

---
 package.json                                  |   1 +
 packages/cli/.npmignore                       |   1 +
 packages/cli/package.json                     |   4 +-
 packages/cli/src/Interfaces.ts                |   8 +-
 packages/cli/src/NodeTypes.ts                 |  15 +-
 packages/cli/src/ReloadNodesAndCredentials.ts |  41 +++++
 packages/cli/src/Server.ts                    |  20 +-
 packages/core/src/DirectoryLoader.ts          |  23 ++-
 .../editor-ui/src/mixins/pushConnection.ts    |   3 +
 pnpm-lock.yaml                                | 173 ++++--------------
 10 files changed, 134 insertions(+), 155 deletions(-)
 create mode 100644 packages/cli/.npmignore
 create mode 100644 packages/cli/src/ReloadNodesAndCredentials.ts

diff --git a/package.json b/package.json
index c1cf9d3c291856..a50f6623fd7c91 100644
--- a/package.json
+++ b/package.json
@@ -67,6 +67,7 @@
     "overrides": {
       "@types/node": "^16.18.12",
       "browserslist": "^4.21.4",
+      "chokidar": "3.5.2",
       "ejs": "^3.1.8",
       "fork-ts-checker-webpack-plugin": "^6.0.4",
       "jsonwebtoken": "9.0.0",
diff --git a/packages/cli/.npmignore b/packages/cli/.npmignore
new file mode 100644
index 00000000000000..e0c12320426e41
--- /dev/null
+++ b/packages/cli/.npmignore
@@ -0,0 +1 @@
+dist/ReloadNodesAndCredentials.*
diff --git a/packages/cli/package.json b/packages/cli/package.json
index f159277ed7fd19..028bee3f60df46 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -75,6 +75,7 @@
     "@types/jsonwebtoken": "^9.0.1",
     "@types/localtunnel": "^1.9.0",
     "@types/lodash.get": "^4.4.6",
+    "@types/lodash.debounce": "^4.0.7",
     "@types/lodash.intersection": "^4.4.7",
     "@types/lodash.iteratee": "^4.7.7",
     "@types/lodash.merge": "^4.6.6",
@@ -99,7 +100,9 @@
     "@types/uuid": "^8.3.2",
     "@types/validator": "^13.7.0",
     "@types/yamljs": "^0.2.31",
+    "chokidar": "^3.5.2",
     "concurrently": "^5.1.0",
+    "lodash.debounce": "^4.0.8",
     "mock-jwks": "^1.0.9",
     "nodemon": "^2.0.2",
     "run-script-os": "^1.0.7",
@@ -190,7 +193,6 @@
     "sse-channel": "^4.0.0",
     "swagger-ui-express": "^4.3.0",
     "syslog-client": "^1.1.1",
-    "tslib": "1.14.1",
     "typeorm": "0.3.11",
     "uuid": "^8.3.2",
     "validator": "13.7.0",
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 3044528ec5f011..86150c1acd96bf 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -615,7 +615,8 @@ export type IPushData =
 	| PushDataConsoleMessage
 	| PushDataReloadNodeType
 	| PushDataRemoveNodeType
-	| PushDataTestWebhook;
+	| PushDataTestWebhook
+	| PushDataNodeDescriptionUpdated;
 
 type PushDataExecutionFinished = {
 	data: IPushDataExecutionFinished;
@@ -657,6 +658,11 @@ type PushDataTestWebhook = {
 	type: 'testWebhookDeleted' | 'testWebhookReceived';
 };
 
+type PushDataNodeDescriptionUpdated = {
+	data: undefined;
+	type: 'nodeDescriptionUpdated';
+};
+
 export interface IPushDataExecutionFinished {
 	data: IRun;
 	executionId: string;
diff --git a/packages/cli/src/NodeTypes.ts b/packages/cli/src/NodeTypes.ts
index 232d978e229856..070831d3a32d17 100644
--- a/packages/cli/src/NodeTypes.ts
+++ b/packages/cli/src/NodeTypes.ts
@@ -10,15 +10,11 @@ import type {
 import { NodeHelpers } from 'n8n-workflow';
 import { RESPONSE_ERROR_MESSAGES } from './constants';
 
-class NodeTypesClass implements INodeTypes {
+export class NodeTypesClass implements INodeTypes {
 	constructor(private nodesAndCredentials: INodesAndCredentials) {
 		// Some nodeTypes need to get special parameters applied like the
 		// polling nodes the polling times
-		// eslint-disable-next-line no-restricted-syntax
-		for (const nodeTypeData of Object.values(this.loadedNodes)) {
-			const nodeType = NodeHelpers.getVersionedNodeType(nodeTypeData.type);
-			NodeHelpers.applySpecialNodeParameters(nodeType);
-		}
+		this.applySpecialNodeParameters();
 	}
 
 	/**
@@ -47,6 +43,13 @@ class NodeTypesClass implements INodeTypes {
 		return NodeHelpers.getVersionedNodeType(this.getNode(nodeType).type, version);
 	}
 
+	applySpecialNodeParameters() {
+		for (const nodeTypeData of Object.values(this.loadedNodes)) {
+			const nodeType = NodeHelpers.getVersionedNodeType(nodeTypeData.type);
+			NodeHelpers.applySpecialNodeParameters(nodeType);
+		}
+	}
+
 	private getNode(type: string): LoadedClass<INodeType | IVersionedNodeType> {
 		const loadedNodes = this.loadedNodes;
 		if (type in loadedNodes) {
diff --git a/packages/cli/src/ReloadNodesAndCredentials.ts b/packages/cli/src/ReloadNodesAndCredentials.ts
new file mode 100644
index 00000000000000..1be112037c589a
--- /dev/null
+++ b/packages/cli/src/ReloadNodesAndCredentials.ts
@@ -0,0 +1,41 @@
+import path from 'path';
+import { realpath } from 'fs/promises';
+
+import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
+import type { NodeTypesClass } from '@/NodeTypes';
+import type { Push } from '@/Push';
+
+export const reloadNodesAndCredentials = async (
+	loadNodesAndCredentials: LoadNodesAndCredentialsClass,
+	nodeTypes: NodeTypesClass,
+	push: Push,
+) => {
+	// eslint-disable-next-line import/no-extraneous-dependencies
+	const { default: debounce } = await import('lodash.debounce');
+	// eslint-disable-next-line import/no-extraneous-dependencies
+	const { watch } = await import('chokidar');
+
+	Object.entries(loadNodesAndCredentials.loaders).forEach(async ([dir, loader]) => {
+		const realModulePath = path.join(await realpath(dir), path.sep);
+		const reloader = debounce(async () => {
+			const modulesToUnload = Object.keys(require.cache).filter((filePath) =>
+				filePath.startsWith(realModulePath),
+			);
+			modulesToUnload.forEach((filePath) => {
+				delete require.cache[filePath];
+			});
+
+			loader.reset();
+			await loader.loadAll();
+			await loadNodesAndCredentials.postProcessLoaders();
+			await loadNodesAndCredentials.generateTypesForFrontend();
+			nodeTypes.applySpecialNodeParameters();
+			push.send('nodeDescriptionUpdated', undefined);
+		}, 100);
+
+		const toWatch = loader.isLazyLoaded
+			? ['**/nodes.json', '**/credentials.json']
+			: ['**/*.js', '**/*.json'];
+		watch(toWatch, { cwd: realModulePath }).on('change', reloader);
+	});
+};
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 9f4eca54c401b9..e166ce6a6eecfe 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -81,6 +81,7 @@ import {
 	AUTH_COOKIE_NAME,
 	EDITOR_UI_DIST_DIR,
 	GENERATED_STATIC_DIR,
+	inDevelopment,
 	N8N_VERSION,
 	NODES_BASE_DIR,
 	RESPONSE_ERROR_MESSAGES,
@@ -138,10 +139,11 @@ import {
 } from '@/CredentialsHelper';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
 import { CredentialTypes } from '@/CredentialTypes';
-import { NodeTypes } from '@/NodeTypes';
-import * as Push from '@/Push';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
+import type { NodeTypesClass } from '@/NodeTypes';
+import { NodeTypes } from '@/NodeTypes';
+import * as Push from '@/Push';
 import * as ResponseHelper from '@/ResponseHelper';
 import type { WaitTrackerClass } from '@/WaitTracker';
 import { WaitTracker } from '@/WaitTracker';
@@ -177,10 +179,12 @@ class Server extends AbstractServer {
 
 	loadNodesAndCredentials: LoadNodesAndCredentialsClass;
 
-	nodeTypes: INodeTypes;
+	nodeTypes: NodeTypesClass;
 
 	credentialTypes: ICredentialTypes;
 
+	push: Push.Push;
+
 	constructor() {
 		super();
 
@@ -198,6 +202,8 @@ class Server extends AbstractServer {
 			this.app.use('/e2e', require('./api/e2e.api').e2eController);
 		}
 
+		this.push = Push.getInstance();
+
 		const urlBaseWebhook = WebhookHelpers.getWebhookBaseUrl();
 		const telemetrySettings: ITelemetrySettings = {
 			enabled: config.getEnv('diagnostics.enabled'),
@@ -429,7 +435,6 @@ class Server extends AbstractServer {
 		this.app.use(cookieParser());
 
 		// Get push connections
-		const push = Push.getInstance();
 		this.app.use(`/${this.restEndpoint}/push`, corsMiddleware, async (req, res, next) => {
 			const { sessionId } = req.query;
 			if (sessionId === undefined) {
@@ -447,7 +452,7 @@ class Server extends AbstractServer {
 				}
 			}
 
-			push.add(sessionId as string, req, res);
+			this.push.add(sessionId as string, req, res);
 		});
 
 		// Make sure that Vue history mode works properly
@@ -1370,6 +1375,11 @@ export async function start(): Promise<void> {
 	// Set up event handling
 	initEvents();
 
+	if (inDevelopment && process.env.N8N_DEV_RELOAD === 'true') {
+		const { reloadNodesAndCredentials } = await import('@/ReloadNodesAndCredentials');
+		await reloadNodesAndCredentials(app.loadNodesAndCredentials, app.nodeTypes, app.push);
+	}
+
 	void Db.collections.Workflow.findOne({
 		select: ['createdAt'],
 		order: { createdAt: 'ASC' },
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 6b150dab4f5e23..66ba6c832b2e77 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -32,15 +32,17 @@ export type Types = {
 };
 
 export abstract class DirectoryLoader {
-	readonly loadedNodes: INodeTypeNameVersion[] = [];
+	isLazyLoaded = false;
 
-	readonly nodeTypes: INodeTypeData = {};
+	loadedNodes: INodeTypeNameVersion[] = [];
 
-	readonly credentialTypes: ICredentialTypeData = {};
+	nodeTypes: INodeTypeData = {};
 
-	readonly known: KnownNodesAndCredentials = { nodes: {}, credentials: {} };
+	credentialTypes: ICredentialTypeData = {};
 
-	readonly types: Types = { nodes: [], credentials: [] };
+	known: KnownNodesAndCredentials = { nodes: {}, credentials: {} };
+
+	types: Types = { nodes: [], credentials: [] };
 
 	constructor(
 		protected readonly directory: string,
@@ -49,8 +51,17 @@ export abstract class DirectoryLoader {
 	) {}
 
 	abstract packageName: string;
+
 	abstract loadAll(): Promise<void>;
 
+	reset() {
+		this.loadedNodes = [];
+		this.nodeTypes = {};
+		this.credentialTypes = {};
+		this.known = { nodes: {}, credentials: {} };
+		this.types = { nodes: [], credentials: [] };
+	}
+
 	protected resolvePath(file: string) {
 		return path.resolve(this.directory, file);
 	}
@@ -371,6 +382,8 @@ export class LazyPackageDirectoryLoader extends PackageDirectoryLoader {
 				nodes: this.types.nodes?.length ?? 0,
 			});
 
+			this.isLazyLoaded = true;
+
 			return; // We can load nodes and credentials lazily now
 		} catch {
 			Logger.debug("Can't enable lazy-loading");
diff --git a/packages/editor-ui/src/mixins/pushConnection.ts b/packages/editor-ui/src/mixins/pushConnection.ts
index 14971d104ce724..1a08f10154b739 100644
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/mixins/pushConnection.ts
@@ -490,6 +490,9 @@ export const pushConnection = mixins(
 				this.credentialsStore.fetchCredentialTypes(false).then(() => {
 					this.nodeTypesStore.removeNodeTypes(nodesToBeRemoved);
 				});
+			} else if (receivedData.type === 'nodeDescriptionUpdated') {
+				this.nodeTypesStore.getNodeTypes();
+				this.credentialsStore.fetchCredentialTypes(true);
 			}
 			return true;
 		},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 69ca8293f952da..177475a28ed52c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -7,6 +7,7 @@ onlyBuiltDependencies:
 overrides:
   '@types/node': ^16.18.12
   browserslist: ^4.21.4
+  chokidar: 3.5.2
   ejs: ^3.1.8
   fork-ts-checker-webpack-plugin: ^6.0.4
   jsonwebtoken: 9.0.0
@@ -122,6 +123,7 @@ importers:
       '@types/json-diff': ^0.5.1
       '@types/jsonwebtoken': ^9.0.1
       '@types/localtunnel': ^1.9.0
+      '@types/lodash.debounce': ^4.0.7
       '@types/lodash.get': ^4.4.6
       '@types/lodash.intersection': ^4.4.7
       '@types/lodash.iteratee': ^4.7.7
@@ -155,6 +157,7 @@ importers:
       bull: ^4.10.2
       callsites: ^3.1.0
       change-case: ^4.1.1
+      chokidar: 3.5.2
       class-validator: ^0.14.0
       client-oauth2: ^4.2.5
       compression: ^1.7.4
@@ -182,6 +185,7 @@ importers:
       jwks-rsa: ^3.0.1
       ldapts: ^4.2.2
       localtunnel: ^2.0.0
+      lodash.debounce: ^4.0.8
       lodash.get: ^4.4.2
       lodash.intersection: ^4.4.0
       lodash.iteratee: ^4.7.0
@@ -229,7 +233,6 @@ importers:
       ts-node: ^9.1.1
       tsc-alias: ^1.7.0
       tsconfig-paths: ^3.14.1
-      tslib: 1.14.1
       typeorm: 0.3.11
       uuid: ^8.3.2
       validator: 13.7.0
@@ -259,7 +262,7 @@ importers:
       cookie-parser: 1.4.6
       crypto-js: 4.1.1
       csrf: 3.1.0
-      curlconverter: 3.21.0
+      curlconverter: 3.21.0_chokidar@3.5.2
       dotenv: 8.6.0
       express: 4.18.2
       express-async-errors: 3.1.1_express@4.18.2
@@ -318,7 +321,6 @@ importers:
       sse-channel: 4.0.0
       swagger-ui-express: 4.5.0_express@4.18.2
       syslog-client: 1.1.1
-      tslib: 1.14.1
       typeorm: 0.3.11_a77gzgdqnod3rkvxniiwirlqsi
       uuid: 8.3.2
       validator: 13.7.0
@@ -338,6 +340,7 @@ importers:
       '@types/json-diff': 0.5.2
       '@types/jsonwebtoken': 9.0.1
       '@types/localtunnel': 1.9.0
+      '@types/lodash.debounce': 4.0.7
       '@types/lodash.get': 4.4.7
       '@types/lodash.intersection': 4.4.7
       '@types/lodash.iteratee': 4.7.7
@@ -363,7 +366,9 @@ importers:
       '@types/uuid': 8.3.4
       '@types/validator': 13.7.7
       '@types/yamljs': 0.2.31
+      chokidar: 3.5.2
       concurrently: 5.3.0
+      lodash.debounce: 4.0.8
       mock-jwks: 1.0.9_nock@13.2.9
       nodemon: 2.0.20
       run-script-os: 1.1.6
@@ -2866,7 +2871,6 @@ packages:
     engines: {node: '>=6.9.0'}
     dependencies:
       regenerator-runtime: 0.13.11
-    dev: true
 
   /@babel/standalone/7.20.12:
     resolution: {integrity: sha512-hK/X+m1il3w1tYS4H8LDaGCEdiT47SVqEXY8RiEAgou26BystipSU8ZL6EvBR6t5l7lTv0ilBiChXWblKJ5iUA==}
@@ -4032,7 +4036,7 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-wsl: 2.2.0
-      tslib: 2.4.0
+      tslib: 2.4.1
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6200,6 +6204,12 @@ packages:
       '@types/lodash': 4.14.186
     dev: true
 
+  /@types/lodash.debounce/4.0.7:
+    resolution: {integrity: sha512-X1T4wMZ+gT000M2/91SYj0d/7JfeNZ9PeeOldSNoE/lunLeQXKvkmIumI29IaKMotU/ln/McOIvgzZcQ/3TrSA==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
   /@types/lodash.get/4.4.7:
     resolution: {integrity: sha512-af34Mj+KdDeuzsJBxc/XeTtOx0SZHZNLd+hdrn+PcKGQs0EG2TJTzQAOTCZTgDJCArahlCzLWSy8c2w59JRz7Q==}
     dependencies:
@@ -6286,10 +6296,10 @@ packages:
 
   /@types/lodash/4.14.186:
     resolution: {integrity: sha512-eHcVlLXP0c2FlMPm56ITode2AgLMSa6aJ05JTTbYbI+7EMkCEE5qk2E41d5g2lCVTqRe0GnnRFurmlCsDODrPw==}
+    dev: true
 
   /@types/lodash/4.14.191:
     resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==}
-    dev: true
 
   /@types/lossless-json/1.0.1:
     resolution: {integrity: sha512-zPE8kmpeL5/6L5gtTQHSOkAW/OSYYNTDRt6/2oEgLO1Zd3Rj5WVDoMloTtLJxQJhZGLGbL4pktKSh3NbzdaWdw==}
@@ -6882,7 +6892,7 @@ packages:
       vite: ^3.0.0 || ^4.0.0
       vue: ^2.7.0-0
     dependencies:
-      vite: 4.0.4_sass@1.55.0+terser@5.16.1
+      vite: 4.0.4_sass@1.57.1
       vue: 2.7.14
     dev: true
 
@@ -7632,20 +7642,12 @@ packages:
       - supports-color
     dev: true
 
-  /anymatch/3.1.2:
-    resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==}
-    engines: {node: '>= 8'}
-    dependencies:
-      normalize-path: 3.0.0
-      picomatch: 2.3.1
-
   /anymatch/3.1.3:
     resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==}
     engines: {node: '>= 8'}
     dependencies:
       normalize-path: 3.0.0
       picomatch: 2.3.1
-    dev: true
 
   /app-root-dir/1.0.2:
     resolution: {integrity: sha512-jlpIfsOoNoafl92Sz//64uQHGSyMrD2vYG5d8o2a4qGvyNCvXur7bzIsWtAC/6flI2RYAp3kv8rsfBtaLm7w0g==}
@@ -8006,10 +8008,6 @@ packages:
       stream-exhaust: 1.0.2
     dev: true
 
-  /async-each/1.0.3:
-    resolution: {integrity: sha512-z/WhQ5FPySLdvREByI2vZiTWwCnF0moMJ1hK9YQwDTHKh6I7/uSckMetoRGb5UBZPC1z0jlw+n/XCgjeH7y1AQ==}
-    dev: true
-
   /async-settle/1.0.0:
     resolution: {integrity: sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==}
     engines: {node: '>= 0.10'}
@@ -8102,7 +8100,7 @@ packages:
   /axios-retry/3.3.1:
     resolution: {integrity: sha512-RohAUQTDxBSWLFEnoIG/6bvmy8l3TfpkclgStjl5MDCMBDgapAWCmr1r/9harQfWC8bzLC8job6UcL1A1Yc+/Q==}
     dependencies:
-      '@babel/runtime': 7.19.4
+      '@babel/runtime': 7.20.7
       is-retry-allowed: 2.2.0
     dev: false
 
@@ -8413,11 +8411,6 @@ packages:
     resolution: {integrity: sha512-uw4ra6Cv483Op/ebM0GBKKfxZlSmn6NgFRby5L3yGTlunLj53KQgndDlqy2WVFOwgvurocApYkSud0aO+mvrpQ==}
     dev: false
 
-  /binary-extensions/1.13.1:
-    resolution: {integrity: sha512-Un7MIEDdUC5gNpcGDV97op1Ywk748MpHcFTHoYs6qnj1Z3j7I53VG3nwZhKzoBZmbdRNnb6WRdFlwl7tSDuZGw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-
   /binary-extensions/2.2.0:
     resolution: {integrity: sha512-jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA==}
     engines: {node: '>=8'}
@@ -8426,13 +8419,6 @@ packages:
     resolution: {integrity: sha512-rA2CrUl1+6yKrn+XgLs8Hdy18OER1UW146nM+ixzhQXDY+Bd3ySkyIJGwF2a4I45JwbvF1mDL/nWkqBwpOcdBA==}
     dev: false
 
-  /bindings/1.5.0:
-    resolution: {integrity: sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==}
-    dependencies:
-      file-uri-to-path: 1.0.0
-    dev: true
-    optional: true
-
   /bintrees/1.0.2:
     resolution: {integrity: sha512-VOMgTMwjAaUG580SXn3LacVgjurrbMme7ZZNYGSSV7mmtY6QQRh0Eg3pwIcntQ77DErK1L0NxkbetjcoXzVwKw==}
     dev: false
@@ -9075,45 +9061,9 @@ packages:
       parse5-htmlparser2-tree-adapter: 6.0.1
     dev: false
 
-  /chokidar/2.1.8:
-    resolution: {integrity: sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==}
-    deprecated: Chokidar 2 does not receive security updates since 2019. Upgrade to chokidar 3 with 15x fewer dependencies
-    dependencies:
-      anymatch: 2.0.0
-      async-each: 1.0.3
-      braces: 2.3.2
-      glob-parent: 3.1.0
-      inherits: 2.0.4
-      is-binary-path: 1.0.1
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      path-is-absolute: 1.0.1
-      readdirp: 2.2.1
-      upath: 1.2.0
-    optionalDependencies:
-      fsevents: 1.2.13
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /chokidar/3.5.2:
     resolution: {integrity: sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==}
     engines: {node: '>= 8.10.0'}
-    dependencies:
-      anymatch: 3.1.2
-      braces: 3.0.2
-      glob-parent: 5.1.2
-      is-binary-path: 2.1.0
-      is-glob: 4.0.3
-      normalize-path: 3.0.0
-      readdirp: 3.6.0
-    optionalDependencies:
-      fsevents: 2.3.2
-    dev: false
-
-  /chokidar/3.5.3:
-    resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==}
-    engines: {node: '>= 8.10.0'}
     dependencies:
       anymatch: 3.1.3
       braces: 3.0.2
@@ -9124,7 +9074,6 @@ packages:
       readdirp: 3.6.0
     optionalDependencies:
       fsevents: 2.3.2
-    dev: true
 
   /chownr/1.1.4:
     resolution: {integrity: sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==}
@@ -10229,14 +10178,14 @@ packages:
   /csstype/3.1.1:
     resolution: {integrity: sha512-DJR/VvkAvSZW9bTouZue2sSxDwdTN92uHjqeKVm+0dAqdfNykRzQ95tay8aXMBAAPpUiq4Qcug2L7neoRh2Egw==}
 
-  /curlconverter/3.21.0:
+  /curlconverter/3.21.0_chokidar@3.5.2:
     resolution: {integrity: sha512-DXCnp1A/Xa69FujksUfdvWQFAnIn/C+4Wuv8t+UVdZkF/lY5bzj98GGKOGme7V/ckSHDLxE29Xp76sJ5Cpsp5A==}
     hasBin: true
     dependencies:
       '@curlconverter/yargs': 0.0.2
       cookie: 0.4.2
       jsesc: 3.0.2
-      nunjucks: 3.2.3
+      nunjucks: 3.2.3_chokidar@3.5.2
       query-string: 7.1.1
       string.prototype.startswith: 1.0.0
       yamljs: 0.3.0
@@ -12092,11 +12041,6 @@ packages:
       token-types: 4.2.1
     dev: false
 
-  /file-uri-to-path/1.0.0:
-    resolution: {integrity: sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==}
-    dev: true
-    optional: true
-
   /file-uri-to-path/2.0.0:
     resolution: {integrity: sha512-hjPFI8oE/2iQPVe4gbrJ73Pp+Xfub2+WI2LlXDbsaJBwT5wuMh35WNWVYYTpnz895shtwfyutMFLFywpQAFdLg==}
     engines: {node: '>= 6'}
@@ -12105,7 +12049,7 @@ packages:
   /filelist/1.0.4:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
-      minimatch: 5.1.0
+      minimatch: 5.1.5
     dev: false
 
   /fill-range/4.0.0:
@@ -12347,7 +12291,7 @@ packages:
       '@babel/code-frame': 7.18.6
       '@types/json-schema': 7.0.11
       chalk: 4.1.2
-      chokidar: 3.5.3
+      chokidar: 3.5.2
       cosmiconfig: 6.0.0
       deepmerge: 4.2.2
       fs-extra: 9.1.0
@@ -12516,17 +12460,6 @@ packages:
   /fs.realpath/1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
-  /fsevents/1.2.13:
-    resolution: {integrity: sha512-oWb1Z6mkHIskLzEJ/XWX0srkpkTQ7vaopMQkyaEIoq0fmtFVxOthb8cCxeT+p3ynTdkk/RZwbgG4brR5BeWECw==}
-    engines: {node: '>= 4.0'}
-    os: [darwin]
-    deprecated: fsevents 1 will break on node v14+ and could be using insecure binaries. Upgrade to fsevents 2.
-    dependencies:
-      bindings: 1.5.0
-      nan: 2.17.0
-    dev: true
-    optional: true
-
   /fsevents/2.3.2:
     resolution: {integrity: sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==}
     engines: {node: ^8.16.0 || ^10.6.0 || >=11.0.0}
@@ -12766,7 +12699,7 @@ packages:
     dependencies:
       anymatch: 2.0.0
       async-done: 1.3.2
-      chokidar: 2.1.8
+      chokidar: 3.5.2
       is-negated-glob: 1.0.0
       just-debounce: 1.1.0
       normalize-path: 3.0.0
@@ -13730,13 +13663,6 @@ packages:
     dependencies:
       has-bigints: 1.0.2
 
-  /is-binary-path/1.0.1:
-    resolution: {integrity: sha512-9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      binary-extensions: 1.13.1
-    dev: true
-
   /is-binary-path/2.1.0:
     resolution: {integrity: sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==}
     engines: {node: '>=8'}
@@ -14508,7 +14434,7 @@ packages:
       '@jest/types': 29.3.1
       '@types/graceful-fs': 4.1.5
       '@types/node': 16.18.12
-      anymatch: 3.1.2
+      anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.10
       jest-regex-util: 29.2.0
@@ -16154,19 +16080,11 @@ packages:
     dependencies:
       brace-expansion: 1.1.11
 
-  /minimatch/5.1.0:
-    resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==}
-    engines: {node: '>=10'}
-    dependencies:
-      brace-expansion: 2.0.1
-    dev: false
-
   /minimatch/5.1.5:
     resolution: {integrity: sha512-CI8wwdrll4ehjPAqs8TL8lBPyNnpZlQI02Wn8C1weNz/QbUbjh3OMxgMKSnvqfKFdLlks3EzHB9tO0BqGc3phQ==}
     engines: {node: '>=10'}
     dependencies:
       brace-expansion: 2.0.1
-    dev: true
 
   /minimist/1.2.7:
     resolution: {integrity: sha512-bzfL1YUZsP41gmu/qjrEk0Q6i2ix/cVeAhbCbqH9u3zYutS1cLg00qhrD0M2MVdCcx4Sc0UpP2eBWo9rotpq6g==}
@@ -16495,6 +16413,7 @@ packages:
 
   /nan/2.17.0:
     resolution: {integrity: sha512-2ZTgtl0nJsO0KQCjEpxcIr5D+Yv90plTitZt9JBfQvVJDS5seMl3FOvsh3+9CoYWXf/1l5OaZzzF6nDm4cagaQ==}
+    dev: false
     optional: true
 
   /nanoclone/0.2.1:
@@ -16773,7 +16692,7 @@ packages:
     engines: {node: '>=8.10.0'}
     hasBin: true
     dependencies:
-      chokidar: 3.5.3
+      chokidar: 3.5.2
       debug: 3.2.7_supports-color@5.5.0
       ignore-by-default: 1.0.1
       minimatch: 3.1.2
@@ -16904,7 +16823,7 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /nunjucks/3.2.3:
+  /nunjucks/3.2.3_chokidar@3.5.2:
     resolution: {integrity: sha512-psb6xjLj47+fE76JdZwskvwG4MYsQKXUtMsPh6U0YMvmyjRtKRFcxnlXGWglNybtNTNVmGdp94K62/+NjF5FDQ==}
     engines: {node: '>= 6.9.0'}
     hasBin: true
@@ -16916,6 +16835,7 @@ packages:
     dependencies:
       a-sync-waterfall: 1.0.1
       asap: 2.0.6
+      chokidar: 3.5.2
       commander: 5.1.0
     dev: false
 
@@ -18726,17 +18646,6 @@ packages:
       readable-stream: 3.6.0
     dev: false
 
-  /readdirp/2.2.1:
-    resolution: {integrity: sha512-1JU/8q+VgFZyxwrJ+SVIOsh+KywWGpds3NTqikiKpDMZWScmAYyKIgqkO+ARvNWJfXeXR1zxz7aHF4u4CyH6vQ==}
-    engines: {node: '>=0.10'}
-    dependencies:
-      graceful-fs: 4.2.10
-      micromatch: 3.1.10
-      readable-stream: 2.3.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /readdirp/3.6.0:
     resolution: {integrity: sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==}
     engines: {node: '>=8.10.0'}
@@ -18849,7 +18758,6 @@ packages:
 
   /regenerator-runtime/0.13.11:
     resolution: {integrity: sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==}
-    dev: true
 
   /regenerator-runtime/0.13.9:
     resolution: {integrity: sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==}
@@ -19425,7 +19333,7 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      chokidar: 3.5.3
+      chokidar: 3.5.2
       immutable: 4.1.0
       source-map-js: 1.0.2
     dev: true
@@ -19435,7 +19343,7 @@ packages:
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
-      chokidar: 3.5.3
+      chokidar: 3.5.2
       immutable: 4.2.2
       source-map-js: 1.0.2
     dev: true
@@ -21257,7 +21165,7 @@ packages:
     resolution: {integrity: sha512-P4+0i+OB0hX17Ca+U6EJ4WZZ+OSupqW32VJ34N7g7+Ch+bwSx1AqYOvDdIVYEKymBh3dfG0t1qxbxPlBbtB1lQ==}
     hasBin: true
     dependencies:
-      chokidar: 3.5.3
+      chokidar: 3.5.2
       commander: 9.4.1
       globby: 11.1.0
       mylas: 2.1.13
@@ -21774,11 +21682,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /upath/1.2.0:
-    resolution: {integrity: sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==}
-    engines: {node: '>=4'}
-    dev: true
-
   /update-browserslist-db/1.0.10_browserslist@4.21.4:
     resolution: {integrity: sha512-OztqDenkfFkbSG+tRxBeAnCVPckDBcvibKd35yDONx6OU8N7sqgwc7rCbkJ/WcYtVRZ4ba68d6byhC21GFh7sQ==}
     hasBin: true
@@ -21793,12 +21696,12 @@ packages:
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.4.1
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.4.1
     dev: false
 
   /uri-js/4.4.1:
@@ -22767,9 +22670,7 @@ packages:
   /watchpack-chokidar2/2.0.1:
     resolution: {integrity: sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==}
     dependencies:
-      chokidar: 2.1.8
-    transitivePeerDependencies:
-      - supports-color
+      chokidar: 3.5.2
     dev: true
     optional: true
 
@@ -22779,10 +22680,8 @@ packages:
       graceful-fs: 4.2.10
       neo-async: 2.6.2
     optionalDependencies:
-      chokidar: 3.5.3
+      chokidar: 3.5.2
       watchpack-chokidar2: 2.0.1
-    transitivePeerDependencies:
-      - supports-color
     dev: true
 
   /watchpack/2.4.0:
@@ -23472,7 +23371,7 @@ packages:
     engines: {node: '>=10'}
     dependencies:
       '@babel/runtime': 7.19.4
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
       lodash: 4.17.21
       lodash-es: 4.17.21
       nanoclone: 0.2.1

From e059caf99330cc0d8e4362f2d3dd070b08333e07 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 8 Feb 2023 22:41:35 +0200
Subject: [PATCH 133/358] feat: Add e2e user invite test suite (no-changelog)
 (#5412)

---
 cypress/e2e/17-sharing.cy.ts                  | 53 +++++++++++
 cypress/pages/index.ts                        |  1 +
 cypress/pages/settings-users.ts               |  3 +
 cypress/pages/sidebar/main-sidebar.ts         |  8 ++
 cypress/pages/workflow.ts                     | 11 ++-
 cypress/support/commands.ts                   | 90 +++++++++++++++----
 cypress/support/index.ts                      | 15 ++++
 .../src/components/InviteUsersModal.vue       |  2 +
 .../components/MainHeader/WorkflowDetails.vue |  7 +-
 .../editor-ui/src/components/MainSidebar.vue  | 24 ++---
 packages/editor-ui/src/constants.ts           |  1 +
 packages/editor-ui/src/router.ts              | 19 +++-
 .../editor-ui/src/views/SettingsUsersView.vue |  1 +
 packages/editor-ui/src/views/SignoutView.vue  | 31 +++++++
 14 files changed, 229 insertions(+), 37 deletions(-)
 create mode 100644 cypress/e2e/17-sharing.cy.ts
 create mode 100644 packages/editor-ui/src/views/SignoutView.vue

diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
new file mode 100644
index 00000000000000..ba93c3b72ee813
--- /dev/null
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -0,0 +1,53 @@
+import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
+
+/**
+ * User A - Instance owner
+ * User B - User, owns C1, W1, W2
+ * User C - User, owns C2
+ *
+ * W1 - Workflow owned by User B, shared with User C
+ * W2 - Workflow owned by User B
+ *
+ * C1 - Credential owned by User B
+ * C2 - Credential owned by User C, shared with User A and User B
+ */
+
+const instanceOwner = {
+	email: `${DEFAULT_USER_EMAIL}A`,
+	password: DEFAULT_USER_PASSWORD,
+	firstName: 'User',
+	lastName: 'A',
+};
+
+const users = [
+	{
+		email: `${DEFAULT_USER_EMAIL}B`,
+		password: DEFAULT_USER_PASSWORD,
+		firstName: 'User',
+		lastName: 'B',
+	},
+	{
+		email: `${DEFAULT_USER_EMAIL}C`,
+		password: DEFAULT_USER_PASSWORD,
+		firstName: 'User',
+		lastName: 'C',
+	},
+];
+
+describe('Sharing', () => {
+	before(() => {
+		cy.resetAll();
+		cy.setupOwner(instanceOwner);
+	});
+
+	beforeEach(() => {
+		cy.on('uncaught:exception', (err, runnable) => {
+			expect(err.message).to.include('Not logged in');
+			return false;
+		});
+	});
+
+	it(`should invite User A and UserB to instance`, () => {
+		cy.inviteUsers({ instanceOwner, users });
+	});
+});
diff --git a/cypress/pages/index.ts b/cypress/pages/index.ts
index 870fbaa58c6c99..7b4c1e09319bf6 100644
--- a/cypress/pages/index.ts
+++ b/cypress/pages/index.ts
@@ -7,5 +7,6 @@ export * from './workflow';
 export * from './modals';
 export * from './settings-users';
 export * from './settings-log-streaming';
+export * from './sidebar';
 export * from './ndv';
 export * from './canvas-node';
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index 8e5002680e2cf4..ae0048c937921c 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -4,6 +4,9 @@ export class SettingsUsersPage extends BasePage {
 	url = '/settings/users';
 	getters = {
 		setUpOwnerButton: () => cy.getByTestId('action-box').find('button').first(),
+		inviteButton: () => cy.getByTestId('settings-users-invite-button').last(),
+		inviteUsersModal: () => cy.getByTestId('inviteUser-modal').last(),
+		inviteUsersModalEmailsInput: () => cy.getByTestId('emails').find('input').first(),
 	};
 	actions = {
 		goToOwnerSetup: () => this.getters.setUpOwnerButton().click(),
diff --git a/cypress/pages/sidebar/main-sidebar.ts b/cypress/pages/sidebar/main-sidebar.ts
index e117a7f32df627..b86ed326f19bc3 100644
--- a/cypress/pages/sidebar/main-sidebar.ts
+++ b/cypress/pages/sidebar/main-sidebar.ts
@@ -9,6 +9,7 @@ export class MainSidebar extends BasePage {
 		workflows: () => this.getters.menuItem('Workflows'),
 		credentials: () => this.getters.menuItem('Credentials'),
 		executions: () => this.getters.menuItem('Executions'),
+		userMenu: () => cy.getByTestId('main-sidebar-user-menu'),
 	};
 	actions = {
 		goToSettings: () => {
@@ -22,5 +23,12 @@ export class MainSidebar extends BasePage {
 			cy.get('[data-old-overflow]').should('not.exist');
 			this.getters.credentials().click();
 		},
+		openUserMenu: () => {
+			this.getters.userMenu().find('[role="button"]').last().click();
+		},
+		signout: () => {
+			this.actions.openUserMenu();
+			cy.getByTestId('workflow-menu-item-logout').click();
+		},
 	};
 }
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 80ef05b3ccc49b..6f4f49727b1e92 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -78,6 +78,8 @@ export class WorkflowPage extends BasePage {
 		workflowSettingsSaveButton: () =>
 			cy.getByTestId('workflow-settings-save-button').find('button'),
 
+		shareButton: () => cy.getByTestId('workflow-share-button').find('button'),
+
 		duplicateWorkflowModal: () => cy.getByTestId('duplicate-modal'),
 		nodeViewBackground: () => cy.getByTestId('node-view-background'),
 		nodeView: () => cy.getByTestId('node-view'),
@@ -109,7 +111,11 @@ export class WorkflowPage extends BasePage {
 			if (keepNdvOpen) return;
 			cy.get('body').type('{esc}');
 		},
-		addNodeToCanvas: (nodeDisplayName: string, plusButtonClick = true, preventNdvClose?: boolean) => {
+		addNodeToCanvas: (
+			nodeDisplayName: string,
+			plusButtonClick = true,
+			preventNdvClose?: boolean,
+		) => {
 			if (plusButtonClick) {
 				this.getters.nodeCreatorPlusButton().click();
 			}
@@ -133,6 +139,9 @@ export class WorkflowPage extends BasePage {
 		openWorkflowMenu: () => {
 			this.getters.workflowMenu().click();
 		},
+		openShareModal: () => {
+			this.getters.shareButton().click();
+		},
 		saveWorkflowOnButtonClick: () => {
 			this.getters.saveButton().should('contain', 'Save');
 			this.getters.saveButton().click();
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index c5e9f898ce61fb..571c2408276dce 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -23,8 +23,8 @@
 //
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-import "cypress-real-events";
-import { WorkflowsPage, SigninPage, SignupPage } from '../pages';
+import 'cypress-real-events';
+import { WorkflowsPage, SigninPage, SignupPage, SettingsUsersPage } from '../pages';
 import { N8N_AUTH_COOKIE } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { MessageBox } from '../pages/modals/message-box';
@@ -87,6 +87,28 @@ Cypress.Commands.add('signin', ({ email, password }) => {
 	);
 });
 
+Cypress.Commands.add('signout', () => {
+	cy.visit('/signout');
+	cy.waitForLoad();
+	cy.url().should('include', '/signin');
+	cy.getCookie(N8N_AUTH_COOKIE).should('not.exist');
+});
+
+Cypress.Commands.add('signup', ({ firstName, lastName, password, url }) => {
+	const signupPage = new SignupPage();
+
+	cy.visit(url);
+
+	signupPage.getters.form().within(() => {
+		cy.url().then((url) => {
+			signupPage.getters.firstName().type(firstName);
+			signupPage.getters.lastName().type(lastName);
+			signupPage.getters.password().type(password);
+			signupPage.getters.submit().click();
+		});
+	});
+});
+
 Cypress.Commands.add('setup', ({ email, firstName, lastName, password }) => {
 	const signupPage = new SignupPage();
 
@@ -94,7 +116,7 @@ Cypress.Commands.add('setup', ({ email, firstName, lastName, password }) => {
 
 	signupPage.getters.form().within(() => {
 		cy.url().then((url) => {
-			if (url.endsWith(signupPage.url)) {
+			if (url.includes(signupPage.url)) {
 				signupPage.getters.email().type(email);
 				signupPage.getters.firstName().type(firstName);
 				signupPage.getters.lastName().type(lastName);
@@ -107,6 +129,36 @@ Cypress.Commands.add('setup', ({ email, firstName, lastName, password }) => {
 	});
 });
 
+Cypress.Commands.add('interceptREST', (method, url) => {
+	cy.intercept(method, `http://localhost:5678/rest${url}`);
+});
+
+Cypress.Commands.add('inviteUsers', ({ instanceOwner, users }) => {
+	const settingsUsersPage = new SettingsUsersPage();
+
+	cy.signin(instanceOwner);
+
+	users.forEach((user) => {
+		cy.signin(instanceOwner);
+		cy.visit(settingsUsersPage.url);
+
+		cy.interceptREST('POST', '/users').as('inviteUser');
+
+		settingsUsersPage.getters.inviteButton().click();
+		settingsUsersPage.getters.inviteUsersModal().within((modal) => {
+			settingsUsersPage.getters.inviteUsersModalEmailsInput().type(user.email).type('{enter}');
+		});
+
+		cy.wait('@inviteUser').then((interception) => {
+			const inviteLink = interception.response!.body.data[0].user.inviteAcceptUrl;
+			cy.log(JSON.stringify(interception.response!.body.data[0].user));
+			cy.log(inviteLink);
+			cy.signout();
+			cy.signup({ ...user, url: inviteLink });
+		});
+	});
+});
+
 Cypress.Commands.add('skipSetup', () => {
 	const signupPage = new SignupPage();
 	const workflowsPage = new WorkflowsPage();
@@ -194,20 +246,20 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 	cy.get(draggableSelector).should('exist');
 	cy.get(droppableSelector).should('exist');
 
-	cy.get(droppableSelector).first().then(([$el]) => {
-		const coords = $el.getBoundingClientRect();
-
-		const pageX = coords.left + coords.width / 2;
-		const pageY = coords.top + coords.height / 2;
-
-		// We can't use realMouseDown here because it hangs headless run
-		cy.get(draggableSelector).trigger('mousedown');
-		// We don't chain these commands to make sure cy.get is re-trying correctly
-		cy.get(droppableSelector).realMouseMove(pageX, pageY)
-		cy.get(droppableSelector).realHover()
-		cy.get(droppableSelector).realMouseUp();
-		cy.get(draggableSelector).realMouseUp();
-	})
+	cy.get(droppableSelector)
+		.first()
+		.then(([$el]) => {
+			const coords = $el.getBoundingClientRect();
+
+			const pageX = coords.left + coords.width / 2;
+			const pageY = coords.top + coords.height / 2;
+
+			// We can't use realMouseDown here because it hangs headless run
+			cy.get(draggableSelector).trigger('mousedown');
+			// We don't chain these commands to make sure cy.get is re-trying correctly
+			cy.get(droppableSelector).realMouseMove(pageX, pageY);
+			cy.get(droppableSelector).realHover();
+			cy.get(droppableSelector).realMouseUp();
+			cy.get(draggableSelector).realMouseUp();
+		});
 });
-
-
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index f0417ce8cc1c59..8eee49e10fe57e 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -1,6 +1,8 @@
 // Load type definitions that come with Cypress module
 /// <reference types="cypress" />
 
+import { Interception } from 'cypress/types/net-stubbing';
+
 interface SigninPayload {
 	email: string;
 	password: string;
@@ -13,6 +15,15 @@ interface SetupPayload {
 	lastName: string;
 }
 
+interface SignupPayload extends SetupPayload {
+	url: string;
+}
+
+interface InviteUsersPayload {
+	instanceOwner: SigninPayload;
+	users: SetupPayload[];
+}
+
 declare global {
 	namespace Cypress {
 		interface Chainable {
@@ -23,8 +34,12 @@ declare global {
 			findChildByTestId(childTestId: string): Chainable<JQuery<HTMLElement>>;
 			createFixtureWorkflow(fixtureKey: string, workflowName: string): void;
 			signin(payload: SigninPayload): void;
+			signout(): void;
+			signup(payload: SignupPayload): void;
 			setup(payload: SetupPayload): void;
 			setupOwner(payload: SetupPayload): void;
+			inviteUsers(payload: InviteUsersPayload): void;
+			interceptREST(method: string, url: string): Chainable<Interception>;
 			skipSetup(): void;
 			resetAll(): void;
 			enableFeature(feature: string): void;
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index 17864b97b59fb7..db1f1fead39445 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -22,6 +22,8 @@
 							<n8n-icon-button
 								icon="link"
 								type="tertiary"
+								data-test-id="copy-invite-link-button"
+								:data-invite-link="user.inviteAcceptUrl"
 								@click="onCopyInviteLink(user)"
 							></n8n-icon-button>
 						</n8n-tooltip>
diff --git a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
index 02e054fe7f96bf..199e659f624855 100644
--- a/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
+++ b/packages/editor-ui/src/components/MainHeader/WorkflowDetails.vue
@@ -62,7 +62,12 @@
 					<WorkflowActivator :workflow-active="isWorkflowActive" :workflow-id="currentWorkflowId" />
 				</span>
 				<enterprise-edition :features="[EnterpriseEditionFeature.Sharing]">
-					<n8n-button type="secondary" class="mr-2xs" @click="onShareButtonClick">
+					<n8n-button
+						type="secondary"
+						class="mr-2xs"
+						@click="onShareButtonClick"
+						data-test-id="workflow-share-button"
+					>
 						{{ $locale.baseText('workflowDetails.share') }}
 					</n8n-button>
 					<template #fallback>
diff --git a/packages/editor-ui/src/components/MainSidebar.vue b/packages/editor-ui/src/components/MainSidebar.vue
index b76dcdf874d713..1b7f142ead1085 100644
--- a/packages/editor-ui/src/components/MainSidebar.vue
+++ b/packages/editor-ui/src/components/MainSidebar.vue
@@ -43,7 +43,7 @@
 			</template>
 			<template #footer v-if="showUserArea">
 				<div :class="$style.userArea">
-					<div class="ml-3xs">
+					<div class="ml-3xs" data-test-id="main-sidebar-user-menu">
 						<!-- This dropdown is only enabled when sidebar is collapsed -->
 						<el-dropdown
 							:disabled="!isCollapsed"
@@ -60,12 +60,12 @@
 							</div>
 							<template #dropdown>
 								<el-dropdown-menu>
-									<el-dropdown-item command="settings">{{
-										$locale.baseText('settings')
-									}}</el-dropdown-item>
-									<el-dropdown-item command="logout">{{
-										$locale.baseText('auth.signout')
-									}}</el-dropdown-item>
+									<el-dropdown-item command="settings">
+										{{ $locale.baseText('settings') }}
+									</el-dropdown-item>
+									<el-dropdown-item command="logout">
+										{{ $locale.baseText('auth.signout') }}
+									</el-dropdown-item>
 								</el-dropdown-menu>
 							</template>
 						</el-dropdown>
@@ -337,14 +337,8 @@ export default mixins(
 					break;
 			}
 		},
-		async onLogout() {
-			try {
-				await this.usersStore.logout();
-				const route = this.$router.resolve({ name: VIEWS.SIGNIN });
-				window.open(route.href, '_self');
-			} catch (e) {
-				this.$showError(e, this.$locale.baseText('auth.signout.error'));
-			}
+		onLogout() {
+			this.$router.push({ name: VIEWS.SIGNOUT });
 		},
 		toggleCollapse() {
 			this.uiStore.toggleSidebarMenuCollapse();
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 1c4eb47cad037e..87b4c5295a94f8 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -311,6 +311,7 @@ export enum VIEWS {
 	TEMPLATE_IMPORT = 'WorkflowTemplate',
 	SIGNIN = 'SigninView',
 	SIGNUP = 'SignupView',
+	SIGNOUT = 'SignoutView',
 	SETUP = 'SetupView',
 	FORGOT_PASSWORD = 'ForgotMyPasswordView',
 	CHANGE_PASSWORD = 'ChangePasswordView',
diff --git a/packages/editor-ui/src/router.ts b/packages/editor-ui/src/router.ts
index 5e08c994e46f8d..02a33d0d44d7db 100644
--- a/packages/editor-ui/src/router.ts
+++ b/packages/editor-ui/src/router.ts
@@ -35,7 +35,7 @@ import { EnterpriseEditionFeature, VIEWS } from './constants';
 import { useSettingsStore } from './stores/settings';
 import { useTemplatesStore } from './stores/templates';
 import SettingsUsageAndPlanVue from './views/SettingsUsageAndPlan.vue';
-import { useUsersStore } from '@/stores/users';
+import SignoutView from '@/views/SignoutView.vue';
 
 Vue.use(Router);
 
@@ -368,6 +368,23 @@ const router = new Router({
 				},
 			},
 		},
+		{
+			path: '/signout',
+			name: VIEWS.SIGNOUT,
+			components: {
+				default: SignoutView,
+			},
+			meta: {
+				telemetry: {
+					pageCategory: 'auth',
+				},
+				permissions: {
+					allow: {
+						loginStatus: [LOGIN_STATUS.LoggedIn],
+					},
+				},
+			},
+		},
 		{
 			path: '/setup',
 			name: VIEWS.SETUP,
diff --git a/packages/editor-ui/src/views/SettingsUsersView.vue b/packages/editor-ui/src/views/SettingsUsersView.vue
index fd91306964978a..71afbfe4ebe344 100644
--- a/packages/editor-ui/src/views/SettingsUsersView.vue
+++ b/packages/editor-ui/src/views/SettingsUsersView.vue
@@ -7,6 +7,7 @@
 					:label="$locale.baseText('settings.users.invite')"
 					@click="onInvite"
 					size="large"
+					data-test-id="settings-users-invite-button"
 				/>
 			</div>
 		</div>
diff --git a/packages/editor-ui/src/views/SignoutView.vue b/packages/editor-ui/src/views/SignoutView.vue
new file mode 100644
index 00000000000000..e867e9849be5ae
--- /dev/null
+++ b/packages/editor-ui/src/views/SignoutView.vue
@@ -0,0 +1,31 @@
+<script lang="ts">
+import { VIEWS } from '@/constants';
+import { mapStores } from 'pinia';
+import { useUsersStore } from '@/stores/users';
+import mixins from 'vue-typed-mixins';
+import { showMessage } from '@/mixins/showMessage';
+
+export default mixins(showMessage).extend({
+	name: 'SignoutView',
+	computed: {
+		...mapStores(useUsersStore),
+	},
+	methods: {
+		async logout() {
+			try {
+				await this.usersStore.logout();
+				this.$router.replace({ name: VIEWS.SIGNIN });
+			} catch (e) {
+				this.$showError(e, this.$locale.baseText('auth.signout.error'));
+			}
+		},
+	},
+	mounted() {
+		this.logout();
+	},
+});
+</script>
+
+<template>
+	<div />
+</template>

From 94f2b2a26fca3987715e49352dd3e6f75b8bd6e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 8 Feb 2023 23:08:50 +0100
Subject: [PATCH 134/358] feat(Edit Image Node): Allow WebP as an image format
 (#5420)

---
 packages/nodes-base/nodes/EditImage/EditImage.node.ts |  4 ++++
 packages/nodes-base/package.json                      |  4 ++--
 pnpm-lock.yaml                                        | 10 +++++-----
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
index f5e45a3832eb3d..4eb26b73db9630 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -909,6 +909,10 @@ export class EditImage implements INodeType {
 								name: 'tiff',
 								value: 'tiff',
 							},
+							{
+								name: 'WebP',
+								value: 'webp',
+							},
 						],
 						default: 'jpeg',
 						description: 'Set the output image format',
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 43db4411d4292c..c20b1ad0612430 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -736,7 +736,7 @@
     "@types/eventsource": "^1.1.2",
     "@types/express": "^4.17.6",
     "@types/formidable": "^1.0.31",
-    "@types/gm": "^1.18.2",
+    "@types/gm": "^1.25.0",
     "@types/imap-simple": "^4.2.0",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/lodash.set": "^4.3.6",
@@ -776,7 +776,7 @@
     "fflate": "^0.7.0",
     "formidable": "^1.2.1",
     "get-system-fonts": "^2.0.2",
-    "gm": "^1.23.1",
+    "gm": "^1.25.0",
     "iconv-lite": "^0.6.2",
     "ics": "^2.27.0",
     "imap-simple": "^4.3.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 177475a28ed52c..49d4d9ce62ef27 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -747,7 +747,7 @@ importers:
       '@types/eventsource': ^1.1.2
       '@types/express': ^4.17.6
       '@types/formidable': ^1.0.31
-      '@types/gm': ^1.18.2
+      '@types/gm': ^1.25.0
       '@types/imap-simple': ^4.2.0
       '@types/js-nacl': ^1.3.0
       '@types/jsonwebtoken': ^9.0.1
@@ -782,7 +782,7 @@ importers:
       fflate: ^0.7.0
       formidable: ^1.2.1
       get-system-fonts: ^2.0.2
-      gm: ^1.23.1
+      gm: ^1.25.0
       gulp: ^4.0.0
       iconv-lite: ^0.6.2
       ics: ^2.27.0
@@ -895,7 +895,7 @@ importers:
       '@types/eventsource': 1.1.9
       '@types/express': 4.17.14
       '@types/formidable': 1.2.5
-      '@types/gm': 1.18.12
+      '@types/gm': 1.25.0
       '@types/imap-simple': 4.2.5
       '@types/jsonwebtoken': 9.0.1
       '@types/lodash.set': 4.3.7
@@ -6062,8 +6062,8 @@ packages:
       '@types/node': 16.18.12
     dev: true
 
-  /@types/gm/1.18.12:
-    resolution: {integrity: sha512-k3Gd15Ywy75FiFQUsrqpKD42rhMdHaETyw2zjK9u3xbrH1c7nS+npSb19yjPCqR8KxeL7vw2zJF4Kl2bAca0aQ==}
+  /@types/gm/1.25.0:
+    resolution: {integrity: sha512-y0nI4vp+0Vtsve+daADIHeSckm11TnWAdC4CBq2BEXTg+CfJiolnsnzsXeIEuIpBCksjN26LUZlvQKJDpthw5g==}
     dependencies:
       '@types/node': 16.18.12
     dev: true

From 74fc1414d70a144cb11651b8ff470a3c0314367c Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Thu, 9 Feb 2023 09:00:29 +0100
Subject: [PATCH 135/358] test(Spreadsheet File Node): Unit tests
 (no-changelog) (#5385)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡️test setup

* ⚡️fix  'testData' implicitly has an 'any' type.

* ✅ test github action file binary data reading

* ✅ checking for output binary equality

* ✅ writing files to different formats

* ✅ reading spreadsheet with different options

* ⚡️improve workflow file path replacement

* 🐛 fixing string.at() not supported in node 14.

* 🐛 trying to fix github action test error

* :zap: fix for empty binary

* :zap: switch for binary test

* ⚡️test helpers now return/compare json and binary (if not empty))

* :zap: removed commented console log

---------

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../test/SpreadsheetFile.test.ts              | 171 ++++++++++++
 .../SpreadsheetFile/test/spreadsheet.csv      |   3 +
 .../nodes/SpreadsheetFile/test/workflow.json  | 253 ++++++++++++++++++
 .../test/nodes/Airtable/Airtable.node.test.ts |   2 +-
 packages/nodes-base/test/nodes/Helpers.ts     |  25 +-
 5 files changed, 449 insertions(+), 5 deletions(-)
 create mode 100644 packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
 create mode 100644 packages/nodes-base/nodes/SpreadsheetFile/test/spreadsheet.csv
 create mode 100644 packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json

diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
new file mode 100644
index 00000000000000..9fae97cd527b07
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/SpreadsheetFile.test.ts
@@ -0,0 +1,171 @@
+import * as Helpers from '../../../test/nodes/Helpers';
+import type { WorkflowTestData } from '../../../test/nodes/types';
+
+import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
+import path from 'path';
+
+describe('Execute Spreadsheet File Node', () => {
+	beforeEach(async () => {
+		await Helpers.initBinaryDataManager();
+	});
+
+	// replace workflow json 'Read Binary File' node's filePath to local file
+	const workflow = Helpers.readJsonFileSync('nodes/SpreadsheetFile/test/workflow.json');
+	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
+	node.parameters.filePath = path.join(__dirname, 'spreadsheet.csv');
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'execute workflow.json',
+			input: {
+				workflowData: workflow,
+			},
+			output: {
+				nodeData: {
+					'Read From File': [
+						[
+							{
+								json: { A: 1, B: 2, C: 3 },
+							},
+							{
+								json: { A: 4, B: 5, C: 6 },
+							},
+						],
+					],
+					'Read From File Range': [
+						[
+							{
+								json: { '1': 4, '2': 5 },
+							},
+						],
+					],
+					'Read From File no Header Row': [
+						[
+							{
+								json: {
+									row: ['A', 'B', 'C'],
+								},
+							},
+							{
+								json: {
+									row: [1, 2, 3],
+								},
+							},
+							{
+								json: {
+									row: [4, 5, 6],
+								},
+							},
+						],
+					],
+					'Read From File Raw Data': [
+						[
+							{
+								json: { A: '1', B: '2', C: '3' },
+							},
+							{
+								json: { A: '4', B: '5', C: '6' },
+							},
+						],
+					],
+					'Read From File Read as String': [
+						[
+							{
+								json: { A: 1, B: 2, C: 3 },
+							},
+							{
+								json: { A: 4, B: 5, C: 6 },
+							},
+						],
+					],
+					'Write To File CSV': [
+						[
+							{
+								json: {},
+								binary: {
+									data: {
+										mimeType: 'text/csv',
+										fileType: 'text',
+										fileExtension: 'csv',
+										data: '77u/QSxCLEMKMSwyLDMKNCw1LDYK',
+										fileName: 'spreadsheet.csv',
+										fileSize: '21 B',
+									},
+								},
+							},
+						],
+					],
+					'Write To File HTML': [
+						[
+							{
+								json: {},
+								binary: {
+									data: {
+										mimeType: 'text/html',
+										fileType: 'text',
+										fileExtension: 'html',
+										data: 'PGh0bWw+PGhlYWQ+PG1ldGEgY2hhcnNldD0idXRmLTgiLz48dGl0bGU+U2hlZXRKUyBUYWJsZSBFeHBvcnQ8L3RpdGxlPjwvaGVhZD48Ym9keT48dGFibGU+PHRyPjx0ZCBkYXRhLXQ9InMiIGRhdGEtdj0iQSIgaWQ9InNqcy1BMSI+QTwvdGQ+PHRkIGRhdGEtdD0icyIgZGF0YS12PSJCIiBpZD0ic2pzLUIxIj5CPC90ZD48dGQgZGF0YS10PSJzIiBkYXRhLXY9IkMiIGlkPSJzanMtQzEiPkM8L3RkPjwvdHI+PHRyPjx0ZCBkYXRhLXQ9Im4iIGRhdGEtdj0iMSIgaWQ9InNqcy1BMiI+MTwvdGQ+PHRkIGRhdGEtdD0ibiIgZGF0YS12PSIyIiBpZD0ic2pzLUIyIj4yPC90ZD48dGQgZGF0YS10PSJuIiBkYXRhLXY9IjMiIGlkPSJzanMtQzIiPjM8L3RkPjwvdHI+PHRyPjx0ZCBkYXRhLXQ9Im4iIGRhdGEtdj0iNCIgaWQ9InNqcy1BMyI+NDwvdGQ+PHRkIGRhdGEtdD0ibiIgZGF0YS12PSI1IiBpZD0ic2pzLUIzIj41PC90ZD48dGQgZGF0YS10PSJuIiBkYXRhLXY9IjYiIGlkPSJzanMtQzMiPjY8L3RkPjwvdHI+PC90YWJsZT48L2JvZHk+PC9odG1sPg==',
+										fileName: 'spreadsheet.html',
+										fileSize: '535 B',
+									},
+								},
+							},
+						],
+					],
+					// ODS file has slight differences every time it's created
+					//
+					'Write To File RTF': [
+						[
+							{
+								json: {},
+								binary: {
+									data: {
+										mimeType: 'application/rtf',
+										fileExtension: 'rtf',
+										data: 'e1xydGYxXGFuc2lcdHJvd2RcdHJhdXRvZml0MVxjZWxseDFcY2VsbHgyXGNlbGx4M1xwYXJkXGludGJsIEFcY2VsbCBCXGNlbGwgQ1xjZWxsXHBhcmRcaW50Ymxccm93XHRyb3dkXHRyYXV0b2ZpdDFcY2VsbHgxXGNlbGx4MlxjZWxseDNccGFyZFxpbnRibCAxXGNlbGwgMlxjZWxsIDNcY2VsbFxwYXJkXGludGJsXHJvd1x0cm93ZFx0cmF1dG9maXQxXGNlbGx4MVxjZWxseDJcY2VsbHgzXHBhcmRcaW50YmwgNFxjZWxsIDVcY2VsbCA2XGNlbGxccGFyZFxpbnRibFxyb3d9',
+										fileName: 'spreadsheet.rtf',
+										fileSize: '267 B',
+									},
+								},
+							},
+						],
+					],
+					'Write To File XLS': [
+						[
+							{
+								json: {},
+								binary: {
+									data: {
+										mimeType: 'application/vnd.ms-excel',
+										fileExtension: 'xls',
+										data: '0M8R4KGxGuEAAAAAAAAAAAAAAAAAAAAAPgADAP7/CQAGAAAAAAAAAAAAAAABAAAAAgAAAAAAAAAAEAAAAQAAAAEAAAD+////AAAAAAAAAAD////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////9/////v////7///8EAAAABQAAAP7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7///8CAAAAAwAAAAQAAAAFAAAABgAAAAcAAAAIAAAACQAAAAoAAAALAAAADAAAAA0AAAAOAAAADwAAABAAAAARAAAAEgAAABMAAAD+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+/////v////7////+////UgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQABQH//////////wEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADAAAAAAUAAAAAAAABAFMAaAAzADMAdABKADUAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEgACAf////8CAAAA/////wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAFcAbwByAGsA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',
+										fileName: 'spreadsheet.xls',
+										fileSize: '3.58 kB',
+									},
+								},
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	for (const testData of tests) {
+		// eslint-disable-next-line @typescript-eslint/no-loop-func
+		test(testData.description, async () => {
+			// execute workflow
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			// check if result node data matches expected test data
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/spreadsheet.csv b/packages/nodes-base/nodes/SpreadsheetFile/test/spreadsheet.csv
new file mode 100644
index 00000000000000..803fa764751475
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/spreadsheet.csv
@@ -0,0 +1,3 @@
+A,B,C
+1,2,3
+4,5,6
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json
new file mode 100644
index 00000000000000..b52c7918bd4115
--- /dev/null
+++ b/packages/nodes-base/nodes/SpreadsheetFile/test/workflow.json
@@ -0,0 +1,253 @@
+{
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "087277cc-297d-4912-bd11-86626eff2d71",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				620,
+				640
+			]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "f55bc21c-c9a8-43af-bbc8-e4bdd30f0ce9",
+			"name": "Read From File",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1260,
+				640
+			]
+		},
+		{
+			"parameters": {
+				"filePath": "C:\\Users\\spech\\Documents\\GitHub\\n8n-master\\packages\\nodes-base\\nodes\\SpreadsheetFile\\test\\spreadsheet.csv"
+			},
+			"id": "d7620053-eb3d-43dd-b2cd-d60d9a08a9cc",
+			"name": "Read Binary File",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"position": [
+				840,
+				640
+			]
+		},
+		{
+			"parameters": {
+				"operation": "toFile",
+				"fileFormat": "csv",
+				"options": {}
+			},
+			"id": "21bc49fe-1e6b-46d6-a04d-cb474d138e02",
+			"name": "Write To File CSV",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1580,
+				280
+			]
+		},
+		{
+			"parameters": {
+				"operation": "toFile",
+				"fileFormat": "html",
+				"options": {}
+			},
+			"id": "a4c2c717-5a9d-4fd6-8450-6bb78e233c05",
+			"name": "Write To File HTML",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1580,
+				460
+			]
+		},
+		{
+			"parameters": {
+				"operation": "toFile",
+				"fileFormat": "ods",
+				"options": {}
+			},
+			"id": "58e5a423-0477-44df-a505-6b8a40dbf275",
+			"name": "Write To File ODS",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1580,
+				640
+			]
+		},
+		{
+			"parameters": {
+				"operation": "toFile",
+				"fileFormat": "rtf",
+				"options": {}
+			},
+			"id": "3ae6e9c5-bc0a-44e4-959e-cfc572f4179f",
+			"name": "Write To File RTF",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1580,
+				820
+			]
+		},
+		{
+			"parameters": {
+				"operation": "toFile",
+				"options": {}
+			},
+			"id": "7e6db847-d24c-4094-907d-92ffec626f68",
+			"name": "Write To File XLS",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1580,
+				1020
+			]
+		},
+		{
+			"parameters": {
+				"options": {
+					"range": "A2:B3"
+				}
+			},
+			"id": "48934f0d-ac10-4862-ae0c-2ea591b111e3",
+			"name": "Read From File Range",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1060,
+				520
+			]
+		},
+		{
+			"parameters": {
+				"options": {
+					"headerRow": false
+				}
+			},
+			"id": "dea6f3f6-f2fb-472e-97b2-8a0c0a36bc4d",
+			"name": "Read From File no Header Row",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1060,
+				320
+			]
+		},
+		{
+			"parameters": {
+				"options": {
+					"rawData": true
+				}
+			},
+			"id": "38ed33fc-6906-4b09-8376-937ef3ca99be",
+			"name": "Read From File Raw Data",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1060,
+				740
+			]
+		},
+		{
+			"parameters": {
+				"options": {
+					"readAsString": true
+				}
+			},
+			"id": "ffe09dc8-9b7a-4baf-bd03-bd65bbce2590",
+			"name": "Read From File Read as String",
+			"type": "n8n-nodes-base.spreadsheetFile",
+			"typeVersion": 1,
+			"position": [
+				1060,
+				940
+			]
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read Binary File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read From File": {
+			"main": [
+				[
+					{
+						"node": "Write To File CSV",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Write To File HTML",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Write To File ODS",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Write To File RTF",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Write To File XLS",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read Binary File": {
+			"main": [
+				[
+					{
+						"node": "Read From File",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Read From File Range",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Read From File no Header Row",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Read From File Raw Data",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Read From File Read as String",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
\ No newline at end of file
diff --git a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
index 706ac41d955c3e..02f91ebdd72b6b 100644
--- a/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
+++ b/packages/nodes-base/test/nodes/Airtable/Airtable.node.test.ts
@@ -34,7 +34,7 @@ describe('Execute Airtable Node', () => {
 			},
 			output: {
 				nodeData: {
-					Airtable: [[...records]],
+					Airtable: [[...records.map((r) => ({ json: r }))]],
 				},
 			},
 		},
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 5b9bf78069869f..721cd5261454ad 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -1,5 +1,5 @@
-import { readFileSync, readdirSync } from 'fs';
-import { Credentials, loadClassInIsolation } from 'n8n-core';
+import { readFileSync, readdirSync, mkdtempSync } from 'fs';
+import { BinaryDataManager, Credentials, loadClassInIsolation } from 'n8n-core';
 import {
 	ICredentialDataDecryptedObject,
 	ICredentialsHelper,
@@ -27,6 +27,8 @@ import {
 import { executeWorkflow } from './ExecuteWorkflow';
 import { WorkflowTestData } from './types';
 import path from 'path';
+import { tmpdir } from 'os';
+import { isEmpty } from 'lodash';
 
 export class CredentialsHelper extends ICredentialsHelper {
 	async authenticate(
@@ -156,6 +158,17 @@ const loadKnownNodes = (): Record<string, LoadingDetails> => {
 	return knownNodes!;
 };
 
+export async function initBinaryDataManager(mode: 'default' | 'filesystem' = 'default') {
+	const temporaryDir = mkdtempSync(path.join(tmpdir(), 'n8n'));
+	await BinaryDataManager.init({
+		mode,
+		availableModes: mode,
+		localStoragePath: temporaryDir,
+		binaryDataTTL: 1,
+		persistedBinaryDataTTL: 1,
+	});
+}
+
 export function setup(testData: Array<WorkflowTestData> | WorkflowTestData) {
 	if (!Array.isArray(testData)) {
 		testData = [testData];
@@ -204,7 +217,11 @@ export function getResultNodeData(result: IRun, testData: WorkflowTestData) {
 			if (nodeData.data === undefined) {
 				return null;
 			}
-			return nodeData.data.main[0]!.map((entry) => entry.json);
+			return nodeData.data.main[0]!.map((entry) => {
+				if (entry.binary && isEmpty(entry.binary)) delete entry.binary;
+				delete entry.pairedItem;
+				return entry;
+			});
 		});
 		return {
 			nodeName,
@@ -241,7 +258,7 @@ export const workflowToTests = (workflowFiles: string[]) => {
 		}
 		const nodeData = Object.keys(workflowData.pinData).reduce(
 			(acc, key) => {
-				const data = (workflowData.pinData[key] as IDataObject[]).map((item) => item.json);
+				const data = workflowData.pinData[key] as IDataObject[];
 				acc[key] = [data as IDataObject[]];
 				return acc;
 			},

From a07de049a2105e1c2f749958a281cedbf918c39a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 9 Feb 2023 09:41:07 +0100
Subject: [PATCH 136/358] feat(editor): Bring completions to HTML editor
 (#5382)

:zap: Bring completions to HTML editor
---
 .../src/components/HtmlEditor/HtmlEditor.vue  | 25 ++++++++++++++++---
 .../src/components/ParameterInput.vue         |  1 +
 .../codemirror/completions/addCompletions.ts  | 18 +++++++++++++
 .../src/plugins/codemirror/n8nLang.ts         | 17 ++-----------
 4 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/addCompletions.ts

diff --git a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
index 895e79caf287f1..8919a068a0e5cc 100644
--- a/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
+++ b/packages/editor-ui/src/components/HtmlEditor/HtmlEditor.vue
@@ -8,10 +8,16 @@ import prettier from 'prettier/standalone';
 import htmlParser from 'prettier/parser-html';
 import cssParser from 'prettier/parser-postcss';
 import jsParser from 'prettier/parser-babel';
-import { html } from 'codemirror-lang-html-n8n';
+import { htmlLanguage, autoCloseTags, html } from 'codemirror-lang-html-n8n';
 import { autocompletion } from '@codemirror/autocomplete';
 import { indentWithTab, insertNewlineAndIndent, history } from '@codemirror/commands';
-import { bracketMatching, ensureSyntaxTree, foldGutter, indentOnInput } from '@codemirror/language';
+import {
+	bracketMatching,
+	ensureSyntaxTree,
+	foldGutter,
+	indentOnInput,
+	LanguageSupport,
+} from '@codemirror/language';
 import { EditorState, Extension } from '@codemirror/state';
 import {
 	dropCursor,
@@ -23,6 +29,7 @@ import {
 	ViewUpdate,
 } from '@codemirror/view';
 
+import { n8nCompletionSources } from '@/plugins/codemirror/completions/addCompletions';
 import { expressionInputHandler } from '@/plugins/codemirror/inputHandlers/expression.inputHandler';
 import { highlighter } from '@/plugins/codemirror/resolvableHighlighter';
 import { htmlEditorEventBus } from '@/event-bus/html-editor-event-bus';
@@ -50,6 +57,10 @@ export default mixins(expressionManager).extend({
 			type: Boolean,
 			default: false,
 		},
+		disableExpressionCompletions: {
+			type: Boolean,
+			default: false,
+		},
 	},
 	data() {
 		return {
@@ -62,10 +73,18 @@ export default mixins(expressionManager).extend({
 		},
 
 		extensions(): Extension[] {
+			function htmlWithCompletions() {
+				return new LanguageSupport(
+					htmlLanguage,
+					n8nCompletionSources().map((source) => htmlLanguage.data.of(source)),
+				);
+			}
+
 			return [
 				bracketMatching(),
 				autocompletion(),
-				html({ autoCloseTags: true }),
+				this.disableExpressionCompletions ? html() : htmlWithCompletions(),
+				autoCloseTags,
 				expressionInputHandler(),
 				keymap.of([indentWithTab, { key: 'Enter', run: insertNewlineAndIndent }]),
 				indentOnInput(),
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index 358e34902dffd3..d15faa918157eb 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -86,6 +86,7 @@
 					:isReadOnly="isReadOnly"
 					:rows="getArgument('rows')"
 					:disableExpressionColoring="!isHtmlNode(node)"
+					:disableExpressionCompletions="!isHtmlNode(node)"
 					@valueChanged="valueChangedDebounced"
 				/>
 
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/addCompletions.ts b/packages/editor-ui/src/plugins/codemirror/completions/addCompletions.ts
new file mode 100644
index 00000000000000..34076935e7cbe0
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/addCompletions.ts
@@ -0,0 +1,18 @@
+import { ifIn } from '@codemirror/autocomplete';
+import { blankCompletions } from './blank.completions';
+import { bracketAccessCompletions } from './bracketAccess.completions';
+import { datatypeCompletions } from './datatype.completions';
+import { dollarCompletions } from './dollar.completions';
+import { nonDollarCompletions } from './nonDollar.completions';
+
+export function n8nCompletionSources() {
+	return [
+		blankCompletions,
+		bracketAccessCompletions,
+		datatypeCompletions,
+		dollarCompletions,
+		nonDollarCompletions,
+	].map((source) => ({
+		autocomplete: ifIn(['Resolvable'], source),
+	}));
+}
diff --git a/packages/editor-ui/src/plugins/codemirror/n8nLang.ts b/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
index b72c332ab7d163..33cc5493d20041 100644
--- a/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
+++ b/packages/editor-ui/src/plugins/codemirror/n8nLang.ts
@@ -2,13 +2,8 @@ import { parserWithMetaData as n8nParser } from 'codemirror-lang-n8n-expression'
 import { LanguageSupport, LRLanguage } from '@codemirror/language';
 import { parseMixed } from '@lezer/common';
 import { javascriptLanguage } from '@codemirror/lang-javascript';
-import { ifIn } from '@codemirror/autocomplete';
 
-import { blankCompletions } from './completions/blank.completions';
-import { bracketAccessCompletions } from './completions/bracketAccess.completions';
-import { datatypeCompletions } from './completions/datatype.completions';
-import { dollarCompletions } from './completions/dollar.completions';
-import { nonDollarCompletions } from './completions/nonDollar.completions';
+import { n8nCompletionSources } from './completions/addCompletions';
 
 const n8nParserWithNestedJsParser = n8nParser.configure({
 	wrap: parseMixed((node) => {
@@ -23,16 +18,8 @@ const n8nParserWithNestedJsParser = n8nParser.configure({
 const n8nLanguage = LRLanguage.define({ parser: n8nParserWithNestedJsParser });
 
 export function n8nLang() {
-	const options = [
-		blankCompletions,
-		bracketAccessCompletions,
-		datatypeCompletions,
-		dollarCompletions,
-		nonDollarCompletions,
-	].map((group) => n8nLanguage.data.of({ autocomplete: ifIn(['Resolvable'], group) }));
-
 	return new LanguageSupport(n8nLanguage, [
 		n8nLanguage.data.of({ closeBrackets: { brackets: ['{', '('] } }),
-		...options,
+		...n8nCompletionSources().map((source) => n8nLanguage.data.of(source)),
 	]);
 }

From e0c4c252276c798fe39c7b982503cdf884c81a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Thu, 9 Feb 2023 10:04:12 +0100
Subject: [PATCH 137/358] test: Add e2e workflow tags (no-changelog) (#5411)

* :test_tube: Add workflow tags tests

* :zap: Create `openTagManagerModal`

* :zap: Add wait to prevent detached DOM element

* :zap: Add wait to mirror other tests
---
 cypress/e2e/17-workflow-tags.cy.ts            | 96 +++++++++++++++++++
 cypress/e2e/7-workflow-actions.cy.ts          | 35 -------
 cypress/pages/workflow.ts                     | 45 ++++++---
 .../TagsManager/TagsView/TagsTable.vue        |  2 +
 .../TagsManager/TagsView/TagsView.vue         |  1 +
 5 files changed, 133 insertions(+), 46 deletions(-)
 create mode 100644 cypress/e2e/17-workflow-tags.cy.ts

diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
new file mode 100644
index 00000000000000..87926bf0f240d3
--- /dev/null
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -0,0 +1,96 @@
+import { WorkflowPage } from '../pages';
+
+const wf = new WorkflowPage();
+
+const TEST_TAGS = ['Tag 1', 'Tag 2', 'Tag 3'];
+
+describe('Workflow tags', () => {
+	beforeEach(() => {
+		cy.resetAll();
+		cy.skipSetup();
+		wf.actions.visit();
+		cy.waitForLoad();
+	});
+
+	it('should create and attach tags inline', () => {
+		wf.getters.createTagButton().click();
+		wf.actions.addTags(TEST_TAGS);
+		wf.getters.tagPills().should('have.length', TEST_TAGS.length);
+		wf.getters.nthTagPill(1).click();
+		wf.actions.addTags('Tag 4');
+		wf.getters.tagPills().should('have.length', TEST_TAGS.length + 1);
+		wf.getters.isWorkflowSaved();
+	});
+
+	it('should create tags via modal', () => {
+		wf.actions.openTagManagerModal();
+
+		const [first, second] = TEST_TAGS;
+
+		cy.contains('Create a tag').click();
+		cy.getByTestId('tags-table').find('input').type(first).type('{enter}');
+		cy.contains('Add new').click();
+		cy.wait(300);
+		cy.getByTestId('tags-table').find('input').type(second).type('{enter}');
+		cy.contains('Done').click();
+
+		wf.getters.createTagButton().click();
+		wf.getters.tagsInDropdown().should('have.length', 2); // two stored
+		wf.getters.tagPills().should('have.length', 0); // none attached
+	});
+
+	it('should delete a tag via modal', () => {
+		wf.actions.openTagManagerModal();
+
+		const [first] = TEST_TAGS;
+
+		cy.contains('Create a tag').click();
+		cy.getByTestId('tags-table').find('input').type(first).type('{enter}');
+		cy.getByTestId('delete-tag-button').click({ force: true });
+		cy.wait(300);
+		cy.contains('Delete tag').click();
+		cy.contains('Done').click();
+		wf.getters.createTagButton().click();
+		wf.getters.tagsInDropdown().should('have.length', 0); // none stored
+		wf.getters.tagPills().should('have.length', 0); // none attached
+	});
+
+	it('should update a tag via modal', () => {
+		wf.actions.openTagManagerModal();
+
+		const [first] = TEST_TAGS;
+
+		cy.contains('Create a tag').click();
+		cy.getByTestId('tags-table').find('input').type(first).type('{enter}');
+		cy.getByTestId('edit-tag-button').click({ force: true });
+		cy.wait(300);
+		cy.getByTestId('tags-table')
+			.find('.el-input--large')
+			.should('be.visible')
+			.type(' Updated')
+			.type('{enter}');
+		cy.contains('Done').click();
+		wf.getters.createTagButton().click();
+		wf.getters.tagsInDropdown().should('have.length', 1); // one stored
+		wf.getters.tagsInDropdown().contains('Updated').should('exist');
+		wf.getters.tagPills().should('have.length', 0); // none attached
+	});
+
+	it('should detach a tag inline by clicking on X on tag pill', () => {
+		wf.getters.createTagButton().click();
+		wf.actions.addTags(TEST_TAGS);
+		wf.getters.nthTagPill(1).click();
+		wf.getters.tagsDropdown().find('.el-tag__close').first().click();
+		cy.get('body').type('{enter}');
+		wf.getters.tagPills().should('have.length', TEST_TAGS.length - 1);
+	});
+
+	it('should detach a tag inline by clicking on dropdown list item', () => {
+		wf.getters.createTagButton().click();
+		wf.actions.addTags(TEST_TAGS);
+		wf.getters.nthTagPill(1).click();
+		wf.getters.tagsDropdown().find('li.selected').first().click();
+		cy.get('body').type('{enter}');
+		wf.getters.tagPills().should('have.length', TEST_TAGS.length - 1);
+	});
+});
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index eb4ff08b6588df..aeb3752ec2c4b4 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -7,7 +7,6 @@ import {
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 
 const NEW_WORKFLOW_NAME = 'Something else';
-const TEST_WF_TAGS = ['Tag 1', 'Tag 2', 'Tag 3'];
 const IMPORT_WORKFLOW_URL = 'https://www.jsonkeeper.com/b/FNB0#.json';
 const DUPLICATE_WORKFLOW_NAME = 'Duplicated workflow';
 const DUPLICATE_WORKFLOW_TAG = 'Duplicate';
@@ -66,40 +65,6 @@ describe('Workflow Actions', () => {
 			.should('eq', NEW_WORKFLOW_NAME);
 	});
 
-	it('should add tags', () => {
-		WorkflowPage.getters.newTagLink().click();
-		WorkflowPage.actions.addTags(TEST_WF_TAGS);
-		WorkflowPage.getters.isWorkflowSaved();
-		WorkflowPage.getters.workflowTagElements().should('have.length', TEST_WF_TAGS.length);
-	});
-
-	it('should add more tags', () => {
-		WorkflowPage.getters.newTagLink().click();
-		WorkflowPage.actions.addTags(TEST_WF_TAGS);
-		WorkflowPage.getters.isWorkflowSaved();
-		WorkflowPage.getters.firstWorkflowTagElement().click();
-		WorkflowPage.actions.addTags(['Another one']);
-		WorkflowPage.getters.workflowTagElements().should('have.length', TEST_WF_TAGS.length + 1);
-	});
-
-	it('should remove tags by clicking X in tag', () => {
-		WorkflowPage.getters.newTagLink().click();
-		WorkflowPage.actions.addTags(TEST_WF_TAGS);
-		WorkflowPage.getters.firstWorkflowTagElement().click();
-		WorkflowPage.getters.workflowTagsContainer().find('.el-tag__close').first().click();
-		cy.get('body').type('{enter}');
-		WorkflowPage.getters.workflowTagElements().should('have.length', TEST_WF_TAGS.length - 1);
-	});
-
-	it('should remove tags from dropdown', () => {
-		WorkflowPage.getters.newTagLink().click();
-		WorkflowPage.actions.addTags(TEST_WF_TAGS);
-		WorkflowPage.getters.firstWorkflowTagElement().click();
-		WorkflowPage.getters.workflowTagsDropdown().find('li.selected').first().click();
-		cy.get('body').type('{enter}');
-		WorkflowPage.getters.workflowTagElements().should('have.length', TEST_WF_TAGS.length - 1);
-	});
-
 	it('should copy nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 6f4f49727b1e92..8a6a78c3a7575d 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -12,11 +12,12 @@ export class WorkflowPage extends BasePage {
 		workflowTagsContainer: () => cy.getByTestId('workflow-tags-container'),
 		workflowTagsInput: () =>
 			this.getters.workflowTagsContainer().then(($el) => cy.wrap($el.find('input').first())),
-		workflowTagElements: () => cy.get('[data-test-id="workflow-tags-container"] span.tags > span'),
-		firstWorkflowTagElement: () =>
-			cy.get('[data-test-id="workflow-tags-container"] span.tags > span:nth-child(1)'),
-		workflowTagsDropdown: () => cy.getByTestId('workflow-tags-dropdown'),
-		newTagLink: () => cy.getByTestId('new-tag-link'),
+		tagPills: () => cy.get('[data-test-id="workflow-tags-container"] span.tags > span'),
+		nthTagPill: (n: number) =>
+			cy.get(`[data-test-id="workflow-tags-container"] span.tags > span:nth-child(${n})`),
+		tagsDropdown: () => cy.getByTestId('workflow-tags-dropdown'),
+		tagsInDropdown: () => cy.getByTestId('workflow-tags-dropdown').find('li').filter('.tag'),
+		createTagButton: () => cy.getByTestId('new-tag-link'),
 		saveButton: () => cy.getByTestId('workflow-save-button'),
 		nodeCreatorSearchBar: () => cy.getByTestId('node-creator-search-bar'),
 		nodeCreatorPlusButton: () => cy.getByTestId('node-creator-plus-button'),
@@ -95,9 +96,13 @@ export class WorkflowPage extends BasePage {
 		ndvParameters: () => cy.getByTestId('parameter-item'),
 		nodeCredentialsLabel: () => cy.getByTestId('credentials-label'),
 		getConnectionBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
-			cy.get(`.jtk-connector[data-source-node="${sourceNodeName}"][data-target-node="${targetNodeName}"]`),
+			cy.get(
+				`.jtk-connector[data-source-node="${sourceNodeName}"][data-target-node="${targetNodeName}"]`,
+			),
 		getConnectionActionsBetweenNodes: (sourceNodeName: string, targetNodeName: string) =>
-			cy.get(`.connection-actions[data-source-node="${sourceNodeName}"][data-target-node="${targetNodeName}"]`),
+			cy.get(
+				`.connection-actions[data-source-node="${sourceNodeName}"][data-target-node="${targetNodeName}"]`,
+			),
 	};
 	actions = {
 		visit: () => {
@@ -132,6 +137,10 @@ export class WorkflowPage extends BasePage {
 			cy.contains('Expression').invoke('show').click();
 			cy.getByTestId('expander').invoke('show').click();
 		},
+		openTagManagerModal: () => {
+			this.getters.createTagButton().click();
+			this.getters.tagsDropdown().find('li.manage-tags').first().click();
+		},
 		openInlineExpressionEditor: () => {
 			cy.contains('Expression').invoke('show').click();
 			this.getters.inlineExpressionEditorInput().click();
@@ -161,7 +170,9 @@ export class WorkflowPage extends BasePage {
 			cy.get('body').type(newName);
 			cy.get('body').type('{enter}');
 		},
-		addTags: (tags: string[]) => {
+		addTags: (tags: string | string[]) => {
+			if (!Array.isArray(tags)) tags = [tags];
+
 			tags.forEach((tag) => {
 				this.getters.workflowTagsInput().type(tag);
 				this.getters.workflowTagsInput().type('{enter}');
@@ -200,12 +211,24 @@ export class WorkflowPage extends BasePage {
 		},
 		addNodeBetweenNodes: (sourceNodeName: string, targetNodeName: string, newNodeName: string) => {
 			this.getters.getConnectionBetweenNodes(sourceNodeName, targetNodeName).first().realHover();
-			this.getters.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName).find('.add').first().click({ force: true });
+			this.getters
+				.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName)
+				.find('.add')
+				.first()
+				.click({ force: true });
 			this.actions.addNodeToCanvas(newNodeName, false);
 		},
-		deleteNodeBetweenNodes: (sourceNodeName: string, targetNodeName: string, newNodeName: string) => {
+		deleteNodeBetweenNodes: (
+			sourceNodeName: string,
+			targetNodeName: string,
+			newNodeName: string,
+		) => {
 			this.getters.getConnectionBetweenNodes(sourceNodeName, targetNodeName).first().realHover();
-			this.getters.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName).find('.delete').first().click({ force: true });
+			this.getters
+				.getConnectionActionsBetweenNodes(sourceNodeName, targetNodeName)
+				.find('.delete')
+				.first()
+				.click({ force: true });
 		},
 	};
 }
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
index 3c6cf43faf5429..7ecacac24ceccc 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsTable.vue
@@ -90,12 +90,14 @@
 							:title="$locale.baseText('tagsTable.editTag')"
 							@click.stop="enableUpdate(scope.row)"
 							icon="pen"
+							data-test-id="edit-tag-button"
 						/>
 						<n8n-icon-button
 							v-if="scope.row.canDelete"
 							:title="$locale.baseText('tagsTable.deleteTag')"
 							@click.stop="enableDelete(scope.row)"
 							icon="trash"
+							data-test-id="delete-tag-button"
 						/>
 					</div>
 				</transition>
diff --git a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
index 1348b265197237..02a33ab4e3a466 100644
--- a/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
+++ b/packages/editor-ui/src/components/TagsManager/TagsView/TagsView.vue
@@ -17,6 +17,7 @@
 			@cancelOperation="cancelOperation"
 			@applyOperation="applyOperation"
 			ref="tagsTable"
+			data-test-id="tags-table"
 		/>
 	</div>
 </template>

From 52cb185637f74ae5734ec26ce9a1f0cfa8fe615d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Feb 2023 10:44:07 +0100
Subject: [PATCH 138/358] refactor(core): Upgrade typeorm (no-changelog)
 (#5423)

[Now we can use aggregate functions directly over the repository API](https://github.com/typeorm/typeorm/pull/9737)
---
 packages/cli/package.json                   |   2 +-
 packages/cli/src/license/License.service.ts |  10 +-
 pnpm-lock.yaml                              | 134 +++++++++++---------
 3 files changed, 79 insertions(+), 67 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 028bee3f60df46..c9e26c90f33645 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -193,7 +193,7 @@
     "sse-channel": "^4.0.0",
     "swagger-ui-express": "^4.3.0",
     "syslog-client": "^1.1.1",
-    "typeorm": "0.3.11",
+    "typeorm": "^0.3.12",
     "uuid": "^8.3.2",
     "validator": "13.7.0",
     "winston": "^3.3.3",
diff --git a/packages/cli/src/license/License.service.ts b/packages/cli/src/license/License.service.ts
index df3aa99f9c1072..5f7f1ff41c83a7 100644
--- a/packages/cli/src/license/License.service.ts
+++ b/packages/cli/src/license/License.service.ts
@@ -4,14 +4,8 @@ import * as Db from '@/Db';
 
 export class LicenseService {
 	static async getActiveTriggerCount(): Promise<number> {
-		const qb = Db.collections.Workflow.createQueryBuilder('workflow')
-			.select('SUM(workflow.triggerCount)', 'triggerCount')
-			.where('workflow.active = :active', { active: true });
-		const results: { triggerCount: number } | undefined = await qb.getRawOne();
-		if (!results) {
-			throw new Error('Could not get active trigger count');
-		}
-		return results.triggerCount ?? 0;
+		const totalTriggerCount = await Db.collections.Workflow.sum('triggerCount', { active: true });
+		return totalTriggerCount ?? 0;
 	}
 
 	// Helper for getting the basic license data that we want to return
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 49d4d9ce62ef27..8b8ce519a6fe55 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -233,7 +233,7 @@ importers:
       ts-node: ^9.1.1
       tsc-alias: ^1.7.0
       tsconfig-paths: ^3.14.1
-      typeorm: 0.3.11
+      typeorm: ^0.3.12
       uuid: ^8.3.2
       validator: 13.7.0
       winston: ^3.3.3
@@ -321,7 +321,7 @@ importers:
       sse-channel: 4.0.0
       swagger-ui-express: 4.5.0_express@4.18.2
       syslog-client: 1.1.1
-      typeorm: 0.3.11_a77gzgdqnod3rkvxniiwirlqsi
+      typeorm: 0.3.12_a77gzgdqnod3rkvxniiwirlqsi
       uuid: 8.3.2
       validator: 13.7.0
       winston: 3.8.2
@@ -1048,7 +1048,7 @@ packages:
     resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/core-auth/1.4.0:
@@ -1056,7 +1056,7 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@azure/abort-controller': 1.1.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/core-client/1.6.1:
@@ -1069,7 +1069,7 @@ packages:
       '@azure/core-tracing': 1.0.1
       '@azure/core-util': 1.1.1
       '@azure/logger': 1.0.3
-      tslib: 2.4.0
+      tslib: 2.5.0
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1100,7 +1100,7 @@ packages:
       node-fetch: 2.6.7
       process: 0.11.10
       tough-cookie: 4.1.2
-      tslib: 2.4.0
+      tslib: 2.5.0
       tunnel: 0.0.6
       uuid: 8.3.2
       xml2js: 0.4.23
@@ -1114,14 +1114,14 @@ packages:
     dependencies:
       '@azure/abort-controller': 1.1.0
       '@azure/logger': 1.0.3
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/core-paging/1.3.0:
     resolution: {integrity: sha512-H6Tg9eBm0brHqLy0OSAGzxIh1t4UL8eZVrSUMJ60Ra9cwq2pOskFqVpz2pYoHDsBY1jZ4V/P8LRGb5D5pmC6rg==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/core-rest-pipeline/1.9.2:
@@ -1136,7 +1136,7 @@ packages:
       form-data: 4.0.0
       http-proxy-agent: 5.0.0
       https-proxy-agent: 5.0.1
-      tslib: 2.4.0
+      tslib: 2.5.0
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -1147,14 +1147,14 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@opentelemetry/api': 1.2.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/core-tracing/1.0.1:
     resolution: {integrity: sha512-I5CGMoLtX+pI17ZdiFJZgxMJApsK6jjfm85hpgp3oazCdq5Wxgh4wMr7ge/TTWW1B5WBuvIOI1fMU/FrOAMKrw==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/core-util/1.1.1:
@@ -1162,7 +1162,7 @@ packages:
     engines: {node: '>=12.0.0'}
     dependencies:
       '@azure/abort-controller': 1.1.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/identity/2.1.0:
@@ -1183,7 +1183,7 @@ packages:
       jws: 4.0.0
       open: 8.4.0
       stoppable: 1.1.0
-      tslib: 2.4.0
+      tslib: 2.5.0
       uuid: 8.3.2
     transitivePeerDependencies:
       - supports-color
@@ -1203,7 +1203,7 @@ packages:
       '@azure/core-tracing': 1.0.1
       '@azure/core-util': 1.1.1
       '@azure/logger': 1.0.3
-      tslib: 2.4.0
+      tslib: 2.5.0
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -1212,7 +1212,7 @@ packages:
     resolution: {integrity: sha512-aK4s3Xxjrx3daZr3VylxejK3vG5ExXck5WOHDJ8in/k9AqlfIyFMMT1uG7u8mNjX+QRILTIn0/Xgschfh/dQ9g==}
     engines: {node: '>=12.0.0'}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /@azure/msal-browser/2.30.0:
@@ -1247,7 +1247,7 @@ packages:
       '@azure/core-tracing': 1.0.0-preview.13
       '@azure/logger': 1.0.3
       events: 3.3.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     transitivePeerDependencies:
       - encoding
     dev: false
@@ -4036,7 +4036,7 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-wsl: 2.2.0
-      tslib: 2.4.1
+      tslib: 2.5.0
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4050,7 +4050,7 @@ packages:
       debug: 4.3.4
       globby: 11.1.0
       is-wsl: 2.2.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     transitivePeerDependencies:
       - supports-color
 
@@ -4063,7 +4063,7 @@ packages:
       debug: 4.3.4_supports-color@8.1.1
       globby: 11.1.0
       is-wsl: 2.2.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -4188,7 +4188,7 @@ packages:
       '@oclif/errors': 1.3.6
       '@oclif/linewrap': 1.0.0
       chalk: 4.1.2
-      tslib: 2.4.0
+      tslib: 2.5.0
 
   /@oclif/plugin-help/3.2.18:
     resolution: {integrity: sha512-5n5Pkz4L0duknIvFwx2Ko9Xda3miT6RZP8bgaaK3Q/9fzVBrhi4bOM0u05/OThI6V+3NsSdxYS2o1NLcXToWDg==}
@@ -4245,7 +4245,7 @@ packages:
       open: 8.4.0
       picocolors: 1.0.0
       tiny-glob: 0.2.9
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: true
 
   /@rudderstack/rudder-sdk-node/1.0.6:
@@ -4366,8 +4366,8 @@ packages:
       '@sinonjs/commons': 1.8.3
     dev: true
 
-  /@sqltools/formatter/1.2.3:
-    resolution: {integrity: sha512-O3uyB/JbkAEMZaP3YqyHH7TMnex7tWyCbCI4EfJdOCoN6HIhqdJBWTM6aCCiWQ/5f5wxjgU735QAIpJbjDvmzg==}
+  /@sqltools/formatter/1.2.5:
+    resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
   /@storybook/addon-actions/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
@@ -7977,21 +7977,21 @@ packages:
     resolution: {integrity: sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==}
     engines: {node: '>=4'}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /ast-types/0.14.2:
     resolution: {integrity: sha512-O0yuUDnZeQDL+ncNGlJ78BiO4jnYI3bvMsD5prT0/nsgijG/LpNBIr63gTjVTNsiGkgQhiyCShTgxt8oXOrklA==}
     engines: {node: '>=4'}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.5.0
     dev: true
 
   /ast-types/0.15.2:
     resolution: {integrity: sha512-c27loCv9QkZinsa5ProX751khO9DJl/AcB5c2KNtA6NRvHKS0PgLfcftz72KVq504vB0Gku5s2kUZzDBvQWvHg==}
     engines: {node: '>=4'}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /astral-regex/2.0.0:
     resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
@@ -8862,7 +8862,7 @@ packages:
     resolution: {integrity: sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==}
     dependencies:
       pascal-case: 3.1.2
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /camelcase-css/2.0.1:
     resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
@@ -8907,7 +8907,7 @@ packages:
     resolution: {integrity: sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: 2.5.0
       upper-case-first: 2.0.2
     dev: false
 
@@ -9235,7 +9235,7 @@ packages:
       strip-ansi: 6.0.1
       supports-color: 8.1.1
       supports-hyperlinks: 2.3.0
-      tslib: 2.4.0
+      tslib: 2.5.0
     transitivePeerDependencies:
       - '@oclif/config'
     dev: true
@@ -9784,7 +9784,7 @@ packages:
     resolution: {integrity: sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: 2.5.0
       upper-case: 2.0.2
     dev: false
 
@@ -10795,7 +10795,7 @@ packages:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /dotenv-expand/5.1.0:
     resolution: {integrity: sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==}
@@ -12727,7 +12727,6 @@ packages:
       inherits: 2.0.4
       minimatch: 5.1.5
       once: 1.4.0
-    dev: true
 
   /global-dirs/3.0.0:
     resolution: {integrity: sha512-v8ho2DS5RiCjftj1nD9NmnfaOzTdud7RRnVd9kFNOjqZbISlx5DQ+OrTkywgd0dIt7oFCvKetZSHoHcP3sDdiA==}
@@ -13091,7 +13090,7 @@ packages:
     resolution: {integrity: sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==}
     dependencies:
       capital-case: 1.0.4
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /heap/0.2.7:
@@ -14252,7 +14251,7 @@ packages:
       jest-util: 29.3.1
       jest-validate: 29.3.1
       prompts: 2.4.2
-      yargs: 17.6.0
+      yargs: 17.6.2
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
@@ -15646,7 +15645,7 @@ packages:
   /lower-case/2.0.2:
     resolution: {integrity: sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /lru-cache/4.0.2:
     resolution: {integrity: sha512-uQw9OqphAGiZhkuPlpFGmdTU2tEuhxTourM/19qGJrxBPHAr/f8BT1a0i/lOclESnGatdJG/UCkP9kZB/Lh1iw==}
@@ -16192,6 +16191,12 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
 
+  /mkdirp/2.1.3:
+    resolution: {integrity: sha512-sjAkg21peAG9HS+Dkx7hlG9Ztx7HLeKnvB3NQRcu/mltCVmvkF0pisbiTSfDVYTT86XEfZrTUosLdZLStquZUw==}
+    engines: {node: '>=10'}
+    hasBin: true
+    dev: false
+
   /mlly/1.1.0:
     resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==}
     dependencies:
@@ -16496,7 +16501,7 @@ packages:
     resolution: {integrity: sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==}
     dependencies:
       lower-case: 2.0.2
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /nock/13.2.9:
     resolution: {integrity: sha512-1+XfJNYF1cjGB+TKMWi29eZ0b82QOvQs2YoLNzbpWGqFMtRQHTa57osqdGj4FrFPgkO4D4AZinzUJR9VvW3QUA==}
@@ -17267,7 +17272,7 @@ packages:
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /parent-module/1.0.1:
     resolution: {integrity: sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==}
@@ -17384,7 +17389,7 @@ packages:
     resolution: {integrity: sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /pascalcase/0.1.1:
     resolution: {integrity: sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==}
@@ -17433,7 +17438,7 @@ packages:
     resolution: {integrity: sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /path-dirname/1.0.2:
@@ -18659,7 +18664,7 @@ packages:
       ast-types: 0.14.2
       esprima: 4.0.1
       source-map: 0.6.1
-      tslib: 2.4.1
+      tslib: 2.5.0
     dev: true
 
   /recast/0.21.5:
@@ -18680,7 +18685,7 @@ packages:
       ast-types: 0.15.2
       esprima: 4.0.1
       source-map: 0.6.1
-      tslib: 2.4.1
+      tslib: 2.5.0
     dev: true
 
   /rechoir/0.6.2:
@@ -19206,7 +19211,7 @@ packages:
   /rxjs/7.5.7:
     resolution: {integrity: sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA==}
     dependencies:
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: true
 
   /safe-buffer/5.1.1:
@@ -19490,7 +19495,7 @@ packages:
     resolution: {integrity: sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==}
     dependencies:
       no-case: 3.0.4
-      tslib: 2.4.0
+      tslib: 2.5.0
       upper-case-first: 2.0.2
 
   /seq-queue/0.0.5:
@@ -19710,7 +19715,7 @@ packages:
     resolution: {integrity: sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==}
     dependencies:
       dot-case: 3.0.4
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: false
 
   /snapdragon-node/2.1.1:
@@ -20575,7 +20580,7 @@ packages:
     engines: {node: ^14.18.0 || >=16.0.0}
     dependencies:
       '@pkgr/utils': 2.3.1
-      tslib: 2.4.0
+      tslib: 2.5.0
     dev: true
 
   /syslog-client/1.1.1:
@@ -21203,8 +21208,8 @@ packages:
   /tslib/2.4.0:
     resolution: {integrity: sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ==}
 
-  /tslib/2.4.1:
-    resolution: {integrity: sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA==}
+  /tslib/2.5.0:
+    resolution: {integrity: sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==}
 
   /tsscmp/1.0.6:
     resolution: {integrity: sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==}
@@ -21360,8 +21365,8 @@ packages:
   /typedarray/0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typeorm/0.3.11_a77gzgdqnod3rkvxniiwirlqsi:
-    resolution: {integrity: sha512-pzdOyWbVuz/z8Ww6gqvBW4nylsM0KLdUCDExr2gR20/x1khGSVxQkjNV/3YqliG90jrWzrknYbYscpk8yxFJVg==}
+  /typeorm/0.3.12_a77gzgdqnod3rkvxniiwirlqsi:
+    resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
     peerDependencies:
@@ -21372,7 +21377,7 @@ packages:
       ioredis: ^5.0.4
       mongodb: ^3.6.0
       mssql: ^7.3.0
-      mysql2: ^2.2.5
+      mysql2: ^2.2.5 || ^3.0.1
       oracledb: ^5.1.0
       pg: ^8.5.1
       pg-native: ^3.0.0
@@ -21418,7 +21423,7 @@ packages:
       typeorm-aurora-data-api-driver:
         optional: true
     dependencies:
-      '@sqltools/formatter': 1.2.3
+      '@sqltools/formatter': 1.2.5
       app-root-path: 3.1.0
       buffer: 6.0.3
       chalk: 4.1.2
@@ -21426,20 +21431,20 @@ packages:
       date-fns: 2.29.3
       debug: 4.3.4
       dotenv: 16.0.3
-      glob: 7.2.3
+      glob: 8.1.0
       ioredis: 5.2.4
       js-yaml: 4.1.0
-      mkdirp: 1.0.4
+      mkdirp: 2.1.3
       mysql2: 2.3.3
       pg: 8.8.0
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
       sqlite3: 5.1.4
       ts-node: 9.1.1_typescript@4.9.4
-      tslib: 2.4.0
-      uuid: 8.3.2
+      tslib: 2.5.0
+      uuid: 9.0.0
       xml2js: 0.4.23
-      yargs: 17.6.0
+      yargs: 17.6.2
     transitivePeerDependencies:
       - supports-color
     dev: false
@@ -21696,12 +21701,12 @@ packages:
   /upper-case-first/2.0.2:
     resolution: {integrity: sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.5.0
 
   /upper-case/2.0.2:
     resolution: {integrity: sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==}
     dependencies:
-      tslib: 2.4.1
+      tslib: 2.5.0
     dev: false
 
   /uri-js/4.4.1:
@@ -23331,6 +23336,19 @@ packages:
       string-width: 4.2.3
       y18n: 5.0.8
       yargs-parser: 21.1.1
+    dev: false
+
+  /yargs/17.6.2:
+    resolution: {integrity: sha512-1/9UrdHjDZc0eOU0HxOHoS78C69UD3JRMvzlJ7S79S2nTaWRA/whGCTV8o9e/N/1Va9YIV7Q4sOxD8VV4pCWOw==}
+    engines: {node: '>=12'}
+    dependencies:
+      cliui: 8.0.1
+      escalade: 3.1.1
+      get-caller-file: 2.0.5
+      require-directory: 2.1.1
+      string-width: 4.2.3
+      y18n: 5.0.8
+      yargs-parser: 21.1.1
 
   /yargs/7.1.2:
     resolution: {integrity: sha512-ZEjj/dQYQy0Zx0lgLMLR8QuaqTihnxirir7EwUHp1Axq4e3+k8jXU5K0VLbNvedv1f4EWtBonDIZm0NUr+jCcA==}

From b5948cbe13af65e969cc5b159226860503064c86 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:23:25 +0200
Subject: [PATCH 139/358] test(XML Node): Unit tests (no-changelog)

---
 packages/nodes-base/nodes/Xml/Xml.node.ts     |   3 +-
 .../nodes/Xml/test/node/Xml.test.ts           |   5 +
 .../nodes/Xml/test/node/workflow.xml.json     | 148 ++++++++++++++++++
 3 files changed, 154 insertions(+), 2 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Xml/test/node/Xml.test.ts
 create mode 100644 packages/nodes-base/nodes/Xml/test/node/workflow.xml.json

diff --git a/packages/nodes-base/nodes/Xml/Xml.node.ts b/packages/nodes-base/nodes/Xml/Xml.node.ts
index 3efc095695460b..302dcd641e1b99 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -244,8 +244,7 @@ export class Xml implements INodeType {
 						);
 					}
 
-					// @ts-ignore
-					const json = await parser.parseStringPromise(item.json[dataPropertyName]);
+					const json = await parser.parseStringPromise(item.json[dataPropertyName] as string);
 					returnData.push({ json });
 				} else if (mode === 'jsonToxml') {
 					const builder = new Builder(options);
diff --git a/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts b/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts
new file mode 100644
index 00000000000000..42fc0cf34a07cd
--- /dev/null
+++ b/packages/nodes-base/nodes/Xml/test/node/Xml.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test XML Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Xml/test/node/workflow.xml.json b/packages/nodes-base/nodes/Xml/test/node/workflow.xml.json
new file mode 100644
index 00000000000000..e15a9c2bcd0e87
--- /dev/null
+++ b/packages/nodes-base/nodes/Xml/test/node/workflow.xml.json
@@ -0,0 +1,148 @@
+{
+	"name": "xml tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "745d1191-f221-4eda-9d09-611233f97edd",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [460, 520]
+		},
+		{
+			"parameters": {
+				"mode": "jsonToxml",
+				"options": {}
+			},
+			"id": "fb48ca4c-5ae2-4c57-9ca9-2080d06dbf65",
+			"name": "XML",
+			"type": "n8n-nodes-base.xml",
+			"typeVersion": 1,
+			"position": [960, 280]
+		},
+		{
+			"parameters": {
+				"jsCode": "return {\n  data: {\n    id: 1,\n    firstName: 'Adam',\n    secondName: 'Smith',\n    fullName: 'Adam Smith',\n  }\n}"
+			},
+			"id": "6a04ca32-c9cc-4cb1-a6b9-3a505b1c2dd5",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [700, 400]
+		},
+		{
+			"parameters": {
+				"mode": "jsonToxml",
+				"options": {
+					"headless": true
+				}
+			},
+			"id": "cd740e65-5117-4bec-a3b3-6863ba25f232",
+			"name": "XML1",
+			"type": "n8n-nodes-base.xml",
+			"typeVersion": 1,
+			"position": [960, 500]
+		},
+		{
+			"parameters": {
+				"jsCode": "return {\n\"data\":\n'<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?> <data> <id>1</id> <firstName>Adam</firstName> <secondName>Smith</secondName> <fullName>Adam Smith</fullName> </data>'\n}"
+			},
+			"id": "817afbf7-9342-403f-8dc0-c4a3905fde4d",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [680, 640]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "f0f37a8f-9136-42e8-be34-f32b77e4aa88",
+			"name": "XML2",
+			"type": "n8n-nodes-base.xml",
+			"typeVersion": 1,
+			"position": [940, 700]
+		}
+	],
+	"pinData": {
+		"XML": [
+			{
+				"json": {
+					"data": "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<data>\n  <id>1</id>\n  <firstName>Adam</firstName>\n  <secondName>Smith</secondName>\n  <fullName>Adam Smith</fullName>\n</data>"
+				}
+			}
+		],
+		"XML1": [
+			{
+				"json": {
+					"data": "<data>\n  <id>1</id>\n  <firstName>Adam</firstName>\n  <secondName>Smith</secondName>\n  <fullName>Adam Smith</fullName>\n</data>"
+				}
+			}
+		],
+		"XML2": [
+			{
+				"json": {
+					"data": {
+						"id": "1",
+						"firstName": "Adam",
+						"secondName": "Smith",
+						"fullName": "Adam Smith"
+					}
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "XML",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "XML1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "XML2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "c1fde9d5-f27c-4e62-bc5c-8be787dcc227",
+	"id": "109",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}

From 2150ea0e792b54d7813ba43172449b35a294251d Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:25:26 +0200
Subject: [PATCH 140/358] test(HTTP Request Node): Unit tests (no-changelog)

---
 .../HttpRequest/test/node/HttpRequest.test.ts | 130 ++++++++++++++++
 .../test/node/workflow.delete.json            |  60 ++++++++
 .../HttpRequest/test/node/workflow.get.json   | 144 ++++++++++++++++++
 .../HttpRequest/test/node/workflow.patch.json |  73 +++++++++
 .../HttpRequest/test/node/workflow.post.json  | 105 +++++++++++++
 .../HttpRequest/test/node/workflow.put.json   |  73 +++++++++
 packages/nodes-base/test/nodes/Helpers.ts     |  26 ++--
 7 files changed, 601 insertions(+), 10 deletions(-)
 create mode 100644 packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
 create mode 100644 packages/nodes-base/nodes/HttpRequest/test/node/workflow.delete.json
 create mode 100644 packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json
 create mode 100644 packages/nodes-base/nodes/HttpRequest/test/node/workflow.patch.json
 create mode 100644 packages/nodes-base/nodes/HttpRequest/test/node/workflow.post.json
 create mode 100644 packages/nodes-base/nodes/HttpRequest/test/node/workflow.put.json

diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
new file mode 100644
index 00000000000000..b59a9bfe487837
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/HttpRequest.test.ts
@@ -0,0 +1,130 @@
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+} from '../../../../test/nodes/Helpers';
+
+import nock from 'nock';
+
+describe('Test HTTP Request Node', () => {
+	const workflows = getWorkflowFilenames(__dirname);
+	const tests = workflowToTests(workflows);
+
+	const baseUrl = 'https://dummyjson.com';
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+
+		//GET
+		nock(baseUrl).get('/todos/1').reply(200, {
+			id: 1,
+			todo: 'Do something nice for someone I care about',
+			completed: true,
+			userId: 26,
+		});
+		nock(baseUrl).matchHeader('Authorization', 'Bearer 12345').get('/todos/3').reply(200, {
+			id: 3,
+			todo: 'Watch a classic movie',
+			completed: false,
+			userId: 4,
+		});
+		nock(baseUrl)
+			.get('/todos?limit=2&skip=10')
+			.reply(200, {
+				todos: [
+					{
+						id: 11,
+						todo: "Text a friend I haven't talked to in a long time",
+						completed: false,
+						userId: 39,
+					},
+					{
+						id: 12,
+						todo: 'Organize pantry',
+						completed: true,
+						userId: 39,
+					},
+				],
+				total: 150,
+				skip: 10,
+				limit: 2,
+			});
+
+		//POST
+		nock(baseUrl)
+			.post('/todos/add', {
+				todo: 'Use DummyJSON in the project',
+				completed: false,
+				userId: '5',
+			})
+			.reply(200, {
+				id: 151,
+				todo: 'Use DummyJSON in the project',
+				completed: false,
+				userId: '5',
+			});
+		nock(baseUrl)
+			.post('/todos/add2', {
+				todo: 'Use DummyJSON in the project',
+				completed: false,
+				userId: 15,
+			})
+			.reply(200, {
+				id: 151,
+				todo: 'Use DummyJSON in the project',
+				completed: false,
+				userId: 15,
+			});
+
+		//PUT
+		nock(baseUrl).put('/todos/10', { userId: '42' }).reply(200, {
+			id: 10,
+			todo: 'Have a football scrimmage with some friends',
+			completed: false,
+			userId: '42',
+		});
+
+		//PATCH
+		nock(baseUrl)
+			.patch('/products/1', '{"title":"iPhone 12"}')
+			.reply(200, {
+				id: 1,
+				title: 'iPhone 12',
+				price: 549,
+				stock: 94,
+				rating: 4.69,
+				images: [
+					'https://i.dummyjson.com/data/products/1/1.jpg',
+					'https://i.dummyjson.com/data/products/1/2.jpg',
+					'https://i.dummyjson.com/data/products/1/3.jpg',
+					'https://i.dummyjson.com/data/products/1/4.jpg',
+					'https://i.dummyjson.com/data/products/1/thumbnail.jpg',
+				],
+				thumbnail: 'https://i.dummyjson.com/data/products/1/thumbnail.jpg',
+				description: 'An apple mobile which is nothing like apple',
+				brand: 'Apple',
+				category: 'smartphones',
+			});
+
+		//DELETE
+		nock(baseUrl).delete('/todos/1').reply(200, {
+			id: 1,
+			todo: 'Do something nice for someone I care about',
+			completed: true,
+			userId: 26,
+			isDeleted: true,
+			deletedOn: '2023-02-09T05:37:31.720Z',
+		});
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.delete.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.delete.json
new file mode 100644
index 00000000000000..d3e7c61252f1b3
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.delete.json
@@ -0,0 +1,60 @@
+{
+	"name": "http request test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "12433cfb-74d9-4bf1-9afd-0ab9afc9ef19",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"method": "DELETE",
+				"url": "https://dummyjson.com/todos/1",
+				"options": {}
+			},
+			"id": "312e64ca-00bf-40e6-b21d-1f73930ef98c",
+			"name": "HTTP Request",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [1100, 360]
+		}
+	],
+	"pinData": {
+		"HTTP Request": [
+			{
+				"json": {
+					"id": 1,
+					"todo": "Do something nice for someone I care about",
+					"completed": true,
+					"userId": 26,
+					"isDeleted": true,
+					"deletedOn": "2023-02-09T05:37:31.720Z"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "HTTP Request",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "b1c4f6ef-0d15-49f3-b46d-447671b1583e",
+	"id": "108",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json
new file mode 100644
index 00000000000000..2615f4cfa1f6b7
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.get.json
@@ -0,0 +1,144 @@
+{
+	"name": "http request test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "12433cfb-74d9-4bf1-9afd-0ab9afc9ef19",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"url": "https://dummyjson.com/todos/1",
+				"options": {}
+			},
+			"id": "07670093-862f-403f-96a5-ddf7fdb0d225",
+			"name": "HTTP Request",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [1120, 100]
+		},
+		{
+			"parameters": {
+				"url": "https://dummyjson.com/todos/3",
+				"sendHeaders": true,
+				"headerParameters": {
+					"parameters": [
+						{
+							"name": "Authorization",
+							"value": "Bearer 12345"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "25cc4f31-9363-4247-a49d-7ac49f174d16",
+			"name": "HTTP Request fake header",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [1120, 440]
+		},
+		{
+			"parameters": {
+				"url": "https://dummyjson.com/todos",
+				"sendQuery": true,
+				"queryParameters": {
+					"parameters": [
+						{
+							"name": "limit",
+							"value": "2"
+						},
+						{
+							"name": "skip",
+							"value": "10"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "33c80933-b113-4eff-beb7-4a5b0bc30bcf",
+			"name": "HTTP Request with query",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [1120, 620]
+		}
+	],
+	"pinData": {
+		"HTTP Request": [
+			{
+				"json": {
+					"id": 1,
+					"todo": "Do something nice for someone I care about",
+					"completed": true,
+					"userId": 26
+				}
+			}
+		],
+		"HTTP Request with query": [
+			{
+				"json": {
+					"todos": [
+						{
+							"id": 11,
+							"todo": "Text a friend I haven't talked to in a long time",
+							"completed": false,
+							"userId": 39
+						},
+						{
+							"id": 12,
+							"todo": "Organize pantry",
+							"completed": true,
+							"userId": 39
+						}
+					],
+					"total": 150,
+					"skip": 10,
+					"limit": 2
+				}
+			}
+		],
+		"HTTP Request fake header": [
+			{
+				"json": {
+					"id": 3,
+					"todo": "Watch a classic movie",
+					"completed": false,
+					"userId": 4
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "HTTP Request",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "HTTP Request with query",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "HTTP Request fake header",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "0fb64565-22b3-4ff3-8ba4-354b2bcaf8a6",
+	"id": "108",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.patch.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.patch.json
new file mode 100644
index 00000000000000..8b176b0b761b5e
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.patch.json
@@ -0,0 +1,73 @@
+{
+	"name": "http request test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "12433cfb-74d9-4bf1-9afd-0ab9afc9ef19",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"method": "PATCH",
+				"url": "https://dummyjson.com/products/1",
+				"sendBody": true,
+				"specifyBody": "json",
+				"jsonBody": "{\"title\":\"iPhone 12\"}",
+				"options": {}
+			},
+			"id": "312e64ca-00bf-40e6-b21d-1f73930ef98c",
+			"name": "HTTP Request",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [1100, 360]
+		}
+	],
+	"pinData": {
+		"HTTP Request": [
+			{
+				"json": {
+					"id": 1,
+					"title": "iPhone 12",
+					"price": 549,
+					"stock": 94,
+					"rating": 4.69,
+					"images": [
+						"https://i.dummyjson.com/data/products/1/1.jpg",
+						"https://i.dummyjson.com/data/products/1/2.jpg",
+						"https://i.dummyjson.com/data/products/1/3.jpg",
+						"https://i.dummyjson.com/data/products/1/4.jpg",
+						"https://i.dummyjson.com/data/products/1/thumbnail.jpg"
+					],
+					"thumbnail": "https://i.dummyjson.com/data/products/1/thumbnail.jpg",
+					"description": "An apple mobile which is nothing like apple",
+					"brand": "Apple",
+					"category": "smartphones"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "HTTP Request",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "a49ffcc8-e61f-4fcd-93c0-c1c422d14b6c",
+	"id": "108",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.post.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.post.json
new file mode 100644
index 00000000000000..52fd70f50602bc
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.post.json
@@ -0,0 +1,105 @@
+{
+	"name": "http request test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "12433cfb-74d9-4bf1-9afd-0ab9afc9ef19",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [820, 360]
+		},
+		{
+			"parameters": {
+				"method": "POST",
+				"url": "https://dummyjson.com/todos/add",
+				"sendBody": true,
+				"bodyParameters": {
+					"parameters": [
+						{
+							"name": "todo",
+							"value": "Use DummyJSON in the project"
+						},
+						{
+							"name": "completed",
+							"value": "={{ false }}"
+						},
+						{
+							"name": "userId",
+							"value": "5"
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "07670093-862f-403f-96a5-ddf7fdb0d225",
+			"name": "HTTP Request",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [1140, 200]
+		},
+		{
+			"parameters": {
+				"method": "POST",
+				"url": "https://dummyjson.com/todos/add2",
+				"sendBody": true,
+				"specifyBody": "json",
+				"jsonBody": "{\"todo\":\"Use DummyJSON in the project\",\"completed\":false,\"userId\":15}",
+				"options": {}
+			},
+			"id": "db088210-2204-422c-823a-101afa464384",
+			"name": "HTTP Request1",
+			"type": "n8n-nodes-base.httpRequest",
+			"typeVersion": 3,
+			"position": [1140, 440]
+		}
+	],
+	"pinData": {
+		"HTTP Request": [
+			{
+				"json": {
+					"id": 151,
+					"todo": "Use DummyJSON in the project",
+					"completed": false,
+					"userId": "5"
+				}
+			}
+		],
+		"HTTP Request1": [
+			{
+				"json": {
+					"id": 151,
+					"todo": "Use DummyJSON in the project",
+					"completed": false,
+					"userId": 15
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "HTTP Request",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "HTTP Request1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "c5d9075a-6d1e-49d8-b16b-7df985ebda69",
+	"id": "108",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/HttpRequest/test/node/workflow.put.json b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.put.json
new file mode 100644
index 00000000000000..81ed96fb93356c
--- /dev/null
+++ b/packages/nodes-base/nodes/HttpRequest/test/node/workflow.put.json
@@ -0,0 +1,73 @@
+{
+  "name": "http request test",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "12433cfb-74d9-4bf1-9afd-0ab9afc9ef19",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        820,
+        360
+      ]
+    },
+    {
+      "parameters": {
+        "method": "PUT",
+        "url": "https://dummyjson.com/todos/10",
+        "sendBody": true,
+        "bodyParameters": {
+          "parameters": [
+            {
+              "name": "userId",
+              "value": "42"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "07670093-862f-403f-96a5-ddf7fdb0d225",
+      "name": "HTTP Request",
+      "type": "n8n-nodes-base.httpRequest",
+      "typeVersion": 3,
+      "position": [
+        1100,
+        360
+      ]
+    }
+  ],
+  "pinData": {
+    "HTTP Request": [
+      {
+        "json": {
+          "id": 10,
+          "todo": "Have a football scrimmage with some friends",
+          "completed": false,
+          "userId": "42"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "HTTP Request",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "209dd43e-fa03-4da7-94fb-cecf1974c5fe",
+  "id": "108",
+  "meta": {
+    "instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+  },
+  "tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 721cd5261454ad..457489e2b079d7 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -248,6 +248,20 @@ export const equalityTest = async (testData: WorkflowTestData, types: INodeTypes
 	expect(result.finished).toEqual(true);
 };
 
+const preparePinData = (pinData: IDataObject) => {
+	const returnData = Object.keys(pinData).reduce(
+		(acc, key) => {
+			const data = pinData[key] as IDataObject[];
+			acc[key] = [data as IDataObject[]];
+			return acc;
+		},
+		{} as {
+			[key: string]: IDataObject[][];
+		},
+	);
+	return returnData;
+};
+
 export const workflowToTests = (workflowFiles: string[]) => {
 	const testCases: WorkflowTestData[] = [];
 	for (const filePath of workflowFiles) {
@@ -256,16 +270,8 @@ export const workflowToTests = (workflowFiles: string[]) => {
 		if (workflowData.pinData === undefined) {
 			throw new Error('Workflow data does not contain pinData');
 		}
-		const nodeData = Object.keys(workflowData.pinData).reduce(
-			(acc, key) => {
-				const data = workflowData.pinData[key] as IDataObject[];
-				acc[key] = [data as IDataObject[]];
-				return acc;
-			},
-			{} as {
-				[key: string]: IDataObject[][];
-			},
-		);
+
+		const nodeData = preparePinData(workflowData.pinData);
 
 		delete workflowData.pinData;
 

From 9024e4dcc7d8969f2271d9392e9b85f4695b0edb Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:29:02 +0200
Subject: [PATCH 141/358] test(Stop and Error Node): Unit tests (no-changelog)

---
 .../test/node/StopAndError.test.ts            | 100 ++++++++++++++++++
 1 file changed, 100 insertions(+)
 create mode 100644 packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts

diff --git a/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
new file mode 100644
index 00000000000000..fd339562312be3
--- /dev/null
+++ b/packages/nodes-base/nodes/StopAndError/test/node/StopAndError.test.ts
@@ -0,0 +1,100 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import type { WorkflowTestData } from '../../../../test/nodes/types';
+import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow';
+import * as Helpers from '../../../../test/nodes/Helpers';
+import type { IDataObject } from 'n8n-workflow';
+
+describe('Execute Stop and Error Node', () => {
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'should run stopAndError node',
+			input: {
+				workflowData: {
+					nodes: [
+						{
+							parameters: {},
+							id: 'b1dcfb89-3dda-4d18-bdd6-c12d8dee70d2',
+							name: 'When clicking "Execute Workflow"',
+							type: 'n8n-nodes-base.manualTrigger',
+							typeVersion: 1,
+							position: [820, 400],
+						},
+						{
+							parameters: {
+								errorType: 'errorObject',
+								errorObject: '{\n"code": 404,\n"message": "error object from node"\n}',
+							},
+							id: '5dae596a-8956-4149-ba9d-36b6b5e80c4a',
+							name: 'Stop and Error1',
+							type: 'n8n-nodes-base.stopAndError',
+							typeVersion: 1,
+							position: [1080, 300],
+							continueOnFail: true,
+						},
+						{
+							parameters: {
+								errorMessage: 'error message from node',
+							},
+							id: '196ca8fe-994d-46aa-a0ed-bd9beeaa490e',
+							name: 'Stop and Error',
+							type: 'n8n-nodes-base.stopAndError',
+							typeVersion: 1,
+							position: [1080, 480],
+							continueOnFail: true,
+						},
+					],
+					connections: {
+						'When clicking "Execute Workflow"': {
+							main: [
+								[
+									{
+										node: 'Stop and Error1',
+										type: 'main',
+										index: 0,
+									},
+									{
+										node: 'Stop and Error',
+										type: 'main',
+										index: 0,
+									},
+								],
+							],
+						},
+					},
+				},
+			},
+			output: {
+				nodeExecutionOrder: ['Start'],
+				nodeData: {},
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			expect(result.finished).toBeUndefined();
+
+			const stopAndErrorRunData = result.data.resultData.runData['Stop and Error'];
+			const stopAndErrorMessage = (
+				(stopAndErrorRunData as unknown as IDataObject[])[0].error as IDataObject
+			).message;
+
+			expect(stopAndErrorMessage).toEqual('error message from node');
+
+			const stopAndError1RunData = result.data.resultData.runData['Stop and Error1'];
+			const stopAndError1Object = (
+				(stopAndError1RunData as unknown as IDataObject[])[0].error as IDataObject
+			).cause;
+
+			expect(stopAndError1Object).toEqual({
+				code: 404,
+				message: 'error object from node',
+				name: 'User-thrown error',
+			});
+		});
+	}
+});

From 0fb4d7fc19f41a7a5417483b3a2cfa7ca065023b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Feb 2023 11:45:32 +0100
Subject: [PATCH 142/358] fix(core): Stop creating icons directories
 (no-changelog) (#5431)

forgot to remove this in https://github.com/n8n-io/n8n/pull/5419
---
 packages/cli/src/LoadNodesAndCredentials.ts | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 21d7666c4c5c3a..478b5fe6d88c7a 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -63,9 +63,6 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
 		module.constructor._initPaths();
 
-		await mkdir(path.join(GENERATED_STATIC_DIR, 'icons/nodes'), { recursive: true });
-		await mkdir(path.join(GENERATED_STATIC_DIR, 'icons/credentials'), { recursive: true });
-
 		await this.loadNodesFromBasePackages();
 		await this.loadNodesFromDownloadedPackages();
 		await this.loadNodesFromCustomDirectories();

From 43abe225a0765ab9cf897719aed7e41c2a0a376e Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Thu, 9 Feb 2023 12:26:51 +0100
Subject: [PATCH 143/358] test(Rename Keys Node): Unit tests (no-changelog)
 (#5428)

Add test for Rename Keys node
---
 .../nodes/RenameKeys/test/RenameKeys.test.ts  |   5 +
 .../RenameKeys/test/RenameKeys.workflow.json  | 302 ++++++++++++++++++
 2 files changed, 307 insertions(+)
 create mode 100644 packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts
 create mode 100644 packages/nodes-base/nodes/RenameKeys/test/RenameKeys.workflow.json

diff --git a/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts
new file mode 100644
index 00000000000000..63446295bf7085
--- /dev/null
+++ b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Rename Keys Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.workflow.json b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.workflow.json
new file mode 100644
index 00000000000000..2d0f9852fc8a36
--- /dev/null
+++ b/packages/nodes-base/nodes/RenameKeys/test/RenameKeys.workflow.json
@@ -0,0 +1,302 @@
+{
+  "name": "node-268-node-unit-test-rename-keys",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "2057ea8b-4834-425f-8ca5-d810c20628fe",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        240,
+        320
+      ]
+    },
+    {
+      "parameters": {
+        "keys": {
+          "key": [
+            {
+              "currentKey": "=propertyName",
+              "newKey": "test"
+            }
+          ]
+        },
+        "additionalOptions": {}
+      },
+      "id": "c44432e0-47bd-43e9-aefe-819c01920dc0",
+      "name": "Rename Keys",
+      "type": "n8n-nodes-base.renameKeys",
+      "typeVersion": 1,
+      "position": [
+        700,
+        200
+      ]
+    },
+    {
+      "parameters": {
+        "values": {
+          "number": [
+            {}
+          ]
+        },
+        "options": {}
+      },
+      "id": "2e4f420d-1aac-408f-8585-4c332a68ae48",
+      "name": "Set",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 1,
+      "position": [
+        500,
+        200
+      ]
+    },
+    {
+      "parameters": {
+        "values": {
+          "number": [
+            {
+              "name": "propertyName.newPropertyName",
+              "value": 21
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "4a8bcf08-d16b-462b-9bb9-f1ab28c0cc88",
+      "name": "Set with dot notation",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 1,
+      "position": [
+        500,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "keys": {
+          "key": [
+            {
+              "currentKey": "=propertyName.newPropertyName",
+              "newKey": "test.dot"
+            }
+          ]
+        },
+        "additionalOptions": {}
+      },
+      "id": "3efdd843-74aa-478c-a1d3-66bd36e49b24",
+      "name": "Rename Keys with dot notation",
+      "type": "n8n-nodes-base.renameKeys",
+      "typeVersion": 1,
+      "position": [
+        700,
+        380
+      ]
+    },
+    {
+      "parameters": {
+        "values": {
+          "number": [
+            {
+              "name": "propertyName.newPropertyName",
+              "value": 21
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "3fae3aad-89ad-40c7-a49e-1ae1c4ddf999",
+      "name": "Set with undefined",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 1,
+      "position": [
+        500,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "keys": {
+          "key": [
+            {
+              "currentKey": "=propertyName.newPropertyName"
+            }
+          ]
+        },
+        "additionalOptions": {}
+      },
+      "id": "7d6f85d3-1847-409b-a0b4-ebbfbaa0dd19",
+      "name": "Rename Keys with undefined",
+      "type": "n8n-nodes-base.renameKeys",
+      "typeVersion": 1,
+      "position": [
+        700,
+        560
+      ]
+    },
+    {
+      "parameters": {
+        "values": {
+          "number": [
+            {
+              "name": "propertyName.newPropertyName"
+            },
+            {
+              "name": "regex"
+            }
+          ]
+        },
+        "options": {}
+      },
+      "id": "748143c8-cf83-4585-9f1c-1ef23911accb",
+      "name": "Set with dot notation1",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 1,
+      "position": [
+        500,
+        760
+      ]
+    },
+    {
+      "parameters": {
+        "additionalOptions": {
+          "regexReplacement": {
+            "replacements": [
+              {
+                "searchRegex": "reg",
+                "replaceRegex": "test",
+                "options": {}
+              }
+            ]
+          }
+        }
+      },
+      "id": "e47b7001-8270-43e7-a6ac-6bede047cfac",
+      "name": "Rename Keys with Regex",
+      "type": "n8n-nodes-base.renameKeys",
+      "typeVersion": 1,
+      "position": [
+        700,
+        760
+      ]
+    }
+  ],
+  "pinData": {
+    "Rename Keys": [
+      {
+        "json": {
+          "test": 0
+        }
+      }
+    ],
+    "Rename Keys with dot notation": [
+      {
+        "json": {
+          "propertyName": {},
+          "test": {
+            "dot": 21
+          }
+        }
+      }
+    ],
+    "Rename Keys with undefined": [
+      {
+        "json": {
+          "propertyName": {
+            "newPropertyName": 21
+          }
+        }
+      }
+    ],
+    "Rename Keys with Regex": [
+      {
+        "json": {
+          "propertyName": {
+            "newPropertyName": 0
+          },
+          "testex": 0
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Set",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Set with dot notation",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Set with undefined",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Set with dot notation1",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Set": {
+      "main": [
+        [
+          {
+            "node": "Rename Keys",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Set with dot notation": {
+      "main": [
+        [
+          {
+            "node": "Rename Keys with dot notation",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Set with undefined": {
+      "main": [
+        [
+          {
+            "node": "Rename Keys with undefined",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Set with dot notation1": {
+      "main": [
+        [
+          {
+            "node": "Rename Keys with Regex",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "cd3cd0a4-12ec-44a9-8cca-f0c4acd4b0cd",
+  "id": "231",
+  "meta": {
+    "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+  },
+  "tags": []
+}
\ No newline at end of file

From d4d55b068444a1899a3592f587bf772d74c95201 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:03:53 +0100
Subject: [PATCH 144/358] test(Crypto Node): Unit tests (no-changelog) (#5433)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add test to Crypto Node

* ✅ added test to generate random uuid

---------

Co-authored-by: Marcus <marcus@n8n.io>
---
 .../nodes/Crypto/test/Crypto.test.ts          |   5 +
 .../Crypto/test/CryptoTest.workflow.json      | 238 ++++++++++++++++++
 2 files changed, 243 insertions(+)
 create mode 100644 packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
 create mode 100644 packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json

diff --git a/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
new file mode 100644
index 00000000000000..c0eff05306df54
--- /dev/null
+++ b/packages/nodes-base/nodes/Crypto/test/Crypto.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Crypto Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json b/packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json
new file mode 100644
index 00000000000000..3b044757ab2faa
--- /dev/null
+++ b/packages/nodes-base/nodes/Crypto/test/CryptoTest.workflow.json
@@ -0,0 +1,238 @@
+{
+	"name": "review node unit tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "78f64c0f-d6a7-47fb-920d-5471fcd8caa1",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-2640,
+				4140
+			]
+		},
+		{
+			"parameters": {
+				"value": "=test"
+			},
+			"id": "90831322-8a73-40ac-ae52-84a6504d3d95",
+			"name": "Crypto Hash into Hex",
+			"type": "n8n-nodes-base.crypto",
+			"typeVersion": 1,
+			"position": [
+				-2120,
+				4140
+			]
+		},
+		{
+			"parameters": {
+				"value": "=test"
+			},
+			"id": "9836f128-6798-498e-8752-ba447218ce21",
+			"name": "Crypto Hash into MD5",
+			"type": "n8n-nodes-base.crypto",
+			"typeVersion": 1,
+			"position": [
+				-2120,
+				3980
+			]
+		},
+		{
+			"parameters": {
+				"action": "sign",
+				"value": "=test",
+				"algorithm": "RSA-MD4",
+				"encoding": "base64",
+				"privateKey": "-----BEGIN RSA PRIVATE KEY-----\nMIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8Qu\nKUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEm\no3qGy0t6z09AIJtH+5OeRV1be+N4cDYJKffGzDa88vQENZiRm0GRq6a+HPGQMd2k\nTQIhAKMSvzIBnni7ot/OSie2TmJLY4SwTQAevXysE2RbFDYdAiEBCUEaRQnMnbp7\n9mxDXDf6AU0cN/RPBjb9qSHDcWZHGzUCIG2Es59z8ugGrDY+pxLQnwfotadxd+Uy\nv/Ow5T0q5gIJAiEAyS4RaI9YG8EWx/2w0T67ZUVAw8eOMB6BIUg0Xcu+3okCIBOs\n/5OiPgoTdSy7bcF9IGpSE8ZgGKzgYQVZeN97YE00\n-----END RSA PRIVATE KEY-----"
+			},
+			"id": "4ec3781a-433d-4b68-bc94-3fbe6ed55a0e",
+			"name": "Crypto Sign data with RSA-MDA4",
+			"type": "n8n-nodes-base.crypto",
+			"typeVersion": 1,
+			"position": [
+				-2120,
+				3800
+			]
+		},
+		{
+			"parameters": {
+				"action": "hmac",
+				"value": "=test",
+				"secret": "-----BEGIN RSA PRIVATE KEY-----|MIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8QuKUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEmo3qGy0t6z09AIJtH+5OeRV1be+N4cDYJKffGzDa88vQENZiRm0GRq6a+HPGQMd2kTQIhAKMSvzIBnni7ot/OSie2TmJLY4SwTQAevXysE2RbFDYdAiEBCUEaRQnMnbp79mxDXDf6AU0cN/RPBjb9qSHDcWZHGzUCIG2Es59z8ugGrDY+pxLQnwfotadxd+Uyv/Ow5T0q5gIJAiEAyS4RaI9YG8EWx/2w0T67ZUVAw8eOMB6BIUg0Xcu+3okCIBOs/5OiPgoTdSy7bcF9IGpSE8ZgGKzgYQVZeN97YE00-----END RSA PRIVATE KEY-----",
+				"encoding": "base64"
+			},
+			"id": "797ba0d9-28e0-4494-bafd-d0603e85c303",
+			"name": "Crypto Hmac data with MD5",
+			"type": "n8n-nodes-base.crypto",
+			"typeVersion": 1,
+			"position": [
+				-2120,
+				3620
+			]
+		},
+		{
+			"parameters": {
+				"action": "generate"
+			},
+			"id": "a6682d88-0842-4884-9869-220597ac3d2a",
+			"name": "Crypto Generate UUID",
+			"type": "n8n-nodes-base.crypto",
+			"typeVersion": 1,
+			"position": [
+				-2120,
+				4320
+			]
+		},
+		{
+			"parameters": {
+				"conditions": {
+					"string": [
+						{
+							"value1": "={{ $json.data }}",
+							"operation": "regex",
+							"value2": "^[0-9a-fA-F]{8}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{4}\\b-[0-9a-fA-F]{12}$"
+						}
+					]
+				}
+			},
+			"id": "89297cfb-e119-45b8-87b4-021a8272534b",
+			"name": "IF",
+			"type": "n8n-nodes-base.if",
+			"typeVersion": 1,
+			"position": [
+				-1900,
+				4320
+			]
+		},
+		{
+			"parameters": {},
+			"id": "1954d932-2878-403d-ad16-373585dbe9cd",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [
+				-1680,
+				4300
+			]
+		},
+		{
+			"parameters": {
+				"errorMessage": "Not a valid uuid"
+			},
+			"id": "b1154e93-9d39-40c6-8ca6-aadc8103cfbd",
+			"name": "Stop and Error",
+			"type": "n8n-nodes-base.stopAndError",
+			"typeVersion": 1,
+			"position": [
+				-1680,
+				4500
+			]
+		}
+	],
+	"pinData": {
+		"Crypto Sign data with RSA-MDA4": [
+			{
+				"json": {
+					"data": "SmzCKZlC8g0EnB8cXbRJIdwsN8sDWIxtUEeMvwEJNfrrJynahyNkdIbdcTO/ciwH7aBFN+roa47J8QEYWDc6Dg=="
+				}
+			}
+		],
+		"Crypto Hash into MD5": [
+			{
+				"json": {
+					"data": "098f6bcd4621d373cade4e832627b4f6"
+				}
+			}
+		],
+		"Crypto Hash into Hex": [
+			{
+				"json": {
+					"data": "098f6bcd4621d373cade4e832627b4f6"
+				}
+			}
+		],
+		"Crypto Hmac data with MD5": [
+			{
+				"json": {
+					"data": "BBXLTeT2o/R6oy5H69Yh7w=="
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Crypto Hash into Hex",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Crypto Hash into MD5",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Crypto Sign data with RSA-MDA4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Crypto Hmac data with MD5",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Crypto Generate UUID",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Crypto Generate UUID": {
+			"main": [
+				[
+					{
+						"node": "IF",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"IF": {
+			"main": [
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Stop and Error",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"No Operation, do nothing": {
+			"main": [
+				[]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "399353bc-5707-41b2-8046-a55cdc69300d",
+	"id": "182",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file

From 172472664d6985ae79e3168e24c9a848317f08dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:52:41 +0100
Subject: [PATCH 145/358] ci: Upgrade dev tooling (no-changelog) (#5424)

* Typescript
* Jest
* Turborepo
* pnpm
---
 .github/workflows/test-workflows.yml |    2 +-
 package.json                         |   19 +-
 packages/cli/package.json            |    5 +-
 pnpm-lock.yaml                       | 1392 +++++++++-----------------
 4 files changed, 491 insertions(+), 927 deletions(-)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index d8392ef3c7c67c..7802f5d2c8e359 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -28,7 +28,7 @@ jobs:
 
       - uses: pnpm/action-setup@v2.2.4
         with:
-          version: 7.18.1
+          version: 7.27.0
 
       - name: Use Node.js ${{ matrix.node-version }}
         uses: actions/setup-node@v3
diff --git a/package.json b/package.json
index a50f6623fd7c91..85120a8a26726e 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "node": ">=16.9",
     "pnpm": ">=7.18"
   },
-  "packageManager": "pnpm@7.18.1",
+  "packageManager": "pnpm@7.27.0",
   "scripts": {
     "preinstall": "node scripts/block-npm-install.js",
     "build": "turbo run build",
@@ -44,9 +44,9 @@
     "cross-env": "^7.0.3",
     "cypress": "^10.0.3",
     "cypress-real-events": "^1.7.6",
-    "jest": "^29.3.1",
-    "jest-environment-jsdom": "^29.3.1",
-    "jest-mock": "^29.3.1",
+    "jest": "^29.4.2",
+    "jest-environment-jsdom": "^29.4.2",
+    "jest-mock": "^29.4.2",
     "nock": "^13.2.9",
     "node-fetch": "^2.6.7",
     "prettier": "^2.8.3",
@@ -54,10 +54,9 @@
     "run-script-os": "^1.0.7",
     "start-server-and-test": "^1.14.0",
     "supertest": "^6.3.3",
-    "ts-jest": "^29.0.3",
-    "tsc-watch": "^5.0.3",
-    "turbo": "1.6.3",
-    "typescript": "^4.8.4"
+    "ts-jest": "^29.0.5",
+    "tsc-watch": "^6.0.0",
+    "turbo": "1.7.4"
   },
   "pnpm": {
     "onlyBuiltDependencies": [
@@ -72,6 +71,8 @@
       "fork-ts-checker-webpack-plugin": "^6.0.4",
       "jsonwebtoken": "9.0.0",
       "prettier": "^2.8.3",
+      "ts-node": "^10.9.1",
+      "typescript": "^4.9.5",
       "cpy@8>globby": "^11.1.0",
       "qqjs>globby": "^11.1.0"
     },
@@ -79,4 +80,4 @@
       "element-ui@2.15.12": "patches/element-ui@2.15.12.patch"
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/cli/package.json b/packages/cli/package.json
index c9e26c90f33645..de112d189323cb 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -106,9 +106,8 @@
     "mock-jwks": "^1.0.9",
     "nodemon": "^2.0.2",
     "run-script-os": "^1.0.7",
-    "ts-node": "^9.1.1",
-    "tsc-alias": "^1.7.0",
-    "tsconfig-paths": "^3.14.1"
+    "tsc-alias": "^1.8.2",
+    "tsconfig-paths": "^4.1.2"
   },
   "dependencies": {
     "@n8n_io/license-sdk": "^1.8.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8b8ce519a6fe55..3c84eaa919fb4c 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -12,6 +12,8 @@ overrides:
   fork-ts-checker-webpack-plugin: ^6.0.4
   jsonwebtoken: 9.0.0
   prettier: ^2.8.3
+  ts-node: ^10.9.1
+  typescript: ^4.9.5
   cpy@8>globby: ^11.1.0
   qqjs>globby: ^11.1.0
 
@@ -31,9 +33,9 @@ importers:
       cross-env: ^7.0.3
       cypress: ^10.0.3
       cypress-real-events: ^1.7.6
-      jest: ^29.3.1
-      jest-environment-jsdom: ^29.3.1
-      jest-mock: ^29.3.1
+      jest: ^29.4.2
+      jest-environment-jsdom: ^29.4.2
+      jest-mock: ^29.4.2
       n8n: '*'
       nock: ^13.2.9
       node-fetch: ^2.6.7
@@ -42,10 +44,9 @@ importers:
       run-script-os: ^1.0.7
       start-server-and-test: ^1.14.0
       supertest: ^6.3.3
-      ts-jest: ^29.0.3
-      tsc-watch: ^5.0.3
-      turbo: 1.6.3
-      typescript: ^4.8.4
+      ts-jest: ^29.0.5
+      tsc-watch: ^6.0.0
+      turbo: 1.7.4
     dependencies:
       n8n: link:packages/cli
     devDependencies:
@@ -56,9 +57,9 @@ importers:
       cross-env: 7.0.3
       cypress: 10.11.0
       cypress-real-events: 1.7.6_cypress@10.11.0
-      jest: 29.3.1
-      jest-environment-jsdom: 29.3.1
-      jest-mock: 29.3.1
+      jest: 29.4.2
+      jest-environment-jsdom: 29.4.2
+      jest-mock: 29.4.2
       nock: 13.2.9
       node-fetch: 2.6.7
       prettier: 2.8.3
@@ -66,10 +67,9 @@ importers:
       run-script-os: 1.1.6
       start-server-and-test: 1.14.0
       supertest: 6.3.3
-      ts-jest: 29.0.3_s73gpqhbuwbfokcbq32jn3f4zi
-      tsc-watch: 5.0.3_typescript@4.8.4
-      turbo: 1.6.3
-      typescript: 4.8.4
+      ts-jest: 29.0.5_pa4ebk5usulsg7iw3zwjv5figy
+      tsc-watch: 6.0.0_typescript@4.9.4
+      turbo: 1.7.4
 
   packages/@n8n_io/eslint-config:
     specifiers:
@@ -230,9 +230,8 @@ importers:
       sse-channel: ^4.0.0
       swagger-ui-express: ^4.3.0
       syslog-client: ^1.1.1
-      ts-node: ^9.1.1
-      tsc-alias: ^1.7.0
-      tsconfig-paths: ^3.14.1
+      tsc-alias: ^1.8.2
+      tsconfig-paths: ^4.1.2
       typeorm: ^0.3.12
       uuid: ^8.3.2
       validator: 13.7.0
@@ -321,7 +320,7 @@ importers:
       sse-channel: 4.0.0
       swagger-ui-express: 4.5.0_express@4.18.2
       syslog-client: 1.1.1
-      typeorm: 0.3.12_a77gzgdqnod3rkvxniiwirlqsi
+      typeorm: 0.3.12_pgelcv6ef3switkrteavpif3pq
       uuid: 8.3.2
       validator: 13.7.0
       winston: 3.8.2
@@ -372,9 +371,8 @@ importers:
       mock-jwks: 1.0.9_nock@13.2.9
       nodemon: 2.0.20
       run-script-os: 1.1.6
-      ts-node: 9.1.1_typescript@4.9.4
-      tsc-alias: 1.7.1
-      tsconfig-paths: 3.14.1
+      tsc-alias: 1.8.2
+      tsconfig-paths: 4.1.2
 
   packages/core:
     specifiers:
@@ -692,7 +690,7 @@ importers:
       c8: 7.12.0
       jshint: 2.13.5
       sass: 1.55.0
-      sass-loader: 10.3.1_sass@1.55.0+webpack@5.74.0
+      sass-loader: 10.3.1_sass@1.55.0+webpack@4.46.0
       string-template-parser: 1.2.6
       vite: 4.0.4_sass@1.55.0+terser@5.16.1
       vite-plugin-monaco-editor: 1.1.0_monaco-editor@0.33.0
@@ -1259,11 +1257,6 @@ packages:
       '@babel/highlight': 7.18.6
     dev: true
 
-  /@babel/compat-data/7.19.4:
-    resolution: {integrity: sha512-CHIGpJcUQ5lU9KrPHTjBMhVwQG6CQjxfg36fGXl3qk/Gik1WwWachaXFuo0uCWJT/mStOKtcbFJCaVLihC1CMw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/compat-data/7.20.10:
     resolution: {integrity: sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==}
     engines: {node: '>=6.9.0'}
@@ -1293,29 +1286,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/core/7.19.3:
-    resolution: {integrity: sha512-WneDJxdsjEvyKtXKsaBGbDeiyOjR5vYq4HcShxnIbG0qixpoHjI3MqeZM9NDvsojNCEBItQE4juOo/bU6e72gQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@ampproject/remapping': 2.2.0
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.19.5
-      '@babel/helper-compilation-targets': 7.19.3_@babel+core@7.19.3
-      '@babel/helper-module-transforms': 7.19.0
-      '@babel/helpers': 7.19.4
-      '@babel/parser': 7.20.7
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.19.4
-      '@babel/types': 7.20.7
-      convert-source-map: 1.9.0
-      debug: 4.3.4
-      gensync: 1.0.0-beta.2
-      json5: 2.2.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/core/7.20.12:
     resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==}
     engines: {node: '>=6.9.0'}
@@ -1339,15 +1309,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/generator/7.19.5:
-    resolution: {integrity: sha512-DxbNz9Lz4aMZ99qPpO1raTbcrI1ZeYh+9NR9qhfkQIbFtVEqotHojEBxHzmxhVONkGt6VyrqVQcgpefMy9pqcg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-      '@jridgewell/gen-mapping': 0.3.2
-      jsesc: 2.5.2
-    dev: true
-
   /@babel/generator/7.20.7:
     resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==}
     engines: {node: '>=6.9.0'}
@@ -1372,19 +1333,6 @@ packages:
       '@babel/types': 7.20.7
     dev: true
 
-  /@babel/helper-compilation-targets/7.19.3_@babel+core@7.19.3:
-    resolution: {integrity: sha512-65ESqLGyGmLvgR0mst5AdW1FkNlj9rQsCKduzEoEPhBCDFGXvz2jW6bXFG6i0/MrV2s7hhXjjb2yAzcPuQlLwg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-    dependencies:
-      '@babel/compat-data': 7.19.4
-      '@babel/core': 7.19.3
-      '@babel/helper-validator-option': 7.18.6
-      browserslist: 4.21.4
-      semver: 6.3.0
-    dev: true
-
   /@babel/helper-compilation-targets/7.20.7_@babel+core@7.20.12:
     resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==}
     engines: {node: '>=6.9.0'}
@@ -1504,22 +1452,6 @@ packages:
       '@babel/types': 7.20.7
     dev: true
 
-  /@babel/helper-module-transforms/7.19.0:
-    resolution: {integrity: sha512-3HBZ377Fe14RbLIA+ac3sY4PTgpxHVkFrESaWhoI5PuyXPBBX8+C34qblV9G89ZtycGJCmCI/Ut+VUDK4bltNQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-simple-access': 7.19.4
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/helper-validator-identifier': 7.19.1
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.19.4
-      '@babel/types': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-module-transforms/7.20.11:
     resolution: {integrity: sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==}
     engines: {node: '>=6.9.0'}
@@ -1547,11 +1479,6 @@ packages:
     resolution: {integrity: sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==}
     dev: true
 
-  /@babel/helper-plugin-utils/7.19.0:
-    resolution: {integrity: sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/helper-plugin-utils/7.20.2:
     resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
     engines: {node: '>=6.9.0'}
@@ -1586,13 +1513,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helper-simple-access/7.19.4:
-    resolution: {integrity: sha512-f9Xq6WqBFqaDfbCzn2w85hwklswz5qsKlh7f08w4Y9yhJHpnNC0QemtSkK5YyOY8kPGvyiwdzZksGUhnGdaUIg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/types': 7.20.7
-    dev: true
-
   /@babel/helper-simple-access/7.20.2:
     resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==}
     engines: {node: '>=6.9.0'}
@@ -1639,17 +1559,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/helpers/7.19.4:
-    resolution: {integrity: sha512-G+z3aOx2nfDHwX/kyVii5fJq+bgscg89/dJNWpYeKeBv3v9xX8EIabmx1k6u9LS04H7nROFVRVK+e3k0VHp+sw==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/template': 7.18.10
-      '@babel/traverse': 7.19.4
-      '@babel/types': 7.20.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helpers/7.20.7:
     resolution: {integrity: sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==}
     engines: {node: '>=6.9.0'}
@@ -1840,7 +1749,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.10.4
+      '@babel/helper-plugin-utils': 7.20.2
       '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.12.9
       '@babel/plugin-transform-parameters': 7.20.7_@babel+core@7.12.9
     dev: true
@@ -1921,15 +1830,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.19.3:
-    resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-async-generators/7.8.4_@babel+core@7.20.12:
     resolution: {integrity: sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==}
     peerDependencies:
@@ -1939,21 +1839,12 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.19.3:
+  /@babel/plugin-syntax-bigint/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-class-properties/7.12.13_@babel+core@7.19.3:
-    resolution: {integrity: sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
@@ -2034,21 +1925,12 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.19.3:
+  /@babel/plugin-syntax-import-meta/7.10.4_@babel+core@7.20.12:
     resolution: {integrity: sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==}
     peerDependencies:
       '@babel/core': ^7.0.0-0
     dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-json-strings/7.8.3_@babel+core@7.19.3:
-    resolution: {integrity: sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
+      '@babel/core': 7.20.12
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
@@ -2070,16 +1952,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.19.3:
-    resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
   /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
@@ -2087,15 +1959,6 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
-  /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.19.3:
-    resolution: {integrity: sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
@@ -2108,15 +1971,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.19.3:
-    resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-nullish-coalescing-operator/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==}
     peerDependencies:
@@ -2126,15 +1980,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.19.3:
-    resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-numeric-separator/7.10.4_@babel+core@7.20.12:
     resolution: {integrity: sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==}
     peerDependencies:
@@ -2153,15 +1998,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.19.3:
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
@@ -2171,15 +2007,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.19.3:
-    resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-optional-catch-binding/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==}
     peerDependencies:
@@ -2189,15 +2016,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.19.3:
-    resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-optional-chaining/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==}
     peerDependencies:
@@ -2217,16 +2035,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.19.3:
-    resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-top-level-await/7.14.5_@babel+core@7.20.12:
     resolution: {integrity: sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==}
     engines: {node: '>=6.9.0'}
@@ -2237,16 +2045,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-typescript/7.18.6_@babel+core@7.19.3:
-    resolution: {integrity: sha512-mAWAuq4rvOepWCBid55JuRNvpTNf2UGVgoz4JV0fXEKolsVZDzsa4NqCef758WZJj/GDu0gVGItjKFiClTAmZA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.19.3
-      '@babel/helper-plugin-utils': 7.19.0
-    dev: true
-
   /@babel/plugin-syntax-typescript/7.20.0_@babel+core@7.20.12:
     resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==}
     engines: {node: '>=6.9.0'}
@@ -2877,15 +2675,6 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/template/7.18.10:
-    resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
-    dev: true
-
   /@babel/template/7.20.7:
     resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==}
     engines: {node: '>=6.9.0'}
@@ -2895,24 +2684,6 @@ packages:
       '@babel/types': 7.20.7
     dev: true
 
-  /@babel/traverse/7.19.4:
-    resolution: {integrity: sha512-w3K1i+V5u2aJUOXBFFC5pveFLmtq1s3qcdDNC2qRI6WPBQIDaKFqXxDEqDO/h1dQ3HjsZoZMyIy6jGLq0xtw+g==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.19.5
-      '@babel/helper-environment-visitor': 7.18.9
-      '@babel/helper-function-name': 7.19.0
-      '@babel/helper-hoist-variables': 7.18.6
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/parser': 7.20.7
-      '@babel/types': 7.20.7
-      debug: 4.3.4
-      globals: 11.12.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/traverse/7.20.12:
     resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==}
     engines: {node: '>=6.9.0'}
@@ -3420,20 +3191,20 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /@jest/console/29.3.1:
-    resolution: {integrity: sha512-IRE6GD47KwcqA09RIWrabKdHPiKDGgtAL31xDxbi/RjQMsr+lY+ppxmHwY0dUEV3qvvxZzoe5Hl0RXZJOjQNUg==}
+  /@jest/console/29.4.2:
+    resolution: {integrity: sha512-0I/rEJwMpV9iwi9cDEnT71a5nNGK9lj8Z4+1pRAU2x/thVXCDnaTGrvxyK+cAqZTFVFCiR+hfVrP4l2m+dCmQg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
       chalk: 4.1.2
-      jest-message-util: 29.3.1
-      jest-util: 29.3.1
+      jest-message-util: 29.4.2
+      jest-util: 29.4.2
       slash: 3.0.0
     dev: true
 
-  /@jest/core/29.3.1:
-    resolution: {integrity: sha512-0ohVjjRex985w5MmO5L3u5GR1O30DexhBSpuwx2P+9ftyqHdJXnk7IUWiP80oHMvt7ubHCJHxV0a0vlKVuZirw==}
+  /@jest/core/29.4.2:
+    resolution: {integrity: sha512-KGuoQah0P3vGNlaS/l9/wQENZGNKGoWb+OPxh3gz+YzG7/XExvYu34MzikRndQCdM2S0tzExN4+FL37i6gZmCQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -3441,32 +3212,32 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/console': 29.3.1
-      '@jest/reporters': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/console': 29.4.2
+      '@jest/reporters': 29.4.2
+      '@jest/test-result': 29.4.2
+      '@jest/transform': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
       ansi-escapes: 4.3.2
       chalk: 4.1.2
-      ci-info: 3.5.0
+      ci-info: 3.7.1
       exit: 0.1.2
       graceful-fs: 4.2.10
-      jest-changed-files: 29.2.0
-      jest-config: 29.3.1_@types+node@16.18.12
-      jest-haste-map: 29.3.1
-      jest-message-util: 29.3.1
-      jest-regex-util: 29.2.0
-      jest-resolve: 29.3.1
-      jest-resolve-dependencies: 29.3.1
-      jest-runner: 29.3.1
-      jest-runtime: 29.3.1
-      jest-snapshot: 29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
-      jest-watcher: 29.3.1
+      jest-changed-files: 29.4.2
+      jest-config: 29.4.2_@types+node@16.18.12
+      jest-haste-map: 29.4.2
+      jest-message-util: 29.4.2
+      jest-regex-util: 29.4.2
+      jest-resolve: 29.4.2
+      jest-resolve-dependencies: 29.4.2
+      jest-runner: 29.4.2
+      jest-runtime: 29.4.2
+      jest-snapshot: 29.4.2
+      jest-util: 29.4.2
+      jest-validate: 29.4.2
+      jest-watcher: 29.4.2
       micromatch: 4.0.5
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
       slash: 3.0.0
       strip-ansi: 6.0.1
     transitivePeerDependencies:
@@ -3474,59 +3245,66 @@ packages:
       - ts-node
     dev: true
 
-  /@jest/environment/29.3.1:
-    resolution: {integrity: sha512-pMmvfOPmoa1c1QpfFW0nXYtNLpofqo4BrCIk6f2kW4JFeNlHV2t3vd+3iDLf31e2ot2Mec0uqZfmI+U0K2CFag==}
+  /@jest/environment/29.4.2:
+    resolution: {integrity: sha512-JKs3VUtse0vQfCaFGJRX1bir9yBdtasxziSyu+pIiEllAQOe4oQhdCYIf3+Lx+nGglFktSKToBnRJfD5QKp+NQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/fake-timers': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/fake-timers': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
-      jest-mock: 29.3.1
+      jest-mock: 29.4.2
     dev: true
 
   /@jest/expect-utils/29.3.1:
     resolution: {integrity: sha512-wlrznINZI5sMjwvUoLVk617ll/UYfGIZNxmbU+Pa7wmkL4vYzhV9R2pwVqUh4NWWuLQWkI8+8mOkxs//prKQ3g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 29.2.0
+      jest-get-type: 29.4.2
     dev: true
 
-  /@jest/expect/29.3.1:
-    resolution: {integrity: sha512-QivM7GlSHSsIAWzgfyP8dgeExPRZ9BIe2LsdPyEhCGkZkoyA+kGsoIzbKAfZCvvRzfZioKwPtCZIt5SaoxYCvg==}
+  /@jest/expect-utils/29.4.2:
+    resolution: {integrity: sha512-Dd3ilDJpBnqa0GiPN7QrudVs0cczMMHtehSo2CSTjm3zdHx0RcpmhFNVEltuEFeqfLIyWKFI224FsMSQ/nsJQA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      expect: 29.3.1
-      jest-snapshot: 29.3.1
+      jest-get-type: 29.4.2
+    dev: true
+
+  /@jest/expect/29.4.2:
+    resolution: {integrity: sha512-NUAeZVApzyaeLjfWIV/64zXjA2SS+NuUPHpAlO7IwVMGd5Vf9szTl9KEDlxY3B4liwLO31os88tYNHl6cpjtKQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      expect: 29.4.2
+      jest-snapshot: 29.4.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@jest/fake-timers/29.3.1:
-    resolution: {integrity: sha512-iHTL/XpnDlFki9Tq0Q1GGuVeQ8BHZGIYsvCO5eN/O/oJaRzofG9Xndd9HuSDBI/0ZS79pg0iwn07OMTQ7ngF2A==}
+  /@jest/fake-timers/29.4.2:
+    resolution: {integrity: sha512-Ny1u0Wg6kCsHFWq7A/rW/tMhIedq2siiyHyLpHCmIhP7WmcAmd2cx95P+0xtTZlj5ZbJxIRQi4OPydZZUoiSQQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
-      '@sinonjs/fake-timers': 9.1.2
+      '@jest/types': 29.4.2
+      '@sinonjs/fake-timers': 10.0.2
       '@types/node': 16.18.12
-      jest-message-util: 29.3.1
-      jest-mock: 29.3.1
-      jest-util: 29.3.1
+      jest-message-util: 29.4.2
+      jest-mock: 29.4.2
+      jest-util: 29.4.2
     dev: true
 
-  /@jest/globals/29.3.1:
-    resolution: {integrity: sha512-cTicd134vOcwO59OPaB6AmdHQMCtWOe+/DitpTZVxWgMJ+YvXL1HNAmPyiGbSHmF/mXVBkvlm8YYtQhyHPnV6Q==}
+  /@jest/globals/29.4.2:
+    resolution: {integrity: sha512-zCk70YGPzKnz/I9BNFDPlK+EuJLk21ur/NozVh6JVM86/YYZtZHqxFFQ62O9MWq7uf3vIZnvNA0BzzrtxD9iyg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/expect': 29.3.1
-      '@jest/types': 29.3.1
-      jest-mock: 29.3.1
+      '@jest/environment': 29.4.2
+      '@jest/expect': 29.4.2
+      '@jest/types': 29.4.2
+      jest-mock: 29.4.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@jest/reporters/29.3.1:
-    resolution: {integrity: sha512-GhBu3YFuDrcAYW/UESz1JphEAbvUjaY2vShRZRoRY1mxpCMB3yGSJ4j9n0GxVlEOdCf7qjvUfBCrTUUqhVfbRA==}
+  /@jest/reporters/29.4.2:
+    resolution: {integrity: sha512-10yw6YQe75zCgYcXgEND9kw3UZZH5tJeLzWv4vTk/2mrS1aY50A37F+XT2hPO5OqQFFnUWizXD8k1BMiATNfUw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       node-notifier: ^8.0.1 || ^9.0.0 || ^10.0.0
@@ -3535,11 +3313,11 @@ packages:
         optional: true
     dependencies:
       '@bcoe/v8-coverage': 0.2.3
-      '@jest/console': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
-      '@jridgewell/trace-mapping': 0.3.16
+      '@jest/console': 29.4.2
+      '@jest/test-result': 29.4.2
+      '@jest/transform': 29.4.2
+      '@jest/types': 29.4.2
+      '@jridgewell/trace-mapping': 0.3.17
       '@types/node': 16.18.12
       chalk: 4.1.2
       collect-v8-coverage: 1.0.1
@@ -3551,9 +3329,9 @@ packages:
       istanbul-lib-report: 3.0.0
       istanbul-lib-source-maps: 4.0.1
       istanbul-reports: 3.1.5
-      jest-message-util: 29.3.1
-      jest-util: 29.3.1
-      jest-worker: 29.3.1
+      jest-message-util: 29.4.2
+      jest-util: 29.4.2
+      jest-worker: 29.4.2
       slash: 3.0.0
       string-length: 4.0.2
       strip-ansi: 6.0.1
@@ -3569,32 +3347,39 @@ packages:
       '@sinclair/typebox': 0.24.51
     dev: true
 
-  /@jest/source-map/29.2.0:
-    resolution: {integrity: sha512-1NX9/7zzI0nqa6+kgpSdKPK+WU1p+SJk3TloWZf5MzPbxri9UEeXX5bWZAPCzbQcyuAzubcdUHA7hcNznmRqWQ==}
+  /@jest/schemas/29.4.2:
+    resolution: {integrity: sha512-ZrGzGfh31NtdVH8tn0mgJw4khQuNHiKqdzJAFbCaERbyCP9tHlxWuL/mnMu8P7e/+k4puWjI1NOzi/sFsjce/g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@sinclair/typebox': 0.25.21
+    dev: true
+
+  /@jest/source-map/29.4.2:
+    resolution: {integrity: sha512-tIoqV5ZNgYI9XCKXMqbYe5JbumcvyTgNN+V5QW4My033lanijvCD0D4PI9tBw4pRTqWOc00/7X3KVvUh+qnF4Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jridgewell/trace-mapping': 0.3.16
+      '@jridgewell/trace-mapping': 0.3.17
       callsites: 3.1.0
       graceful-fs: 4.2.10
     dev: true
 
-  /@jest/test-result/29.3.1:
-    resolution: {integrity: sha512-qeLa6qc0ddB0kuOZyZIhfN5q0e2htngokyTWsGriedsDhItisW7SDYZ7ceOe57Ii03sL988/03wAcBh3TChMGw==}
+  /@jest/test-result/29.4.2:
+    resolution: {integrity: sha512-HZsC3shhiHVvMtP+i55MGR5bPcc3obCFbA5bzIOb8pCjwBZf11cZliJncCgaVUbC5yoQNuGqCkC0Q3t6EItxZA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/console': 29.4.2
+      '@jest/types': 29.4.2
       '@types/istanbul-lib-coverage': 2.0.4
       collect-v8-coverage: 1.0.1
     dev: true
 
-  /@jest/test-sequencer/29.3.1:
-    resolution: {integrity: sha512-IqYvLbieTv20ArgKoAMyhLHNrVHJfzO6ARZAbQRlY4UGWfdDnLlZEF0BvKOMd77uIiIjSZRwq3Jb3Fa3I8+2UA==}
+  /@jest/test-sequencer/29.4.2:
+    resolution: {integrity: sha512-9Z2cVsD6CcObIVrWigHp2McRJhvCxL27xHtrZFgNC1RwnoSpDx6fZo8QYjJmziFlW9/hr78/3sxF54S8B6v8rg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.3.1
+      '@jest/test-result': 29.4.2
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
+      jest-haste-map: 29.4.2
       slash: 3.0.0
     dev: true
 
@@ -3621,21 +3406,21 @@ packages:
       - supports-color
     dev: true
 
-  /@jest/transform/29.3.1:
-    resolution: {integrity: sha512-8wmCFBTVGYqFNLWfcOWoVuMuKYPUBTnTMDkdvFtAYELwDOl9RGwOsvQWGPFxDJ8AWY9xM/8xCXdqmPK3+Q5Lug==}
+  /@jest/transform/29.4.2:
+    resolution: {integrity: sha512-kf1v5iTJHn7p9RbOsBuc/lcwyPtJaZJt5885C98omWz79NIeD3PfoiiaPSu7JyCyFzNOIzKhmMhQLUhlTL9BvQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.19.3
-      '@jest/types': 29.3.1
-      '@jridgewell/trace-mapping': 0.3.16
+      '@babel/core': 7.20.12
+      '@jest/types': 29.4.2
+      '@jridgewell/trace-mapping': 0.3.17
       babel-plugin-istanbul: 6.1.1
       chalk: 4.1.2
       convert-source-map: 2.0.0
       fast-json-stable-stringify: 2.1.0
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
-      jest-regex-util: 29.2.0
-      jest-util: 29.3.1
+      jest-haste-map: 29.4.2
+      jest-regex-util: 29.4.2
+      jest-util: 29.4.2
       micromatch: 4.0.5
       pirates: 4.0.5
       slash: 3.0.0
@@ -3659,7 +3444,19 @@ packages:
     resolution: {integrity: sha512-d0S0jmmTpjnhCmNpApgX3jrUZgZ22ivKJRvL2lli5hpCRoNnp1f85r2/wpKfXuYu8E7Jjh1hGfhPyup1NM5AmA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/schemas': 29.0.0
+      '@jest/schemas': 29.4.2
+      '@types/istanbul-lib-coverage': 2.0.4
+      '@types/istanbul-reports': 3.0.1
+      '@types/node': 16.18.12
+      '@types/yargs': 17.0.19
+      chalk: 4.1.2
+    dev: true
+
+  /@jest/types/29.4.2:
+    resolution: {integrity: sha512-CKlngyGP0fwlgC1BRUtPZSiWLBhyS9dKwKmyGxk8Z6M82LBEGB2aLQSg+U1MyLsU+M7UjnlLllBM2BLWKVm/Uw==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/schemas': 29.4.2
       '@types/istanbul-lib-coverage': 2.0.4
       '@types/istanbul-reports': 3.0.1
       '@types/node': 16.18.12
@@ -3705,13 +3502,6 @@ packages:
     resolution: {integrity: sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==}
     dev: true
 
-  /@jridgewell/trace-mapping/0.3.16:
-    resolution: {integrity: sha512-LCQ+NeThyJ4k1W2d+vIKdxuSt9R3pQSZ4P92m7EakaYuXcVWbHuT5bjNcqLd4Rdgi6xYWYDvBJZJLZSLanjDcA==}
-    dependencies:
-      '@jridgewell/resolve-uri': 3.1.0
-      '@jridgewell/sourcemap-codec': 1.4.14
-    dev: true
-
   /@jridgewell/trace-mapping/0.3.17:
     resolution: {integrity: sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==}
     dependencies:
@@ -4354,16 +4144,20 @@ packages:
     resolution: {integrity: sha512-1P1OROm/rdubP5aFDSZQILU0vrLCJ4fvHt6EoqHEM+2D/G5MK3bIaymUKLit8Js9gbns5UyJnkP/TZROLw4tUA==}
     dev: true
 
-  /@sinonjs/commons/1.8.3:
-    resolution: {integrity: sha512-xkNcLAn/wZaX14RPlwizcKicDk9G3F8m2nU3L7Ukm5zBgTwiT0wsoFAHx9Jq56fJA1z/7uKGtCRu16sOUCLIHQ==}
+  /@sinclair/typebox/0.25.21:
+    resolution: {integrity: sha512-gFukHN4t8K4+wVC+ECqeqwzBDeFeTzBXroBTqE6vcWrQGbEUpHO7LYdG0f4xnvYq4VOEwITSlHlp0JBAIFMS/g==}
+    dev: true
+
+  /@sinonjs/commons/2.0.0:
+    resolution: {integrity: sha512-uLa0j859mMrg2slwQYdO/AkrOfmH+X6LTVmNTS9CqexuE2IvVORIkSpJLqePAbEnKJ77aMmCwr1NUZ57120Xcg==}
     dependencies:
       type-detect: 4.0.8
     dev: true
 
-  /@sinonjs/fake-timers/9.1.2:
-    resolution: {integrity: sha512-BPS4ynJW/o92PUR4wgriz2Ud5gpST5vz6GQfMixEDK0Z8ZCUv2M7SkBLykH56T++Xs+8ln9zTGbOvNGIe02/jw==}
+  /@sinonjs/fake-timers/10.0.2:
+    resolution: {integrity: sha512-SwUDyjWnah1AaNl7kxsa7cfLhlTYoiyhDAIgyh+El30YvXs/o7OLXpYH88Zdhyx9JExKrmHDJ+10bwIcY80Jmw==}
     dependencies:
-      '@sinonjs/commons': 1.8.3
+      '@sinonjs/commons': 2.0.0
     dev: true
 
   /@sqltools/formatter/1.2.5:
@@ -5992,13 +5786,6 @@ packages:
       '@types/node': 16.18.12
     dev: false
 
-  /@types/eslint-scope/3.7.4:
-    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
-    dependencies:
-      '@types/eslint': 8.4.6
-      '@types/estree': 1.0.0
-    dev: true
-
   /@types/eslint/8.4.6:
     resolution: {integrity: sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==}
     dependencies:
@@ -6006,10 +5793,6 @@ packages:
       '@types/json-schema': 7.0.11
     dev: true
 
-  /@types/estree/0.0.51:
-    resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
-    dev: true
-
   /@types/estree/1.0.0:
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
@@ -6068,12 +5851,6 @@ packages:
       '@types/node': 16.18.12
     dev: true
 
-  /@types/graceful-fs/4.1.5:
-    resolution: {integrity: sha512-anKkLmZZ+xm4p8JWBf4hElkM4XR+EZeA2M9BAkkTldmcyDY4mbdIJnRghDJH3Ov5ooY7/UAoENtmdMSkaAd7Cw==}
-    dependencies:
-      '@types/node': 16.18.12
-    dev: true
-
   /@types/graceful-fs/4.1.6:
     resolution: {integrity: sha512-Sig0SNORX9fdW+bQuTEovKj3uHcUL6LQKbCrrqb1X7J6/ReAbhCXRAhc+SMejhLELFj2QcyuxmUooZ4bt5ReSw==}
     dependencies:
@@ -6145,7 +5922,7 @@ packages:
     resolution: {integrity: sha512-H2cSxkKgVmqNHXP7TC2L/WUorrZu8ZigyRywfVzv6EyBlxj39n4C00hjXYQWsbwqgElaj/CiAeSRmk5GoaKTgw==}
     dependencies:
       expect: 29.3.1
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
     dev: true
 
   /@types/jmespath/0.15.0:
@@ -7108,13 +6885,6 @@ packages:
       vue-template-compiler: 2.7.14
     dev: true
 
-  /@webassemblyjs/ast/1.11.1:
-    resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
-    dependencies:
-      '@webassemblyjs/helper-numbers': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-    dev: true
-
   /@webassemblyjs/ast/1.9.0:
     resolution: {integrity: sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==}
     dependencies:
@@ -7123,26 +6893,14 @@ packages:
       '@webassemblyjs/wast-parser': 1.9.0
     dev: true
 
-  /@webassemblyjs/floating-point-hex-parser/1.11.1:
-    resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==}
-    dev: true
-
   /@webassemblyjs/floating-point-hex-parser/1.9.0:
     resolution: {integrity: sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==}
     dev: true
 
-  /@webassemblyjs/helper-api-error/1.11.1:
-    resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==}
-    dev: true
-
   /@webassemblyjs/helper-api-error/1.9.0:
     resolution: {integrity: sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==}
     dev: true
 
-  /@webassemblyjs/helper-buffer/1.11.1:
-    resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==}
-    dev: true
-
   /@webassemblyjs/helper-buffer/1.9.0:
     resolution: {integrity: sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==}
     dev: true
@@ -7163,31 +6921,10 @@ packages:
       '@webassemblyjs/ast': 1.9.0
     dev: true
 
-  /@webassemblyjs/helper-numbers/1.11.1:
-    resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==}
-    dependencies:
-      '@webassemblyjs/floating-point-hex-parser': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
-      '@xtuc/long': 4.2.2
-    dev: true
-
-  /@webassemblyjs/helper-wasm-bytecode/1.11.1:
-    resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==}
-    dev: true
-
   /@webassemblyjs/helper-wasm-bytecode/1.9.0:
     resolution: {integrity: sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==}
     dev: true
 
-  /@webassemblyjs/helper-wasm-section/1.11.1:
-    resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-    dev: true
-
   /@webassemblyjs/helper-wasm-section/1.9.0:
     resolution: {integrity: sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==}
     dependencies:
@@ -7197,51 +6934,22 @@ packages:
       '@webassemblyjs/wasm-gen': 1.9.0
     dev: true
 
-  /@webassemblyjs/ieee754/1.11.1:
-    resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==}
-    dependencies:
-      '@xtuc/ieee754': 1.2.0
-    dev: true
-
   /@webassemblyjs/ieee754/1.9.0:
     resolution: {integrity: sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==}
     dependencies:
       '@xtuc/ieee754': 1.2.0
     dev: true
 
-  /@webassemblyjs/leb128/1.11.1:
-    resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==}
-    dependencies:
-      '@xtuc/long': 4.2.2
-    dev: true
-
   /@webassemblyjs/leb128/1.9.0:
     resolution: {integrity: sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==}
     dependencies:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/utf8/1.11.1:
-    resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==}
-    dev: true
-
   /@webassemblyjs/utf8/1.9.0:
     resolution: {integrity: sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==}
     dev: true
 
-  /@webassemblyjs/wasm-edit/1.11.1:
-    resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/helper-wasm-section': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-opt': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      '@webassemblyjs/wast-printer': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-edit/1.9.0:
     resolution: {integrity: sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==}
     dependencies:
@@ -7255,16 +6963,6 @@ packages:
       '@webassemblyjs/wast-printer': 1.9.0
     dev: true
 
-  /@webassemblyjs/wasm-gen/1.11.1:
-    resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-gen/1.9.0:
     resolution: {integrity: sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==}
     dependencies:
@@ -7275,15 +6973,6 @@ packages:
       '@webassemblyjs/utf8': 1.9.0
     dev: true
 
-  /@webassemblyjs/wasm-opt/1.11.1:
-    resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-opt/1.9.0:
     resolution: {integrity: sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==}
     dependencies:
@@ -7293,17 +6982,6 @@ packages:
       '@webassemblyjs/wasm-parser': 1.9.0
     dev: true
 
-  /@webassemblyjs/wasm-parser/1.11.1:
-    resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-parser/1.9.0:
     resolution: {integrity: sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==}
     dependencies:
@@ -7326,13 +7004,6 @@ packages:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/wast-printer/1.11.1:
-    resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@xtuc/long': 4.2.2
-    dev: true
-
   /@webassemblyjs/wast-printer/1.9.0:
     resolution: {integrity: sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==}
     dependencies:
@@ -7374,14 +7045,6 @@ packages:
       acorn-walk: 8.2.0
     dev: true
 
-  /acorn-import-assertions/1.8.0_acorn@8.8.1:
-    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
-    peerDependencies:
-      acorn: ^8
-    dependencies:
-      acorn: 8.8.1
-    dev: true
-
   /acorn-jsx/5.3.2_acorn@7.4.1:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -7700,9 +7363,6 @@ packages:
     dev: false
     optional: true
 
-  /arg/4.1.3:
-    resolution: {integrity: sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==}
-
   /argparse/1.0.10:
     resolution: {integrity: sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==}
     dependencies:
@@ -8159,17 +7819,17 @@ packages:
     resolution: {integrity: sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==}
     dev: false
 
-  /babel-jest/29.3.1_@babel+core@7.19.3:
-    resolution: {integrity: sha512-aard+xnMoxgjwV70t0L6wkW/3HQQtV+O0PEimxKgzNqCJnbYmroPojdP2tqKSOAt8QAKV/uSZU8851M7B5+fcA==}
+  /babel-jest/29.4.2_@babel+core@7.20.12:
+    resolution: {integrity: sha512-vcghSqhtowXPG84posYkkkzcZsdayFkubUgbE3/1tuGbX7AQtwCkkNA/wIbB0BMjuCPoqTkiDyKN7Ty7d3uwNQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.8.0
     dependencies:
-      '@babel/core': 7.19.3
-      '@jest/transform': 29.3.1
+      '@babel/core': 7.20.12
+      '@jest/transform': 29.4.2
       '@types/babel__core': 7.1.19
       babel-plugin-istanbul: 6.1.1
-      babel-preset-jest: 29.2.0_@babel+core@7.19.3
+      babel-preset-jest: 29.4.2_@babel+core@7.20.12
       chalk: 4.1.2
       graceful-fs: 4.2.10
       slash: 3.0.0
@@ -8221,11 +7881,11 @@ packages:
       - supports-color
     dev: true
 
-  /babel-plugin-jest-hoist/29.2.0:
-    resolution: {integrity: sha512-TnspP2WNiR3GLfCsUNHqeXw0RoQ2f9U5hQ5L3XFpwuO8htQmSrhh8qsB6vi5Yi8+kuynN1yjDjQsPfkebmB6ZA==}
+  /babel-plugin-jest-hoist/29.4.2:
+    resolution: {integrity: sha512-5HZRCfMeWypFEonRbEkwWXtNS1sQK159LhRVyRuLzyfVBxDy/34Tr/rg4YVi0SScSJ4fqeaR/OIeceJ/LaQ0pQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/template': 7.18.10
+      '@babel/template': 7.20.7
       '@babel/types': 7.20.7
       '@types/babel__core': 7.1.19
       '@types/babel__traverse': 7.18.2
@@ -8288,35 +7948,35 @@ packages:
       - supports-color
     dev: true
 
-  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.19.3:
+  /babel-preset-current-node-syntax/1.0.1_@babel+core@7.20.12:
     resolution: {integrity: sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.19.3
-      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.19.3
-      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.19.3
-      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.19.3
-      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.19.3
-      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.19.3
-      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.19.3
-      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.19.3
-      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.19.3
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.19.3
-      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.19.3
-      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.19.3
-      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.19.3
-    dev: true
-
-  /babel-preset-jest/29.2.0_@babel+core@7.19.3:
-    resolution: {integrity: sha512-z9JmMJppMxNv8N7fNRHvhMg9cvIkMxQBXgFkane3yKVEvEOP+kB50lk8DFRvF9PGqbyXxlmebKWhuDORO8RgdA==}
+      '@babel/core': 7.20.12
+      '@babel/plugin-syntax-async-generators': 7.8.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-bigint': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-class-properties': 7.12.13_@babel+core@7.20.12
+      '@babel/plugin-syntax-import-meta': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-json-strings': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-logical-assignment-operators': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-nullish-coalescing-operator': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.12
+      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-optional-catch-binding': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-optional-chaining': 7.8.3_@babel+core@7.20.12
+      '@babel/plugin-syntax-top-level-await': 7.14.5_@babel+core@7.20.12
+    dev: true
+
+  /babel-preset-jest/29.4.2_@babel+core@7.20.12:
+    resolution: {integrity: sha512-ecWdaLY/8JyfUDr0oELBMpj3R5I1L6ZqG+kRJmwqfHtLWuPrJStR0LUkvUhfykJWTsXXMnohsayN/twltBbDrQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@babel/core': ^7.0.0
     dependencies:
-      '@babel/core': 7.19.3
-      babel-plugin-jest-hoist: 29.2.0
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.19.3
+      '@babel/core': 7.20.12
+      babel-plugin-jest-hoist: 29.4.2
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12
     dev: true
 
   /babel-runtime/6.26.0:
@@ -9092,10 +8752,6 @@ packages:
     resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==}
     dev: true
 
-  /ci-info/3.5.0:
-    resolution: {integrity: sha512-yH4RezKOGlOhxkmhbeNuC4eYZKAUsEaGtBuBzDDP1eFUKiccDWzBABxBfOx31IDwDIXMTxWuwAxUGModvkbuVw==}
-    dev: true
-
   /ci-info/3.7.1:
     resolution: {integrity: sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==}
     engines: {node: '>=8'}
@@ -9999,9 +9655,6 @@ packages:
       sha.js: 2.4.11
     dev: true
 
-  /create-require/1.1.1:
-    resolution: {integrity: sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==}
-
   /crelt/1.0.5:
     resolution: {integrity: sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==}
     dev: false
@@ -10402,10 +10055,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /decimal.js/10.4.1:
-    resolution: {integrity: sha512-F29o+vci4DodHYT9UrR5IEbfBw9pE5eSapIJdTqXK5+6hq+t8VRxwQyKlW2i+KDKFkkJQRvFyI/QXD83h8LyQw==}
-    dev: true
-
   /decimal.js/10.4.3:
     resolution: {integrity: sha512-VBBaLc1MgL5XpzgIP7ny5Z6Nx3UrRkIViUkPUdtl9aya5amy3De1gsUUSB1g3+3sExYNjCAsAznmukyxCb1GRA==}
     dev: true
@@ -10626,15 +10275,11 @@ packages:
       wrappy: 1.0.2
     dev: true
 
-  /diff-sequences/29.3.1:
-    resolution: {integrity: sha512-hlM3QR272NXCi4pq+N4Kok4kOp6EsgOM3ZSpJI7Da3UAs+Ttsi8MRmB6trM/lhyzUxGfOgnpkHtgqm5Q/CTcfQ==}
+  /diff-sequences/29.4.2:
+    resolution: {integrity: sha512-R6P0Y6PrsH3n4hUXxL3nns0rbRk6Q33js3ygJBeEpbzLzgcNuJ61+u0RXasFpTKISw99TxUzFnumSnRLsjhLaw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /diff/4.0.2:
-    resolution: {integrity: sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==}
-    engines: {node: '>=0.3.1'}
-
   /diffie-hellman/5.0.3:
     resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==}
     dependencies:
@@ -11111,10 +10756,6 @@ packages:
       stop-iteration-iterator: 1.0.0
     dev: true
 
-  /es-module-lexer/0.9.3:
-    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
-    dev: true
-
   /es-set-tostringtag/2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
@@ -11775,7 +11416,18 @@ packages:
       jest-get-type: 29.2.0
       jest-matcher-utils: 29.3.1
       jest-message-util: 29.3.1
-      jest-util: 29.3.1
+      jest-util: 29.4.2
+    dev: true
+
+  /expect/29.4.2:
+    resolution: {integrity: sha512-+JHYg9O3hd3RlICG90OPVjRkPBoiUH7PxvDVMnRiaq1g6JUgZStX514erMl0v2Dc5SkfVbm7ztqbd6qHHPn+mQ==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/expect-utils': 29.4.2
+      jest-get-type: 29.4.2
+      jest-matcher-utils: 29.4.2
+      jest-message-util: 29.4.2
+      jest-util: 29.4.2
     dev: true
 
   /express-async-errors/3.1.1_express@4.18.2:
@@ -13698,7 +13350,7 @@ packages:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
     dependencies:
-      ci-info: 3.5.0
+      ci-info: 3.7.1
     dev: true
 
   /is-core-module/2.11.0:
@@ -14195,43 +13847,43 @@ packages:
       minimatch: 3.1.2
     dev: false
 
-  /jest-changed-files/29.2.0:
-    resolution: {integrity: sha512-qPVmLLyBmvF5HJrY7krDisx6Voi8DmlV3GZYX0aFNbaQsZeoz1hfxcCMbqDGuQCxU1dJy9eYc2xscE8QrCCYaA==}
+  /jest-changed-files/29.4.2:
+    resolution: {integrity: sha512-Qdd+AXdqD16PQa+VsWJpxR3kN0JyOCX1iugQfx5nUgAsI4gwsKviXkpclxOK9ZnwaY2IQVHz+771eAvqeOlfuw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       execa: 5.1.1
       p-limit: 3.1.0
     dev: true
 
-  /jest-circus/29.3.1:
-    resolution: {integrity: sha512-wpr26sEvwb3qQQbdlmei+gzp6yoSSoSL6GsLPxnuayZSMrSd5Ka7IjAvatpIernBvT2+Ic6RLTg+jSebScmasg==}
+  /jest-circus/29.4.2:
+    resolution: {integrity: sha512-wW3ztp6a2P5c1yOc1Cfrt5ozJ7neWmqeXm/4SYiqcSriyisgq63bwFj1NuRdSR5iqS0CMEYwSZd89ZA47W9zUg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/expect': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/environment': 29.4.2
+      '@jest/expect': 29.4.2
+      '@jest/test-result': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
       chalk: 4.1.2
       co: 4.6.0
       dedent: 0.7.0
       is-generator-fn: 2.1.0
-      jest-each: 29.3.1
-      jest-matcher-utils: 29.3.1
-      jest-message-util: 29.3.1
-      jest-runtime: 29.3.1
-      jest-snapshot: 29.3.1
-      jest-util: 29.3.1
+      jest-each: 29.4.2
+      jest-matcher-utils: 29.4.2
+      jest-message-util: 29.4.2
+      jest-runtime: 29.4.2
+      jest-snapshot: 29.4.2
+      jest-util: 29.4.2
       p-limit: 3.1.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
       slash: 3.0.0
-      stack-utils: 2.0.5
+      stack-utils: 2.0.6
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-cli/29.3.1:
-    resolution: {integrity: sha512-TO/ewvwyvPOiBBuWZ0gm04z3WWP8TIK8acgPzE4IxgsLKQgb377NYGrQLc3Wl/7ndWzIH2CDNNsUjGxwLL43VQ==}
+  /jest-cli/29.4.2:
+    resolution: {integrity: sha512-b+eGUtXq/K2v7SH3QcJvFvaUaCDS1/YAZBYz0m28Q/Ppyr+1qNaHmVYikOrbHVbZqYQs2IeI3p76uy6BWbXq8Q==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -14240,16 +13892,16 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/core': 29.4.2
+      '@jest/test-result': 29.4.2
+      '@jest/types': 29.4.2
       chalk: 4.1.2
       exit: 0.1.2
       graceful-fs: 4.2.10
       import-local: 3.1.0
-      jest-config: 29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
+      jest-config: 29.4.2
+      jest-util: 29.4.2
+      jest-validate: 29.4.2
       prompts: 2.4.2
       yargs: 17.6.2
     transitivePeerDependencies:
@@ -14258,8 +13910,8 @@ packages:
       - ts-node
     dev: true
 
-  /jest-config/29.3.1:
-    resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==}
+  /jest-config/29.4.2:
+    resolution: {integrity: sha512-919CtnXic52YM0zW4C1QxjG6aNueX1kBGthuMtvFtRTAxhKfJmiXC9qwHmi6o2josjbDz8QlWyY55F1SIVmCWA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@types/node': '*'
@@ -14270,34 +13922,34 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.19.3
-      '@jest/test-sequencer': 29.3.1
-      '@jest/types': 29.3.1
-      babel-jest: 29.3.1_@babel+core@7.19.3
+      '@babel/core': 7.20.12
+      '@jest/test-sequencer': 29.4.2
+      '@jest/types': 29.4.2
+      babel-jest: 29.4.2_@babel+core@7.20.12
       chalk: 4.1.2
-      ci-info: 3.5.0
+      ci-info: 3.7.1
       deepmerge: 4.2.2
       glob: 7.2.3
       graceful-fs: 4.2.10
-      jest-circus: 29.3.1
-      jest-environment-node: 29.3.1
-      jest-get-type: 29.2.0
-      jest-regex-util: 29.2.0
-      jest-resolve: 29.3.1
-      jest-runner: 29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
+      jest-circus: 29.4.2
+      jest-environment-node: 29.4.2
+      jest-get-type: 29.4.2
+      jest-regex-util: 29.4.2
+      jest-resolve: 29.4.2
+      jest-runner: 29.4.2
+      jest-util: 29.4.2
+      jest-validate: 29.4.2
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
       slash: 3.0.0
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-config/29.3.1_@types+node@16.18.12:
-    resolution: {integrity: sha512-y0tFHdj2WnTEhxmGUK1T7fgLen7YK4RtfvpLFBXfQkh2eMJAQq24Vx9472lvn5wg0MAO6B+iPfJfzdR9hJYalg==}
+  /jest-config/29.4.2_@types+node@16.18.12:
+    resolution: {integrity: sha512-919CtnXic52YM0zW4C1QxjG6aNueX1kBGthuMtvFtRTAxhKfJmiXC9qwHmi6o2josjbDz8QlWyY55F1SIVmCWA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       '@types/node': '*'
@@ -14308,63 +13960,63 @@ packages:
       ts-node:
         optional: true
     dependencies:
-      '@babel/core': 7.19.3
-      '@jest/test-sequencer': 29.3.1
-      '@jest/types': 29.3.1
+      '@babel/core': 7.20.12
+      '@jest/test-sequencer': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
-      babel-jest: 29.3.1_@babel+core@7.19.3
+      babel-jest: 29.4.2_@babel+core@7.20.12
       chalk: 4.1.2
-      ci-info: 3.5.0
+      ci-info: 3.7.1
       deepmerge: 4.2.2
       glob: 7.2.3
       graceful-fs: 4.2.10
-      jest-circus: 29.3.1
-      jest-environment-node: 29.3.1
-      jest-get-type: 29.2.0
-      jest-regex-util: 29.2.0
-      jest-resolve: 29.3.1
-      jest-runner: 29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
+      jest-circus: 29.4.2
+      jest-environment-node: 29.4.2
+      jest-get-type: 29.4.2
+      jest-regex-util: 29.4.2
+      jest-resolve: 29.4.2
+      jest-runner: 29.4.2
+      jest-util: 29.4.2
+      jest-validate: 29.4.2
       micromatch: 4.0.5
       parse-json: 5.2.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
       slash: 3.0.0
       strip-json-comments: 3.1.1
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-diff/29.3.1:
-    resolution: {integrity: sha512-vU8vyiO7568tmin2lA3r2DP8oRvzhvRcD4DjpXc6uGveQodyk7CKLhQlCSiwgx3g0pFaE88/KLZ0yaTWMc4Uiw==}
+  /jest-diff/29.4.2:
+    resolution: {integrity: sha512-EK8DSajVtnjx9sa1BkjZq3mqChm2Cd8rIzdXkQMA8e0wuXq53ypz6s5o5V8HRZkoEt2ywJ3eeNWFKWeYr8HK4g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      diff-sequences: 29.3.1
-      jest-get-type: 29.2.0
-      pretty-format: 29.3.1
+      diff-sequences: 29.4.2
+      jest-get-type: 29.4.2
+      pretty-format: 29.4.2
     dev: true
 
-  /jest-docblock/29.2.0:
-    resolution: {integrity: sha512-bkxUsxTgWQGbXV5IENmfiIuqZhJcyvF7tU4zJ/7ioTutdz4ToB5Yx6JOFBpgI+TphRY4lhOyCWGNH/QFQh5T6A==}
+  /jest-docblock/29.4.2:
+    resolution: {integrity: sha512-dV2JdahgClL34Y5vLrAHde3nF3yo2jKRH+GIYJuCpfqwEJZcikzeafVTGAjbOfKPG17ez9iWXwUYp7yefeCRag==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       detect-newline: 3.1.0
     dev: true
 
-  /jest-each/29.3.1:
-    resolution: {integrity: sha512-qrZH7PmFB9rEzCSl00BWjZYuS1BSOH8lLuC0azQE9lQrAx3PWGKHTDudQiOSwIy5dGAJh7KA0ScYlCP7JxvFYA==}
+  /jest-each/29.4.2:
+    resolution: {integrity: sha512-trvKZb0JYiCndc55V1Yh0Luqi7AsAdDWpV+mKT/5vkpnnFQfuQACV72IoRV161aAr6kAVIBpmYzwhBzm34vQkA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.2
       chalk: 4.1.2
-      jest-get-type: 29.2.0
-      jest-util: 29.3.1
-      pretty-format: 29.3.1
+      jest-get-type: 29.4.2
+      jest-util: 29.4.2
+      pretty-format: 29.4.2
     dev: true
 
-  /jest-environment-jsdom/29.3.1:
-    resolution: {integrity: sha512-G46nKgiez2Gy4zvYNhayfMEAFlVHhWfncqvqS6yCd0i+a4NsSUD2WtrKSaYQrYiLQaupHXxCRi8xxVL2M9PbhA==}
+  /jest-environment-jsdom/29.4.2:
+    resolution: {integrity: sha512-v1sH4Q0JGM+LPEGqHNM+m+uTMf3vpXpKiuDYqWUAh+0c9+nc7scGE+qTR5JuE+OOTDnwfzPgcv9sMq6zWAOaVg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     peerDependencies:
       canvas: ^2.5.0
@@ -14372,13 +14024,13 @@ packages:
       canvas:
         optional: true
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/fake-timers': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/environment': 29.4.2
+      '@jest/fake-timers': 29.4.2
+      '@jest/types': 29.4.2
       '@types/jsdom': 20.0.1
       '@types/node': 16.18.12
-      jest-mock: 29.3.1
-      jest-util: 29.3.1
+      jest-mock: 29.4.2
+      jest-util: 29.4.2
       jsdom: 20.0.2
     transitivePeerDependencies:
       - bufferutil
@@ -14386,16 +14038,16 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jest-environment-node/29.3.1:
-    resolution: {integrity: sha512-xm2THL18Xf5sIHoU7OThBPtuH6Lerd+Y1NLYiZJlkE3hbE+7N7r8uvHIl/FkZ5ymKXJe/11SQuf3fv4v6rUMag==}
+  /jest-environment-node/29.4.2:
+    resolution: {integrity: sha512-MLPrqUcOnNBc8zTOfqBbxtoa8/Ee8tZ7UFW7hRDQSUT+NGsvS96wlbHGTf+EFAT9KC3VNb7fWEM6oyvmxtE/9w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/fake-timers': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/environment': 29.4.2
+      '@jest/fake-timers': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
-      jest-mock: 29.3.1
-      jest-util: 29.3.1
+      jest-mock: 29.4.2
+      jest-util: 29.4.2
     dev: true
 
   /jest-get-type/29.2.0:
@@ -14403,6 +14055,11 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
+  /jest-get-type/29.4.2:
+    resolution: {integrity: sha512-vERN30V5i2N6lqlFu4ljdTqQAgrkTFMC9xaIIfOPYBw04pufjXRty5RuXBiB1d72tGbURa/UgoiHB90ruOSivg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dev: true
+
   /jest-haste-map/26.6.2:
     resolution: {integrity: sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==}
     engines: {node: '>= 10.14.2'}
@@ -14426,31 +14083,31 @@ packages:
       - supports-color
     dev: true
 
-  /jest-haste-map/29.3.1:
-    resolution: {integrity: sha512-/FFtvoG1xjbbPXQLFef+WSU4yrc0fc0Dds6aRPBojUid7qlPqZvxdUBA03HW0fnVHXVCnCdkuoghYItKNzc/0A==}
+  /jest-haste-map/29.4.2:
+    resolution: {integrity: sha512-WkUgo26LN5UHPknkezrBzr7lUtV1OpGsp+NfXbBwHztsFruS3gz+AMTTBcEklvi8uPzpISzYjdKXYZQJXBnfvw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
-      '@types/graceful-fs': 4.1.5
+      '@jest/types': 29.4.2
+      '@types/graceful-fs': 4.1.6
       '@types/node': 16.18.12
       anymatch: 3.1.3
       fb-watchman: 2.0.2
       graceful-fs: 4.2.10
-      jest-regex-util: 29.2.0
-      jest-util: 29.3.1
-      jest-worker: 29.3.1
+      jest-regex-util: 29.4.2
+      jest-util: 29.4.2
+      jest-worker: 29.4.2
       micromatch: 4.0.5
       walker: 1.0.8
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /jest-leak-detector/29.3.1:
-    resolution: {integrity: sha512-3DA/VVXj4zFOPagGkuqHnSQf1GZBmmlagpguxEERO6Pla2g84Q1MaVIB3YMxgUaFIaYag8ZnTyQgiZ35YEqAQA==}
+  /jest-leak-detector/29.4.2:
+    resolution: {integrity: sha512-Wa62HuRJmWXtX9F00nUpWlrbaH5axeYCdyRsOs/+Rb1Vb6+qWTlB5rKwCCRKtorM7owNwKsyJ8NRDUcZ8ghYUA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-get-type: 29.2.0
-      pretty-format: 29.3.1
+      jest-get-type: 29.4.2
+      pretty-format: 29.4.2
     dev: true
 
   /jest-matcher-utils/29.3.1:
@@ -14458,9 +14115,19 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
-      jest-diff: 29.3.1
-      jest-get-type: 29.2.0
-      pretty-format: 29.3.1
+      jest-diff: 29.4.2
+      jest-get-type: 29.4.2
+      pretty-format: 29.4.2
+    dev: true
+
+  /jest-matcher-utils/29.4.2:
+    resolution: {integrity: sha512-EZaAQy2je6Uqkrm6frnxBIdaWtSYFoR8SVb2sNLAtldswlR/29JAgx+hy67llT3+hXBaLB0zAm5UfeqerioZyg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      chalk: 4.1.2
+      jest-diff: 29.4.2
+      jest-get-type: 29.4.2
+      pretty-format: 29.4.2
     dev: true
 
   /jest-message-util/29.3.1:
@@ -14468,26 +14135,41 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@babel/code-frame': 7.18.6
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.2
       '@types/stack-utils': 2.0.1
       chalk: 4.1.2
       graceful-fs: 4.2.10
       micromatch: 4.0.5
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
       slash: 3.0.0
       stack-utils: 2.0.6
     dev: true
 
-  /jest-mock/29.3.1:
-    resolution: {integrity: sha512-H8/qFDtDVMFvFP4X8NuOT3XRDzOUTz+FeACjufHzsOIBAxivLqkB1PoLCaJx9iPPQ8dZThHPp/G3WRWyMgA3JA==}
+  /jest-message-util/29.4.2:
+    resolution: {integrity: sha512-SElcuN4s6PNKpOEtTInjOAA8QvItu0iugkXqhYyguRvQoXapg5gN+9RQxLAkakChZA7Y26j6yUCsFWN+hlKD6g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@babel/code-frame': 7.18.6
+      '@jest/types': 29.4.2
+      '@types/stack-utils': 2.0.1
+      chalk: 4.1.2
+      graceful-fs: 4.2.10
+      micromatch: 4.0.5
+      pretty-format: 29.4.2
+      slash: 3.0.0
+      stack-utils: 2.0.6
+    dev: true
+
+  /jest-mock/29.4.2:
+    resolution: {integrity: sha512-x1FSd4Gvx2yIahdaIKoBjwji6XpboDunSJ95RpntGrYulI1ByuYQCKN/P7hvk09JB74IonU3IPLdkutEWYt++g==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
-      jest-util: 29.3.1
+      jest-util: 29.4.2
     dev: true
 
-  /jest-pnp-resolver/1.2.2_jest-resolve@29.3.1:
+  /jest-pnp-resolver/1.2.2_jest-resolve@29.4.2:
     resolution: {integrity: sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==}
     engines: {node: '>=6'}
     peerDependencies:
@@ -14496,7 +14178,7 @@ packages:
       jest-resolve:
         optional: true
     dependencies:
-      jest-resolve: 29.3.1
+      jest-resolve: 29.4.2
     dev: true
 
   /jest-regex-util/26.0.0:
@@ -14504,89 +14186,90 @@ packages:
     engines: {node: '>= 10.14.2'}
     dev: true
 
-  /jest-regex-util/29.2.0:
-    resolution: {integrity: sha512-6yXn0kg2JXzH30cr2NlThF+70iuO/3irbaB4mh5WyqNIvLLP+B6sFdluO1/1RJmslyh/f9osnefECflHvTbwVA==}
+  /jest-regex-util/29.4.2:
+    resolution: {integrity: sha512-XYZXOqUl1y31H6VLMrrUL1ZhXuiymLKPz0BO1kEeR5xER9Tv86RZrjTm74g5l9bPJQXA/hyLdaVPN/sdqfteig==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /jest-resolve-dependencies/29.3.1:
-    resolution: {integrity: sha512-Vk0cYq0byRw2WluNmNWGqPeRnZ3p3hHmjJMp2dyyZeYIfiBskwq4rpiuGFR6QGAdbj58WC7HN4hQHjf2mpvrLA==}
+  /jest-resolve-dependencies/29.4.2:
+    resolution: {integrity: sha512-6pL4ptFw62rjdrPk7rRpzJYgcRqRZNsZTF1VxVTZMishbO6ObyWvX57yHOaNGgKoADtAHRFYdHQUEvYMJATbDg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      jest-regex-util: 29.2.0
-      jest-snapshot: 29.3.1
+      jest-regex-util: 29.4.2
+      jest-snapshot: 29.4.2
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-resolve/29.3.1:
-    resolution: {integrity: sha512-amXJgH/Ng712w3Uz5gqzFBBjxV8WFLSmNjoreBGMqxgCz5cH7swmBZzgBaCIOsvb0NbpJ0vgaSFdJqMdT+rADw==}
+  /jest-resolve/29.4.2:
+    resolution: {integrity: sha512-RtKWW0mbR3I4UdkOrW7552IFGLYQ5AF9YrzD0FnIOkDu0rAMlA5/Y1+r7lhCAP4nXSBTaE7ueeqj6IOwZpgoqw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       chalk: 4.1.2
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
-      jest-pnp-resolver: 1.2.2_jest-resolve@29.3.1
-      jest-util: 29.3.1
-      jest-validate: 29.3.1
+      jest-haste-map: 29.4.2
+      jest-pnp-resolver: 1.2.2_jest-resolve@29.4.2
+      jest-util: 29.4.2
+      jest-validate: 29.4.2
       resolve: 1.22.1
-      resolve.exports: 1.1.0
+      resolve.exports: 2.0.0
       slash: 3.0.0
     dev: true
 
-  /jest-runner/29.3.1:
-    resolution: {integrity: sha512-oFvcwRNrKMtE6u9+AQPMATxFcTySyKfLhvso7Sdk/rNpbhg4g2GAGCopiInk1OP4q6gz3n6MajW4+fnHWlU3bA==}
+  /jest-runner/29.4.2:
+    resolution: {integrity: sha512-wqwt0drm7JGjwdH+x1XgAl+TFPH7poowMguPQINYxaukCqlczAcNLJiK+OLxUxQAEWMdy+e6nHZlFHO5s7EuRg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/console': 29.3.1
-      '@jest/environment': 29.3.1
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/console': 29.4.2
+      '@jest/environment': 29.4.2
+      '@jest/test-result': 29.4.2
+      '@jest/transform': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
       chalk: 4.1.2
       emittery: 0.13.1
       graceful-fs: 4.2.10
-      jest-docblock: 29.2.0
-      jest-environment-node: 29.3.1
-      jest-haste-map: 29.3.1
-      jest-leak-detector: 29.3.1
-      jest-message-util: 29.3.1
-      jest-resolve: 29.3.1
-      jest-runtime: 29.3.1
-      jest-util: 29.3.1
-      jest-watcher: 29.3.1
-      jest-worker: 29.3.1
+      jest-docblock: 29.4.2
+      jest-environment-node: 29.4.2
+      jest-haste-map: 29.4.2
+      jest-leak-detector: 29.4.2
+      jest-message-util: 29.4.2
+      jest-resolve: 29.4.2
+      jest-runtime: 29.4.2
+      jest-util: 29.4.2
+      jest-watcher: 29.4.2
+      jest-worker: 29.4.2
       p-limit: 3.1.0
       source-map-support: 0.5.13
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /jest-runtime/29.3.1:
-    resolution: {integrity: sha512-jLzkIxIqXwBEOZx7wx9OO9sxoZmgT2NhmQKzHQm1xwR1kNW/dn0OjxR424VwHHf1SPN6Qwlb5pp1oGCeFTQ62A==}
+  /jest-runtime/29.4.2:
+    resolution: {integrity: sha512-3fque9vtpLzGuxT9eZqhxi+9EylKK/ESfhClv4P7Y9sqJPs58LjVhTt8jaMp/pRO38agll1CkSu9z9ieTQeRrw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/environment': 29.3.1
-      '@jest/fake-timers': 29.3.1
-      '@jest/globals': 29.3.1
-      '@jest/source-map': 29.2.0
-      '@jest/test-result': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/environment': 29.4.2
+      '@jest/fake-timers': 29.4.2
+      '@jest/globals': 29.4.2
+      '@jest/source-map': 29.4.2
+      '@jest/test-result': 29.4.2
+      '@jest/transform': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
       chalk: 4.1.2
       cjs-module-lexer: 1.2.2
       collect-v8-coverage: 1.0.1
       glob: 7.2.3
       graceful-fs: 4.2.10
-      jest-haste-map: 29.3.1
-      jest-message-util: 29.3.1
-      jest-mock: 29.3.1
-      jest-regex-util: 29.2.0
-      jest-resolve: 29.3.1
-      jest-snapshot: 29.3.1
-      jest-util: 29.3.1
+      jest-haste-map: 29.4.2
+      jest-message-util: 29.4.2
+      jest-mock: 29.4.2
+      jest-regex-util: 29.4.2
+      jest-resolve: 29.4.2
+      jest-snapshot: 29.4.2
+      jest-util: 29.4.2
+      semver: 7.3.8
       slash: 3.0.0
       strip-bom: 4.0.0
     transitivePeerDependencies:
@@ -14601,33 +14284,33 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /jest-snapshot/29.3.1:
-    resolution: {integrity: sha512-+3JOc+s28upYLI2OJM4PWRGK9AgpsMs/ekNryUV0yMBClT9B1DF2u2qay8YxcQd338PPYSFNb0lsar1B49sLDA==}
+  /jest-snapshot/29.4.2:
+    resolution: {integrity: sha512-PdfubrSNN5KwroyMH158R23tWcAXJyx4pvSvWls1dHoLCaUhGul9rsL3uVjtqzRpkxlkMavQjGuWG1newPgmkw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@babel/core': 7.19.3
-      '@babel/generator': 7.19.5
-      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.19.3
-      '@babel/plugin-syntax-typescript': 7.18.6_@babel+core@7.19.3
-      '@babel/traverse': 7.19.4
+      '@babel/core': 7.20.12
+      '@babel/generator': 7.20.7
+      '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.12
+      '@babel/traverse': 7.20.12
       '@babel/types': 7.20.7
-      '@jest/expect-utils': 29.3.1
-      '@jest/transform': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/expect-utils': 29.4.2
+      '@jest/transform': 29.4.2
+      '@jest/types': 29.4.2
       '@types/babel__traverse': 7.18.2
       '@types/prettier': 2.7.1
-      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.19.3
+      babel-preset-current-node-syntax: 1.0.1_@babel+core@7.20.12
       chalk: 4.1.2
-      expect: 29.3.1
+      expect: 29.4.2
       graceful-fs: 4.2.10
-      jest-diff: 29.3.1
-      jest-get-type: 29.2.0
-      jest-haste-map: 29.3.1
-      jest-matcher-utils: 29.3.1
-      jest-message-util: 29.3.1
-      jest-util: 29.3.1
+      jest-diff: 29.4.2
+      jest-get-type: 29.4.2
+      jest-haste-map: 29.4.2
+      jest-matcher-utils: 29.4.2
+      jest-message-util: 29.4.2
+      jest-util: 29.4.2
       natural-compare: 1.4.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
       semver: 7.3.8
     transitivePeerDependencies:
       - supports-color
@@ -14657,29 +14340,41 @@ packages:
       picomatch: 2.3.1
     dev: true
 
-  /jest-validate/29.3.1:
-    resolution: {integrity: sha512-N9Lr3oYR2Mpzuelp1F8negJR3YE+L1ebk1rYA5qYo9TTY3f9OWdptLoNSPP9itOCBIRBqjt/S5XHlzYglLN67g==}
+  /jest-util/29.4.2:
+    resolution: {integrity: sha512-wKnm6XpJgzMUSRFB7YF48CuwdzuDIHenVuoIb1PLuJ6F+uErZsuDkU+EiExkChf6473XcawBrSfDSnXl+/YG4g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/types': 29.3.1
+      '@jest/types': 29.4.2
+      '@types/node': 16.18.12
+      chalk: 4.1.2
+      ci-info: 3.7.1
+      graceful-fs: 4.2.10
+      picomatch: 2.3.1
+    dev: true
+
+  /jest-validate/29.4.2:
+    resolution: {integrity: sha512-tto7YKGPJyFbhcKhIDFq8B5od+eVWD/ySZ9Tvcp/NGCvYA4RQbuzhbwYWtIjMT5W5zA2W0eBJwu4HVw34d5G6Q==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/types': 29.4.2
       camelcase: 6.3.0
       chalk: 4.1.2
-      jest-get-type: 29.2.0
+      jest-get-type: 29.4.2
       leven: 3.1.0
-      pretty-format: 29.3.1
+      pretty-format: 29.4.2
     dev: true
 
-  /jest-watcher/29.3.1:
-    resolution: {integrity: sha512-RspXG2BQFDsZSRKGCT/NiNa8RkQ1iKAjrO0//soTMWx/QUt+OcxMqMSBxz23PYGqUuWm2+m2mNNsmj0eIoOaFg==}
+  /jest-watcher/29.4.2:
+    resolution: {integrity: sha512-onddLujSoGiMJt+tKutehIidABa175i/Ays+QvKxCqBwp7fvxP3ZhKsrIdOodt71dKxqk4sc0LN41mWLGIK44w==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
-      '@jest/test-result': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/test-result': 29.4.2
+      '@jest/types': 29.4.2
       '@types/node': 16.18.12
       ansi-escapes: 4.3.2
       chalk: 4.1.2
       emittery: 0.13.1
-      jest-util: 29.3.1
+      jest-util: 29.4.2
       string-length: 4.0.2
     dev: true
 
@@ -14692,27 +14387,18 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /jest-worker/27.5.1:
-    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
-    engines: {node: '>= 10.13.0'}
-    dependencies:
-      '@types/node': 16.18.12
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-    dev: true
-
-  /jest-worker/29.3.1:
-    resolution: {integrity: sha512-lY4AnnmsEWeiXirAIA0c9SDPbuCBq8IYuDVL8PMm0MZ2PEs2yPvRA/J64QBXuZp7CYKrDM/rmNrc9/i3KJQncw==}
+  /jest-worker/29.4.2:
+    resolution: {integrity: sha512-VIuZA2hZmFyRbchsUCHEehoSf2HEl0YVF8SDJqtPnKorAaBuh42V8QsLnde0XP5F6TyCynGPEGgBOn3Fc+wZGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dependencies:
       '@types/node': 16.18.12
-      jest-util: 29.3.1
+      jest-util: 29.4.2
       merge-stream: 2.0.0
       supports-color: 8.1.1
     dev: true
 
-  /jest/29.3.1:
-    resolution: {integrity: sha512-6iWfL5DTT0Np6UYs/y5Niu7WIfNv/wRTtN5RSXt2DIEft3dx3zPuw/3WJQBCJfmEzvDiEKwoqMbGD9n49+qLSA==}
+  /jest/29.4.2:
+    resolution: {integrity: sha512-+5hLd260vNIHu+7ZgMIooSpKl7Jp5pHKb51e73AJU3owd5dEo/RfVwHbA/na3C/eozrt3hJOLGf96c7EWwIAzg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -14721,10 +14407,10 @@ packages:
       node-notifier:
         optional: true
     dependencies:
-      '@jest/core': 29.3.1
-      '@jest/types': 29.3.1
+      '@jest/core': 29.4.2
+      '@jest/types': 29.4.2
       import-local: 3.1.0
-      jest-cli: 29.3.1
+      jest-cli: 29.4.2
     transitivePeerDependencies:
       - '@types/node'
       - supports-color
@@ -14863,7 +14549,7 @@ packages:
       cssom: 0.5.0
       cssstyle: 2.3.0
       data-urls: 3.0.2
-      decimal.js: 10.4.1
+      decimal.js: 10.4.3
       domexception: 4.0.0
       escodegen: 2.0.0
       form-data: 4.0.0
@@ -14881,7 +14567,7 @@ packages:
       whatwg-encoding: 2.0.0
       whatwg-mimetype: 3.0.0
       whatwg-url: 11.0.0
-      ws: 8.9.0
+      ws: 8.12.0
       xml-name-validator: 4.0.0
     transitivePeerDependencies:
       - bufferutil
@@ -14996,13 +14682,6 @@ packages:
   /json-stringify-safe/5.0.1:
     resolution: {integrity: sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==}
 
-  /json5/1.0.1:
-    resolution: {integrity: sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==}
-    hasBin: true
-    dependencies:
-      minimist: 1.2.7
-    dev: true
-
   /json5/1.0.2:
     resolution: {integrity: sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==}
     hasBin: true
@@ -15010,12 +14689,6 @@ packages:
       minimist: 1.2.7
     dev: true
 
-  /json5/2.2.1:
-    resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==}
-    engines: {node: '>=6'}
-    hasBin: true
-    dev: true
-
   /json5/2.2.3:
     resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==}
     engines: {node: '>=6'}
@@ -15400,11 +15073,6 @@ packages:
     engines: {node: '>=4.3.0 <5.0.0 || >=5.10'}
     dev: true
 
-  /loader-runner/4.3.0:
-    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
-    engines: {node: '>=6.11.5'}
-    dev: true
-
   /loader-utils/1.4.2:
     resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
     engines: {node: '>=4.0.0'}
@@ -15420,7 +15088,7 @@ packages:
     dependencies:
       big.js: 5.2.2
       emojis-list: 3.0.0
-      json5: 2.2.1
+      json5: 2.2.3
     dev: true
 
   /loader-utils/2.0.4:
@@ -18026,6 +17694,15 @@ packages:
       react-is: 18.2.0
     dev: true
 
+  /pretty-format/29.4.2:
+    resolution: {integrity: sha512-qKlHR8yFVCbcEWba0H0TOC8dnLlO4vPlyEjRPw31FZ2Rupy9nLa8ZLbYny8gWEl8CkEhJqAE6IzdNELTBVcBEg==}
+    engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
+    dependencies:
+      '@jest/schemas': 29.4.2
+      ansi-styles: 5.2.0
+      react-is: 18.2.0
+    dev: true
+
   /pretty-hrtime/1.0.3:
     resolution: {integrity: sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==}
     engines: {node: '>= 0.8'}
@@ -19086,8 +18763,8 @@ packages:
     deprecated: https://github.com/lydell/resolve-url#deprecated
     dev: true
 
-  /resolve.exports/1.1.0:
-    resolution: {integrity: sha512-J1l+Zxxp4XK3LUDZ9m60LRJF/mAe4z6a4xyabPHk7pvK5t35dACV32iIjJDFeWZFfZlO29w6SZ67knR0tHzJtQ==}
+  /resolve.exports/2.0.0:
+    resolution: {integrity: sha512-6K/gDlqgQscOlg9fSRpWstA8sYe8rbELsSTNpx+3kTrsVCzvSl0zIvRErM7fdl9ERWDsKnrLnwB+Ne89918XOg==}
     engines: {node: '>=10'}
     dev: true
 
@@ -19283,7 +18960,7 @@ packages:
     dev: false
     optional: true
 
-  /sass-loader/10.3.1_sass@1.55.0+webpack@5.74.0:
+  /sass-loader/10.3.1_sass@1.55.0+webpack@4.46.0:
     resolution: {integrity: sha512-y2aBdtYkbqorVavkC3fcJIUDGIegzDWPn3/LAFhsf3G+MzPKTJx37sROf5pXtUeggSVbNbmfj8TgRaSLMelXRA==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -19305,7 +18982,7 @@ packages:
       sass: 1.55.0
       schema-utils: 3.1.1
       semver: 7.3.8
-      webpack: 5.74.0
+      webpack: 4.46.0
     dev: true
 
   /sass-loader/10.3.1_sass@1.57.1+webpack@4.46.0:
@@ -19513,12 +19190,6 @@ packages:
     dependencies:
       randombytes: 2.1.0
 
-  /serialize-javascript/6.0.0:
-    resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==}
-    dependencies:
-      randombytes: 2.1.0
-    dev: true
-
   /serve-favicon/2.5.0:
     resolution: {integrity: sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==}
     engines: {node: '>= 0.8.0'}
@@ -20056,13 +19727,6 @@ packages:
   /stack-trace/0.0.10:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
 
-  /stack-utils/2.0.5:
-    resolution: {integrity: sha512-xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA==}
-    engines: {node: '>=10'}
-    dependencies:
-      escape-string-regexp: 2.0.0
-    dev: true
-
   /stack-utils/2.0.6:
     resolution: {integrity: sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==}
     engines: {node: '>=10'}
@@ -20236,8 +19900,8 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
-  /string-argv/0.1.2:
-    resolution: {integrity: sha512-mBqPGEOMNJKXRo7z0keX0wlAhbBAjilUdPW13nN0PecVryZxdHIeM7TqbsSUA7VYuS00HGC6mojP7DlQzfa9ZA==}
+  /string-argv/0.3.1:
+    resolution: {integrity: sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==}
     engines: {node: '>=0.6.19'}
     dev: true
 
@@ -20734,30 +20398,6 @@ packages:
       - bluebird
     dev: true
 
-  /terser-webpack-plugin/5.3.6_webpack@5.74.0:
-    resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      jest-worker: 27.5.1
-      schema-utils: 3.1.1
-      serialize-javascript: 6.0.0
-      terser: 5.16.1
-      webpack: 5.74.0
-    dev: true
-
   /terser/4.8.1:
     resolution: {integrity: sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==}
     engines: {node: '>=6.0.0'}
@@ -21085,8 +20725,8 @@ packages:
     resolution: {integrity: sha512-e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ==}
     dev: false
 
-  /ts-jest/29.0.3_s73gpqhbuwbfokcbq32jn3f4zi:
-    resolution: {integrity: sha512-Ibygvmuyq1qp/z3yTh9QTwVVAbFdDy/+4BtIQR2sp6baF2SJU/8CKK/hhnGIDY2L90Az2jIqTwZPnN2p+BweiQ==}
+  /ts-jest/29.0.5_pa4ebk5usulsg7iw3zwjv5figy:
+    resolution: {integrity: sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
     peerDependencies:
@@ -21106,16 +20746,16 @@ packages:
       esbuild:
         optional: true
     dependencies:
-      '@babel/core': 7.19.3
+      '@babel/core': 7.20.12
       bs-logger: 0.2.6
       fast-json-stable-stringify: 2.1.0
-      jest: 29.3.1
+      jest: 29.4.2
       jest-util: 29.3.1
-      json5: 2.2.1
+      json5: 2.2.3
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.3.8
-      typescript: 4.8.4
+      typescript: 4.9.4
       yargs-parser: 21.1.1
     dev: true
 
@@ -21139,21 +20779,6 @@ packages:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
     dev: true
 
-  /ts-node/9.1.1_typescript@4.9.4:
-    resolution: {integrity: sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==}
-    engines: {node: '>=10.0.0'}
-    hasBin: true
-    peerDependencies:
-      typescript: '>=2.7'
-    dependencies:
-      arg: 4.1.3
-      create-require: 1.1.1
-      diff: 4.0.2
-      make-error: 1.3.6
-      source-map-support: 0.5.21
-      typescript: 4.9.4
-      yn: 3.1.1
-
   /ts-pnp/1.2.0_typescript@4.9.4:
     resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==}
     engines: {node: '>=6'}
@@ -21166,8 +20791,8 @@ packages:
       typescript: 4.9.4
     dev: true
 
-  /tsc-alias/1.7.1:
-    resolution: {integrity: sha512-P4+0i+OB0hX17Ca+U6EJ4WZZ+OSupqW32VJ34N7g7+Ch+bwSx1AqYOvDdIVYEKymBh3dfG0t1qxbxPlBbtB1lQ==}
+  /tsc-alias/1.8.2:
+    resolution: {integrity: sha512-ukBkcNekOgwtnSWYLD5QsMX3yQWg7JviAs8zg3qJGgu4LGtY3tsV4G6vnqvOXIDkbC+XL9vbhObWSpRA5/6wbg==}
     hasBin: true
     dependencies:
       chokidar: 3.5.2
@@ -21178,9 +20803,9 @@ packages:
       plimit-lit: 1.4.1
     dev: true
 
-  /tsc-watch/5.0.3_typescript@4.8.4:
-    resolution: {integrity: sha512-Hz2UawwELMSLOf0xHvAFc7anLeMw62cMVXr1flYmhRuOhOyOljwmb1l/O60ZwRyy1k7N1iC1mrn1QYM2zITfuw==}
-    engines: {node: '>=8.17.0'}
+  /tsc-watch/6.0.0_typescript@4.9.4:
+    resolution: {integrity: sha512-zgpju+/z5z29/kK5V28Nz16CMkX2voFOUxkTlCim/R25hxzbyUqu2NfTnmJBQfESBSPbEQUGqDdB9A8opAcB4A==}
+    engines: {node: '>=12.12.0'}
     hasBin: true
     peerDependencies:
       typescript: '*'
@@ -21188,16 +20813,24 @@ packages:
       cross-spawn: 7.0.3
       node-cleanup: 2.1.2
       ps-tree: 1.2.0
-      string-argv: 0.1.2
-      strip-ansi: 6.0.1
-      typescript: 4.8.4
+      string-argv: 0.3.1
+      typescript: 4.9.4
     dev: true
 
   /tsconfig-paths/3.14.1:
     resolution: {integrity: sha512-fxDhWnFSLt3VuTwtvJt5fpwxBHg5AdKWMsgcPOOIilyjymcYVZoCQF8fvFRezCNfblEXmi+PcM1eYHeOAgXCOQ==}
     dependencies:
       '@types/json5': 0.0.29
-      json5: 1.0.1
+      json5: 1.0.2
+      minimist: 1.2.7
+      strip-bom: 3.0.0
+    dev: true
+
+  /tsconfig-paths/4.1.2:
+    resolution: {integrity: sha512-uhxiMgnXQp1IR622dUXI+9Ehnws7i/y6xvpZB9IbUVOPy0muvdvgXeZOn88UcGPiT98Vp3rJPTa8bFoalZ3Qhw==}
+    engines: {node: '>=6'}
+    dependencies:
+      json5: 2.2.3
       minimist: 1.2.7
       strip-bom: 3.0.0
     dev: true
@@ -21240,58 +20873,58 @@ packages:
     engines: {node: '>=0.6.11 <=0.7.0 || >=0.7.3'}
     dev: false
 
-  /turbo-darwin-64/1.6.3:
-    resolution: {integrity: sha512-QmDIX0Yh1wYQl0bUS0gGWwNxpJwrzZU2GIAYt3aOKoirWA2ecnyb3R6ludcS1znfNV2MfunP+l8E3ncxUHwtjA==}
+  /turbo-darwin-64/1.7.4:
+    resolution: {integrity: sha512-ZyYrQlUl8K/mYN1e6R7bEhPPYjMakz0DYMaexkyD7TAijQtWmTSd4a+I7VknOYNEssnUZ/v41GU3gPV1JAzxxQ==}
     cpu: [x64]
     os: [darwin]
     dev: true
     optional: true
 
-  /turbo-darwin-arm64/1.6.3:
-    resolution: {integrity: sha512-75DXhFpwE7CinBbtxTxH08EcWrxYSPFow3NaeFwsG8aymkWXF+U2aukYHJA6I12n9/dGqf7yRXzkF0S/9UtdyQ==}
+  /turbo-darwin-arm64/1.7.4:
+    resolution: {integrity: sha512-CKIXg9uqp1a+Yeq/c4U0alPOqvwLUq5SBZf1PGYhGqJsfG0fRBtJfkUjHuBsuJIOGXg8rCmcGSWGIsIF6fqYuw==}
     cpu: [arm64]
     os: [darwin]
     dev: true
     optional: true
 
-  /turbo-linux-64/1.6.3:
-    resolution: {integrity: sha512-O9uc6J0yoRPWdPg9THRQi69K6E2iZ98cRHNvus05lZbcPzZTxJYkYGb5iagCmCW/pq6fL4T4oLWAd6evg2LGQA==}
+  /turbo-linux-64/1.7.4:
+    resolution: {integrity: sha512-RIUl4RUFFyzD2T024vL7509Ygwcw+SEa8NOwPfaN6TtJHK7RZV/SBP3fLNVOptG9WRLnOWX3OvsLMbiOqDLLyA==}
     cpu: [x64]
     os: [linux]
     dev: true
     optional: true
 
-  /turbo-linux-arm64/1.6.3:
-    resolution: {integrity: sha512-dCy667qqEtZIhulsRTe8hhWQNCJO0i20uHXv7KjLHuFZGCeMbWxB8rsneRoY+blf8+QNqGuXQJxak7ayjHLxiA==}
+  /turbo-linux-arm64/1.7.4:
+    resolution: {integrity: sha512-Bg65F0AjYYYxqE6RPf2H5TIGuA/EyWMeGOATHVSZOWAbYcnG3Ly03GZii8AHnUi7ntWBdjwvXf/QbOS1ayNB6A==}
     cpu: [arm64]
     os: [linux]
     dev: true
     optional: true
 
-  /turbo-windows-64/1.6.3:
-    resolution: {integrity: sha512-lKRqwL3mrVF09b9KySSaOwetehmGknV9EcQTF7d2dxngGYYX1WXoQLjFP9YYH8ZV07oPm+RUOAKSCQuDuMNhiA==}
+  /turbo-windows-64/1.7.4:
+    resolution: {integrity: sha512-rTaV50XZ2BRxRHOHqt1UsWfeDmYLbn8UKE6g2D2ED+uW+kmnTvR9s01nmlGWd2sAuWcRYQyQ2V+O09VfKPKcQw==}
     cpu: [x64]
     os: [win32]
     dev: true
     optional: true
 
-  /turbo-windows-arm64/1.6.3:
-    resolution: {integrity: sha512-BXY1sDPEA1DgPwuENvDCD8B7Hb0toscjus941WpL8CVd10hg9pk/MWn9CNgwDO5Q9ks0mw+liDv2EMnleEjeNA==}
+  /turbo-windows-arm64/1.7.4:
+    resolution: {integrity: sha512-h8sxdKPvHTnWUPtwnYszFMmSO0P/iUUwmYY9n7iYThA71zSao28UeZ0H0Gw75cY3MPjvkjn2C4EBAUGPjuZJLw==}
     cpu: [arm64]
     os: [win32]
     dev: true
     optional: true
 
-  /turbo/1.6.3:
-    resolution: {integrity: sha512-FtfhJLmEEtHveGxW4Ye/QuY85AnZ2ZNVgkTBswoap7UMHB1+oI4diHPNyqrQLG4K1UFtCkjOlVoLsllUh/9QRw==}
+  /turbo/1.7.4:
+    resolution: {integrity: sha512-8RLedDoUL0kkVKWEZ/RMM70BvKLyDFen06QuKKhYC2XNOfNKqFDqzIdcY/vGick869bNIWalChoy4O07k0HLsA==}
     hasBin: true
     optionalDependencies:
-      turbo-darwin-64: 1.6.3
-      turbo-darwin-arm64: 1.6.3
-      turbo-linux-64: 1.6.3
-      turbo-linux-arm64: 1.6.3
-      turbo-windows-64: 1.6.3
-      turbo-windows-arm64: 1.6.3
+      turbo-darwin-64: 1.7.4
+      turbo-darwin-arm64: 1.7.4
+      turbo-linux-64: 1.7.4
+      turbo-linux-arm64: 1.7.4
+      turbo-windows-64: 1.7.4
+      turbo-windows-arm64: 1.7.4
     dev: true
 
   /tweetnacl/0.14.5:
@@ -21365,7 +20998,7 @@ packages:
   /typedarray/0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typeorm/0.3.12_a77gzgdqnod3rkvxniiwirlqsi:
+  /typeorm/0.3.12_pgelcv6ef3switkrteavpif3pq:
     resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
     engines: {node: '>= 12.9.0'}
     hasBin: true
@@ -21440,7 +21073,6 @@ packages:
       reflect-metadata: 0.1.13
       sha.js: 2.4.11
       sqlite3: 5.1.4
-      ts-node: 9.1.1_typescript@4.9.4
       tslib: 2.5.0
       uuid: 9.0.0
       xml2js: 0.4.23
@@ -21449,12 +21081,6 @@ packages:
       - supports-color
     dev: false
 
-  /typescript/4.8.4:
-    resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: true
-
   /typescript/4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
@@ -22754,11 +22380,6 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /webpack-sources/3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
-    dev: true
-
   /webpack-virtual-modules/0.2.2:
     resolution: {integrity: sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==}
     dependencies:
@@ -22807,46 +22428,6 @@ packages:
       - supports-color
     dev: true
 
-  /webpack/5.74.0:
-    resolution: {integrity: sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
-    dependencies:
-      '@types/eslint-scope': 3.7.4
-      '@types/estree': 0.0.51
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/wasm-edit': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      acorn: 8.8.1
-      acorn-import-assertions: 1.8.0_acorn@8.8.1
-      browserslist: 4.21.4
-      chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.10.0
-      es-module-lexer: 0.9.3
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 3.1.1
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6_webpack@5.74.0
-      watchpack: 2.4.0
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-    dev: true
-
   /whatwg-encoding/2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
@@ -23119,19 +22700,6 @@ packages:
         optional: true
     dev: true
 
-  /ws/8.9.0:
-    resolution: {integrity: sha512-Ja7nszREasGaYUYCI2k4lCKIRTt+y7XuqVoHR44YpI49TtryyqbqvDMn5eqfW7e6HzTukDRIsXqzVHScqRcafg==}
-    engines: {node: '>=10.0.0'}
-    peerDependencies:
-      bufferutil: ^4.0.1
-      utf-8-validate: ^5.0.2
-    peerDependenciesMeta:
-      bufferutil:
-        optional: true
-      utf-8-validate:
-        optional: true
-    dev: true
-
   /x-default-browser/0.4.0:
     resolution: {integrity: sha512-7LKo7RtWfoFN/rHx1UELv/2zHGMx8MkZKDq1xENmOCTkfIqZJ0zZ26NEJX8czhnPXVcqS0ARjjfJB+eJ0/5Cvw==}
     hasBin: true
@@ -23375,10 +22943,6 @@ packages:
       fd-slicer: 1.1.0
     dev: true
 
-  /yn/3.1.1:
-    resolution: {integrity: sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==}
-    engines: {node: '>=6'}
-
   /yocto-queue/0.1.0:
     resolution: {integrity: sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==}
     engines: {node: '>=10'}

From 3e2d76ec797bbf57e89eec75cc997f7c19e65c97 Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:56:39 +0100
Subject: [PATCH 146/358] test(Code Node): Unit tests (no-changelog) (#5373)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡ test setup

* ⚡️basic test with run once for all and each items

* 🎨 fix linting error

* ⚡️update to new Helper.setup(tests)

* ⚡ migrate tests to pin data approach
---
 .../nodes/Code/test/Code.node.test.ts         |   5 +
 .../nodes/Code/test/Code.workflow.json        | 116 ++++++++++++++++++
 2 files changed, 121 insertions(+)
 create mode 100644 packages/nodes-base/nodes/Code/test/Code.node.test.ts
 create mode 100644 packages/nodes-base/nodes/Code/test/Code.workflow.json

diff --git a/packages/nodes-base/nodes/Code/test/Code.node.test.ts b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
new file mode 100644
index 00000000000000..e232d6513da8b8
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/test/Code.node.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Code Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Code/test/Code.workflow.json b/packages/nodes-base/nodes/Code/test/Code.workflow.json
new file mode 100644
index 00000000000000..02bef9a1648b25
--- /dev/null
+++ b/packages/nodes-base/nodes/Code/test/Code.workflow.json
@@ -0,0 +1,116 @@
+{
+	"name": "My workflow 24",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "3691826c-caf3-4773-b0af-f5fe2eda42bc",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				-960,
+				600
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "return[\n  { value: 1 },\n  { value: 2 },\n]"
+			},
+			"id": "149e8223-20e2-480e-b675-2aeb6a9f9095",
+			"name": "Sample Data",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				-720,
+				600
+			]
+		},
+		{
+			"parameters": {
+				"jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nlet sum = 0;\nfor (const item of $input.all()) {\n  sum += item.json.value;\n}\n\nreturn [ {sum} ];"
+			},
+			"id": "2002ec71-fd88-4a5b-b2fe-0071fc5397e4",
+			"name": "Run Once for All Items",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				-460,
+				480
+			]
+		},
+		{
+			"parameters": {
+				"mode": "runOnceForEachItem",
+				"jsCode": "// Add a new field called 'myNewField' to the\n// JSON of the item\n$input.item.json.myNewField = $input.item.json.value;\n\nreturn $input.item;"
+			},
+			"id": "9adbeb7a-c711-4ff6-881e-96d5e122c2bc",
+			"name": "Run Once for Each Item",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [
+				-460,
+				720
+			]
+		}
+	],
+	"pinData": {
+		"Run Once for All Items": [
+			{
+				"json": {
+					"sum": 3
+				}
+			}
+		],
+		"Run Once for Each Item": [
+			{
+				"json": {
+					"value": 1,
+					"myNewField": 1
+				}
+			},
+			{
+				"json": {
+					"value": 2,
+					"myNewField": 2
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Sample Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Sample Data": {
+			"main": [
+				[
+					{
+						"node": "Run Once for All Items",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Run Once for Each Item",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "b0d8ec77-92ab-4fa7-93b1-8a2e3543059d",
+	"id": "181",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file

From 40f4ec75fab640c77efc797dede5c41f230f794f Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Thu, 9 Feb 2023 14:54:24 +0100
Subject: [PATCH 147/358] test(Date & Time Node): Unit tests (no-changelog)
 (#5415)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ Add tests to DateTime node

* Test different timezone

* Try new fix

* Fix workflow change time of workflow exec in UTC

* Check if UTC is correctly setup

---------

Co-authored-by: Marcus <marcus@n8n.io>
---
 .../nodes/DateTime/test/node/DateTime.test.ts |  14 +
 .../test/node/DateTimeWorklfow.test.json      | 331 ++++++++++++++++++
 2 files changed, 345 insertions(+)
 create mode 100644 packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
 create mode 100644 packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json

diff --git a/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
new file mode 100644
index 00000000000000..e9b3cbbbdb798f
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTime.test.ts
@@ -0,0 +1,14 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+// ! When making changes to the Workflow test files make sure to export env TZ=UTC as Github Actions runs in UTC timezone
+if (new Date().getTimezoneOffset() === 0) {
+	describe('Test DateTime Node', () => testWorkflows(workflows));
+} else {
+	describe('Test DateTime Node', () => {
+		it('Skipped because timezone is not UTC', () => {
+			expect(true).toBe(true);
+		});
+	});
+}
diff --git a/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json b/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json
new file mode 100644
index 00000000000000..124fc5b1d30b40
--- /dev/null
+++ b/packages/nodes-base/nodes/DateTime/test/node/DateTimeWorklfow.test.json
@@ -0,0 +1,331 @@
+{
+  "name": "My workflow",
+  "nodes": [
+    {
+      "parameters": {},
+      "id": "bd40f2b1-090e-4cf0-8342-0ebcca1089b4",
+      "name": "When clicking \"Execute Workflow\"",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        40,
+        -320
+      ]
+    },
+    {
+      "parameters": {
+        "action": "calculate",
+        "value": "08/01/2022",
+        "duration": 10,
+        "options": {}
+      },
+      "id": "cadf04c8-5900-414e-bf61-46adbf3687c2",
+      "name": "Calculate Date: Add Day",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        -400
+      ]
+    },
+    {
+      "parameters": {
+        "action": "calculate",
+        "value": "08/01/2022",
+        "duration": 2,
+        "timeUnit": "quarters",
+        "options": {}
+      },
+      "id": "77939e5a-db02-4c85-bf31-b61a017f4f64",
+      "name": "Calculate Date: Substract Quarter",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        -40
+      ]
+    },
+    {
+      "parameters": {
+        "action": "calculate",
+        "value": "08/01/2022",
+        "operation": "subtract",
+        "duration": 2,
+        "options": {}
+      },
+      "id": "6426aa5b-96ad-4516-a346-b9d0ee68b7bd",
+      "name": "Calculate Date: Substract Day",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        -220
+      ]
+    },
+    {
+      "parameters": {
+        "action": "calculate",
+        "value": "08/01/2022",
+        "duration": 2,
+        "timeUnit": "months",
+        "options": {}
+      },
+      "id": "de76ce11-7865-4b15-9829-5ed7d6a287eb",
+      "name": "Calculate Date: Add months",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        140
+      ]
+    },
+    {
+      "parameters": {
+        "action": "calculate",
+        "value": "08/01/2022",
+        "operation": "subtract",
+        "duration": 2,
+        "timeUnit": "months",
+        "options": {}
+      },
+      "id": "ccbe4625-e470-45f8-b494-06ee1ecfb1a5",
+      "name": "Calculate Date: Substract Months",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        300
+      ]
+    },
+    {
+      "parameters": {
+        "value": "08/01/2022",
+        "toFormat": "YYYY/MM/DD",
+        "options": {}
+      },
+      "id": "aed1eed3-db4e-431b-be04-488b47880665",
+      "name": "Calculate Date: Format YYYY/MM/DD",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        480
+      ]
+    },
+    {
+      "parameters": {
+        "value": "08/01/2022",
+        "toFormat": "YYYY/MM/DD",
+        "options": {
+          "fromTimezone": "US/Hawaii"
+        }
+      },
+      "id": "3bc2aa26-bc98-40c0-be8a-75bc0d58601c",
+      "name": "Calculate Date: Format YYYY/MM/DD with Timezone",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        660
+      ]
+    },
+    {
+      "parameters": {
+        "value": "08/01/2022",
+        "toFormat": "YYYY/MM/DD",
+        "options": {
+          "fromTimezone": "US/Hawaii",
+          "toTimezone": "US/Pacific"
+        }
+      },
+      "id": "e2defb6b-e465-4d5f-9d65-d66ab91345f5",
+      "name": "Calculate Date: Format YYYY/MM/DD with Timezone1",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        520,
+        840
+      ]
+    },
+    {
+      "parameters": {
+        "value": "08/01/2022",
+        "toFormat": "x",
+        "options": {
+          "fromTimezone": "US/Hawaii",
+          "toTimezone": "US/Pacific"
+        }
+      },
+      "id": "cdf19ab4-aa0c-4cad-8264-bd4356928baf",
+      "name": "Calculate Date: Format YYYY/MM/DD with Timezone Unix",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        40,
+        200
+      ]
+    },
+    {
+      "parameters": {
+        "value": "2022-01-12",
+        "toFormat": "MM-DD-YYYY",
+        "options": {
+          "fromFormat": "YYYY-DD-MM",
+          "fromTimezone": "US/Hawaii",
+          "toTimezone": "US/Pacific"
+        }
+      },
+      "id": "3383f04e-f13d-438b-b1c4-1bc09332401c",
+      "name": "Calculate Date: Format YYYY/MM/DD with Timezone with special zone",
+      "type": "n8n-nodes-base.dateTime",
+      "typeVersion": 1,
+      "position": [
+        40,
+        380
+      ]
+    }
+  ],
+  "pinData": {
+    "Calculate Date: Format YYYY/MM/DD with Timezone Unix": [
+      {
+        "json": {
+          "data": "1659312000000"
+        }
+      }
+    ],
+    "Calculate Date: Format YYYY/MM/DD with Timezone with special zone": [
+      {
+        "json": {
+          "data": "12-01-2022"
+        }
+      }
+    ],
+    "Calculate Date: Add Day": [
+      {
+        "json": {
+          "data": "2022-08-11T00:00:00.000Z"
+        }
+      }
+    ],
+    "Calculate Date: Substract Day": [
+      {
+        "json": {
+          "data": "2022-07-30T00:00:00.000Z"
+        }
+      }
+    ],
+    "Calculate Date: Substract Quarter": [
+      {
+        "json": {
+          "data": "2023-02-01T00:00:00.000Z"
+        }
+      }
+    ],
+    "Calculate Date: Add months": [
+      {
+        "json": {
+          "data": "2022-10-01T00:00:00.000Z"
+        }
+      }
+    ],
+    "Calculate Date: Substract Months": [
+      {
+        "json": {
+          "data": "2022-06-01T00:00:00.000Z"
+        }
+      }
+    ],
+    "Calculate Date: Format YYYY/MM/DD": [
+      {
+        "json": {
+          "data": "2022/08/01"
+        }
+      }
+    ],
+    "Calculate Date: Format YYYY/MM/DD with Timezone": [
+      {
+        "json": {
+          "data": "2022/07/31"
+        }
+      }
+    ],
+    "Calculate Date: Format YYYY/MM/DD with Timezone1": [
+      {
+        "json": {
+          "data": "2022/07/31"
+        }
+      }
+    ]
+  },
+  "connections": {
+    "When clicking \"Execute Workflow\"": {
+      "main": [
+        [
+          {
+            "node": "Calculate Date: Add Day",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Substract Day",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Substract Quarter",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Add months",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Substract Months",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Format YYYY/MM/DD",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Format YYYY/MM/DD with Timezone",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Format YYYY/MM/DD with Timezone1",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Format YYYY/MM/DD with Timezone Unix",
+            "type": "main",
+            "index": 0
+          },
+          {
+            "node": "Calculate Date: Format YYYY/MM/DD with Timezone with special zone",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {
+    "saveManualExecutions": false,
+    "callerPolicy": "workflowsFromSameOwner",
+    "timezone": "America/New_York",
+    "saveExecutionProgress": "DEFAULT"
+  },
+  "versionId": "2737913c-dd04-438a-ba00-b1ee5f734038",
+  "id": "230",
+  "meta": {
+    "instanceId": "27cc9b56542ad45b38725555722c50a1c3fee1670bbb67980558314ee08517c4"
+  },
+  "tags": []
+}
\ No newline at end of file

From c7b58e0ed19869a4f47c666cc895ed72fe20e8e4 Mon Sep 17 00:00:00 2001
From: Valya <68596159+valya@users.noreply.github.com>
Date: Thu, 9 Feb 2023 13:57:45 +0000
Subject: [PATCH 148/358] fix(core): Expression extension failing with optional
 chaining (#5370)

* wip

* fix: working optional chaining polyfill

* fix: polyfill optional chaining on extended functions

* test: add optional chaining tests
---
 packages/workflow/package.json                |   2 +
 packages/workflow/src/Expression.ts           |   4 +-
 .../src/Extensions/ExpressionExtension.ts     | 314 +++++++++++++++++-
 packages/workflow/src/Extensions/index.ts     |   1 +
 .../ExpressionExtension.test.ts               |  58 +++-
 pnpm-lock.yaml                                |   4 +
 6 files changed, 364 insertions(+), 19 deletions(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 03fe098b1c10ed..9e1f1902e753ab 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -52,7 +52,9 @@
   },
   "dependencies": {
     "@n8n_io/riot-tmpl": "^2.0.0",
+    "ast-types": "0.15.2",
     "crypto-js": "^4.1.1",
+    "esprima-next": "5.8.4",
     "jmespath": "^0.16.0",
     "js-base64": "^3.7.2",
     "lodash.get": "^4.4.2",
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index 084c308e19174f..635a1f8afb6c42 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -19,7 +19,7 @@ import { WorkflowDataProxy } from './WorkflowDataProxy';
 import type { Workflow } from './Workflow';
 
 // eslint-disable-next-line import/no-cycle
-import { extend, hasExpressionExtension, hasNativeMethod } from './Extensions';
+import { extend, extendOptional, hasExpressionExtension, hasNativeMethod } from './Extensions';
 import type { ExpressionChunk, ExpressionCode } from './Extensions/ExpressionParser';
 import { joinExpression, splitExpression } from './Extensions/ExpressionParser';
 import { extendTransform } from './Extensions/ExpressionExtension';
@@ -268,6 +268,7 @@ export class Expression {
 
 		// expression extensions
 		data.extend = extend;
+		data.extendOptional = extendOptional;
 
 		Object.assign(data, extendedFunctions);
 
@@ -367,6 +368,7 @@ export class Expression {
 				}
 
 				let text = output.code;
+
 				// We need to cut off any trailing semicolons. These cause issues
 				// with certain types of expression and cause the whole expression
 				// to fail.
diff --git a/packages/workflow/src/Extensions/ExpressionExtension.ts b/packages/workflow/src/Extensions/ExpressionExtension.ts
index 51a9c8f63e4952..112e5ce36cf41f 100644
--- a/packages/workflow/src/Extensions/ExpressionExtension.ts
+++ b/packages/workflow/src/Extensions/ExpressionExtension.ts
@@ -2,14 +2,18 @@
 import { DateTime } from 'luxon';
 import { ExpressionExtensionError } from '../ExpressionError';
 import { parse, visit, types, print } from 'recast';
+import { getOption } from 'recast/lib/util';
+import { parse as esprimaParse } from 'esprima-next';
 
 import { arrayExtensions } from './ArrayExtensions';
 import { dateExtensions } from './DateExtensions';
 import { numberExtensions } from './NumberExtensions';
 import { stringExtensions } from './StringExtensions';
 import { objectExtensions } from './ObjectExtensions';
+import type { ExpressionKind } from 'ast-types/gen/kinds';
 
 const EXPRESSION_EXTENDER = 'extend';
+const EXPRESSION_EXTENDER_OPTIONAL = 'extendOptional';
 
 function isEmpty(value: unknown) {
 	return value === null || value === undefined || !value;
@@ -45,7 +49,7 @@ const EXPRESSION_EXTENSION_METHODS = Array.from(
 );
 
 const EXPRESSION_EXTENSION_REGEX = new RegExp(
-	`(\\$if|\\.(${EXPRESSION_EXTENSION_METHODS.join('|')}))\\s*\\(`,
+	`(\\$if|\\.(${EXPRESSION_EXTENSION_METHODS.join('|')})\\s*(\\?\\.)?)\\s*\\(`,
 );
 
 const isExpressionExtension = (str: string) => EXPRESSION_EXTENSION_METHODS.some((m) => m === str);
@@ -74,10 +78,38 @@ export const hasNativeMethod = (method: string): boolean => {
 	});
 };
 
+// /**
+//  * recast's types aren't great and we need to use a lot of anys
+//  */
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function parseWithEsprimaNext(source: string, options?: any): any {
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+	const ast = esprimaParse(source, {
+		loc: true,
+		locations: true,
+		comment: true,
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		range: getOption(options, 'range', false),
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		tolerant: getOption(options, 'tolerant', true),
+		tokens: true,
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		jsx: getOption(options, 'jsx', false),
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		sourceType: getOption(options, 'sourceType', 'module'),
+		// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	} as any);
+
+	return ast;
+}
+
 /**
  * A function to inject an extender function call into the AST of an expression.
  * This uses recast to do the transform.
  *
+ * This function also polyfills optional chaining if using extended functions.
+ *
  * ```ts
  * 'a'.method('x') // becomes
  * extend('a', 'method', ['x']);
@@ -88,8 +120,213 @@ export const hasNativeMethod = (method: string): boolean => {
  */
 export const extendTransform = (expression: string): { code: string } | undefined => {
 	try {
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		const ast = parse(expression);
+		const ast = parse(expression, { parser: { parse: parseWithEsprimaNext } }) as types.ASTNode;
+
+		let currentChain = 1;
+
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+		visit(ast, {
+			// Polyfill optional chaining
+			visitChainExpression(path) {
+				this.traverse(path);
+				const chainNumber = currentChain;
+				currentChain += 1;
+
+				// This is to match our fork of tmpl
+				const globalIdentifier = types.builders.identifier(
+					// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+					// @ts-ignore
+					typeof window !== 'object' ? 'global' : 'window',
+				);
+				const undefinedIdentifier = types.builders.identifier('undefined');
+				const cancelIdentifier = types.builders.identifier(`chainCancelToken${chainNumber}`);
+				const valueIdentifier = types.builders.identifier(`chainValue${chainNumber}`);
+				const cancelMemberExpression = types.builders.memberExpression(
+					globalIdentifier,
+					cancelIdentifier,
+				);
+				const valueMemberExpression = types.builders.memberExpression(
+					globalIdentifier,
+					valueIdentifier,
+				);
+
+				const patchedStack: ExpressionKind[] = [];
+
+				const buildCancelCheckWrapper = (node: ExpressionKind): ExpressionKind => {
+					return types.builders.conditionalExpression(
+						types.builders.binaryExpression(
+							'===',
+							cancelMemberExpression,
+							types.builders.booleanLiteral(true),
+						),
+						undefinedIdentifier,
+						node,
+					);
+				};
+
+				const buildValueAssignWrapper = (node: ExpressionKind): ExpressionKind => {
+					return types.builders.assignmentExpression('=', valueMemberExpression, node);
+				};
+
+				const buildOptionalWrapper = (node: ExpressionKind): ExpressionKind => {
+					return types.builders.binaryExpression(
+						'===',
+						types.builders.logicalExpression(
+							'??',
+							buildValueAssignWrapper(node),
+							undefinedIdentifier,
+						),
+						undefinedIdentifier,
+					);
+				};
+
+				const buildCancelAssignWrapper = (node: ExpressionKind): ExpressionKind => {
+					return types.builders.assignmentExpression('=', cancelMemberExpression, node);
+				};
+
+				let currentNode: ExpressionKind = path.node.expression;
+				let currentPatch: ExpressionKind | null = null;
+				let patchTop: ExpressionKind | null = null;
+				let wrapNextTopInOptionalExtend = false;
+
+				const updatePatch = (toPatch: ExpressionKind, node: ExpressionKind) => {
+					if (toPatch.type === 'MemberExpression' || toPatch.type === 'OptionalMemberExpression') {
+						toPatch.object = node;
+					} else if (
+						toPatch.type === 'CallExpression' ||
+						toPatch.type === 'OptionalCallExpression'
+					) {
+						toPatch.callee = node;
+					}
+				};
+
+				while (true) {
+					if (
+						currentNode.type === 'MemberExpression' ||
+						currentNode.type === 'OptionalMemberExpression' ||
+						currentNode.type === 'CallExpression' ||
+						currentNode.type === 'OptionalCallExpression'
+					) {
+						let patchNode: ExpressionKind;
+						if (
+							currentNode.type === 'MemberExpression' ||
+							currentNode.type === 'OptionalMemberExpression'
+						) {
+							patchNode = types.builders.memberExpression(
+								valueMemberExpression,
+								currentNode.property,
+							);
+						} else {
+							patchNode = types.builders.callExpression(
+								valueMemberExpression,
+								currentNode.arguments,
+							);
+						}
+
+						if (currentPatch) {
+							updatePatch(currentPatch, patchNode);
+						}
+
+						if (!patchTop) {
+							patchTop = patchNode;
+						}
+
+						currentPatch = patchNode;
+
+						if (currentNode.optional) {
+							// Implement polyfill described below
+							if (wrapNextTopInOptionalExtend) {
+								wrapNextTopInOptionalExtend = false;
+								// This shouldn't ever happen
+								if (
+									patchTop.type === 'MemberExpression' &&
+									patchTop.property.type === 'Identifier'
+								) {
+									patchTop = types.builders.callExpression(
+										types.builders.identifier(EXPRESSION_EXTENDER_OPTIONAL),
+										[patchTop.object, types.builders.stringLiteral(patchTop.property.name)],
+									);
+								}
+							}
+
+							patchedStack.push(patchTop);
+							patchTop = null;
+							currentPatch = null;
+
+							// Attempting to optional chain on an extended function. If we don't
+							// polyfill this most calls will always be undefined. Marking that the
+							// next part of the chain should be wrapped in our polyfill.
+							if (
+								(currentNode.type === 'CallExpression' ||
+									currentNode.type === 'OptionalCallExpression') &&
+								(currentNode.callee.type === 'MemberExpression' ||
+									currentNode.callee.type === 'OptionalMemberExpression') &&
+								currentNode.callee.property.type === 'Identifier' &&
+								isExpressionExtension(currentNode.callee.property.name)
+							) {
+								wrapNextTopInOptionalExtend = true;
+							}
+						}
+
+						if (
+							currentNode.type === 'MemberExpression' ||
+							currentNode.type === 'OptionalMemberExpression'
+						) {
+							currentNode = currentNode.object;
+						} else {
+							currentNode = currentNode.callee;
+						}
+					} else {
+						if (currentPatch) {
+							updatePatch(currentPatch, currentNode);
+							if (!patchTop) {
+								patchTop = currentPatch;
+							}
+						}
+
+						if (wrapNextTopInOptionalExtend) {
+							wrapNextTopInOptionalExtend = false;
+							// This shouldn't ever happen
+							if (
+								patchTop?.type === 'MemberExpression' &&
+								patchTop.property.type === 'Identifier'
+							) {
+								patchTop = types.builders.callExpression(
+									types.builders.identifier(EXPRESSION_EXTENDER_OPTIONAL),
+									[patchTop.object, types.builders.stringLiteral(patchTop.property.name)],
+								);
+							}
+						}
+
+						if (patchTop) {
+							patchedStack.push(patchTop);
+						} else {
+							patchedStack.push(currentNode);
+						}
+						break;
+					}
+				}
+
+				patchedStack.reverse();
+
+				for (let i = 0; i < patchedStack.length; i++) {
+					let node = patchedStack[i];
+
+					if (i !== patchedStack.length - 1) {
+						node = buildCancelAssignWrapper(buildOptionalWrapper(node));
+					}
+
+					if (i !== 0) {
+						node = buildCancelCheckWrapper(node);
+					}
+					patchedStack[i] = node;
+				}
+
+				const sequenceNode = types.builders.sequenceExpression(patchedStack);
+
+				path.replace(sequenceNode);
+			},
+		});
 
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		visit(ast, {
@@ -158,14 +395,14 @@ function isDate(input: unknown): boolean {
 	return d instanceof Date && !isNaN(d.valueOf()) && d.toISOString() === input;
 }
 
-/**
- * Extender function injected by expression extension plugin to allow calls to extensions.
- *
- * ```ts
- * extend(input, "functionName", [...args]);
- * ```
- */
-export function extend(input: unknown, functionName: string, args: unknown[]) {
+interface FoundFunction {
+	type: 'native' | 'extended';
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	function: Function;
+}
+
+// eslint-disable-next-line @typescript-eslint/ban-types
+function findExtendedFunction(input: unknown, functionName: string): FoundFunction | undefined {
 	// eslint-disable-next-line @typescript-eslint/ban-types
 	let foundFunction: Function | undefined;
 	if (Array.isArray(input)) {
@@ -191,23 +428,39 @@ export function extend(input: unknown, functionName: string, args: unknown[]) {
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		const inputAny: any = input;
 		// This is likely a builtin we're implementing for another type
-		// (e.g. toLocaleString). We'll just call it
+		// (e.g. toLocaleString). We'll return that instead
 		if (
 			inputAny &&
 			functionName &&
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 			typeof inputAny[functionName] === 'function'
 		) {
-			// I was having weird issues with eslint not finding rules on this line.
-			// Just disabling all eslint rules for now.
-			// eslint-disable-next-line
-			return inputAny[functionName](...args);
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+			return { type: 'native', function: inputAny[functionName] };
 		}
 
 		// Use a generic version if available
 		foundFunction = genericExtensions[functionName];
 	}
 
+	if (!foundFunction) {
+		return undefined;
+	}
+
+	return { type: 'extended', function: foundFunction };
+}
+
+/**
+ * Extender function injected by expression extension plugin to allow calls to extensions.
+ *
+ * ```ts
+ * extend(input, "functionName", [...args]);
+ * ```
+ */
+export function extend(input: unknown, functionName: string, args: unknown[]) {
+	// eslint-disable-next-line @typescript-eslint/ban-types
+	const foundFunction = findExtendedFunction(input, functionName);
+
 	// No type specific or generic function found. Check to see if
 	// any types have a function with that name. Then throw an error
 	// letting the user know the available types.
@@ -232,6 +485,33 @@ export function extend(input: unknown, functionName: string, args: unknown[]) {
 		}
 	}
 
+	if (foundFunction.type === 'native') {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return foundFunction.function.apply(input, args);
+	}
+
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-return
-	return foundFunction(input, args);
+	return foundFunction.function(input, args);
+}
+
+export function extendOptional(
+	input: unknown,
+	functionName: string,
+	// eslint-disable-next-line @typescript-eslint/ban-types
+): Function | undefined {
+	const foundFunction = findExtendedFunction(input, functionName);
+
+	if (!foundFunction) {
+		return undefined;
+	}
+
+	if (foundFunction.type === 'native') {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return foundFunction.function.bind(input);
+	}
+
+	return (...args: unknown[]) => {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+		return foundFunction.function(input, args);
+	};
 }
diff --git a/packages/workflow/src/Extensions/index.ts b/packages/workflow/src/Extensions/index.ts
index ff4f5be15a5d64..a0c98d6208f37f 100644
--- a/packages/workflow/src/Extensions/index.ts
+++ b/packages/workflow/src/Extensions/index.ts
@@ -1,6 +1,7 @@
 // eslint-disable-next-line import/no-cycle
 export {
 	extend,
+	extendOptional,
 	hasExpressionExtension,
 	hasNativeMethod,
 	extendTransform,
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index 1a253ee2f5bfe6..951a4e22a1f9ae 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -95,7 +95,7 @@ describe('tmpl Expression Parser', () => {
 			);
 		});
 
-		test('Escaped closinging bracket', () => {
+		test('Escaped closing bracket', () => {
 			expect(joinExpression(splitExpression('test {{ code.test("\\}}") }}'))).toEqual(
 				'test {{ code.test("\\}}") }}',
 			);
@@ -112,6 +112,62 @@ describe('tmpl Expression Parser', () => {
 		});
 	});
 
+	describe('Test newer ES syntax', () => {
+		test('Optional chaining transforms', () => {
+			expect(extendTransform('$json.something?.test.funcCall()')?.code).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = $json.something) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1.test.funcCall();',
+			);
+
+			expect(extendTransform('$json.something?.test.funcCall()?.somethingElse')?.code).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = $json.something) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainCancelToken1 = ((window.chainValue1 = window.chainValue1.test.funcCall()) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1.somethingElse;',
+			);
+
+			expect(extendTransform('$json.something?.test.funcCall().somethingElse')?.code).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = $json.something) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1.test.funcCall().somethingElse;',
+			);
+
+			expect(
+				extendTransform('$json.something?.test.funcCall()?.somethingElse.otherCall()')?.code,
+			).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = $json.something) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainCancelToken1 = ((window.chainValue1 = window.chainValue1.test.funcCall()) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1.somethingElse.otherCall();',
+			);
+
+			expect(evaluate('={{ [1, 2, 3, 4]?.sum() }}')).toBe(10);
+		});
+
+		test('Optional chaining transforms on calls', () => {
+			expect(extendTransform('Math.min?.(1)')?.code).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = extendOptional(Math, "min")) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1(1);',
+			);
+			expect(extendTransform('Math?.min?.(1)')?.code).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = Math) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainCancelToken1 = ((window.chainValue1 = extendOptional(window.chainValue1, "min")) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1(1);',
+			);
+
+			expect(extendTransform('$json.test.test2?.sum()')?.code).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = $json.test.test2) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : extend(window.chainValue1, "sum", []);',
+			);
+			expect(extendTransform('$json.test.test2?.sum?.()')?.code).toBe(
+				'window.chainCancelToken1 = ((window.chainValue1 = $json.test.test2) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainCancelToken1 = ((window.chainValue1 = extendOptional(window.chainValue1, "sum")) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1();',
+			);
+
+			expect(evaluate('={{ [1, 2, 3, 4].sum?.() }}')).toBe(10);
+		});
+
+		test('Multiple optional chains in an expression', () => {
+			expect(extendTransform('$json.test?.test2($json.test?.test2)')?.code)
+				.toBe(`window.chainCancelToken2 = ((window.chainValue2 = $json.test) ?? undefined) === undefined, window.chainCancelToken2 === true ? undefined : window.chainValue2.test2(
+  (window.chainCancelToken1 = ((window.chainValue1 = $json.test) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1.test2)
+);`);
+
+			expect(extendTransform('$json.test?.test2($json.test.sum?.())')?.code)
+				.toBe(`window.chainCancelToken2 = ((window.chainValue2 = $json.test) ?? undefined) === undefined, window.chainCancelToken2 === true ? undefined : window.chainValue2.test2(
+  (window.chainCancelToken1 = ((window.chainValue1 = extendOptional($json.test, "sum")) ?? undefined) === undefined, window.chainCancelToken1 === true ? undefined : window.chainValue1())
+);`);
+		});
+
+		expect(evaluate('={{ [1, 2, 3, 4]?.sum((undefined)?.test) }}')).toBe(10);
+	});
+
 	describe('Non dot extensions', () => {
 		test('min', () => {
 			expect(evaluate('={{ min(1, 2, 3, 4, 5, 6) }}')).toEqual(1);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3c84eaa919fb4c..0c0982dd93adf3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -930,7 +930,9 @@ importers:
       '@types/lodash.set': ^4.3.6
       '@types/luxon': ^2.0.9
       '@types/xml2js': ^0.4.3
+      ast-types: 0.15.2
       crypto-js: ^4.1.1
+      esprima-next: 5.8.4
       jmespath: ^0.16.0
       js-base64: ^3.7.2
       lodash.get: ^4.4.2
@@ -944,7 +946,9 @@ importers:
       xml2js: ^0.4.23
     dependencies:
       '@n8n_io/riot-tmpl': 2.0.0
+      ast-types: 0.15.2
       crypto-js: 4.1.1
+      esprima-next: 5.8.4
       jmespath: 0.16.0
       js-base64: 3.7.2
       lodash.get: 4.4.2

From 1ea1935b9aa8a0bc19f0ee81a2c83cc4feb91e23 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Thu, 9 Feb 2023 16:13:23 +0200
Subject: [PATCH 149/358] test(RSS Read Node): Unit tests (no-changelog)

---
 .../RssFeedRead/test/node/RssFeedRead.test.ts | 32 +++++++
 .../RssFeedRead/test/node/workflow.rss.json   | 87 +++++++++++++++++++
 2 files changed, 119 insertions(+)
 create mode 100644 packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
 create mode 100644 packages/nodes-base/nodes/RssFeedRead/test/node/workflow.rss.json

diff --git a/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
new file mode 100644
index 00000000000000..ff46b61735a63c
--- /dev/null
+++ b/packages/nodes-base/nodes/RssFeedRead/test/node/RssFeedRead.test.ts
@@ -0,0 +1,32 @@
+import {
+	setup,
+	equalityTest,
+	workflowToTests,
+	getWorkflowFilenames,
+} from '../../../../test/nodes/Helpers';
+
+import nock from 'nock';
+
+// eslint-disable-next-line n8n-local-rules/no-unneeded-backticks
+const feed = `<?xml version="1.0" encoding="UTF-8"?><rss xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:content="http://purl.org/rss/1.0/modules/content/" xmlns:atom="http://www.w3.org/2005/Atom" version="2.0"><channel><title><![CDATA[Lorem ipsum feed for an interval of 1 minutes with 3 item(s)]]></title><description><![CDATA[This is a constantly updating lorem ipsum feed]]></description><link>http://example.com/</link><generator>RSS for Node</generator><lastBuildDate>Thu, 09 Feb 2023 13:40:32 GMT</lastBuildDate><pubDate>Thu, 09 Feb 2023 13:40:00 GMT</pubDate><copyright><![CDATA[Michael Bertolacci, licensed under a Creative Commons Attribution 3.0 Unported License.]]></copyright><ttl>1</ttl><item><title><![CDATA[Lorem ipsum 2023-02-09T13:40:00Z]]></title><description><![CDATA[Fugiat excepteur exercitation tempor ut aute sunt pariatur veniam pariatur dolor.]]></description><link>http://example.com/test/1675950000</link><guid isPermaLink="true">http://example.com/test/1675950000</guid><dc:creator><![CDATA[John Smith]]></dc:creator><pubDate>Thu, 09 Feb 2023 13:40:00 GMT</pubDate></item><item><title><![CDATA[Lorem ipsum 2023-02-09T13:39:00Z]]></title><description><![CDATA[Laboris quis nulla tempor eu ullamco est esse qui aute commodo aliqua occaecat.]]></description><link>http://example.com/test/1675949940</link><guid isPermaLink="true">http://example.com/test/1675949940</guid><dc:creator><![CDATA[John Smith]]></dc:creator><pubDate>Thu, 09 Feb 2023 13:39:00 GMT</pubDate></item><item><title><![CDATA[Lorem ipsum 2023-02-09T13:38:00Z]]></title><description><![CDATA[Irure labore dolor dolore sint aliquip eu anim aute anim et nulla adipisicing nostrud.]]></description><link>http://example.com/test/1675949880</link><guid isPermaLink="true">http://example.com/test/1675949880</guid><dc:creator><![CDATA[John Smith]]></dc:creator><pubDate>Thu, 09 Feb 2023 13:38:00 GMT</pubDate></item></channel></rss>`;
+
+describe('Test HTTP Request Node', () => {
+	const workflows = getWorkflowFilenames(__dirname);
+	const tests = workflowToTests(workflows);
+
+	beforeAll(() => {
+		nock.disableNetConnect();
+
+		nock('https://lorem-rss.herokuapp.com').get('/feed?length=3').reply(200, feed);
+	});
+
+	afterAll(() => {
+		nock.restore();
+	});
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => equalityTest(testData, nodeTypes));
+	}
+});
diff --git a/packages/nodes-base/nodes/RssFeedRead/test/node/workflow.rss.json b/packages/nodes-base/nodes/RssFeedRead/test/node/workflow.rss.json
new file mode 100644
index 00000000000000..8a67b561f72d6c
--- /dev/null
+++ b/packages/nodes-base/nodes/RssFeedRead/test/node/workflow.rss.json
@@ -0,0 +1,87 @@
+{
+	"name": "rss feed test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "e5fd1ef8-5528-4626-a523-7668969b2123",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [880, 400]
+		},
+		{
+			"parameters": {
+				"url": "https://lorem-rss.herokuapp.com/feed?length=3"
+			},
+			"id": "9c40a026-fa38-4c91-a4a1-5332f762c3dd",
+			"name": "RSS Read",
+			"type": "n8n-nodes-base.rssFeedRead",
+			"typeVersion": 1,
+			"position": [1080, 400]
+		}
+	],
+	"pinData": {
+		"RSS Read": [
+			{
+				"json": {
+					"creator": "John Smith",
+					"title": "Lorem ipsum 2023-02-09T13:40:00Z",
+					"link": "http://example.com/test/1675950000",
+					"pubDate": "Thu, 09 Feb 2023 13:40:00 GMT",
+					"dc:creator": "John Smith",
+					"content": "Fugiat excepteur exercitation tempor ut aute sunt pariatur veniam pariatur dolor.",
+					"contentSnippet": "Fugiat excepteur exercitation tempor ut aute sunt pariatur veniam pariatur dolor.",
+					"guid": "http://example.com/test/1675950000",
+					"isoDate": "2023-02-09T13:40:00.000Z"
+				}
+			},
+			{
+				"json": {
+					"creator": "John Smith",
+					"title": "Lorem ipsum 2023-02-09T13:39:00Z",
+					"link": "http://example.com/test/1675949940",
+					"pubDate": "Thu, 09 Feb 2023 13:39:00 GMT",
+					"dc:creator": "John Smith",
+					"content": "Laboris quis nulla tempor eu ullamco est esse qui aute commodo aliqua occaecat.",
+					"contentSnippet": "Laboris quis nulla tempor eu ullamco est esse qui aute commodo aliqua occaecat.",
+					"guid": "http://example.com/test/1675949940",
+					"isoDate": "2023-02-09T13:39:00.000Z"
+				}
+			},
+			{
+				"json": {
+					"creator": "John Smith",
+					"title": "Lorem ipsum 2023-02-09T13:38:00Z",
+					"link": "http://example.com/test/1675949880",
+					"pubDate": "Thu, 09 Feb 2023 13:38:00 GMT",
+					"dc:creator": "John Smith",
+					"content": "Irure labore dolor dolore sint aliquip eu anim aute anim et nulla adipisicing nostrud.",
+					"contentSnippet": "Irure labore dolor dolore sint aliquip eu anim aute anim et nulla adipisicing nostrud.",
+					"guid": "http://example.com/test/1675949880",
+					"isoDate": "2023-02-09T13:38:00.000Z"
+				}
+			}
+		]
+	},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "RSS Read",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "d0662c8d-35a5-424b-a55f-3a2baf4f860e",
+	"id": "113",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}

From fdf47a96dee8883b811249e1e427b764cab15004 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:24:09 +0100
Subject: [PATCH 150/358] fix(core): Fix import command for workflows with old
 format(pre UM) (#5403)

* Replace invalid credentials when importing workflows

* Remove useless console.logs
---
 packages/cli/src/commands/import/workflow.ts | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts
index 2828f0447155f2..027c77bc58045c 100644
--- a/packages/cli/src/commands/import/workflow.ts
+++ b/packages/cli/src/commands/import/workflow.ts
@@ -27,6 +27,7 @@ import type { User } from '@db/entities/User';
 import { setTagsForImport } from '@/TagHelpers';
 import type { ICredentialsDb, IWorkflowToImport } from '@/Interfaces';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
+import { replaceInvalidCredentials } from '@/WorkflowHelpers';
 
 const FIX_INSTRUCTION =
 	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
@@ -125,7 +126,7 @@ export class ImportWorkflowsCommand extends Command {
 				});
 
 				totalImported = files.length;
-
+				console.info(`Importing ${totalImported} workflows...`);
 				await Db.getConnection().transaction(async (transactionManager) => {
 					this.transactionManager = transactionManager;
 
@@ -165,17 +166,26 @@ export class ImportWorkflowsCommand extends Command {
 				this.transactionManager = transactionManager;
 
 				for (const workflow of workflows) {
+					let oldCredentialFormat = false;
 					if (credentials.length > 0) {
 						workflow.nodes.forEach((node: INode) => {
 							this.transformCredentials(node, credentials);
-
 							if (!node.id) {
 								// eslint-disable-next-line no-param-reassign
 								node.id = uuid();
 							}
+							if (!node.credentials?.id) {
+								oldCredentialFormat = true;
+							}
 						});
 					}
-
+					if (oldCredentialFormat) {
+						try {
+							await replaceInvalidCredentials(workflow as unknown as WorkflowEntity);
+						} catch (error) {
+							console.log(error);
+						}
+					}
 					if (Object.prototype.hasOwnProperty.call(workflow, 'tags')) {
 						await setTagsForImport(transactionManager, workflow, tags);
 					}

From e01192e7afee3d44810705a2a28af37af7fab4a1 Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:31:10 +0100
Subject: [PATCH 151/358] test(Read Binary File Node): Unit tests
 (no-changelog) (#5436)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ add Read Binary Data node unit test

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../test/ReadBinaryFile.test.ts               |  63 ++++++++++++++++++
 .../test/ReadBinaryFile.workflow.json         |  51 ++++++++++++++
 .../nodes/ReadBinaryFile/test/image.jpg       | Bin 0 -> 1045 bytes
 3 files changed, 114 insertions(+)
 create mode 100644 packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
 create mode 100644 packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.workflow.json
 create mode 100644 packages/nodes-base/nodes/ReadBinaryFile/test/image.jpg

diff --git a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
new file mode 100644
index 00000000000000..fbba9089780027
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.test.ts
@@ -0,0 +1,63 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import * as Helpers from '../../../test/nodes/Helpers';
+import type { WorkflowTestData } from '../../../test/nodes/types';
+import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
+import path from 'path';
+
+describe('Test Read Binary File Node', () => {
+	beforeEach(async () => {
+		await Helpers.initBinaryDataManager();
+	});
+
+	const workflow = Helpers.readJsonFileSync(
+		'nodes/ReadBinaryFile/test/ReadBinaryFile.workflow.json',
+	);
+	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
+	node.parameters.filePath = path.join(__dirname, 'image.jpg');
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'nodes/ReadBinaryFile/test/ReadBinaryFile.workflow.json',
+			input: {
+				workflowData: workflow,
+			},
+			output: {
+				nodeData: {
+					'Read Binary File': [
+						[
+							{
+								json: {},
+								binary: {
+									data: {
+										mimeType: 'image/jpeg',
+										fileType: 'image',
+										fileExtension: 'jpg',
+										data: '/9j/4AAQSkZJRgABAQEASABIAAD/4QBmRXhpZgAATU0AKgAAAAgABAEaAAUAAAABAAAAPgEbAAUAAAABAAAARgEoAAMAAAABAAIAAAExAAIAAAAQAAAATgAAAAAAARlJAAAD6AABGUkAAAPocGFpbnQubmV0IDUuMC4xAP/bAEMAIBYYHBgUIBwaHCQiICYwUDQwLCwwYkZKOlB0Znp4cmZwboCQuJyAiK6KbnCg2qKuvsTO0M58muLy4MjwuMrOxv/bAEMBIiQkMCowXjQ0XsaEcITGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxv/AABEIAB8AOwMBEgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOgqgrXF2zNHJ5aKcD3oNPZ23di/VKG82bkuTh1OMgdaAdOSLtZ6G5ut0iSeWoOAKAdO27NCqUN8oQrcHDqccDrQDpyRNPdRwEKcsx7CobIebPLORwThc0inGMF724jagNpxG4OOM1dIDAgjIPBpkqUOxnR2pmh85pW3nJB9KkNi4yqTssZ6rSNXNX0ehHFfusYDLuI7+tXY4I40ChQcdzQRKcL7Fb7PcQO32cqUY5we1XqZPtH11KsFoFDGYK7sckkZxVqgTnJlEQXMBZYGUoTkZ7VeoH7RvcqwWaIh80K7k5JIq1QJzkyhbMtvdSxMdqnlc1amgjmx5i5I70inNSVpFdrmaWRltkBVerHvUW57B2AUNGxyOaC+VW9xXLVrcGbcjrtkXqKZZxvveeTAL9APSgiooq1ty3RTMj//2Q==',
+										directory: __dirname,
+										fileName: 'image.jpg',
+										fileSize: '1.04 kB',
+									},
+								},
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.workflow.json b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.workflow.json
new file mode 100644
index 00000000000000..6144d62b673b49
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadBinaryFile/test/ReadBinaryFile.workflow.json
@@ -0,0 +1,51 @@
+{
+	"name": "Read Binary File Unit Test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "209e36b6-de70-4cc4-ac95-ca17fd3f83ff",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				1020,
+				640
+			]
+		},
+		{
+			"parameters": {
+				"filePath": "C:\\Test\\image.jpg"
+			},
+			"id": "1901bee9-d429-4485-9fdb-e5cd3aa64eab",
+			"name": "Read Binary File",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"position": [
+				1240,
+				640
+			]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read Binary File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "c0b978b3-92e6-4c62-9c85-9539922b0443",
+	"id": "184",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/test/image.jpg b/packages/nodes-base/nodes/ReadBinaryFile/test/image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..24b60c421ecc14914b9e63577915a5837fb69504
GIT binary patch
literal 1045
zcmex=<NpH&0WUXCHwH#VMg|WcWcdG(A<eZSGmU}4*Ox(yfq{X8frU|uffdMN1Y$cz
zX*k=BQG<aQEY1X!G-Lph3<5yx2gE=DNlyj_<`*!!ATcwqL@zJ3M8Q<gK+llj|7`|m
z1_dz*83_>u87UbRB?UEu022cp9fKq{FROr(w5p1tw1T{b2|MOAbgb*jD_C%A(Yk#{
z&RsZHGwac(2PZ!4ICbtA$Ph*)6%_+5gE$kDxMM8^EyqX({|_(-axlm<STi#UF)#@-
zG7B>PKLX@4FtP$e1r#t)z{teR!pg?Z!O6u9RIpWmfr*isnTds&m6e4BsJa#?&%h$c
zDx_%W$R-?^$gWf<V$?WsA&0Wl#)G0k7eA;NClxhua*2scNJ^=yscUFznV6cHTUc5-
zySTc!dw6;UhlGZOM?^*?r=+H(XJlp-mz0*3S5#Itx3spkcXW15nmlFdwCOWu&RVp1
z$<k%ZSFBvMY4et?+qUo6x$Ds3BS()NKXLNZrOQ{YUb}wd=B<a19zS{d?D>nAuRebI
z{N?Mn?>~P20{M%Pff?d0xX;l1B?$Bv6AKG73p>bPj7;S~%q+;ls%Xe2<QT}FSSYMy
z)W{*?G;!g^gPh97K_5huiY{`AshB)e{Rr|J*k{Cftcfh2!99lX*DVGfW=3G-F$*%-
zGrZ7h+IsZ1vAg=Tt^(T^Cf~~L-q;_qaL>)1dVaEgM(k0HmnZ36tCF6*_L9oHsOAO@
zcE8)3omM*6EabW)V>PG1>H^=Ki6-9z4>--)EO%((Cb^tX=iFHy7JDq0I9PqV<5t71
zLh0r{<8Tii4rPT8nUj|C9V;nYmQnL;>h?JkYPFn`9&1hBbgXKva=2-&TuWj6u4Bx4
zkF0-Pz44&WgiA!G+(c0G&~MRw=L?y)-#j%Xd5+xGs+o2dzg}6*x**_K!n!v_o{~qS
z7WfsV3bLMIoyHc_@+5t0+=9A`drxhMT%`EfY4_ww9;-t*&-pCOIh|js<5RZsX>r)H
zCd-Y_^gP~sEH_on6utE<GbMGKLul2;_knrU><J<!IYpKW_J!sb#%#?lNW0UwJ0)(>
c%yjAZl}`@nU*PxRSg~kr?&*?XBm4h10lOThTL1t6

literal 0
HcmV?d00001


From 00befbc75a5ceed8196fcf7ac260122cda2bfa30 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Feb 2023 15:47:34 +0100
Subject: [PATCH 152/358] ci(editor): Faster builds on the CI (no-changelog)
 (#5422)

---
 packages/editor-ui/vite.config.ts | 26 ++++++++++------
 packages/editor-ui/vue.config.js  | 49 -------------------------------
 2 files changed, 17 insertions(+), 58 deletions(-)
 delete mode 100644 packages/editor-ui/vue.config.js

diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
index 7508d04578baba..1c8cffa2949d72 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.ts
@@ -2,11 +2,13 @@ import vue from '@vitejs/plugin-vue2';
 import legacy from '@vitejs/plugin-legacy';
 import monacoEditorPlugin from 'vite-plugin-monaco-editor';
 import path, { resolve } from 'path';
-import { defineConfig, mergeConfig, PluginOption } from 'vite';
+import { defineConfig, mergeConfig } from 'vite';
 import { defineConfig as defineVitestConfig } from 'vitest/config';
 
 import packageJSON from './package.json';
 
+const isCI = process.env.CI === 'true';
+
 const vendorChunks = ['vue', 'vue-router'];
 const n8nChunks = ['n8n-workflow', 'n8n-design-system'];
 const ignoreChunks = [
@@ -57,15 +59,19 @@ export default mergeConfig(
 			BASE_PATH: `'${publicPath}'`,
 		},
 		plugins: [
-			legacy({
-				targets: ['defaults', 'not IE 11'],
-			}),
 			vue(),
-			monacoEditorPlugin({
-				publicPath: 'assets/monaco-editor',
-				customDistPath: (root: string, buildOutDir: string, base: string) =>
-					`${root}/${buildOutDir}/assets/monaco-editor`,
-			}) as PluginOption,
+			...(!isCI
+				? [
+						legacy({
+							targets: ['defaults', 'not IE 11'],
+						}),
+						monacoEditorPlugin({
+							publicPath: 'assets/monaco-editor',
+							customDistPath: (root: string, buildOutDir: string, base: string) =>
+								`${root}/${buildOutDir}/assets/monaco-editor`,
+						}),
+				  ]
+				: []),
 		],
 		resolve: {
 			alias: [
@@ -104,9 +110,11 @@ export default mergeConfig(
 			},
 		},
 		build: {
+			minify: !isCI,
 			assetsInlineLimit: 0,
 			sourcemap: false,
 			rollupOptions: {
+				treeshake: !isCI,
 				output: {
 					manualChunks: {
 						vendor: vendorChunks,
diff --git a/packages/editor-ui/vue.config.js b/packages/editor-ui/vue.config.js
deleted file mode 100644
index bff148b43211d1..00000000000000
--- a/packages/editor-ui/vue.config.js
+++ /dev/null
@@ -1,49 +0,0 @@
-const path = require('path');
-const MonacoWebpackPlugin = require('monaco-editor-webpack-plugin');
-
-module.exports = {
-	chainWebpack: (config) => {
-		config.resolve.symlinks(false);
-		// config.plugins.delete("prefetch"); // enable when language package grows
-	},
-	pluginOptions: {
-		webpackBundleAnalyzer: {
-			openAnalyzer: false,
-		},
-		i18n: {
-			locale: 'en',
-			fallbackLocale: 'en',
-			localeDir: './src/i18n/locales',
-			enableInSFC: false,
-		},
-	},
-	configureWebpack: {
-		devServer: {
-			disableHostCheck: true,
-		},
-		plugins: [new MonacoWebpackPlugin({ languages: ['javascript', 'json', 'typescript'] })],
-		resolve: {
-			alias: {
-				'element-ui/packages/button': path.resolve(
-					__dirname,
-					'..',
-					'design-system/src/components/N8nButton/overrides/ElButton.vue',
-				),
-				'element-ui/lib/button': path.resolve(
-					__dirname,
-					'..',
-					'design-system/src/components/N8nButton/overrides/ElButton.vue',
-				),
-			},
-		},
-	},
-	css: {
-		loaderOptions: {
-			sass: {
-				prependData: `
-					@import "@/n8n-theme-variables.scss";
-				`,
-			},
-		},
-	},
-};

From b8980f6118cb7afabcbb628800958b7d9c791603 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 9 Feb 2023 17:59:01 +0300
Subject: [PATCH 153/358] test: Add more data mapping tests (#5389)

* test: Add more data mapping tests

* test: add tests for preview mapping

* test: update wording

* test: add more tests

* test: fix up prev node test

* test: stop popup

* test: add mapping test for paths

* test: revert back param changes

* test: fix mapping tests

* test: reset db

* test: fix up mapping tests

* test: fix up mapping tests

* test: update tests to be more stable

* chore: clean up unused command

* fix: fix up before unload bug

* fix: fix data transformation tests

* test: fix up flaky webhook tests

* test: fix up flaky webhook tests

* test: fix up flaky dt tests
---
 .../14-data-transformation-expressions.cy.ts  |  31 ++-
 cypress/e2e/14-mapping.cy.ts                  | 196 +++++++++++++++++-
 cypress/e2e/16-webhook-node.cy.ts             |  49 ++---
 cypress/fixtures/Test_workflow_3.json         | 121 +++++++++++
 cypress/pages/canvas-node.ts                  |   2 +-
 cypress/pages/ndv.ts                          |  35 +++-
 cypress/support/commands.ts                   |  14 +-
 cypress/support/index.ts                      |   2 +-
 .../src/components/ParameterInputWrapper.vue  |   3 +-
 packages/editor-ui/src/views/NodeView.vue     |   8 +-
 10 files changed, 393 insertions(+), 68 deletions(-)
 create mode 100644 cypress/fixtures/Test_workflow_3.json

diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
index ab59eef826ece0..6f6b802926d9b5 100644
--- a/cypress/e2e/14-data-transformation-expressions.cy.ts
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -4,15 +4,18 @@ const wf = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Data transformation expressions', () => {
-	before(() => {
+	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
+		wf.actions.visit();
 		cy.waitForLoad();
+
+		cy.window()
+			// @ts-ignore
+			.then(win => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload));
 	});
 
 	it('$json + native string methods', () => {
-		wf.actions.visit();
-
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myStr: 'Monday' }]);
 		ndv.actions.close();
@@ -23,12 +26,10 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+		ndv.getters.outputDataContainer().should('be.visible').contains(output);
 	});
 
 	it('$json + n8n string methods', () => {
-		wf.actions.visit();
-
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myStr: 'hello@n8n.io is an email' }]);
 		ndv.actions.close();
@@ -39,12 +40,10 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+		ndv.getters.outputDataContainer().should('be.visible').contains(output);
 	});
 
 	it('$json + native numeric methods', () => {
-		wf.actions.visit();
-
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myNum: 9.123 }]);
 		ndv.actions.close();
@@ -55,12 +54,10 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+		ndv.getters.outputDataContainer().should('be.visible').contains(output);
 	});
 
 	it('$json + n8n numeric methods', () => {
-		wf.actions.visit();
-
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myStr: 'hello@n8n.io is an email' }]);
 		ndv.actions.close();
@@ -71,12 +68,10 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+		ndv.getters.outputDataContainer().should('be.visible').contains(output);
 	});
 
 	it('$json + native array methods', () => {
-		wf.actions.visit();
-
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myArr: [1, 2, 3] }]);
 		ndv.actions.close();
@@ -87,12 +82,10 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+		ndv.getters.outputDataContainer().should('be.visible').contains(output);
 	});
 
 	it('$json + n8n array methods', () => {
-		wf.actions.visit();
-
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myArr: [1, 2, 3] }]);
 		ndv.actions.close();
@@ -103,7 +96,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().contains(output).should('be.visible');
+		ndv.getters.outputDataContainer().should('be.visible').contains(output);
 	});
 });
 
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 6c24da45fc4428..ade387e454f6b3 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -5,16 +5,18 @@ const ndv = new NDV();
 const canvasNode = new CanvasNode();
 
 describe('Data mapping', () => {
-	before(() => {
+	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
-	});
-
-	beforeEach(() => {
 		workflowPage.actions.visit();
+		cy.waitForLoad();
+
+		cy.window()
+			// @ts-ignore
+			.then(win => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload))
 	});
 
-	it('Should be able to map expressions from table header', () => {
+	it('maps expressions from table header', () => {
 		cy.fixture('Test_workflow-actions_paste-data.json').then((data) => {
 			cy.get('body').paste(JSON.stringify(data));
 		});
@@ -34,4 +36,188 @@ describe('Data mapping', () => {
 		ndv.actions.mapDataFromHeader(2, 'value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.timestamp }} {{ $json["Readable date"] }}');
 	});
+
+	it('maps expressions from table json, and resolves value based on hover', () => {
+		cy.fixture('Test_workflow_3.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		canvasNode.actions.openNode('Set');
+		ndv.actions.switchInputMode('Table');
+		ndv.getters.inputDataContainer().get('table', { timeout: 10000 }).should('exist');
+
+		ndv.getters.parameterInput('name').should('have.length', 1).find('input').should('have.value', 'other');
+		ndv.getters.parameterInput('value').should('have.length', 1).find('input').should('have.value', '');
+
+		ndv.getters.inputTbodyCell(1, 0).find('span').contains('count').trigger('mousedown', {force: true});
+		ndv.actions.mapToParameter('value');
+
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0')
+
+		ndv.getters.inputTbodyCell(1, 0).realHover();
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '0')
+			.invoke('css', 'color')
+			.should('equal', 'rgb(125, 125, 135)');
+
+		ndv.getters.inputTbodyCell(2, 0).realHover();
+		ndv.getters.parameterExpressionPreview('value')
+				.should('include.text', '1')
+				.invoke('css', 'color')
+				.should('equal', 'rgb(125, 125, 135)');
+
+		ndv.actions.execute();
+
+		ndv.getters.outputTbodyCell(1, 0).realHover();
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '0')
+			.invoke('css', 'color')
+			.should('equal', 'rgb(125, 125, 135)'); // todo update color
+
+		ndv.getters.outputTbodyCell(2, 0).realHover();
+		ndv.getters.parameterExpressionPreview('value')
+				.should('include.text', '1')
+				.invoke('css', 'color')
+				.should('equal', 'rgb(125, 125, 135)');
+	});
+
+	it('maps expressions from json view', () => {
+		cy.fixture('Test_workflow_3.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		canvasNode.actions.openNode('Set');
+		ndv.actions.switchInputMode('JSON');
+
+		ndv.getters.inputDataContainer().should('exist').find('.json-data')
+			.should('have.text', '[{"input":[{"count":0,"with space":"!!","with.dot":"!!","with"quotes":"!!"}]},{"input":[{"count":1}]}]')
+			.find('span').contains('"count"')
+			.realMouseDown();
+
+		ndv.actions.mapToParameter('value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '0');
+
+		ndv.getters.inputDataContainer().find('.json-data')
+			.find('span').contains('"input"')
+			.realMouseDown();
+
+		ndv.actions.mapToParameter('value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '0 [object Object]');
+	});
+
+	it('maps expressions from schema view', () => {
+		cy.fixture('Test_workflow_3.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		canvasNode.actions.openNode('Set');
+		ndv.actions.clearParameterInput('value');
+		cy.get('body').type('{esc}');
+
+		ndv.getters.inputDataContainer()
+			.should('exist')
+			.find('span').contains('count')
+			.realMouseDown();
+
+
+		ndv.actions.mapToParameter('value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '0');
+
+		ndv.getters.inputDataContainer()
+			.find('span').contains('input')
+			.realMouseDown();
+
+		ndv.actions.mapToParameter('value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '0 [object Object]');
+	});
+
+	it('maps expressions from previous nodes', () => {
+		cy.createFixtureWorkflow('Test_workflow_3.json', `My test workflow`);
+		canvasNode.actions.openNode('Set1');
+
+		ndv.actions.selectInputNode('Schedule Trigger');
+
+		ndv.getters.inputDataContainer()
+			.find('span').contains('count')
+			.realMouseDown();
+
+		ndv.actions.mapToParameter('value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $node["Schedule Trigger"].json.input[0].count }}');
+		ndv.getters.parameterExpressionPreview('value')
+			.should('not.exist');
+
+		ndv.actions.switchInputMode('Table');
+		ndv.actions.mapDataFromHeader(1, 'value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $node["Schedule Trigger"].json.input[0].count }} {{ $node["Schedule Trigger"].json.input }}');
+		ndv.getters.parameterExpressionPreview('value')
+			.should('not.exist');
+
+		ndv.actions.selectInputNode('Set');
+
+		ndv.actions.executePrevious();
+		ndv.getters.executingLoader().should('not.exist');
+		ndv.getters.inputDataContainer().should('exist');
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '0 [object Object]');
+
+		ndv.getters.inputTbodyCell(2, 0).realHover();
+		ndv.getters.parameterExpressionPreview('value')
+			.should('include.text', '1 [object Object]');
+	});
+
+	it('maps keys to path', () => {
+		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger', {keepNdvOpen: true});
+
+		ndv.actions.setPinnedData([
+			{
+				input: [
+					{
+						"hello.world": {
+							"my count": 0,
+						},
+					}
+				]
+			},
+			{
+				input: [
+					{
+						"hello.world": {
+							"my count": 1,
+						}
+					}
+				]
+			},
+		]);
+
+		ndv.actions.close();
+
+		workflowPage.actions.addNodeToCanvas('Item Lists');
+		canvasNode.actions.openNode('Item Lists');
+
+		ndv.getters.parameterInput('operation')
+			.click()
+			.find('li').contains('Sort')
+			.click();
+
+		ndv.getters.nodeParameters().find('button').contains('Add Field To Sort By').click();
+
+		ndv.getters.inputDataContainer()
+			.find('span').contains('my count')
+			.realMouseDown();
+
+		ndv.actions.mapToParameter('fieldName');
+
+		ndv.getters.inlineExpressionEditorInput().should('have.length', 0);
+		ndv.getters.parameterInput('fieldName')
+			.find('input').should('have.value', 'input[0]["hello.world"]["my count"]');
+	});
 });
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 119ebdd3b4af33..07495cc4b0c572 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -1,13 +1,11 @@
-import { WorkflowPage, WorkflowsPage, NDV, CredentialsModal } from '../pages';
+import { WorkflowPage, NDV, CredentialsModal } from '../pages';
 import { v4 as uuid } from 'uuid';
 import { cowBase64 } from '../support/binaryTestFiles';
 
-const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 const credentialsModal = new CredentialsModal();
 
-const webhookWorkflowName = 'Webhook Workflow';
 const waitForWebhook = 500;
 
 interface SimpleWebhookCallOptions {
@@ -21,7 +19,7 @@ interface SimpleWebhookCallOptions {
 }
 
 const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
-	const { 
+	const {
 		authentication,
 		method,
 		webhookPath,
@@ -31,10 +29,6 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 		executeNow = true,
 		} = options;
 
-	cy.visit(workflowsPage.url);
-
-	workflowsPage.actions.createWorkflowFromCard();
-	workflowPage.actions.renameWorkflow(webhookWorkflowName);
 	workflowPage.actions.addInitialNodeToCanvas('Webhook');
 	workflowPage.actions.openNode('Webhook');
 
@@ -49,7 +43,7 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 		.find('input')
 		.clear()
 		.type(webhookPath);
-	
+
 	if (authentication) {
 		cy.getByTestId('parameter-input-authentication').click();
 		cy.getByTestId('parameter-input-authentication')
@@ -66,7 +60,7 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 		.clear()
 		.type(responseCode.toString());
 	}
-	
+
 	if (respondWith) {
 		cy.getByTestId('parameter-input-responseMode').click();
 		cy.getByTestId('parameter-input-responseMode')
@@ -85,7 +79,7 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 		.click();
 	}
 
-	if (executeNow) { 
+	if (executeNow) {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
@@ -97,14 +91,15 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 };
 
 describe('Webhook Trigger node', async () => {
-	before(() => {
+	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
-	});
+		workflowPage.actions.visit();
+		cy.waitForLoad();
 
-	afterEach(() => {
-		cy.visit(workflowsPage.url);
-		workflowsPage.actions.deleteWorkFlow(webhookWorkflowName);
+		cy.window()
+			// @ts-ignore
+			.then(win => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload));
 	});
 
 	it('should listen for a GET request', () => {
@@ -138,7 +133,7 @@ describe('Webhook Trigger node', async () => {
 		});
 
 		ndv.getters.backToCanvas().click();
-		
+
 		workflowPage.actions.addNodeToCanvas('Set');
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
@@ -146,12 +141,12 @@ describe('Webhook Trigger node', async () => {
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('MyValue');
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
 		ndv.getters.backToCanvas().click();
-		
+
 		workflowPage.actions.addNodeToCanvas('Respond to Webhook');
 
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
-	
+
 		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
@@ -169,7 +164,7 @@ describe('Webhook Trigger node', async () => {
 
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
-	
+
 		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
 			expect(response.status).to.eq(201);
 		});
@@ -184,7 +179,7 @@ describe('Webhook Trigger node', async () => {
 			respondWith: 'Last Node',
 		});
 		ndv.getters.backToCanvas().click();
-		
+
 		workflowPage.actions.addNodeToCanvas('Set');
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
@@ -192,10 +187,10 @@ describe('Webhook Trigger node', async () => {
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('MyValue');
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
 		ndv.getters.backToCanvas().click();
-		
+
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
-	
+
 		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
@@ -212,7 +207,7 @@ describe('Webhook Trigger node', async () => {
 			responseData: 'First Entry Binary',
 		});
 		ndv.getters.backToCanvas().click();
-		
+
 		workflowPage.actions.addNodeToCanvas('Set');
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
@@ -220,7 +215,7 @@ describe('Webhook Trigger node', async () => {
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('data');
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().find('input').invoke('val', cowBase64).trigger('blur');
 		ndv.getters.backToCanvas().click();
-		
+
 
 		workflowPage.actions.addNodeToCanvas('Move Binary Data');
 		workflowPage.actions.zoomToFit();
@@ -233,10 +228,10 @@ describe('Webhook Trigger node', async () => {
 			.contains('JSON to Binary')
 			.click();
 		ndv.getters.backToCanvas().click();
-		
+
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
-	
+
 		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(Object.keys(response.body).includes('data')).to.be.true;
diff --git a/cypress/fixtures/Test_workflow_3.json b/cypress/fixtures/Test_workflow_3.json
new file mode 100644
index 00000000000000..846b50cf193c8d
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_3.json
@@ -0,0 +1,121 @@
+{
+	"name": "My workflow",
+	"nodes": [
+		{
+			"parameters": {
+				"rule": {
+					"interval": [
+						{}
+					]
+				}
+			},
+			"id": "0f7d87ee-19c6-4576-bdff-1f3c4739392c",
+			"name": "Schedule Trigger",
+			"type": "n8n-nodes-base.scheduleTrigger",
+			"typeVersion": 1,
+			"position": [
+				720,
+				300
+			]
+		},
+		{
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "other",
+							"value": ""
+						}
+					]
+				},
+				"options": {}
+			},
+			"id": "2dfc690a-95cf-48c2-85a6-2b3bb8cd1d1d",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				920,
+				300
+			]
+		},
+		{
+			"id": "9bee04af-1bfc-4be2-a704-e975cb887ced",
+			"name": "Set1",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				1120,
+				300
+			],
+			"parameters": {
+				"values": {
+					"string": [
+						{
+							"name": "other",
+							"value": ""
+						}
+					]
+				},
+				"options": {}
+			}
+		}
+	],
+	"pinData": {
+		"Schedule Trigger": [
+			{
+				"json": {
+					"input": [
+						{
+							"count": 0,
+							"with space": "!!",
+							"with.dot": "!!",
+							"with\"quotes": "!!"
+						}
+					]
+				}
+			},
+			{
+				"json": {
+					"input": [
+						{
+							"count": 1
+						}
+					]
+				}
+			}
+		]
+	},
+	"connections": {
+		"Schedule Trigger": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Set": {
+			"main": [
+				[
+					{
+						"node": "Set1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "c26af749-dacb-45ef-8071-98aba8688075",
+	"id": "1",
+	"meta": {
+		"instanceId": "fe45a93dd232270eb40d3ba1f7907ad3935bbd72ad5e4ee09ff61e96674f9aef"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/cypress/pages/canvas-node.ts b/cypress/pages/canvas-node.ts
index e0506d15f801e5..b0d0032320e5d7 100644
--- a/cypress/pages/canvas-node.ts
+++ b/cypress/pages/canvas-node.ts
@@ -9,7 +9,7 @@ export class CanvasNode extends BasePage {
 
 	actions = {
 		openNode: (nodeName: string) => {
-			this.getters.nodeByName(nodeName).dblclick();
+			this.getters.nodeByName(nodeName).eq(0).dblclick();
 		},
 	};
 }
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 74febf8c001752..9d15a836c3a9d0 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -10,6 +10,7 @@ export class NDV extends BasePage {
 		inputOption: () => cy.getByTestId('ndv-input-option'),
 		inputPanel: () => cy.getByTestId('ndv-input-panel'),
 		outputPanel: () => cy.getByTestId('output-panel'),
+		executingLoader: () => cy.getByTestId('ndv-executing'),
 		inputDataContainer: () => this.getters.inputPanel().findChildByTestId('ndv-data-container'),
 		inputDisplayMode: () => this.getters.inputPanel().getByTestId('ndv-run-data-display-mode'),
 		outputDataContainer: () => this.getters.outputPanel().findChildByTestId('ndv-data-container'),
@@ -24,18 +25,18 @@ export class NDV extends BasePage {
 		outputTableHeaders: () => this.getters.outputDataContainer().find('table thead th'),
 		outputTableRow: (row: number) => this.getters.outputTableRows().eq(row),
 		outputTbodyCell: (row: number, col: number) => this.getters.outputTableRow(row).find('td').eq(col),
-		inputTableRows: () => this.getters.outputDataContainer().find('table tr'),
-		inputTableHeaders: () => this.getters.outputDataContainer().find('table thead th'),
-		inputTableRow: (row: number) => this.getters.outputTableRows().eq(row),
-		inputTbodyCell: (row: number, col: number) => this.getters.outputTableRow(row).find('td').eq(col),
+		inputTableRows: () => this.getters.inputDataContainer().find('table tr'),
+		inputTableHeaders: () => this.getters.inputDataContainer().find('table thead th'),
+		inputTableRow: (row: number) => this.getters.inputTableRows().eq(row),
+		inputTbodyCell: (row: number, col: number) => this.getters.inputTableRow(row).find('td').eq(col),
 		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input'),
 		nodeParameters: () => cy.getByTestId('node-parameters'),
 		parameterInput: (parameterName: string) => cy.getByTestId(`parameter-input-${parameterName}`),
+		parameterExpressionPreview: (parameterName: string) => this.getters.nodeParameters().find(`[data-test-id="parameter-input-${parameterName}"] + [data-test-id="parameter-expression-preview"]`),
 		nodeNameContainer: () => cy.getByTestId('node-title-container'),
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
 		executePrevious: () => cy.getByTestId('execute-previous-node'),
 		httpRequestNotice: () => cy.getByTestId('node-parameters-http-notice'),
-		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input'),
 		nthParam: (n: number) => cy.getByTestId('node-parameters').find('.parameter-item').eq(n),
 	};
 
@@ -46,6 +47,9 @@ export class NDV extends BasePage {
 		editPinnedData: () => {
 			this.getters.editPinnedDataButton().click();
 		},
+		savePinnedData: () => {
+			this.getters.savePinnedDataButton().click();
+		},
 		execute: () => {
 			this.getters.nodeExecuteButton().first().click();
 		},
@@ -64,7 +68,10 @@ export class NDV extends BasePage {
 			editor.type(`{selectall}{backspace}`);
 			editor.type(JSON.stringify(data).replace(new RegExp('{', 'g'), '{{}'));
 
-			this.getters.savePinnedDataButton().click();
+			this.actions.savePinnedData();
+		},
+		clearParameterInput: (parameterName: string) => {
+			this.getters.parameterInput(parameterName).type(`{selectall}{backspace}`);
 		},
 		typeIntoParameterInput: (parameterName: string, content: string) => {
 			this.getters.parameterInput(parameterName).type(content);
@@ -92,11 +99,23 @@ export class NDV extends BasePage {
 			const droppable = `[data-test-id="parameter-input-${parameterName}"]`;
 			cy.draganddrop(draggable, droppable);
 		},
+		mapToParameter: (parameterName: string) => {
+			const droppable = `[data-test-id="parameter-input-${parameterName}"]`;
+			cy.draganddrop('', droppable);
+		},
 		switchInputMode: (type: 'Schema' | 'Table' | 'JSON' | 'Binary') => {
-			this.getters.inputDisplayMode().find('label').contains(type).click();
+			this.getters.inputDisplayMode().find('label').contains(type).click({force: true});
 		},
 		switchOutputMode: (type: 'Schema' | 'Table' | 'JSON' | 'Binary') => {
-			this.getters.outputDisplayMode().find('label').contains(type).click();
+			this.getters.outputDisplayMode().find('label').contains(type).click({force: true});
+		},
+		selectInputNode: (nodeName: string) => {
+			this.getters.inputSelect().find('.el-select').click();
+			this.getters.inputOption().contains(nodeName).click();
+		},
+		addDefaultPinnedData: () => {
+			this.actions.editPinnedData();
+			this.actions.savePinnedData();
 		},
 	};
 }
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 571c2408276dce..ff64f69599c3bc 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -243,7 +243,9 @@ Cypress.Commands.add('drag', (selector, pos) => {
 });
 
 Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
-	cy.get(draggableSelector).should('exist');
+	if (draggableSelector) {
+		cy.get(draggableSelector).should('exist');
+	}
 	cy.get(droppableSelector).should('exist');
 
 	cy.get(droppableSelector)
@@ -254,12 +256,16 @@ Cypress.Commands.add('draganddrop', (draggableSelector, droppableSelector) => {
 			const pageX = coords.left + coords.width / 2;
 			const pageY = coords.top + coords.height / 2;
 
-			// We can't use realMouseDown here because it hangs headless run
-			cy.get(draggableSelector).trigger('mousedown');
+			if (draggableSelector) {
+				// We can't use realMouseDown here because it hangs headless run
+				cy.get(draggableSelector).trigger('mousedown');
+			}
 			// We don't chain these commands to make sure cy.get is re-trying correctly
 			cy.get(droppableSelector).realMouseMove(pageX, pageY);
 			cy.get(droppableSelector).realHover();
 			cy.get(droppableSelector).realMouseUp();
-			cy.get(draggableSelector).realMouseUp();
+			if (draggableSelector) {
+				cy.get(draggableSelector).realMouseUp();
+			}
 		});
 });
diff --git a/cypress/support/index.ts b/cypress/support/index.ts
index 8eee49e10fe57e..93927c98e8ee85 100644
--- a/cypress/support/index.ts
+++ b/cypress/support/index.ts
@@ -48,7 +48,7 @@ declare global {
 			readClipboard(): Chainable<string>;
 			paste(pastePayload: string): void;
 			drag(selector: string, target: [number, number]): void;
-			draganddrop(selector: string, target: string): void;
+			draganddrop(draggableSelector: string, droppableSelector: string): void;
 		}
 	}
 }
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index d5735f03dffd3e..0fc39cefdde73e 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -16,16 +16,17 @@
 			:isForCredential="isForCredential"
 			:eventSource="eventSource"
 			:expressionEvaluated="expressionValueComputed"
+			:data-test-id="`parameter-input-${parameter.name}`"
 			@focus="onFocus"
 			@blur="onBlur"
 			@drop="onDrop"
 			@textInput="onTextInput"
 			@valueChanged="onValueChanged"
-			:data-test-id="`parameter-input-${parameter.name}`"
 		/>
 		<input-hint
 			v-if="expressionOutput"
 			:class="$style.hint"
+			data-test-id="parameter-expression-preview"
 			:highlight="!!(expressionOutput && targetItem)"
 			:hint="expressionOutput"
 		/>
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 6f82056eb03b63..51c79d15e23412 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -2536,7 +2536,10 @@ export default mixins(
 			this.uiStore.nodeViewInitialized = true;
 			document.addEventListener('keydown', this.keyDown);
 			document.addEventListener('keyup', this.keyUp);
-			window.addEventListener('beforeunload', (e) => {
+
+			// allow to be overriden in e2e tests
+			// @ts-ignore
+			window.onBeforeUnload = (e) => {
 				if (this.isDemo) {
 					return;
 				} else if (this.uiStore.stateIsDirty) {
@@ -2549,7 +2552,8 @@ export default mixins(
 					this.startLoading(this.$locale.baseText('nodeView.redirecting'));
 					return;
 				}
-			});
+			};
+			window.addEventListener('beforeunload', window.onBeforeUnload);
 		},
 		getOutputEndpointUUID(nodeName: string, index: number): string | null {
 			const node = this.workflowsStore.getNodeByName(nodeName);

From d9a4c2c66dc75e2bd2c2631b8f6b566b16bc6a28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Thu, 9 Feb 2023 16:00:55 +0100
Subject: [PATCH 154/358] test(editor): Add user management e2e tests (#5438)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✅ Added initial UM test using new commands
* ✅ Added rest of the UM tests
---
 cypress/e2e/17-sharing.cy.ts                  | 53 ----------
 cypress/e2e/18-user-management.cy.ts          | 96 +++++++++++++++++++
 cypress/pages/settings-users.ts               | 37 +++++++
 .../N8nActionToggle/ActionToggle.vue          |  2 +-
 .../src/components/N8nUsersList/UsersList.vue |  1 +
 .../src/components/DeleteUserModal.vue        |  6 +-
 6 files changed, 140 insertions(+), 55 deletions(-)
 delete mode 100644 cypress/e2e/17-sharing.cy.ts
 create mode 100644 cypress/e2e/18-user-management.cy.ts

diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
deleted file mode 100644
index ba93c3b72ee813..00000000000000
--- a/cypress/e2e/17-sharing.cy.ts
+++ /dev/null
@@ -1,53 +0,0 @@
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
-
-/**
- * User A - Instance owner
- * User B - User, owns C1, W1, W2
- * User C - User, owns C2
- *
- * W1 - Workflow owned by User B, shared with User C
- * W2 - Workflow owned by User B
- *
- * C1 - Credential owned by User B
- * C2 - Credential owned by User C, shared with User A and User B
- */
-
-const instanceOwner = {
-	email: `${DEFAULT_USER_EMAIL}A`,
-	password: DEFAULT_USER_PASSWORD,
-	firstName: 'User',
-	lastName: 'A',
-};
-
-const users = [
-	{
-		email: `${DEFAULT_USER_EMAIL}B`,
-		password: DEFAULT_USER_PASSWORD,
-		firstName: 'User',
-		lastName: 'B',
-	},
-	{
-		email: `${DEFAULT_USER_EMAIL}C`,
-		password: DEFAULT_USER_PASSWORD,
-		firstName: 'User',
-		lastName: 'C',
-	},
-];
-
-describe('Sharing', () => {
-	before(() => {
-		cy.resetAll();
-		cy.setupOwner(instanceOwner);
-	});
-
-	beforeEach(() => {
-		cy.on('uncaught:exception', (err, runnable) => {
-			expect(err.message).to.include('Not logged in');
-			return false;
-		});
-	});
-
-	it(`should invite User A and UserB to instance`, () => {
-		cy.inviteUsers({ instanceOwner, users });
-	});
-});
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
new file mode 100644
index 00000000000000..6c0f9c84d48ffd
--- /dev/null
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -0,0 +1,96 @@
+import { MainSidebar } from './../pages/sidebar/main-sidebar';
+import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
+import { SettingsSidebar, SettingsUsersPage, WorkflowPage, WorkflowsPage } from '../pages';
+
+/**
+ * User A - Instance owner
+ * User B - User, owns C1, W1, W2
+ * User C - User, owns C2
+ *
+ * W1 - Workflow owned by User B, shared with User C
+ * W2 - Workflow owned by User B
+ *
+ * C1 - Credential owned by User B
+ * C2 - Credential owned by User C, shared with User A and User B
+ */
+
+const instanceOwner = {
+	email: `${DEFAULT_USER_EMAIL}A`,
+	password: DEFAULT_USER_PASSWORD,
+	firstName: 'User',
+	lastName: 'A',
+};
+
+const users = [
+	{
+		email: `${DEFAULT_USER_EMAIL}B`,
+		password: DEFAULT_USER_PASSWORD,
+		firstName: 'User',
+		lastName: 'B',
+	},
+	{
+		email: `${DEFAULT_USER_EMAIL}C`,
+		password: DEFAULT_USER_PASSWORD,
+		firstName: 'User',
+		lastName: 'C',
+	},
+];
+
+const usersSettingsPage = new SettingsUsersPage();
+const workflowPage = new WorkflowPage();
+
+describe('User Management', () => {
+	before(() => {
+		cy.resetAll();
+		cy.setupOwner(instanceOwner);
+	});
+
+	beforeEach(() => {
+		cy.on('uncaught:exception', (err, runnable) => {
+			expect(err.message).to.include('Not logged in');
+			return false;
+		});
+	});
+
+	it(`should invite User B and User C to instance`, () => {
+		cy.inviteUsers({ instanceOwner, users });
+	});
+
+	it('should prevent non-owners to access UM settings', () => {
+		usersSettingsPage.actions.loginAndVisit(users[0].email, users[0].password, false)
+	});
+
+	it('should allow instance owner to access UM settings', () => {
+		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
+	});
+
+	it('should properly render UM settings page for instance owners', () => {
+		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
+		// All items in user list should be there
+		usersSettingsPage.getters.userListItems().should('have.length', 3);
+		// List item for current user should have the `Owner` badge
+		usersSettingsPage.getters.userItem(instanceOwner.email).find('.n8n-badge:contains("Owner")').should('exist');
+		// Other users list items should contain action pop-up list
+		usersSettingsPage.getters.userActionsToggle(users[0].email).should('exist');
+		usersSettingsPage.getters.userActionsToggle(users[1].email).should('exist');
+	});
+
+	it('should delete user and their data', () => {
+		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
+		usersSettingsPage.actions.opedDeleteDialog(users[0].email);
+		usersSettingsPage.getters.deleteDataRadioButton().realClick();
+		usersSettingsPage.getters.deleteDataInput().type('delete all data');
+		usersSettingsPage.getters.deleteUserButton().realClick();
+		workflowPage.getters.successToast().should('contain', 'User deleted');
+	});
+
+	it('should delete user and transfer their data', () => {
+		usersSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password, true);
+		usersSettingsPage.actions.opedDeleteDialog(users[1].email);
+		usersSettingsPage.getters.transferDataRadioButton().realClick();
+		usersSettingsPage.getters.userSelectDropDown().realClick();
+		usersSettingsPage.getters.userSelectOptions().first().realClick();
+		usersSettingsPage.getters.deleteUserButton().realClick();
+		workflowPage.getters.successToast().should('contain', 'User deleted');
+	});
+});
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index ae0048c937921c..e52d43a8099d41 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -1,5 +1,12 @@
+import { SettingsSidebar } from './sidebar/settings-sidebar';
+import { MainSidebar } from './sidebar/main-sidebar';
+import { WorkflowsPage } from './workflows';
 import { BasePage } from './base';
 
+const workflowsPage =  new WorkflowsPage();
+const mainSidebar = new MainSidebar();
+const settingsSidebar = new SettingsSidebar();
+
 export class SettingsUsersPage extends BasePage {
 	url = '/settings/users';
 	getters = {
@@ -7,8 +14,38 @@ export class SettingsUsersPage extends BasePage {
 		inviteButton: () => cy.getByTestId('settings-users-invite-button').last(),
 		inviteUsersModal: () => cy.getByTestId('inviteUser-modal').last(),
 		inviteUsersModalEmailsInput: () => cy.getByTestId('emails').find('input').first(),
+		userListItems: () => cy.get('[data-test-id^="user-list-item"]'),
+		userItem: (email: string) => cy.getByTestId(`user-list-item-${email.toLowerCase()}`),
+		userActionsToggle: (email: string) => this.getters.userItem(email).find('[data-test-id="action-toggle"]'),
+		deleteUserAction: () => cy.getByTestId('action-toggle-dropdown').find('li:contains("Delete"):visible'),
+		confirmDeleteModal: () => cy.getByTestId('deleteUser-modal').last(),
+		transferDataRadioButton: () => this.getters.confirmDeleteModal().find('[role="radio"]').first(),
+		deleteDataRadioButton: () => this.getters.confirmDeleteModal().find('[role="radio"]').last(),
+		userSelectDropDown: () => this.getters.confirmDeleteModal().find('.n8n-select'),
+		userSelectOptions: () => cy.get('.el-select-dropdown:visible .el-select-dropdown__item'),
+		deleteUserButton: () => this.getters.confirmDeleteModal().find('button:contains("Delete")'),
+		deleteDataInput: () => cy.getByTestId('delete-data-input').find('input').first(),
 	};
 	actions = {
 		goToOwnerSetup: () => this.getters.setUpOwnerButton().click(),
+		loginAndVisit: (email: string, password: string, isOwner: boolean) => {
+			cy.signin({ email, password });
+			cy.visit(workflowsPage.url);
+			mainSidebar.actions.goToSettings();
+			if (isOwner) {
+				settingsSidebar.getters.menuItem('Users').click();
+				cy.url().should('match', new RegExp(this.url));
+			} else {
+				settingsSidebar.getters.menuItem('Users').should('not.exist');
+				// Should be redirected to workflows page if trying to access UM url
+				cy.visit('/settings/users');
+				cy.url().should('match', new RegExp(workflowsPage.url));
+			}
+		},
+		opedDeleteDialog: (email: string) => {
+			this.getters.userActionsToggle(email).click();
+			this.getters.deleteUserAction().realClick();
+			this.getters.confirmDeleteModal().should('be.visible');
+		},
 	};
 }
diff --git a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
index 1b71a5b3ebe6d3..86baf05d21a01f 100644
--- a/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
+++ b/packages/design-system/src/components/N8nActionToggle/ActionToggle.vue
@@ -1,5 +1,5 @@
 <template>
-	<span :class="$style.container">
+	<span :class="$style.container" data-test-id="action-toggle">
 		<el-dropdown
 			:placement="placement"
 			:size="size"
diff --git a/packages/design-system/src/components/N8nUsersList/UsersList.vue b/packages/design-system/src/components/N8nUsersList/UsersList.vue
index 9fcb7e3a34ec06..58cfc3161eb46d 100644
--- a/packages/design-system/src/components/N8nUsersList/UsersList.vue
+++ b/packages/design-system/src/components/N8nUsersList/UsersList.vue
@@ -5,6 +5,7 @@
 			:key="user.id"
 			class="ph-no-capture"
 			:class="i === sortedUsers.length - 1 ? $style.itemContainer : $style.itemWithBorder"
+			:data-test-id="`user-list-item-${user.email}`"
 		>
 			<n8n-user-info v-bind="user" :isCurrentUser="currentUserId === user.id" />
 			<div :class="$style.badgeContainer">
diff --git a/packages/editor-ui/src/components/DeleteUserModal.vue b/packages/editor-ui/src/components/DeleteUserModal.vue
index 6f30836b4c1d96..23e2ad94e3b9dc 100644
--- a/packages/editor-ui/src/components/DeleteUserModal.vue
+++ b/packages/editor-ui/src/components/DeleteUserModal.vue
@@ -41,7 +41,11 @@
 							$locale.baseText('settings.users.deleteWorkflowsAndCredentials')
 						}}</n8n-text>
 					</el-radio>
-					<div :class="$style.optionInput" v-if="operation === 'delete'">
+					<div
+						:class="$style.optionInput"
+						v-if="operation === 'delete'"
+						data-test-id="delete-data-input"
+					>
 						<n8n-input-label :label="$locale.baseText('settings.users.deleteConfirmationMessage')">
 							<n8n-input
 								:value="deleteConfirmText"

From 018f8a3510b280b08d95037f9b6b870748170f3e Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 9 Feb 2023 16:04:26 +0100
Subject: [PATCH 155/358] fix(editor): Prevent creation of input connections
 for nodes without input slot (#5425)

* fix(editor): Prevent creation of input connections for nodes without input

* WIP: Workflow checks service and controller

* fix: Created SQLite migration to remove broken connections

* Cleanup & add mysql/posgres migrations

* Linter fixes

* Unify the migration scripts

* Escape migration workflow_entity

* Wrap the migration in try/catch and do not parse nodes and connection if mysql/postgres

* Do migration changes also fro mysql

* refactor: Wrap only the necessary call in try catch block

---------

Co-authored-by: Omar Ajoue <krynble@gmail.com>
---
 packages/cli/src/commands/start.ts            | 16 ++--
 ...0580449-PurgeInvalidWorkflowConnections.ts | 91 +++++++++++++++++++
 .../src/databases/migrations/mysqldb/index.ts |  2 +
 ...0580449-PurgeInvalidWorkflowConnections.ts | 90 ++++++++++++++++++
 .../databases/migrations/postgresdb/index.ts  |  2 +
 ...0580449-PurgeInvalidWorkflowConnections.ts | 91 +++++++++++++++++++
 .../src/databases/migrations/sqlite/index.ts  |  2 +
 packages/editor-ui/src/views/NodeView.vue     | 33 +++----
 8 files changed, 301 insertions(+), 26 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts

diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 590307c26f4a34..90b495fe791b4c 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -239,6 +239,14 @@ export class Start extends Command {
 		const { flags } = this.parse(Start);
 
 		try {
+			// Load all node and credential types
+			const loadNodesAndCredentials = LoadNodesAndCredentials();
+			await loadNodesAndCredentials.init();
+
+			// Add the found types to an instance other parts of the application can use
+			const nodeTypes = NodeTypes(loadNodesAndCredentials);
+			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
+
 			// Start directly with the init of the database to improve startup time
 			await Db.init().catch(async (error: Error) =>
 				exitWithCrash('There was an error initializing DB', error),
@@ -265,18 +273,10 @@ export class Start extends Command {
 				await Start.generateStaticAssets();
 			}
 
-			// Load all node and credential types
-			const loadNodesAndCredentials = LoadNodesAndCredentials();
-			await loadNodesAndCredentials.init();
-
 			// Load all external hooks
 			const externalHooks = ExternalHooks();
 			await externalHooks.init();
 
-			// Add the found types to an instance other parts of the application can use
-			const nodeTypes = NodeTypes(loadNodesAndCredentials);
-			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
-
 			// Load the credentials overwrites if any exist
 			CredentialsOverwrites(credentialTypes);
 
diff --git a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
new file mode 100644
index 00000000000000..654858b422c9e0
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -0,0 +1,91 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import { NodeTypes } from '@/NodeTypes';
+import { IConnections, INode } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
+
+export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
+	name = 'PurgeInvalidWorkflowConnections1675940580449';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+
+		const tablePrefix = getTablePrefix();
+
+		const workflows: Array<{ id: number; nodes: INode[]; connections: IConnections }> =
+			await queryRunner.query(`
+			SELECT id, nodes, connections
+			FROM \`${tablePrefix}workflow_entity\`
+		`);
+
+		const nodeTypes = NodeTypes();
+
+		workflows.forEach(async (workflow) => {
+			let connections: IConnections = workflow.connections;
+			const nodes: INode[] = workflow.nodes;
+
+			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
+				try {
+					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+					if ((nodeType.description.inputs?.length ?? []) === 0) {
+						acc.push(node.name);
+					}
+				} catch (error) {
+					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
+				}
+				return acc;
+			}, [] as string[]);
+
+			Object.keys(connections).forEach((sourceNodeName) => {
+				const connection = connections[sourceNodeName];
+				const outputs = Object.keys(connection);
+
+				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
+					const outputConnection = connection[outputConnectionName];
+
+					// It filters out all connections that are connected to a node that cannot receive input
+					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
+						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+							(outgoingConnections) =>
+								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
+						);
+					});
+
+					// Filter out output connection items that are empty
+					connection[outputConnectionName] = connection[outputConnectionName].filter(
+						(item) => item.length > 0,
+					);
+
+					// Delete the output connection container if it is empty
+					if (connection[outputConnectionName].length === 0) {
+						delete connection[outputConnectionName];
+					}
+				});
+
+				// Finally delete the source node if it has no output connections
+				if (Object.keys(connection).length === 0) {
+					delete connections[sourceNodeName];
+				}
+			});
+
+			// Update database with new connections
+			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
+				`
+							UPDATE \`${tablePrefix}workflow_entity\`
+							SET connections = :connections
+							WHERE id = '${workflow.id}'
+						`,
+				{ connections: JSON.stringify(connections) },
+				{},
+			);
+
+			await queryRunner.query(updateQuery, updateParams);
+		});
+
+		logMigrationEnd(this.name);
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		// No need to revert this migration
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 8892ddcbe72d7d..2c25db44b15880 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -30,6 +30,7 @@ import { RemoveWorkflowDataLoadedFlag1671726148420 } from './1671726148420-Remov
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -64,4 +65,5 @@ export const mysqlMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
+	PurgeInvalidWorkflowConnections1675940580449
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
new file mode 100644
index 00000000000000..7534742ce401b9
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -0,0 +1,90 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import { NodeTypes } from '@/NodeTypes';
+import { IConnections, INode } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
+export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
+	name = 'PurgeInvalidWorkflowConnections1675940580449';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+
+		const tablePrefix = getTablePrefix();
+
+		const workflows: Array<{ id: number; nodes: INode[]; connections: IConnections }> =
+			await queryRunner.query(`
+			SELECT id, nodes, connections
+			FROM "${tablePrefix}workflow_entity"
+		`);
+
+		const nodeTypes = NodeTypes();
+
+		workflows.forEach(async (workflow) => {
+			let connections: IConnections = workflow.connections;
+			const nodes: INode[] = workflow.nodes;
+
+			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
+				try {
+					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+					if ((nodeType.description.inputs?.length ?? []) === 0) {
+						acc.push(node.name);
+					}
+				} catch (error) {
+					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
+				}
+				return acc;
+			}, [] as string[]);
+
+			Object.keys(connections).forEach((sourceNodeName) => {
+				const connection = connections[sourceNodeName];
+				const outputs = Object.keys(connection);
+
+				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
+					const outputConnection = connection[outputConnectionName];
+
+					// It filters out all connections that are connected to a node that cannot receive input
+					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
+						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+							(outgoingConnections) =>
+								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
+						);
+					});
+
+					// Filter out output connection items that are empty
+					connection[outputConnectionName] = connection[outputConnectionName].filter(
+						(item) => item.length > 0,
+					);
+
+					// Delete the output connection container if it is empty
+					if (connection[outputConnectionName].length === 0) {
+						delete connection[outputConnectionName];
+					}
+				});
+
+				// Finally delete the source node if it has no output connections
+				if (Object.keys(connection).length === 0) {
+					delete connections[sourceNodeName];
+				}
+			});
+
+			// Update database with new connections
+			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
+				`
+						UPDATE "${tablePrefix}workflow_entity"
+						SET connections = :connections
+						WHERE id = '${workflow.id}'
+					`,
+				{ connections: JSON.stringify(connections) },
+				{},
+			);
+
+			await queryRunner.query(updateQuery, updateParams);
+		});
+
+		logMigrationEnd(this.name);
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		// No need to revert this migration
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 6138f89d5641c1..dde85c808bec72 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -28,6 +28,7 @@ import { RemoveWorkflowDataLoadedFlag1671726148421 } from './1671726148421-Remov
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 
 export const postgresMigrations = [
 	InitialMigration1587669153312,
@@ -60,4 +61,5 @@ export const postgresMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
+	PurgeInvalidWorkflowConnections1675940580449
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
new file mode 100644
index 00000000000000..459c4782140c59
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -0,0 +1,91 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import { NodeTypes } from '@/NodeTypes';
+import { IConnections, INode } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
+
+export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
+	name = 'PurgeInvalidWorkflowConnections1675940580449';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+
+		const tablePrefix = getTablePrefix();
+
+		const workflows: Array<{ id: number; nodes: string; connections: string }> =
+			await queryRunner.query(`
+			SELECT id, nodes, connections
+			FROM "${tablePrefix}workflow_entity"
+		`);
+
+		const nodeTypes = NodeTypes();
+
+		workflows.forEach(async (workflow) => {
+			let connections: IConnections = JSON.parse(workflow.connections);
+			const nodes: INode[] = JSON.parse(workflow.nodes);
+
+			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
+				try {
+					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+					if ((nodeType.description.inputs?.length ?? []) === 0) {
+						acc.push(node.name);
+					}
+				} catch (error) {
+					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
+				}
+				return acc;
+			}, [] as string[]);
+
+			Object.keys(connections).forEach((sourceNodeName) => {
+				const connection = connections[sourceNodeName];
+				const outputs = Object.keys(connection);
+
+				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
+					const outputConnection = connection[outputConnectionName];
+
+					// It filters out all connections that are connected to a node that cannot receive input
+					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
+						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+							(outgoingConnections) =>
+								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
+						);
+					});
+
+					// Filter out output connection items that are empty
+					connection[outputConnectionName] = connection[outputConnectionName].filter(
+						(item) => item.length > 0,
+					);
+
+					// Delete the output connection container if it is empty
+					if (connection[outputConnectionName].length === 0) {
+						delete connection[outputConnectionName];
+					}
+				});
+
+				// Finally delete the source node if it has no output connections
+				if (Object.keys(connection).length === 0) {
+					delete connections[sourceNodeName];
+				}
+			});
+
+			// Update database with new connections
+			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
+				`
+							UPDATE "${tablePrefix}workflow_entity"
+							SET connections = :connections
+							WHERE id = '${workflow.id}'
+						`,
+				{ connections: JSON.stringify(connections) },
+				{},
+			);
+
+			await queryRunner.query(updateQuery, updateParams);
+		});
+
+		logMigrationEnd(this.name);
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		// No need to revert this migration
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 247daf12809c08..7325893d18f862 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -27,6 +27,7 @@ import { RemoveWorkflowDataLoadedFlag1671726148419 } from './1671726148419-Remov
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 
 const sqliteMigrations = [
 	InitialMigration1588102412422,
@@ -58,6 +59,7 @@ const sqliteMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
+	PurgeInvalidWorkflowConnections1675940580449,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 51c79d15e23412..700fc076996ed2 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1995,7 +1995,7 @@ export default mixins(
 				},
 			] as [IConnection, IConnection];
 
-			this.__addConnection(connectionData, true);
+			this.__addConnection(connectionData);
 		},
 		async addNode(
 			nodeTypeName: string,
@@ -2571,22 +2571,19 @@ export default mixins(
 
 			return NodeViewUtils.getInputEndpointUUID(node.id, index);
 		},
-		__addConnection(connection: [IConnection, IConnection], addVisualConnection = false) {
-			if (addVisualConnection) {
-				const outputUuid = this.getOutputEndpointUUID(connection[0].node, connection[0].index);
-				const inputUuid = this.getInputEndpointUUID(connection[1].node, connection[1].index);
-				if (!outputUuid || !inputUuid) {
-					return;
-				}
-
-				const uuid: [string, string] = [outputUuid, inputUuid];
-				// Create connections in DOM
-				this.instance?.connect({
-					uuids: uuid,
-					detachable: !this.isReadOnly,
-				});
+		__addConnection(connection: [IConnection, IConnection]) {
+			const outputUuid = this.getOutputEndpointUUID(connection[0].node, connection[0].index);
+			const inputUuid = this.getInputEndpointUUID(connection[1].node, connection[1].index);
+			if (!outputUuid || !inputUuid) {
+				return;
 			}
-			this.workflowsStore.addConnection({ connection });
+
+			const uuid: [string, string] = [outputUuid, inputUuid];
+			// Create connections in DOM
+			this.instance?.connect({
+				uuids: uuid,
+				detachable: !this.isReadOnly,
+			});
 
 			setTimeout(() => {
 				this.addPinDataConnections(this.workflowsStore.pinData);
@@ -3277,7 +3274,7 @@ export default mixins(
 									},
 								] as [IConnection, IConnection];
 
-								this.__addConnection(connectionData, true);
+								this.__addConnection(connectionData);
 							});
 						}
 					}
@@ -3763,7 +3760,7 @@ export default mixins(
 		},
 		async onRevertRemoveConnection({ connection }: { connection: [IConnection, IConnection] }) {
 			this.suspendRecordingDetachedConnections = true;
-			this.__addConnection(connection, true);
+			this.__addConnection(connection);
 			this.suspendRecordingDetachedConnections = false;
 		},
 		async onRevertNameChange({ currentName, newName }: { currentName: string; newName: string }) {

From 32de081b0c35571a3d41152f45ff99c3742958c3 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Thu, 9 Feb 2023 17:13:39 +0200
Subject: [PATCH 156/358] test(Compression Node): Unit tests (no-changelog)

---
 .../Compression/test/node/Compression.test.ts | 78 +++++++++++++++++
 .../nodes/Compression/test/node/lorem.txt     | 12 +++
 .../test/node/workflow.compression.json       | 87 +++++++++++++++++++
 3 files changed, 177 insertions(+)
 create mode 100644 packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
 create mode 100644 packages/nodes-base/nodes/Compression/test/node/lorem.txt
 create mode 100644 packages/nodes-base/nodes/Compression/test/node/workflow.compression.json

diff --git a/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
new file mode 100644
index 00000000000000..f6ad4066aee3e5
--- /dev/null
+++ b/packages/nodes-base/nodes/Compression/test/node/Compression.test.ts
@@ -0,0 +1,78 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import type { WorkflowTestData } from '../../../../test/nodes/types';
+import type { IDataObject } from 'n8n-workflow';
+
+import {
+	getResultNodeData,
+	setup,
+	initBinaryDataManager,
+	readJsonFileSync,
+} from '../../../../test/nodes/Helpers';
+import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow';
+
+import path from 'path';
+import os from 'node:os';
+
+if (os.platform() !== 'win32') {
+	describe('Execute Compression Node', () => {
+		beforeEach(async () => {
+			await initBinaryDataManager();
+		});
+
+		const workflowData = readJsonFileSync('nodes/Compression/test/node/workflow.compression.json');
+
+		const node = workflowData.nodes.find((n: IDataObject) => n.name === 'Read Binary File');
+		node.parameters.filePath = path.join(__dirname, 'lorem.txt');
+
+		const tests: WorkflowTestData[] = [
+			{
+				description: 'nodes/Compression/test/node/workflow.compression.json',
+				input: {
+					workflowData,
+				},
+				output: {
+					nodeData: {
+						Compression1: [
+							[
+								{
+									json: {},
+									binary: {
+										file_0: {
+											mimeType: 'text/plain',
+											fileType: 'text',
+											fileExtension: 'txt',
+											data: 'TG9yZW0gSXBzdW0KIk5lcXVlIHBvcnJvIHF1aXNxdWFtIGVzdCBxdWkgZG9sb3JlbSBpcHN1bSBxdWlhIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciwgYWRpcGlzY2kgdmVsaXQuLi4iCiJUaGVyZSBpcyBubyBvbmUgd2hvIGxvdmVzIHBhaW4gaXRzZWxmLCB3aG8gc2Vla3MgYWZ0ZXIgaXQgYW5kIHdhbnRzIHRvIGhhdmUgaXQsIHNpbXBseSBiZWNhdXNlIGl0IGlzIHBhaW4uLi4iCkxvcmVtIGlwc3VtIGRvbG9yIHNpdCBhbWV0LCBjb25zZWN0ZXR1ciBhZGlwaXNjaW5nIGVsaXQuIFZpdmFtdXMgZWZmaWNpdHVyIGF1Z3VlIGVnZXQgbGVvIGF1Y3RvciBpbnRlcmR1bS4gTWFlY2VuYXMgcGhhcmV0cmEgcGVsbGVudGVzcXVlIGp1c3RvIGF0IHBvcnR0aXRvci4gUGhhc2VsbHVzIHNvZGFsZXMgYWNjdW1zYW4gcG9zdWVyZS4gU2VkIHVybmEgYXVndWUsIG1hbGVzdWFkYSBldCBwbGFjZXJhdCBlZ2V0LCBhbGlxdWV0IHNlZCB0b3J0b3IuIFByYWVzZW50IGNvbW1vZG8sIGVyb3MgdmVsIGZlcm1lbnR1bSBhbGlxdWV0LCBkaWFtIGZlbGlzIHRlbXB1cyB1cm5hLCBuZWMgcG9zdWVyZSBsaWd1bGEgZWxpdCBxdWlzIGRpYW0uIFNlZCBub24gbG9yZW0gdm9sdXRwYXQsIG1vbGVzdGllIG5pYmggZWdldCwgcHVsdmluYXIgZWxpdC4gTWFlY2VuYXMgYWMgdmFyaXVzIGV4LCBxdWlzIHVsdHJpY2VzIHNhcGllbi4gVml2YW11cyBlZ2VzdGFzLCByaXN1cyBzaXQgYW1ldCBtYWxlc3VhZGEgZWxlaWZlbmQsIG1hc3NhIHRvcnRvciBlbGVtZW50dW0gdHVycGlzLCBpZCBzb2xsaWNpdHVkaW4gZXN0IGxpYmVybyBzZWQgZHVpLiBOdWxsYSBpZCBwdWx2aW5hciBzZW0sIG5lYyBoZW5kcmVyaXQgbGFjdXMuCgpWZXN0aWJ1bHVtIGFsaXF1YW0gZXQgcHVydXMgc2l0IGFtZXQgdWxsYW1jb3JwZXIuIE5hbSB2aXZlcnJhIHRyaXN0aXF1ZSBmaW5pYnVzLiBWaXZhbXVzIGRpZ25pc3NpbSB0aW5jaWR1bnQgZXN0LiBEb25lYyBqdXN0byB0dXJwaXMsIGZldWdpYXQgc29sbGljaXR1ZGluIHN1c2NpcGl0IGEsIGJsYW5kaXQgY3Vyc3VzIHF1YW0uIER1aXMgdml2ZXJyYSBzZW0gdXQgbGFjaW5pYSBzZW1wZXIuIEFlbmVhbiB1bHRyaWNlcyBhbnRlIGV0IG5pc2kgc2VtcGVyIGRhcGlidXMuIE1vcmJpIHF1aXMgZnJpbmdpbGxhIG1hZ25hLiBOdW5jIGxpZ3VsYSBhcmN1LCBhbGlxdWFtIHF1aXMgbGVvIGV0LCBjb21tb2RvIG1vbGVzdGllIGxlY3R1cy4gUHJvaW4gYWMgbGVvIGZlcm1lbnR1bSwgY29udmFsbGlzIGVyYXQgaW4sIHVsdHJpY2llcyBtYWduYS4gTW9yYmkgbG9yZW0gYXJjdSwgY29uZ3VlIHNlZCBkaWFtIGlkLCBtb2xlc3RpZSBhbGlxdWV0IGVyYXQuIEFsaXF1YW0gdXQgZHVpIHBvc3VlcmUsIHB1bHZpbmFyIHNhcGllbiBzZWQsIGludGVyZHVtIHNhcGllbi4gRG9uZWMgc29sbGljaXR1ZGluIGxpYmVybyBpbXBlcmRpZXQgYWxpcXVhbSBhbGlxdWFtLgoKRG9uZWMgbm9uIG9kaW8gbWFzc2EuIE1hZWNlbmFzIGV1IGludGVyZHVtIGlwc3VtLCBhdCBncmF2aWRhIHR1cnBpcy4gVmVzdGlidWx1bSBldSBtb2xsaXMgdHVycGlzLCBlZ2V0IGZhdWNpYnVzIGxpZ3VsYS4gVmVzdGlidWx1bSBhbnRlIGlwc3VtIHByaW1pcyBpbiBmYXVjaWJ1cyBvcmNpIGx1Y3R1cyBldCB1bHRyaWNlcyBwb3N1ZXJlIGN1YmlsaWEgY3VyYWU7IEFlbmVhbiB0cmlzdGlxdWUgZXggbmVjIHJpc3VzIGJpYmVuZHVtLCBldSB1bGxhbWNvcnBlciBlcm9zIHBoYXJldHJhLiBVdCBmaW5pYnVzIGp1c3RvIGxlY3R1cywgbm9uIHZhcml1cyBhbnRlIHZvbHV0cGF0IGV1LiBQZWxsZW50ZXNxdWUgdHVycGlzIGVyb3MsIG1vbGVzdGllIGVnZXQgZW5pbSBuZWMsIGVsZW1lbnR1bSBwb3N1ZXJlIHJpc3VzLiBQaGFzZWxsdXMgZGljdHVtLCBlc3Qgdml0YWUgdml2ZXJyYSBlZ2VzdGFzLCBlbGl0IGVyb3MgcG9zdWVyZSBsb3JlbSwgaWQgZmluaWJ1cyBzYXBpZW4gbnVsbGEgc2l0IGFtZXQgYW50ZS4gRXRpYW0gaW4gcHVydXMgaWQgdGVsbHVzIHBvcnR0aXRvciBwb3N1ZXJlLgoKRG9uZWMgbm9uIGx1Y3R1cyBlbmltLiBWaXZhbXVzIHNvbGxpY2l0dWRpbiB0dXJwaXMgcXVpcyBxdWFtIGZlcm1lbnR1bSBwb3J0dGl0b3IuIFByb2luIGlkIHRpbmNpZHVudCBlcmF0LiBBZW5lYW4gaGVuZHJlcml0IHNpdCBhbWV0IGFyY3UgdmVuZW5hdGlzIHZ1bHB1dGF0ZS4gUGVsbGVudGVzcXVlIG5vbiBlcm9zIHZvbHV0cGF0LCB2ZXN0aWJ1bHVtIG1pIG5vbiwgdm9sdXRwYXQgYXJjdS4gSW4gYWMgdWxsYW1jb3JwZXIgc2FwaWVuLiBVdCBzaXQgYW1ldCB1cm5hIGFjIG51bmMgYWNjdW1zYW4gYXVjdG9yLiBGdXNjZSBhY2N1bXNhbiBsaWJlcm8gdmVsIHByZXRpdW0gaWFjdWxpcy4gUHJvaW4gc2VkIHZlaGljdWxhIGVyYXQuIEludGVnZXIgZmF1Y2lidXMgYXVndWUgbnVuYywgbmVjIGJsYW5kaXQgYXJjdSBsdWN0dXMgZGlnbmlzc2ltLiBNYWVjZW5hcyBhbGlxdWFtIHNvbGxpY2l0dWRpbiBkdWksIGF0IHBsYWNlcmF0IGVyYXQgbWFsZXN1YWRhIHV0LiBTdXNwZW5kaXNzZSBub24gcnV0cnVtIG9kaW8sIHV0IHVsdHJpY2llcyBtYXNzYS4KCk1vcmJpIHNpdCBhbWV0IHJpc3VzIHZlc3RpYnVsdW0sIHZlaGljdWxhIGVsaXQgdmVsLCB1bGxhbWNvcnBlciBhbnRlLiBBZW5lYW4gcnV0cnVtIHBlbGxlbnRlc3F1ZSBmZWxpcywgbmVjIHBoYXJldHJhIGlwc3VtIGNvbnNlY3RldHVyIHF1aXMuIE1hdXJpcyBpbiBlbGl0IGV1IG51bGxhIGRhcGlidXMgZmV1Z2lhdC4gSW4gdmVzdGlidWx1bSBtYXNzYSBpZCBsYW9yZWV0IHNvZGFsZXMuIFN1c3BlbmRpc3NlIG9ybmFyZSBjb25ndWUgbWV0dXMsIGluIHVsdHJpY2llcyBuZXF1ZSBjb25zZXF1YXQgbmVjLiBJbnRlcmR1bSBldCBtYWxlc3VhZGEgZmFtZXMgYWMgYW50ZSBpcHN1bSBwcmltaXMgaW4gZmF1Y2lidXMuIE1hZWNlbmFzIHNlZCBsdWN0dXMgdmVsaXQuIFF1aXNxdWUgaW4gbnVuYyBwZWxsZW50ZXNxdWUsIGFsaXF1ZXQgcXVhbSBpbiwgYWNjdW1zYW4gbGVjdHVzLiBWZXN0aWJ1bHVtIGRhcGlidXMgdG9ydG9yIGFjIG1ldHVzIGZldWdpYXQgY3Vyc3VzLiBTZWQgbmVjIHNjZWxlcmlzcXVlIGFyY3UuCg==',
+											fileName: 'lorem.txt',
+											fileSize: '3.07 kB',
+										},
+									},
+								},
+							],
+						],
+					},
+				},
+			},
+		];
+
+		const nodeTypes = setup(tests);
+
+		for (const testData of tests) {
+			test(testData.description, async () => {
+				const { result } = await executeWorkflow(testData, nodeTypes);
+
+				const resultNodeData = getResultNodeData(result, testData);
+				resultNodeData.forEach(({ nodeName, resultData }) => {
+					expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+				});
+
+				expect(result.finished).toEqual(true);
+			});
+		}
+	});
+} else {
+	describe('Execute Compression Node', () => {
+		it('Skipped because compression results are different on platform win32', () => {
+			expect(true).toBe(true);
+		});
+	});
+}
diff --git a/packages/nodes-base/nodes/Compression/test/node/lorem.txt b/packages/nodes-base/nodes/Compression/test/node/lorem.txt
new file mode 100644
index 00000000000000..94bce29b29993b
--- /dev/null
+++ b/packages/nodes-base/nodes/Compression/test/node/lorem.txt
@@ -0,0 +1,12 @@
+Lorem Ipsum
+"Neque porro quisquam est qui dolorem ipsum quia dolor sit amet, consectetur, adipisci velit..."
+"There is no one who loves pain itself, who seeks after it and wants to have it, simply because it is pain..."
+Lorem ipsum dolor sit amet, consectetur adipiscing elit. Vivamus efficitur augue eget leo auctor interdum. Maecenas pharetra pellentesque justo at porttitor. Phasellus sodales accumsan posuere. Sed urna augue, malesuada et placerat eget, aliquet sed tortor. Praesent commodo, eros vel fermentum aliquet, diam felis tempus urna, nec posuere ligula elit quis diam. Sed non lorem volutpat, molestie nibh eget, pulvinar elit. Maecenas ac varius ex, quis ultrices sapien. Vivamus egestas, risus sit amet malesuada eleifend, massa tortor elementum turpis, id sollicitudin est libero sed dui. Nulla id pulvinar sem, nec hendrerit lacus.
+
+Vestibulum aliquam et purus sit amet ullamcorper. Nam viverra tristique finibus. Vivamus dignissim tincidunt est. Donec justo turpis, feugiat sollicitudin suscipit a, blandit cursus quam. Duis viverra sem ut lacinia semper. Aenean ultrices ante et nisi semper dapibus. Morbi quis fringilla magna. Nunc ligula arcu, aliquam quis leo et, commodo molestie lectus. Proin ac leo fermentum, convallis erat in, ultricies magna. Morbi lorem arcu, congue sed diam id, molestie aliquet erat. Aliquam ut dui posuere, pulvinar sapien sed, interdum sapien. Donec sollicitudin libero imperdiet aliquam aliquam.
+
+Donec non odio massa. Maecenas eu interdum ipsum, at gravida turpis. Vestibulum eu mollis turpis, eget faucibus ligula. Vestibulum ante ipsum primis in faucibus orci luctus et ultrices posuere cubilia curae; Aenean tristique ex nec risus bibendum, eu ullamcorper eros pharetra. Ut finibus justo lectus, non varius ante volutpat eu. Pellentesque turpis eros, molestie eget enim nec, elementum posuere risus. Phasellus dictum, est vitae viverra egestas, elit eros posuere lorem, id finibus sapien nulla sit amet ante. Etiam in purus id tellus porttitor posuere.
+
+Donec non luctus enim. Vivamus sollicitudin turpis quis quam fermentum porttitor. Proin id tincidunt erat. Aenean hendrerit sit amet arcu venenatis vulputate. Pellentesque non eros volutpat, vestibulum mi non, volutpat arcu. In ac ullamcorper sapien. Ut sit amet urna ac nunc accumsan auctor. Fusce accumsan libero vel pretium iaculis. Proin sed vehicula erat. Integer faucibus augue nunc, nec blandit arcu luctus dignissim. Maecenas aliquam sollicitudin dui, at placerat erat malesuada ut. Suspendisse non rutrum odio, ut ultricies massa.
+
+Morbi sit amet risus vestibulum, vehicula elit vel, ullamcorper ante. Aenean rutrum pellentesque felis, nec pharetra ipsum consectetur quis. Mauris in elit eu nulla dapibus feugiat. In vestibulum massa id laoreet sodales. Suspendisse ornare congue metus, in ultricies neque consequat nec. Interdum et malesuada fames ac ante ipsum primis in faucibus. Maecenas sed luctus velit. Quisque in nunc pellentesque, aliquet quam in, accumsan lectus. Vestibulum dapibus tortor ac metus feugiat cursus. Sed nec scelerisque arcu.
diff --git a/packages/nodes-base/nodes/Compression/test/node/workflow.compression.json b/packages/nodes-base/nodes/Compression/test/node/workflow.compression.json
new file mode 100644
index 00000000000000..366e96c51bbf8b
--- /dev/null
+++ b/packages/nodes-base/nodes/Compression/test/node/workflow.compression.json
@@ -0,0 +1,87 @@
+{
+	"name": "Compression test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "abf9ed91-0b05-49df-82d3-1bafb6e6f698",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [400, 400]
+		},
+		{
+			"parameters": {
+				"operation": "compress",
+				"outputFormat": "zip",
+				"fileName": "data.zip"
+			},
+			"id": "a84b995a-bd44-42a0-b5e0-a8ff4e879814",
+			"name": "Compression",
+			"type": "n8n-nodes-base.compression",
+			"typeVersion": 1,
+			"position": [800, 400]
+		},
+		{
+			"parameters": {
+				"filePath": "/home/me/Desktop/lorem.txt"
+			},
+			"id": "2fdbf11d-e1ae-4091-b15f-e0eed69e87c3",
+			"name": "Read Binary File",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"position": [600, 400]
+		},
+		{
+			"parameters": {},
+			"id": "959fa107-f3e6-444e-8fd4-1c893b8942db",
+			"name": "Compression1",
+			"type": "n8n-nodes-base.compression",
+			"typeVersion": 1,
+			"position": [1000, 400]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read Binary File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read Binary File": {
+			"main": [
+				[
+					{
+						"node": "Compression",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compression": {
+			"main": [
+				[
+					{
+						"node": "Compression1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "9868d72c-88bc-4bcc-a85b-586ae1b6b023",
+	"id": "112",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}

From 57a2b9cceb52cbed905459e6ae92007e00a335cc Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Thu, 9 Feb 2023 15:58:52 +0000
Subject: [PATCH 157/358] fix(Linear Node): Fix issue with Issue States not
 loading correctly (#5435)

---
 .../nodes-base/nodes/Linear/Linear.node.ts    | 27 +++++++++++++++++++
 packages/nodes-base/nodes/Linear/Queries.ts   | 17 +++++++++---
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
index b5c10b4b220a19..e04b07aace9463 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.ts
+++ b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -134,11 +134,38 @@ export class Linear implements INodeType {
 				return returnData;
 			},
 			async getStates(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
+				let teamId = this.getNodeParameter('teamId', null) as string;
+				// Handle Updates
+				if (!teamId) {
+					const updateFields = this.getNodeParameter('updateFields', null) as IDataObject;
+					// If not updating the team look up the current team
+					if (!updateFields.teamId) {
+						const issueId = this.getNodeParameter('issueId');
+						const body = {
+							query: query.getIssueTeam(),
+							variables: {
+								issueId,
+							},
+						};
+						const responseData = await linearApiRequest.call(this, body);
+						teamId = responseData?.data?.issue?.team?.id;
+					} else {
+						teamId = updateFields.teamId as string;
+					}
+				}
+
 				const returnData: INodePropertyOptions[] = [];
 				const body = {
 					query: query.getStates(),
 					variables: {
 						$first: 10,
+						filter: {
+							team: {
+								id: {
+									eq: teamId,
+								},
+							},
+						},
 					},
 				};
 				const states = await linearApiRequestAllItems.call(this, 'data.workflowStates', body);
diff --git a/packages/nodes-base/nodes/Linear/Queries.ts b/packages/nodes-base/nodes/Linear/Queries.ts
index 0bd897a0bdfe74..46a0085aab191e 100644
--- a/packages/nodes-base/nodes/Linear/Queries.ts
+++ b/packages/nodes-base/nodes/Linear/Queries.ts
@@ -1,7 +1,7 @@
 export const query = {
 	getUsers() {
-		return `query Users ($first: Int){
-			users (first: $first){
+		return `query Users ($first: Int, $after: String){
+			users (first: $first, after: $after){
 				nodes {
 					id
 					name
@@ -26,8 +26,8 @@ export const query = {
 			}}`;
 	},
 	getStates() {
-		return `query States ($first: Int){
-				workflowStates (first: $first){
+		return `query States ($first: Int, $after: String, $filter: WorkflowStateFilter){
+				workflowStates (first: $first, after: $after, filter: $filter){
 					nodes {
 						id
 						name
@@ -121,6 +121,15 @@ export const query = {
 			}
 		}`;
 	},
+	getIssueTeam() {
+		return `query Issue($issueId: String!) {
+			issue(id: $issueId) {
+				team {
+					id
+				}
+			}
+		}`;
+	},
 	getIssues() {
 		return `query Issue ($first: Int, $after: String){
 					issues (first: $first, after: $after){

From 2eb72a6c9f447f77f78f6d0ab392ebec5515f58c Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 9 Feb 2023 18:15:20 +0100
Subject: [PATCH 158/358] fix: MySQL migration parses database contents if
 necessary (fix for MariaDB) (#5441)

---
 ...75940580449-PurgeInvalidWorkflowConnections.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
index 654858b422c9e0..ed104c21229e1a 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -12,8 +12,11 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 
 		const tablePrefix = getTablePrefix();
 
-		const workflows: Array<{ id: number; nodes: INode[]; connections: IConnections }> =
-			await queryRunner.query(`
+		const workflows: Array<{
+			id: number;
+			nodes: INode[] | string;
+			connections: IConnections | string;
+		}> = await queryRunner.query(`
 			SELECT id, nodes, connections
 			FROM \`${tablePrefix}workflow_entity\`
 		`);
@@ -21,8 +24,12 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 		const nodeTypes = NodeTypes();
 
 		workflows.forEach(async (workflow) => {
-			let connections: IConnections = workflow.connections;
-			const nodes: INode[] = workflow.nodes;
+			let connections: IConnections =
+				typeof workflow.connections === 'string'
+					? JSON.parse(workflow.connections)
+					: workflow.connections;
+			const nodes: INode[] =
+				typeof workflow.nodes === 'string' ? JSON.parse(workflow.nodes) : workflow.nodes;
 
 			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
 				try {

From b57ec1d6abbae9e23ae5f473d70674aa14701bce Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 9 Feb 2023 16:04:26 +0100
Subject: [PATCH 159/358] fix(editor): Prevent creation of input connections
 for nodes without input slot (#5425)

* fix(editor): Prevent creation of input connections for nodes without input

* WIP: Workflow checks service and controller

* fix: Created SQLite migration to remove broken connections

* Cleanup & add mysql/posgres migrations

* Linter fixes

* Unify the migration scripts

* Escape migration workflow_entity

* Wrap the migration in try/catch and do not parse nodes and connection if mysql/postgres

* Do migration changes also fro mysql

* refactor: Wrap only the necessary call in try catch block

---------

Co-authored-by: Omar Ajoue <krynble@gmail.com>
---
 packages/cli/src/commands/start.ts            | 16 ++--
 ...0580449-PurgeInvalidWorkflowConnections.ts | 91 +++++++++++++++++++
 .../src/databases/migrations/mysqldb/index.ts |  2 +
 ...0580449-PurgeInvalidWorkflowConnections.ts | 90 ++++++++++++++++++
 .../databases/migrations/postgresdb/index.ts  |  2 +
 ...0580449-PurgeInvalidWorkflowConnections.ts | 91 +++++++++++++++++++
 .../src/databases/migrations/sqlite/index.ts  |  2 +
 packages/editor-ui/src/views/NodeView.vue     | 33 +++----
 8 files changed, 301 insertions(+), 26 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts

diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 590307c26f4a34..90b495fe791b4c 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -239,6 +239,14 @@ export class Start extends Command {
 		const { flags } = this.parse(Start);
 
 		try {
+			// Load all node and credential types
+			const loadNodesAndCredentials = LoadNodesAndCredentials();
+			await loadNodesAndCredentials.init();
+
+			// Add the found types to an instance other parts of the application can use
+			const nodeTypes = NodeTypes(loadNodesAndCredentials);
+			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
+
 			// Start directly with the init of the database to improve startup time
 			await Db.init().catch(async (error: Error) =>
 				exitWithCrash('There was an error initializing DB', error),
@@ -265,18 +273,10 @@ export class Start extends Command {
 				await Start.generateStaticAssets();
 			}
 
-			// Load all node and credential types
-			const loadNodesAndCredentials = LoadNodesAndCredentials();
-			await loadNodesAndCredentials.init();
-
 			// Load all external hooks
 			const externalHooks = ExternalHooks();
 			await externalHooks.init();
 
-			// Add the found types to an instance other parts of the application can use
-			const nodeTypes = NodeTypes(loadNodesAndCredentials);
-			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
-
 			// Load the credentials overwrites if any exist
 			CredentialsOverwrites(credentialTypes);
 
diff --git a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
new file mode 100644
index 00000000000000..654858b422c9e0
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -0,0 +1,91 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import { NodeTypes } from '@/NodeTypes';
+import { IConnections, INode } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
+
+export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
+	name = 'PurgeInvalidWorkflowConnections1675940580449';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+
+		const tablePrefix = getTablePrefix();
+
+		const workflows: Array<{ id: number; nodes: INode[]; connections: IConnections }> =
+			await queryRunner.query(`
+			SELECT id, nodes, connections
+			FROM \`${tablePrefix}workflow_entity\`
+		`);
+
+		const nodeTypes = NodeTypes();
+
+		workflows.forEach(async (workflow) => {
+			let connections: IConnections = workflow.connections;
+			const nodes: INode[] = workflow.nodes;
+
+			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
+				try {
+					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+					if ((nodeType.description.inputs?.length ?? []) === 0) {
+						acc.push(node.name);
+					}
+				} catch (error) {
+					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
+				}
+				return acc;
+			}, [] as string[]);
+
+			Object.keys(connections).forEach((sourceNodeName) => {
+				const connection = connections[sourceNodeName];
+				const outputs = Object.keys(connection);
+
+				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
+					const outputConnection = connection[outputConnectionName];
+
+					// It filters out all connections that are connected to a node that cannot receive input
+					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
+						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+							(outgoingConnections) =>
+								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
+						);
+					});
+
+					// Filter out output connection items that are empty
+					connection[outputConnectionName] = connection[outputConnectionName].filter(
+						(item) => item.length > 0,
+					);
+
+					// Delete the output connection container if it is empty
+					if (connection[outputConnectionName].length === 0) {
+						delete connection[outputConnectionName];
+					}
+				});
+
+				// Finally delete the source node if it has no output connections
+				if (Object.keys(connection).length === 0) {
+					delete connections[sourceNodeName];
+				}
+			});
+
+			// Update database with new connections
+			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
+				`
+							UPDATE \`${tablePrefix}workflow_entity\`
+							SET connections = :connections
+							WHERE id = '${workflow.id}'
+						`,
+				{ connections: JSON.stringify(connections) },
+				{},
+			);
+
+			await queryRunner.query(updateQuery, updateParams);
+		});
+
+		logMigrationEnd(this.name);
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		// No need to revert this migration
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 8892ddcbe72d7d..2c25db44b15880 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -30,6 +30,7 @@ import { RemoveWorkflowDataLoadedFlag1671726148420 } from './1671726148420-Remov
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -64,4 +65,5 @@ export const mysqlMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
+	PurgeInvalidWorkflowConnections1675940580449
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
new file mode 100644
index 00000000000000..7534742ce401b9
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -0,0 +1,90 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import { NodeTypes } from '@/NodeTypes';
+import { IConnections, INode } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
+export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
+	name = 'PurgeInvalidWorkflowConnections1675940580449';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+
+		const tablePrefix = getTablePrefix();
+
+		const workflows: Array<{ id: number; nodes: INode[]; connections: IConnections }> =
+			await queryRunner.query(`
+			SELECT id, nodes, connections
+			FROM "${tablePrefix}workflow_entity"
+		`);
+
+		const nodeTypes = NodeTypes();
+
+		workflows.forEach(async (workflow) => {
+			let connections: IConnections = workflow.connections;
+			const nodes: INode[] = workflow.nodes;
+
+			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
+				try {
+					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+					if ((nodeType.description.inputs?.length ?? []) === 0) {
+						acc.push(node.name);
+					}
+				} catch (error) {
+					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
+				}
+				return acc;
+			}, [] as string[]);
+
+			Object.keys(connections).forEach((sourceNodeName) => {
+				const connection = connections[sourceNodeName];
+				const outputs = Object.keys(connection);
+
+				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
+					const outputConnection = connection[outputConnectionName];
+
+					// It filters out all connections that are connected to a node that cannot receive input
+					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
+						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+							(outgoingConnections) =>
+								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
+						);
+					});
+
+					// Filter out output connection items that are empty
+					connection[outputConnectionName] = connection[outputConnectionName].filter(
+						(item) => item.length > 0,
+					);
+
+					// Delete the output connection container if it is empty
+					if (connection[outputConnectionName].length === 0) {
+						delete connection[outputConnectionName];
+					}
+				});
+
+				// Finally delete the source node if it has no output connections
+				if (Object.keys(connection).length === 0) {
+					delete connections[sourceNodeName];
+				}
+			});
+
+			// Update database with new connections
+			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
+				`
+						UPDATE "${tablePrefix}workflow_entity"
+						SET connections = :connections
+						WHERE id = '${workflow.id}'
+					`,
+				{ connections: JSON.stringify(connections) },
+				{},
+			);
+
+			await queryRunner.query(updateQuery, updateParams);
+		});
+
+		logMigrationEnd(this.name);
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		// No need to revert this migration
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 6138f89d5641c1..dde85c808bec72 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -28,6 +28,7 @@ import { RemoveWorkflowDataLoadedFlag1671726148421 } from './1671726148421-Remov
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 
 export const postgresMigrations = [
 	InitialMigration1587669153312,
@@ -60,4 +61,5 @@ export const postgresMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
+	PurgeInvalidWorkflowConnections1675940580449
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
new file mode 100644
index 00000000000000..459c4782140c59
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -0,0 +1,91 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import { NodeTypes } from '@/NodeTypes';
+import { IConnections, INode } from 'n8n-workflow';
+import { getLogger } from '@/Logger';
+
+export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
+	name = 'PurgeInvalidWorkflowConnections1675940580449';
+
+	async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+
+		const tablePrefix = getTablePrefix();
+
+		const workflows: Array<{ id: number; nodes: string; connections: string }> =
+			await queryRunner.query(`
+			SELECT id, nodes, connections
+			FROM "${tablePrefix}workflow_entity"
+		`);
+
+		const nodeTypes = NodeTypes();
+
+		workflows.forEach(async (workflow) => {
+			let connections: IConnections = JSON.parse(workflow.connections);
+			const nodes: INode[] = JSON.parse(workflow.nodes);
+
+			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
+				try {
+					const nodeType = nodeTypes.getByNameAndVersion(node.type, node.typeVersion);
+					if ((nodeType.description.inputs?.length ?? []) === 0) {
+						acc.push(node.name);
+					}
+				} catch (error) {
+					getLogger().warn(`Migration ${this.name} failed with error: ${error.message}`);
+				}
+				return acc;
+			}, [] as string[]);
+
+			Object.keys(connections).forEach((sourceNodeName) => {
+				const connection = connections[sourceNodeName];
+				const outputs = Object.keys(connection);
+
+				outputs.forEach((outputConnectionName /* Like `main` */, idx) => {
+					const outputConnection = connection[outputConnectionName];
+
+					// It filters out all connections that are connected to a node that cannot receive input
+					outputConnection.forEach((outputConnectionItem, outputConnectionItemIdx) => {
+						outputConnection[outputConnectionItemIdx] = outputConnectionItem.filter(
+							(outgoingConnections) =>
+								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
+						);
+					});
+
+					// Filter out output connection items that are empty
+					connection[outputConnectionName] = connection[outputConnectionName].filter(
+						(item) => item.length > 0,
+					);
+
+					// Delete the output connection container if it is empty
+					if (connection[outputConnectionName].length === 0) {
+						delete connection[outputConnectionName];
+					}
+				});
+
+				// Finally delete the source node if it has no output connections
+				if (Object.keys(connection).length === 0) {
+					delete connections[sourceNodeName];
+				}
+			});
+
+			// Update database with new connections
+			const [updateQuery, updateParams] = queryRunner.connection.driver.escapeQueryWithParameters(
+				`
+							UPDATE "${tablePrefix}workflow_entity"
+							SET connections = :connections
+							WHERE id = '${workflow.id}'
+						`,
+				{ connections: JSON.stringify(connections) },
+				{},
+			);
+
+			await queryRunner.query(updateQuery, updateParams);
+		});
+
+		logMigrationEnd(this.name);
+	}
+
+	async down(queryRunner: QueryRunner): Promise<void> {
+		// No need to revert this migration
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 247daf12809c08..7325893d18f862 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -27,6 +27,7 @@ import { RemoveWorkflowDataLoadedFlag1671726148419 } from './1671726148419-Remov
 import { MessageEventBusDestinations1671535397530 } from './1671535397530-MessageEventBusDestinations';
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
+import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 
 const sqliteMigrations = [
 	InitialMigration1588102412422,
@@ -58,6 +59,7 @@ const sqliteMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
+	PurgeInvalidWorkflowConnections1675940580449,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 22ee4d36794b0c..6d33c4d1e66b03 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -1995,7 +1995,7 @@ export default mixins(
 				},
 			] as [IConnection, IConnection];
 
-			this.__addConnection(connectionData, true);
+			this.__addConnection(connectionData);
 		},
 		async addNode(
 			nodeTypeName: string,
@@ -2558,22 +2558,19 @@ export default mixins(
 
 			return NodeViewUtils.getInputEndpointUUID(node.id, index);
 		},
-		__addConnection(connection: [IConnection, IConnection], addVisualConnection = false) {
-			if (addVisualConnection) {
-				const outputUuid = this.getOutputEndpointUUID(connection[0].node, connection[0].index);
-				const inputUuid = this.getInputEndpointUUID(connection[1].node, connection[1].index);
-				if (!outputUuid || !inputUuid) {
-					return;
-				}
-
-				const uuid: [string, string] = [outputUuid, inputUuid];
-				// Create connections in DOM
-				this.instance?.connect({
-					uuids: uuid,
-					detachable: !this.isReadOnly,
-				});
+		__addConnection(connection: [IConnection, IConnection]) {
+			const outputUuid = this.getOutputEndpointUUID(connection[0].node, connection[0].index);
+			const inputUuid = this.getInputEndpointUUID(connection[1].node, connection[1].index);
+			if (!outputUuid || !inputUuid) {
+				return;
 			}
-			this.workflowsStore.addConnection({ connection });
+
+			const uuid: [string, string] = [outputUuid, inputUuid];
+			// Create connections in DOM
+			this.instance?.connect({
+				uuids: uuid,
+				detachable: !this.isReadOnly,
+			});
 
 			setTimeout(() => {
 				this.addPinDataConnections(this.workflowsStore.pinData);
@@ -3264,7 +3261,7 @@ export default mixins(
 									},
 								] as [IConnection, IConnection];
 
-								this.__addConnection(connectionData, true);
+								this.__addConnection(connectionData);
 							});
 						}
 					}
@@ -3750,7 +3747,7 @@ export default mixins(
 		},
 		async onRevertRemoveConnection({ connection }: { connection: [IConnection, IConnection] }) {
 			this.suspendRecordingDetachedConnections = true;
-			this.__addConnection(connection, true);
+			this.__addConnection(connection);
 			this.suspendRecordingDetachedConnections = false;
 		},
 		async onRevertNameChange({ currentName, newName }: { currentName: string; newName: string }) {

From 7fc96571e0ce294de3d643f5f29cc38211888a0a Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Thu, 9 Feb 2023 18:15:20 +0100
Subject: [PATCH 160/358] fix: MySQL migration parses database contents if
 necessary (fix for MariaDB) (#5441)

---
 ...75940580449-PurgeInvalidWorkflowConnections.ts | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
index 654858b422c9e0..ed104c21229e1a 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -12,8 +12,11 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 
 		const tablePrefix = getTablePrefix();
 
-		const workflows: Array<{ id: number; nodes: INode[]; connections: IConnections }> =
-			await queryRunner.query(`
+		const workflows: Array<{
+			id: number;
+			nodes: INode[] | string;
+			connections: IConnections | string;
+		}> = await queryRunner.query(`
 			SELECT id, nodes, connections
 			FROM \`${tablePrefix}workflow_entity\`
 		`);
@@ -21,8 +24,12 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 		const nodeTypes = NodeTypes();
 
 		workflows.forEach(async (workflow) => {
-			let connections: IConnections = workflow.connections;
-			const nodes: INode[] = workflow.nodes;
+			let connections: IConnections =
+				typeof workflow.connections === 'string'
+					? JSON.parse(workflow.connections)
+					: workflow.connections;
+			const nodes: INode[] =
+				typeof workflow.nodes === 'string' ? JSON.parse(workflow.nodes) : workflow.nodes;
 
 			const nodesThatCannotReceiveInput: string[] = nodes.reduce((acc, node) => {
 				try {

From 8f36ce3ffbbea83bddfdcdb56ff25aea8cb8d1e8 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 9 Feb 2023 19:33:34 +0100
Subject: [PATCH 161/358] :bookmark: Release n8n-editor-ui@0.180.3

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 2c4708001490bb..fa363356c28ddd 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.180.2",
+  "version": "0.180.3",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 48740f87638d1223e5716d6f42aa8741e3634c2f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 9 Feb 2023 12:36:56 -0600
Subject: [PATCH 162/358] :arrow_up: Set n8n-editor-ui@0.180.3 on n8n

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 450b42c4758c90..b1391d44b3f3b9 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -166,7 +166,7 @@
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
     "n8n-core": "~0.153.0",
-    "n8n-editor-ui": "~0.180.2",
+    "n8n-editor-ui": "~0.180.3",
     "n8n-nodes-base": "~0.212.2",
     "n8n-workflow": "~0.135.0",
     "nodemailer": "^6.7.1",

From c278f010ef83541f166fafdaafe3b851419bc04e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 9 Feb 2023 12:38:05 -0600
Subject: [PATCH 163/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.214.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index b1391d44b3f3b9..1ce845a75d2c6e 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.2",
+  "version": "0.214.3",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 1c6a93feecc6c3c87724b70d781163d4a8b5d273 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 9 Feb 2023 12:40:53 -0600
Subject: [PATCH 164/358] :books: Update CHANGELOG.md and main package.json to
 0.214.3

---
 CHANGELOG.md   | 9 +++++++++
 package.json   | 2 +-
 pnpm-lock.yaml | 4 ++--
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0908dd4faacdc..d8ce37e50af119 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [0.214.3](https://github.com/n8n-io/n8n/compare/n8n@0.214.2...n8n@0.214.3) (2023-02-09)
+
+
+### Bug Fixes
+
+* **editor:** Prevent creation of input connections for nodes without input slot ([#5425](https://github.com/n8n-io/n8n/issues/5425)) ([b57ec1d](https://github.com/n8n-io/n8n/commit/b57ec1d6abbae9e23ae5f473d70674aa14701bce))
+
+
+
 ## [0.214.1](https://github.com/n8n-io/n8n/compare/n8n@0.214.0...n8n@0.214.1) (2023-02-06)
 
 
diff --git a/package.json b/package.json
index cefee514e2913c..733fdce8e44f46 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.1",
+  "version": "0.214.3",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 3dc447b27d6c3a..828f0a2f9c50e8 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -198,8 +198,8 @@ importers:
       luxon: ^3.1.0
       mysql2: ~2.3.3
       n8n-core: ~0.153.0
-      n8n-editor-ui: ~0.180.1
-      n8n-nodes-base: ~0.212.1
+      n8n-editor-ui: ~0.180.3
+      n8n-nodes-base: ~0.212.2
       n8n-workflow: ~0.135.0
       nodemailer: ^6.7.1
       nodemon: ^2.0.2

From 136b74de5e2e3f4cd55d8e99e6b21fd46b6b64bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Iv=C3=A1n=20Ovejero?= <ivov.src@gmail.com>
Date: Fri, 10 Feb 2023 03:20:15 +0100
Subject: [PATCH 165/358] test: Upgrade `vitest` (no-changelog) (#5307)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 packages/design-system/package.json |   5 +-
 packages/editor-ui/package.json     |   2 +-
 pnpm-lock.yaml                      | 425 +++++++++++-----------------
 3 files changed, 166 insertions(+), 266 deletions(-)

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 1727c4a9f7d46e..926996b594459b 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -64,13 +64,12 @@
     "storybook-addon-themes": "^6.1.0",
     "trim": "^1.0.1",
     "vite": "^4.0.4",
-    "vitest": "^0.27.2",
+    "vitest": "^0.28.4",
     "vue-class-component": "^7.2.6",
     "vue-loader": "^15.10.1",
     "vue-property-decorator": "^9.1.2",
     "vue-template-compiler": "^2.7.14",
     "vue-tsc": "^1.0.24",
-    "vue2-boring-avatars": "0.3.4",
     "webpack": "^4.46.0"
   },
   "dependencies": {
@@ -82,7 +81,7 @@
     "sanitize-html": "2.7.3",
     "vue": "^2.7.14",
     "vue-typed-mixins": "^0.2.0",
-    "vue2-boring-avatars": "0.3.8",
+    "vue2-boring-avatars": "^0.3.8",
     "xss": "^1.0.14"
   }
 }
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index fa363356c28ddd..e7337451313458 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -112,7 +112,7 @@
     "string-template-parser": "^1.2.6",
     "vite": "4.0.4",
     "vite-plugin-monaco-editor": "^1.0.10",
-    "vitest": "0.27.2",
+    "vitest": "^0.28.4",
     "vue-tsc": "^1.0.24"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 32a8983cbaba11..1dd27c55e5c811 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -67,8 +67,8 @@ importers:
       run-script-os: 1.1.6
       start-server-and-test: 1.14.0
       supertest: 6.3.3
-      ts-jest: 29.0.5_zxiwvszgu5ffnwmdmgcln4cteq
-      tsc-watch: 6.0.0_typescript@4.8.4
+      ts-jest: 29.0.5_pa4ebk5usulsg7iw3zwjv5figy
+      tsc-watch: 6.0.0_typescript@4.9.4
       turbo: 1.7.4
 
   packages/@n8n_io/eslint-config:
@@ -466,7 +466,7 @@ importers:
       storybook-addon-themes: ^6.1.0
       trim: ^1.0.1
       vite: ^4.0.4
-      vitest: ^0.27.2
+      vitest: ^0.28.4
       vue: ^2.7.14
       vue-class-component: ^7.2.6
       vue-loader: ^15.10.1
@@ -474,7 +474,7 @@ importers:
       vue-template-compiler: ^2.7.14
       vue-tsc: ^1.0.24
       vue-typed-mixins: ^0.2.0
-      vue2-boring-avatars: 0.3.8
+      vue2-boring-avatars: ^0.3.8
       webpack: ^4.46.0
       xss: ^1.0.14
     dependencies:
@@ -514,7 +514,7 @@ importers:
       storybook-addon-themes: 6.1.0_a5nuvzww5baef7fspvwijmdp24
       trim: 1.0.1
       vite: 4.0.4_sass@1.57.1
-      vitest: 0.27.2_jsdom@21.0.0+sass@1.57.1
+      vitest: 0.28.4_jsdom@21.0.0+sass@1.57.1
       vue-class-component: 7.2.6_vue@2.7.14
       vue-loader: 15.10.1_kqygo6wsub6p3cpcl6idox7sza
       vue-property-decorator: 9.1.2_jtyyyychrtcflhl7vfprhmeb3y
@@ -593,7 +593,7 @@ importers:
       v-click-outside: ^3.1.2
       vite: 4.0.4
       vite-plugin-monaco-editor: ^1.0.10
-      vitest: 0.27.2
+      vitest: ^0.28.4
       vue: ^2.7.14
       vue-agile: ^2.0.0
       vue-fragment: 1.5.1
@@ -690,11 +690,11 @@ importers:
       c8: 7.12.0
       jshint: 2.13.5
       sass: 1.55.0
-      sass-loader: 10.3.1_sass@1.55.0+webpack@5.74.0
+      sass-loader: 10.3.1_sass@1.55.0+webpack@4.46.0
       string-template-parser: 1.2.6
       vite: 4.0.4_sass@1.55.0+terser@5.16.1
       vite-plugin-monaco-editor: 1.1.0_monaco-editor@0.33.0
-      vitest: 0.27.2_sass@1.55.0+terser@5.16.1
+      vitest: 0.28.4_sass@1.55.0+terser@5.16.1
       vue-tsc: 1.0.24_typescript@4.9.4
 
   packages/node-dev:
@@ -5784,13 +5784,6 @@ packages:
       '@types/node': 16.18.12
     dev: false
 
-  /@types/eslint-scope/3.7.4:
-    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
-    dependencies:
-      '@types/eslint': 8.4.6
-      '@types/estree': 1.0.0
-    dev: true
-
   /@types/eslint/8.4.6:
     resolution: {integrity: sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==}
     dependencies:
@@ -5798,10 +5791,6 @@ packages:
       '@types/json-schema': 7.0.11
     dev: true
 
-  /@types/estree/0.0.51:
-    resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
-    dev: true
-
   /@types/estree/1.0.0:
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
@@ -6682,6 +6671,38 @@ packages:
       vue: 2.7.14
     dev: true
 
+  /@vitest/expect/0.28.4:
+    resolution: {integrity: sha512-JqK0NZ4brjvOSL8hXAnIsfi+jxDF7rH/ZWCGCt0FAqRnVFc1hXsfwXksQvEnKqD84avRt3gmeXoK4tNbmkoVsQ==}
+    dependencies:
+      '@vitest/spy': 0.28.4
+      '@vitest/utils': 0.28.4
+      chai: 4.3.7
+    dev: true
+
+  /@vitest/runner/0.28.4:
+    resolution: {integrity: sha512-Q8UV6GjDvBSTfUoq0QXVCNpNOUrWu4P2qvRq7ssJWzn0+S0ojbVOxEjMt+8a32X6SdkhF8ak+2nkppsqV0JyNQ==}
+    dependencies:
+      '@vitest/utils': 0.28.4
+      p-limit: 4.0.0
+      pathe: 1.1.0
+    dev: true
+
+  /@vitest/spy/0.28.4:
+    resolution: {integrity: sha512-8WuhfXLlvCXpNXEGJW6Gc+IKWI32435fQJLh43u70HnZ1otJOa2Cmg2Wy2Aym47ZnNCP4NolF+8cUPwd0MigKQ==}
+    dependencies:
+      tinyspy: 1.0.2
+    dev: true
+
+  /@vitest/utils/0.28.4:
+    resolution: {integrity: sha512-l2QztOLdc2LkR+w/lP52RGh8hW+Ul4KESmCAgVE8q737I7e7bQoAfkARKpkPJ4JQtGpwW4deqlj1732VZD7TFw==}
+    dependencies:
+      cli-truncate: 3.1.0
+      diff: 5.1.0
+      loupe: 2.3.6
+      picocolors: 1.0.0
+      pretty-format: 27.5.1
+    dev: true
+
   /@volar/language-core/1.0.24:
     resolution: {integrity: sha512-vTN+alJiWwK0Pax6POqrmevbtFW2dXhjwWiW/MW4f48eDYPLdyURWcr8TixO7EN/nHsUBj2udT7igFKPtjyAKg==}
     dependencies:
@@ -6894,13 +6915,6 @@ packages:
       vue-template-compiler: 2.7.14
     dev: true
 
-  /@webassemblyjs/ast/1.11.1:
-    resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
-    dependencies:
-      '@webassemblyjs/helper-numbers': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-    dev: true
-
   /@webassemblyjs/ast/1.9.0:
     resolution: {integrity: sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==}
     dependencies:
@@ -6909,26 +6923,14 @@ packages:
       '@webassemblyjs/wast-parser': 1.9.0
     dev: true
 
-  /@webassemblyjs/floating-point-hex-parser/1.11.1:
-    resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==}
-    dev: true
-
   /@webassemblyjs/floating-point-hex-parser/1.9.0:
     resolution: {integrity: sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==}
     dev: true
 
-  /@webassemblyjs/helper-api-error/1.11.1:
-    resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==}
-    dev: true
-
   /@webassemblyjs/helper-api-error/1.9.0:
     resolution: {integrity: sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==}
     dev: true
 
-  /@webassemblyjs/helper-buffer/1.11.1:
-    resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==}
-    dev: true
-
   /@webassemblyjs/helper-buffer/1.9.0:
     resolution: {integrity: sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==}
     dev: true
@@ -6949,31 +6951,10 @@ packages:
       '@webassemblyjs/ast': 1.9.0
     dev: true
 
-  /@webassemblyjs/helper-numbers/1.11.1:
-    resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==}
-    dependencies:
-      '@webassemblyjs/floating-point-hex-parser': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
-      '@xtuc/long': 4.2.2
-    dev: true
-
-  /@webassemblyjs/helper-wasm-bytecode/1.11.1:
-    resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==}
-    dev: true
-
   /@webassemblyjs/helper-wasm-bytecode/1.9.0:
     resolution: {integrity: sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==}
     dev: true
 
-  /@webassemblyjs/helper-wasm-section/1.11.1:
-    resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-    dev: true
-
   /@webassemblyjs/helper-wasm-section/1.9.0:
     resolution: {integrity: sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==}
     dependencies:
@@ -6983,51 +6964,22 @@ packages:
       '@webassemblyjs/wasm-gen': 1.9.0
     dev: true
 
-  /@webassemblyjs/ieee754/1.11.1:
-    resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==}
-    dependencies:
-      '@xtuc/ieee754': 1.2.0
-    dev: true
-
   /@webassemblyjs/ieee754/1.9.0:
     resolution: {integrity: sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==}
     dependencies:
       '@xtuc/ieee754': 1.2.0
     dev: true
 
-  /@webassemblyjs/leb128/1.11.1:
-    resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==}
-    dependencies:
-      '@xtuc/long': 4.2.2
-    dev: true
-
   /@webassemblyjs/leb128/1.9.0:
     resolution: {integrity: sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==}
     dependencies:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/utf8/1.11.1:
-    resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==}
-    dev: true
-
   /@webassemblyjs/utf8/1.9.0:
     resolution: {integrity: sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==}
     dev: true
 
-  /@webassemblyjs/wasm-edit/1.11.1:
-    resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/helper-wasm-section': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-opt': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      '@webassemblyjs/wast-printer': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-edit/1.9.0:
     resolution: {integrity: sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==}
     dependencies:
@@ -7041,16 +6993,6 @@ packages:
       '@webassemblyjs/wast-printer': 1.9.0
     dev: true
 
-  /@webassemblyjs/wasm-gen/1.11.1:
-    resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-gen/1.9.0:
     resolution: {integrity: sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==}
     dependencies:
@@ -7061,15 +7003,6 @@ packages:
       '@webassemblyjs/utf8': 1.9.0
     dev: true
 
-  /@webassemblyjs/wasm-opt/1.11.1:
-    resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-buffer': 1.11.1
-      '@webassemblyjs/wasm-gen': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-opt/1.9.0:
     resolution: {integrity: sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==}
     dependencies:
@@ -7079,17 +7012,6 @@ packages:
       '@webassemblyjs/wasm-parser': 1.9.0
     dev: true
 
-  /@webassemblyjs/wasm-parser/1.11.1:
-    resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/helper-api-error': 1.11.1
-      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
-      '@webassemblyjs/ieee754': 1.11.1
-      '@webassemblyjs/leb128': 1.11.1
-      '@webassemblyjs/utf8': 1.11.1
-    dev: true
-
   /@webassemblyjs/wasm-parser/1.9.0:
     resolution: {integrity: sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==}
     dependencies:
@@ -7112,13 +7034,6 @@ packages:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/wast-printer/1.11.1:
-    resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==}
-    dependencies:
-      '@webassemblyjs/ast': 1.11.1
-      '@xtuc/long': 4.2.2
-    dev: true
-
   /@webassemblyjs/wast-printer/1.9.0:
     resolution: {integrity: sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==}
     dependencies:
@@ -7160,14 +7075,6 @@ packages:
       acorn-walk: 8.2.0
     dev: true
 
-  /acorn-import-assertions/1.8.0_acorn@8.8.1:
-    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
-    peerDependencies:
-      acorn: ^8
-    dependencies:
-      acorn: 8.8.1
-    dev: true
-
   /acorn-jsx/5.3.2_acorn@7.4.1:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -7381,6 +7288,11 @@ packages:
     resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==}
     engines: {node: '>=8'}
 
+  /ansi-regex/6.0.1:
+    resolution: {integrity: sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==}
+    engines: {node: '>=12'}
+    dev: true
+
   /ansi-styles/3.2.1:
     resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==}
     engines: {node: '>=4'}
@@ -7399,6 +7311,11 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /ansi-styles/6.2.1:
+    resolution: {integrity: sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==}
+    engines: {node: '>=12'}
+    dev: true
+
   /ansi-to-html/0.6.15:
     resolution: {integrity: sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==}
     engines: {node: '>=8.0.0'}
@@ -8984,6 +8901,14 @@ packages:
       string-width: 4.2.3
     dev: true
 
+  /cli-truncate/3.1.0:
+    resolution: {integrity: sha512-wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      slice-ansi: 5.0.0
+      string-width: 5.1.2
+    dev: true
+
   /cli-ux/5.6.7_@oclif+config@1.18.5:
     resolution: {integrity: sha512-dsKAurMNyFDnO6X1TiiRNiVbL90XReLKcvIq4H777NMqXGBxBws23ag8ubCJE97vVZEgWG2eSUhsyLf63Jv8+g==}
     engines: {node: '>=8.0.0'}
@@ -10403,6 +10328,11 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
+  /diff/5.1.0:
+    resolution: {integrity: sha512-D+mk+qE8VC/PAUrlAU34N+VfXev0ghe5ywmpqrawphmVZc1bEfn56uo9qpyGp1p4xpzOHkSW4ztBd6L7Xx4ACw==}
+    engines: {node: '>=0.3.1'}
+    dev: true
+
   /diffie-hellman/5.0.3:
     resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==}
     dependencies:
@@ -10613,6 +10543,10 @@ packages:
       object.defaults: 1.1.0
     dev: true
 
+  /eastasianwidth/0.2.0:
+    resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
+    dev: true
+
   /ecc-jsbn/0.1.2:
     resolution: {integrity: sha512-eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw==}
     dependencies:
@@ -10688,6 +10622,10 @@ packages:
   /emoji-regex/8.0.0:
     resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==}
 
+  /emoji-regex/9.2.2:
+    resolution: {integrity: sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==}
+    dev: true
+
   /emojis-list/3.0.0:
     resolution: {integrity: sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==}
     engines: {node: '>= 4'}
@@ -10879,10 +10817,6 @@ packages:
       stop-iteration-iterator: 1.0.0
     dev: true
 
-  /es-module-lexer/0.9.3:
-    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
-    dev: true
-
   /es-set-tostringtag/2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
@@ -13583,6 +13517,11 @@ packages:
     resolution: {integrity: sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==}
     engines: {node: '>=8'}
 
+  /is-fullwidth-code-point/4.0.0:
+    resolution: {integrity: sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==}
+    engines: {node: '>=12'}
+    dev: true
+
   /is-function/1.0.2:
     resolution: {integrity: sha512-lw7DUp0aWXYg+CBCN+JKkcE0Q2RayZnSvnZBlwgxHBQhqt5pZNVy4Ri7H9GmmXkdu7LUthszM+Tor1u/2iBcpQ==}
     dev: true
@@ -14524,15 +14463,6 @@ packages:
       supports-color: 7.2.0
     dev: true
 
-  /jest-worker/27.5.1:
-    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
-    engines: {node: '>= 10.13.0'}
-    dependencies:
-      '@types/node': 16.18.12
-      merge-stream: 2.0.0
-      supports-color: 8.1.1
-    dev: true
-
   /jest-worker/29.4.2:
     resolution: {integrity: sha512-VIuZA2hZmFyRbchsUCHEehoSf2HEl0YVF8SDJqtPnKorAaBuh42V8QsLnde0XP5F6TyCynGPEGgBOn3Fc+wZGw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -15226,11 +15156,6 @@ packages:
     engines: {node: '>=4.3.0 <5.0.0 || >=5.10'}
     dev: true
 
-  /loader-runner/4.3.0:
-    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
-    engines: {node: '>=6.11.5'}
-    dev: true
-
   /loader-utils/1.4.2:
     resolution: {integrity: sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==}
     engines: {node: '>=4.0.0'}
@@ -16027,7 +15952,7 @@ packages:
     resolution: {integrity: sha512-cwzBrBfwGC1gYJyfcy8TcZU1f+dbH/T+TuOhtYP2wLv/Fb51/uV7HJQfBPtEupZ2ORLRU1EKFS/QfS3eo9+kBQ==}
     dependencies:
       acorn: 8.8.1
-      pathe: 1.0.0
+      pathe: 1.1.0
       pkg-types: 1.0.1
       ufo: 1.0.1
     dev: true
@@ -17006,6 +16931,13 @@ packages:
       yocto-queue: 0.1.0
     dev: true
 
+  /p-limit/4.0.0:
+    resolution: {integrity: sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==}
+    engines: {node: ^12.20.0 || ^14.13.1 || >=16.0.0}
+    dependencies:
+      yocto-queue: 1.0.0
+    dev: true
+
   /p-locate/3.0.0:
     resolution: {integrity: sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==}
     engines: {node: '>=6'}
@@ -17338,12 +17270,8 @@ packages:
     resolution: {integrity: sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==}
     engines: {node: '>=8'}
 
-  /pathe/0.2.0:
-    resolution: {integrity: sha512-sTitTPYnn23esFR3RlqYBWn4c45WGeLcsKzQiUpXJAyfcWkolvlYpV8FLo7JishK946oQwMFUCHXQ9AjGPKExw==}
-    dev: true
-
-  /pathe/1.0.0:
-    resolution: {integrity: sha512-nPdMG0Pd09HuSsr7QOKUXO2Jr9eqaDiZvDwdyIhNG5SHYujkQHYKDfGQkulBxvbDHz8oHLsTgKN86LSwYzSHAg==}
+  /pathe/1.1.0:
+    resolution: {integrity: sha512-ODbEPR0KKHqECXW1GoxdDb+AZvULmXjVPy4rt+pGo2+TnjJTIPJQSVS6N63n8T2Ip+syHhbn52OewKicV0373w==}
     dev: true
 
   /pathval/1.1.1:
@@ -17551,7 +17479,7 @@ packages:
     dependencies:
       jsonc-parser: 3.2.0
       mlly: 1.1.0
-      pathe: 1.0.0
+      pathe: 1.1.0
     dev: true
 
   /plimit-lit/1.4.1:
@@ -17846,6 +17774,15 @@ packages:
       react-is: 17.0.2
     dev: true
 
+  /pretty-format/27.5.1:
+    resolution: {integrity: sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==}
+    engines: {node: ^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0}
+    dependencies:
+      ansi-regex: 5.0.1
+      ansi-styles: 5.2.0
+      react-is: 17.0.2
+    dev: true
+
   /pretty-format/29.3.1:
     resolution: {integrity: sha512-FyLnmb1cYJV8biEIiRyzRFvs2lry7PPIvOqKVe1GCUEYg4YGmlx1qG9EJNMxArYm7piII4qb8UV1Pncq5dxmcg==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -19122,7 +19059,7 @@ packages:
     dev: false
     optional: true
 
-  /sass-loader/10.3.1_sass@1.55.0+webpack@5.74.0:
+  /sass-loader/10.3.1_sass@1.55.0+webpack@4.46.0:
     resolution: {integrity: sha512-y2aBdtYkbqorVavkC3fcJIUDGIegzDWPn3/LAFhsf3G+MzPKTJx37sROf5pXtUeggSVbNbmfj8TgRaSLMelXRA==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -19144,7 +19081,7 @@ packages:
       sass: 1.55.0
       schema-utils: 3.1.1
       semver: 7.3.8
-      webpack: 5.74.0
+      webpack: 4.46.0
     dev: true
 
   /sass-loader/10.3.1_sass@1.57.1+webpack@4.46.0:
@@ -19352,12 +19289,6 @@ packages:
     dependencies:
       randombytes: 2.1.0
 
-  /serialize-javascript/6.0.0:
-    resolution: {integrity: sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==}
-    dependencies:
-      randombytes: 2.1.0
-    dev: true
-
   /serve-favicon/2.5.0:
     resolution: {integrity: sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==}
     engines: {node: '>= 0.8.0'}
@@ -19545,6 +19476,14 @@ packages:
       is-fullwidth-code-point: 3.0.0
     dev: true
 
+  /slice-ansi/5.0.0:
+    resolution: {integrity: sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-styles: 6.2.1
+      is-fullwidth-code-point: 4.0.0
+    dev: true
+
   /smart-buffer/4.2.0:
     resolution: {integrity: sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==}
     engines: {node: '>= 6.0.0', npm: '>= 3.0.0'}
@@ -19953,6 +19892,10 @@ packages:
     resolution: {integrity: sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==}
     engines: {node: '>= 0.8'}
 
+  /std-env/3.3.2:
+    resolution: {integrity: sha512-uUZI65yrV2Qva5gqE0+A7uVAvO40iPo6jGhs7s8keRfHCmtg+uB2X6EiLGCI9IgL1J17xGhvoOqSz79lzICPTA==}
+    dev: true
+
   /stealthy-require/1.1.1:
     resolution: {integrity: sha512-ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==}
     engines: {node: '>=0.10.0'}
@@ -20115,6 +20058,15 @@ packages:
       is-fullwidth-code-point: 3.0.0
       strip-ansi: 6.0.1
 
+  /string-width/5.1.2:
+    resolution: {integrity: sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==}
+    engines: {node: '>=12'}
+    dependencies:
+      eastasianwidth: 0.2.0
+      emoji-regex: 9.2.2
+      strip-ansi: 7.0.1
+    dev: true
+
   /string.prototype.matchall/4.0.8:
     resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==}
     dependencies:
@@ -20214,6 +20166,13 @@ packages:
     dependencies:
       ansi-regex: 5.0.1
 
+  /strip-ansi/7.0.1:
+    resolution: {integrity: sha512-cXNxvT8dFNRVfhVME3JAe98mkXDYN2O1l7jmcwMnOslDeESg1rF/OZMtK0nRAhiari1unG5cD4jG3rapUAkLbw==}
+    engines: {node: '>=12'}
+    dependencies:
+      ansi-regex: 6.0.1
+    dev: true
+
   /strip-bom/2.0.0:
     resolution: {integrity: sha512-kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g==}
     engines: {node: '>=0.10.0'}
@@ -20566,30 +20525,6 @@ packages:
       - bluebird
     dev: true
 
-  /terser-webpack-plugin/5.3.6_webpack@5.74.0:
-    resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      '@swc/core': '*'
-      esbuild: '*'
-      uglify-js: '*'
-      webpack: ^5.1.0
-    peerDependenciesMeta:
-      '@swc/core':
-        optional: true
-      esbuild:
-        optional: true
-      uglify-js:
-        optional: true
-    dependencies:
-      '@jridgewell/trace-mapping': 0.3.17
-      jest-worker: 27.5.1
-      schema-utils: 3.1.1
-      serialize-javascript: 6.0.0
-      terser: 5.16.1
-      webpack: 5.74.0
-    dev: true
-
   /terser/4.8.1:
     resolution: {integrity: sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==}
     engines: {node: '>=6.0.0'}
@@ -20705,8 +20640,8 @@ packages:
     resolution: {integrity: sha512-h80m9GPFGbcLzZByXlNSEhp1gf8Dy+VX/2JCGUZsWLo7lV1mnE/XlxGYgRBoMLJh1lIDXP0EMC4RPTjlRaV+Bg==}
     dev: false
 
-  /tinypool/0.3.0:
-    resolution: {integrity: sha512-NX5KeqHOBZU6Bc0xj9Vr5Szbb1j8tUHIeD18s41aDJaPeC5QTdEhK0SpdpUrZlj2nv5cctNcSjaKNanXlfcVEQ==}
+  /tinypool/0.3.1:
+    resolution: {integrity: sha512-zLA1ZXlstbU2rlpA4CIeVaqvWq41MTWqLY3FfsAXgC8+f7Pk7zroaJQxDgxn1xNudKW6Kmj4808rPFShUlIRmQ==}
     engines: {node: '>=14.0.0'}
     dev: true
 
@@ -20917,7 +20852,7 @@ packages:
     resolution: {integrity: sha512-e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ==}
     dev: false
 
-  /ts-jest/29.0.5_zxiwvszgu5ffnwmdmgcln4cteq:
+  /ts-jest/29.0.5_pa4ebk5usulsg7iw3zwjv5figy:
     resolution: {integrity: sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -20947,7 +20882,7 @@ packages:
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.3.8
-      typescript: 4.8.4
+      typescript: 4.9.4
       yargs-parser: 21.1.1
     dev: true
 
@@ -20995,7 +20930,7 @@ packages:
       plimit-lit: 1.4.1
     dev: true
 
-  /tsc-watch/6.0.0_typescript@4.8.4:
+  /tsc-watch/6.0.0_typescript@4.9.4:
     resolution: {integrity: sha512-zgpju+/z5z29/kK5V28Nz16CMkX2voFOUxkTlCim/R25hxzbyUqu2NfTnmJBQfESBSPbEQUGqDdB9A8opAcB4A==}
     engines: {node: '>=12.12.0'}
     hasBin: true
@@ -21006,7 +20941,7 @@ packages:
       node-cleanup: 2.1.2
       ps-tree: 1.2.0
       string-argv: 0.3.1
-      typescript: 4.8.4
+      typescript: 4.9.4
     dev: true
 
   /tsconfig-paths/3.14.1:
@@ -21276,12 +21211,6 @@ packages:
       - supports-color
     dev: false
 
-  /typescript/4.8.4:
-    resolution: {integrity: sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==}
-    engines: {node: '>=4.2.0'}
-    hasBin: true
-    dev: true
-
   /typescript/4.9.4:
     resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
     engines: {node: '>=4.2.0'}
@@ -21849,15 +21778,15 @@ packages:
       replace-ext: 1.0.1
     dev: true
 
-  /vite-node/0.27.2_lydj4ordo26cwwlynpu7uqrnl4:
-    resolution: {integrity: sha512-IDwuVhslF10qCnWOGJui7/2KksAOBHi+UbVo6Pqt4f5lgn+kS2sVvYDsETRG5PSuslisGB5CFGvb9I6FQgymBQ==}
+  /vite-node/0.28.4_lydj4ordo26cwwlynpu7uqrnl4:
+    resolution: {integrity: sha512-KM0Q0uSG/xHHKOJvVHc5xDBabgt0l70y7/lWTR7Q0pR5/MrYxadT+y32cJOE65FfjGmJgxpVEEY+69btJgcXOQ==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4
       mlly: 1.1.0
-      pathe: 0.2.0
+      pathe: 1.1.0
       picocolors: 1.0.0
       source-map: 0.6.1
       source-map-support: 0.5.21
@@ -21872,15 +21801,15 @@ packages:
       - terser
     dev: true
 
-  /vite-node/0.27.2_uuaiuqsfc4gpri2fkjqkscjfse:
-    resolution: {integrity: sha512-IDwuVhslF10qCnWOGJui7/2KksAOBHi+UbVo6Pqt4f5lgn+kS2sVvYDsETRG5PSuslisGB5CFGvb9I6FQgymBQ==}
+  /vite-node/0.28.4_uuaiuqsfc4gpri2fkjqkscjfse:
+    resolution: {integrity: sha512-KM0Q0uSG/xHHKOJvVHc5xDBabgt0l70y7/lWTR7Q0pR5/MrYxadT+y32cJOE65FfjGmJgxpVEEY+69btJgcXOQ==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     dependencies:
       cac: 6.7.14
       debug: 4.3.4
       mlly: 1.1.0
-      pathe: 0.2.0
+      pathe: 1.1.0
       picocolors: 1.0.0
       source-map: 0.6.1
       source-map-support: 0.5.21
@@ -22043,8 +21972,8 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /vitest/0.27.2_jsdom@21.0.0+sass@1.57.1:
-    resolution: {integrity: sha512-y7tdsL2uaQy+KF18AlmNHZe29ukyFytlxrpSTwwmgLE2XHR/aPucJP9FLjWoqjgqFlXzRAjHlFJLU+HDyI/OsA==}
+  /vitest/0.28.4_jsdom@21.0.0+sass@1.57.1:
+    resolution: {integrity: sha512-sfWIy0AdlbyGRhunm+TLQEJrFH9XuRPdApfubsyLcDbCRrUX717BRQKInTgzEfyl2Ipi1HWoHB84Nqtcwxogcg==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     peerDependencies:
@@ -22068,6 +21997,10 @@ packages:
       '@types/chai': 4.3.4
       '@types/chai-subset': 1.3.3
       '@types/node': 16.18.12
+      '@vitest/expect': 0.28.4
+      '@vitest/runner': 0.28.4
+      '@vitest/spy': 0.28.4
+      '@vitest/utils': 0.28.4
       acorn: 8.8.1
       acorn-walk: 8.2.0
       cac: 6.7.14
@@ -22075,14 +22008,16 @@ packages:
       debug: 4.3.4
       jsdom: 21.0.0
       local-pkg: 0.4.2
+      pathe: 1.1.0
       picocolors: 1.0.0
       source-map: 0.6.1
+      std-env: 3.3.2
       strip-literal: 1.0.0
       tinybench: 2.3.1
-      tinypool: 0.3.0
+      tinypool: 0.3.1
       tinyspy: 1.0.2
       vite: 4.0.4_uuaiuqsfc4gpri2fkjqkscjfse
-      vite-node: 0.27.2_uuaiuqsfc4gpri2fkjqkscjfse
+      vite-node: 0.28.4_uuaiuqsfc4gpri2fkjqkscjfse
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -22093,8 +22028,8 @@ packages:
       - terser
     dev: true
 
-  /vitest/0.27.2_sass@1.55.0+terser@5.16.1:
-    resolution: {integrity: sha512-y7tdsL2uaQy+KF18AlmNHZe29ukyFytlxrpSTwwmgLE2XHR/aPucJP9FLjWoqjgqFlXzRAjHlFJLU+HDyI/OsA==}
+  /vitest/0.28.4_sass@1.55.0+terser@5.16.1:
+    resolution: {integrity: sha512-sfWIy0AdlbyGRhunm+TLQEJrFH9XuRPdApfubsyLcDbCRrUX717BRQKInTgzEfyl2Ipi1HWoHB84Nqtcwxogcg==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
     peerDependencies:
@@ -22118,20 +22053,26 @@ packages:
       '@types/chai': 4.3.4
       '@types/chai-subset': 1.3.3
       '@types/node': 16.18.12
+      '@vitest/expect': 0.28.4
+      '@vitest/runner': 0.28.4
+      '@vitest/spy': 0.28.4
+      '@vitest/utils': 0.28.4
       acorn: 8.8.1
       acorn-walk: 8.2.0
       cac: 6.7.14
       chai: 4.3.7
       debug: 4.3.4
       local-pkg: 0.4.2
+      pathe: 1.1.0
       picocolors: 1.0.0
       source-map: 0.6.1
+      std-env: 3.3.2
       strip-literal: 1.0.0
       tinybench: 2.3.1
-      tinypool: 0.3.0
+      tinypool: 0.3.1
       tinyspy: 1.0.2
       vite: 4.0.4_lydj4ordo26cwwlynpu7uqrnl4
-      vite-node: 0.27.2_lydj4ordo26cwwlynpu7uqrnl4
+      vite-node: 0.28.4_lydj4ordo26cwwlynpu7uqrnl4
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -22581,11 +22522,6 @@ packages:
       source-map: 0.6.1
     dev: true
 
-  /webpack-sources/3.2.3:
-    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
-    engines: {node: '>=10.13.0'}
-    dev: true
-
   /webpack-virtual-modules/0.2.2:
     resolution: {integrity: sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==}
     dependencies:
@@ -22634,46 +22570,6 @@ packages:
       - supports-color
     dev: true
 
-  /webpack/5.74.0:
-    resolution: {integrity: sha512-A2InDwnhhGN4LYctJj6M1JEaGL7Luj6LOmyBHjcI8529cm5p6VXiTIW2sn6ffvEAKmveLzvu4jrihwXtPojlAA==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
-    peerDependencies:
-      webpack-cli: '*'
-    peerDependenciesMeta:
-      webpack-cli:
-        optional: true
-    dependencies:
-      '@types/eslint-scope': 3.7.4
-      '@types/estree': 0.0.51
-      '@webassemblyjs/ast': 1.11.1
-      '@webassemblyjs/wasm-edit': 1.11.1
-      '@webassemblyjs/wasm-parser': 1.11.1
-      acorn: 8.8.1
-      acorn-import-assertions: 1.8.0_acorn@8.8.1
-      browserslist: 4.21.4
-      chrome-trace-event: 1.0.3
-      enhanced-resolve: 5.10.0
-      es-module-lexer: 0.9.3
-      eslint-scope: 5.1.1
-      events: 3.3.0
-      glob-to-regexp: 0.4.1
-      graceful-fs: 4.2.10
-      json-parse-even-better-errors: 2.3.1
-      loader-runner: 4.3.0
-      mime-types: 2.1.35
-      neo-async: 2.6.2
-      schema-utils: 3.1.1
-      tapable: 2.2.1
-      terser-webpack-plugin: 5.3.6_webpack@5.74.0
-      watchpack: 2.4.0
-      webpack-sources: 3.2.3
-    transitivePeerDependencies:
-      - '@swc/core'
-      - esbuild
-      - uglify-js
-    dev: true
-
   /whatwg-encoding/2.0.0:
     resolution: {integrity: sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==}
     engines: {node: '>=12'}
@@ -23194,6 +23090,11 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
+  /yocto-queue/1.0.0:
+    resolution: {integrity: sha512-9bnSc/HEW2uRy67wc+T8UwauLuPJVn28jb+GtJY16iiKWyvmYJRXVT4UamsAEGQfPohgr2q4Tq0sQbQlxTfi1g==}
+    engines: {node: '>=12.20'}
+    dev: true
+
   /yup/0.32.11:
     resolution: {integrity: sha512-Z2Fe1bn+eLstG8DRR6FTavGD+MeAwyfmouhHsIUgaADz8jvFKbO/fXc2trJKZg+5EBjh4gGm3iU/t3onKlXHIg==}
     engines: {node: '>=10'}

From 5b1e3a3fd3ecadee5b35ab691446e49028974484 Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Fri, 10 Feb 2023 09:53:20 +0100
Subject: [PATCH 166/358] test(Write Binary File Node): Unit tests
 (no-changelog) (#5440)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✅ add write binary file test

* 🎨 cleanup

---------

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../test/WriteBinaryFile.test.ts              |  70 ++++++++++++++++
 .../test/WriteBinaryFile.workflow.json        |  76 ++++++++++++++++++
 .../nodes/WriteBinaryFile/test/image.jpg      | Bin 0 -> 1045 bytes
 packages/nodes-base/test/nodes/Helpers.ts     |   7 +-
 4 files changed, 152 insertions(+), 1 deletion(-)
 create mode 100644 packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
 create mode 100644 packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.workflow.json
 create mode 100644 packages/nodes-base/nodes/WriteBinaryFile/test/image.jpg

diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
new file mode 100644
index 00000000000000..8a11e927c1e1cd
--- /dev/null
+++ b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.test.ts
@@ -0,0 +1,70 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import * as Helpers from '../../../test/nodes/Helpers';
+import type { WorkflowTestData } from '../../../test/nodes/types';
+import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
+import path from 'path';
+
+describe('Test Write Binary File Node', () => {
+	beforeEach(async () => {
+		await Helpers.initBinaryDataManager();
+	});
+
+	const temporaryDir = Helpers.createTemporaryDir();
+	const workflow = Helpers.readJsonFileSync(
+		'nodes/WriteBinaryFile/test/WriteBinaryFile.workflow.json',
+	);
+	const readFileNode = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
+	readFileNode.parameters.filePath = path.join(__dirname, 'image.jpg');
+
+	const writeFileNode = workflow.nodes.find((n: any) => n.name === 'Write Binary File');
+	const writeFilePath = path.join(temporaryDir, 'image-written.jpg');
+	writeFileNode.parameters.fileName = writeFilePath;
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'nodes/WriteBinaryFile/test/WriteBinaryFile.workflow.json',
+			input: {
+				workflowData: workflow,
+			},
+			output: {
+				nodeData: {
+					'Write Binary File': [
+						[
+							{
+								json: {
+									fileName: writeFilePath,
+								},
+								binary: {
+									data: {
+										mimeType: 'image/jpeg',
+										fileType: 'image',
+										fileExtension: 'jpg',
+										data: '/9j/4AAQSkZJRgABAQEASABIAAD/4QBmRXhpZgAATU0AKgAAAAgABAEaAAUAAAABAAAAPgEbAAUAAAABAAAARgEoAAMAAAABAAIAAAExAAIAAAAQAAAATgAAAAAAARlJAAAD6AABGUkAAAPocGFpbnQubmV0IDUuMC4xAP/bAEMAIBYYHBgUIBwaHCQiICYwUDQwLCwwYkZKOlB0Znp4cmZwboCQuJyAiK6KbnCg2qKuvsTO0M58muLy4MjwuMrOxv/bAEMBIiQkMCowXjQ0XsaEcITGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxsbGxv/AABEIAB8AOwMBEgACEQEDEQH/xAAfAAABBQEBAQEBAQAAAAAAAAAAAQIDBAUGBwgJCgv/xAC1EAACAQMDAgQDBQUEBAAAAX0BAgMABBEFEiExQQYTUWEHInEUMoGRoQgjQrHBFVLR8CQzYnKCCQoWFxgZGiUmJygpKjQ1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoOEhYaHiImKkpOUlZaXmJmaoqOkpaanqKmqsrO0tba3uLm6wsPExcbHyMnK0tPU1dbX2Nna4eLj5OXm5+jp6vHy8/T19vf4+fr/xAAfAQADAQEBAQEBAQEBAAAAAAAAAQIDBAUGBwgJCgv/xAC1EQACAQIEBAMEBwUEBAABAncAAQIDEQQFITEGEkFRB2FxEyIygQgUQpGhscEJIzNS8BVictEKFiQ04SXxFxgZGiYnKCkqNTY3ODk6Q0RFRkdISUpTVFVWV1hZWmNkZWZnaGlqc3R1dnd4eXqCg4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2dri4+Tl5ufo6ery8/T19vf4+fr/2gAMAwEAAhEDEQA/AOgqgrXF2zNHJ5aKcD3oNPZ23di/VKG82bkuTh1OMgdaAdOSLtZ6G5ut0iSeWoOAKAdO27NCqUN8oQrcHDqccDrQDpyRNPdRwEKcsx7CobIebPLORwThc0inGMF724jagNpxG4OOM1dIDAgjIPBpkqUOxnR2pmh85pW3nJB9KkNi4yqTssZ6rSNXNX0ehHFfusYDLuI7+tXY4I40ChQcdzQRKcL7Fb7PcQO32cqUY5we1XqZPtH11KsFoFDGYK7sckkZxVqgTnJlEQXMBZYGUoTkZ7VeoH7RvcqwWaIh80K7k5JIq1QJzkyhbMtvdSxMdqnlc1amgjmx5i5I70inNSVpFdrmaWRltkBVerHvUW57B2AUNGxyOaC+VW9xXLVrcGbcjrtkXqKZZxvveeTAL9APSgiooq1ty3RTMj//2Q==',
+										directory: __dirname,
+										fileName: 'image.jpg',
+										fileSize: '1.04 kB',
+									},
+								},
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.workflow.json b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.workflow.json
new file mode 100644
index 00000000000000..b79452ef823fdd
--- /dev/null
+++ b/packages/nodes-base/nodes/WriteBinaryFile/test/WriteBinaryFile.workflow.json
@@ -0,0 +1,76 @@
+{
+	"name": "Write Binary File unit test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "b319a78c-ff34-4888-b412-e08609bd84e4",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				1040,
+				640
+			]
+		},
+		{
+			"parameters": {
+				"fileName": "C:\\Test\\image-written.jpg",
+				"options": {}
+			},
+			"id": "804f7422-7414-4557-bf3b-0aa0e8f4885e",
+			"name": "Write Binary File",
+			"type": "n8n-nodes-base.writeBinaryFile",
+			"typeVersion": 1,
+			"position": [
+				1540,
+				640
+			]
+		},
+		{
+			"parameters": {
+				"filePath": "C:\\Test\\image.jpg"
+			},
+			"id": "7bed9527-c0a9-4b03-8f2f-d96d805f7fbc",
+			"name": "Read Binary File",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"position": [
+				1300,
+				640
+			]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read Binary File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read Binary File": {
+			"main": [
+				[
+					{
+						"node": "Write Binary File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "eb891093-ce90-44d8-9325-b2130e59819d",
+	"id": "185",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
\ No newline at end of file
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/test/image.jpg b/packages/nodes-base/nodes/WriteBinaryFile/test/image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..24b60c421ecc14914b9e63577915a5837fb69504
GIT binary patch
literal 1045
zcmex=<NpH&0WUXCHwH#VMg|WcWcdG(A<eZSGmU}4*Ox(yfq{X8frU|uffdMN1Y$cz
zX*k=BQG<aQEY1X!G-Lph3<5yx2gE=DNlyj_<`*!!ATcwqL@zJ3M8Q<gK+llj|7`|m
z1_dz*83_>u87UbRB?UEu022cp9fKq{FROr(w5p1tw1T{b2|MOAbgb*jD_C%A(Yk#{
z&RsZHGwac(2PZ!4ICbtA$Ph*)6%_+5gE$kDxMM8^EyqX({|_(-axlm<STi#UF)#@-
zG7B>PKLX@4FtP$e1r#t)z{teR!pg?Z!O6u9RIpWmfr*isnTds&m6e4BsJa#?&%h$c
zDx_%W$R-?^$gWf<V$?WsA&0Wl#)G0k7eA;NClxhua*2scNJ^=yscUFznV6cHTUc5-
zySTc!dw6;UhlGZOM?^*?r=+H(XJlp-mz0*3S5#Itx3spkcXW15nmlFdwCOWu&RVp1
z$<k%ZSFBvMY4et?+qUo6x$Ds3BS()NKXLNZrOQ{YUb}wd=B<a19zS{d?D>nAuRebI
z{N?Mn?>~P20{M%Pff?d0xX;l1B?$Bv6AKG73p>bPj7;S~%q+;ls%Xe2<QT}FSSYMy
z)W{*?G;!g^gPh97K_5huiY{`AshB)e{Rr|J*k{Cftcfh2!99lX*DVGfW=3G-F$*%-
zGrZ7h+IsZ1vAg=Tt^(T^Cf~~L-q;_qaL>)1dVaEgM(k0HmnZ36tCF6*_L9oHsOAO@
zcE8)3omM*6EabW)V>PG1>H^=Ki6-9z4>--)EO%((Cb^tX=iFHy7JDq0I9PqV<5t71
zLh0r{<8Tii4rPT8nUj|C9V;nYmQnL;>h?JkYPFn`9&1hBbgXKva=2-&TuWj6u4Bx4
zkF0-Pz44&WgiA!G+(c0G&~MRw=L?y)-#j%Xd5+xGs+o2dzg}6*x**_K!n!v_o{~qS
z7WfsV3bLMIoyHc_@+5t0+=9A`drxhMT%`EfY4_ww9;-t*&-pCOIh|js<5RZsX>r)H
zCd-Y_^gP~sEH_on6utE<GbMGKLul2;_knrU><J<!IYpKW_J!sb#%#?lNW0UwJ0)(>
c%yjAZl}`@nU*PxRSg~kr?&*?XBm4h10lOThTL1t6

literal 0
HcmV?d00001

diff --git a/packages/nodes-base/test/nodes/Helpers.ts b/packages/nodes-base/test/nodes/Helpers.ts
index 457489e2b079d7..83fb957b2ee111 100644
--- a/packages/nodes-base/test/nodes/Helpers.ts
+++ b/packages/nodes-base/test/nodes/Helpers.ts
@@ -158,8 +158,12 @@ const loadKnownNodes = (): Record<string, LoadingDetails> => {
 	return knownNodes!;
 };
 
+export function createTemporaryDir(prefix: string = 'n8n') {
+	return mkdtempSync(path.join(tmpdir(), prefix));
+}
+
 export async function initBinaryDataManager(mode: 'default' | 'filesystem' = 'default') {
-	const temporaryDir = mkdtempSync(path.join(tmpdir(), 'n8n'));
+	const temporaryDir = createTemporaryDir();
 	await BinaryDataManager.init({
 		mode,
 		availableModes: mode,
@@ -167,6 +171,7 @@ export async function initBinaryDataManager(mode: 'default' | 'filesystem' = 'de
 		binaryDataTTL: 1,
 		persistedBinaryDataTTL: 1,
 	});
+	return temporaryDir;
 }
 
 export function setup(testData: Array<WorkflowTestData> | WorkflowTestData) {

From 287fa9cd06ff08edb62222de22e7d0c059886e6e Mon Sep 17 00:00:00 2001
From: Valya <68596159+valya@users.noreply.github.com>
Date: Fri, 10 Feb 2023 09:05:34 +0000
Subject: [PATCH 167/358] test(core): Add basic expression tests (no-changelog)
 (#5439)

* test(core): add basic expression tests

* test: fix $if test not working properly
---
 packages/workflow/test/Expression.test.ts     |  47 ++
 .../ExpressionExtension.test.ts               |   8 +-
 .../test/ExpressionExtensions/Helpers.ts      |   6 +-
 .../workflow/test/ExpressionFixtures/base.ts  | 672 ++++++++++++++++++
 4 files changed, 725 insertions(+), 8 deletions(-)
 create mode 100644 packages/workflow/test/ExpressionFixtures/base.ts

diff --git a/packages/workflow/test/Expression.test.ts b/packages/workflow/test/Expression.test.ts
index 7d33dc15efa55b..470929d8dba08f 100644
--- a/packages/workflow/test/Expression.test.ts
+++ b/packages/workflow/test/Expression.test.ts
@@ -6,6 +6,15 @@ import { DateTime, Duration, Interval } from 'luxon';
 import { Expression } from '@/Expression';
 import { Workflow } from '@/Workflow';
 import * as Helpers from './Helpers';
+import { baseFixtures } from './ExpressionFixtures/base';
+import {
+	IConnections,
+	IExecuteData,
+	INode,
+	INodeExecutionData,
+	IRunExecutionData,
+	ITaskData,
+} from '@/Interfaces';
 
 describe('Expression', () => {
 	describe('getParameterValue()', () => {
@@ -147,4 +156,42 @@ describe('Expression', () => {
 			expect(evaluate('={{Symbol(1).toString()}}')).toEqual(Symbol(1).toString());
 		});
 	});
+
+	describe('Test all expression value fixtures', () => {
+		const nodeTypes = Helpers.NodeTypes();
+		const workflow = new Workflow({
+			nodes: [
+				{
+					name: 'node',
+					typeVersion: 1,
+					type: 'test.set',
+					id: 'uuid-1234',
+					position: [0, 0],
+					parameters: {},
+				},
+			],
+			connections: {},
+			active: false,
+			nodeTypes,
+		});
+
+		const expression = new Expression(workflow);
+
+		const evaluate = (value: string, data: INodeExecutionData[]) => {
+			return expression.getParameterValue(value, null, 0, 0, 'node', data, 'manual', '', {});
+		};
+
+		for (const t of baseFixtures) {
+			if (!t.tests.some((test) => test.type === 'evaluation')) {
+				continue;
+			}
+			test(t.expression, () => {
+				for (const test of t.tests.filter((test) => test.type === 'evaluation')) {
+					expect(evaluate(t.expression, test.input.map((d) => ({ json: d })) as any)).toStrictEqual(
+						test.output,
+					);
+				}
+			});
+		}
+	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
index 951a4e22a1f9ae..71dfe82fe99553 100644
--- a/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ExpressionExtension.test.ts
@@ -209,13 +209,11 @@ describe('tmpl Expression Parser', () => {
 			// If you're implementing sandboxing maybe provide a way to add functions to
 			// sandbox we can check instead?
 			const mockCallback = jest.fn(() => false);
-			// @ts-ignore
-			evaluate('={{ $if("a"==="a", true, $data["cb"]()) }}', [{ cb: mockCallback }]);
+			evaluate('={{ $if("a"==="a", true, $data.cb()) }}', [{ cb: mockCallback }]);
 			expect(mockCallback.mock.calls.length).toEqual(0);
 
-			// @ts-ignore
-			evaluate('={{ $if("a"==="b", true, $data["cb"]()) }}', [{ cb: mockCallback }]);
-			expect(mockCallback.mock.calls.length).toEqual(0);
+			evaluate('={{ $if("a"==="b", true, $data.cb()) }}', [{ cb: mockCallback }]);
+			expect(mockCallback.mock.calls.length).toEqual(1);
 		});
 
 		test('$not', () => {
diff --git a/packages/workflow/test/ExpressionExtensions/Helpers.ts b/packages/workflow/test/ExpressionExtensions/Helpers.ts
index fe6c3df7832740..828f50052db981 100644
--- a/packages/workflow/test/ExpressionExtensions/Helpers.ts
+++ b/packages/workflow/test/ExpressionExtensions/Helpers.ts
@@ -1,4 +1,4 @@
-import { Expression, INodeExecutionData, Workflow } from '../../src';
+import { Expression, IDataObject, Workflow } from '../../src';
 import * as Helpers from '../Helpers';
 
 export const TEST_TIMEZONE = 'America/New_York';
@@ -21,14 +21,14 @@ export const workflow = new Workflow({
 });
 export const expression = new Expression(workflow);
 
-export const evaluate = (value: string, values?: INodeExecutionData[]) =>
+export const evaluate = (value: string, values?: IDataObject[]) =>
 	expression.getParameterValue(
 		value,
 		null,
 		0,
 		0,
 		'node',
-		values ?? [],
+		values?.map((v) => ({ json: v })) ?? [],
 		'manual',
 		TEST_TIMEZONE,
 		{},
diff --git a/packages/workflow/test/ExpressionFixtures/base.ts b/packages/workflow/test/ExpressionFixtures/base.ts
new file mode 100644
index 00000000000000..90b8fdc9c89ae3
--- /dev/null
+++ b/packages/workflow/test/ExpressionFixtures/base.ts
@@ -0,0 +1,672 @@
+import type { GenericValue, IDataObject } from '@/Interfaces';
+
+export interface ExpressionTestBase {
+	type: string;
+}
+
+export interface ExpressionTestEvaluation extends ExpressionTestBase {
+	type: 'evaluation';
+	input: Array<IDataObject | GenericValue>;
+	output: IDataObject | GenericValue;
+}
+
+export type ExpressionTests = ExpressionTestEvaluation;
+
+export interface ExpressionTestFixture {
+	expression: string;
+	tests: ExpressionTests[];
+}
+
+export const baseFixtures: ExpressionTestFixture[] = [
+	{
+		expression: '={{$json["contact"]["FirstName"]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ contact: { FirstName: 'test' } }],
+				output: 'test',
+			},
+			{
+				type: 'evaluation',
+				input: [{ contact: null }],
+				output: undefined,
+			},
+		],
+	},
+	{
+		expression: '={{ $json["test"] }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ test: 'value' }],
+				output: 'value',
+			},
+			{
+				type: 'evaluation',
+				input: [{ test: 1 }],
+				output: 1,
+			},
+			{
+				type: 'evaluation',
+				input: [{ test: null }],
+				output: null,
+			},
+			{
+				type: 'evaluation',
+				input: [{}],
+				output: undefined,
+			},
+		],
+	},
+	{
+		expression: '={{$json["test"].json["message"]["message_id"]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ test: { json: { message: { message_id: 'value' } } } }],
+				output: 'value',
+			},
+		],
+	},
+	{
+		expression: '={{$json[$json["Set2"].json["apiKey"]]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ Set2: { json: { apiKey: 'testKey' } }, testKey: 'testValue' }],
+				output: 'testValue',
+			},
+		],
+	},
+	{
+		expression: '={{$json["get"].json["recipes"][0]["image"]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ get: { json: { recipes: [{ image: 'test' }] } } }],
+				output: 'test',
+			},
+		],
+	},
+	{
+		expression:
+			'=https://example.com/api/v1/workspaces/{{$json["Clockify1"].parameter["workspaceId"]}}/projects/{{$json["Clockify1"].json["id"]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ Clockify1: { parameter: { workspaceId: 'test1' }, json: { id: 'test2' } } }],
+				output: 'https://example.com/api/v1/workspaces/test1/projects/test2',
+			},
+		],
+	},
+	{
+		expression: '= {{$json["dig check CF"].data["stdout"]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ 'dig check CF': { data: { stdout: 'testout' } } }],
+				output: ' testout',
+			},
+		],
+	},
+	{
+		expression: '={{$item(0).$json["Set URL"].json["base_domain"]}}{{$json["link"]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ 'Set URL': { json: { base_domain: 'left' } }, link: 'right' }],
+				output: 'leftright',
+			},
+		],
+	},
+	{
+		expression: '={{$runIndex}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: 0,
+			},
+		],
+	},
+	{
+		expression: '={{ new String().toString() }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: '',
+			},
+		],
+	},
+	{
+		expression:
+			'={{(Date.parse($json["IF Zoom meeting"].json["end"]["dateTime"])-Date.parse($json["IF Zoom meeting"].json["start"]["dateTime"]))/(60*1000)}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [
+					{
+						'IF Zoom meeting': {
+							json: {
+								end: { dateTime: '2023-02-09T13:32:54.187Z' },
+								start: { dateTime: '2023-02-09T13:22:54.187Z' },
+							},
+						},
+					},
+				],
+				output: 10,
+			},
+		],
+	},
+	{
+		expression: '={{$json["GetTicket"].json["tickets"].length}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ GetTicket: { json: { tickets: [1, 2, 3, 4] } } }],
+				output: 4,
+			},
+		],
+	},
+	{
+		expression: '={{ $json.toString() }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ test: 1 }],
+				output: '[object Object]',
+			},
+		],
+	},
+	{
+		expression: '={{Math.floor(Math.min(1, 2) * 100);}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: 100,
+			},
+		],
+	},
+	{
+		expression: '={{$json["\u56fe\u7247\u6570\u91cf\u5224\u65ad"].data["imgList"][0]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [
+					{
+						'\u56fe\u7247\u6570\u91cf\u5224\u65ad': {
+							data: { imgList: ['test'] },
+						},
+					},
+				],
+				output: 'test',
+			},
+		],
+	},
+	{
+		expression: '={{ $json["phone"] ?? 0}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ phone: 'test' }],
+				output: 'test',
+			},
+			{
+				type: 'evaluation',
+				input: [{ phone: null }],
+				output: 0,
+			},
+			{
+				type: 'evaluation',
+				input: [{}],
+				output: 0,
+			},
+			{
+				type: 'evaluation',
+				input: [],
+				output: undefined,
+			},
+		],
+	},
+	{
+		expression:
+			"={{$json['Webhook1'].json[\"headers\"][\"x-api-key\"] +'-'+ new String('test').toString()}}",
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ Webhook1: { json: { headers: { 'x-api-key': 'left' } } } }],
+				output: 'left-test',
+			},
+		],
+	},
+	{
+		expression:
+			'={{$json[\'Webhook1\'].json["headers"]["x-api-key"] +\'-\'+ parseInt($json.test)}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ Webhook1: { json: { headers: { 'x-api-key': 'left' } } }, test: 3 }],
+				output: 'left-3',
+			},
+		],
+	},
+	{
+		expression: '={{ [].concat($json["Create or update"].json["vid"]) }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ 'Create or update': { json: { vid: [1, 2, 3] } } }],
+				output: [1, 2, 3],
+			},
+		],
+	},
+	{
+		expression: '=https://example.com/test?id={{$json["Crypto"].json["data"].substr(0,6)}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ Crypto: { json: { data: 'testtest' } } }],
+				output: 'https://example.com/test?id=testte',
+			},
+		],
+	},
+	{
+		expression: '={{ $json["body"]["project"]["name"].match(/\\[(\\d+)]/)[1] }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ body: { project: { name: 'test[1234]' } } }],
+				output: '1234',
+			},
+		],
+	},
+	{
+		expression:
+			'={{(new Date($json["end"]["date"]).getTime() - new Date($json["start"]["date"]).getTime()) / (1000 * 3600 * 24)}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [
+					{
+						start: { date: '2023-02-09T13:22:54.187Z' },
+						end: { date: '2023-02-13T13:22:54.187Z' },
+					},
+				],
+				output: 4,
+			},
+		],
+	},
+	{
+		expression:
+			'={{ $json["projectName"] == "" ? "Project Group " + ($json["projectsCount"] + 1) : $json["projectName"] }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ projectName: '', projectsCount: 3 }],
+				output: 'Project Group 4',
+			},
+			{
+				type: 'evaluation',
+				input: [{ projectName: 'Project Test', projectsCount: 3 }],
+				output: 'Project Test',
+			},
+		],
+	},
+	{
+		expression: '={{new Date($json["created_at"]).toISOString()}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ created_at: '2023-02-09T13:22:54.187Z' }],
+				output: '2023-02-09T13:22:54.187Z',
+			},
+		],
+	},
+	{
+		expression: '={{$json["Find by ID1"].json["fields"]["clicks"]+1}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ 'Find by ID1': { json: { fields: { clicks: 8 } } } }],
+				output: 9,
+			},
+		],
+	},
+	{
+		expression:
+			'={{ (parseFloat($json["Bid"].replace(\',\', \'.\')) * parseFloat($json["Baserow"].json["Count"])).toFixed(2) }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ Bid: '3,80', Baserow: { json: { Count: '10' } } }],
+				output: '38.00',
+			},
+		],
+	},
+	{
+		expression:
+			'={\n\t"article": {\n\t\t"title": "{{$json["body"]["entry"]["Title"]}}",\n\t\t"published": true,\n\t\t"article_markdown": "{{$json["body"]["entry"]["PostContent"]}}",\n\t\t"tags":["{{$json["body"]["entry"]["Tag"]}}"]\n\t}\n}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [
+					{ body: { entry: { Title: 'title', PostContent: 'test contents', Tag: 'testTag' } } },
+				],
+				output: `{
+	"article": {
+		"title": "title",
+		"published": true,
+		"article_markdown": "test contents",
+		"tags":["testTag"]
+	}
+}`,
+			},
+		],
+	},
+	{
+		expression:
+			'={{$json["Find by ID"].json["id"] != "" && $json["Find by ID"].json["id"] != null && $json["Find by ID"].json["id"] != undefined}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ 'Find by ID': { json: { id: 'test' } } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ 'Find by ID': { json: { id: '' } } }],
+				output: false,
+			},
+			{
+				type: 'evaluation',
+				input: [{ 'Find by ID': { json: { id: null } } }],
+				output: false,
+			},
+			{
+				type: 'evaluation',
+				input: [{ 'Find by ID': { json: {} } }],
+				output: false,
+			},
+		],
+	},
+	{
+		expression: '={{$json["HTTP Request"].json["paging"] ? true : false}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ 'HTTP Request': { json: { paging: 'test' } } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ 'HTTP Request': { json: {} } }],
+				output: false,
+			},
+		],
+	},
+	{
+		expression: '={{Math.min(1, 2);}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: 1,
+			},
+		],
+	},
+	{
+		expression: '={{ !!$json["different"]["name"] || !!$json["different"]["phone"] }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ different: { name: 'test' } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ different: { phone: 'test' } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ different: {} }],
+				output: false,
+			},
+			{
+				type: 'evaluation',
+				input: [{ different: { phone: 'test', name: 'test2' } }],
+				output: true,
+			},
+		],
+	},
+	{
+		expression: '={{200}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: 200,
+			},
+		],
+	},
+	{
+		expression: '={{$json.assetValue * $json.value / 100}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ assetValue: 50, value: 50 }],
+				output: 25,
+			},
+		],
+	},
+	{
+		expression: '={{/^\\d+$/.test($json["search_term"])}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ search_term: '1234' }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ search_term: 'asdf' }],
+				output: false,
+			},
+		],
+	},
+	{
+		expression: '={{ `test\nvalue\nmulti\nline` }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: `test
+value
+multi
+line`,
+			},
+		],
+	},
+	{
+		expression: '={{ { "data": $json.body.choices } }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ body: { choices: 'testValue' } }],
+				output: { data: 'testValue' },
+			},
+		],
+	},
+	{
+		expression: '={{ $json["data"]["errors"] && $json["data"]["errors"].length > 0 }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ data: { errors: [1, 2, 3, 4] } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: { errors: [] } }],
+				output: false,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: {} }],
+				output: undefined,
+			},
+		],
+	},
+	{
+		expression: '={{asdas}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: undefined,
+			},
+			{
+				type: 'evaluation',
+				input: [{ asdas: 1 }],
+				output: undefined,
+			},
+		],
+	},
+	{
+		expression: '={{!!$json["data"]["errors"]}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ data: { errors: [] } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: {} }],
+				output: false,
+			},
+		],
+	},
+	{
+		expression: '=TRUE',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: 'TRUE',
+			},
+		],
+	},
+	{
+		expression: '={{ !$json?.data?.data?.issues?.pageInfo?.hasNextPage }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ data: { data: { issues: { pageInfo: { hasNextPage: true } } } } }],
+				output: false,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: { data: { issues: { pageInfo: { hasNextPage: false } } } } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: { data: { issues: { pageInfo: {} } } } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: { data: { issues: {} } } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: { data: {} } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ data: {} }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{}],
+				output: true,
+			},
+		],
+	},
+	{
+		expression: "={{ [{'name': 'something', 'batch_size':1000, 'ignore_cols':['x']}] }}",
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: [{ name: 'something', batch_size: 1000, ignore_cols: ['x'] }],
+			},
+		],
+	},
+	{
+		expression: '={{typeof $json["person"].json["name"] != "undefined"}}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ person: { json: { name: 'test' } } }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ person: { json: {} } }],
+				output: false,
+			},
+		],
+	},
+	{
+		expression: "={{ $json?.data == undefined ? '' : $json.data }}",
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ data: 1 }],
+				output: 1,
+			},
+			{
+				type: 'evaluation',
+				input: [{}],
+				output: '',
+			},
+		],
+	},
+	{
+		expression: "={{ 'domain' in $json && $json.domain != null}}",
+		tests: [
+			{
+				type: 'evaluation',
+				input: [{ domain: 1 }],
+				output: true,
+			},
+			{
+				type: 'evaluation',
+				input: [{ domain: null }],
+				output: false,
+			},
+			{
+				type: 'evaluation',
+				input: [{}],
+				output: false,
+			},
+		],
+	},
+	{
+		expression: '={{ String("testing").length }}',
+		tests: [
+			{
+				type: 'evaluation',
+				input: [],
+				output: 7,
+			},
+		],
+	},
+];

From b641a3e36dc62d3d672409c6a01abf19e728269c Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 10 Feb 2023 11:57:54 +0200
Subject: [PATCH 168/358] test(Compare Datasets Node): Unit tests
 (no-changelog)

---
 .../test/node/CompareDatasets.test.ts         |    5 +
 .../node/workflow.compareDatasets.fuzzy.json  | 1054 +++++++++++++++++
 .../test/node/workflow.compareDatasets.json   |  879 ++++++++++++++
 3 files changed, 1938 insertions(+)
 create mode 100644 packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts
 create mode 100644 packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.fuzzy.json
 create mode 100644 packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.json

diff --git a/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts b/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts
new file mode 100644
index 00000000000000..80c545b7952721
--- /dev/null
+++ b/packages/nodes-base/nodes/CompareDatasets/test/node/CompareDatasets.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Compare Datasets Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.fuzzy.json b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.fuzzy.json
new file mode 100644
index 00000000000000..f3d24a243e03b2
--- /dev/null
+++ b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.fuzzy.json
@@ -0,0 +1,1054 @@
+{
+	"name": "compare datasets fuzzy search",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "0600a6c9-83c5-4bb8-a2ee-d763406b2f9f",
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [160, 2200]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: '1',\n    data: [1,2,3],\n  },\n  {\n    id: 2,\n    data: 25,\n  },\n  {\n    id: 3,\n    data: true,\n  },\n  {\n    id: 4,\n    data: false,\n  },\n  {\n    id: '5',\n    data: true,\n  },\n  {\n    id: 6,\n    data: null,\n  },\n  {\n    id: 7,\n    data: '',\n  },\n  {\n    id: '8',\n    data: [],\n  },\n];"
+			},
+			"id": "a9204c1d-11da-4f54-9a52-82992815e893",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 300]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: \"[1,2,3]\",\n  },\n  {\n    id: 2,\n    data: '25',\n  },\n  {\n    id: 3,\n    data: 'tRuE',\n  },\n  {\n    id: 4,\n    data: 'FalsE',\n  },\n  {\n    id: 5,\n    data: 1,\n  },\n  {\n    id: 6,\n    data: [],\n  },\n  {\n    id: 7,\n    data: null,\n  },\n  {\n    id: 8,\n    data: '',\n  },\n];"
+			},
+			"id": "839119da-4372-442d-8ba6-7d57b53b7825",
+			"name": "Code1",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 500]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"resolve": "preferInput1",
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "c950a588-900b-4eba-a94b-566e27a5f5b6",
+			"name": "Compare Datasets",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [940, 260]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "b4886a20-3c69-4233-a66b-91ed19693647",
+			"name": "Compare Datasets1",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [940, 540]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: [1,2,3],\n  },\n  {\n    id: 2,\n    data: '[\"a\", \"b\", \"c\"]',\n  },\n  {\n    id: 3,\n    data: [],\n  },\n];"
+			},
+			"id": "f0a7fbcf-226a-4b19-a946-5a0d8480bbb8",
+			"name": "Code2",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 680]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: '1',\n    data: \"[1,2,3]\",\n  },\n  {\n    id: 2,\n    data: ['a', 'b', 'c'],\n  },\n  {\n    id: 3,\n    data: \"[]\",\n  },\n];"
+			},
+			"id": "9d510249-3eff-4264-8f93-1959480fd100",
+			"name": "Code3",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 880]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "80782eeb-bf05-402a-a169-a44d32e189d9",
+			"name": "Compare Datasets2",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [920, 800]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: 25.36,\n  },\n  {\n    id: 2,\n    data: 2500,\n  },\n  {\n    id: 3,\n    data: 0.894,\n  },\n  {\n    id: 4,\n    data: 42,\n  },\n];"
+			},
+			"id": "eb4e5ee5-5f9e-413e-bd80-11d75bff9f90",
+			"name": "Code4",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [620, 1100]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: '25.36',\n  },\n  {\n    id: 2,\n    data: '2500',\n  },\n  {\n    id: 3,\n    data: '0.894',\n  },\n  {\n    id: 4,\n    data: 'forty two',\n  },\n];"
+			},
+			"id": "28d3f7f4-abba-4523-9b5b-1bcf47d6dbec",
+			"name": "Code5",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [620, 1300]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"resolve": "includeBoth",
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "661c9b3e-f5c7-41a2-9f48-4e2648c657d4",
+			"name": "Compare Datasets3",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [900, 1180]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: \"TRUE\",\n  },\n  {\n    id: 2,\n    data: false,\n  },\n  {\n    id: 3,\n    data: 1,\n  },\n  {\n    id: 4,\n    data: false,\n  },\n  {\n    id: '5',\n    data: true,\n  },\n  {\n    id: 6,\n    data: '0',\n  },\n];"
+			},
+			"id": "bf4f3286-db11-4075-a10a-6c19b60ef8cf",
+			"name": "Code6",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [620, 1480]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: true,\n  },\n  {\n    id: 2,\n    data: 'False',\n  },\n  {\n    id: 3,\n    data: true,\n  },\n  {\n    id: 4,\n    data: 0,\n  },\n  {\n    id: '5',\n    data: '1',\n  },\n  {\n    id: 6,\n    data: false,\n  },\n];"
+			},
+			"id": "731b6fc7-0a57-449e-b9c4-54f1feeec9be",
+			"name": "Code7",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [620, 1680]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "72fcf699-62b7-42c6-b6a8-4c8af514eaa7",
+			"name": "Compare Datasets4",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [880, 1580]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: '1',\n    data: null,\n  },\n  {\n    id: 2,\n    data: null,\n  },\n  {\n    id: 3,\n    data: null,\n  },\n  {\n    id: 4,\n    data: [],\n  },\n  {\n    id: '5',\n    data: '',\n  },\n  {\n    id: 6,\n    data: '',\n  },\n  {\n    id: 7,\n    data: [],\n  },\n];"
+			},
+			"id": "f75820ed-4f8f-49b7-af25-3bbd0691eafd",
+			"name": "Code8",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [620, 1860]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: '1',\n    data: '',\n  },\n  {\n    id: 2,\n    data: [],\n  },\n  {\n    id: 3,\n    data: null,\n  },\n  {\n    id: 4,\n    data: '',\n  },\n  {\n    id: '5',\n    data: [],\n  },\n  {\n    id: 6,\n    data: '',\n  },\n  {\n    id: 7,\n    data: [],\n  },\n];"
+			},
+			"id": "abe98ef5-0b3a-4e06-8a5d-f0554e42cf33",
+			"name": "Code9",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [620, 2060]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "0f86d545-5612-4743-8d18-593e95b1b95d",
+			"name": "Compare Datasets5",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [880, 1960]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: {foo: 'foo', bar: 'bar'},\n  },\n  {\n    id: 2,\n    data: '{\"foo\": \"foo\", \"bar\": \"bar\"}',\n  },\n  {\n    id: 3,\n    data: {},\n  },\n];"
+			},
+			"id": "c516813c-a5c7-464e-887b-447e5177c137",
+			"name": "Code10",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 2440]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 2,\n    data: {foo: 'foo', bar: 'bar'},\n  },\n  {\n    id: 1,\n    data: '{\"foo\": \"foo\", \"bar\": \"bar\"}',\n  },\n  {\n    id: 3,\n    data: \"{}\",\n  },\n];"
+			},
+			"id": "a0986a04-da68-47e7-9a06-f7abf83604c8",
+			"name": "Code11",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 2640]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"resolve": "includeBoth",
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "a60fd8e1-962e-40e9-b00d-847ef424f2be",
+			"name": "Compare Datasets6",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [920, 2560]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: \"2019-08-30T22:54:40.273Z\",\n  },\n  {\n    id: 2,\n    data: '{\"foo\": \"foo\", \"bar\": \"bar\"}',\n  },\n  {\n    id: 3,\n    data: {},\n  },\n];"
+			},
+			"id": "80c1f595-9d0e-4df9-b927-4b1459e217c1",
+			"name": "Code12",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 2860]
+		},
+		{
+			"parameters": {
+				"jsCode": "return [\n  {\n    id: 1,\n    data: 'Sat Aug 31 2019 01:54:40 GMT+0300 (Eastern European Summer Time)',\n  },\n  {\n    id: 2,\n    data: '{\"foo\": \"foo\", \"bar\": \"bar\"}',\n  },\n  {\n    id: 3,\n    data: \"{}\",\n  },\n];"
+			},
+			"id": "d9764a14-2b8b-4a12-ad06-8a4f09685e62",
+			"name": "Code13",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [640, 3060]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"resolve": "includeBoth",
+				"options": {
+					"fuzzyCompare": true
+				}
+			},
+			"id": "e7c46e07-4f65-4ba8-8435-2b8284567bdd",
+			"name": "Compare Datasets7",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [920, 2980]
+		},
+		{
+			"parameters": {},
+			"id": "7a8fd2b3-a55e-43a0-af3d-5621b42bbd06",
+			"name": "No Operation, do nothing",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1200, 200]
+		},
+		{
+			"parameters": {},
+			"id": "cfe4cf23-3329-4c7d-89f1-9e358eba9265",
+			"name": "No Operation, do nothing1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 480]
+		},
+		{
+			"parameters": {},
+			"id": "4b55d3ee-ada6-4b72-beee-f9c5bbf8531b",
+			"name": "No Operation, do nothing2",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 680]
+		},
+		{
+			"parameters": {},
+			"id": "b55e855b-ad71-439b-aa76-f0cb38b137d1",
+			"name": "No Operation, do nothing3",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1200, 1020]
+		},
+		{
+			"parameters": {},
+			"id": "a64cbf1e-3701-498e-b4a7-47353f15d602",
+			"name": "No Operation, do nothing4",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1200, 1260]
+		},
+		{
+			"parameters": {},
+			"id": "52b6b2e2-c8f6-4b22-a469-da437d092a5a",
+			"name": "No Operation, do nothing5",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1160, 1520]
+		},
+		{
+			"parameters": {},
+			"id": "dca4c5e9-db21-4cf3-8de4-9b9e32166ae1",
+			"name": "No Operation, do nothing6",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1140, 1860]
+		},
+		{
+			"parameters": {},
+			"id": "ee8d917b-a338-468c-9cc0-fdfbf6a76445",
+			"name": "No Operation, do nothing7",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1180, 2440]
+		},
+		{
+			"parameters": {},
+			"id": "95d18d83-79e8-427b-8745-55e2256cb7f5",
+			"name": "No Operation, do nothing8",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 2900]
+		},
+		{
+			"parameters": {},
+			"id": "e191ba81-bd88-4962-bd13-36ffd752336d",
+			"name": "No Operation, do nothing9",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [1220, 3100]
+		}
+	],
+	"pinData": {
+		"No Operation, do nothing9": [
+			{
+				"json": {
+					"keys": {
+						"id": 1
+					},
+					"same": {
+						"id": 1
+					},
+					"different": {
+						"data": {
+							"input1": "2019-08-30T22:54:40.273Z",
+							"input2": "Sat Aug 31 2019 01:54:40 GMT+0300 (Eastern European Summer Time)"
+						}
+					}
+				}
+			}
+		],
+		"No Operation, do nothing8": [
+			{
+				"json": {
+					"id": 2,
+					"data": "{\"foo\": \"foo\", \"bar\": \"bar\"}"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": {}
+				}
+			}
+		],
+		"No Operation, do nothing7": [
+			{
+				"json": {
+					"id": 1,
+					"data": {
+						"foo": "foo",
+						"bar": "bar"
+					}
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "{\"foo\": \"foo\", \"bar\": \"bar\"}"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": {}
+				}
+			}
+		],
+		"No Operation, do nothing6": [
+			{
+				"json": {
+					"id": "1",
+					"data": ""
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": []
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": null
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"data": ""
+				}
+			},
+			{
+				"json": {
+					"id": "5",
+					"data": []
+				}
+			},
+			{
+				"json": {
+					"id": 6,
+					"data": ""
+				}
+			},
+			{
+				"json": {
+					"id": 7,
+					"data": []
+				}
+			}
+		],
+		"No Operation, do nothing5": [
+			{
+				"json": {
+					"id": 1,
+					"data": true
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "False"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": true
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"data": 0
+				}
+			},
+			{
+				"json": {
+					"id": "5",
+					"data": "1"
+				}
+			},
+			{
+				"json": {
+					"id": 6,
+					"data": false
+				}
+			}
+		],
+		"No Operation, do nothing4": [
+			{
+				"json": {
+					"keys": {
+						"id": 4
+					},
+					"same": {
+						"id": 4
+					},
+					"different": {
+						"data": {
+							"input1": 42,
+							"input2": "forty two"
+						}
+					}
+				}
+			}
+		],
+		"No Operation, do nothing3": [
+			{
+				"json": {
+					"id": 1,
+					"data": 25.36
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": 2500
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": 0.894
+				}
+			}
+		],
+		"No Operation, do nothing2": [
+			{
+				"json": {
+					"id": "1",
+					"data": "[1,2,3]"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": ["a", "b", "c"]
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": "[]"
+				}
+			}
+		],
+		"No Operation, do nothing1": [
+			{
+				"json": {
+					"id": 1,
+					"data": "[1,2,3]"
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": "25"
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": "tRuE"
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"data": "FalsE"
+				}
+			},
+			{
+				"json": {
+					"id": 5,
+					"data": 1
+				}
+			},
+			{
+				"json": {
+					"id": 6,
+					"data": []
+				}
+			},
+			{
+				"json": {
+					"id": 7,
+					"data": null
+				}
+			},
+			{
+				"json": {
+					"id": 8,
+					"data": ""
+				}
+			}
+		],
+		"No Operation, do nothing": [
+			{
+				"json": {
+					"id": "1",
+					"data": [1, 2, 3]
+				}
+			},
+			{
+				"json": {
+					"id": 2,
+					"data": 25
+				}
+			},
+			{
+				"json": {
+					"id": 3,
+					"data": true
+				}
+			},
+			{
+				"json": {
+					"id": 4,
+					"data": false
+				}
+			},
+			{
+				"json": {
+					"id": "5",
+					"data": true
+				}
+			},
+			{
+				"json": {
+					"id": 6,
+					"data": null
+				}
+			},
+			{
+				"json": {
+					"id": 7,
+					"data": ""
+				}
+			},
+			{
+				"json": {
+					"id": "8",
+					"data": []
+				}
+			}
+		]
+	},
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Code3",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code4",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code5",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code6",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code7",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code8",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code9",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code10",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code11",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code12",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Code13",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code1": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets",
+						"type": "main",
+						"index": 1
+					},
+					{
+						"node": "Compare Datasets1",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Compare Datasets1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code2": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code3": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets2",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Code4": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code5": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets3",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Code6": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code7": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets4",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Code8": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code9": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets5",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Code10": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code11": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets6",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Code12": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code13": {
+			"main": [
+				[
+					{
+						"node": "Compare Datasets7",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Compare Datasets": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets1": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets2": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets3": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing3",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "No Operation, do nothing4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets4": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing5",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets5": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing6",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets6": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare Datasets7": {
+			"main": [
+				[],
+				[
+					{
+						"node": "No Operation, do nothing8",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "No Operation, do nothing9",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "66b1e26d-0897-4c70-8eac-0f7bc0536214",
+	"id": "85",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.json b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.json
new file mode 100644
index 00000000000000..18ebdcc8b5d11a
--- /dev/null
+++ b/packages/nodes-base/nodes/CompareDatasets/test/node/workflow.compareDatasets.json
@@ -0,0 +1,879 @@
+{
+	"name": "compare datasets tests",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "c8767bae-66ba-495c-9d2c-4b0cc192ea22",
+			"name": "Start",
+			"type": "n8n-nodes-base.start",
+			"typeVersion": 1,
+			"position": [-1020, 1640]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						},
+						{
+							"field1": "text",
+							"field2": "text"
+						}
+					]
+				},
+				"options": {
+					"multipleMatches": "first"
+				}
+			},
+			"id": "80490760-2b76-4e22-977d-6c5142a5ec99",
+			"name": "Compare",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [180, 680]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: 1,\n    text: 'foo',\n    data: 'A',\n    data2: 555,\n    memo: 'test',\n  },\n  {\n    id: 2,\n    text: 'bar bar',\n    data: 'E',\n  },\n  {\n    id: 3,\n    text: 'spam',\n    data: 'C',\n  },\n    {\n    id: 4,\n    text: 'not matched',\n    data: 'Y',\n  },\n];\n\nreturn data;"
+			},
+			"id": "3f4b329b-9d7f-475b-815a-5bb7abfae247",
+			"name": "Function",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-100, 600]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: 1,\n    text: 'foo',\n    data: 'D',\n    data3: 111,\n    memo: 'test'\n  },\n    {\n    id: 1,\n    text: 'foo',\n    data: 'DD',\n  },\n  {\n    id: 2,\n    text: 'bar bar',\n    data: 'E',\n  },\n  {\n    id: 3,\n    text: 'spam',\n    data: 'F',\n  },\n  {\n    id: 5,\n    text: 'spam',\n    data: 'X',\n  },\n];\n\nreturn data;"
+			},
+			"id": "a91e7fe8-b9fb-417f-a434-c15623246c99",
+			"name": "Function1",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-100, 760]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (!(items.length === 2) && items.filter(({json}) => json.text === 'foo' || 'spam').length !== 2) {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "bef942a0-21f4-469d-b019-e528140d9686",
+			"name": "Function2",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [440, 900]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (!(items.length === 1) && items[0].json.data !== 'Y') {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "29b9aa7a-4d1f-442d-9487-7f46e0cba1fe",
+			"name": "Function3",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [440, 440]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (!(items.length === 1) && items[0].json.data !== 'E') {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "5669e2d2-6cfe-4df2-9513-3871df1fb7f1",
+			"name": "Function4",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [440, 580]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (!(items.length === 2) && items.filter(({json}) => json.text === 'foo' || 'spam').length !== 2) {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "4f7c534d-da1d-4947-8deb-9736c83e8956",
+			"name": "Function5",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [440, 740]
+		},
+		{
+			"parameters": {},
+			"id": "916d4bb7-066f-41cb-9a4b-c4ce34643923",
+			"name": "first match only by id and text",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-340, 680]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id",
+							"field2": "id"
+						}
+					]
+				},
+				"resolve": "includeBoth",
+				"options": {
+					"multipleMatches": "all"
+				}
+			},
+			"id": "ecb9384d-79b2-4ea8-9a44-a1bb9064311d",
+			"name": "Compare1",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [160, 1340]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: 1,\n    data: 'A',\n  },\n  {\n    id: 2,\n    data: 'B',\n  },\n  {\n    id: 3,\n    data: 'C',\n  },\n];\n\nreturn data;"
+			},
+			"id": "d218a3b7-1f10-42d8-be27-155f15682855",
+			"name": "Function6",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-120, 1260]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: 1,\n    data: 'D',\n  },\n  {\n    id: 1,\n    data: 'DD',\n  },\n  {\n    id: 2,\n    data: 'E',\n  },\n  {\n    id: 2,\n    data: 'EE',\n  },\n  {\n    id: 3,\n    data: 'F',\n  },\n    {\n    id: 3,\n    data: 'FF',\n  },\n  {\n    id: 5,\n    data: 'X',\n  },\n];\n\nreturn data;"
+			},
+			"id": "7d8e9189-b8e7-4893-96ac-05533d846503",
+			"name": "Function7",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-120, 1420]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (\n  items.filter(({json}) => json.id === 5).length !== 1 \n) {\n  throw new Error('Incorrect data');\n}\n\n\nreturn {success: true};"
+			},
+			"id": "d030711e-4627-456d-936a-5fa433719b77",
+			"name": "Function8",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [540, 1440]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (\n  items.filter(({json}) => json.keys.id === 1).length !== 2 &&\n  items.filter(({json}) => json.keys.id === 2).length !== 2 &&\n  items.filter(({json}) => json.keys.id === 3).length !== 2\n) {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "c2033b2a-7046-411a-8a8f-8ed8b46a97e3",
+			"name": "Function11",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [540, 1280]
+		},
+		{
+			"parameters": {},
+			"id": "d762ad62-1101-4ef4-912c-d1c6f5dc62fc",
+			"name": "all match by id",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-360, 1340]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id.code",
+							"field2": "id.code"
+						}
+					]
+				},
+				"resolve": "mix",
+				"exceptWhenMix": "data",
+				"options": {
+					"multipleMatches": "all"
+				}
+			},
+			"id": "f9e2ccd7-ca40-400a-85eb-32c75169519c",
+			"name": "Compare2",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [160, 1980]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: {code: 1},\n    data: 'A',\n  },\n  {\n    id: {code: 2},\n    data: 'B',\n  },\n  {\n    id: {code: 3},\n    data: 'C',\n  },\n  {\n    id: {code: 4},\n    data: 'AA',\n  },\n];\n\nreturn data;"
+			},
+			"id": "e70cc695-01f5-456c-bdef-bcd85f4c90db",
+			"name": "Function12",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-120, 1900]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: {code: 1},\n    data: 'A',\n  },\n  {\n    id: {code: 2},\n    data: 'E',\n  },\n  {\n    id: {code: 3},\n    data: 'F',\n  },\n    {\n    id: {code: 5},\n    data: 'EE',\n  },\n];\n\nreturn data;"
+			},
+			"id": "ae9aea77-57b4-4b5a-bb1f-cedda223a357",
+			"name": "Function13",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-120, 2060]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id.code",
+							"field2": "id.code"
+						}
+					]
+				},
+				"resolve": "includeBoth",
+				"options": {}
+			},
+			"id": "83c6ebd3-dbf3-4175-bf04-313ef47b359e",
+			"name": "Compare3",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [160, 2480],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: {code: 1},\n    data: 'A',\n  },\n  {\n    id: {code: 2},\n    data: 'B',\n  },\n  {\n    id: {code: 3},\n    data: 'C',\n  },\n   {\n    'id.code': 'AAA',\n  },\n];\n\nreturn data;"
+			},
+			"id": "91d3256e-dda8-4d8f-9796-f2ab5c5e6372",
+			"name": "Function18",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-100, 2400]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: {code: 1},\n    data: 'D',\n  },\n  {\n    id: {code: 2},\n    data: 'E',\n  },\n  {\n    id: {code: 3},\n    data: 'F',\n  },\n  {\n    'id.code': 'AAA',\n  },\n];\n\nreturn data;"
+			},
+			"id": "36651bfd-6835-429a-b6f6-eb2cf4ab0178",
+			"name": "Function19",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-100, 2560]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items[0].json.data !== 'EE') {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "b1929edc-cecb-4e0e-9698-e2210df4d839",
+			"name": "Function14",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [420, 2240]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items[0].json.data !== 'AA') {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "ffa2e4be-a352-466d-90fd-6be7be8df2c4",
+			"name": "Function15",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [420, 1780]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items[0].json.data !== 'A') {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "3f1d1ed6-06ac-43d8-85f8-e290fd3ffbca",
+			"name": "Function16",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [420, 1920]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items.filter(({json}) => json.data === 'E').length !== 1 && items.filter(({json}) => json.data === 'F').length !== 1) {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "6a0501c1-922f-48a4-813b-64106da3c988",
+			"name": "Function17",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [420, 2080]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (!(items.length === 3)) {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "10ce1673-eb0d-4794-a104-05abf0240a8e",
+			"name": "Function20",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [440, 2560]
+		},
+		{
+			"parameters": {},
+			"id": "57138e79-dad4-43c4-b805-9e1cda72cb76",
+			"name": "matching by dot notation",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-340, 2480]
+		},
+		{
+			"parameters": {},
+			"id": "ea46b0bd-bd94-453d-b64e-1574c31fdac4",
+			"name": "matches mix prefer input 1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-360, 1980]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items[0].json['id.code'] !== 'AAA') {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "55362767-c887-4f31-9a23-fd171869e19f",
+			"name": "Function21",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [440, 2420]
+		},
+		{
+			"parameters": {
+				"mergeByFields": {
+					"values": [
+						{
+							"field1": "id.code",
+							"field2": "id.code"
+						}
+					]
+				},
+				"resolve": "includeBoth",
+				"options": {
+					"disableDotNotation": true
+				}
+			},
+			"id": "542ad5ce-31e7-4a26-b561-757a0fa500c9",
+			"name": "Compare4",
+			"type": "n8n-nodes-base.compareDatasets",
+			"typeVersion": 1,
+			"position": [180, 2860],
+			"continueOnFail": true
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: {code: 1},\n    data: 'A',\n  },\n  {\n    id: {code: 2},\n    data: 'B',\n  },\n  {\n    id: {code: 3},\n    data: 'C',\n  },\n   {\n    'id.code': 'AAA',\n  },\n];\n\nreturn data;"
+			},
+			"id": "8563aa7c-3e6c-47ba-999b-1fee0489a647",
+			"name": "Function22",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-80, 2780]
+		},
+		{
+			"parameters": {
+				"functionCode": "const data = [\n  {\n    id: {code: 1},\n    data: 'D',\n  },\n  {\n    id: {code: 2},\n    data: 'E',\n  },\n  {\n    id: {code: 3},\n    data: 'F',\n  },\n  {\n    'id.code': 'AAA',\n  },\n];\n\nreturn data;"
+			},
+			"id": "e5dc38cb-c5c3-4ae2-8bb4-5b1ef74c0a3f",
+			"name": "Function23",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [-80, 2940]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items.length !== 3) {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "7739d61b-f62b-47ad-81b5-5fb38b919e01",
+			"name": "Function24",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [460, 3020]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items[0].json['id.code'] !== 'AAA') {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "805f2f3d-51e7-45ad-94d3-ebb9a1c47964",
+			"name": "Function25",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [460, 2880]
+		},
+		{
+			"parameters": {
+				"functionCode": "if (items.length !== 3) {\n  throw new Error('Incorrect data');\n}\n\nreturn {success: true};"
+			},
+			"id": "b82d6133-783d-4777-818d-dbcbe3a82042",
+			"name": "Function26",
+			"type": "n8n-nodes-base.function",
+			"typeVersion": 1,
+			"position": [460, 2740]
+		},
+		{
+			"parameters": {},
+			"id": "1ba0048e-e032-4f6a-903c-3aaf0598f191",
+			"name": "disabled dot notation1",
+			"type": "n8n-nodes-base.noOp",
+			"typeVersion": 1,
+			"position": [-320, 2860]
+		}
+	],
+	"pinData": {
+		"Function3": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function4": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function5": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function2": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function11": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function8": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function15": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function16": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function17": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function14": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function21": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function20": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function26": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function25": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		],
+		"Function24": [
+			{
+				"json": {
+					"success": true
+				}
+			}
+		]
+	},
+	"connections": {
+		"Function": {
+			"main": [
+				[
+					{
+						"node": "Compare",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function1": {
+			"main": [
+				[
+					{
+						"node": "Compare",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Compare": {
+			"main": [
+				[
+					{
+						"node": "Function3",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function4",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function5",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"first match only by id and text": {
+			"main": [
+				[
+					{
+						"node": "Function",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Function1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare1": {
+			"main": [
+				[],
+				[],
+				[
+					{
+						"node": "Function11",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function8",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function6": {
+			"main": [
+				[
+					{
+						"node": "Compare1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function7": {
+			"main": [
+				[
+					{
+						"node": "Compare1",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"all match by id": {
+			"main": [
+				[
+					{
+						"node": "Function6",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Function7",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare2": {
+			"main": [
+				[
+					{
+						"node": "Function15",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function16",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function17",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function14",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function12": {
+			"main": [
+				[
+					{
+						"node": "Compare2",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function13": {
+			"main": [
+				[
+					{
+						"node": "Compare2",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Function18": {
+			"main": [
+				[
+					{
+						"node": "Compare3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function19": {
+			"main": [
+				[
+					{
+						"node": "Compare3",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"Compare3": {
+			"main": [
+				[],
+				[
+					{
+						"node": "Function21",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function20",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Start": {
+			"main": [
+				[
+					{
+						"node": "first match only by id and text",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "all match by id",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "matches mix prefer input 1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "matching by dot notation",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "disabled dot notation1",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"matching by dot notation": {
+			"main": [
+				[
+					{
+						"node": "Function18",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Function19",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"matches mix prefer input 1": {
+			"main": [
+				[
+					{
+						"node": "Function12",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Function13",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Compare4": {
+			"main": [
+				[
+					{
+						"node": "Function26",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[
+					{
+						"node": "Function25",
+						"type": "main",
+						"index": 0
+					}
+				],
+				[],
+				[
+					{
+						"node": "Function24",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function22": {
+			"main": [
+				[
+					{
+						"node": "Compare4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Function23": {
+			"main": [
+				[
+					{
+						"node": "Compare4",
+						"type": "main",
+						"index": 1
+					}
+				]
+			]
+		},
+		"disabled dot notation1": {
+			"main": [
+				[
+					{
+						"node": "Function22",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Function23",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "7169a2ae-a8dd-47a1-8339-8ca7554587a9",
+	"id": "114",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}

From 649c7ccfb178546140d87ad914076b659a9d802b Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 10 Feb 2023 12:30:37 +0200
Subject: [PATCH 169/358] test(Markdown Node): Unit tests (no-changelog)

---
 .../nodes/Markdown/test/node/Markdown.test.ts |   5 +
 .../Markdown/test/node/workflow.markdown.json | 181 ++++++++++++++++++
 2 files changed, 186 insertions(+)
 create mode 100644 packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts
 create mode 100644 packages/nodes-base/nodes/Markdown/test/node/workflow.markdown.json

diff --git a/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts b/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts
new file mode 100644
index 00000000000000..5edd9dd6dd66d8
--- /dev/null
+++ b/packages/nodes-base/nodes/Markdown/test/node/Markdown.test.ts
@@ -0,0 +1,5 @@
+import { testWorkflows, getWorkflowFilenames } from '../../../../test/nodes/Helpers';
+
+const workflows = getWorkflowFilenames(__dirname);
+
+describe('Test Markdown Node', () => testWorkflows(workflows));
diff --git a/packages/nodes-base/nodes/Markdown/test/node/workflow.markdown.json b/packages/nodes-base/nodes/Markdown/test/node/workflow.markdown.json
new file mode 100644
index 00000000000000..2203186227c02f
--- /dev/null
+++ b/packages/nodes-base/nodes/Markdown/test/node/workflow.markdown.json
@@ -0,0 +1,181 @@
+{
+	"name": "Markdown report generation",
+	"nodes": [
+		{
+			"parameters": {},
+			"name": "On clicking 'execute'",
+			"type": "n8n-nodes-base.manualTrigger",
+			"position": [700, 420],
+			"typeVersion": 1,
+			"id": "bc5de3f0-e5f1-4fc0-ab50-ef91bada8b35"
+		},
+		{
+			"parameters": {
+				"html": "={{ $json.data }}",
+				"options": {}
+			},
+			"id": "01b5727e-79a2-4cc1-b52f-32ea1ba67a6f",
+			"name": "Markdown1",
+			"type": "n8n-nodes-base.markdown",
+			"typeVersion": 1,
+			"position": [1200, 420]
+		},
+		{
+			"parameters": {
+				"mode": "markdownToHtml",
+				"markdown": "={{ $json.data }}",
+				"options": {
+					"completeHTMLDocument": true
+				}
+			},
+			"id": "43950238-9726-403e-a17a-a9cab8089041",
+			"name": "Markdown",
+			"type": "n8n-nodes-base.markdown",
+			"typeVersion": 1,
+			"position": [1500, 700]
+		},
+		{
+			"parameters": {
+				"jsCode": "return {\n\"data\":\n`<!doctype html> <html> <head> <title>Example Domain</title> <meta charset=\"utf-8\" /> <meta http-equiv=\"Content-type\" content=\"text/html; charset=utf-8\" /> <meta name=\"viewport\" content=\"width=device-width, initial-scale=1\" /> <style type=\"text/css\"> body { background-color: #f0f0f2; margin: 0; padding: 0; font-family: -apple-system, system-ui, BlinkMacSystemFont, \"Segoe UI\", \"Open Sans\", \"Helvetica Neue\", Helvetica, Arial, sans-serif; } div { width: 600px; margin: 5em auto; padding: 2em; background-color: #fdfdff; border-radius: 0.5em; box-shadow: 2px 3px 7px 2px rgba(0,0,0,0.02); } a:link, a:visited { color: #38488f; text-decoration: none; } @media (max-width: 700px) { div { margin: 0 auto; width: auto; } } </style> </head> <body> <div> <h1>Example Domain</h1> <p>This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.</p> <p><a href=\"https://www.iana.org/domains/example\">More information...</a></p> </div> </body> </html>`\n};"
+			},
+			"id": "d1f890b1-c484-441f-be70-7b35959ba9b4",
+			"name": "Code",
+			"type": "n8n-nodes-base.code",
+			"typeVersion": 1,
+			"position": [940, 420]
+		},
+		{
+			"parameters": {
+				"html": "={{ $json.data }}",
+				"options": {
+					"ignore": "h1"
+				}
+			},
+			"id": "b9f9b71d-8b27-45a3-92cc-51e1138f688b",
+			"name": "Markdown2",
+			"type": "n8n-nodes-base.markdown",
+			"typeVersion": 1,
+			"position": [1200, 220]
+		},
+		{
+			"parameters": {
+				"html": "={{ $json.data }}",
+				"options": {
+					"textReplace": {
+						"values": [
+							{
+								"pattern": "Example Domain",
+								"replacement": "REPLACED"
+							}
+						]
+					}
+				}
+			},
+			"id": "9e1f3ade-067b-40b0-b702-be077e3ab653",
+			"name": "Markdown3",
+			"type": "n8n-nodes-base.markdown",
+			"typeVersion": 1,
+			"position": [1200, 20]
+		},
+		{
+			"parameters": {
+				"mode": "markdownToHtml",
+				"markdown": "={{ $json.data }}",
+				"options": {}
+			},
+			"id": "b7db1d99-8af5-404d-aa82-14690f879b4d",
+			"name": "Markdown4",
+			"type": "n8n-nodes-base.markdown",
+			"typeVersion": 1,
+			"position": [1500, 520]
+		}
+	],
+	"pinData": {
+		"Markdown3": [
+			{
+				"json": {
+					"data": " \n\n# REPLACED\n\nThis domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.\n\n[More information...](https://www.iana.org/domains/example)"
+				}
+			}
+		],
+		"Markdown2": [
+			{
+				"json": {
+					"data": " \n\n# Example Domain\n\nThis domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.\n\n[More information...](https://www.iana.org/domains/example)"
+				}
+			}
+		],
+		"Markdown4": [
+			{
+				"json": {
+					"data": "<h1 id=\"exampledomain\">Example Domain</h1>\n<p>This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.</p>\n<p><a href=\"https://www.iana.org/domains/example\">More information…</a></p>"
+				}
+			}
+		],
+		"Markdown": [
+			{
+				"json": {
+					"data": "<!DOCTYPE HTML>\n<html>\n<head>\n<meta charset=\"utf-8\">\n</head>\n<body>\n<h1 id=\"exampledomain\">Example Domain</h1>\n<p>This domain is for use in illustrative examples in documents. You may use this domain in literature without prior coordination or asking for permission.</p>\n<p><a href=\"https://www.iana.org/domains/example\">More information…</a></p>\n</body>\n</html>"
+				}
+			}
+		]
+	},
+	"connections": {
+		"On clicking 'execute'": {
+			"main": [
+				[
+					{
+						"node": "Code",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Markdown1": {
+			"main": [
+				[
+					{
+						"node": "Markdown",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Markdown4",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Code": {
+			"main": [
+				[
+					{
+						"node": "Markdown1",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Markdown2",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Markdown3",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "fadb0d9c-191d-461d-904c-5ce47763ae25",
+	"id": "115",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}

From 40879f67cb01786bc6f150e1dfd87a1596c9077e Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Fri, 10 Feb 2023 12:55:07 +0200
Subject: [PATCH 170/358] test(iCalendar Node): Unit tests (no-changelog)

---
 .../ICalendar/test/node/ICalendar.test.ts     | 72 +++++++++++++++++++
 .../test/node/workflow.iCalendar.json         | 59 +++++++++++++++
 2 files changed, 131 insertions(+)
 create mode 100644 packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
 create mode 100644 packages/nodes-base/nodes/ICalendar/test/node/workflow.iCalendar.json

diff --git a/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
new file mode 100644
index 00000000000000..1566c91b45fb36
--- /dev/null
+++ b/packages/nodes-base/nodes/ICalendar/test/node/ICalendar.test.ts
@@ -0,0 +1,72 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import type { WorkflowTestData } from '../../../../test/nodes/types';
+
+import {
+	getResultNodeData,
+	setup,
+	readJsonFileSync,
+	initBinaryDataManager,
+} from '../../../../test/nodes/Helpers';
+import { executeWorkflow } from '../../../../test/nodes/ExecuteWorkflow';
+
+describe('Execute iCalendar Node', () => {
+	beforeEach(async () => {
+		await initBinaryDataManager();
+	});
+	const workflowData = readJsonFileSync('nodes/ICalendar/test/node/workflow.iCalendar.json');
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'nodes/ICalendar/test/node/workflow.iCalendar.json',
+			input: {
+				workflowData,
+			},
+			output: {
+				nodeData: {
+					iCalendar: [
+						[
+							{
+								json: {},
+								binary: {
+									data: {
+										mimeType: 'text/calendar',
+										fileType: 'text',
+										fileExtension: 'ics',
+										data: 'QkVHSU46VkNBTEVOREFSDQpWRVJTSU9OOjIuMA0KQ0FMU0NBTEU6R1JFR09SSUFODQpQUk9ESUQ6YWRhbWdpYmJvbnMvaWNzDQpNRVRIT0Q6UFVCTElTSA0KWC1XUi1DQUxOQU1FOmRlZmF1bHQNClgtUFVCTElTSEVELVRUTDpQVDFIDQpCRUdJTjpWRVZFTlQNClVJRDpMWC1zckVYdkI1MXA1ZUxNS1gwTnkNClNVTU1BUlk6bmV3IGV2ZW50DQpEVFNUQU1QOjIwMjMwMjEwVDA5MzYwMFoNCkRUU1RBUlQ7VkFMVUU9REFURToyMDIzMDIyOA0KRFRFTkQ7VkFMVUU9REFURToyMDIzMDMwMQ0KQVRURU5ERUU7UlNWUD1GQUxTRTtDTj1QZXJzb246bWFpbHRvOnBlcnNvbjFAZW1haWwuY29tDQpFTkQ6VkVWRU5UDQpFTkQ6VkNBTEVOREFSDQo=',
+										fileName: 'event.ics',
+										fileSize: '359 B',
+									},
+								},
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodeTypes = setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) => {
+				//@ts-ignore
+				expect(resultData[0][0].binary.data.data.length).toEqual(
+					testData.output.nodeData[nodeName][0][0].binary.data.data.length,
+				);
+
+				//uid every time would be different, so we need to delete it in order to compare objects
+				//@ts-ignore
+				delete resultData[0][0].binary.data.data;
+				delete testData.output.nodeData[nodeName][0][0].binary.data.data;
+
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]);
+			});
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/nodes/ICalendar/test/node/workflow.iCalendar.json b/packages/nodes-base/nodes/ICalendar/test/node/workflow.iCalendar.json
new file mode 100644
index 00000000000000..4e1ec32c3ff64b
--- /dev/null
+++ b/packages/nodes-base/nodes/ICalendar/test/node/workflow.iCalendar.json
@@ -0,0 +1,59 @@
+{
+	"name": "iCalendar test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "987fdc91-f1a7-4882-9975-3d41e183b7f3",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [780, 400]
+		},
+		{
+			"parameters": {
+				"title": "new event",
+				"start": "2023-02-27T22:00:00.000Z",
+				"end": "2023-02-27T22:00:00.000Z",
+				"allDay": true,
+				"additionalFields": {
+					"attendeesUi": {
+						"attendeeValues": [
+							{
+								"name": "Person",
+								"email": "person1@email.com"
+							}
+						]
+					},
+					"calName": "default"
+				}
+			},
+			"id": "afe2a25a-d7a3-41f5-a9be-7a2ea3bb260d",
+			"name": "iCalendar",
+			"type": "n8n-nodes-base.iCal",
+			"typeVersion": 1,
+			"position": [1080, 400]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "iCalendar",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "6c0ed4a8-3c83-44e1-957c-bbe7ef57ebd3",
+	"id": "116",
+	"meta": {
+		"instanceId": "36203ea1ce3cef713fa25999bd9874ae26b9e4c2c3a90a365f2882a154d031d0"
+	},
+	"tags": []
+}

From 8494c978213378efc2aed7326d1444745db416cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Fri, 10 Feb 2023 13:12:06 +0100
Subject: [PATCH 171/358] test(editor): Add e2e tests for personal settings
 page (#5451)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ Added tests for personal user settings
---
 cypress/e2e/18-user-management.cy.ts          | 52 +++++++++++++++++++
 cypress/pages/modals/change-password-modal.ts | 12 +++++
 cypress/pages/settings-personal.ts            | 52 +++++++++++++++++++
 .../src/components/ChangePasswordModal.vue    |  1 +
 .../src/views/SettingsPersonalView.vue        |  9 ++--
 5 files changed, 122 insertions(+), 4 deletions(-)
 create mode 100644 cypress/pages/modals/change-password-modal.ts
 create mode 100644 cypress/pages/settings-personal.ts

diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index 6c0f9c84d48ffd..f01cee784422ef 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -1,6 +1,7 @@
 import { MainSidebar } from './../pages/sidebar/main-sidebar';
 import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
 import { SettingsSidebar, SettingsUsersPage, WorkflowPage, WorkflowsPage } from '../pages';
+import { PersonalSettingsPage } from '../pages/settings-personal';
 
 /**
  * User A - Instance owner
@@ -36,8 +37,17 @@ const users = [
 	},
 ];
 
+const updatedPersonalData = {
+	newFirstName: 'Something',
+	newLastName: 'Else',
+	newEmail: 'something_else@acme.corp',
+	newPassword: 'Keybo4rd',
+	invalidPasswords: ['abc', 'longEnough', 'longenough123']
+}
+
 const usersSettingsPage = new SettingsUsersPage();
 const workflowPage = new WorkflowPage();
+const personalSettingsPage = new PersonalSettingsPage();
 
 describe('User Management', () => {
 	before(() => {
@@ -93,4 +103,46 @@ describe('User Management', () => {
 		usersSettingsPage.getters.deleteUserButton().realClick();
 		workflowPage.getters.successToast().should('contain', 'User deleted');
 	});
+
+	it(`should allow user to change their personal data`, () => {
+		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		personalSettingsPage.actions.updateFirstAndLastName(updatedPersonalData.newFirstName, updatedPersonalData.newLastName);
+		personalSettingsPage.getters.currentUserName().should('contain', `${updatedPersonalData.newFirstName} ${updatedPersonalData.newLastName}`);
+		workflowPage.getters.successToast().should('contain', 'Personal details updated');
+	});
+
+	it(`shouldn't allow user to set weak password`, () => {
+		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		for (let weakPass of updatedPersonalData.invalidPasswords) {
+			personalSettingsPage.actions.tryToSetWeakPassword(instanceOwner.password, weakPass);
+		}
+	});
+
+	it(`shouldn't allow user to change password if old password is wrong`, () => {
+		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		personalSettingsPage.actions.updatePassword('iCannotRemember', updatedPersonalData.newPassword);
+		workflowPage.getters.errorToast().closest('div').should('contain', 'Provided current password is incorrect.');
+	});
+
+	it(`should change current user password`, () => {
+		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
+		personalSettingsPage.actions.updatePassword(instanceOwner.password, updatedPersonalData.newPassword);
+		workflowPage.getters.successToast().should('contain', 'Password updated');
+		personalSettingsPage.actions.loginWithNewData(instanceOwner.email, updatedPersonalData.newPassword);
+	});
+
+	it(`shouldn't allow users to set invalid email`, () => {
+		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, updatedPersonalData.newPassword);
+		// try without @ part
+		personalSettingsPage.actions.tryToSetInvalidEmail(updatedPersonalData.newEmail.split('@')[0]);
+		// try without domain
+		personalSettingsPage.actions.tryToSetInvalidEmail(updatedPersonalData.newEmail.split('.')[0]);
+	});
+
+	it(`should change user email`, () => {
+		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, updatedPersonalData.newPassword);
+		personalSettingsPage.actions.updateEmail(updatedPersonalData.newEmail);
+		workflowPage.getters.successToast().should('contain', 'Personal details updated');
+		personalSettingsPage.actions.loginWithNewData(updatedPersonalData.newEmail, updatedPersonalData.newPassword);
+	});
 });
diff --git a/cypress/pages/modals/change-password-modal.ts b/cypress/pages/modals/change-password-modal.ts
new file mode 100644
index 00000000000000..3e9ebc86978e7f
--- /dev/null
+++ b/cypress/pages/modals/change-password-modal.ts
@@ -0,0 +1,12 @@
+import { BasePage } from './../base';
+
+export class ChangePasswordModal extends BasePage {
+	getters = {
+		modalContainer: () => cy.getByTestId('changePassword-modal').last(),
+		currentPasswordInput: () => cy.getByTestId('currentPassword').find('input').first(),
+		newPasswordInputContainer: () => cy.getByTestId('password'),
+		newPasswordInput: () => cy.getByTestId('password').find('input').first(),
+		repeatPasswordInput: () => cy.getByTestId('password2').find('input').first(),
+		changePasswordButton: () => cy.getByTestId('change-password-button'),
+	};
+}
diff --git a/cypress/pages/settings-personal.ts b/cypress/pages/settings-personal.ts
new file mode 100644
index 00000000000000..a454837011a19e
--- /dev/null
+++ b/cypress/pages/settings-personal.ts
@@ -0,0 +1,52 @@
+import { ChangePasswordModal } from './modals/change-password-modal';
+import { BasePage } from './base';
+
+const changePasswordModal = new ChangePasswordModal();
+
+export class PersonalSettingsPage extends BasePage {
+	url = '/settings/personal';
+	getters = {
+		currentUserName: () => cy.getByTestId('current-user-name'),
+		firstNameInput: () => cy.getByTestId('firstName').find('input').first(),
+		lastNameInput: () => cy.getByTestId('lastName').find('input').first(),
+		emailInputContainer: () => cy.getByTestId('email'),
+		emailInput: () => cy.getByTestId('email').find('input').first(),
+		changePasswordLink: () => cy.getByTestId('change-password-link').find('a').first(),
+		saveSettingsButton: () => cy.getByTestId('save-settings-button'),
+	};
+	actions = {
+		loginAndVisit: (email: string, password: string) => {
+			cy.signin({ email, password });
+			cy.visit(this.url);
+		},
+		updateFirstAndLastName: (newFirstName: string, newLastName: string) => {
+			this.getters.firstNameInput().type('{selectall}').type(newFirstName);
+			this.getters.lastNameInput().type('{selectall}').type(newLastName);
+			this.getters.saveSettingsButton().realClick();
+		},
+		updatePassword: (oldPassword: string, newPassword: string) => {
+			this.getters.changePasswordLink().realClick();
+			changePasswordModal.getters.modalContainer().should('be.visible');
+			changePasswordModal.getters.currentPasswordInput().type('{selectall}').type(oldPassword);
+			changePasswordModal.getters.newPasswordInput().type('{selectall}').type(newPassword);
+			changePasswordModal.getters.repeatPasswordInput().type('{selectall}').type(newPassword);
+			changePasswordModal.getters.changePasswordButton().click();
+		},
+		tryToSetWeakPassword: (oldPassword: string, newPassword: string) => {
+			this.actions.updatePassword(oldPassword, newPassword);
+			changePasswordModal.getters.newPasswordInputContainer().find('div[class^="_errorInput"]').should('exist');
+		},
+		updateEmail: (newEmail: string) => {
+			this.getters.emailInput().type('{selectall}').type(newEmail).type('{enter}');
+		},
+		tryToSetInvalidEmail: (newEmail: string) => {
+			this.actions.updateEmail(newEmail);
+			this.getters.emailInputContainer().find('div[class^="_errorInput"]').should('exist');
+		},
+		loginWithNewData: (email: string, password: string) => {
+			cy.signout();
+			this.actions.loginAndVisit(email, password);
+			cy.url().should('match', new RegExp(this.url));
+		},
+	};
+}
diff --git a/packages/editor-ui/src/components/ChangePasswordModal.vue b/packages/editor-ui/src/components/ChangePasswordModal.vue
index b6e00d35e73018..7e404b3328012d 100644
--- a/packages/editor-ui/src/components/ChangePasswordModal.vue
+++ b/packages/editor-ui/src/components/ChangePasswordModal.vue
@@ -22,6 +22,7 @@
 				:label="$locale.baseText('auth.changePassword')"
 				@click="onSubmitClick"
 				float="right"
+				data-test-id="change-password-button"
 			/>
 		</template>
 	</Modal>
diff --git a/packages/editor-ui/src/views/SettingsPersonalView.vue b/packages/editor-ui/src/views/SettingsPersonalView.vue
index 86c7b14e2a6de9..ef6cc55220f0d2 100644
--- a/packages/editor-ui/src/views/SettingsPersonalView.vue
+++ b/packages/editor-ui/src/views/SettingsPersonalView.vue
@@ -1,11 +1,11 @@
 <template>
-	<div :class="$style.container">
+	<div :class="$style.container" data-test-id="personal-settings-container">
 		<div :class="$style.header">
 			<n8n-heading size="2xlarge">{{
 				$locale.baseText('settings.personal.personalSettings')
 			}}</n8n-heading>
 			<div class="ph-no-capture" :class="$style.user">
-				<span :class="$style.username">
+				<span :class="$style.username" data-test-id="current-user-name">
 					<n8n-text color="text-light">{{ currentUser.fullName }}</n8n-text>
 				</span>
 				<n8n-avatar
@@ -21,7 +21,7 @@
 					$locale.baseText('settings.personal.basicInformation')
 				}}</n8n-heading>
 			</div>
-			<div>
+			<div data-test-id="personal-data-form">
 				<n8n-form-inputs
 					v-if="formInputs"
 					:inputs="formInputs"
@@ -38,7 +38,7 @@
 			</div>
 			<div>
 				<n8n-input-label :label="$locale.baseText('auth.password')">
-					<n8n-link @click="openPasswordModal">{{
+					<n8n-link @click="openPasswordModal" data-test-id="change-password-link">{{
 						$locale.baseText('auth.changePassword')
 					}}</n8n-link>
 				</n8n-input-label>
@@ -50,6 +50,7 @@
 				:label="$locale.baseText('settings.personal.save')"
 				size="large"
 				:disabled="!hasAnyChanges || !readyToSubmit"
+				data-test-id="save-settings-button"
 				@click="onSaveClick"
 			/>
 		</div>

From 5194513850e0c5cb21bd53eb5165f1fb7d9f7ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 10 Feb 2023 14:59:20 +0100
Subject: [PATCH 172/358] refactor(core): Delete duplicate code across all 
 commands (#5452)

---
 packages/cli/src/ActiveWorkflowRunner.ts      |   6 +-
 packages/cli/src/LoadNodesAndCredentials.ts   |   3 +-
 .../handlers/workflows/workflows.service.ts   |   3 +-
 packages/cli/src/Queue.ts                     |   3 +-
 packages/cli/src/WorkflowRunnerProcess.ts     |   6 +-
 packages/cli/src/commands/BaseCommand.ts      | 109 +++--
 packages/cli/src/commands/Interfaces.d.ts     |  12 +-
 packages/cli/src/commands/audit.ts            |  47 +-
 packages/cli/src/commands/db/revert.ts        |  62 +--
 packages/cli/src/commands/execute.ts          | 158 +++----
 packages/cli/src/commands/executeBatch.ts     | 155 ++-----
 .../cli/src/commands/export/credentials.ts    | 137 +++---
 packages/cli/src/commands/export/workflow.ts  | 123 +++---
 .../cli/src/commands/import/credentials.ts    | 153 ++++---
 packages/cli/src/commands/import/workflow.ts  | 190 ++++----
 packages/cli/src/commands/ldap/reset.ts       |  13 +-
 packages/cli/src/commands/license/clear.ts    |  45 +-
 packages/cli/src/commands/list/workflow.ts    |  47 +-
 packages/cli/src/commands/start.ts            | 412 ++++++++----------
 packages/cli/src/commands/update/workflow.ts  |  55 +--
 .../cli/src/commands/user-management/reset.ts |  34 +-
 packages/cli/src/commands/webhook.ts          | 107 +----
 packages/cli/src/commands/worker.ts           | 366 +++++++---------
 packages/cli/src/constants.ts                 |   2 +
 packages/cli/src/utils.ts                     |   3 +-
 packages/workflow/src/LoggerProxy.ts          |   3 +-
 26 files changed, 944 insertions(+), 1310 deletions(-)

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 14961f2c5ba309..376f6c15e42649 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -64,6 +64,7 @@ import { WorkflowRunner } from '@/WorkflowRunner';
 import { ExternalHooks } from '@/ExternalHooks';
 import { whereClause } from './UserManagement/UserManagementHelper';
 import { WorkflowsService } from './workflows/workflows.services';
+import { START_NODES } from './constants';
 
 const WEBHOOK_PROD_UNREGISTERED_HINT =
 	"The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
@@ -801,10 +802,7 @@ export class ActiveWorkflowRunner {
 				settings: workflowData.settings,
 			});
 
-			const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated([
-				'n8n-nodes-base.start',
-				'n8n-nodes-base.manualTrigger',
-			]);
+			const canBeActivated = workflowInstance.checkIfWorkflowCanBeActivated(START_NODES);
 			if (!canBeActivated) {
 				Logger.error(`Unable to activate workflow "${workflowData.name}"`);
 				throw new Error(
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 478b5fe6d88c7a..f44c131ad90aee 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -30,6 +30,7 @@ import {
 	RESPONSE_ERROR_MESSAGES,
 	CUSTOM_API_CALL_KEY,
 	CUSTOM_API_CALL_NAME,
+	inTest,
 } from '@/constants';
 import {
 	persistInstalledPackageData,
@@ -61,7 +62,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 
 		// @ts-ignore
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
-		module.constructor._initPaths();
+		if (!inTest) module.constructor._initPaths();
 
 		await this.loadNodesFromBasePackages();
 		await this.loadNodesFromDownloadedPackages();
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
index 26069da83efc94..62f6d7443880f0 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.service.ts
@@ -11,6 +11,7 @@ import { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import { isInstanceOwner } from '../users/users.service';
 import type { Role } from '@db/entities/Role';
 import config from '@/config';
+import { START_NODES } from '@/constants';
 
 function insertIf(condition: boolean, elements: string[]): string[] {
 	return condition ? elements : [];
@@ -128,7 +129,7 @@ export async function updateWorkflow(
 export function hasStartNode(workflow: WorkflowEntity): boolean {
 	if (!workflow.nodes.length) return false;
 
-	const found = workflow.nodes.find((node) => node.type === 'n8n-nodes-base.start');
+	const found = workflow.nodes.find((node) => START_NODES.includes(node.type));
 
 	return Boolean(found);
 }
diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index 6f19626dea4d11..88ba6c1a53df2e 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -5,6 +5,7 @@ import config from '@/config';
 import * as ActiveExecutions from '@/ActiveExecutions';
 import * as WebhookHelpers from '@/WebhookHelpers';
 
+export type JobId = Bull.JobId;
 export type Job = Bull.Job<JobData>;
 export type JobQueue = Bull.Queue<JobData>;
 
@@ -55,7 +56,7 @@ export class Queue {
 		return this.jobQueue.add(jobData, jobOptions);
 	}
 
-	async getJob(jobId: Bull.JobId): Promise<Job | null> {
+	async getJob(jobId: JobId): Promise<Job | null> {
 		return this.jobQueue.getJob(jobId);
 	}
 
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 5beb4c7469c018..1b8b4246ededbe 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -101,20 +101,20 @@ class WorkflowRunnerProcess {
 
 		this.startedAt = new Date();
 
+		const userSettings = await UserSettings.prepareUserSettings();
+
 		const loadNodesAndCredentials = LoadNodesAndCredentials();
 		await loadNodesAndCredentials.init();
 
 		const nodeTypes = NodeTypes(loadNodesAndCredentials);
 		const credentialTypes = CredentialTypes(loadNodesAndCredentials);
-
-		// Load the credentials overwrites if any exist
 		CredentialsOverwrites(credentialTypes);
 
 		// Load all external hooks
 		const externalHooks = ExternalHooks();
 		await externalHooks.init();
 
-		const instanceId = (await UserSettings.prepareUserSettings()).instanceId ?? '';
+		const instanceId = userSettings.instanceId ?? '';
 		await InternalHooksManager.init(instanceId, nodeTypes);
 
 		const binaryDataConfig = config.getEnv('binaryDataManager');
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 445deadfbd9ae3..1ef136b209e3b7 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -1,59 +1,94 @@
-import { Command } from '@oclif/core';
-import { LoggerProxy } from 'n8n-workflow';
-import type { Logger } from '@/Logger';
+import { Command } from '@oclif/command';
+import type { INodeTypes } from 'n8n-workflow';
+import { LoggerProxy, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
+import type { IUserSettings } from 'n8n-core';
+import { BinaryDataManager, UserSettings } from 'n8n-core';
 import { getLogger } from '@/Logger';
-import { User } from '@db/entities/User';
+import config from '@/config';
 import * as Db from '@/Db';
+import * as CrashJournal from '@/CrashJournal';
 import { inTest } from '@/constants';
+import { CredentialTypes } from '@/CredentialTypes';
+import { CredentialsOverwrites } from '@/CredentialsOverwrites';
+import { InternalHooksManager } from '@/InternalHooksManager';
+import { initErrorHandling } from '@/ErrorReporting';
+import { ExternalHooks } from '@/ExternalHooks';
+import { NodeTypes } from '@/NodeTypes';
+import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import type { IExternalHooksClass } from '@/Interfaces';
+
+export const UM_FIX_INSTRUCTION =
+	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
 
 export abstract class BaseCommand extends Command {
-	logger: Logger;
+	protected logger = LoggerProxy.init(getLogger());
+
+	protected externalHooks: IExternalHooksClass;
+
+	protected loadNodesAndCredentials: LoadNodesAndCredentialsClass;
+
+	protected nodeTypes: INodeTypes;
 
-	/**
-	 * Lifecycle methods
-	 */
+	protected userSettings: IUserSettings;
 
 	async init(): Promise<void> {
-		this.logger = getLogger();
-		LoggerProxy.init(this.logger);
+		await initErrorHandling();
 
-		await Db.init();
-	}
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		this.stopProcess = this.stopProcess.bind(this);
 
-	async finally(): Promise<void> {
-		if (inTest) return;
+		// Make sure the settings exist
+		this.userSettings = await UserSettings.prepareUserSettings();
 
-		this.exit();
-	}
+		this.loadNodesAndCredentials = LoadNodesAndCredentials();
+		await this.loadNodesAndCredentials.init();
+		this.nodeTypes = NodeTypes(this.loadNodesAndCredentials);
+		const credentialTypes = CredentialTypes(this.loadNodesAndCredentials);
+		CredentialsOverwrites(credentialTypes);
 
-	/**
-	 * User Management utils
-	 */
+		await InternalHooksManager.init(this.userSettings.instanceId ?? '', this.nodeTypes);
 
-	defaultUserProps = {
-		firstName: null,
-		lastName: null,
-		email: null,
-		password: null,
-		resetPasswordToken: null,
-	};
+		await Db.init().catch(async (error: Error) =>
+			this.exitWithCrash('There was an error initializing DB', error),
+		);
+	}
 
-	async getInstanceOwner(): Promise<User> {
-		const globalRole = await Db.collections.Role.findOneByOrFail({
-			name: 'owner',
-			scope: 'global',
-		});
+	protected async stopProcess() {
+		// This needs to be overridden
+	}
 
-		const owner = await Db.collections.User.findOneBy({ globalRoleId: globalRole.id });
+	protected async initCrashJournal() {
+		await CrashJournal.init();
+	}
 
-		if (owner) return owner;
+	protected async exitSuccessFully() {
+		try {
+			await CrashJournal.cleanup();
+		} finally {
+			process.exit();
+		}
+	}
 
-		const user = new User();
+	protected async exitWithCrash(message: string, error: unknown) {
+		ErrorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
+		await sleep(2000);
+		process.exit(1);
+	}
 
-		Object.assign(user, { ...this.defaultUserProps, globalRole });
+	protected async initBinaryManager() {
+		const binaryDataConfig = config.getEnv('binaryDataManager');
+		await BinaryDataManager.init(binaryDataConfig, true);
+	}
 
-		await Db.collections.User.save(user);
+	protected async initExternalHooks() {
+		this.externalHooks = ExternalHooks();
+		await this.externalHooks.init();
+	}
 
-		return Db.collections.User.findOneByOrFail({ globalRoleId: globalRole.id });
+	async finally(error: Error | undefined) {
+		if (inTest || this.id === 'start') return;
+		if (Db.isInitialized) await Db.connection.destroy();
+		this.exit(error ? 1 : 0);
 	}
 }
diff --git a/packages/cli/src/commands/Interfaces.d.ts b/packages/cli/src/commands/Interfaces.d.ts
index 96a31ad9f89690..9f423b575be054 100644
--- a/packages/cli/src/commands/Interfaces.d.ts
+++ b/packages/cli/src/commands/Interfaces.d.ts
@@ -12,6 +12,7 @@ interface IResult {
 	};
 	executions: IExecutionResult[];
 }
+
 interface IExecutionResult {
 	workflowId: string;
 	workflowName: string;
@@ -53,14 +54,3 @@ declare module 'json-diff' {
 	}
 	export function diff(obj1: unknown, obj2: unknown, diffOptions: IDiffOptions): string;
 }
-
-type SmtpConfig = {
-	host: string;
-	port: number;
-	secure: boolean;
-	auth: {
-		user: string;
-		pass: string;
-	};
-	sender: string;
-};
diff --git a/packages/cli/src/commands/audit.ts b/packages/cli/src/commands/audit.ts
index a9f402f01a207b..ceac790ea58658 100644
--- a/packages/cli/src/commands/audit.ts
+++ b/packages/cli/src/commands/audit.ts
@@ -1,19 +1,12 @@
-import Command, { flags } from '@oclif/command';
-import { LoggerProxy } from 'n8n-workflow';
-import { UserSettings } from 'n8n-core';
-import type { Logger } from '@/Logger';
-import { getLogger } from '@/Logger';
+import { flags } from '@oclif/command';
 import { audit } from '@/audit';
 import { RISK_CATEGORIES } from '@/audit/constants';
-import { CredentialTypes } from '@/CredentialTypes';
-import { NodeTypes } from '@/NodeTypes';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { InternalHooksManager } from '@/InternalHooksManager';
 import config from '@/config';
-import * as Db from '@/Db';
 import type { Risk } from '@/audit/types';
+import { BaseCommand } from './BaseCommand';
 
-export class SecurityAudit extends Command {
+export class SecurityAudit extends BaseCommand {
 	static description = 'Generate a security audit report for this n8n instance';
 
 	static examples = [
@@ -35,11 +28,7 @@ export class SecurityAudit extends Command {
 		}),
 	};
 
-	logger: Logger;
-
 	async run() {
-		await this.init();
-
 		const { flags: auditFlags } = this.parse(SecurityAudit);
 
 		const categories =
@@ -70,38 +59,8 @@ export class SecurityAudit extends Command {
 		void InternalHooksManager.getInstance().onAuditGeneratedViaCli();
 	}
 
-	async init() {
-		await Db.init();
-
-		this.initLogger();
-
-		await this.initInternalHooksManager();
-	}
-
-	initLogger() {
-		this.logger = getLogger();
-		LoggerProxy.init(this.logger);
-	}
-
-	async initInternalHooksManager(): Promise<void> {
-		const loadNodesAndCredentials = LoadNodesAndCredentials();
-		await loadNodesAndCredentials.init();
-
-		const nodeTypes = NodeTypes(loadNodesAndCredentials);
-		CredentialTypes(loadNodesAndCredentials);
-
-		const instanceId = await UserSettings.getInstanceId();
-		await InternalHooksManager.init(instanceId, nodeTypes);
-	}
-
 	async catch(error: Error) {
 		this.logger.error('Failed to generate security audit');
 		this.logger.error(error.message);
-
-		this.exit(1);
-	}
-
-	async finally() {
-		this.exit();
 	}
 }
diff --git a/packages/cli/src/commands/db/revert.ts b/packages/cli/src/commands/db/revert.ts
index 7ad1964e7db7d1..56de3b566372a6 100644
--- a/packages/cli/src/commands/db/revert.ts
+++ b/packages/cli/src/commands/db/revert.ts
@@ -1,10 +1,7 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
 import { Command, flags } from '@oclif/command';
 import type { DataSourceOptions as ConnectionOptions } from 'typeorm';
 import { DataSource as Connection } from 'typeorm';
 import { LoggerProxy } from 'n8n-workflow';
-
 import { getLogger } from '@/Logger';
 import { getConnectionOptions } from '@/Db';
 import config from '@/config';
@@ -18,36 +15,39 @@ export class DbRevertMigrationCommand extends Command {
 		help: flags.help({ char: 'h' }),
 	};
 
-	async run() {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
+	protected logger = LoggerProxy.init(getLogger());
+
+	private connection: Connection;
 
+	async init() {
 		this.parse(DbRevertMigrationCommand);
+	}
+
+	async run() {
+		const dbType = config.getEnv('database.type');
+		const connectionOptions: ConnectionOptions = {
+			...getConnectionOptions(dbType),
+			subscribers: [],
+			synchronize: false,
+			migrationsRun: false,
+			dropSchema: false,
+			logging: ['query', 'error', 'schema'],
+		};
+
+		this.connection = new Connection(connectionOptions);
+		await this.connection.initialize();
+		await this.connection.undoLastMigration();
+		await this.connection.destroy();
+	}
+
+	async catch(error: Error) {
+		this.logger.error('Error reverting last migration. See log messages for details.');
+		this.logger.error(error.message);
+	}
+
+	protected async finally(error: Error | undefined) {
+		if (this.connection?.isInitialized) await this.connection.destroy();
 
-		let connection: Connection | undefined;
-		try {
-			const dbType = config.getEnv('database.type');
-			const connectionOptions: ConnectionOptions = {
-				...getConnectionOptions(dbType),
-				subscribers: [],
-				synchronize: false,
-				migrationsRun: false,
-				dropSchema: false,
-				logging: ['query', 'error', 'schema'],
-			};
-			connection = new Connection(connectionOptions);
-			await connection.initialize();
-			await connection.undoLastMigration();
-			await connection.destroy();
-		} catch (error) {
-			if (connection?.isInitialized) await connection.destroy();
-
-			console.error('Error reverting last migration. See log messages for details.');
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-			logger.error(error.message);
-			this.exit(1);
-		}
-
-		this.exit();
+		this.exit(error ? 1 : 0);
 	}
 }
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index 7b299cde6f21e2..6a3d655e032615 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -1,30 +1,20 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
 import { promises as fs } from 'fs';
-import { Command, flags } from '@oclif/command';
-import { BinaryDataManager, UserSettings, PLACEHOLDER_EMPTY_WORKFLOW_ID } from 'n8n-core';
+import { flags } from '@oclif/command';
+import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from 'n8n-core';
 import type { IWorkflowBase } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
+import { ExecutionBaseError } from 'n8n-workflow';
 
 import * as ActiveExecutions from '@/ActiveExecutions';
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { CredentialTypes } from '@/CredentialTypes';
 import * as Db from '@/Db';
-import { ExternalHooks } from '@/ExternalHooks';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { NodeTypes } from '@/NodeTypes';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IWorkflowExecutionDataProcess } from '@/Interfaces';
-import { getLogger } from '@/Logger';
-import config from '@/config';
 import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
 import { findCliWorkflowStart } from '@/utils';
 import { initEvents } from '@/events';
+import { BaseCommand } from './BaseCommand';
 
-export class Execute extends Command {
+export class Execute extends BaseCommand {
 	static description = '\nExecutes a given workflow';
 
 	static examples = ['$ n8n execute --id=5', '$ n8n execute --file=workflow.json'];
@@ -42,33 +32,26 @@ export class Execute extends Command {
 		}),
 	};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	async run() {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-		const binaryDataConfig = config.getEnv('binaryDataManager');
-		await BinaryDataManager.init(binaryDataConfig, true);
+	async init() {
+		await super.init();
+		await this.initBinaryManager();
+		await this.initExternalHooks();
 
 		// Add event handlers
 		initEvents();
+	}
 
+	async run() {
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(Execute);
 
-		// Start directly with the init of the database to improve startup time
-		const startDbInitPromise = Db.init();
-
-		// Load all node and credential types
-		const loadNodesAndCredentials = LoadNodesAndCredentials();
-		const loadNodesAndCredentialsPromise = loadNodesAndCredentials.init();
-
 		if (!flags.id && !flags.file) {
-			console.info('Either option "--id" or "--file" have to be set!');
+			this.logger.info('Either option "--id" or "--file" have to be set!');
 			return;
 		}
 
 		if (flags.id && flags.file) {
-			console.info('Either "id" or "file" can be set never both!');
+			this.logger.info('Either "id" or "file" can be set never both!');
 			return;
 		}
 
@@ -82,7 +65,7 @@ export class Execute extends Command {
 			} catch (error) {
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 				if (error.code === 'ENOENT') {
-					console.info(`The file "${flags.file}" could not be found.`);
+					this.logger.info(`The file "${flags.file}" could not be found.`);
 					return;
 				}
 
@@ -96,22 +79,19 @@ export class Execute extends Command {
 				workflowData.nodes === undefined ||
 				workflowData.connections === undefined
 			) {
-				console.info(`The file "${flags.file}" does not contain valid workflow data.`);
+				this.logger.info(`The file "${flags.file}" does not contain valid workflow data.`);
 				return;
 			}
 
 			workflowId = workflowData.id ?? PLACEHOLDER_EMPTY_WORKFLOW_ID;
 		}
 
-		// Wait till the database is ready
-		await startDbInitPromise;
-
 		if (flags.id) {
 			// Id of workflow is given
 			workflowId = flags.id;
 			workflowData = await Db.collections.Workflow.findOneBy({ id: workflowId });
 			if (workflowData === null) {
-				console.info(`The workflow with the id "${workflowId}" does not exist.`);
+				this.logger.info(`The workflow with the id "${workflowId}" does not exist.`);
 				process.exit(1);
 			}
 		}
@@ -120,82 +100,56 @@ export class Execute extends Command {
 			throw new Error('Failed to retrieve workflow data for requested workflow');
 		}
 
-		// Make sure the settings exist
-		await UserSettings.prepareUserSettings();
-
-		// Wait till the n8n-packages have been read
-		await loadNodesAndCredentialsPromise;
-
-		NodeTypes(loadNodesAndCredentials);
-		const credentialTypes = CredentialTypes(loadNodesAndCredentials);
-
-		// Load the credentials overwrites if any exist
-		CredentialsOverwrites(credentialTypes);
-
-		// Load all external hooks
-		const externalHooks = ExternalHooks();
-		await externalHooks.init();
-
-		// Add the found types to an instance other parts of the application can use
-		const nodeTypes = NodeTypes(loadNodesAndCredentials);
-		CredentialTypes(loadNodesAndCredentials);
-
-		const instanceId = await UserSettings.getInstanceId();
-		await InternalHooksManager.init(instanceId, nodeTypes);
-
 		if (!WorkflowHelpers.isWorkflowIdValid(workflowId)) {
 			workflowId = undefined;
 		}
 
-		try {
-			const startingNode = findCliWorkflowStart(workflowData.nodes);
+		const startingNode = findCliWorkflowStart(workflowData.nodes);
 
-			const user = await getInstanceOwner();
-			const runData: IWorkflowExecutionDataProcess = {
-				executionMode: 'cli',
-				startNodes: [startingNode.name],
-				workflowData,
-				userId: user.id,
-			};
+		const user = await getInstanceOwner();
+		const runData: IWorkflowExecutionDataProcess = {
+			executionMode: 'cli',
+			startNodes: [startingNode.name],
+			workflowData,
+			userId: user.id,
+		};
 
-			const workflowRunner = new WorkflowRunner();
-			const executionId = await workflowRunner.run(runData);
+		const workflowRunner = new WorkflowRunner();
+		const executionId = await workflowRunner.run(runData);
 
-			const activeExecutions = ActiveExecutions.getInstance();
-			const data = await activeExecutions.getPostExecutePromise(executionId);
+		const activeExecutions = ActiveExecutions.getInstance();
+		const data = await activeExecutions.getPostExecutePromise(executionId);
 
-			if (data === undefined) {
-				throw new Error('Workflow did not return any data!');
-			}
+		if (data === undefined) {
+			throw new Error('Workflow did not return any data!');
+		}
 
-			if (data.data.resultData.error) {
-				console.info('Execution was NOT successful. See log message for details.');
-				logger.info('Execution error:');
-				logger.info('====================================');
-				logger.info(JSON.stringify(data, null, 2));
-
-				const { error } = data.data.resultData;
-				// eslint-disable-next-line @typescript-eslint/no-throw-literal
-				throw {
-					...error,
-					stack: error.stack,
-				};
-			}
-			if (flags.rawOutput === undefined) {
-				this.log('Execution was successful:');
-				this.log('====================================');
-			}
-			this.log(JSON.stringify(data, null, 2));
-		} catch (e) {
-			console.error('Error executing workflow. See log messages for details.');
-			logger.error('\nExecution error:');
-			logger.info('====================================');
-			logger.error(e.message);
-			if (e.description) logger.error(e.description);
-			logger.error(e.stack);
-			this.exit(1);
+		if (data.data.resultData.error) {
+			this.logger.info('Execution was NOT successful. See log message for details.');
+			this.logger.info('Execution error:');
+			this.logger.info('====================================');
+			this.logger.info(JSON.stringify(data, null, 2));
+
+			const { error } = data.data.resultData;
+			// eslint-disable-next-line @typescript-eslint/no-throw-literal
+			throw {
+				...error,
+				stack: error.stack,
+			};
 		}
+		if (flags.rawOutput === undefined) {
+			this.log('Execution was successful:');
+			this.log('====================================');
+		}
+		this.log(JSON.stringify(data, null, 2));
+	}
 
-		this.exit();
+	async catch(error: Error) {
+		this.logger.error('Error executing workflow. See log messages for details.');
+		this.logger.error('\nExecution error:');
+		this.logger.info('====================================');
+		this.logger.error(error.message);
+		if (error instanceof ExecutionBaseError) this.logger.error(error.description!);
+		this.logger.error(error.stack!);
 	}
 }
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index 61021746d17366..592c1873c683bc 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -1,45 +1,25 @@
-/* eslint-disable @typescript-eslint/prefer-optional-chain */
-/* eslint-disable array-callback-return */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable no-async-promise-executor */
-/* eslint-disable no-param-reassign */
-/* eslint-disable @typescript-eslint/unbound-method */
-/* eslint-disable no-console */
+/* eslint-disable @typescript-eslint/no-loop-func */
 import fs from 'fs';
-import { Command, flags } from '@oclif/command';
-
-import { BinaryDataManager, UserSettings } from 'n8n-core';
-
+import { flags } from '@oclif/command';
 import type { ITaskData } from 'n8n-workflow';
-import { LoggerProxy, sleep } from 'n8n-workflow';
-
+import { sleep } from 'n8n-workflow';
 import { sep } from 'path';
-
 import { diff } from 'json-diff';
-
 import pick from 'lodash.pick';
-import { getLogger } from '@/Logger';
 
 import * as ActiveExecutions from '@/ActiveExecutions';
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { CredentialTypes } from '@/CredentialTypes';
 import * as Db from '@/Db';
-import { ExternalHooks } from '@/ExternalHooks';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { NodeTypes } from '@/NodeTypes';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
-import config from '@/config';
 import type { User } from '@db/entities/User';
 import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
 import { findCliWorkflowStart } from '@/utils';
 import { initEvents } from '@/events';
+import { BaseCommand } from './BaseCommand';
 
 const re = /\d+/;
 
-export class ExecuteBatch extends Command {
+export class ExecuteBatch extends BaseCommand {
 	static description = '\nExecutes multiple workflows once';
 
 	static cancelled = false;
@@ -115,7 +95,6 @@ export class ExecuteBatch extends Command {
 	 * Gracefully handles exit.
 	 * @param {boolean} skipExit Whether to skip exit or number according to received signal
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	static async stopProcess(skipExit: boolean | number = false) {
 		if (ExecuteBatch.cancelled) {
 			process.exit(0);
@@ -123,16 +102,13 @@ export class ExecuteBatch extends Command {
 
 		ExecuteBatch.cancelled = true;
 		const activeExecutionsInstance = ActiveExecutions.getInstance();
-		const stopPromises = activeExecutionsInstance.getActiveExecutions().map(async (execution) => {
-			// eslint-disable-next-line @typescript-eslint/no-floating-promises
-			activeExecutionsInstance.stopExecution(execution.id);
-		});
+		const stopPromises = activeExecutionsInstance
+			.getActiveExecutions()
+			.map(async (execution) => activeExecutionsInstance.stopExecution(execution.id));
 
 		await Promise.allSettled(stopPromises);
 
-		setTimeout(() => {
-			process.exit(0);
-		}, 30000);
+		setTimeout(() => process.exit(0), 30000);
 
 		let executingWorkflows = activeExecutionsInstance.getActiveExecutions();
 
@@ -144,7 +120,6 @@ export class ExecuteBatch extends Command {
 					console.log(` - Execution ID ${execution.id}, workflow ID: ${execution.workflowId}`);
 				});
 			}
-			// eslint-disable-next-line no-await-in-loop
 			await sleep(500);
 			executingWorkflows = activeExecutionsInstance.getActiveExecutions();
 		}
@@ -155,13 +130,11 @@ export class ExecuteBatch extends Command {
 		}
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	formatJsonOutput(data: object) {
+	private formatJsonOutput(data: object) {
 		return JSON.stringify(data, null, 2);
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	shouldBeConsideredAsWarning(errorMessage: string) {
+	private shouldBeConsideredAsWarning(errorMessage: string) {
 		const warningStrings = [
 			'refresh token is invalid',
 			'unable to connect to',
@@ -174,7 +147,6 @@ export class ExecuteBatch extends Command {
 			'status code 401',
 		];
 
-		// eslint-disable-next-line no-param-reassign
 		errorMessage = errorMessage.toLowerCase();
 
 		for (let i = 0; i < warningStrings.length; i++) {
@@ -186,22 +158,24 @@ export class ExecuteBatch extends Command {
 		return false;
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
+	async init() {
+		await super.init();
+		await this.initBinaryManager();
+		await this.initExternalHooks();
+
+		// Add event handlers
+		initEvents();
+	}
+
 	async run() {
+		// eslint-disable-next-line @typescript-eslint/unbound-method
 		process.once('SIGTERM', ExecuteBatch.stopProcess);
+		// eslint-disable-next-line @typescript-eslint/unbound-method
 		process.once('SIGINT', ExecuteBatch.stopProcess);
 
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-		const binaryDataConfig = config.getEnv('binaryDataManager');
-		await BinaryDataManager.init(binaryDataConfig, true);
-
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(ExecuteBatch);
 
-		// Add event handlers
-		initEvents();
-
 		ExecuteBatch.debug = flags.debug;
 		ExecuteBatch.concurrency = flags.concurrency || 1;
 
@@ -277,23 +251,8 @@ export class ExecuteBatch extends Command {
 			ExecuteBatch.shallow = true;
 		}
 
-		// Start directly with the init of the database to improve startup time
-		const startDbInitPromise = Db.init();
-
-		// Load all node and credential types
-		const loadNodesAndCredentials = LoadNodesAndCredentials();
-		const loadNodesAndCredentialsPromise = loadNodesAndCredentials.init();
-
-		// Make sure the settings exist
-		await UserSettings.prepareUserSettings();
-
-		// Wait till the database is ready
-		await startDbInitPromise;
-
 		ExecuteBatch.instanceOwner = await getInstanceOwner();
 
-		let allWorkflows;
-
 		const query = Db.collections.Workflow.createQueryBuilder('workflows');
 
 		if (ids.length > 0) {
@@ -304,33 +263,12 @@ export class ExecuteBatch extends Command {
 			query.andWhere('workflows.id not in (:...skipIds)', { skipIds });
 		}
 
-		// eslint-disable-next-line prefer-const
-		allWorkflows = (await query.getMany()) as IWorkflowDb[];
+		const allWorkflows = (await query.getMany()) as IWorkflowDb[];
 
 		if (ExecuteBatch.debug) {
 			process.stdout.write(`Found ${allWorkflows.length} workflows to execute.\n`);
 		}
 
-		// Wait till the n8n-packages have been read
-		await loadNodesAndCredentialsPromise;
-
-		NodeTypes(loadNodesAndCredentials);
-		const credentialTypes = CredentialTypes(loadNodesAndCredentials);
-
-		// Load the credentials overwrites if any exist
-		CredentialsOverwrites(credentialTypes);
-
-		// Load all external hooks
-		const externalHooks = ExternalHooks();
-		await externalHooks.init();
-
-		// Add the found types to an instance other parts of the application can use
-		const nodeTypes = NodeTypes(loadNodesAndCredentials);
-		CredentialTypes(loadNodesAndCredentials);
-
-		const instanceId = await UserSettings.getInstanceId();
-		await InternalHooksManager.init(instanceId, nodeTypes);
-
 		// Send a shallow copy of allWorkflows so we still have all workflow data.
 		const results = await this.runTests([...allWorkflows]);
 
@@ -348,7 +286,6 @@ export class ExecuteBatch extends Command {
 				failedWorkflowIds.includes(workflow.id),
 			);
 
-			// eslint-disable-next-line no-await-in-loop
 			const retryResults = await this.runTests(newWorkflowList);
 
 			this.mergeResults(results, retryResults);
@@ -389,7 +326,6 @@ export class ExecuteBatch extends Command {
 		this.exit(0);
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	mergeResults(results: IResult, retryResults: IResult) {
 		if (retryResults.summary.successfulExecutions === 0) {
 			// Nothing to replace.
@@ -430,7 +366,7 @@ export class ExecuteBatch extends Command {
 		});
 	}
 
-	async runTests(allWorkflows: IWorkflowDb[]): Promise<IResult> {
+	private async runTests(allWorkflows: IWorkflowDb[]): Promise<IResult> {
 		const result: IResult = {
 			totalWorkflows: allWorkflows.length,
 			summary: {
@@ -475,7 +411,6 @@ export class ExecuteBatch extends Command {
 							this.updateStatus();
 						}
 
-						// eslint-disable-next-line @typescript-eslint/no-loop-func
 						await this.startThread(workflow).then((executionResult) => {
 							if (ExecuteBatch.debug) {
 								ExecuteBatch.workflowExecutionsProgress[i].pop();
@@ -542,7 +477,6 @@ export class ExecuteBatch extends Command {
 		});
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	updateStatus() {
 		if (ExecuteBatch.cancelled) {
 			return;
@@ -584,7 +518,6 @@ export class ExecuteBatch extends Command {
 		});
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	initializeLogs() {
 		process.stdout.write('**********************************************\n');
 		process.stdout.write('              n8n test workflows\n');
@@ -687,12 +620,13 @@ export class ExecuteBatch extends Command {
 						1000;
 					executionResult.finished = data?.finished !== undefined;
 
-					if (data.data.resultData.error) {
-						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, no-prototype-builtins
-						executionResult.error = data.data.resultData.error.hasOwnProperty('description')
+					const resultError = data.data.resultData.error;
+					if (resultError) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+						executionResult.error = resultError.hasOwnProperty('description')
 							? // @ts-ignore
-							  data.data.resultData.error.description
-							: data.data.resultData.error.message;
+							  resultError.description
+							: resultError.message;
 						if (data.data.resultData.lastNodeExecuted !== undefined) {
 							executionResult.error += ` on node ${data.data.resultData.lastNodeExecuted}`;
 						}
@@ -723,33 +657,29 @@ export class ExecuteBatch extends Command {
 												return;
 											}
 
-											if (
-												nodeEdgeCases[nodeName] !== undefined &&
-												nodeEdgeCases[nodeName].capResults !== undefined
-											) {
-												executionDataArray.splice(nodeEdgeCases[nodeName].capResults!);
+											const { capResults, ignoredProperties, keepOnlyProperties } =
+												nodeEdgeCases[nodeName] || {};
+
+											if (capResults !== undefined) {
+												executionDataArray.splice(capResults);
 											}
 
 											executionDataArray.map((executionData) => {
 												if (executionData.json === undefined) {
 													return;
 												}
-												if (
-													nodeEdgeCases[nodeName] !== undefined &&
-													nodeEdgeCases[nodeName].ignoredProperties !== undefined
-												) {
-													nodeEdgeCases[nodeName].ignoredProperties!.forEach(
+
+												if (ignoredProperties !== undefined) {
+													ignoredProperties.forEach(
 														(ignoredProperty) => delete executionData.json[ignoredProperty],
 													);
 												}
 
 												let keepOnlyFields = [] as string[];
-												if (
-													nodeEdgeCases[nodeName] !== undefined &&
-													nodeEdgeCases[nodeName].keepOnlyProperties !== undefined
-												) {
-													keepOnlyFields = nodeEdgeCases[nodeName].keepOnlyProperties!;
+												if (keepOnlyProperties !== undefined) {
+													keepOnlyFields = keepOnlyProperties;
 												}
+
 												executionData.json =
 													keepOnlyFields.length > 0
 														? pick(executionData.json, keepOnlyFields)
@@ -857,8 +787,7 @@ export class ExecuteBatch extends Command {
 					}
 				}
 			} catch (e) {
-				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions, @typescript-eslint/no-unsafe-member-access
-				executionResult.error = `Workflow failed to execute: ${e.message}`;
+				executionResult.error = `Workflow failed to execute: ${(e as Error).message}`;
 				executionResult.executionStatus = 'error';
 			}
 			clearTimeout(timeoutTimer);
diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index 22ce61aff5bbdc..d19dd809534257 100644
--- a/packages/cli/src/commands/export/credentials.ts
+++ b/packages/cli/src/commands/export/credentials.ts
@@ -1,21 +1,13 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/restrict-plus-operands */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
-import { Command, flags } from '@oclif/command';
-
-import { Credentials, UserSettings } from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-
+import { flags } from '@oclif/command';
 import fs from 'fs';
 import path from 'path';
-import { getLogger } from '@/Logger';
+import { Credentials, UserSettings } from 'n8n-core';
+import type { IDataObject } from 'n8n-workflow';
 import * as Db from '@/Db';
 import type { ICredentialsDecryptedDb } from '@/Interfaces';
+import { BaseCommand } from '../BaseCommand';
 
-export class ExportCredentialsCommand extends Command {
+export class ExportCredentialsCommand extends BaseCommand {
 	static description = 'Export credentials';
 
 	static examples = [
@@ -55,11 +47,7 @@ export class ExportCredentialsCommand extends Command {
 		}),
 	};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(ExportCredentialsCommand);
 
@@ -70,104 +58,103 @@ export class ExportCredentialsCommand extends Command {
 		}
 
 		if (!flags.all && !flags.id) {
-			console.info('Either option "--all" or "--id" have to be set!');
+			this.logger.info('Either option "--all" or "--id" have to be set!');
 			return;
 		}
 
 		if (flags.all && flags.id) {
-			console.info('You should either use "--all" or "--id" but never both!');
+			this.logger.info('You should either use "--all" or "--id" but never both!');
 			return;
 		}
 
 		if (flags.separate) {
 			try {
 				if (!flags.output) {
-					console.info('You must inform an output directory via --output when using --separate');
+					this.logger.info(
+						'You must inform an output directory via --output when using --separate',
+					);
 					return;
 				}
 
 				if (fs.existsSync(flags.output)) {
 					if (!fs.lstatSync(flags.output).isDirectory()) {
-						console.info('The parameter --output must be a directory');
+						this.logger.info('The parameter --output must be a directory');
 						return;
 					}
 				} else {
 					fs.mkdirSync(flags.output, { recursive: true });
 				}
 			} catch (e) {
-				console.error(
+				this.logger.error(
 					'Aborting execution as a filesystem error has been encountered while creating the output directory. See log messages for details.',
 				);
-				logger.error('\nFILESYSTEM ERROR');
-				logger.info('====================================');
-				logger.error(e.message);
-				logger.error(e.stack);
-				this.exit(1);
+				this.logger.error('\nFILESYSTEM ERROR');
+				if (e instanceof Error) {
+					this.logger.info('====================================');
+					this.logger.error(e.message);
+					this.logger.error(e.stack!);
+				}
+				return;
 			}
 		} else if (flags.output) {
 			if (fs.existsSync(flags.output)) {
 				if (fs.lstatSync(flags.output).isDirectory()) {
-					console.info('The parameter --output must be a writeable file');
+					this.logger.info('The parameter --output must be a writeable file');
 					return;
 				}
 			}
 		}
 
-		try {
-			await Db.init();
-
-			const findQuery: IDataObject = {};
-			if (flags.id) {
-				findQuery.id = flags.id;
-			}
+		const findQuery: IDataObject = {};
+		if (flags.id) {
+			findQuery.id = flags.id;
+		}
 
-			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			const credentials = await Db.collections.Credentials.find(findQuery);
+		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+		const credentials = await Db.collections.Credentials.find(findQuery);
 
-			if (flags.decrypted) {
-				const encryptionKey = await UserSettings.getEncryptionKey();
+		if (flags.decrypted) {
+			const encryptionKey = await UserSettings.getEncryptionKey();
 
-				for (let i = 0; i < credentials.length; i++) {
-					const { name, type, nodesAccess, data } = credentials[i];
-					const id = credentials[i].id;
-					const credential = new Credentials({ id, name }, type, nodesAccess, data);
-					const plainData = credential.getData(encryptionKey);
-					(credentials[i] as ICredentialsDecryptedDb).data = plainData;
-				}
+			for (let i = 0; i < credentials.length; i++) {
+				const { name, type, nodesAccess, data } = credentials[i];
+				const id = credentials[i].id;
+				const credential = new Credentials({ id, name }, type, nodesAccess, data);
+				const plainData = credential.getData(encryptionKey);
+				(credentials[i] as ICredentialsDecryptedDb).data = plainData;
 			}
+		}
 
-			if (credentials.length === 0) {
-				throw new Error('No credentials found with specified filters.');
-			}
+		if (credentials.length === 0) {
+			throw new Error('No credentials found with specified filters.');
+		}
 
-			if (flags.separate) {
-				let fileContents: string;
-				let i: number;
-				for (i = 0; i < credentials.length; i++) {
-					fileContents = JSON.stringify(credentials[i], null, flags.pretty ? 2 : undefined);
-					const filename = `${
-						// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-						(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
-						credentials[i].id
-					}.json`;
-					fs.writeFileSync(filename, fileContents);
-				}
-				console.info(`Successfully exported ${i} credentials.`);
+		if (flags.separate) {
+			let fileContents: string;
+			let i: number;
+			for (i = 0; i < credentials.length; i++) {
+				fileContents = JSON.stringify(credentials[i], null, flags.pretty ? 2 : undefined);
+				const filename = `${
+					// eslint-disable-next-line @typescript-eslint/no-non-null-assertion, @typescript-eslint/restrict-plus-operands
+					(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
+					credentials[i].id
+				}.json`;
+				fs.writeFileSync(filename, fileContents);
+			}
+			this.logger.info(`Successfully exported ${i} credentials.`);
+		} else {
+			const fileContents = JSON.stringify(credentials, null, flags.pretty ? 2 : undefined);
+			if (flags.output) {
+				fs.writeFileSync(flags.output, fileContents);
+				this.logger.info(`Successfully exported ${credentials.length} credentials.`);
 			} else {
-				const fileContents = JSON.stringify(credentials, null, flags.pretty ? 2 : undefined);
-				if (flags.output) {
-					fs.writeFileSync(flags.output, fileContents);
-					console.info(`Successfully exported ${credentials.length} credentials.`);
-				} else {
-					console.info(fileContents);
-				}
+				this.logger.info(fileContents);
 			}
-			// Force exit as process won't exit using MySQL or Postgres.
-			process.exit(0);
-		} catch (error) {
-			console.error('Error exporting credentials. See log messages for details.');
-			logger.error(error.message);
-			this.exit(1);
 		}
 	}
+
+	async catch(error: Error) {
+		this.logger.error('Error exporting credentials. See log messages for details.');
+		this.logger.error(error.message);
+	}
 }
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 14b46cbcd9653b..6a3d3cdf52d55e 100644
--- a/packages/cli/src/commands/export/workflow.ts
+++ b/packages/cli/src/commands/export/workflow.ts
@@ -1,17 +1,11 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
-import { Command, flags } from '@oclif/command';
-
-import type { IDataObject } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-
+import { flags } from '@oclif/command';
 import fs from 'fs';
 import path from 'path';
-import { getLogger } from '@/Logger';
+import type { IDataObject } from 'n8n-workflow';
 import * as Db from '@/Db';
+import { BaseCommand } from '../BaseCommand';
 
-export class ExportWorkflowsCommand extends Command {
+export class ExportWorkflowsCommand extends BaseCommand {
 	static description = 'Export workflows';
 
 	static examples = [
@@ -46,11 +40,7 @@ export class ExportWorkflowsCommand extends Command {
 		}),
 	};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(ExportWorkflowsCommand);
 
@@ -61,98 +51,97 @@ export class ExportWorkflowsCommand extends Command {
 		}
 
 		if (!flags.all && !flags.id) {
-			console.info('Either option "--all" or "--id" have to be set!');
+			this.logger.info('Either option "--all" or "--id" have to be set!');
 			return;
 		}
 
 		if (flags.all && flags.id) {
-			console.info('You should either use "--all" or "--id" but never both!');
+			this.logger.info('You should either use "--all" or "--id" but never both!');
 			return;
 		}
 
 		if (flags.separate) {
 			try {
 				if (!flags.output) {
-					console.info('You must inform an output directory via --output when using --separate');
+					this.logger.info(
+						'You must inform an output directory via --output when using --separate',
+					);
 					return;
 				}
 
 				if (fs.existsSync(flags.output)) {
 					if (!fs.lstatSync(flags.output).isDirectory()) {
-						console.info('The parameter --output must be a directory');
+						this.logger.info('The parameter --output must be a directory');
 						return;
 					}
 				} else {
 					fs.mkdirSync(flags.output, { recursive: true });
 				}
 			} catch (e) {
-				console.error(
+				this.logger.error(
 					'Aborting execution as a filesystem error has been encountered while creating the output directory. See log messages for details.',
 				);
-				logger.error('\nFILESYSTEM ERROR');
-				logger.info('====================================');
-				logger.error(e.message);
-				logger.error(e.stack);
+				this.logger.error('\nFILESYSTEM ERROR');
+				this.logger.info('====================================');
+				if (e instanceof Error) {
+					this.logger.error(e.message);
+					this.logger.error(e.stack!);
+				}
 				this.exit(1);
 			}
 		} else if (flags.output) {
 			if (fs.existsSync(flags.output)) {
 				if (fs.lstatSync(flags.output).isDirectory()) {
-					console.info('The parameter --output must be a writeable file');
+					this.logger.info('The parameter --output must be a writeable file');
 					return;
 				}
 			}
 		}
 
-		try {
-			await Db.init();
+		const findQuery: IDataObject = {};
+		if (flags.id) {
+			findQuery.id = flags.id;
+		}
 
-			const findQuery: IDataObject = {};
-			if (flags.id) {
-				findQuery.id = flags.id;
-			}
+		const workflows = await Db.collections.Workflow.find({
+			where: findQuery,
+			relations: ['tags'],
+		});
 
-			const workflows = await Db.collections.Workflow.find({
-				where: findQuery,
-				relations: ['tags'],
-			});
+		if (workflows.length === 0) {
+			throw new Error('No workflows found with specified filters.');
+		}
 
-			if (workflows.length === 0) {
-				throw new Error('No workflows found with specified filters.');
+		if (flags.separate) {
+			let fileContents: string;
+			let i: number;
+			for (i = 0; i < workflows.length; i++) {
+				fileContents = JSON.stringify(workflows[i], null, flags.pretty ? 2 : undefined);
+				const filename = `${
+					// eslint-disable-next-line @typescript-eslint/restrict-plus-operands, @typescript-eslint/no-non-null-assertion
+					(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
+					workflows[i].id
+				}.json`;
+				fs.writeFileSync(filename, fileContents);
 			}
-
-			if (flags.separate) {
-				let fileContents: string;
-				let i: number;
-				for (i = 0; i < workflows.length; i++) {
-					fileContents = JSON.stringify(workflows[i], null, flags.pretty ? 2 : undefined);
-					const filename = `${
-						// eslint-disable-next-line @typescript-eslint/restrict-plus-operands, @typescript-eslint/no-non-null-assertion
-						(flags.output!.endsWith(path.sep) ? flags.output! : flags.output + path.sep) +
-						workflows[i].id
-					}.json`;
-					fs.writeFileSync(filename, fileContents);
-				}
-				console.info(`Successfully exported ${i} workflows.`);
+			this.logger.info(`Successfully exported ${i} workflows.`);
+		} else {
+			const fileContents = JSON.stringify(workflows, null, flags.pretty ? 2 : undefined);
+			if (flags.output) {
+				fs.writeFileSync(flags.output, fileContents);
+				this.logger.info(
+					`Successfully exported ${workflows.length} ${
+						workflows.length === 1 ? 'workflow.' : 'workflows.'
+					}`,
+				);
 			} else {
-				const fileContents = JSON.stringify(workflows, null, flags.pretty ? 2 : undefined);
-				if (flags.output) {
-					fs.writeFileSync(flags.output, fileContents);
-					console.info(
-						`Successfully exported ${workflows.length} ${
-							workflows.length === 1 ? 'workflow.' : 'workflows.'
-						}`,
-					);
-				} else {
-					console.info(fileContents);
-				}
+				this.logger.info(fileContents);
 			}
-			// Force exit as process won't exit using MySQL or Postgres.
-			process.exit(0);
-		} catch (error) {
-			console.error('Error exporting workflows. See log messages for details.');
-			logger.error(error.message);
-			this.exit(1);
 		}
 	}
+
+	async catch(error: Error) {
+		this.logger.error('Error exporting workflows. See log messages for details.');
+		this.logger.error(error.message);
+	}
 }
diff --git a/packages/cli/src/commands/import/credentials.ts b/packages/cli/src/commands/import/credentials.ts
index be0e2de7bd3ee7..efed0a972cab5d 100644
--- a/packages/cli/src/commands/import/credentials.ts
+++ b/packages/cli/src/commands/import/credentials.ts
@@ -1,18 +1,8 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
-import { Command, flags } from '@oclif/command';
-import { Credentials, UserSettings } from 'n8n-core';
-import { LoggerProxy } from 'n8n-workflow';
+import { flags } from '@oclif/command';
+import { Credentials } from 'n8n-core';
 import fs from 'fs';
 import glob from 'fast-glob';
 import type { EntityManager } from 'typeorm';
-import { getLogger } from '@/Logger';
 import config from '@/config';
 import * as Db from '@/Db';
 import type { User } from '@db/entities/User';
@@ -20,11 +10,11 @@ import { SharedCredentials } from '@db/entities/SharedCredentials';
 import type { Role } from '@db/entities/Role';
 import { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
+import { BaseCommand, UM_FIX_INSTRUCTION } from '../BaseCommand';
+import type { ICredentialsEncrypted } from 'n8n-workflow';
+import { jsonParse } from 'n8n-workflow';
 
-const FIX_INSTRUCTION =
-	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
-
-export class ImportCredentialsCommand extends Command {
+export class ImportCredentialsCommand extends BaseCommand {
 	static description = 'Import credentials';
 
 	static examples = [
@@ -48,25 +38,28 @@ export class ImportCredentialsCommand extends Command {
 		}),
 	};
 
-	ownerCredentialRole: Role;
+	private ownerCredentialRole: Role;
 
-	transactionManager: EntityManager;
+	private transactionManager: EntityManager;
 
-	async run(): Promise<void> {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
+	async init() {
+		disableAutoGeneratedIds(CredentialsEntity);
+		await super.init();
+	}
 
+	async run(): Promise<void> {
+		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(ImportCredentialsCommand);
 
 		if (!flags.input) {
-			console.info('An input file or directory with --input must be provided');
+			this.logger.info('An input file or directory with --input must be provided');
 			return;
 		}
 
 		if (flags.separate) {
 			if (fs.existsSync(flags.input)) {
 				if (!fs.lstatSync(flags.input).isDirectory()) {
-					console.info('The argument to --input must be a directory');
+					this.logger.info('The argument to --input must be a directory');
 					return;
 				}
 			}
@@ -74,82 +67,82 @@ export class ImportCredentialsCommand extends Command {
 
 		let totalImported = 0;
 
-		try {
-			disableAutoGeneratedIds(CredentialsEntity);
-			await Db.init();
-
-			await this.initOwnerCredentialRole();
-			const user = flags.userId ? await this.getAssignee(flags.userId) : await this.getOwner();
-
-			// Make sure the settings exist
-			await UserSettings.prepareUserSettings();
-
-			const encryptionKey = await UserSettings.getEncryptionKey();
-
-			if (flags.separate) {
-				let { input: inputPath } = flags;
-
-				if (process.platform === 'win32') {
-					inputPath = inputPath.replace(/\\/g, '/');
-				}
-
-				const files = await glob('*.json', {
-					cwd: inputPath,
-					absolute: true,
-				});
-
-				totalImported = files.length;
+		await this.initOwnerCredentialRole();
+		const user = flags.userId ? await this.getAssignee(flags.userId) : await this.getOwner();
 
-				await Db.getConnection().transaction(async (transactionManager) => {
-					this.transactionManager = transactionManager;
-					for (const file of files) {
-						const credential = JSON.parse(fs.readFileSync(file, { encoding: 'utf8' }));
+		const encryptionKey = this.userSettings.encryptionKey;
 
-						if (typeof credential.data === 'object') {
-							// plain data / decrypted input. Should be encrypted first.
-							Credentials.prototype.setData.call(credential, credential.data, encryptionKey);
-						}
-
-						await this.storeCredential(credential, user);
-					}
-				});
+		if (flags.separate) {
+			let { input: inputPath } = flags;
 
-				this.reportSuccess(totalImported);
-				process.exit();
+			if (process.platform === 'win32') {
+				inputPath = inputPath.replace(/\\/g, '/');
 			}
 
-			const credentials = JSON.parse(fs.readFileSync(flags.input, { encoding: 'utf8' }));
-
-			totalImported = credentials.length;
+			const files = await glob('*.json', {
+				cwd: inputPath,
+				absolute: true,
+			});
 
-			if (!Array.isArray(credentials)) {
-				throw new Error(
-					'File does not seem to contain credentials. Make sure the credentials are contained in an array.',
-				);
-			}
+			totalImported = files.length;
 
 			await Db.getConnection().transaction(async (transactionManager) => {
 				this.transactionManager = transactionManager;
-				for (const credential of credentials) {
+				for (const file of files) {
+					const credential = jsonParse<ICredentialsEncrypted>(
+						fs.readFileSync(file, { encoding: 'utf8' }),
+					);
+
 					if (typeof credential.data === 'object') {
 						// plain data / decrypted input. Should be encrypted first.
 						Credentials.prototype.setData.call(credential, credential.data, encryptionKey);
 					}
+
 					await this.storeCredential(credential, user);
 				}
 			});
 
 			this.reportSuccess(totalImported);
-			process.exit();
-		} catch (error) {
-			console.error('An error occurred while importing credentials. See log messages for details.');
-			if (error instanceof Error) logger.error(error.message);
-			this.exit(1);
+			return;
+		}
+
+		const credentials = jsonParse<ICredentialsEncrypted[]>(
+			fs.readFileSync(flags.input, { encoding: 'utf8' }),
+		);
+
+		totalImported = credentials.length;
+
+		if (!Array.isArray(credentials)) {
+			throw new Error(
+				'File does not seem to contain credentials. Make sure the credentials are contained in an array.',
+			);
 		}
+
+		await Db.getConnection().transaction(async (transactionManager) => {
+			this.transactionManager = transactionManager;
+			for (const credential of credentials) {
+				if (typeof credential.data === 'object') {
+					// plain data / decrypted input. Should be encrypted first.
+					Credentials.prototype.setData.call(credential, credential.data, encryptionKey);
+				}
+				await this.storeCredential(credential, user);
+			}
+		});
+
+		this.reportSuccess(totalImported);
+	}
+
+	async catch(error: Error) {
+		this.logger.error(
+			'An error occurred while importing credentials. See log messages for details.',
+		);
+		this.logger.error(error.message);
 	}
 
 	private reportSuccess(total: number) {
-		console.info(`Successfully imported ${total} ${total === 1 ? 'credential.' : 'credentials.'}`);
+		this.logger.info(
+			`Successfully imported ${total} ${total === 1 ? 'credential.' : 'credentials.'}`,
+		);
 	}
 
 	private async initOwnerCredentialRole() {
@@ -158,7 +151,7 @@ export class ImportCredentialsCommand extends Command {
 		});
 
 		if (!ownerCredentialRole) {
-			throw new Error(`Failed to find owner credential role. ${FIX_INSTRUCTION}`);
+			throw new Error(`Failed to find owner credential role. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		this.ownerCredentialRole = ownerCredentialRole;
@@ -169,7 +162,7 @@ export class ImportCredentialsCommand extends Command {
 		await this.transactionManager.upsert(
 			SharedCredentials,
 			{
-				credentialsId: result.identifiers[0].id,
+				credentialsId: result.identifiers[0].id as string,
 				userId: user.id,
 				roleId: this.ownerCredentialRole.id,
 			},
@@ -192,7 +185,7 @@ export class ImportCredentialsCommand extends Command {
 			(await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole.id }));
 
 		if (!owner) {
-			throw new Error(`Failed to find owner. ${FIX_INSTRUCTION}`);
+			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return owner;
diff --git a/packages/cli/src/commands/import/workflow.ts b/packages/cli/src/commands/import/workflow.ts
index 027c77bc58045c..df93f7f79fac9a 100644
--- a/packages/cli/src/commands/import/workflow.ts
+++ b/packages/cli/src/commands/import/workflow.ts
@@ -1,23 +1,10 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable no-restricted-syntax */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-loop-func */
-/* eslint-disable no-await-in-loop */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable no-console */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import { Command, flags } from '@oclif/command';
+import { flags } from '@oclif/command';
 import type { INode, INodeCredentialsDetails } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
+import { jsonParse } from 'n8n-workflow';
 import fs from 'fs';
 import glob from 'fast-glob';
-import { UserSettings } from 'n8n-core';
 import type { EntityManager } from 'typeorm';
 import { v4 as uuid } from 'uuid';
-import { getLogger } from '@/Logger';
 import config from '@/config';
 import * as Db from '@/Db';
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
@@ -28,9 +15,7 @@ import { setTagsForImport } from '@/TagHelpers';
 import type { ICredentialsDb, IWorkflowToImport } from '@/Interfaces';
 import { disableAutoGeneratedIds } from '@db/utils/commandHelpers';
 import { replaceInvalidCredentials } from '@/WorkflowHelpers';
-
-const FIX_INSTRUCTION =
-	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
+import { BaseCommand, UM_FIX_INSTRUCTION } from '../BaseCommand';
 
 function assertHasWorkflowsToImport(workflows: unknown): asserts workflows is IWorkflowToImport[] {
 	if (!Array.isArray(workflows)) {
@@ -50,7 +35,7 @@ function assertHasWorkflowsToImport(workflows: unknown): asserts workflows is IW
 	}
 }
 
-export class ImportWorkflowsCommand extends Command {
+export class ImportWorkflowsCommand extends BaseCommand {
 	static description = 'Import workflows';
 
 	static examples = [
@@ -74,118 +59,74 @@ export class ImportWorkflowsCommand extends Command {
 		}),
 	};
 
-	ownerWorkflowRole: Role;
+	private ownerWorkflowRole: Role;
 
-	transactionManager: EntityManager;
+	private transactionManager: EntityManager;
 
-	async run(): Promise<void> {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
+	async init() {
+		disableAutoGeneratedIds(WorkflowEntity);
+		await super.init();
+	}
 
+	async run(): Promise<void> {
+		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(ImportWorkflowsCommand);
 
 		if (!flags.input) {
-			console.info('An input file or directory with --input must be provided');
+			this.logger.info('An input file or directory with --input must be provided');
 			return;
 		}
 
 		if (flags.separate) {
 			if (fs.existsSync(flags.input)) {
 				if (!fs.lstatSync(flags.input).isDirectory()) {
-					console.info('The argument to --input must be a directory');
+					this.logger.info('The argument to --input must be a directory');
 					return;
 				}
 			}
 		}
 
-		try {
-			disableAutoGeneratedIds(WorkflowEntity);
-
-			await Db.init();
-
-			await this.initOwnerWorkflowRole();
-			const user = flags.userId ? await this.getAssignee(flags.userId) : await this.getOwner();
-
-			// Make sure the settings exist
-			await UserSettings.prepareUserSettings();
-			const credentials = await Db.collections.Credentials.find();
-			const tags = await Db.collections.Tag.find();
-
-			let totalImported = 0;
-
-			if (flags.separate) {
-				let { input: inputPath } = flags;
-
-				if (process.platform === 'win32') {
-					inputPath = inputPath.replace(/\\/g, '/');
-				}
-
-				const files = await glob('*.json', {
-					cwd: inputPath,
-					absolute: true,
-				});
+		await this.initOwnerWorkflowRole();
+		const user = flags.userId ? await this.getAssignee(flags.userId) : await this.getOwner();
 
-				totalImported = files.length;
-				console.info(`Importing ${totalImported} workflows...`);
-				await Db.getConnection().transaction(async (transactionManager) => {
-					this.transactionManager = transactionManager;
+		const credentials = await Db.collections.Credentials.find();
+		const tags = await Db.collections.Tag.find();
 
-					for (const file of files) {
-						const workflow = JSON.parse(fs.readFileSync(file, { encoding: 'utf8' }));
+		let totalImported = 0;
 
-						if (credentials.length > 0) {
-							workflow.nodes.forEach((node: INode) => {
-								this.transformCredentials(node, credentials);
-
-								if (!node.id) {
-									// eslint-disable-next-line no-param-reassign
-									node.id = uuid();
-								}
-							});
-						}
-
-						if (Object.prototype.hasOwnProperty.call(workflow, 'tags')) {
-							await setTagsForImport(transactionManager, workflow, tags);
-						}
-
-						await this.storeWorkflow(workflow, user);
-					}
-				});
+		if (flags.separate) {
+			let { input: inputPath } = flags;
 
-				this.reportSuccess(totalImported);
-				process.exit();
+			if (process.platform === 'win32') {
+				inputPath = inputPath.replace(/\\/g, '/');
 			}
 
-			const workflows = JSON.parse(fs.readFileSync(flags.input, { encoding: 'utf8' }));
-
-			assertHasWorkflowsToImport(workflows);
-
-			totalImported = workflows.length;
+			const files = await glob('*.json', {
+				cwd: inputPath,
+				absolute: true,
+			});
 
+			totalImported = files.length;
+			this.logger.info(`Importing ${totalImported} workflows...`);
 			await Db.getConnection().transaction(async (transactionManager) => {
 				this.transactionManager = transactionManager;
 
-				for (const workflow of workflows) {
-					let oldCredentialFormat = false;
+				for (const file of files) {
+					const workflow = jsonParse<IWorkflowToImport>(
+						fs.readFileSync(file, { encoding: 'utf8' }),
+					);
+
 					if (credentials.length > 0) {
 						workflow.nodes.forEach((node: INode) => {
 							this.transformCredentials(node, credentials);
+
 							if (!node.id) {
 								// eslint-disable-next-line no-param-reassign
 								node.id = uuid();
 							}
-							if (!node.credentials?.id) {
-								oldCredentialFormat = true;
-							}
 						});
 					}
-					if (oldCredentialFormat) {
-						try {
-							await replaceInvalidCredentials(workflow as unknown as WorkflowEntity);
-						} catch (error) {
-							console.log(error);
-						}
-					}
+
 					if (Object.prototype.hasOwnProperty.call(workflow, 'tags')) {
 						await setTagsForImport(transactionManager, workflow, tags);
 					}
@@ -196,15 +137,58 @@ export class ImportWorkflowsCommand extends Command {
 
 			this.reportSuccess(totalImported);
 			process.exit();
-		} catch (error) {
-			console.error('An error occurred while importing workflows. See log messages for details.');
-			if (error instanceof Error) logger.error(error.message);
-			this.exit(1);
 		}
+
+		const workflows = jsonParse<IWorkflowToImport[]>(
+			fs.readFileSync(flags.input, { encoding: 'utf8' }),
+		);
+
+		assertHasWorkflowsToImport(workflows);
+
+		totalImported = workflows.length;
+
+		await Db.getConnection().transaction(async (transactionManager) => {
+			this.transactionManager = transactionManager;
+
+			for (const workflow of workflows) {
+				let oldCredentialFormat = false;
+				if (credentials.length > 0) {
+					workflow.nodes.forEach((node: INode) => {
+						this.transformCredentials(node, credentials);
+						if (!node.id) {
+							// eslint-disable-next-line no-param-reassign
+							node.id = uuid();
+						}
+						if (!node.credentials?.id) {
+							oldCredentialFormat = true;
+						}
+					});
+				}
+				if (oldCredentialFormat) {
+					try {
+						await replaceInvalidCredentials(workflow as unknown as WorkflowEntity);
+					} catch (error) {
+						this.logger.error('Failed to replace invalid credential', error as Error);
+					}
+				}
+				if (Object.prototype.hasOwnProperty.call(workflow, 'tags')) {
+					await setTagsForImport(transactionManager, workflow, tags);
+				}
+
+				await this.storeWorkflow(workflow, user);
+			}
+		});
+
+		this.reportSuccess(totalImported);
+	}
+
+	async catch(error: Error) {
+		this.logger.error('An error occurred while importing workflows. See log messages for details.');
+		this.logger.error(error.message);
 	}
 
 	private reportSuccess(total: number) {
-		console.info(`Successfully imported ${total} ${total === 1 ? 'workflow.' : 'workflows.'}`);
+		this.logger.info(`Successfully imported ${total} ${total === 1 ? 'workflow.' : 'workflows.'}`);
 	}
 
 	private async initOwnerWorkflowRole() {
@@ -213,7 +197,7 @@ export class ImportWorkflowsCommand extends Command {
 		});
 
 		if (!ownerWorkflowRole) {
-			throw new Error(`Failed to find owner workflow role. ${FIX_INSTRUCTION}`);
+			throw new Error(`Failed to find owner workflow role. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		this.ownerWorkflowRole = ownerWorkflowRole;
@@ -224,7 +208,7 @@ export class ImportWorkflowsCommand extends Command {
 		await this.transactionManager.upsert(
 			SharedWorkflow,
 			{
-				workflowId: result.identifiers[0].id,
+				workflowId: result.identifiers[0].id as string,
 				userId: user.id,
 				roleId: this.ownerWorkflowRole.id,
 			},
@@ -247,7 +231,7 @@ export class ImportWorkflowsCommand extends Command {
 			(await Db.collections.User.findOneBy({ globalRoleId: ownerGlobalRole?.id }));
 
 		if (!owner) {
-			throw new Error(`Failed to find owner. ${FIX_INSTRUCTION}`);
+			throw new Error(`Failed to find owner. ${UM_FIX_INSTRUCTION}`);
 		}
 
 		return owner;
diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts
index 61e420acb024df..7b555fc52ea8ac 100644
--- a/packages/cli/src/commands/ldap/reset.ts
+++ b/packages/cli/src/commands/ldap/reset.ts
@@ -7,14 +7,16 @@ export class Reset extends BaseCommand {
 	static description = '\nResets the database to the default ldap state';
 
 	async run(): Promise<void> {
-		const ldapIdentities = await Db.collections.AuthIdentity.find({
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		const { AuthIdentity, AuthProviderSyncHistory, Settings, User } = Db.collections;
+		const ldapIdentities = await AuthIdentity.find({
 			where: { providerType: 'ldap' },
 			select: ['userId'],
 		});
-		await Db.collections.AuthProviderSyncHistory.delete({ providerType: 'ldap' });
-		await Db.collections.AuthIdentity.delete({ providerType: 'ldap' });
-		await Db.collections.User.delete({ id: In(ldapIdentities.map((i) => i.userId)) });
-		await Db.collections.Settings.delete({ key: LDAP_FEATURE_NAME });
+		await AuthProviderSyncHistory.delete({ providerType: 'ldap' });
+		await AuthIdentity.delete({ providerType: 'ldap' });
+		await User.delete({ id: In(ldapIdentities.map((i) => i.userId)) });
+		await Settings.delete({ key: LDAP_FEATURE_NAME });
 
 		this.logger.info('Successfully reset the database to default ldap state.');
 	}
@@ -22,6 +24,5 @@ export class Reset extends BaseCommand {
 	async catch(error: Error): Promise<void> {
 		this.logger.error('Error resetting database. See log messages for details.');
 		this.logger.error(error.message);
-		this.exit(1);
 	}
 }
diff --git a/packages/cli/src/commands/license/clear.ts b/packages/cli/src/commands/license/clear.ts
index c2dc3d35faf31e..d7e3bf51d34f02 100644
--- a/packages/cli/src/commands/license/clear.ts
+++ b/packages/cli/src/commands/license/clear.ts
@@ -1,42 +1,25 @@
-import { Command } from '@oclif/command';
-
-import { LoggerProxy } from 'n8n-workflow';
-
 import * as Db from '@/Db';
-
-import { getLogger } from '@/Logger';
 import { SETTINGS_LICENSE_CERT_KEY } from '@/constants';
+import { BaseCommand } from '../BaseCommand';
 
-export class ClearLicenseCommand extends Command {
+export class ClearLicenseCommand extends BaseCommand {
 	static description = 'Clear license';
 
 	static examples = ['$ n8n clear:license'];
 
 	async run() {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-
-		try {
-			await Db.init();
-
-			console.info('Clearing license from database.');
-			await Db.collections.Settings.delete({
-				key: SETTINGS_LICENSE_CERT_KEY,
-			});
-			console.info('Done. Restart n8n to take effect.');
-		} catch (e: unknown) {
-			console.error('Error updating database. See log messages for details.');
-			logger.error('\nGOT ERROR');
-			logger.info('====================================');
-			if (e instanceof Error) {
-				logger.error(e.message);
-				if (e.stack) {
-					logger.error(e.stack);
-				}
-			}
-			this.exit(1);
-		}
+		this.logger.info('Clearing license from database.');
+		await Db.collections.Settings.delete({
+			key: SETTINGS_LICENSE_CERT_KEY,
+		});
+		this.logger.info('Done. Restart n8n to take effect.');
+	}
 
-		this.exit();
+	async catch(error: Error) {
+		this.logger.error('Error updating database. See log messages for details.');
+		this.logger.error('\nGOT ERROR');
+		this.logger.info('====================================');
+		this.logger.error(error.message);
+		this.logger.error(error.stack!);
 	}
 }
diff --git a/packages/cli/src/commands/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts
index 95ab06dfb8bb1f..240e56d4fdeddd 100644
--- a/packages/cli/src/commands/list/workflow.ts
+++ b/packages/cli/src/commands/list/workflow.ts
@@ -1,12 +1,9 @@
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable no-console */
-import { Command, flags } from '@oclif/command';
-
+import { flags } from '@oclif/command';
 import type { IDataObject } from 'n8n-workflow';
-
 import * as Db from '@/Db';
+import { BaseCommand } from '../BaseCommand';
 
-export class ListWorkflowCommand extends Command {
+export class ListWorkflowCommand extends BaseCommand {
 	static description = '\nList workflows';
 
 	static examples = [
@@ -25,7 +22,6 @@ export class ListWorkflowCommand extends Command {
 		}),
 	};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(ListWorkflowCommand);
@@ -34,28 +30,23 @@ export class ListWorkflowCommand extends Command {
 			this.error('The --active flag has to be passed using true or false');
 		}
 
-		try {
-			await Db.init();
-
-			const findQuery: IDataObject = {};
-			if (flags.active !== undefined) {
-				findQuery.active = flags.active === 'true';
-			}
-
-			const workflows = await Db.collections.Workflow.find(findQuery);
-			if (flags.onlyId) {
-				workflows.forEach((workflow) => console.log(workflow.id));
-			} else {
-				workflows.forEach((workflow) => console.log(`${workflow.id}|${workflow.name}`));
-			}
-		} catch (e) {
-			console.error('\nGOT ERROR');
-			console.log('====================================');
-			console.error(e.message);
-			console.error(e.stack);
-			this.exit(1);
+		const findQuery: IDataObject = {};
+		if (flags.active !== undefined) {
+			findQuery.active = flags.active === 'true';
 		}
 
-		this.exit();
+		const workflows = await Db.collections.Workflow.find(findQuery);
+		if (flags.onlyId) {
+			workflows.forEach((workflow) => this.logger.info(workflow.id));
+		} else {
+			workflows.forEach((workflow) => this.logger.info(`${workflow.id}|${workflow.name}`));
+		}
+	}
+
+	async catch(error: Error) {
+		this.logger.error('\nGOT ERROR');
+		this.logger.error('====================================');
+		this.logger.error(error.message);
+		this.logger.error(error.stack!);
 	}
 }
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 90b495fe791b4c..28b092783037f6 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -6,39 +6,31 @@ import path from 'path';
 import { mkdir } from 'fs/promises';
 import { createReadStream, createWriteStream, existsSync } from 'fs';
 import localtunnel from 'localtunnel';
-import { BinaryDataManager, TUNNEL_SUBDOMAIN_ENV, UserSettings } from 'n8n-core';
-import { Command, flags } from '@oclif/command';
+import { TUNNEL_SUBDOMAIN_ENV, UserSettings } from 'n8n-core';
+import { flags } from '@oclif/command';
 import stream from 'stream';
 import replaceStream from 'replacestream';
 import { promisify } from 'util';
 import glob from 'fast-glob';
 
-import { LoggerProxy, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
+import { LoggerProxy, sleep, jsonParse } from 'n8n-workflow';
 import { createHash } from 'crypto';
 import config from '@/config';
 
 import * as ActiveExecutions from '@/ActiveExecutions';
 import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { CredentialTypes } from '@/CredentialTypes';
 import * as Db from '@/Db';
-import { ExternalHooks } from '@/ExternalHooks';
 import * as GenericHelpers from '@/GenericHelpers';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { NodeTypes } from '@/NodeTypes';
 import { InternalHooksManager } from '@/InternalHooksManager';
 import * as Server from '@/Server';
 import * as TestWebhooks from '@/TestWebhooks';
 import { WaitTracker } from '@/WaitTracker';
-
-import { getLogger } from '@/Logger';
 import { getAllInstalledPackages } from '@/CommunityNodes/packageModel';
 import { handleLdapInit } from '@/Ldap/helpers';
-import { initErrorHandling } from '@/ErrorReporting';
-import * as CrashJournal from '@/CrashJournal';
 import { createPostHogLoadingScript } from '@/telemetry/scripts';
 import { EDITOR_UI_DIST_DIR, GENERATED_STATIC_DIR } from '@/constants';
-import { eventBus } from '../eventbus';
+import { eventBus } from '@/eventbus';
+import { BaseCommand } from './BaseCommand';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const open = require('open');
@@ -46,21 +38,7 @@ const pipeline = promisify(stream.pipeline);
 
 let activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner | undefined;
 
-const exitWithCrash = async (message: string, error: unknown) => {
-	ErrorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
-	await sleep(2000);
-	process.exit(1);
-};
-
-const exitSuccessFully = async () => {
-	try {
-		await CrashJournal.cleanup();
-	} finally {
-		process.exit();
-	}
-};
-
-export class Start extends Command {
+export class Start extends BaseCommand {
 	static description = 'Starts n8n. Makes Web-UI available and starts active workflows';
 
 	static examples = [
@@ -89,8 +67,7 @@ export class Start extends Command {
 	/**
 	 * Opens the UI in browser
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	static openBrowser() {
+	private openBrowser() {
 		const editorUrl = GenericHelpers.getBaseUrl();
 
 		// eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -106,22 +83,20 @@ export class Start extends Command {
 	 * Make for example sure that all the webhooks from third party services
 	 * get removed.
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	static async stopProcess() {
-		getLogger().info('\nStopping n8n...');
+	async stopProcess() {
+		this.logger.info('\nStopping n8n...');
 
 		try {
 			// Stop with trying to activate workflows that could not be activated
 			activeWorkflowRunner?.removeAllQueuedWorkflowActivations();
 
-			const externalHooks = ExternalHooks();
-			await externalHooks.run('n8n.stop', []);
+			await this.externalHooks.run('n8n.stop', []);
 
 			setTimeout(async () => {
 				// In case that something goes wrong with shutdown we
 				// kill after max. 30 seconds no matter what
 				console.log('process exited after 30s');
-				await exitSuccessFully();
+				await this.exitSuccessFully();
 			}, 30000);
 
 			await InternalHooksManager.getInstance().onN8nStop();
@@ -162,13 +137,13 @@ export class Start extends Command {
 			//finally shut down Event Bus
 			await eventBus.close();
 		} catch (error) {
-			await exitWithCrash('There was an error shutting down n8n.', error);
+			await this.exitWithCrash('There was an error shutting down n8n.', error);
 		}
 
-		await exitSuccessFully();
+		await this.exitSuccessFully();
 	}
 
-	static async generateStaticAssets() {
+	private async generateStaticAssets() {
 		// Read the index file and replace the path placeholder
 		const n8nPath = config.getEnv('path');
 		const hooksUrls = config.getEnv('externalFrontendHooksUrls');
@@ -223,239 +198,206 @@ export class Start extends Command {
 		await Promise.all(files.map(compileFile));
 	}
 
-	async run() {
+	async init() {
 		// Make sure that n8n shuts down gracefully if possible
-		process.once('SIGTERM', Start.stopProcess);
-		process.once('SIGINT', Start.stopProcess);
+		process.once('SIGTERM', this.stopProcess);
+		process.once('SIGINT', this.stopProcess);
 
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-		logger.info('Initializing n8n process');
+		await this.initCrashJournal();
+		await super.init();
+		this.logger.info('Initializing n8n process');
 
-		await initErrorHandling();
-		await CrashJournal.init();
+		await this.initBinaryManager();
+		await this.initExternalHooks();
+
+		if (!config.getEnv('endpoints.disableUi')) {
+			await this.generateStaticAssets();
+		}
+	}
 
+	async run() {
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(Start);
 
-		try {
-			// Load all node and credential types
-			const loadNodesAndCredentials = LoadNodesAndCredentials();
-			await loadNodesAndCredentials.init();
-
-			// Add the found types to an instance other parts of the application can use
-			const nodeTypes = NodeTypes(loadNodesAndCredentials);
-			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
-
-			// Start directly with the init of the database to improve startup time
-			await Db.init().catch(async (error: Error) =>
-				exitWithCrash('There was an error initializing DB', error),
-			);
-
-			// Make sure the settings exist
-			const userSettings = await UserSettings.prepareUserSettings();
+		if (!config.getEnv('userManagement.jwtSecret')) {
+			// If we don't have a JWT secret set, generate
+			// one based and save to config.
+			const encryptionKey = await UserSettings.getEncryptionKey();
 
-			if (!config.getEnv('userManagement.jwtSecret')) {
-				// If we don't have a JWT secret set, generate
-				// one based and save to config.
-				const encryptionKey = await UserSettings.getEncryptionKey();
-
-				// For a key off every other letter from encryption key
-				// CAREFUL: do not change this or it breaks all existing tokens.
-				let baseKey = '';
-				for (let i = 0; i < encryptionKey.length; i += 2) {
-					baseKey += encryptionKey[i];
-				}
-				config.set('userManagement.jwtSecret', createHash('sha256').update(baseKey).digest('hex'));
-			}
-
-			if (!config.getEnv('endpoints.disableUi')) {
-				await Start.generateStaticAssets();
+			// For a key off every other letter from encryption key
+			// CAREFUL: do not change this or it breaks all existing tokens.
+			let baseKey = '';
+			for (let i = 0; i < encryptionKey.length; i += 2) {
+				baseKey += encryptionKey[i];
 			}
+			config.set('userManagement.jwtSecret', createHash('sha256').update(baseKey).digest('hex'));
+		}
 
-			// Load all external hooks
-			const externalHooks = ExternalHooks();
-			await externalHooks.init();
-
-			// Load the credentials overwrites if any exist
-			CredentialsOverwrites(credentialTypes);
-
-			await loadNodesAndCredentials.generateTypesForFrontend();
-
-			const installedPackages = await getAllInstalledPackages();
-			const missingPackages = new Set<{
-				packageName: string;
-				version: string;
-			}>();
-			installedPackages.forEach((installedPackage) => {
-				installedPackage.installedNodes.forEach((installedNode) => {
-					if (!loadNodesAndCredentials.known.nodes[installedNode.type]) {
-						// Leave the list ready for installing in case we need.
-						missingPackages.add({
-							packageName: installedPackage.packageName,
-							version: installedPackage.installedVersion,
-						});
-					}
-				});
+		await this.loadNodesAndCredentials.generateTypesForFrontend();
+
+		const installedPackages = await getAllInstalledPackages();
+		const missingPackages = new Set<{
+			packageName: string;
+			version: string;
+		}>();
+		installedPackages.forEach((installedPackage) => {
+			installedPackage.installedNodes.forEach((installedNode) => {
+				if (!this.loadNodesAndCredentials.known.nodes[installedNode.type]) {
+					// Leave the list ready for installing in case we need.
+					missingPackages.add({
+						packageName: installedPackage.packageName,
+						version: installedPackage.installedVersion,
+					});
+				}
 			});
+		});
 
-			await UserSettings.getEncryptionKey();
+		await UserSettings.getEncryptionKey();
 
-			// Load settings from database and set them to config.
-			const databaseSettings = await Db.collections.Settings.findBy({ loadOnStartup: true });
-			databaseSettings.forEach((setting) => {
-				config.set(setting.key, JSON.parse(setting.value));
-			});
+		// Load settings from database and set them to config.
+		const databaseSettings = await Db.collections.Settings.findBy({ loadOnStartup: true });
+		databaseSettings.forEach((setting) => {
+			config.set(setting.key, jsonParse(setting.value));
+		});
+
+		config.set('nodes.packagesMissing', '');
+		if (missingPackages.size) {
+			LoggerProxy.error(
+				'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
+			);
 
-			config.set('nodes.packagesMissing', '');
-			if (missingPackages.size) {
-				LoggerProxy.error(
-					'n8n detected that some packages are missing. For more information, visit https://docs.n8n.io/integrations/community-nodes/troubleshooting/',
-				);
-
-				if (flags.reinstallMissingPackages || process.env.N8N_REINSTALL_MISSING_PACKAGES) {
-					LoggerProxy.info('Attempting to reinstall missing packages', { missingPackages });
-					try {
-						// Optimistic approach - stop if any installation fails
-						// eslint-disable-next-line no-restricted-syntax
-						for (const missingPackage of missingPackages) {
-							// eslint-disable-next-line no-await-in-loop
-							void (await loadNodesAndCredentials.loadNpmModule(
-								missingPackage.packageName,
-								missingPackage.version,
-							));
-							missingPackages.delete(missingPackage);
-						}
-						LoggerProxy.info('Packages reinstalled successfully. Resuming regular initialization.');
-					} catch (error) {
-						LoggerProxy.error('n8n was unable to install the missing packages.');
+			if (flags.reinstallMissingPackages || process.env.N8N_REINSTALL_MISSING_PACKAGES) {
+				LoggerProxy.info('Attempting to reinstall missing packages', { missingPackages });
+				try {
+					// Optimistic approach - stop if any installation fails
+					// eslint-disable-next-line no-restricted-syntax
+					for (const missingPackage of missingPackages) {
+						// eslint-disable-next-line no-await-in-loop
+						void (await this.loadNodesAndCredentials.loadNpmModule(
+							missingPackage.packageName,
+							missingPackage.version,
+						));
+						missingPackages.delete(missingPackage);
 					}
+					LoggerProxy.info('Packages reinstalled successfully. Resuming regular initialization.');
+				} catch (error) {
+					LoggerProxy.error('n8n was unable to install the missing packages.');
 				}
-
-				config.set(
-					'nodes.packagesMissing',
-					Array.from(missingPackages)
-						.map((missingPackage) => `${missingPackage.packageName}@${missingPackage.version}`)
-						.join(' '),
-				);
 			}
 
-			const dbType = config.getEnv('database.type');
-			if (dbType === 'sqlite') {
-				const shouldRunVacuum = config.getEnv('database.sqlite.executeVacuumOnStartup');
-				if (shouldRunVacuum) {
-					// eslint-disable-next-line @typescript-eslint/no-floating-promises
-					await Db.collections.Execution.query('VACUUM;');
-				}
+			config.set(
+				'nodes.packagesMissing',
+				Array.from(missingPackages)
+					.map((missingPackage) => `${missingPackage.packageName}@${missingPackage.version}`)
+					.join(' '),
+			);
+		}
+
+		const dbType = config.getEnv('database.type');
+		if (dbType === 'sqlite') {
+			const shouldRunVacuum = config.getEnv('database.sqlite.executeVacuumOnStartup');
+			if (shouldRunVacuum) {
+				// eslint-disable-next-line @typescript-eslint/no-floating-promises
+				await Db.collections.Execution.query('VACUUM;');
 			}
+		}
 
-			if (flags.tunnel) {
-				this.log('\nWaiting for tunnel ...');
-
-				let tunnelSubdomain;
-				if (
-					process.env[TUNNEL_SUBDOMAIN_ENV] !== undefined &&
-					process.env[TUNNEL_SUBDOMAIN_ENV] !== ''
-				) {
-					tunnelSubdomain = process.env[TUNNEL_SUBDOMAIN_ENV];
-				} else if (userSettings.tunnelSubdomain !== undefined) {
-					tunnelSubdomain = userSettings.tunnelSubdomain;
-				}
+		if (flags.tunnel) {
+			this.log('\nWaiting for tunnel ...');
+
+			let tunnelSubdomain;
+			if (
+				process.env[TUNNEL_SUBDOMAIN_ENV] !== undefined &&
+				process.env[TUNNEL_SUBDOMAIN_ENV] !== ''
+			) {
+				tunnelSubdomain = process.env[TUNNEL_SUBDOMAIN_ENV];
+			} else if (this.userSettings.tunnelSubdomain !== undefined) {
+				tunnelSubdomain = this.userSettings.tunnelSubdomain;
+			}
 
-				if (tunnelSubdomain === undefined) {
-					// When no tunnel subdomain did exist yet create a new random one
-					const availableCharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
-					userSettings.tunnelSubdomain = Array.from({ length: 24 })
-						.map(() => {
-							return availableCharacters.charAt(
-								Math.floor(Math.random() * availableCharacters.length),
-							);
-						})
-						.join('');
-
-					await UserSettings.writeUserSettings(userSettings);
-				}
+			if (tunnelSubdomain === undefined) {
+				// When no tunnel subdomain did exist yet create a new random one
+				const availableCharacters = 'abcdefghijklmnopqrstuvwxyz0123456789';
+				this.userSettings.tunnelSubdomain = Array.from({ length: 24 })
+					.map(() => {
+						return availableCharacters.charAt(
+							Math.floor(Math.random() * availableCharacters.length),
+						);
+					})
+					.join('');
+
+				await UserSettings.writeUserSettings(this.userSettings);
+			}
 
-				const tunnelSettings: localtunnel.TunnelConfig = {
-					host: 'https://hooks.n8n.cloud',
-					subdomain: tunnelSubdomain,
-				};
+			const tunnelSettings: localtunnel.TunnelConfig = {
+				host: 'https://hooks.n8n.cloud',
+				subdomain: tunnelSubdomain,
+			};
 
-				const port = config.getEnv('port');
+			const port = config.getEnv('port');
 
-				// @ts-ignore
-				const webhookTunnel = await localtunnel(port, tunnelSettings);
+			// @ts-ignore
+			const webhookTunnel = await localtunnel(port, tunnelSettings);
 
-				process.env.WEBHOOK_URL = `${webhookTunnel.url}/`;
-				this.log(`Tunnel URL: ${process.env.WEBHOOK_URL}\n`);
-				this.log(
-					'IMPORTANT! Do not share with anybody as it would give people access to your n8n instance!',
-				);
-			}
+			process.env.WEBHOOK_URL = `${webhookTunnel.url}/`;
+			this.log(`Tunnel URL: ${process.env.WEBHOOK_URL}\n`);
+			this.log(
+				'IMPORTANT! Do not share with anybody as it would give people access to your n8n instance!',
+			);
+		}
 
-			const instanceId = await UserSettings.getInstanceId();
-			await InternalHooksManager.init(instanceId, nodeTypes);
+		await Server.start();
 
-			const binaryDataConfig = config.getEnv('binaryDataManager');
-			await BinaryDataManager.init(binaryDataConfig, true);
+		// Start to get active workflows and run their triggers
+		activeWorkflowRunner = ActiveWorkflowRunner.getInstance();
+		await activeWorkflowRunner.init();
 
-			await Server.start();
+		WaitTracker();
 
-			// Start to get active workflows and run their triggers
-			activeWorkflowRunner = ActiveWorkflowRunner.getInstance();
-			await activeWorkflowRunner.init();
+		await handleLdapInit();
 
-			WaitTracker();
+		const editorUrl = GenericHelpers.getBaseUrl();
+		this.log(`\nEditor is now accessible via:\n${editorUrl}`);
 
-			await handleLdapInit();
+		const saveManualExecutions = config.getEnv('executions.saveDataManualExecutions');
 
-			const editorUrl = GenericHelpers.getBaseUrl();
-			this.log(`\nEditor is now accessible via:\n${editorUrl}`);
+		if (saveManualExecutions) {
+			this.log('\nManual executions will be visible only for the owner');
+		}
 
-			const saveManualExecutions = config.getEnv('executions.saveDataManualExecutions');
+		// Allow to open n8n editor by pressing "o"
+		if (Boolean(process.stdout.isTTY) && process.stdin.setRawMode) {
+			process.stdin.setRawMode(true);
+			process.stdin.resume();
+			process.stdin.setEncoding('utf8');
 
-			if (saveManualExecutions) {
-				this.log('\nManual executions will be visible only for the owner');
+			if (flags.open) {
+				this.openBrowser();
 			}
-
-			// Allow to open n8n editor by pressing "o"
-			if (Boolean(process.stdout.isTTY) && process.stdin.setRawMode) {
-				process.stdin.setRawMode(true);
-				process.stdin.resume();
-				process.stdin.setEncoding('utf8');
-				// eslint-disable-next-line @typescript-eslint/no-unused-vars
-				let inputText = '';
-
-				if (flags.open) {
-					Start.openBrowser();
-				}
-				this.log('\nPress "o" to open in Browser.');
-				process.stdin.on('data', (key: string) => {
-					if (key === 'o') {
-						Start.openBrowser();
-						inputText = '';
-					} else if (key.charCodeAt(0) === 3) {
-						// Ctrl + c got pressed
-						// eslint-disable-next-line @typescript-eslint/no-floating-promises
-						Start.stopProcess();
+			this.log('\nPress "o" to open in Browser.');
+			process.stdin.on('data', (key: string) => {
+				if (key === 'o') {
+					this.openBrowser();
+				} else if (key.charCodeAt(0) === 3) {
+					// Ctrl + c got pressed
+					// eslint-disable-next-line @typescript-eslint/no-floating-promises
+					this.stopProcess();
+				} else {
+					// When anything else got pressed, record it and send it on enter into the child process
+					// eslint-disable-next-line no-lonely-if
+					if (key.charCodeAt(0) === 13) {
+						// send to child process and print in terminal
+						process.stdout.write('\n');
 					} else {
-						// When anything else got pressed, record it and send it on enter into the child process
-						// eslint-disable-next-line no-lonely-if
-						if (key.charCodeAt(0) === 13) {
-							// send to child process and print in terminal
-							process.stdout.write('\n');
-							inputText = '';
-						} else {
-							// record it and write into terminal
-							// eslint-disable-next-line @typescript-eslint/no-unused-vars
-							inputText += key;
-							process.stdout.write(key);
-						}
+						// record it and write into terminal
+						process.stdout.write(key);
 					}
-				});
-			}
-		} catch (error) {
-			await exitWithCrash('There was an error', error);
+				}
+			});
 		}
 	}
+
+	async catch(error: Error) {
+		await this.exitWithCrash('Exiting due to an error.', error);
+	}
 }
diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts
index 94ef751e752324..a26fd805165604 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -1,16 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable no-console */
-import { Command, flags } from '@oclif/command';
-
+import { flags } from '@oclif/command';
 import type { IDataObject } from 'n8n-workflow';
-import { LoggerProxy } from 'n8n-workflow';
-
 import * as Db from '@/Db';
+import { BaseCommand } from '../BaseCommand';
 
-import { getLogger } from '@/Logger';
-
-export class UpdateWorkflowCommand extends Command {
+export class UpdateWorkflowCommand extends BaseCommand {
 	static description = 'Update workflows';
 
 	static examples = [
@@ -31,11 +27,7 @@ export class UpdateWorkflowCommand extends Command {
 		}),
 	};
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async run() {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(UpdateWorkflowCommand);
 
@@ -56,35 +48,32 @@ export class UpdateWorkflowCommand extends Command {
 			console.info('No update flag like "--active=true" has been set!');
 			return;
 		}
+
 		if (!['false', 'true'].includes(flags.active)) {
 			console.info('Valid values for flag "--active" are only "false" or "true"!');
 			return;
 		}
-		updateQuery.active = flags.active === 'true';
-
-		try {
-			await Db.init();
 
-			const findQuery: IDataObject = {};
-			if (flags.id) {
-				console.info(`Deactivating workflow with ID: ${flags.id}`);
-				findQuery.id = flags.id;
-			} else {
-				console.info('Deactivating all workflows');
-				findQuery.active = true;
-			}
+		updateQuery.active = flags.active === 'true';
 
-			await Db.collections.Workflow.update(findQuery, updateQuery);
-			console.info('Done');
-		} catch (e) {
-			console.error('Error updating database. See log messages for details.');
-			logger.error('\nGOT ERROR');
-			logger.info('====================================');
-			logger.error(e.message);
-			logger.error(e.stack);
-			this.exit(1);
+		const findQuery: IDataObject = {};
+		if (flags.id) {
+			this.logger.info(`Deactivating workflow with ID: ${flags.id}`);
+			findQuery.id = flags.id;
+		} else {
+			this.logger.info('Deactivating all workflows');
+			findQuery.active = true;
 		}
 
-		this.exit();
+		await Db.collections.Workflow.update(findQuery, updateQuery);
+		this.logger.info('Done');
+	}
+
+	async catch(error: Error) {
+		this.logger.error('Error updating database. See log messages for details.');
+		this.logger.error('\nGOT ERROR');
+		this.logger.error('====================================');
+		this.logger.error(error.message);
+		this.logger.error(error.stack!);
 	}
 }
diff --git a/packages/cli/src/commands/user-management/reset.ts b/packages/cli/src/commands/user-management/reset.ts
index 36179b42dcaa60..8c3bac1a96dc63 100644
--- a/packages/cli/src/commands/user-management/reset.ts
+++ b/packages/cli/src/commands/user-management/reset.ts
@@ -1,10 +1,21 @@
 import { Not } from 'typeorm';
 import * as Db from '@/Db';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
+import { User } from '@db/entities/User';
 import { BaseCommand } from '../BaseCommand';
 
+const defaultUserProps = {
+	firstName: null,
+	lastName: null,
+	email: null,
+	password: null,
+	resetPasswordToken: null,
+};
+
 export class Reset extends BaseCommand {
-	static description = '\nResets the database to the default user state';
+	static description = 'Resets the database to the default user state';
+
+	static examples = ['$ n8n user-management:reset'];
 
 	async run(): Promise<void> {
 		const owner = await this.getInstanceOwner();
@@ -30,7 +41,7 @@ export class Reset extends BaseCommand {
 		);
 
 		await Db.collections.User.delete({ id: Not(owner.id) });
-		await Db.collections.User.save(Object.assign(owner, this.defaultUserProps));
+		await Db.collections.User.save(Object.assign(owner, defaultUserProps));
 
 		const danglingCredentials: CredentialsEntity[] =
 			(await Db.collections.Credentials.createQueryBuilder('credentials')
@@ -58,6 +69,25 @@ export class Reset extends BaseCommand {
 		this.logger.info('Successfully reset the database to default user state.');
 	}
 
+	async getInstanceOwner(): Promise<User> {
+		const globalRole = await Db.collections.Role.findOneByOrFail({
+			name: 'owner',
+			scope: 'global',
+		});
+
+		const owner = await Db.collections.User.findOneBy({ globalRoleId: globalRole.id });
+
+		if (owner) return owner;
+
+		const user = new User();
+
+		Object.assign(user, { ...defaultUserProps, globalRole });
+
+		await Db.collections.User.save(user);
+
+		return Db.collections.User.findOneByOrFail({ globalRoleId: globalRole.id });
+	}
+
 	async catch(error: Error): Promise<void> {
 		this.logger.error('Error resetting database. See log messages for details.');
 		this.logger.error(error.message);
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index ed47095c66f64c..e8cafdbfbc13ff 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -1,37 +1,12 @@
 /* eslint-disable @typescript-eslint/unbound-method */
-import { BinaryDataManager, UserSettings } from 'n8n-core';
-import { Command, flags } from '@oclif/command';
-
-import { LoggerProxy, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
+import { flags } from '@oclif/command';
+import { LoggerProxy, sleep } from 'n8n-workflow';
 import config from '@/config';
 import * as ActiveExecutions from '@/ActiveExecutions';
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { CredentialTypes } from '@/CredentialTypes';
-import * as Db from '@/Db';
-import { ExternalHooks } from '@/ExternalHooks';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { NodeTypes } from '@/NodeTypes';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { WebhookServer } from '@/WebhookServer';
-import { getLogger } from '@/Logger';
-import { initErrorHandling } from '@/ErrorReporting';
-import * as CrashJournal from '@/CrashJournal';
-
-const exitWithCrash = async (message: string, error: unknown) => {
-	ErrorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
-	await sleep(2000);
-	process.exit(1);
-};
-
-const exitSuccessFully = async () => {
-	try {
-		await CrashJournal.cleanup();
-	} finally {
-		process.exit();
-	}
-};
+import { BaseCommand } from './BaseCommand';
 
-export class Webhook extends Command {
+export class Webhook extends BaseCommand {
 	static description = 'Starts n8n webhook process. Intercepts only production URLs.';
 
 	static examples = ['$ n8n webhook'];
@@ -45,18 +20,16 @@ export class Webhook extends Command {
 	 * Make for example sure that all the webhooks from third party services
 	 * get removed.
 	 */
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	static async stopProcess() {
+	async stopProcess() {
 		LoggerProxy.info('\nStopping n8n...');
 
 		try {
-			const externalHooks = ExternalHooks();
-			await externalHooks.run('n8n.stop', []);
+			await this.externalHooks.run('n8n.stop', []);
 
 			setTimeout(async () => {
 				// In case that something goes wrong with shutdown we
 				// kill after max. 30 seconds no matter what
-				await exitSuccessFully();
+				await this.exitSuccessFully();
 			}, 30000);
 
 			// Wait for active workflow executions to finish
@@ -75,14 +48,13 @@ export class Webhook extends Command {
 				executingWorkflows = activeExecutionsInstance.getActiveExecutions();
 			}
 		} catch (error) {
-			await exitWithCrash('There was an error shutting down n8n.', error);
+			await this.exitWithCrash('There was an error shutting down n8n.', error);
 		}
 
-		await exitSuccessFully();
+		await this.exitSuccessFully();
 	}
 
-	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
-	async run() {
+	async init() {
 		if (config.getEnv('executions.mode') !== 'queue') {
 			/**
 			 * It is technically possible to run without queues but
@@ -99,56 +71,23 @@ export class Webhook extends Command {
 			this.error('Webhook processes can only run with execution mode as queue.');
 		}
 
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-
 		// Make sure that n8n shuts down gracefully if possible
-		process.once('SIGTERM', Webhook.stopProcess);
-		process.once('SIGINT', Webhook.stopProcess);
-
-		await initErrorHandling();
-		await CrashJournal.init();
-
-		try {
-			// Start directly with the init of the database to improve startup time
-			const startDbInitPromise = Db.init().catch(async (error: Error) =>
-				exitWithCrash('There was an error initializing DB', error),
-			);
-
-			// Make sure the settings exist
-			// eslint-disable-next-line @typescript-eslint/no-unused-vars
-			await UserSettings.prepareUserSettings();
-
-			// Load all node and credential types
-			const loadNodesAndCredentials = LoadNodesAndCredentials();
-			await loadNodesAndCredentials.init();
+		process.once('SIGTERM', this.stopProcess);
+		process.once('SIGINT', this.stopProcess);
 
-			// Add the found types to an instance other parts of the application can use
-			const nodeTypes = NodeTypes(loadNodesAndCredentials);
-			const credentialTypes = CredentialTypes(loadNodesAndCredentials);
+		await this.initCrashJournal();
+		await super.init();
 
-			// Load the credentials overwrites if any exist
-			CredentialsOverwrites(credentialTypes);
-
-			// Load all external hooks
-			const externalHooks = ExternalHooks();
-			await externalHooks.init();
-
-			// Wait till the database is ready
-			await startDbInitPromise;
-
-			const instanceId = await UserSettings.getInstanceId();
-			await InternalHooksManager.init(instanceId, nodeTypes);
-
-			const binaryDataConfig = config.getEnv('binaryDataManager');
-			await BinaryDataManager.init(binaryDataConfig);
+		await this.initBinaryManager();
+		await this.initExternalHooks();
+	}
 
-			const server = new WebhookServer();
-			await server.start();
+	async run() {
+		await new WebhookServer().start();
+		this.logger.info('Webhook listener waiting for requests.');
+	}
 
-			console.info('Webhook listener waiting for requests.');
-		} catch (error) {
-			await exitWithCrash('Exiting due to error.', error);
-		}
+	async catch(error: Error) {
+		await this.exitWithCrash('Exiting due to an error.', error);
 	}
 }
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 895ed3988ad9dd..591aa4f836c1ed 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -1,54 +1,28 @@
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
-/* eslint-disable @typescript-eslint/no-shadow */
 /* eslint-disable @typescript-eslint/unbound-method */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/restrict-template-expressions */
 import express from 'express';
 import http from 'http';
 import type PCancelable from 'p-cancelable';
 
-import { Command, flags } from '@oclif/command';
-import { BinaryDataManager, UserSettings, WorkflowExecute } from 'n8n-core';
+import { flags } from '@oclif/command';
+import { WorkflowExecute } from 'n8n-core';
 
 import type { IExecuteResponsePromiseData, INodeTypes, IRun } from 'n8n-workflow';
-import { Workflow, LoggerProxy, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
+import { Workflow, NodeOperationError, LoggerProxy, sleep } from 'n8n-workflow';
 
-import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { CredentialTypes } from '@/CredentialTypes';
 import * as Db from '@/Db';
-import { ExternalHooks } from '@/ExternalHooks';
-import { NodeTypes } from '@/NodeTypes';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { InternalHooksManager } from '@/InternalHooksManager';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import { getLogger } from '@/Logger';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 
 import config from '@/config';
 import * as Queue from '@/Queue';
-import * as CrashJournal from '@/CrashJournal';
 import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { N8N_VERSION } from '@/constants';
-import { initErrorHandling } from '@/ErrorReporting';
-
-const exitWithCrash = async (message: string, error: unknown) => {
-	ErrorReporter.error(new Error(message, { cause: error }), { level: 'fatal' });
-	await sleep(2000);
-	process.exit(1);
-};
-
-const exitSuccessFully = async () => {
-	try {
-		await CrashJournal.cleanup();
-	} finally {
-		process.exit();
-	}
-};
+import { BaseCommand } from './BaseCommand';
 
-export class Worker extends Command {
+export class Worker extends BaseCommand {
 	static description = '\nStarts a n8n worker';
 
 	static examples = ['$ n8n worker --concurrency=5'];
@@ -72,7 +46,7 @@ export class Worker extends Command {
 	 * Make for example sure that all the webhooks from third party services
 	 * get removed.
 	 */
-	static async stopProcess() {
+	async stopProcess() {
 		LoggerProxy.info('Stopping n8n...');
 
 		// Stop accepting new jobs
@@ -80,8 +54,7 @@ export class Worker extends Command {
 		Worker.jobQueue.pause(true);
 
 		try {
-			const externalHooks = ExternalHooks();
-			await externalHooks.run('n8n.stop', []);
+			await this.externalHooks.run('n8n.stop', []);
 
 			const maxStopTime = config.getEnv('queue.bull.gracefulShutdownTimeout') * 1000;
 
@@ -90,7 +63,7 @@ export class Worker extends Command {
 			setTimeout(async () => {
 				// In case that something goes wrong with shutdown we
 				// kill after max. 30 seconds no matter what
-				await exitSuccessFully();
+				await this.exitSuccessFully();
 			}, maxStopTime);
 
 			// Wait for active workflow executions to finish
@@ -108,10 +81,10 @@ export class Worker extends Command {
 				await sleep(500);
 			}
 		} catch (error) {
-			await exitWithCrash('There was an error shutting down n8n.', error);
+			await this.exitWithCrash('There was an error shutting down n8n.', error);
 		}
 
-		await exitSuccessFully();
+		await this.exitSuccessFully();
 	}
 
 	async runJob(job: Queue.Job, nodeTypes: INodeTypes): Promise<Queue.JobResponse> {
@@ -128,31 +101,27 @@ export class Worker extends Command {
 			);
 		}
 		const currentExecutionDb = ResponseHelper.unflattenExecutionData(executionDb);
+		const workflowId = currentExecutionDb.workflowData.id!;
 		LoggerProxy.info(
-			`Start job: ${job.id} (Workflow ID: ${currentExecutionDb.workflowData.id} | Execution: ${executionId})`,
+			`Start job: ${job.id} (Workflow ID: ${workflowId} | Execution: ${executionId})`,
 		);
 
-		const workflowOwner = await getWorkflowOwner(currentExecutionDb.workflowData.id!.toString());
+		const workflowOwner = await getWorkflowOwner(workflowId);
 
 		let { staticData } = currentExecutionDb.workflowData;
 		if (loadStaticData) {
 			const workflowData = await Db.collections.Workflow.findOne({
 				select: ['id', 'staticData'],
 				where: {
-					id: currentExecutionDb.workflowData.id,
+					id: workflowId,
 				},
 			});
 			if (workflowData === null) {
 				LoggerProxy.error(
 					'Worker execution failed because workflow could not be found in database.',
-					{
-						workflowId: currentExecutionDb.workflowData.id,
-						executionId,
-					},
-				);
-				throw new Error(
-					`The workflow with the ID "${currentExecutionDb.workflowData.id}" could not be found`,
+					{ workflowId, executionId },
 				);
+				throw new Error(`The workflow with the ID "${workflowId}" could not be found`);
 			}
 			staticData = workflowData.staticData;
 		}
@@ -173,7 +142,7 @@ export class Worker extends Command {
 		}
 
 		const workflow = new Workflow({
-			id: currentExecutionDb.workflowData.id as string,
+			id: workflowId,
 			name: currentExecutionDb.workflowData.name,
 			nodes: currentExecutionDb.workflowData.nodes,
 			connections: currentExecutionDb.workflowData.connections,
@@ -198,15 +167,15 @@ export class Worker extends Command {
 		try {
 			await PermissionChecker.check(workflow, workflowOwner.id);
 		} catch (error) {
-			const failedExecution = generateFailedExecutionFromError(
-				currentExecutionDb.mode,
-				error,
-				error.node,
-			);
-			await additionalData.hooks.executeHookFunctions('workflowExecuteAfter', [failedExecution]);
-			return {
-				success: true,
-			};
+			if (error instanceof NodeOperationError) {
+				const failedExecution = generateFailedExecutionFromError(
+					currentExecutionDb.mode,
+					error,
+					error.node,
+				);
+				await additionalData.hooks.executeHookFunctions('workflowExecuteAfter', [failedExecution]);
+			}
+			return { success: true };
 		}
 
 		additionalData.hooks.hookFunctions.sendResponse = [
@@ -249,184 +218,149 @@ export class Worker extends Command {
 		};
 	}
 
-	async run() {
-		const logger = getLogger();
-		LoggerProxy.init(logger);
-
-		// eslint-disable-next-line no-console
-		console.info('Starting n8n worker...');
-
+	async init() {
 		// Make sure that n8n shuts down gracefully if possible
-		process.once('SIGTERM', Worker.stopProcess);
-		process.once('SIGINT', Worker.stopProcess);
-
-		await initErrorHandling();
-		await CrashJournal.init();
+		process.once('SIGTERM', this.stopProcess);
+		process.once('SIGINT', this.stopProcess);
 
-		// Wrap that the process does not close but we can still use async
-		await (async () => {
-			try {
-				const { flags } = this.parse(Worker);
+		await this.initCrashJournal();
+		await super.init();
+		this.logger.debug('Starting n8n worker...');
 
-				// Start directly with the init of the database to improve startup time
-				const startDbInitPromise = Db.init().catch(async (error: Error) =>
-					exitWithCrash('There was an error initializing DB', error),
-				);
+		await this.initBinaryManager();
+		await this.initExternalHooks();
+	}
 
-				// Make sure the settings exist
-				await UserSettings.prepareUserSettings();
+	async run() {
+		// eslint-disable-next-line @typescript-eslint/no-shadow
+		const { flags } = this.parse(Worker);
 
-				// Load all node and credential types
-				const loadNodesAndCredentials = LoadNodesAndCredentials();
-				await loadNodesAndCredentials.init();
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+		const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
 
-				// Add the found types to an instance other parts of the application can use
-				const nodeTypes = NodeTypes(loadNodesAndCredentials);
-				const credentialTypes = CredentialTypes(loadNodesAndCredentials);
+		const queue = await Queue.getInstance();
+		Worker.jobQueue = queue.getBullObjectInstance();
+		// eslint-disable-next-line @typescript-eslint/no-floating-promises
+		Worker.jobQueue.process(flags.concurrency, async (job) => this.runJob(job, this.nodeTypes));
+
+		this.logger.info('\nn8n worker is now ready');
+		this.logger.info(` * Version: ${N8N_VERSION}`);
+		this.logger.info(` * Concurrency: ${flags.concurrency}`);
+		this.logger.info('');
+
+		Worker.jobQueue.on('global:progress', (jobId: Queue.JobId, progress) => {
+			// Progress of a job got updated which does get used
+			// to communicate that a job got canceled.
+
+			if (progress === -1) {
+				// Job has to get canceled
+				if (Worker.runningJobs[jobId] !== undefined) {
+					// Job is processed by current worker so cancel
+					Worker.runningJobs[jobId].cancel();
+					delete Worker.runningJobs[jobId];
+				}
+			}
+		});
 
-				// Load the credentials overwrites if any exist
-				CredentialsOverwrites(credentialTypes);
+		let lastTimer = 0;
+		let cumulativeTimeout = 0;
+		Worker.jobQueue.on('error', (error: Error) => {
+			if (error.toString().includes('ECONNREFUSED')) {
+				const now = Date.now();
+				if (now - lastTimer > 30000) {
+					// Means we had no timeout at all or last timeout was temporary and we recovered
+					lastTimer = now;
+					cumulativeTimeout = 0;
+				} else {
+					cumulativeTimeout += now - lastTimer;
+					lastTimer = now;
+					if (cumulativeTimeout > redisConnectionTimeoutLimit) {
+						this.logger.error(
+							`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
+						);
+						process.exit(1);
+					}
+				}
+				this.logger.warn('Redis unavailable - trying to reconnect...');
+			} else if (error.toString().includes('Error initializing Lua scripts')) {
+				// This is a non-recoverable error
+				// Happens when worker starts and Redis is unavailable
+				// Even if Redis comes back online, worker will be zombie
+				this.logger.error('Error initializing worker.');
+				process.exit(2);
+			} else {
+				this.logger.error('Error from queue: ', error);
+				throw error;
+			}
+		});
 
-				// Load all external hooks
-				const externalHooks = ExternalHooks();
-				await externalHooks.init();
+		if (config.getEnv('queue.health.active')) {
+			const port = config.getEnv('queue.health.port');
 
-				// Wait till the database is ready
-				await startDbInitPromise;
+			const app = express();
+			app.disable('x-powered-by');
 
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-				const redisConnectionTimeoutLimit = config.getEnv('queue.bull.redis.timeoutThreshold');
+			const server = http.createServer(app);
 
-				const queue = await Queue.getInstance();
-				Worker.jobQueue = queue.getBullObjectInstance();
-				// eslint-disable-next-line @typescript-eslint/no-floating-promises
-				Worker.jobQueue.process(flags.concurrency, async (job) => this.runJob(job, nodeTypes));
+			app.get(
+				'/healthz',
+				// eslint-disable-next-line consistent-return
+				async (req: express.Request, res: express.Response) => {
+					LoggerProxy.debug('Health check started!');
 
-				const instanceId = await UserSettings.getInstanceId();
+					const connection = Db.getConnection();
 
-				await InternalHooksManager.init(instanceId, nodeTypes);
+					try {
+						if (!connection.isInitialized) {
+							// Connection is not active
+							throw new Error('No active database connection!');
+						}
+						// DB ping
+						await connection.query('SELECT 1');
+					} catch (e) {
+						LoggerProxy.error('No Database connection!', e as Error);
+						const error = new ResponseHelper.ServiceUnavailableError('No Database connection!');
+						return ResponseHelper.sendErrorResponse(res, error);
+					}
 
-				const binaryDataConfig = config.getEnv('binaryDataManager');
-				await BinaryDataManager.init(binaryDataConfig);
+					// Just to be complete, generally will the worker stop automatically
+					// if it loses the connection to redis
+					try {
+						// Redis ping
+						await Worker.jobQueue.client.ping();
+					} catch (e) {
+						LoggerProxy.error('No Redis connection!', e as Error);
+						const error = new ResponseHelper.ServiceUnavailableError('No Redis connection!');
+						return ResponseHelper.sendErrorResponse(res, error);
+					}
 
-				console.info('\nn8n worker is now ready');
-				console.info(` * Version: ${N8N_VERSION}`);
-				console.info(` * Concurrency: ${flags.concurrency}`);
-				console.info('');
+					// Everything fine
+					const responseData = {
+						status: 'ok',
+					};
 
-				Worker.jobQueue.on('global:progress', (jobId, progress) => {
-					// Progress of a job got updated which does get used
-					// to communicate that a job got canceled.
+					LoggerProxy.debug('Health check completed successfully!');
 
-					if (progress === -1) {
-						// Job has to get canceled
-						if (Worker.runningJobs[jobId] !== undefined) {
-							// Job is processed by current worker so cancel
-							Worker.runningJobs[jobId].cancel();
-							delete Worker.runningJobs[jobId];
-						}
-					}
-				});
-
-				let lastTimer = 0;
-				let cumulativeTimeout = 0;
-				Worker.jobQueue.on('error', (error: Error) => {
-					if (error.toString().includes('ECONNREFUSED')) {
-						const now = Date.now();
-						if (now - lastTimer > 30000) {
-							// Means we had no timeout at all or last timeout was temporary and we recovered
-							lastTimer = now;
-							cumulativeTimeout = 0;
-						} else {
-							cumulativeTimeout += now - lastTimer;
-							lastTimer = now;
-							if (cumulativeTimeout > redisConnectionTimeoutLimit) {
-								logger.error(
-									`Unable to connect to Redis after ${redisConnectionTimeoutLimit}. Exiting process.`,
-								);
-								process.exit(1);
-							}
-						}
-						logger.warn('Redis unavailable - trying to reconnect...');
-					} else if (error.toString().includes('Error initializing Lua scripts')) {
-						// This is a non-recoverable error
-						// Happens when worker starts and Redis is unavailable
-						// Even if Redis comes back online, worker will be zombie
-						logger.error('Error initializing worker.');
-						process.exit(2);
-					} else {
-						logger.error('Error from queue: ', error);
-						throw error;
-					}
-				});
-
-				if (config.getEnv('queue.health.active')) {
-					const port = config.getEnv('queue.health.port');
-
-					const app = express();
-					app.disable('x-powered-by');
-
-					const server = http.createServer(app);
-
-					app.get(
-						'/healthz',
-						// eslint-disable-next-line consistent-return
-						async (req: express.Request, res: express.Response) => {
-							LoggerProxy.debug('Health check started!');
-
-							const connection = Db.getConnection();
-
-							try {
-								if (!connection.isInitialized) {
-									// Connection is not active
-									throw new Error('No active database connection!');
-								}
-								// DB ping
-								await connection.query('SELECT 1');
-							} catch (e) {
-								LoggerProxy.error('No Database connection!', e);
-								const error = new ResponseHelper.ServiceUnavailableError('No Database connection!');
-								return ResponseHelper.sendErrorResponse(res, error);
-							}
-
-							// Just to be complete, generally will the worker stop automatically
-							// if it loses the connection to redis
-							try {
-								// Redis ping
-								await Worker.jobQueue.client.ping();
-							} catch (e) {
-								LoggerProxy.error('No Redis connection!', e);
-								const error = new ResponseHelper.ServiceUnavailableError('No Redis connection!');
-								return ResponseHelper.sendErrorResponse(res, error);
-							}
-
-							// Everything fine
-							const responseData = {
-								status: 'ok',
-							};
-
-							LoggerProxy.debug('Health check completed successfully!');
-
-							ResponseHelper.sendSuccessResponse(res, responseData, true, 200);
-						},
-					);
+					ResponseHelper.sendSuccessResponse(res, responseData, true, 200);
+				},
+			);
 
-					server.listen(port, () => {
-						console.info(`\nn8n worker health check via, port ${port}`);
-					});
+			server.listen(port, () => {
+				this.logger.info(`\nn8n worker health check via, port ${port}`);
+			});
 
-					server.on('error', (error: Error & { code: string }) => {
-						if (error.code === 'EADDRINUSE') {
-							console.log(
-								`n8n's port ${port} is already in use. Do you have the n8n main process running on that port?`,
-							);
-							process.exit(1);
-						}
-					});
+			server.on('error', (error: Error & { code: string }) => {
+				if (error.code === 'EADDRINUSE') {
+					this.logger.error(
+						`n8n's port ${port} is already in use. Do you have the n8n main process running on that port?`,
+					);
+					process.exit(1);
 				}
-			} catch (error) {
-				await exitWithCrash('Worker process cannot continue.', error);
-			}
-		})();
+			});
+		}
+	}
+
+	async catch(error: Error) {
+		await this.exitWithCrash('Worker exiting due to an error.', error);
 	}
 }
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 9084784aa339e5..5b2d2e08721a2f 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -25,6 +25,8 @@ export function getN8nPackageJson() {
 	return jsonParse<n8n.PackageJson>(readFileSync(join(CLI_DIR, 'package.json'), 'utf8'));
 }
 
+export const START_NODES = ['n8n-nodes-base.start', 'n8n-nodes-base.manualTrigger'];
+
 export const N8N_VERSION = getN8nPackageJson().version;
 
 export const NODE_PACKAGE_PREFIX = 'n8n-nodes-';
diff --git a/packages/cli/src/utils.ts b/packages/cli/src/utils.ts
index e7059e11595661..7ec8afb253441b 100644
--- a/packages/cli/src/utils.ts
+++ b/packages/cli/src/utils.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { CliWorkflowOperationError, SubworkflowOperationError } from 'n8n-workflow';
 import type { INode } from 'n8n-workflow';
+import { START_NODES } from './constants';
 
 function findWorkflowStart(executionMode: 'integrated' | 'cli') {
 	return function (nodes: INode[]) {
@@ -10,7 +11,7 @@ function findWorkflowStart(executionMode: 'integrated' | 'cli') {
 
 		if (executeWorkflowTriggerNode) return executeWorkflowTriggerNode;
 
-		const startNode = nodes.find((node) => node.type === 'n8n-nodes-base.start');
+		const startNode = nodes.find((node) => START_NODES.includes(node.type));
 
 		if (startNode) return startNode;
 
diff --git a/packages/workflow/src/LoggerProxy.ts b/packages/workflow/src/LoggerProxy.ts
index c056013ddb71ef..57cf6419c96b6b 100644
--- a/packages/workflow/src/LoggerProxy.ts
+++ b/packages/workflow/src/LoggerProxy.ts
@@ -3,8 +3,9 @@ import type { ILogger, LogTypes } from './Interfaces';
 
 let logger: ILogger | undefined;
 
-export function init(loggerInstance: ILogger) {
+export function init<L extends ILogger>(loggerInstance: L) {
 	logger = loggerInstance;
+	return loggerInstance;
 }
 
 export function getInstance(): ILogger {

From 538984dc2f95fe2089f99deefcee3352e4ccd144 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 10 Feb 2023 15:02:47 +0100
Subject: [PATCH 173/358] feat(core): Add support for WebSockets as an
 alternative to Server-Sent Events (#5443)

Co-authored-by: Matthijs Knigge <matthijs@volcano.nl>
---
 packages/cli/package.json                     |   2 +
 packages/cli/src/AbstractServer.ts            |  21 ++-
 packages/cli/src/Interfaces.ts                |  51 +------
 packages/cli/src/Push.ts                      |  83 -----------
 packages/cli/src/ReloadNodesAndCredentials.ts |   2 +-
 packages/cli/src/Server.ts                    |  58 ++------
 packages/cli/src/TestWebhooks.ts              | 137 +++++++-----------
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  98 ++++++-------
 packages/cli/src/WorkflowRunner.ts            |   7 +-
 packages/cli/src/api/nodes.api.ts             |  10 +-
 packages/cli/src/config/schema.ts             |   9 ++
 packages/cli/src/index.ts                     |   2 -
 packages/cli/src/push/abstract.push.ts        |  49 +++++++
 packages/cli/src/push/index.ts                | 105 ++++++++++++++
 packages/cli/src/push/sse.push.ts             |  32 ++++
 packages/cli/src/push/types.ts                |  15 ++
 packages/cli/src/push/websocket.push.ts       |  19 +++
 packages/cli/src/sse-channel.d.ts             |  10 +-
 packages/cli/test/setup-mocks.ts              |   2 +-
 packages/editor-ui/src/Interface.ts           |   1 +
 .../editor-ui/src/mixins/pushConnection.ts    | 128 ++++++++--------
 packages/editor-ui/src/stores/settings.ts     |   3 +
 pnpm-lock.yaml                                |  11 +-
 23 files changed, 456 insertions(+), 399 deletions(-)
 delete mode 100644 packages/cli/src/Push.ts
 create mode 100644 packages/cli/src/push/abstract.push.ts
 create mode 100644 packages/cli/src/push/index.ts
 create mode 100644 packages/cli/src/push/sse.push.ts
 create mode 100644 packages/cli/src/push/types.ts
 create mode 100644 packages/cli/src/push/websocket.push.ts

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 9bf7460c16efe2..88298c03afdef3 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -99,6 +99,7 @@
     "@types/syslog-client": "^1.1.2",
     "@types/uuid": "^8.3.2",
     "@types/validator": "^13.7.0",
+    "@types/ws": "^8.5.4",
     "@types/yamljs": "^0.2.31",
     "chokidar": "^3.5.2",
     "concurrently": "^5.1.0",
@@ -196,6 +197,7 @@
     "uuid": "^8.3.2",
     "validator": "13.7.0",
     "winston": "^3.3.3",
+    "ws": "^8.12.0",
     "yamljs": "^0.3.0"
   }
 }
diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index cb7098848e7a2c..ee01a639a15b53 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -30,6 +30,8 @@ import { WEBHOOK_METHODS } from '@/WebhookHelpers';
 const emptyBuffer = Buffer.alloc(0);
 
 export abstract class AbstractServer {
+	protected server: Server;
+
 	protected app: express.Application;
 
 	protected externalHooks: IExternalHooksClass;
@@ -73,7 +75,7 @@ export abstract class AbstractServer {
 		this.activeWorkflowRunner = ActiveWorkflowRunner.getInstance();
 	}
 
-	private async setupCommonMiddlewares() {
+	private async setupErrorHandlers() {
 		const { app } = this;
 
 		// Augment errors sent to Sentry
@@ -82,6 +84,10 @@ export abstract class AbstractServer {
 		} = await import('@sentry/node');
 		app.use(requestHandler());
 		app.use(errorHandler());
+	}
+
+	private async setupCommonMiddlewares() {
+		const { app } = this;
 
 		// Compress the response data
 		app.use(compression());
@@ -147,6 +153,8 @@ export abstract class AbstractServer {
 		this.app.use(corsMiddleware);
 	}
 
+	protected setupPushServer() {}
+
 	private async setupHealthCheck() {
 		this.app.use((req, res, next) => {
 			if (!Db.isInitialized) {
@@ -392,10 +400,9 @@ export abstract class AbstractServer {
 	async start(): Promise<void> {
 		const { app, externalHooks, protocol, sslKey, sslCert } = this;
 
-		let server: Server;
 		if (protocol === 'https' && sslKey && sslCert) {
 			const https = await import('https');
-			server = https.createServer(
+			this.server = https.createServer(
 				{
 					key: await readFile(this.sslKey, 'utf8'),
 					cert: await readFile(this.sslCert, 'utf8'),
@@ -404,13 +411,13 @@ export abstract class AbstractServer {
 			);
 		} else {
 			const http = await import('http');
-			server = http.createServer(app);
+			this.server = http.createServer(app);
 		}
 
 		const PORT = config.getEnv('port');
 		const ADDRESS = config.getEnv('listen_address');
 
-		server.on('error', (error: Error & { code: string }) => {
+		this.server.on('error', (error: Error & { code: string }) => {
 			if (error.code === 'EADDRINUSE') {
 				console.log(
 					`n8n's port ${PORT} is already in use. Do you have another instance of n8n running already?`,
@@ -419,8 +426,10 @@ export abstract class AbstractServer {
 			}
 		});
 
-		await new Promise<void>((resolve) => server.listen(PORT, ADDRESS, () => resolve()));
+		await new Promise<void>((resolve) => this.server.listen(PORT, ADDRESS, () => resolve()));
 
+		await this.setupErrorHandlers();
+		this.setupPushServer();
 		await this.setupCommonMiddlewares();
 		if (inDevelopment) {
 			this.setupDevMiddlewares();
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 86150c1acd96bf..145500b9be5689 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -449,56 +449,6 @@ export interface IInternalHooksClass {
 	onApiKeyDeleted(apiKeyDeletedData: { user: User; public_api: boolean }): Promise<void>;
 }
 
-export interface IN8nConfig {
-	database: IN8nConfigDatabase;
-	endpoints: IN8nConfigEndpoints;
-	executions: IN8nConfigExecutions;
-	generic: IN8nConfigGeneric;
-	host: string;
-	nodes: IN8nConfigNodes;
-	port: number;
-	protocol: 'http' | 'https';
-}
-
-export interface IN8nConfigDatabase {
-	type: DatabaseType;
-	postgresdb: {
-		host: string;
-		password: string;
-		port: number;
-		user: string;
-	};
-}
-
-export interface IN8nConfigEndpoints {
-	rest: string;
-	webhook: string;
-	webhookTest: string;
-}
-
-// eslint-disable-next-line import/export
-export interface IN8nConfigExecutions {
-	saveDataOnError: SaveExecutionDataType;
-	saveDataOnSuccess: SaveExecutionDataType;
-	saveDataManualExecutions: boolean;
-}
-
-// eslint-disable-next-line import/export
-export interface IN8nConfigExecutions {
-	saveDataOnError: SaveExecutionDataType;
-	saveDataOnSuccess: SaveExecutionDataType;
-	saveDataManualExecutions: boolean;
-}
-
-export interface IN8nConfigGeneric {
-	timezone: string;
-}
-
-export interface IN8nConfigNodes {
-	errorTriggerType: string;
-	exclude: string[];
-}
-
 export interface IVersionNotificationSettings {
 	enabled: boolean;
 	endpoint: string;
@@ -550,6 +500,7 @@ export interface IN8nUISettings {
 	onboardingCallPromptEnabled: boolean;
 	missingPackages?: boolean;
 	executionMode: 'regular' | 'queue';
+	pushBackend: 'sse' | 'websocket';
 	communityNodesEnabled: boolean;
 	deployment: {
 		type: string;
diff --git a/packages/cli/src/Push.ts b/packages/cli/src/Push.ts
deleted file mode 100644
index 74a399e037288f..00000000000000
--- a/packages/cli/src/Push.ts
+++ /dev/null
@@ -1,83 +0,0 @@
-import SSEChannel from 'sse-channel';
-import type { Request, Response } from 'express';
-
-import { LoggerProxy as Logger } from 'n8n-workflow';
-import type { IPushData, IPushDataType } from '@/Interfaces';
-
-export class Push {
-	private channel = new SSEChannel();
-
-	private connections: Record<string, Response> = {};
-
-	constructor() {
-		this.channel.on('disconnect', (channel: string, res: Response) => {
-			if (res.req !== undefined) {
-				const { sessionId } = res.req.query;
-				Logger.debug('Remove editor-UI session', { sessionId });
-				delete this.connections[sessionId as string];
-			}
-		});
-	}
-
-	/**
-	 * Adds a new push connection
-	 *
-	 * @param {string} sessionId The id of the session
-	 * @param {Request} req The request
-	 * @param {Response} res The response
-	 */
-	add(sessionId: string, req: Request, res: Response) {
-		Logger.debug('Add editor-UI session', { sessionId });
-
-		if (this.connections[sessionId] !== undefined) {
-			// Make sure to remove existing connection with the same session
-			// id if one exists already
-			this.connections[sessionId].end();
-			this.channel.removeClient(this.connections[sessionId]);
-		}
-
-		this.connections[sessionId] = res;
-		this.channel.addClient(req, res);
-	}
-
-	/**
-	 * Sends data to the client which is connected via a specific session
-	 *
-	 * @param {string} sessionId The session id of client to send data to
-	 * @param {string} type Type of data to send
-	 */
-
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	send(type: IPushDataType, data: any, sessionId?: string) {
-		if (sessionId !== undefined && this.connections[sessionId] === undefined) {
-			Logger.error(`The session "${sessionId}" is not registered.`, { sessionId });
-			return;
-		}
-
-		Logger.debug(`Send data of type "${type}" to editor-UI`, { dataType: type, sessionId });
-
-		const sendData: IPushData = {
-			type,
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-			data,
-		};
-
-		if (sessionId === undefined) {
-			// Send to all connected clients
-			this.channel.send(JSON.stringify(sendData));
-		} else {
-			// Send only to a specific client
-			this.channel.send(JSON.stringify(sendData), [this.connections[sessionId]]);
-		}
-	}
-}
-
-let activePushInstance: Push | undefined;
-
-export function getInstance(): Push {
-	if (activePushInstance === undefined) {
-		activePushInstance = new Push();
-	}
-
-	return activePushInstance;
-}
diff --git a/packages/cli/src/ReloadNodesAndCredentials.ts b/packages/cli/src/ReloadNodesAndCredentials.ts
index 1be112037c589a..d7cc36c05e6bad 100644
--- a/packages/cli/src/ReloadNodesAndCredentials.ts
+++ b/packages/cli/src/ReloadNodesAndCredentials.ts
@@ -3,7 +3,7 @@ import { realpath } from 'fs/promises';
 
 import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
 import type { NodeTypesClass } from '@/NodeTypes';
-import type { Push } from '@/Push';
+import type { Push } from '@/push';
 
 export const reloadNodesAndCredentials = async (
 	loadNodesAndCredentials: LoadNodesAndCredentialsClass,
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index e166ce6a6eecfe..b898f62a792dc4 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1,31 +1,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
 /* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
 /* eslint-disable @typescript-eslint/no-unnecessary-type-assertion */
-/* eslint-disable @typescript-eslint/no-use-before-define */
-/* eslint-disable @typescript-eslint/await-thenable */
-/* eslint-disable new-cap */
 /* eslint-disable prefer-const */
 /* eslint-disable @typescript-eslint/no-invalid-void-type */
-/* eslint-disable no-return-assign */
-/* eslint-disable no-param-reassign */
-/* eslint-disable consistent-return */
 /* eslint-disable @typescript-eslint/restrict-template-expressions */
-/* eslint-disable @typescript-eslint/no-non-null-assertion */
-/* eslint-disable id-denylist */
-/* eslint-disable no-console */
-/* eslint-disable global-require */
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable @typescript-eslint/no-shadow */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unused-vars */
-/* eslint-disable no-continue */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-explicit-any */
-/* eslint-disable no-restricted-syntax */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable import/no-dynamic-require */
-/* eslint-disable no-await-in-loop */
 
 import { exec as callbackExec } from 'child_process';
 import { access as fsAccess } from 'fs/promises';
@@ -60,7 +44,6 @@ import type {
 	INodeTypeNameVersion,
 	ITelemetrySettings,
 	WorkflowExecuteMode,
-	INodeTypes,
 	ICredentialTypes,
 } from 'n8n-workflow';
 import { LoggerProxy, jsonParse } from 'n8n-workflow';
@@ -78,7 +61,6 @@ import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 import { nodesController } from '@/api/nodes.api';
 import { workflowsController } from '@/workflows/workflows.controller';
 import {
-	AUTH_COOKIE_NAME,
 	EDITOR_UI_DIST_DIR,
 	GENERATED_STATIC_DIR,
 	inDevelopment,
@@ -106,7 +88,6 @@ import {
 	PasswordResetController,
 	UsersController,
 } from '@/controllers';
-import { resolveJwt } from '@/auth/jwt';
 
 import { executionsController } from '@/executions/executions.controller';
 import { nodeTypesController } from '@/api/nodeTypes.api';
@@ -143,7 +124,6 @@ import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
 import type { NodeTypesClass } from '@/NodeTypes';
 import { NodeTypes } from '@/NodeTypes';
-import * as Push from '@/Push';
 import * as ResponseHelper from '@/ResponseHelper';
 import type { WaitTrackerClass } from '@/WaitTracker';
 import { WaitTracker } from '@/WaitTracker';
@@ -155,7 +135,9 @@ import { eventBusRouter } from '@/eventbus/eventBusRoutes';
 import { isLogStreamingEnabled } from '@/eventbus/MessageEventBus/MessageEventBusHelper';
 import { getLicense } from '@/License';
 import { licenseController } from './license/license.controller';
-import { corsMiddleware, setupAuthMiddlewares } from './middlewares';
+import type { Push } from '@/push';
+import { getPushInstance, setupPushServer, setupPushHandler } from '@/push';
+import { setupAuthMiddlewares } from './middlewares';
 import { initEvents } from './events';
 import { ldapController } from './Ldap/routes/ldap.controller.ee';
 import { getLdapLoginLabel, isLdapEnabled, isLdapLoginEnabled } from './Ldap/helpers';
@@ -183,7 +165,7 @@ class Server extends AbstractServer {
 
 	credentialTypes: ICredentialTypes;
 
-	push: Push.Push;
+	push: Push;
 
 	constructor() {
 		super();
@@ -198,12 +180,12 @@ class Server extends AbstractServer {
 		this.presetCredentialsLoaded = false;
 		this.endpointPresetCredentials = config.getEnv('credentials.overwrite.endpoint');
 
+		this.push = getPushInstance();
+
 		if (process.env.E2E_TESTS === 'true') {
 			this.app.use('/e2e', require('./api/e2e.api').e2eController);
 		}
 
-		this.push = Push.getInstance();
-
 		const urlBaseWebhook = WebhookHelpers.getWebhookBaseUrl();
 		const telemetrySettings: ITelemetrySettings = {
 			enabled: config.getEnv('diagnostics.enabled'),
@@ -280,6 +262,7 @@ class Server extends AbstractServer {
 			},
 			onboardingCallPromptEnabled: config.getEnv('onboardingCallPrompt.enabled'),
 			executionMode: config.getEnv('executions.mode'),
+			pushBackend: config.getEnv('push.backend'),
 			communityNodesEnabled: config.getEnv('nodes.communityPackages.enabled'),
 			deployment: {
 				type: config.getEnv('deployment.type'),
@@ -434,26 +417,8 @@ class Server extends AbstractServer {
 		// Parse cookies for easier access
 		this.app.use(cookieParser());
 
-		// Get push connections
-		this.app.use(`/${this.restEndpoint}/push`, corsMiddleware, async (req, res, next) => {
-			const { sessionId } = req.query;
-			if (sessionId === undefined) {
-				next(new Error('The query parameter "sessionId" is missing!'));
-				return;
-			}
-
-			if (isUserManagementEnabled()) {
-				try {
-					const authCookie = req.cookies?.[AUTH_COOKIE_NAME] ?? '';
-					await resolveJwt(authCookie);
-				} catch (error) {
-					res.status(401).send('Unauthorized');
-					return;
-				}
-			}
-
-			this.push.add(sessionId as string, req, res);
-		});
+		const { restEndpoint, app } = this;
+		setupPushHandler(restEndpoint, app, isUserManagementEnabled());
 
 		// Make sure that Vue history mode works properly
 		this.app.use(
@@ -1324,6 +1289,11 @@ class Server extends AbstractServer {
 			this.app.use('/', express.static(GENERATED_STATIC_DIR));
 		}
 	}
+
+	protected setupPushServer(): void {
+		const { restEndpoint, server, app } = this;
+		setupPushServer(restEndpoint, server, app);
+	}
 }
 
 export async function start(): Promise<void> {
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index fe3b454229d0ee..aee337ec74b904 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -14,14 +14,15 @@ import type {
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import type { IResponseCallbackData, IWorkflowDb } from '@/Interfaces';
-import * as Push from '@/Push';
+import type { Push } from '@/push';
+import { getPushInstance } from '@/push';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 
 const WEBHOOK_TEST_UNREGISTERED_HINT =
 	"Click the 'Execute workflow' button on the canvas, then try again. (In test mode, the webhook only works for one call after you click this button)";
 
-export class TestWebhooks {
+class TestWebhooks {
 	private testWebhookData: {
 		[key: string]: {
 			sessionId?: string;
@@ -32,18 +33,14 @@ export class TestWebhooks {
 		};
 	} = {};
 
-	private activeWebhooks: ActiveWebhooks | null = null;
-
-	constructor() {
-		this.activeWebhooks = new ActiveWebhooks();
-		this.activeWebhooks.testWebhooks = true;
+	constructor(private activeWebhooks: ActiveWebhooks, private push: Push) {
+		activeWebhooks.testWebhooks = true;
 	}
 
 	/**
 	 * Executes a test-webhook and returns the data. It also makes sure that the
 	 * data gets additionally send to the UI. After the request got handled it
 	 * automatically remove the test-webhook.
-	 *
 	 */
 	async callTestWebhook(
 		httpMethod: WebhookHttpMethod,
@@ -59,14 +56,16 @@ export class TestWebhooks {
 			path = path.slice(0, -1);
 		}
 
-		let webhookData: IWebhookData | undefined = this.activeWebhooks!.get(httpMethod, path);
+		const { activeWebhooks, push, testWebhookData } = this;
+
+		let webhookData: IWebhookData | undefined = activeWebhooks.get(httpMethod, path);
 
 		// check if path is dynamic
 		if (webhookData === undefined) {
 			const pathElements = path.split('/');
 			const webhookId = pathElements.shift();
 			// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-			webhookData = this.activeWebhooks!.get(httpMethod, pathElements.join('/'), webhookId);
+			webhookData = activeWebhooks.get(httpMethod, pathElements.join('/'), webhookId);
 			if (webhookData === undefined) {
 				// The requested webhook is not registered
 				throw new ResponseHelper.NotFoundError(
@@ -85,14 +84,15 @@ export class TestWebhooks {
 			});
 		}
 
-		const webhookKey = `${this.activeWebhooks!.getWebhookKey(
+		const { workflowId } = webhookData;
+		const webhookKey = `${activeWebhooks.getWebhookKey(
 			webhookData.httpMethod,
 			webhookData.path,
 			webhookData.webhookId,
-		)}|${webhookData.workflowId}`;
+		)}|${workflowId}`;
 
 		// TODO: Clean that duplication up one day and improve code generally
-		if (this.testWebhookData[webhookKey] === undefined) {
+		if (testWebhookData[webhookKey] === undefined) {
 			// The requested webhook is not registered
 			throw new ResponseHelper.NotFoundError(
 				`The requested webhook "${httpMethod} ${path}" is not registered.`,
@@ -100,7 +100,8 @@ export class TestWebhooks {
 			);
 		}
 
-		const { workflow } = this.testWebhookData[webhookKey];
+		const { destinationNode, sessionId, workflow, workflowData, timeout } =
+			testWebhookData[webhookKey];
 
 		// Get the node which has the webhook defined to know where to start from and to
 		// get additional data
@@ -116,61 +117,46 @@ export class TestWebhooks {
 				const executionId = await WebhookHelpers.executeWebhook(
 					workflow,
 					webhookData!,
-					this.testWebhookData[webhookKey].workflowData,
+					workflowData,
 					workflowStartNode,
 					executionMode,
-					this.testWebhookData[webhookKey].sessionId,
+					sessionId,
 					undefined,
 					undefined,
 					request,
 					response,
 					(error: Error | null, data: IResponseCallbackData) => {
-						if (error !== null) {
-							return reject(error);
-						}
-						resolve(data);
+						if (error !== null) reject(error);
+						else resolve(data);
 					},
-					this.testWebhookData[webhookKey].destinationNode,
+					destinationNode,
 				);
 
-				if (executionId === undefined) {
-					// The workflow did not run as the request was probably setup related
-					// or a ping so do not resolve the promise and wait for the real webhook
-					// request instead.
-					return;
-				}
+				// The workflow did not run as the request was probably setup related
+				// or a ping so do not resolve the promise and wait for the real webhook
+				// request instead.
+				if (executionId === undefined) return;
 
 				// Inform editor-ui that webhook got received
-				if (this.testWebhookData[webhookKey].sessionId !== undefined) {
-					const pushInstance = Push.getInstance();
-					pushInstance.send(
-						'testWebhookReceived',
-						{ workflowId: webhookData!.workflowId, executionId },
-						this.testWebhookData[webhookKey].sessionId,
-					);
+				if (sessionId !== undefined) {
+					push.send('testWebhookReceived', { workflowId, executionId }, sessionId);
 				}
-			} catch (error) {
+			} finally {
 				// Delete webhook also if an error is thrown
-			}
+				if (timeout) clearTimeout(timeout);
+				delete testWebhookData[webhookKey];
 
-			// Remove the webhook
-			if (this.testWebhookData[webhookKey]) {
-				clearTimeout(this.testWebhookData[webhookKey].timeout);
-				delete this.testWebhookData[webhookKey];
+				await activeWebhooks.removeWorkflow(workflow);
 			}
-			// eslint-disable-next-line @typescript-eslint/no-floating-promises
-			this.activeWebhooks!.removeWorkflow(workflow);
 		});
 	}
 
 	/**
 	 * Gets all request methods associated with a single test webhook
-	 * @param path webhook path
 	 */
 	async getWebhookMethods(path: string): Promise<string[]> {
-		const webhookMethods: string[] = this.activeWebhooks!.getWebhookMethods(path);
-
-		if (webhookMethods === undefined) {
+		const webhookMethods = this.activeWebhooks.getWebhookMethods(path);
+		if (!webhookMethods.length) {
 			// The requested webhook is not registered
 			throw new ResponseHelper.NotFoundError(
 				`The requested webhook "${path}" is not registered.`,
@@ -182,10 +168,8 @@ export class TestWebhooks {
 	}
 
 	/**
-	 * Checks if it has to wait for webhook data to execute the workflow. If yes it waits
-	 * for it and resolves with the result of the workflow if not it simply resolves
-	 * with undefined
-	 *
+	 * Checks if it has to wait for webhook data to execute the workflow.
+	 * If yes it waits for it and resolves with the result of the workflow if not it simply resolves with undefined
 	 */
 	async needsWebhookData(
 		workflowData: IWorkflowDb,
@@ -216,11 +200,13 @@ export class TestWebhooks {
 			this.cancelTestWebhook(workflowData.id);
 		}, 120000);
 
+		const { activeWebhooks, testWebhookData } = this;
+
 		let key: string;
 		const activatedKey: string[] = [];
 		// eslint-disable-next-line no-restricted-syntax
 		for (const webhookData of webhooks) {
-			key = `${this.activeWebhooks!.getWebhookKey(
+			key = `${activeWebhooks.getWebhookKey(
 				webhookData.httpMethod,
 				webhookData.path,
 				webhookData.webhookId,
@@ -228,7 +214,7 @@ export class TestWebhooks {
 
 			activatedKey.push(key);
 
-			this.testWebhookData[key] = {
+			testWebhookData[key] = {
 				sessionId,
 				timeout,
 				workflow,
@@ -238,11 +224,11 @@ export class TestWebhooks {
 
 			try {
 				// eslint-disable-next-line no-await-in-loop
-				await this.activeWebhooks!.add(workflow, webhookData, mode, activation);
+				await activeWebhooks.add(workflow, webhookData, mode, activation);
 			} catch (error) {
-				activatedKey.forEach((deleteKey) => delete this.testWebhookData[deleteKey]);
+				activatedKey.forEach((deleteKey) => delete testWebhookData[deleteKey]);
 				// eslint-disable-next-line no-await-in-loop
-				await this.activeWebhooks!.removeWorkflow(workflow);
+				await activeWebhooks.removeWorkflow(workflow);
 				throw error;
 			}
 		}
@@ -256,40 +242,34 @@ export class TestWebhooks {
 	 */
 	cancelTestWebhook(workflowId: string): boolean {
 		let foundWebhook = false;
+		const { activeWebhooks, push, testWebhookData } = this;
 		// eslint-disable-next-line no-restricted-syntax
-		for (const webhookKey of Object.keys(this.testWebhookData)) {
-			const webhookData = this.testWebhookData[webhookKey];
+		for (const webhookKey of Object.keys(testWebhookData)) {
+			const { sessionId, timeout, workflow, workflowData } = testWebhookData[webhookKey];
 
-			if (webhookData.workflowData.id !== workflowId) {
+			if (workflowData.id !== workflowId) {
 				// eslint-disable-next-line no-continue
 				continue;
 			}
 
-			clearTimeout(this.testWebhookData[webhookKey].timeout);
+			clearTimeout(timeout);
 
 			// Inform editor-ui that webhook got received
-			if (this.testWebhookData[webhookKey].sessionId !== undefined) {
+			if (sessionId !== undefined) {
 				try {
-					const pushInstance = Push.getInstance();
-					pushInstance.send(
-						'testWebhookDeleted',
-						{ workflowId },
-						this.testWebhookData[webhookKey].sessionId,
-					);
-				} catch (error) {
+					push.send('testWebhookDeleted', { workflowId }, sessionId);
+				} catch {
 					// Could not inform editor, probably is not connected anymore. So simply go on.
 				}
 			}
 
-			const { workflow } = this.testWebhookData[webhookKey];
-
 			// Remove the webhook
-			delete this.testWebhookData[webhookKey];
+			delete testWebhookData[webhookKey];
 
 			if (!foundWebhook) {
 				// As it removes all webhooks of the workflow execute only once
 				// eslint-disable-next-line @typescript-eslint/no-floating-promises
-				this.activeWebhooks!.removeWorkflow(workflow);
+				activeWebhooks.removeWorkflow(workflow);
 			}
 
 			foundWebhook = true;
@@ -302,18 +282,7 @@ export class TestWebhooks {
 	 * Removes all the currently active test webhooks
 	 */
 	async removeAll(): Promise<void> {
-		if (this.activeWebhooks === null) {
-			return;
-		}
-
-		let workflow: Workflow;
-		const workflows: Workflow[] = [];
-		// eslint-disable-next-line no-restricted-syntax
-		for (const webhookKey of Object.keys(this.testWebhookData)) {
-			workflow = this.testWebhookData[webhookKey].workflow;
-			workflows.push(workflow);
-		}
-
+		const workflows = Object.values(this.testWebhookData).map(({ workflow }) => workflow);
 		return this.activeWebhooks.removeAll(workflows);
 	}
 }
@@ -322,7 +291,7 @@ let testWebhooksInstance: TestWebhooks | undefined;
 
 export function getInstance(): TestWebhooks {
 	if (testWebhooksInstance === undefined) {
-		testWebhooksInstance = new TestWebhooks();
+		testWebhooksInstance = new TestWebhooks(new ActiveWebhooks(), getPushInstance());
 	}
 
 	return testWebhooksInstance;
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index c81d08c691d52d..9f220dd164298a 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -60,7 +60,7 @@ import type {
 } from '@/Interfaces';
 import { InternalHooksManager } from '@/InternalHooksManager';
 import { NodeTypes } from '@/NodeTypes';
-import * as Push from '@/Push';
+import { getPushInstance } from '@/push';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
@@ -250,76 +250,67 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 	return {
 		nodeExecuteBefore: [
 			async function (this: WorkflowHooks, nodeName: string): Promise<void> {
+				const { sessionId, executionId } = this;
 				// Push data to session which started workflow before each
 				// node which starts rendering
-				if (this.sessionId === undefined) {
+				if (sessionId === undefined) {
 					return;
 				}
+
 				Logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
-					executionId: this.executionId,
-					sessionId: this.sessionId,
+					executionId,
+					sessionId,
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = Push.getInstance();
-				pushInstance.send(
-					'nodeExecuteBefore',
-					{
-						executionId: this.executionId,
-						nodeName,
-					},
-					this.sessionId,
-				);
+				const pushInstance = getPushInstance();
+				pushInstance.send('nodeExecuteBefore', { executionId, nodeName }, sessionId);
 			},
 		],
 		nodeExecuteAfter: [
 			async function (this: WorkflowHooks, nodeName: string, data: ITaskData): Promise<void> {
+				const { sessionId, executionId } = this;
 				// Push data to session which started workflow after each rendered node
-				if (this.sessionId === undefined) {
+				if (sessionId === undefined) {
 					return;
 				}
+
 				Logger.debug(`Executing hook on node "${nodeName}" (hookFunctionsPush)`, {
-					executionId: this.executionId,
-					sessionId: this.sessionId,
+					executionId,
+					sessionId,
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = Push.getInstance();
-				pushInstance.send(
-					'nodeExecuteAfter',
-					{
-						executionId: this.executionId,
-						nodeName,
-						data,
-					},
-					this.sessionId,
-				);
+				const pushInstance = getPushInstance();
+				pushInstance.send('nodeExecuteAfter', { executionId, nodeName, data }, sessionId);
 			},
 		],
 		workflowExecuteBefore: [
 			async function (this: WorkflowHooks): Promise<void> {
+				const { sessionId, executionId } = this;
+				const { id: workflowId, name: workflowName } = this.workflowData;
 				Logger.debug('Executing hook (hookFunctionsPush)', {
-					executionId: this.executionId,
-					sessionId: this.sessionId,
-					workflowId: this.workflowData.id,
+					executionId,
+					sessionId,
+					workflowId,
 				});
 				// Push data to session which started the workflow
-				if (this.sessionId === undefined) {
+				if (sessionId === undefined) {
 					return;
 				}
-				const pushInstance = Push.getInstance();
+				const pushInstance = getPushInstance();
 				pushInstance.send(
 					'executionStarted',
 					{
-						executionId: this.executionId,
+						executionId,
 						mode: this.mode,
 						startedAt: new Date(),
 						retryOf: this.retryOf,
-						workflowId: this.workflowData.id,
-						sessionId: this.sessionId,
-						workflowName: this.workflowData.name,
+						workflowId,
+						sessionId,
+						workflowName,
 					},
-					this.sessionId,
+					sessionId,
 				);
 			},
 		],
@@ -329,13 +320,15 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				fullRunData: IRun,
 				newStaticData: IDataObject,
 			): Promise<void> {
+				const { sessionId, executionId, retryOf } = this;
+				const { id: workflowId } = this.workflowData;
 				Logger.debug('Executing hook (hookFunctionsPush)', {
-					executionId: this.executionId,
-					sessionId: this.sessionId,
-					workflowId: this.workflowData.id,
+					executionId,
+					sessionId,
+					workflowId,
 				});
 				// Push data to session which started the workflow
-				if (this.sessionId === undefined) {
+				if (sessionId === undefined) {
 					return;
 				}
 
@@ -354,19 +347,19 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				};
 
 				// Push data to editor-ui once workflow finished
-				Logger.debug(`Save execution progress to database for execution ID ${this.executionId} `, {
-					executionId: this.executionId,
-					workflowId: this.workflowData.id,
+				Logger.debug(`Save execution progress to database for execution ID ${executionId} `, {
+					executionId,
+					workflowId,
 				});
 				// TODO: Look at this again
 				const sendData: IPushDataExecutionFinished = {
-					executionId: this.executionId,
+					executionId,
 					data: pushRunData,
-					retryOf: this.retryOf,
+					retryOf,
 				};
 
-				const pushInstance = Push.getInstance();
-				pushInstance.send('executionFinished', sendData, this.sessionId);
+				const pushInstance = getPushInstance();
+				pushInstance.send('executionFinished', sendData, sessionId);
 			},
 		],
 	};
@@ -1041,11 +1034,11 @@ async function executeWorkflow(
 	if (data.finished === true) {
 		// Workflow did finish successfully
 
-		await ActiveExecutions.getInstance().remove(executionId, data);
+		ActiveExecutions.getInstance().remove(executionId, data);
 		const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
 		return returnData!.data!.main;
 	}
-	await ActiveExecutions.getInstance().remove(executionId, data);
+	ActiveExecutions.getInstance().remove(executionId, data);
 	// Workflow did fail
 	const { error } = data.data.resultData;
 	// eslint-disable-next-line @typescript-eslint/no-throw-literal
@@ -1057,20 +1050,21 @@ async function executeWorkflow(
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function sendMessageToUI(source: string, messages: any[]) {
-	if (this.sessionId === undefined) {
+	const { sessionId } = this;
+	if (sessionId === undefined) {
 		return;
 	}
 
 	// Push data to session which started workflow
 	try {
-		const pushInstance = Push.getInstance();
+		const pushInstance = getPushInstance();
 		pushInstance.send(
 			'sendConsoleMessage',
 			{
 				source: `[Node: "${source}"]`,
 				messages,
 			},
-			this.sessionId,
+			sessionId,
 		);
 	} catch (error) {
 		Logger.warn(`There was a problem sending message to UI: ${error.message}`);
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 30fa45970cb2be..0e0f90bbd4d906 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -44,7 +44,6 @@ import type {
 	IWorkflowExecutionDataProcessWithExecution,
 } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
-import * as Push from '@/Push';
 import * as Queue from '@/Queue';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
@@ -54,16 +53,18 @@ import { InternalHooksManager } from '@/InternalHooksManager';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { initErrorHandling } from '@/ErrorReporting';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
+import type { Push } from '@/push';
+import { getPushInstance } from '@/push';
 
 export class WorkflowRunner {
 	activeExecutions: ActiveExecutions.ActiveExecutions;
 
-	push: Push.Push;
+	push: Push;
 
 	jobQueue: Queue.JobQueue;
 
 	constructor() {
-		this.push = Push.getInstance();
+		this.push = getPushInstance();
 		this.activeExecutions = ActiveExecutions.getInstance();
 	}
 
diff --git a/packages/cli/src/api/nodes.api.ts b/packages/cli/src/api/nodes.api.ts
index b68480be44c51e..05e5ede065ba6d 100644
--- a/packages/cli/src/api/nodes.api.ts
+++ b/packages/cli/src/api/nodes.api.ts
@@ -4,7 +4,6 @@ import type { PublicInstalledPackage } from 'n8n-workflow';
 import config from '@/config';
 import { InternalHooksManager } from '@/InternalHooksManager';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import * as Push from '@/Push';
 import * as ResponseHelper from '@/ResponseHelper';
 
 import {
@@ -34,6 +33,7 @@ import { isAuthenticatedRequest } from '@/UserManagement/UserManagementHelper';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { CommunityPackages } from '@/Interfaces';
 import type { NodeRequest } from '@/requests';
+import { getPushInstance } from '@/push';
 
 const { PACKAGE_NOT_INSTALLED, PACKAGE_NAME_NOT_PROVIDED } = RESPONSE_ERROR_MESSAGES;
 
@@ -141,7 +141,7 @@ nodesController.post(
 
 		if (!hasLoaded) removePackageFromMissingList(name);
 
-		const pushInstance = Push.getInstance();
+		const pushInstance = getPushInstance();
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
@@ -248,7 +248,7 @@ nodesController.delete(
 			throw new ResponseHelper.InternalServerError(message);
 		}
 
-		const pushInstance = Push.getInstance();
+		const pushInstance = getPushInstance();
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
@@ -295,7 +295,7 @@ nodesController.patch(
 				previouslyInstalledPackage,
 			);
 
-			const pushInstance = Push.getInstance();
+			const pushInstance = getPushInstance();
 
 			// broadcast to connected frontends that node list has been updated
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
@@ -325,7 +325,7 @@ nodesController.patch(
 			return newInstalledPackage;
 		} catch (error) {
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				const pushInstance = Push.getInstance();
+				const pushInstance = getPushInstance();
 				pushInstance.send('removeNodeType', {
 					name: node.type,
 					version: node.latestVersion,
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index cf1091bdae4281..0c453e202fe61c 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -925,6 +925,15 @@ export const schema = {
 		},
 	},
 
+	push: {
+		backend: {
+			format: ['sse', 'websocket'] as const,
+			default: 'sse',
+			env: 'N8N_PUSH_BACKEND',
+			doc: 'Backend to use for push notifications',
+		},
+	},
+
 	binaryDataManager: {
 		availableModes: {
 			format: String,
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index f9609a77c08a84..152ae625dc0a5f 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -16,7 +16,6 @@ import * as ActiveExecutions from './ActiveExecutions';
 import * as ActiveWorkflowRunner from './ActiveWorkflowRunner';
 import * as Db from './Db';
 import * as GenericHelpers from './GenericHelpers';
-import * as Push from './Push';
 import * as ResponseHelper from './ResponseHelper';
 import * as Server from './Server';
 import * as TestWebhooks from './TestWebhooks';
@@ -30,7 +29,6 @@ export {
 	ActiveWorkflowRunner,
 	Db,
 	GenericHelpers,
-	Push,
 	ResponseHelper,
 	Server,
 	TestWebhooks,
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
new file mode 100644
index 00000000000000..dbbbe63b737b05
--- /dev/null
+++ b/packages/cli/src/push/abstract.push.ts
@@ -0,0 +1,49 @@
+import { LoggerProxy as Logger } from 'n8n-workflow';
+import type { IPushDataType } from '@/Interfaces';
+
+export abstract class AbstractPush<T> {
+	protected connections: Record<string, T> = {};
+
+	protected abstract close(connection: T): void;
+	protected abstract sendToOne(connection: T, data: string): void;
+
+	protected add(sessionId: string, connection: T): void {
+		const { connections } = this;
+		Logger.debug('Add editor-UI session', { sessionId });
+
+		const existingConnection = connections[sessionId];
+		if (existingConnection) {
+			// Make sure to remove existing connection with the same id
+			this.close(existingConnection);
+		}
+
+		connections[sessionId] = connection;
+	}
+
+	protected remove(sessionId?: string): void {
+		if (sessionId !== undefined) {
+			Logger.debug('Remove editor-UI session', { sessionId });
+			delete this.connections[sessionId];
+		}
+	}
+
+	send<D>(type: IPushDataType, data: D, sessionId: string | undefined = undefined) {
+		const { connections } = this;
+		if (sessionId !== undefined && connections[sessionId] === undefined) {
+			Logger.error(`The session "${sessionId}" is not registered.`, { sessionId });
+			return;
+		}
+
+		Logger.debug(`Send data of type "${type}" to editor-UI`, { dataType: type, sessionId });
+
+		const sendData = JSON.stringify({ type, data });
+
+		if (sessionId === undefined) {
+			// Send to all connected clients
+			Object.values(connections).forEach((connection) => this.sendToOne(connection, sendData));
+		} else {
+			// Send only to a specific client
+			this.sendToOne(connections[sessionId], sendData);
+		}
+	}
+}
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
new file mode 100644
index 00000000000000..54675b1ef8c2c5
--- /dev/null
+++ b/packages/cli/src/push/index.ts
@@ -0,0 +1,105 @@
+import { ServerResponse } from 'http';
+import type { Server } from 'http';
+import type { Socket } from 'net';
+import type { Application, RequestHandler } from 'express';
+import { Server as WSServer } from 'ws';
+import { parse as parseUrl } from 'url';
+import config from '@/config';
+import { resolveJwt } from '@/auth/jwt';
+import { AUTH_COOKIE_NAME } from '@/constants';
+import { SSEPush } from './sse.push';
+import { WebSocketPush } from './websocket.push';
+import type { Push, PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
+export type { Push } from './types';
+
+const useWebSockets = config.getEnv('push.backend') === 'websocket';
+
+let pushInstance: Push;
+export const getPushInstance = () => {
+	if (!pushInstance) pushInstance = useWebSockets ? new WebSocketPush() : new SSEPush();
+	return pushInstance;
+};
+
+export const setupPushServer = (restEndpoint: string, server: Server, app: Application) => {
+	if (useWebSockets) {
+		const wsServer = new WSServer({ noServer: true });
+		server.on('upgrade', (request: WebSocketPushRequest, socket: Socket, head) => {
+			if (parseUrl(request.url).pathname === `/${restEndpoint}/push`) {
+				wsServer.handleUpgrade(request, socket, head, (ws) => {
+					request.ws = ws;
+
+					const response = new ServerResponse(request);
+					response.writeHead = (statusCode) => {
+						if (statusCode > 200) ws.close();
+						return response;
+					};
+
+					// @ts-ignore
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+					app.handle(request, response);
+				});
+			}
+		});
+	}
+};
+
+export const setupPushHandler = (
+	restEndpoint: string,
+	app: Application,
+	isUserManagementEnabled: boolean,
+) => {
+	const push = getPushInstance();
+	const endpoint = `/${restEndpoint}/push`;
+
+	const pushValidationMiddleware: RequestHandler = async (
+		req: SSEPushRequest | WebSocketPushRequest,
+		res,
+		next,
+	) => {
+		const ws = req.ws;
+
+		const { sessionId } = req.query;
+		if (sessionId === undefined) {
+			if (ws) {
+				ws.send('The query parameter "sessionId" is missing!');
+				ws.close(400);
+			} else {
+				next(new Error('The query parameter "sessionId" is missing!'));
+			}
+			return;
+		}
+
+		// Handle authentication
+		if (isUserManagementEnabled) {
+			try {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+				const authCookie: string = req.cookies?.[AUTH_COOKIE_NAME] ?? '';
+				await resolveJwt(authCookie);
+			} catch (error) {
+				if (ws) {
+					ws.send(`Unauthorized: ${(error as Error).message}`);
+					ws.close(401);
+				} else {
+					res.status(401).send('Unauthorized');
+				}
+				return;
+			}
+		}
+
+		next();
+	};
+
+	app.use(
+		endpoint,
+		pushValidationMiddleware,
+		(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) => {
+			if (req.ws) {
+				(push as WebSocketPush).add(req.query.sessionId, req.ws);
+			} else if (!useWebSockets) {
+				(push as SSEPush).add(req.query.sessionId, { req, res });
+			} else {
+				res.status(401).send('Unauthorized');
+			}
+		},
+	);
+};
diff --git a/packages/cli/src/push/sse.push.ts b/packages/cli/src/push/sse.push.ts
new file mode 100644
index 00000000000000..e3bae7dd1f6eee
--- /dev/null
+++ b/packages/cli/src/push/sse.push.ts
@@ -0,0 +1,32 @@
+import SSEChannel from 'sse-channel';
+import { AbstractPush } from './abstract.push';
+import type { PushRequest, PushResponse } from './types';
+
+type Connection = { req: PushRequest; res: PushResponse };
+
+export class SSEPush extends AbstractPush<Connection> {
+	readonly channel = new SSEChannel();
+
+	readonly connections: Record<string, Connection> = {};
+
+	constructor() {
+		super();
+		this.channel.on('disconnect', (channel, { req }) => {
+			this.remove(req?.query?.sessionId);
+		});
+	}
+
+	add(sessionId: string, connection: Connection) {
+		super.add(sessionId, connection);
+		this.channel.addClient(connection.req, connection.res);
+	}
+
+	protected close({ res }: Connection): void {
+		res.end();
+		this.channel.removeClient(res);
+	}
+
+	protected sendToOne(connection: Connection, data: string): void {
+		this.channel.send(data, [connection.res]);
+	}
+}
diff --git a/packages/cli/src/push/types.ts b/packages/cli/src/push/types.ts
new file mode 100644
index 00000000000000..531ab604781e06
--- /dev/null
+++ b/packages/cli/src/push/types.ts
@@ -0,0 +1,15 @@
+import type { Request, Response } from 'express';
+import type { WebSocket } from 'ws';
+import type { SSEPush } from './sse.push';
+import type { WebSocketPush } from './websocket.push';
+
+// TODO: move all push related types here
+
+export type Push = SSEPush | WebSocketPush;
+
+export type PushRequest = Request<{}, {}, {}, { sessionId: string }>;
+
+export type SSEPushRequest = PushRequest & { ws: undefined };
+export type WebSocketPushRequest = PushRequest & { ws: WebSocket };
+
+export type PushResponse = Response & { req: PushRequest };
diff --git a/packages/cli/src/push/websocket.push.ts b/packages/cli/src/push/websocket.push.ts
new file mode 100644
index 00000000000000..93c9a24220759d
--- /dev/null
+++ b/packages/cli/src/push/websocket.push.ts
@@ -0,0 +1,19 @@
+import type WebSocket from 'ws';
+import { AbstractPush } from './abstract.push';
+
+export class WebSocketPush extends AbstractPush<WebSocket> {
+	add(sessionId: string, connection: WebSocket) {
+		super.add(sessionId, connection);
+
+		// Makes sure to remove the session if the connection is closed
+		connection.once('close', () => this.remove(sessionId));
+	}
+
+	protected close(connection: WebSocket): void {
+		connection.close();
+	}
+
+	protected sendToOne(connection: WebSocket, data: string): void {
+		connection.send(data);
+	}
+}
diff --git a/packages/cli/src/sse-channel.d.ts b/packages/cli/src/sse-channel.d.ts
index 2dc8ef5e56880a..6ea435b36140a8 100644
--- a/packages/cli/src/sse-channel.d.ts
+++ b/packages/cli/src/sse-channel.d.ts
@@ -1,16 +1,16 @@
-import type { Request, Response } from 'express';
+import type { PushRequest, PushResponse } from './push/types';
 
 declare module 'sse-channel' {
 	declare class Channel {
 		constructor();
 
-		on(event: string, handler: (channel: string, res: Response) => void): void;
+		on(event: string, handler: (channel: string, res: PushResponse) => void): void;
 
-		removeClient: (res: Response) => void;
+		removeClient: (res: PushResponse) => void;
 
-		addClient: (req: Request, res: Response) => void;
+		addClient: (req: PushRequest, res: PushResponse) => void;
 
-		send: (msg: string, clients?: Response[]) => void;
+		send: (msg: string, clients?: PushResponse[]) => void;
 	}
 
 	export = Channel;
diff --git a/packages/cli/test/setup-mocks.ts b/packages/cli/test/setup-mocks.ts
index 4e116fbea453c7..1a9bb4e9c0a15c 100644
--- a/packages/cli/test/setup-mocks.ts
+++ b/packages/cli/test/setup-mocks.ts
@@ -2,4 +2,4 @@ jest.mock('@sentry/node');
 jest.mock('@n8n_io/license-sdk');
 jest.mock('@/telemetry');
 jest.mock('@/eventbus/MessageEventBus/MessageEventBus');
-jest.mock('@/Push');
+jest.mock('@/push');
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index d3dad5022e51e3..9580abc9909081 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -690,6 +690,7 @@ export interface IN8nUISettings {
 		host: string;
 	};
 	executionMode: string;
+	pushBackend: 'sse' | 'websocket';
 	communityNodesEnabled: boolean;
 	isNpmAvailable: boolean;
 	publicApi: {
diff --git a/packages/editor-ui/src/mixins/pushConnection.ts b/packages/editor-ui/src/mixins/pushConnection.ts
index 1a08f10154b739..7ef18364fb0c90 100644
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/mixins/pushConnection.ts
@@ -24,6 +24,7 @@ import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useCredentialsStore } from '@/stores/credentials';
+import { useSettingsStore } from '@/stores/settings';
 
 export const pushConnection = mixins(
 	externalHooks,
@@ -34,7 +35,7 @@ export const pushConnection = mixins(
 ).extend({
 	data() {
 		return {
-			eventSource: null as EventSource | null,
+			pushSource: null as WebSocket | EventSource | null,
 			reconnectTimeout: null as NodeJS.Timeout | null,
 			retryTimeout: null as NodeJS.Timeout | null,
 			pushMessageQueue: [] as Array<{ event: Event; retriesLeft: number }>,
@@ -43,92 +44,99 @@ export const pushConnection = mixins(
 		};
 	},
 	computed: {
-		...mapStores(useCredentialsStore, useNodeTypesStore, useUIStore, useWorkflowsStore),
+		...mapStores(
+			useCredentialsStore,
+			useNodeTypesStore,
+			useUIStore,
+			useWorkflowsStore,
+			useSettingsStore,
+		),
 		sessionId(): string {
 			return this.rootStore.sessionId;
 		},
 	},
 	methods: {
-		pushAutomaticReconnect(): void {
-			if (this.reconnectTimeout !== null) {
-				return;
-			}
+		attemptReconnect() {
+			const isWorkflowRunning = this.uiStore.isActionActive('workflowRunning');
+			if (this.connectRetries > 3 && !this.lostConnection && isWorkflowRunning) {
+				this.lostConnection = true;
 
-			this.reconnectTimeout = setTimeout(() => {
-				this.connectRetries++;
-				const isWorkflowRunning = this.uiStore.isActionActive('workflowRunning');
-				if (this.connectRetries > 3 && !this.lostConnection && isWorkflowRunning) {
-					this.lostConnection = true;
+				this.workflowsStore.executingNode = null;
+				this.uiStore.removeActiveAction('workflowRunning');
 
-					this.workflowsStore.executingNode = null;
-					this.uiStore.removeActiveAction('workflowRunning');
+				this.$showMessage({
+					title: this.$locale.baseText('pushConnection.executionFailed'),
+					message: this.$locale.baseText('pushConnection.executionFailed.message'),
+					type: 'error',
+					duration: 0,
+				});
+			}
 
-					this.$showMessage({
-						title: this.$locale.baseText('pushConnection.executionFailed'),
-						message: this.$locale.baseText('pushConnection.executionFailed.message'),
-						type: 'error',
-						duration: 0,
-					});
-				}
-				this.pushConnect();
-			}, 3000);
+			this.pushConnect();
 		},
 
 		/**
-		 * Connect to server to receive data via EventSource
+		 * Connect to server to receive data via a WebSocket or EventSource
 		 */
 		pushConnect(): void {
-			// Make sure existing event-source instances get
-			// always removed that we do not end up with multiple ones
+			// always close the previous connection so that we do not end up with multiple connections
 			this.pushDisconnect();
 
-			const connectionUrl = `${this.rootStore.getRestUrl}/push?sessionId=${this.sessionId}`;
+			if (this.reconnectTimeout) {
+				clearTimeout(this.reconnectTimeout);
+				this.reconnectTimeout = null;
+			}
 
-			this.eventSource = new EventSource(connectionUrl, { withCredentials: true });
-			this.eventSource.addEventListener('message', this.pushMessageReceived, false);
+			const useWebSockets = this.settingsStore.pushBackend === 'websocket';
 
-			this.eventSource.addEventListener(
-				'open',
-				() => {
-					this.connectRetries = 0;
-					this.lostConnection = false;
+			const { getRestUrl: restUrl } = this.rootStore;
+			const url = `/push?sessionId=${this.sessionId}`;
 
-					this.rootStore.pushConnectionActive = true;
-					if (this.reconnectTimeout !== null) {
-						clearTimeout(this.reconnectTimeout);
-						this.reconnectTimeout = null;
-					}
-				},
+			if (useWebSockets) {
+				const { protocol, host } = window.location;
+				const baseUrl = restUrl.startsWith('http')
+					? restUrl.replace(/^http/, 'ws')
+					: `${protocol === 'https:' ? 'wss' : 'ws'}://${host + restUrl}`;
+				this.pushSource = new WebSocket(`${baseUrl}${url}`);
+			} else {
+				this.pushSource = new EventSource(`${restUrl}${url}`, { withCredentials: true });
+			}
+
+			this.pushSource.addEventListener('open', this.onConnectionSuccess, false);
+			this.pushSource.addEventListener('message', this.pushMessageReceived, false);
+			this.pushSource.addEventListener(
+				useWebSockets ? 'close' : 'error',
+				this.onConnectionError,
 				false,
 			);
+		},
 
-			this.eventSource.addEventListener(
-				'error',
-				() => {
-					this.pushDisconnect();
-
-					if (this.reconnectTimeout !== null) {
-						clearTimeout(this.reconnectTimeout);
-						this.reconnectTimeout = null;
-					}
+		onConnectionSuccess() {
+			this.connectRetries = 0;
+			this.lostConnection = false;
+			this.rootStore.pushConnectionActive = true;
+			this.pushSource?.removeEventListener('open', this.onConnectionSuccess);
+		},
 
-					this.rootStore.pushConnectionActive = false;
-					this.pushAutomaticReconnect();
-				},
-				false,
-			);
+		onConnectionError() {
+			this.pushDisconnect();
+			this.connectRetries++;
+			this.reconnectTimeout = setTimeout(this.attemptReconnect, this.connectRetries * 5000);
 		},
 
 		/**
 		 * Close connection to server
 		 */
 		pushDisconnect(): void {
-			if (this.eventSource !== null) {
-				this.eventSource.close();
-				this.eventSource = null;
-
-				this.rootStore.pushConnectionActive = false;
+			if (this.pushSource !== null) {
+				this.pushSource.removeEventListener('error', this.onConnectionError);
+				this.pushSource.removeEventListener('close', this.onConnectionError);
+				this.pushSource.removeEventListener('message', this.pushMessageReceived);
+				if (this.pushSource.readyState < 2) this.pushSource.close();
+				this.pushSource = null;
 			}
+
+			this.rootStore.pushConnectionActive = false;
 		},
 
 		/**
@@ -136,7 +144,6 @@ export const pushConnection = mixins(
 		 * the REST API so we do not know yet what execution ID
 		 * is currently active. So internally resend the message
 		 * a few more times
-		 *
 		 */
 		queuePushMessage(event: Event, retryAttempts: number) {
 			this.pushMessageQueue.push({ event, retriesLeft: retryAttempts });
@@ -178,9 +185,6 @@ export const pushConnection = mixins(
 
 		/**
 		 * Process a newly received message
-		 *
-		 * @param {Event} event The event data with the message data
-		 * @param {boolean} [isRetry] If it is a retry
 		 */
 		pushMessageReceived(event: Event, isRetry?: boolean): boolean {
 			const retryAttempts = 5;
diff --git a/packages/editor-ui/src/stores/settings.ts b/packages/editor-ui/src/stores/settings.ts
index e86c9abc613f4c..9fca2f63f9bcf7 100644
--- a/packages/editor-ui/src/stores/settings.ts
+++ b/packages/editor-ui/src/stores/settings.ts
@@ -141,6 +141,9 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 		templatesHost(): string {
 			return this.settings.templates.host;
 		},
+		pushBackend(): IN8nUISettings['pushBackend'] {
+			return this.settings.pushBackend;
+		},
 		isCommunityNodesFeatureEnabled(): boolean {
 			return this.settings.communityNodesEnabled;
 		},
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 1dd27c55e5c811..9e9ac46b9aea99 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -148,6 +148,7 @@ importers:
       '@types/syslog-client': ^1.1.2
       '@types/uuid': ^8.3.2
       '@types/validator': ^13.7.0
+      '@types/ws': ^8.5.4
       '@types/yamljs': ^0.2.31
       axios: ^0.21.1
       basic-auth: ^2.0.1
@@ -236,6 +237,7 @@ importers:
       uuid: ^8.3.2
       validator: 13.7.0
       winston: ^3.3.3
+      ws: ^8.12.0
       yamljs: ^0.3.0
     dependencies:
       '@n8n_io/license-sdk': 1.8.0
@@ -324,6 +326,7 @@ importers:
       uuid: 8.3.2
       validator: 13.7.0
       winston: 3.8.2
+      ws: 8.12.0
       yamljs: 0.3.0
     devDependencies:
       '@apidevtools/swagger-cli': 4.0.0
@@ -364,6 +367,7 @@ importers:
       '@types/syslog-client': 1.1.2
       '@types/uuid': 8.3.4
       '@types/validator': 13.7.7
+      '@types/ws': 8.5.4
       '@types/yamljs': 0.2.31
       chokidar: 3.5.2
       concurrently: 5.3.0
@@ -6482,6 +6486,12 @@ packages:
       '@types/webidl-conversions': 7.0.0
     dev: false
 
+  /@types/ws/8.5.4:
+    resolution: {integrity: sha512-zdQDHKUgcX/zBc4GrwsE/7dVdAD8JR4EuiAXiiUhhfyIJXXb2+PrGshFyeXWQPMmmZ2XxgaqclgpIC7eTXc1mg==}
+    dependencies:
+      '@types/node': 16.18.12
+    dev: true
+
   /@types/xml2js/0.4.11:
     resolution: {integrity: sha512-JdigeAKmCyoJUiQljjr7tQG3if9NkqGUgwEUqBvV0N7LM4HyQk7UXCnusRa1lnvXAEYJ8mw8GtZWioagNztOwA==}
     dependencies:
@@ -22840,7 +22850,6 @@ packages:
         optional: true
       utf-8-validate:
         optional: true
-    dev: true
 
   /x-default-browser/0.4.0:
     resolution: {integrity: sha512-7LKo7RtWfoFN/rHx1UELv/2zHGMx8MkZKDq1xENmOCTkfIqZJ0zZ26NEJX8czhnPXVcqS0ARjjfJB+eJ0/5Cvw==}

From a2e2ec5442ccce59217d22a23abcd3b56d449c29 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Fri, 10 Feb 2023 15:24:20 +0100
Subject: [PATCH 174/358] test: Add tests for ActiveWorkflowRunner class
 (#5278)

---
 packages/cli/src/ActiveWorkflowRunner.ts      |  40 +--
 .../test/unit/ActiveWorkflowRunner.test.ts    | 265 ++++++++++++++++++
 packages/cli/test/unit/Helpers.ts             |  67 +++++
 .../cli/test/unit/PermissionChecker.test.ts   |  24 +-
 4 files changed, 357 insertions(+), 39 deletions(-)
 create mode 100644 packages/cli/test/unit/ActiveWorkflowRunner.test.ts

diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 376f6c15e42649..4eddb668d278f8 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -1,7 +1,6 @@
 /* eslint-disable prefer-spread */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable no-param-reassign */
-/* eslint-disable no-console */
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
 /* eslint-disable @typescript-eslint/no-floating-promises */
@@ -93,7 +92,7 @@ export class ActiveWorkflowRunner {
 		// so instead of pulling all the active webhooks just pull the actives that have a trigger
 		const workflowsData: IWorkflowDb[] = (await Db.collections.Workflow.find({
 			where: { active: true },
-			relations: ['shared', 'shared.user', 'shared.user.globalRole'],
+			relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
 		})) as IWorkflowDb[];
 
 		if (!config.getEnv('endpoints.skipWebhooksDeregistrationOnShutdown')) {
@@ -109,12 +108,12 @@ export class ActiveWorkflowRunner {
 		}
 
 		if (workflowsData.length !== 0) {
-			console.info(' ================================');
-			console.info('   Start Active Workflows:');
-			console.info(' ================================');
+			Logger.info(' ================================');
+			Logger.info('   Start Active Workflows:');
+			Logger.info(' ================================');
 
 			for (const workflowData of workflowsData) {
-				console.log(`   - ${workflowData.name} (ID: ${workflowData.id})`);
+				Logger.info(`   - ${workflowData.name} (ID: ${workflowData.id})`);
 				Logger.debug(`Initializing active workflow "${workflowData.name}" (startup)`, {
 					workflowName: workflowData.name,
 					workflowId: workflowData.id,
@@ -125,14 +124,14 @@ export class ActiveWorkflowRunner {
 						workflowName: workflowData.name,
 						workflowId: workflowData.id,
 					});
-					console.log('     => Started');
+					Logger.info('     => Started');
 				} catch (error) {
 					ErrorReporter.error(error);
-					console.log(
+					Logger.info(
 						'     => ERROR: Workflow could not be activated on first try, keep on trying',
 					);
 					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-					console.log(`               ${error.message}`);
+					Logger.info(`               ${error.message}`);
 					Logger.error(
 						`Issue on intital workflow activation try "${workflowData.name}" (startup)`,
 						{
@@ -166,7 +165,10 @@ export class ActiveWorkflowRunner {
 		}
 
 		const activeWorkflows = await this.getActiveWorkflows();
-		activeWorkflowIds = [...activeWorkflowIds, ...activeWorkflows.map((workflow) => workflow.id)];
+		activeWorkflowIds = [
+			...activeWorkflowIds,
+			...activeWorkflows.map((workflow) => workflow.id.toString()),
+		];
 
 		// Make sure IDs are unique
 		activeWorkflowIds = Array.from(new Set(activeWorkflowIds));
@@ -480,7 +482,7 @@ export class ActiveWorkflowRunner {
 				try {
 					await this.removeWorkflowWebhooks(workflow.id as string);
 				} catch (error) {
-					console.error(
+					Logger.error(
 						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 						`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error.message}"`,
 					);
@@ -649,7 +651,7 @@ export class ActiveWorkflowRunner {
 							.catch(donePromise.reject);
 					});
 				} else {
-					executePromise.catch(console.error);
+					executePromise.catch(Logger.error);
 				}
 			};
 
@@ -706,7 +708,7 @@ export class ActiveWorkflowRunner {
 							.catch(donePromise.reject);
 					});
 				} else {
-					executePromise.catch(console.error);
+					executePromise.catch(Logger.error);
 				}
 			};
 			returnFunctions.emitError = async (error: Error): Promise<void> => {
@@ -783,7 +785,7 @@ export class ActiveWorkflowRunner {
 			if (workflowData === undefined) {
 				workflowData = (await Db.collections.Workflow.findOne({
 					where: { id: workflowId },
-					relations: ['shared', 'shared.user', 'shared.user.globalRole'],
+					relations: ['shared', 'shared.user', 'shared.user.globalRole', 'shared.role'],
 				})) as IWorkflowDb;
 			}
 
@@ -811,9 +813,13 @@ export class ActiveWorkflowRunner {
 			}
 
 			const mode = 'trigger';
-			const additionalData = await WorkflowExecuteAdditionalData.getBase(
-				(workflowData as WorkflowEntity).shared[0].user.id,
+			const workflowOwner = (workflowData as WorkflowEntity).shared.find(
+				(shared) => shared.role.name === 'owner',
 			);
+			if (!workflowOwner) {
+				throw new Error('Workflow cannot be activated because it has no owner');
+			}
+			const additionalData = await WorkflowExecuteAdditionalData.getBase(workflowOwner.user.id);
 			const getTriggerFunctions = this.getExecuteTriggerFunctions(
 				workflowData,
 				additionalData,
@@ -977,7 +983,7 @@ export class ActiveWorkflowRunner {
 				await this.removeWorkflowWebhooks(workflowId);
 			} catch (error) {
 				ErrorReporter.error(error);
-				console.error(
+				Logger.error(
 					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
 				);
diff --git a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
new file mode 100644
index 00000000000000..e45dd334cb0ce5
--- /dev/null
+++ b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
@@ -0,0 +1,265 @@
+import { v4 as uuid } from 'uuid';
+import { mocked } from 'jest-mock';
+
+import { ICredentialTypes, LoggerProxy, NodeOperationError, Workflow } from 'n8n-workflow';
+
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
+import * as Db from '@/Db';
+import { WorkflowEntity } from '@/databases/entities/WorkflowEntity';
+import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
+import { Role } from '@/databases/entities/Role';
+import { User } from '@/databases/entities/User';
+import { getLogger } from '@/Logger';
+import { NodeTypes } from '@/NodeTypes';
+import { CredentialTypes } from '@/CredentialTypes';
+import { randomEmail, randomName } from '../integration/shared/random';
+import * as Helpers from './Helpers';
+import { WorkflowExecuteAdditionalData } from '@/index';
+import { WorkflowRunner } from '@/WorkflowRunner';
+
+/**
+ * TODO:
+ * - test workflow webhooks activation (that trigger `executeWebhook`and other webhook methods)
+ * - test activation error catching and getters such as `getActivationError` (requires building a workflow that fails to activate)
+ * - test queued workflow activation functions (might need to create a non-working workflow to test this)
+ */
+
+let databaseActiveWorkflowsCount = 0;
+let databaseActiveWorkflowsList: WorkflowEntity[] = [];
+
+const generateWorkflows = (count: number): WorkflowEntity[] => {
+	const workflows: WorkflowEntity[] = [];
+	const ownerRole = new Role();
+	ownerRole.scope = 'workflow';
+	ownerRole.name = 'owner';
+	ownerRole.id = '1';
+
+	const owner = new User();
+	owner.id = uuid();
+	owner.firstName = randomName();
+	owner.lastName = randomName();
+	owner.email = randomEmail();
+
+	for (let i = 0; i < count; i++) {
+		const workflow = new WorkflowEntity();
+		Object.assign(workflow, {
+			id: i + 1,
+			name: randomName(),
+			active: true,
+			createdAt: new Date(),
+			updatedAt: new Date(),
+			nodes: [
+				{
+					parameters: {
+						rule: {
+							interval: [{}],
+						},
+					},
+					id: uuid(),
+					name: 'Schedule Trigger',
+					type: 'n8n-nodes-base.scheduleTrigger',
+					typeVersion: 1,
+					position: [900, 460],
+				},
+			],
+			connections: {},
+			tags: [],
+		});
+		const sharedWorkflow = new SharedWorkflow();
+		sharedWorkflow.workflowId = workflow.id;
+		sharedWorkflow.role = ownerRole;
+		sharedWorkflow.user = owner;
+
+		workflow.shared = [sharedWorkflow];
+
+		workflows.push(workflow);
+	}
+	databaseActiveWorkflowsList = workflows;
+	return workflows;
+};
+
+const MOCK_NODE_TYPES_DATA = Helpers.mockNodeTypesData(['scheduleTrigger'], {
+	addTrigger: true,
+});
+
+jest.mock('@/Db', () => {
+	return {
+		collections: {
+			Workflow: {
+				find: jest.fn(async () => Promise.resolve(generateWorkflows(databaseActiveWorkflowsCount))),
+				findOne: jest.fn(async (searchParams) => {
+					const foundWorkflow = databaseActiveWorkflowsList.find(
+						(workflow) => workflow.id.toString() === searchParams.where.id.toString(),
+					);
+					return Promise.resolve(foundWorkflow);
+				}),
+				update: jest.fn(),
+				createQueryBuilder: jest.fn(() => {
+					const fakeQueryBuilder = {
+						update: () => fakeQueryBuilder,
+						set: () => fakeQueryBuilder,
+						where: () => fakeQueryBuilder,
+						execute: () => Promise.resolve(),
+					};
+					return fakeQueryBuilder;
+				}),
+			},
+			Webhook: {
+				clear: jest.fn(),
+				delete: jest.fn(),
+			},
+		},
+	};
+});
+
+const mockExternalHooksRunFunction = jest.fn();
+
+jest.mock('@/ExternalHooks', () => {
+	return {
+		ExternalHooks: () => {
+			return {
+				run: () => mockExternalHooksRunFunction(),
+				init: () => Promise.resolve(),
+			};
+		},
+	};
+});
+
+const workflowCheckIfCanBeActivated = jest.fn(() => true);
+
+jest
+	.spyOn(Workflow.prototype, 'checkIfWorkflowCanBeActivated')
+	.mockImplementation(workflowCheckIfCanBeActivated);
+
+const removeFunction = jest.spyOn(ActiveWorkflowRunner.prototype, 'remove');
+const removeWebhooksFunction = jest.spyOn(ActiveWorkflowRunner.prototype, 'removeWorkflowWebhooks');
+const workflowRunnerRun = jest.spyOn(WorkflowRunner.prototype, 'run');
+const workflowExecuteAdditionalDataExecuteErrorWorkflowSpy = jest.spyOn(
+	WorkflowExecuteAdditionalData,
+	'executeErrorWorkflow',
+);
+
+describe('ActiveWorkflowRunner', () => {
+	let activeWorkflowRunner: ActiveWorkflowRunner;
+
+	beforeAll(async () => {
+		LoggerProxy.init(getLogger());
+		NodeTypes({
+			loaded: {
+				nodes: MOCK_NODE_TYPES_DATA,
+				credentials: {},
+			},
+			known: { nodes: {}, credentials: {} },
+			credentialTypes: {} as ICredentialTypes,
+		});
+		CredentialTypes({
+			loaded: {
+				nodes: MOCK_NODE_TYPES_DATA,
+				credentials: {},
+			},
+			known: { nodes: {}, credentials: {} },
+			credentialTypes: {} as ICredentialTypes,
+		});
+	});
+
+	beforeEach(() => {
+		activeWorkflowRunner = new ActiveWorkflowRunner();
+	});
+
+	afterEach(async () => {
+		await activeWorkflowRunner.removeAll();
+		databaseActiveWorkflowsCount = 0;
+		jest.clearAllMocks();
+	});
+
+	test('Should initialize activeWorkflowRunner with empty list of active workflows and call External Hooks', async () => {
+		void (await activeWorkflowRunner.init());
+		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(0);
+		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
+		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
+		expect(mockExternalHooksRunFunction).toHaveBeenCalledTimes(1);
+	});
+
+	test('Should initialize activeWorkflowRunner with one active workflow', async () => {
+		databaseActiveWorkflowsCount = 1;
+		void (await activeWorkflowRunner.init());
+		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
+			databaseActiveWorkflowsCount,
+		);
+		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
+		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
+		expect(mockExternalHooksRunFunction).toHaveBeenCalled();
+	});
+
+	test('Should make sure function checkIfWorkflowCanBeActivated was called for every workflow', async () => {
+		databaseActiveWorkflowsCount = 2;
+		void (await activeWorkflowRunner.init());
+		expect(workflowCheckIfCanBeActivated).toHaveBeenCalledTimes(databaseActiveWorkflowsCount);
+	});
+
+	test('Call to removeAll should remove every workflow', async () => {
+		databaseActiveWorkflowsCount = 2;
+		void (await activeWorkflowRunner.init());
+		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
+			databaseActiveWorkflowsCount,
+		);
+		void (await activeWorkflowRunner.removeAll());
+		expect(removeFunction).toHaveBeenCalledTimes(databaseActiveWorkflowsCount);
+	});
+
+	test('Call to remove should also call removeWorkflowWebhooks', async () => {
+		databaseActiveWorkflowsCount = 1;
+		void (await activeWorkflowRunner.init());
+		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
+			databaseActiveWorkflowsCount,
+		);
+		void (await activeWorkflowRunner.remove('1'));
+		expect(removeWebhooksFunction).toHaveBeenCalledTimes(1);
+	});
+
+	test('Call to isActive should return true for valid workflow', async () => {
+		databaseActiveWorkflowsCount = 1;
+		void (await activeWorkflowRunner.init());
+		expect(await activeWorkflowRunner.isActive('1')).toBe(true);
+	});
+
+	test('Call to isActive should return false for invalid workflow', async () => {
+		databaseActiveWorkflowsCount = 1;
+		void (await activeWorkflowRunner.init());
+		expect(await activeWorkflowRunner.isActive('2')).toBe(false);
+	});
+
+	test('Calling add should call checkIfWorkflowCanBeActivated', async () => {
+		// Initialize with default (0) workflows
+		void (await activeWorkflowRunner.init());
+		generateWorkflows(1);
+		void (await activeWorkflowRunner.add('1', 'activate'));
+		expect(workflowCheckIfCanBeActivated).toHaveBeenCalledTimes(1);
+	});
+
+	test('runWorkflow should call run method in WorkflowRunner', async () => {
+		void (await activeWorkflowRunner.init());
+		const workflow = generateWorkflows(1);
+		const additionalData = await WorkflowExecuteAdditionalData.getBase('fake-user-id');
+
+		workflowRunnerRun.mockImplementationOnce(() => Promise.resolve('invalid-execution-id'));
+
+		void (await activeWorkflowRunner.runWorkflow(
+			workflow[0],
+			workflow[0].nodes[0],
+			[[]],
+			additionalData,
+			'trigger',
+		));
+
+		expect(workflowRunnerRun).toHaveBeenCalledTimes(1);
+	});
+
+	test('executeErrorWorkflow should call function with same name in WorkflowExecuteAdditionalData', async () => {
+		const workflowData = generateWorkflows(1)[0];
+		const error = new NodeOperationError(workflowData.nodes[0], 'Fake error message');
+		void (await activeWorkflowRunner.init());
+		activeWorkflowRunner.executeErrorWorkflow(error, workflowData, 'trigger');
+		expect(workflowExecuteAdditionalDataExecuteErrorWorkflowSpy).toHaveBeenCalledTimes(1);
+	});
+});
diff --git a/packages/cli/test/unit/Helpers.ts b/packages/cli/test/unit/Helpers.ts
index 079b606f415ea5..afe90f68704a14 100644
--- a/packages/cli/test/unit/Helpers.ts
+++ b/packages/cli/test/unit/Helpers.ts
@@ -3,6 +3,8 @@ import {
 	INodeType,
 	INodeTypeData,
 	INodeTypes,
+	ITriggerFunctions,
+	ITriggerResponse,
 	IVersionedNodeType,
 	NodeHelpers,
 } from 'n8n-workflow';
@@ -41,6 +43,41 @@ class NodeTypesClass implements INodeTypes {
 				},
 			},
 		},
+		'fake-scheduler': {
+			sourcePath: '',
+			type: {
+				description: {
+					displayName: 'Schedule',
+					name: 'set',
+					group: ['input'],
+					version: 1,
+					description: 'Schedules execuitons',
+					defaults: {
+						name: 'Set',
+						color: '#0000FF',
+					},
+					inputs: ['main'],
+					outputs: ['main'],
+					properties: [
+						{
+							displayName: 'Value1',
+							name: 'value1',
+							type: 'string',
+							default: 'default-value1',
+						},
+						{
+							displayName: 'Value2',
+							name: 'value2',
+							type: 'string',
+							default: 'default-value2',
+						},
+					],
+				},
+				trigger: () => {
+					return Promise.resolve(undefined);
+				},
+			},
+		},
 	};
 
 	constructor(nodesAndCredentials?: INodesAndCredentials) {
@@ -74,3 +111,33 @@ export function NodeTypes(nodesAndCredentials?: INodesAndCredentials): NodeTypes
  * after all promises in the microtask queue have settled first.
  */
 export const flushPromises = async () => new Promise(setImmediate);
+
+export function mockNodeTypesData(
+	nodeNames: string[],
+	options?: {
+		addTrigger?: boolean;
+	},
+) {
+	return nodeNames.reduce<INodeTypeData>((acc, nodeName) => {
+		return (
+			(acc[`n8n-nodes-base.${nodeName}`] = {
+				sourcePath: '',
+				type: {
+					description: {
+						displayName: nodeName,
+						name: nodeName,
+						group: [],
+						description: '',
+						version: 1,
+						defaults: {},
+						inputs: [],
+						outputs: [],
+						properties: [],
+					},
+					trigger: options?.addTrigger ? () => Promise.resolve(undefined) : undefined,
+				},
+			}),
+			acc
+		);
+	}, {});
+}
diff --git a/packages/cli/test/unit/PermissionChecker.test.ts b/packages/cli/test/unit/PermissionChecker.test.ts
index 3514e5bf064c31..7fbe35535131dc 100644
--- a/packages/cli/test/unit/PermissionChecker.test.ts
+++ b/packages/cli/test/unit/PermissionChecker.test.ts
@@ -10,7 +10,7 @@ import {
 import config from '@/config';
 import * as Db from '@/Db';
 import * as testDb from '../integration/shared/testDb';
-import { NodeTypes as MockNodeTypes } from './Helpers';
+import { mockNodeTypesData, NodeTypes as MockNodeTypes } from './Helpers';
 import { UserService } from '@/user/user.service';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 import * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
@@ -388,24 +388,4 @@ describe('PermissionChecker.checkSubworkflowExecutePolicy', () => {
 	});
 });
 
-const MOCK_NODE_TYPES_DATA = ['start', 'actionNetwork'].reduce<INodeTypeData>((acc, nodeName) => {
-	return (
-		(acc[`n8n-nodes-base.${nodeName}`] = {
-			sourcePath: '',
-			type: {
-				description: {
-					displayName: nodeName,
-					name: nodeName,
-					group: [],
-					description: '',
-					version: 1,
-					defaults: {},
-					inputs: [],
-					outputs: [],
-					properties: [],
-				},
-			},
-		}),
-		acc
-	);
-}, {});
+const MOCK_NODE_TYPES_DATA = mockNodeTypesData(['start', 'actionNetwork']);

From 9698c7e7ea8858e3c0ca51723bad58c2e774e44c Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Fri, 10 Feb 2023 15:33:32 +0100
Subject: [PATCH 175/358] test(Move Binary Data Node): Unit tests
 (no-changelog) (#5442)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✅ add Move Binary Data test

* ✅ improve Move Binary Data Test -

---------

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../test/MoveBinaryData.test.ts               | 130 +++++++++++++
 .../test/MoveBinaryData.workflow.json         | 171 ++++++++++++++++++
 .../MoveBinaryData/test/data/sample.json      |   5 +
 3 files changed, 306 insertions(+)
 create mode 100644 packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
 create mode 100644 packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.workflow.json
 create mode 100644 packages/nodes-base/nodes/MoveBinaryData/test/data/sample.json

diff --git a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
new file mode 100644
index 00000000000000..c9c190b5cb50af
--- /dev/null
+++ b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.test.ts
@@ -0,0 +1,130 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import * as Helpers from '../../../test/nodes/Helpers';
+import type { WorkflowTestData } from '../../../test/nodes/types';
+import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
+import path from 'path';
+
+describe('Test Move Binary Data Node', () => {
+	beforeEach(async () => {
+		await Helpers.initBinaryDataManager();
+	});
+
+	const workflow = Helpers.readJsonFileSync(
+		'nodes/MoveBinaryData/test/MoveBinaryData.workflow.json',
+	);
+	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
+	node.parameters.filePath = path.join(__dirname, 'data', 'sample.json');
+
+	const tests: WorkflowTestData[] = [
+		{
+			description: 'nodes/MoveBinaryData/test/MoveBinaryData.workflow.json',
+			input: {
+				workflowData: workflow,
+			},
+			output: {
+				nodeData: {
+					'Binary to JSON': [
+						[
+							{
+								json: {
+									id: 1,
+									title: 'My Title',
+									description: 'Lorem Ipsum ...',
+								},
+							},
+						],
+					],
+					'Binary to JSON - No Set All Data': [
+						[
+							{
+								json: {
+									data: '{\n\t"id": 1,\n\t"title": "My Title",\n\t"description": "Lorem Ipsum ..."\n}',
+								},
+							},
+						],
+					],
+					'Binary to JSON - No Set All Data + Json Parse': [
+						[
+							{
+								json: {
+									data: {
+										id: 1,
+										title: 'My Title',
+										description: 'Lorem Ipsum ...',
+									},
+								},
+							},
+						],
+					],
+					'Binary to JSON - No Set All Data + Encoding base64': [
+						[
+							{
+								json: {
+									data: 'ewoJImlkIjogMSwKCSJ0aXRsZSI6ICJNeSBUaXRsZSIsCgkiZGVzY3JpcHRpb24iOiAiTG9yZW0gSXBzdW0gLi4uIgp9',
+								},
+							},
+						],
+					],
+					'Binary to JSON - Keep as Base64': [
+						[
+							{
+								json: {
+									data: 'ewoJImlkIjogMSwKCSJ0aXRsZSI6ICJNeSBUaXRsZSIsCgkiZGVzY3JpcHRpb24iOiAiTG9yZW0gSXBzdW0gLi4uIgp9',
+								},
+							},
+						],
+					],
+					'JSON to Binary': [
+						[
+							{
+								json: {},
+								binary: {
+									data: {
+										data: 'eyJpZCI6MSwidGl0bGUiOiJNeSBUaXRsZSIsImRlc2NyaXB0aW9uIjoiTG9yZW0gSXBzdW0gLi4uIn0=',
+										mimeType: 'application/json',
+										fileType: 'json',
+										fileSize: '59 B',
+									},
+								},
+							},
+						],
+					],
+					'JSON to Binary - No Convert All Data': [
+						[
+							{
+								json: {
+									id: 1,
+									description: 'Lorem Ipsum ...',
+								},
+								binary: {
+									data: {
+										data: 'Ik15IFRpdGxlIg==',
+										mimeType: 'application/json',
+										fileType: 'json',
+										fileSize: '10 B',
+										fileName: 'example.json',
+									},
+								},
+							},
+						],
+					],
+				},
+			},
+		},
+	];
+
+	const nodeTypes = Helpers.setup(tests);
+
+	for (const testData of tests) {
+		test(testData.description, async () => {
+			const { result } = await executeWorkflow(testData, nodeTypes);
+
+			const resultNodeData = Helpers.getResultNodeData(result, testData);
+			resultNodeData.forEach(({ nodeName, resultData }) =>
+				expect(resultData).toEqual(testData.output.nodeData[nodeName]),
+			);
+
+			expect(result.finished).toEqual(true);
+		});
+	}
+});
diff --git a/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.workflow.json b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.workflow.json
new file mode 100644
index 00000000000000..284362853fc46c
--- /dev/null
+++ b/packages/nodes-base/nodes/MoveBinaryData/test/MoveBinaryData.workflow.json
@@ -0,0 +1,171 @@
+{
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "f1789069-98a9-44ad-8e72-6b5c4a000f51",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [0, 1120]
+		},
+		{
+			"parameters": {
+				"filePath": "C:\\Test\\sample.json"
+			},
+			"id": "ef780d51-664d-4d8a-b0c1-43fe63921e82",
+			"name": "Read Binary File",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"position": [220, 1120]
+		},
+		{
+			"parameters": {
+				"setAllData": false,
+				"options": {}
+			},
+			"id": "1dfba9d4-dc39-4693-9411-405e423b8da8",
+			"name": "Binary to JSON - No Set All Data",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [440, 1120]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "b745f52d-3a5f-4f42-b3d0-e303d3aded4c",
+			"name": "Binary to JSON",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [440, 920]
+		},
+		{
+			"parameters": {
+				"mode": "jsonToBinary",
+				"options": {}
+			},
+			"id": "fb1bbc87-8b6c-4889-a376-760dbb8a090e",
+			"name": "JSON to Binary",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [740, 780]
+		},
+		{
+			"parameters": {
+				"mode": "jsonToBinary",
+				"convertAllData": false,
+				"sourceKey": "title",
+				"options": {
+					"fileName": "example.json"
+				}
+			},
+			"id": "34ff0af3-fd2d-4b26-9e92-176f1aaff11a",
+			"name": "JSON to Binary - No Convert All Data",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [740, 1020]
+		},
+		{
+			"parameters": {
+				"setAllData": false,
+				"options": {
+					"jsonParse": true
+				}
+			},
+			"id": "b2c37763-801b-497f-b7d8-4c30b7e108e7",
+			"name": "Binary to JSON - No Set All Data + Json Parse",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [440, 1340]
+		},
+		{
+			"parameters": {
+				"setAllData": false,
+				"options": {
+					"encoding": "base64"
+				}
+			},
+			"id": "b2125e40-9cd6-4730-b243-30aa565a42ee",
+			"name": "Binary to JSON - No Set All Data + Encoding base64",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [440, 1560]
+		},
+		{
+			"parameters": {
+				"setAllData": false,
+				"options": {
+					"keepAsBase64": true
+				}
+			},
+			"id": "30b27ae6-29e1-43c6-be10-1f17cb3ade8a",
+			"name": "Binary to JSON - Keep as Base64",
+			"type": "n8n-nodes-base.moveBinaryData",
+			"typeVersion": 1,
+			"position": [440, 1780]
+		}
+	],
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read Binary File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read Binary File": {
+			"main": [
+				[
+					{
+						"node": "Binary to JSON",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Binary to JSON - No Set All Data",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Binary to JSON - No Set All Data + Json Parse",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Binary to JSON - No Set All Data + Encoding base64",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "Binary to JSON - Keep as Base64",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Binary to JSON": {
+			"main": [
+				[
+					{
+						"node": "JSON to Binary",
+						"type": "main",
+						"index": 0
+					},
+					{
+						"node": "JSON to Binary - No Convert All Data",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/MoveBinaryData/test/data/sample.json b/packages/nodes-base/nodes/MoveBinaryData/test/data/sample.json
new file mode 100644
index 00000000000000..ae8da55880462f
--- /dev/null
+++ b/packages/nodes-base/nodes/MoveBinaryData/test/data/sample.json
@@ -0,0 +1,5 @@
+{
+	"id": 1,
+	"title": "My Title",
+	"description": "Lorem Ipsum ..."
+}
\ No newline at end of file

From d266401ed85953cfe060e2f8ea3f957d7cc21333 Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Fri, 10 Feb 2023 16:26:26 +0100
Subject: [PATCH 176/358] test(Read PDF Node): Unit tests (no-changelog)
 (#5453)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✅ add ReadPDF node test

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../nodes/ReadPdf/test/ReadPDF.test.ts        |  60 ++++++++++++++++
 .../nodes/ReadPdf/test/ReadPDF.workflow.json  |  64 ++++++++++++++++++
 .../nodes-base/nodes/ReadPdf/test/sample.pdf  | Bin 0 -> 17814 bytes
 3 files changed, 124 insertions(+)
 create mode 100644 packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
 create mode 100644 packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
 create mode 100644 packages/nodes-base/nodes/ReadPdf/test/sample.pdf

diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
new file mode 100644
index 00000000000000..b814a3eee5eade
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.test.ts
@@ -0,0 +1,60 @@
+/* eslint-disable @typescript-eslint/no-loop-func */
+import * as Helpers from '../../../test/nodes/Helpers';
+import type { WorkflowTestData } from '../../../test/nodes/types';
+import { executeWorkflow } from '../../../test/nodes/ExecuteWorkflow';
+import path from 'path';
+
+describe('Test Read PDF Node', () => {
+	beforeEach(async () => {
+		await Helpers.initBinaryDataManager();
+	});
+
+	const workflow = Helpers.readJsonFileSync('nodes/ReadPdf/test/ReadPDF.workflow.json');
+	const node = workflow.nodes.find((n: any) => n.name === 'Read Binary File');
+	node.parameters.filePath = path.join(__dirname, 'sample.pdf');
+
+	const testData: WorkflowTestData = {
+		description: 'nodes/ReadPdf/test/ReadPDF.workflow.json',
+		input: {
+			workflowData: workflow,
+		},
+		output: {
+			nodeData: {
+				'Read PDF': [
+					[
+						{
+							json: {
+								numpages: 1,
+								numrender: 1,
+								info: {
+									PDFFormatVersion: '1.4',
+									IsAcroFormPresent: false,
+									IsXFAPresent: false,
+									Title: 'sample',
+									Producer: 'iLovePDF',
+									ModDate: 'D:20230210122750Z',
+								},
+								metadata: null,
+								text: '\n\nN8N\nSample PDF\nLorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor\ninvidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et\njusto duo dolores et ea rebum.',
+								version: '1.10.100',
+							},
+						},
+					],
+				],
+			},
+		},
+	};
+
+	const nodeTypes = Helpers.setup(testData);
+
+	test(testData.description, async () => {
+		const { result } = await executeWorkflow(testData, nodeTypes);
+		const resultNodeData = Helpers.getResultNodeData(result, testData);
+
+		// delete binary data because we test against json only
+		delete resultNodeData[0].resultData[0]![0].binary;
+		expect(resultNodeData[0].resultData).toEqual(testData.output.nodeData['Read PDF']);
+
+		expect(result.finished).toEqual(true);
+	});
+});
diff --git a/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
new file mode 100644
index 00000000000000..9d6aaf0c1fd2b2
--- /dev/null
+++ b/packages/nodes-base/nodes/ReadPdf/test/ReadPDF.workflow.json
@@ -0,0 +1,64 @@
+{
+	"name": "Read PDF node unit test",
+	"nodes": [
+		{
+			"parameters": {},
+			"id": "0c9db33c-dd15-4088-9d12-b9f3b8f1fa96",
+			"name": "When clicking \"Execute Workflow\"",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [960, 540]
+		},
+		{
+			"parameters": {},
+			"id": "86abdc3b-206d-4b67-a37f-6b67b6bd3bbc",
+			"name": "Read PDF",
+			"type": "n8n-nodes-base.readPDF",
+			"typeVersion": 1,
+			"position": [1400, 540]
+		},
+		{
+			"parameters": {
+				"filePath": "C:\\Test\\sample.pdf"
+			},
+			"id": "2f6d241e-44a4-4213-b49a-166201946a89",
+			"name": "Read Binary File",
+			"type": "n8n-nodes-base.readBinaryFile",
+			"typeVersion": 1,
+			"position": [1180, 540]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"When clicking \"Execute Workflow\"": {
+			"main": [
+				[
+					{
+						"node": "Read Binary File",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Read Binary File": {
+			"main": [
+				[
+					{
+						"node": "Read PDF",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {},
+	"versionId": "9802b48d-727a-40ef-ad87-d544a9a648a7",
+	"id": "188",
+	"meta": {
+		"instanceId": "104a4d08d8897b8bdeb38aaca515021075e0bd8544c983c2bb8c86e6a8e6081c"
+	},
+	"tags": []
+}
diff --git a/packages/nodes-base/nodes/ReadPdf/test/sample.pdf b/packages/nodes-base/nodes/ReadPdf/test/sample.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..5e539c06132761199bbfeba1ed0baf55944fd77f
GIT binary patch
literal 17814
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

literal 0
HcmV?d00001


From 9a331ec7b6ba6097a972d283aeca292bd8e7c0a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 10 Feb 2023 16:34:39 +0100
Subject: [PATCH 177/358] fix(core): Stop using unbound calls to `stopProcess`
 (no-changelog) (#5456)

---
 packages/cli/src/commands/BaseCommand.ts  | 13 +++++++++----
 packages/cli/src/commands/executeBatch.ts |  9 ++-------
 packages/cli/src/commands/start.ts        |  5 -----
 packages/cli/src/commands/webhook.ts      |  5 -----
 packages/cli/src/commands/worker.ts       |  5 -----
 5 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 1ef136b209e3b7..65b6dd27fc87ff 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -1,4 +1,5 @@
 import { Command } from '@oclif/command';
+import { ExitError } from '@oclif/errors';
 import type { INodeTypes } from 'n8n-workflow';
 import { LoggerProxy, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
 import type { IUserSettings } from 'n8n-core';
@@ -35,8 +36,8 @@ export abstract class BaseCommand extends Command {
 	async init(): Promise<void> {
 		await initErrorHandling();
 
-		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-		this.stopProcess = this.stopProcess.bind(this);
+		process.once('SIGTERM', async () => this.stopProcess());
+		process.once('SIGINT', async () => this.stopProcess());
 
 		// Make sure the settings exist
 		this.userSettings = await UserSettings.prepareUserSettings();
@@ -88,7 +89,11 @@ export abstract class BaseCommand extends Command {
 
 	async finally(error: Error | undefined) {
 		if (inTest || this.id === 'start') return;
-		if (Db.isInitialized) await Db.connection.destroy();
-		this.exit(error ? 1 : 0);
+		if (Db.isInitialized) {
+			await sleep(100); // give any in-flight query some time to finish
+			await Db.connection.destroy();
+		}
+		const exitCode = error instanceof ExitError ? error.oclif.exit : error ? 1 : 0;
+		this.exit(exitCode);
 	}
 }
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index 592c1873c683bc..d12c7fabd89fcc 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -95,7 +95,7 @@ export class ExecuteBatch extends BaseCommand {
 	 * Gracefully handles exit.
 	 * @param {boolean} skipExit Whether to skip exit or number according to received signal
 	 */
-	static async stopProcess(skipExit: boolean | number = false) {
+	async stopProcess(skipExit: boolean | number = false) {
 		if (ExecuteBatch.cancelled) {
 			process.exit(0);
 		}
@@ -168,11 +168,6 @@ export class ExecuteBatch extends BaseCommand {
 	}
 
 	async run() {
-		// eslint-disable-next-line @typescript-eslint/unbound-method
-		process.once('SIGTERM', ExecuteBatch.stopProcess);
-		// eslint-disable-next-line @typescript-eslint/unbound-method
-		process.once('SIGINT', ExecuteBatch.stopProcess);
-
 		// eslint-disable-next-line @typescript-eslint/no-shadow
 		const { flags } = this.parse(ExecuteBatch);
 
@@ -318,7 +313,7 @@ export class ExecuteBatch extends BaseCommand {
 			console.log(this.formatJsonOutput(results));
 		}
 
-		await ExecuteBatch.stopProcess(true);
+		await this.stopProcess(true);
 
 		if (results.summary.failedExecutions > 0) {
 			this.exit(1);
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 28b092783037f6..c3761f02e768e4 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/await-thenable */
-/* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import path from 'path';
@@ -199,10 +198,6 @@ export class Start extends BaseCommand {
 	}
 
 	async init() {
-		// Make sure that n8n shuts down gracefully if possible
-		process.once('SIGTERM', this.stopProcess);
-		process.once('SIGINT', this.stopProcess);
-
 		await this.initCrashJournal();
 		await super.init();
 		this.logger.info('Initializing n8n process');
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index e8cafdbfbc13ff..c061efbcbe46b9 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/unbound-method */
 import { flags } from '@oclif/command';
 import { LoggerProxy, sleep } from 'n8n-workflow';
 import config from '@/config';
@@ -71,10 +70,6 @@ export class Webhook extends BaseCommand {
 			this.error('Webhook processes can only run with execution mode as queue.');
 		}
 
-		// Make sure that n8n shuts down gracefully if possible
-		process.once('SIGTERM', this.stopProcess);
-		process.once('SIGINT', this.stopProcess);
-
 		await this.initCrashJournal();
 		await super.init();
 
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 591aa4f836c1ed..bd4c09266be465 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -1,4 +1,3 @@
-/* eslint-disable @typescript-eslint/unbound-method */
 import express from 'express';
 import http from 'http';
 import type PCancelable from 'p-cancelable';
@@ -219,10 +218,6 @@ export class Worker extends BaseCommand {
 	}
 
 	async init() {
-		// Make sure that n8n shuts down gracefully if possible
-		process.once('SIGTERM', this.stopProcess);
-		process.once('SIGINT', this.stopProcess);
-
 		await this.initCrashJournal();
 		await super.init();
 		this.logger.debug('Starting n8n worker...');

From 7ec7e31565f6864a95e28f492ea52e821e0c4e37 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:42:33 +0000
Subject: [PATCH 178/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.136.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 9e1f1902e753ab..28265cc50f5c2e 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.135.0",
+  "version": "0.136.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 6e431eb8a8972b983e2adc49ebbcc271d0414910 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:42:44 +0000
Subject: [PATCH 179/358] :arrow_up: Set n8n-workflow@0.136.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 5be8864bbceeb1..a79124ac1ab4d7 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,7 +55,7 @@
     "form-data": "^4.0.0",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.135.0",
+    "n8n-workflow": "~0.136.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "pretty-bytes": "^5.6.0",

From d857d87f8bcd65385f060e31f8cbb83dbb3d7d91 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:42:44 +0000
Subject: [PATCH 180/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.15?=
 =?UTF-8?q?4.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index a79124ac1ab4d7..ebda975e26f01a 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.153.0",
+  "version": "0.154.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 24411ba9535d7478d1a9703276993f4a217b2b20 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:42:58 +0000
Subject: [PATCH 181/358] :arrow_up: Set n8n-core@0.154.0 and
 n8n-workflow@0.136.0 on n8n-node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 05feabfe58ace5..97a801fbbb7243 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.153.0",
-    "n8n-workflow": "~0.135.0",
+    "n8n-core": "~0.154.0",
+    "n8n-workflow": "~0.136.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From 89ea19a7ce40f4c99c0f91d9c40a58275ff76a02 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:42:58 +0000
Subject: [PATCH 182/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@?=
 =?UTF-8?q?0.93.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 97a801fbbb7243..df466b348ae46f 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.92.0",
+  "version": "0.93.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 829edf3c2661b6105215bd4e133df843ec24c0d4 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:43:13 +0000
Subject: [PATCH 183/358] :arrow_up: Set n8n-core@0.154.0 and
 n8n-workflow@0.136.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index c20b1ad0612430..5ef03acb86ef9e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -758,7 +758,7 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "~0.135.0"
+    "n8n-workflow": "~0.136.0"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
@@ -797,7 +797,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "~0.153.0",
+    "n8n-core": "~0.154.0",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",

From 595ef1ee95986f84be44e98b1b0fb2b997c8b8a3 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:43:13 +0000
Subject: [PATCH 184/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.213.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 5ef03acb86ef9e..f82cc39f533617 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.212.2",
+  "version": "0.213.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 2fb54e922a77e86aaf2804c97d9d57a4bc1b39e9 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:44:19 +0000
Subject: [PATCH 185/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-design-sy?=
 =?UTF-8?q?stem@0.53.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/design-system/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 926996b594459b..4adb3517a75068 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "0.52.0",
+  "version": "0.53.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {

From 565f1216e34ac5062524314f80bcf6b0a3e2d796 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:44:37 +0000
Subject: [PATCH 186/358] :arrow_up: Set n8n-design-system@0.53.0 and
 n8n-workflow@0.136.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index e7337451313458..ef9b0ad784f06e 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -63,8 +63,8 @@
     "lodash.set": "^4.3.2",
     "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
-    "n8n-design-system": "~0.52.0",
-    "n8n-workflow": "~0.135.0",
+    "n8n-design-system": "~0.53.0",
+    "n8n-workflow": "~0.136.0",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.0.22",
     "prettier": "^2.8.3",

From 8fa8aaa4b1ddfe934f372d0f2224699ae91410cd Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:44:37 +0000
Subject: [PATCH 187/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.181.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index ef9b0ad784f06e..1dfa13e57262e5 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.180.3",
+  "version": "0.181.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From ffc88977ef9c0ccb4906ddecc4abf2dbae3fd109 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:46:55 +0000
Subject: [PATCH 188/358] :arrow_up: Set n8n-core@0.154.0,
 n8n-editor-ui@0.181.0, n8n-nodes-base@0.213.0 and n8n-workflow@0.136.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 88298c03afdef3..4ea899957ec3a1 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -167,10 +167,10 @@
     "lodash.unset": "^4.5.2",
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
-    "n8n-core": "~0.153.0",
-    "n8n-editor-ui": "~0.180.3",
-    "n8n-nodes-base": "~0.212.2",
-    "n8n-workflow": "~0.135.0",
+    "n8n-core": "~0.154.0",
+    "n8n-editor-ui": "~0.181.0",
+    "n8n-nodes-base": "~0.213.0",
+    "n8n-workflow": "~0.136.0",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 231b6906052dcd59e3a4540b06720bfaa7fd95e5 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 15:46:55 +0000
Subject: [PATCH 189/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.215.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4ea899957ec3a1..05c38c789d5c68 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.3",
+  "version": "0.215.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 21e9af09a79be9f3910a57b4ff355d3a6ad893da Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Fri, 10 Feb 2023 09:56:06 -0600
Subject: [PATCH 190/358] :books: Update CHANGELOG.md and main package.json to
 0.215.0

---
 CHANGELOG.md   | 27 +++++++++++++++++++++++++++
 package.json   |  2 +-
 pnpm-lock.yaml | 22 +++++++++++-----------
 3 files changed, 39 insertions(+), 12 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eda41e5cc8810b..9be3a0f8e6e467 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,30 @@
+# [0.215.0](https://github.com/n8n-io/n8n/compare/n8n@0.214.3...n8n@0.215.0) (2023-02-10)
+
+
+### Bug Fixes
+
+* **ActiveCampaign Node:** Fix additional fields not being sent when updating account contacts ([#5216](https://github.com/n8n-io/n8n/issues/5216)) ([333a817](https://github.com/n8n-io/n8n/commit/333a817a8ef202d4133f2796b066e6a8ec414719))
+* **core:** Disable transactions on sqlite migrations that use `PRAGMA foreign_keys` ([#5392](https://github.com/n8n-io/n8n/issues/5392)) ([3a435f7](https://github.com/n8n-io/n8n/commit/3a435f7057ac4e48945bd1b3a4efea0397f026a0))
+* **core:** Expression extension failing with optional chaining ([#5370](https://github.com/n8n-io/n8n/issues/5370)) ([c7b58e0](https://github.com/n8n-io/n8n/commit/c7b58e0ed19869a4f47c666cc895ed72fe20e8e4))
+* **core:** Fix import command for workflows with old format(pre UM) ([#5403](https://github.com/n8n-io/n8n/issues/5403)) ([fdf47a9](https://github.com/n8n-io/n8n/commit/fdf47a96dee8883b811249e1e427b764cab15004))
+* **core:** Stop copying icons to cache ([#5419](https://github.com/n8n-io/n8n/issues/5419)) ([f23fb92](https://github.com/n8n-io/n8n/commit/f23fb9269660721aadd34cbb5bb958d7aaf0bcb2))
+* **editor:** Prevent creation of input connections for nodes without input slot ([#5425](https://github.com/n8n-io/n8n/issues/5425)) ([018f8a3](https://github.com/n8n-io/n8n/commit/018f8a3510b280b08d95037f9b6b870748170f3e))
+* Error workflow now correctly checks for subworkflow permissions ([#5390](https://github.com/n8n-io/n8n/issues/5390)) ([c8245b9](https://github.com/n8n-io/n8n/commit/c8245b9f872fd2c85ecaaa0da426b3ef9cb03113))
+* **Linear Node:** Fix issue with Issue States not loading correctly ([#5435](https://github.com/n8n-io/n8n/issues/5435)) ([57a2b9c](https://github.com/n8n-io/n8n/commit/57a2b9cceb52cbed905459e6ae92007e00a335cc))
+* MySQL migration parses database contents if necessary (fix for MariaDB) ([#5441](https://github.com/n8n-io/n8n/issues/5441)) ([2eb72a6](https://github.com/n8n-io/n8n/commit/2eb72a6c9f447f77f78f6d0ab392ebec5515f58c))
+
+
+### Features
+
+* Change desktop UM experience ([#5312](https://github.com/n8n-io/n8n/issues/5312)) ([5e3e70b](https://github.com/n8n-io/n8n/commit/5e3e70b83bf905c39f23a213f953bc42d7eed357))
+* **core:** Add support for WebSockets as an alternative to Server-Sent Events ([#5443](https://github.com/n8n-io/n8n/issues/5443)) ([538984d](https://github.com/n8n-io/n8n/commit/538984dc2f95fe2089f99deefcee3352e4ccd144))
+* **Edit Image Node:** Allow WebP as an image format ([#5420](https://github.com/n8n-io/n8n/issues/5420)) ([94f2b2a](https://github.com/n8n-io/n8n/commit/94f2b2a26fca3987715e49352dd3e6f75b8bd6e2))
+* **editor:** Add `Object` global completions ([#5407](https://github.com/n8n-io/n8n/issues/5407)) ([d7b3923](https://github.com/n8n-io/n8n/commit/d7b3923c2f5e02680170b132ba0e7cc59cb67cf6))
+* **editor:** Bring completions to HTML editor ([#5382](https://github.com/n8n-io/n8n/issues/5382)) ([a07de04](https://github.com/n8n-io/n8n/commit/a07de049a2105e1c2f749958a281cedbf918c39a))
+* **HubSpot Trigger Node:** Add conversation events ([#5408](https://github.com/n8n-io/n8n/issues/5408)) ([aeaa663](https://github.com/n8n-io/n8n/commit/aeaa6636201f0ad98603d1abd602bdf6072e8a11))
+
+
+
 ## [0.214.3](https://github.com/n8n-io/n8n/compare/n8n@0.214.2...n8n@0.214.3) (2023-02-09)
 
 * **editor:** Prevent creation of input connections for nodes without input slot ([#5425](https://github.com/n8n-io/n8n/issues/5425)) ([b57ec1d](https://github.com/n8n-io/n8n/commit/b57ec1d6abbae9e23ae5f473d70674aa14701bce))
diff --git a/package.json b/package.json
index 6ba1c87480e04f..c0d14e52551c9a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.214.3",
+  "version": "0.215.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9e9ac46b9aea99..f04a0bafca5536 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -203,10 +203,10 @@ importers:
       luxon: ^3.1.0
       mock-jwks: ^1.0.9
       mysql2: ~2.3.3
-      n8n-core: ~0.153.0
-      n8n-editor-ui: ~0.180.3
-      n8n-nodes-base: ~0.212.2
-      n8n-workflow: ~0.135.0
+      n8n-core: ~0.154.0
+      n8n-editor-ui: ~0.181.0
+      n8n-nodes-base: ~0.213.0
+      n8n-workflow: ~0.136.0
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
       oauth-1.0a: ^2.2.6
@@ -399,7 +399,7 @@ importers:
       form-data: ^4.0.0
       lodash.get: ^4.4.2
       mime-types: ^2.1.27
-      n8n-workflow: ~0.135.0
+      n8n-workflow: ~0.136.0
       oauth-1.0a: ^2.2.6
       p-cancelable: ^2.0.0
       pretty-bytes: ^5.6.0
@@ -582,8 +582,8 @@ importers:
       lodash.set: ^4.3.2
       luxon: ^3.1.0
       monaco-editor: ^0.33.0
-      n8n-design-system: ~0.52.0
-      n8n-workflow: ~0.135.0
+      n8n-design-system: ~0.53.0
+      n8n-workflow: ~0.136.0
       normalize-wheel: ^1.0.1
       pinia: ^2.0.22
       prettier: ^2.8.3
@@ -713,8 +713,8 @@ importers:
       change-case: ^4.1.1
       fast-glob: ^3.2.5
       inquirer: ^7.0.1
-      n8n-core: ~0.153.0
-      n8n-workflow: ~0.135.0
+      n8n-core: ~0.154.0
+      n8n-workflow: ~0.136.0
       oauth-1.0a: ^2.2.6
       replace-in-file: ^6.0.0
       request: ^2.88.2
@@ -806,8 +806,8 @@ importers:
       mqtt: 4.2.6
       mssql: ^8.1.2
       mysql2: ~2.3.0
-      n8n-core: ~0.153.0
-      n8n-workflow: ~0.135.0
+      n8n-core: ~0.154.0
+      n8n-workflow: ~0.136.0
       node-html-markdown: ^1.1.3
       node-ssh: ^12.0.0
       nodemailer: ^6.7.1

From 309c9953646f535d22a0bd94b198294d0a18b12a Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Fri, 10 Feb 2023 17:11:06 +0100
Subject: [PATCH 191/358] test: Change workflows to test from safe list to skip
 list (#5457)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Remove check by safe list to skip list

* add an option to skip using statistics events

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 .github/workflows/test-workflows.yml | 3 ++-
 packages/cli/src/events/index.ts     | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-workflows.yml b/.github/workflows/test-workflows.yml
index 7802f5d2c8e359..2a26fcf9c24445 100644
--- a/.github/workflows/test-workflows.yml
+++ b/.github/workflows/test-workflows.yml
@@ -73,10 +73,11 @@ jobs:
         shell: bash
 
       - name: Run tests
-        run: n8n/packages/cli/bin/n8n executeBatch --shallow --ids=test-workflows/safeList.txt --shortOutput --concurrency=16 --compare=test-workflows/snapshots
+        run: n8n/packages/cli/bin/n8n executeBatch --shallow --skipList=test-workflows/skipList.txt --shortOutput --concurrency=16 --compare=test-workflows/snapshots
         shell: bash
         env:
           N8N_ENCRYPTION_KEY: ${{secrets.ENCRYPTION_KEY}}
+          SKIP_STATISTICS_EVENTS: true
       # -
       #   name: Export credentials
       #   if: always()
diff --git a/packages/cli/src/events/index.ts b/packages/cli/src/events/index.ts
index d2d29a7538d494..a73a848f75d923 100644
--- a/packages/cli/src/events/index.ts
+++ b/packages/cli/src/events/index.ts
@@ -2,6 +2,8 @@ import { eventEmitter } from 'n8n-core';
 import { nodeFetchedData, workflowExecutionCompleted } from './WorkflowStatistics';
 
 export function initEvents() {
+	if ('SKIP_STATISTICS_EVENTS' in process.env) return;
+
 	// Check for undefined as during testing these functions end up undefined for some reason
 	if (nodeFetchedData) {
 		eventEmitter.on(eventEmitter.types.nodeFetchedData, nodeFetchedData);

From 59f5c4221efd6f8733bfb5ab41a0834332e9b9e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 10 Feb 2023 18:33:04 +0100
Subject: [PATCH 192/358] fix(core): Handle versioned custom nodes correctly
 (#5313)

---
 packages/core/src/DirectoryLoader.ts |  6 ++++--
 packages/workflow/src/NodeHelpers.ts | 16 ++++++----------
 packages/workflow/src/index.ts       |  1 +
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 66ba6c832b2e77..adf6888c2bcc58 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -1,7 +1,7 @@
 import * as path from 'path';
 import { readFile } from 'fs/promises';
 import glob from 'fast-glob';
-import { jsonParse, LoggerProxy as Logger } from 'n8n-workflow';
+import { jsonParse, getVersionedNodeTypeAll, LoggerProxy as Logger } from 'n8n-workflow';
 import type {
 	CodexData,
 	DocumentationLink,
@@ -133,7 +133,9 @@ export abstract class DirectoryLoader {
 			version: nodeVersion,
 		});
 
-		this.types.nodes.push(tempNode.description);
+		getVersionedNodeTypeAll(tempNode).forEach(({ description }) => {
+			this.types.nodes.push(description);
+		});
 	}
 
 	protected loadCredentialFromFile(credentialName: string, filePath: string): void {
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index 59c02e760c0791..bfef53b0aa55bd 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -1395,22 +1395,18 @@ export function getVersionedNodeType(
 	object: IVersionedNodeType | INodeType,
 	version?: number,
 ): INodeType {
-	if (isNodeTypeVersioned(object)) {
-		return (object as IVersionedNodeType).getNodeType(version);
+	if ('nodeVersions' in object) {
+		return object.getNodeType(version);
 	}
-	return object as INodeType;
+	return object;
 }
 
 export function getVersionedNodeTypeAll(object: IVersionedNodeType | INodeType): INodeType[] {
-	if (isNodeTypeVersioned(object)) {
-		return Object.values((object as IVersionedNodeType).nodeVersions).map((element) => {
+	if ('nodeVersions' in object) {
+		return Object.values(object.nodeVersions).map((element) => {
 			element.description.name = object.description.name;
 			return element;
 		});
 	}
-	return [object as INodeType];
-}
-
-export function isNodeTypeVersioned(object: IVersionedNodeType | INodeType): boolean {
-	return !!('getNodeType' in object);
+	return [object];
 }
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 9e8b53d552e4d8..5e60cfb422c8d6 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -11,6 +11,7 @@ export * from './MessageEventBus';
 export * from './Expression';
 export * from './ExpressionError';
 export * from './NodeErrors';
+export * from './NodeHelpers';
 export * from './RoutingNode';
 export * from './Workflow';
 export * from './WorkflowActivationError';

From 339655611fcf05ebdf9be7c452bc1164333f122e Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <janober@users.noreply.github.com>
Date: Sat, 11 Feb 2023 09:46:10 -0600
Subject: [PATCH 193/358] fix(core): Fix issue that worker and webhook service
 close directly (#5461)

---
 packages/cli/src/commands/webhook.ts | 3 +++
 packages/cli/src/commands/worker.ts  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index c061efbcbe46b9..2bacd79128e7ae 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -80,6 +80,9 @@ export class Webhook extends BaseCommand {
 	async run() {
 		await new WebhookServer().start();
 		this.logger.info('Webhook listener waiting for requests.');
+
+		// Make sure that the process does not close
+		await new Promise(() => {});
 	}
 
 	async catch(error: Error) {
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index bd4c09266be465..66073ed711baf2 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -353,6 +353,9 @@ export class Worker extends BaseCommand {
 				}
 			});
 		}
+
+		// Make sure that the process does not close
+		await new Promise(() => {});
 	}
 
 	async catch(error: Error) {

From a245dbe0c9f123f3b49cd8635a60db6257e1e915 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:50:03 +0000
Subject: [PATCH 194/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.136.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 28265cc50f5c2e..a4c485160a36c9 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.136.0",
+  "version": "0.136.1",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 89c98754237b3483b77434d85a2e97b3a9015b4f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:50:13 +0000
Subject: [PATCH 195/358] :arrow_up: Set n8n-workflow@0.136.1 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index ebda975e26f01a..4e75ba4eea98f6 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,7 +55,7 @@
     "form-data": "^4.0.0",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.136.0",
+    "n8n-workflow": "~0.136.1",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "pretty-bytes": "^5.6.0",

From be17ec6e821f9609d6139296679aa68c7f5bc487 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:50:13 +0000
Subject: [PATCH 196/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.15?=
 =?UTF-8?q?4.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 4e75ba4eea98f6..9775a72bb6b781 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.154.0",
+  "version": "0.154.1",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 04eb832bfa6274aa74fb5f0d0b0c49786e63ada0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:50:22 +0000
Subject: [PATCH 197/358] :arrow_up: Set n8n-core@0.154.1 and
 n8n-workflow@0.136.1 on n8n-node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index df466b348ae46f..f2f146511d91b6 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.154.0",
-    "n8n-workflow": "~0.136.0",
+    "n8n-core": "~0.154.1",
+    "n8n-workflow": "~0.136.1",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From 8c4d1f73b52648dc7a097b1183b9719a215dcf09 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:50:23 +0000
Subject: [PATCH 198/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@?=
 =?UTF-8?q?0.93.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index f2f146511d91b6..0b769784023a23 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.93.0",
+  "version": "0.93.1",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From b064a2e8cc21538ca78c23084f9590cd00bb6ae6 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:50:36 +0000
Subject: [PATCH 199/358] :arrow_up: Set n8n-core@0.154.1 and
 n8n-workflow@0.136.1 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index f82cc39f533617..6321c4a8e3c586 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -758,7 +758,7 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "~0.136.0"
+    "n8n-workflow": "~0.136.1"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
@@ -797,7 +797,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "~0.154.0",
+    "n8n-core": "~0.154.1",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",

From c25a5a99a6f5544ecc57ae22d198f66d6b995cc3 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:50:36 +0000
Subject: [PATCH 200/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.213.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 6321c4a8e3c586..4c4ea0749dcd7e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.213.0",
+  "version": "0.213.1",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From b9ef0a3664305396bde878dfbd101e84e97287d2 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:51:37 +0000
Subject: [PATCH 201/358] :arrow_up: Set n8n-workflow@0.136.1 on n8n-editor-ui

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 1dfa13e57262e5..4cf014b3d1f2cb 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -64,7 +64,7 @@
     "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
     "n8n-design-system": "~0.53.0",
-    "n8n-workflow": "~0.136.0",
+    "n8n-workflow": "~0.136.1",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.0.22",
     "prettier": "^2.8.3",

From 498a724e26c3ef2c094dcd0e9d25d70780b7cb32 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:51:38 +0000
Subject: [PATCH 202/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.181.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 4cf014b3d1f2cb..f6521c95bf0721 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.181.0",
+  "version": "0.181.1",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 1627f8b4443df7d902a9f8914e5ff22b8da2fcab Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:53:54 +0000
Subject: [PATCH 203/358] :arrow_up: Set n8n-core@0.154.1,
 n8n-editor-ui@0.181.1, n8n-nodes-base@0.213.1 and n8n-workflow@0.136.1 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 05c38c789d5c68..d074d82221f46c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -167,10 +167,10 @@
     "lodash.unset": "^4.5.2",
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
-    "n8n-core": "~0.154.0",
-    "n8n-editor-ui": "~0.181.0",
-    "n8n-nodes-base": "~0.213.0",
-    "n8n-workflow": "~0.136.0",
+    "n8n-core": "~0.154.1",
+    "n8n-editor-ui": "~0.181.1",
+    "n8n-nodes-base": "~0.213.1",
+    "n8n-workflow": "~0.136.1",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 8f25073a225666f1b079616d7c4628d77c4e9528 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 15:53:54 +0000
Subject: [PATCH 204/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.215.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index d074d82221f46c..886227b057b367 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.215.0",
+  "version": "0.215.1",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From e705701cb017c803621e356d35d349432f2886fa Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Sat, 11 Feb 2023 09:58:35 -0600
Subject: [PATCH 205/358] :books: Update CHANGELOG.md and main package.json to
 0.215.1

---
 CHANGELOG.md   | 10 ++++++++++
 package.json   |  2 +-
 pnpm-lock.yaml | 20 ++++++++++----------
 3 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9be3a0f8e6e467..80510a9f0893e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+## [0.215.1](https://github.com/n8n-io/n8n/compare/n8n@0.215.0...n8n@0.215.1) (2023-02-11)
+
+
+### Bug Fixes
+
+* **core:** Fix issue that worker and webhook service close directly ([#5461](https://github.com/n8n-io/n8n/issues/5461)) ([3396556](https://github.com/n8n-io/n8n/commit/339655611fcf05ebdf9be7c452bc1164333f122e))
+* **core:** Handle versioned custom nodes correctly ([#5313](https://github.com/n8n-io/n8n/issues/5313)) ([59f5c42](https://github.com/n8n-io/n8n/commit/59f5c4221efd6f8733bfb5ab41a0834332e9b9e4))
+
+
+
 # [0.215.0](https://github.com/n8n-io/n8n/compare/n8n@0.214.3...n8n@0.215.0) (2023-02-10)
 
 
diff --git a/package.json b/package.json
index c0d14e52551c9a..4aad8532826891 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.215.0",
+  "version": "0.215.1",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index f04a0bafca5536..c6332f1d27381b 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -203,10 +203,10 @@ importers:
       luxon: ^3.1.0
       mock-jwks: ^1.0.9
       mysql2: ~2.3.3
-      n8n-core: ~0.154.0
-      n8n-editor-ui: ~0.181.0
-      n8n-nodes-base: ~0.213.0
-      n8n-workflow: ~0.136.0
+      n8n-core: ~0.154.1
+      n8n-editor-ui: ~0.181.1
+      n8n-nodes-base: ~0.213.1
+      n8n-workflow: ~0.136.1
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
       oauth-1.0a: ^2.2.6
@@ -399,7 +399,7 @@ importers:
       form-data: ^4.0.0
       lodash.get: ^4.4.2
       mime-types: ^2.1.27
-      n8n-workflow: ~0.136.0
+      n8n-workflow: ~0.136.1
       oauth-1.0a: ^2.2.6
       p-cancelable: ^2.0.0
       pretty-bytes: ^5.6.0
@@ -583,7 +583,7 @@ importers:
       luxon: ^3.1.0
       monaco-editor: ^0.33.0
       n8n-design-system: ~0.53.0
-      n8n-workflow: ~0.136.0
+      n8n-workflow: ~0.136.1
       normalize-wheel: ^1.0.1
       pinia: ^2.0.22
       prettier: ^2.8.3
@@ -713,8 +713,8 @@ importers:
       change-case: ^4.1.1
       fast-glob: ^3.2.5
       inquirer: ^7.0.1
-      n8n-core: ~0.154.0
-      n8n-workflow: ~0.136.0
+      n8n-core: ~0.154.1
+      n8n-workflow: ~0.136.1
       oauth-1.0a: ^2.2.6
       replace-in-file: ^6.0.0
       request: ^2.88.2
@@ -806,8 +806,8 @@ importers:
       mqtt: 4.2.6
       mssql: ^8.1.2
       mysql2: ~2.3.0
-      n8n-core: ~0.154.0
-      n8n-workflow: ~0.136.0
+      n8n-core: ~0.154.1
+      n8n-workflow: ~0.136.1
       node-html-markdown: ^1.1.3
       node-ssh: ^12.0.0
       nodemailer: ^6.7.1

From 4dc458eca5587cf7765bed6fd384d47a31e66e2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 13 Feb 2023 16:16:53 +0100
Subject: [PATCH 206/358] fix(core): Fix the issue with test webhooks getting
 removed incorrectly (no-changelog) (#5466)

This broke because of the change [here](https://github.com/n8n-io/n8n/pull/5443/files#diff-b386248ff00977749c873ed85821c241b773e9740d7e7adf94e05b73b350ed74L152).
`finally` block is called even if there is a `return` in the `try` block, and this is causing the test webhook to be removed, even when it shouldn't be removed.
---
 packages/cli/src/TestWebhooks.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index aee337ec74b904..12ec4a68270722 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -141,13 +141,13 @@ class TestWebhooks {
 				if (sessionId !== undefined) {
 					push.send('testWebhookReceived', { workflowId, executionId }, sessionId);
 				}
-			} finally {
-				// Delete webhook also if an error is thrown
-				if (timeout) clearTimeout(timeout);
-				delete testWebhookData[webhookKey];
+			} catch {}
 
-				await activeWebhooks.removeWorkflow(workflow);
-			}
+			// Delete webhook also if an error is thrown
+			if (timeout) clearTimeout(timeout);
+			delete testWebhookData[webhookKey];
+
+			await activeWebhooks.removeWorkflow(workflow);
 		});
 	}
 

From 0ba557316203119ce284b321c7fd1ab28a3cc14b Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 14 Feb 2023 10:10:30 +0000
Subject: [PATCH 207/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.215.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 886227b057b367..5c51f15773b835 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.215.1",
+  "version": "0.215.2",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 856238721a16a4fc12cb9f18809b80e46b5d2af0 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Tue, 14 Feb 2023 11:14:00 +0100
Subject: [PATCH 208/358] :books: Update CHANGELOG.md and main package.json to
 0.215.2

---
 CHANGELOG.md | 9 +++++++++
 package.json | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 80510a9f0893e4..98a1860bba8530 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [0.215.2](https://github.com/n8n-io/n8n/compare/n8n@0.215.1...n8n@0.215.2) (2023-02-14)
+
+
+### Bug Fixes
+
+* **core:** Fix the issue with test webhooks getting removed incorrectly ([#5466](https://github.com/n8n-io/n8n/issues/5466)) ([4dc458e](https://github.com/n8n-io/n8n/commit/4dc458eca5587cf7765bed6fd384d47a31e66e2c)), closes [/github.com/n8n-io/n8n/pull/5443/files#diff-b386248ff00977749c873ed85821c241b773e9740d7e7adf94e05b73b350ed74L152](https://github.com//github.com/n8n-io/n8n/pull/5443/files/issues/diff-b386248ff00977749c873ed85821c241b773e9740d7e7adf94e05b73b350ed74L152)
+
+
+
 ## [0.215.1](https://github.com/n8n-io/n8n/compare/n8n@0.215.0...n8n@0.215.1) (2023-02-11)
 
 
diff --git a/package.json b/package.json
index 4aad8532826891..37ec66c9186df0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.215.1",
+  "version": "0.215.2",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {

From 3b9eec77ecf25c765a349bf174e7d42a545109c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 14 Feb 2023 11:39:19 +0100
Subject: [PATCH 209/358] test(editor): Add e2e tests for executions preview
 (#5458)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✅ Added initial tests for executions preview
* 🔥 Removing unneeded actions
* 👌 Renaming test suite, moving mock executions logic to util function
---
 cypress/e2e/20-workflow-executions.cy.ts      | 40 +++++++++++
 .../Test_workflow_4_executions_view.json      | 69 +++++++++++++++++++
 cypress/pages/workflow-executions-tab.ts      | 40 +++++++++++
 cypress/pages/workflow.ts                     | 11 +++
 .../N8nRadioButtons/RadioButton.vue           |  1 +
 .../ExecutionsView/ExecutionCard.vue          |  8 ++-
 .../ExecutionsView/ExecutionPreview.vue       | 22 ++++--
 .../ExecutionsView/ExecutionsSidebar.vue      | 34 +++++++--
 8 files changed, 211 insertions(+), 14 deletions(-)
 create mode 100644 cypress/e2e/20-workflow-executions.cy.ts
 create mode 100644 cypress/fixtures/Test_workflow_4_executions_view.json
 create mode 100644 cypress/pages/workflow-executions-tab.ts

diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
new file mode 100644
index 00000000000000..bd7dc0a2108b16
--- /dev/null
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -0,0 +1,40 @@
+import { WorkflowPage } from "../pages";
+import { WorkflowExecutionsTab } from "../pages/workflow-executions-tab";
+
+const workflowPage = new WorkflowPage();
+const executionsTab = new WorkflowExecutionsTab();
+
+// Test suite for executions tab
+describe('Current Workflow Executions', () => {
+	before(() => {
+		cy.resetAll();
+		cy.skipSetup();
+		workflowPage.actions.visit();
+		cy.waitForLoad();
+		cy.createFixtureWorkflow('Test_workflow_4_executions_view.json', `My test workflow`);
+		createMockExecutions();
+	});
+
+	it('should render executions tab correctly', () => {
+		cy.waitForLoad();
+		executionsTab.getters.executionListItems().should('have.length', 11);
+		executionsTab.getters.successfulExecutionListItems().should('have.length', 9);
+		executionsTab.getters.failedExecutionListItems().should('have.length', 2);
+		executionsTab.getters.executionListItems().first().invoke('attr','class').should('match', /_active_/);
+	});
+
+});
+
+
+const createMockExecutions = () => {
+	workflowPage.actions.turnOnManualExecutionSaving();
+	executionsTab.actions.createManualExecutions(5);
+	// Make some failed executions by enabling Code node with syntax error
+	executionsTab.actions.toggleNodeEnabled('Error');
+	executionsTab.actions.createManualExecutions(2);
+	// Then add some more successful ones
+	executionsTab.actions.toggleNodeEnabled('Error');
+	executionsTab.actions.createManualExecutions(4);
+	executionsTab.actions.switchToExecutionsTab();
+	cy.waitForLoad();
+}
diff --git a/cypress/fixtures/Test_workflow_4_executions_view.json b/cypress/fixtures/Test_workflow_4_executions_view.json
new file mode 100644
index 00000000000000..a0be9eae350662
--- /dev/null
+++ b/cypress/fixtures/Test_workflow_4_executions_view.json
@@ -0,0 +1,69 @@
+{
+  "meta": {
+    "instanceId": "6b85439d79c07750ea49eced4bc2a12b283cfcba0ab2917cd4f3fee36080e869"
+  },
+  "nodes": [
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n  error\n}\n\nreturn $input.all();"
+      },
+      "id": "d0ab7e12-0e1b-4c08-8081-83107794f37d",
+      "name": "Error",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 1,
+      "position": [
+        680,
+        460
+      ],
+      "disabled": true
+    },
+    {
+      "parameters": {},
+      "id": "f5026145-66c1-463c-8ac8-46a1309a6632",
+      "name": "On clicking 'execute'",
+      "type": "n8n-nodes-base.manualTrigger",
+      "typeVersion": 1,
+      "position": [
+        460,
+        460
+      ]
+    },
+    {
+      "parameters": {
+        "jsCode": "// Loop over input items and add a new field\n// called 'myNewField' to the JSON of each one\nfor (const item of $input.all()) {\n  item.json.myNewField = 1;\n}\n\nreturn $input.all();"
+      },
+      "id": "9926f884-348a-4af0-872e-dd7c8b3da811",
+      "name": "Code",
+      "type": "n8n-nodes-base.code",
+      "typeVersion": 1,
+      "position": [
+        900,
+        460
+      ]
+    }
+  ],
+  "connections": {
+    "Error": {
+      "main": [
+        [
+          {
+            "node": "Code",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "On clicking 'execute'": {
+      "main": [
+        [
+          {
+            "node": "Error",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  }
+}
diff --git a/cypress/pages/workflow-executions-tab.ts b/cypress/pages/workflow-executions-tab.ts
new file mode 100644
index 00000000000000..ea6c8b4fd5b7c7
--- /dev/null
+++ b/cypress/pages/workflow-executions-tab.ts
@@ -0,0 +1,40 @@
+import { BasePage } from "./base";
+import { WorkflowPage } from "./workflow";
+
+const workflowPage = new WorkflowPage();
+
+export class WorkflowExecutionsTab extends BasePage {
+	getters = {
+		executionsTabButton: () => cy.getByTestId('radio-button-executions'),
+		executionsSidebar: () => cy.getByTestId('executions-sidebar'),
+		autoRefreshCheckBox: () => cy.getByTestId('auto-refresh-checkbox'),
+		executionsList: () => cy.getByTestId('current-executions-list'),
+		executionListItems: () => this.getters.executionsList().find('div.execution-card'),
+		successfulExecutionListItems: () => cy.get('[data-test-execution-status="success"]'),
+		failedExecutionListItems: () => cy.get('[data-test-execution-status="error"]'),
+		executionCard: (executionId: string) => cy.getByTestId(`execution-details-${executionId}`),
+		executionPreviewDetails: () => cy.get('[data-test-id^="execution-preview-details-"]'),
+		executionPreviewDetailsById: (executionId: string) => cy.getByTestId(`execution-preview-details-${executionId}`),
+		executionPreviewTime: () => this.getters.executionPreviewDetails().find('[data-test-id="execution-time"]'),
+		executionPreviewStatus: () => this.getters.executionPreviewDetails().find('[data-test-id="execution-preview-label"]'),
+		executionPreviewId: () => this.getters.executionPreviewDetails().find('[data-test-id="execution-preview-id"]'),
+	};
+	actions = {
+		toggleNodeEnabled: (nodeName: string) => {
+			workflowPage.getters.canvasNodeByName(nodeName).click();
+			cy.get('body').type('d', { force: true });
+		},
+		createManualExecutions: (count: number) => {
+			for (let i=0; i<count; i++) {
+				workflowPage.actions.executeWorkflow();
+				cy.wait(300);
+			}
+		},
+		switchToExecutionsTab: () => {
+			this.getters.executionsTabButton().click();
+		},
+		switchToEditorTab: () => {
+			workflowPage.getters.editorTabButton().click();
+		}
+	};
+};
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 8a6a78c3a7575d..d895ccfab4b17a 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -103,6 +103,7 @@ export class WorkflowPage extends BasePage {
 			cy.get(
 				`.connection-actions[data-source-node="${sourceNodeName}"][data-target-node="${targetNodeName}"]`,
 			),
+		editorTabButton: () => cy.getByTestId('radio-button-workflow'),
 	};
 	actions = {
 		visit: () => {
@@ -230,5 +231,15 @@ export class WorkflowPage extends BasePage {
 				.first()
 				.click({ force: true });
 		},
+		turnOnManualExecutionSaving: () => {
+			this.getters.workflowMenu().click();
+			this.getters.workflowMenuItemSettings().click();
+			this.getters
+				.workflowSettingsSaveManualExecutionsSelect()
+				.find('li:contains("Yes")')
+				.click({ force: true });
+			this.getters.workflowSettingsSaveButton().click();
+			this.getters.successToast().should('exist');
+		},
 	};
 }
diff --git a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
index 4d35e6b1103d73..7f729df7cb3407 100644
--- a/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
+++ b/packages/design-system/src/components/N8nRadioButtons/RadioButton.vue
@@ -17,6 +17,7 @@
 				[$style[size]]: true,
 				[$style.disabled]: disabled,
 			}"
+			:data-test-id="`radio-button-${value}`"
 			@click="$emit('click')"
 		>
 			{{ label }}
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
index 45cacf47a76ef2..aaa602f0cacd08 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
@@ -14,11 +14,12 @@
 				name: VIEWS.EXECUTION_PREVIEW,
 				params: { workflowId: currentWorkflow, executionId: execution.id },
 			}"
+			:data-test-execution-status="executionUIDetails.name"
 		>
 			<div :class="$style.description">
-				<n8n-text color="text-dark" :bold="true" size="medium">{{
-					executionUIDetails.startTime
-				}}</n8n-text>
+				<n8n-text color="text-dark" :bold="true" size="medium" data-test-id="execution-time">
+					{{ executionUIDetails.startTime }}
+				</n8n-text>
 				<div :class="$style.executionStatus">
 					<n8n-spinner
 						v-if="executionUIDetails.name === 'running'"
@@ -62,6 +63,7 @@
 					:class="[$style.icon, $style.retry]"
 					:items="retryExecutionActions"
 					activatorIcon="redo"
+					data-test-id="retry-execution-button"
 					@select="onRetryMenuItemSelect"
 				/>
 				<n8n-tooltip v-if="execution.mode === 'manual'" placement="top">
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
index 4d2c118c1bba26..43e727b1dd2171 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
@@ -17,9 +17,10 @@
 		<div
 			:class="{ [$style.executionDetails]: true, [$style.sidebarCollapsed]: sidebarCollapsed }"
 			v-if="activeExecution"
+			:data-test-id="`execution-preview-details-${executionId}`"
 		>
 			<div>
-				<n8n-text size="large" color="text-base" :bold="true">{{
+				<n8n-text size="large" color="text-base" :bold="true" data-test-id="execution-time">{{
 					executionUIDetails.startTime
 				}}</n8n-text
 				><br />
@@ -28,9 +29,13 @@
 					size="small"
 					:class="[$style.spinner, 'mr-4xs']"
 				/>
-				<n8n-text size="medium" :class="[$style.status, $style[executionUIDetails.name]]">{{
-					executionUIDetails.label
-				}}</n8n-text>
+				<n8n-text
+					size="medium"
+					:class="[$style.status, $style[executionUIDetails.name]]"
+					data-test-id="execution-preview-label"
+				>
+					{{ executionUIDetails.label }}
+				</n8n-text>
 				<n8n-text v-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
 					{{
 						$locale.baseText('executionDetails.runningTimeRunning', {
@@ -39,7 +44,12 @@
 					}}
 					| ID#{{ activeExecution.id }}
 				</n8n-text>
-				<n8n-text v-else-if="executionUIDetails.name !== 'waiting'" color="text-base" size="medium">
+				<n8n-text
+					v-else-if="executionUIDetails.name !== 'waiting'"
+					color="text-base"
+					size="medium"
+					data-test-id="execution-preview-id"
+				>
 					{{
 						$locale.baseText('executionDetails.runningTimeFinished', {
 							interpolate: { time: executionUIDetails.runningTime },
@@ -80,6 +90,7 @@
 							type="tertiary"
 							:title="$locale.baseText('executionsList.retryExecution')"
 							icon="redo"
+							data-test-id="execution-preview-retry-button"
 							@blur="onRetryButtonBlur"
 						/>
 					</span>
@@ -99,6 +110,7 @@
 					icon="trash"
 					size="large"
 					type="tertiary"
+					data-test-id="execution-preview-delete-button"
 					@click="onDeleteExecution"
 				/>
 			</div>
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
index e1664e00261d04..69c190e0f1e7e4 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
@@ -1,18 +1,32 @@
 <template>
-	<div :class="['executions-sidebar', $style.container]" ref="container">
+	<div
+		:class="['executions-sidebar', $style.container]"
+		ref="container"
+		data-test-id="executions-sidebar"
+	>
 		<div :class="$style.heading">
 			<n8n-heading tag="h2" size="medium" color="text-dark">
 				{{ $locale.baseText('generic.executions') }}
 			</n8n-heading>
 		</div>
 		<div :class="$style.controls">
-			<el-checkbox v-model="autoRefresh" @change="onAutoRefreshToggle">{{
-				$locale.baseText('executionsList.autoRefresh')
-			}}</el-checkbox>
+			<el-checkbox
+				v-model="autoRefresh"
+				@change="onAutoRefreshToggle"
+				data-test-id="auto-refresh-checkbox"
+			>
+				{{ $locale.baseText('executionsList.autoRefresh') }}
+			</el-checkbox>
 			<n8n-popover trigger="click">
 				<template #reference>
 					<div :class="$style.filterButton">
-						<n8n-button icon="filter" type="tertiary" size="medium" :active="statusFilterApplied">
+						<n8n-button
+							icon="filter"
+							type="tertiary"
+							size="medium"
+							:active="statusFilterApplied"
+							data-test-id="executions-filter-button"
+						>
 							<n8n-badge v-if="statusFilterApplied" theme="primary" class="mr-4xs">1</n8n-badge>
 							{{ $locale.baseText('executionsList.filters') }}
 						</n8n-button>
@@ -33,6 +47,7 @@
 							ref="typeInput"
 							:class="$style['type-input']"
 							:placeholder="$locale.baseText('generic.any')"
+							data-test-id="execution-status-select"
 							@change="onFilterChange"
 						>
 							<n8n-option
@@ -40,6 +55,7 @@
 								:key="item.id"
 								:label="item.name"
 								:value="item.id"
+								:data-test-id="`execution-status-${item.id}`"
 							>
 							</n8n-option>
 						</n8n-select>
@@ -60,7 +76,12 @@
 				</n8n-link>
 			</n8n-info-tip>
 		</div>
-		<div :class="$style.executionList" ref="executionList" @scroll="loadMore(20)">
+		<div
+			:class="$style.executionList"
+			ref="executionList"
+			data-test-id="current-executions-list"
+			@scroll="loadMore(20)"
+		>
 			<div v-if="loading" class="mr-m">
 				<n8n-loading :class="$style.loader" variant="p" :rows="1" />
 				<n8n-loading :class="$style.loader" variant="p" :rows="1" />
@@ -77,6 +98,7 @@
 				:key="execution.id"
 				:execution="execution"
 				:ref="`execution-${execution.id}`"
+				:data-test-id="`execution-details-${execution.id}`"
 				@refresh="onRefresh"
 				@retryExecution="onRetryExecution"
 			/>

From f9d8248dbd6a4eefa7914471b121062945d4248a Mon Sep 17 00:00:00 2001
From: Deborah <deborah@starfallprojects.co.uk>
Date: Tue, 14 Feb 2023 11:10:37 +0000
Subject: [PATCH 210/358] docs: Update release notes link (#5472)

doc: Update release notes link
---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 336ea39e741fb4..980a0c665dbe44 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ The official n8n documentation can be found on our [documentation website](https
 
 Additional information and example workflows on the [n8n.io website](https://n8n.io)
 
-The release notes can be found [here](https://docs.n8n.io/reference/release-notes/) and the list of breaking
+The release notes can be found [here](https://docs.n8n.io/release-notes/) and the list of breaking
 changes [here](https://github.com/n8n-io/n8n/blob/master/packages/cli/BREAKING-CHANGES.md).
 
 ## Usage

From f7cbd6b17e1d258b704f6e577ab2da8cf504504a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 14 Feb 2023 12:44:13 +0100
Subject: [PATCH 211/358] feat(editor): Upgrade to Storybook v7 (no-changelog)
 (#5454)

Storybook 6 + Webpack 4 are pulling in a lot of dependencies that are blocking us from supporting node 18.
---
 packages/design-system/.storybook/main.js |    6 +-
 packages/design-system/package.json       |   30 +-
 pnpm-lock.yaml                            | 4686 +++++++--------------
 3 files changed, 1492 insertions(+), 3230 deletions(-)

diff --git a/packages/design-system/.storybook/main.js b/packages/design-system/.storybook/main.js
index 3e512d7a6d1eeb..2a72dca1e6e551 100644
--- a/packages/design-system/.storybook/main.js
+++ b/packages/design-system/.storybook/main.js
@@ -1,9 +1,13 @@
 const path = require('path');
 
 /**
- * @type {import('@storybook/core-common').StorybookConfig}
+ * @type {import('@storybook/types').StorybookConfig}
  */
 module.exports = {
+	framework: {
+		name: '@storybook/vue-webpack5',
+		options: {},
+	},
 	stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.{ts,js}'],
 	addons: [
 		'@storybook/addon-links',
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 4adb3517a75068..24e1853ecee332 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -19,8 +19,8 @@
     "test": "vitest run",
     "test:ci": "vitest run --coverage",
     "test:dev": "vitest",
-    "build:storybook": "build-storybook",
-    "storybook": "start-storybook -p 6006",
+    "build:storybook": "storybook build",
+    "storybook": "storybook dev -p 6006",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
     "lint": "eslint --quiet --ext .js,.ts,.vue src",
     "lintfix": "eslint --ext .js,.ts,.vue src --fix"
@@ -42,11 +42,12 @@
     "@fortawesome/fontawesome-svg-core": "^1.2.36",
     "@fortawesome/free-solid-svg-icons": "^5.15.4",
     "@fortawesome/vue-fontawesome": "^2.0.9",
-    "@storybook/addon-actions": "^6.5.15",
-    "@storybook/addon-essentials": "^6.5.15",
-    "@storybook/addon-links": "^6.5.15",
-    "@storybook/addon-postcss": "^2.0.0",
-    "@storybook/vue": "^6.5.15",
+    "@storybook/addon-actions": "^7.0.0-beta.46",
+    "@storybook/addon-essentials": "^7.0.0-beta.46",
+    "@storybook/addon-links": "^7.0.0-beta.46",
+    "@storybook/addon-postcss": "^3.0.0-alpha.1",
+    "@storybook/vue": "^7.0.0-beta.46",
+    "@storybook/vue-webpack5": "^7.0.0-beta.46",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/vue": "^5.8.3",
     "@types/markdown-it": "^12.2.3",
@@ -54,12 +55,14 @@
     "@types/markdown-it-link-attributes": "^3.0.1",
     "@types/sanitize-html": "^2.8.0",
     "@vitejs/plugin-vue2": "^2.2.0",
+    "autoprefixer": "^10.4.13",
     "c8": "7.12.0",
-    "core-js": "^3.27.1",
-    "jsdom": "21.0.0",
+    "core-js": "^3.27.2",
+    "jsdom": "21.1.0",
     "node-notifier": "^10.0.1",
-    "sass": "^1.57.1",
-    "sass-loader": "^10.3.1",
+    "sass": "^1.58.0",
+    "sass-loader": "^13.2.0",
+    "storybook": "^7.0.0-beta.46",
     "storybook-addon-designs": "^6.3.1",
     "storybook-addon-themes": "^6.1.0",
     "trim": "^1.0.1",
@@ -69,8 +72,7 @@
     "vue-loader": "^15.10.1",
     "vue-property-decorator": "^9.1.2",
     "vue-template-compiler": "^2.7.14",
-    "vue-tsc": "^1.0.24",
-    "webpack": "^4.46.0"
+    "vue-tsc": "^1.0.24"
   },
   "dependencies": {
     "element-ui": "~2.15.12",
@@ -78,7 +80,7 @@
     "markdown-it-emoji": "^2.0.2",
     "markdown-it-link-attributes": "^4.0.1",
     "markdown-it-task-lists": "^2.1.1",
-    "sanitize-html": "2.7.3",
+    "sanitize-html": "2.9.0",
     "vue": "^2.7.14",
     "vue-typed-mixins": "^0.2.0",
     "vue2-boring-avatars": "^0.3.8",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index c6332f1d27381b..887327f2b5fb98 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -442,11 +442,12 @@ importers:
       '@fortawesome/fontawesome-svg-core': ^1.2.36
       '@fortawesome/free-solid-svg-icons': ^5.15.4
       '@fortawesome/vue-fontawesome': ^2.0.9
-      '@storybook/addon-actions': ^6.5.15
-      '@storybook/addon-essentials': ^6.5.15
-      '@storybook/addon-links': ^6.5.15
-      '@storybook/addon-postcss': ^2.0.0
-      '@storybook/vue': ^6.5.15
+      '@storybook/addon-actions': ^7.0.0-beta.46
+      '@storybook/addon-essentials': ^7.0.0-beta.46
+      '@storybook/addon-links': ^7.0.0-beta.46
+      '@storybook/addon-postcss': ^3.0.0-alpha.1
+      '@storybook/vue': ^7.0.0-beta.46
+      '@storybook/vue-webpack5': ^7.0.0-beta.46
       '@testing-library/jest-dom': ^5.16.5
       '@testing-library/vue': ^5.8.3
       '@types/markdown-it': ^12.2.3
@@ -454,18 +455,20 @@ importers:
       '@types/markdown-it-link-attributes': ^3.0.1
       '@types/sanitize-html': ^2.8.0
       '@vitejs/plugin-vue2': ^2.2.0
+      autoprefixer: ^10.4.13
       c8: 7.12.0
-      core-js: ^3.27.1
+      core-js: ^3.27.2
       element-ui: ~2.15.12
-      jsdom: 21.0.0
+      jsdom: 21.1.0
       markdown-it: ^13.0.1
       markdown-it-emoji: ^2.0.2
       markdown-it-link-attributes: ^4.0.1
       markdown-it-task-lists: ^2.1.1
       node-notifier: ^10.0.1
-      sanitize-html: 2.7.3
-      sass: ^1.57.1
-      sass-loader: ^10.3.1
+      sanitize-html: 2.9.0
+      sass: ^1.58.0
+      sass-loader: ^13.2.0
+      storybook: ^7.0.0-beta.46
       storybook-addon-designs: ^6.3.1
       storybook-addon-themes: ^6.1.0
       trim: ^1.0.1
@@ -479,7 +482,6 @@ importers:
       vue-tsc: ^1.0.24
       vue-typed-mixins: ^0.2.0
       vue2-boring-avatars: ^0.3.8
-      webpack: ^4.46.0
       xss: ^1.0.14
     dependencies:
       element-ui: 2.15.12_prckukfdop5sl2her6de25cod4_vue@2.7.14
@@ -487,7 +489,7 @@ importers:
       markdown-it-emoji: 2.0.2
       markdown-it-link-attributes: 4.0.1
       markdown-it-task-lists: 2.1.1
-      sanitize-html: 2.7.3
+      sanitize-html: 2.9.0
       vue: 2.7.14
       vue-typed-mixins: 0.2.0
       vue2-boring-avatars: 0.3.8
@@ -496,11 +498,12 @@ importers:
       '@fortawesome/fontawesome-svg-core': 1.2.36
       '@fortawesome/free-solid-svg-icons': 5.15.4
       '@fortawesome/vue-fontawesome': 2.0.9_dh3wzfumpzw6zsszdpw5cxouqy
-      '@storybook/addon-actions': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addon-essentials': 6.5.15_tmwo376r55imxzsx4yykzrtc74
-      '@storybook/addon-links': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addon-postcss': 2.0.0_webpack@4.46.0
-      '@storybook/vue': 6.5.15_ogbyckaggwfyqweeqbx5bhjsqy
+      '@storybook/addon-actions': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-essentials': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-links': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-postcss': 3.0.0-alpha.1_webpack@5.75.0
+      '@storybook/vue': 7.0.0-beta.46_wp7tvu3eu4pbkovl2pyk3t6dzu
+      '@storybook/vue-webpack5': 7.0.0-beta.46_kqbjeyqrxfaciuxblodnlqbkgm
       '@testing-library/jest-dom': 5.16.5
       '@testing-library/vue': 5.8.3_rhqkolmkwunxzlyyxxsuwaiuri
       '@types/markdown-it': 12.2.3
@@ -508,23 +511,24 @@ importers:
       '@types/markdown-it-link-attributes': 3.0.1
       '@types/sanitize-html': 2.8.0
       '@vitejs/plugin-vue2': 2.2.0_vite@4.0.4+vue@2.7.14
+      autoprefixer: 10.4.13_postcss@8.4.21
       c8: 7.12.0
-      core-js: 3.27.1
-      jsdom: 21.0.0
+      core-js: 3.27.2
+      jsdom: 21.1.0
       node-notifier: 10.0.1
-      sass: 1.57.1
-      sass-loader: 10.3.1_sass@1.57.1+webpack@4.46.0
+      sass: 1.58.0
+      sass-loader: 13.2.0_sass@1.58.0+webpack@5.75.0
+      storybook: 7.0.0-beta.46
       storybook-addon-designs: 6.3.1_react@17.0.2
       storybook-addon-themes: 6.1.0_a5nuvzww5baef7fspvwijmdp24
       trim: 1.0.1
-      vite: 4.0.4_sass@1.57.1
-      vitest: 0.28.4_jsdom@21.0.0+sass@1.57.1
+      vite: 4.0.4_sass@1.58.0
+      vitest: 0.28.4_jsdom@21.1.0+sass@1.58.0
       vue-class-component: 7.2.6_vue@2.7.14
-      vue-loader: 15.10.1_kqygo6wsub6p3cpcl6idox7sza
+      vue-loader: 15.10.1_eo5mtzohqv75mh6aooqyrh42dy
       vue-property-decorator: 9.1.2_jtyyyychrtcflhl7vfprhmeb3y
       vue-template-compiler: 2.7.14
       vue-tsc: 1.0.24_typescript@4.9.4
-      webpack: 4.46.0
 
   packages/editor-ui:
     specifiers:
@@ -694,7 +698,7 @@ importers:
       c8: 7.12.0
       jshint: 2.13.5
       sass: 1.55.0
-      sass-loader: 10.3.1_sass@1.55.0+webpack@4.46.0
+      sass-loader: 10.3.1_sass@1.55.0+webpack@5.75.0
       string-template-parser: 1.2.6
       vite: 4.0.4_sass@1.55.0+terser@5.16.1
       vite-plugin-monaco-editor: 1.1.0_monaco-editor@0.33.0
@@ -1050,6 +1054,13 @@ packages:
       z-schema: 4.2.4
     dev: true
 
+  /@aw-web-design/x-default-browser/1.4.88:
+    resolution: {integrity: sha512-AkEmF0wcwYC2QkhK703Y83fxWARttIWXDmQN8+cof8FmFZ5BRhnNXGymeb1S73bOCLfWjYELxtujL56idCN/XA==}
+    hasBin: true
+    dependencies:
+      default-browser-id: 3.0.0
+    dev: true
+
   /@azure/abort-controller/1.1.0:
     resolution: {integrity: sha512-TrRLIoSQVzfAJX9H1JeFjzAoDGcoK1IYX1UImfceTZpsyYfWr09Ss1aHW1y5TrrR3iq6RZLBwJ3E24uwPhwahw==}
     engines: {node: '>=12.0.0'}
@@ -1270,30 +1281,6 @@ packages:
     engines: {node: '>=6.9.0'}
     dev: true
 
-  /@babel/core/7.12.9:
-    resolution: {integrity: sha512-gTXYh3M5wb7FRXQy+FErKFAv90BnlOuNn1QkCK2lREoPAjrQCO49+HVSrFoe5uakFAF5eenS75KbO2vQiLrTMQ==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      '@babel/code-frame': 7.18.6
-      '@babel/generator': 7.20.7
-      '@babel/helper-module-transforms': 7.20.11
-      '@babel/helpers': 7.20.7
-      '@babel/parser': 7.20.7
-      '@babel/template': 7.20.7
-      '@babel/traverse': 7.20.12
-      '@babel/types': 7.20.7
-      convert-source-map: 1.9.0
-      debug: 4.3.4
-      gensync: 1.0.0-beta.2
-      json5: 2.2.3
-      lodash: 4.17.21
-      resolve: 1.22.1
-      semver: 5.7.1
-      source-map: 0.5.7
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/core/7.20.12:
     resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==}
     engines: {node: '>=6.9.0'}
@@ -1385,24 +1372,6 @@ packages:
       regexpu-core: 5.2.2
     dev: true
 
-  /@babel/helper-define-polyfill-provider/0.1.5_@babel+core@7.20.12:
-    resolution: {integrity: sha512-nXuzCSwlJ/WKr8qxzW816gwyT6VZgiJG17zR40fou70yfAcqjoNyTLl/DQ+FExw5Hx5KNqshmN8Ldl/r2N7cTg==}
-    peerDependencies:
-      '@babel/core': ^7.4.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-compilation-targets': 7.20.7_@babel+core@7.20.12
-      '@babel/helper-module-imports': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/traverse': 7.20.12
-      debug: 4.3.4
-      lodash.debounce: 4.0.8
-      resolve: 1.22.1
-      semver: 6.3.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/helper-define-polyfill-provider/0.3.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-z5aQKU4IzbqCC1XH0nAqfsFLMVSo22SBKUc0BxGrLkolTdPTructy0ToNnlO2zA4j9Q/7pjMZf0DSY+DSTYzww==}
     peerDependencies:
@@ -1483,15 +1452,6 @@ packages:
       '@babel/types': 7.20.7
     dev: true
 
-  /@babel/helper-plugin-utils/7.10.4:
-    resolution: {integrity: sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==}
-    dev: true
-
-  /@babel/helper-plugin-utils/7.19.0:
-    resolution: {integrity: sha512-40Ryx7I8mT+0gaNxm8JGTZFUITNqdLAgdg0hXzeVZxVD6nFsdhQvip6v8dqkRHzsz1VFpFAaOCHNn0vKBL7Czw==}
-    engines: {node: '>=6.9.0'}
-    dev: true
-
   /@babel/helper-plugin-utils/7.20.2:
     resolution: {integrity: sha512-8RvlJG2mj4huQ4pZ+rU9lqKi9ZKiRmuvGuM2HlWmkmgOhbs6zEAw6IEiJ5cQqGbDzGZOhwuOQNtZMi/ENLjZoQ==}
     engines: {node: '>=6.9.0'}
@@ -1663,22 +1623,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-proposal-decorators/7.20.7_@babel+core@7.20.12:
-    resolution: {integrity: sha512-JB45hbUweYpwAGjkiM7uCyXMENH2lG+9r3G2E+ttc2PRXAoEkpfd/KW5jDg4j8RS6tLtTG1jZi9LbHZVSfs1/A==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-create-class-features-plugin': 7.20.12_@babel+core@7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-replace-supers': 7.20.7
-      '@babel/helper-split-export-declaration': 7.18.6
-      '@babel/plugin-syntax-decorators': 7.19.0_@babel+core@7.20.12
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@babel/plugin-proposal-dynamic-import/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw==}
     engines: {node: '>=6.9.0'}
@@ -1690,17 +1634,6 @@ packages:
       '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-export-default-from/7.18.10_@babel+core@7.20.12:
-    resolution: {integrity: sha512-5H2N3R2aQFxkV4PIBUR/i7PUSwgTZjouJKzI8eKswfIjT0PhvzkPn0t0wIS5zn6maQuvtT0t1oHtMUz61LOuow==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-export-default-from': 7.18.6_@babel+core@7.20.12
-    dev: true
-
   /@babel/plugin-proposal-export-namespace-from/7.18.9_@babel+core@7.20.12:
     resolution: {integrity: sha512-k1NtHyOMvlDDFeb9G5PhUXuGj8m/wiwojgQVEhJ/fsVsMCpLyOP4h0uGEjYJKrRI+EVPlb5Jk+Gt9P97lOGwtA==}
     engines: {node: '>=6.9.0'}
@@ -1756,17 +1689,6 @@ packages:
       '@babel/plugin-syntax-numeric-separator': 7.10.4_@babel+core@7.20.12
     dev: true
 
-  /@babel/plugin-proposal-object-rest-spread/7.12.1_@babel+core@7.12.9:
-    resolution: {integrity: sha512-s6SowJIjzlhx8o7lsFx5zmY4At6CTtDvgNQDdPzkBQucle58A6b/TTeEBYtyDgmcXjUTM+vE8YOGHZzzbc/ioA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.12.9
-      '@babel/plugin-transform-parameters': 7.20.7_@babel+core@7.12.9
-    dev: true
-
   /@babel/plugin-proposal-object-rest-spread/7.20.7_@babel+core@7.20.12:
     resolution: {integrity: sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==}
     engines: {node: '>=6.9.0'}
@@ -1880,16 +1802,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-decorators/7.19.0_@babel+core@7.20.12:
-    resolution: {integrity: sha512-xaBZUEDntt4faL1yN8oIFlhfXeQAWJW7CLKYsHTUqriCUbj8xOra8bfxxKGi/UwExPFBuPdH4XfHc9rGQhrVkQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-dynamic-import/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-5gdGbFon+PszYzqs83S3E5mpi7/y/8M9eC90MRTZfduQOYW76ig6SOSPNe41IG5LoP3FGBn2N0RjVDSQiS94kQ==}
     peerDependencies:
@@ -1899,16 +1811,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-export-default-from/7.18.6_@babel+core@7.20.12:
-    resolution: {integrity: sha512-Kr//z3ujSVNx6E9z9ih5xXXMqK07VVTuqPmqGe6Mss/zW5XPeLZeSDZoP9ab/hT4wPKqAgjl2PnhPrcpk8Seew==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-export-namespace-from/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q==}
     peerDependencies:
@@ -1956,15 +1858,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-jsx/7.12.1_@babel+core@7.12.9:
-    resolution: {integrity: sha512-1yRi7yAtB0ETgxdY9ti/p2TivUxJkTdhu/ZbF9MshVGqOx1TdB3b7xCXs49Fupgg50N45KcAsRP/ZqWjs9SRjg==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==}
     engines: {node: '>=6.9.0'}
@@ -1972,7 +1865,7 @@ packages:
       '@babel/core': ^7.0.0-0
     dependencies:
       '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.19.0
+      '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
   /@babel/plugin-syntax-logical-assignment-operators/7.10.4_@babel+core@7.20.12:
@@ -2002,15 +1895,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.12.9:
-    resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-syntax-object-rest-spread/7.8.3_@babel+core@7.20.12:
     resolution: {integrity: sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==}
     peerDependencies:
@@ -2327,16 +2211,6 @@ packages:
       - supports-color
     dev: true
 
-  /@babel/plugin-transform-parameters/7.20.7_@babel+core@7.12.9:
-    resolution: {integrity: sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-transform-parameters/7.20.7_@babel+core@7.20.12:
     resolution: {integrity: sha512-WiWBIkeHKVOSYPO0pWkxGPfKeWrCJyD3NJ53+Lrp/QMSZbsVPovrVl2aWZ19D/LTVnaDv5Ap7GJ/B2CTOZdrfA==}
     engines: {node: '>=6.9.0'}
@@ -2357,26 +2231,6 @@ packages:
       '@babel/helper-plugin-utils': 7.20.2
     dev: true
 
-  /@babel/plugin-transform-react-display-name/7.18.6_@babel+core@7.20.12:
-    resolution: {integrity: sha512-TV4sQ+T013n61uMoygyMRm+xf04Bd5oqFpv2jAEQwSZ8NwQA7zeRPg1LMVg2PWi3zWBz+CLKD+v5bcpZ/BS0aA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
-  /@babel/plugin-transform-react-jsx-development/7.18.6_@babel+core@7.20.12:
-    resolution: {integrity: sha512-SA6HEjwYFKF7WDjWcMcMGUimmw/nhNRDWxr+KaLSCrkD/LMDBvWRmHAYgE1HDeF8KUuI8OAu+RT6EOtKxSW2qA==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/plugin-transform-react-jsx': 7.20.7_@babel+core@7.20.12
-    dev: true
-
   /@babel/plugin-transform-react-jsx/7.20.7_@babel+core@7.20.12:
     resolution: {integrity: sha512-Tfq7qqD+tRj3EoDhY00nn2uP2hsRxgYGi5mLQ5TimKav0a9Lrpd4deE+fcLXU8zFYRjlKPHZhpCvfEA6qnBxqQ==}
     engines: {node: '>=6.9.0'}
@@ -2391,17 +2245,6 @@ packages:
       '@babel/types': 7.20.7
     dev: true
 
-  /@babel/plugin-transform-react-pure-annotations/7.18.6_@babel+core@7.20.12:
-    resolution: {integrity: sha512-I8VfEPg9r2TRDdvnHgPepTKvuRomzA8+u+nhY7qSI1fR2hRNebasZEETLyM5mAUr0Ku56OkXJ0I7NHJnO6cJiQ==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-annotate-as-pure': 7.18.6
-      '@babel/helper-plugin-utils': 7.20.2
-    dev: true
-
   /@babel/plugin-transform-regenerator/7.20.5_@babel+core@7.20.12:
     resolution: {integrity: sha512-kW/oO7HPBtntbsahzQ0qSE3tFvkFwnbozz3NWFhLGqH75vLEg+sCGngLlhVkePlCs3Jv0dBBHDzCHxNiFAQKCQ==}
     engines: {node: '>=6.9.0'}
@@ -2620,21 +2463,6 @@ packages:
       esutils: 2.0.3
     dev: true
 
-  /@babel/preset-react/7.18.6_@babel+core@7.20.12:
-    resolution: {integrity: sha512-zXr6atUmyYdiWRVLOZahakYmOBHtWc2WGCkP8PYTgZi0iJXDY2CN180TdrIW4OGOAdLc7TifzDIvtx6izaRIzg==}
-    engines: {node: '>=6.9.0'}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-plugin-utils': 7.20.2
-      '@babel/helper-validator-option': 7.18.6
-      '@babel/plugin-transform-react-display-name': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-transform-react-jsx': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-react-jsx-development': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-transform-react-pure-annotations': 7.18.6_@babel+core@7.20.12
-    dev: true
-
   /@babel/preset-typescript/7.18.6_@babel+core@7.20.12:
     resolution: {integrity: sha512-s9ik86kXBAnD760aybBucdpnLsAt0jK1xqJn2juOn9lkOvSHV60os5hxoVJsPzMQxvnUJFAlkont2DvvaYEBtQ==}
     engines: {node: '>=6.9.0'}
@@ -2728,15 +2556,6 @@ packages:
     resolution: {integrity: sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==}
     dev: true
 
-  /@cnakazawa/watch/1.0.4:
-    resolution: {integrity: sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==}
-    engines: {node: '>=0.1.95'}
-    hasBin: true
-    dependencies:
-      exec-sh: 0.3.6
-      minimist: 1.2.7
-    dev: true
-
   /@codemirror/autocomplete/6.4.0_wo7q3lvweq5evsu423o7qzum5i:
     resolution: {integrity: sha512-HLF2PnZAm1s4kGs30EiqKMgD7XsYaQ0XJnMR0rofEWQ5t5D60SfqpDIkIh1ze5tiEbyUWm8+VJ6W1/erVvBMIA==}
     peerDependencies:
@@ -2883,6 +2702,14 @@ packages:
     engines: {node: '>=10.0.0'}
     dev: true
 
+  /@emotion/use-insertion-effect-with-fallbacks/1.0.0_react@17.0.2:
+    resolution: {integrity: sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A==}
+    peerDependencies:
+      react: '>=16.8.0'
+    dependencies:
+      react: 17.0.2
+    dev: true
+
   /@esbuild/android-arm/0.16.17:
     resolution: {integrity: sha512-N9x1CMXVhtWEAMS7pNNONyA14f71VPQN9Cnavj1XQh6T7bskqiLLrSca4O0Vr8Wdcga943eThxnVp3JLnBMYtw==}
     engines: {node: '>=12'}
@@ -3076,6 +2903,10 @@ packages:
       - supports-color
     dev: true
 
+  /@fal-works/esbuild-plugin-global-externals/2.1.2:
+    resolution: {integrity: sha512-cEee/Z+I12mZcFJshKcCqC8tuX5hG3s+d+9nZ3LabqKF1vKdF41B92pJVCBggjAGORAeOzyyDDKrZwIkLffeOQ==}
+    dev: true
+
   /@figspec/components/1.0.1:
     resolution: {integrity: sha512-UvnEamPEAMh9HExViqpobWmX25g1+soA9kcJu+It3VerMa7CeVyaIbQydNf1Gys5v/rxJVdTDRgQ7OXW2zAAig==}
     dependencies:
@@ -3146,6 +2977,8 @@ packages:
 
   /@gar/promisify/1.1.3:
     resolution: {integrity: sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==}
+    dev: false
+    optional: true
 
   /@hapi/hoek/9.3.0:
     resolution: {integrity: sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==}
@@ -3397,29 +3230,6 @@ packages:
       slash: 3.0.0
     dev: true
 
-  /@jest/transform/26.6.2:
-    resolution: {integrity: sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      '@babel/core': 7.20.12
-      '@jest/types': 26.6.2
-      babel-plugin-istanbul: 6.1.1
-      chalk: 4.1.2
-      convert-source-map: 1.9.0
-      fast-json-stable-stringify: 2.1.0
-      graceful-fs: 4.2.10
-      jest-haste-map: 26.6.2
-      jest-regex-util: 26.0.0
-      jest-util: 26.6.2
-      micromatch: 4.0.5
-      pirates: 4.0.5
-      slash: 3.0.0
-      source-map: 0.6.1
-      write-file-atomic: 3.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /@jest/transform/29.4.2:
     resolution: {integrity: sha512-kf1v5iTJHn7p9RbOsBuc/lcwyPtJaZJt5885C98omWz79NIeD3PfoiiaPSu7JyCyFzNOIzKhmMhQLUhlTL9BvQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -3546,6 +3356,10 @@ packages:
     resolution: {integrity: sha512-POrqlZMOo821oa49Xbxb+pNmnxu0z2oS7FOeklRxKuYXR+7nsP0j9PpXjo8E8Ily4TaP+pdUnatb53vAaONO3g==}
     dev: false
 
+  /@juggle/resize-observer/3.4.0:
+    resolution: {integrity: sha512-dfLbk+PwWvFzSxwk3n5ySL0hfBog779o8h68wK/7/APo/7cgyWp5jcXockbxdk5kFRkbeXWm4Fbi9FrdN381sA==}
+    dev: true
+
   /@kafkajs/confluent-schema-registry/1.0.6:
     resolution: {integrity: sha512-NrZL1peOIlmlLKvheQcJAx9PHdnc4kaW+9+Yt4jXUfbbYR9EFNCZt6yApI4SwlFilaiZieReM6XslWy1LZAvoQ==}
     dependencies:
@@ -3635,44 +3449,16 @@ packages:
       - supports-color
     dev: false
 
-  /@mdx-js/mdx/1.6.22:
-    resolution: {integrity: sha512-AMxuLxPz2j5/6TpF/XSdKpQP1NlG0z11dFOlq+2IP/lSgl11GY8ji6S/rgsViN/L0BDvHvUMruRb7ub+24LUYA==}
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/plugin-syntax-jsx': 7.12.1_@babel+core@7.12.9
-      '@babel/plugin-syntax-object-rest-spread': 7.8.3_@babel+core@7.12.9
-      '@mdx-js/util': 1.6.22
-      babel-plugin-apply-mdx-type-prop: 1.6.22_@babel+core@7.12.9
-      babel-plugin-extract-import-names: 1.6.22
-      camelcase-css: 2.0.1
-      detab: 2.0.4
-      hast-util-raw: 6.0.1
-      lodash.uniq: 4.5.0
-      mdast-util-to-hast: 10.0.1
-      remark-footnotes: 2.0.0
-      remark-mdx: 1.6.22
-      remark-parse: 8.0.3
-      remark-squeeze-paragraphs: 4.0.0
-      style-to-object: 0.3.0
-      unified: 9.2.0
-      unist-builder: 2.0.3
-      unist-util-visit: 2.0.3
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /@mdx-js/react/1.6.22_react@17.0.2:
-    resolution: {integrity: sha512-TDoPum4SHdfPiGSAaRBw7ECyI8VaHpK8GJugbJIJuqyh6kzw9ZLJZW3HGL3NNrJGxcAixUvqROm+YuQOo5eXtg==}
+  /@mdx-js/react/2.3.0_react@17.0.2:
+    resolution: {integrity: sha512-zQH//gdOmuu7nt2oJR29vFhDv88oGPmVw6BggmrHeMI+xgEkp1B2dX9/bMBSYtK0dyLX/aOmesKS09g222K1/g==}
     peerDependencies:
-      react: ^16.13.1 || ^17.0.0
+      react: '>=16'
     dependencies:
+      '@types/mdx': 2.0.3
+      '@types/react': 18.0.27
       react: 17.0.2
     dev: true
 
-  /@mdx-js/util/1.6.22:
-    resolution: {integrity: sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==}
-    dev: true
-
   /@msgpackr-extract/msgpackr-extract-darwin-arm64/2.2.0:
     resolution: {integrity: sha512-Z9LFPzfoJi4mflGWV+rv7o7ZbMU5oAU9VmzCgL240KnqDW65Y2HFCT3MW06/ITJSnbVLacmcEJA8phywK7JinQ==}
     cpu: [arm64]
@@ -3763,6 +3549,8 @@ packages:
     dependencies:
       '@gar/promisify': 1.1.3
       semver: 7.3.8
+    dev: false
+    optional: true
 
   /@npmcli/move-file/1.1.2:
     resolution: {integrity: sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==}
@@ -3771,6 +3559,8 @@ packages:
     dependencies:
       mkdirp: 1.0.4
       rimraf: 3.0.2
+    dev: false
+    optional: true
 
   /@oclif/command/1.8.18_@oclif+config@1.18.2:
     resolution: {integrity: sha512-qTad+jtiriMMbkw6ArtcUY89cwLwmwDnD4KSGT+OQiZKYtegp3NUCM9JN8lfj/aKC+0kvSitJM4ULzbgiVTKQQ==}
@@ -4166,8 +3956,8 @@ packages:
     resolution: {integrity: sha512-Uy0+khmZqUrUGm5dmMqVlnvufZRSK0FbYzVgp0UMstm+F5+W2/jnEEQyc9vo1ZR/E5ZI/B1WjjoTqBqwJL6Krw==}
     dev: false
 
-  /@storybook/addon-actions/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-cnLzVK1S+EydFDSuvxMmMAxVqNXijBGdV9QTgsu6ys5sOkoiXRETKZmxuN8/ZRbkfc4N+1KAylSCZOOHzBQTBQ==}
+  /@storybook/addon-actions/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-4n/J/MgKsBxt4/p1tsm+EaC8Sq2frNjSL4gkUrMpCB8LASK0onVttd/kSpc41Pck+R/nK812nSrfUhLkEsAGiA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4177,31 +3967,30 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
-      fast-deep-equal: 3.1.3
-      global: 4.4.0
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
+      dequal: 2.0.3
       lodash: 4.17.21
       polished: 4.2.2
       prop-types: 15.8.1
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      react-inspector: 5.1.1_react@17.0.2
-      regenerator-runtime: 0.13.11
-      telejson: 6.0.8
+      react-inspector: 6.0.1_react@17.0.2
+      telejson: 7.0.4
       ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
       uuid-browser: 3.1.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/addon-backgrounds/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-9ddB3QIL8mRurf7TvYG1P9i1sW0b8Iik3kGlHggKogHER9WJPzbiUeH0XDjkASSa4rMCZdYn5CZKNkIAoJ2jdA==}
+  /@storybook/addon-backgrounds/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-u2stsYYsEUOiZFDLmAurjemy2yKkGmOgHVoF3LjMdUVejJCCOf/9VyMwqCoe3jif4N5xI5WB/CKtwu3OC5V/5Q==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4211,25 +4000,24 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
-      global: 4.4.0
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
       ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/addon-controls/6.5.15_yonfb5w3xd2pgsvxfpudwaxcey:
-    resolution: {integrity: sha512-q5y0TvD0stvQoJZ2PnFmmKIRNSOI4/k2NKyZq//J2cBUBcP1reYlFxdsNwLZWmAFpSIkc2+nsliEzNxU1WByoA==}
+  /@storybook/addon-controls/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-iKi86tbeWtBduV6bu/eeXrUGzPi2RE4omN552QjGwMFqP05hJtK2jdrrFi5gYtdbTt/kaIsJGzKPrj9l887lMQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4239,174 +4027,98 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-common': 6.5.15_yonfb5w3xd2pgsvxfpudwaxcey
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/node-logger': 6.5.15
-      '@storybook/store': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
+      '@storybook/blocks': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
       lodash: 4.17.21
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
       ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - eslint
       - supports-color
-      - typescript
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/addon-docs/6.5.15_pveflopc7y5y46x7s5oinmobm4:
-    resolution: {integrity: sha512-k3LAu+wVp6pNhfh6B1soCRl6+7sNTNxtqy6WTrIeVJVCGbXbyc5s7gQ48gJ4WAk6meoDEZbypiP4NK1El03YLg==}
+  /@storybook/addon-docs/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-ksdDLwsNxnGHMTlQORRd7LF1J7O2YxXEj9rmoETBPQlKSj0UUW8yRf91mB8oHEbp9wbGC6BVHDUubPJMx9PCCw==}
     peerDependencies:
-      '@storybook/mdx2-csf': ^0.0.3
+      '@storybook/mdx1-csf': '>=1.0.0-0'
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     peerDependenciesMeta:
-      '@storybook/mdx2-csf':
-        optional: true
-      react:
-        optional: true
-      react-dom:
+      '@storybook/mdx1-csf':
         optional: true
     dependencies:
+      '@babel/core': 7.20.12
       '@babel/plugin-transform-react-jsx': 7.20.7_@babel+core@7.20.12
-      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
-      '@jest/transform': 26.6.2
-      '@mdx-js/react': 1.6.22_react@17.0.2
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-common': 6.5.15_yonfb5w3xd2pgsvxfpudwaxcey
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/docs-tools': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/mdx1-csf': 0.0.1_@babel+core@7.20.12
-      '@storybook/node-logger': 6.5.15
-      '@storybook/postinstall': 6.5.15
-      '@storybook/preview-web': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/source-loader': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/store': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
-      core-js: 3.27.1
-      fast-deep-equal: 3.1.3
-      global: 4.4.0
-      lodash: 4.17.21
+      '@jest/transform': 29.4.2
+      '@mdx-js/react': 2.3.0_react@17.0.2
+      '@storybook/blocks': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/csf-plugin': 7.0.0-beta.46
+      '@storybook/csf-tools': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/mdx2-csf': 1.0.0-next.5
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/postinstall': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
+      fs-extra: 11.1.0
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
       remark-external-links: 8.0.0
       remark-slug: 6.1.0
       ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
     transitivePeerDependencies:
-      - '@babel/core'
-      - eslint
       - supports-color
-      - typescript
-      - vue-template-compiler
-      - webpack
-      - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/addon-essentials/6.5.15_tmwo376r55imxzsx4yykzrtc74:
-    resolution: {integrity: sha512-m3EY6BhUk6Z9Et7P5wGaRGNoEDHzJIOsLbGS/4IXvIoDfrqmNIilqUQl8kfDqpVdBSFprvpacHpKpLosu9H37w==}
+  /@storybook/addon-essentials/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-Chvj4gezsIHzAIplAjJIHhRG5WMoVl4AVCyrTD3E5h/8qqXXsLMDWN3sOl6pl/11OV1F1bhM4fFjgJxn9eGoEA==}
     peerDependencies:
-      '@babel/core': ^7.9.6
-      '@storybook/angular': '*'
-      '@storybook/builder-manager4': '*'
-      '@storybook/builder-manager5': '*'
-      '@storybook/builder-webpack4': '*'
-      '@storybook/builder-webpack5': '*'
-      '@storybook/html': '*'
-      '@storybook/vue': '*'
-      '@storybook/vue3': '*'
-      '@storybook/web-components': '*'
-      lit: '*'
-      lit-html: '*'
-      react: '*'
-      react-dom: '*'
-      svelte: '*'
-      sveltedoc-parser: '*'
-      vue: '*'
-      webpack: '*'
-    peerDependenciesMeta:
-      '@storybook/angular':
-        optional: true
-      '@storybook/builder-manager4':
-        optional: true
-      '@storybook/builder-manager5':
-        optional: true
-      '@storybook/builder-webpack4':
-        optional: true
-      '@storybook/builder-webpack5':
-        optional: true
-      '@storybook/html':
-        optional: true
-      '@storybook/vue':
-        optional: true
-      '@storybook/vue3':
-        optional: true
-      '@storybook/web-components':
-        optional: true
-      lit:
-        optional: true
-      lit-html:
-        optional: true
-      react:
-        optional: true
-      react-dom:
-        optional: true
-      svelte:
-        optional: true
-      sveltedoc-parser:
-        optional: true
-      vue:
-        optional: true
-      webpack:
-        optional: true
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/addon-actions': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addon-backgrounds': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addon-controls': 6.5.15_yonfb5w3xd2pgsvxfpudwaxcey
-      '@storybook/addon-docs': 6.5.15_pveflopc7y5y46x7s5oinmobm4
-      '@storybook/addon-measure': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addon-outline': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addon-toolbars': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addon-viewport': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-common': 6.5.15_yonfb5w3xd2pgsvxfpudwaxcey
-      '@storybook/node-logger': 6.5.15
-      '@storybook/vue': 6.5.15_ogbyckaggwfyqweeqbx5bhjsqy
-      core-js: 3.27.1
+      '@storybook/addon-actions': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-backgrounds': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-controls': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-docs': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-highlight': 7.0.0-beta.46
+      '@storybook/addon-measure': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-outline': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-toolbars': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/addon-viewport': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
       ts-dedent: 2.2.0
-      vue: 2.7.14
-      webpack: 4.46.0
     transitivePeerDependencies:
-      - '@storybook/mdx2-csf'
-      - eslint
+      - '@storybook/mdx1-csf'
+      - supports-color
+    dev: true
+
+  /@storybook/addon-highlight/7.0.0-beta.46:
+    resolution: {integrity: sha512-bMwOdhIRofIG/MJvR5TxFWDWoBWhVC8xTgiytjSjzpo4HxWxUspCAC7mrriZ0QZvHGeTm8uk/P/3IRcb1EPIZA==}
+    dependencies:
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 7.0.0-beta.46
+    transitivePeerDependencies:
       - supports-color
-      - typescript
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/addon-links/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-L7Q3u/xEUuy1uPq8ttjDfvDj19Hr2Crq/Us0RfowfGAAzOb7fCoiUJDP37ADtRUlCYyuKM5V/nHxN8eGpWtugw==}
+  /@storybook/addon-links/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-m5WZ/AVzkb4sHvu/25CQ4EjlHTr+T9enh5cHZD9c5frEpFX4gwOczcYirMKFzEI93dDkv6LX1Yo51hOOpJrhrg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4416,24 +4128,24 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/router': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@types/qs': 6.9.7
-      core-js: 3.27.1
-      global: 4.4.0
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/router': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
       prop-types: 15.8.1
-      qs: 6.11.0
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
       ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/addon-measure/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-j77WX/v6qpWK8ZuYscWLIc+Am4/WOJRsVgyXLIw1EZIviQsjoXPo7mmyoTneEIbbHfPtWlLRbtmkjh8DAVDrCA==}
+  /@storybook/addon-measure/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-jvwvcvJ9YEhScRy51GUTSVDQSbNnhbMYQXTbvWjuzSV3RJolSx+lT+ILNblF6QptK5GKpM0GBKGLd1e5oXUlhA==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4443,20 +4155,21 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      core-js: 3.27.1
-      global: 4.4.0
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/addon-outline/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-8yGEZQOYypnliU3rsakoZlgT4Pkq8iOhX9JclVXZL/fJMQWFQGCsXqlLaRn8sx7qsa+21PPxY5bd2+Hv/Au4zQ==}
+  /@storybook/addon-outline/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-hENg4a2lDeTVM9xuI0nHRsL/QMVTlmvtr2dOEOUul9gtwSjmssZ3Hr8LIeujp2WbSOL8xwx9s1NP15LCb367YQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4466,35 +4179,35 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      core-js: 3.27.1
-      global: 4.4.0
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
       ts-dedent: 2.2.0
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/addon-postcss/2.0.0_webpack@4.46.0:
-    resolution: {integrity: sha512-Nt82A7e9zJH4+A+VzLKKswUfru+T6FJTakj4dccP0i8DSn7a0CkzRPrLuZBq8tg4voV6gD74bcDf3gViCVBGtA==}
-    engines: {node: '>=10', yarn: ^1.17.0}
+  /@storybook/addon-postcss/3.0.0-alpha.1_webpack@5.75.0:
+    resolution: {integrity: sha512-j3DB//h89ctz0Orh1N4AHuzdzYhbL5XhUdh1V5rJ6tPOhHZ57v60tS4owukY4nE5gqM345lbuXK6MjbSZPqZdQ==}
+    engines: {node: '>=14', yarn: ^1.17.0}
     dependencies:
       '@storybook/node-logger': 6.5.15
-      css-loader: 3.6.0_webpack@4.46.0
+      css-loader: 3.6.0_webpack@5.75.0
       postcss: 7.0.39
-      postcss-loader: 4.3.0_gzaxsinx64nntyd3vmdqwl7coe
-      style-loader: 1.3.0_webpack@4.46.0
+      postcss-loader: 4.3.0_is25vgl4syps62ryudctlza7cy
+      style-loader: 1.3.0_webpack@5.75.0
     transitivePeerDependencies:
       - webpack
     dev: true
 
-  /@storybook/addon-toolbars/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-btwDTgElmaaT0dBRASABbTpq6m1UiQXQmLUmxfjLxVC3I2SK5tyJKbPQ2hVLFAQHK4cQn4u45BxdZ5LDpJ830A==}
+  /@storybook/addon-toolbars/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-kC12SbWTOROE7IO82Ctl/wX/MXVhwkPia0zj9DbGul2xAwj59L5ZlWMdM+bG73VpSgbFDRIy3UZikSDgXUs/Ig==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4504,19 +4217,19 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/addon-viewport/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-oOiVzgFMlTnzPLVoHWQNzWdmpksrUyT6Aq8ZOyBPNMQ0RN2doIgFr7W53nZ1OBB5cPQx9q2FgWwzJ7Tawo+iVA==}
+  /@storybook/addon-viewport/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-vKINgaKSl1czI54Kh3Q7Rx9KsxjdCg1aeKW2cFxztBi1OlcKxjb85hnfhreyGlSphjsKRaQtX9fPGPRwdcaPTQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4526,19 +4239,19 @@ packages:
       react-dom:
         optional: true
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/api': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/core-events': 6.5.15
-      '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
-      global: 4.4.0
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       memoizerific: 1.11.3
       prop-types: 15.8.1
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /@storybook/addons/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
@@ -4555,32 +4268,26 @@ packages:
       '@storybook/router': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
       '@types/webpack-env': 1.18.0
-      core-js: 3.27.1
+      core-js: 3.27.2
       global: 4.4.0
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/addons/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-xT31SuSX+kYGyxCNK2nqL7WTxucs3rSmhiCLovJcUjYk+QquV3c2c53Ki7lwwdDbzfXFcNAe0HJ4hoTN4jhn0Q==}
+  /@storybook/addons/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-p2My3VkxPm3bzpV+giiM9zXt0fWnBN0UI4CXOroXlzPiTuxpJJcSXY65K4hHVuV4tvVRX023kQ0r+sEjxEaQSg==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/api': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/router': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@types/webpack-env': 1.18.0
-      core-js: 3.27.1
-      global: 4.4.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /@storybook/api/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
@@ -4596,7 +4303,7 @@ packages:
       '@storybook/router': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/semver': 7.3.2
       '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
+      core-js: 3.27.2
       fast-deep-equal: 3.1.3
       global: 4.4.0
       lodash: 4.17.21
@@ -4610,35 +4317,76 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/api/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-BBE0KXKvj1/3jTghbIoWfrcDM0t+xO7EYtWWAXD6XlhGsZVD2Dy82Z52ONyLulMDRpMWl0OYy3h6A1YnFUH25w==}
+  /@storybook/api/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-S42ZsT8uU2FNrCHVOtNEm5Wqebymu9S6iWXN/QSreQdrX2mvqcvbPbcFOa2nfNnUiBHrCjzF2ZySV1WnsJxtOQ==}
+    dependencies:
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+    transitivePeerDependencies:
+      - react
+      - react-dom
+      - supports-color
+    dev: true
+
+  /@storybook/blocks/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-ziNMCAtJbZ2RnWx95iA7TAYRKugjDbt7/qp0yNHrEpwS5ddQOb3O6Yb7BbNDrAhhJ/oapDtyelSZJYM7BL6gSQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/router': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/semver': 7.3.2
-      '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      core-js: 3.27.1
-      fast-deep-equal: 3.1.3
-      global: 4.4.0
+      '@storybook/channels': 7.0.0-beta.46
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/docs-tools': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
+      '@types/lodash': 4.14.191
+      color-convert: 2.0.1
+      dequal: 2.0.3
       lodash: 4.17.21
+      markdown-to-jsx: 7.1.9_react@17.0.2
       memoizerific: 1.11.3
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
-      store2: 2.14.2
-      telejson: 6.0.8
+      polished: 4.2.2
+      react: 17.0.2
+      react-colorful: 5.6.1_6l5554ty5ajsajah6yazvrjhoe
+      react-dom: 18.2.0_react@17.0.2
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@storybook/builder-manager/7.0.0-beta.46:
+    resolution: {integrity: sha512-uQ4pAr2/gcdgZPmnxvA51VQxyZGh44TuDuoJB1IOcIenh/U5PPZ5VqCDrB8ONU46bKy32uzxz/Xpd9nHedIUiA==}
+    dependencies:
+      '@fal-works/esbuild-plugin-global-externals': 2.1.2
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/manager': 7.0.0-beta.46
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@types/ejs': 3.1.1
+      '@types/find-cache-dir': 3.2.1
+      '@yarnpkg/esbuild-plugin-pnp': 3.0.0-rc.15_esbuild@0.16.17
+      browser-assert: 1.2.1
+      ejs: 3.1.8
+      esbuild: 0.16.17
+      esbuild-plugin-alias: 0.2.1
+      express: 4.18.2
+      find-cache-dir: 3.3.2
+      fs-extra: 11.1.0
+      process: 0.11.10
+      slash: 3.0.0
+      util: 0.12.5
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/builder-webpack4/6.5.15_osrebwaanaolfmicoqxqxv5ftu:
-    resolution: {integrity: sha512-1ZkMECUUdiYplhlgyUF5fqW3XU7eWNDJbuPUguyDOeidgJ111WZzBcLuKj+SNrzdNNgXwROCWAFybiNnX33YHQ==}
+  /@storybook/builder-webpack5/7.0.0-beta.46_vsjsuvw2laeoxumlaes6yduxsu:
+    resolution: {integrity: sha512-1pvo9IDlz836hiDFmALVttQxw4ehSd3UEhE6Yz0B+TMl4cAQuSRWze8w2sI474tiHtGeKGRoIIWmH5hSVQvFrQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4648,131 +4396,183 @@ packages:
         optional: true
     dependencies:
       '@babel/core': 7.20.12
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/api': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/channel-postmessage': 6.5.15
-      '@storybook/channels': 6.5.15
-      '@storybook/client-api': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/core-common': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      '@storybook/core-events': 6.5.15
-      '@storybook/node-logger': 6.5.15
-      '@storybook/preview-web': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/router': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/semver': 7.3.2
-      '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/ui': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
+      '@storybook/addons': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/channel-postmessage': 7.0.0-beta.46
+      '@storybook/channel-websocket': 7.0.0-beta.46
+      '@storybook/channels': 7.0.0-beta.46
+      '@storybook/client-api': 7.0.0-beta.46
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/core-webpack': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/preview': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/router': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/store': 7.0.0-beta.46
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@types/node': 16.18.12
-      '@types/webpack': 4.41.33
-      autoprefixer: 9.8.8
-      babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
+      '@types/semver': 7.3.13
+      babel-loader: 9.1.2_la66t7xldg4uecmyawueag5wkm
+      babel-plugin-named-exports-order: 0.0.2
+      browser-assert: 1.2.1
       case-sensitive-paths-webpack-plugin: 2.4.0
-      core-js: 3.27.1
-      css-loader: 3.6.0_webpack@4.46.0
-      file-loader: 6.2.0_webpack@4.46.0
-      find-up: 5.0.0
-      fork-ts-checker-webpack-plugin: 6.5.2_ujcznmgb2owsphq4mksjmidcsi
-      glob: 7.2.3
-      glob-promise: 3.4.0_glob@7.2.3
-      global: 4.4.0
-      html-webpack-plugin: 4.5.2_webpack@4.46.0
-      pnp-webpack-plugin: 1.6.4_typescript@4.9.4
-      postcss: 7.0.39
-      postcss-flexbugs-fixes: 4.2.1
-      postcss-loader: 4.3.0_gzaxsinx64nntyd3vmdqwl7coe
-      raw-loader: 4.0.2_webpack@4.46.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      stable: 0.1.8
-      style-loader: 1.3.0_webpack@4.46.0
-      terser-webpack-plugin: 4.2.3_webpack@4.46.0
+      css-loader: 6.7.3_webpack@5.75.0
+      express: 4.18.2
+      fork-ts-checker-webpack-plugin: 6.5.2_oidmngyddw6azfqg3taanyywde
+      fs-extra: 11.1.0
+      html-webpack-plugin: 5.5.0_webpack@5.75.0
+      path-browserify: 1.0.1
+      process: 0.11.10
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
+      semver: 7.3.8
+      slash: 3.0.0
+      style-loader: 3.3.1_webpack@5.75.0
+      terser-webpack-plugin: 5.3.6_htvmhiqynazf46fjrszipnqp7a
       ts-dedent: 2.2.0
       typescript: 4.9.4
-      url-loader: 4.1.1_lit45vopotvaqup7lrvlnvtxwy
+      util: 0.12.5
       util-deprecate: 1.0.2
-      webpack: 4.46.0
-      webpack-dev-middleware: 3.7.3_webpack@4.46.0
-      webpack-filter-warnings-plugin: 1.2.1_webpack@4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
+      webpack-dev-middleware: 5.3.3_webpack@5.75.0
       webpack-hot-middleware: 2.25.3
-      webpack-virtual-modules: 0.2.2
+      webpack-virtual-modules: 0.4.6
     transitivePeerDependencies:
-      - bluebird
+      - '@swc/core'
+      - esbuild
       - eslint
       - supports-color
+      - uglify-js
       - vue-template-compiler
       - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/channel-postmessage/6.5.15:
-    resolution: {integrity: sha512-gMpA8LWT8lC4z5KWnaMh03aazEwtDO7GtY5kZVru+EEMgExGmaR82qgekwmLmgLj2nRJEv0o138o9IqYUcou8w==}
+  /@storybook/channel-postmessage/7.0.0-beta.46:
+    resolution: {integrity: sha512-bJ7/9J1vHrm4czBzB1gNV6N6eYVP2JQJjteMjyul1ujS6PhC243GB2PTlQDwrE9MuPGIP1Qv6dSgs9bMQeXNVg==}
     dependencies:
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      core-js: 3.27.1
-      global: 4.4.0
+      '@storybook/channels': 7.0.0-beta.46
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
       qs: 6.11.0
-      telejson: 6.0.8
+      telejson: 7.0.4
     dev: true
 
-  /@storybook/channel-websocket/6.5.15:
-    resolution: {integrity: sha512-K85KEgzo5ahzJNJjyUbSNyuRmkeC8glJX2hCg2j9HiJ9rasX53qugkODrKDlWAeheulo3kR13VSuAqIuwVbmbw==}
+  /@storybook/channel-websocket/7.0.0-beta.46:
+    resolution: {integrity: sha512-Y/d3aXpytu8yVws2sPrFyXPvtM+clAfo4WU5g3YvpPMO/K6bohfpVtucLrHIvq/lFDdoK3nWwi9AhqPe2E1YKg==}
     dependencies:
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      core-js: 3.27.1
-      global: 4.4.0
-      telejson: 6.0.8
+      '@storybook/channels': 7.0.0-beta.46
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      telejson: 7.0.4
     dev: true
 
   /@storybook/channels/6.5.15:
     resolution: {integrity: sha512-gPpsBgirv2NCXbH4WbYqdkI0JLE96aiVuu7UEWfn9yu071pQ9CLHbhXGD9fSFNrfOkyBBY10ppSE7uCXw3Wexg==}
     dependencies:
-      core-js: 3.27.1
+      core-js: 3.27.2
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/client-api/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-0ZGpRgVz7rdbCguBqBpwObXbsVY5qlSTWDzzIBpmz8EkxW/MtK5wEyeq+0L0O+DTn41FwvH5yCGLAENpzWD8BQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  /@storybook/channels/7.0.0-beta.46:
+    resolution: {integrity: sha512-fNsUiWe+K+jnHyeG1WrUrJDGHmO/QLOek0Ly+5j2LhV7PG4S/33IUVShux4yfZIMJwtrVtaawM306q1uJofFaw==}
+    dev: true
+
+  /@storybook/cli/7.0.0-beta.46:
+    resolution: {integrity: sha512-4JTTnW0GlQzp6KCPMRxNjKwpFoaywXAUn2pXfXaI44WCLdT7IjHEEvK5Z5kwAW9cc+2mGT7tMqy0Xwd+acvMDQ==}
+    hasBin: true
     dependencies:
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/channel-postmessage': 6.5.15
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@types/qs': 6.9.7
-      '@types/webpack-env': 1.18.0
-      core-js: 3.27.1
-      fast-deep-equal: 3.1.3
-      global: 4.4.0
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-      qs: 6.11.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
-      store2: 2.14.2
-      synchronous-promise: 2.0.16
+      '@babel/core': 7.20.12
+      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
+      '@storybook/codemod': 7.0.0-beta.46
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/core-server': 7.0.0-beta.46
+      '@storybook/csf-tools': 7.0.0-beta.46
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/telemetry': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      '@types/semver': 7.3.13
+      boxen: 5.1.2
+      chalk: 4.1.2
+      commander: 6.2.1
+      cross-spawn: 7.0.3
+      detect-indent: 6.1.0
+      envinfo: 7.8.1
+      execa: 5.1.1
+      express: 4.18.2
+      find-up: 5.0.0
+      fs-extra: 11.1.0
+      get-port: 5.1.1
+      giget: 1.0.0
+      globby: 11.1.0
+      jscodeshift: 0.14.0_@babel+preset-env@7.20.2
+      leven: 3.1.0
+      prompts: 2.4.2
+      puppeteer-core: 2.1.1
+      read-pkg-up: 7.0.1
+      semver: 7.3.8
+      shelljs: 0.8.5
+      simple-update-notifier: 1.0.7
+      strip-json-comments: 3.1.1
+      tempy: 1.0.1
       ts-dedent: 2.2.0
       util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - supports-color
+      - utf-8-validate
+    dev: true
+
+  /@storybook/client-api/7.0.0-beta.46:
+    resolution: {integrity: sha512-cpCI6tMExvgfI+xfuzZItFrntz4PTTWSek9RG8E5SGZjKGg0vEuCaEBNIOK8PX5sRvqbFCfg6xqLZh8ZwW8Upg==}
+    dependencies:
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /@storybook/client-logger/6.5.15:
     resolution: {integrity: sha512-0uyxKvodq+FycGv6aUwC1wUR6suXf2+7ywMFAOlYolI4UvNj8NyU/5AfgKT5XnxYAgPmoCiAjOE700TrfHrosw==}
     dependencies:
-      core-js: 3.27.1
+      core-js: 3.27.2
       global: 4.4.0
     dev: true
 
+  /@storybook/client-logger/7.0.0-beta.46:
+    resolution: {integrity: sha512-dehsFk2DDrxY1l+HtsILCw4MQTw4/7XBpAWK01dR4xOagCZvmGJqVRouDVqZJBB3NAEw1uSKR5Jy+2teu9sCOA==}
+    dependencies:
+      '@storybook/global': 5.0.0
+    dev: true
+
+  /@storybook/codemod/7.0.0-beta.46:
+    resolution: {integrity: sha512-UZZIwogqqpsdkSNBWXZgpYjRIQN/cIJIkwL0Tt7fba6sx31HMCUdyiTBXQC6YvzoF/w2FWx/JRFBFqs9E7XpjA==}
+    dependencies:
+      '@babel/core': 7.20.12
+      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
+      '@babel/types': 7.20.7
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf-tools': 7.0.0-beta.46
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      cross-spawn: 7.0.3
+      globby: 11.1.0
+      jscodeshift: 0.14.0_@babel+preset-env@7.20.2
+      lodash: 4.17.21
+      prettier: 2.8.3
+      recast: 0.23.1
+      util: 0.12.5
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /@storybook/components/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
     resolution: {integrity: sha512-bHTT0Oa3s4g+MBMaLBbX9ofMtb1AW59AzIUNGrfqW1XqJMGuUHMiJ7TSo+i5dRSFpbFygnwMEG9LfHxpR2Z0Dw==}
     peerDependencies:
@@ -4782,7 +4582,7 @@ packages:
       '@storybook/client-logger': 6.5.15
       '@storybook/csf': 0.0.2--canary.4566f4d.1
       '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
+      core-js: 3.27.2
       memoizerific: 1.11.3
       qs: 6.11.0
       react: 17.0.2
@@ -4791,253 +4591,106 @@ packages:
       util-deprecate: 1.0.2
     dev: true
 
-  /@storybook/components/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-bHTT0Oa3s4g+MBMaLBbX9ofMtb1AW59AzIUNGrfqW1XqJMGuUHMiJ7TSo+i5dRSFpbFygnwMEG9LfHxpR2Z0Dw==}
+  /@storybook/components/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-/rwNE7BHJ7RXDNC53yQCAb1JH56QJG7n258jxDJ0OSCAtTsaxfa2VPVJHDqEllnOh2VsbC1jF5msfGHoMbAV0A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/client-logger': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      core-js: 3.27.1
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/global': 5.0.0
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
       memoizerific: 1.11.3
-      qs: 6.11.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
+      use-resize-observer: 9.1.0_6l5554ty5ajsajah6yazvrjhoe
       util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/core-client/6.5.15_bmqcfyb5ehjqnclktwh7o6o4uy:
-    resolution: {integrity: sha512-i9t4WONy2MxJwLI1FIp5ck7b52EXyJfALnxUn4O/3GTkw09J0NOKi2DPjefUsi7IB5MzFpDjDH9vw/XiTM+OZw==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
-      webpack: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@storybook/core-client/7.0.0-beta.46:
+    resolution: {integrity: sha512-XEYjS6z+HL5tpriLFSoWPnJbZ04PdN1YNb3mn0GhPUZuCBWqjssH1T5gt5w5L2ZEbsiWBLHBbs34tQLWCGsnTg==}
     dependencies:
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/channel-postmessage': 6.5.15
-      '@storybook/channel-websocket': 6.5.15
-      '@storybook/client-api': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/preview-web': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/ui': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      airbnb-js-shims: 2.2.1
-      ansi-to-html: 0.6.15
-      core-js: 3.27.1
-      global: 4.4.0
-      lodash: 4.17.21
-      qs: 6.11.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
-      ts-dedent: 2.2.0
-      typescript: 4.9.4
-      unfetch: 4.2.0
-      util-deprecate: 1.0.2
-      webpack: 4.46.0
-    dev: true
-
-  /@storybook/core-common/6.5.15_osrebwaanaolfmicoqxqxv5ftu:
-    resolution: {integrity: sha512-uits9o6qwHTPnjsNZP25f7hWmUBGRJ7FXtxxtEaNSmtiwk50KWxBaro7wt505lJ1Gb9vOhpNPhS7y3IxdsXNmQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-proposal-decorators': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-proposal-export-default-from': 7.18.10_@babel+core@7.20.12
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-proposal-optional-chaining': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-proposal-private-property-in-object': 7.20.5_@babel+core@7.20.12
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.20.12
-      '@babel/plugin-transform-arrow-functions': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-block-scoping': 7.20.11_@babel+core@7.20.12
-      '@babel/plugin-transform-classes': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-destructuring': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-for-of': 7.18.8_@babel+core@7.20.12
-      '@babel/plugin-transform-parameters': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-shorthand-properties': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-transform-spread': 7.20.7_@babel+core@7.20.12
-      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
-      '@babel/preset-react': 7.18.6_@babel+core@7.20.12
-      '@babel/preset-typescript': 7.18.6_@babel+core@7.20.12
-      '@babel/register': 7.18.9_@babel+core@7.20.12
-      '@storybook/node-logger': 6.5.15
-      '@storybook/semver': 7.3.2
-      '@types/node': 16.18.12
-      '@types/pretty-hrtime': 1.0.1
-      babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
-      babel-plugin-macros: 3.1.0
-      babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.20.12
-      chalk: 4.1.2
-      core-js: 3.27.1
-      express: 4.18.2
-      file-system-cache: 1.1.0
-      find-up: 5.0.0
-      fork-ts-checker-webpack-plugin: 6.5.2_ujcznmgb2owsphq4mksjmidcsi
-      fs-extra: 9.1.0
-      glob: 7.2.3
-      handlebars: 4.7.7
-      interpret: 2.2.0
-      json5: 2.2.3
-      lazy-universal-dotenv: 3.0.1
-      picomatch: 2.3.1
-      pkg-dir: 5.0.0
-      pretty-hrtime: 1.0.3
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      resolve-from: 5.0.0
-      slash: 3.0.0
-      telejson: 6.0.8
-      ts-dedent: 2.2.0
-      typescript: 4.9.4
-      util-deprecate: 1.0.2
-      webpack: 4.46.0
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
     transitivePeerDependencies:
-      - eslint
       - supports-color
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/core-common/6.5.15_yonfb5w3xd2pgsvxfpudwaxcey:
-    resolution: {integrity: sha512-uits9o6qwHTPnjsNZP25f7hWmUBGRJ7FXtxxtEaNSmtiwk50KWxBaro7wt505lJ1Gb9vOhpNPhS7y3IxdsXNmQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
+  /@storybook/core-common/7.0.0-beta.46:
+    resolution: {integrity: sha512-NerwE0237uqFpnLMWrsk0J0IAU3A/VD7GBiCWdySz4sgKFv2aFV9m/Rbucoo4jHhAbZs2B4a+q4vvVIZvse0Hw==}
     dependencies:
       '@babel/core': 7.20.12
-      '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-proposal-decorators': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-proposal-export-default-from': 7.18.10_@babel+core@7.20.12
-      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-proposal-object-rest-spread': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-proposal-optional-chaining': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-proposal-private-methods': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-proposal-private-property-in-object': 7.20.5_@babel+core@7.20.12
-      '@babel/plugin-syntax-dynamic-import': 7.8.3_@babel+core@7.20.12
-      '@babel/plugin-transform-arrow-functions': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-block-scoping': 7.20.11_@babel+core@7.20.12
-      '@babel/plugin-transform-classes': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-destructuring': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-for-of': 7.18.8_@babel+core@7.20.12
-      '@babel/plugin-transform-parameters': 7.20.7_@babel+core@7.20.12
-      '@babel/plugin-transform-shorthand-properties': 7.18.6_@babel+core@7.20.12
-      '@babel/plugin-transform-spread': 7.20.7_@babel+core@7.20.12
-      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
-      '@babel/preset-react': 7.18.6_@babel+core@7.20.12
-      '@babel/preset-typescript': 7.18.6_@babel+core@7.20.12
-      '@babel/register': 7.18.9_@babel+core@7.20.12
-      '@storybook/node-logger': 6.5.15
-      '@storybook/semver': 7.3.2
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      '@types/babel__core': 7.20.0
+      '@types/express': 4.17.14
       '@types/node': 16.18.12
       '@types/pretty-hrtime': 1.0.1
-      babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
-      babel-plugin-macros: 3.1.0
-      babel-plugin-polyfill-corejs3: 0.1.7_@babel+core@7.20.12
       chalk: 4.1.2
-      core-js: 3.27.1
+      esbuild: 0.16.17
+      esbuild-register: 3.4.2_esbuild@0.16.17
       express: 4.18.2
-      file-system-cache: 1.1.0
+      file-system-cache: 2.0.2
       find-up: 5.0.0
-      fork-ts-checker-webpack-plugin: 6.5.2_ujcznmgb2owsphq4mksjmidcsi
-      fs-extra: 9.1.0
-      glob: 7.2.3
+      fs-extra: 11.1.0
+      glob: 8.1.0
+      glob-promise: 6.0.2_glob@8.1.0
       handlebars: 4.7.7
-      interpret: 2.2.0
-      json5: 2.2.3
-      lazy-universal-dotenv: 3.0.1
+      lazy-universal-dotenv: 4.0.0
       picomatch: 2.3.1
       pkg-dir: 5.0.0
       pretty-hrtime: 1.0.3
-      react: 17.0.2
-      react-dom: 18.2.0_react@17.0.2
       resolve-from: 5.0.0
       slash: 3.0.0
-      telejson: 6.0.8
       ts-dedent: 2.2.0
-      typescript: 4.9.4
-      util-deprecate: 1.0.2
-      webpack: 4.46.0
     transitivePeerDependencies:
-      - eslint
       - supports-color
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
   /@storybook/core-events/6.5.15:
     resolution: {integrity: sha512-B1Ba6l5W7MeNclclqMMTMHgYgfdpB5SIhNCQFnzIz8blynzRhNFMdxvbAl6Je5G0S4xydYYd7Lno2kXQebs7HA==}
     dependencies:
-      core-js: 3.27.1
+      core-js: 3.27.2
     dev: true
 
-  /@storybook/core-server/6.5.15_osrebwaanaolfmicoqxqxv5ftu:
-    resolution: {integrity: sha512-m+pZwHhCjwryeqTptyyKHSbIjnnPGKoRSnkqLTOpKQf8llZMnNQWUFrn4fx6UDKzxFQ2st2+laV8O2QbMs8qwQ==}
-    peerDependencies:
-      '@storybook/builder-webpack5': '*'
-      '@storybook/manager-webpack5': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      '@storybook/builder-webpack5':
-        optional: true
-      '@storybook/manager-webpack5':
-        optional: true
-      typescript:
-        optional: true
+  /@storybook/core-events/7.0.0-beta.46:
+    resolution: {integrity: sha512-ogC+bHeMsmpZuEiKWCUdgncATgDsnPTDqumgV99fXDWrYpt2KUePsZSBSTaI97lTZqko3WN1GTBbqqZ0OrerHw==}
+    dev: true
+
+  /@storybook/core-server/7.0.0-beta.46:
+    resolution: {integrity: sha512-QKEfI1Aoi69fnP52UzZfG6DEtc+gWKqJjbTiIq/RA+4OXEQiRne/Z8I2NopSCrTKJTwidEJ2K0OcVimhFxHERQ==}
     dependencies:
+      '@aw-web-design/x-default-browser': 1.4.88
       '@discoveryjs/json-ext': 0.5.7
-      '@storybook/builder-webpack4': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      '@storybook/core-client': 6.5.15_bmqcfyb5ehjqnclktwh7o6o4uy
-      '@storybook/core-common': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/csf-tools': 6.5.15
-      '@storybook/manager-webpack4': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      '@storybook/node-logger': 6.5.15
-      '@storybook/semver': 7.3.2
-      '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/telemetry': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
+      '@storybook/builder-manager': 7.0.0-beta.46
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf-tools': 7.0.0-beta.46
+      '@storybook/docs-mdx': 0.0.1-next.6
+      '@storybook/global': 5.0.0
+      '@storybook/manager': 7.0.0-beta.46
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/telemetry': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      '@types/detect-port': 1.3.2
       '@types/node': 16.18.12
       '@types/node-fetch': 2.6.2
       '@types/pretty-hrtime': 1.0.1
-      '@types/webpack': 4.41.33
+      '@types/semver': 7.3.13
       better-opn: 2.1.1
       boxen: 5.1.2
       chalk: 4.1.2
       cli-table3: 0.6.3
-      commander: 6.2.1
       compression: 1.7.4
-      core-js: 3.27.1
-      cpy: 8.1.2
       detect-port: 1.5.1
       express: 4.18.2
-      fs-extra: 9.1.0
-      global: 4.4.0
+      fs-extra: 11.1.0
       globby: 11.1.0
       ip: 2.0.0
       lodash: 4.17.21
@@ -5045,89 +4698,51 @@ packages:
       open: 8.4.0
       pretty-hrtime: 1.0.3
       prompts: 2.4.2
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
+      read-pkg-up: 7.0.1
+      semver: 7.3.8
       serve-favicon: 2.5.0
       slash: 3.0.0
-      telejson: 6.0.8
+      telejson: 7.0.4
       ts-dedent: 2.2.0
-      typescript: 4.9.4
       util-deprecate: 1.0.2
       watchpack: 2.4.0
-      webpack: 4.46.0
       ws: 8.12.0
-      x-default-browser: 0.4.0
     transitivePeerDependencies:
-      - '@storybook/mdx2-csf'
-      - bluebird
       - bufferutil
       - encoding
-      - eslint
       - supports-color
       - utf-8-validate
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/core/6.5.15_gzqk2gwodf7pskyq5ws3vlplhm:
-    resolution: {integrity: sha512-T9TjLxbb5P/XvLEoj0dnbtexJa0V3pqCifRlIUNkTJO0nU3PdGLMcKMSyIYWjkthAJ9oBrajnodV0UveM/epTg==}
-    peerDependencies:
-      '@storybook/builder-webpack5': '*'
-      '@storybook/manager-webpack5': '*'
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
-      webpack: '*'
-    peerDependenciesMeta:
-      '@storybook/builder-webpack5':
-        optional: true
-      '@storybook/manager-webpack5':
-        optional: true
-      typescript:
-        optional: true
+  /@storybook/core-webpack/7.0.0-beta.46:
+    resolution: {integrity: sha512-YpPLECzWcZQ1+U78FkX5Ec9bOpx7tOqoBpBgQP4gGShZZA6v3oe8Q8UDAe84SzNxkH/d/AWsIpu0bIhK/WWgtg==}
     dependencies:
-      '@storybook/core-client': 6.5.15_bmqcfyb5ehjqnclktwh7o6o4uy
-      '@storybook/core-server': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      typescript: 4.9.4
-      webpack: 4.46.0
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/node-logger': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      '@types/node': 16.18.12
+      ts-dedent: 2.2.0
     transitivePeerDependencies:
-      - '@storybook/mdx2-csf'
-      - bluebird
-      - bufferutil
-      - encoding
-      - eslint
       - supports-color
-      - utf-8-validate
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/csf-tools/6.5.15:
-    resolution: {integrity: sha512-2LwSD7yE/ccXBc58K4vdKw/oJJg6IpC4WD51rBt2mAl5JUCkxhOq7wG/Z8Wy1lZw2LVuKNTmjVou5blGRI/bTg==}
-    peerDependencies:
-      '@storybook/mdx2-csf': ^0.0.3
-    peerDependenciesMeta:
-      '@storybook/mdx2-csf':
-        optional: true
+  /@storybook/csf-plugin/7.0.0-beta.46:
+    resolution: {integrity: sha512-8FQKNajJQWCF1NA8MGZI0+GtlulLSBRmj4e7cP+0NCVs49ypslRpWQRFMRaTibYgMlOvCsGpZLgYMNghRbiJSg==}
+    dependencies:
+      '@storybook/csf-tools': 7.0.0-beta.46
+      unplugin: 0.10.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@storybook/csf-tools/7.0.0-beta.46:
+    resolution: {integrity: sha512-H7zXfL1wf/1jWi5MaFISt/taxE41fgpV/uLfi5CHcHLX9ZgeQs2B/2utpUgwvBsxiL+E/jKAt5cLeuZCIvglMg==}
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/generator': 7.20.7
-      '@babel/parser': 7.20.7
-      '@babel/plugin-transform-react-jsx': 7.20.7_@babel+core@7.20.12
-      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
-      '@babel/traverse': 7.20.12
       '@babel/types': 7.20.7
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/mdx1-csf': 0.0.1_@babel+core@7.20.12
-      core-js: 3.27.1
-      fs-extra: 9.1.0
-      global: 4.4.0
-      regenerator-runtime: 0.13.11
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/types': 7.0.0-beta.46
+      fs-extra: 11.1.0
+      recast: 0.23.1
       ts-dedent: 2.2.0
     transitivePeerDependencies:
       - supports-color
@@ -5139,113 +4754,69 @@ packages:
       lodash: 4.17.21
     dev: true
 
-  /@storybook/docs-tools/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-8w78NFOtlJGuIa9vPPsr87J9iQUGmLFh7CrMS2+t9LxW+0oH5MZ8QqPQUHNuTuKsYN3r+QAmmi2pj0auZmCoKA==}
+  /@storybook/csf/0.0.2-next.8:
+    resolution: {integrity: sha512-3T6rflW7D9q1iXOR+bidwoNbd9rVUTyjYH/sqsnYjbXhb/aOXsQzGKwNeq9QqZIFVpKfg5BoOF5i7DCMtoGknQ==}
     dependencies:
-      '@babel/core': 7.20.12
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/store': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
-      doctrine: 3.0.0
+      expect-type: 0.14.2
       lodash: 4.17.21
-      regenerator-runtime: 0.13.11
-    transitivePeerDependencies:
-      - react
-      - react-dom
-      - supports-color
+      type-fest: 2.19.0
+    dev: true
+
+  /@storybook/docs-mdx/0.0.1-next.6:
+    resolution: {integrity: sha512-DjoSIXADmLJtdroXAjUotFiZlcZ2usWhqrS7aeOtZs0DVR0Ws5WQjnwtpDUXt8gryTSd+OZJ0cNsDcqg4JDEvQ==}
     dev: true
 
-  /@storybook/docs-tools/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-8w78NFOtlJGuIa9vPPsr87J9iQUGmLFh7CrMS2+t9LxW+0oH5MZ8QqPQUHNuTuKsYN3r+QAmmi2pj0auZmCoKA==}
+  /@storybook/docs-tools/7.0.0-beta.46:
+    resolution: {integrity: sha512-lTZyjz6PspoCEpelIKznEfoHCQIchxhtHAtU/OJIbZIk1Hu2AuMOOJiD7yEC8lD2yhlO4XNR/ZegxPidzdPfeA==}
     dependencies:
       '@babel/core': 7.20.12
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      core-js: 3.27.1
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      '@types/doctrine': 0.0.3
       doctrine: 3.0.0
       lodash: 4.17.21
-      regenerator-runtime: 0.13.11
     transitivePeerDependencies:
-      - react
-      - react-dom
       - supports-color
     dev: true
 
-  /@storybook/manager-webpack4/6.5.15_osrebwaanaolfmicoqxqxv5ftu:
-    resolution: {integrity: sha512-zRvBTMoaFO6MvHDsDLnt3tsFENhpY3k+e/UIPdqbIDMbUPGGQzxJucAM9aS/kbVSO5IVs8IflVxbeeB/uTIIfA==}
+  /@storybook/global/5.0.0:
+    resolution: {integrity: sha512-FcOqPAXACP0I3oJ/ws6/rrPT9WGhu915Cg8D02a9YxLo0DE9zI+a9A5gRGvmQ09fiWPukqI8ZAEoQEdWUKMQdQ==}
+    dev: true
+
+  /@storybook/manager-api/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-9GvE1h/jbQ2rkMXahJ4oHlPynyffXwIlKiDFgdDyauZquh7uLDc+ANLLoppzf4EGD7QVcGJ31SU9EUhTjqYQCw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
     dependencies:
-      '@babel/core': 7.20.12
-      '@babel/plugin-transform-template-literals': 7.18.9_@babel+core@7.20.12
-      '@babel/preset-react': 7.18.6_@babel+core@7.20.12
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/core-client': 6.5.15_bmqcfyb5ehjqnclktwh7o6o4uy
-      '@storybook/core-common': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      '@storybook/node-logger': 6.5.15
-      '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/ui': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@types/node': 16.18.12
-      '@types/webpack': 4.41.33
-      babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
-      case-sensitive-paths-webpack-plugin: 2.4.0
-      chalk: 4.1.2
-      core-js: 3.27.1
-      css-loader: 3.6.0_webpack@4.46.0
-      express: 4.18.2
-      file-loader: 6.2.0_webpack@4.46.0
-      find-up: 5.0.0
-      fs-extra: 9.1.0
-      html-webpack-plugin: 4.5.2_webpack@4.46.0
-      node-fetch: 2.6.8
-      pnp-webpack-plugin: 1.6.4_typescript@4.9.4
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      read-pkg-up: 7.0.1
-      regenerator-runtime: 0.13.11
-      resolve-from: 5.0.0
-      style-loader: 1.3.0_webpack@4.46.0
-      telejson: 6.0.8
-      terser-webpack-plugin: 4.2.3_webpack@4.46.0
+      '@storybook/channels': 7.0.0-beta.46
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/global': 5.0.0
+      '@storybook/router': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
+      '@storybook/types': 7.0.0-beta.46
+      dequal: 2.0.3
+      lodash: 4.17.21
+      memoizerific: 1.11.3
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
+      semver: 7.3.8
+      store2: 2.14.2
+      telejson: 7.0.4
       ts-dedent: 2.2.0
-      typescript: 4.9.4
-      url-loader: 4.1.1_lit45vopotvaqup7lrvlnvtxwy
-      util-deprecate: 1.0.2
-      webpack: 4.46.0
-      webpack-dev-middleware: 3.7.3_webpack@4.46.0
-      webpack-virtual-modules: 0.2.2
     transitivePeerDependencies:
-      - bluebird
-      - encoding
-      - eslint
       - supports-color
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
-  /@storybook/mdx1-csf/0.0.1_@babel+core@7.20.12:
-    resolution: {integrity: sha512-4biZIWWzoWlCarMZmTpqcJNgo/RBesYZwGFbQeXiGYsswuvfWARZnW9RE9aUEMZ4XPn7B1N3EKkWcdcWe/K2tg==}
-    dependencies:
-      '@babel/generator': 7.20.7
-      '@babel/parser': 7.20.7
-      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
-      '@babel/types': 7.20.7
-      '@mdx-js/mdx': 1.6.22
-      '@types/lodash': 4.14.191
-      js-string-escape: 1.0.1
-      loader-utils: 2.0.4
-      lodash: 4.17.21
-      prettier: 2.8.3
-      ts-dedent: 2.2.0
-    transitivePeerDependencies:
-      - '@babel/core'
-      - supports-color
+  /@storybook/manager/7.0.0-beta.46:
+    resolution: {integrity: sha512-0Tsm47YM3SU9rvPpXxp6/toQ1DDUrIbZt1pXcj72szLZvi7U/fXTMpsBX9gOB1MNVYIYRqS2V+jcO8UjFd4qyQ==}
+    dev: true
+
+  /@storybook/mdx2-csf/1.0.0-next.5:
+    resolution: {integrity: sha512-02w0sgGZaK1agT050yCVhJ+o4rLHANWvLKWjQjeAsYbjneLC5ITt+3GDB4jRiWwJboZ8dHW1fGSK1Vg5fA34aQ==}
     dev: true
 
   /@storybook/node-logger/6.5.15:
@@ -5253,67 +4824,83 @@ packages:
     dependencies:
       '@types/npmlog': 4.1.4
       chalk: 4.1.2
-      core-js: 3.27.1
+      core-js: 3.27.2
       npmlog: 5.0.1
       pretty-hrtime: 1.0.3
     dev: true
 
-  /@storybook/postinstall/6.5.15:
-    resolution: {integrity: sha512-l7pApTgLD10OedNOyuf4vUdVCHLOSaIUIL9gdJl1WaSFHiUpJvvzBIh5M4aRICYPbnuExQc8y2GAjERKO4Ep+g==}
+  /@storybook/node-logger/7.0.0-beta.46:
+    resolution: {integrity: sha512-EEf9apXHZuYRrwuFckwg/0InAr/TRTllqJjo5E+fH5UWDRr3aRSrDFb57C84FwP8cY/aKMf+quPQZ7/LoDqpzQ==}
     dependencies:
-      core-js: 3.27.1
+      '@types/npmlog': 4.1.4
+      chalk: 4.1.2
+      npmlog: 5.0.1
+      pretty-hrtime: 1.0.3
+    dev: true
+
+  /@storybook/postinstall/7.0.0-beta.46:
+    resolution: {integrity: sha512-tQ6hv57SPVxyOYPQzhlrhkuKs3Nk4Efa1DN9bzYg5jEzXbeZ9uK4jmV9TDQdWv0QeAvK81SD1YNI2OtzbLPVgA==}
     dev: true
 
-  /@storybook/preview-web/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-gIHABSAD0JS0iRaG67BnSDq/q8Zf4fFwEWBQOSYgcEx2TzhAUeSkhGZUQHdlOTCwuA2PpXT0/cWDH8u2Ev+msg==}
+  /@storybook/preset-vue-webpack/7.0.0-beta.46_saukmnhi62725vq7wtdfif6krm:
+    resolution: {integrity: sha512-X40UKuFlXV5lQuVrdP4jBEkPwf+9whXqJwNnBMlQICU/SEwC5oE2sqi7cFU5sZ8DBVzqDunxCE0rfYETeliyyw==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+      '@babel/core': '*'
+      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
+      css-loader: '*'
+      vue: ^2.6.8
+      vue-loader: ^15.7.0
+      vue-template-compiler: ^2.6.14
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/channel-postmessage': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/store': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      ansi-to-html: 0.6.15
-      core-js: 3.27.1
-      global: 4.4.0
-      lodash: 4.17.21
-      qs: 6.11.0
-      react: 17.0.2
-      react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
-      synchronous-promise: 2.0.16
-      ts-dedent: 2.2.0
-      unfetch: 4.2.0
-      util-deprecate: 1.0.2
+      '@babel/core': 7.20.12
+      '@storybook/core-webpack': 7.0.0-beta.46
+      '@storybook/docs-tools': 7.0.0-beta.46
+      '@types/node': 16.18.12
+      babel-loader: 9.1.2_la66t7xldg4uecmyawueag5wkm
+      css-loader: 6.7.3_webpack@5.75.0
+      ts-loader: 9.4.2_3fkjkrd3audxnith3e7fo4fnxi
+      vue: 2.7.14
+      vue-docgen-api: 4.56.4_vue@2.7.14
+      vue-docgen-loader: 1.5.1_yl6fzifju7igosbqtgzpjuylxi
+      vue-loader: 15.10.1_eo5mtzohqv75mh6aooqyrh42dy
+      vue-template-compiler: 2.7.14
+      webpack: 5.75.0_esbuild@0.16.17
+    transitivePeerDependencies:
+      - '@babel/preset-env'
+      - '@swc/core'
+      - esbuild
+      - supports-color
+      - typescript
+      - uglify-js
+      - webpack-cli
     dev: true
 
-  /@storybook/preview-web/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-gIHABSAD0JS0iRaG67BnSDq/q8Zf4fFwEWBQOSYgcEx2TzhAUeSkhGZUQHdlOTCwuA2PpXT0/cWDH8u2Ev+msg==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  /@storybook/preview-api/7.0.0-beta.46:
+    resolution: {integrity: sha512-sEfdUk9rMcIrCKYA9q6/735VUGRaQvGaUpATjy468WOhXwUgASFjBvRk6w0xu/lpfcnIcPwoDVpbYR17kKvzTg==}
     dependencies:
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/channel-postmessage': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      ansi-to-html: 0.6.15
-      core-js: 3.27.1
-      global: 4.4.0
+      '@storybook/channel-postmessage': 7.0.0-beta.46
+      '@storybook/channels': 7.0.0-beta.46
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/core-events': 7.0.0-beta.46
+      '@storybook/csf': 0.0.2-next.8
+      '@storybook/global': 5.0.0
+      '@storybook/types': 7.0.0-beta.46
+      '@types/qs': 6.9.7
+      dequal: 2.0.3
       lodash: 4.17.21
+      memoizerific: 1.11.3
       qs: 6.11.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
+      slash: 3.0.0
       synchronous-promise: 2.0.16
       ts-dedent: 2.2.0
-      unfetch: 4.2.0
       util-deprecate: 1.0.2
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /@storybook/preview/7.0.0-beta.46:
+    resolution: {integrity: sha512-4k62e85sR6Cyl0O7ZeCct/pE0v+tjIjGhHDs9U0AZbfBJlSppazRAP51q6v1QdF2eWDgdRbn3oTQnW8rdCBeMg==}
     dev: true
 
   /@storybook/router/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
@@ -5323,7 +4910,7 @@ packages:
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@storybook/client-logger': 6.5.15
-      core-js: 3.27.1
+      core-js: 3.27.2
       memoizerific: 1.11.3
       qs: 6.11.0
       react: 17.0.2
@@ -5331,19 +4918,17 @@ packages:
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/router/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-9t8rI8t7/Krolau29gsdjdbRQ66orONIyP0efp0EukVgv6reNFzb/U14ARrl0uHys6Tl5Xyece9FoakQUdn8Kg==}
+  /@storybook/router/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-W0mrFxILTrOvM2nca2WfXenHHnblX9gPOEfXBrw+0ZQ2eyuXPCPCgNMHfz+ZXVIVOTJHQ5NCgq5Fbpwrrz+P1A==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/client-logger': 6.5.15
-      core-js: 3.27.1
+      '@storybook/client-logger': 7.0.0-beta.46
       memoizerific: 1.11.3
       qs: 6.11.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
     dev: true
 
   /@storybook/semver/7.3.2:
@@ -5351,105 +4936,34 @@ packages:
     engines: {node: '>=10'}
     hasBin: true
     dependencies:
-      core-js: 3.27.1
+      core-js: 3.27.2
       find-up: 4.1.0
     dev: true
 
-  /@storybook/source-loader/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-MaWzki40g0/7NWmJgUBhOp+e7y8Ohw6G/bRr/rcDP7eXSnud6ThYylXv0QqBScLPPTy8txjmBClCoqdLGyvLWQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      core-js: 3.27.1
-      estraverse: 5.3.0
-      global: 4.4.0
-      loader-utils: 2.0.4
-      lodash: 4.17.21
-      prettier: 2.8.3
-      react: 17.0.2
-      react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
-    dev: true
-
-  /@storybook/store/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
-    resolution: {integrity: sha512-r6cYTf6GtbqgdI4ZG3xuWdJAAu5fJ3xAWMiDkHyoK2u+R2TeYXIsJvgn0BPrW87sZhELIkg4ckdFECmATs3kpQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  /@storybook/store/7.0.0-beta.46:
+    resolution: {integrity: sha512-gGe6RuBp4ZFYKzvZrYaxc8rNbVWWKaq8mFfKzL2NJ7o0o9zrcW7GVT6Klfr4JP3+slPhPt0KQTH9FL33/6T8VA==}
     dependencies:
-      '@storybook/addons': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      core-js: 3.27.1
-      fast-deep-equal: 3.1.3
-      global: 4.4.0
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-      react: 17.0.2
-      react-dom: 18.2.0_react@17.0.2
-      regenerator-runtime: 0.13.11
-      slash: 3.0.0
-      stable: 0.1.8
-      synchronous-promise: 2.0.16
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
-    dev: true
-
-  /@storybook/store/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-r6cYTf6GtbqgdI4ZG3xuWdJAAu5fJ3xAWMiDkHyoK2u+R2TeYXIsJvgn0BPrW87sZhELIkg4ckdFECmATs3kpQ==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-    dependencies:
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-events': 6.5.15
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      core-js: 3.27.1
-      fast-deep-equal: 3.1.3
-      global: 4.4.0
-      lodash: 4.17.21
-      memoizerific: 1.11.3
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
-      slash: 3.0.0
-      stable: 0.1.8
-      synchronous-promise: 2.0.16
-      ts-dedent: 2.2.0
-      util-deprecate: 1.0.2
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/preview-api': 7.0.0-beta.46
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/telemetry/6.5.15_osrebwaanaolfmicoqxqxv5ftu:
-    resolution: {integrity: sha512-WHMRG6xMkEGscn1q4SotwzV8hxM1g3zHyXPN77iosY5zpOIn/qAzvkmW28V1DPH9jPWMZMizBgG1TIQvUpduXg==}
+  /@storybook/telemetry/7.0.0-beta.46:
+    resolution: {integrity: sha512-sDdE0GZDOYzyoZ2Z4o4ei1WVyJp3Ac5u3ZPldZKYxen4mFhM+vVbDvpwkvp8aXrO59L9I8aleyEMjmTFqJWhjw==}
     dependencies:
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core-common': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/core-common': 7.0.0-beta.46
       chalk: 4.1.2
-      core-js: 3.27.1
       detect-package-manager: 2.0.1
       fetch-retry: 5.0.3
-      fs-extra: 9.1.0
-      global: 4.4.0
+      fs-extra: 11.1.0
       isomorphic-unfetch: 3.1.0
       nanoid: 3.3.4
       read-pkg-up: 7.0.1
-      regenerator-runtime: 0.13.11
     transitivePeerDependencies:
       - encoding
-      - eslint
-      - react
-      - react-dom
       - supports-color
-      - typescript
-      - vue-template-compiler
-      - webpack-cli
-      - webpack-command
     dev: true
 
   /@storybook/theming/6.5.15_6l5554ty5ajsajah6yazvrjhoe:
@@ -5459,103 +4973,103 @@ packages:
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@storybook/client-logger': 6.5.15
-      core-js: 3.27.1
+      core-js: 3.27.2
       memoizerific: 1.11.3
       react: 17.0.2
       react-dom: 18.2.0_react@17.0.2
       regenerator-runtime: 0.13.11
     dev: true
 
-  /@storybook/theming/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-pgdW0lVZKKXQ4VhIfLHycMmwFSVOY7vLTKnytag4Y8Yz+aXm0bwDN/QxPntFzDH47F1Rcy2ywNnvty8ooDTvuA==}
+  /@storybook/theming/7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-Zhiu8gEWgUoHYP8VMCXuI1TyjG+MwMDLqooFGoNoaX/p0Fg+orf+Y4u1J8eXUMv75tlPEoBvmAv8pa8REvxYGw==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@storybook/client-logger': 6.5.15
-      core-js: 3.27.1
+      '@emotion/use-insertion-effect-with-fallbacks': 1.0.0_react@17.0.2
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
       memoizerific: 1.11.3
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
     dev: true
 
-  /@storybook/ui/6.5.15_wcqkhtmu7mswc6yz4uyexck3ty:
-    resolution: {integrity: sha512-OO+TWZmI8ebWA1C3JBKNvbUbsgvt4GppqsGlkf5CTBZrT/MzmMlYiooLAtlY1ZPcMtTd5ynLxvroHWBEnMOk2A==}
-    peerDependencies:
-      react: ^16.8.0 || ^17.0.0 || ^18.0.0
-      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
+  /@storybook/types/7.0.0-beta.46:
+    resolution: {integrity: sha512-I5nf8aDYmkM3FqlBAqr2SxnIp16iydvjSegShHEeraXDs9wSqbyAlYuw8m2WcN+bGA2qqhGUGEWbJv5bY3WaTQ==}
     dependencies:
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/api': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/channels': 6.5.15
-      '@storybook/client-logger': 6.5.15
-      '@storybook/components': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/core-events': 6.5.15
-      '@storybook/router': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/semver': 7.3.2
-      '@storybook/theming': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      core-js: 3.27.1
-      memoizerific: 1.11.3
-      qs: 6.11.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      regenerator-runtime: 0.13.11
-      resolve-from: 5.0.0
+      '@babel/core': 7.20.12
+      '@storybook/channels': 7.0.0-beta.46
+      '@types/babel__core': 7.20.0
+      '@types/express': 4.17.14
+      express: 4.18.2
+      file-system-cache: 2.0.2
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
-  /@storybook/vue/6.5.15_ogbyckaggwfyqweeqbx5bhjsqy:
-    resolution: {integrity: sha512-rbNzev4V8ZElNEFt65v5qyb1WMt8ZpogNMoCYbHrQw+FzP0CqYtP/sMpQHP/J2TgfOtw8ykpusftV/A5lcQfyg==}
-    engines: {node: '>=10.13.0'}
-    hasBin: true
+  /@storybook/vue-webpack5/7.0.0-beta.46_kqbjeyqrxfaciuxblodnlqbkgm:
+    resolution: {integrity: sha512-PJJo/NGiWL1raOfHpJTb3X6LmLAC2TgI3EV2nDlkPigxj29O+zeMkyvfDky7eWpgOIbVqqtNVUYGH1GwbL7jqw==}
+    engines: {node: '>=16.0.0'}
     peerDependencies:
       '@babel/core': '*'
-      babel-loader: ^7.0.0 || ^8.0.0
+      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
       css-loader: '*'
+      react: ^16.8.0 || ^17.0.0 || ^18.0.0
+      react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
       vue: ^2.6.8
       vue-loader: ^15.7.0
       vue-template-compiler: ^2.6.8
     dependencies:
       '@babel/core': 7.20.12
-      '@storybook/addons': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/client-logger': 6.5.15
-      '@storybook/core': 6.5.15_gzqk2gwodf7pskyq5ws3vlplhm
-      '@storybook/core-common': 6.5.15_osrebwaanaolfmicoqxqxv5ftu
-      '@storybook/csf': 0.0.2--canary.4566f4d.1
-      '@storybook/docs-tools': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
-      '@storybook/store': 6.5.15_wcqkhtmu7mswc6yz4uyexck3ty
+      '@storybook/builder-webpack5': 7.0.0-beta.46_vsjsuvw2laeoxumlaes6yduxsu
+      '@storybook/core-common': 7.0.0-beta.46
+      '@storybook/preset-vue-webpack': 7.0.0-beta.46_saukmnhi62725vq7wtdfif6krm
+      '@storybook/vue': 7.0.0-beta.46_wp7tvu3eu4pbkovl2pyk3t6dzu
       '@types/node': 16.18.12
-      '@types/webpack-env': 1.18.0
-      babel-loader: 8.3.0_nwtvwtk5tmh22l2urnqucz7kqu
-      core-js: 3.27.1
-      css-loader: 6.7.3_webpack@4.46.0
-      global: 4.4.0
-      react: 16.14.0
-      react-dom: 16.14.0_react@16.14.0
-      read-pkg-up: 7.0.1
-      regenerator-runtime: 0.13.11
-      ts-dedent: 2.2.0
-      ts-loader: 8.4.0_ad6xlx6c2kce7qmj5vxus5gywi
+      babel-loader: 9.1.2_la66t7xldg4uecmyawueag5wkm
+      css-loader: 6.7.3_webpack@5.75.0
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
       vue: 2.7.14
-      vue-docgen-api: 4.56.4_vue@2.7.14
-      vue-docgen-loader: 1.5.1_awh5tkduz2tly6kx55g4apqcei
-      vue-loader: 15.10.1_kqygo6wsub6p3cpcl6idox7sza
+      vue-loader: 15.10.1_eo5mtzohqv75mh6aooqyrh42dy
       vue-template-compiler: 2.7.14
-      webpack: 4.46.0
     transitivePeerDependencies:
       - '@babel/preset-env'
-      - '@storybook/builder-webpack5'
-      - '@storybook/manager-webpack5'
-      - '@storybook/mdx2-csf'
-      - bluebird
-      - bufferutil
-      - encoding
+      - '@swc/core'
+      - esbuild
       - eslint
       - supports-color
       - typescript
-      - utf-8-validate
+      - uglify-js
       - webpack-cli
-      - webpack-command
+    dev: true
+
+  /@storybook/vue/7.0.0-beta.46_wp7tvu3eu4pbkovl2pyk3t6dzu:
+    resolution: {integrity: sha512-ULUZ78BuHKbz98VmmdqstDOh+rBSDAoxUlwr3hTOfoK84HyxpXizab8BK4lCK+DkYvxeUduDcHn9aT3VbjGbsA==}
+    engines: {node: '>=16.0.0'}
+    peerDependencies:
+      '@babel/core': '*'
+      babel-loader: ^7.0.0 || ^8.0.0 || ^9.0.0
+      css-loader: '*'
+      vue: ^2.6.8
+    peerDependenciesMeta:
+      babel-loader:
+        optional: true
+    dependencies:
+      '@babel/core': 7.20.12
+      '@storybook/client-logger': 7.0.0-beta.46
+      '@storybook/core-client': 7.0.0-beta.46
+      '@storybook/docs-tools': 7.0.0-beta.46
+      '@storybook/global': 5.0.0
+      '@storybook/preview-api': 7.0.0-beta.46
+      '@storybook/types': 7.0.0-beta.46
+      babel-loader: 9.1.2_la66t7xldg4uecmyawueag5wkm
+      css-loader: 6.7.3_webpack@5.75.0
+      ts-dedent: 2.2.0
+      type-fest: 2.19.0
+      vue: 2.7.14
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /@techteamer/ocsp/1.0.0:
@@ -5650,8 +5164,8 @@ packages:
       '@types/node': 16.18.12
     dev: true
 
-  /@types/babel__core/7.1.19:
-    resolution: {integrity: sha512-WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw==}
+  /@types/babel__core/7.20.0:
+    resolution: {integrity: sha512-+n8dL/9GWblDO0iU6eZAwEIJVr5DWigtle+Q6HLOrh/pdbXOhOtqzq8VPPE2zvNJzSKY4vH/z3iT3tn0A3ypiQ==}
     dependencies:
       '@babel/parser': 7.20.7
       '@babel/types': 7.20.7
@@ -5782,12 +5296,31 @@ packages:
     resolution: {integrity: sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==}
     dev: true
 
+  /@types/detect-port/1.3.2:
+    resolution: {integrity: sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g==}
+    dev: true
+
+  /@types/doctrine/0.0.3:
+    resolution: {integrity: sha512-w5jZ0ee+HaPOaX25X2/2oGR/7rgAQSYII7X7pp0m9KgBfMP7uKfMfTvcpl5Dj+eDBbpxKGiqE+flqDr6XTd2RA==}
+    dev: true
+
+  /@types/ejs/3.1.1:
+    resolution: {integrity: sha512-RQul5wEfY7BjWm0sYY86cmUN/pcXWGyVxWX93DFFJvcrxax5zKlieLwA3T77xJGwNcZW0YW6CYG70p1m8xPFmA==}
+    dev: true
+
   /@types/es-aggregate-error/1.0.2:
     resolution: {integrity: sha512-erqUpFXksaeR2kejKnhnjZjbFxUpGZx4Z7ydNL9ie8tEhXPiZTsLeUDJ6aR1F8j5wWUAtOAQWUqkc7givBJbBA==}
     dependencies:
       '@types/node': 16.18.12
     dev: false
 
+  /@types/eslint-scope/3.7.4:
+    resolution: {integrity: sha512-9K4zoImiZc3HlIp6AVUDE4CWYx22a+lhSZMYNpbjW04+YF0KWj4pJXnEMjdnFTiQibFFmElcsasJXDbdI/EPhA==}
+    dependencies:
+      '@types/eslint': 8.4.6
+      '@types/estree': 1.0.0
+    dev: true
+
   /@types/eslint/8.4.6:
     resolution: {integrity: sha512-/fqTbjxyFUaYNO7VcW5g+4npmqVACz1bB7RTHYuLj+PRjw9hrCwrUXVQFpChUS0JsyEFvMZ7U/PfmvWgxJhI9g==}
     dependencies:
@@ -5795,6 +5328,10 @@ packages:
       '@types/json-schema': 7.0.11
     dev: true
 
+  /@types/estree/0.0.51:
+    resolution: {integrity: sha512-CuPgU6f3eT/XgKKPqKd/gLZV1Xmvf1a2R5POBOGQa6uv82xpls89HU5zKeVoyR8XzHd1RGNOlQlvUe3CFkjWNQ==}
+    dev: true
+
   /@types/estree/1.0.0:
     resolution: {integrity: sha512-WulqXMDUTYAXCjZnk6JtIHPigp55cVtDgDrO2gHRwhyJto21+1zbVCtOYB2L1F9w4qCQ0rOGWBnBe0FNTiEJIQ==}
     dev: true
@@ -5822,6 +5359,10 @@ packages:
     resolution: {integrity: sha512-zv9kNf3keYegP5oThGLaPk8E081DFDuwfqjtiTzm6PoxChdJ1raSuADf2YGCVIyrSynLrgc8JWv296s7Q7pQSQ==}
     dev: true
 
+  /@types/find-cache-dir/3.2.1:
+    resolution: {integrity: sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==}
+    dev: true
+
   /@types/formidable/1.2.5:
     resolution: {integrity: sha512-zu3mQJa4hDNubEMViSj937602XdDGzK7Q5pJ5QmLUbNxclbo9tZGt5jtwM352ssZ+pqo5V4H14TBvT/ALqQQcA==}
     dependencies:
@@ -5859,14 +5400,8 @@ packages:
       '@types/node': 16.18.12
     dev: true
 
-  /@types/hast/2.3.4:
-    resolution: {integrity: sha512-wLEm0QvaoawEDoTRwzTXp4b4jpwiJDvR5KMnFnVodm3scufTlBOWRD6N1OBf9TZMhjlNsSfcO5V+7AF4+Vy+9g==}
-    dependencies:
-      '@types/unist': 2.0.6
-    dev: true
-
-  /@types/html-minifier-terser/5.1.2:
-    resolution: {integrity: sha512-h4lTMgMJctJybDp8CQrxTUiiYmedihHWkjnF/8Pxseu2S6Nlfcy8kwboQ8yejh456rP2yWoEVm1sS/FVsfM48w==}
+  /@types/html-minifier-terser/6.1.0:
+    resolution: {integrity: sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg==}
     dev: true
 
   /@types/humanize-duration/3.27.1:
@@ -6113,16 +5648,14 @@ packages:
       '@types/mdurl': 1.0.2
     dev: true
 
-  /@types/mdast/3.0.10:
-    resolution: {integrity: sha512-W864tg/Osz1+9f4lrGTZpCSO5/z4608eUp19tbozkq2HJK6i3z1kT0H9tlADXuYIb1YYOBByU4Jsqkk75q48qA==}
-    dependencies:
-      '@types/unist': 2.0.6
-    dev: true
-
   /@types/mdurl/1.0.2:
     resolution: {integrity: sha512-eC4U9MlIcu2q0KQmXszyn5Akca/0jrQmwDRgpAMJai7qBWq4amIQhZyNau4VYGtCeALvW1/NtjzJJ567aZxfKA==}
     dev: true
 
+  /@types/mdx/2.0.3:
+    resolution: {integrity: sha512-IgHxcT3RC8LzFLhKwP3gbMPeaK7BM9eBH46OdapPA7yvuIUJ8H6zHZV53J8hGZcTSnt95jANt+rTBNUUc22ACQ==}
+    dev: true
+
   /@types/mime-types/2.1.1:
     resolution: {integrity: sha512-vXOTGVSLR2jMw440moWTC7H19iUyLtP3Z1YTj7cSsubOICinjMxFeb/V57v9QdyyPGbbWolUFSSmSiRSn94tFw==}
     dev: true
@@ -6186,10 +5719,6 @@ packages:
     resolution: {integrity: sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==}
     dev: true
 
-  /@types/parse5/5.0.3:
-    resolution: {integrity: sha512-kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw==}
-    dev: true
-
   /@types/parseurl/1.3.1:
     resolution: {integrity: sha512-sAfjGAYgJ/MZsk95f3ByThfJgasZk1hWJROghBwfKnLLNANEAG/WHckAcT6HNqx2sHwVlci7OAX7k1KYpOcgMw==}
     dependencies:
@@ -6242,6 +5771,10 @@ packages:
       '@types/promise-ftp-common': 1.1.0
     dev: true
 
+  /@types/prop-types/15.7.5:
+    resolution: {integrity: sha512-JCB8C6SnDoQf0cNycqd/35A7MjcnK+ZTqE7judS6o7utxUCg6imJg3QK2qzHKszlTjcj2cn+NwMB2i96ubpj7w==}
+    dev: true
+
   /@types/psl/1.1.0:
     resolution: {integrity: sha512-HhZnoLAvI2koev3czVPzBNRYvdrzJGLjQbWZhqFmS9Q6a0yumc5qtfSahBGb5g+6qWvA8iiQktqGkwoIXa/BNQ==}
     dev: true
@@ -6252,6 +5785,14 @@ packages:
   /@types/range-parser/1.2.4:
     resolution: {integrity: sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==}
 
+  /@types/react/18.0.27:
+    resolution: {integrity: sha512-3vtRKHgVxu3Jp9t718R9BuzoD4NcQ8YJ5XRzsSKxNDiDonD2MXIT1TmSkenxuCycZJoQT5d2vE8LwWJxBC1gmA==}
+    dependencies:
+      '@types/prop-types': 15.7.5
+      '@types/scheduler': 0.16.2
+      csstype: 3.1.1
+    dev: true
+
   /@types/redis/2.8.32:
     resolution: {integrity: sha512-7jkMKxcGq9p242exlbsVzuJb57KqHRhNl4dHoQu2Y5v9bCAbtIXXH0R3HleSQW4CTOqpHIYUW3t6tpUj4BVQ+w==}
     dependencies:
@@ -6283,6 +5824,10 @@ packages:
       htmlparser2: 8.0.1
     dev: true
 
+  /@types/scheduler/0.16.2:
+    resolution: {integrity: sha512-hppQEBDmlwhFAXKJX2KnWLYu5yMfi91yazPb2l+lbJiwW+wdo1gNeRA+3RgNSO39WYX2euey41KEwnqesU2Jew==}
+    dev: true
+
   /@types/semver/7.3.13:
     resolution: {integrity: sha512-21cFJr9z3g5dW8B0CVI9g2O9beqaThGQ6ZFBqHfwhzLDKUxaqTIy3vnfah/UPkfOiF2pLq+tGz+W8RyCskuslw==}
     dev: true
@@ -6326,10 +5871,6 @@ packages:
       '@types/node': 16.18.12
     dev: true
 
-  /@types/source-list-map/0.1.2:
-    resolution: {integrity: sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==}
-    dev: true
-
   /@types/ssh2-sftp-client/5.3.2:
     resolution: {integrity: sha512-s5R3hsnI3/7Ar57LG++gm2kxgONHtOZY2A3AgGzEwiJlHR8j7MRPDw1n/hG6oMnOUJ4zuoLNtDXgDfmmxV4lDA==}
     dependencies:
@@ -6378,10 +5919,6 @@ packages:
       '@types/node': 16.18.12
     dev: true
 
-  /@types/tapable/1.0.8:
-    resolution: {integrity: sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==}
-    dev: true
-
   /@types/tedious/4.0.9:
     resolution: {integrity: sha512-ipwFvfy9b2m0gjHsIX0D6NAAwGCKokzf5zJqUZHUGt+7uWVlBIy6n2eyMgiKQ8ChLFVxic/zwQUhjLYNzbHDRA==}
     dependencies:
@@ -6422,12 +5959,6 @@ packages:
       '@types/node': 16.18.12
     dev: false
 
-  /@types/uglify-js/3.17.1:
-    resolution: {integrity: sha512-GkewRA4i5oXacU/n4MA9+bLgt5/L3F1mKrYvFGm7r2ouLXhRKjuWwo9XHNnbx6WF3vlGW21S3fCvgqxvxXXc5g==}
-    dependencies:
-      source-map: 0.6.1
-    dev: true
-
   /@types/unist/2.0.6:
     resolution: {integrity: sha512-PBjIUxZHOuj0R15/xuwJYjFi+KZdNFrehocChv4g5hu6aFroHue8m0lBP0POdK2nKzbw0cgV1mws8+V/JAcEkQ==}
     dev: true
@@ -6460,25 +5991,6 @@ packages:
     resolution: {integrity: sha512-56/MAlX5WMsPVbOg7tAxnYvNYMMWr/QJiIp6BxVSW3JJXUVzzOn64qW8TzQyMSqSUFM2+PVI4aUHcHOzIz/1tg==}
     dev: true
 
-  /@types/webpack-sources/3.2.0:
-    resolution: {integrity: sha512-Ft7YH3lEVRQ6ls8k4Ff1oB4jN6oy/XmU6tQISKdhfh+1mR+viZFphS6WL0IrtDOzvefmJg5a0s7ZQoRXwqTEFg==}
-    dependencies:
-      '@types/node': 16.18.12
-      '@types/source-list-map': 0.1.2
-      source-map: 0.7.4
-    dev: true
-
-  /@types/webpack/4.41.33:
-    resolution: {integrity: sha512-PPajH64Ft2vWevkerISMtnZ8rTs4YmRbs+23c402J0INmxDKCrhZNvwZYtzx96gY2wAtXdrK1BS2fiC8MlLr3g==}
-    dependencies:
-      '@types/node': 16.18.12
-      '@types/tapable': 1.0.8
-      '@types/uglify-js': 3.17.1
-      '@types/webpack-sources': 3.2.0
-      anymatch: 3.1.3
-      source-map: 0.6.1
-    dev: true
-
   /@types/whatwg-url/8.2.2:
     resolution: {integrity: sha512-FtQu10RWgn3D9U4aazdwIE2yzphmTJREDqNdODHrbrZmmMqI0vMheC/6NE/J1Yveaj8H+ela+YwWTjq5PGmuhA==}
     dependencies:
@@ -6662,7 +6174,7 @@ packages:
       vite: ^4.0.0
     dependencies:
       '@babel/standalone': 7.20.12
-      core-js: 3.27.1
+      core-js: 3.27.2
       magic-string: 0.27.0
       regenerator-runtime: 0.13.11
       systemjs: 6.13.0
@@ -6677,7 +6189,7 @@ packages:
       vite: ^3.0.0 || ^4.0.0
       vue: ^2.7.0-0
     dependencies:
-      vite: 4.0.4_sass@1.57.1
+      vite: 4.0.4_sass@1.58.0
       vue: 2.7.14
     dev: true
 
@@ -6925,130 +6437,109 @@ packages:
       vue-template-compiler: 2.7.14
     dev: true
 
-  /@webassemblyjs/ast/1.9.0:
-    resolution: {integrity: sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==}
+  /@webassemblyjs/ast/1.11.1:
+    resolution: {integrity: sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==}
     dependencies:
-      '@webassemblyjs/helper-module-context': 1.9.0
-      '@webassemblyjs/helper-wasm-bytecode': 1.9.0
-      '@webassemblyjs/wast-parser': 1.9.0
-    dev: true
-
-  /@webassemblyjs/floating-point-hex-parser/1.9.0:
-    resolution: {integrity: sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==}
+      '@webassemblyjs/helper-numbers': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
     dev: true
 
-  /@webassemblyjs/helper-api-error/1.9.0:
-    resolution: {integrity: sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==}
+  /@webassemblyjs/floating-point-hex-parser/1.11.1:
+    resolution: {integrity: sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==}
     dev: true
 
-  /@webassemblyjs/helper-buffer/1.9.0:
-    resolution: {integrity: sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==}
+  /@webassemblyjs/helper-api-error/1.11.1:
+    resolution: {integrity: sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==}
     dev: true
 
-  /@webassemblyjs/helper-code-frame/1.9.0:
-    resolution: {integrity: sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==}
-    dependencies:
-      '@webassemblyjs/wast-printer': 1.9.0
-    dev: true
-
-  /@webassemblyjs/helper-fsm/1.9.0:
-    resolution: {integrity: sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==}
+  /@webassemblyjs/helper-buffer/1.11.1:
+    resolution: {integrity: sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==}
     dev: true
 
-  /@webassemblyjs/helper-module-context/1.9.0:
-    resolution: {integrity: sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==}
+  /@webassemblyjs/helper-numbers/1.11.1:
+    resolution: {integrity: sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==}
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
+      '@webassemblyjs/floating-point-hex-parser': 1.11.1
+      '@webassemblyjs/helper-api-error': 1.11.1
+      '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/helper-wasm-bytecode/1.9.0:
-    resolution: {integrity: sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==}
+  /@webassemblyjs/helper-wasm-bytecode/1.11.1:
+    resolution: {integrity: sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==}
     dev: true
 
-  /@webassemblyjs/helper-wasm-section/1.9.0:
-    resolution: {integrity: sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==}
+  /@webassemblyjs/helper-wasm-section/1.11.1:
+    resolution: {integrity: sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==}
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/helper-buffer': 1.9.0
-      '@webassemblyjs/helper-wasm-bytecode': 1.9.0
-      '@webassemblyjs/wasm-gen': 1.9.0
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-buffer': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/wasm-gen': 1.11.1
     dev: true
 
-  /@webassemblyjs/ieee754/1.9.0:
-    resolution: {integrity: sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==}
+  /@webassemblyjs/ieee754/1.11.1:
+    resolution: {integrity: sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==}
     dependencies:
       '@xtuc/ieee754': 1.2.0
     dev: true
 
-  /@webassemblyjs/leb128/1.9.0:
-    resolution: {integrity: sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==}
+  /@webassemblyjs/leb128/1.11.1:
+    resolution: {integrity: sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==}
     dependencies:
       '@xtuc/long': 4.2.2
     dev: true
 
-  /@webassemblyjs/utf8/1.9.0:
-    resolution: {integrity: sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==}
+  /@webassemblyjs/utf8/1.11.1:
+    resolution: {integrity: sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==}
     dev: true
 
-  /@webassemblyjs/wasm-edit/1.9.0:
-    resolution: {integrity: sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==}
+  /@webassemblyjs/wasm-edit/1.11.1:
+    resolution: {integrity: sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==}
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/helper-buffer': 1.9.0
-      '@webassemblyjs/helper-wasm-bytecode': 1.9.0
-      '@webassemblyjs/helper-wasm-section': 1.9.0
-      '@webassemblyjs/wasm-gen': 1.9.0
-      '@webassemblyjs/wasm-opt': 1.9.0
-      '@webassemblyjs/wasm-parser': 1.9.0
-      '@webassemblyjs/wast-printer': 1.9.0
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-buffer': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/helper-wasm-section': 1.11.1
+      '@webassemblyjs/wasm-gen': 1.11.1
+      '@webassemblyjs/wasm-opt': 1.11.1
+      '@webassemblyjs/wasm-parser': 1.11.1
+      '@webassemblyjs/wast-printer': 1.11.1
     dev: true
 
-  /@webassemblyjs/wasm-gen/1.9.0:
-    resolution: {integrity: sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==}
+  /@webassemblyjs/wasm-gen/1.11.1:
+    resolution: {integrity: sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==}
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/helper-wasm-bytecode': 1.9.0
-      '@webassemblyjs/ieee754': 1.9.0
-      '@webassemblyjs/leb128': 1.9.0
-      '@webassemblyjs/utf8': 1.9.0
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/ieee754': 1.11.1
+      '@webassemblyjs/leb128': 1.11.1
+      '@webassemblyjs/utf8': 1.11.1
     dev: true
 
-  /@webassemblyjs/wasm-opt/1.9.0:
-    resolution: {integrity: sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==}
+  /@webassemblyjs/wasm-opt/1.11.1:
+    resolution: {integrity: sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==}
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/helper-buffer': 1.9.0
-      '@webassemblyjs/wasm-gen': 1.9.0
-      '@webassemblyjs/wasm-parser': 1.9.0
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-buffer': 1.11.1
+      '@webassemblyjs/wasm-gen': 1.11.1
+      '@webassemblyjs/wasm-parser': 1.11.1
     dev: true
 
-  /@webassemblyjs/wasm-parser/1.9.0:
-    resolution: {integrity: sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==}
+  /@webassemblyjs/wasm-parser/1.11.1:
+    resolution: {integrity: sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==}
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/helper-api-error': 1.9.0
-      '@webassemblyjs/helper-wasm-bytecode': 1.9.0
-      '@webassemblyjs/ieee754': 1.9.0
-      '@webassemblyjs/leb128': 1.9.0
-      '@webassemblyjs/utf8': 1.9.0
-    dev: true
-
-  /@webassemblyjs/wast-parser/1.9.0:
-    resolution: {integrity: sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==}
-    dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/floating-point-hex-parser': 1.9.0
-      '@webassemblyjs/helper-api-error': 1.9.0
-      '@webassemblyjs/helper-code-frame': 1.9.0
-      '@webassemblyjs/helper-fsm': 1.9.0
-      '@xtuc/long': 4.2.2
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/helper-api-error': 1.11.1
+      '@webassemblyjs/helper-wasm-bytecode': 1.11.1
+      '@webassemblyjs/ieee754': 1.11.1
+      '@webassemblyjs/leb128': 1.11.1
+      '@webassemblyjs/utf8': 1.11.1
     dev: true
 
-  /@webassemblyjs/wast-printer/1.9.0:
-    resolution: {integrity: sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==}
+  /@webassemblyjs/wast-printer/1.11.1:
+    resolution: {integrity: sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==}
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/wast-parser': 1.9.0
+      '@webassemblyjs/ast': 1.11.1
       '@xtuc/long': 4.2.2
     dev: true
 
@@ -7060,6 +6551,16 @@ packages:
     resolution: {integrity: sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==}
     dev: true
 
+  /@yarnpkg/esbuild-plugin-pnp/3.0.0-rc.15_esbuild@0.16.17:
+    resolution: {integrity: sha512-kYzDJO5CA9sy+on/s2aIW0411AklfCi8Ck/4QDivOqsMKpStZA2SsR+X27VTggGwpStWaLrjJcDcdDMowtG8MA==}
+    engines: {node: '>=14.15.0'}
+    peerDependencies:
+      esbuild: '>=0.10.0'
+    dependencies:
+      esbuild: 0.16.17
+      tslib: 2.5.0
+    dev: true
+
   /a-sync-waterfall/1.0.1:
     resolution: {integrity: sha512-RYTOHHdWipFUliRFMCS4X2Yn2X8M87V/OpSqWzKKOGhzqyUxzyVmhHDH9sAvG+ZuQf/TAOFsLCpMw09I1ufUnA==}
     dev: false
@@ -7085,6 +6586,14 @@ packages:
       acorn-walk: 8.2.0
     dev: true
 
+  /acorn-import-assertions/1.8.0_acorn@8.8.1:
+    resolution: {integrity: sha512-m7VZ3jwz4eK6A4Vtt8Ew1/mNbP24u0FhdyfA7fSvnJR6LMdfOYnmuIrrJAgrYfYJ10F/otaHTtrtrtmHdMNzEw==}
+    peerDependencies:
+      acorn: ^8
+    dependencies:
+      acorn: 8.8.1
+    dev: true
+
   /acorn-jsx/5.3.2_acorn@7.4.1:
     resolution: {integrity: sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==}
     peerDependencies:
@@ -7105,12 +6614,6 @@ packages:
     resolution: {integrity: sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==}
     engines: {node: '>=0.4.0'}
 
-  /acorn/6.4.2:
-    resolution: {integrity: sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==}
-    engines: {node: '>=0.4.0'}
-    hasBin: true
-    dev: true
-
   /acorn/7.4.1:
     resolution: {integrity: sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==}
     engines: {node: '>=0.4.0'}
@@ -7153,6 +6656,11 @@ packages:
     engines: {node: '>=0.8'}
     dev: false
 
+  /agent-base/5.1.1:
+    resolution: {integrity: sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==}
+    engines: {node: '>= 6.0.0'}
+    dev: true
+
   /agent-base/6.0.2:
     resolution: {integrity: sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==}
     engines: {node: '>= 6.0.0'}
@@ -7180,34 +6688,15 @@ packages:
       clean-stack: 2.2.0
       indent-string: 4.0.0
 
-  /airbnb-js-shims/2.2.1:
-    resolution: {integrity: sha512-wJNXPH66U2xjgo1Zwyjf9EydvJ2Si94+vSdk6EERcBfB2VZkeltpqIats0cqIZMLCXP3zcyaUKGYQeIBT6XjsQ==}
-    dependencies:
-      array-includes: 3.1.6
-      array.prototype.flat: 1.3.1
-      array.prototype.flatmap: 1.3.1
-      es5-shim: 4.6.7
-      es6-shim: 0.35.7
-      function.prototype.name: 1.1.5
-      globalthis: 1.0.3
-      object.entries: 1.1.6
-      object.fromentries: 2.0.6
-      object.getownpropertydescriptors: 2.1.5
-      object.values: 1.1.6
-      promise.allsettled: 1.0.6
-      promise.prototype.finally: 3.1.4
-      string.prototype.matchall: 4.0.8
-      string.prototype.padend: 3.1.4
-      string.prototype.padstart: 3.1.4
-      symbol.prototype.description: 1.0.5
-    dev: true
-
-  /ajv-errors/1.0.1_ajv@6.12.6:
-    resolution: {integrity: sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==}
+  /ajv-formats/2.1.1_ajv@8.12.0:
+    resolution: {integrity: sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==}
     peerDependencies:
-      ajv: '>=5.0.0'
+      ajv: ^8.0.0
+    peerDependenciesMeta:
+      ajv:
+        optional: true
     dependencies:
-      ajv: 6.12.6
+      ajv: 8.12.0
     dev: true
 
   /ajv-keywords/3.5.2_ajv@6.12.6:
@@ -7218,6 +6707,15 @@ packages:
       ajv: 6.12.6
     dev: true
 
+  /ajv-keywords/5.1.0_ajv@8.12.0:
+    resolution: {integrity: sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==}
+    peerDependencies:
+      ajv: ^8.8.2
+    dependencies:
+      ajv: 8.12.0
+      fast-deep-equal: 3.1.3
+    dev: true
+
   /ajv/6.12.6:
     resolution: {integrity: sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==}
     dependencies:
@@ -7226,6 +6724,15 @@ packages:
       json-schema-traverse: 0.4.1
       uri-js: 4.4.1
 
+  /ajv/8.12.0:
+    resolution: {integrity: sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA==}
+    dependencies:
+      fast-deep-equal: 3.1.3
+      json-schema-traverse: 1.0.0
+      require-from-string: 2.0.2
+      uri-js: 4.4.1
+    dev: true
+
   /amqplib/0.10.3:
     resolution: {integrity: sha512-UHmuSa7n8vVW/a5HGh2nFPqAEr8+cD4dEZ6u9GjP91nHfr1a54RyAKyra7Sb5NH7NBKOUlyQSMXIp0qAixKexw==}
     engines: {node: '>=10'}
@@ -7251,11 +6758,6 @@ packages:
       ansi-wrap: 0.1.0
     dev: true
 
-  /ansi-colors/3.2.4:
-    resolution: {integrity: sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==}
-    engines: {node: '>=6'}
-    dev: true
-
   /ansi-colors/4.1.3:
     resolution: {integrity: sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==}
     engines: {node: '>=6'}
@@ -7326,14 +6828,6 @@ packages:
     engines: {node: '>=12'}
     dev: true
 
-  /ansi-to-html/0.6.15:
-    resolution: {integrity: sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==}
-    engines: {node: '>=8.0.0'}
-    hasBin: true
-    dependencies:
-      entities: 2.2.0
-    dev: true
-
   /ansi-wrap/0.1.0:
     resolution: {integrity: sha512-ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==}
     engines: {node: '>=0.10.0'}
@@ -7382,10 +6876,6 @@ packages:
     resolution: {integrity: sha512-klpgFSWLW1ZEs8svjfb7g4qWY0YS5imI82dTg+QahUvJ8YqAY0P10Uk8tTyh9ZGuYEZEMaeJYCF5BFuX552hsw==}
     dev: false
 
-  /aproba/1.2.0:
-    resolution: {integrity: sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==}
-    dev: true
-
   /aproba/2.0.0:
     resolution: {integrity: sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==}
 
@@ -7469,12 +6959,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /array-find-index/1.0.2:
-    resolution: {integrity: sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-    optional: true
-
   /array-flatten/1.1.1:
     resolution: {integrity: sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==}
 
@@ -7489,17 +6973,6 @@ packages:
       is-string: 1.0.7
     dev: true
 
-  /array-includes/3.1.6:
-    resolution: {integrity: sha512-sgTbLvL6cNnw24FnbaDyjmvddQ2ML8arZsgaJhoABMoplz/4QRhtrYS+alr1BUM1Bwp6dhx8vVCBSLG+StwOFw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      get-intrinsic: 1.1.3
-      is-string: 1.0.7
-    dev: true
-
   /array-initial/1.1.0:
     resolution: {integrity: sha512-BC4Yl89vneCYfpLrs5JU2aAu9/a+xWbeKhvISg9PT7eWFB9UlRvI+rKEtk6mgxWr3dSkk9gQ8hCrdqt06NXPdw==}
     engines: {node: '>=0.10.0'}
@@ -7556,37 +7029,6 @@ packages:
       es-shim-unscopables: 1.0.0
     dev: true
 
-  /array.prototype.flat/1.3.1:
-    resolution: {integrity: sha512-roTU0KWIOmJ4DRLmwKd19Otg0/mT3qPNt0Qb3GWW8iObuZXxrjB/pzn0R3hqpRSWg4HCwqx+0vwOnWnvlOyeIA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      es-shim-unscopables: 1.0.0
-    dev: true
-
-  /array.prototype.flatmap/1.3.1:
-    resolution: {integrity: sha512-8UGn9O1FDVvMNB0UlLv4voxRMze7+FpHyF5mSMRjWHUMlpoDViniy05870VlxhfgTnLbpuwTzvD76MTtWxB/mQ==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      es-shim-unscopables: 1.0.0
-    dev: true
-
-  /array.prototype.map/1.0.5:
-    resolution: {integrity: sha512-gfaKntvwqYIuC7mLLyv2wzZIJqrRhn5PZ9EfFejSx6a78sV7iDsGpG9P+3oUPtm1Rerqm6nrKS4FYuTIvWfo3g==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      es-array-method-boxes-properly: 1.0.0
-      is-string: 1.0.7
-    dev: true
-
   /array.prototype.reduce/1.0.4:
     resolution: {integrity: sha512-WnM+AjG/DvLRLo4DDl+r+SvCzYtD2Jd9oeBYMcEaI7t3fFrHY9M53/wdLcTvmZNQ70IU6Htj0emFkZ5TS+lrdw==}
     engines: {node: '>= 0.4'}
@@ -7598,22 +7040,6 @@ packages:
       is-string: 1.0.7
     dev: false
 
-  /array.prototype.reduce/1.0.5:
-    resolution: {integrity: sha512-kDdugMl7id9COE8R7MHF5jWk7Dqt/fs4Pv+JXoICnYwqpjjjbUurz6w5fT5IG6brLdJhv6/VoHB0H7oyIBXd+Q==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      es-array-method-boxes-properly: 1.0.0
-      is-string: 1.0.7
-    dev: true
-
-  /arrify/2.0.1:
-    resolution: {integrity: sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==}
-    engines: {node: '>=8'}
-    dev: true
-
   /asap/2.0.6:
     resolution: {integrity: sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==}
 
@@ -7639,6 +7065,7 @@ packages:
       inherits: 2.0.4
       minimalistic-assert: 1.0.1
       safer-buffer: 2.1.2
+    dev: false
 
   /asn1/0.2.6:
     resolution: {integrity: sha512-ix/FxPn0MDjeyJ7i/yoHGFt/EX6LyNbxSEhPPXODPL+KB0VPk86UYfL0lMdy+KCnv+fmvIzySwaK5COwqVbWTQ==}
@@ -7658,13 +7085,6 @@ packages:
     resolution: {integrity: sha512-NfJ4UzBCcQGLDlQq7nHxH+tv3kyZ0hHQqF5BO6J7tNJeP5do1llPr8dZ8zHonfhAu0PHAdMkSo+8o0wxg9lZWw==}
     engines: {node: '>=0.8'}
 
-  /assert/1.5.0:
-    resolution: {integrity: sha512-EDsgawzwoun2CZkCgtxJbv392v4nbk9XDD06zI+kQYoBM/3RBWLlEyJARDOmhAAosBjWACEkKL6S+lIZtcAubA==}
-    dependencies:
-      object-assign: 4.1.1
-      util: 0.10.3
-    dev: true
-
   /assert/2.0.0:
     resolution: {integrity: sha512-se5Cd+js9dXJnu6Ag2JFc00t+HmHOen+8Q+L7O9zI0PqQXr20uk2J0XQqMxZEeo5U50o8Nvmmx7dZrl+Ufr35A==}
     dependencies:
@@ -7703,6 +7123,13 @@ packages:
     dependencies:
       tslib: 2.4.1
 
+  /ast-types/0.16.1:
+    resolution: {integrity: sha512-6t10qk83GOG8p0vKmaCr8eiilZwO171AvbROMtvvNiwrTly62t+7XkA8RdIIVbpMhCASAsxgAzdRSwh6nw/5Dg==}
+    engines: {node: '>=4'}
+    dependencies:
+      tslib: 2.5.0
+    dev: true
+
   /astral-regex/2.0.0:
     resolution: {integrity: sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==}
     engines: {node: '>=8'}
@@ -7718,6 +7145,10 @@ packages:
       stream-exhaust: 1.0.2
     dev: true
 
+  /async-limiter/1.0.1:
+    resolution: {integrity: sha512-csOlWGAcRFJaI6m+F2WKdnMKr4HhdhFVBk0H/QbJFMCr+uO2kwohwXQPxw/9OCxp05r5ghVBFSyioixx3gfkNQ==}
+    dev: true
+
   /async-settle/1.0.0:
     resolution: {integrity: sha512-VPXfB4Vk49z1LHHodrEQ6Xf7W4gg1w0dAPROHngx7qgDjqmIQ+fXmwgGXTW/ITLai0YLSvWepJOP9EVpMnEAcw==}
     engines: {node: '>= 0.10'}
@@ -7752,7 +7183,7 @@ packages:
     hasBin: true
     dependencies:
       commander: 5.1.0
-      core-js: 3.25.5
+      core-js: 3.27.2
       handlebars: 4.7.7
       lodash.uniqby: 4.7.0
       node-fetch: 2.6.7
@@ -7763,16 +7194,19 @@ packages:
       - encoding
     dev: false
 
-  /autoprefixer/9.8.8:
-    resolution: {integrity: sha512-eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==}
+  /autoprefixer/10.4.13_postcss@8.4.21:
+    resolution: {integrity: sha512-49vKpMqcZYsJjwotvt4+h/BCjJVnhGwcLpDt5xkcaOG3eLrG/HUYLagrihYsQ+qrIBgIzX1Rw7a6L8I/ZA1Atg==}
+    engines: {node: ^10 || ^12 || >=14}
     hasBin: true
+    peerDependencies:
+      postcss: ^8.1.0
     dependencies:
       browserslist: 4.21.4
       caniuse-lite: 1.0.30001445
+      fraction.js: 4.2.0
       normalize-range: 0.1.2
-      num2fraction: 1.2.2
-      picocolors: 0.2.1
-      postcss: 7.0.39
+      picocolors: 1.0.0
+      postcss: 8.4.21
       postcss-value-parser: 4.2.0
     dev: true
 
@@ -7877,7 +7311,7 @@ packages:
     dependencies:
       '@babel/core': 7.20.12
       '@jest/transform': 29.4.2
-      '@types/babel__core': 7.1.19
+      '@types/babel__core': 7.20.0
       babel-plugin-istanbul: 6.1.1
       babel-preset-jest: 29.4.2_@babel+core@7.20.12
       chalk: 4.1.2
@@ -7887,35 +7321,17 @@ packages:
       - supports-color
     dev: true
 
-  /babel-loader/8.3.0_nwtvwtk5tmh22l2urnqucz7kqu:
-    resolution: {integrity: sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==}
-    engines: {node: '>= 8.9'}
-    peerDependencies:
-      '@babel/core': ^7.0.0
-      webpack: '>=2'
-    dependencies:
-      '@babel/core': 7.20.12
-      find-cache-dir: 3.3.2
-      loader-utils: 2.0.4
-      make-dir: 3.1.0
-      schema-utils: 2.7.1
-      webpack: 4.46.0
-    dev: true
-
-  /babel-plugin-apply-mdx-type-prop/1.6.22_@babel+core@7.12.9:
-    resolution: {integrity: sha512-VefL+8o+F/DfK24lPZMtJctrCVOfgbqLAGZSkxwhazQv4VxPg3Za/i40fu22KR2m8eEda+IfSOlPLUSIiLcnCQ==}
-    peerDependencies:
-      '@babel/core': ^7.11.6
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.10.4
-      '@mdx-js/util': 1.6.22
-    dev: true
-
-  /babel-plugin-extract-import-names/1.6.22:
-    resolution: {integrity: sha512-yJ9BsJaISua7d8zNT7oRG1ZLBJCIdZ4PZqmH8qa9N5AK01ifk3fnkc98AXhtzE7UkfCsEumvoQWgoYLhOnJ7jQ==}
+  /babel-loader/9.1.2_la66t7xldg4uecmyawueag5wkm:
+    resolution: {integrity: sha512-mN14niXW43tddohGl8HPu5yfQq70iUThvFL/4QzESA7GcZoC0eVOhvWdQ8+3UlSjaDE9MVtsW9mxDY07W7VpVA==}
+    engines: {node: '>= 14.15.0'}
+    peerDependencies:
+      '@babel/core': ^7.12.0
+      webpack: '>=5'
     dependencies:
-      '@babel/helper-plugin-utils': 7.10.4
+      '@babel/core': 7.20.12
+      find-cache-dir: 3.3.2
+      schema-utils: 4.0.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /babel-plugin-istanbul/6.1.1:
@@ -7937,17 +7353,12 @@ packages:
     dependencies:
       '@babel/template': 7.20.7
       '@babel/types': 7.20.7
-      '@types/babel__core': 7.1.19
+      '@types/babel__core': 7.20.0
       '@types/babel__traverse': 7.18.2
     dev: true
 
-  /babel-plugin-macros/3.1.0:
-    resolution: {integrity: sha512-Cg7TFGpIr01vOQNODXOOaGz2NpCU5gl8x1qJFbb6hbZxR7XrcE2vtbAsTAbJ7/xwJtUuJEw8K8Zr/AE0LHlesg==}
-    engines: {node: '>=10', npm: '>=6'}
-    dependencies:
-      '@babel/runtime': 7.20.7
-      cosmiconfig: 7.1.0
-      resolve: 1.22.1
+  /babel-plugin-named-exports-order/0.0.2:
+    resolution: {integrity: sha512-OgOYHOLoRK+/mvXU9imKHlG6GkPLYrUCvFXG/CM93R/aNNO8pOOF4aS+S8CCHMDQoNSeiOYEZb/G6RwL95Jktw==}
     dev: true
 
   /babel-plugin-polyfill-corejs2/0.3.3_@babel+core@7.20.12:
@@ -7963,18 +7374,6 @@ packages:
       - supports-color
     dev: true
 
-  /babel-plugin-polyfill-corejs3/0.1.7_@babel+core@7.20.12:
-    resolution: {integrity: sha512-u+gbS9bbPhZWEeyy1oR/YaaSpod/KDT07arZHb80aTpl8H5ZBq+uN1nN9/xtX7jQyfLdPfoqI4Rue/MQSWJquw==}
-    peerDependencies:
-      '@babel/core': ^7.0.0-0
-    dependencies:
-      '@babel/core': 7.20.12
-      '@babel/helper-define-polyfill-provider': 0.1.5_@babel+core@7.20.12
-      core-js-compat: 3.27.1
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /babel-plugin-polyfill-corejs3/0.6.0_@babel+core@7.20.12:
     resolution: {integrity: sha512-+eHqR6OPcBhJOGgsIar7xoAB1GcSwVUA3XjAd7HJNzOXT4wv6/H7KIdA/Nc60cvUlDbKApmqNvD1B1bzOt4nyA==}
     peerDependencies:
@@ -8058,10 +7457,6 @@ packages:
       now-and-later: 2.0.1
     dev: true
 
-  /bail/1.0.5:
-    resolution: {integrity: sha512-xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==}
-    dev: true
-
   /balanced-match/1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
@@ -8162,10 +7557,7 @@ packages:
 
   /bn.js/4.12.0:
     resolution: {integrity: sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA==}
-
-  /bn.js/5.2.1:
-    resolution: {integrity: sha512-eXRvHzWyYPBuB4NBy0cmYQjGitUrtqwbvlzP3G6VFnNRbsZQIxQ10PbKKHt8gZ/HW/D/747aDl+QkDqg3KQLMQ==}
-    dev: true
+    dev: false
 
   /body-parser-xml/2.0.3:
     resolution: {integrity: sha512-tWvcAbh8QPd/lj+yfGZBMY/roof/e2iSXrJbYXYjxVhHQ88D2CF3AxDTdwhb9wcNdHVNbCttaWipchJPEs5r0g==}
@@ -8210,12 +7602,12 @@ packages:
       wrap-ansi: 7.0.0
     dev: true
 
-  /bplist-parser/0.1.1:
-    resolution: {integrity: sha512-2AEM0FXy8ZxVLBuqX0hqt1gDwcnz2zygEkQ6zaD5Wko/sB9paUNwlpawrFtKeHUAQUOzjVy9AO4oeonqIHKA9Q==}
+  /bplist-parser/0.2.0:
+    resolution: {integrity: sha512-z0M+byMThzQmD9NILRniCUXYsYpjwnlO8N5uCFaCqIOpqRsJCrQL9NK3JsD67CN5a08nF5oIL2bD6loTdHOuKw==}
+    engines: {node: '>= 5.10.0'}
     dependencies:
       big-integer: 1.6.51
     dev: true
-    optional: true
 
   /brace-expansion/1.1.11:
     resolution: {integrity: sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==}
@@ -8252,8 +7644,8 @@ packages:
     dependencies:
       fill-range: 7.0.1
 
-  /brorand/1.1.0:
-    resolution: {integrity: sha512-cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==}
+  /browser-assert/1.2.1:
+    resolution: {integrity: sha512-nfulgvOR6S4gt9UKCeGJOuSGBPGiFT6oQ/2UBnvTY/5aQ1PnksW72fhZkM30DzoRRv2WpwZf1vHHEr3mtuXIWQ==}
     dev: true
 
   /browser-request/0.3.3:
@@ -8261,61 +7653,6 @@ packages:
     engines: {'0': node}
     dev: false
 
-  /browserify-aes/1.2.0:
-    resolution: {integrity: sha512-+7CHXqGuspUn/Sl5aO7Ea0xWGAtETPXNSAjHo48JfLdPWcMng33Xe4znFvQweqc/uzk5zSOI3H52CYnjCfb5hA==}
-    dependencies:
-      buffer-xor: 1.0.3
-      cipher-base: 1.0.4
-      create-hash: 1.2.0
-      evp_bytestokey: 1.0.3
-      inherits: 2.0.4
-      safe-buffer: 5.2.1
-    dev: true
-
-  /browserify-cipher/1.0.1:
-    resolution: {integrity: sha512-sPhkz0ARKbf4rRQt2hTpAHqn47X3llLkUGn+xEJzLjwY8LRs2p0v7ljvI5EyoRO/mexrNunNECisZs+gw2zz1w==}
-    dependencies:
-      browserify-aes: 1.2.0
-      browserify-des: 1.0.2
-      evp_bytestokey: 1.0.3
-    dev: true
-
-  /browserify-des/1.0.2:
-    resolution: {integrity: sha512-BioO1xf3hFwz4kc6iBhI3ieDFompMhrMlnDFC4/0/vd5MokpuAc3R+LYbwTA9A5Yc9pq9UYPqffKpW2ObuwX5A==}
-    dependencies:
-      cipher-base: 1.0.4
-      des.js: 1.0.1
-      inherits: 2.0.4
-      safe-buffer: 5.2.1
-    dev: true
-
-  /browserify-rsa/4.1.0:
-    resolution: {integrity: sha512-AdEER0Hkspgno2aR97SAf6vi0y0k8NuOpGnVH3O99rcA5Q6sh8QxcngtHuJ6uXwnfAXNM4Gn1Gb7/MV1+Ymbog==}
-    dependencies:
-      bn.js: 5.2.1
-      randombytes: 2.1.0
-    dev: true
-
-  /browserify-sign/4.2.1:
-    resolution: {integrity: sha512-/vrA5fguVAKKAVTNJjgSm1tRQDHUU6DbwO9IROu/0WAzC8PKhucDSh18J0RMvVeHAn5puMd+QHC2erPRNf8lmg==}
-    dependencies:
-      bn.js: 5.2.1
-      browserify-rsa: 4.1.0
-      create-hash: 1.2.0
-      create-hmac: 1.1.7
-      elliptic: 6.5.4
-      inherits: 2.0.4
-      parse-asn1: 5.1.6
-      readable-stream: 3.6.0
-      safe-buffer: 5.2.1
-    dev: true
-
-  /browserify-zlib/0.2.0:
-    resolution: {integrity: sha512-Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==}
-    dependencies:
-      pako: 1.0.11
-    dev: true
-
   /browserslist/4.21.4:
     resolution: {integrity: sha512-CBHJJdDmgjl3daYjN5Cp5kbTf1mUhZoS+beLklHIvkOWscs83YAhLlF3Wsh/lciQYAcbBJgTOD44VtG31ZM4Hw==}
     engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7}
@@ -8371,16 +7708,13 @@ packages:
     engines: {node: '>=4'}
     dev: false
 
-  /buffer-xor/1.0.3:
-    resolution: {integrity: sha512-571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==}
-    dev: true
-
   /buffer/4.9.2:
     resolution: {integrity: sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==}
     dependencies:
       base64-js: 1.5.1
       ieee754: 1.2.1
       isarray: 1.0.0
+    dev: false
 
   /buffer/5.7.1:
     resolution: {integrity: sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==}
@@ -8401,10 +7735,6 @@ packages:
     dev: false
     optional: true
 
-  /builtin-status-codes/3.0.0:
-    resolution: {integrity: sha512-HpGFw18DgFWlncDfjTa2rcQ4W88O1mC8e8yZ2AvQY5KDaktSTwo+KRf6nHK6FRI5FyRyb/5T6+TSxfP7QyGsmQ==}
-    dev: true
-
   /bull/3.29.3:
     resolution: {integrity: sha512-MOqV1dKLy1YQgP9m3lFolyMxaU+1+o4afzYYf0H4wNM+x/S0I1QPQfkgGlLiH00EyFrvSmeubeCYFP47rTfpjg==}
     engines: {node: '>=10'}
@@ -8483,26 +7813,6 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
-  /cacache/12.0.4:
-    resolution: {integrity: sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==}
-    dependencies:
-      bluebird: 3.7.2
-      chownr: 1.1.4
-      figgy-pudding: 3.5.2
-      glob: 7.2.3
-      graceful-fs: 4.2.10
-      infer-owner: 1.0.4
-      lru-cache: 5.1.1
-      mississippi: 3.0.0
-      mkdirp: 0.5.6
-      move-concurrently: 1.0.1
-      promise-inflight: 1.0.1_bluebird@3.7.2
-      rimraf: 2.7.1
-      ssri: 6.0.2
-      unique-filename: 1.1.1
-      y18n: 4.0.3
-    dev: true
-
   /cacache/15.3.0:
     resolution: {integrity: sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==}
     engines: {node: '>= 10'}
@@ -8527,6 +7837,8 @@ packages:
       unique-filename: 1.1.1
     transitivePeerDependencies:
       - bluebird
+    dev: false
+    optional: true
 
   /cache-base/1.0.1:
     resolution: {integrity: sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==}
@@ -8574,26 +7886,6 @@ packages:
       pascal-case: 3.1.2
       tslib: 2.5.0
 
-  /camelcase-css/2.0.1:
-    resolution: {integrity: sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==}
-    engines: {node: '>= 6'}
-    dev: true
-
-  /camelcase-keys/2.1.0:
-    resolution: {integrity: sha512-bA/Z/DERHKqoEOrp+qeGKw1QlvEQkGZSc0XaY6VnTxZr+Kv1G5zFwttpjv8qxZ/sBPT4nthwZaAcsAZTJlSKXQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      camelcase: 2.1.1
-      map-obj: 1.0.1
-    dev: true
-    optional: true
-
-  /camelcase/2.1.1:
-    resolution: {integrity: sha512-DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-    optional: true
-
   /camelcase/3.0.0:
     resolution: {integrity: sha512-4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==}
     engines: {node: '>=0.10.0'}
@@ -8621,13 +7913,6 @@ packages:
       upper-case-first: 2.0.2
     dev: false
 
-  /capture-exit/2.0.0:
-    resolution: {integrity: sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-    dependencies:
-      rsvp: 4.8.5
-    dev: true
-
   /cardinal/2.1.1:
     resolution: {integrity: sha512-JSr5eOgoEymtYHBjNWyjrMqet9Am2miJhlfKNdqLp6zoeAh0KN5dRAcxlecj5mAJrmQomgiOBj35xHLrFjqBpw==}
     hasBin: true
@@ -8643,10 +7928,6 @@ packages:
   /caseless/0.12.0:
     resolution: {integrity: sha512-4tYFyifaFfGacoiObjJegolkwSU4xQNGbVgUiNYVUxbQ2x2lUsFvY4hVgVzGiIe6WLOPqycWXA40l+PWsxthUw==}
 
-  /ccount/1.1.0:
-    resolution: {integrity: sha512-vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg==}
-    dev: true
-
   /cfb/1.2.2:
     resolution: {integrity: sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==}
     engines: {node: '>=0.8'}
@@ -8714,24 +7995,12 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /character-entities-legacy/1.1.4:
-    resolution: {integrity: sha512-3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==}
-    dev: true
-
-  /character-entities/1.2.4:
-    resolution: {integrity: sha512-iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==}
-    dev: true
-
   /character-parser/2.2.0:
     resolution: {integrity: sha512-+UqJQjFEFaTAs3bNsF2j2kEN1baG/zghZbdqoYEDxGZtJo9LBzl1A+m0D4n3qKx8N2FNv8/Xp6yV9mQmBuptaw==}
     dependencies:
       is-regex: 1.1.4
     dev: true
 
-  /character-reference-invalid/1.1.4:
-    resolution: {integrity: sha512-mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==}
-    dev: true
-
   /chardet/0.7.0:
     resolution: {integrity: sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==}
     dev: false
@@ -8798,22 +8067,11 @@ packages:
     engines: {node: '>=6.0'}
     dev: true
 
-  /ci-info/2.0.0:
-    resolution: {integrity: sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==}
-    dev: true
-
   /ci-info/3.7.1:
     resolution: {integrity: sha512-4jYS4MOAaCIStSRwiuxc4B8MYhIe676yO1sYGzARnjXkWpmzZMMYxY6zu8WYWDhSuth5zhrQ1rhNSibyyvv4/w==}
     engines: {node: '>=8'}
     dev: true
 
-  /cipher-base/1.0.4:
-    resolution: {integrity: sha512-Kkht5ye6ZGmwv40uUDZztayT2ThLQGfnj/T71N/XzeZeo3nf8foyW7zGTsPYkEya3m5f3cAypH+qe7YOrM1U2Q==}
-    dependencies:
-      inherits: 2.0.4
-      safe-buffer: 5.2.1
-    dev: true
-
   /cjs-module-lexer/1.2.2:
     resolution: {integrity: sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==}
     dev: true
@@ -8840,9 +8098,9 @@ packages:
       validator: 13.7.0
     dev: false
 
-  /clean-css/4.2.4:
-    resolution: {integrity: sha512-EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==}
-    engines: {node: '>= 4.0'}
+  /clean-css/5.3.2:
+    resolution: {integrity: sha512-JVJbM+f3d3Q704rF4bqQ5UUyTtuJ0JRKNbTKVEeujCCBoMdkEi+V+e8oktO9qGQNSvHrFTM6JZRXrUvGR1czww==}
+    engines: {node: '>= 10.0'}
     dependencies:
       source-map: 0.6.1
     dev: true
@@ -9094,10 +8352,6 @@ packages:
     engines: {node: '>=0.8'}
     dev: false
 
-  /collapse-white-space/1.0.6:
-    resolution: {integrity: sha512-jEovNnrhMuqyCcjfEJA56v0Xq8SkIoPKDyaHahwo3POf4qcSXqMYuwNcOTzp74vTsR9Tn08z4MxWqAhcekogkQ==}
-    dev: true
-
   /collect-v8-coverage/1.0.1:
     resolution: {integrity: sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==}
     dev: true
@@ -9171,18 +8425,9 @@ packages:
     dependencies:
       delayed-stream: 1.0.0
 
-  /comma-separated-tokens/1.0.8:
-    resolution: {integrity: sha512-GHuDRO12Sypu2cV70d1dkA2EUmXHgntrzbpvOB+Qy+49ypNfGgFQIC2fhhXbnyrJRynDCAARsT7Ou0M6hirpfw==}
-    dev: true
-
   /commander/2.20.3:
     resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==}
 
-  /commander/4.1.1:
-    resolution: {integrity: sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==}
-    engines: {node: '>= 6'}
-    dev: true
-
   /commander/5.1.0:
     resolution: {integrity: sha512-P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==}
     engines: {node: '>= 6'}
@@ -9192,6 +8437,11 @@ packages:
     engines: {node: '>= 6'}
     dev: true
 
+  /commander/8.3.0:
+    resolution: {integrity: sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==}
+    engines: {node: '>= 12'}
+    dev: true
+
   /commander/9.4.1:
     resolution: {integrity: sha512-5EEkTNyHNGFPD2H+c/dXXfQZYa/scCKasxWcXJaWnNJ99pnQN9Vnmqow+p+PlFPE63Q6mThaZws1T+HxfpgtPw==}
     engines: {node: ^12.20.0 || >=14}
@@ -9317,10 +8567,6 @@ packages:
       date-now: 0.1.4
     dev: true
 
-  /console-browserify/1.2.0:
-    resolution: {integrity: sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA==}
-    dev: true
-
   /console-control-strings/1.1.0:
     resolution: {integrity: sha512-ty/fTekppD2fIwRvnZAVdeOiGd1c7YXEixbgJTNzqcxJWKQnjJ/V1bNEEE6hygpM3WjwHFUVK6HTjWSzV4a8sQ==}
 
@@ -9509,10 +8755,6 @@ packages:
       '@babel/types': 7.20.7
     dev: true
 
-  /constants-browserify/1.0.0:
-    resolution: {integrity: sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ==}
-    dev: true
-
   /content-disposition/0.5.4:
     resolution: {integrity: sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==}
     engines: {node: '>= 0.6'}
@@ -9568,17 +8810,6 @@ packages:
     resolution: {integrity: sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==}
     dev: true
 
-  /copy-concurrently/1.0.5:
-    resolution: {integrity: sha512-f2domd9fsVDFtaFcbaRZuYXwtdmnzqbADSwhSWYxYB/Q8zsdUUFMXVRwXGDMWmbEzAn1kdRrtI1T/KTFOL4X2A==}
-    dependencies:
-      aproba: 1.2.0
-      fs-write-stream-atomic: 1.0.10
-      iferr: 0.1.5
-      mkdirp: 0.5.6
-      rimraf: 2.7.1
-      run-queue: 1.0.3
-    dev: true
-
   /copy-descriptor/0.1.1:
     resolution: {integrity: sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==}
     engines: {node: '>=0.10.0'}
@@ -9610,12 +8841,8 @@ packages:
     deprecated: core-js@<3.23.3 is no longer maintained and not recommended for usage due to the number of issues. Because of the V8 engine whims, feature detection in old core-js versions could cause a slowdown up to 100x even if nothing is polyfilled. Some versions have web compatibility issues. Please, upgrade your dependencies to the actual version of core-js.
     dev: false
 
-  /core-js/3.25.5:
-    resolution: {integrity: sha512-nbm6eZSjm+ZuBQxCUPQKQCoUEfFOXjUZ8dTTyikyKaWrTYmAVbykQfwsKE5dBK88u3QCkCrzsx/PPlKfhsvgpw==}
-    dev: false
-
-  /core-js/3.27.1:
-    resolution: {integrity: sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==}
+  /core-js/3.27.2:
+    resolution: {integrity: sha512-9ashVQskuh5AZEZ1JdQWp1GqSoC1e1G87MzRqg2gIfVAQ7Qn9K+uFj8EcniUFA4P2NLZfV+TOlX1SzoKfo+s7w==}
 
   /core-util-is/1.0.2:
     resolution: {integrity: sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==}
@@ -9645,16 +8872,6 @@ packages:
       yaml: 1.10.2
     dev: true
 
-  /cp-file/7.0.0:
-    resolution: {integrity: sha512-0Cbj7gyvFVApzpK/uhCtQ/9kE9UnYpxMzaq5nQQC/Dh4iaj5fxp7iEFIullrYwzj8nf0qnsI1Qsx34hAeAebvw==}
-    engines: {node: '>=8'}
-    dependencies:
-      graceful-fs: 4.2.10
-      make-dir: 3.1.0
-      nested-error-stacks: 2.1.1
-      p-event: 4.2.0
-    dev: true
-
   /cpu-features/0.0.4:
     resolution: {integrity: sha512-fKiZ/zp1mUwQbnzb9IghXtHtDoTMtNeb8oYGx6kX2SYfhnG0HNdBEBIzB9b5KlXu5DQPhfy3mInbBxFcgwAr3A==}
     engines: {node: '>=10.0.0'}
@@ -9664,55 +8881,12 @@ packages:
     dev: false
     optional: true
 
-  /cpy/8.1.2:
-    resolution: {integrity: sha512-dmC4mUesv0OYH2kNFEidtf/skUwv4zePmGeepjyyJ0qTo5+8KhA1o99oIAwVVLzQMAeDJml74d6wPPKb6EZUTg==}
-    engines: {node: '>=8'}
-    dependencies:
-      arrify: 2.0.1
-      cp-file: 7.0.0
-      globby: 11.1.0
-      has-glob: 1.0.0
-      junk: 3.1.0
-      nested-error-stacks: 2.1.1
-      p-all: 2.1.0
-      p-filter: 2.1.0
-      p-map: 3.0.0
-    dev: true
-
   /crc-32/1.2.2:
     resolution: {integrity: sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==}
     engines: {node: '>=0.8'}
     hasBin: true
     dev: false
 
-  /create-ecdh/4.0.4:
-    resolution: {integrity: sha512-mf+TCx8wWc9VpuxfP2ht0iSISLZnt0JgWlrOKZiNqyUZWnjIaCIVNQArMHnCZKfEYRg6IM7A+NeJoN8gf/Ws0A==}
-    dependencies:
-      bn.js: 4.12.0
-      elliptic: 6.5.4
-    dev: true
-
-  /create-hash/1.2.0:
-    resolution: {integrity: sha512-z00bCGNHDG8mHAkP7CtT1qVu+bFQUPjYq/4Iv3C3kWjTFV10zIjfSoeqXo9Asws8gwSHDGj/hl2u4OGIjapeCg==}
-    dependencies:
-      cipher-base: 1.0.4
-      inherits: 2.0.4
-      md5.js: 1.3.5
-      ripemd160: 2.0.2
-      sha.js: 2.4.11
-    dev: true
-
-  /create-hmac/1.1.7:
-    resolution: {integrity: sha512-MJG9liiZ+ogc4TzUwuvbER1JRdgvUFSB5+VR/g5h82fGaIRWMWddtKBHi7/sVhfjQZ6SehlyhvQYrcYkaUIpLg==}
-    dependencies:
-      cipher-base: 1.0.4
-      create-hash: 1.2.0
-      inherits: 2.0.4
-      ripemd160: 2.0.2
-      safe-buffer: 5.2.1
-      sha.js: 2.4.11
-    dev: true
-
   /crelt/1.0.5:
     resolution: {integrity: sha512-+BO9wPPi+DWTDcNYhr/W90myha8ptzftZT+LwcmUbbok0rcP/fequmFYCw8NMoH7pkAZQzU78b3kYrlua5a9eA==}
     dev: false
@@ -9776,26 +8950,15 @@ packages:
     resolution: {integrity: sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==}
     dev: false
 
-  /crypto-browserify/3.12.0:
-    resolution: {integrity: sha512-fz4spIh+znjO2VjL+IdhEpRJ3YN6sMzITSBijk6FK2UvTqruSQW+/cCZTSNsMiZNvUeq0CqurF+dAbyiGOY6Wg==}
-    dependencies:
-      browserify-cipher: 1.0.1
-      browserify-sign: 4.2.1
-      create-ecdh: 4.0.4
-      create-hash: 1.2.0
-      create-hmac: 1.1.7
-      diffie-hellman: 5.0.3
-      inherits: 2.0.4
-      pbkdf2: 3.1.2
-      public-encrypt: 4.0.3
-      randombytes: 2.1.0
-      randomfill: 1.0.4
-    dev: true
-
   /crypto-js/4.1.1:
     resolution: {integrity: sha512-o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw==}
     dev: false
 
+  /crypto-random-string/2.0.0:
+    resolution: {integrity: sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==}
+    engines: {node: '>=8'}
+    dev: true
+
   /csrf/3.1.0:
     resolution: {integrity: sha512-uTqEnCvWRk042asU6JtapDTcJeeailFy4ydOQS28bj1hcLnYRiqi8SsD2jS412AY1I/4qdOwWZun774iqywf9w==}
     engines: {node: '>= 0.8'}
@@ -9805,7 +8968,7 @@ packages:
       uid-safe: 2.1.5
     dev: false
 
-  /css-loader/3.6.0_webpack@4.46.0:
+  /css-loader/3.6.0_webpack@5.75.0:
     resolution: {integrity: sha512-M5lSukoWi1If8dhQAUCvj4H8vUt3vOnwbQBH9DdTm/s4Ym2B/3dPMtYZeJmq7Q3S3Pa+I94DcZ7pc9bP14cWIQ==}
     engines: {node: '>= 8.9.0'}
     peerDependencies:
@@ -9824,10 +8987,10 @@ packages:
       postcss-value-parser: 4.2.0
       schema-utils: 2.7.1
       semver: 6.3.0
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
-  /css-loader/6.7.3_webpack@4.46.0:
+  /css-loader/6.7.3_webpack@5.75.0:
     resolution: {integrity: sha512-qhOH1KlBMnZP8FzRO6YCH9UHXQhVMcEGLyNdb7Hv2cpcmJbW0YrddO+tG1ab5nT41KpHIYGsbeHqxB9xPu1pKQ==}
     engines: {node: '>= 12.13.0'}
     peerDependencies:
@@ -9841,7 +9004,7 @@ packages:
       postcss-modules-values: 4.0.0_postcss@8.4.21
       postcss-value-parser: 4.2.0
       semver: 7.3.8
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /css-select/4.3.0:
@@ -9911,18 +9074,6 @@ packages:
       nub: 0.0.0
     dev: false
 
-  /currently-unhandled/0.4.1:
-    resolution: {integrity: sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      array-find-index: 1.0.2
-    dev: true
-    optional: true
-
-  /cyclist/1.0.1:
-    resolution: {integrity: sha512-NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A==}
-    dev: true
-
   /cypress-real-events/1.7.6_cypress@10.11.0:
     resolution: {integrity: sha512-yP6GnRrbm6HK5q4DH6Nnupz37nOfZu/xn1xFYqsE2o4G73giPWQOdu6375QYpwfU1cvHNCgyD2bQ2hPH9D7NMw==}
     peerDependencies:
@@ -10172,16 +9323,13 @@ packages:
     resolution: {integrity: sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==}
     engines: {node: '>=0.10.0'}
 
-  /default-browser-id/1.0.4:
-    resolution: {integrity: sha512-qPy925qewwul9Hifs+3sx1ZYn14obHxpkX+mPD369w4Rzg+YkJBgi3SOvwUq81nWSjqGUegIgEPwD8u+HUnxlw==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
+  /default-browser-id/3.0.0:
+    resolution: {integrity: sha512-OZ1y3y0SqSICtE8DE4S8YOE9UZOJ8wO16fKWVP5J1Qz42kV9jcnMVFrEE/noXb/ss3Q4pZIH79kxofzyNNtUNA==}
+    engines: {node: '>=12'}
     dependencies:
-      bplist-parser: 0.1.1
-      meow: 3.7.0
-      untildify: 2.1.0
+      bplist-parser: 0.2.0
+      untildify: 4.0.0
     dev: true
-    optional: true
 
   /default-compare/1.0.0:
     resolution: {integrity: sha512-QWfXlM0EkAbqOCbD/6HjdwT19j7WCkMyiRhWilc4H9/5h/RzTF9gv5LYh1+CmDV5d1rki6KAWLtQale0xt20eQ==}
@@ -10235,6 +9383,10 @@ packages:
       isobject: 3.0.1
     dev: true
 
+  /defu/6.1.2:
+    resolution: {integrity: sha512-+uO4+qr7msjNNWKYPHqN/3+Dx3NFkmIzayk2L1MyZQlvgZb/J1A0fo410dpKrN2SnqFjt8n4JL8fDJE0wIgjFQ==}
+    dev: true
+
   /degenerator/3.0.2:
     resolution: {integrity: sha512-c0mef3SNQo56t6urUU6tdQAs+ThoD0o9B9MJ8HEt7NQcGEILCRFqQb7ZbP9JAv+QF1Ky5plydhMR/IrqWDm+TQ==}
     engines: {node: '>= 6'}
@@ -10245,6 +9397,20 @@ packages:
       vm2: 3.9.11
     dev: false
 
+  /del/6.1.1:
+    resolution: {integrity: sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==}
+    engines: {node: '>=10'}
+    dependencies:
+      globby: 11.1.0
+      graceful-fs: 4.2.10
+      is-glob: 4.0.3
+      is-path-cwd: 2.2.0
+      is-path-inside: 3.0.3
+      p-map: 4.0.0
+      rimraf: 3.0.2
+      slash: 3.0.0
+    dev: true
+
   /delayed-stream/1.0.0:
     resolution: {integrity: sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==}
     engines: {node: '>=0.4.0'}
@@ -10272,23 +9438,15 @@ packages:
     resolution: {integrity: sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==}
     engines: {node: '>= 0.8'}
 
-  /des.js/1.0.1:
-    resolution: {integrity: sha512-Q0I4pfFrv2VPd34/vfLrFOoRmlYj3OV50i7fskps1jZWK1kApMWWT9G6RRUeYedLcBDIhnSDaUvJMb3AhUlaEA==}
-    dependencies:
-      inherits: 2.0.4
-      minimalistic-assert: 1.0.1
+  /dequal/2.0.3:
+    resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==}
+    engines: {node: '>=6'}
     dev: true
 
   /destroy/1.2.0:
     resolution: {integrity: sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==}
     engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
 
-  /detab/2.0.4:
-    resolution: {integrity: sha512-8zdsQA5bIkoRECvCrNKPla84lyoR7DSAyf7p0YgXzBO9PDJx8KntPUay7NS6yp+KdxdVtiE5SpHKtbp2ZQyA9g==}
-    dependencies:
-      repeat-string: 1.6.1
-    dev: true
-
   /detect-file/1.0.0:
     resolution: {integrity: sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==}
     engines: {node: '>=0.10.0'}
@@ -10343,14 +9501,6 @@ packages:
     engines: {node: '>=0.3.1'}
     dev: true
 
-  /diffie-hellman/5.0.3:
-    resolution: {integrity: sha512-kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==}
-    dependencies:
-      bn.js: 4.12.0
-      miller-rabin: 4.0.1
-      randombytes: 2.1.0
-    dev: true
-
   /difflib/0.2.4:
     resolution: {integrity: sha512-9YVwmMb0wQHQNr5J9m6BSj6fk4pfGITGQOOs+D9Fl+INODWFOfvhIU1hNv6GgR1RBoC/9NJcwu77zShxV0kT7w==}
     dependencies:
@@ -10433,17 +9583,11 @@ packages:
       domelementtype: 2.3.0
       domhandler: 5.0.3
       entities: 4.4.0
-    dev: true
 
   /dom-walk/0.1.2:
     resolution: {integrity: sha512-6QvTW9mrGeIegrFXdtQi9pk7O/nSK6lSdXW2eqUspN5LWD7UTji2Fqw5V2YLjBpHEoU9Xl/eUWNpDeZvoyOv2w==}
     dev: true
 
-  /domain-browser/1.2.0:
-    resolution: {integrity: sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==}
-    engines: {node: '>=0.4', npm: '>=1.2'}
-    dev: true
-
   /domelementtype/1.3.1:
     resolution: {integrity: sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==}
     dev: true
@@ -10475,7 +9619,6 @@ packages:
     engines: {node: '>= 4'}
     dependencies:
       domelementtype: 2.3.0
-    dev: true
 
   /domutils/1.5.1:
     resolution: {integrity: sha512-gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==}
@@ -10497,7 +9640,6 @@ packages:
       dom-serializer: 2.0.0
       domelementtype: 2.3.0
       domhandler: 5.0.3
-    dev: true
 
   /dot-case/3.0.4:
     resolution: {integrity: sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==}
@@ -10505,18 +9647,19 @@ packages:
       no-case: 3.0.4
       tslib: 2.5.0
 
-  /dotenv-expand/5.1.0:
-    resolution: {integrity: sha512-YXQl1DSa4/PQyRfgrv6aoNjhasp/p4qs9FjJ4q4cQk+8m4r6k4ZSiEyytKG8f8W9gi8WsQtIObNmKd+tMzNTmA==}
+  /dotenv-expand/10.0.0:
+    resolution: {integrity: sha512-GopVGCpVS1UKH75VKHGuQFqS1Gusej0z4FyQkPdwjil2gNIv+LNsqBlboOzpJFZKVT95GkCyWJbBSdFEFUWI2A==}
+    engines: {node: '>=12'}
     dev: true
 
   /dotenv/16.0.3:
     resolution: {integrity: sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==}
     engines: {node: '>=12'}
-    dev: false
 
   /dotenv/8.6.0:
     resolution: {integrity: sha512-IrPdXQsk2BbzvCBGBOTmmSH5SodmqZNt4ERAZDmW4CT+tL8VtvinqywuANaFu4bOMWki16nqf0e4oC0QIaDr/g==}
     engines: {node: '>=10'}
+    dev: false
 
   /dreamopt/0.6.0:
     resolution: {integrity: sha512-KRJa47iBEK0y6ZtgCgy2ykuvMT8c9gj3ua9Dv7vCkclFJJeH2FjhGY2xO5qBoWGahsjCGMlk4Cq9wJYeWxuYhQ==}
@@ -10587,7 +9730,6 @@ packages:
     hasBin: true
     dependencies:
       jake: 10.8.5
-    dev: false
 
   /electron-to-chromium/1.4.284:
     resolution: {integrity: sha512-M8WEXFuKXMYMVr45fo8mq0wUrrJHheiKZf6BArTKk9ZBYCKJEOU5H8cdWgDT+qCVZf7Na4lVUaZsA+h6uA9+PA==}
@@ -10608,18 +9750,6 @@ packages:
     dev: false
     patched: true
 
-  /elliptic/6.5.4:
-    resolution: {integrity: sha512-iLhC6ULemrljPZb+QutR5TQGB+pdW6KGD5RSegS+8sorOZT+rdQFbsQFJgvN3eRqNALqJer4oQ16YvJHlU8hzQ==}
-    dependencies:
-      bn.js: 4.12.0
-      brorand: 1.1.0
-      hash.js: 1.1.7
-      hmac-drbg: 1.0.1
-      inherits: 2.0.4
-      minimalistic-assert: 1.0.1
-      minimalistic-crypto-utils: 1.0.1
-    dev: true
-
   /emittery/0.13.1:
     resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
     engines: {node: '>=12'}
@@ -10666,15 +9796,6 @@ packages:
     dependencies:
       once: 1.4.0
 
-  /enhanced-resolve/4.5.0:
-    resolution: {integrity: sha512-Nv9m36S/vxpsI+Hc4/ZGRs0n9mXqSWGGq49zxb/cJfPAQMbUtttJAlNPS4AQzaBdw/pKskw5bMbekT/Y7W/Wlg==}
-    engines: {node: '>=6.9.0'}
-    dependencies:
-      graceful-fs: 4.2.10
-      memory-fs: 0.5.0
-      tapable: 1.1.3
-    dev: true
-
   /enhanced-resolve/5.10.0:
     resolution: {integrity: sha512-T0yTFjdpldGY8PmuXXR0PyQ1ufZpEGiHVrp7zHKB7jdR4qlmZHhONVM5AQOAWXuF/w3dnHbEQVrNptJgt7F+cQ==}
     engines: {node: '>=10.13.0'}
@@ -10705,7 +9826,6 @@ packages:
   /entities/4.4.0:
     resolution: {integrity: sha512-oYp7156SP8LkeGD0GF85ad1X9Ai79WtRsZ2gxJqtBuzH+98YUV6jkHEKlZkMbcrjJjIVJNIDP/3WL9wQkoPbWA==}
     engines: {node: '>=0.12'}
-    dev: true
 
   /env-paths/2.2.1:
     resolution: {integrity: sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==}
@@ -10713,17 +9833,16 @@ packages:
     dev: false
     optional: true
 
+  /envinfo/7.8.1:
+    resolution: {integrity: sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==}
+    engines: {node: '>=4'}
+    hasBin: true
+    dev: true
+
   /err-code/2.0.3:
     resolution: {integrity: sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==}
     dev: false
 
-  /errno/0.1.8:
-    resolution: {integrity: sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==}
-    hasBin: true
-    dependencies:
-      prr: 1.0.1
-    dev: true
-
   /error-ex/1.3.2:
     resolution: {integrity: sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==}
     dependencies:
@@ -10812,6 +9931,7 @@ packages:
 
   /es-array-method-boxes-properly/1.0.0:
     resolution: {integrity: sha512-wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==}
+    dev: false
 
   /es-get-iterator/1.1.3:
     resolution: {integrity: sha512-sPZmqHBe6JIiTfN5q2pEi//TwxmAFHwj/XEuYjTuse78i8KxaqMTTzxPoFKuzRpDpTJ+0NAbpfenkmH2rePtuw==}
@@ -10827,6 +9947,10 @@ packages:
       stop-iteration-iterator: 1.0.0
     dev: true
 
+  /es-module-lexer/0.9.3:
+    resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
+    dev: true
+
   /es-set-tostringtag/2.0.1:
     resolution: {integrity: sha512-g3OMbtlwY3QewlqAiMLI47KywjWZoEytKr8pf6iTC8uJq5bIAH52Z9pnQ8pVL6whrCto53JZDuUIsifGeLorTg==}
     engines: {node: '>= 0.4'}
@@ -10863,11 +9987,6 @@ packages:
     engines: {node: '>=0.4'}
     dev: false
 
-  /es5-shim/4.6.7:
-    resolution: {integrity: sha512-jg21/dmlrNQI7JyyA2w7n+yifSxBng0ZralnSfVZjoCawgNTCnS+yBCyVM9DL5itm7SUnDGgv7hcq2XCZX4iRQ==}
-    engines: {node: '>=0.4.0'}
-    dev: true
-
   /es6-iterator/2.0.3:
     resolution: {integrity: sha512-zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==}
     dependencies:
@@ -10880,10 +9999,6 @@ packages:
     resolution: {integrity: sha512-MEl9uirslVwqQU369iHNWZXsI8yaZYGg/D65aOgZkeyFJwHYSxilf7rQzXKI7DdDuBPrBXbfk3sl9hJhmd5AUw==}
     dev: true
 
-  /es6-shim/0.35.7:
-    resolution: {integrity: sha512-baZkUfTDSx7X69+NA8imbvGrsPfqH0MX7ADdIDjqwsI8lkTgLIiD2QWrUCSGsUQ0YMnSCA/4pNgSyXdnLHWf3A==}
-    dev: true
-
   /es6-symbol/3.1.3:
     resolution: {integrity: sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==}
     dependencies:
@@ -10900,6 +10015,21 @@ packages:
       es6-symbol: 3.1.3
     dev: true
 
+  /esbuild-plugin-alias/0.2.1:
+    resolution: {integrity: sha512-jyfL/pwPqaFXyKnj8lP8iLk6Z0m099uXR45aSN8Av1XD4vhvQutxxPzgA2bTcAwQpa1zCXDcWOlhFgyP3GKqhQ==}
+    dev: true
+
+  /esbuild-register/3.4.2_esbuild@0.16.17:
+    resolution: {integrity: sha512-kG/XyTDyz6+YDuyfB9ZoSIOOmgyFCH+xPRtsCa8W85HLRV5Csp+o3jWVbOSHgSLfyLc5DmP+KFDNwty4mEjC+Q==}
+    peerDependencies:
+      esbuild: '>=0.12 <1'
+    dependencies:
+      debug: 4.3.4
+      esbuild: 0.16.17
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /esbuild/0.16.17:
     resolution: {integrity: sha512-G8LEkV0XzDMNwXKgM0Jwu3nY3lSTwSGY6XbxM9cr9+s0T/qSV1q1JVPBGzm3dcjhCic9+emZDmMffkwgPeOeLg==}
     engines: {node: '>=12'}
@@ -11170,14 +10300,6 @@ packages:
       - supports-color
     dev: true
 
-  /eslint-scope/4.0.3:
-    resolution: {integrity: sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==}
-    engines: {node: '>=4.0.0'}
-    dependencies:
-      esrecurse: 4.3.0
-      estraverse: 4.3.0
-    dev: true
-
   /eslint-scope/5.1.1:
     resolution: {integrity: sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==}
     engines: {node: '>=8.0.0'}
@@ -11369,21 +10491,10 @@ packages:
     resolution: {integrity: sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==}
     engines: {node: '>=0.8.x'}
 
-  /eventsource/2.0.2:
-    resolution: {integrity: sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==}
-    engines: {node: '>=12.0.0'}
-    dev: false
-
-  /evp_bytestokey/1.0.3:
-    resolution: {integrity: sha512-/f2Go4TognH/KvCISP7OUsHn85hT9nUkxxA9BEWxFn+Oj9o8ZNLm/40hdlgSLyuOimsrTKLUMEorQexp/aPQeA==}
-    dependencies:
-      md5.js: 1.3.5
-      safe-buffer: 5.2.1
-    dev: true
-
-  /exec-sh/0.3.6:
-    resolution: {integrity: sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==}
-    dev: true
+  /eventsource/2.0.2:
+    resolution: {integrity: sha512-IzUmBGPR3+oUG9dUeXynyNmf91/3zUSJg1lCktzKw47OXuhco54U3r9B7O4XX+Rb1Itm9OZ2b0RkTs10bICOxA==}
+    engines: {node: '>=12.0.0'}
+    dev: false
 
   /execa/0.10.0:
     resolution: {integrity: sha512-7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw==}
@@ -11398,19 +10509,6 @@ packages:
       strip-eof: 1.0.0
     dev: true
 
-  /execa/1.0.0:
-    resolution: {integrity: sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==}
-    engines: {node: '>=6'}
-    dependencies:
-      cross-spawn: 6.0.5
-      get-stream: 4.1.0
-      is-stream: 1.1.0
-      npm-run-path: 2.0.2
-      p-finally: 1.0.0
-      signal-exit: 3.0.7
-      strip-eof: 1.0.0
-    dev: true
-
   /execa/4.1.0:
     resolution: {integrity: sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==}
     engines: {node: '>=10'}
@@ -11479,6 +10577,10 @@ packages:
     dependencies:
       homedir-polyfill: 1.0.3
 
+  /expect-type/0.14.2:
+    resolution: {integrity: sha512-ed3+tr5ujbIYXZ8Pl/VgIphwJQ0q5tBLGGdn7Zvwt1WyPBRX83xjT5pT77P/GkuQbctx0K2ZNSSan7eruJqTCQ==}
+    dev: true
+
   /expect/29.3.1:
     resolution: {integrity: sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -11628,6 +10730,18 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /extract-zip/1.7.0:
+    resolution: {integrity: sha512-xoh5G1W/PB0/27lXgMQyIhP5DSY/LhoCsOyZgb+6iMmRtCwVBo55uKaMoEYrDCKQhWvqEip5ZPKAc6eFNyf/MA==}
+    hasBin: true
+    dependencies:
+      concat-stream: 1.6.2
+      debug: 2.6.9
+      mkdirp: 0.5.6
+      yauzl: 2.10.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /extract-zip/2.0.1_supports-color@8.1.1:
     resolution: {integrity: sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==}
     engines: {node: '>= 10.17.0'}
@@ -11716,10 +10830,6 @@ packages:
     resolution: {integrity: sha512-5u2V/CDW15QM1XbbgS+0DfPxVB+jUKhWEKuuFuHncbk3tEEqzmoXL+2KyOFuKGqOnmdIy0/davWF1CkuwtibCw==}
     dev: false
 
-  /figgy-pudding/3.5.2:
-    resolution: {integrity: sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==}
-    dev: true
-
   /figures/3.2.0:
     resolution: {integrity: sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==}
     engines: {node: '>=8'}
@@ -11733,25 +10843,14 @@ packages:
       flat-cache: 3.0.4
     dev: true
 
-  /file-loader/6.2.0_webpack@4.46.0:
-    resolution: {integrity: sha512-qo3glqyTa61Ytg4u73GultjHGjdRyig3tG6lPtyX/jOEJvHif9uB0/OCI2Kif6ctF3caQTW2G5gym21oAsI4pw==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
-    dependencies:
-      loader-utils: 2.0.4
-      schema-utils: 3.1.1
-      webpack: 4.46.0
-    dev: true
-
   /file-saver/2.0.5:
     resolution: {integrity: sha512-P9bmyZ3h/PRG+Nzga+rbdI4OEpNDzAVyy74uVO9ATgzLK6VtAsYybF/+TOCvrc0MO793d6+42lLyZTw7/ArVzA==}
     dev: false
 
-  /file-system-cache/1.1.0:
-    resolution: {integrity: sha512-IzF5MBq+5CR0jXx5RxPe4BICl/oEhBSXKaL9fLhAXrIfIUS77Hr4vzrYyqYMHN6uTt+BOqi3fDCTjjEBCjERKw==}
+  /file-system-cache/2.0.2:
+    resolution: {integrity: sha512-lp4BHO4CWqvRyx88Tt3quZic9ZMf4cJyquYq7UI8sH42Bm2ArlBBjKQAalZOo+UfaBassb7X123Lik5qZ/tSAA==}
     dependencies:
-      fs-extra: 10.1.0
+      fs-extra: 11.1.0
       ramda: 0.28.0
     dev: true
 
@@ -11773,7 +10872,6 @@ packages:
     resolution: {integrity: sha512-w1cEuf3S+DrLCQL7ET6kz+gmlJdbq9J7yXCSjK/OZCPA+qEN1WyF4ZAf0YYJa4/shHJra2t/d/r8SV4Ji+x+8Q==}
     dependencies:
       minimatch: 5.1.5
-    dev: false
 
   /fill-range/4.0.0:
     resolution: {integrity: sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==}
@@ -11997,7 +11095,7 @@ packages:
   /forever-agent/0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
 
-  /fork-ts-checker-webpack-plugin/6.5.2_ujcznmgb2owsphq4mksjmidcsi:
+  /fork-ts-checker-webpack-plugin/6.5.2_oidmngyddw6azfqg3taanyywde:
     resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==}
     engines: {node: '>=10', yarn: '>=1.0.0'}
     peerDependencies:
@@ -12026,7 +11124,7 @@ packages:
       tapable: 1.1.3
       typescript: 4.9.4
       vue-template-compiler: 2.7.14
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /form-data/2.3.3:
@@ -12093,6 +11191,10 @@ packages:
     engines: {node: '>=0.8'}
     dev: false
 
+  /fraction.js/4.2.0:
+    resolution: {integrity: sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA==}
+    dev: true
+
   /fragment-cache/0.2.1:
     resolution: {integrity: sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==}
     engines: {node: '>=0.10.0'}
@@ -12108,20 +11210,13 @@ packages:
     resolution: {integrity: sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==}
     dev: true
 
-  /from2/2.3.0:
-    resolution: {integrity: sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==}
-    dependencies:
-      inherits: 2.0.4
-      readable-stream: 2.3.7
-    dev: true
-
   /fs-constants/1.0.0:
     resolution: {integrity: sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==}
     dev: true
 
-  /fs-extra/10.1.0:
-    resolution: {integrity: sha512-oRXApq54ETRj4eMiFzGnHWGy+zo5raudjuxN0b8H7s/RU2oW0Wvsx9O0ACRN/kRq9E8Vu/ReskGB5o3ji+FzHQ==}
-    engines: {node: '>=12'}
+  /fs-extra/11.1.0:
+    resolution: {integrity: sha512-0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==}
+    engines: {node: '>=14.14'}
     dependencies:
       graceful-fs: 4.2.10
       jsonfile: 6.1.0
@@ -12171,15 +11266,6 @@ packages:
     resolution: {integrity: sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==}
     dev: true
 
-  /fs-write-stream-atomic/1.0.10:
-    resolution: {integrity: sha512-gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA==}
-    dependencies:
-      graceful-fs: 4.2.10
-      iferr: 0.1.5
-      imurmurhash: 0.1.4
-      readable-stream: 2.3.7
-    dev: true
-
   /fs.realpath/1.0.0:
     resolution: {integrity: sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==}
 
@@ -12282,26 +11368,12 @@ packages:
   /get-port/5.1.1:
     resolution: {integrity: sha512-g/Q1aTSDOxFpchXC4i8ZWvxA1lnPqx/JHqcpIw0/LX9T8x/GBbi6YnlN5nhaKIFkT8oFsscUKgDJYxfwfS6QsQ==}
     engines: {node: '>=8'}
-    dev: false
-
-  /get-stdin/4.0.1:
-    resolution: {integrity: sha512-F5aQMywwJ2n85s4hJPTT9RPxGmubonuB10MNYo17/xph174n2MIR33HRguhzVag10O/npM7SPk73LMZNP+FaWw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-    optional: true
 
   /get-stream/3.0.0:
     resolution: {integrity: sha512-GlhdIUuVakc8SJ6kK0zAFbiGzRFzNnY4jUuEbV9UROo4Y+0Ny4fjvcZFVTeDA4odpFyOQzaw6hXukJSq/f28sQ==}
     engines: {node: '>=4'}
     dev: true
 
-  /get-stream/4.1.0:
-    resolution: {integrity: sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==}
-    engines: {node: '>=6'}
-    dependencies:
-      pump: 3.0.0
-    dev: true
-
   /get-stream/5.2.0:
     resolution: {integrity: sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==}
     engines: {node: '>=8'}
@@ -12360,6 +11432,21 @@ packages:
     dependencies:
       assert-plus: 1.0.0
 
+  /giget/1.0.0:
+    resolution: {integrity: sha512-KWELZn3Nxq5+0So485poHrFriK9Bn3V/x9y+wgqrHkbmnGbjfLmZ685/SVA/ovW+ewoqW0gVI47pI4yW/VNobQ==}
+    hasBin: true
+    dependencies:
+      colorette: 2.0.19
+      defu: 6.1.2
+      https-proxy-agent: 5.0.1
+      mri: 1.2.0
+      node-fetch-native: 1.0.1
+      pathe: 1.1.0
+      tar: 6.1.13
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /github-slugger/1.4.0:
     resolution: {integrity: sha512-w0dzqw/nt51xMVmlaV1+JRzN+oCa1KfcgGEWhxUG16wbdA+Xnt/yoFO8Z8x/V82ZcZ0wy6ln9QDup5avbhiDhQ==}
     dev: true
@@ -12387,14 +11474,14 @@ packages:
       is-glob: 4.0.3
     dev: true
 
-  /glob-promise/3.4.0_glob@7.2.3:
-    resolution: {integrity: sha512-q08RJ6O+eJn+dVanerAndJwIcumgbDdYiUT7zFQl3Wm1xD6fBKtah7H8ZJChj4wP+8C+QfeVy8xautR7rdmKEw==}
-    engines: {node: '>=4'}
+  /glob-promise/6.0.2_glob@8.1.0:
+    resolution: {integrity: sha512-Ni2aDyD1ekD6x8/+K4hDriRDbzzfuK4yKpqSymJ4P7IxbtARiOOuU+k40kbHM0sLIlbf1Qh0qdMkAHMZYE6XJQ==}
+    engines: {node: '>=16'}
     peerDependencies:
-      glob: '*'
+      glob: ^8.0.3
     dependencies:
       '@types/glob': 8.0.0
-      glob: 7.2.3
+      glob: 8.1.0
     dev: true
 
   /glob-stream/6.1.0:
@@ -12657,13 +11744,6 @@ packages:
     resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==}
     engines: {node: '>=8'}
 
-  /has-glob/1.0.0:
-    resolution: {integrity: sha512-D+8A457fBShSEI3tFCj65PAbT++5sKiFtdCdOam0gnfBgw9D277OERk+HM9qYJXmdVLZ/znez10SqHN0BBQ50g==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-glob: 3.1.0
-    dev: true
-
   /has-property-descriptors/1.0.0:
     resolution: {integrity: sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==}
     dependencies:
@@ -12723,88 +11803,10 @@ packages:
     dependencies:
       function-bind: 1.1.1
 
-  /hash-base/3.1.0:
-    resolution: {integrity: sha512-1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==}
-    engines: {node: '>=4'}
-    dependencies:
-      inherits: 2.0.4
-      readable-stream: 3.6.0
-      safe-buffer: 5.2.1
-    dev: true
-
   /hash-sum/1.0.2:
     resolution: {integrity: sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==}
     dev: true
 
-  /hash.js/1.1.7:
-    resolution: {integrity: sha512-taOaskGt4z4SOANNseOviYDvjEJinIkRgmp7LbKP2YTTmVxWBl87s/uzK9r+44BclBSp2X7K1hqeNfz9JbBeXA==}
-    dependencies:
-      inherits: 2.0.4
-      minimalistic-assert: 1.0.1
-    dev: true
-
-  /hast-to-hyperscript/9.0.1:
-    resolution: {integrity: sha512-zQgLKqF+O2F72S1aa4y2ivxzSlko3MAvxkwG8ehGmNiqd98BIN3JM1rAJPmplEyLmGLO2QZYJtIneOSZ2YbJuA==}
-    dependencies:
-      '@types/unist': 2.0.6
-      comma-separated-tokens: 1.0.8
-      property-information: 5.6.0
-      space-separated-tokens: 1.1.5
-      style-to-object: 0.3.0
-      unist-util-is: 4.1.0
-      web-namespaces: 1.1.4
-    dev: true
-
-  /hast-util-from-parse5/6.0.1:
-    resolution: {integrity: sha512-jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA==}
-    dependencies:
-      '@types/parse5': 5.0.3
-      hastscript: 6.0.0
-      property-information: 5.6.0
-      vfile: 4.2.1
-      vfile-location: 3.2.0
-      web-namespaces: 1.1.4
-    dev: true
-
-  /hast-util-parse-selector/2.2.5:
-    resolution: {integrity: sha512-7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ==}
-    dev: true
-
-  /hast-util-raw/6.0.1:
-    resolution: {integrity: sha512-ZMuiYA+UF7BXBtsTBNcLBF5HzXzkyE6MLzJnL605LKE8GJylNjGc4jjxazAHUtcwT5/CEt6afRKViYB4X66dig==}
-    dependencies:
-      '@types/hast': 2.3.4
-      hast-util-from-parse5: 6.0.1
-      hast-util-to-parse5: 6.0.0
-      html-void-elements: 1.0.5
-      parse5: 6.0.1
-      unist-util-position: 3.1.0
-      vfile: 4.2.1
-      web-namespaces: 1.1.4
-      xtend: 4.0.2
-      zwitch: 1.0.5
-    dev: true
-
-  /hast-util-to-parse5/6.0.0:
-    resolution: {integrity: sha512-Lu5m6Lgm/fWuz8eWnrKezHtVY83JeRGaNQ2kn9aJgqaxvVkFCZQBEhgodZUDUvoodgyROHDb3r5IxAEdl6suJQ==}
-    dependencies:
-      hast-to-hyperscript: 9.0.1
-      property-information: 5.6.0
-      web-namespaces: 1.1.4
-      xtend: 4.0.2
-      zwitch: 1.0.5
-    dev: true
-
-  /hastscript/6.0.0:
-    resolution: {integrity: sha512-nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w==}
-    dependencies:
-      '@types/hast': 2.3.4
-      comma-separated-tokens: 1.0.8
-      hast-util-parse-selector: 2.2.5
-      property-information: 5.6.0
-      space-separated-tokens: 1.1.5
-    dev: true
-
   /he/1.2.0:
     resolution: {integrity: sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==}
     hasBin: true
@@ -12838,14 +11840,6 @@ packages:
     resolution: {integrity: sha512-tzcUFauisWKNHaRkN4Wjl/ZA07gENAjFl3J/c480dprkGTg5EQstgaNFqBfUqCq54kZRIEcreTsAgF/m2quD7A==}
     dev: false
 
-  /hmac-drbg/1.0.1:
-    resolution: {integrity: sha512-Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg==}
-    dependencies:
-      hash.js: 1.1.7
-      minimalistic-assert: 1.0.1
-      minimalistic-crypto-utils: 1.0.1
-    dev: true
-
   /homedir-polyfill/1.0.3:
     resolution: {integrity: sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==}
     engines: {node: '>=0.10.0'}
@@ -12878,18 +11872,18 @@ packages:
     resolution: {integrity: sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==}
     dev: true
 
-  /html-minifier-terser/5.1.1:
-    resolution: {integrity: sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg==}
-    engines: {node: '>=6'}
+  /html-minifier-terser/6.1.0:
+    resolution: {integrity: sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==}
+    engines: {node: '>=12'}
     hasBin: true
     dependencies:
       camel-case: 4.1.2
-      clean-css: 4.2.4
-      commander: 4.1.1
+      clean-css: 5.3.2
+      commander: 8.3.0
       he: 1.2.0
       param-case: 3.0.4
       relateurl: 0.2.7
-      terser: 4.8.1
+      terser: 5.16.1
     dev: true
 
   /html-to-text/8.2.0:
@@ -12905,26 +11899,18 @@ packages:
       selderee: 0.6.0
     dev: false
 
-  /html-void-elements/1.0.5:
-    resolution: {integrity: sha512-uE/TxKuyNIcx44cIWnjr/rfIATDH7ZaOMmstu0CwhFG1Dunhlp4OC6/NMbhiwoq5BpW0ubi303qnEk/PZj614w==}
-    dev: true
-
-  /html-webpack-plugin/4.5.2_webpack@4.46.0:
-    resolution: {integrity: sha512-q5oYdzjKUIPQVjOosjgvCHQOv9Ett9CYYHlgvJeXG0qQvdSojnBq4vAdQBwn1+yGveAwHCoe/rMR86ozX3+c2A==}
-    engines: {node: '>=6.9'}
+  /html-webpack-plugin/5.5.0_webpack@5.75.0:
+    resolution: {integrity: sha512-sy88PC2cRTVxvETRgUHFrL4No3UxvcH8G1NepGhqaTT+GXN2kTamqasot0inS5hXeg1cMbFDt27zzo9p35lZVw==}
+    engines: {node: '>=10.13.0'}
     peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
+      webpack: ^5.20.0
     dependencies:
-      '@types/html-minifier-terser': 5.1.2
-      '@types/tapable': 1.0.8
-      '@types/webpack': 4.41.33
-      html-minifier-terser: 5.1.1
-      loader-utils: 1.4.2
+      '@types/html-minifier-terser': 6.1.0
+      html-minifier-terser: 6.1.0
       lodash: 4.17.21
-      pretty-error: 2.1.2
-      tapable: 1.1.3
-      util.promisify: 1.0.0
-      webpack: 4.46.0
+      pretty-error: 4.0.0
+      tapable: 2.2.1
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /htmlparser2/3.8.3:
@@ -12952,7 +11938,6 @@ packages:
       domhandler: 5.0.3
       domutils: 3.0.1
       entities: 4.4.0
-    dev: true
 
   /http-cache-semantics/4.1.0:
     resolution: {integrity: sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==}
@@ -13022,8 +12007,14 @@ packages:
       sshpk: 1.17.0
     dev: true
 
-  /https-browserify/1.0.0:
-    resolution: {integrity: sha512-J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg==}
+  /https-proxy-agent/4.0.0:
+    resolution: {integrity: sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==}
+    engines: {node: '>= 6.0.0'}
+    dependencies:
+      agent-base: 5.1.1
+      debug: 4.3.4
+    transitivePeerDependencies:
+      - supports-color
     dev: true
 
   /https-proxy-agent/5.0.1:
@@ -13101,10 +12092,6 @@ packages:
   /ieee754/1.2.1:
     resolution: {integrity: sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==}
 
-  /iferr/0.1.5:
-    resolution: {integrity: sha512-DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA==}
-    dev: true
-
   /ignore-by-default/1.0.1:
     resolution: {integrity: sha512-Ius2VYcGNk7T90CppJqcIkS5ooHUZyIQK+ClZfMfMNFEF9VSE73Fq+906u/CWu92x4gzZMWOwfFYckPObzdEbA==}
     dev: true
@@ -13175,20 +12162,14 @@ packages:
     engines: {node: '>=6.0.0'}
     dev: true
 
-  /indent-string/2.1.0:
-    resolution: {integrity: sha512-aqwDFWSgSgfRaEwao5lg5KEcVd/2a+D1rvoG7NdilmYz0NwRk6StWpWdz/Hpk34MKPpx7s8XxUqimfcQK6gGlg==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      repeating: 2.0.1
-    dev: true
-    optional: true
-
   /indent-string/4.0.0:
     resolution: {integrity: sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==}
     engines: {node: '>=8'}
 
   /infer-owner/1.0.4:
     resolution: {integrity: sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==}
+    dev: false
+    optional: true
 
   /inflight/1.0.6:
     resolution: {integrity: sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==}
@@ -13196,14 +12177,6 @@ packages:
       once: 1.4.0
       wrappy: 1.0.2
 
-  /inherits/2.0.1:
-    resolution: {integrity: sha512-8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA==}
-    dev: true
-
-  /inherits/2.0.3:
-    resolution: {integrity: sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==}
-    dev: true
-
   /inherits/2.0.4:
     resolution: {integrity: sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==}
 
@@ -13216,10 +12189,6 @@ packages:
     engines: {node: '>=10'}
     dev: true
 
-  /inline-style-parser/0.1.1:
-    resolution: {integrity: sha512-7NXolsK4CAS5+xvdj5OMMbI962hU/wvwoxk+LWR9Ek9bVtyuuYScDN6eS0rUm6TxApFpw7CX1o4uJzcd4AyD3Q==}
-    dev: true
-
   /inquirer/7.3.3:
     resolution: {integrity: sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==}
     engines: {node: '>=8.0.0'}
@@ -13259,11 +12228,6 @@ packages:
     resolution: {integrity: sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==}
     engines: {node: '>= 0.10'}
 
-  /interpret/2.2.0:
-    resolution: {integrity: sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==}
-    engines: {node: '>= 0.10'}
-    dev: true
-
   /invert-kv/1.0.0:
     resolution: {integrity: sha512-xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==}
     engines: {node: '>=0.10.0'}
@@ -13347,17 +12311,6 @@ packages:
       kind-of: 6.0.3
     dev: true
 
-  /is-alphabetical/1.0.4:
-    resolution: {integrity: sha512-DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==}
-    dev: true
-
-  /is-alphanumerical/1.0.4:
-    resolution: {integrity: sha512-UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==}
-    dependencies:
-      is-alphabetical: 1.0.4
-      is-decimal: 1.0.4
-    dev: true
-
   /is-arguments/1.1.1:
     resolution: {integrity: sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==}
     engines: {node: '>= 0.4'}
@@ -13401,22 +12354,10 @@ packages:
   /is-buffer/1.1.6:
     resolution: {integrity: sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==}
 
-  /is-buffer/2.0.5:
-    resolution: {integrity: sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==}
-    engines: {node: '>=4'}
-    dev: true
-
   /is-callable/1.2.7:
     resolution: {integrity: sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==}
     engines: {node: '>= 0.4'}
 
-  /is-ci/2.0.0:
-    resolution: {integrity: sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==}
-    hasBin: true
-    dependencies:
-      ci-info: 2.0.0
-    dev: true
-
   /is-ci/3.0.1:
     resolution: {integrity: sha512-ZYvCgrefwqoQ6yTyYUbQu64HsITZ3NfKX1lzaEYdkTDcfKzzCI/wthRRYKkdjHKFVgNiXKAKm65Zo1pk2as/QQ==}
     hasBin: true
@@ -13449,10 +12390,6 @@ packages:
     dependencies:
       has-tostringtag: 1.0.0
 
-  /is-decimal/1.0.4:
-    resolution: {integrity: sha512-RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==}
-    dev: true
-
   /is-descriptor/0.1.6:
     resolution: {integrity: sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==}
     engines: {node: '>=0.10.0'}
@@ -13476,13 +12413,6 @@ packages:
     engines: {node: '>=8'}
     hasBin: true
 
-  /is-dom/1.1.0:
-    resolution: {integrity: sha512-u82f6mvhYxRPKpw8V1N0W8ce1xXwOrQtgGcxl6UCL5zBmZu3is/18K0rR7uFCnMDuAsS/3W54mGL4vsaFUQlEQ==}
-    dependencies:
-      is-object: 1.0.2
-      is-window: 1.0.2
-    dev: true
-
   /is-expression/4.0.0:
     resolution: {integrity: sha512-zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A==}
     dependencies:
@@ -13505,12 +12435,6 @@ packages:
     resolution: {integrity: sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==}
     engines: {node: '>=0.10.0'}
 
-  /is-finite/1.1.0:
-    resolution: {integrity: sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-    optional: true
-
   /is-fullwidth-code-point/1.0.0:
     resolution: {integrity: sha512-1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw==}
     engines: {node: '>=0.10.0'}
@@ -13559,10 +12483,6 @@ packages:
     dependencies:
       is-extglob: 2.1.1
 
-  /is-hexadecimal/1.0.4:
-    resolution: {integrity: sha512-gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==}
-    dev: true
-
   /is-installed-globally/0.4.0:
     resolution: {integrity: sha512-iwGqO3J21aaSkC7jWnHP/difazwS7SFeIqxv6wEtLU8Y5KlzFTjyqcSIT0d8s4+dDhKytsk9PJZ2BkS5eZwQRQ==}
     engines: {node: '>=10'}
@@ -13617,8 +12537,9 @@ packages:
     resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==}
     engines: {node: '>=0.12.0'}
 
-  /is-object/1.0.2:
-    resolution: {integrity: sha512-2rRIahhZr2UWb45fIOuvZGpFtz0TyOZLf32KxBbSoUCeZR495zCKlWUKKUByk3geS2eAs7ZAABt0Y/Rx0GiQGA==}
+  /is-path-cwd/2.2.0:
+    resolution: {integrity: sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==}
+    engines: {node: '>=6'}
     dev: true
 
   /is-path-inside/3.0.3:
@@ -13771,32 +12692,15 @@ packages:
       get-intrinsic: 1.1.3
     dev: true
 
-  /is-whitespace-character/1.0.4:
-    resolution: {integrity: sha512-SDweEzfIZM0SJV0EUga669UTKlmL0Pq8Lno0QDQsPnvECB3IM2aP0gdx5TrU0A01MAPfViaZiI2V1QMZLaKK5w==}
-    dev: true
-
   /is-whitespace/0.3.0:
     resolution: {integrity: sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==}
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /is-window/1.0.2:
-    resolution: {integrity: sha512-uj00kdXyZb9t9RcAUAwMZAnkBUwdYGhYlt7djMXhfyhUCzwNba50tIiBKR7q0l7tdoBtFVw/3JmLY6fI3rmZmg==}
-    dev: true
-
   /is-windows/1.0.2:
     resolution: {integrity: sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==}
     engines: {node: '>=0.10.0'}
 
-  /is-word-character/1.0.4:
-    resolution: {integrity: sha512-5SMO8RVennx3nZrqtKwCGyyetPE9VDba5ugvKLaD4KopPG5kR4mQ7tNt/r7feL5yt5h3lpuBbIUmCOG2eSzXHA==}
-    dev: true
-
-  /is-wsl/1.1.0:
-    resolution: {integrity: sha512-gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw==}
-    engines: {node: '>=4'}
-    dev: true
-
   /is-wsl/2.2.0:
     resolution: {integrity: sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==}
     engines: {node: '>=8'}
@@ -13901,17 +12805,6 @@ packages:
       istanbul-lib-report: 3.0.0
     dev: true
 
-  /iterate-iterator/1.0.2:
-    resolution: {integrity: sha512-t91HubM4ZDQ70M9wqp+pcNpu8OyJ9UAtXntT/Bcsvp5tZMnz9vRa+IunKXeI8AnfZMTv0jNuVEmGeLSMjVvfPw==}
-    dev: true
-
-  /iterate-value/1.0.2:
-    resolution: {integrity: sha512-A6fMAio4D2ot2r/TYzr4yUWrmwNdsN5xL7+HUiyACE4DXm+q8HtPcnFTp+NnW3k4N05tZ7FVYFFb2CR13NxyHQ==}
-    dependencies:
-      es-get-iterator: 1.1.3
-      iterate-iterator: 1.0.2
-    dev: true
-
   /jake/10.8.5:
     resolution: {integrity: sha512-sVpxYeuAhWt0OTWITwT98oyV0GsXyMlXCF+3L1SuafBVUIr/uILGRB+NqwkzhgXKvoJpDIpQvqkUALgdmQsQxw==}
     engines: {node: '>=10'}
@@ -13921,7 +12814,6 @@ packages:
       chalk: 4.1.2
       filelist: 1.0.4
       minimatch: 3.1.2
-    dev: false
 
   /jest-changed-files/29.4.2:
     resolution: {integrity: sha512-Qdd+AXdqD16PQa+VsWJpxR3kN0JyOCX1iugQfx5nUgAsI4gwsKviXkpclxOK9ZnwaY2IQVHz+771eAvqeOlfuw==}
@@ -14146,29 +13038,6 @@ packages:
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     dev: true
 
-  /jest-haste-map/26.6.2:
-    resolution: {integrity: sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      '@jest/types': 26.6.2
-      '@types/graceful-fs': 4.1.6
-      '@types/node': 16.18.12
-      anymatch: 3.1.3
-      fb-watchman: 2.0.2
-      graceful-fs: 4.2.10
-      jest-regex-util: 26.0.0
-      jest-serializer: 26.6.2
-      jest-util: 26.6.2
-      jest-worker: 26.6.2
-      micromatch: 4.0.5
-      sane: 4.1.0
-      walker: 1.0.8
-    optionalDependencies:
-      fsevents: 2.3.2
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
   /jest-haste-map/29.4.2:
     resolution: {integrity: sha512-WkUgo26LN5UHPknkezrBzr7lUtV1OpGsp+NfXbBwHztsFruS3gz+AMTTBcEklvi8uPzpISzYjdKXYZQJXBnfvw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14267,11 +13136,6 @@ packages:
       jest-resolve: 29.4.2
     dev: true
 
-  /jest-regex-util/26.0.0:
-    resolution: {integrity: sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==}
-    engines: {node: '>= 10.14.2'}
-    dev: true
-
   /jest-regex-util/29.4.2:
     resolution: {integrity: sha512-XYZXOqUl1y31H6VLMrrUL1ZhXuiymLKPz0BO1kEeR5xER9Tv86RZrjTm74g5l9bPJQXA/hyLdaVPN/sdqfteig==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14362,14 +13226,6 @@ packages:
       - supports-color
     dev: true
 
-  /jest-serializer/26.6.2:
-    resolution: {integrity: sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      '@types/node': 16.18.12
-      graceful-fs: 4.2.10
-    dev: true
-
   /jest-snapshot/29.4.2:
     resolution: {integrity: sha512-PdfubrSNN5KwroyMH158R23tWcAXJyx4pvSvWls1dHoLCaUhGul9rsL3uVjtqzRpkxlkMavQjGuWG1newPgmkw==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14402,18 +13258,6 @@ packages:
       - supports-color
     dev: true
 
-  /jest-util/26.6.2:
-    resolution: {integrity: sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==}
-    engines: {node: '>= 10.14.2'}
-    dependencies:
-      '@jest/types': 26.6.2
-      '@types/node': 16.18.12
-      chalk: 4.1.2
-      graceful-fs: 4.2.10
-      is-ci: 2.0.0
-      micromatch: 4.0.5
-    dev: true
-
   /jest-util/29.3.1:
     resolution: {integrity: sha512-7YOVZaiX7RJLv76ZfHt4nbNEzzTRiMW/IiOG7ZOKmTXmoGBxUDefgMAxQubu6WPVqP5zSzAdZG0FfLcC7HOIFQ==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -14464,13 +13308,13 @@ packages:
       string-length: 4.0.2
     dev: true
 
-  /jest-worker/26.6.2:
-    resolution: {integrity: sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==}
+  /jest-worker/27.5.1:
+    resolution: {integrity: sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==}
     engines: {node: '>= 10.13.0'}
     dependencies:
       '@types/node': 16.18.12
       merge-stream: 2.0.0
-      supports-color: 7.2.0
+      supports-color: 8.1.1
     dev: true
 
   /jest-worker/29.4.2:
@@ -14557,11 +13401,6 @@ packages:
     resolution: {integrity: sha512-08bOAKweV2NUC1wqTtf3qZlnpOX/R2DU9ikpjOHs0H+ibQv3zpncVQg6um4uYtRtrwIX8M4Nh3ytK4HGlYAq7Q==}
     dev: true
 
-  /js-string-escape/1.0.1:
-    resolution: {integrity: sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==}
-    engines: {node: '>= 0.8'}
-    dev: true
-
   /js-stringify/1.0.2:
     resolution: {integrity: sha512-rtS5ATOo2Q5k1G+DADISilDA6lv79zIiwFd6CcjuIxGKLFm5C+RLImRscVap9k55i+MOZwgliw+NejvkLuGD5g==}
     dev: true
@@ -14590,8 +13429,38 @@ packages:
   /jsbn/0.1.1:
     resolution: {integrity: sha512-UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg==}
 
-  /jscodeshift/0.13.1_@babel+preset-env@7.20.2:
-    resolution: {integrity: sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==}
+  /jscodeshift/0.13.1_@babel+preset-env@7.20.2:
+    resolution: {integrity: sha512-lGyiEbGOvmMRKgWk4vf+lUrCWO/8YR8sUR3FKF1Cq5fovjZDlIcw3Hu5ppLHAnEXshVffvaM0eyuY/AbOeYpnQ==}
+    hasBin: true
+    peerDependencies:
+      '@babel/preset-env': ^7.1.6
+    dependencies:
+      '@babel/core': 7.20.12
+      '@babel/parser': 7.20.7
+      '@babel/plugin-proposal-class-properties': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-nullish-coalescing-operator': 7.18.6_@babel+core@7.20.12
+      '@babel/plugin-proposal-optional-chaining': 7.20.7_@babel+core@7.20.12
+      '@babel/plugin-transform-modules-commonjs': 7.20.11_@babel+core@7.20.12
+      '@babel/preset-env': 7.20.2_@babel+core@7.20.12
+      '@babel/preset-flow': 7.18.6_@babel+core@7.20.12
+      '@babel/preset-typescript': 7.18.6_@babel+core@7.20.12
+      '@babel/register': 7.18.9_@babel+core@7.20.12
+      babel-core: 7.0.0-bridge.0_@babel+core@7.20.12
+      chalk: 4.1.2
+      flow-parser: 0.197.0
+      graceful-fs: 4.2.10
+      micromatch: 3.1.10
+      neo-async: 2.6.2
+      node-dir: 0.1.17
+      recast: 0.20.5
+      temp: 0.8.4
+      write-file-atomic: 2.4.3
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
+  /jscodeshift/0.14.0_@babel+preset-env@7.20.2:
+    resolution: {integrity: sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==}
     hasBin: true
     peerDependencies:
       '@babel/preset-env': ^7.1.6
@@ -14610,10 +13479,10 @@ packages:
       chalk: 4.1.2
       flow-parser: 0.197.0
       graceful-fs: 4.2.10
-      micromatch: 3.1.10
+      micromatch: 4.0.5
       neo-async: 2.6.2
       node-dir: 0.1.17
-      recast: 0.20.5
+      recast: 0.21.5
       temp: 0.8.4
       write-file-atomic: 2.4.3
     transitivePeerDependencies:
@@ -14661,8 +13530,8 @@ packages:
       - utf-8-validate
     dev: true
 
-  /jsdom/21.0.0:
-    resolution: {integrity: sha512-AIw+3ZakSUtDYvhwPwWHiZsUi3zHugpMEKlNPaurviseYoBqo0zBd3zqoUi3LPCNtPFlEP8FiW9MqCZdjb2IYA==}
+  /jsdom/21.1.0:
+    resolution: {integrity: sha512-m0lzlP7qOtthD918nenK3hdItSd2I+V3W9IrBcB36sqDwG+KnUs66IF5GY7laGWUnlM9vTsD0W1QwSEBYWWcJg==}
     engines: {node: '>=14'}
     peerDependencies:
       canvas: ^2.5.0
@@ -14759,6 +13628,10 @@ packages:
   /json-schema-traverse/0.4.1:
     resolution: {integrity: sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==}
 
+  /json-schema-traverse/1.0.0:
+    resolution: {integrity: sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==}
+    dev: true
+
   /json-schema/0.4.0:
     resolution: {integrity: sha512-es94M3nTIfsEPisRafak+HDLfHXnKBhV3vU5eqPcS3flIWqcxJWgXHXiey3YrpaNsanY5ei1VoYEbOzijuq9BA==}
 
@@ -14852,11 +13725,6 @@ packages:
       promise: 7.3.1
     dev: true
 
-  /junk/3.1.0:
-    resolution: {integrity: sha512-pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==}
-    engines: {node: '>=8'}
-    dev: true
-
   /just-debounce/1.1.0:
     resolution: {integrity: sha512-qpcRocdkUmf+UTNBYx5w6dexX5J31AKK1OmPwH630a83DdVVUIngk55RSAiIGpQyoH0dlr872VHfPjnQnK1qDQ==}
     dev: true
@@ -14964,15 +13832,13 @@ packages:
     engines: {node: '> 0.8'}
     dev: true
 
-  /lazy-universal-dotenv/3.0.1:
-    resolution: {integrity: sha512-prXSYk799h3GY3iOWnC6ZigYzMPjxN2svgjJ9shk7oMadSNX3wXy0B6F32PMJv7qtMnrIbUxoEHzbutvxR2LBQ==}
-    engines: {node: '>=6.0.0', npm: '>=6.0.0', yarn: '>=1.0.0'}
+  /lazy-universal-dotenv/4.0.0:
+    resolution: {integrity: sha512-aXpZJRnTkpK6gQ/z4nk+ZBLd/Qdp118cvPruLSIQzQNRhKwEcdXCOzXuF55VDqIiuAaY3UGZ10DJtvZzDcvsxg==}
+    engines: {node: '>=14.0.0'}
     dependencies:
-      '@babel/runtime': 7.20.7
       app-root-dir: 1.0.2
-      core-js: 3.27.1
-      dotenv: 8.6.0
-      dotenv-expand: 5.1.0
+      dotenv: 16.0.3
+      dotenv-expand: 10.0.0
     dev: true
 
   /lazystream/1.0.1:
@@ -15161,9 +14027,9 @@ packages:
       type-fest: 0.6.0
     dev: true
 
-  /loader-runner/2.4.0:
-    resolution: {integrity: sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==}
-    engines: {node: '>=4.3.0 <5.0.0 || >=5.10'}
+  /loader-runner/4.3.0:
+    resolution: {integrity: sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==}
+    engines: {node: '>=6.11.5'}
     dev: true
 
   /loader-utils/1.4.2:
@@ -15329,6 +14195,7 @@ packages:
 
   /lodash.uniq/4.5.0:
     resolution: {integrity: sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==}
+    dev: false
 
   /lodash.uniqby/4.7.0:
     resolution: {integrity: sha512-e/zcLx6CSbmaEgFHCA7BnoQKyCtKMxnuWrJygbwPs/AIn+IMKl66L8/s+wBUn5LRw2pZx3bUHibiV1b6aTWIww==}
@@ -15388,15 +14255,6 @@ packages:
     resolution: {integrity: sha512-RicKUuLwZVNZ6ZdJHgIZnSeA05p8qWc5NW0uR96mpPIjN9WDLUg9+kj1esQU1GkPn9iLZVKatSQK5gyiaFHgJA==}
     dev: false
 
-  /loud-rejection/1.6.0:
-    resolution: {integrity: sha512-RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      currently-unhandled: 0.4.1
-      signal-exit: 3.0.7
-    dev: true
-    optional: true
-
   /loupe/2.3.6:
     resolution: {integrity: sha512-RaPMZKiMy8/JruncMU5Bt6na1eftNoo++R4Y+N2FrxkDVTrGvcyzFTsaGif4QTeKESheMGegbhw6iUAq+5A8zA==}
     dependencies:
@@ -15555,12 +14413,6 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /map-obj/1.0.1:
-    resolution: {integrity: sha512-7N/q3lyZ+LVCp7PzuxrJr4KMbBE2hW7BT7YNia330OFxIf4d3r5zVpicP2650l7CPN6RM9zOJRl3NGpqSiw3Eg==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-    optional: true
-
   /map-or-similar/1.5.0:
     resolution: {integrity: sha512-0aF7ZmVon1igznGI4VS30yugpduQW3y3GkcgGJOp7d8x8QrizhigUxjI/m2UojsXXto+jLAH3KSz+xOJTiORjg==}
     dev: true
@@ -15580,10 +14432,6 @@ packages:
     resolution: {integrity: sha512-Es99fy0E52fxmhRvCyed7WVlSyuz6ME/wOsRpSmi0GcbMEZ6y5D2GL4+qNGPCc2P270J5yw8L2zg+K4BWACcHg==}
     dev: false
 
-  /markdown-escapes/1.0.4:
-    resolution: {integrity: sha512-8z4efJYk43E0upd0NbVXwgSTQs6cT3T06etieCMEg7dRbzCbxUCK/GHlX8mhHRDcp+OLlHkPKsvqQTCvsRl2cg==}
-    dev: true
-
   /markdown-it-emoji/2.0.2:
     resolution: {integrity: sha512-zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==}
     dev: false
@@ -15607,6 +14455,15 @@ packages:
       uc.micro: 1.0.6
     dev: false
 
+  /markdown-to-jsx/7.1.9_react@17.0.2:
+    resolution: {integrity: sha512-x4STVIKIJR0mGgZIZ5RyAeQD7FEZd5tS8m/htbcVGlex32J+hlSLj+ExrHCxP6nRKF1EKbcO7i6WhC1GtOpBlA==}
+    engines: {node: '>= 10'}
+    peerDependencies:
+      react: '>= 0.14.0'
+    dependencies:
+      react: 17.0.2
+    dev: true
+
   /matchdep/2.0.0:
     resolution: {integrity: sha512-LFgVbaHIHMqCRuCZyfCtUOq9/Lnzhi7Z0KFUE2fhD54+JN2jLh3hC02RLkqauJ3U4soU6H1J3tfj/Byk7GoEjA==}
     engines: {node: '>= 0.10.0'}
@@ -15623,14 +14480,6 @@ packages:
     resolution: {integrity: sha512-6qE4B9deFBIa9YSpOc9O0Sgc43zTeVYbgDT5veRKSlB2+ZuHNoVVxA1L/ckMUayV9Ay9y7Z/SZCLcGteW9i7bg==}
     dev: false
 
-  /md5.js/1.3.5:
-    resolution: {integrity: sha512-xitP+WxNPcTTOgnTJcrhM0xvdPepipPSf3I8EIpGKeFLjt3PlJLIDG3u8EX53ZIubkb+5U2+3rELYpEhHhzdkg==}
-    dependencies:
-      hash-base: 3.1.0
-      inherits: 2.0.4
-      safe-buffer: 5.2.1
-    dev: true
-
   /md5/2.3.0:
     resolution: {integrity: sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==}
     dependencies:
@@ -15639,37 +14488,19 @@ packages:
       is-buffer: 1.1.6
     dev: false
 
-  /mdast-squeeze-paragraphs/4.0.0:
-    resolution: {integrity: sha512-zxdPn69hkQ1rm4J+2Cs2j6wDEv7O17TfXTJ33tl/+JPIoEmtV9t2ZzBM5LPHE8QlHsmVD8t3vPKCyY3oH+H8MQ==}
-    dependencies:
-      unist-util-remove: 2.1.0
-    dev: true
-
   /mdast-util-definitions/4.0.0:
     resolution: {integrity: sha512-k8AJ6aNnUkB7IE+5azR9h81O5EQ/cTDXtWdMq9Kk5KcEW/8ritU5CeLg/9HhOC++nALHBlaogJ5jz0Ybk3kPMQ==}
     dependencies:
       unist-util-visit: 2.0.3
     dev: true
 
-  /mdast-util-to-hast/10.0.1:
-    resolution: {integrity: sha512-BW3LM9SEMnjf4HXXVApZMt8gLQWVNXc3jryK0nJu/rOXPOnlkUjmdkDlmxMirpbU9ILncGFIwLH/ubnWBbcdgA==}
-    dependencies:
-      '@types/mdast': 3.0.10
-      '@types/unist': 2.0.6
-      mdast-util-definitions: 4.0.0
-      mdurl: 1.0.1
-      unist-builder: 2.0.3
-      unist-util-generated: 1.1.6
-      unist-util-position: 3.1.0
-      unist-util-visit: 2.0.3
-    dev: true
-
   /mdast-util-to-string/1.1.0:
     resolution: {integrity: sha512-jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==}
     dev: true
 
   /mdurl/1.0.1:
     resolution: {integrity: sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==}
+    dev: false
 
   /media-typer/0.3.0:
     resolution: {integrity: sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==}
@@ -15693,43 +14524,11 @@ packages:
       map-or-similar: 1.5.0
     dev: true
 
-  /memory-fs/0.4.1:
-    resolution: {integrity: sha512-cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ==}
-    dependencies:
-      errno: 0.1.8
-      readable-stream: 2.3.7
-    dev: true
-
-  /memory-fs/0.5.0:
-    resolution: {integrity: sha512-jA0rdU5KoQMC0e6ppoNRtpp6vjFq6+NY7r8hywnC7V+1Xj/MtHwGIbB1QaK/dunyjWteJzmkpd7ooeWg10T7GA==}
-    engines: {node: '>=4.3.0 <5.0.0 || >=5.10'}
-    dependencies:
-      errno: 0.1.8
-      readable-stream: 2.3.7
-    dev: true
-
   /memory-pager/1.5.0:
     resolution: {integrity: sha512-ZS4Bp4r/Zoeq6+NLJpP+0Zzm0pR8whtGPf1XExKLJBAczGMnSi3It14OiNCStjQjM6NU1okjQGSxgEZN8eBYKg==}
     dev: false
     optional: true
 
-  /meow/3.7.0:
-    resolution: {integrity: sha512-TNdwZs0skRlpPpCUK25StC4VH+tP5GgeY1HQOOGP+lQ2xtdkN2VtT/5tiX9k3IWpkBPV9b3LsAWXn4GGi/PrSA==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      camelcase-keys: 2.1.0
-      decamelize: 1.2.0
-      loud-rejection: 1.6.0
-      map-obj: 1.0.1
-      minimist: 1.2.7
-      normalize-package-data: 2.5.0
-      object-assign: 4.1.1
-      read-pkg-up: 1.0.1
-      redent: 1.0.0
-      trim-newlines: 1.0.0
-    dev: true
-    optional: true
-
   /merge-descriptors/1.0.1:
     resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
 
@@ -15779,14 +14578,6 @@ packages:
       braces: 3.0.2
       picomatch: 2.3.1
 
-  /miller-rabin/4.0.1:
-    resolution: {integrity: sha512-115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==}
-    hasBin: true
-    dependencies:
-      bn.js: 4.12.0
-      brorand: 1.1.0
-    dev: true
-
   /mime-db/1.52.0:
     resolution: {integrity: sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==}
     engines: {node: '>= 0.6'}
@@ -15824,10 +14615,7 @@ packages:
 
   /minimalistic-assert/1.0.1:
     resolution: {integrity: sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==}
-
-  /minimalistic-crypto-utils/1.0.1:
-    resolution: {integrity: sha512-JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg==}
-    dev: true
+    dev: false
 
   /minimatch/3.0.8:
     resolution: {integrity: sha512-6FsRAQsxQ61mw+qP1ZzbL9Bc78x2p5OqNgNpnoAFLTrX8n5Kxph0CsnhmKKNXTWjXqU5L0pGPR7hYk+XWZr60Q==}
@@ -15854,6 +14642,8 @@ packages:
     engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
+    dev: false
+    optional: true
 
   /minipass-fetch/1.4.1:
     resolution: {integrity: sha512-CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==}
@@ -15872,12 +14662,16 @@ packages:
     engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
+    dev: false
+    optional: true
 
   /minipass-pipeline/1.2.4:
     resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==}
     engines: {node: '>=8'}
     dependencies:
       minipass: 3.3.6
+    dev: false
+    optional: true
 
   /minipass-sized/1.0.3:
     resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==}
@@ -15913,22 +14707,6 @@ packages:
       minipass: 3.3.6
       yallist: 4.0.0
 
-  /mississippi/3.0.0:
-    resolution: {integrity: sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==}
-    engines: {node: '>=4.0.0'}
-    dependencies:
-      concat-stream: 1.6.2
-      duplexify: 3.7.1
-      end-of-stream: 1.4.4
-      flush-write-stream: 1.1.1
-      from2: 2.3.0
-      parallel-transform: 1.2.0
-      pump: 3.0.0
-      pumpify: 1.5.1
-      stream-each: 1.2.3
-      through2: 2.0.5
-    dev: true
-
   /mixin-deep/1.3.2:
     resolution: {integrity: sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==}
     engines: {node: '>=0.10.0'}
@@ -16022,17 +14800,6 @@ packages:
     resolution: {integrity: sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==}
     dev: false
 
-  /move-concurrently/1.0.1:
-    resolution: {integrity: sha512-hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ==}
-    dependencies:
-      aproba: 1.2.0
-      copy-concurrently: 1.0.5
-      fs-write-stream-atomic: 1.0.10
-      mkdirp: 0.5.6
-      rimraf: 2.7.1
-      run-queue: 1.0.3
-    dev: true
-
   /mqtt-packet/6.10.0:
     resolution: {integrity: sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==}
     dependencies:
@@ -16068,6 +14835,11 @@ packages:
       - utf-8-validate
     dev: false
 
+  /mri/1.2.0:
+    resolution: {integrity: sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==}
+    engines: {node: '>=4'}
+    dev: true
+
   /ms/2.0.0:
     resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}
 
@@ -16242,10 +15014,6 @@ packages:
   /neo-async/2.6.2:
     resolution: {integrity: sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==}
 
-  /nested-error-stacks/2.1.1:
-    resolution: {integrity: sha512-9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==}
-    dev: true
-
   /netmask/2.0.2:
     resolution: {integrity: sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==}
     engines: {node: '>= 0.4.0'}
@@ -16299,6 +15067,10 @@ packages:
     resolution: {integrity: sha512-DRI60hzo2oKN1ma0ckc6nQWlHU69RH6xN0sjQTjMpChPfTYvKZdcQFfdYK2RWbJcKyUizSIy/l8OTGxMAM1QDw==}
     dev: false
 
+  /node-fetch-native/1.0.1:
+    resolution: {integrity: sha512-VzW+TAk2wE4X9maiKMlT+GsPU4OMmR1U9CrHSmd3DFLn2IcZ9VJ6M6BBugGfYUnPCLSYxXdZy17M0BEJyhUTwg==}
+    dev: true
+
   /node-fetch/2.6.7:
     resolution: {integrity: sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ==}
     engines: {node: 4.x || >=6.0.0}
@@ -16372,34 +15144,6 @@ packages:
     resolution: {integrity: sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==}
     dev: true
 
-  /node-libs-browser/2.2.1:
-    resolution: {integrity: sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==}
-    dependencies:
-      assert: 1.5.0
-      browserify-zlib: 0.2.0
-      buffer: 4.9.2
-      console-browserify: 1.2.0
-      constants-browserify: 1.0.0
-      crypto-browserify: 3.12.0
-      domain-browser: 1.2.0
-      events: 3.3.0
-      https-browserify: 1.0.0
-      os-browserify: 0.3.0
-      path-browserify: 0.0.1
-      process: 0.11.10
-      punycode: 1.4.1
-      querystring-es3: 0.2.1
-      readable-stream: 2.3.7
-      stream-browserify: 2.0.2
-      stream-http: 2.8.3
-      string_decoder: 1.3.0
-      timers-browserify: 2.0.12
-      tty-browserify: 0.0.0
-      url: 0.11.0
-      util: 0.11.1
-      vm-browserify: 1.1.2
-    dev: true
-
   /node-machine-id/1.1.12:
     resolution: {integrity: sha512-QNABxbrPa3qEIfrE6GOJ7BYIuignnJw7iQ2YPbc3Nla1HzRJjXzZOiikfF8m7eAMfichLt3M4VgLOetqgDmgGQ==}
     dev: false
@@ -16580,10 +15324,6 @@ packages:
     resolution: {integrity: sha512-dK0Ss9C34R/vV0FfYJXuqDAqHlaW9fvWVufq9MmGF2umCuDbd5GRfRD9fpi/LiM0l4ZXf8IBB+RYmZExqCrf0w==}
     dev: false
 
-  /num2fraction/1.2.2:
-    resolution: {integrity: sha512-Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==}
-    dev: true
-
   /number-is-nan/1.0.1:
     resolution: {integrity: sha512-4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==}
     engines: {node: '>=0.10.0'}
@@ -16687,24 +15427,6 @@ packages:
       es-abstract: 1.20.4
     dev: true
 
-  /object.entries/1.1.6:
-    resolution: {integrity: sha512-leTPzo4Zvg3pmbQ3rDK69Rl8GQvIqMWubrkxONG9/ojtFE2rD9fjMKfSI5BxW3osRH1m6VdzmqK8oAY9aT4x5w==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
-
-  /object.fromentries/2.0.6:
-    resolution: {integrity: sha512-VciD13dswC4j1Xt5394WR4MzmAQmlgN72phd/riNp9vtD7tp4QQWJ0R4wvclXcafgcYK8veHRed2W6XeGBvcfg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
-
   /object.getownpropertydescriptors/2.1.4:
     resolution: {integrity: sha512-sccv3L/pMModT6dJAYF3fzGMVcb38ysQ0tEE6ixv2yXJDtEIPph268OlAdJj5/qZMZDq2g/jqvwppt36uS/uQQ==}
     engines: {node: '>= 0.8'}
@@ -16715,16 +15437,6 @@ packages:
       es-abstract: 1.20.4
     dev: false
 
-  /object.getownpropertydescriptors/2.1.5:
-    resolution: {integrity: sha512-yDNzckpM6ntyQiGTik1fKV1DcVDRS+w8bvpWNCBanvH5LfRX9O8WTHqQzG4RZwRAM4I0oU7TV11Lj5v0g20ibw==}
-    engines: {node: '>= 0.8'}
-    dependencies:
-      array.prototype.reduce: 1.0.5
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
-
   /object.map/1.0.1:
     resolution: {integrity: sha512-3+mAJu2PLfnSVGHwIWubpOFLscJANBKuB/6A4CxBstc4aqwQY0FWcsppuy4jU5GSB95yES5JHSI+33AWuS4k6w==}
     engines: {node: '>=0.10.0'}
@@ -16757,15 +15469,6 @@ packages:
       es-abstract: 1.20.4
     dev: true
 
-  /object.values/1.1.6:
-    resolution: {integrity: sha512-FVVTkD1vENCsAcwNs9k6jea2uHC/X0+JcjG8YA60FN5CMaJmG95wT9jek/xX9nornqGRrBkKtzuAu2wuHpKqvw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
-
   /on-finished/2.4.1:
     resolution: {integrity: sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==}
     engines: {node: '>= 0.8'}
@@ -16854,16 +15557,6 @@ packages:
     dependencies:
       readable-stream: 2.3.7
 
-  /os-browserify/0.3.0:
-    resolution: {integrity: sha512-gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A==}
-    dev: true
-
-  /os-homedir/1.0.2:
-    resolution: {integrity: sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-    optional: true
-
   /os-locale/1.4.0:
     resolution: {integrity: sha512-PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==}
     engines: {node: '>=0.10.0'}
@@ -16897,32 +15590,11 @@ packages:
       minimist: 1.2.7
     dev: false
 
-  /p-all/2.1.0:
-    resolution: {integrity: sha512-HbZxz5FONzz/z2gJfk6bFca0BCiSRF8jU3yCsWOen/vR6lZjfPOu/e7L3uFzTW1i0H8TlC3vqQstEJPQL4/uLA==}
-    engines: {node: '>=6'}
-    dependencies:
-      p-map: 2.1.0
-    dev: true
-
   /p-cancelable/2.1.1:
     resolution: {integrity: sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==}
     engines: {node: '>=8'}
     dev: false
 
-  /p-event/4.2.0:
-    resolution: {integrity: sha512-KXatOjCRXXkSePPb1Nbi0p0m+gQAwdlbhi4wQKJPI1HsMQS9g+Sqp2o+QHziPr7eYJyOZet836KoHEVM1mwOrQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-timeout: 3.2.0
-    dev: true
-
-  /p-filter/2.1.0:
-    resolution: {integrity: sha512-ZBxxZ5sL2HghephhpGAQdoskxplTwr7ICaehZwLIlfL6acuVgZPm8yBNuRAFBGEqtD/hmUeq9eqLg2ys9Xr/yw==}
-    engines: {node: '>=8'}
-    dependencies:
-      p-map: 2.1.0
-    dev: true
-
   /p-finally/1.0.0:
     resolution: {integrity: sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==}
     engines: {node: '>=4'}
@@ -16972,13 +15644,7 @@ packages:
   /p-map/2.1.0:
     resolution: {integrity: sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==}
     engines: {node: '>=6'}
-
-  /p-map/3.0.0:
-    resolution: {integrity: sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==}
-    engines: {node: '>=8'}
-    dependencies:
-      aggregate-error: 3.1.0
-    dev: true
+    dev: false
 
   /p-map/4.0.0:
     resolution: {integrity: sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==}
@@ -16991,6 +15657,7 @@ packages:
     engines: {node: '>=8'}
     dependencies:
       p-finally: 1.0.0
+    dev: false
 
   /p-try/2.2.0:
     resolution: {integrity: sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==}
@@ -17027,18 +15694,6 @@ packages:
     resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
     dev: false
 
-  /pako/1.0.11:
-    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
-    dev: true
-
-  /parallel-transform/1.2.0:
-    resolution: {integrity: sha512-P2vSmIu38uIlvdcU7fDkyrxj33gTUy/ABO5ZUbGowxNCopBq/OoD42bP4UmMrJoPyk4Uqf0mu3mtWBhHCZD8yg==}
-    dependencies:
-      cyclist: 1.0.1
-      inherits: 2.0.4
-      readable-stream: 2.3.7
-    dev: true
-
   /param-case/3.0.4:
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
@@ -17052,27 +15707,6 @@ packages:
       callsites: 3.1.0
     dev: true
 
-  /parse-asn1/5.1.6:
-    resolution: {integrity: sha512-RnZRo1EPU6JBnra2vGHj0yhp6ebyjBZpmUCLHWiFhxlzvBCCpAuZ7elsBp1PVAbQN0/04VD/19rfzlBSwLstMw==}
-    dependencies:
-      asn1.js: 5.4.1
-      browserify-aes: 1.2.0
-      evp_bytestokey: 1.0.3
-      pbkdf2: 3.1.2
-      safe-buffer: 5.2.1
-    dev: true
-
-  /parse-entities/2.0.0:
-    resolution: {integrity: sha512-kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==}
-    dependencies:
-      character-entities: 1.2.4
-      character-entities-legacy: 1.1.4
-      character-reference-invalid: 1.1.4
-      is-alphanumerical: 1.0.4
-      is-decimal: 1.0.4
-      is-hexadecimal: 1.0.4
-    dev: true
-
   /parse-filepath/1.0.2:
     resolution: {integrity: sha512-FwdRXKCohSVeXqwtYonZTXtbGJKrn+HNyWDYVcp5yuJlesTwNH4rsmRZ+GrKAPJ5bLpRxESMeS+Rl0VCHRvB2Q==}
     engines: {node: '>=0.8'}
@@ -17138,6 +15772,7 @@ packages:
 
   /parse5/6.0.1:
     resolution: {integrity: sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==}
+    dev: false
 
   /parse5/7.1.1:
     resolution: {integrity: sha512-kwpuwzB+px5WUg9pyK0IcK/shltJN5/OVhQagxhCQNtT9Y9QRZqNY2e1cmbu/paRh5LMnz/oVTVLBpjFmMZhSg==}
@@ -17201,8 +15836,8 @@ packages:
       ansi-escapes: 3.2.0
       cross-spawn: 6.0.5
 
-  /path-browserify/0.0.1:
-    resolution: {integrity: sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==}
+  /path-browserify/1.0.1:
+    resolution: {integrity: sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==}
     dev: true
 
   /path-case/3.0.4:
@@ -17297,17 +15932,6 @@ packages:
     resolution: {integrity: sha512-KG8UEiEVkR3wGEb4m5yZkVCzigAD+cVEJck2CzYZO37ZGJfctvVptVO192MwrtPhzONn6go8ylnOdMhKqi4nfg==}
     dev: false
 
-  /pbkdf2/3.1.2:
-    resolution: {integrity: sha512-iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==}
-    engines: {node: '>=0.12'}
-    dependencies:
-      create-hash: 1.2.0
-      create-hmac: 1.1.7
-      ripemd160: 2.0.2
-      safe-buffer: 5.2.1
-      sha.js: 2.4.11
-    dev: true
-
   /pdf-parse/1.1.1:
     resolution: {integrity: sha512-v6ZJ/efsBpGrGGknjtq9J/oC8tZWq0KWL5vQrk2GlzLEQPUDB1ex+13Rmidl1neNN358Jn9EHZw5y07FFtaC7A==}
     engines: {node: '>=6.8.1'}
@@ -17503,15 +16127,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /pnp-webpack-plugin/1.6.4_typescript@4.9.4:
-    resolution: {integrity: sha512-7Wjy+9E3WwLOEL30D+m8TSTF7qJJUJLONBnwQp0518siuMxUQUbgZwssaFX+QKlZkjHZcw/IpZCt/H0srrntSg==}
-    engines: {node: '>=6'}
-    dependencies:
-      ts-pnp: 1.2.0_typescript@4.9.4
-    transitivePeerDependencies:
-      - typescript
-    dev: true
-
   /polished/4.2.2:
     resolution: {integrity: sha512-Sz2Lkdxz6F2Pgnpi9U5Ng/WdWAUZxmHrNPoVlm3aAemxoy2Qy7LGjQg4uf8qKelDAUW94F4np3iH2YPf2qefcQ==}
     engines: {node: '>=10'}
@@ -17588,13 +16203,7 @@ packages:
     engines: {node: '>=0.10.0'}
     dev: true
 
-  /postcss-flexbugs-fixes/4.2.1:
-    resolution: {integrity: sha512-9SiofaZ9CWpQWxOwRh1b/r85KD5y7GgvsNt1056k6OYLvWUun0czCvogfJgylC22uJTwW1KzY3Gz65NZRlvoiQ==}
-    dependencies:
-      postcss: 7.0.39
-    dev: true
-
-  /postcss-loader/4.3.0_gzaxsinx64nntyd3vmdqwl7coe:
+  /postcss-loader/4.3.0_is25vgl4syps62ryudctlza7cy:
     resolution: {integrity: sha512-M/dSoIiNDOo8Rk0mUqoj4kpGq91gcxCfb9PoyZVdZ76/AuhxylHDYZblNE8o+EQ9AMSASeMFEKxZf5aU6wlx1Q==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -17607,7 +16216,7 @@ packages:
       postcss: 7.0.39
       schema-utils: 3.1.1
       semver: 7.3.8
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /postcss-modules-extract-imports/2.0.0:
@@ -17767,11 +16376,11 @@ packages:
     resolution: {integrity: sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==}
     engines: {node: '>=6'}
 
-  /pretty-error/2.1.2:
-    resolution: {integrity: sha512-EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==}
+  /pretty-error/4.0.0:
+    resolution: {integrity: sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==}
     dependencies:
       lodash: 4.17.21
-      renderkid: 2.0.7
+      renderkid: 3.0.0
     dev: true
 
   /pretty-format/26.6.2:
@@ -17843,6 +16452,11 @@ packages:
     resolution: {integrity: sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==}
     engines: {node: '>= 0.6.0'}
 
+  /progress/2.0.3:
+    resolution: {integrity: sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==}
+    engines: {node: '>=0.4.0'}
+    dev: true
+
   /prom-client/13.2.0:
     resolution: {integrity: sha512-wGr5mlNNdRNzEhRYXgboUU2LxHWIojxscJKmtG3R8f4/KiWqyYgXTLHs0+Ted7tG3zFT7pgHJbtomzZ1L0ARaQ==}
     engines: {node: '>=10'}
@@ -17872,17 +16486,8 @@ packages:
     peerDependenciesMeta:
       bluebird:
         optional: true
-
-  /promise-inflight/1.0.1_bluebird@3.7.2:
-    resolution: {integrity: sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==}
-    peerDependencies:
-      bluebird: '*'
-    peerDependenciesMeta:
-      bluebird:
-        optional: true
-    dependencies:
-      bluebird: 3.7.2
-    dev: true
+    dev: false
+    optional: true
 
   /promise-retry/2.0.1:
     resolution: {integrity: sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==}
@@ -17892,18 +16497,6 @@ packages:
       retry: 0.12.0
     dev: false
 
-  /promise.allsettled/1.0.6:
-    resolution: {integrity: sha512-22wJUOD3zswWFqgwjNHa1965LvqTX87WPu/lreY2KSd7SVcERfuZ4GfUaOnJNnvtoIv2yXT/W00YIGMetXtFXg==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      array.prototype.map: 1.0.5
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      get-intrinsic: 1.1.3
-      iterate-value: 1.0.2
-    dev: true
-
   /promise.prototype.finally/3.1.3:
     resolution: {integrity: sha512-EXRF3fC9/0gz4qkt/f5EP5iW4kj9oFpBICNpCNOb/52+8nlHIX07FPLbi/q4qYBQ1xZqivMzTpNQSnArVASolQ==}
     engines: {node: '>= 0.4'}
@@ -17913,15 +16506,6 @@ packages:
       es-abstract: 1.20.4
     dev: false
 
-  /promise.prototype.finally/3.1.4:
-    resolution: {integrity: sha512-nNc3YbgMfLzqtqvO/q5DP6RR0SiHI9pUPGzyDf1q+usTwCN2kjvAnJkBb7bHe3o+fFSBPpsGMoYtaSi+LTNqng==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
-
   /promise/1.3.0:
     resolution: {integrity: sha512-R9WrbTF3EPkVtWjp7B7umQGVndpsi+rsDAfrR4xAALQpFLa/+2OriecLhawxzvii2gd9+DZFwROWDuUUaqS5yA==}
     dependencies:
@@ -17959,12 +16543,6 @@ packages:
     resolution: {integrity: sha512-IJUkICM5dP5znhCckHSv30Q4b5/JA5enCtkRHYaOVOAocnH/1BQEYTC5NMfT3AVl/iXKdr3aqQbQn9DxyWknwA==}
     dev: false
 
-  /property-information/5.6.0:
-    resolution: {integrity: sha512-YUHSPk+A30YPv+0Qf8i9Mbfe/C0hdPXk1s1jPVToV8pk8BQtpw10ct89Eo7OWkutrwqvT0eicAxlOg3dOAu8JA==}
-    dependencies:
-      xtend: 4.0.2
-    dev: true
-
   /proto-list/1.2.4:
     resolution: {integrity: sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==}
     dev: true
@@ -17998,11 +16576,6 @@ packages:
 
   /proxy-from-env/1.1.0:
     resolution: {integrity: sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==}
-    dev: false
-
-  /prr/1.0.1:
-    resolution: {integrity: sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==}
-    dev: true
 
   /ps-tree/1.2.0:
     resolution: {integrity: sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==}
@@ -18017,20 +16590,9 @@ packages:
 
   /psl/1.9.0:
     resolution: {integrity: sha512-E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag==}
-
-  /pstree.remy/1.1.8:
-    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
-    dev: true
-
-  /public-encrypt/4.0.3:
-    resolution: {integrity: sha512-zVpa8oKZSz5bTMTFClc1fQOnyyEzpl5ozpi1B5YcvBrdohMjH2rfsBtyXcuNuwjsDIXmBYlF2N5FlJYhR29t8Q==}
-    dependencies:
-      bn.js: 4.12.0
-      browserify-rsa: 4.1.0
-      create-hash: 1.2.0
-      parse-asn1: 5.1.6
-      randombytes: 2.1.0
-      safe-buffer: 5.2.1
+
+  /pstree.remy/1.1.8:
+    resolution: {integrity: sha512-77DZwxQmxKnu3aR542U+X8FypNzbfJ+C5XQDk3uWjWxn6151aIMGthWYRXTqT1E5oJvg+ljaa2OJi+VfvCOQ8w==}
     dev: true
 
   /pug-attrs/3.0.0:
@@ -18145,19 +16707,37 @@ packages:
 
   /punycode/1.3.2:
     resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
-
-  /punycode/1.4.1:
-    resolution: {integrity: sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ==}
-    dev: true
+    dev: false
 
   /punycode/2.1.1:
     resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
     engines: {node: '>=6'}
+    dev: false
 
   /punycode/2.2.0:
     resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
     engines: {node: '>=6'}
 
+  /puppeteer-core/2.1.1:
+    resolution: {integrity: sha512-n13AWriBMPYxnpbb6bnaY5YoY6rGj8vPLrz6CZF3o0qJNEwlcfJVxBzYZ0NJsQ21UbdJoijPCDrM++SUVEz7+w==}
+    engines: {node: '>=8.16.0'}
+    dependencies:
+      '@types/mime-types': 2.1.1
+      debug: 4.3.4
+      extract-zip: 1.7.0
+      https-proxy-agent: 4.0.0
+      mime: 2.6.0
+      mime-types: 2.1.35
+      progress: 2.0.3
+      proxy-from-env: 1.1.0
+      rimraf: 2.7.1
+      ws: 6.2.2
+    transitivePeerDependencies:
+      - bufferutil
+      - supports-color
+      - utf-8-validate
+    dev: true
+
   /python-struct/1.1.3:
     resolution: {integrity: sha512-UsI/mNvk25jRpGKYI38Nfbv84z48oiIWwG67DLVvjRhy8B/0aIK+5Ju5WOHgw/o9rnEmbAS00v4rgKFQeC332Q==}
     dependencies:
@@ -18205,15 +16785,11 @@ packages:
       strict-uri-encode: 2.0.0
     dev: false
 
-  /querystring-es3/0.2.1:
-    resolution: {integrity: sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==}
-    engines: {node: '>=0.4.x'}
-    dev: true
-
   /querystring/0.2.0:
     resolution: {integrity: sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==}
     engines: {node: '>=0.4.x'}
     deprecated: The querystring API is considered Legacy. new code should use the URLSearchParams API instead.
+    dev: false
 
   /querystring/0.2.1:
     resolution: {integrity: sha512-wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==}
@@ -18264,13 +16840,6 @@ packages:
     dependencies:
       safe-buffer: 5.2.1
 
-  /randomfill/1.0.4:
-    resolution: {integrity: sha512-87lcbR8+MhcWcUiQ+9e+Rwx8MyR2P7qnt15ynUlbm3TU/fjbgz4GsvfSUDTemtCCtVCqb4ZcEFlyPNTh9bBTLw==}
-    dependencies:
-      randombytes: 2.1.0
-      safe-buffer: 5.2.1
-    dev: true
-
   /range-parser/1.2.1:
     resolution: {integrity: sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==}
     engines: {node: '>= 0.6'}
@@ -18284,27 +16853,14 @@ packages:
       iconv-lite: 0.4.24
       unpipe: 1.0.0
 
-  /raw-loader/4.0.2_webpack@4.46.0:
-    resolution: {integrity: sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
-    dependencies:
-      loader-utils: 2.0.4
-      schema-utils: 3.1.1
-      webpack: 4.46.0
-    dev: true
-
-  /react-dom/16.14.0_react@16.14.0:
-    resolution: {integrity: sha512-1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw==}
+  /react-colorful/5.6.1_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw==}
     peerDependencies:
-      react: ^16.14.0
+      react: '>=16.8.0'
+      react-dom: '>=16.8.0'
     dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      prop-types: 15.8.1
-      react: 16.14.0
-      scheduler: 0.19.1
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
     dev: true
 
   /react-dom/18.2.0_react@17.0.2:
@@ -18317,14 +16873,11 @@ packages:
       scheduler: 0.23.0
     dev: true
 
-  /react-inspector/5.1.1_react@17.0.2:
-    resolution: {integrity: sha512-GURDaYzoLbW8pMGXwYPDBIv6nqei4kK7LPRZ9q9HCZF54wqXz/dnylBp/kfE9XmekBhHvLDdcYeyIwSrvtOiWg==}
+  /react-inspector/6.0.1_react@17.0.2:
+    resolution: {integrity: sha512-cxKSeFTf7jpSSVddm66sKdolG90qURAX3g1roTeaN6x0YEbtWc8JpmFN9+yIqLNH2uEkYerWLtJZIXRIFuBKrg==}
     peerDependencies:
-      react: ^16.8.4 || ^17.0.0
+      react: ^16.8.4 || ^17.0.0 || ^18.0.0
     dependencies:
-      '@babel/runtime': 7.20.7
-      is-dom: 1.1.0
-      prop-types: 15.8.1
       react: 17.0.2
     dev: true
 
@@ -18340,15 +16893,6 @@ packages:
     resolution: {integrity: sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==}
     dev: true
 
-  /react/16.14.0:
-    resolution: {integrity: sha512-0X2CImDkJGApiAlcf0ODKIneSwBPhqJawOa5wCtKbu7ZECrmS26NvtSILynQ66cgkT/RJ4LidJOc3bUESwmU8g==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-      prop-types: 15.8.1
-    dev: true
-
   /react/17.0.2:
     resolution: {integrity: sha512-gnhPt75i/dq/z3/6q/0asP78D0u592D5L1pd7M8P+dck6Fu/jJeL6iVVK23fptSUZj8Vjf++7wXA8UNclGQcbA==}
     engines: {node: '>=0.10.0'}
@@ -18460,7 +17004,6 @@ packages:
       esprima: 4.0.1
       source-map: 0.6.1
       tslib: 2.4.0
-    dev: false
 
   /recast/0.22.0:
     resolution: {integrity: sha512-5AAx+mujtXijsEavc5lWXBPQqrM4+Dl5qNH96N2aNeuJFUzpiiToKPsxQD/zAIJHspz7zz0maX0PCtCTFVlixQ==}
@@ -18473,21 +17016,23 @@ packages:
       tslib: 2.5.0
     dev: true
 
+  /recast/0.23.1:
+    resolution: {integrity: sha512-RokaBcoxSjXUDzz1TXSZmZsSW6ZpLmlA3GGqJ8uuTrQ9hZhEz+4Tpsc+gRvYRJ2BU4H+ZyUlg91eSGDw7bwy7g==}
+    engines: {node: '>= 4'}
+    dependencies:
+      assert: 2.0.0
+      ast-types: 0.16.1
+      esprima: 4.0.1
+      source-map: 0.6.1
+      tslib: 2.5.0
+    dev: true
+
   /rechoir/0.6.2:
     resolution: {integrity: sha512-HFM8rkZ+i3zrV+4LQjwQ0W+ez98pApMGM3HUrN04j3CqzPOzl9nmP15Y8YXNm8QHGv/eacOVEjqhmWpkRV0NAw==}
     engines: {node: '>= 0.10'}
     dependencies:
       resolve: 1.22.1
 
-  /redent/1.0.0:
-    resolution: {integrity: sha512-qtW5hKzGQZqKoh6JNSD+4lfitfPKGz42e6QwiRmPM5mmKtR0N41AbJRYu0xJi7nhOJ4WDgRkKvAk6tw4WIwR4g==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      indent-string: 2.1.0
-      strip-indent: 1.0.1
-    dev: true
-    optional: true
-
   /redent/3.0.0:
     resolution: {integrity: sha512-6tDA8g98We0zd0GvVeMT9arEOnTw9qM03L9cJXaCjrip1OO764RDBLBfrB4cwzNGDj5OA5ioymC9GkizgWJDUg==}
     engines: {node: '>=8'}
@@ -18622,46 +17167,6 @@ packages:
       unist-util-visit: 2.0.3
     dev: true
 
-  /remark-footnotes/2.0.0:
-    resolution: {integrity: sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==}
-    dev: true
-
-  /remark-mdx/1.6.22:
-    resolution: {integrity: sha512-phMHBJgeV76uyFkH4rvzCftLfKCr2RZuF+/gmVcaKrpsihyzmhXjA0BEMDaPTXG5y8qZOKPVo83NAOX01LPnOQ==}
-    dependencies:
-      '@babel/core': 7.12.9
-      '@babel/helper-plugin-utils': 7.10.4
-      '@babel/plugin-proposal-object-rest-spread': 7.12.1_@babel+core@7.12.9
-      '@babel/plugin-syntax-jsx': 7.12.1_@babel+core@7.12.9
-      '@mdx-js/util': 1.6.22
-      is-alphabetical: 1.0.4
-      remark-parse: 8.0.3
-      unified: 9.2.0
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /remark-parse/8.0.3:
-    resolution: {integrity: sha512-E1K9+QLGgggHxCQtLt++uXltxEprmWzNfg+MxpfHsZlrddKzZ/hZyWHDbK3/Ap8HJQqYJRXP+jHczdL6q6i85Q==}
-    dependencies:
-      ccount: 1.1.0
-      collapse-white-space: 1.0.6
-      is-alphabetical: 1.0.4
-      is-decimal: 1.0.4
-      is-whitespace-character: 1.0.4
-      is-word-character: 1.0.4
-      markdown-escapes: 1.0.4
-      parse-entities: 2.0.0
-      repeat-string: 1.6.1
-      state-toggle: 1.0.3
-      trim: 0.0.1
-      trim-trailing-lines: 1.1.4
-      unherit: 1.1.3
-      unist-util-remove-position: 2.0.1
-      vfile-location: 3.2.0
-      xtend: 4.0.2
-    dev: true
-
   /remark-slug/6.1.0:
     resolution: {integrity: sha512-oGCxDF9deA8phWvxFuyr3oSJsdyUAxMFbA0mZ7Y1Sas+emILtO+e5WutF9564gDsEN4IXaQXm5pFo6MLH+YmwQ==}
     dependencies:
@@ -18670,12 +17175,6 @@ packages:
       unist-util-visit: 2.0.3
     dev: true
 
-  /remark-squeeze-paragraphs/4.0.0:
-    resolution: {integrity: sha512-8qRqmL9F4nuLPIgl92XUuxI3pFxize+F1H0e/W3llTk0UsjJaj01+RrirkMw7P21RKe4X6goQhYRSvNWX+70Rw==}
-    dependencies:
-      mdast-squeeze-paragraphs: 4.0.0
-    dev: true
-
   /remove-bom-buffer/3.0.0:
     resolution: {integrity: sha512-8v2rWhaakv18qcvNeli2mZ/TMTL2nEyAKRvzo1WtnZBl15SHyEhrCu2/xKlJyUFKHiHgfXIyuY6g2dObJJycXQ==}
     engines: {node: '>=0.10.0'}
@@ -18700,14 +17199,14 @@ packages:
     resolution: {integrity: sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA==}
     dev: false
 
-  /renderkid/2.0.7:
-    resolution: {integrity: sha512-oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==}
+  /renderkid/3.0.0:
+    resolution: {integrity: sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==}
     dependencies:
       css-select: 4.3.0
       dom-converter: 0.2.0
       htmlparser2: 6.1.0
       lodash: 4.17.21
-      strip-ansi: 3.0.1
+      strip-ansi: 6.0.1
     dev: true
 
   /repeat-element/1.1.4:
@@ -18720,14 +17219,6 @@ packages:
     engines: {node: '>=0.10'}
     dev: true
 
-  /repeating/2.0.1:
-    resolution: {integrity: sha512-ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      is-finite: 1.1.0
-    dev: true
-    optional: true
-
   /replace-ext/1.0.1:
     resolution: {integrity: sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw==}
     engines: {node: '>= 0.10'}
@@ -18820,6 +17311,11 @@ packages:
     resolution: {integrity: sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==}
     engines: {node: '>=0.10.0'}
 
+  /require-from-string/2.0.2:
+    resolution: {integrity: sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==}
+    engines: {node: '>=0.10.0'}
+    dev: true
+
   /require-main-filename/1.0.1:
     resolution: {integrity: sha512-IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==}
     dev: true
@@ -18936,13 +17432,6 @@ packages:
     dependencies:
       glob: 7.2.3
 
-  /ripemd160/2.0.2:
-    resolution: {integrity: sha512-ii4iagi25WusVoiC4B4lq7pbXfAp3D9v5CwfkY33vffw2+pkDjY1D8GaN7spsxvCSx8dkPqOZCEZyfxcmJG2IA==}
-    dependencies:
-      hash-base: 3.1.0
-      inherits: 2.0.4
-    dev: true
-
   /rndm/1.2.0:
     resolution: {integrity: sha512-fJhQQI5tLrQvYIYFpOnFinzv9dwmR7hRnUz1XqP3OJ1jIweTNOd6aTO4jwQSgcBSFUB+/KHJxuGneime+FdzOw==}
     dev: false
@@ -18962,11 +17451,6 @@ packages:
       xml2js: 0.4.23
     dev: false
 
-  /rsvp/4.8.5:
-    resolution: {integrity: sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==}
-    engines: {node: 6.* || >= 7.*}
-    dev: true
-
   /run-async/2.4.1:
     resolution: {integrity: sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==}
     engines: {node: '>=0.12.0'}
@@ -18977,12 +17461,6 @@ packages:
     dependencies:
       queue-microtask: 1.2.3
 
-  /run-queue/1.0.3:
-    resolution: {integrity: sha512-ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg==}
-    dependencies:
-      aproba: 1.2.0
-    dev: true
-
   /run-script-os/1.1.6:
     resolution: {integrity: sha512-ql6P2LzhBTTDfzKts+Qo4H94VUKpxKDFz6QxxwaUZN0mwvi7L3lpOI7BqPCq7lgDh3XLl0dpeXwfcVIitlrYrw==}
     hasBin: true
@@ -19031,31 +17509,12 @@ packages:
   /safer-buffer/2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
-  /sane/4.1.0:
-    resolution: {integrity: sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==}
-    engines: {node: 6.* || 8.* || >= 10.*}
-    deprecated: some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added
-    hasBin: true
-    dependencies:
-      '@cnakazawa/watch': 1.0.4
-      anymatch: 2.0.0
-      capture-exit: 2.0.0
-      exec-sh: 0.3.6
-      execa: 1.0.0
-      fb-watchman: 2.0.2
-      micromatch: 3.1.10
-      minimist: 1.2.7
-      walker: 1.0.8
-    transitivePeerDependencies:
-      - supports-color
-    dev: true
-
-  /sanitize-html/2.7.3:
-    resolution: {integrity: sha512-jMaHG29ak4miiJ8wgqA1849iInqORgNv7SLfSw9LtfOhEUQ1C0YHKH73R+hgyufBW9ZFeJrb057k9hjlfBCVlw==}
+  /sanitize-html/2.9.0:
+    resolution: {integrity: sha512-KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg==}
     dependencies:
       deepmerge: 4.2.2
       escape-string-regexp: 4.0.0
-      htmlparser2: 6.1.0
+      htmlparser2: 8.0.1
       is-plain-object: 5.0.0
       parse-srcset: 1.0.2
       postcss: 8.4.21
@@ -19069,7 +17528,7 @@ packages:
     dev: false
     optional: true
 
-  /sass-loader/10.3.1_sass@1.55.0+webpack@4.46.0:
+  /sass-loader/10.3.1_sass@1.55.0+webpack@5.75.0:
     resolution: {integrity: sha512-y2aBdtYkbqorVavkC3fcJIUDGIegzDWPn3/LAFhsf3G+MzPKTJx37sROf5pXtUeggSVbNbmfj8TgRaSLMelXRA==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
@@ -19091,17 +17550,18 @@ packages:
       sass: 1.55.0
       schema-utils: 3.1.1
       semver: 7.3.8
-      webpack: 4.46.0
+      webpack: 5.75.0
     dev: true
 
-  /sass-loader/10.3.1_sass@1.57.1+webpack@4.46.0:
-    resolution: {integrity: sha512-y2aBdtYkbqorVavkC3fcJIUDGIegzDWPn3/LAFhsf3G+MzPKTJx37sROf5pXtUeggSVbNbmfj8TgRaSLMelXRA==}
-    engines: {node: '>= 10.13.0'}
+  /sass-loader/13.2.0_sass@1.58.0+webpack@5.75.0:
+    resolution: {integrity: sha512-JWEp48djQA4nbZxmgC02/Wh0eroSUutulROUusYJO9P9zltRbNN80JCBHqRGzjd4cmZCa/r88xgfkjGD0TXsHg==}
+    engines: {node: '>= 14.15.0'}
     peerDependencies:
       fibers: '>= 3.1.0'
-      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0
+      node-sass: ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0
       sass: ^1.3.0
-      webpack: ^4.36.0 || ^5.0.0
+      sass-embedded: '*'
+      webpack: ^5.0.0
     peerDependenciesMeta:
       fibers:
         optional: true
@@ -19109,14 +17569,13 @@ packages:
         optional: true
       sass:
         optional: true
+      sass-embedded:
+        optional: true
     dependencies:
-      klona: 2.0.5
-      loader-utils: 2.0.2
+      klona: 2.0.6
       neo-async: 2.6.2
-      sass: 1.57.1
-      schema-utils: 3.1.1
-      semver: 7.3.8
-      webpack: 4.46.0
+      sass: 1.58.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /sass/1.55.0:
@@ -19129,8 +17588,8 @@ packages:
       source-map-js: 1.0.2
     dev: true
 
-  /sass/1.57.1:
-    resolution: {integrity: sha512-O2+LwLS79op7GI0xZ8fqzF7X2m/m8WFfI02dHOdsK5R2ECeS5F62zrwg/relM1rjSLy7Vd/DiMNIvPrQGsA0jw==}
+  /sass/1.58.0:
+    resolution: {integrity: sha512-PiMJcP33DdKtZ/1jSjjqVIKihoDc6yWmYr9K/4r3fVVIEDAluD0q7XZiRKrNJcPK3qkLRF/79DND1H5q1LBjgg==}
     engines: {node: '>=12.0.0'}
     hasBin: true
     dependencies:
@@ -19166,28 +17625,12 @@ packages:
       sb-promise-queue: 2.1.0
     dev: false
 
-  /scheduler/0.19.1:
-    resolution: {integrity: sha512-n/zwRWRYSUj0/3g/otKDRPMh6qv2SYMWNq85IEa8iZyAv8od9zDYpGSnpBEjNgcMNq6Scbu5KfIPxNF72R/2EA==}
-    dependencies:
-      loose-envify: 1.4.0
-      object-assign: 4.1.1
-    dev: true
-
   /scheduler/0.23.0:
     resolution: {integrity: sha512-CtuThmgHNg7zIZWAXi3AsyIzA3n4xx7aNyjwC2VJldO2LMVDhFK+63xGqq6CsJH4rTAt6/M+N4GhZiDYPx9eUw==}
     dependencies:
       loose-envify: 1.4.0
     dev: true
 
-  /schema-utils/1.0.0:
-    resolution: {integrity: sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==}
-    engines: {node: '>= 4'}
-    dependencies:
-      ajv: 6.12.6
-      ajv-errors: 1.0.1_ajv@6.12.6
-      ajv-keywords: 3.5.2_ajv@6.12.6
-    dev: true
-
   /schema-utils/2.7.0:
     resolution: {integrity: sha512-0ilKFI6QQF5nxDZLFn2dMjvc4hjg/Wkg7rHd3jK6/A4a1Hl9VFdQWvgB1UMGoU94pad1P/8N7fMcEnLnSiju8A==}
     engines: {node: '>= 8.9.0'}
@@ -19215,6 +17658,16 @@ packages:
       ajv-keywords: 3.5.2_ajv@6.12.6
     dev: true
 
+  /schema-utils/4.0.0:
+    resolution: {integrity: sha512-1edyXKgh6XnJsJSQ8mKWXnN/BVaIbFMLpouRUrXgVq7WYne5kw3MW7UPhO44uRXQSIpTSXoJbmrR2X0w9kUTyg==}
+    engines: {node: '>= 12.13.0'}
+    dependencies:
+      '@types/json-schema': 7.0.11
+      ajv: 8.12.0
+      ajv-formats: 2.1.1_ajv@8.12.0
+      ajv-keywords: 5.1.0_ajv@8.12.0
+    dev: true
+
   /seedrandom/3.0.5:
     resolution: {integrity: sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==}
     dev: true
@@ -19288,16 +17741,17 @@ packages:
     resolution: {integrity: sha512-hr3Wtp/GZIc/6DAGPDcV4/9WoZhjrkXsi5B/07QgX8tsdc6ilr7BFM6PM6rbdAX1kFSDYeZGLipIZZKyQP0O5Q==}
     dev: false
 
-  /serialize-javascript/4.0.0:
-    resolution: {integrity: sha512-GaNA54380uFefWghODBWEGisLZFj00nS5ACs6yHa9nLqlLpVLO8ChDGeKRjZnV4Nh4n0Qi7nhYZD/9fCPzEqkw==}
+  /serialize-javascript/5.0.1:
+    resolution: {integrity: sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==}
     dependencies:
       randombytes: 2.1.0
-    dev: true
+    dev: false
 
-  /serialize-javascript/5.0.1:
-    resolution: {integrity: sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==}
+  /serialize-javascript/6.0.1:
+    resolution: {integrity: sha512-owoXEFjWRllis8/M1Q+Cw5k8ZH40e3zhp/ovX+Xr/vi1qj6QesbyXXViFbpNvWvPNAD62SutwEXavefrLJWj7w==}
     dependencies:
       randombytes: 2.1.0
+    dev: true
 
   /serve-favicon/2.5.0:
     resolution: {integrity: sha512-FMW2RvqNr03x+C0WxTyu6sOv21oOjkq5j8tjquWccwa6ScNyGFOGJVpuS1NmTVGBAHS07xnSKotgf2ehQmf9iA==}
@@ -19342,10 +17796,6 @@ packages:
       split-string: 3.1.0
     dev: true
 
-  /setimmediate/1.0.5:
-    resolution: {integrity: sha512-MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA==}
-    dev: true
-
   /setprototypeof/1.2.0:
     resolution: {integrity: sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==}
 
@@ -19355,6 +17805,7 @@ packages:
     dependencies:
       inherits: 2.0.4
       safe-buffer: 5.2.1
+    dev: false
 
   /shallow-clone/3.0.1:
     resolution: {integrity: sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==}
@@ -19397,7 +17848,6 @@ packages:
       glob: 7.2.3
       interpret: 1.4.0
       rechoir: 0.6.2
-    dev: false
 
   /shellwords/0.1.1:
     resolution: {integrity: sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==}
@@ -19616,10 +18066,6 @@ packages:
       is-plain-obj: 2.1.0
     dev: true
 
-  /source-list-map/2.0.1:
-    resolution: {integrity: sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==}
-    dev: true
-
   /source-map-js/1.0.2:
     resolution: {integrity: sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==}
     engines: {node: '>=0.10.0'}
@@ -19662,11 +18108,6 @@ packages:
     resolution: {integrity: sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==}
     engines: {node: '>=0.10.0'}
 
-  /source-map/0.7.4:
-    resolution: {integrity: sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==}
-    engines: {node: '>= 8'}
-    dev: true
-
   /sourcemap-codec/1.4.8:
     resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==}
     deprecated: Please use @jridgewell/sourcemap-codec instead
@@ -19824,22 +18265,13 @@ packages:
       safer-buffer: 2.1.2
       tweetnacl: 0.14.5
 
-  /ssri/6.0.2:
-    resolution: {integrity: sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q==}
-    dependencies:
-      figgy-pudding: 3.5.2
-    dev: true
-
   /ssri/8.0.1:
     resolution: {integrity: sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==}
     engines: {node: '>= 8'}
     dependencies:
       minipass: 3.3.6
-
-  /stable/0.1.8:
-    resolution: {integrity: sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==}
-    deprecated: 'Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility'
-    dev: true
+    dev: false
+    optional: true
 
   /stack-trace/0.0.10:
     resolution: {integrity: sha512-KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg==}
@@ -19875,10 +18307,6 @@ packages:
       - supports-color
     dev: true
 
-  /state-toggle/1.0.3:
-    resolution: {integrity: sha512-d/5Z4/2iiCnHw6Xzghyhb+GcmF89bxwgXG60wjIiZaxnymbyOmI8Hk4VqHXiVVp6u2ysaskFfXg3ekCj4WNftQ==}
-    dev: true
-
   /static-eval/2.0.2:
     resolution: {integrity: sha512-N/D219Hcr2bPjLxPiV+TQE++Tsmrady7TqAJugLy7Xk1EumfDWS/f5dtBbkRCGE7wKKXuYockQoj8Rm2/pVKyg==}
     dependencies:
@@ -19954,7 +18382,7 @@ packages:
       '@storybook/components': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/core-events': 6.5.15
       '@storybook/theming': 6.5.15_6l5554ty5ajsajah6yazvrjhoe
-      core-js: 3.27.1
+      core-js: 3.27.2
       global: 4.4.0
       memoizerific: 1.11.3
       react: 17.0.2
@@ -19963,11 +18391,16 @@ packages:
       - react-dom
     dev: true
 
-  /stream-browserify/2.0.2:
-    resolution: {integrity: sha512-nX6hmklHs/gr2FuxYDltq8fJA1GDlxKQCz8O/IM4atRqBH8OORmBNgfvW5gG10GT/qQ9u0CzIvr2X5Pkt6ntqg==}
+  /storybook/7.0.0-beta.46:
+    resolution: {integrity: sha512-xMMCSrnfU2JLQVH7G8eJQVTwCwx3ABA/WeDxPCkNESR1PBVWA/OipUxE4wTD3z/1XLq0sfwknZcJZgz1mhqaAQ==}
+    hasBin: true
     dependencies:
-      inherits: 2.0.4
-      readable-stream: 2.3.7
+      '@storybook/cli': 7.0.0-beta.46
+    transitivePeerDependencies:
+      - bufferutil
+      - encoding
+      - supports-color
+      - utf-8-validate
     dev: true
 
   /stream-browserify/3.0.0:
@@ -19983,27 +18416,10 @@ packages:
       duplexer: 0.1.2
     dev: true
 
-  /stream-each/1.2.3:
-    resolution: {integrity: sha512-vlMC2f8I2u/bZGqkdfLQW/13Zihpej/7PmSiMQsbYddxuTsJp8vRe2x2FvVExZg7FaOds43ROAuFJwPR4MTZLw==}
-    dependencies:
-      end-of-stream: 1.4.4
-      stream-shift: 1.0.1
-    dev: true
-
   /stream-exhaust/1.0.2:
     resolution: {integrity: sha512-b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==}
     dev: true
 
-  /stream-http/2.8.3:
-    resolution: {integrity: sha512-+TSkfINHDo4J+ZobQLWiMouQYB+UVYFttRA94FpEzzJ7ZdqcL4uUUQ7WkdkI4DSozGmgBUE/a47L+38PenXhUw==}
-    dependencies:
-      builtin-status-codes: 3.0.0
-      inherits: 2.0.4
-      readable-stream: 2.3.7
-      to-arraybuffer: 1.0.1
-      xtend: 4.0.2
-    dev: true
-
   /stream-shift/1.0.1:
     resolution: {integrity: sha512-AiisoFqQ0vbGcZgQPY1cdP2I76glaVA/RauYR4G4thNFgkTqr90yXTo4LYX60Jl+sIlPNHHdGSwo01AvbKUSVQ==}
 
@@ -20077,37 +18493,6 @@ packages:
       strip-ansi: 7.0.1
     dev: true
 
-  /string.prototype.matchall/4.0.8:
-    resolution: {integrity: sha512-6zOCOcJ+RJAQshcTvXPHoxoQGONa3e/Lqx90wUA+wEzX78sg5Bo+1tQo4N0pohS0erG9qtCqJDjNCQBjeWVxyg==}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-      get-intrinsic: 1.1.3
-      has-symbols: 1.0.3
-      internal-slot: 1.0.4
-      regexp.prototype.flags: 1.4.3
-      side-channel: 1.0.4
-    dev: true
-
-  /string.prototype.padend/3.1.4:
-    resolution: {integrity: sha512-67otBXoksdjsnXXRUq+KMVTdlVRZ2af422Y0aTyTjVaoQkGr3mxl2Bc5emi7dOQ3OGVVQQskmLEWwFXwommpNw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
-
-  /string.prototype.padstart/3.1.4:
-    resolution: {integrity: sha512-XqOHj8horGsF+zwxraBvMTkBFM28sS/jHBJajh17JtJKA92qazidiQbLosV4UA18azvLOVKYo/E3g3T9Y5826w==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      call-bind: 1.0.2
-      define-properties: 1.1.4
-      es-abstract: 1.21.1
-    dev: true
-
   /string.prototype.startswith/1.0.0:
     resolution: {integrity: sha512-VHhsDkuf8gsw4JNRK9cIZjYe6r7PsVUutVohaBhqYAoPaRADoQH+mMgUg7Cs/TgQeDGEvI+PzPEMOdvdsCMvpg==}
     dependencies:
@@ -20210,15 +18595,6 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /strip-indent/1.0.1:
-    resolution: {integrity: sha512-I5iQq6aFMM62fBEAIB/hXzwJD6EEZ0xEGCX2t7oXqaKPIRgt4WruAQ285BISgdkP+HLGWyeGmNJcpIwFeRYRUA==}
-    engines: {node: '>=0.10.0'}
-    hasBin: true
-    dependencies:
-      get-stdin: 4.0.1
-    dev: true
-    optional: true
-
   /strip-indent/3.0.0:
     resolution: {integrity: sha512-laJTa3Jb+VQpaC6DseHhF7dXVqHTfJPCRDaEbid/drOhgitgYku/letMUqOXFoWV0zIIUbjpdH2t+tYj4bQMRQ==}
     engines: {node: '>=8'}
@@ -20251,7 +18627,7 @@ packages:
       peek-readable: 4.1.0
     dev: false
 
-  /style-loader/1.3.0_webpack@4.46.0:
+  /style-loader/1.3.0_webpack@5.75.0:
     resolution: {integrity: sha512-V7TCORko8rs9rIqkSrlMfkqA63DfoGBBJmK1kKGCcSi+BWb4cqz0SRsnp4l6rU5iwOEd0/2ePv68SV22VXon4Q==}
     engines: {node: '>= 8.9.0'}
     peerDependencies:
@@ -20259,19 +18635,22 @@ packages:
     dependencies:
       loader-utils: 2.0.4
       schema-utils: 2.7.1
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
+    dev: true
+
+  /style-loader/3.3.1_webpack@5.75.0:
+    resolution: {integrity: sha512-GPcQ+LDJbrcxHORTRes6Jy2sfvK2kS6hpSfI/fXhPt+spVzxF6LJ1dHLN9zIGmVaaP044YKaIatFaufENRiDoQ==}
+    engines: {node: '>= 12.13.0'}
+    peerDependencies:
+      webpack: ^5.0.0
+    dependencies:
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /style-mod/4.0.0:
     resolution: {integrity: sha512-OPhtyEjyyN9x3nhPsu76f52yUGXiZcgvsrFVtvTkyGRQJ0XK+GPc6ov1z+lRpbeabka+MYEQxOYRnt5nF30aMw==}
     dev: false
 
-  /style-to-object/0.3.0:
-    resolution: {integrity: sha512-CzFnRRXhzWIdItT3OmF8SQfWyahHhjq3HwcMNCNLn+N7klOOqPjMeG/4JSu77D7ypZdGvSzvkrbyeTMizz2VrA==}
-    dependencies:
-      inline-style-parser: 0.1.1
-    dev: true
-
   /superagent/8.0.9:
     resolution: {integrity: sha512-4C7Bh5pyHTvU33KpZgwrNKh/VQnvgtCSqPRfJAUdmrtSYePVzVg4E4OzsrbkhJj9O7SO6Bnv75K/F8XVZT8YHA==}
     engines: {node: '>=6.4.0 <13 || >=14'}
@@ -20362,16 +18741,6 @@ packages:
     resolution: {integrity: sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==}
     dev: true
 
-  /symbol.prototype.description/1.0.5:
-    resolution: {integrity: sha512-x738iXRYsrAt9WBhRCVG5BtIC3B7CUkFwbHW2zOvGtwM33s7JjrCDyq8V0zgMYVb5ymsL8+qkzzpANH63CPQaQ==}
-    engines: {node: '>= 0.11.15'}
-    dependencies:
-      call-bind: 1.0.2
-      get-symbol-description: 1.0.0
-      has-symbols: 1.0.3
-      object.getownpropertydescriptors: 2.1.5
-    dev: true
-
   /synchronous-promise/2.0.16:
     resolution: {integrity: sha512-qImOD23aDfnIDNqlG1NOehdB9IYsn1V9oByPjKY1nakv2MQYCEMyX033/q+aEtYCpmYK1cv2+NTmlH+ra6GA5A==}
     dev: true
@@ -20471,7 +18840,7 @@ packages:
       jsbi: 4.3.0
       native-duplexpair: 1.0.0
       node-abort-controller: 3.0.1
-      punycode: 2.1.1
+      punycode: 2.2.0
       sprintf-js: 1.1.2
     transitivePeerDependencies:
       - supports-color
@@ -20490,6 +18859,17 @@ packages:
       memoizerific: 1.11.3
     dev: true
 
+  /telejson/7.0.4:
+    resolution: {integrity: sha512-J4QEuCnYGXAI9KSN7RXK0a0cOW2ONpjc4IQbInGZ6c3stvplLAYyZjTnScrRd8deXVjNCFV1wXcLC7SObDuQYA==}
+    dependencies:
+      memoizerific: 1.11.3
+    dev: true
+
+  /temp-dir/2.0.0:
+    resolution: {integrity: sha512-aoBAniQmmwtcKp/7BzsH8Cxzv8OL736p7v1ihGb5e9DJ9kTwGWHrQrVB5+lfVDzfGrdRzXch+ig7LHaY1JTOrg==}
+    engines: {node: '>=8'}
+    dev: true
+
   /temp/0.8.4:
     resolution: {integrity: sha512-s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg==}
     engines: {node: '>=6.0.0'}
@@ -20497,53 +18877,64 @@ packages:
       rimraf: 2.6.3
     dev: true
 
-  /terser-webpack-plugin/1.4.5_webpack@4.46.0:
-    resolution: {integrity: sha512-04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw==}
-    engines: {node: '>= 6.9.0'}
-    peerDependencies:
-      webpack: ^4.0.0
+  /tempy/1.0.1:
+    resolution: {integrity: sha512-biM9brNqxSc04Ee71hzFbryD11nX7VPhQQY32AdDmjFvodsRFz/3ufeoTZ6uYkRFfGo188tENcASNs3vTdsM0w==}
+    engines: {node: '>=10'}
     dependencies:
-      cacache: 12.0.4
-      find-cache-dir: 2.1.0
-      is-wsl: 1.1.0
-      schema-utils: 1.0.0
-      serialize-javascript: 4.0.0
-      source-map: 0.6.1
-      terser: 4.8.1
-      webpack: 4.46.0
-      webpack-sources: 1.4.3
-      worker-farm: 1.7.0
+      del: 6.1.1
+      is-stream: 2.0.1
+      temp-dir: 2.0.0
+      type-fest: 0.16.0
+      unique-string: 2.0.0
     dev: true
 
-  /terser-webpack-plugin/4.2.3_webpack@4.46.0:
-    resolution: {integrity: sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==}
+  /terser-webpack-plugin/5.3.6_htvmhiqynazf46fjrszipnqp7a:
+    resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
     engines: {node: '>= 10.13.0'}
     peerDependencies:
-      webpack: ^4.0.0 || ^5.0.0
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
     dependencies:
-      cacache: 15.3.0
-      find-cache-dir: 3.3.2
-      jest-worker: 26.6.2
-      p-limit: 3.1.0
+      '@jridgewell/trace-mapping': 0.3.17
+      esbuild: 0.16.17
+      jest-worker: 27.5.1
       schema-utils: 3.1.1
-      serialize-javascript: 5.0.1
-      source-map: 0.6.1
+      serialize-javascript: 6.0.1
       terser: 5.16.1
-      webpack: 4.46.0
-      webpack-sources: 1.4.3
-    transitivePeerDependencies:
-      - bluebird
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
-  /terser/4.8.1:
-    resolution: {integrity: sha512-4GnLC0x667eJG0ewJTa6z/yXrbLGv80D9Ru6HIpCQmO+Q4PfEtBFi0ObSckqwL6VyQv/7ENJieXHo2ANmdQwgw==}
-    engines: {node: '>=6.0.0'}
-    hasBin: true
+  /terser-webpack-plugin/5.3.6_webpack@5.75.0:
+    resolution: {integrity: sha512-kfLFk+PoLUQIbLmB1+PZDMRSZS99Mp+/MHqDNmMA6tOItzRt+Npe3E+fsMs5mfcM0wCtrrdU387UnV+vnSffXQ==}
+    engines: {node: '>= 10.13.0'}
+    peerDependencies:
+      '@swc/core': '*'
+      esbuild: '*'
+      uglify-js: '*'
+      webpack: ^5.1.0
+    peerDependenciesMeta:
+      '@swc/core':
+        optional: true
+      esbuild:
+        optional: true
+      uglify-js:
+        optional: true
     dependencies:
-      acorn: 8.8.1
-      commander: 2.20.3
-      source-map: 0.6.1
-      source-map-support: 0.5.21
+      '@jridgewell/trace-mapping': 0.3.17
+      jest-worker: 27.5.1
+      schema-utils: 3.1.1
+      serialize-javascript: 6.0.1
+      terser: 5.16.1
+      webpack: 5.75.0
     dev: true
 
   /terser/5.16.1:
@@ -20628,13 +19019,6 @@ packages:
     resolution: {integrity: sha512-a7wPxPdVlQL7lqvitHGGRsofhdwtkoSXPGATFuSOA2i1ZNQEPLrGnj68vOp2sOJTCFAQVXPeNMX/GctBaO9L2w==}
     dev: false
 
-  /timers-browserify/2.0.12:
-    resolution: {integrity: sha512-9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ==}
-    engines: {node: '>=0.6.0'}
-    dependencies:
-      setimmediate: 1.0.5
-    dev: true
-
   /tiny-glob/0.2.9:
     resolution: {integrity: sha512-g/55ssRPUjShh+xkfx9UPDXqhckHEsHr4Vd9zX55oSdGZc/MD0m3sferOkwWtp98bv+kcVfEHtRJgBVJzelrzg==}
     dependencies:
@@ -20707,10 +19091,6 @@ packages:
       is-absolute: 1.0.0
       is-negated-glob: 1.0.0
 
-  /to-arraybuffer/1.0.1:
-    resolution: {integrity: sha512-okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA==}
-    dev: true
-
   /to-fast-properties/2.0.0:
     resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==}
     engines: {node: '>=4'}
@@ -20785,7 +19165,7 @@ packages:
     engines: {node: '>=0.8'}
     dependencies:
       psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.2.0
 
   /tough-cookie/3.0.1:
     resolution: {integrity: sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==}
@@ -20827,20 +19207,6 @@ packages:
     hasBin: true
     dev: true
 
-  /trim-newlines/1.0.0:
-    resolution: {integrity: sha512-Nm4cF79FhSTzrLKGDMi3I4utBtFv8qKy4sq1enftf2gMdpqI8oVQTAfySkTz5r49giVzDj88SVZXP4CeYQwjaw==}
-    engines: {node: '>=0.10.0'}
-    dev: true
-    optional: true
-
-  /trim-trailing-lines/1.1.4:
-    resolution: {integrity: sha512-rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ==}
-    dev: true
-
-  /trim/0.0.1:
-    resolution: {integrity: sha512-YzQV+TZg4AxpKxaTHK3c3D+kRDCGVEE7LemdlQZoQXn0iennk10RsIoY6ikzAqJTc9Xjl9C1/waHom/J86ziAQ==}
-    dev: true
-
   /trim/1.0.1:
     resolution: {integrity: sha512-3JVP2YVqITUisXblCDq/Bi4P9457G/sdEamInkyvCsjbTcXLXIiG7XCb4kGMFWh6JGXesS3TKxOPtrncN/xe8w==}
     dev: true
@@ -20849,10 +19215,6 @@ packages:
     resolution: {integrity: sha512-XrHUvV5HpdLmIj4uVMxHggLbFSZYIn7HEWsqePZcI50pco+MPqJ50wMGY794X7AOOhxOBAjbkqfAbEe/QMp2Lw==}
     dev: false
 
-  /trough/1.0.5:
-    resolution: {integrity: sha512-rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==}
-    dev: true
-
   /ts-dedent/2.2.0:
     resolution: {integrity: sha512-q5W7tVM71e2xjHZTlgfTDoPF/SmqKG5hddq9SzR49CH2hayqRKJtQ4mtRlSxKaJlR/+9rEM+mnBHf7I2/BQcpQ==}
     engines: {node: '>=6.10'}
@@ -20896,38 +19258,25 @@ packages:
       yargs-parser: 21.1.1
     dev: true
 
-  /ts-loader/8.4.0_ad6xlx6c2kce7qmj5vxus5gywi:
-    resolution: {integrity: sha512-6nFY3IZ2//mrPc+ImY3hNWx1vCHyEhl6V+wLmL4CZcm6g1CqX7UKrkc6y0i4FwcfOhxyMPCfaEvh20f4r9GNpw==}
-    engines: {node: '>=10.0.0'}
+  /ts-loader/9.4.2_3fkjkrd3audxnith3e7fo4fnxi:
+    resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
+    engines: {node: '>=12.0.0'}
     peerDependencies:
       typescript: '*'
-      webpack: '*'
+      webpack: ^5.0.0
     dependencies:
       chalk: 4.1.2
-      enhanced-resolve: 4.5.0
-      loader-utils: 2.0.4
+      enhanced-resolve: 5.10.0
       micromatch: 4.0.5
       semver: 7.3.8
       typescript: 4.9.4
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /ts-map/1.0.3:
     resolution: {integrity: sha512-vDWbsl26LIcPGmDpoVzjEP6+hvHZkBkLW7JpvwbCv/5IYPJlsbzCVXY3wsCeAxAUeTclNOUZxnLdGh3VBD/J6w==}
     dev: true
 
-  /ts-pnp/1.2.0_typescript@4.9.4:
-    resolution: {integrity: sha512-csd+vJOb/gkzvcCHgTGSChYpy5f1/XKNsmvBGO4JXS+z1v2HobugDz4s1IeFXM3wZB44uczs+eazB5Q/ccdhQw==}
-    engines: {node: '>=6'}
-    peerDependencies:
-      typescript: '*'
-    peerDependenciesMeta:
-      typescript:
-        optional: true
-    dependencies:
-      typescript: 4.9.4
-    dev: true
-
   /tsc-alias/1.8.2:
     resolution: {integrity: sha512-ukBkcNekOgwtnSWYLD5QsMX3yQWg7JviAs8zg3qJGgu4LGtY3tsV4G6vnqvOXIDkbC+XL9vbhObWSpRA5/6wbg==}
     hasBin: true
@@ -20999,10 +19348,6 @@ packages:
       typescript: 4.9.4
     dev: true
 
-  /tty-browserify/0.0.0:
-    resolution: {integrity: sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw==}
-    dev: true
-
   /tunnel-agent/0.6.0:
     resolution: {integrity: sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==}
     dependencies:
@@ -21088,6 +19433,11 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
+  /type-fest/0.16.0:
+    resolution: {integrity: sha512-eaBzG6MxNzEn9kiwvtre90cXaNLkmadMWa1zQMs3XORCXNbsH/OewwbxC5ia9dCxIxnTAsSxXJaa/p5y8DlvJg==}
+    engines: {node: '>=10'}
+    dev: true
+
   /type-fest/0.20.2:
     resolution: {integrity: sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==}
     engines: {node: '>=10'}
@@ -21107,6 +19457,11 @@ packages:
     engines: {node: '>=8'}
     dev: true
 
+  /type-fest/2.19.0:
+    resolution: {integrity: sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==}
+    engines: {node: '>=12.20'}
+    dev: true
+
   /type-is/1.6.18:
     resolution: {integrity: sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==}
     engines: {node: '>= 0.6'}
@@ -21299,13 +19654,6 @@ packages:
     resolution: {integrity: sha512-F9p7yYCn6cIW9El1zi0HI6vqpeIvBsr3dSuRO6Xuppb1u5rXpCPmMvLSyECLhybr9isec8Ohl0hPekMVrEinDA==}
     dev: true
 
-  /unherit/1.1.3:
-    resolution: {integrity: sha512-Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ==}
-    dependencies:
-      inherits: 2.0.4
-      xtend: 4.0.2
-    dev: true
-
   /unicode-canonical-property-names-ecmascript/2.0.0:
     resolution: {integrity: sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==}
     engines: {node: '>=4'}
@@ -21329,18 +19677,6 @@ packages:
     engines: {node: '>=4'}
     dev: true
 
-  /unified/9.2.0:
-    resolution: {integrity: sha512-vx2Z0vY+a3YoTj8+pttM3tiJHCwY5UFbYdiWrwBEbHmK8pvsPj2rtAX2BFfgXen8T39CJWblWRDT4L5WGXtDdg==}
-    dependencies:
-      '@types/unist': 2.0.6
-      bail: 1.0.5
-      extend: 3.0.2
-      is-buffer: 2.0.5
-      is-plain-obj: 2.1.0
-      trough: 1.0.5
-      vfile: 4.2.1
-    dev: true
-
   /union-value/1.0.1:
     resolution: {integrity: sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==}
     engines: {node: '>=0.10.0'}
@@ -21355,11 +19691,15 @@ packages:
     resolution: {integrity: sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==}
     dependencies:
       unique-slug: 2.0.2
+    dev: false
+    optional: true
 
   /unique-slug/2.0.2:
     resolution: {integrity: sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==}
     dependencies:
       imurmurhash: 0.1.4
+    dev: false
+    optional: true
 
   /unique-stream/2.3.1:
     resolution: {integrity: sha512-2nY4TnBE70yoxHkDli7DMazpWiP7xMdCYqU2nBRO0UB+ZpEkGsSija7MvmvnZFUeC+mrgiUfcHSr3LmRFIg4+A==}
@@ -21367,40 +19707,17 @@ packages:
       json-stable-stringify-without-jsonify: 1.0.1
       through2-filter: 3.0.0
 
-  /unist-builder/2.0.3:
-    resolution: {integrity: sha512-f98yt5pnlMWlzP539tPc4grGMsFaQQlP/vM396b00jngsiINumNmsY8rkXjfoi1c6QaM8nQ3vaGDuoKWbe/1Uw==}
-    dev: true
-
-  /unist-util-generated/1.1.6:
-    resolution: {integrity: sha512-cln2Mm1/CZzN5ttGK7vkoGw+RZ8VcUH6BtGbq98DDtRGquAAOXig1mrBQYelOwMXYS8rK+vZDyyojSjp7JX+Lg==}
+  /unique-string/2.0.0:
+    resolution: {integrity: sha512-uNaeirEPvpZWSgzwsPGtU2zVSTrn/8L5q/IexZmH0eH6SA73CmAA5U4GwORTxQAZs95TAXLNqeLoPPNO5gZfWg==}
+    engines: {node: '>=8'}
+    dependencies:
+      crypto-random-string: 2.0.0
     dev: true
 
   /unist-util-is/4.1.0:
     resolution: {integrity: sha512-ZOQSsnce92GrxSqlnEEseX0gi7GH9zTJZ0p9dtu87WRb/37mMPO2Ilx1s/t9vBHrFhbgweUwb+t7cIn5dxPhZg==}
     dev: true
 
-  /unist-util-position/3.1.0:
-    resolution: {integrity: sha512-w+PkwCbYSFw8vpgWD0v7zRCl1FpY3fjDSQ3/N/wNd9Ffa4gPi8+4keqt99N3XW6F99t/mUzp2xAhNmfKWp95QA==}
-    dev: true
-
-  /unist-util-remove-position/2.0.1:
-    resolution: {integrity: sha512-fDZsLYIe2uT+oGFnuZmy73K6ZxOPG/Qcm+w7jbEjaFcJgbQ6cqjs/eSPzXhsmGpAsWPkqZM9pYjww5QTn3LHMA==}
-    dependencies:
-      unist-util-visit: 2.0.3
-    dev: true
-
-  /unist-util-remove/2.1.0:
-    resolution: {integrity: sha512-J8NYPyBm4baYLdCbjmf1bhPu45Cr1MWTm77qd9istEkzWpnN6O9tMsEbB2JhNnBCqGENRqEWomQ+He6au0B27Q==}
-    dependencies:
-      unist-util-is: 4.1.0
-    dev: true
-
-  /unist-util-stringify-position/2.0.3:
-    resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==}
-    dependencies:
-      '@types/unist': 2.0.6
-    dev: true
-
   /unist-util-visit-parents/3.1.1:
     resolution: {integrity: sha512-1KROIZWo6bcMrZEwiH2UrXDyalAa0uqzWCxCJj6lPOvTve2WkfgCytoDTPaMnodXh1WrXOq0haVYHj99ynJlsg==}
     dependencies:
@@ -21432,6 +19749,15 @@ packages:
     resolution: {integrity: sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==}
     engines: {node: '>= 0.8'}
 
+  /unplugin/0.10.2:
+    resolution: {integrity: sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA==}
+    dependencies:
+      acorn: 8.8.1
+      chokidar: 3.5.2
+      webpack-sources: 3.2.3
+      webpack-virtual-modules: 0.4.6
+    dev: true
+
   /unset-value/1.0.0:
     resolution: {integrity: sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==}
     engines: {node: '>=0.10.0'}
@@ -21440,14 +19766,6 @@ packages:
       isobject: 3.0.1
     dev: true
 
-  /untildify/2.1.0:
-    resolution: {integrity: sha512-sJjbDp2GodvkB0FZZcn7k6afVisqX5BZD7Yq3xp4nN2O15BBK0cLm3Vwn2vQaF7UDS0UUsrQMkkplmDI5fskig==}
-    engines: {node: '>=0.10.0'}
-    dependencies:
-      os-homedir: 1.0.2
-    dev: true
-    optional: true
-
   /untildify/4.0.0:
     resolution: {integrity: sha512-KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==}
     engines: {node: '>=8'}
@@ -21485,23 +19803,6 @@ packages:
     deprecated: Please see https://github.com/lydell/urix#deprecated
     dev: true
 
-  /url-loader/4.1.1_lit45vopotvaqup7lrvlnvtxwy:
-    resolution: {integrity: sha512-3BTV812+AVHHOJQO8O5MkWgZ5aosP7GnROJwvzLS9hWDj00lZ6Z0wNak423Lp9PBZN05N+Jk/N5Si8jRAlGyWA==}
-    engines: {node: '>= 10.13.0'}
-    peerDependencies:
-      file-loader: '*'
-      webpack: ^4.0.0 || ^5.0.0
-    peerDependenciesMeta:
-      file-loader:
-        optional: true
-    dependencies:
-      file-loader: 6.2.0_webpack@4.46.0
-      loader-utils: 2.0.4
-      mime-types: 2.1.35
-      schema-utils: 3.1.1
-      webpack: 4.46.0
-    dev: true
-
   /url-parse/1.5.10:
     resolution: {integrity: sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==}
     dependencies:
@@ -21520,13 +19821,6 @@ packages:
       querystring: 0.2.0
     dev: false
 
-  /url/0.11.0:
-    resolution: {integrity: sha512-kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ==}
-    dependencies:
-      punycode: 1.3.2
-      querystring: 0.2.0
-    dev: true
-
   /urllib/2.39.1:
     resolution: {integrity: sha512-c3sLtY8uhc/WoyJt/nNcEwO4fFC9sFYMQmU5NKoUz9OqUYrPSbYFPflocZCA5oCTavky9weK+YA2EHjsva9AwQ==}
     engines: {node: '>= 0.10.0'}
@@ -21550,6 +19844,17 @@ packages:
       - supports-color
     dev: false
 
+  /use-resize-observer/9.1.0_6l5554ty5ajsajah6yazvrjhoe:
+    resolution: {integrity: sha512-R25VqO9Wb3asSD4eqtcxk8sJalvIOYBqS8MNZlpDSQ4l4xMQxC/J7Id9HoTqPq8FwULIn0PVW+OAqF2dyYbjow==}
+    peerDependencies:
+      react: 16.8.0 - 18
+      react-dom: 16.8.0 - 18
+    dependencies:
+      '@juggle/resize-observer': 3.4.0
+      react: 17.0.2
+      react-dom: 18.2.0_react@17.0.2
+    dev: true
+
   /use/3.1.1:
     resolution: {integrity: sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==}
     engines: {node: '>=0.10.0'}
@@ -21568,13 +19873,6 @@ packages:
   /util-deprecate/1.0.2:
     resolution: {integrity: sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==}
 
-  /util.promisify/1.0.0:
-    resolution: {integrity: sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==}
-    dependencies:
-      define-properties: 1.1.4
-      object.getownpropertydescriptors: 2.1.5
-    dev: true
-
   /util.promisify/1.1.1:
     resolution: {integrity: sha512-/s3UsZUrIfa6xDhr7zZhnE9SLQ5RIXyYfiVnMMyMDzOc8WhWN4Nbh36H842OyurKbCDAesZOJaVyvmSl6fhGQw==}
     dependencies:
@@ -21585,18 +19883,6 @@ packages:
       object.getownpropertydescriptors: 2.1.4
     dev: false
 
-  /util/0.10.3:
-    resolution: {integrity: sha512-5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ==}
-    dependencies:
-      inherits: 2.0.1
-    dev: true
-
-  /util/0.11.1:
-    resolution: {integrity: sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==}
-    dependencies:
-      inherits: 2.0.3
-    dev: true
-
   /util/0.12.4:
     resolution: {integrity: sha512-bxZ9qtSlGUWSOy9Qa9Xgk11kSslpuZwaxCg4sNIDj6FLucDab2JxnHwyNTCpHMtK1MjoQiWQ6DiUMZYbSrO+Sw==}
     dependencies:
@@ -21656,6 +19942,7 @@ packages:
     resolution: {integrity: sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==}
     deprecated: Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.
     hasBin: true
+    dev: false
 
   /uuid/8.0.0:
     resolution: {integrity: sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw==}
@@ -21720,26 +20007,6 @@ packages:
       core-util-is: 1.0.2
       extsprintf: 1.3.0
 
-  /vfile-location/3.2.0:
-    resolution: {integrity: sha512-aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA==}
-    dev: true
-
-  /vfile-message/2.0.4:
-    resolution: {integrity: sha512-DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==}
-    dependencies:
-      '@types/unist': 2.0.6
-      unist-util-stringify-position: 2.0.3
-    dev: true
-
-  /vfile/4.2.1:
-    resolution: {integrity: sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==}
-    dependencies:
-      '@types/unist': 2.0.6
-      is-buffer: 2.0.5
-      unist-util-stringify-position: 2.0.3
-      vfile-message: 2.0.4
-    dev: true
-
   /vinyl-fs/3.0.3:
     resolution: {integrity: sha512-vIu34EkyNyJxmP0jscNzWBSygh7VWhqun6RmqVfXePrOwi9lhvRs//dOaGOTRUQr4tx7/zd26Tk5WeSVZitgng==}
     engines: {node: '>= 0.10'}
@@ -21811,7 +20078,7 @@ packages:
       - terser
     dev: true
 
-  /vite-node/0.28.4_uuaiuqsfc4gpri2fkjqkscjfse:
+  /vite-node/0.28.4_qunqnclgus7a37wov3mdiagm7e:
     resolution: {integrity: sha512-KM0Q0uSG/xHHKOJvVHc5xDBabgt0l70y7/lWTR7Q0pR5/MrYxadT+y32cJOE65FfjGmJgxpVEEY+69btJgcXOQ==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
@@ -21823,7 +20090,7 @@ packages:
       picocolors: 1.0.0
       source-map: 0.6.1
       source-map-support: 0.5.21
-      vite: 4.0.4_uuaiuqsfc4gpri2fkjqkscjfse
+      vite: 4.0.4_qunqnclgus7a37wov3mdiagm7e
     transitivePeerDependencies:
       - '@types/node'
       - less
@@ -21878,7 +20145,7 @@ packages:
       fsevents: 2.3.2
     dev: true
 
-  /vite/4.0.4_sass@1.55.0+terser@5.16.1:
+  /vite/4.0.4_qunqnclgus7a37wov3mdiagm7e:
     resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -21903,17 +20170,17 @@ packages:
       terser:
         optional: true
     dependencies:
+      '@types/node': 16.18.12
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
       rollup: 3.10.0
-      sass: 1.55.0
-      terser: 5.16.1
+      sass: 1.58.0
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vite/4.0.4_sass@1.57.1:
+  /vite/4.0.4_sass@1.55.0+terser@5.16.1:
     resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -21942,12 +20209,13 @@ packages:
       postcss: 8.4.21
       resolve: 1.22.1
       rollup: 3.10.0
-      sass: 1.57.1
+      sass: 1.55.0
+      terser: 5.16.1
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vite/4.0.4_uuaiuqsfc4gpri2fkjqkscjfse:
+  /vite/4.0.4_sass@1.58.0:
     resolution: {integrity: sha512-xevPU7M8FU0i/80DMR+YhgrzR5KS2ORy1B4xcX/cXLsvnUWvfHuqMmVU6N0YiJ4JWGRJJsLCgjEzKjG9/GKoSw==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
@@ -21972,17 +20240,16 @@ packages:
       terser:
         optional: true
     dependencies:
-      '@types/node': 16.18.12
       esbuild: 0.16.17
       postcss: 8.4.21
       resolve: 1.22.1
       rollup: 3.10.0
-      sass: 1.57.1
+      sass: 1.58.0
     optionalDependencies:
       fsevents: 2.3.2
     dev: true
 
-  /vitest/0.28.4_jsdom@21.0.0+sass@1.57.1:
+  /vitest/0.28.4_jsdom@21.1.0+sass@1.58.0:
     resolution: {integrity: sha512-sfWIy0AdlbyGRhunm+TLQEJrFH9XuRPdApfubsyLcDbCRrUX717BRQKInTgzEfyl2Ipi1HWoHB84Nqtcwxogcg==}
     engines: {node: '>=v14.16.0'}
     hasBin: true
@@ -22016,7 +20283,7 @@ packages:
       cac: 6.7.14
       chai: 4.3.7
       debug: 4.3.4
-      jsdom: 21.0.0
+      jsdom: 21.1.0
       local-pkg: 0.4.2
       pathe: 1.1.0
       picocolors: 1.0.0
@@ -22026,8 +20293,8 @@ packages:
       tinybench: 2.3.1
       tinypool: 0.3.1
       tinyspy: 1.0.2
-      vite: 4.0.4_uuaiuqsfc4gpri2fkjqkscjfse
-      vite-node: 0.28.4_uuaiuqsfc4gpri2fkjqkscjfse
+      vite: 4.0.4_qunqnclgus7a37wov3mdiagm7e
+      vite-node: 0.28.4_qunqnclgus7a37wov3mdiagm7e
       why-is-node-running: 2.2.2
     transitivePeerDependencies:
       - less
@@ -22093,10 +20360,6 @@ packages:
       - terser
     dev: true
 
-  /vm-browserify/1.1.2:
-    resolution: {integrity: sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==}
-    dev: true
-
   /vm2/3.9.11:
     resolution: {integrity: sha512-PFG8iJRSjvvBdisowQ7iVF580DXb1uCIiGaXgm7tynMR1uTBlv7UJlB1zdv5KJ+Tmq1f0Upnj3fayoEOPpCBKg==}
     engines: {node: '>=6.0'}
@@ -22167,7 +20430,7 @@ packages:
       - vue
     dev: true
 
-  /vue-docgen-loader/1.5.1_awh5tkduz2tly6kx55g4apqcei:
+  /vue-docgen-loader/1.5.1_yl6fzifju7igosbqtgzpjuylxi:
     resolution: {integrity: sha512-coMmQYsg+fy18SVtBNU7/tztdqEyrneFfwQFLmx8O7jaJ11VZ//9tRWXlwGzJM07cPRwMHDKMlAdWrpuw3U46A==}
     engines: {node: '>= 8.16'}
     peerDependencies:
@@ -22179,7 +20442,7 @@ packages:
       loader-utils: 1.4.2
       querystring: 0.2.1
       vue-docgen-api: 4.56.4_vue@2.7.14
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
     transitivePeerDependencies:
       - '@babel/preset-env'
       - supports-color
@@ -22244,7 +20507,7 @@ packages:
     engines: {node: '>= 10.0.0', npm: '>= 5.0.0'}
     dev: false
 
-  /vue-loader/15.10.1_kqygo6wsub6p3cpcl6idox7sza:
+  /vue-loader/15.10.1_eo5mtzohqv75mh6aooqyrh42dy:
     resolution: {integrity: sha512-SaPHK1A01VrNthlix6h1hq4uJu7S/z0kdLUb6klubo738NeQoLbS6V9/d8Pv19tU0XdQKju3D1HSKuI8wJ5wMA==}
     peerDependencies:
       '@vue/compiler-sfc': ^3.0.8
@@ -22261,13 +20524,13 @@ packages:
         optional: true
     dependencies:
       '@vue/component-compiler-utils': 3.3.0_6l5554ty5ajsajah6yazvrjhoe
-      css-loader: 6.7.3_webpack@4.46.0
+      css-loader: 6.7.3_webpack@5.75.0
       hash-sum: 1.0.2
       loader-utils: 1.4.2
       vue-hot-reload-api: 2.3.4
       vue-style-loader: 4.1.3
       vue-template-compiler: 2.7.14
-      webpack: 4.46.0
+      webpack: 5.75.0_esbuild@0.16.17
     transitivePeerDependencies:
       - arc-templates
       - atpl
@@ -22391,7 +20654,7 @@ packages:
   /vue2-boring-avatars/0.3.4:
     resolution: {integrity: sha512-N3FYX9Z6rZdTeP3BOBz2LMxlWo9WRmPF6SOsYzz+tEuUH0QjX8UD7c1X95J8pZ7cFvbh9QflVujYQRqRiiwoAg==}
     dependencies:
-      core-js: 3.27.1
+      core-js: 3.27.2
       vue: 2.7.14
       vue-color: 2.8.1
     dev: false
@@ -22399,7 +20662,7 @@ packages:
   /vue2-boring-avatars/0.3.8:
     resolution: {integrity: sha512-8vNN+zhCIiIMnSQDu0DwhJ11e9r3t4t12dromXmXDtRryBhV58NPn4XgMb4JKrBlfNK92KFrY/cxRy3nzhQfpQ==}
     dependencies:
-      core-js: 3.27.1
+      core-js: 3.27.2
       vue: 2.7.14
       vue-color: 2.8.1
     dev: false
@@ -22450,23 +20713,6 @@ packages:
       makeerror: 1.0.12
     dev: true
 
-  /watchpack-chokidar2/2.0.1:
-    resolution: {integrity: sha512-nCFfBIPKr5Sh61s4LPpy1Wtfi0HE8isJ3d2Yb5/Ppw2P2B/3eVSEBjKfN0fmHJSK14+31KwMKmcrzs2GM4P0Ww==}
-    dependencies:
-      chokidar: 3.5.2
-    dev: true
-    optional: true
-
-  /watchpack/1.7.5:
-    resolution: {integrity: sha512-9P3MWk6SrKjHsGkLT2KHXdQ/9SNkyoJbabxnKOoJepsvJjJG8uYTR3yTPxPQvNDI3w4Nz1xnE0TLHK4RIVe/MQ==}
-    dependencies:
-      graceful-fs: 4.2.10
-      neo-async: 2.6.2
-    optionalDependencies:
-      chokidar: 3.5.2
-      watchpack-chokidar2: 2.0.1
-    dev: true
-
   /watchpack/2.4.0:
     resolution: {integrity: sha512-Lcvm7MGST/4fup+ifyKi2hjyIAwcdI4HRgtvTpIUxBRhB+RFtUh8XtDOxUfctVCnhVi+QQj49i91OyvzkJl6cg==}
     engines: {node: '>=10.13.0'}
@@ -22475,10 +20721,6 @@ packages:
       graceful-fs: 4.2.10
     dev: true
 
-  /web-namespaces/1.1.4:
-    resolution: {integrity: sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw==}
-    dev: true
-
   /webidl-conversions/3.0.1:
     resolution: {integrity: sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==}
 
@@ -22486,27 +20728,18 @@ packages:
     resolution: {integrity: sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==}
     engines: {node: '>=12'}
 
-  /webpack-dev-middleware/3.7.3_webpack@4.46.0:
-    resolution: {integrity: sha512-djelc/zGiz9nZj/U7PTBi2ViorGJXEWo/3ltkPbDyxCXhhEXkW0ce99falaok4TPj+AsxLiXJR0EBOb0zh9fKQ==}
-    engines: {node: '>= 6'}
+  /webpack-dev-middleware/5.3.3_webpack@5.75.0:
+    resolution: {integrity: sha512-hj5CYrY0bZLB+eTO+x/j67Pkrquiy7kWepMHmUMoPsmcUaeEnQJqFzHJOyxgWlq746/wUuA64p9ta34Kyb01pA==}
+    engines: {node: '>= 12.13.0'}
     peerDependencies:
       webpack: ^4.0.0 || ^5.0.0
     dependencies:
-      memory-fs: 0.4.1
-      mime: 2.6.0
-      mkdirp: 0.5.6
+      colorette: 2.0.19
+      memfs: 3.4.13
+      mime-types: 2.1.35
       range-parser: 1.2.1
-      webpack: 4.46.0
-      webpack-log: 2.0.0
-    dev: true
-
-  /webpack-filter-warnings-plugin/1.2.1_webpack@4.46.0:
-    resolution: {integrity: sha512-Ez6ytc9IseDMLPo0qCuNNYzgtUl8NovOqjIq4uAU8LTD4uoa1w1KpZyyzFtLTEMZpkkOkLfL9eN+KGYdk1Qtwg==}
-    engines: {node: '>= 4.3 < 5.0.0 || >= 5.10'}
-    peerDependencies:
-      webpack: ^2.0.0 || ^3.0.0 || ^4.0.0
-    dependencies:
-      webpack: 4.46.0
+      schema-utils: 4.0.0
+      webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
   /webpack-hot-middleware/2.25.3:
@@ -22517,67 +20750,93 @@ packages:
       strip-ansi: 6.0.1
     dev: true
 
-  /webpack-log/2.0.0:
-    resolution: {integrity: sha512-cX8G2vR/85UYG59FgkoMamwHUIkSSlV3bBMRsbxVXVUk2j6NleCKjQ/WE9eYg9WY4w25O9w8wKP4rzNZFmUcUg==}
-    engines: {node: '>= 6'}
-    dependencies:
-      ansi-colors: 3.2.4
-      uuid: 3.4.0
+  /webpack-sources/3.2.3:
+    resolution: {integrity: sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==}
+    engines: {node: '>=10.13.0'}
     dev: true
 
-  /webpack-sources/1.4.3:
-    resolution: {integrity: sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==}
-    dependencies:
-      source-list-map: 2.0.1
-      source-map: 0.6.1
+  /webpack-virtual-modules/0.4.6:
+    resolution: {integrity: sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==}
     dev: true
 
-  /webpack-virtual-modules/0.2.2:
-    resolution: {integrity: sha512-kDUmfm3BZrei0y+1NTHJInejzxfhtU8eDj2M7OKb2IWrPFAeO1SOH2KuQ68MSZu9IGEHcxbkKKR1v18FrUSOmA==}
+  /webpack/5.75.0:
+    resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
+    engines: {node: '>=10.13.0'}
+    hasBin: true
+    peerDependencies:
+      webpack-cli: '*'
+    peerDependenciesMeta:
+      webpack-cli:
+        optional: true
     dependencies:
-      debug: 3.2.7
+      '@types/eslint-scope': 3.7.4
+      '@types/estree': 0.0.51
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/wasm-edit': 1.11.1
+      '@webassemblyjs/wasm-parser': 1.11.1
+      acorn: 8.8.1
+      acorn-import-assertions: 1.8.0_acorn@8.8.1
+      browserslist: 4.21.4
+      chrome-trace-event: 1.0.3
+      enhanced-resolve: 5.10.0
+      es-module-lexer: 0.9.3
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.10
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
+      neo-async: 2.6.2
+      schema-utils: 3.1.1
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.6_webpack@5.75.0
+      watchpack: 2.4.0
+      webpack-sources: 3.2.3
     transitivePeerDependencies:
-      - supports-color
+      - '@swc/core'
+      - esbuild
+      - uglify-js
     dev: true
 
-  /webpack/4.46.0:
-    resolution: {integrity: sha512-6jJuJjg8znb/xRItk7bkT0+Q7AHCYjjFnvKIWQPkNIOyRqoCGvkOs0ipeQzrqz4l5FtN5ZI/ukEHroeX/o1/5Q==}
-    engines: {node: '>=6.11.5'}
+  /webpack/5.75.0_esbuild@0.16.17:
+    resolution: {integrity: sha512-piaIaoVJlqMsPtX/+3KTTO6jfvrSYgauFVdt8cr9LTHKmcq/AMd4mhzsiP7ZF/PGRNPGA8336jldh9l2Kt2ogQ==}
+    engines: {node: '>=10.13.0'}
     hasBin: true
     peerDependencies:
       webpack-cli: '*'
-      webpack-command: '*'
     peerDependenciesMeta:
       webpack-cli:
         optional: true
-      webpack-command:
-        optional: true
     dependencies:
-      '@webassemblyjs/ast': 1.9.0
-      '@webassemblyjs/helper-module-context': 1.9.0
-      '@webassemblyjs/wasm-edit': 1.9.0
-      '@webassemblyjs/wasm-parser': 1.9.0
-      acorn: 6.4.2
-      ajv: 6.12.6
-      ajv-keywords: 3.5.2_ajv@6.12.6
+      '@types/eslint-scope': 3.7.4
+      '@types/estree': 0.0.51
+      '@webassemblyjs/ast': 1.11.1
+      '@webassemblyjs/wasm-edit': 1.11.1
+      '@webassemblyjs/wasm-parser': 1.11.1
+      acorn: 8.8.1
+      acorn-import-assertions: 1.8.0_acorn@8.8.1
+      browserslist: 4.21.4
       chrome-trace-event: 1.0.3
-      enhanced-resolve: 4.5.0
-      eslint-scope: 4.0.3
-      json-parse-better-errors: 1.0.2
-      loader-runner: 2.4.0
-      loader-utils: 1.4.2
-      memory-fs: 0.4.1
-      micromatch: 3.1.10
-      mkdirp: 0.5.6
+      enhanced-resolve: 5.10.0
+      es-module-lexer: 0.9.3
+      eslint-scope: 5.1.1
+      events: 3.3.0
+      glob-to-regexp: 0.4.1
+      graceful-fs: 4.2.10
+      json-parse-even-better-errors: 2.3.1
+      loader-runner: 4.3.0
+      mime-types: 2.1.35
       neo-async: 2.6.2
-      node-libs-browser: 2.2.1
-      schema-utils: 1.0.0
-      tapable: 1.1.3
-      terser-webpack-plugin: 1.4.5_webpack@4.46.0
-      watchpack: 1.7.5
-      webpack-sources: 1.4.3
+      schema-utils: 3.1.1
+      tapable: 2.2.1
+      terser-webpack-plugin: 5.3.6_htvmhiqynazf46fjrszipnqp7a
+      watchpack: 2.4.0
+      webpack-sources: 3.2.3
     transitivePeerDependencies:
-      - supports-color
+      - '@swc/core'
+      - esbuild
+      - uglify-js
     dev: true
 
   /whatwg-encoding/2.0.0:
@@ -22747,12 +21006,6 @@ packages:
   /wordwrap/1.0.0:
     resolution: {integrity: sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==}
 
-  /worker-farm/1.7.0:
-    resolution: {integrity: sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==}
-    dependencies:
-      errno: 0.1.8
-    dev: true
-
   /wrap-ansi/2.1.0:
     resolution: {integrity: sha512-vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==}
     engines: {node: '>=0.10.0'}
@@ -22826,6 +21079,20 @@ packages:
       write-file-atomic: 3.0.3
     dev: true
 
+  /ws/6.2.2:
+    resolution: {integrity: sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==}
+    peerDependencies:
+      bufferutil: ^4.0.1
+      utf-8-validate: ^5.0.2
+    peerDependenciesMeta:
+      bufferutil:
+        optional: true
+      utf-8-validate:
+        optional: true
+    dependencies:
+      async-limiter: 1.0.1
+    dev: true
+
   /ws/7.5.9:
     resolution: {integrity: sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q==}
     engines: {node: '>=8.3.0'}
@@ -22851,13 +21118,6 @@ packages:
       utf-8-validate:
         optional: true
 
-  /x-default-browser/0.4.0:
-    resolution: {integrity: sha512-7LKo7RtWfoFN/rHx1UELv/2zHGMx8MkZKDq1xENmOCTkfIqZJ0zZ26NEJX8czhnPXVcqS0ARjjfJB+eJ0/5Cvw==}
-    hasBin: true
-    optionalDependencies:
-      default-browser-id: 1.0.4
-    dev: true
-
   /xlsx/0.17.5:
     resolution: {integrity: sha512-lXNU0TuYsvElzvtI6O7WIVb9Zar1XYw7Xb3VAx2wn8N/n0whBYrCnHMxtFyIiUU1Wjf09WzmLALDfBO5PqTb1g==}
     engines: {node: '>=0.8'}
@@ -23128,7 +21388,3 @@ packages:
     optionalDependencies:
       commander: 2.20.3
     dev: true
-
-  /zwitch/1.0.5:
-    resolution: {integrity: sha512-V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==}
-    dev: true

From b25c10a0e16cdc9881defbc97dfac47935514462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 14 Feb 2023 13:00:15 +0100
Subject: [PATCH 212/358] ci: Update the "Check Documentation URLs" workflow
 (no-changelog) (#5473)

* ci: Update the "Check Documentation URLs" workflow (no-changelog)

* fix the documentation url for HtmlExtract node
---
 .github/workflows/check-documentation-urls.yml              | 6 ++++--
 package.json                                                | 1 +
 packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json | 2 +-
 pnpm-lock.yaml                                              | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/check-documentation-urls.yml b/.github/workflows/check-documentation-urls.yml
index f32fc6f1654aca..c8e405457ddf25 100644
--- a/.github/workflows/check-documentation-urls.yml
+++ b/.github/workflows/check-documentation-urls.yml
@@ -4,10 +4,12 @@ on:
   push:
     tags:
       - n8n@*
+  schedule:
+    - cron: '0 0 * * *'
   workflow_dispatch:
 
 jobs:
-  build:
+  check-docs-urls:
     runs-on: ubuntu-latest
 
     timeout-minutes: 5
@@ -23,7 +25,7 @@ jobs:
           cache: 'pnpm'
 
       - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+        run: pnpm install
 
       - name: Build nodes-base
         run: pnpm --filter n8n-workflow --filter=n8n-core --filter=n8n-nodes-base build
diff --git a/package.json b/package.json
index 37ec66c9186df0..190ba8cc5584fe 100644
--- a/package.json
+++ b/package.json
@@ -49,6 +49,7 @@
     "jest-mock": "^29.4.2",
     "nock": "^13.2.9",
     "node-fetch": "^2.6.7",
+    "p-limit": "^3.1.0",
     "prettier": "^2.8.3",
     "rimraf": "^3.0.2",
     "run-script-os": "^1.0.7",
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
index 08432a4cc2e4eb..d4434eed4ca3c5 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.htmlextract/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.html/"
 			}
 		],
 		"generic": [
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 887327f2b5fb98..d56810db3856f3 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -39,6 +39,7 @@ importers:
       n8n: '*'
       nock: ^13.2.9
       node-fetch: ^2.6.7
+      p-limit: ^3.1.0
       prettier: ^2.8.3
       rimraf: ^3.0.2
       run-script-os: ^1.0.7
@@ -62,6 +63,7 @@ importers:
       jest-mock: 29.4.2
       nock: 13.2.9
       node-fetch: 2.6.7
+      p-limit: 3.1.0
       prettier: 2.8.3
       rimraf: 3.0.2
       run-script-os: 1.1.6

From 246189f6dae2ce96dabd900ce0a192de731cc6aa Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 14 Feb 2023 16:13:00 +0200
Subject: [PATCH 213/358] feat: Add workflow and credential sharing access e2e
 tests (#5463)

feat: add workflow and credential sharing access e2e tests
---
 cypress/e2e/17-sharing.cy.ts                  | 168 ++++++++++++++++++
 cypress/pages/modals/credentials-modal.ts     |  14 ++
 cypress/pages/modals/index.ts                 |   1 +
 .../pages/modals/workflow-sharing-modal.ts    |  26 +++
 cypress/pages/ndv.ts                          |  29 +--
 cypress/pages/workflow.ts                     |  12 +-
 cypress/support/commands.ts                   |   5 +-
 .../CredentialEdit/CredentialSharing.ee.vue   |   1 +
 .../src/components/NodeCredentials.vue        |   1 +
 .../src/components/WorkflowShareModal.ee.vue  |   4 +-
 10 files changed, 239 insertions(+), 22 deletions(-)
 create mode 100644 cypress/e2e/17-sharing.cy.ts
 create mode 100644 cypress/pages/modals/workflow-sharing-modal.ts

diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
new file mode 100644
index 00000000000000..9bb11293f449c5
--- /dev/null
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -0,0 +1,168 @@
+import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
+import {
+	CredentialsModal,
+	CredentialsPage,
+	NDV,
+	WorkflowPage,
+	WorkflowSharingModal,
+	WorkflowsPage,
+} from '../pages';
+
+/**
+ * User U1 - Instance owner
+ * User U2 - User, owns C1, W1, W2
+ * User U3 - User, owns C2
+ *
+ * W1 - Workflow owned by User U2, shared with User U3
+ * W2 - Workflow owned by User U2
+ *
+ * C1 - Credential owned by User U2
+ * C2 - Credential owned by User U3, shared with User U1 and User U2
+ */
+
+const credentialsPage = new CredentialsPage();
+const credentialsModal = new CredentialsModal();
+
+const workflowsPage = new WorkflowsPage();
+const workflowPage = new WorkflowPage();
+const workflowSharingModal = new WorkflowSharingModal();
+const ndv = new NDV();
+
+const instanceOwner = {
+	email: `${DEFAULT_USER_EMAIL}one`,
+	password: DEFAULT_USER_PASSWORD,
+	firstName: 'User',
+	lastName: 'U1',
+};
+
+const users = [
+	{
+		email: `${DEFAULT_USER_EMAIL}two`,
+		password: DEFAULT_USER_PASSWORD,
+		firstName: 'User',
+		lastName: 'U2',
+	},
+	{
+		email: `${DEFAULT_USER_EMAIL}three`,
+		password: DEFAULT_USER_PASSWORD,
+		firstName: 'User',
+		lastName: 'U3',
+	},
+];
+
+describe('Sharing', () => {
+	before(() => {
+		cy.resetAll();
+		cy.setupOwner(instanceOwner);
+	});
+
+	beforeEach(() => {
+		cy.on('uncaught:exception', (err, runnable) => {
+			expect(err.message).to.include('Not logged in');
+			return false;
+		});
+	});
+
+	it('should invite User U2 and User U3 to instance', () => {
+		cy.inviteUsers({ instanceOwner, users });
+	});
+
+	let workflowW2Url = '';
+	it('should create C1, W1, W2, share W1 with U3, as U2', () => {
+		cy.signin(users[0]);
+
+		cy.visit(credentialsPage.url);
+		credentialsPage.getters.emptyListCreateCredentialButton().click();
+		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
+		credentialsModal.getters.newCredentialTypeButton().click();
+		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
+		credentialsModal.actions.setName('Credential C1');
+		credentialsModal.actions.save();
+		credentialsModal.actions.close();
+
+		cy.visit(workflowsPage.url);
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		workflowPage.actions.setWorkflowName('Workflow W1');
+		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addNodeToCanvas('Notion', true, true);
+		ndv.getters.credentialInput().should('contain', 'Credential C1');
+		ndv.actions.close();
+
+		workflowPage.actions.openShareModal();
+		workflowSharingModal.actions.addUser(users[1].email);
+		workflowSharingModal.actions.save();
+		workflowPage.actions.saveWorkflowOnButtonClick();
+
+		cy.visit(workflowsPage.url);
+		workflowsPage.getters.createWorkflowButton().click();
+		cy.createFixtureWorkflow('Test_workflow_1.json', 'Workflow W2');
+		cy.url().then((url) => {
+			workflowW2Url = url;
+		});
+	});
+
+	it('should create C2, share C2 with U1 and U2, as U3', () => {
+		cy.signin(users[1]);
+
+		cy.visit(credentialsPage.url);
+		credentialsPage.getters.emptyListCreateCredentialButton().click();
+		credentialsModal.getters.newCredentialTypeOption('Airtable API').click();
+		credentialsModal.getters.newCredentialTypeButton().click();
+		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
+		credentialsModal.actions.setName('Credential C2');
+		credentialsModal.actions.changeTab('Sharing');
+		credentialsModal.actions.addUser(instanceOwner.email);
+		credentialsModal.actions.addUser(users[0].email);
+		credentialsModal.actions.save();
+		credentialsModal.actions.close();
+	});
+
+	it('should open W1, add node using C2 as U3', () => {
+		cy.signin(users[1]);
+
+		cy.visit(workflowsPage.url);
+		workflowsPage.getters.workflowCards().should('have.length', 1);
+		workflowsPage.getters.workflowCard('Workflow W1').click();
+		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
+		ndv.getters.credentialInput().should('contain', 'Credential C2');
+		ndv.actions.close();
+		workflowPage.actions.saveWorkflowOnButtonClick();
+
+		workflowPage.actions.openNode('Notion');
+		ndv.getters
+			.credentialInput()
+			.find('input')
+			.should('have.value', 'Credential C1')
+			.should('be.disabled');
+		ndv.actions.close();
+	});
+
+	it('should not have access to W2, as U3', () => {
+		cy.signin(users[1]);
+
+		cy.visit(workflowW2Url);
+		cy.waitForLoad();
+		cy.wait(1000);
+		cy.get('.el-notification').contains('Could not find workflow').should('be.visible');
+	});
+
+	it('should have access to W1, W2, as U1', () => {
+		cy.signin(instanceOwner);
+
+		cy.visit(workflowsPage.url);
+		workflowsPage.getters.workflowCards().should('have.length', 2);
+		workflowsPage.getters.workflowCard('Workflow W1').click();
+		workflowPage.actions.openNode('Notion');
+		ndv.getters
+			.credentialInput()
+			.find('input')
+			.should('have.value', 'Credential C1')
+			.should('be.disabled');
+		ndv.actions.close();
+
+		cy.waitForLoad();
+		cy.visit(workflowsPage.url);
+		workflowsPage.getters.workflowCard('Workflow W2').click();
+		workflowPage.actions.executeWorkflow();
+	});
+});
diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index e6ae20079f1ea4..02b267bf9fa083 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -26,8 +26,19 @@ export class CredentialsModal extends BasePage {
 		credentialAuthTypeRadioButtons: () =>
 			this.getters.credentialsAuthTypeSelector().find('label[role=radio]'),
 		credentialInputs: () => cy.getByTestId('credential-connection-parameter'),
+		menu: () => this.getters.editCredentialModal().get('.menu-container'),
+		menuItem: (name: string) => this.getters.menu().get('.n8n-menu-item').contains(name),
+		usersSelect: () => cy.getByTestId('credential-sharing-modal-users-select'),
 	};
 	actions = {
+		addUser: (email: string) => {
+			this.getters.usersSelect().click();
+			this.getters
+				.usersSelect()
+				.get('.el-select-dropdown__item')
+				.contains(email.toLowerCase())
+				.click();
+		},
 		setName: (name: string) => {
 			this.getters.name().click();
 			this.getters.nameInput().clear().type(name);
@@ -64,5 +75,8 @@ export class CredentialsModal extends BasePage {
 			this.getters.nameInput().type(newName);
 			this.getters.nameInput().type('{enter}');
 		},
+		changeTab: (tabName: string) => {
+			this.getters.menuItem(tabName).click();
+		},
 	};
 }
diff --git a/cypress/pages/modals/index.ts b/cypress/pages/modals/index.ts
index 24f5101aed2df2..3d1981d027ad2d 100644
--- a/cypress/pages/modals/index.ts
+++ b/cypress/pages/modals/index.ts
@@ -1,2 +1,3 @@
 export * from './credentials-modal';
 export * from './message-box';
+export * from './workflow-sharing-modal';
diff --git a/cypress/pages/modals/workflow-sharing-modal.ts b/cypress/pages/modals/workflow-sharing-modal.ts
new file mode 100644
index 00000000000000..c01309328675a0
--- /dev/null
+++ b/cypress/pages/modals/workflow-sharing-modal.ts
@@ -0,0 +1,26 @@
+import { BasePage } from '../base';
+
+export class WorkflowSharingModal extends BasePage {
+	getters = {
+		modal: () => cy.getByTestId('workflowShare-modal', { timeout: 5000 }),
+		usersSelect: () => cy.getByTestId('workflow-sharing-modal-users-select'),
+		saveButton: () => cy.getByTestId('workflow-sharing-modal-save-button'),
+		closeButton: () => this.getters.modal().find('.el-dialog__close').first(),
+	};
+	actions = {
+		addUser: (email: string) => {
+			this.getters.usersSelect().click();
+			this.getters
+				.usersSelect()
+				.get('.el-select-dropdown__item')
+				.contains(email.toLowerCase())
+				.click();
+		},
+		save: () => {
+			this.getters.saveButton().click();
+		},
+		closeModal: () => {
+			this.getters.closeButton().click();
+		},
+	};
+}
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 9d15a836c3a9d0..9cc0285a4fbf69 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -5,6 +5,7 @@ export class NDV extends BasePage {
 		container: () => cy.getByTestId('ndv'),
 		backToCanvas: () => cy.getByTestId('back-to-canvas'),
 		copyInput: () => cy.getByTestId('copy-input'),
+		credentialInput: (eq = 0) => cy.getByTestId('node-credentials-select').eq(eq),
 		nodeExecuteButton: () => cy.getByTestId('node-execute-button'),
 		inputSelect: () => cy.getByTestId('ndv-input-select'),
 		inputOption: () => cy.getByTestId('ndv-input-option'),
@@ -24,15 +25,22 @@ export class NDV extends BasePage {
 		outputTableRows: () => this.getters.outputDataContainer().find('table tr'),
 		outputTableHeaders: () => this.getters.outputDataContainer().find('table thead th'),
 		outputTableRow: (row: number) => this.getters.outputTableRows().eq(row),
-		outputTbodyCell: (row: number, col: number) => this.getters.outputTableRow(row).find('td').eq(col),
+		outputTbodyCell: (row: number, col: number) =>
+			this.getters.outputTableRow(row).find('td').eq(col),
 		inputTableRows: () => this.getters.inputDataContainer().find('table tr'),
 		inputTableHeaders: () => this.getters.inputDataContainer().find('table thead th'),
 		inputTableRow: (row: number) => this.getters.inputTableRows().eq(row),
-		inputTbodyCell: (row: number, col: number) => this.getters.inputTableRow(row).find('td').eq(col),
+		inputTbodyCell: (row: number, col: number) =>
+			this.getters.inputTableRow(row).find('td').eq(col),
 		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input'),
 		nodeParameters: () => cy.getByTestId('node-parameters'),
 		parameterInput: (parameterName: string) => cy.getByTestId(`parameter-input-${parameterName}`),
-		parameterExpressionPreview: (parameterName: string) => this.getters.nodeParameters().find(`[data-test-id="parameter-input-${parameterName}"] + [data-test-id="parameter-expression-preview"]`),
+		parameterExpressionPreview: (parameterName: string) =>
+			this.getters
+				.nodeParameters()
+				.find(
+					`[data-test-id="parameter-input-${parameterName}"] + [data-test-id="parameter-expression-preview"]`,
+				),
 		nodeNameContainer: () => cy.getByTestId('node-title-container'),
 		nodeRenameInput: () => cy.getByTestId('node-rename-input'),
 		executePrevious: () => cy.getByTestId('execute-previous-node'),
@@ -77,18 +85,11 @@ export class NDV extends BasePage {
 			this.getters.parameterInput(parameterName).type(content);
 		},
 		selectOptionInParameterDropdown: (parameterName: string, content: string) => {
-			this.getters
-				.parameterInput(parameterName)
-				.find('.option-headline')
-				.contains(content)
-				.click();
+			this.getters.parameterInput(parameterName).find('.option-headline').contains(content).click();
 		},
 		rename: (newName: string) => {
 			this.getters.nodeNameContainer().click();
-			this.getters.nodeRenameInput()
-				.should('be.visible')
-				.type('{selectall}')
-				.type(newName);
+			this.getters.nodeRenameInput().should('be.visible').type('{selectall}').type(newName);
 			cy.get('body').type('{enter}');
 		},
 		executePrevious: () => {
@@ -104,10 +105,10 @@ export class NDV extends BasePage {
 			cy.draganddrop('', droppable);
 		},
 		switchInputMode: (type: 'Schema' | 'Table' | 'JSON' | 'Binary') => {
-			this.getters.inputDisplayMode().find('label').contains(type).click({force: true});
+			this.getters.inputDisplayMode().find('label').contains(type).click({ force: true });
 		},
 		switchOutputMode: (type: 'Schema' | 'Table' | 'JSON' | 'Binary') => {
-			this.getters.outputDisplayMode().find('label').contains(type).click({force: true});
+			this.getters.outputDisplayMode().find('label').contains(type).click({ force: true });
 		},
 		selectInputNode: (nodeName: string) => {
 			this.getters.inputSelect().find('.el-select').click();
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index d895ccfab4b17a..f09bda9f1fc891 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -26,7 +26,7 @@ export class WorkflowPage extends BasePage {
 		canvasNodeByName: (nodeName: string) =>
 			this.getters.canvasNodes().filter(`:contains("${nodeName}")`),
 		getEndpointSelector: (type: 'input' | 'output' | 'plus', nodeName: string, index = 0) => {
-			return `[data-endpoint-name='${nodeName}'][data-endpoint-type='${type}'][data-input-index='${index}']`
+			return `[data-endpoint-name='${nodeName}'][data-endpoint-type='${type}'][data-input-index='${index}']`;
 		},
 		canvasNodeInputEndpointByName: (nodeName: string, index = 0) => {
 			return cy.get(this.getters.getEndpointSelector('input', nodeName, index));
@@ -79,7 +79,7 @@ export class WorkflowPage extends BasePage {
 		workflowSettingsSaveButton: () =>
 			cy.getByTestId('workflow-settings-save-button').find('button'),
 
-		shareButton: () => cy.getByTestId('workflow-share-button').find('button'),
+		shareButton: () => cy.getByTestId('workflow-share-button'),
 
 		duplicateWorkflowModal: () => cy.getByTestId('duplicate-modal'),
 		nodeViewBackground: () => cy.getByTestId('node-view-background'),
@@ -155,11 +155,17 @@ export class WorkflowPage extends BasePage {
 		saveWorkflowOnButtonClick: () => {
 			this.getters.saveButton().should('contain', 'Save');
 			this.getters.saveButton().click();
-			this.getters.saveButton().should('contain', 'Saved')
+			this.getters.saveButton().should('contain', 'Saved');
 		},
 		saveWorkflowUsingKeyboardShortcut: () => {
 			cy.get('body').type('{meta}', { release: false }).type('s');
 		},
+		setWorkflowName: (name: string) => {
+			this.getters.workflowNameInput().should('be.disabled');
+			this.getters.workflowNameInput().parent().click();
+			this.getters.workflowNameInput().should('be.enabled');
+			this.getters.workflowNameInput().clear().type(name).type('{enter}');
+		},
 		activateWorkflow: () => {
 			this.getters.activatorSwitch().find('input').first().should('be.enabled');
 			this.getters.activatorSwitch().click();
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index ff64f69599c3bc..445645975c7302 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -40,10 +40,7 @@ Cypress.Commands.add('createFixtureWorkflow', (fixtureKey, workflowName) => {
 	WorkflowPage.getters
 		.workflowImportInput()
 		.selectFile(`cypress/fixtures/${fixtureKey}`, { force: true });
-	WorkflowPage.getters.workflowNameInput().should('be.disabled');
-	WorkflowPage.getters.workflowNameInput().parent().click();
-	WorkflowPage.getters.workflowNameInput().should('be.enabled');
-	WorkflowPage.getters.workflowNameInput().clear().type(workflowName).type('{enter}');
+	WorkflowPage.actions.setWorkflowName(workflowName);
 
 	WorkflowPage.getters.saveButton().should('contain', 'Saved');
 });
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index 2012311bdca712..fc29c79688ac5f 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -61,6 +61,7 @@
 				:users="usersList"
 				:currentUserId="usersStore.currentUser.id"
 				:placeholder="$locale.baseText('credentialEdit.credentialSharing.select.placeholder')"
+				data-test-id="credential-sharing-modal-users-select"
 				@input="onAddSharee"
 			>
 				<template #prefix>
diff --git a/packages/editor-ui/src/components/NodeCredentials.vue b/packages/editor-ui/src/components/NodeCredentials.vue
index 1f7b551d4b2f77..cb1a1621ce8056 100644
--- a/packages/editor-ui/src/components/NodeCredentials.vue
+++ b/packages/editor-ui/src/components/NodeCredentials.vue
@@ -20,6 +20,7 @@
 						:value="getSelectedName(credentialTypeDescription.name)"
 						disabled
 						size="small"
+						data-test-id="node-credentials-select"
 					/>
 				</div>
 				<div
diff --git a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
index 8c20cd5ef3284f..6977058ef76751 100644
--- a/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
+++ b/packages/editor-ui/src/components/WorkflowShareModal.ee.vue
@@ -38,6 +38,7 @@
 						:users="usersList"
 						:currentUserId="currentUser.id"
 						:placeholder="$locale.baseText('workflows.shareModal.select.placeholder')"
+						data-test-id="workflow-sharing-modal-users-select"
 						@input="onAddSharee"
 					>
 						<template #prefix>
@@ -108,10 +109,11 @@
 				</n8n-text>
 				<n8n-button
 					v-show="workflowPermissions.updateSharing"
-					@click="onSave"
 					:loading="loading"
 					:disabled="!isDirty"
 					size="medium"
+					data-test-id="workflow-sharing-modal-save-button"
+					@click="onSave"
 				>
 					{{ $locale.baseText('workflows.shareModal.save') }}
 				</n8n-button>

From 36108f82a1c1657c3959225d0635255668bf0af6 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Tue, 14 Feb 2023 16:13:22 +0200
Subject: [PATCH 214/358] feat(editor): Add correct credential owner contact
 details for readonly credentials (#5208)

* feat: add correct credential owner contact details for readonly credentials

* chore: remove unnecessary translation

* fix: update credential owner name to be retrieved using usedCredentials

* fix: correct credentialownername getter typing
---
 .../CredentialEdit/CredentialConfig.vue       |  2 +-
 .../CredentialEdit/CredentialSharing.ee.vue   |  2 +-
 .../src/components/NodeDetailsView.vue        | 13 ++++---
 .../editor-ui/src/components/NodeSettings.vue | 38 ++++++++++++++++---
 .../src/plugins/i18n/locales/en.json          |  2 +-
 packages/editor-ui/src/stores/credentials.ts  | 14 +++++--
 6 files changed, 54 insertions(+), 17 deletions(-)

diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
index d3f132c4eba240..e2255bd90012ea 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialConfig.vue
@@ -266,7 +266,7 @@ export default mixins(restApi).extend({
 			return (this.credentialType as ICredentialType).name;
 		},
 		credentialOwnerName(): string {
-			return this.credentialsStore.getCredentialOwnerName(`${this.credentialId}`);
+			return this.credentialsStore.getCredentialOwnerNameById(`${this.credentialId}`);
 		},
 		documentationUrl(): string {
 			const type = this.credentialType as ICredentialType;
diff --git a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
index fc29c79688ac5f..10094bb05b7163 100644
--- a/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
+++ b/packages/editor-ui/src/components/CredentialEdit/CredentialSharing.ee.vue
@@ -137,7 +137,7 @@ export default mixins(showMessage).extend({
 			].concat(this.credentialData.sharedWith || []);
 		},
 		credentialOwnerName(): string {
-			return this.credentialsStore.getCredentialOwnerName(`${this.credentialId}`);
+			return this.credentialsStore.getCredentialOwnerNameById(`${this.credentialId}`);
 		},
 	},
 	methods: {
diff --git a/packages/editor-ui/src/components/NodeDetailsView.vue b/packages/editor-ui/src/components/NodeDetailsView.vue
index fcda16e6568a04..07e27bbfba90f8 100644
--- a/packages/editor-ui/src/components/NodeDetailsView.vue
+++ b/packages/editor-ui/src/components/NodeDetailsView.vue
@@ -93,7 +93,7 @@
 						:dragging="isDragging"
 						:sessionId="sessionId"
 						:nodeType="activeNodeType"
-						:hasForeignCredential="hasForeignCredential"
+						:foreignCredentials="foreignCredentials"
 						:readOnly="readOnly"
 						:blockUI="blockUi && showTriggerPanel"
 						:executable="!readOnly"
@@ -375,11 +375,11 @@ export default mixins(
 		blockUi(): boolean {
 			return this.isWorkflowRunning || this.isExecutionWaitingForWebhook;
 		},
-		hasForeignCredential(): boolean {
+		foreignCredentials(): string[] {
 			const credentials = (this.activeNode || {}).credentials;
 			const usedCredentials = this.workflowsStore.usedCredentials;
 
-			let hasForeignCredential = false;
+			const foreignCredentials: string[] = [];
 			if (
 				credentials &&
 				this.settingsStore.isEnterpriseFeatureEnabled(EnterpriseEditionFeature.Sharing)
@@ -390,12 +390,15 @@ export default mixins(
 						usedCredentials[credential.id] &&
 						!usedCredentials[credential.id].currentUserHasAccess
 					) {
-						hasForeignCredential = true;
+						foreignCredentials.push(credential.id);
 					}
 				});
 			}
 
-			return hasForeignCredential;
+			return foreignCredentials;
+		},
+		hasForeignCredential(): boolean {
+			return this.foreignCredentials.length > 0;
 		},
 	},
 	watch: {
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index b1673a6f132179..658d1076db58bb 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -82,7 +82,7 @@
 				v-if="hasForeignCredential"
 				:content="
 					$locale.baseText('nodeSettings.hasForeignCredential', {
-						interpolate: { owner: workflowOwnerName },
+						interpolate: { owner: credentialOwnerName },
 					})
 				"
 			/>
@@ -166,7 +166,14 @@ import {
 	NodeParameterValue,
 	deepCopy,
 } from 'n8n-workflow';
-import { INodeUi, INodeUpdatePropertiesInformation, IUpdateInformation } from '@/Interface';
+import {
+	ICredentialsResponse,
+	INodeUi,
+	INodeUpdatePropertiesInformation,
+	IUpdateInformation,
+	IUsedCredential,
+	IUser,
+} from '@/Interface';
 
 import {
 	COMMUNITY_NODES_INSTALLATION_DOCS_URL,
@@ -197,6 +204,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useHistoryStore } from '@/stores/history';
 import { RenameNodeCommand } from '@/models/history';
 import useWorkflowsEEStore from '@/stores/workflows.ee';
+import { useCredentialsStore } from '@/stores/credentials';
 
 export default mixins(externalHooks, nodeHelpers).extend({
 	name: 'NodeSettings',
@@ -215,6 +223,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 			useNodeTypesStore,
 			useNDVStore,
 			useUIStore,
+			useCredentialsStore,
 			useWorkflowsStore,
 			useWorkflowsEEStore,
 		),
@@ -292,6 +301,25 @@ export default mixins(externalHooks, nodeHelpers).extend({
 		workflowOwnerName(): string {
 			return this.workflowsEEStore.getWorkflowOwnerName(`${this.workflowsStore.workflowId}`);
 		},
+		hasForeignCredential(): boolean {
+			return this.foreignCredentials.length > 0;
+		},
+		usedCredentials(): IUsedCredential[] {
+			return Object.values(this.workflowsStore.usedCredentials).filter((credential) => {
+				return Object.values(this.node?.credentials || []).find((nodeCredential) => {
+					return nodeCredential.id === credential.id;
+				});
+			});
+		},
+		credentialOwnerName(): string {
+			const credential = this.usedCredentials
+				? Object.values(this.usedCredentials).find((credential) => {
+						return credential.id === this.foreignCredentials[0];
+				  })
+				: undefined;
+
+			return this.credentialsStore.getCredentialOwnerName(credential);
+		},
 	},
 	props: {
 		eventBus: {},
@@ -308,9 +336,9 @@ export default mixins(externalHooks, nodeHelpers).extend({
 			type: Boolean,
 			default: false,
 		},
-		hasForeignCredential: {
-			type: Boolean,
-			default: false,
+		foreignCredentials: {
+			type: Array as PropType<string[]>,
+			default: () => [],
 		},
 		blockUI: {
 			type: Boolean,
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 3e80d5d83cc173..20010cf8e38734 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -785,7 +785,7 @@
 	"nodeSettings.useTheHttpRequestNode": "Use the <b>HTTP Request</b> node to make a custom API call. We'll take care of the {nodeTypeDisplayName} auth for you. <a target=\"_blank\" href=\"https://docs.n8n.io/integrations/custom-operations/\">Learn more</a>",
 	"nodeSettings.waitBetweenTries.description": "How long to wait between each attempt (in milliseconds)",
 	"nodeSettings.waitBetweenTries.displayName": "Wait Between Tries (ms)",
-	"nodeSettings.hasForeignCredential": "To edit this node, either:<br/>a) Ask credential owner to share the credential with you, or<br/>b) Duplicate the node and add your own credential",
+	"nodeSettings.hasForeignCredential": "To edit this node, either:<br/>a) Ask {owner} to share the credential with you, or<br/>b) Duplicate the node and add your own credential",
 	"nodeView.addNode": "Add node",
 	"nodeView.addATriggerNodeFirst": "Add a <a data-action='showNodeCreator'>Trigger Node</a> first",
 	"nodeView.addOrEnableTriggerNode": "<a data-action='showNodeCreator'>Add</a> or enable a Trigger node to execute the workflow",
diff --git a/packages/editor-ui/src/stores/credentials.ts b/packages/editor-ui/src/stores/credentials.ts
index 2874cd8bac71c2..b3c071e2b882b8 100644
--- a/packages/editor-ui/src/stores/credentials.ts
+++ b/packages/editor-ui/src/stores/credentials.ts
@@ -1,4 +1,4 @@
-import { INodeUi } from './../Interface';
+import { INodeUi, IUsedCredential } from './../Interface';
 import {
 	createNewCredential,
 	deleteCredential,
@@ -177,13 +177,19 @@ export const useCredentialsStore = defineStore(STORES.CREDENTIALS, {
 			};
 		},
 		getCredentialOwnerName() {
-			return (credentialId: string): string => {
-				const credential = this.getCredentialById(credentialId);
-				return credential && credential.ownedBy && credential.ownedBy.firstName
+			return (credential: ICredentialsResponse | IUsedCredential | undefined): string => {
+				return credential?.ownedBy?.firstName
 					? `${credential.ownedBy.firstName} ${credential.ownedBy.lastName} (${credential.ownedBy.email})`
 					: i18n.baseText('credentialEdit.credentialSharing.info.sharee.fallback');
 			};
 		},
+		getCredentialOwnerNameById() {
+			return (credentialId: string): string => {
+				const credential = this.getCredentialById(credentialId);
+
+				return this.getCredentialOwnerName(credential);
+			};
+		},
 	},
 	actions: {
 		setCredentialTypes(credentialTypes: ICredentialType[]): void {

From 522ddfc0cd3344db3ae9f53960233c3f0c0ee51e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 14 Feb 2023 16:10:39 +0100
Subject: [PATCH 215/358] fix(editor): Fix Vite dev mode (no-changelog) (#5475)

because of the updated dev tooling in https://github.com/n8n-io/n8n/pull/5454, vite dev mode is crashing because of the `util` package looking for `process.env`.
---
 packages/editor-ui/vite.config.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
index 1c8cffa2949d72..82d3be9ee7d0d1 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.ts
@@ -51,11 +51,14 @@ const lodashAliases = ['orderBy', 'camelCase', 'cloneDeep', 'isEqual', 'startCas
 	replacement: require.resolve(`lodash-es/${name}`),
 }));
 
+const { NODE_ENV } = process.env;
+
 export default mergeConfig(
 	defineConfig({
 		define: {
 			// This causes test to fail but is required for actually running it
-			...(process.env.NODE_ENV !== 'test' ? { global: 'globalThis' } : {}),
+			...(NODE_ENV !== 'test' ? { global: 'globalThis' } : {}),
+			...(NODE_ENV === 'development' ? { process: { env: {} } } : {}),
 			BASE_PATH: `'${publicPath}'`,
 		},
 		plugins: [

From a6c59fcbc2989a7aad36eae0e843463b87bd13ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 14 Feb 2023 17:05:53 +0100
Subject: [PATCH 216/358] fix(core): Use stricter typing on queries in cli
 commands (no-changelog) (#5476)

This has been broken since TypeORM upgrade

Fixes:
https://linear.app/n8n/issue/ENG-50
https://community.n8n.io/t/execute-command-stdout/22994
---
 packages/cli/src/commands/export/credentials.ts | 9 ++++-----
 packages/cli/src/commands/export/workflow.ts    | 5 +++--
 packages/cli/src/commands/list/workflow.ts      | 7 ++++---
 packages/cli/src/commands/update/workflow.ts    | 8 +++++---
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/packages/cli/src/commands/export/credentials.ts b/packages/cli/src/commands/export/credentials.ts
index d19dd809534257..110febe25e8d10 100644
--- a/packages/cli/src/commands/export/credentials.ts
+++ b/packages/cli/src/commands/export/credentials.ts
@@ -1,10 +1,10 @@
 import { flags } from '@oclif/command';
 import fs from 'fs';
 import path from 'path';
+import type { FindOptionsWhere } from 'typeorm';
 import { Credentials, UserSettings } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
 import * as Db from '@/Db';
-import type { ICredentialsDecryptedDb } from '@/Interfaces';
+import type { ICredentialsDb, ICredentialsDecryptedDb } from '@/Interfaces';
 import { BaseCommand } from '../BaseCommand';
 
 export class ExportCredentialsCommand extends BaseCommand {
@@ -105,13 +105,12 @@ export class ExportCredentialsCommand extends BaseCommand {
 			}
 		}
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<ICredentialsDb> = {};
 		if (flags.id) {
 			findQuery.id = flags.id;
 		}
 
-		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-		const credentials = await Db.collections.Credentials.find(findQuery);
+		const credentials = await Db.collections.Credentials.findBy(findQuery);
 
 		if (flags.decrypted) {
 			const encryptionKey = await UserSettings.getEncryptionKey();
diff --git a/packages/cli/src/commands/export/workflow.ts b/packages/cli/src/commands/export/workflow.ts
index 6a3d3cdf52d55e..69f795e5bc998a 100644
--- a/packages/cli/src/commands/export/workflow.ts
+++ b/packages/cli/src/commands/export/workflow.ts
@@ -1,8 +1,9 @@
 import { flags } from '@oclif/command';
 import fs from 'fs';
 import path from 'path';
-import type { IDataObject } from 'n8n-workflow';
+import type { FindOptionsWhere } from 'typeorm';
 import * as Db from '@/Db';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { BaseCommand } from '../BaseCommand';
 
 export class ExportWorkflowsCommand extends BaseCommand {
@@ -98,7 +99,7 @@ export class ExportWorkflowsCommand extends BaseCommand {
 			}
 		}
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.id) {
 			findQuery.id = flags.id;
 		}
diff --git a/packages/cli/src/commands/list/workflow.ts b/packages/cli/src/commands/list/workflow.ts
index 240e56d4fdeddd..da9d37f81c18fb 100644
--- a/packages/cli/src/commands/list/workflow.ts
+++ b/packages/cli/src/commands/list/workflow.ts
@@ -1,6 +1,7 @@
 import { flags } from '@oclif/command';
-import type { IDataObject } from 'n8n-workflow';
+import type { FindOptionsWhere } from 'typeorm';
 import * as Db from '@/Db';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { BaseCommand } from '../BaseCommand';
 
 export class ListWorkflowCommand extends BaseCommand {
@@ -30,12 +31,12 @@ export class ListWorkflowCommand extends BaseCommand {
 			this.error('The --active flag has to be passed using true or false');
 		}
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.active !== undefined) {
 			findQuery.active = flags.active === 'true';
 		}
 
-		const workflows = await Db.collections.Workflow.find(findQuery);
+		const workflows = await Db.collections.Workflow.findBy(findQuery);
 		if (flags.onlyId) {
 			workflows.forEach((workflow) => this.logger.info(workflow.id));
 		} else {
diff --git a/packages/cli/src/commands/update/workflow.ts b/packages/cli/src/commands/update/workflow.ts
index a26fd805165604..a13721ce66a091 100644
--- a/packages/cli/src/commands/update/workflow.ts
+++ b/packages/cli/src/commands/update/workflow.ts
@@ -2,8 +2,10 @@
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable no-console */
 import { flags } from '@oclif/command';
-import type { IDataObject } from 'n8n-workflow';
+import type { FindOptionsWhere } from 'typeorm';
+import type { QueryDeepPartialEntity } from 'typeorm/query-builder/QueryPartialEntity';
 import * as Db from '@/Db';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { BaseCommand } from '../BaseCommand';
 
 export class UpdateWorkflowCommand extends BaseCommand {
@@ -43,7 +45,7 @@ export class UpdateWorkflowCommand extends BaseCommand {
 			return;
 		}
 
-		const updateQuery: IDataObject = {};
+		const updateQuery: QueryDeepPartialEntity<WorkflowEntity> = {};
 		if (flags.active === undefined) {
 			console.info('No update flag like "--active=true" has been set!');
 			return;
@@ -56,7 +58,7 @@ export class UpdateWorkflowCommand extends BaseCommand {
 
 		updateQuery.active = flags.active === 'true';
 
-		const findQuery: IDataObject = {};
+		const findQuery: FindOptionsWhere<WorkflowEntity> = {};
 		if (flags.id) {
 			this.logger.info(`Deactivating workflow with ID: ${flags.id}`);
 			findQuery.id = flags.id;

From 83505cb0d49637854dd8ec2db1a3c1910f365c6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 15 Feb 2023 09:00:41 +0100
Subject: [PATCH 217/358] ci(core): Add unit tests for "me" controller
 (no-changelog) (#5479)

---
 package.json                                  |   1 +
 .../unit/controllers/me.controller.test.ts    | 166 ++++++++++++++++++
 pnpm-lock.yaml                                |  21 +++
 3 files changed, 188 insertions(+)
 create mode 100644 packages/cli/test/unit/controllers/me.controller.test.ts

diff --git a/package.json b/package.json
index 190ba8cc5584fe..8c642daef97c50 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "jest": "^29.4.2",
     "jest-environment-jsdom": "^29.4.2",
     "jest-mock": "^29.4.2",
+    "jest-mock-extended": "^3.0.1",
     "nock": "^13.2.9",
     "node-fetch": "^2.6.7",
     "p-limit": "^3.1.0",
diff --git a/packages/cli/test/unit/controllers/me.controller.test.ts b/packages/cli/test/unit/controllers/me.controller.test.ts
new file mode 100644
index 00000000000000..1606915398c572
--- /dev/null
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -0,0 +1,166 @@
+import { CookieOptions, Response } from 'express';
+import type { Repository } from 'typeorm';
+import jwt from 'jsonwebtoken';
+import { mock, anyObject, captor } from 'jest-mock-extended';
+import type { ILogger } from 'n8n-workflow';
+import type { IExternalHooksClass, IInternalHooksClass } from '@/Interfaces';
+import type { User } from '@db/entities/User';
+import { MeController } from '@/controllers';
+import { AUTH_COOKIE_NAME } from '@/constants';
+import { BadRequestError } from '@/ResponseHelper';
+import type { AuthenticatedRequest, MeRequest } from '@/requests';
+
+describe('MeController', () => {
+	const logger = mock<ILogger>();
+	const externalHooks = mock<IExternalHooksClass>();
+	const internalHooks = mock<IInternalHooksClass>();
+	const userRepository = mock<Repository<User>>();
+
+	let controller: MeController;
+	beforeAll(() => {
+		controller = new MeController({
+			logger,
+			externalHooks,
+			internalHooks,
+			repositories: { User: userRepository },
+		});
+	});
+
+	describe('updateCurrentUser', () => {
+		it('should throw BadRequestError if email is missing in the payload', async () => {
+			const req = mock<MeRequest.Settings>({});
+			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
+				new BadRequestError('Email is mandatory'),
+			);
+		});
+
+		it('should throw BadRequestError if email is invalid', async () => {
+			const req = mock<MeRequest.Settings>({ body: { email: 'invalid-email' } });
+			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
+				new BadRequestError('Invalid email address'),
+			);
+		});
+
+		it('should update the user in the DB, and issue a new cookie', async () => {
+			const req = mock<MeRequest.Settings>({
+				user: mock({ id: '123', password: 'password', authIdentities: [] }),
+				body: { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' },
+			});
+			const res = mock<Response>();
+			userRepository.save.calledWith(anyObject()).mockResolvedValue(req.user);
+			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
+
+			await controller.updateCurrentUser(req, res);
+
+			const cookieOptions = captor<CookieOptions>();
+			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'signed-token', cookieOptions);
+			expect(cookieOptions.value.httpOnly).toBe(true);
+			expect(cookieOptions.value.sameSite).toBe('lax');
+
+			expect(externalHooks.run).toHaveBeenCalledWith('user.profile.update', [
+				req.user.email,
+				anyObject(),
+			]);
+		});
+	});
+
+	describe('updatePassword', () => {
+		const passwordHash = '$2a$10$ffitcKrHT.Ls.m9FfWrMrOod76aaI0ogKbc3S96Q320impWpCbgj6'; // Hashed 'old_password'
+
+		it('should throw if the user does not have a password set', async () => {
+			const req = mock<MeRequest.Password>({
+				user: mock({ password: undefined }),
+				body: { currentPassword: '', newPassword: '' },
+			});
+			expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+				new BadRequestError('Requesting user not set up.'),
+			);
+		});
+
+		it("should throw if currentPassword does not match the user's password", async () => {
+			const req = mock<MeRequest.Password>({
+				user: mock({ password: passwordHash }),
+				body: { currentPassword: 'not_old_password', newPassword: '' },
+			});
+			expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+				new BadRequestError('Provided current password is incorrect.'),
+			);
+		});
+
+		describe('should throw if newPassword is not valid', () => {
+			Object.entries({
+				pass: 'Password must be 8 to 64 characters long. Password must contain at least 1 number. Password must contain at least 1 uppercase letter.',
+				password:
+					'Password must contain at least 1 number. Password must contain at least 1 uppercase letter.',
+				password1: 'Password must contain at least 1 uppercase letter.',
+			}).forEach(([newPassword, errorMessage]) => {
+				it(newPassword, async () => {
+					const req = mock<MeRequest.Password>({
+						user: mock({ password: passwordHash }),
+						body: { currentPassword: 'old_password', newPassword },
+					});
+					expect(controller.updatePassword(req, mock())).rejects.toThrowError(
+						new BadRequestError(errorMessage),
+					);
+				});
+			});
+		});
+
+		it('should update the password in the DB, and issue a new cookie', async () => {
+			const req = mock<MeRequest.Password>({
+				user: mock({ password: passwordHash }),
+				body: { currentPassword: 'old_password', newPassword: 'NewPassword123' },
+			});
+			const res = mock<Response>();
+			userRepository.save.calledWith(req.user).mockResolvedValue(req.user);
+			jest.spyOn(jwt, 'sign').mockImplementation(() => 'new-signed-token');
+
+			await controller.updatePassword(req, res);
+
+			expect(req.user.password).not.toBe(passwordHash);
+
+			const cookieOptions = captor<CookieOptions>();
+			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'new-signed-token', cookieOptions);
+			expect(cookieOptions.value.httpOnly).toBe(true);
+			expect(cookieOptions.value.sameSite).toBe('lax');
+
+			expect(externalHooks.run).toHaveBeenCalledWith('user.password.update', [
+				req.user.email,
+				req.user.password,
+			]);
+
+			expect(internalHooks.onUserUpdate).toHaveBeenCalledWith({
+				user: req.user,
+				fields_changed: ['password'],
+			});
+		});
+	});
+
+	describe('API Key methods', () => {
+		let req: AuthenticatedRequest;
+		beforeAll(() => {
+			req = mock({ user: mock<Partial<User>>({ id: '123', apiKey: 'test-key' }) });
+		});
+
+		describe('createAPIKey', () => {
+			it('should create and save an API key', async () => {
+				const { apiKey } = await controller.createAPIKey(req);
+				expect(userRepository.update).toHaveBeenCalledWith(req.user.id, { apiKey });
+			});
+		});
+
+		describe('getAPIKey', () => {
+			it('should return the users api key', async () => {
+				const { apiKey } = await controller.getAPIKey(req);
+				expect(apiKey).toEqual(req.user.apiKey);
+			});
+		});
+
+		describe('deleteAPIKey', () => {
+			it('should delete the API key', async () => {
+				await controller.deleteAPIKey(req);
+				expect(userRepository.update).toHaveBeenCalledWith(req.user.id, { apiKey: null });
+			});
+		});
+	});
+});
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d56810db3856f3..923b34c5aa86cb 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -36,6 +36,7 @@ importers:
       jest: ^29.4.2
       jest-environment-jsdom: ^29.4.2
       jest-mock: ^29.4.2
+      jest-mock-extended: ^3.0.1
       n8n: '*'
       nock: ^13.2.9
       node-fetch: ^2.6.7
@@ -61,6 +62,7 @@ importers:
       jest: 29.4.2
       jest-environment-jsdom: 29.4.2
       jest-mock: 29.4.2
+      jest-mock-extended: 3.0.1_47mstovy2thvxzoe7ouhdvjexm
       nock: 13.2.9
       node-fetch: 2.6.7
       p-limit: 3.1.0
@@ -13117,6 +13119,17 @@ packages:
       stack-utils: 2.0.6
     dev: true
 
+  /jest-mock-extended/3.0.1_47mstovy2thvxzoe7ouhdvjexm:
+    resolution: {integrity: sha512-RF4Ow8pXvbRuEcCTj56oYHmig5311BSFvbEGxPNYL51wGKGu93MvVQgx0UpFmjqyBXIcElkZo2Rke88kR1iSKQ==}
+    peerDependencies:
+      jest: ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0
+      typescript: ^3.0.0 || ^4.0.0
+    dependencies:
+      jest: 29.4.2
+      ts-essentials: 7.0.3_typescript@4.9.4
+      typescript: 4.9.4
+    dev: true
+
   /jest-mock/29.4.2:
     resolution: {integrity: sha512-x1FSd4Gvx2yIahdaIKoBjwji6XpboDunSJ95RpntGrYulI1ByuYQCKN/P7hvk09JB74IonU3IPLdkutEWYt++g==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
@@ -19222,6 +19235,14 @@ packages:
     engines: {node: '>=6.10'}
     dev: true
 
+  /ts-essentials/7.0.3_typescript@4.9.4:
+    resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
+    peerDependencies:
+      typescript: '>=3.7.0'
+    dependencies:
+      typescript: 4.9.4
+    dev: true
+
   /ts-expect/1.3.0:
     resolution: {integrity: sha512-e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ==}
     dev: false

From 0cf45bc4c862c7544e69af4981d4607bf0b530e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Wed, 15 Feb 2023 10:50:16 +0100
Subject: [PATCH 218/358] fix(core): Fix data transformation function that are
 reported not to work properly (#5338)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :fire: Remove test extensions
* :construction: Add test description
* :blue_book: Expand types
* :zap: Export extensions
* :zap: Export collection
* :zap: Mark all proxies
* :pencil2: Rename for clarity
* :zap: Export from barrel
* :sparkles: Create datatype completions
* :zap: Mount datatype completions
* :test_tube: Adjust tests
* :zap: Add `path` prop
* :fire: Remove `()` from completion labels
* :zap: Filter out completions for pseudo-proxies
* :bug: Fix method error
* :zap: Add metrics
* :pencil2: Improve naming
* :sparkles: Start completion on empty resolvable
* :sparkles: Implement completion previews
* :zap: Break out completion manager
* :zap: Implement in expression editor modal
* :pencil2: Improve naming
* :zap: Filter out irrelevant completions
* :sparkles: Add preview hint
* :pencil2: Improve comments
* :art: Style preview hint
* :zap: Expand `hasNoParams`
* :zap: Add spacing for readability
* :zap: Add error codes
* :pencil2: Add comment
* :bug: Fix Esc behavior
* :zap: Parse Unicode
* :zap: Throw on invalid `DateTime`
* :zap: Fix second root completion detection
* :zap: Switch message at completable prefix position
* :bug: Fix function names for non-dev build
* :bug: Fix `json` handling
* :fire: Comment out previews
* :recycle: Apply feedback
* :fire: Remove extensions
* :truck: Rename extensions
* :zap: Adjust some implementations
* :fire: Remove dummy extensions
* :bug: Fix object regex
* :recycle: Apply feedback
* :pencil2: Fix typos
* :pencil2: Add `fn is not a function` message
* :fire: Remove check
* :sparkles: Add `isNotEmpty` for objects
* :truck: Rename `global` to `alpha`
* :fire: Remove `encrypt`
* :zap: Restore `is not a function` error
* :zap: Support `week` on `extract()`
* :test_tube: Fix tests
* :zap: Add validation to some string extensions
* :zap: Validate number arrays in some extensions
* :test_tube: Fix tests
* :pencil2: Improve error message
* :rewind: Revert extensions framework changes
* :broom: Previews cleanup
* :zap: Condense blank completions
* :zap: Refactor dollar completions
* :zap: Refactor non-dollar completions
* :zap: Refactor Luxon completions
* :zap: Refactor datatype completions
* :zap: Use `DATETIMEUNIT_MAP`
* :pencil2: Update test description
* :rewind: Revert "Use `DATETIMEUNIT_MAP`"
This reverts commit 472a77df5cd789905d162f3c3db02ac767b89b4e.
* :test_tube: Add tests
* :recycle: Restore generic extensions
* :fire: Remove logs
* :test_tube: Expand tests
* :sparkles: Add `Math` completions
* :pencil2: List breaking change
* :zap: Add doc tooltips
* :bug: Fix node selector regex
* :bug: Fix `context` resolution
* :bug: Allow dollar completions in args
* :zap: Make numeric array methods context-dependent
* :pencil: Adjust docs
* :bug: Fix selector ref
* :zap: Surface error for valid URL
* :bug: Disallow whitespace in `isEmail` check
* :test_tube: Fix test for `isUrl`
* :zap: Add comma validator in `toFloat`
* :zap: Add validation to `$jmespath()`
* :rewind: Revert valid URL error
* :zap: Adjust `$jmespath()` validation
* :test_tube: Adjust `isUrl` test
* :zap: Remove `{}` and `[]` from compact
* :pencil2: Update docs
* :truck: Rename `stripTags` to `removeTags`
* :zap: Do not inject whitespace inside resolvable
* :zap: Make completions aware of `()`
* :pencil2: Add note
* :zap: Update sorting
* :zap: Hide active node name from node selector
* :fire: Remove `length()` and its aliases
* :zap: Validate non-zero for `chunk`
* :pencil2: Reword all error messages
* :bug: Fix `$now` and `$today`
* :zap: Simplify with `stripExcessParens`
* :zap: Fold luxon into datatype
* :test_tube: Clean up tests
* :fire: Remove tests for removed methods
* :shirt: Fix type
* :arrow_up: Upgrade lang pack
* :rewind: Undo change to `vitest` command
* :fire: Remove unused method
* :zap: Separate `return` line
* :pencil2: Improve description
* :test_tube: Expand tests for initial-only completions
* :test_tube: Add bracket-aware completions
* :zap: Make check for `all()` stricter
* :pencil2: Adjust explanatory comments
* :fire: Remove unneded copy
* :fire: Remove outdated comment
* :zap: Make naming consistent
* :pencil2: Update comments
* :zap: Improve URL scheme check
* :pencil2: Add comment
* :truck: Move extension
* :pencil2: Update `BREAKING-CHANGES.md`
* :pencil2: Update upcoming version
* :pencil2: Fix grammar
* :pencil2: Shorten message
* :bug: Fix `Esc` behavior
* :bug: Fix `isNumeric`
* ✨ Using UTC to handle-dates on back-end
* ✅ Added more unit tests for date extensions
* ⚡ Not using `JSON.stringify` to render dates
* ⚡ Using `deep-equal` library instead of our `deepCompare` function
* ✅ Adding more tests to array extensions
* ⚡ Fixing `inBetween` extension function
* ✅ Added tests for `.inBetween()`
* ⚡ Updating `isEven` and `isOdd` to throw for floats
* ⚡ Updating `Array.merge()` so it works without arguments
* 🔀 Fixing leftover merge confilct
* ⚡ Updating `removeFieldsContaining` and `keepFieldsContaining` to throw on empty strings
* ⚡ Fixing `pluck()` so it returns only plucked values
* ⬆️ Updating pnpm lockfile
* 👕 Fixing lint errors
* ⚡ Using workflow timezone to display dates
* ✔️ Updating tests with workflow timezone
* ⚡ Not using system timezone when creating Luxon dates
* ⚡ Updating `merge()` and `pluck()` array functions
* 🔀 Sync with `master`: Removing code that was preserved during merge
* ⚡ Updating `.pluck()` to return full array if no arguments are passed
* ⚡ Updating `keepFieldsContaining` and `merge` object functions
* ⚡ Using week as default for `date.extract()`
* ✅ Adding more test cases for DT functions
* ⚡ Removing `Object.merge` extension function. Adding missing `deep-equal` dependency
* ⚡ Handling `toDate` case when time component is not specified
* ⚡ Using workflow's timezone to render dates in output panel, updated unit tests after removing `Object.merge` function
* ⚡ Not parsing numbers as dates
* 👕 Fixing lint errors
* ⚡ Fixing a typo
* ⚡ Making date detection more strict so only stringified dates are getting converted
* 👌 Addressing PR feedback
* 🔥 Removing leftover comment
---------

Co-authored-by: Iván Ovejero <ivov.src@gmail.com>
---
 .../editor-ui/src/components/RunDataJson.vue  |  11 +-
 .../editor-ui/src/components/RunDataTable.vue |   7 +-
 packages/editor-ui/src/utils/typesUtils.ts    |  16 ++
 packages/workflow/package.json                |   2 +
 packages/workflow/src/Expression.ts           |  14 +-
 .../src/Extensions/ArrayExtensions.ts         | 183 +++++++-----------
 .../workflow/src/Extensions/DateExtensions.ts |  31 ++-
 .../src/Extensions/NumberExtensions.ts        |   8 +-
 .../src/Extensions/ObjectExtensions.ts        |  34 +---
 .../src/Extensions/StringExtensions.ts        |   7 +-
 packages/workflow/src/Extensions/utils.ts     |  19 ++
 .../ArrayExtensions.test.ts                   | 101 ++++++++--
 .../DateExtensions.test.ts                    |  56 ++++++
 .../test/ExpressionExtensions/Helpers.ts      |   3 +
 .../NumberExtensions.test.ts                  |  12 +-
 .../ObjectExtensions.test.ts                  |  34 +++-
 pnpm-lock.yaml                                |  58 +-----
 17 files changed, 372 insertions(+), 224 deletions(-)
 create mode 100644 packages/workflow/src/Extensions/utils.ts

diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 15a6c0289ca0a3..149c2fa0634e97 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -73,13 +73,14 @@ import VueJsonPretty from 'vue-json-pretty';
 import { LOCAL_STORAGE_MAPPING_FLAG } from '@/constants';
 import { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from '@/components/Draggable.vue';
-import { convertPath, executionDataToJson, isString, shorten } from '@/utils';
+import { parseDate, executionDataToJson, isString, shorten } from '@/utils';
 import { INodeUi } from '@/Interface';
 import { externalHooks } from '@/mixins/externalHooks';
 import { mapStores } from 'pinia';
 import { useNDVStore } from '@/stores/ndv';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
+import { useWorkflowsStore } from '@/stores/workflows';
 
 const runDataJsonActions = () => import('@/components/RunDataJsonActions.vue');
 
@@ -149,7 +150,7 @@ export default mixins(externalHooks).extend({
 		}
 	},
 	computed: {
-		...mapStores(useNDVStore),
+		...mapStores(useNDVStore, useWorkflowsStore),
 		jsonData(): IDataObject[] {
 			return executionDataToJson(this.inputData);
 		},
@@ -209,7 +210,11 @@ export default mixins(externalHooks).extend({
 			}, 1000); // ensure dest data gets set if drop
 		},
 		getContent(value: unknown): string {
-			return isString(value) ? `"${value}"` : JSON.stringify(value);
+			if (isString(value)) {
+				const parsedDate = parseDate(value, this.workflowsStore.workflow.settings?.timezone);
+				return parsedDate ? parsedDate.toString() : `"${value}"`;
+			}
+			return JSON.stringify(value);
 		},
 		getListItemName(path: string): string {
 			return path.replace(/^(\["?\d"?]\.?)/g, '');
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 3f2c1e5b7c5b07..383e905e196176 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -159,7 +159,7 @@
 <script lang="ts">
 /* eslint-disable prefer-spread */
 import { INodeUi, ITableData, NDVState } from '@/Interface';
-import { getPairedItemId } from '@/utils';
+import { getPairedItemId, parseDate } from '@/utils';
 import Vue, { PropType } from 'vue';
 import mixins from 'vue-typed-mixins';
 import { GenericValue, IDataObject, INodeExecutionData } from 'n8n-workflow';
@@ -171,6 +171,7 @@ import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
+import { DateTime } from 'luxon';
 
 const MAX_COLUMNS_LIMIT = 40;
 
@@ -365,6 +366,10 @@ export default mixins(externalHooks).extend({
 				return this.$locale.baseText('runData.emptyString');
 			}
 			if (typeof value === 'string') {
+				const parsedDate = parseDate(value, this.workflowsStore.workflow.settings?.timezone);
+				if (parsedDate) {
+					return parsedDate.toString();
+				}
 				return value.replaceAll('\n', '\\n');
 			}
 
diff --git a/packages/editor-ui/src/utils/typesUtils.ts b/packages/editor-ui/src/utils/typesUtils.ts
index 52f3010b1c3a71..12c43b0ba631c2 100644
--- a/packages/editor-ui/src/utils/typesUtils.ts
+++ b/packages/editor-ui/src/utils/typesUtils.ts
@@ -3,6 +3,8 @@ import { IDataObject, jsonParse } from 'n8n-workflow';
 import { Schema, Optional, Primitives } from '@/Interface';
 import { isObj } from '@/utils/typeGuards';
 import { generatePath } from '@/utils/mappingUtils';
+import { DateTime } from 'luxon';
+import { useWorkflowsStore } from '@/stores/workflows';
 
 /*
 	Constants and utility functions than can be used to manipulate different data types and objects
@@ -247,3 +249,17 @@ export const getSchema = (input: Optional<Primitives | object>, path = ''): Sche
 
 	return schema;
 };
+
+// Convert UTC dates that come from back-end to workflow timezone
+export const parseDate = (input: string, timezone: string | undefined): DateTime | null => {
+	const isUTCDate = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/.test(
+		input,
+	);
+	if (isUTCDate) {
+		const date = new Date(Date.parse(input));
+		if (date.toString() !== 'Invalid Date') {
+			return DateTime.fromJSDate(date, { zone: timezone });
+		}
+	}
+	return null;
+};
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index a4c485160a36c9..e0813fe8076449 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -41,6 +41,7 @@
   "devDependencies": {
     "@n8n_io/eslint-config": "",
     "@types/crypto-js": "^4.1.1",
+    "@types/deep-equal": "^1.0.1",
     "@types/express": "^4.17.6",
     "@types/jmespath": "^0.15.0",
     "@types/lodash.get": "^4.4.6",
@@ -54,6 +55,7 @@
     "@n8n_io/riot-tmpl": "^2.0.0",
     "ast-types": "0.15.2",
     "crypto-js": "^4.1.1",
+    "deep-equal": "^2.2.0",
     "esprima-next": "5.8.4",
     "jmespath": "^0.16.0",
     "js-base64": "^3.7.2",
diff --git a/packages/workflow/src/Expression.ts b/packages/workflow/src/Expression.ts
index 635a1f8afb6c42..5f996b408b59e3 100644
--- a/packages/workflow/src/Expression.ts
+++ b/packages/workflow/src/Expression.ts
@@ -60,11 +60,21 @@ export class Expression {
 	convertObjectValueToString(value: object): string {
 		const typeName = Array.isArray(value) ? 'Array' : 'Object';
 
-		if (DateTime.isDateTime(value) && value.invalidReason !== null) {
+		if (value instanceof DateTime && value.invalidReason !== null) {
 			throw new Error('invalid DateTime');
 		}
 
-		const result = JSON.stringify(value)
+		let result = '';
+		if (value instanceof Date) {
+			// We don't want to use JSON.stringify for dates since it disregards workflow timezone
+			result = DateTime.fromJSDate(value, {
+				zone: this.workflow.settings.timezone?.toString() ?? 'default',
+			}).toISO();
+		} else {
+			result = JSON.stringify(value);
+		}
+
+		result = result
 			.replace(/,"/g, ', "') // spacing for
 			.replace(/":/g, '": '); // readability
 
diff --git a/packages/workflow/src/Extensions/ArrayExtensions.ts b/packages/workflow/src/Extensions/ArrayExtensions.ts
index 236b219523ea57..52f700841b9478 100644
--- a/packages/workflow/src/Extensions/ArrayExtensions.ts
+++ b/packages/workflow/src/Extensions/ArrayExtensions.ts
@@ -1,87 +1,7 @@
 import { ExpressionError, ExpressionExtensionError } from '../ExpressionError';
 import type { ExtensionMap } from './Extensions';
-import { compact as oCompact, merge as oMerge } from './ObjectExtensions';
-
-function deepCompare(left: unknown, right: unknown): boolean {
-	if (left === right) {
-		return true;
-	}
-
-	// Check to see if they're the basic type
-	if (typeof left !== typeof right) {
-		return false;
-	}
-
-	if (typeof left === 'number' && isNaN(left) && isNaN(right as number)) {
-		return true;
-	}
-
-	// Explicitly return false if certain primitives don't equal each other
-	if (['number', 'string', 'bigint', 'boolean', 'symbol'].includes(typeof left) && left !== right) {
-		return false;
-	}
-
-	// Quickly check how many properties each has to avoid checking obviously mismatching
-	// objects
-	if (Object.keys(left as object).length !== Object.keys(right as object).length) {
-		return false;
-	}
-
-	// Quickly check if they're arrays
-	if (Array.isArray(left) !== Array.isArray(right)) {
-		return false;
-	}
-
-	// Check if arrays are equal, ordering is important
-	if (Array.isArray(left)) {
-		if (left.length !== (right as unknown[]).length) {
-			return false;
-		}
-		return left.every((v, i) => deepCompare(v, (right as object[])[i]));
-	}
-
-	// Check right first quickly. This is to see if we have mismatched properties.
-	// We'll check the left more indepth later to cover all our bases.
-	for (const key in right as object) {
-		if ((left as object).hasOwnProperty(key) !== (right as object).hasOwnProperty(key)) {
-			return false;
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-		} else if (typeof (left as any)[key] !== typeof (right as any)[key]) {
-			return false;
-		}
-	}
-
-	// Check left more in depth
-	for (const key in left as object) {
-		if ((left as object).hasOwnProperty(key) !== (right as object).hasOwnProperty(key)) {
-			return false;
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-		} else if (typeof (left as any)[key] !== typeof (right as any)[key]) {
-			return false;
-		}
-
-		if (
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-			typeof (left as any)[key] === 'object'
-		) {
-			if (
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-				(left as any)[key] !== (right as any)[key] &&
-				// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-				!deepCompare((left as any)[key], (right as any)[key])
-			) {
-				return false;
-			}
-		} else {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-			if ((left as any)[key] !== (right as any)[key]) {
-				return false;
-			}
-		}
-	}
-
-	return true;
-}
+import { compact as oCompact } from './ObjectExtensions';
+import deepEqual from 'deep-equal';
 
 function first(value: unknown[]): unknown {
 	return value[0];
@@ -103,18 +23,26 @@ function pluck(value: unknown[], extraArgs: unknown[]): unknown[] {
 	if (!Array.isArray(extraArgs)) {
 		throw new ExpressionError('arguments must be passed to pluck');
 	}
-	const fieldsToPluck = extraArgs;
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	return (value as any[]).map((element: object) => {
-		const entries = Object.entries(element);
-		return entries.reduce((p, c) => {
-			const [key, val] = c as [string, Date | string | number];
-			if (fieldsToPluck.includes(key)) {
-				Object.assign(p, { [key]: val });
+	if (!extraArgs || extraArgs.length === 0) {
+		return value;
+	}
+	const plucked = value.reduce<unknown[]>((pluckedFromObject, current) => {
+		if (current && typeof current === 'object') {
+			const p: unknown[] = [];
+			Object.keys(current).forEach((k) => {
+				extraArgs.forEach((field: string) => {
+					if (current && field === k) {
+						p.push((current as { [key: string]: unknown })[k]);
+					}
+				});
+			});
+			if (p.length > 0) {
+				pluckedFromObject.push(p.length === 1 ? p[0] : p);
 			}
-			return p;
-		}, {});
-	}) as unknown[];
+		}
+		return pluckedFromObject;
+	}, new Array<unknown>());
+	return plucked;
 }
 
 function randomItem(value: unknown[]): unknown {
@@ -127,8 +55,13 @@ function unique(value: unknown[], extraArgs: string[]): unknown[] {
 		return value.reduce<unknown[]>((l, v) => {
 			if (typeof v === 'object' && v !== null && extraArgs.every((i) => i in v)) {
 				const alreadySeen = l.find((i) =>
-					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
-					extraArgs.every((j) => deepCompare((i as any)[j], (v as any)[j])),
+					extraArgs.every((j) =>
+						deepEqual(
+							(i as Record<string, unknown>)[j],
+							(v as Record<string, unknown>, { strict: true })[j],
+							{ strict: true },
+						),
+					),
 				);
 				if (!alreadySeen) {
 					l.push(v);
@@ -138,7 +71,7 @@ function unique(value: unknown[], extraArgs: string[]): unknown[] {
 		}, []);
 	}
 	return value.reduce<unknown[]>((l, v) => {
-		if (l.findIndex((i) => deepCompare(i, v)) === -1) {
+		if (l.findIndex((i) => deepEqual(i, v, { strict: true })) === -1) {
 			l.push(v);
 		}
 		return l;
@@ -281,28 +214,58 @@ function renameKeys(value: unknown[], extraArgs: string[]): unknown[] {
 	});
 }
 
-function merge(value: unknown[], extraArgs: unknown[][]): unknown[] {
+function mergeObjects(value: Record<string, unknown>, extraArgs: unknown[]): unknown {
+	const [other] = extraArgs;
+
+	if (!other) {
+		return value;
+	}
+
+	if (typeof other !== 'object') {
+		throw new ExpressionExtensionError('merge(): expected object arg');
+	}
+
+	const newObject = { ...value };
+	for (const [key, val] of Object.entries(other)) {
+		if (!(key in newObject)) {
+			newObject[key] = val;
+		}
+	}
+	return newObject;
+}
+
+function merge(value: unknown[], extraArgs: unknown[][]): unknown {
 	const [others] = extraArgs;
+
+	if (others === undefined) {
+		// If there are no arguments passed, merge all objects within the array
+		const merged = value.reduce((combined, current) => {
+			if (current !== null && typeof current === 'object' && !Array.isArray(current)) {
+				combined = mergeObjects(combined as Record<string, unknown>, [current]);
+			}
+			return combined;
+		}, {});
+		return merged;
+	}
+
 	if (!Array.isArray(others)) {
 		throw new ExpressionExtensionError(
 			'merge(): expected array arg, e.g. .merge([{ id: 1, otherValue: 3 }])',
 		);
 	}
 	const listLength = value.length > others.length ? value.length : others.length;
-	const newList = new Array(listLength);
+	let merged = {};
 	for (let i = 0; i < listLength; i++) {
 		if (value[i] !== undefined) {
 			if (typeof value[i] === 'object' && typeof others[i] === 'object') {
-				newList[i] = oMerge(value[i] as object, [others[i]]);
-			} else {
-				newList[i] = value[i];
+				merged = Object.assign(
+					merged,
+					mergeObjects(value[i] as Record<string, unknown>, [others[i]]),
+				);
 			}
-		} else {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-			newList[i] = others[i];
 		}
 	}
-	return newList;
+	return merged;
 }
 
 function union(value: unknown[], extraArgs: unknown[][]): unknown[] {
@@ -312,7 +275,8 @@ function union(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	}
 	const newArr: unknown[] = Array.from(value);
 	for (const v of others) {
-		if (newArr.findIndex((w) => deepCompare(w, v)) === -1) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+		if (newArr.findIndex((w) => deepEqual(w, v, { strict: true })) === -1) {
 			newArr.push(v);
 		}
 	}
@@ -328,7 +292,7 @@ function difference(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	}
 	const newArr: unknown[] = [];
 	for (const v of value) {
-		if (others.findIndex((w) => deepCompare(w, v)) === -1) {
+		if (others.findIndex((w) => deepEqual(w, v, { strict: true })) === -1) {
 			newArr.push(v);
 		}
 	}
@@ -344,12 +308,13 @@ function intersection(value: unknown[], extraArgs: unknown[][]): unknown[] {
 	}
 	const newArr: unknown[] = [];
 	for (const v of value) {
-		if (others.findIndex((w) => deepCompare(w, v)) !== -1) {
+		if (others.findIndex((w) => deepEqual(w, v, { strict: true })) !== -1) {
 			newArr.push(v);
 		}
 	}
 	for (const v of others) {
-		if (value.findIndex((w) => deepCompare(w, v)) !== -1) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-call
+		if (value.findIndex((w) => deepEqual(w, v, { strict: true })) !== -1) {
 			newArr.push(v);
 		}
 	}
diff --git a/packages/workflow/src/Extensions/DateExtensions.ts b/packages/workflow/src/Extensions/DateExtensions.ts
index eaae9a71d01032..686f04e324e899 100644
--- a/packages/workflow/src/Extensions/DateExtensions.ts
+++ b/packages/workflow/src/Extensions/DateExtensions.ts
@@ -1,8 +1,10 @@
+import { ExpressionExtensionError } from './../ExpressionError';
 /* eslint-disable @typescript-eslint/unbound-method */
 /* eslint-disable @typescript-eslint/explicit-member-accessibility */
 import { DateTime } from 'luxon';
 import type { DateTimeUnit, DurationLike, DurationObjectUnits, LocaleOptions } from 'luxon';
 import type { ExtensionMap } from './Extensions';
+import { convertToDateTime } from './utils';
 
 type DurationUnit =
 	| 'milliseconds'
@@ -82,11 +84,8 @@ function beginningOf(date: Date | DateTime, extraArgs: DurationUnit[]): Date {
 	if (isDateTime(date)) {
 		return date.startOf(DATETIMEUNIT_MAP[unit] || unit).toJSDate();
 	}
-	let datetime = DateTime.fromJSDate(date);
-	if (date.getTimezoneOffset() === 0) {
-		datetime = datetime.setZone('UTC');
-	}
-	return datetime.startOf(DATETIMEUNIT_MAP[unit] || unit).toJSDate();
+	const dateTime = DateTime.fromJSDate(date);
+	return dateTime.startOf(DATETIMEUNIT_MAP[unit] || unit).toJSDate();
 }
 
 function endOfMonth(date: Date | DateTime): Date {
@@ -97,7 +96,7 @@ function endOfMonth(date: Date | DateTime): Date {
 }
 
 function extract(inputDate: Date | DateTime, extraArgs: DatePart[]): number | Date {
-	let [part] = extraArgs;
+	let [part = 'week'] = extraArgs;
 	let date = inputDate;
 	if (isDateTime(date)) {
 		date = date.toJSDate();
@@ -126,10 +125,22 @@ function format(date: Date | DateTime, extraArgs: unknown[]): string {
 	return DateTime.fromJSDate(date).toFormat(dateFormat, { ...localeOpts });
 }
 
-function isBetween(date: Date | DateTime, extraArgs: unknown[]): boolean {
-	const [first, second] = extraArgs as string[];
-	const firstDate = new Date(first);
-	const secondDate = new Date(second);
+function isBetween(
+	date: Date | DateTime,
+	extraArgs: Array<string | Date | DateTime>,
+): boolean | undefined {
+	if (extraArgs.length !== 2) {
+		throw new ExpressionExtensionError('isBetween(): expected exactly two args');
+	}
+
+	const [first, second] = extraArgs;
+
+	const firstDate = convertToDateTime(first);
+	const secondDate = convertToDateTime(second);
+
+	if (!firstDate || !secondDate) {
+		return;
+	}
 
 	if (firstDate > secondDate) {
 		return secondDate < date && date < firstDate;
diff --git a/packages/workflow/src/Extensions/NumberExtensions.ts b/packages/workflow/src/Extensions/NumberExtensions.ts
index f344b843baa98b..ab61c857fef4c3 100644
--- a/packages/workflow/src/Extensions/NumberExtensions.ts
+++ b/packages/workflow/src/Extensions/NumberExtensions.ts
@@ -1,7 +1,7 @@
 /**
  * @jest-environment jsdom
  */
-
+import { ExpressionExtensionError } from './../ExpressionError';
 import type { ExtensionMap } from './Extensions';
 
 function format(value: number, extraArgs: unknown[]): string {
@@ -14,10 +14,16 @@ function format(value: number, extraArgs: unknown[]): string {
 }
 
 function isEven(value: number) {
+	if (!Number.isInteger(value)) {
+		throw new ExpressionExtensionError('isEven() is only callable on integers');
+	}
 	return value % 2 === 0;
 }
 
 function isOdd(value: number) {
+	if (!Number.isInteger(value)) {
+		throw new ExpressionExtensionError('isOdd() is only callable on integers');
+	}
 	return Math.abs(value) % 2 === 1;
 }
 
diff --git a/packages/workflow/src/Extensions/ObjectExtensions.ts b/packages/workflow/src/Extensions/ObjectExtensions.ts
index a83316e426cd1d..22523a11817546 100644
--- a/packages/workflow/src/Extensions/ObjectExtensions.ts
+++ b/packages/workflow/src/Extensions/ObjectExtensions.ts
@@ -1,22 +1,6 @@
 import { ExpressionExtensionError } from '../ExpressionError';
 import type { ExtensionMap } from './Extensions';
 
-export function merge(value: object, extraArgs: unknown[]): unknown {
-	const [other] = extraArgs;
-	if (typeof other !== 'object' || !other) {
-		throw new ExpressionExtensionError('merge(): expected object arg');
-	}
-	// eslint-disable-next-line @typescript-eslint/no-explicit-any
-	const newObject: any = { ...value };
-	for (const [key, val] of Object.entries(other)) {
-		if (!(key in newObject)) {
-			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
-			newObject[key] = val;
-		}
-	}
-	return newObject;
-}
-
 function isEmpty(value: object): boolean {
 	return Object.keys(value).length === 0;
 }
@@ -43,8 +27,8 @@ function removeField(value: object, extraArgs: string[]): object {
 
 function removeFieldsContaining(value: object, extraArgs: string[]): object {
 	const [match] = extraArgs;
-	if (typeof match !== 'string') {
-		throw new ExpressionExtensionError('removeFieldsContaining(): expected string arg');
+	if (typeof match !== 'string' || match === '') {
+		throw new ExpressionExtensionError('removeFieldsContaining(): expected non-empty string arg');
 	}
 	const newObject = { ...value };
 	for (const [key, val] of Object.entries(value)) {
@@ -58,12 +42,14 @@ function removeFieldsContaining(value: object, extraArgs: string[]): object {
 
 function keepFieldsContaining(value: object, extraArgs: string[]): object {
 	const [match] = extraArgs;
-	if (typeof match !== 'string') {
-		throw new ExpressionExtensionError('argument of keepFieldsContaining must be a string');
+	if (typeof match !== 'string' || match === '') {
+		throw new ExpressionExtensionError(
+			'argument of keepFieldsContaining must be a non-empty string',
+		);
 	}
 	const newObject = { ...value };
 	for (const [key, val] of Object.entries(value)) {
-		if (typeof val === 'string' && !val.includes(match)) {
+		if (typeof val !== 'string' || (typeof val === 'string' && !val.includes(match))) {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-explicit-any
 			delete (newObject as any)[key];
 		}
@@ -120,11 +106,6 @@ urlEncode.doc = {
 
 // @TODO_NEXT_PHASE: Surface extensions below which take args
 
-merge.doc = {
-	name: 'merge',
-	returnType: 'object',
-};
-
 hasField.doc = {
 	name: 'hasField',
 	returnType: 'boolean',
@@ -150,7 +131,6 @@ export const objectExtensions: ExtensionMap = {
 	functions: {
 		isEmpty,
 		isNotEmpty,
-		merge,
 		hasField,
 		removeField,
 		removeFieldsContaining,
diff --git a/packages/workflow/src/Extensions/StringExtensions.ts b/packages/workflow/src/Extensions/StringExtensions.ts
index 505a3e20e7e6ca..f7955de83db481 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -113,12 +113,15 @@ function removeTags(value: string): string {
 }
 
 function toDate(value: string): Date {
-	const date = new Date(value.toString());
+	const date = new Date(Date.parse(value));
 
 	if (date.toString() === 'Invalid Date') {
 		throw new ExpressionError.ExpressionExtensionError('cannot convert to date');
 	}
-
+	// If time component is not specified, force 00:00h
+	if (!/:/.test(value)) {
+		date.setHours(0, 0, 0);
+	}
 	return date;
 }
 
diff --git a/packages/workflow/src/Extensions/utils.ts b/packages/workflow/src/Extensions/utils.ts
new file mode 100644
index 00000000000000..563ecf31a1549b
--- /dev/null
+++ b/packages/workflow/src/Extensions/utils.ts
@@ -0,0 +1,19 @@
+import { DateTime } from 'luxon';
+
+// Utility functions and type guards for expression extensions
+
+export const convertToDateTime = (value: string | Date | DateTime): DateTime | undefined => {
+	let converted: DateTime | undefined;
+
+	if (typeof value === 'string') {
+		converted = DateTime.fromJSDate(new Date(value));
+		if (converted.invalidReason !== null) {
+			return;
+		}
+	} else if (value instanceof Date) {
+		converted = DateTime.fromJSDate(value);
+	} else if (DateTime.isDateTime(value)) {
+		converted = value;
+	}
+	return converted;
+};
diff --git a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
index b3e3748e1bbd28..fbd62432e4bc51 100644
--- a/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ArrayExtensions.test.ts
@@ -22,16 +22,58 @@ describe('Data Transformation Functions', () => {
 				{ value: 3, string: '3' },
 				{ value: 4, string: '4' },
 				{ value: 5, string: '5' },
-				{ value: 6, string: '6' }
+				{ value: 6, string: '6' },
+				{ value: { something: 'else' } }
 			].pluck("value") }}`),
+			).toEqual(
+				expect.arrayContaining([1, 2, 3, 4, 5, 6, { something: 'else' }]),
+			);
+		});
+
+		test('.pluck() should work correctly for multiple values', () => {
+			expect(
+				evaluate(`={{ [
+					{
+						firstName: 'John',
+						lastName: 'Doe',
+						phone: {
+							home: '111-222',
+							office: '333-444'
+						}
+					},
+					{
+						firstName: 'Jane',
+						lastName: 'Doe',
+						phone: {
+							office: '555-666'
+						}
+					}
+			].pluck("firstName", "lastName") }}`),
+			).toEqual(
+				expect.arrayContaining([["John", "Doe"],["Jane", "Doe"]]),
+			);
+		});
+
+		test('.pluck() should work return everything with no args', () => {
+			expect(
+				evaluate(`={{ [
+				{ value: 1, string: '1' },
+				{ value: 2, string: '2' },
+				{ value: 3, string: '3' },
+				{ value: 4, string: '4' },
+				{ value: 5, string: '5' },
+				{ value: 6, string: '6' },
+				{ value: { something: 'else' } }
+			].pluck() }}`),
 			).toEqual(
 				expect.arrayContaining([
-					{ value: 1 },
-					{ value: 2 },
-					{ value: 3 },
-					{ value: 4 },
-					{ value: 5 },
-					{ value: 6 },
+					{ value: 1, string: '1' },
+					{ value: 2, string: '2' },
+					{ value: 3, string: '3' },
+					{ value: 4, string: '4' },
+					{ value: 5, string: '5' },
+					{ value: 6, string: '6' },
+					{ value: { something: 'else' } }
 				]),
 			);
 		});
@@ -42,6 +84,14 @@ describe('Data Transformation Functions', () => {
 			);
 		});
 
+		test('.unique() should work on an arrays containing nulls, objects and arrays', () => {
+			expect(
+				evaluate(
+					'={{ [1, 2, 3, "as", {}, {}, 1, 2, [1,2], "[sad]", "[sad]", null].unique() }}',
+				),
+			).toEqual([1, 2, 3, "as", {}, [1,2], "[sad]", null]);
+		});
+
 		test('.isEmpty() should work correctly on an array', () => {
 			expect(evaluate('={{ [].isEmpty() }}')).toEqual(true);
 		});
@@ -63,10 +113,15 @@ describe('Data Transformation Functions', () => {
 				evaluate(
 					'={{ [{ test1: 1, test2: 2 }, { test1: 1, test3: 3 }].merge([{ test1: 2, test3: 3 }, { test4: 4 }]) }}',
 				),
-			).toEqual([
-				{ test1: 1, test2: 2, test3: 3 },
-				{ test1: 1, test3: 3, test4: 4 },
-			]);
+			).toEqual({"test1": 1, "test2": 2, "test3": 3, "test4": 4});
+		});
+
+		test('.merge() should work correctly without arguments', () => {
+			expect(
+				evaluate(
+					'={{ [{ a: 1, some: null }, { a: 2, c: "something" }, 2, "asds", { b: 23 }, null, [1, 2]].merge() }}',
+				),
+			).toEqual({"a": 1, "some": null, "c": "something", "b": 23});
 		});
 
 		test('.smartJoin() should work correctly on an array of objects', () => {
@@ -119,6 +174,14 @@ describe('Data Transformation Functions', () => {
 			).toEqual([{ test1: 1 }, { test2: 2 }, { test1: 1, test3: 3 }, { test4: 4 }]);
 		});
 
+		test('.union() should work on an arrays containing nulls, objects and arrays', () => {
+			expect(
+				evaluate(
+					'={{ [1, 2, "dd", {}, null].union([1, {}, null, 3]) }}',
+				),
+			).toEqual([1, 2, "dd", {}, null, 3]);
+		});
+
 		test('.intersection() should work on an array of objects', () => {
 			expect(
 				evaluate(
@@ -127,6 +190,14 @@ describe('Data Transformation Functions', () => {
 			).toEqual([{ test2: 2 }]);
 		});
 
+		test('.intersection() should work on an arrays containing nulls, objects and arrays', () => {
+			expect(
+				evaluate(
+					'={{ [1, 2, "dd", {}, null].intersection([1, {}, null]) }}',
+				),
+			).toEqual([1, {}, null]);
+		});
+
 		test('.difference() should work on an array of objects', () => {
 			expect(
 				evaluate(
@@ -139,6 +210,14 @@ describe('Data Transformation Functions', () => {
 			).toEqual([]);
 		});
 
+		test('.difference() should work on an arrays containing nulls, objects and arrays', () => {
+			expect(
+				evaluate(
+					'={{ [1, 2, "dd", {}, null, ["a", 1]].difference([1, {}, null, ["a", 1]]) }}',
+				),
+			).toEqual([2, "dd"]);
+		});
+
 		test('.compact() should work on an array', () => {
 			expect(
 				evaluate(
diff --git a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
index c6aa4b0e3a3618..917c20cb488709 100644
--- a/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/DateExtensions.test.ts
@@ -20,6 +20,33 @@ describe('Data Transformation Functions', () => {
 			);
 		});
 
+		test('.beginningOf("week") should work correctly on a string', () => {
+			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("week") }}');
+			const expectedDate = DateTime.local(2023, 1, 23, { zone: TEST_TIMEZONE }).toJSDate();
+
+			if (evaluatedDate && evaluatedDate instanceof Date) {
+				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+			}
+		});
+
+		test('.beginningOf("month") should work correctly on a string', () => {
+			const evaluatedDate = evaluate('={{ "2023-06-16".toDate().beginningOf("month") }}');
+			const expectedDate = DateTime.local(2023, 6, 1, { zone: TEST_TIMEZONE }).toJSDate();
+
+			if (evaluatedDate && evaluatedDate instanceof Date) {
+				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+			}
+		});
+
+		test('.beginningOf("year") should work correctly on a string', () => {
+			const evaluatedDate = evaluate('={{ "2023-01-30".toDate().beginningOf("year") }}');
+			const expectedDate = DateTime.local(2023, 1, 1, { zone: TEST_TIMEZONE }).toJSDate();
+
+			if (evaluatedDate && evaluatedDate instanceof Date) {
+				expect(evaluatedDate.toDateString()).toEqual(expectedDate.toDateString());
+			}
+		});
+
 		test('.endOfMonth() should work correctly on a date', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 16).endOfMonth() }}')).toEqual(
 				DateTime.local(2023, 1, 31, 23, 59, 59, 999, { zone: TEST_TIMEZONE }).toJSDate(),
@@ -30,6 +57,11 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 20).extract("day") }}')).toEqual(20);
 		});
 
+		test('.extract() should extract week for no args', () => {
+			expect(evaluate('={{ DateTime.local(2023, 1, 20).extract() }}')).toEqual(3);
+		});
+
+
 		test('.format("yyyy LLL dd") should work correctly on a date', () => {
 			expect(evaluate('={{ DateTime.local(2023, 1, 16).format("yyyy LLL dd") }}')).toEqual(
 				'2023 Jan 16',
@@ -40,5 +72,29 @@ describe('Data Transformation Functions', () => {
 			const date = new Date(2022, 0, 3);
 			expect(evaluate(`={{ "${getLocalISOString(date)}".toDate() }}`)).toEqual(date);
 		});
+
+		test('.inBetween() should work on string and Date', () => {
+			expect(evaluate(`={{ $now.isBetween('2023-06-23'.toDate(), '2023-06-23') }}`)).toBeDefined();
+		});
+
+		test('.inBetween() should work on string and DateTime', () => {
+			expect(evaluate(`={{ $now.isBetween($now, '2023-06-23') }}`)).toBeDefined();
+		});
+
+		test('.inBetween() should not work for invalid strings', () => {
+			expect(evaluate(`={{ $now.isBetween($now, 'invalid') }}`)).toBeUndefined();
+		});
+
+		test('.inBetween() should not work for numbers', () => {
+			expect(evaluate(`={{ $now.isBetween($now, 1) }}`)).toBeUndefined();
+		});
+
+		test('.inBetween() should not work for a single argument', () => {
+			expect(() => evaluate(`={{ $now.isBetween($now) }}`)).toThrow();
+		});
+
+		test('.inBetween() should not work for a more than two arguments', () => {
+			expect(() => evaluate(`={{ $now.isBetween($now, '2023-06-23', '2023-09-21'.toDate()) }}`)).toThrow();
+		});
 	});
 });
diff --git a/packages/workflow/test/ExpressionExtensions/Helpers.ts b/packages/workflow/test/ExpressionExtensions/Helpers.ts
index 828f50052db981..9d6bd1ad7b0660 100644
--- a/packages/workflow/test/ExpressionExtensions/Helpers.ts
+++ b/packages/workflow/test/ExpressionExtensions/Helpers.ts
@@ -18,6 +18,9 @@ export const workflow = new Workflow({
 	connections: {},
 	active: false,
 	nodeTypes,
+	settings: {
+		timezone: TEST_TIMEZONE,
+	}
 });
 export const expression = new Expression(workflow);
 
diff --git a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
index 8452efa2df11fb..1a514c79284b04 100644
--- a/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/NumberExtensions.test.ts
@@ -38,14 +38,22 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{ (9).isOdd() }}')).toEqual(true);
 			expect(evaluate('={{ (8).isOdd() }}')).toEqual(false);
 			expect(evaluate('={{ (0).isOdd() }}')).toEqual(false);
-			expect(evaluate('={{ (NaN).isOdd() }}')).toEqual(false);
+		});
+
+		test('.isOdd() should not work on a float or NaN', () => {
+			expect(() => evaluate('={{ (NaN).isOdd() }}')).toThrow();
+			expect(() => evaluate('={{ (9.2).isOdd() }}')).toThrow();
 		});
 
 		test('.isEven() should work on a number', () => {
 			expect(evaluate('={{ (9).isEven() }}')).toEqual(false);
 			expect(evaluate('={{ (8).isEven() }}')).toEqual(true);
 			expect(evaluate('={{ (0).isEven() }}')).toEqual(true);
-			expect(evaluate('={{ (NaN).isEven() }}')).toEqual(false);
+		});
+
+		test('.isEven() should not work on a float or NaN', () => {
+			expect(() => evaluate('={{ (NaN).isEven() }}')).toThrow();
+			expect(() => evaluate('={{ (9.2).isEven() }}')).toThrow();
 		});
 	});
 
diff --git a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
index 67ba3d60ca5c87..71e5445f11f02d 100644
--- a/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
+++ b/packages/workflow/test/ExpressionExtensions/ObjectExtensions.test.ts
@@ -7,14 +7,6 @@ describe('Data Transformation Functions', () => {
 			expect(evaluate('={{({ test1: 1 }).isEmpty()}}')).toEqual(false);
 		});
 
-		test('.merge should work on an object', () => {
-			expect(evaluate('={{ ({ test1: 1, test2: 2 }).merge({ test2: 3, test3: 3 }) }}')).toEqual({
-				test1: 1,
-				test2: 2,
-				test3: 3,
-			});
-		});
-
 		test('.hasField should work on an object', () => {
 			expect(evaluate('={{ ({ test1: 1 }).hasField("test1") }}')).toEqual(true);
 			expect(evaluate('={{ ({ test1: 1 }).hasField("test2") }}')).toEqual(false);
@@ -44,6 +36,14 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
+		test('.removeFieldsContaining should not work for empty string', () => {
+			expect(
+				() => evaluate(
+					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).removeFieldsContaining("") }}',
+				),
+			).toThrow();
+		});
+
 		test('.keepFieldsContaining should work on an object', () => {
 			expect(
 				evaluate(
@@ -54,6 +54,24 @@ describe('Data Transformation Functions', () => {
 			});
 		});
 
+		test('.keepFieldsContaining should work on a nested object', () => {
+			expect(
+				evaluate(
+					'={{ ({ test1: "i exist", test2: "i should be removed", test3: { test4: "me too" } }).keepFieldsContaining("exist") }}',
+				),
+			).toEqual({
+				test1: 'i exist',
+			});
+		});
+
+		test('.keepFieldsContaining should not work for empty string', () => {
+			expect(
+				() => evaluate(
+					'={{ ({ test1: "i exist", test2: "i should be removed", test3: "i should also be removed" }).keepFieldsContaining("") }}',
+				),
+			).toThrow();
+		});
+
 		test('.compact should work on an object', () => {
 			expect(
 				evaluate('={{ ({ test1: 1, test2: "2", test3: undefined, test4: null }).compact() }}'),
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 923b34c5aa86cb..6702c63fb8f6d0 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -934,6 +934,7 @@ importers:
       '@n8n_io/eslint-config': ''
       '@n8n_io/riot-tmpl': ^2.0.0
       '@types/crypto-js': ^4.1.1
+      '@types/deep-equal': ^1.0.1
       '@types/express': ^4.17.6
       '@types/jmespath': ^0.15.0
       '@types/lodash.get': ^4.4.6
@@ -944,6 +945,7 @@ importers:
       '@types/xml2js': ^0.4.3
       ast-types: 0.15.2
       crypto-js: ^4.1.1
+      deep-equal: ^2.2.0
       esprima-next: 5.8.4
       jmespath: ^0.16.0
       js-base64: ^3.7.2
@@ -960,6 +962,7 @@ importers:
       '@n8n_io/riot-tmpl': 2.0.0
       ast-types: 0.15.2
       crypto-js: 4.1.1
+      deep-equal: 2.2.0
       esprima-next: 5.8.4
       jmespath: 0.16.0
       js-base64: 3.7.2
@@ -975,6 +978,7 @@ importers:
     devDependencies:
       '@n8n_io/eslint-config': link:../@n8n_io/eslint-config
       '@types/crypto-js': 4.1.1
+      '@types/deep-equal': 1.0.1
       '@types/express': 4.17.14
       '@types/jmespath': 0.15.0
       '@types/lodash.get': 4.4.7
@@ -5300,6 +5304,8 @@ packages:
     resolution: {integrity: sha512-KlPPdikagvL6ELjWsljbyDIPzNCeliYkqRpI+zea99vBBbCIA5JNshZAwQKTON139c87y9qvTFVgkFd14rtS4g==}
     dev: true
 
+  /@types/deep-equal/1.0.1:
+    resolution: {integrity: sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==}
   /@types/detect-port/1.3.2:
     resolution: {integrity: sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g==}
     dev: true
@@ -9313,7 +9319,6 @@ packages:
       which-boxed-primitive: 1.0.2
       which-collection: 1.0.1
       which-typed-array: 1.1.9
-    dev: true
 
   /deep-is/0.1.4:
     resolution: {integrity: sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==}
@@ -9866,14 +9871,14 @@ packages:
       has: 1.0.3
       has-property-descriptors: 1.0.0
       has-symbols: 1.0.3
-      internal-slot: 1.0.3
+      internal-slot: 1.0.4
       is-callable: 1.2.7
       is-negative-zero: 2.0.2
       is-regex: 1.1.4
       is-shared-array-buffer: 1.0.2
       is-string: 1.0.7
       is-weakref: 1.0.2
-      object-inspect: 1.12.2
+      object-inspect: 1.12.3
       object-keys: 1.1.1
       object.assign: 4.1.4
       regexp.prototype.flags: 1.4.3
@@ -9949,7 +9954,6 @@ packages:
       is-string: 1.0.7
       isarray: 2.0.5
       stop-iteration-iterator: 1.0.0
-    dev: true
 
   /es-module-lexer/0.9.3:
     resolution: {integrity: sha512-1HQ2M2sPtxwnvOvT1ZClHyQDiggdNjURWpY2we6aMKCQiUVxTmVs2UYPLIrD84sS+kMdUwfBSylbJPwNnBrnHQ==}
@@ -12212,14 +12216,6 @@ packages:
       through: 2.3.8
     dev: false
 
-  /internal-slot/1.0.3:
-    resolution: {integrity: sha512-O0DB1JC/sPyZl7cIo78n5dR7eUSwwpYPiXRhTzNxZVAMUuB8vlnRFyLxdrVToks6XPLVnFfbzaVd5WLjhgg+vA==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      get-intrinsic: 1.1.3
-      has: 1.0.3
-      side-channel: 1.0.4
-
   /internal-slot/1.0.4:
     resolution: {integrity: sha512-tA8URYccNzMo94s5MQZgH8NB/XTa6HsOo0MLfXTKKEnHVVdegzaQoFZ7Jp44bdvLvY2waT5dc+j5ICEswhi7UQ==}
     engines: {node: '>= 0.4'}
@@ -12502,7 +12498,6 @@ packages:
 
   /is-map/2.0.2:
     resolution: {integrity: sha512-cOZFQQozTha1f4MxLFzlgKYPTyj26picdZTx82hbc/Xf4K/tZOOXSCkMvU4pKioRXGDLJRn0GM7Upe7kR721yg==}
-    dev: true
 
   /is-nan/1.3.2:
     resolution: {integrity: sha512-E+zBKpQ2t6MEo1VsonYmluk9NxGrbzpeeLC2xIViuO2EjU2xsXsBPwTr3Ykv9l08UYEVEdWeRZNouaZqF6RN0w==}
@@ -12608,7 +12603,6 @@ packages:
 
   /is-set/2.0.2:
     resolution: {integrity: sha512-+2cnTEZeY5z/iXGbLhPrOAaK/Mau5k5eXq9j14CpRTftq0pAJu2MwVRSZhyZWBzx3o6X795Lz6Bpb6R0GKf37g==}
-    dev: true
 
   /is-shared-array-buffer/1.0.2:
     resolution: {integrity: sha512-sqN2UDu1/0y6uvXyStCOzyhAjCSlHceFoMKJW8W9EU9cvic/QdsZ0kEU93HEy3IUEFZIiH/3w+AH/UQbPHNdhA==}
@@ -12646,17 +12640,6 @@ packages:
       gopd: 1.0.1
       has-tostringtag: 1.0.0
 
-  /is-typed-array/1.1.9:
-    resolution: {integrity: sha512-kfrlnTTn8pZkfpJMUgYD7YZ3qzeJgWUn8XfVYBARc4wnmNOmLbmuuaAs3q5fvB0UJOn6yHAKaGTPM7d6ezoD/A==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      es-abstract: 1.20.4
-      for-each: 0.3.3
-      has-tostringtag: 1.0.0
-    dev: false
-
   /is-typedarray/1.0.0:
     resolution: {integrity: sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==}
 
@@ -12682,7 +12665,6 @@ packages:
 
   /is-weakmap/2.0.1:
     resolution: {integrity: sha512-NSBR4kH5oVj1Uwvv970ruUkCV7O1mzgVFO4/rev2cLRda9Tm9HrL70ZPut4rOHgY0FNrUu9BCbXA2sdQ+x0chA==}
-    dev: true
 
   /is-weakref/1.0.2:
     resolution: {integrity: sha512-qctsuLZmIQ0+vSSMfoVvyFe2+GSEvnmZ2ezTup1SBse9+twCCeial6EEi3Nc2KFcf6+qz2FBPnjXsk8xhKSaPQ==}
@@ -12694,7 +12676,6 @@ packages:
     dependencies:
       call-bind: 1.0.2
       get-intrinsic: 1.1.3
-    dev: true
 
   /is-whitespace/0.3.0:
     resolution: {integrity: sha512-RydPhl4S6JwAyj0JJjshWJEFG6hNye3pZFBRZaTUfZFwGHxzppNaNOVgQuS/E/SlhrApuMXrpnK1EEIXfdo3Dg==}
@@ -12719,7 +12700,6 @@ packages:
 
   /isarray/2.0.5:
     resolution: {integrity: sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==}
-    dev: true
 
   /isbot/3.6.1:
     resolution: {integrity: sha512-e1RmjWns87x60QyiHberWWMJGutL3+Ad0nZ8cz735iDEDDS6ApPfKSFo4EMj0PmMZ0m0ntpWIM0ADdqDFvUJPQ==}
@@ -15385,9 +15365,6 @@ packages:
       kind-of: 3.2.2
     dev: true
 
-  /object-inspect/1.12.2:
-    resolution: {integrity: sha512-z+cPxW0QGUp0mcqcsgQyLVRDoXFQbXOwBaqyF7VIgI4TWNQsDHrBpUQslRmIfAoYWdYzs6UlKJtB2XJpTaNSpQ==}
-
   /object-inspect/1.12.3:
     resolution: {integrity: sha512-geUvdk7c+eizMNUDkRpW1wJwgfOiOeHbxBR/hLXK1aT6zmVSO0jsQcs7fj6MGw89jC/cjGfLcNOrtMYtGqm81g==}
 
@@ -15397,7 +15374,6 @@ packages:
     dependencies:
       call-bind: 1.0.2
       define-properties: 1.1.4
-    dev: true
 
   /object-keys/1.1.1:
     resolution: {integrity: sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==}
@@ -18359,7 +18335,6 @@ packages:
     engines: {node: '>= 0.4'}
     dependencies:
       internal-slot: 1.0.4
-    dev: true
 
   /stoppable/1.1.0:
     resolution: {integrity: sha512-KXDYZ9dszj6bzvnEMRYvxgeTHU74QBFL54XKtP3nyMuJ81CFYtABZ3bAzL2EdFUaEwJOBOgENyFj3R7oTzDyyw==}
@@ -19912,9 +19887,9 @@ packages:
       inherits: 2.0.4
       is-arguments: 1.1.1
       is-generator-function: 1.0.10
-      is-typed-array: 1.1.9
+      is-typed-array: 1.1.10
       safe-buffer: 5.2.1
-      which-typed-array: 1.1.8
+      which-typed-array: 1.1.9
     dev: false
 
   /util/0.12.5:
@@ -20903,7 +20878,6 @@ packages:
       is-set: 2.0.2
       is-weakmap: 2.0.1
       is-weakset: 2.0.2
-    dev: true
 
   /which-module/1.0.0:
     resolution: {integrity: sha512-F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==}
@@ -20913,18 +20887,6 @@ packages:
     resolution: {integrity: sha512-B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q==}
     dev: true
 
-  /which-typed-array/1.1.8:
-    resolution: {integrity: sha512-Jn4e5PItbcAHyLoRDwvPj1ypu27DJbtdYXUa5zsinrUx77Uvfb0cXwwnGMTn7cjUfhhqgVQnVJCwF+7cgU7tpw==}
-    engines: {node: '>= 0.4'}
-    dependencies:
-      available-typed-arrays: 1.0.5
-      call-bind: 1.0.2
-      es-abstract: 1.20.4
-      for-each: 0.3.3
-      has-tostringtag: 1.0.0
-      is-typed-array: 1.1.9
-    dev: false
-
   /which-typed-array/1.1.9:
     resolution: {integrity: sha512-w9c4xkx6mPidwp7180ckYWfMmvxpjlZuIudNtDf4N/tTAUB8VJbX25qZoAsrtGuYNnGw3pa0AXgbGKRB8/EceA==}
     engines: {node: '>= 0.4'}

From a3d8fac73a8a93d6b7f769e1386276e34066a1b7 Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Wed, 15 Feb 2023 13:12:28 +0100
Subject: [PATCH 219/358] feat(Github Trigger Node): Use resource locator
 component (#5253)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡️wip

* ⚡️RLC Search Function for getUsers and getRepositories

* 🐛fix Repository RLC by name url

* 🐛 search method getRepositories include forks

* 🐛 fix repository name can have a dot

* 🐛 fix RLC extractValue without optional

* 🎨 fix linting errors

* 🎨 using prefix 'e.g.' in RLC placeholders

---------

Co-authored-by: Michael Kret <michael.k@radency.com>
---
 .../nodes/Github/GenericFunctions.ts          |   4 +-
 .../nodes/Github/GithubTrigger.node.ts        | 135 +++++++++++++++---
 .../nodes/Github/SearchFunctions.ts           |  87 +++++++++++
 3 files changed, 208 insertions(+), 18 deletions(-)
 create mode 100644 packages/nodes-base/nodes/Github/SearchFunctions.ts

diff --git a/packages/nodes-base/nodes/Github/GenericFunctions.ts b/packages/nodes-base/nodes/Github/GenericFunctions.ts
index 3a12a86164bb4d..d25f4e588b89ca 100644
--- a/packages/nodes-base/nodes/Github/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Github/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 /**
@@ -10,7 +10,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
  *
  */
 export async function githubApiRequest(
-	this: IHookFunctions | IExecuteFunctions,
+	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: string,
 	endpoint: string,
 	body: object,
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index d3e23f1de94526..518f2d0d873801 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -9,6 +9,7 @@ import type {
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { githubApiRequest } from './GenericFunctions';
+import { getRepositories, getUsers } from './SearchFunctions';
 
 export class GithubTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -73,20 +74,111 @@ export class GithubTrigger implements INodeType {
 			{
 				displayName: 'Repository Owner',
 				name: 'owner',
-				type: 'string',
-				default: '',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
 				required: true,
-				placeholder: 'n8n-io',
-				description: 'Owner of the repsitory',
+				modes: [
+					{
+						displayName: 'Repository Owner',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select an owner...',
+						typeOptions: {
+							searchListMethod: 'getUsers',
+							searchable: true,
+							searchFilterRequired: true,
+						},
+					},
+					{
+						displayName: 'Link',
+						name: 'url',
+						type: 'string',
+						placeholder: 'e.g. https://github.com/n8n-io',
+						extractValue: {
+							type: 'regex',
+							regex: 'https:\\/\\/github.com\\/([-_0-9a-zA-Z]+)',
+						},
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: 'https:\\/\\/github.com\\/([-_0-9a-zA-Z]+)(?:.*)',
+									errorMessage: 'Not a valid Github URL',
+								},
+							},
+						],
+					},
+					{
+						displayName: 'By Name',
+						name: 'name',
+						type: 'string',
+						placeholder: 'e.g. n8n-io',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: '[-_a-zA-Z0-9]+',
+									errorMessage: 'Not a valid Github Owner Name',
+								},
+							},
+						],
+						url: '=https://github.com/{{$value}}',
+					},
+				],
 			},
 			{
 				displayName: 'Repository Name',
 				name: 'repository',
-				type: 'string',
-				default: '',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
 				required: true,
-				placeholder: 'n8n',
-				description: 'The name of the repsitory',
+				modes: [
+					{
+						displayName: 'Repository Name',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select an Repository...',
+						typeOptions: {
+							searchListMethod: 'getRepositories',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'Link',
+						name: 'url',
+						type: 'string',
+						placeholder: 'e.g. https://github.com/n8n-io/n8n',
+						extractValue: {
+							type: 'regex',
+							regex: 'https:\\/\\/github.com\\/(?:[-_0-9a-zA-Z]+)\\/([-_.0-9a-zA-Z]+)',
+						},
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: 'https:\\/\\/github.com\\/(?:[-_0-9a-zA-Z]+)\\/([-_.0-9a-zA-Z]+)(?:.*)',
+									errorMessage: 'Not a valid Github Repository URL',
+								},
+							},
+						],
+					},
+					{
+						displayName: 'By Name',
+						name: 'name',
+						type: 'string',
+						placeholder: 'e.g. n8n',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: '[-_.0-9a-zA-Z]+',
+									errorMessage: 'Not a valid Github Repository Name',
+								},
+							},
+						],
+						url: '=https://github.com/{{$parameter["owner"]}}/{{$value}}',
+					},
+				],
 			},
 			{
 				displayName: 'Events',
@@ -343,7 +435,6 @@ export class GithubTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -355,8 +446,10 @@ export class GithubTrigger implements INodeType {
 				}
 
 				// Webhook got created before so check if it still exists
-				const owner = this.getNodeParameter('owner') as string;
-				const repository = this.getNodeParameter('repository') as string;
+				const owner = this.getNodeParameter('owner', '', { extractValue: true }) as string;
+				const repository = this.getNodeParameter('repository', '', {
+					extractValue: true,
+				}) as string;
 				const endpoint = `/repos/${owner}/${repository}/hooks/${webhookData.webhookId}`;
 
 				try {
@@ -373,7 +466,6 @@ export class GithubTrigger implements INodeType {
 					// Some error occured
 					throw error;
 				}
-
 				// If it did not error then the webhook exists
 				return true;
 			},
@@ -387,8 +479,10 @@ export class GithubTrigger implements INodeType {
 					);
 				}
 
-				const owner = this.getNodeParameter('owner') as string;
-				const repository = this.getNodeParameter('repository') as string;
+				const owner = this.getNodeParameter('owner', '', { extractValue: true }) as string;
+				const repository = this.getNodeParameter('repository', '', {
+					extractValue: true,
+				}) as string;
 				const events = this.getNodeParameter('events', []);
 
 				const endpoint = `/repos/${owner}/${repository}/hooks`;
@@ -455,8 +549,10 @@ export class GithubTrigger implements INodeType {
 				const webhookData = this.getWorkflowStaticData('node');
 
 				if (webhookData.webhookId !== undefined) {
-					const owner = this.getNodeParameter('owner') as string;
-					const repository = this.getNodeParameter('repository') as string;
+					const owner = this.getNodeParameter('owner', '', { extractValue: true }) as string;
+					const repository = this.getNodeParameter('repository', '', {
+						extractValue: true,
+					}) as string;
 					const endpoint = `/repos/${owner}/${repository}/hooks/${webhookData.webhookId}`;
 					const body = {};
 
@@ -477,6 +573,13 @@ export class GithubTrigger implements INodeType {
 		},
 	};
 
+	methods = {
+		listSearch: {
+			getUsers,
+			getRepositories,
+		},
+	};
+
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const bodyData = this.getBodyData();
 
diff --git a/packages/nodes-base/nodes/Github/SearchFunctions.ts b/packages/nodes-base/nodes/Github/SearchFunctions.ts
new file mode 100644
index 00000000000000..79da3bd05b35df
--- /dev/null
+++ b/packages/nodes-base/nodes/Github/SearchFunctions.ts
@@ -0,0 +1,87 @@
+import type {
+	ILoadOptionsFunctions,
+	INodeListSearchItems,
+	INodeListSearchResult,
+} from 'n8n-workflow';
+import { githubApiRequest } from './GenericFunctions';
+
+type UserSearchItem = {
+	login: string;
+	html_url: string;
+};
+
+type RepositorySearchItem = {
+	name: string;
+	html_url: string;
+};
+
+type UserSearchResponse = {
+	items: UserSearchItem[];
+	total_count: number;
+};
+
+type RepositorySearchResponse = {
+	items: RepositorySearchItem[];
+	total_count: number;
+};
+
+export async function getUsers(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const page = paginationToken ? +paginationToken : 1;
+	const per_page = 100;
+	const responseData: UserSearchResponse = await githubApiRequest.call(
+		this,
+		'GET',
+		'/search/users',
+		{},
+		{ q: filter, page, per_page },
+	);
+
+	const results: INodeListSearchItems[] = responseData.items.map((item: UserSearchItem) => ({
+		name: item.login,
+		value: item.login,
+		url: item.html_url,
+	}));
+
+	const nextPaginationToken = page * per_page < responseData.total_count ? page + 1 : undefined;
+	return { results, paginationToken: nextPaginationToken };
+}
+
+export async function getRepositories(
+	this: ILoadOptionsFunctions,
+	filter?: string,
+	paginationToken?: string,
+): Promise<INodeListSearchResult> {
+	const owner = this.getCurrentNodeParameter('owner', { extractValue: true });
+	const page = paginationToken ? +paginationToken : 1;
+	const per_page = 100;
+	const q = `${filter ?? ''} user:${owner} fork:true`;
+	let responseData: RepositorySearchResponse = {
+		items: [],
+		total_count: 0,
+	};
+
+	try {
+		responseData = await githubApiRequest.call(
+			this,
+			'GET',
+			'/search/repositories',
+			{},
+			{ q, page, per_page },
+		);
+	} catch (_error) {
+		// will fail if the owner does not have any repositories
+	}
+
+	const results: INodeListSearchItems[] = responseData.items.map((item: RepositorySearchItem) => ({
+		name: item.name,
+		value: item.name,
+		url: item.html_url,
+	}));
+
+	const nextPaginationToken = page * per_page < responseData.total_count ? page + 1 : undefined;
+	return { results, paginationToken: nextPaginationToken };
+}

From 6265f3a27a076f6c3c24d0fb323e44c471d85b23 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Wed, 15 Feb 2023 15:05:55 +0200
Subject: [PATCH 220/358] feat(editor): Update to personalization survey v4
 (#5474)

* feat(editor): update to personalization survey v4

* refactor: rename role other key for consistency

* feat: add reported source to survey

* test: add unit tests for personalization modal
---
 packages/editor-ui/src/Interface.ts           |  20 +-
 packages/editor-ui/src/__tests__/setup.ts     |   8 +
 packages/editor-ui/src/__tests__/utils.ts     |  17 ++
 .../src/components/PersonalizationModal.vue   | 263 ++++++++++++----
 .../__tests__/PersonalizationModal.spec.ts    |  62 ++++
 .../PersonalizationModal.spec.ts.snap         | 284 ++++++++++++++++++
 packages/editor-ui/src/constants.ts           |  41 ++-
 .../src/plugins/i18n/locales/en.json          |  22 +-
 packages/editor-ui/src/utils/userUtils.ts     |  24 +-
 9 files changed, 666 insertions(+), 75 deletions(-)
 create mode 100644 packages/editor-ui/src/__tests__/utils.ts
 create mode 100644 packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
 create mode 100644 packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 9580abc9909081..d20f6713020cb8 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -512,7 +512,25 @@ export type IPersonalizationSurveyAnswersV3 = {
 	email?: string | null;
 };
 
-export type IPersonalizationLatestVersion = IPersonalizationSurveyAnswersV3;
+export type IPersonalizationSurveyAnswersV4 = {
+	version: 'v4';
+	automationGoalDevops?: string[] | null;
+	automationGoalDevopsOther?: string | null;
+	companyIndustryExtended?: string[] | null;
+	otherCompanyIndustryExtended?: string[] | null;
+	companySize?: string | null;
+	companyType?: string | null;
+	automationGoalSm?: string[] | null;
+	automationGoalSmOther?: string | null;
+	usageModes?: string[] | null;
+	email?: string | null;
+	role?: string | null;
+	roleOther?: string | null;
+	reportedSource?: string | null;
+	reportedSourceOther?: string | null;
+};
+
+export type IPersonalizationLatestVersion = IPersonalizationSurveyAnswersV4;
 
 export type IPersonalizationSurveyVersions =
 	| IPersonalizationSurveyAnswersV1
diff --git a/packages/editor-ui/src/__tests__/setup.ts b/packages/editor-ui/src/__tests__/setup.ts
index bd57d1e416bf3b..350dbc992a6cb5 100644
--- a/packages/editor-ui/src/__tests__/setup.ts
+++ b/packages/editor-ui/src/__tests__/setup.ts
@@ -11,3 +11,11 @@ Vue.config.devtools = false;
 // [Vue warn]: Failed to mount component: template or render function not defined.
 Vue.component('vue-json-pretty', require('vue-json-pretty').default);
 Vue.use((vue) => I18nPlugin(vue));
+
+window.ResizeObserver =
+	window.ResizeObserver ||
+	vi.fn().mockImplementation(() => ({
+		disconnect: vi.fn(),
+		observe: vi.fn(),
+		unobserve: vi.fn(),
+	}));
diff --git a/packages/editor-ui/src/__tests__/utils.ts b/packages/editor-ui/src/__tests__/utils.ts
new file mode 100644
index 00000000000000..49834e3854e13a
--- /dev/null
+++ b/packages/editor-ui/src/__tests__/utils.ts
@@ -0,0 +1,17 @@
+export const retry = (assertion: () => any, { interval = 20, timeout = 200 } = {}) => {
+	return new Promise((resolve, reject) => {
+		const startTime = Date.now();
+
+		const tryAgain = () => {
+			setTimeout(() => {
+				try {
+					resolve(assertion());
+				} catch (err) {
+					Date.now() - startTime > timeout ? reject(err) : tryAgain();
+				}
+			}, interval);
+		};
+
+		tryAgain();
+	});
+};
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index 7751ae46d10e8f..b0606f52094f61 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -53,7 +53,7 @@
 <script lang="ts">
 import mixins from 'vue-typed-mixins';
 
-const SURVEY_VERSION = 'v3';
+const SURVEY_VERSION = 'v4';
 
 import {
 	COMPANY_SIZE_100_499,
@@ -78,19 +78,7 @@ import {
 	PHYSICAL_RETAIL_OR_SERVICES,
 	REAL_ESTATE_OR_CONSTRUCTION,
 	TELECOMS_INDUSTRY,
-	AUTOMATION_GOAL_KEY,
-	CUSTOMER_INTEGRATIONS_GOAL,
-	CUSTOMER_SUPPORT_GOAL,
-	ENGINEERING_GOAL,
-	FINANCE_ACCOUNTING_GOAL,
-	HR_GOAL,
-	OPERATIONS_GOAL,
-	PRODUCT_GOAL,
-	SALES_MARKETING_GOAL,
-	SECURITY_GOAL,
 	OTHER_AUTOMATION_GOAL,
-	NOT_SURE_YET_GOAL,
-	AUTOMATION_GOAL_OTHER_KEY,
 	COMPANY_TYPE_KEY,
 	EMAIL_KEY,
 	SAAS_COMPANY_TYPE,
@@ -114,20 +102,46 @@ import {
 	MARKETING_AUTOMATION_DATA_SYNCHING,
 	MARKETING_AUTOMATION_OTHER,
 	OTHER_MARKETING_AUTOMATION_GOAL_KEY,
-	USAGE_MODE_KEY,
-	USAGE_MODE_MANIPULATE_FILES,
-	USAGE_MODE_BUILD_BE_SERVICES,
-	USAGE_MODE_CONNECT_TO_DB,
+	ROLE_KEY,
+	ROLE_BUSINESS_OWNER,
+	ROLE_CUSTOMER_SUPPORT,
+	ROLE_ENGINEERING,
+	ROLE_DATA_SCIENCE,
+	ROLE_DEVOPS,
+	ROLE_IT,
+	ROLE_SALES_AND_MARKETING,
+	ROLE_SECURITY,
+	ROLE_OTHER,
+	ROLE_OTHER_KEY,
+	DEVOPS_AUTOMATION_GOAL_OTHER_KEY,
+	DEVOPS_AUTOMATION_GOAL_KEY,
+	DEVOPS_AUTOMATION_OTHER,
+	DEVOPS_AUTOMATION_CI_CD_GOAL,
+	DEVOPS_AUTOMATION_CLOUD_INFRASTRUCTURE_ORCHESTRATION_GOAL,
+	DEVOPS_AUTOMATION_DATA_SYNCING_GOAL,
+	DEVOPS_INCIDENT_RESPONSE_GOAL,
+	DEVOPS_MONITORING_AND_ALERTING_GOAL,
+	DEVOPS_REPORTING_GOAL,
+	DEVOPS_TICKETING_SYSTEMS_INTEGRATIONS_GOAL,
+	AUTOMATION_BENEFICIARY_KEY,
+	AUTOMATION_BENEFICIARY_SELF,
+	AUTOMATION_BENEFICIARY_MY_TEAM,
+	AUTOMATION_BENEFICIARY_OTHER_TEAMS,
+	REPORTED_SOURCE_KEY,
+	REPORTED_SOURCE_GOOGLE,
+	REPORTED_SOURCE_TWITTER,
+	REPORTED_SOURCE_LINKEDIN,
+	REPORTED_SOURCE_YOUTUBE,
+	REPORTED_SOURCE_FRIEND,
+	REPORTED_SOURCE_PODCAST,
+	REPORTED_SOURCE_EVENT,
+	REPORTED_SOURCE_OTHER,
+	REPORTED_SOURCE_OTHER_KEY,
 } from '../constants';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { showMessage } from '@/mixins/showMessage';
 import Modal from './Modal.vue';
-import {
-	IFormInputs,
-	IPersonalizationLatestVersion,
-	IPersonalizationSurveyAnswersV3,
-	IUser,
-} from '@/Interface';
+import { IFormInputs, IPersonalizationLatestVersion, IUser } from '@/Interface';
 import Vue from 'vue';
 import { getAccountAge } from '@/utils';
 import { GenericValue } from 'n8n-workflow';
@@ -293,73 +307,132 @@ export default mixins(showMessage, workflowHelpers).extend({
 					},
 				},
 				{
-					name: AUTOMATION_GOAL_KEY,
+					name: ROLE_KEY,
 					properties: {
 						type: 'select',
-						label: this.$locale.baseText('personalizationModal.whatAreYouLookingToAutomate'),
+						label: this.$locale.baseText('personalizationModal.whichRoleBestDescribesYou'),
 						placeholder: this.$locale.baseText('personalizationModal.select'),
 						options: [
 							{
-								value: CUSTOMER_INTEGRATIONS_GOAL,
-								label: this.$locale.baseText('personalizationModal.customerIntegrations'),
+								value: ROLE_BUSINESS_OWNER,
+								label: this.$locale.baseText('personalizationModal.businessOwner'),
 							},
 							{
-								value: CUSTOMER_SUPPORT_GOAL,
+								value: ROLE_CUSTOMER_SUPPORT,
 								label: this.$locale.baseText('personalizationModal.customerSupport'),
 							},
 							{
-								value: ENGINEERING_GOAL,
-								label: this.$locale.baseText('personalizationModal.engineeringOrDevops'),
-							},
-							{
-								value: FINANCE_ACCOUNTING_GOAL,
-								label: this.$locale.baseText('personalizationModal.financeOrAccounting'),
+								value: ROLE_DATA_SCIENCE,
+								label: this.$locale.baseText('personalizationModal.dataScience'),
 							},
 							{
-								value: HR_GOAL,
-								label: this.$locale.baseText('personalizationModal.hr'),
+								value: ROLE_DEVOPS,
+								label: this.$locale.baseText('personalizationModal.devops'),
 							},
 							{
-								value: OPERATIONS_GOAL,
-								label: this.$locale.baseText('personalizationModal.operations'),
+								value: ROLE_IT,
+								label: this.$locale.baseText('personalizationModal.it'),
 							},
 							{
-								value: PRODUCT_GOAL,
-								label: this.$locale.baseText('personalizationModal.product'),
+								value: ROLE_ENGINEERING,
+								label: this.$locale.baseText('personalizationModal.engineering'),
 							},
 							{
-								value: SALES_MARKETING_GOAL,
+								value: ROLE_SALES_AND_MARKETING,
 								label: this.$locale.baseText('personalizationModal.salesAndMarketing'),
 							},
 							{
-								value: SECURITY_GOAL,
+								value: ROLE_SECURITY,
 								label: this.$locale.baseText('personalizationModal.security'),
 							},
 							{
-								value: OTHER_AUTOMATION_GOAL,
+								value: ROLE_OTHER,
 								label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
 							},
+						],
+					},
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationLatestVersion)[COMPANY_TYPE_KEY];
+						return companyType !== PERSONAL_COMPANY_TYPE;
+					},
+				},
+				{
+					name: ROLE_OTHER_KEY,
+					properties: {
+						placeholder: this.$locale.baseText('personalizationModal.specifyYourRole'),
+					},
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationLatestVersion)[COMPANY_TYPE_KEY];
+						const role = (values as IPersonalizationLatestVersion)[ROLE_KEY];
+						return companyType !== PERSONAL_COMPANY_TYPE && role === ROLE_OTHER;
+					},
+				},
+				{
+					name: DEVOPS_AUTOMATION_GOAL_KEY,
+					properties: {
+						type: 'multi-select',
+						label: this.$locale.baseText('personalizationModal.whatAreYouLookingToAutomate'),
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								value: DEVOPS_AUTOMATION_CI_CD_GOAL,
+								label: this.$locale.baseText('personalizationModal.cicd'),
+							},
+							{
+								value: DEVOPS_AUTOMATION_CLOUD_INFRASTRUCTURE_ORCHESTRATION_GOAL,
+								label: this.$locale.baseText(
+									'personalizationModal.cloudInfrastructureOrchestration',
+								),
+							},
+							{
+								value: DEVOPS_AUTOMATION_DATA_SYNCING_GOAL,
+								label: this.$locale.baseText('personalizationModal.dataSynching'),
+							},
 							{
-								value: NOT_SURE_YET_GOAL,
-								label: this.$locale.baseText('personalizationModal.notSureYet'),
+								value: DEVOPS_INCIDENT_RESPONSE_GOAL,
+								label: this.$locale.baseText('personalizationModal.incidentResponse'),
+							},
+							{
+								value: DEVOPS_MONITORING_AND_ALERTING_GOAL,
+								label: this.$locale.baseText('personalizationModal.monitoringAndAlerting'),
+							},
+							{
+								value: DEVOPS_REPORTING_GOAL,
+								label: this.$locale.baseText('personalizationModal.reporting'),
+							},
+							{
+								value: DEVOPS_TICKETING_SYSTEMS_INTEGRATIONS_GOAL,
+								label: this.$locale.baseText('personalizationModal.ticketingSystemsIntegrations'),
+							},
+							{
+								value: OTHER_AUTOMATION_GOAL,
+								label: this.$locale.baseText('personalizationModal.other'),
 							},
 						],
 					},
 					shouldDisplay(values): boolean {
 						const companyType = (values as IPersonalizationLatestVersion)[COMPANY_TYPE_KEY];
-						return companyType !== PERSONAL_COMPANY_TYPE;
+						const role = (values as IPersonalizationLatestVersion)[ROLE_KEY] as string;
+						return (
+							companyType !== PERSONAL_COMPANY_TYPE &&
+							[ROLE_DEVOPS, ROLE_ENGINEERING, ROLE_IT].includes(role)
+						);
 					},
 				},
 				{
-					name: AUTOMATION_GOAL_OTHER_KEY,
+					name: DEVOPS_AUTOMATION_GOAL_OTHER_KEY,
 					properties: {
 						placeholder: this.$locale.baseText('personalizationModal.specifyYourAutomationGoal'),
 					},
 					shouldDisplay(values): boolean {
 						const companyType = (values as IPersonalizationLatestVersion)[COMPANY_TYPE_KEY];
-						const automationGoal = (values as IPersonalizationLatestVersion)[AUTOMATION_GOAL_KEY];
+						const goals = (values as IPersonalizationLatestVersion)[DEVOPS_AUTOMATION_GOAL_KEY];
+						const role = (values as IPersonalizationLatestVersion)[ROLE_KEY] as string;
 						return (
-							companyType !== PERSONAL_COMPANY_TYPE && automationGoal === OTHER_AUTOMATION_GOAL
+							companyType !== PERSONAL_COMPANY_TYPE &&
+							[ROLE_DEVOPS, ROLE_ENGINEERING, ROLE_IT].includes(role) &&
+							!!goals &&
+							goals.includes(DEVOPS_AUTOMATION_OTHER)
 						);
 					},
 				},
@@ -401,8 +474,9 @@ export default mixins(showMessage, workflowHelpers).extend({
 						],
 					},
 					shouldDisplay(values): boolean {
-						const goal = (values as IPersonalizationLatestVersion)[AUTOMATION_GOAL_KEY];
-						return goal === SALES_MARKETING_GOAL;
+						const companyType = (values as IPersonalizationLatestVersion)[COMPANY_TYPE_KEY];
+						const role = (values as IPersonalizationLatestVersion)[ROLE_KEY];
+						return companyType !== PERSONAL_COMPANY_TYPE && role === ROLE_SALES_AND_MARKETING;
 					},
 				},
 				{
@@ -413,31 +487,42 @@ export default mixins(showMessage, workflowHelpers).extend({
 						),
 					},
 					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationLatestVersion)[COMPANY_TYPE_KEY];
 						const goals = (values as IPersonalizationLatestVersion)[MARKETING_AUTOMATION_GOAL_KEY];
-						return !!goals && goals.includes(MARKETING_AUTOMATION_OTHER);
+						const role = (values as IPersonalizationLatestVersion)[ROLE_KEY];
+						return (
+							companyType !== PERSONAL_COMPANY_TYPE &&
+							role === ROLE_SALES_AND_MARKETING &&
+							!!goals &&
+							goals.includes(MARKETING_AUTOMATION_OTHER)
+						);
 					},
 				},
 				{
-					name: USAGE_MODE_KEY,
+					name: AUTOMATION_BENEFICIARY_KEY,
 					properties: {
-						type: 'multi-select',
-						label: this.$locale.baseText('personalizationModal.specifyUsageMode'),
+						type: 'select',
+						label: this.$locale.baseText('personalizationModal.specifyAutomationBeneficiary'),
 						placeholder: this.$locale.baseText('personalizationModal.select'),
 						options: [
 							{
-								label: this.$locale.baseText('personalizationModal.connectToInternalDB'),
-								value: USAGE_MODE_CONNECT_TO_DB,
+								label: this.$locale.baseText('personalizationModal.myself'),
+								value: AUTOMATION_BENEFICIARY_SELF,
 							},
 							{
-								label: this.$locale.baseText('personalizationModal.buildBackendServices'),
-								value: USAGE_MODE_BUILD_BE_SERVICES,
+								label: this.$locale.baseText('personalizationModal.myTeam'),
+								value: AUTOMATION_BENEFICIARY_MY_TEAM,
 							},
 							{
-								label: this.$locale.baseText('personalizationModal.manipulateFiles'),
-								value: USAGE_MODE_MANIPULATE_FILES,
+								label: this.$locale.baseText('personalizationModal.otherTeams'),
+								value: AUTOMATION_BENEFICIARY_OTHER_TEAMS,
 							},
 						],
 					},
+					shouldDisplay(values): boolean {
+						const companyType = (values as IPersonalizationLatestVersion)[COMPANY_TYPE_KEY];
+						return companyType !== PERSONAL_COMPANY_TYPE;
+					},
 				},
 				{
 					name: COMPANY_SIZE_KEY,
@@ -477,6 +562,58 @@ export default mixins(showMessage, workflowHelpers).extend({
 						return companyType !== PERSONAL_COMPANY_TYPE;
 					},
 				},
+				{
+					name: REPORTED_SOURCE_KEY,
+					properties: {
+						type: 'select',
+						label: this.$locale.baseText('personalizationModal.howDidYouHearAboutN8n'),
+						placeholder: this.$locale.baseText('personalizationModal.select'),
+						options: [
+							{
+								label: 'Google',
+								value: REPORTED_SOURCE_GOOGLE,
+							},
+							{
+								label: 'Twitter',
+								value: REPORTED_SOURCE_TWITTER,
+							},
+							{
+								label: 'LinkedIn',
+								value: REPORTED_SOURCE_LINKEDIN,
+							},
+							{
+								label: 'YouTube',
+								value: REPORTED_SOURCE_YOUTUBE,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.friendWordOfMouth'),
+								value: REPORTED_SOURCE_FRIEND,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.podcast'),
+								value: REPORTED_SOURCE_PODCAST,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.event'),
+								value: REPORTED_SOURCE_EVENT,
+							},
+							{
+								label: this.$locale.baseText('personalizationModal.otherPleaseSpecify'),
+								value: REPORTED_SOURCE_OTHER,
+							},
+						],
+					},
+				},
+				{
+					name: REPORTED_SOURCE_OTHER_KEY,
+					properties: {
+						placeholder: this.$locale.baseText('personalizationModal.specifyReportedSource'),
+					},
+					shouldDisplay(values): boolean {
+						const reportedSource = (values as IPersonalizationLatestVersion)[REPORTED_SOURCE_KEY];
+						return reportedSource === REPORTED_SOURCE_OTHER;
+					},
+				},
 			];
 
 			return survey;
@@ -502,9 +639,7 @@ export default mixins(showMessage, workflowHelpers).extend({
 
 				this.$externalHooks().run('personalizationModal.onSubmit', survey);
 
-				await this.usersStore.submitPersonalizationSurvey(
-					survey as IPersonalizationSurveyAnswersV3,
-				);
+				await this.usersStore.submitPersonalizationSurvey(survey as IPersonalizationLatestVersion);
 
 				if (Object.keys(values).length === 0) {
 					this.closeDialog();
diff --git a/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts b/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
new file mode 100644
index 00000000000000..145426923275ff
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/PersonalizationModal.spec.ts
@@ -0,0 +1,62 @@
+import { PiniaVuePlugin } from 'pinia';
+import { createLocalVue, mount } from '@vue/test-utils';
+import PersonalizationModal from '@/components/PersonalizationModal.vue';
+import { createTestingPinia } from '@pinia/testing';
+import { PERSONALIZATION_MODAL_KEY, ROLE_SALES_AND_MARKETING } from '@/constants';
+import { retry } from '@/__tests__/utils';
+
+describe('PersonalizationModal.vue', () => {
+	const pinia = createTestingPinia({
+		initialState: {
+			ui: {
+				modals: {
+					[PERSONALIZATION_MODAL_KEY]: { open: true },
+				},
+			},
+			settings: {
+				settings: {
+					templates: {
+						host: '',
+					},
+				},
+			},
+		},
+	});
+	const localVue = createLocalVue();
+	localVue.use(PiniaVuePlugin);
+
+	it('should render correctly', async () => {
+		const wrapper = mount(PersonalizationModal, {
+			localVue,
+			pinia,
+		});
+
+		await retry(() => expect(wrapper.find('.modal-content').exists()).toBe(true));
+
+		expect(wrapper.findAll('.n8n-select').length).toEqual(5);
+		expect(wrapper.html()).toMatchSnapshot();
+	});
+
+	it('should display new option when role is "Devops", "Engineering", "IT", or "Sales and marketing"', async () => {
+		const wrapper = mount(PersonalizationModal, {
+			localVue,
+			pinia,
+		});
+
+		await retry(() => expect(wrapper.find('.modal-content').exists()).toBe(true));
+
+		for (const index of [3, 4, 5, 6]) {
+			wrapper.find('.n8n-select[name="role"]').trigger('click');
+			wrapper
+				.find('.n8n-select[name="role"]')
+				.findAll('.el-select-dropdown__item')
+				.at(index)
+				.trigger('click');
+
+			await retry(() => {
+				expect(wrapper.findAll('.n8n-select').length).toEqual(6);
+				expect(wrapper.find('.n8n-select[name^="automationGoal"]').exists()).toBe(true);
+			});
+		}
+	});
+});
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
new file mode 100644
index 00000000000000..02fffa30463532
--- /dev/null
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
@@ -0,0 +1,284 @@
+// Vitest Snapshot v1
+
+exports[`PersonalizationModal.vue > should render correctly 1`] = `
+"<transition-stub name=\\"dialog-fade\\" data-test-id=\\"personalization-form\\" class=\\"dialog-wrapper\\" style=\\"z-index: 2001;\\">
+  <div class=\\"el-dialog__wrapper\\">
+    <div role=\\"dialog\\" aria-modal=\\"true\\" aria-label=\\"dialog\\" class=\\"el-dialog\\" style=\\"margin-top: 15vh; width: 460px;\\">
+      <div class=\\"el-dialog__header\\">
+        <div class=\\"centerTitle\\">
+          <div>
+            <h1 class=\\"n8n-heading size-xlarge regular\\">Customize n8n to you</h1>
+          </div>
+          <div class=\\"subtitle\\">
+            <h3 class=\\"n8n-heading text-light size-small regular\\">These questions help us tailor n8n to you</h3>
+          </div>
+        </div>
+        <!---->
+      </div>
+      <div class=\\"el-dialog__body\\">
+        <div class=\\"modal-content\\">
+          <div class=\\"container\\">
+            <div>
+              <div class=\\"grid\\">
+                <div class=\\"\\">
+                  <div class=\\"container\\" data-test-id=\\"companyType\\"><label for=\\"companyType\\" class=\\"inputLabel heading medium\\">
+                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> What best describes your company? <!----></span></div>
+                      <!---->
+                      <!---->
+                      <!---->
+                    </label>
+                    <div class=\\"\\">
+                      <div class=\\"n8n-select container\\" name=\\"companyType\\">
+                        <!---->
+                        <div class=\\"el-select el-select--large\\">
+                          <!---->
+                          <div class=\\"el-input el-input--large el-input--suffix\\">
+                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
+                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
+                            <!----></span>
+                            <!---->
+                            <!---->
+                          </div>
+                          <transition-stub name=\\"el-zoom-in-top\\">
+                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
+                              <div class=\\"el-scrollbar\\" style=\\"\\">
+                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
+                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
+                                    <!---->
+                                    <li class=\\"el-select-dropdown__item\\"><span>Software as a service</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Ecommerce</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Marketing agency / consultancy</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Systems integrator / Automation agency</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Education</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Other</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>I'm not using n8n for work</span></li>
+                                  </ul>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-horizontal\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-vertical\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
+                                </div>
+                              </div>
+                              <!---->
+                            </div>
+                          </transition-stub>
+                        </div>
+                      </div>
+                    </div>
+                    <!---->
+                  </div>
+                </div>
+                <div class=\\"mt-undefined\\">
+                  <div class=\\"container\\" data-test-id=\\"role\\"><label for=\\"role\\" class=\\"inputLabel heading medium\\">
+                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Which role best describes you? <!----></span></div>
+                      <!---->
+                      <!---->
+                      <!---->
+                    </label>
+                    <div class=\\"\\">
+                      <div class=\\"n8n-select container\\" name=\\"role\\">
+                        <!---->
+                        <div class=\\"el-select el-select--large\\">
+                          <!---->
+                          <div class=\\"el-input el-input--large el-input--suffix\\">
+                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
+                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
+                            <!----></span>
+                            <!---->
+                            <!---->
+                          </div>
+                          <transition-stub name=\\"el-zoom-in-top\\">
+                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
+                              <div class=\\"el-scrollbar\\" style=\\"\\">
+                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
+                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
+                                    <!---->
+                                    <li class=\\"el-select-dropdown__item\\"><span>Business Owner</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Customer support</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Data Science</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Devops</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>IT</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Engineering</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Sales and Marketing</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Security</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Other (please specify)</span></li>
+                                  </ul>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-horizontal\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-vertical\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
+                                </div>
+                              </div>
+                              <!---->
+                            </div>
+                          </transition-stub>
+                        </div>
+                      </div>
+                    </div>
+                    <!---->
+                  </div>
+                </div>
+                <div class=\\"mt-undefined\\">
+                  <div class=\\"container\\" data-test-id=\\"automationBeneficiary\\"><label for=\\"automationBeneficiary\\" class=\\"inputLabel heading medium\\">
+                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> Who will your automations mainly be for? <!----></span></div>
+                      <!---->
+                      <!---->
+                      <!---->
+                    </label>
+                    <div class=\\"\\">
+                      <div class=\\"n8n-select container\\" name=\\"automationBeneficiary\\">
+                        <!---->
+                        <div class=\\"el-select el-select--large\\">
+                          <!---->
+                          <div class=\\"el-input el-input--large el-input--suffix\\">
+                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
+                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
+                            <!----></span>
+                            <!---->
+                            <!---->
+                          </div>
+                          <transition-stub name=\\"el-zoom-in-top\\">
+                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
+                              <div class=\\"el-scrollbar\\" style=\\"\\">
+                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
+                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
+                                    <!---->
+                                    <li class=\\"el-select-dropdown__item\\"><span>Myself</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>My team</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Other teams</span></li>
+                                  </ul>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-horizontal\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-vertical\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
+                                </div>
+                              </div>
+                              <!---->
+                            </div>
+                          </transition-stub>
+                        </div>
+                      </div>
+                    </div>
+                    <!---->
+                  </div>
+                </div>
+                <div class=\\"mt-undefined\\">
+                  <div class=\\"container\\" data-test-id=\\"companySize\\"><label for=\\"companySize\\" class=\\"inputLabel heading medium\\">
+                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How big is your company? <!----></span></div>
+                      <!---->
+                      <!---->
+                      <!---->
+                    </label>
+                    <div class=\\"\\">
+                      <div class=\\"n8n-select container\\" name=\\"companySize\\">
+                        <!---->
+                        <div class=\\"el-select el-select--large\\">
+                          <!---->
+                          <div class=\\"el-input el-input--large el-input--suffix\\">
+                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
+                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
+                            <!----></span>
+                            <!---->
+                            <!---->
+                          </div>
+                          <transition-stub name=\\"el-zoom-in-top\\">
+                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
+                              <div class=\\"el-scrollbar\\" style=\\"\\">
+                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
+                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
+                                    <!---->
+                                    <li class=\\"el-select-dropdown__item\\"><span>Less than 20 people</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>20-99 people</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>100-499 people</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>500-999 people</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>1000+ people</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>I'm not using n8n for work</span></li>
+                                  </ul>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-horizontal\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-vertical\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
+                                </div>
+                              </div>
+                              <!---->
+                            </div>
+                          </transition-stub>
+                        </div>
+                      </div>
+                    </div>
+                    <!---->
+                  </div>
+                </div>
+                <div class=\\"mt-undefined\\">
+                  <div class=\\"container\\" data-test-id=\\"reportedSource\\"><label for=\\"reportedSource\\" class=\\"inputLabel heading medium\\">
+                      <div class=\\"title\\"><span class=\\"n8n-text size-medium bold\\"> How did you hear about n8n? <!----></span></div>
+                      <!---->
+                      <!---->
+                      <!---->
+                    </label>
+                    <div class=\\"\\">
+                      <div class=\\"n8n-select container\\" name=\\"reportedSource\\">
+                        <!---->
+                        <div class=\\"el-select el-select--large\\">
+                          <!---->
+                          <div class=\\"el-input el-input--large el-input--suffix\\">
+                            <!----><input type=\\"text\\" readonly=\\"readonly\\" autocomplete=\\"off\\" placeholder=\\"Select...\\" class=\\"el-input__inner\\">
+                            <!----><span class=\\"el-input__suffix\\"><span class=\\"el-input__suffix-inner\\"><i class=\\"el-select__caret el-input__icon el-icon-arrow-up\\"></i><!----><!----><!----><!----><!----></span>
+                            <!----></span>
+                            <!---->
+                            <!---->
+                          </div>
+                          <transition-stub name=\\"el-zoom-in-top\\">
+                            <div class=\\"el-select-dropdown el-popper\\" style=\\"display: none;\\">
+                              <div class=\\"el-scrollbar\\" style=\\"\\">
+                                <div class=\\"el-select-dropdown__wrap el-scrollbar__wrap el-scrollbar__wrap--hidden-default\\">
+                                  <ul class=\\"el-scrollbar__view el-select-dropdown__list\\">
+                                    <!---->
+                                    <li class=\\"el-select-dropdown__item\\"><span>Google</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Twitter</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>LinkedIn</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>YouTube</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Friend / Word of mouth</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Podcast</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Event</span></li>
+                                    <li class=\\"el-select-dropdown__item\\"><span>Other (please specify)</span></li>
+                                  </ul>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-horizontal\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateX(0%); webkit-transform: translateX(0%);\\"></div>
+                                </div>
+                                <div class=\\"el-scrollbar__bar is-vertical\\">
+                                  <div class=\\"el-scrollbar__thumb\\" style=\\"transform: translateY(0%); webkit-transform: translateY(0%);\\"></div>
+                                </div>
+                              </div>
+                              <!---->
+                            </div>
+                          </transition-stub>
+                        </div>
+                      </div>
+                    </div>
+                    <!---->
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class=\\"footer\\">
+          <div><button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button primary medium float-right\\">
+              <!----><span>Continue</span></button></div>
+        </div>
+      </div>
+      <!---->
+    </div>
+  </div>
+</transition-stub>"
+`;
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 87b4c5295a94f8..4a3f2f17ec4369 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -232,13 +232,40 @@ export const OTHER_MARKETING_AUTOMATION_GOAL_KEY = 'automationGoalSmOther';
 
 export const CODING_SKILL_KEY = 'codingSkill';
 
+export const AUTOMATION_BENEFICIARY_KEY = 'automationBeneficiary';
+export const AUTOMATION_BENEFICIARY_SELF = 'myself';
+export const AUTOMATION_BENEFICIARY_MY_TEAM = 'my-team';
+export const AUTOMATION_BENEFICIARY_OTHER_TEAMS = 'other-teams';
+
 export const USAGE_MODE_KEY = 'usageModes';
 export const USAGE_MODE_CONNECT_TO_DB = 'connect-internal-db';
 export const USAGE_MODE_BUILD_BE_SERVICES = 'build-be-services';
 export const USAGE_MODE_MANIPULATE_FILES = 'manipulate-files';
 
+export const REPORTED_SOURCE_KEY = 'reportedSource';
+export const REPORTED_SOURCE_OTHER_KEY = 'reportedSourceOther';
+export const REPORTED_SOURCE_GOOGLE = 'google';
+export const REPORTED_SOURCE_TWITTER = 'twitter';
+export const REPORTED_SOURCE_LINKEDIN = 'linkedin';
+export const REPORTED_SOURCE_YOUTUBE = 'youtube';
+export const REPORTED_SOURCE_FRIEND = 'friend';
+export const REPORTED_SOURCE_PODCAST = 'podcast';
+export const REPORTED_SOURCE_EVENT = 'event';
+export const REPORTED_SOURCE_OTHER = 'other';
+
 export const AUTOMATION_GOAL_KEY = 'automationGoal';
-export const AUTOMATION_GOAL_OTHER_KEY = 'otherAutomationGoal';
+export const DEVOPS_AUTOMATION_GOAL_KEY = 'automationGoalDevops';
+export const DEVOPS_AUTOMATION_GOAL_OTHER_KEY = 'automationGoalDevopsOther';
+export const DEVOPS_AUTOMATION_OTHER = 'other';
+export const DEVOPS_AUTOMATION_CI_CD_GOAL = 'ci-cd';
+export const DEVOPS_AUTOMATION_CLOUD_INFRASTRUCTURE_ORCHESTRATION_GOAL =
+	'cloud-infrastructure-orchestration';
+export const DEVOPS_AUTOMATION_DATA_SYNCING_GOAL = 'data-syncing';
+export const DEVOPS_INCIDENT_RESPONSE_GOAL = 'incident-response';
+export const DEVOPS_MONITORING_AND_ALERTING_GOAL = 'monitoring-alerting';
+export const DEVOPS_REPORTING_GOAL = 'reporting';
+export const DEVOPS_TICKETING_SYSTEMS_INTEGRATIONS_GOAL = 'ticketing-systems-integrations';
+
 export const CUSTOMER_INTEGRATIONS_GOAL = 'customer-integrations';
 export const CUSTOMER_SUPPORT_GOAL = 'customer-support';
 export const ENGINEERING_GOAL = 'engineering';
@@ -251,6 +278,18 @@ export const SECURITY_GOAL = 'security';
 export const OTHER_AUTOMATION_GOAL = 'other';
 export const NOT_SURE_YET_GOAL = 'not-sure-yet';
 
+export const ROLE_KEY = 'role';
+export const ROLE_OTHER_KEY = 'roleOther';
+export const ROLE_BUSINESS_OWNER = 'business-owner';
+export const ROLE_CUSTOMER_SUPPORT = 'customer-support';
+export const ROLE_DATA_SCIENCE = 'data-science';
+export const ROLE_DEVOPS = 'devops';
+export const ROLE_IT = 'it';
+export const ROLE_ENGINEERING = 'engineering';
+export const ROLE_SALES_AND_MARKETING = 'sales-and-marketing';
+export const ROLE_SECURITY = 'security';
+export const ROLE_OTHER = 'other';
+
 /** END OF PERSONALIZATION SURVEY */
 
 export const MODAL_CANCEL = 'cancel';
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 20010cf8e38734..3460093297acba 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -897,13 +897,19 @@
 	"parameterInputList.delete": "Delete",
 	"parameterInputList.deleteParameter": "Delete Parameter",
 	"parameterInputList.parameterOptions": "Parameter Options",
+	"personalizationModal.businessOwner": "Business Owner",
 	"personalizationModal.continue": "Continue",
+	"personalizationModal.cicd": "CI/CD",
+	"personalizationModal.cloudInfrastructureOrchestration": "Cloud infrastructure orchestration",
 	"personalizationModal.customerIntegrations": "Customer integrations",
 	"personalizationModal.customerSupport": "Customer support",
 	"personalizationModal.customizeN8n": "Customize n8n to you",
+	"personalizationModal.dataScience": "Data Science",
+	"personalizationModal.devops": "Devops",
 	"personalizationModal.digitalAgencyOrConsultant": "Marketing agency / consultancy",
-	"personalizationModal.eCommerce": "eCommerce",
+	"personalizationModal.eCommerce": "Ecommerce",
 	"personalizationModal.education": "Education",
+	"personalizationModal.engineering": "Engineering",
 	"personalizationModal.engineeringOrDevops": "Engineering / Devops",
 	"personalizationModal.errorWhileSubmittingResults": "Error while submitting results",
 	"personalizationModal.financeOrAccounting": "Finance / Accounting",
@@ -927,6 +933,7 @@
 	"personalizationModal.operations": "Operations",
 	"personalizationModal.other": "Other",
 	"personalizationModal.otherPleaseSpecify": "Other (please specify)",
+	"personalizationModal.specifyReportedSource": "Specify how you heard about n8n",
 	"personalizationModal.people": "people",
 	"personalizationModal.physicalRetailOrServices": "Physical retail or services",
 	"personalizationModal.product": "Product (e.g. fast prototyping)",
@@ -935,6 +942,15 @@
 	"personalizationModal.salesAndMarketing": "Sales and Marketing",
 	"personalizationModal.security": "Security",
 	"personalizationModal.select": "Select...",
+	"personalizationModal.howDidYouHearAboutN8n": "How did you hear about n8n?",
+	"personalizationModal.friendWordOfMouth": "Friend / Word of mouth",
+	"personalizationModal.podcast": "Podcast",
+	"personalizationModal.event": "Event",
+	"personalizationModal.myself": "Myself",
+	"personalizationModal.myTeam": "My team",
+	"personalizationModal.otherTeams": "Other teams",
+	"personalizationModal.specifyAutomationBeneficiary": "Who will your automations mainly be for?",
+	"personalizationModal.specifyYourRole": "Please specify your role",
 	"personalizationModal.specifyYourAutomationGoal": "Please specify your automation goal",
 	"personalizationModal.specifyYourCompanysIndustry": "Specify your company's industry",
 	"personalizationModal.support": "Support",
@@ -942,6 +958,7 @@
 	"personalizationModal.telecoms": "Telecoms",
 	"personalizationModal.thanks": "Thanks!",
 	"personalizationModal.theseQuestionsHelpUs": "These questions help us tailor n8n to you",
+	"personalizationModal.whichRoleBestDescribesYou": "Which role best describes you?",
 	"personalizationModal.whatAreYouLookingToAutomate": "What are you looking to automate?",
 	"personalizationModal.whatBestDescribesYourCompany": "What best describes your company?",
 	"personalizationModal.whichIndustriesIsYourCompanyIn": "Which industries is your company in?",
@@ -953,7 +970,10 @@
 	"personalizationModal.email": "Enter your email..",
 	"personalizationModal.adCampaign": "Ad campaign management",
 	"personalizationModal.reporting": "Reporting",
+	"personalizationModal.ticketingSystemsIntegrations": "Ticketing systems integrations",
 	"personalizationModal.dataSynching": "Data syncing",
+	"personalizationModal.incidentResponse": "Incident response",
+	"personalizationModal.monitoringAndAlerting": "Monitoring and alerting",
 	"personalizationModal.specifyUsageMode": "Are you looking to do any of these?",
 	"personalizationModal.connectToInternalDB": "Connect to my company’s internal databases",
 	"personalizationModal.buildBackendServices": "Build backend services (endpoints)",
diff --git a/packages/editor-ui/src/utils/userUtils.ts b/packages/editor-ui/src/utils/userUtils.ts
index e5fba6f01adc76..2d7b1ce01b9e2f 100644
--- a/packages/editor-ui/src/utils/userUtils.ts
+++ b/packages/editor-ui/src/utils/userUtils.ts
@@ -65,6 +65,7 @@ import {
 	IPersonalizationSurveyAnswersV1,
 	IPersonalizationSurveyAnswersV2,
 	IPersonalizationSurveyAnswersV3,
+	IPersonalizationSurveyAnswersV4,
 	IPersonalizationSurveyVersions,
 	IUser,
 } from '@/Interface';
@@ -74,9 +75,12 @@ import { ILogInStatus, IRole, IUserPermissions } from '@/Interface';
 	Utility functions used to handle users in n8n
 */
 
-function isPersonalizationV2OrV3(
+function isPersonalizationSurveyV2OrLater(
 	data: IPersonalizationSurveyVersions,
-): data is IPersonalizationSurveyAnswersV2 | IPersonalizationSurveyAnswersV3 {
+): data is
+	| IPersonalizationSurveyAnswersV2
+	| IPersonalizationSurveyAnswersV3
+	| IPersonalizationSurveyAnswersV4 {
 	return 'version' in data;
 }
 
@@ -179,17 +183,18 @@ export function getPersonalizedNodeTypes(
 		| IPersonalizationSurveyAnswersV1
 		| IPersonalizationSurveyAnswersV2
 		| IPersonalizationSurveyAnswersV3
+		| IPersonalizationSurveyAnswersV4
 		| null,
 ): string[] {
 	if (!answers) {
 		return [];
 	}
 
-	if (isPersonalizationV2OrV3(answers)) {
-		return getPersonalizationV2(answers);
+	if (isPersonalizationSurveyV2OrLater(answers)) {
+		return getPersonalizationSurveyV2OrLater(answers);
 	}
 
-	return getPersonalizationV1(answers);
+	return getPersonalizationSurveyV1(answers);
 }
 
 export function getAccountAge(currentUser: IUser): number {
@@ -202,8 +207,11 @@ export function getAccountAge(currentUser: IUser): number {
 	return -1;
 }
 
-function getPersonalizationV2(
-	answers: IPersonalizationSurveyAnswersV2 | IPersonalizationSurveyAnswersV3,
+function getPersonalizationSurveyV2OrLater(
+	answers:
+		| IPersonalizationSurveyAnswersV2
+		| IPersonalizationSurveyAnswersV3
+		| IPersonalizationSurveyAnswersV4,
 ) {
 	let nodeTypes: string[] = [];
 
@@ -339,7 +347,7 @@ function getPersonalizationV2(
 	return nodeTypes;
 }
 
-function getPersonalizationV1(answers: IPersonalizationSurveyAnswersV1) {
+function getPersonalizationSurveyV1(answers: IPersonalizationSurveyAnswersV1) {
 	const companySize = answers[COMPANY_SIZE_KEY];
 	const workArea = answers[WORK_AREA_KEY];
 

From a9f08fc5baebee2b7e481267c92f7e3f2d95d7ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 15 Feb 2023 16:09:53 +0100
Subject: [PATCH 221/358] fix(core): Fix issues with community node
 installation (no-changelog) (#5481)

This fixes the following issues:
* After a community node is installed, we were not calling `postProcessLoaders`, which was causing a bunch of unexpected behaviors, and sometimes even crashes. This was only happening in the session where the package was installed. After a crash, the restarted service was working without these issues.
* After a community node is installed, the icon for the nodes and credentials were missing in the UI, as we were creating one icons route per installed package at startup, and this did not handle newly installed packages. restarting the service fixes this issue as well.

Fixes https://community.n8n.io/t/showing-weird-count-on-community-nodes/23035
---
 .../cli/src/CommunityNodes/packageModel.ts    | 33 ++++----
 packages/cli/src/LoadNodesAndCredentials.ts   | 81 ++++++-------------
 packages/cli/src/ReloadNodesAndCredentials.ts | 13 ++-
 packages/cli/src/Server.ts                    | 25 +++---
 packages/core/src/DirectoryLoader.ts          |  2 +-
 5 files changed, 65 insertions(+), 89 deletions(-)

diff --git a/packages/cli/src/CommunityNodes/packageModel.ts b/packages/cli/src/CommunityNodes/packageModel.ts
index 947fc4364d1e44..522dbc8dbc1e1d 100644
--- a/packages/cli/src/CommunityNodes/packageModel.ts
+++ b/packages/cli/src/CommunityNodes/packageModel.ts
@@ -1,5 +1,5 @@
-import type { INodeTypeData, INodeTypeNameVersion } from 'n8n-workflow';
 import { LoggerProxy } from 'n8n-workflow';
+import type { PackageDirectoryLoader } from 'n8n-core';
 import * as Db from '@/Db';
 import { InstalledNodes } from '@db/entities/InstalledNodes';
 import { InstalledPackages } from '@db/entities/InstalledPackages';
@@ -12,8 +12,9 @@ export async function findInstalledPackage(packageName: string): Promise<Install
 }
 
 export async function isPackageInstalled(packageName: string): Promise<boolean> {
-	const installedPackage = await findInstalledPackage(packageName);
-	return installedPackage !== null;
+	return Db.collections.InstalledPackages.exist({
+		where: { packageName },
+	});
 }
 
 export async function getAllInstalledPackages(): Promise<InstalledPackages[]> {
@@ -27,13 +28,11 @@ export async function removePackageFromDatabase(
 }
 
 export async function persistInstalledPackageData(
-	installedPackageName: string,
-	installedPackageVersion: string,
-	installedNodes: INodeTypeNameVersion[],
-	loadedNodeTypes: INodeTypeData,
-	authorName?: string,
-	authorEmail?: string,
+	packageLoader: PackageDirectoryLoader,
 ): Promise<InstalledPackages> {
+	const { packageJson, nodeTypes, loadedNodes } = packageLoader;
+	const { name: packageName, version: installedVersion, author } = packageJson;
+
 	let installedPackage: InstalledPackages;
 
 	try {
@@ -41,21 +40,21 @@ export async function persistInstalledPackageData(
 			const promises = [];
 
 			const installedPackagePayload = Object.assign(new InstalledPackages(), {
-				packageName: installedPackageName,
-				installedVersion: installedPackageVersion,
-				authorName,
-				authorEmail,
+				packageName,
+				installedVersion,
+				authorName: author?.name,
+				authorEmail: author?.email,
 			});
 			installedPackage = await transactionManager.save<InstalledPackages>(installedPackagePayload);
 			installedPackage.installedNodes = [];
 
 			promises.push(
-				...installedNodes.map(async (loadedNode) => {
+				...loadedNodes.map(async (loadedNode) => {
 					const installedNodePayload = Object.assign(new InstalledNodes(), {
-						name: loadedNodeTypes[loadedNode.name].type.description.displayName,
+						name: nodeTypes[loadedNode.name].type.description.displayName,
 						type: loadedNode.name,
 						latestVersion: loadedNode.version,
-						package: installedPackageName,
+						package: packageName,
 					});
 					installedPackage.installedNodes.push(installedNodePayload);
 					return transactionManager.save<InstalledNodes>(installedNodePayload);
@@ -70,7 +69,7 @@ export async function persistInstalledPackageData(
 		LoggerProxy.error('Failed to save installed packages and nodes', {
 			// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 			error,
-			packageName: installedPackageName,
+			packageName,
 		});
 		throw error;
 	}
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index f44c131ad90aee..0f0f8f2c4b502e 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -22,7 +22,6 @@ import { access as fsAccess, mkdir, readdir as fsReaddir, stat as fsStat } from
 import path from 'path';
 import config from '@/config';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
-import type { InstalledNodes } from '@db/entities/InstalledNodes';
 import { executeCommand } from '@/CommunityNodes/helpers';
 import {
 	CLI_DIR,
@@ -198,23 +197,13 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 
 		const finalNodeUnpackedPath = path.join(downloadFolder, 'node_modules', packageName);
 
-		const { loadedNodes, packageJson } = await this.runDirectoryLoader(
-			PackageDirectoryLoader,
-			finalNodeUnpackedPath,
-		);
+		const loader = await this.runDirectoryLoader(PackageDirectoryLoader, finalNodeUnpackedPath);
 
-		if (loadedNodes.length > 0) {
+		if (loader.loadedNodes.length > 0) {
 			// Save info to DB
 			try {
-				const installedPackage = await persistInstalledPackageData(
-					packageJson.name,
-					packageJson.version,
-					loadedNodes,
-					this.loaded.nodes,
-					packageJson.author?.name,
-					packageJson.author?.email,
-				);
-				this.attachNodesToNodeTypes(installedPackage.installedNodes);
+				const installedPackage = await persistInstalledPackageData(loader);
+				await this.postProcessLoaders();
 				await this.generateTypesForFrontend();
 				return installedPackage;
 			} catch (error) {
@@ -242,9 +231,13 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 
 		await removePackageFromDatabase(installedPackage);
 
-		await this.generateTypesForFrontend();
+		if (packageName in this.loaders) {
+			this.loaders[packageName].reset();
+			delete this.loaders[packageName];
+		}
 
-		this.unloadNodes(installedPackage.installedNodes);
+		await this.postProcessLoaders();
+		await this.generateTypesForFrontend();
 	}
 
 	async updateNpmModule(
@@ -264,33 +257,17 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 			throw error;
 		}
 
-		this.unloadNodes(installedPackage.installedNodes);
-
 		const finalNodeUnpackedPath = path.join(downloadFolder, 'node_modules', packageName);
 
-		const { loadedNodes, packageJson } = await this.runDirectoryLoader(
-			PackageDirectoryLoader,
-			finalNodeUnpackedPath,
-		);
+		const loader = await this.runDirectoryLoader(PackageDirectoryLoader, finalNodeUnpackedPath);
 
-		if (loadedNodes.length > 0) {
+		if (loader.loadedNodes.length > 0) {
 			// Save info to DB
 			try {
 				await removePackageFromDatabase(installedPackage);
-
-				const newlyInstalledPackage = await persistInstalledPackageData(
-					packageJson.name,
-					packageJson.version,
-					loadedNodes,
-					this.loaded.nodes,
-					packageJson.author?.name,
-					packageJson.author?.email,
-				);
-
-				this.attachNodesToNodeTypes(newlyInstalledPackage.installedNodes);
-
+				const newlyInstalledPackage = await persistInstalledPackageData(loader);
+				await this.postProcessLoaders();
 				await this.generateTypesForFrontend();
-
 				return newlyInstalledPackage;
 			} catch (error) {
 				LoggerProxy.error('Failed to save installed packages and nodes', {
@@ -363,20 +340,6 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		});
 	}
 
-	private unloadNodes(installedNodes: InstalledNodes[]): void {
-		installedNodes.forEach((installedNode) => {
-			delete this.loaded.nodes[installedNode.type];
-		});
-	}
-
-	private attachNodesToNodeTypes(installedNodes: InstalledNodes[]): void {
-		const loadedNodes = this.loaded.nodes;
-		installedNodes.forEach((installedNode) => {
-			const { type, sourcePath } = loadedNodes[installedNode.type];
-			loadedNodes[installedNode.type] = { type, sourcePath };
-		});
-	}
-
 	/**
 	 * Run a loader of source files of nodes and credentials in a directory.
 	 */
@@ -386,16 +349,18 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 	) {
 		const loader = new constructor(dir, this.excludeNodes, this.includeNodes);
 		await loader.loadAll();
-		this.loaders[dir] = loader;
+		this.loaders[loader.packageName] = loader;
 		return loader;
 	}
 
 	async postProcessLoaders() {
-		this.types.nodes = [];
-		this.types.credentials = [];
-		for (const [dir, loader] of Object.entries(this.loaders)) {
+		this.known = { nodes: {}, credentials: {} };
+		this.loaded = { nodes: {}, credentials: {} };
+		this.types = { nodes: [], credentials: [] };
+
+		for (const loader of Object.values(this.loaders)) {
 			// list of node & credential types that will be sent to the frontend
-			const { types } = loader;
+			const { types, directory } = loader;
 			this.types.nodes = this.types.nodes.concat(types.nodes);
 			this.types.credentials = this.types.credentials.concat(types.credentials);
 
@@ -416,7 +381,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 					const { className, sourcePath } = known.nodes[type];
 					this.known.nodes[type] = {
 						className,
-						sourcePath: path.join(dir, sourcePath),
+						sourcePath: path.join(directory, sourcePath),
 					};
 				}
 
@@ -424,7 +389,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 					const { className, sourcePath, nodesToTestWith } = known.credentials[type];
 					this.known.credentials[type] = {
 						className,
-						sourcePath: path.join(dir, sourcePath),
+						sourcePath: path.join(directory, sourcePath),
 						nodesToTestWith: nodesToTestWith?.map((nodeName) => `${packageName}.${nodeName}`),
 					};
 				}
diff --git a/packages/cli/src/ReloadNodesAndCredentials.ts b/packages/cli/src/ReloadNodesAndCredentials.ts
index d7cc36c05e6bad..f0fde3ba3a53f3 100644
--- a/packages/cli/src/ReloadNodesAndCredentials.ts
+++ b/packages/cli/src/ReloadNodesAndCredentials.ts
@@ -1,5 +1,5 @@
 import path from 'path';
-import { realpath } from 'fs/promises';
+import { realpath, access } from 'fs/promises';
 
 import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
 import type { NodeTypesClass } from '@/NodeTypes';
@@ -15,8 +15,15 @@ export const reloadNodesAndCredentials = async (
 	// eslint-disable-next-line import/no-extraneous-dependencies
 	const { watch } = await import('chokidar');
 
-	Object.entries(loadNodesAndCredentials.loaders).forEach(async ([dir, loader]) => {
-		const realModulePath = path.join(await realpath(dir), path.sep);
+	Object.values(loadNodesAndCredentials.loaders).forEach(async (loader) => {
+		try {
+			await access(loader.directory);
+		} catch {
+			// If directory doesn't exist, there is nothing to watch
+			return;
+		}
+
+		const realModulePath = path.join(await realpath(loader.directory), path.sep);
 		const reloader = debounce(async () => {
 			const modulesToUnload = Object.keys(require.cache).filter((filePath) =>
 				filePath.startsWith(realModulePath),
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index b898f62a792dc4..c65300131668d9 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1261,18 +1261,23 @@ class Server extends AbstractServer {
 				},
 			};
 
-			for (const [dir, loader] of Object.entries(this.loadNodesAndCredentials.loaders)) {
-				const pathPrefix = `/icons/${loader.packageName}`;
-				this.app.use(`${pathPrefix}/*/*.(svg|png)`, async (req, res) => {
-					const filePath = pathResolve(dir, req.originalUrl.substring(pathPrefix.length + 1));
+			this.app.use('/icons/:packageName/*/*.(svg|png)', async (req, res) => {
+				const { packageName } = req.params;
+				const loader = this.loadNodesAndCredentials.loaders[packageName];
+				if (loader) {
+					const pathPrefix = `/icons/${packageName}/`;
+					const filePath = pathResolve(
+						loader.directory,
+						req.originalUrl.substring(pathPrefix.length),
+					);
 					try {
 						await fsAccess(filePath);
-						res.sendFile(filePath);
-					} catch {
-						res.sendStatus(404);
-					}
-				});
-			}
+						return res.sendFile(filePath);
+					} catch {}
+				}
+
+				res.sendStatus(404);
+			});
 
 			this.app.use(
 				'/',
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index adf6888c2bcc58..5709efa819d5d4 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -45,7 +45,7 @@ export abstract class DirectoryLoader {
 	types: Types = { nodes: [], credentials: [] };
 
 	constructor(
-		protected readonly directory: string,
+		readonly directory: string,
 		protected readonly excludeNodes: string[] = [],
 		protected readonly includeNodes: string[] = [],
 	) {}

From 71cba06b7c1ee8ed42a4dacc2d8114df119339dc Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Thu, 16 Feb 2023 09:00:54 +0000
Subject: [PATCH 222/358] feat(Notion Node): Add icon support for page and
 database page creation (#5468)

---
 .../nodes/Notion/DatabasePageDescription.ts   | 41 +++++++++++++++++++
 .../nodes/Notion/PageDescription.ts           | 41 +++++++++++++++++++
 .../nodes/Notion/v1/NotionV1.node.ts          | 18 ++++++++
 .../nodes/Notion/v2/NotionV2.node.ts          | 21 +++++++++-
 4 files changed, 120 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
index 958e63f7aa353b..ee458942691d0f 100644
--- a/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/DatabasePageDescription.ts
@@ -534,6 +534,47 @@ export const databasePageFields: INodeProperties[] = [
 		],
 	},
 	...blocks('databasePage', 'create'),
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['databasePage'],
+				operation: ['create'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Icon Type',
+				name: 'iconType',
+				type: 'options',
+				options: [
+					{
+						name: 'Emoji',
+						value: 'emoji',
+						description: 'Use an Emoji for the icon',
+					},
+					{
+						name: 'File',
+						value: 'file',
+						description: 'Use a file for the icon',
+					},
+				],
+				default: 'emoji',
+				description: 'The icon type for the database page, Either a URL or an Emoji',
+			},
+			{
+				displayName: 'Icon',
+				name: 'icon',
+				type: 'string',
+				default: '',
+				description: 'Emoji or File URL to use as the icon',
+			},
+		],
+	},
 	/* -------------------------------------------------------------------------- */
 	/*                      databasePage:update                                   */
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Notion/PageDescription.ts b/packages/nodes-base/nodes/Notion/PageDescription.ts
index 3d3829c61209ad..5c4ec2d1586870 100644
--- a/packages/nodes-base/nodes/Notion/PageDescription.ts
+++ b/packages/nodes-base/nodes/Notion/PageDescription.ts
@@ -237,6 +237,47 @@ export const pageFields: INodeProperties[] = [
 		description: 'Whether to return a simplified version of the response instead of the raw data',
 	},
 	...blocks('page', 'create'),
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		displayOptions: {
+			show: {
+				resource: ['page'],
+				operation: ['create'],
+			},
+		},
+		default: {},
+		placeholder: 'Add Option',
+		options: [
+			{
+				displayName: 'Icon Type',
+				name: 'iconType',
+				type: 'options',
+				options: [
+					{
+						name: 'Emoji',
+						value: 'emoji',
+						description: 'Use an Emoji for the icon',
+					},
+					{
+						name: 'File',
+						value: 'file',
+						description: 'Use a file for the icon',
+					},
+				],
+				default: 'emoji',
+				description: 'The icon type for the page, Either a URL or an Emoji',
+			},
+			{
+				displayName: 'Icon',
+				name: 'icon',
+				type: 'string',
+				default: '',
+				description: 'Emoji or File URL to use as the icon',
+			},
+		],
+	},
 	/* -------------------------------------------------------------------------- */
 	/*                                page:get                                    */
 	/* -------------------------------------------------------------------------- */
diff --git a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
index cb20285f0c3c35..71709bbdf7759c 100644
--- a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
+++ b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
@@ -369,6 +369,15 @@ export class NotionV1 implements INodeType {
 						responseData = simplifyObjects(responseData, false, 1);
 					}
 
+					const options = this.getNodeParameter('options', i);
+					if (options.icon) {
+						if (options.iconType && options.iconType === 'file') {
+							body.icon = { external: { url: options.icon } };
+						} else {
+							body.icon = { emoji: options.icon };
+						}
+					}
+
 					const executionData = this.helpers.constructExecutionMetaData(
 						this.helpers.returnJsonArray(responseData),
 						{ itemData: { item: i } },
@@ -530,6 +539,15 @@ export class NotionV1 implements INodeType {
 						responseData = simplifyObjects(responseData, false, 1);
 					}
 
+					const options = this.getNodeParameter('options', i);
+					if (options.icon) {
+						if (options.iconType && options.iconType === 'file') {
+							body.icon = { external: { url: options.icon } };
+						} else {
+							body.icon = { emoji: options.icon };
+						}
+					}
+
 					const executionData = this.helpers.constructExecutionMetaData(
 						this.helpers.returnJsonArray(responseData),
 						{ itemData: { item: i } },
diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
index 2b1f7d88c8a79a..566fab9f5019e1 100644
--- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
+++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -463,6 +463,16 @@ export class NotionV2 implements INodeType {
 					const blockValues = this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[];
 					extractDatabaseMentionRLC(blockValues);
 					body.children = formatBlocks(blockValues);
+
+					const options = this.getNodeParameter('options', i);
+					if (options.icon) {
+						if (options.iconType && options.iconType === 'file') {
+							body.icon = { external: { url: options.icon } };
+						} else {
+							body.icon = { emoji: options.icon };
+						}
+					}
+
 					responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
 					if (simple) {
 						responseData = simplifyObjects(responseData);
@@ -663,7 +673,6 @@ export class NotionV2 implements INodeType {
 			if (operation === 'create') {
 				for (let i = 0; i < length; i++) {
 					const simple = this.getNodeParameter('simple', i) as boolean;
-
 					const body: { [key: string]: any } = {
 						parent: {},
 						properties: {},
@@ -675,6 +684,16 @@ export class NotionV2 implements INodeType {
 					const blockValues = this.getNodeParameter('blockUi.blockValues', i, []) as IDataObject[];
 					extractDatabaseMentionRLC(blockValues);
 					body.children = formatBlocks(blockValues);
+
+					const options = this.getNodeParameter('options', i);
+					if (options.icon) {
+						if (options.iconType && options.iconType === 'file') {
+							body.icon = { external: { url: options.icon } };
+						} else {
+							body.icon = { emoji: options.icon };
+						}
+					}
+
 					responseData = await notionApiRequest.call(this, 'POST', '/pages', body);
 					if (simple) {
 						responseData = simplifyObjects(responseData, download);

From 1a20fd9f46495e32508d74dbb9ccaaa0f6194a07 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Thu, 16 Feb 2023 09:01:56 +0000
Subject: [PATCH 223/358] fix(Bubble Node): Fix pagination issue when returning
 all objects (#5483)

---
 packages/nodes-base/nodes/Bubble/GenericFunctions.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
index b0f9cc30021640..0775a93e2cf528 100644
--- a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
@@ -69,9 +69,10 @@ export async function bubbleApiRequestAllItems(
 
 	let responseData;
 	qs.limit = 100;
+	qs.cursor = 0;
 	do {
 		responseData = await bubbleApiRequest.call(this, method, endpoint, body, qs);
-		qs.cursor = responseData.cursor;
+		qs.cursor += qs.limit;
 		returnData.push.apply(returnData, responseData.response.results);
 	} while (responseData.response.remaining !== 0);
 

From a2c6ea9e110e51debf137707b52eb7fedbc0032b Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 16 Feb 2023 10:36:24 +0100
Subject: [PATCH 224/358] fix(core): Remove unnecessary info from `GET
 /workflows` response (#5311)

* fix(core): Remove unnecessary info from `GET /workflows` response

* fix(core): Remove unnecessary info from `GET /workflows` response

* fix(core): Remove credentials from `GET /workflows` response

* fix(core): Update unit tests for `GET /workflows` response

* fix(core): Remove `usedCredentials` from `GET /workflows` response

* fix(core): Update unit tests for `GET /workflows` response

* fix(core): remove nodes from getMany

* fix(core): remove unnecessary owner props from workflow list items

* fix(core): fix lint error

* fix(core): remove unused function

* fix(core): simplifying ownerId usage

* fix(core): trim down the query for workflow listing
---
 .../src/workflows/workflows.controller.ee.ts  | 12 ++-
 .../src/workflows/workflows.services.ee.ts    | 76 +++----------------
 .../cli/src/workflows/workflows.services.ts   | 45 +++++------
 packages/cli/src/workflows/workflows.types.ts |  6 ++
 .../workflows.controller.ee.test.ts           | 29 +------
 5 files changed, 51 insertions(+), 117 deletions(-)

diff --git a/packages/cli/src/workflows/workflows.controller.ee.ts b/packages/cli/src/workflows/workflows.controller.ee.ts
index 90de9dc93ffd69..410b699fced582 100644
--- a/packages/cli/src/workflows/workflows.controller.ee.ts
+++ b/packages/cli/src/workflows/workflows.controller.ee.ts
@@ -203,12 +203,16 @@ EEWorkflowController.post(
 EEWorkflowController.get(
 	'/',
 	ResponseHelper.send(async (req: WorkflowRequest.GetAll) => {
-		const workflows = await EEWorkflows.getMany(req.user, req.query.filter);
-		await EEWorkflows.addCredentialsToWorkflows(workflows, req.user);
+		const [workflows, workflowOwnerRole] = await Promise.all([
+			EEWorkflows.getMany(req.user, req.query.filter),
+			Db.collections.Role.findOneOrFail({
+				select: ['id'],
+				where: { name: 'owner', scope: 'workflow' },
+			}),
+		]);
 
 		return workflows.map((workflow) => {
-			EEWorkflows.addOwnerAndSharings(workflow);
-			workflow.nodes = [];
+			EEWorkflows.addOwnerId(workflow, workflowOwnerRole);
 			return workflow;
 		});
 	}),
diff --git a/packages/cli/src/workflows/workflows.services.ee.ts b/packages/cli/src/workflows/workflows.services.ee.ts
index aa47acd2e7d0de..97b8df7e9cb351 100644
--- a/packages/cli/src/workflows/workflows.services.ee.ts
+++ b/packages/cli/src/workflows/workflows.services.ee.ts
@@ -5,6 +5,7 @@ import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import type { ICredentialsDb } from '@/Interfaces';
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
+import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { RoleService } from '@/role/role.service';
@@ -13,6 +14,7 @@ import { WorkflowsService } from './workflows.services';
 import type {
 	CredentialUsedByWorkflow,
 	WorkflowWithSharingsAndCredentials,
+	WorkflowForList,
 } from './workflows.types';
 import { EECredentialsService as EECredentials } from '@/credentials/credentials.service.ee';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
@@ -87,6 +89,14 @@ export class EEWorkflowsService extends WorkflowsService {
 		return transaction.save(newSharedWorkflows);
 	}
 
+	static addOwnerId(workflow: WorkflowForList, workflowOwnerRole: Role): void {
+		const ownerId = workflow.shared?.find(
+			({ roleId }) => String(roleId) === workflowOwnerRole.id,
+		)?.userId;
+		workflow.ownedBy = ownerId ? { id: ownerId } : null;
+		delete workflow.shared;
+	}
+
 	static addOwnerAndSharings(workflow: WorkflowWithSharingsAndCredentials): void {
 		workflow.ownedBy = null;
 		workflow.sharedWith = [];
@@ -156,72 +166,6 @@ export class EEWorkflowsService extends WorkflowsService {
 		});
 	}
 
-	static async addCredentialsToWorkflows(
-		workflows: WorkflowWithSharingsAndCredentials[],
-		currentUser: User,
-	): Promise<void> {
-		// Create 2 maps: one with all the credential ids used by all workflows
-		// And another to match back workflow <> credentials
-		const allUsedCredentialIds = new Set<string>();
-		const mapsWorkflowsToUsedCredentials: string[][] = [];
-		workflows.forEach((workflow, idx) => {
-			workflow.nodes.forEach((node) => {
-				if (!node.credentials) {
-					return;
-				}
-				Object.keys(node.credentials).forEach((credentialType) => {
-					const credential = node.credentials?.[credentialType];
-					if (!credential?.id) {
-						return;
-					}
-					if (!mapsWorkflowsToUsedCredentials[idx]) {
-						mapsWorkflowsToUsedCredentials[idx] = [];
-					}
-					mapsWorkflowsToUsedCredentials[idx].push(credential.id);
-					allUsedCredentialIds.add(credential.id);
-				});
-			});
-		});
-
-		const usedWorkflowsCredentials = await EECredentials.getMany({
-			where: {
-				id: In(Array.from(allUsedCredentialIds)),
-			},
-			relations: ['shared', 'shared.user', 'shared.role'],
-		});
-		const userCredentials = await EECredentials.getAll(currentUser, { disableGlobalRole: true });
-		const userCredentialIds = userCredentials.map((credential) => credential.id);
-		const credentialsMap: Record<string, CredentialUsedByWorkflow> = {};
-		usedWorkflowsCredentials.forEach((credential) => {
-			const credentialId = credential.id;
-			credentialsMap[credentialId] = {
-				id: credentialId,
-				name: credential.name,
-				type: credential.type,
-				currentUserHasAccess: userCredentialIds.includes(credentialId),
-				sharedWith: [],
-				ownedBy: null,
-			};
-			credential.shared?.forEach(({ user, role }) => {
-				const { id, email, firstName, lastName } = user;
-				if (role.name === 'owner') {
-					credentialsMap[credentialId].ownedBy = { id, email, firstName, lastName };
-				} else {
-					credentialsMap[credentialId].sharedWith?.push({
-						id,
-						email,
-						firstName,
-						lastName,
-					});
-				}
-			});
-		});
-
-		mapsWorkflowsToUsedCredentials.forEach((usedCredentialIds, idx) => {
-			workflows[idx].usedCredentials = usedCredentialIds.map((id) => credentialsMap[id]);
-		});
-	}
-
 	static validateCredentialPermissionsToUser(
 		workflow: WorkflowEntity,
 		allowedCredentials: ICredentialsDb[],
diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 3b5fd2d928bee1..601f34807dd5ee 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -1,7 +1,7 @@
 import { validate as jsonSchemaValidate } from 'jsonschema';
 import type { INode, IPinData, JsonObject } from 'n8n-workflow';
 import { NodeApiError, jsonParse, LoggerProxy, Workflow } from 'n8n-workflow';
-import type { FindOptionsWhere, UpdateResult } from 'typeorm';
+import type { FindOptionsSelect, FindOptionsWhere, UpdateResult } from 'typeorm';
 import { In } from 'typeorm';
 import pick from 'lodash.pick';
 import { v4 as uuid } from 'uuid';
@@ -25,12 +25,12 @@ import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData'
 import * as TestWebhooks from '@/TestWebhooks';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 import { isSharingEnabled, whereClause } from '@/UserManagement/UserManagementHelper';
+import type { WorkflowForList } from '@/workflows/workflows.types';
 
-export interface IGetWorkflowsQueryFilter {
-	id?: string;
-	name?: string;
-	active?: boolean;
-}
+export type IGetWorkflowsQueryFilter = Pick<
+	FindOptionsWhere<WorkflowEntity>,
+	'id' | 'name' | 'active'
+>;
 
 const schemaGetWorkflowsQueryFilter = {
 	$id: '/IGetWorkflowsQueryFilter',
@@ -114,7 +114,7 @@ export class WorkflowsService {
 		return getSharedWorkflowIds(user, roles);
 	}
 
-	static async getMany(user: User, rawFilter: string): Promise<WorkflowEntity[]> {
+	static async getMany(user: User, rawFilter: string): Promise<WorkflowForList[]> {
 		const sharedWorkflowIds = await this.getWorkflowIdsForUser(user, ['owner']);
 		if (sharedWorkflowIds.length === 0) {
 			// return early since without shared workflows there can be no hits
@@ -122,7 +122,7 @@ export class WorkflowsService {
 			return [];
 		}
 
-		let filter: IGetWorkflowsQueryFilter | undefined = undefined;
+		let filter: IGetWorkflowsQueryFilter = {};
 		if (rawFilter) {
 			try {
 				const filterJson: JsonObject = jsonParse(rawFilter);
@@ -152,31 +152,32 @@ export class WorkflowsService {
 			return [];
 		}
 
-		const fields: Array<keyof WorkflowEntity> = [
-			'id',
-			'name',
-			'active',
-			'createdAt',
-			'updatedAt',
-			'nodes',
-		];
+		const select: FindOptionsSelect<WorkflowEntity> = {
+			id: true,
+			name: true,
+			active: true,
+			createdAt: true,
+			updatedAt: true,
+		};
 		const relations: string[] = [];
 
 		if (!config.getEnv('workflowTagsDisabled')) {
 			relations.push('tags');
+			select.tags = { name: true };
 		}
 
 		if (isSharingEnabled()) {
-			relations.push('shared', 'shared.user', 'shared.role');
+			relations.push('shared');
+			select.shared = { userId: true, roleId: true };
+			select.versionId = true;
 		}
 
+		filter.id = In(sharedWorkflowIds);
 		return Db.collections.Workflow.find({
-			select: isSharingEnabled() ? [...fields, 'versionId'] : fields,
+			select,
 			relations,
-			where: {
-				id: In(sharedWorkflowIds),
-				...filter,
-			},
+			where: filter,
+			order: { updatedAt: 'DESC' },
 		});
 	}
 
diff --git a/packages/cli/src/workflows/workflows.types.ts b/packages/cli/src/workflows/workflows.types.ts
index ef30bb18c7b3ee..99813736abfdc4 100644
--- a/packages/cli/src/workflows/workflows.types.ts
+++ b/packages/cli/src/workflows/workflows.types.ts
@@ -9,6 +9,12 @@ export interface WorkflowWithSharingsAndCredentials extends Omit<WorkflowEntity,
 	shared?: SharedWorkflow[];
 }
 
+export interface WorkflowForList
+	extends Omit<WorkflowEntity, 'ownedBy' | 'nodes' | 'connections' | 'shared' | 'settings'> {
+	ownedBy?: Pick<IUser, 'id'> | null;
+	shared?: SharedWorkflow[];
+}
+
 export interface CredentialUsedByWorkflow {
 	id: string;
 	name: string;
diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
index 8c5fda07bbb753..b03bbebc74cd97 100644
--- a/packages/cli/test/integration/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows.controller.ee.test.ts
@@ -151,7 +151,7 @@ describe('PUT /workflows/:id', () => {
 });
 
 describe('GET /workflows', () => {
-	test('should return workflows with ownership, sharing and credential usage details', async () => {
+	test('should return workflows without nodes, sharing and credential usage details', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
 
@@ -188,32 +188,11 @@ describe('GET /workflows', () => {
 		expect(response.statusCode).toBe(200);
 		expect(fetchedWorkflow.ownedBy).toMatchObject({
 			id: owner.id,
-			email: owner.email,
-			firstName: owner.firstName,
-			lastName: owner.lastName,
-		});
-
-		expect(fetchedWorkflow.sharedWith).toHaveLength(1);
-
-		const [sharee] = fetchedWorkflow.sharedWith;
-
-		expect(sharee).toMatchObject({
-			id: member.id,
-			email: member.email,
-			firstName: member.firstName,
-			lastName: member.lastName,
 		});
 
-		expect(fetchedWorkflow.usedCredentials).toHaveLength(1);
-
-		const [usedCredential] = fetchedWorkflow.usedCredentials;
-
-		expect(usedCredential).toMatchObject({
-			id: savedCredential.id,
-			name: savedCredential.name,
-			type: savedCredential.type,
-			currentUserHasAccess: true,
-		});
+		expect(fetchedWorkflow.sharedWith).not.toBeDefined()
+		expect(fetchedWorkflow.usedCredentials).not.toBeDefined()
+		expect(fetchedWorkflow.nodes).not.toBeDefined()
 	});
 });
 

From 593b5d299a05fc17e582ed8cca347e2083c41549 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 16 Feb 2023 11:41:25 +0100
Subject: [PATCH 225/358] test(editor): Execution testing from UI perspective
 (no-changelog) (#5429)

* test(editor): Execution testing from UI perspective

* test(editor): Execution testing from UI perspective

* test(editor): Execution test rename

* test(editor): Execution test rename and add stop test

* test(editor): Execution test with webhook

* test(editor): Execution test with webhook
---
 cypress/e2e/19-execution.cy.ts            | 225 ++++++++++++++++++++++
 cypress/fixtures/Manual_wait_set.json     |  81 ++++++++
 cypress/fixtures/Webhook_wait_set.json    |  81 ++++++++
 cypress/pages/workflow.ts                 |   3 +
 packages/editor-ui/src/views/NodeView.vue |   3 +
 5 files changed, 393 insertions(+)
 create mode 100644 cypress/e2e/19-execution.cy.ts
 create mode 100644 cypress/fixtures/Manual_wait_set.json
 create mode 100644 cypress/fixtures/Webhook_wait_set.json

diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
new file mode 100644
index 00000000000000..37b9561f6f74f1
--- /dev/null
+++ b/cypress/e2e/19-execution.cy.ts
@@ -0,0 +1,225 @@
+import { v4 as uuid } from 'uuid';
+import { NDV, WorkflowPage as WorkflowPageClass, WorkflowsPage } from '../pages';
+
+const workflowsPage = new WorkflowsPage();
+const workflowPage = new WorkflowPageClass();
+const ndv = new NDV();
+
+describe('Execution',() => {
+	beforeEach(() => {
+		cy.resetAll();
+		cy.skipSetup();
+		cy.visit('/');
+	});
+
+	it('should test manual workflow', () => {
+		// Import workflow
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		cy.createFixtureWorkflow('Manual_wait_set.json', `Manual wait set ${uuid()}`);
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('not.exist');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
+
+		// Execute the workflow
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().get('.n8n-spinner').should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('be.visible');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
+
+		// Check canvas nodes after 1st step (workflow passed the manual trigger node
+		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+
+		cy.wait(2000);
+
+		// Check canvas nodes after 2nd step (waiting node finished its execution and the http request node is about to start)
+		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check')).should('be.visible');
+
+		// Clear execution data
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().click();
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+
+		// Check success toast (works because Cypress waits enough for the element to show after the http request node has finished)
+		workflowPage.getters.successToast().should('be.visible');
+	});
+
+	it('should test manual workflow stop', () => {
+		// Import workflow
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		cy.createFixtureWorkflow('Manual_wait_set.json', `Manual wait set ${uuid()}`);
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('not.exist');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
+
+		// Execute the workflow
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().get('.n8n-spinner').should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('be.visible');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
+
+		// Check canvas nodes after 1st step (workflow passed the manual trigger node
+		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+
+
+		cy.wait(1000);
+		workflowPage.getters.stopExecutionButton().click();
+
+		// Check canvas nodes after workflow stopped
+		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt').should('not.visible'));
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+
+		// Clear execution data
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().click();
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+
+		// Check success toast (works because Cypress waits enough for the element to show after the http request node has finished)
+		workflowPage.getters.successToast().should('be.visible');
+	});
+
+	it('should test webhook workflow', () => {
+		// Import workflow
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		cy.createFixtureWorkflow('Webhook_wait_set.json', `Webhook wait set ${uuid()}`);
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('not.exist');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
+
+		// Execute the workflow
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().get('.n8n-spinner').should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('not.exist');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('be.visible');
+
+		workflowPage.getters.canvasNodes().first().dblclick();
+
+		ndv.getters.copyInput().click();
+
+		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
+
+		ndv.getters.backToCanvas().click();
+
+		cy.readClipboard().then((url) => {
+			cy.request({
+				method: 'GET',
+				url,
+			}).then((resp) => {
+				expect(resp.status).to.eq(200);
+			});
+		});
+
+		// Check canvas nodes after 1st step (workflow passed the manual trigger node
+		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+
+		cy.wait(2000);
+
+		// Check canvas nodes after 2nd step (waiting node finished its execution and the http request node is about to start)
+		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check')).should('be.visible');
+
+		// Clear execution data
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().click();
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+
+		// Check success toast (works because Cypress waits enough for the element to show after the http request node has finished)
+		workflowPage.getters.successToast().should('be.visible');
+	});
+
+	it('should test webhook workflow stop', () => {
+		// Import workflow
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		cy.createFixtureWorkflow('Webhook_wait_set.json', `Webhook wait set ${uuid()}`);
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('not.exist');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
+
+		// Execute the workflow
+		workflowPage.getters.zoomToFitButton().click();
+		workflowPage.getters.executeWorkflowButton().click();
+
+		// Check workflow buttons
+		workflowPage.getters.executeWorkflowButton().get('.n8n-spinner').should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+		workflowPage.getters.stopExecutionButton().should('not.exist');
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('be.visible');
+
+		workflowPage.getters.canvasNodes().first().dblclick();
+
+		ndv.getters.copyInput().click();
+
+		cy.grantBrowserPermissions('clipboardReadWrite', 'clipboardSanitizedWrite');
+
+		ndv.getters.backToCanvas().click();
+
+		cy.readClipboard().then((url) => {
+			cy.request({
+				method: 'GET',
+				url,
+			}).then((resp) => {
+				expect(resp.status).to.eq(200);
+			});
+		});
+
+		// Check canvas nodes after 1st step (workflow passed the manual trigger node
+		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+
+		cy.wait(1000);
+		workflowPage.getters.stopExecutionWaitingForWebhookButton().click();
+
+		// Check canvas nodes after workflow stopped
+		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt').should('not.visible'));
+		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+
+		// Clear execution data
+		workflowPage.getters.clearExecutionDataButton().should('be.visible');
+		workflowPage.getters.clearExecutionDataButton().click();
+		workflowPage.getters.clearExecutionDataButton().should('not.exist');
+
+		// Check success toast (works because Cypress waits enough for the element to show after the http request node has finished)
+		workflowPage.getters.successToast().should('be.visible');
+	});
+});
diff --git a/cypress/fixtures/Manual_wait_set.json b/cypress/fixtures/Manual_wait_set.json
new file mode 100644
index 00000000000000..b05a39ee2befa3
--- /dev/null
+++ b/cypress/fixtures/Manual_wait_set.json
@@ -0,0 +1,81 @@
+{
+	"name": "Manual wait set",
+	"nodes": [
+		{
+			"parameters": {
+				"amount": 2,
+				"unit": "seconds"
+			},
+			"id": "ed6e0168-1145-43d0-9082-970b8a8f3cb5",
+			"name": "Wait",
+			"type": "n8n-nodes-base.wait",
+			"typeVersion": 1,
+			"position": [
+				900,
+				580
+			],
+			"webhookId": "0f6f94a4-c28d-46f9-8468-6ab315a9fec9"
+		},
+		{
+			"parameters": {},
+			"id": "59467b99-4e7c-4f19-8fc2-4329788f0951",
+			"name": "Manual",
+			"type": "n8n-nodes-base.manualTrigger",
+			"typeVersion": 1,
+			"position": [
+				680,
+				580
+			]
+		},
+		{
+			"parameters": {
+				"options": {}
+			},
+			"id": "6ddf089f-4d01-4691-928f-6de168e3b089",
+			"name": "Set",
+			"type": "n8n-nodes-base.set",
+			"typeVersion": 1,
+			"position": [
+				1120,
+				580
+			]
+		}
+	],
+	"pinData": {},
+	"connections": {
+		"Wait": {
+			"main": [
+				[
+					{
+						"node": "Set",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		},
+		"Manual": {
+			"main": [
+				[
+					{
+						"node": "Wait",
+						"type": "main",
+						"index": 0
+					}
+				]
+			]
+		}
+	},
+	"active": false,
+	"settings": {
+		"saveExecutionProgress": true,
+		"saveManualExecutions": true,
+		"callerPolicy": "workflowsFromSameOwner"
+	},
+	"versionId": "f11ff1bf-4273-46cb-bbec-65c7b2fa13cb",
+	"id": "1037",
+	"meta": {
+		"instanceId": "8a47b83b4479b11330fdf21ccc96d4a8117035a968612e452b4c87bfd09c16c7"
+	},
+	"tags": []
+}
diff --git a/cypress/fixtures/Webhook_wait_set.json b/cypress/fixtures/Webhook_wait_set.json
new file mode 100644
index 00000000000000..64ef060fdfba89
--- /dev/null
+++ b/cypress/fixtures/Webhook_wait_set.json
@@ -0,0 +1,81 @@
+{
+  "name": "Webhook wait set",
+  "nodes": [
+    {
+      "parameters": {
+        "path": "23fc3930-b8f9-41d9-89db-b647291a2201",
+        "options": {}
+      },
+      "id": "70d84fe7-e221-4978-a15e-3984f2df645f",
+      "name": "Webhook",
+      "type": "n8n-nodes-base.webhook",
+      "typeVersion": 1,
+      "position": [
+        500,
+        580
+      ],
+      "webhookId": "23fc3930-b8f9-41d9-89db-b647291a2201"
+    },
+    {
+      "parameters": {
+        "amount": 2,
+        "unit": "seconds"
+      },
+      "id": "7f15f650-99bc-400b-8db8-67be53003fa3",
+      "name": "Wait",
+      "type": "n8n-nodes-base.wait",
+      "typeVersion": 1,
+      "position": [
+        720,
+        580
+      ],
+      "webhookId": "18a12605-1fbd-49da-854e-268ab6db1ea3"
+    },
+    {
+      "parameters": {
+        "options": {}
+      },
+      "id": "5bdafae4-e297-463f-991f-b8ea14983026",
+      "name": "Set",
+      "type": "n8n-nodes-base.set",
+      "typeVersion": 1,
+      "position": [
+        940,
+        580
+      ]
+    }
+  ],
+  "pinData": {},
+  "connections": {
+    "Webhook": {
+      "main": [
+        [
+          {
+            "node": "Wait",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    },
+    "Wait": {
+      "main": [
+        [
+          {
+            "node": "Set",
+            "type": "main",
+            "index": 0
+          }
+        ]
+      ]
+    }
+  },
+  "active": false,
+  "settings": {},
+  "versionId": "0c67e557-1faf-446e-881e-3245228c627e",
+  "id": "1038",
+  "meta": {
+    "instanceId": "8a47b83b4479b11330fdf21ccc96d4a8117035a968612e452b4c87bfd09c16c7"
+  },
+  "tags": []
+}
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index f09bda9f1fc891..bf150e038a4d8e 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -90,6 +90,9 @@ export class WorkflowPage extends BasePage {
 		zoomOutButton: () => cy.getByTestId('zoom-out-button'),
 		resetZoomButton: () => cy.getByTestId('reset-zoom-button'),
 		executeWorkflowButton: () => cy.getByTestId('execute-workflow-button'),
+		clearExecutionDataButton: () => cy.getByTestId('clear-execution-data-button'),
+		stopExecutionButton: () => cy.getByTestId('stop-execution-button'),
+		stopExecutionWaitingForWebhookButton: () => cy.getByTestId('stop-execution-waiting-for-webhook-button'),
 		nodeCredentialsSelect: () => cy.getByTestId('node-credentials-select'),
 		nodeCredentialsEditButton: () => cy.getByTestId('credential-edit-button'),
 		nodeCreatorItems: () => cy.getByTestId('item-iterator-item'),
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 700fc076996ed2..84a3c005e75030 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -133,6 +133,7 @@
 					"
 					:loading="stopExecutionInProgress"
 					@click.stop="stopExecution"
+					data-test-id="stop-execution-button"
 				/>
 
 				<n8n-icon-button
@@ -143,6 +144,7 @@
 					:title="$locale.baseText('nodeView.stopWaitingForWebhookCall')"
 					type="secondary"
 					@click.stop="stopWaitingForWebhook"
+					data-test-id="stop-execution-waiting-for-webhook-button"
 				/>
 
 				<n8n-icon-button
@@ -151,6 +153,7 @@
 					icon="trash"
 					size="large"
 					@click.stop="clearExecutionData"
+					data-test-id="clear-execution-data-button"
 				/>
 			</div>
 		</div>

From 7954ed3cfbd4d8d0611c0cc51385b49cc80282a6 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Thu, 16 Feb 2023 10:45:03 +0000
Subject: [PATCH 226/358] feat(Slack Node): Add support for manually inputting
 a channel name (#5488)

---
 packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts   | 2 +-
 packages/nodes-base/nodes/Slack/V2/MessageDescription.ts | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index 02cb92d7ea2fb6..72143524375be7 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -59,7 +59,7 @@ export async function slackApiRequest(
 				}'`,
 				{
 					description:
-						'Hint: Upgrate to the Slack plan that includes the funcionality you want to use.',
+						'Hint: Upgrade to a Slack plan that includes the functionality you want to use.',
 				},
 			);
 		} else if (response.error === 'missing_scope') {
diff --git a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
index a948941be6f9b4..7e1ecd27789e5b 100644
--- a/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
+++ b/packages/nodes-base/nodes/Slack/V2/MessageDescription.ts
@@ -181,6 +181,12 @@ export const messageFields: INodeProperties[] = [
 				],
 				placeholder: 'C0122KQ70S7E',
 			},
+			{
+				displayName: 'By Name',
+				name: 'name',
+				type: 'string',
+				placeholder: '#general',
+			},
 			{
 				displayName: 'By URL',
 				name: 'url',

From af703371fc96dcfdd8f418201d3880f124cfcfc4 Mon Sep 17 00:00:00 2001
From: feelgood-interface
 <78543720+feelgood-interface@users.noreply.github.com>
Date: Thu, 16 Feb 2023 12:00:06 +0100
Subject: [PATCH 227/358] fix(HTTP Request Node): Ignore empty body for auto
 detect json (#5215)

---
 .../nodes/HttpRequest/V3/HttpRequestV3.node.ts       | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index c2a255b43c6108..af4eada7bdfbf5 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -1344,7 +1344,17 @@ export class HttpRequestV3 implements INodeType {
 				const responseContentType = response.headers['content-type'] ?? '';
 				if (responseContentType.includes('application/json')) {
 					responseFormat = 'json';
-					response.body = jsonParse(Buffer.from(response.body).toString());
+					const neverError = this.getNodeParameter(
+						'options.response.response.neverError',
+						0,
+						false,
+					) as boolean;
+					const data = Buffer.from(response.body).toString();
+					response.body = jsonParse(data, {
+						...(neverError
+							? { fallbackValue: {} }
+							: { errorMessage: 'Invalid JSON in response body' }),
+					});
 				} else if (binaryContentTypes.some((e) => responseContentType.includes(e))) {
 					responseFormat = 'file';
 				} else {

From 6592d144d1fb680b34240ce57a6615b06de5cde5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Thu, 16 Feb 2023 12:47:19 +0100
Subject: [PATCH 228/358] feat(editor): Add most important native props and
 methods to autocomplete (#5486)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡ Implemented support for documentation links in autocomplete tooltips
* ⚡ Added support for arguments and code stying in autocomplete documentation. Added build-in string functions docs.
* ⚡ Added support for args without types in autocomplete, Added array native functions.
* ⚡ Added native Number and Object methods to autocomplete
* ⚡ Added support for native properties in autocomplete
* 📚 Added comment for next phase
* ✔️ Updating tests to account for native autocomplete options. Fixing lint errros.
* 👌 Addressing design review comments
* 🎨 Using design-system tokens instead of colors for autocomplete
---
 packages/editor-ui/src/main.ts                |   1 +
 .../completions/__tests__/completions.test.ts |  45 ++--
 .../completions/datatype.completions.ts       | 129 +++++++---
 packages/editor-ui/src/plugins/i18n/index.ts  |   4 +
 .../src/styles/autocomplete-theme.scss        |  45 ++++
 .../workflow/src/Extensions/Extensions.ts     |   9 +-
 .../src/NativeMethods/Array.methods.ts        | 205 ++++++++++++++++
 .../src/NativeMethods/Number.methods.ts       |  28 +++
 .../src/NativeMethods/Object.Methods.ts       |  27 +++
 .../src/NativeMethods/String.methods.ts       | 228 +++++++++++++++++-
 packages/workflow/src/NativeMethods/index.ts  |   6 +-
 11 files changed, 672 insertions(+), 55 deletions(-)
 create mode 100644 packages/editor-ui/src/styles/autocomplete-theme.scss
 create mode 100644 packages/workflow/src/NativeMethods/Array.methods.ts
 create mode 100644 packages/workflow/src/NativeMethods/Number.methods.ts
 create mode 100644 packages/workflow/src/NativeMethods/Object.Methods.ts

diff --git a/packages/editor-ui/src/main.ts b/packages/editor-ui/src/main.ts
index 980bae1a06f1fd..ff291537d2d331 100644
--- a/packages/editor-ui/src/main.ts
+++ b/packages/editor-ui/src/main.ts
@@ -10,6 +10,7 @@ import 'vue-json-pretty/lib/styles.css';
 import '@jsplumb/browser-ui/css/jsplumbtoolkit.css';
 import 'n8n-design-system/css/index.scss';
 import './n8n-theme.scss';
+import './styles/autocomplete-theme.scss';
 
 import '@fontsource/open-sans/latin-400.css';
 import '@fontsource/open-sans/latin-600.css';
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
index 61683cd9ee0495..5b5362acd3b4b7 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/__tests__/completions.test.ts
@@ -172,7 +172,7 @@ describe('Resolution-based completions', () => {
 
 			if (!found) throw new Error('Expected to find completions');
 
-			expect(found).toHaveLength(extensions('string').length);
+			expect(found).toHaveLength(extensions('string').length + natives('string').length);
 			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
 		});
 
@@ -183,7 +183,7 @@ describe('Resolution-based completions', () => {
 
 			if (!found) throw new Error('Expected to find completions');
 
-			expect(found).toHaveLength(extensions('number').length);
+			expect(found).toHaveLength(extensions('number').length + natives('number').length);
 			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
 		});
 
@@ -194,7 +194,7 @@ describe('Resolution-based completions', () => {
 
 			if (!found) throw new Error('Expected to find completions');
 
-			expect(found).toHaveLength(extensions('array').length);
+			expect(found).toHaveLength(extensions('array').length + natives('array').length);
 			expect(found.map((c) => c.label).every((l) => !l.endsWith('()')));
 		});
 	});
@@ -206,14 +206,16 @@ describe('Resolution-based completions', () => {
 		test('should return completions for: {{ $input.| }}', () => {
 			resolveParameterSpy.mockReturnValue($input);
 
-			expect(completions('{{ $input.| }}')).toHaveLength(Reflect.ownKeys($input).length);
+			expect(completions('{{ $input.| }}')).toHaveLength(
+				Reflect.ownKeys($input).length + natives('object').length,
+			);
 		});
 
 		test("should return completions for: {{ $('nodeName').| }}", () => {
 			resolveParameterSpy.mockReturnValue($('Rename'));
 
 			expect(completions('{{ $("Rename").| }}')).toHaveLength(
-				Reflect.ownKeys($('Rename')).length - ['pairedItem'].length,
+				Reflect.ownKeys($('Rename')).length + natives('object').length - ['pairedItem'].length,
 			);
 		});
 
@@ -224,7 +226,7 @@ describe('Resolution-based completions', () => {
 
 			if (!found) throw new Error('Expected to find completion');
 
-			expect(found).toHaveLength(1);
+			expect(found).toHaveLength(3);
 			expect(found[0].label).toBe('json');
 		});
 
@@ -235,7 +237,7 @@ describe('Resolution-based completions', () => {
 
 			if (!found) throw new Error('Expected to find completion');
 
-			expect(found).toHaveLength(1);
+			expect(found).toHaveLength(3);
 			expect(found[0].label).toBe('json');
 		});
 
@@ -246,7 +248,7 @@ describe('Resolution-based completions', () => {
 
 			if (!found) throw new Error('Expected to find completion');
 
-			expect(found).toHaveLength(1);
+			expect(found).toHaveLength(3);
 			expect(found[0].label).toBe('json');
 		});
 
@@ -261,7 +263,8 @@ describe('Resolution-based completions', () => {
 			resolveParameterSpy.mockReturnValue($input.item.json);
 
 			expect(completions('{{ $input.item.| }}')).toHaveLength(
-				Object.keys($input.item.json).length + extensions('object').length,
+				Object.keys($input.item.json).length +
+					(extensions('object').length + natives('object').length),
 			);
 		});
 
@@ -269,7 +272,8 @@ describe('Resolution-based completions', () => {
 			resolveParameterSpy.mockReturnValue($input.first().json);
 
 			expect(completions('{{ $input.first().| }}')).toHaveLength(
-				Object.keys($input.first().json).length + extensions('object').length,
+				Object.keys($input.first().json).length +
+					(extensions('object').length + natives('object').length),
 			);
 		});
 
@@ -277,7 +281,8 @@ describe('Resolution-based completions', () => {
 			resolveParameterSpy.mockReturnValue($input.last().json);
 
 			expect(completions('{{ $input.last().| }}')).toHaveLength(
-				Object.keys($input.last().json).length + extensions('object').length,
+				Object.keys($input.last().json).length +
+					(extensions('object').length + natives('object').length),
 			);
 		});
 
@@ -285,33 +290,41 @@ describe('Resolution-based completions', () => {
 			resolveParameterSpy.mockReturnValue($input.all()[0].json);
 
 			expect(completions('{{ $input.all()[0].| }}')).toHaveLength(
-				Object.keys($input.all()[0].json).length + extensions('object').length,
+				Object.keys($input.all()[0].json).length +
+					(extensions('object').length + natives('object').length),
 			);
 		});
 
 		test('should return completions for: {{ $input.item.json.str.| }}', () => {
 			resolveParameterSpy.mockReturnValue($input.item.json.str);
 
-			expect(completions('{{ $input.item.json.str.| }}')).toHaveLength(extensions('string').length);
+			expect(completions('{{ $input.item.json.str.| }}')).toHaveLength(
+				extensions('string').length + natives('string').length,
+			);
 		});
 
 		test('should return completions for: {{ $input.item.json.num.| }}', () => {
 			resolveParameterSpy.mockReturnValue($input.item.json.num);
 
-			expect(completions('{{ $input.item.json.num.| }}')).toHaveLength(extensions('number').length);
+			expect(completions('{{ $input.item.json.num.| }}')).toHaveLength(
+				extensions('number').length + natives('number').length,
+			);
 		});
 
 		test('should return completions for: {{ $input.item.json.arr.| }}', () => {
 			resolveParameterSpy.mockReturnValue($input.item.json.arr);
 
-			expect(completions('{{ $input.item.json.arr.| }}')).toHaveLength(extensions('array').length);
+			expect(completions('{{ $input.item.json.arr.| }}')).toHaveLength(
+				extensions('array').length + natives('array').length,
+			);
 		});
 
 		test('should return completions for: {{ $input.item.json.obj.| }}', () => {
 			resolveParameterSpy.mockReturnValue($input.item.json.obj);
 
 			expect(completions('{{ $input.item.json.obj.| }}')).toHaveLength(
-				Object.keys($input.item.json.obj).length + extensions('object').length,
+				Object.keys($input.item.json.obj).length +
+					(extensions('object').length + natives('object').length),
 			);
 		});
 	});
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
index 72d93075a87991..6f8392bf9f77d8 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -1,4 +1,4 @@
-import { ExpressionExtensions, NativeMethods, IDataObject } from 'n8n-workflow';
+import { ExpressionExtensions, NativeMethods, IDataObject, DocMetadata } from 'n8n-workflow';
 import { DateTime } from 'luxon';
 import { i18n } from '@/plugins/i18n';
 import { resolveParameter } from '@/mixins/workflowHelpers';
@@ -15,6 +15,10 @@ import {
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
 import type { ExtensionTypeName, FnToDoc, Resolved } from './types';
+import { sanitizeHtml } from '@/utils';
+import { NativeDoc } from 'n8n-workflow/src/Extensions/Extensions';
+
+type AutocompleteOptionType = 'function' | 'keyword';
 
 /**
  * Resolution-based completions offered according to datatype.
@@ -111,11 +115,14 @@ function datatypeOptions(resolved: Resolved, toResolve: string) {
 }
 
 export const natives = (typeName: ExtensionTypeName): Completion[] => {
-	const natives = NativeMethods.find((ee) => ee.typeName.toLowerCase() === typeName);
+	const natives: NativeDoc = NativeMethods.find((ee) => ee.typeName.toLowerCase() === typeName);
 
 	if (!natives) return [];
 
-	return toOptions(natives.functions, typeName);
+	const nativeProps = natives.properties ? toOptions(natives.properties, typeName, 'keyword') : [];
+	const nativeMethods = toOptions(natives.functions, typeName, 'function');
+
+	return [...nativeProps, ...nativeMethods];
 };
 
 export const extensions = (typeName: ExtensionTypeName) => {
@@ -132,50 +139,116 @@ export const extensions = (typeName: ExtensionTypeName) => {
 	return toOptions(fnToDoc, typeName);
 };
 
-export const toOptions = (fnToDoc: FnToDoc, typeName: ExtensionTypeName) => {
+export const toOptions = (
+	fnToDoc: FnToDoc,
+	typeName: ExtensionTypeName,
+	optionType: AutocompleteOptionType = 'function',
+) => {
 	return Object.entries(fnToDoc)
 		.sort((a, b) => a[0].localeCompare(b[0]))
 		.map(([fnName, fn]) => {
 			const option: Completion = {
-				label: fnName + '()',
-				type: 'function',
+				label: optionType === 'function' ? fnName + '()' : fnName,
+				type: optionType,
 			};
 
 			option.info = () => {
 				const tooltipContainer = document.createElement('div');
+				tooltipContainer.classList.add('autocomplete-info-container');
 
 				if (!fn.doc?.description) return null;
 
-				tooltipContainer.style.display = 'flex';
-				tooltipContainer.style.flexDirection = 'column';
-				tooltipContainer.style.paddingTop = 'var(--spacing-4xs)';
-				tooltipContainer.style.paddingBottom = 'var(--spacing-4xs)';
+				const header =
+					optionType === 'function'
+						? createFunctionHeader(typeName, fn)
+						: createPropHeader(typeName, fn);
+				header.classList.add('autocomplete-info-header');
+				tooltipContainer.appendChild(header);
 
-				const header = document.createElement('div');
-				header.style.marginBottom = 'var(--spacing-2xs)';
+				const descriptionBody = document.createElement('div');
+				descriptionBody.classList.add('autocomplete-info-description');
+				const descriptionText = document.createElement('p');
+				descriptionText.innerHTML = sanitizeHtml(
+					fn.doc.description.replace(/`(.*?)`/g, '<code>$1</code>'),
+				);
+				descriptionBody.appendChild(descriptionText);
+				if (fn.doc.docURL) {
+					const descriptionLink = document.createElement('a');
+					descriptionLink.setAttribute('target', '_blank');
+					descriptionLink.setAttribute('href', fn.doc.docURL);
+					descriptionLink.innerText = i18n.autocompleteUIValues['docLinkLabel'] || 'Learn more';
+					descriptionLink.addEventListener('mousedown', (event: MouseEvent) => {
+						// This will prevent documentation popup closing before click
+						// event gets to links
+						event.preventDefault();
+					});
+					descriptionLink.classList.add('autocomplete-info-doc-link');
+					descriptionBody.appendChild(descriptionLink);
+				}
+				tooltipContainer.appendChild(descriptionBody);
 
-				const typeNameSpan = document.createElement('span');
-				typeNameSpan.innerHTML = typeName.slice(0, 1).toUpperCase() + typeName.slice(1) + '.';
+				return tooltipContainer;
+			};
 
-				const functionNameSpan = document.createElement('span');
-				functionNameSpan.innerHTML = fn.doc.name + '()';
-				functionNameSpan.style.fontWeight = 'var(--font-weight-bold)';
+			return option;
+		});
+};
 
-				const returnTypeSpan = document.createElement('span');
-				returnTypeSpan.innerHTML = ': ' + fn.doc.returnType;
+const createFunctionHeader = (typeName: string, fn: { doc?: DocMetadata | undefined }) => {
+	const header = document.createElement('div');
+	if (fn.doc) {
+		const typeNameSpan = document.createElement('span');
+		typeNameSpan.innerHTML = typeName.slice(0, 1).toUpperCase() + typeName.slice(1) + '.';
+
+		const functionNameSpan = document.createElement('span');
+		functionNameSpan.classList.add('autocomplete-info-name');
+		functionNameSpan.innerHTML = `${fn.doc.name}`;
+		let functionArgs = '(';
+		if (fn.doc.args) {
+			functionArgs += fn.doc.args
+				.map((arg) => {
+					let argString = `${arg.name}`;
+					if (arg.type) {
+						argString += `: ${arg.type}`;
+					}
+					return argString;
+				})
+				.join(', ');
+		}
+		functionArgs += ')';
+		const argsSpan = document.createElement('span');
+		argsSpan.classList.add('autocomplete-info-name-args');
+		argsSpan.innerText = functionArgs;
+
+		const returnTypeSpan = document.createElement('span');
+		returnTypeSpan.innerHTML = ': ' + fn.doc.returnType;
+
+		header.appendChild(typeNameSpan);
+		header.appendChild(functionNameSpan);
+		header.appendChild(argsSpan);
+		header.appendChild(returnTypeSpan);
+	}
+	return header;
+};
 
-				header.appendChild(typeNameSpan);
-				header.appendChild(functionNameSpan);
-				header.appendChild(returnTypeSpan);
+const createPropHeader = (typeName: string, property: { doc?: DocMetadata | undefined }) => {
+	const header = document.createElement('div');
+	if (property.doc) {
+		const typeNameSpan = document.createElement('span');
+		typeNameSpan.innerHTML = typeName.slice(0, 1).toUpperCase() + typeName.slice(1) + '.';
 
-				tooltipContainer.appendChild(header);
-				tooltipContainer.appendChild(document.createTextNode(fn.doc.description));
+		const propNameSpan = document.createElement('span');
+		propNameSpan.classList.add('autocomplete-info-name');
+		propNameSpan.innerText = property.doc.name;
 
-				return tooltipContainer;
-			};
+		const returnTypeSpan = document.createElement('span');
+		returnTypeSpan.innerHTML = ': ' + property.doc.returnType;
 
-			return option;
-		});
+		header.appendChild(typeNameSpan);
+		header.appendChild(propNameSpan);
+		header.appendChild(returnTypeSpan);
+	}
+	return header;
 };
 
 const objectOptions = (toResolve: string, resolved: IDataObject) => {
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index d3b3f590826d4b..524b8e9905e45f 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -480,6 +480,10 @@ export class I18nClass {
 		invalid: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.invalid'),
 		isDateTime: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.isDateTime'),
 	};
+
+	autocompleteUIValues: Record<string, string | undefined> = {
+		docLinkLabel: this.baseText('expressionEdit.learnMore'),
+	};
 }
 
 export const i18nInstance = new VueI18n({
diff --git a/packages/editor-ui/src/styles/autocomplete-theme.scss b/packages/editor-ui/src/styles/autocomplete-theme.scss
new file mode 100644
index 00000000000000..489fb78bfa20b1
--- /dev/null
+++ b/packages/editor-ui/src/styles/autocomplete-theme.scss
@@ -0,0 +1,45 @@
+.cm-tooltip-autocomplete {
+	background-color: var(--color-background-xlight) !important;
+
+	li .cm-completionLabel {
+		color: var(--color-success);
+	}
+}
+
+.ͼ2 .cm-tooltip-autocomplete ul li[aria-selected] .cm-completionLabel {
+	color: var(--color-text-xlight) !important;
+	font-weight: 600;
+}
+
+.autocomplete-info-container {
+	display: flex;
+	flex-direction: column;
+	padding: var(--spacing-4xs) 0;
+}
+
+.cm-completionInfo {
+	background-color: var(--color-background-xlight) !important;
+
+	.autocomplete-info-header {
+		color: var(--color-text-dark);
+		line-height: var(--font-line-height-compact);
+		margin-bottom: var(--spacing-2xs);
+	}
+
+	.autocomplete-info-name {
+		color: var(--color-success);
+		font-weight: var(--font-weight-bold);
+	}
+
+	.autocomplete-info-description {
+		code {
+			background-color: var(--color-background-base);
+			padding: 0 2px;
+		}
+		p {
+			line-height: var(--font-line-height-compact);
+			margin-top: 0;
+			margin-bottom: var(--spacing-4xs);
+		}
+	}
+}
diff --git a/packages/workflow/src/Extensions/Extensions.ts b/packages/workflow/src/Extensions/Extensions.ts
index ca4d2ff011ede4..a5ec7575c86dee 100644
--- a/packages/workflow/src/Extensions/Extensions.ts
+++ b/packages/workflow/src/Extensions/Extensions.ts
@@ -4,10 +4,17 @@ export interface ExtensionMap {
 	functions: Record<string, Function & { doc?: DocMetadata }>;
 }
 
+export type NativeDoc = {
+	typeName: string;
+	properties?: Record<string, { doc?: DocMetadata }>;
+	functions: Record<string, { doc?: DocMetadata }>;
+};
+
 export type DocMetadata = {
 	name: string;
 	returnType: string;
 	description?: string;
 	aliases?: string[];
-	args?: unknown[];
+	args?: Array<{ name: string; type?: string }>;
+	docURL?: string;
 };
diff --git a/packages/workflow/src/NativeMethods/Array.methods.ts b/packages/workflow/src/NativeMethods/Array.methods.ts
new file mode 100644
index 00000000000000..7b9017040844d4
--- /dev/null
+++ b/packages/workflow/src/NativeMethods/Array.methods.ts
@@ -0,0 +1,205 @@
+import type { NativeDoc } from '@/Extensions/Extensions';
+
+export const arrayMethods: NativeDoc = {
+	typeName: 'Array',
+	properties: {
+		length: {
+			doc: {
+				name: 'length',
+				description: 'Returns the number of elements in the Array.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/length',
+				returnType: 'number',
+			},
+		},
+	},
+	functions: {
+		concat: {
+			doc: {
+				name: 'concat',
+				description: 'Merges two or more arrays into one array.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/concat',
+				returnType: 'Array',
+				args: [
+					{ name: 'arr1', type: 'Array' },
+					{ name: 'arr2', type: 'Array' },
+					{ name: '...' },
+					{ name: 'arrN', type: 'Array' },
+				],
+			},
+		},
+		filter: {
+			doc: {
+				name: 'filter',
+				description: 'Returns an array only containing the elements that pass the test `fn`.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/filter',
+				returnType: 'Array',
+				args: [{ name: 'fn', type: 'Function' }],
+			},
+		},
+		find: {
+			doc: {
+				name: 'find',
+				description:
+					'Returns the first element in the provided array that passes the test `fn`. If no values satisfy the testing function, `undefined` is returned.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/find',
+				returnType: 'Array|undefined',
+				args: [{ name: 'fn', type: 'Function' }],
+			},
+		},
+		findIndex: {
+			doc: {
+				name: 'findIndex',
+				description:
+					'Returns the index of the first element in an array that passes the test `fn`. If none are found, -1 is returned.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findIndex',
+				returnType: 'number',
+				args: [{ name: 'fn', type: 'Function' }],
+			},
+		},
+		findLast: {
+			doc: {
+				name: 'findLast',
+				description: 'Returns the value of the last element that passes the test `fn`.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findLast',
+				returnType: 'Element|undefined',
+				args: [{ name: 'fn', type: 'Function' }],
+			},
+		},
+		findLastIndex: {
+			doc: {
+				name: 'findLastIndex',
+				description:
+					'Returns the index of the last element that satisfies the provided testing function. If none are found, -1 is returned.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/findLastIndex',
+				returnType: 'number',
+				args: [{ name: 'fn', type: 'Function' }],
+			},
+		},
+		indexOf: {
+			doc: {
+				name: 'indexOf',
+				description:
+					'Returns the first index at which a given element can be found in the array, or -1 if it is not present.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/indexOf',
+				returnType: 'number',
+				args: [
+					{ name: 'searchElement', type: 'string|number' },
+					{ name: 'fromIndex?', type: 'number' },
+				],
+			},
+		},
+		includes: {
+			doc: {
+				name: 'includes',
+				description: 'Checks if an array includes a certain value among its entries.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/includes',
+				returnType: 'boolean',
+				args: [
+					{ name: 'searchElement', type: 'Element' },
+					{ name: 'fromIndex?', type: 'number' },
+				],
+			},
+		},
+		join: {
+			doc: {
+				name: 'join',
+				description:
+					'Returns a string that concatenates all of the elements in an array, separated by `separator`, which defaults to comma.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join',
+				returnType: 'Array',
+				args: [{ name: 'separator?', type: 'string' }],
+			},
+		},
+		map: {
+			doc: {
+				name: 'map',
+				description: 'Returns an array containing the results of calling `fn` on every element.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map',
+				returnType: 'Array',
+				args: [{ name: 'fn', type: 'Function' }],
+			},
+		},
+		reverse: {
+			doc: {
+				name: 'reverse',
+				description:
+					'Reverses an array and returns it. The first array element now becomes the last, and the last array element becomes the first.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reverse',
+				returnType: 'Array',
+			},
+		},
+		reduce: {
+			doc: {
+				name: 'reduce',
+				description:
+					'Executes a "reducer" function `fn` on each element of the array. Passing in the return value from the calculation on the preceding element. The final result of running the reducer across all elements of the array is a single value.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/reduce',
+				returnType: 'any',
+				args: [{ name: 'fn', type: 'Function' }],
+			},
+		},
+		slice: {
+			doc: {
+				name: 'slice',
+				description:
+					'Returns a section of an Array. `end` defaults to the length of the Array if not given.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/slice',
+				returnType: 'Array',
+				args: [
+					{ name: 'start', type: 'number' },
+					{ name: 'end?', type: 'number' },
+				],
+			},
+		},
+		sort: {
+			doc: {
+				name: 'sort',
+				description:
+					'Returns a sorted array. The default sort order is ascending, built upon converting the elements into strings.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort',
+				returnType: 'Array',
+				args: [{ name: 'fn?', type: 'Function' }],
+			},
+		},
+		splice: {
+			doc: {
+				name: 'splice',
+				description: 'Changes the contents of an array by removing or replacing existing elements.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/splice',
+				returnType: 'Array',
+				args: [
+					{ name: 'start', type: 'number' },
+					{ name: 'deleteCount?', type: 'number' },
+					{ name: 'item1?', type: 'Element' },
+					{ name: '...' },
+					{ name: 'itemN?', type: 'Element' },
+				],
+			},
+		},
+		toString: {
+			doc: {
+				name: 'toString',
+				description: 'Returns a string representing the specified array and its elements.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/toString',
+				returnType: 'string',
+			},
+		},
+	},
+};
diff --git a/packages/workflow/src/NativeMethods/Number.methods.ts b/packages/workflow/src/NativeMethods/Number.methods.ts
new file mode 100644
index 00000000000000..f2c8d9884b06ef
--- /dev/null
+++ b/packages/workflow/src/NativeMethods/Number.methods.ts
@@ -0,0 +1,28 @@
+import type { NativeDoc } from '@/Extensions/Extensions';
+
+export const numberMethods: NativeDoc = {
+	typeName: 'Number',
+	functions: {
+		toFixed: {
+			doc: {
+				name: 'toFixed',
+				description:
+					'Formats a number using fixed-point notation. `digits` defaults to null if not given.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toFixed',
+				returnType: 'string',
+				args: [{ name: 'digits?', type: 'number' }],
+			},
+		},
+		toPrecision: {
+			doc: {
+				name: 'toPrecision',
+				description: 'Returns a string representing the number to the specified precision.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number/toPrecision',
+				returnType: 'string',
+				args: [{ name: 'precision?', type: 'number' }],
+			},
+		},
+	},
+};
diff --git a/packages/workflow/src/NativeMethods/Object.Methods.ts b/packages/workflow/src/NativeMethods/Object.Methods.ts
new file mode 100644
index 00000000000000..41739de8b159fb
--- /dev/null
+++ b/packages/workflow/src/NativeMethods/Object.Methods.ts
@@ -0,0 +1,27 @@
+import type { NativeDoc } from '@/Extensions/Extensions';
+
+export const objectMethods: NativeDoc = {
+	typeName: 'Object',
+	functions: {
+		keys: {
+			doc: {
+				name: 'keys',
+				description:
+					"Returns an array of a given object's own enumerable string-keyed property names.",
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/keys',
+				returnType: 'Array',
+			},
+		},
+		values: {
+			doc: {
+				name: 'values',
+				description:
+					"Returns an array of a given object's own enumerable string-keyed property values.",
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/values',
+				returnType: 'Array',
+			},
+		},
+	},
+};
diff --git a/packages/workflow/src/NativeMethods/String.methods.ts b/packages/workflow/src/NativeMethods/String.methods.ts
index f8a92737747998..7eca69b3dde78a 100644
--- a/packages/workflow/src/NativeMethods/String.methods.ts
+++ b/packages/workflow/src/NativeMethods/String.methods.ts
@@ -1,13 +1,223 @@
-export const stringMethods = {
+import type { NativeDoc } from '@/Extensions/Extensions';
+
+export const stringMethods: NativeDoc = {
 	typeName: 'String',
+	properties: {
+		length: {
+			doc: {
+				name: 'length',
+				description: 'Returns the number of characters in the string.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/length',
+				returnType: 'number',
+			},
+		},
+	},
 	functions: {
-		// @TODO_NEXT_PHASE: Populate below and cover other datatypes
-		// trim: {
-		// 	doc: {
-		// 		name: 'trim',
-		// 		description: 'Removes whitespace from both ends of a string and returns a new string',
-		// 		returnType: 'string',
-		// 	},
-		// },
+		concat: {
+			doc: {
+				name: 'concat',
+				description: 'Concatenates the string arguments to the calling string.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/concat',
+				returnType: 'string',
+			},
+		},
+		endsWith: {
+			doc: {
+				name: 'endsWith',
+				description: 'Checks if a string ends with `searchString`.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/endsWith',
+				returnType: 'boolean',
+				args: [{ name: 'searchString', type: 'string' }],
+			},
+		},
+		indexOf: {
+			doc: {
+				name: 'indexOf',
+				description: 'Returns the index of the first occurrence of `searchString`',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf',
+				returnType: 'number',
+				args: [
+					{ name: 'searchString', type: 'string' },
+					{ name: 'position?', type: 'number' },
+				],
+			},
+		},
+		lastIndexOf: {
+			doc: {
+				name: 'lastIndexOf',
+				description: 'Returns the index of the last occurrence of `searchString`',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf',
+				returnType: 'number',
+				args: [
+					{ name: 'searchString', type: 'string' },
+					{ name: 'position?', type: 'number' },
+				],
+			},
+		},
+		match: {
+			doc: {
+				name: 'match',
+				description: 'Retrieves the result of matching a string against a regular expression.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/match',
+				returnType: 'Array',
+				args: [{ name: 'regexp', type: 'string|RegExp' }],
+			},
+		},
+		includes: {
+			doc: {
+				name: 'includes',
+				description: 'Checks if `searchString` may be found within the calling string.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/includes',
+				returnType: 'boolean',
+				args: [
+					{ name: 'searchString', type: 'string' },
+					{ name: 'position?', type: 'number' },
+				],
+			},
+		},
+		replace: {
+			doc: {
+				name: 'replace',
+				description:
+					'Returns a string with matches of a `pattern` replaced by a `replacement`. If `pattern` is a string, only the first occurrence will be replaced.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replace',
+				returnType: 'string',
+				args: [
+					{ name: 'pattern', type: 'string|RegExp' },
+					{ name: 'replacement', type: 'string' },
+				],
+			},
+		},
+		replaceAll: {
+			doc: {
+				name: 'replaceAll',
+				description: 'Returns a string with matches of a `pattern` replaced by a `replacement`.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/replaceAll',
+				returnType: 'string',
+				args: [
+					{ name: 'pattern', type: 'string|RegExp' },
+					{ name: 'replacement', type: 'string' },
+				],
+			},
+		},
+		search: {
+			doc: {
+				name: 'search',
+				description: 'Returns a string that matches `pattern` within the given string.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/search',
+				returnType: 'string',
+				args: [{ name: 'pattern', type: 'string|RegExp' }],
+			},
+		},
+		slice: {
+			doc: {
+				name: 'slice',
+				description:
+					'Returns a section of a string. `indexEnd` defaults to the length of the string if not given.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/slice',
+				returnType: 'string',
+				args: [
+					{ name: 'indexStart', type: 'number' },
+					{ name: 'indexEnd?', type: 'number' },
+				],
+			},
+		},
+		split: {
+			doc: {
+				name: 'split',
+				description:
+					'Returns the substrings that result from dividing the given string with `separator`.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/split',
+				returnType: 'Array',
+				args: [
+					{ name: 'separator', type: 'string|RegExp' },
+					{ name: 'limit?', type: 'number' },
+				],
+			},
+		},
+		startsWith: {
+			doc: {
+				name: 'startsWith',
+				description: 'Checks if the string begins with `searchString`.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/startsWith',
+				returnType: 'boolean',
+				args: [
+					{ name: 'searchString', type: 'string' },
+					{ name: 'position?', type: 'number' },
+				],
+			},
+		},
+		substring: {
+			doc: {
+				name: 'substring',
+				description:
+					'Returns the part of the string from the start index up to and excluding the end index, or to the end of the string if no end index is supplied.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substring',
+				returnType: 'string',
+				args: [
+					{ name: 'indexStart', type: 'number' },
+					{ name: 'indexEnd?', type: 'number' },
+				],
+			},
+		},
+		toLowerCase: {
+			doc: {
+				name: 'toLowerCase',
+				description: 'Formats a string to lowercase. Example: "this is lowercase”.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toLowerCase',
+				returnType: 'string',
+			},
+		},
+		toUpperCase: {
+			doc: {
+				name: 'toUpperCase',
+				description: 'Formats a string to lowercase. Example: "THIS IS UPPERCASE”.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/toUpperCase',
+				returnType: 'string',
+			},
+		},
+		trim: {
+			doc: {
+				name: 'trim',
+				description: 'Removes whitespace from both ends of a string and returns a new string.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/Trim',
+				returnType: 'string',
+			},
+		},
+		trimEnd: {
+			doc: {
+				name: 'trimEnd',
+				description: 'Removes whitespace from the end of a string and returns a new string.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trimEnd',
+				returnType: 'string',
+			},
+		},
+		trimStart: {
+			doc: {
+				name: 'trimStart',
+				description: 'Removes whitespace from the beginning of a string and returns a new string.',
+				docURL:
+					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/trimStart',
+				returnType: 'string',
+			},
+		},
 	},
 };
diff --git a/packages/workflow/src/NativeMethods/index.ts b/packages/workflow/src/NativeMethods/index.ts
index dbc5785b52de12..9f96784ac5fe0d 100644
--- a/packages/workflow/src/NativeMethods/index.ts
+++ b/packages/workflow/src/NativeMethods/index.ts
@@ -1,5 +1,9 @@
 import { stringMethods } from './String.methods';
+import { arrayMethods } from './Array.methods';
+import { numberMethods } from './Number.methods';
+import { objectMethods } from './Object.Methods';
+import type { NativeDoc } from '@/Extensions/Extensions';
 
-const NATIVE_METHODS = [stringMethods];
+const NATIVE_METHODS: NativeDoc[] = [stringMethods, arrayMethods, numberMethods, objectMethods];
 
 export { NATIVE_METHODS as NativeMethods };

From 00ac4c308a4d96a0f93401402dd92bbbd087f082 Mon Sep 17 00:00:00 2001
From: Marcus <56945030+maspio@users.noreply.github.com>
Date: Thu, 16 Feb 2023 12:54:42 +0100
Subject: [PATCH 229/358] feat(Github Node): Use resource locator component
 (#5489)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

⚡️RLC for Repository Owner and Repository Name
---
 .../nodes-base/nodes/Github/Github.node.ts    | 119 ++++++++++++++++--
 1 file changed, 109 insertions(+), 10 deletions(-)

diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 34b7fcd41a9545..bc24c32bf6b89a 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -11,6 +11,7 @@ import { NodeOperationError } from 'n8n-workflow';
 import { getFileSha, githubApiRequest, githubApiRequestAllItems } from './GenericFunctions';
 
 import { snakeCase } from 'change-case';
+import { getRepositories, getUsers } from './SearchFunctions';
 
 export class Github implements INodeType {
 	description: INodeTypeDescription = {
@@ -385,31 +386,122 @@ export class Github implements INodeType {
 			{
 				displayName: 'Repository Owner',
 				name: 'owner',
-				type: 'string',
-				default: '',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
 				required: true,
+				modes: [
+					{
+						displayName: 'Repository Owner',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select an owner...',
+						typeOptions: {
+							searchListMethod: 'getUsers',
+							searchable: true,
+							searchFilterRequired: true,
+						},
+					},
+					{
+						displayName: 'Link',
+						name: 'url',
+						type: 'string',
+						placeholder: 'e.g. https://github.com/n8n-io',
+						extractValue: {
+							type: 'regex',
+							regex: 'https:\\/\\/github.com\\/([-_0-9a-zA-Z]+)',
+						},
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: 'https:\\/\\/github.com\\/([-_0-9a-zA-Z]+)(?:.*)',
+									errorMessage: 'Not a valid Github URL',
+								},
+							},
+						],
+					},
+					{
+						displayName: 'By Name',
+						name: 'name',
+						type: 'string',
+						placeholder: 'e.g. n8n-io',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: '[-_a-zA-Z0-9]+',
+									errorMessage: 'Not a valid Github Owner Name',
+								},
+							},
+						],
+						url: '=https://github.com/{{$value}}',
+					},
+				],
 				displayOptions: {
 					hide: {
 						operation: ['invite'],
 					},
 				},
-				placeholder: 'n8n-io',
-				description: 'Owner of the repository',
 			},
 			{
 				displayName: 'Repository Name',
 				name: 'repository',
-				type: 'string',
-				default: '',
+				type: 'resourceLocator',
+				default: { mode: 'list', value: '' },
 				required: true,
+				modes: [
+					{
+						displayName: 'Repository Name',
+						name: 'list',
+						type: 'list',
+						placeholder: 'Select an Repository...',
+						typeOptions: {
+							searchListMethod: 'getRepositories',
+							searchable: true,
+						},
+					},
+					{
+						displayName: 'Link',
+						name: 'url',
+						type: 'string',
+						placeholder: 'e.g. https://github.com/n8n-io/n8n',
+						extractValue: {
+							type: 'regex',
+							regex: 'https:\\/\\/github.com\\/(?:[-_0-9a-zA-Z]+)\\/([-_.0-9a-zA-Z]+)',
+						},
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: 'https:\\/\\/github.com\\/(?:[-_0-9a-zA-Z]+)\\/([-_.0-9a-zA-Z]+)(?:.*)',
+									errorMessage: 'Not a valid Github Repository URL',
+								},
+							},
+						],
+					},
+					{
+						displayName: 'By Name',
+						name: 'name',
+						type: 'string',
+						placeholder: 'e.g. n8n',
+						validation: [
+							{
+								type: 'regex',
+								properties: {
+									regex: '[-_.0-9a-zA-Z]+',
+									errorMessage: 'Not a valid Github Repository Name',
+								},
+							},
+						],
+						url: '=https://github.com/{{$parameter["owner"]}}/{{$value}}',
+					},
+				],
 				displayOptions: {
 					hide: {
 						resource: ['user', 'organization'],
 						operation: ['getRepositories'],
 					},
 				},
-				placeholder: 'n8n',
-				description: 'The name of the repository',
 			},
 
 			// ----------------------------------
@@ -1601,6 +1693,13 @@ export class Github implements INodeType {
 		],
 	};
 
+	methods = {
+		listSearch: {
+			getUsers,
+			getRepositories,
+		},
+	};
+
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 		const returnData: INodeExecutionData[] = [];
@@ -1667,7 +1766,7 @@ export class Github implements INodeType {
 				let owner = '';
 				if (fullOperation !== 'user:invite') {
 					// Request the parameters which almost all operations need
-					owner = this.getNodeParameter('owner', i) as string;
+					owner = this.getNodeParameter('owner', i, '', { extractValue: true }) as string;
 				}
 
 				let repository = '';
@@ -1676,7 +1775,7 @@ export class Github implements INodeType {
 					fullOperation !== 'user:invite' &&
 					fullOperation !== 'organization:getRepositories'
 				) {
-					repository = this.getNodeParameter('repository', i) as string;
+					repository = this.getNodeParameter('repository', i, '', { extractValue: true }) as string;
 				}
 
 				if (resource === 'file') {

From 3de49e8f7894e628b722e2a0c62e8739b1de6be9 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 16 Feb 2023 15:07:08 +0300
Subject: [PATCH 230/358] feat: Update telemetry api endpoints (#5482)

* feat: update PostHog api endpoint

* feat: update rs host

* feat: update rs host

* feat: update rs endpoints

* refactor: use api host for BE events as well
---
 packages/cli/src/config/schema.ts                 | 2 +-
 packages/cli/src/telemetry/index.ts               | 4 +++-
 packages/editor-ui/src/plugins/telemetry/index.ts | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 0c453e202fe61c..55925eebf6c34e 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1039,7 +1039,7 @@ export const schema = {
 				apiHost: {
 					doc: 'API host for PostHog',
 					format: String,
-					default: 'https://app.posthog.com',
+					default: 'https://ph.n8n.io',
 					env: 'N8N_DIAGNOSTICS_POSTHOG_API_HOST',
 				},
 				disableSessionRecording: {
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 24d59c7be9a387..66376b67f8a464 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -60,7 +60,9 @@ export class Telemetry {
 
 			// eslint-disable-next-line @typescript-eslint/naming-convention
 			const { PostHog } = await import('posthog-node');
-			this.postHog = new PostHog(config.getEnv('diagnostics.config.posthog.apiKey'));
+			this.postHog = new PostHog(config.getEnv('diagnostics.config.posthog.apiKey'), {
+				host: config.getEnv('diagnostics.config.posthog.apiHost'),
+			});
 
 			this.startPulse();
 		}
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index c442042fec6544..1958b591db37c0 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -57,6 +57,7 @@ export class Telemetry {
 		this.initRudderStack(key, url, {
 			integrations: { All: false },
 			loadIntegration: false,
+			configUrl: 'https://api-rs.n8n.io',
 			...logging,
 		});
 
@@ -253,7 +254,7 @@ export class Telemetry {
 
 			script.type = 'text/javascript';
 			script.async = !0;
-			script.src = 'https://cdn.rudderlabs.com/v1/rudder-analytics.min.js';
+			script.src = 'https://cdn-rs.n8n.io/v1/ra.min.js';
 
 			const element: Element = document.getElementsByTagName('script')[0];
 

From 49865b7b6292492aba52ac6bdc59e773c3e90c46 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:14:40 +0000
Subject: [PATCH 231/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-workflow@?=
 =?UTF-8?q?0.137.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/workflow/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index e0813fe8076449..5814aa2169c1a3 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.136.1",
+  "version": "0.137.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 21484a9daba8f8bb4a728c0b752dee982c9517b4 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:14:53 +0000
Subject: [PATCH 232/358] :arrow_up: Set n8n-workflow@0.137.0 on n8n-core

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index 9775a72bb6b781..c557fbf71ba01e 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,7 +55,7 @@
     "form-data": "^4.0.0",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.136.1",
+    "n8n-workflow": "~0.137.0",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "pretty-bytes": "^5.6.0",

From 36df2de75833123fc60c460a44c69c06ad081a7a Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:14:53 +0000
Subject: [PATCH 233/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-core@0.15?=
 =?UTF-8?q?5.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/core/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/core/package.json b/packages/core/package.json
index c557fbf71ba01e..53932ea78db3d3 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.154.1",
+  "version": "0.155.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From a82316652750a21d38dc4b800c0821be28b36063 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:15:03 +0000
Subject: [PATCH 234/358] :arrow_up: Set n8n-core@0.155.0 and
 n8n-workflow@0.137.0 on n8n-node-dev

---
 packages/node-dev/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 0b769784023a23..5607e9fd329fc5 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.154.1",
-    "n8n-workflow": "~0.136.1",
+    "n8n-core": "~0.155.0",
+    "n8n-workflow": "~0.137.0",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",

From ebb1fa85d62ab38052093e84296596b68ea3de94 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:15:03 +0000
Subject: [PATCH 235/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-node-dev@?=
 =?UTF-8?q?0.94.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/node-dev/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 5607e9fd329fc5..94b8dc3b2f3372 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.93.1",
+  "version": "0.94.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From fda6db2bd1026a77198fc050a35674b136b9e46d Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:15:14 +0000
Subject: [PATCH 236/358] :arrow_up: Set n8n-core@0.155.0 and
 n8n-workflow@0.137.0 on n8n-nodes-base

---
 packages/nodes-base/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 4c4ea0749dcd7e..1a832bcd979c4b 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -758,7 +758,7 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "~0.136.1"
+    "n8n-workflow": "~0.137.0"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
@@ -797,7 +797,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "~0.154.1",
+    "n8n-core": "~0.155.0",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",

From 33798a20dc84800aa25a6c471401d366819c2da9 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:15:14 +0000
Subject: [PATCH 237/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-nodes-bas?=
 =?UTF-8?q?e@0.214.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/nodes-base/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 1a832bcd979c4b..99b6cbbd51ebcd 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.213.1",
+  "version": "0.214.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 18cbc6aa237f38c9b51aecd6ebdb605a5a788f6f Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:16:25 +0000
Subject: [PATCH 238/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-design-sy?=
 =?UTF-8?q?stem@0.54.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/design-system/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 24e1853ecee332..e820e7b0c2233b 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "0.53.0",
+  "version": "0.54.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {

From 8630e84cfee2840a9d0fa35e04599664c020138d Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:16:41 +0000
Subject: [PATCH 239/358] :arrow_up: Set n8n-design-system@0.54.0 and
 n8n-workflow@0.137.0 on n8n-editor-ui

---
 packages/editor-ui/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index f6521c95bf0721..c7a14289e87a71 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -63,8 +63,8 @@
     "lodash.set": "^4.3.2",
     "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
-    "n8n-design-system": "~0.53.0",
-    "n8n-workflow": "~0.136.1",
+    "n8n-design-system": "~0.54.0",
+    "n8n-workflow": "~0.137.0",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.0.22",
     "prettier": "^2.8.3",

From dab9d78c30a5b40f567fe8da68c07cb1db641ff7 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:16:41 +0000
Subject: [PATCH 240/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n-editor-ui?=
 =?UTF-8?q?@0.182.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/editor-ui/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index c7a14289e87a71..eb4ead029a0320 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.181.1",
+  "version": "0.182.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From f3f026cb5e068313ae6d2cfe63cdef32551d1d6c Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:18:57 +0000
Subject: [PATCH 241/358] :arrow_up: Set n8n-core@0.155.0,
 n8n-editor-ui@0.182.0, n8n-nodes-base@0.214.0 and n8n-workflow@0.137.0 on n8n

---
 packages/cli/package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 5c51f15773b835..87a7cc152eb2d4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -167,10 +167,10 @@
     "lodash.unset": "^4.5.2",
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
-    "n8n-core": "~0.154.1",
-    "n8n-editor-ui": "~0.181.1",
-    "n8n-nodes-base": "~0.213.1",
-    "n8n-workflow": "~0.136.1",
+    "n8n-core": "~0.155.0",
+    "n8n-editor-ui": "~0.182.0",
+    "n8n-nodes-base": "~0.214.0",
+    "n8n-workflow": "~0.137.0",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",

From 12ae0951544bcc2a994a93237669749380abc1e5 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 12:18:57 +0000
Subject: [PATCH 242/358] =?UTF-8?q?:bookmark:=20Release=C2=A0n8n@0.216.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 packages/cli/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 87a7cc152eb2d4..6b1f9227b312e4 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.215.2",
+  "version": "0.216.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From fcac1ddd9f12fdf39b2ad536b8854a40fafc3f99 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <jan.oberhauser@gmail.com>
Date: Thu, 16 Feb 2023 13:22:46 +0100
Subject: [PATCH 243/358] :books: Update CHANGELOG.md and main package.json to
 0.216.0

---
 CHANGELOG.md   | 25 +++++++++++++++++++++++++
 package.json   |  2 +-
 pnpm-lock.yaml | 50 +++++++++++++++++++++++---------------------------
 3 files changed, 49 insertions(+), 28 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98a1860bba8530..5ea8b39bffaa41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,28 @@
+# [0.216.0](https://github.com/n8n-io/n8n/compare/n8n@0.215.2...n8n@0.216.0) (2023-02-16)
+
+
+### Bug Fixes
+
+* **Bubble Node:** Fix pagination issue when returning all objects ([#5483](https://github.com/n8n-io/n8n/issues/5483)) ([1a20fd9](https://github.com/n8n-io/n8n/commit/1a20fd9f46495e32508d74dbb9ccaaa0f6194a07))
+* **core:** Fix data transformation function that are reported not to work properly ([#5338](https://github.com/n8n-io/n8n/issues/5338)) ([0cf45bc](https://github.com/n8n-io/n8n/commit/0cf45bc4c862c7544e69af4981d4607bf0b530e3))
+* **core:** Remove unnecessary info from `GET /workflows` response ([#5311](https://github.com/n8n-io/n8n/issues/5311)) ([a2c6ea9](https://github.com/n8n-io/n8n/commit/a2c6ea9e110e51debf137707b52eb7fedbc0032b))
+* **HTTP Request Node:** Ignore empty body for auto detect json ([#5215](https://github.com/n8n-io/n8n/issues/5215)) ([af70337](https://github.com/n8n-io/n8n/commit/af703371fc96dcfdd8f418201d3880f124cfcfc4))
+
+
+### Features
+
+* Add workflow and credential sharing access e2e tests ([#5463](https://github.com/n8n-io/n8n/issues/5463)) ([246189f](https://github.com/n8n-io/n8n/commit/246189f6dae2ce96dabd900ce0a192de731cc6aa))
+* **editor:** Add correct credential owner contact details for readonly credentials ([#5208](https://github.com/n8n-io/n8n/issues/5208)) ([36108f8](https://github.com/n8n-io/n8n/commit/36108f82a1c1657c3959225d0635255668bf0af6))
+* **editor:** Add most important native props and methods to autocomplete ([#5486](https://github.com/n8n-io/n8n/issues/5486)) ([6592d14](https://github.com/n8n-io/n8n/commit/6592d144d1fb680b34240ce57a6615b06de5cde5))
+* **editor:** Update to personalization survey v4 ([#5474](https://github.com/n8n-io/n8n/issues/5474)) ([6265f3a](https://github.com/n8n-io/n8n/commit/6265f3a27a076f6c3c24d0fb323e44c471d85b23))
+* **Github Node:** Use resource locator component ([#5489](https://github.com/n8n-io/n8n/issues/5489)) ([00ac4c3](https://github.com/n8n-io/n8n/commit/00ac4c308a4d96a0f93401402dd92bbbd087f082))
+* **Github Trigger Node:** Use resource locator component ([#5253](https://github.com/n8n-io/n8n/issues/5253)) ([a3d8fac](https://github.com/n8n-io/n8n/commit/a3d8fac73a8a93d6b7f769e1386276e34066a1b7))
+* **Notion Node:** Add icon support for page and database page creation ([#5468](https://github.com/n8n-io/n8n/issues/5468)) ([71cba06](https://github.com/n8n-io/n8n/commit/71cba06b7c1ee8ed42a4dacc2d8114df119339dc))
+* **Slack Node:** Add support for manually inputting a channel name ([#5488](https://github.com/n8n-io/n8n/issues/5488)) ([7954ed3](https://github.com/n8n-io/n8n/commit/7954ed3cfbd4d8d0611c0cc51385b49cc80282a6))
+* Update telemetry api endpoints ([#5482](https://github.com/n8n-io/n8n/issues/5482)) ([3de49e8](https://github.com/n8n-io/n8n/commit/3de49e8f7894e628b722e2a0c62e8739b1de6be9))
+
+
+
 ## [0.215.2](https://github.com/n8n-io/n8n/compare/n8n@0.215.1...n8n@0.215.2) (2023-02-14)
 
 
diff --git a/package.json b/package.json
index 8c642daef97c50..530c323e4ccd86 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.215.2",
+  "version": "0.216.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6702c63fb8f6d0..055fb2d89c4d02 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -207,10 +207,10 @@ importers:
       luxon: ^3.1.0
       mock-jwks: ^1.0.9
       mysql2: ~2.3.3
-      n8n-core: ~0.154.1
-      n8n-editor-ui: ~0.181.1
-      n8n-nodes-base: ~0.213.1
-      n8n-workflow: ~0.136.1
+      n8n-core: ~0.155.0
+      n8n-editor-ui: ~0.182.0
+      n8n-nodes-base: ~0.214.0
+      n8n-workflow: ~0.137.0
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
       oauth-1.0a: ^2.2.6
@@ -403,7 +403,7 @@ importers:
       form-data: ^4.0.0
       lodash.get: ^4.4.2
       mime-types: ^2.1.27
-      n8n-workflow: ~0.136.1
+      n8n-workflow: ~0.137.0
       oauth-1.0a: ^2.2.6
       p-cancelable: ^2.0.0
       pretty-bytes: ^5.6.0
@@ -590,8 +590,8 @@ importers:
       lodash.set: ^4.3.2
       luxon: ^3.1.0
       monaco-editor: ^0.33.0
-      n8n-design-system: ~0.53.0
-      n8n-workflow: ~0.136.1
+      n8n-design-system: ~0.54.0
+      n8n-workflow: ~0.137.0
       normalize-wheel: ^1.0.1
       pinia: ^2.0.22
       prettier: ^2.8.3
@@ -721,8 +721,8 @@ importers:
       change-case: ^4.1.1
       fast-glob: ^3.2.5
       inquirer: ^7.0.1
-      n8n-core: ~0.154.1
-      n8n-workflow: ~0.136.1
+      n8n-core: ~0.155.0
+      n8n-workflow: ~0.137.0
       oauth-1.0a: ^2.2.6
       replace-in-file: ^6.0.0
       request: ^2.88.2
@@ -814,8 +814,8 @@ importers:
       mqtt: 4.2.6
       mssql: ^8.1.2
       mysql2: ~2.3.0
-      n8n-core: ~0.154.1
-      n8n-workflow: ~0.136.1
+      n8n-core: ~0.155.0
+      n8n-workflow: ~0.137.0
       node-html-markdown: ^1.1.3
       node-ssh: ^12.0.0
       nodemailer: ^6.7.1
@@ -4138,7 +4138,7 @@ packages:
     dependencies:
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/global': 5.0.0
       '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/preview-api': 7.0.0-beta.46
@@ -4346,7 +4346,7 @@ packages:
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/docs-tools': 7.0.0-beta.46
       '@storybook/global': 5.0.0
       '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
@@ -4566,7 +4566,7 @@ packages:
       '@babel/core': 7.20.12
       '@babel/preset-env': 7.20.2_@babel+core@7.20.12
       '@babel/types': 7.20.7
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/csf-tools': 7.0.0-beta.46
       '@storybook/node-logger': 7.0.0-beta.46
       '@storybook/types': 7.0.0-beta.46
@@ -4606,7 +4606,7 @@ packages:
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/global': 5.0.0
       '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/types': 7.0.0-beta.46
@@ -4677,7 +4677,7 @@ packages:
       '@storybook/builder-manager': 7.0.0-beta.46
       '@storybook/core-common': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/csf-tools': 7.0.0-beta.46
       '@storybook/docs-mdx': 0.0.1-next.6
       '@storybook/global': 5.0.0
@@ -4747,7 +4747,7 @@ packages:
     resolution: {integrity: sha512-H7zXfL1wf/1jWi5MaFISt/taxE41fgpV/uLfi5CHcHLX9ZgeQs2B/2utpUgwvBsxiL+E/jKAt5cLeuZCIvglMg==}
     dependencies:
       '@babel/types': 7.20.7
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/types': 7.0.0-beta.46
       fs-extra: 11.1.0
       recast: 0.23.1
@@ -4762,11 +4762,9 @@ packages:
       lodash: 4.17.21
     dev: true
 
-  /@storybook/csf/0.0.2-next.8:
-    resolution: {integrity: sha512-3T6rflW7D9q1iXOR+bidwoNbd9rVUTyjYH/sqsnYjbXhb/aOXsQzGKwNeq9QqZIFVpKfg5BoOF5i7DCMtoGknQ==}
+  /@storybook/csf/0.0.2-next.9:
+    resolution: {integrity: sha512-ECOLMK425s+z8oA0aVAhBhhquuwTsZrM4oha/5De44JG8uYGXhqVrv/l27oxZEkwytuiQu+9f65HxYli+DY+3w==}
     dependencies:
-      expect-type: 0.14.2
-      lodash: 4.17.21
       type-fest: 2.19.0
     dev: true
 
@@ -4801,7 +4799,7 @@ packages:
       '@storybook/channels': 7.0.0-beta.46
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/global': 5.0.0
       '@storybook/router': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
@@ -4891,7 +4889,7 @@ packages:
       '@storybook/channels': 7.0.0-beta.46
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.8
+      '@storybook/csf': 0.0.2-next.9
       '@storybook/global': 5.0.0
       '@storybook/types': 7.0.0-beta.46
       '@types/qs': 6.9.7
@@ -5306,6 +5304,8 @@ packages:
 
   /@types/deep-equal/1.0.1:
     resolution: {integrity: sha512-mMUu4nWHLBlHtxXY17Fg6+ucS/MnndyOWyOe7MmwkoMYxvfQU2ajtRaEvqSUv+aVkMqH/C0NCI8UoVfRNQ10yg==}
+    dev: true
+
   /@types/detect-port/1.3.2:
     resolution: {integrity: sha512-xxgAGA2SAU4111QefXPSp5eGbDm/hW6zhvYl9IeEPZEry9F4d66QAHm5qpUXjb6IsevZV/7emAEx5MhP6O192g==}
     dev: true
@@ -10585,10 +10585,6 @@ packages:
     dependencies:
       homedir-polyfill: 1.0.3
 
-  /expect-type/0.14.2:
-    resolution: {integrity: sha512-ed3+tr5ujbIYXZ8Pl/VgIphwJQ0q5tBLGGdn7Zvwt1WyPBRX83xjT5pT77P/GkuQbctx0K2ZNSSan7eruJqTCQ==}
-    dev: true
-
   /expect/29.3.1:
     resolution: {integrity: sha512-gGb1yTgU30Q0O/tQq+z30KBWv24ApkMgFUpvKBkyLUBL68Wv8dHdJxTBZFl/iT8K/bqDHvUYRH6IIN3rToopPA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}

From 3a9c257f55a87890c7456601de13f182cec89fde Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Thu, 16 Feb 2023 15:05:39 +0100
Subject: [PATCH 244/358] feat(core): Add saml feature flag (#5494)

adds saml feature flag
---
 packages/cli/src/Interfaces.ts    |  1 +
 packages/cli/src/License.ts       |  4 ++++
 packages/cli/src/Saml/helpers.ts  | 10 ++++++++++
 packages/cli/src/Server.ts        |  3 +++
 packages/cli/src/config/schema.ts |  4 ++++
 packages/cli/src/constants.ts     |  1 +
 6 files changed, 23 insertions(+)
 create mode 100644 packages/cli/src/Saml/helpers.ts

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 145500b9be5689..2605c809291053 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -513,6 +513,7 @@ export interface IN8nUISettings {
 	enterprise: {
 		sharing: boolean;
 		ldap: boolean;
+		saml: boolean;
 		logStreaming: boolean;
 	};
 	hideUsagePage: boolean;
diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index 72c62eb993f332..66952b0080a1c8 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -102,6 +102,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.LDAP);
 	}
 
+	isSamlEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.SAML);
+	}
+
 	getCurrentEntitlements() {
 		return this.manager?.getCurrentEntitlements() ?? [];
 	}
diff --git a/packages/cli/src/Saml/helpers.ts b/packages/cli/src/Saml/helpers.ts
new file mode 100644
index 00000000000000..c12f02cdba15bb
--- /dev/null
+++ b/packages/cli/src/Saml/helpers.ts
@@ -0,0 +1,10 @@
+import { getLicense } from '../License';
+import { isUserManagementEnabled } from '../UserManagement/UserManagementHelper';
+
+/**
+ *  Check whether the SAML feature is licensed and enabled in the instance
+ */
+export function isSamlEnabled(): boolean {
+	const license = getLicense();
+	return isUserManagementEnabled() && license.isSamlEnabled();
+}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index c65300131668d9..870a7e124c447c 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -145,6 +145,7 @@ import { AbstractServer } from './AbstractServer';
 import { configureMetrics } from './metrics';
 import { setupBasicAuth } from './middlewares/basicAuth';
 import { setupExternalJWTAuth } from './middlewares/externalJWTAuth';
+import { isSamlEnabled } from './Saml/helpers';
 
 const exec = promisify(callbackExec);
 
@@ -275,6 +276,7 @@ class Server extends AbstractServer {
 			enterprise: {
 				sharing: false,
 				ldap: false,
+				saml: false,
 				logStreaming: config.getEnv('enterprise.features.logStreaming'),
 			},
 			hideUsagePage: config.getEnv('hideUsagePage'),
@@ -303,6 +305,7 @@ class Server extends AbstractServer {
 			sharing: isSharingEnabled(),
 			logStreaming: isLogStreamingEnabled(),
 			ldap: isLdapEnabled(),
+			saml: isSamlEnabled(),
 		});
 
 		if (isLdapEnabled()) {
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 55925eebf6c34e..3fa9dc0cbbb781 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -985,6 +985,10 @@ export const schema = {
 				format: Boolean,
 				default: false,
 			},
+			saml: {
+				format: Boolean,
+				default: false,
+			},
 			logStreaming: {
 				format: Boolean,
 				default: false,
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 5b2d2e08721a2f..0a50fe90818ffe 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -69,6 +69,7 @@ export const SETTINGS_LICENSE_CERT_KEY = 'license.cert';
 export enum LICENSE_FEATURES {
 	SHARING = 'feat:sharing',
 	LDAP = 'feat:ldap',
+	SAML = 'feat:saml',
 	LOG_STREAMING = 'feat:logStreaming',
 }
 

From d143f3f2ec9ce42cfa4db2b41dab019b7b42f379 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Fri, 17 Feb 2023 10:54:07 +0100
Subject: [PATCH 245/358] feat(core): Add execution runData recovery and status
 field (#5112)

* adds ExecutionEvents view modal to ExecutionList

* fix time rendering and remove wf column

* checks for unfinished executions and fails them

* prevent re-setting stoppedAt for execution

* some cleanup / manually create rundata after crash

* quicksave

* remove Threads lib, log worker rewrite

* cleanup comment

* fix sentry destination return value

* test for tests...

* run tests with single worker

* fix tests

* remove console log

* add endpoint for execution data recovery

* lint cleanup and some refactoring

* fix accidental recursion

* remove cyclic imports

* add rundata recovery to Workflowrunner

* remove comments

* cleanup and refactor

* adds a status field to executions

* setExecutionStatus on queued worker

* fix onWorkflowPostExecute

* set waiting from worker

* get crashed status into frontend

* remove comment

* merge fix

* cleanup

* catch empty rundata in recovery

* refactor IExecutionsSummary and inject nodeExecution Errors

* reduce default event log size to 10mb from 100mb

* add per node execution status

* lint fix

* merge and lint fix

* phrasing change

* improve preview rendering and messaging

* remove debug

* Improve partial rundata recovery

* fix labels

* fix line through

* send manual rundata to ui at crash

* some type and msg push fixes

* improve recovered item rendering in preview

* update workflowStatistics on recover

* merge fix

* review fixes

* merge fix

* notify eventbus when ui is back up

* add a small timeout to make sure the UI is back up

* increase reconnect timeout to 30s

* adjust recover timeout and ui connection lost msg

* do not stop execution in editor after x reconnects

* add executionRecovered push event

* fix recovered connection not green

* remove reconnect toast and  merge existing rundata

* merge editor and recovered data for own mode
---
 .vscode/launch.json                           |   2 +-
 packages/cli/package.json                     |   2 +
 packages/cli/src/ActiveExecutions.ts          |  42 +++-
 packages/cli/src/ActiveWorkflowRunner.ts      |   1 +
 packages/cli/src/GenericHelpers.ts            |   1 +
 packages/cli/src/Interfaces.ts                |  31 +--
 packages/cli/src/InternalHooks.ts             |  38 ++++
 packages/cli/src/PublicApi/types.d.ts         |   4 +-
 .../handlers/executions/executions.service.ts |   2 +-
 packages/cli/src/ResponseHelper.ts            |   2 +
 packages/cli/src/Server.ts                    |  20 +-
 packages/cli/src/WaitTracker.ts               |   8 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  56 +++++-
 packages/cli/src/WorkflowHelpers.ts           |   1 +
 packages/cli/src/WorkflowRunner.ts            |  45 ++++-
 packages/cli/src/WorkflowRunnerProcess.ts     |   4 +
 packages/cli/src/commands/Interfaces.d.ts     |   2 -
 packages/cli/src/commands/executeBatch.ts     |   8 +-
 packages/cli/src/commands/worker.ts           |   7 +-
 packages/cli/src/config/schema.ts             |   2 +-
 .../src/databases/entities/ExecutionEntity.ts |   5 +-
 .../1674138566000-AddStatusToExecutions.ts    |  24 +++
 .../src/databases/migrations/mysqldb/index.ts |   4 +-
 .../1674138566000-AddStatusToExecutions.ts    |  21 ++
 .../databases/migrations/postgresdb/index.ts  |   4 +-
 .../1674138566000-AddStatusToExecutions.ts    |  23 +++
 .../src/databases/migrations/sqlite/index.ts  |   2 +
 .../AbstractEventMessage.ts                   |   3 +-
 .../AbstractEventMessageOptions.ts            |   3 +-
 .../EventMessageClasses/EventMessageAudit.ts  |  26 +--
 .../EventMessageClasses/EventMessageNode.ts   |   4 +-
 .../EventMessageWorkflow.ts                   |   9 +-
 .../src/eventbus/EventMessageClasses/index.ts |  49 ++++-
 .../MessageEventBus/MessageEventBus.ts        |  48 +++--
 .../eventbus/MessageEventBus/recoverEvents.ts | 190 ++++++++++++++++++
 .../MessageEventBusDestination/Helpers.ee.ts  |  13 +-
 .../MessageEventBusDestination.ee.ts          |  25 ++-
 .../MessageEventBusDestinationSentry.ee.ts    |  20 +-
 .../MessageEventBusDestinationSyslog.ee.ts    |  22 +-
 .../MessageEventBusDestinationWebhook.ee.ts   |  25 ++-
 .../MessageEventBusLogWriter.ts               |  43 ++--
 packages/cli/src/eventbus/eventBusRoutes.ts   |  44 +++-
 .../cli/src/executions/executions.service.ts  |  71 ++++++-
 packages/cli/src/push/abstract.push.ts        |   2 +
 .../cli/test/integration/eventbus.test.ts     |  43 ++--
 .../cli/test/unit/ActiveExecutions.test.ts    |   1 +
 packages/core/src/NodeExecuteFunctions.ts     |   3 +
 packages/core/src/WorkflowExecute.ts          |  14 ++
 packages/editor-ui/src/Interface.ts           |  25 +--
 .../src/components/ExecutionsList.vue         |  90 ++++++---
 .../ExecutionsView/ExecutionCard.vue          |   5 +-
 .../ExecutionsView/ExecutionPreview.vue       |  22 +-
 .../ExecutionsView/ExecutionsSidebar.vue      |   2 +
 .../editor-ui/src/components/InputPanel.vue   |  21 ++
 .../src/components/InviteUsersModal.vue       |   1 -
 packages/editor-ui/src/components/Node.vue    |  46 ++++-
 .../editor-ui/src/components/OutputPanel.vue  |  33 +++
 packages/editor-ui/src/components/RunData.vue |  11 +-
 .../editor-ui/src/components/TitledList.vue   |   2 +-
 .../editor-ui/src/mixins/executionsHelpers.ts |  26 ++-
 .../editor-ui/src/mixins/pushConnection.ts    | 117 +++++++++--
 packages/editor-ui/src/mixins/restApi.ts      |   1 +
 .../src/plugins/i18n/locales/en.json          |  15 +-
 packages/editor-ui/src/stores/workflows.ts    |  13 +-
 packages/editor-ui/src/utils/nodeViewUtils.ts |  37 +++-
 packages/editor-ui/src/views/NodeView.vue     |   4 +-
 packages/workflow/src/ExecutionStatus.ts      |  10 +
 packages/workflow/src/Interfaces.ts           |  32 +++
 packages/workflow/src/NodeErrors.ts           |  13 ++
 packages/workflow/src/WorkflowErrors.ts       |   2 +
 packages/workflow/src/index.ts                |   1 +
 71 files changed, 1243 insertions(+), 305 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts
 create mode 100644 packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
 create mode 100644 packages/workflow/src/ExecutionStatus.ts

diff --git a/.vscode/launch.json b/.vscode/launch.json
index cada9486ee6590..6e814517875a9a 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -39,7 +39,7 @@
 			"name": "Launch n8n CLI dev with debug",
 			"runtimeExecutable": "pnpm",
 			"cwd": "${workspaceFolder}/packages/cli",
-			"runtimeArgs": ["run", "dev", "--", "--inspect-brk"],
+			"runtimeArgs": ["run", "buildAndDev", "--", "--inspect-brk"],
 			"console": "integratedTerminal",
 			"restart": true,
 			"autoAttachChildProcesses": true,
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6b1f9227b312e4..6c7f275e800d9f 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -22,7 +22,9 @@
     "clean": "rimraf dist .turbo",
     "typecheck": "tsc",
     "build": "tsc -p tsconfig.build.json && tsc-alias -p tsconfig.build.json && node scripts/build.mjs",
+    "buildAndDev": "pnpm run build && pnpm run dev",
     "dev": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon\"",
+    "dev:worker": "concurrently -k -n \"TypeScript,Node\" -c \"yellow.bold,cyan.bold\" \"npm run watch\" \"nodemon worker\"",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
     "lint": "eslint --quiet .",
     "lintfix": "eslint . --fix",
diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
index 681d5c1f219d75..23102daf4ed431 100644
--- a/packages/cli/src/ActiveExecutions.ts
+++ b/packages/cli/src/ActiveExecutions.ts
@@ -5,8 +5,13 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
-import type { IDeferredPromise, IExecuteResponsePromiseData, IRun } from 'n8n-workflow';
-import { createDeferredPromise } from 'n8n-workflow';
+import type {
+	IDeferredPromise,
+	IExecuteResponsePromiseData,
+	IRun,
+	ExecutionStatus,
+} from 'n8n-workflow';
+import { createDeferredPromise, LoggerProxy } from 'n8n-workflow';
 
 import type { ChildProcess } from 'child_process';
 import { stringify } from 'flatted';
@@ -36,6 +41,7 @@ export class ActiveExecutions {
 		process?: ChildProcess,
 		executionId?: string,
 	): Promise<string> {
+		let executionStatus: ExecutionStatus = executionId ? 'running' : 'new';
 		if (executionId === undefined) {
 			// Is a new execution so save in DB
 
@@ -45,6 +51,7 @@ export class ActiveExecutions {
 				finished: false,
 				startedAt: new Date(),
 				workflowData: executionData.workflowData,
+				status: executionStatus,
 			};
 
 			if (executionData.retryOf !== undefined) {
@@ -59,32 +66,37 @@ export class ActiveExecutions {
 			const execution = ResponseHelper.flattenExecutionData(fullExecutionData);
 
 			const executionResult = await Db.collections.Execution.save(execution as IExecutionFlattedDb);
+			// TODO: what is going on here?
 			executionId =
 				typeof executionResult.id === 'object'
 					? // @ts-ignore
 					  executionResult.id!.toString()
 					: executionResult.id + '';
+			if (executionId === undefined) {
+				throw new Error('There was an issue assigning an execution id to the execution');
+			}
+			executionStatus = 'running';
 		} else {
 			// Is an existing execution we want to finish so update in DB
 
-			const execution = {
+			const execution: Pick<IExecutionFlattedDb, 'id' | 'data' | 'waitTill' | 'status'> = {
 				id: executionId,
 				data: stringify(executionData.executionData!),
 				waitTill: null,
+				status: executionStatus,
 			};
 
 			await Db.collections.Execution.update(executionId, execution);
 		}
 
-		// @ts-ignore
 		this.activeExecutions[executionId] = {
 			executionData,
 			process,
 			startedAt: new Date(),
 			postExecutePromises: [],
+			status: executionStatus,
 		};
 
-		// @ts-ignore
 		return executionId;
 	}
 
@@ -215,11 +227,31 @@ export class ActiveExecutions {
 				startedAt: data.startedAt,
 				mode: data.executionData.executionMode,
 				workflowId: data.executionData.workflowData.id! as string,
+				status: data.status,
 			});
 		}
 
 		return returnData;
 	}
+
+	async setStatus(executionId: string, status: ExecutionStatus): Promise<void> {
+		if (this.activeExecutions[executionId] === undefined) {
+			LoggerProxy.debug(
+				`There is no active execution with id "${executionId}", can't update status to ${status}.`,
+			);
+			return;
+		}
+
+		this.activeExecutions[executionId].status = status;
+	}
+
+	getStatus(executionId: string): ExecutionStatus {
+		if (this.activeExecutions[executionId] === undefined) {
+			return 'unknown';
+		}
+
+		return this.activeExecutions[executionId].status;
+	}
 }
 
 let activeExecutionsInstance: ActiveExecutions | undefined;
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index 4eddb668d278f8..cc803ee6060757 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -760,6 +760,7 @@ export class ActiveWorkflowRunner {
 			mode,
 			startedAt: new Date(),
 			stoppedAt: new Date(),
+			status: 'running',
 		};
 
 		WorkflowExecuteAdditionalData.executeErrorWorkflow(workflowData, fullRunData, mode);
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index e3940a620b7c34..7d8011abdec59c 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -190,6 +190,7 @@ export async function createErrorExecution(
 		workflowData,
 		workflowId: workflow.id,
 		stoppedAt: new Date(),
+		status: 'new',
 	};
 
 	const execution = ResponseHelper.flattenExecutionData(fullExecutionData);
diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 2605c809291053..8ec9b0ccbd01c9 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -20,6 +20,8 @@ import type {
 	Workflow,
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
+	ExecutionStatus,
+	IExecutionsSummary,
 } from 'n8n-workflow';
 
 import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
@@ -153,6 +155,7 @@ export interface IExecutionBase {
 	finished: boolean;
 	retryOf?: string; // If it is a retry, the id of the execution it is a retry of.
 	retrySuccessId?: string; // If it failed and a retry did succeed. The id of the successful retry.
+	status: ExecutionStatus;
 }
 
 // Data in regular format with references
@@ -188,6 +191,7 @@ export interface IExecutionFlattedDb extends IExecutionBase {
 	data: string;
 	waitTill?: Date | null;
 	workflowData: Omit<IWorkflowBase, 'pinData'>;
+	status: ExecutionStatus;
 }
 
 export interface IExecutionFlattedResponse extends IExecutionFlatted {
@@ -222,25 +226,13 @@ export interface IExecutionsStopData {
 	stoppedAt?: Date;
 }
 
-export interface IExecutionsSummary {
-	id: string;
-	finished?: boolean;
-	mode: WorkflowExecuteMode;
-	retryOf?: string;
-	retrySuccessId?: string;
-	waitTill?: Date;
-	startedAt: Date;
-	stoppedAt?: Date;
-	workflowId: string;
-	workflowName?: string;
-}
-
 export interface IExecutionsCurrentSummary {
 	id: string;
 	retryOf?: string;
 	startedAt: Date;
 	mode: WorkflowExecuteMode;
 	workflowId: string;
+	status?: ExecutionStatus;
 }
 
 export interface IExecutionDeleteFilter {
@@ -256,6 +248,7 @@ export interface IExecutingWorkflowData {
 	postExecutePromises: Array<IDeferredPromise<IRun | undefined>>;
 	responsePromise?: IDeferredPromise<IExecuteResponsePromiseData>;
 	workflowExecution?: PCancelable<IRun>;
+	status: ExecutionStatus;
 }
 
 export interface IExternalHooks {
@@ -568,7 +561,13 @@ export type IPushData =
 	| PushDataReloadNodeType
 	| PushDataRemoveNodeType
 	| PushDataTestWebhook
-	| PushDataNodeDescriptionUpdated;
+	| PushDataNodeDescriptionUpdated
+	| PushDataExecutionRecovered;
+
+type PushDataExecutionRecovered = {
+	data: IPushDataExecutionRecovered;
+	type: 'executionRecovered';
+};
 
 type PushDataExecutionFinished = {
 	data: IPushDataExecutionFinished;
@@ -615,6 +614,10 @@ type PushDataNodeDescriptionUpdated = {
 	type: 'nodeDescriptionUpdated';
 };
 
+export interface IPushDataExecutionRecovered {
+	executionId: string;
+}
+
 export interface IPushDataExecutionFinished {
 	data: IRun;
 	executionId: string;
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index d97a5c98a3bdfe..84102e62e36526 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -4,11 +4,13 @@
 import { snakeCase } from 'change-case';
 import { BinaryDataManager } from 'n8n-core';
 import type {
+	ExecutionStatus,
 	INodesGraphResult,
 	INodeTypes,
 	IRun,
 	ITelemetryTrackProperties,
 	IWorkflowBase,
+	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import { TelemetryHelpers } from 'n8n-workflow';
 import { get as pslGet } from 'psl';
@@ -26,6 +28,7 @@ import { RoleService } from './role/role.service';
 import { eventBus } from './eventbus';
 import type { User } from '@db/entities/User';
 import { N8N_VERSION } from '@/constants';
+import * as Db from '@/Db';
 
 function userToPayload(user: User): {
 	userId: string;
@@ -220,6 +223,7 @@ export class InternalHooksClass implements IInternalHooksClass {
 		data: IWorkflowExecutionDataProcess,
 	): Promise<void> {
 		void Promise.all([
+			Db.collections.Execution.update(executionId, { status: 'running' }),
 			eventBus.sendWorkflowEvent({
 				eventName: 'n8n.workflow.started',
 				payload: {
@@ -233,6 +237,24 @@ export class InternalHooksClass implements IInternalHooksClass {
 		]);
 	}
 
+	async onWorkflowCrashed(
+		executionId: string,
+		executionMode: WorkflowExecuteMode,
+		workflowData?: IWorkflowBase,
+	): Promise<void> {
+		void Promise.all([
+			eventBus.sendWorkflowEvent({
+				eventName: 'n8n.workflow.crashed',
+				payload: {
+					executionId,
+					isManual: executionMode === 'manual',
+					workflowId: workflowData?.id?.toString(),
+					workflowName: workflowData?.name,
+				},
+			}),
+		]);
+	}
+
 	async onWorkflowPostExecute(
 		executionId: string,
 		workflow: IWorkflowBase,
@@ -315,6 +337,7 @@ export class InternalHooksClass implements IInternalHooksClass {
 					user_id: userId,
 					workflow_id: workflow.id,
 					status: properties.success ? 'success' : 'failed',
+					executionStatus: runData?.status ?? 'unknown',
 					error_message: properties.error_message as string,
 					error_node_type: properties.error_node_type,
 					node_graph_string: properties.node_graph_string as string,
@@ -363,6 +386,21 @@ export class InternalHooksClass implements IInternalHooksClass {
 			}
 		}
 
+		let executionStatus: ExecutionStatus;
+		if (runData?.status === 'crashed') {
+			executionStatus = 'crashed';
+		} else if (runData?.status === 'waiting' || runData?.data?.waitTill) {
+			executionStatus = 'waiting';
+		} else {
+			executionStatus = properties.success ? 'success' : 'failed';
+		}
+
+		promises.push(
+			Db.collections.Execution.update(executionId, {
+				status: executionStatus,
+			}) as unknown as Promise<void>,
+		);
+
 		promises.push(
 			properties.success
 				? eventBus.sendWorkflowEvent({
diff --git a/packages/cli/src/PublicApi/types.d.ts b/packages/cli/src/PublicApi/types.d.ts
index 481888d00dbf53..b908f07b851640 100644
--- a/packages/cli/src/PublicApi/types.d.ts
+++ b/packages/cli/src/PublicApi/types.d.ts
@@ -1,5 +1,5 @@
 import type express from 'express';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, ExecutionStatus } from 'n8n-workflow';
 
 import type { User } from '@db/entities/User';
 
@@ -11,8 +11,6 @@ import type * as UserManagementMailer from '@/UserManagement/email/UserManagemen
 
 import type { Risk } from '@/audit/types';
 
-export type ExecutionStatus = 'error' | 'running' | 'success' | 'waiting' | null;
-
 export type AuthlessRequest<
 	RouteParams = {},
 	ResponseBody = {},
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts
index fa0d5b0c613933..4ae709dea649a9 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.service.ts
@@ -4,7 +4,7 @@ import { In, Not, Raw, LessThan, IsNull } from 'typeorm';
 
 import * as Db from '@/Db';
 import type { IExecutionFlattedDb, IExecutionResponseApi } from '@/Interfaces';
-import type { ExecutionStatus } from '@/PublicApi/types';
+import type { ExecutionStatus } from 'n8n-workflow';
 
 function prepareExecutionData(
 	execution: IExecutionFlattedDb | null,
diff --git a/packages/cli/src/ResponseHelper.ts b/packages/cli/src/ResponseHelper.ts
index 7cf88b385c18e8..b7b22336d58366 100644
--- a/packages/cli/src/ResponseHelper.ts
+++ b/packages/cli/src/ResponseHelper.ts
@@ -228,6 +228,7 @@ export function flattenExecutionData(fullExecutionData: IExecutionDb): IExecutio
 		workflowId: fullExecutionData.workflowId,
 		// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 		workflowData: fullExecutionData.workflowData!,
+		status: fullExecutionData.status,
 	};
 
 	if (fullExecutionData.id !== undefined) {
@@ -261,6 +262,7 @@ export function unflattenExecutionData(fullExecutionData: IExecutionFlattedDb):
 		stoppedAt: fullExecutionData.stoppedAt,
 		finished: fullExecutionData.finished ? fullExecutionData.finished : false,
 		workflowId: fullExecutionData.workflowId,
+		status: fullExecutionData.status,
 	};
 
 	return returnData;
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 870a7e124c447c..87e9b7463ea06e 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -21,7 +21,7 @@ import cookieParser from 'cookie-parser';
 import express from 'express';
 import type { ServeStaticOptions } from 'serve-static';
 import type { FindManyOptions } from 'typeorm';
-import { In } from 'typeorm';
+import { Not, In } from 'typeorm';
 import type { AxiosRequestConfig } from 'axios';
 import axios from 'axios';
 import type { RequestOptions } from 'oauth-1.0a';
@@ -45,6 +45,8 @@ import type {
 	ITelemetrySettings,
 	WorkflowExecuteMode,
 	ICredentialTypes,
+	ExecutionStatus,
+	IExecutionsSummary,
 } from 'n8n-workflow';
 import { LoggerProxy, jsonParse } from 'n8n-workflow';
 
@@ -109,7 +111,6 @@ import type {
 	IDiagnosticInfo,
 	IExecutionFlattedDb,
 	IExecutionsStopData,
-	IExecutionsSummary,
 	IN8nUISettings,
 } from '@/Interfaces';
 import * as ActiveExecutions from '@/ActiveExecutions';
@@ -130,7 +131,6 @@ import { WaitTracker } from '@/WaitTracker';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { toHttpNodeParameters } from '@/CurlConverterHelper';
-import { eventBus } from '@/eventbus';
 import { eventBusRouter } from '@/eventbus/eventBusRoutes';
 import { isLogStreamingEnabled } from '@/eventbus/MessageEventBus/MessageEventBusHelper';
 import { getLicense } from '@/License';
@@ -145,6 +145,7 @@ import { AbstractServer } from './AbstractServer';
 import { configureMetrics } from './metrics';
 import { setupBasicAuth } from './middlewares/basicAuth';
 import { setupExternalJWTAuth } from './middlewares/externalJWTAuth';
+import { eventBus } from './eventbus';
 import { isSamlEnabled } from './Saml/helpers';
 
 const exec = promisify(callbackExec);
@@ -980,10 +981,11 @@ class Server extends AbstractServer {
 						if (!currentlyRunningExecutionIds.length) return [];
 
 						const findOptions: FindManyOptions<IExecutionFlattedDb> = {
-							select: ['id', 'workflowId', 'mode', 'retryOf', 'startedAt'],
+							select: ['id', 'workflowId', 'mode', 'retryOf', 'startedAt', 'stoppedAt', 'status'],
 							order: { id: 'DESC' },
 							where: {
 								id: In(currentlyRunningExecutionIds),
+								status: Not(In(['finished', 'stopped', 'failed', 'crashed'] as ExecutionStatus[])),
 							},
 						};
 
@@ -992,10 +994,16 @@ class Server extends AbstractServer {
 						if (!sharedWorkflowIds.length) return [];
 
 						if (req.query.filter) {
-							const { workflowId } = jsonParse<any>(req.query.filter);
+							const { workflowId, status, finished } = jsonParse<any>(req.query.filter);
 							if (workflowId && sharedWorkflowIds.includes(workflowId)) {
 								Object.assign(findOptions.where!, { workflowId });
 							}
+							if (status) {
+								Object.assign(findOptions.where!, { status: In(status) });
+							}
+							if (finished) {
+								Object.assign(findOptions.where!, { finished });
+							}
 						} else {
 							Object.assign(findOptions.where!, { workflowId: In(sharedWorkflowIds) });
 						}
@@ -1011,6 +1019,8 @@ class Server extends AbstractServer {
 								mode: execution.mode,
 								retryOf: execution.retryOf !== null ? execution.retryOf : undefined,
 								startedAt: new Date(execution.startedAt),
+								status: execution.status ?? null,
+								stoppedAt: execution.stoppedAt ?? null,
 							} as IExecutionsSummary;
 						});
 					}
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 98b292df73a89e..06ca1c988d3c89 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -11,7 +11,7 @@ import {
 	WorkflowOperationError,
 } from 'n8n-workflow';
 import type { FindManyOptions, ObjectLiteral } from 'typeorm';
-import { LessThanOrEqual } from 'typeorm';
+import { Not, LessThanOrEqual } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 
 import config from '@/config';
@@ -57,6 +57,7 @@ export class WaitTrackerClass {
 			select: ['id', 'waitTill'],
 			where: {
 				waitTill: LessThanOrEqual(new Date(Date.now() + 70000)),
+				status: Not('crashed'),
 			},
 			order: {
 				waitTill: 'ASC',
@@ -127,10 +128,13 @@ export class WaitTrackerClass {
 
 		fullExecutionData.stoppedAt = new Date();
 		fullExecutionData.waitTill = undefined;
+		fullExecutionData.status = 'canceled';
 
 		await Db.collections.Execution.update(
 			executionId,
-			ResponseHelper.flattenExecutionData(fullExecutionData),
+			ResponseHelper.flattenExecutionData({
+				...fullExecutionData,
+			}),
 		);
 
 		return {
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 9f220dd164298a..e24a6b586e3dfc 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -33,6 +33,7 @@ import type {
 	IWorkflowHooksOptionalParameters,
 	IWorkflowSettings,
 	WorkflowExecuteMode,
+	ExecutionStatus,
 } from 'n8n-workflow';
 import {
 	ErrorReporterProxy as ErrorReporter,
@@ -335,16 +336,22 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				// Clone the object except the runData. That one is not supposed
 				// to be send. Because that data got send piece by piece after
 				// each node which finished executing
-				const pushRunData = {
-					...fullRunData,
-					data: {
-						...fullRunData.data,
-						resultData: {
-							...fullRunData.data.resultData,
-							runData: {},
+				// Edit: we now DO send the runData to the UI if mode=manual so that it shows the point of crashes
+				let pushRunData;
+				if (fullRunData.mode === 'manual') {
+					pushRunData = fullRunData;
+				} else {
+					pushRunData = {
+						...fullRunData,
+						data: {
+							...fullRunData.data,
+							resultData: {
+								...fullRunData.data.resultData,
+								runData: {},
+							},
 						},
-					},
-				};
+					};
+				}
 
 				// Push data to editor-ui once workflow finished
 				Logger.debug(`Save execution progress to database for execution ID ${executionId} `, {
@@ -445,6 +452,8 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
 					// Set last executed node so that it may resume on failure
 					fullExecutionData.data.resultData.lastNodeExecuted = nodeName;
 
+					fullExecutionData.status = 'running';
+
 					const flattenedExecutionData = ResponseHelper.flattenExecutionData(fullExecutionData);
 
 					await Db.collections.Execution.update(
@@ -600,6 +609,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						stoppedAt: fullRunData.stoppedAt,
 						workflowData: pristineWorkflowData,
 						waitTill: fullRunData.waitTill,
+						status: fullRunData.status,
 					};
 
 					if (this.retryOf !== undefined) {
@@ -711,7 +721,11 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						}
 					}
 
-					const workflowDidSucceed = !fullRunData.data.resultData.error;
+					const workflowHasCrashed = fullRunData.status === 'crashed';
+					const workflowDidSucceed = !fullRunData.data.resultData.error && !workflowHasCrashed;
+					let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed';
+					if (workflowHasCrashed) workflowStatusFinal = 'crashed';
+
 					if (!workflowDidSucceed) {
 						executeErrorWorkflow(
 							this.workflowData,
@@ -730,6 +744,7 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						stoppedAt: fullRunData.stoppedAt,
 						workflowData: this.workflowData,
 						waitTill: fullRunData.data.waitTill,
+						status: workflowStatusFinal,
 					};
 
 					if (this.retryOf !== undefined) {
@@ -749,6 +764,11 @@ function hookFunctionsSaveWorker(): IWorkflowExecuteHooks {
 						executionData as IExecutionFlattedDb,
 					);
 
+					// For reasons(tm) the execution status is not updated correctly in the first update, so has to be written again (tbd)
+					await Db.collections.Execution.update(this.executionId, {
+						status: executionData.status,
+					});
+
 					if (fullRunData.finished === true && this.retryOf !== undefined) {
 						// If the retry was successful save the reference it on the original execution
 						await Db.collections.Execution.update(this.retryOf, {
@@ -995,6 +1015,7 @@ async function executeWorkflow(
 			mode: 'integrated',
 			startedAt: new Date(),
 			stoppedAt: new Date(),
+			status: 'error',
 		};
 		// When failing, we might not have finished the execution
 		// Therefore, database might not contain finished errors.
@@ -1006,6 +1027,7 @@ async function executeWorkflow(
 			finished: fullRunData.finished ? fullRunData.finished : false,
 			startedAt: fullRunData.startedAt,
 			stoppedAt: fullRunData.stoppedAt,
+			status: fullRunData.status,
 			workflowData,
 		};
 		if (workflowData.id) {
@@ -1048,6 +1070,19 @@ async function executeWorkflow(
 	};
 }
 
+export function setExecutionStatus(status: ExecutionStatus) {
+	if (this.executionId === undefined) {
+		Logger.debug(`Setting execution status "${status}" failed because executionId is undefined`);
+		return;
+	}
+	Logger.debug(`Setting execution status for ${this.executionId} to "${status}"`);
+	ActiveExecutions.getInstance()
+		.setStatus(this.executionId, status)
+		.catch((error) => {
+			Logger.debug(`Setting execution status "${status}" failed: ${error.message}`);
+		});
+}
+
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function sendMessageToUI(source: string, messages: any[]) {
 	const { sessionId } = this;
@@ -1101,6 +1136,7 @@ export async function getBase(
 		currentNodeParameters,
 		executionTimeoutTimestamp,
 		userId,
+		setExecutionStatus,
 	};
 }
 
diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index c4e19b89a56784..958030b51aa38c 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -484,6 +484,7 @@ export function generateFailedExecutionFromError(
 		mode,
 		startedAt: new Date(),
 		stoppedAt: new Date(),
+		status: 'failed',
 	};
 }
 
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 0e0f90bbd4d906..8d61c13723a03c 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -55,6 +55,8 @@ import { initErrorHandling } from '@/ErrorReporting';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 import type { Push } from '@/push';
 import { getPushInstance } from '@/push';
+import { eventBus } from './eventbus';
+import { recoverExecutionDataFromEventLogMessages } from './eventbus/MessageEventBus/recoverEvents';
 
 export class WorkflowRunner {
 	activeExecutions: ActiveExecutions.ActiveExecutions;
@@ -103,8 +105,40 @@ export class WorkflowRunner {
 			mode: executionMode,
 			startedAt,
 			stoppedAt: new Date(),
+			status: 'error',
 		};
 
+		// The following will attempt to recover runData from event logs
+		// Note that this will only work as long as the event logs actually contain the events from this workflow execution
+		// Since processError is run almost immediately after the workflow execution has failed, it is likely that the event logs
+		// does contain those messages.
+		try {
+			// Search for messages for this executionId in event logs
+			const eventLogMessages = await eventBus.getEventsByExecutionId(executionId);
+			// Attempt to recover more better runData from these messages (but don't update the execution db entry yet)
+			if (eventLogMessages.length > 0) {
+				const eventLogExecutionData = await recoverExecutionDataFromEventLogMessages(
+					executionId,
+					eventLogMessages,
+					false,
+				);
+				if (eventLogExecutionData) {
+					fullRunData.data.resultData.runData = eventLogExecutionData.resultData.runData;
+					fullRunData.status = 'crashed';
+				}
+			}
+
+			const executionFlattedData = await Db.collections.Execution.findOneBy({ id: executionId });
+
+			void InternalHooksManager.getInstance().onWorkflowCrashed(
+				executionId,
+				executionMode,
+				executionFlattedData?.workflowData,
+			);
+		} catch {
+			// Ignore errors
+		}
+
 		// Remove from active execution with empty data. That will
 		// set the execution to failed.
 		this.activeExecutions.remove(executionId, fullRunData);
@@ -287,6 +321,10 @@ export class WorkflowRunner {
 				},
 			];
 
+			additionalData.setExecutionStatus = WorkflowExecuteAdditionalData.setExecutionStatus.bind({
+				executionId,
+			});
+
 			additionalData.sendMessageToUI = WorkflowExecuteAdditionalData.sendMessageToUI.bind({
 				sessionId: data.sessionId,
 			});
@@ -354,6 +392,7 @@ export class WorkflowRunner {
 					if (workflowExecution.isCanceled) {
 						fullRunData.finished = false;
 					}
+					fullRunData.status = this.activeExecutions.getStatus(executionId);
 					this.activeExecutions.remove(executionId, fullRunData);
 				})
 				.catch((error) => {
@@ -708,7 +747,7 @@ export class WorkflowRunner {
 				}
 
 				// eslint-disable-next-line @typescript-eslint/await-thenable
-				await this.activeExecutions.remove(message.data.executionId, message.data.result);
+				this.activeExecutions.remove(message.data.executionId, message.data.result);
 			}
 		});
 
@@ -733,7 +772,7 @@ export class WorkflowRunner {
 				);
 				// Process did exit with error code, so something went wrong.
 				const executionError = new WorkflowOperationError(
-					'Workflow execution process did crash for an unknown reason!',
+					'Workflow execution process crashed for an unknown reason!',
 				);
 
 				await this.processError(
@@ -752,7 +791,7 @@ export class WorkflowRunner {
 				// Instead of pending forever as executing when it
 				// actually isn't anymore.
 				// eslint-disable-next-line @typescript-eslint/await-thenable, no-await-in-loop
-				await this.activeExecutions.remove(executionId);
+				this.activeExecutions.remove(executionId);
 			}
 
 			clearTimeout(executionTimeout);
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index 1b8b4246ededbe..b8fd32f773b3d2 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -181,6 +181,9 @@ class WorkflowRunnerProcess {
 
 		additionalData.executionId = inputData.executionId;
 
+		additionalData.setExecutionStatus = WorkflowExecuteAdditionalData.setExecutionStatus.bind({
+			executionId: inputData.executionId,
+		});
 		// eslint-disable-next-line @typescript-eslint/no-explicit-any
 		additionalData.sendMessageToUI = async (source: string, message: any) => {
 			if (workflowRunner.data!.executionMode !== 'manual') {
@@ -487,6 +490,7 @@ process.on('message', async (message: IProcessMessage) => {
 						: ('own' as WorkflowExecuteMode),
 					startedAt: workflowRunner.startedAt,
 					stoppedAt: new Date(),
+					status: 'canceled',
 				};
 
 				// eslint-disable-next-line @typescript-eslint/no-floating-promises
diff --git a/packages/cli/src/commands/Interfaces.d.ts b/packages/cli/src/commands/Interfaces.d.ts
index 9f423b575be054..e06bb83abd4955 100644
--- a/packages/cli/src/commands/Interfaces.d.ts
+++ b/packages/cli/src/commands/Interfaces.d.ts
@@ -46,8 +46,6 @@ interface INodeSpecialCase {
 	keepOnlyProperties?: string[];
 }
 
-type ExecutionStatus = 'success' | 'error' | 'warning' | 'running';
-
 declare module 'json-diff' {
 	interface IDiffOptions {
 		keysOnly?: boolean;
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index d12c7fabd89fcc..897f5211ae2bda 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -618,10 +618,10 @@ export class ExecuteBatch extends BaseCommand {
 					const resultError = data.data.resultData.error;
 					if (resultError) {
 						// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-						executionResult.error = resultError.hasOwnProperty('description')
-							? // @ts-ignore
-							  resultError.description
-							: resultError.message;
+						executionResult.error =
+							resultError.hasOwnProperty('description') && resultError.description !== null
+								? resultError.description
+								: resultError.message;
 						if (data.data.resultData.lastNodeExecuted !== undefined) {
 							executionResult.error += ` on node ${data.data.resultData.lastNodeExecuted}`;
 						}
diff --git a/packages/cli/src/commands/worker.ts b/packages/cli/src/commands/worker.ts
index 66073ed711baf2..87d7b55bffefea 100644
--- a/packages/cli/src/commands/worker.ts
+++ b/packages/cli/src/commands/worker.ts
@@ -5,7 +5,7 @@ import type PCancelable from 'p-cancelable';
 import { flags } from '@oclif/command';
 import { WorkflowExecute } from 'n8n-core';
 
-import type { IExecuteResponsePromiseData, INodeTypes, IRun } from 'n8n-workflow';
+import type { ExecutionStatus, IExecuteResponsePromiseData, INodeTypes, IRun } from 'n8n-workflow';
 import { Workflow, NodeOperationError, LoggerProxy, sleep } from 'n8n-workflow';
 
 import * as Db from '@/Db';
@@ -189,6 +189,11 @@ export class Worker extends BaseCommand {
 
 		additionalData.executionId = executionId;
 
+		additionalData.setExecutionStatus = (status: ExecutionStatus) => {
+			// Can't set the status directly in the queued worker, but it will happen in InternalHook.onWorkflowPostExecute
+			LoggerProxy.debug(`Queued worker execution status for ${executionId} is "${status}"`);
+		};
+
 		let workflowExecute: WorkflowExecute;
 		let workflowRun: PCancelable<IRun>;
 		if (currentExecutionDb.data !== undefined) {
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 3fa9dc0cbbb781..9b91f411fb4eb5 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1150,7 +1150,7 @@ export const schema = {
 			maxFileSizeInKB: {
 				doc: 'Maximum size of an event log file before a new one is started.',
 				format: Number,
-				default: 102400, // 100MB
+				default: 10240, // 10MB
 				env: 'N8N_EVENTBUS_LOGWRITER_MAXFILESIZEINKB',
 			},
 			logBaseName: {
diff --git a/packages/cli/src/databases/entities/ExecutionEntity.ts b/packages/cli/src/databases/entities/ExecutionEntity.ts
index 41891f375c6444..2172f2700366aa 100644
--- a/packages/cli/src/databases/entities/ExecutionEntity.ts
+++ b/packages/cli/src/databases/entities/ExecutionEntity.ts
@@ -1,4 +1,4 @@
-import { WorkflowExecuteMode } from 'n8n-workflow';
+import { ExecutionStatus, WorkflowExecuteMode } from 'n8n-workflow';
 import { Column, Entity, Generated, Index, PrimaryColumn } from 'typeorm';
 import { datetimeColumnType, jsonColumnType } from './AbstractEntity';
 import { IWorkflowDb } from '@/Interfaces';
@@ -31,6 +31,9 @@ export class ExecutionEntity implements IExecutionFlattedDb {
 	@Column({ nullable: true })
 	retrySuccessId: string;
 
+	@Column('varchar', { nullable: true })
+	status: ExecutionStatus;
+
 	@Column(datetimeColumnType)
 	startedAt: Date;
 
diff --git a/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts b/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts
new file mode 100644
index 00000000000000..ef41dc9758ed75
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1674138566000-AddStatusToExecutions.ts
@@ -0,0 +1,24 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class AddStatusToExecutions1674138566000 implements MigrationInterface {
+	name = 'AddStatusToExecutions1674138566000';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			// 'ALTER TABLE `' + tablePrefix + 'execution_entity` ADD COLUMN `status` varchar',
+			`ALTER TABLE \`${tablePrefix}execution_entity\`	ADD COLUMN \`status\` VARCHAR(255)`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(`ALTER TABLE \`${tablePrefix}execution_entity\`	DROP COLUMN \`status\``);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index 2c25db44b15880..af0240b4d20f24 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -31,6 +31,7 @@ import { MessageEventBusDestinations1671535397530 } from './1671535397530-Messag
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
+import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -65,5 +66,6 @@ export const mysqlMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
-	PurgeInvalidWorkflowConnections1675940580449
+	PurgeInvalidWorkflowConnections1675940580449,
+	AddStatusToExecutions1674138566000,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts b/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts
new file mode 100644
index 00000000000000..b8cc0e2b00d43d
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1674138566000-AddStatusToExecutions.ts
@@ -0,0 +1,21 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class AddStatusToExecutions1674138566000 implements MigrationInterface {
+	name = 'AddStatusToExecutions1674138566000';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}execution_entity ADD COLUMN status varchar`);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(`ALTER TABLE ${tablePrefix}execution_entity DROP COLUMN status`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index dde85c808bec72..1c19fa86bc3449 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -29,6 +29,7 @@ import { MessageEventBusDestinations1671535397530 } from './1671535397530-Messag
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
+import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 
 export const postgresMigrations = [
 	InitialMigration1587669153312,
@@ -61,5 +62,6 @@ export const postgresMigrations = [
 	MessageEventBusDestinations1671535397530,
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
-	PurgeInvalidWorkflowConnections1675940580449
+	PurgeInvalidWorkflowConnections1675940580449,
+	AddStatusToExecutions1674138566000,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts b/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts
new file mode 100644
index 00000000000000..b77a57f45e3497
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1674138566000-AddStatusToExecutions.ts
@@ -0,0 +1,23 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class AddStatusToExecutions1674138566000 implements MigrationInterface {
+	name = 'AddStatusToExecutions1674138566000';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`ALTER TABLE \`${tablePrefix}execution_entity\` ADD COLUMN "status" varchar`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(`ALTER TABLE \`${tablePrefix}execution_entity\` DROP COLUMN "status"`);
+	}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 7325893d18f862..01cd22f226ab30 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -28,6 +28,7 @@ import { MessageEventBusDestinations1671535397530 } from './1671535397530-Messag
 import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-DeleteExecutionsWithWorkflows';
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
+import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 
 const sqliteMigrations = [
 	InitialMigration1588102412422,
@@ -60,6 +61,7 @@ const sqliteMigrations = [
 	DeleteExecutionsWithWorkflows1673268682475,
 	CreateLdapEntities1674509946020,
 	PurgeInvalidWorkflowConnections1675940580449,
+	AddStatusToExecutions1674138566000,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
index 0b89bebc0552a0..f71b03a4137556 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessage.ts
@@ -4,6 +4,7 @@ import type { EventMessageTypeNames, JsonObject } from 'n8n-workflow';
 import { v4 as uuid } from 'uuid';
 import type { AbstractEventPayload } from './AbstractEventPayload';
 import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
+import type { EventNamesTypes } from '.';
 
 function modifyUnderscoredKeys(
 	input: { [key: string]: any },
@@ -85,7 +86,7 @@ export abstract class AbstractEventMessage {
 
 	ts: DateTime;
 
-	eventName: string;
+	eventName: EventNamesTypes;
 
 	message: string;
 
diff --git a/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessageOptions.ts b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessageOptions.ts
index 71842e4e30b2ea..95f3ef6432a2ee 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessageOptions.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/AbstractEventMessageOptions.ts
@@ -1,12 +1,13 @@
 import type { DateTime } from 'luxon';
 import type { EventMessageTypeNames } from 'n8n-workflow';
+import type { EventNamesTypes } from '.';
 import type { AbstractEventPayload } from './AbstractEventPayload';
 
 export interface AbstractEventMessageOptions {
 	__type?: EventMessageTypeNames;
 	id?: string;
 	ts?: DateTime | string;
-	eventName: string;
+	eventName: EventNamesTypes;
 	message?: string;
 	payload?: AbstractEventPayload;
 	anonymize?: boolean;
diff --git a/packages/cli/src/eventbus/EventMessageClasses/EventMessageAudit.ts b/packages/cli/src/eventbus/EventMessageClasses/EventMessageAudit.ts
index f34982338289ff..737a1ebf0a2e19 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/EventMessageAudit.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/EventMessageAudit.ts
@@ -1,31 +1,9 @@
 import { AbstractEventMessage, isEventMessageOptionsWithType } from './AbstractEventMessage';
-import type { JsonObject, JsonValue } from 'n8n-workflow';
 import { EventMessageTypeNames } from 'n8n-workflow';
+import type { JsonObject, JsonValue } from 'n8n-workflow';
 import type { AbstractEventPayload } from './AbstractEventPayload';
 import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
-
-export const eventNamesAudit = [
-	'n8n.audit.user.signedup',
-	'n8n.audit.user.updated',
-	'n8n.audit.user.deleted',
-	'n8n.audit.user.invited',
-	'n8n.audit.user.invitation.accepted',
-	'n8n.audit.user.reinvited',
-	'n8n.audit.user.email.failed',
-	'n8n.audit.user.reset.requested',
-	'n8n.audit.user.reset',
-	'n8n.audit.user.credentials.created',
-	'n8n.audit.user.credentials.shared',
-	'n8n.audit.user.api.created',
-	'n8n.audit.user.api.deleted',
-	'n8n.audit.package.installed',
-	'n8n.audit.package.updated',
-	'n8n.audit.package.deleted',
-	'n8n.audit.workflow.created',
-	'n8n.audit.workflow.deleted',
-	'n8n.audit.workflow.updated',
-] as const;
-export type EventNamesAuditType = (typeof eventNamesAudit)[number];
+import type { EventNamesAuditType } from '.';
 
 // --------------------------------------
 // EventMessage class for Audit events
diff --git a/packages/cli/src/eventbus/EventMessageClasses/EventMessageNode.ts b/packages/cli/src/eventbus/EventMessageClasses/EventMessageNode.ts
index 072aafaa4330db..d9dda95e27b89e 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/EventMessageNode.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/EventMessageNode.ts
@@ -3,9 +3,7 @@ import type { JsonObject } from 'n8n-workflow';
 import { EventMessageTypeNames } from 'n8n-workflow';
 import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
 import type { AbstractEventPayload } from './AbstractEventPayload';
-
-export const eventNamesNode = ['n8n.node.started', 'n8n.node.finished'] as const;
-export type EventNamesNodeType = (typeof eventNamesNode)[number];
+import type { EventNamesNodeType } from '.';
 
 // --------------------------------------
 // EventMessage class for Node events
diff --git a/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts b/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts
index 71acfd85ab6c98..41cb442e395bd6 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/EventMessageWorkflow.ts
@@ -4,14 +4,7 @@ import { EventMessageTypeNames } from 'n8n-workflow';
 import type { AbstractEventMessageOptions } from './AbstractEventMessageOptions';
 import type { AbstractEventPayload } from './AbstractEventPayload';
 import type { IExecutionBase } from '@/Interfaces';
-
-export const eventNamesWorkflow = [
-	'n8n.workflow.started',
-	'n8n.workflow.success',
-	'n8n.workflow.failed',
-] as const;
-
-export type EventNamesWorkflowType = (typeof eventNamesWorkflow)[number];
+import type { EventNamesWorkflowType } from '.';
 
 // --------------------------------------
 // EventMessage class for Workflow events
diff --git a/packages/cli/src/eventbus/EventMessageClasses/index.ts b/packages/cli/src/eventbus/EventMessageClasses/index.ts
index f49e1ae4f3301a..508b5031cfa567 100644
--- a/packages/cli/src/eventbus/EventMessageClasses/index.ts
+++ b/packages/cli/src/eventbus/EventMessageClasses/index.ts
@@ -1,12 +1,47 @@
-import type { EventMessageAudit, EventNamesAuditType } from './EventMessageAudit';
-import { eventNamesAudit } from './EventMessageAudit';
+import type { EventMessageAudit } from './EventMessageAudit';
 import type { EventMessageGeneric } from './EventMessageGeneric';
-import type { EventMessageNode, EventNamesNodeType } from './EventMessageNode';
-import { eventNamesNode } from './EventMessageNode';
-import type { EventMessageWorkflow, EventNamesWorkflowType } from './EventMessageWorkflow';
-import { eventNamesWorkflow } from './EventMessageWorkflow';
+import type { EventMessageNode } from './EventMessageNode';
+import type { EventMessageWorkflow } from './EventMessageWorkflow';
+
+export const eventNamesWorkflow = [
+	'n8n.workflow.started',
+	'n8n.workflow.success',
+	'n8n.workflow.failed',
+	'n8n.workflow.crashed',
+] as const;
+export const eventNamesNode = ['n8n.node.started', 'n8n.node.finished'] as const;
+export const eventNamesAudit = [
+	'n8n.audit.user.signedup',
+	'n8n.audit.user.updated',
+	'n8n.audit.user.deleted',
+	'n8n.audit.user.invited',
+	'n8n.audit.user.invitation.accepted',
+	'n8n.audit.user.reinvited',
+	'n8n.audit.user.email.failed',
+	'n8n.audit.user.reset.requested',
+	'n8n.audit.user.reset',
+	'n8n.audit.user.credentials.created',
+	'n8n.audit.user.credentials.shared',
+	'n8n.audit.user.api.created',
+	'n8n.audit.user.api.deleted',
+	'n8n.audit.package.installed',
+	'n8n.audit.package.updated',
+	'n8n.audit.package.deleted',
+	'n8n.audit.workflow.created',
+	'n8n.audit.workflow.deleted',
+	'n8n.audit.workflow.updated',
+] as const;
+
+export type EventNamesWorkflowType = (typeof eventNamesWorkflow)[number];
+export type EventNamesAuditType = (typeof eventNamesAudit)[number];
+export type EventNamesNodeType = (typeof eventNamesNode)[number];
+
+export type EventNamesTypes =
+	| EventNamesAuditType
+	| EventNamesWorkflowType
+	| EventNamesNodeType
+	| 'n8n.destination.test';
 
-export type EventNamesTypes = EventNamesAuditType | EventNamesWorkflowType | EventNamesNodeType;
 export const eventNamesAll = [...eventNamesAudit, ...eventNamesWorkflow, ...eventNamesNode];
 
 export type EventMessageTypes =
diff --git a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
index 3956c373af3c4d..439e4773e6a2f5 100644
--- a/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/MessageEventBus.ts
@@ -1,5 +1,5 @@
-import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import { LoggerProxy } from 'n8n-workflow';
+import type { MessageEventBusDestinationOptions } from 'n8n-workflow';
 import type { DeleteResult } from 'typeorm';
 import type { EventMessageTypes } from '../EventMessageClasses/';
 import type { MessageEventBusDestination } from '../MessageEventBusDestination/MessageEventBusDestination.ee';
@@ -24,10 +24,16 @@ import {
 	EventMessageGeneric,
 	eventMessageGenericDestinationTestEvent,
 } from '../EventMessageClasses/EventMessageGeneric';
+import { recoverExecutionDataFromEventLogMessages } from './recoverEvents';
 
 export type EventMessageReturnMode = 'sent' | 'unsent' | 'all' | 'unfinished';
 
-class MessageEventBus extends EventEmitter {
+export interface MessageWithCallback {
+	msg: EventMessageTypes;
+	confirmCallback: (message: EventMessageTypes, src: EventMessageConfirmSource) => void;
+}
+
+export class MessageEventBus extends EventEmitter {
 	private static instance: MessageEventBus;
 
 	isInitialized: boolean;
@@ -71,12 +77,13 @@ class MessageEventBus extends EventEmitter {
 		if (savedEventDestinations.length > 0) {
 			for (const destinationData of savedEventDestinations) {
 				try {
-					const destination = messageEventBusDestinationFromDb(destinationData);
+					const destination = messageEventBusDestinationFromDb(this, destinationData);
 					if (destination) {
 						await this.addDestination(destination);
 					}
 				} catch (error) {
-					console.log(error);
+					// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+					if (error.message) LoggerProxy.debug(error.message as string);
 				}
 			}
 		}
@@ -96,9 +103,13 @@ class MessageEventBus extends EventEmitter {
 		this.logWriter?.startLogging();
 		await this.send(unsentAndUnfinished.unsentMessages);
 
-		if (unsentAndUnfinished.unfinishedExecutions.size > 0) {
-			for (const executionId of unsentAndUnfinished.unfinishedExecutions) {
-				LoggerProxy.debug(`Found unfinished execution ${executionId} in event log(s)`);
+		if (Object.keys(unsentAndUnfinished.unfinishedExecutions).length > 0) {
+			for (const executionId of Object.keys(unsentAndUnfinished.unfinishedExecutions)) {
+				await recoverExecutionDataFromEventLogMessages(
+					executionId,
+					unsentAndUnfinished.unfinishedExecutions[executionId],
+					true,
+				);
 			}
 		}
 
@@ -181,12 +192,15 @@ class MessageEventBus extends EventEmitter {
 	}
 
 	async testDestination(destinationId: string): Promise<boolean> {
-		const testMessage = new EventMessageGeneric({
+		const msg = new EventMessageGeneric({
 			eventName: eventMessageGenericDestinationTestEvent,
 		});
 		const destination = await this.findDestination(destinationId);
 		if (destination.length > 0) {
-			const sendResult = await this.destinations[destinationId].receiveFromEventBus(testMessage);
+			const sendResult = await this.destinations[destinationId].receiveFromEventBus({
+				msg,
+				confirmCallback: () => this.confirmSent(msg, { id: '0', name: 'eventBus' }),
+			});
 			return sendResult;
 		}
 		return false;
@@ -212,17 +226,21 @@ class MessageEventBus extends EventEmitter {
 
 		// generic emit for external modules to capture events
 		// this is for internal use ONLY and not for use with custom destinations!
-		this.emit('message', msg);
-
-		// LoggerProxy.debug(`Listeners: ${this.eventNames().join(',')}`);
+		this.emitMessageWithCallback('message', msg);
 
 		if (this.shouldSendMsg(msg)) {
 			for (const destinationName of Object.keys(this.destinations)) {
-				this.emit(this.destinations[destinationName].getId(), msg);
+				this.emitMessageWithCallback(this.destinations[destinationName].getId(), msg);
 			}
 		}
 	}
 
+	private emitMessageWithCallback(eventName: string, msg: EventMessageTypes): boolean {
+		const confirmCallback = (message: EventMessageTypes, src: EventMessageConfirmSource) =>
+			this.confirmSent(message, src);
+		return this.emit(eventName, msg, confirmCallback);
+	}
+
 	shouldSendMsg(msg: EventMessageTypes): boolean {
 		return (
 			isLogStreamingEnabled() &&
@@ -249,14 +267,14 @@ class MessageEventBus extends EventEmitter {
 		return filtered;
 	}
 
-	async getUnfinishedExecutions(): Promise<Set<string>> {
+	async getUnfinishedExecutions(): Promise<Record<string, EventMessageTypes[]>> {
 		const queryResult = await this.logWriter?.getUnfinishedExecutions();
 		return queryResult;
 	}
 
 	async getUnsentAndUnfinishedExecutions(): Promise<{
 		unsentMessages: EventMessageTypes[];
-		unfinishedExecutions: Set<string>;
+		unfinishedExecutions: Record<string, EventMessageTypes[]>;
 	}> {
 		const queryResult = await this.logWriter?.getUnsentAndUnfinishedExecutions();
 		return queryResult;
diff --git a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
new file mode 100644
index 00000000000000..3647c888ecf5dd
--- /dev/null
+++ b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
@@ -0,0 +1,190 @@
+import { parse, stringify } from 'flatted';
+import type { IRun, IRunExecutionData, ITaskData } from 'n8n-workflow';
+import { NodeOperationError, WorkflowOperationError } from 'n8n-workflow';
+import * as Db from '@/Db';
+import type { EventMessageTypes, EventNamesTypes } from '../EventMessageClasses';
+import type { DateTime } from 'luxon';
+import { InternalHooksManager } from '../../InternalHooksManager';
+import { getPushInstance } from '@/push';
+import type { IPushDataExecutionRecovered } from '../../Interfaces';
+import { workflowExecutionCompleted } from '../../events/WorkflowStatistics';
+import { eventBus } from './MessageEventBus';
+
+export async function recoverExecutionDataFromEventLogMessages(
+	executionId: string,
+	messages: EventMessageTypes[],
+	applyToDb = true,
+): Promise<IRunExecutionData | undefined> {
+	const executionEntry = await Db.collections.Execution.findOne({
+		where: {
+			id: executionId,
+		},
+	});
+
+	if (executionEntry && messages) {
+		let executionData: IRunExecutionData | undefined;
+		let workflowError: WorkflowOperationError | undefined;
+		try {
+			executionData = parse(executionEntry.data) as IRunExecutionData;
+		} catch {}
+		if (!executionData) {
+			executionData = { resultData: { runData: {} } };
+		}
+		let nodeNames: string[] = [];
+		if (
+			executionData?.resultData?.runData &&
+			Object.keys(executionData.resultData.runData).length > 0
+		) {
+		} else {
+			if (!executionData.resultData) {
+				executionData.resultData = {
+					runData: {},
+				};
+			} else {
+				if (!executionData.resultData.runData) {
+					executionData.resultData.runData = {};
+				}
+			}
+		}
+		nodeNames = executionEntry.workflowData.nodes.map((n) => n.name);
+
+		let lastNodeRunTimestamp: DateTime | undefined = undefined;
+
+		for (const nodeName of nodeNames) {
+			const nodeByName = executionEntry?.workflowData.nodes.find((n) => n.name === nodeName);
+
+			if (!nodeByName) continue;
+
+			const nodeStartedMessage = messages.find(
+				(message) =>
+					message.eventName === 'n8n.node.started' && message.payload.nodeName === nodeName,
+			);
+			const nodeFinishedMessage = messages.find(
+				(message) =>
+					message.eventName === 'n8n.node.finished' && message.payload.nodeName === nodeName,
+			);
+
+			const executionTime =
+				nodeStartedMessage && nodeFinishedMessage
+					? nodeFinishedMessage.ts.diff(nodeStartedMessage.ts).toMillis()
+					: 0;
+
+			let taskData: ITaskData;
+			if (executionData.resultData.runData[nodeName]?.length > 0) {
+				taskData = executionData.resultData.runData[nodeName][0];
+			} else {
+				taskData = {
+					startTime: nodeStartedMessage ? nodeStartedMessage.ts.toUnixInteger() : 0,
+					executionTime,
+					source: [null],
+					executionStatus: 'unknown',
+				};
+			}
+
+			if (nodeStartedMessage && !nodeFinishedMessage) {
+				const nodeError = new NodeOperationError(
+					nodeByName,
+					'Node crashed, possible out-of-memory issue',
+					{
+						message: 'Execution stopped at this node',
+						description:
+							"n8n may have run out of memory while executing it. More context and tips on how to avoid this <a href='https://docs.n8n.io/flow-logic/error-handling/memory-errors' target='_blank'>in the docs</a>",
+					},
+				);
+				workflowError = new WorkflowOperationError(
+					'Workflow did not finish, possible out-of-memory issue',
+				);
+				taskData.error = nodeError;
+				taskData.executionStatus = 'crashed';
+				executionData.resultData.lastNodeExecuted = nodeName;
+				if (nodeStartedMessage) lastNodeRunTimestamp = nodeStartedMessage.ts;
+			} else if (nodeStartedMessage && nodeFinishedMessage) {
+				taskData.executionStatus = 'success';
+				if (taskData.data === undefined) {
+					taskData.data = {
+						main: [
+							[
+								{
+									json: {
+										isArtificalRecoveredEventItem: true,
+									},
+									pairedItem: undefined,
+								},
+							],
+						],
+					};
+				}
+			}
+
+			if (!executionData.resultData.runData[nodeName]) {
+				executionData.resultData.runData[nodeName] = [taskData];
+			}
+		}
+
+		if (!executionData.resultData.error && workflowError) {
+			executionData.resultData.error = workflowError;
+		}
+		if (!lastNodeRunTimestamp) {
+			const workflowEndedMessage = messages.find((message) =>
+				(
+					[
+						'n8n.workflow.success',
+						'n8n.workflow.crashed',
+						'n8n.workflow.failed',
+					] as EventNamesTypes[]
+				).includes(message.eventName),
+			);
+			if (workflowEndedMessage) {
+				lastNodeRunTimestamp = workflowEndedMessage.ts;
+			} else {
+				const workflowStartedMessage = messages.find(
+					(message) => message.eventName === 'n8n.workflow.started',
+				);
+				if (workflowStartedMessage) {
+					lastNodeRunTimestamp = workflowStartedMessage.ts;
+				}
+			}
+		}
+		if (applyToDb) {
+			await Db.collections.Execution.update(executionId, {
+				data: stringify(executionData),
+				status: 'crashed',
+				stoppedAt: lastNodeRunTimestamp?.toJSDate(),
+			});
+			const internalHooks = InternalHooksManager.getInstance();
+			await internalHooks.onWorkflowPostExecute(executionId, executionEntry.workflowData, {
+				data: executionData,
+				finished: false,
+				mode: executionEntry.mode,
+				waitTill: executionEntry.waitTill ?? undefined,
+				startedAt: executionEntry.startedAt,
+				stoppedAt: lastNodeRunTimestamp?.toJSDate(),
+				status: 'crashed',
+			});
+			const iRunData: IRun = {
+				data: executionData,
+				finished: false,
+				mode: executionEntry.mode,
+				waitTill: executionEntry.waitTill ?? undefined,
+				startedAt: executionEntry.startedAt,
+				stoppedAt: lastNodeRunTimestamp?.toJSDate(),
+				status: 'crashed',
+			};
+
+			// calling workflowExecutionCompleted directly because the eventEmitter is not up yet at this point
+			await workflowExecutionCompleted(executionEntry.workflowData, iRunData);
+
+			// wait for UI to be back up and send the execution data
+			eventBus.once('editorUiConnected', function handleUiBackUp() {
+				// add a small timeout to make sure the UI is back up
+				setTimeout(() => {
+					getPushInstance().send('executionRecovered', {
+						executionId,
+					} as IPushDataExecutionRecovered);
+				}, 1000);
+			});
+		}
+		return executionData;
+	}
+	return;
+}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts
index a262468aaebdf6..301c38c2136241 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/Helpers.ee.ts
@@ -1,5 +1,4 @@
-/* eslint-disable import/no-cycle */
-import type { EventDestinations } from '@db/entities/MessageEventBusDestinationEntity';
+import type { EventDestinations } from '@/databases/entities/MessageEventBusDestinationEntity';
 import { promClient } from '@/metrics';
 import {
 	EventMessageTypeNames,
@@ -12,21 +11,23 @@ import type { MessageEventBusDestination } from './MessageEventBusDestination.ee
 import { MessageEventBusDestinationSentry } from './MessageEventBusDestinationSentry.ee';
 import { MessageEventBusDestinationSyslog } from './MessageEventBusDestinationSyslog.ee';
 import { MessageEventBusDestinationWebhook } from './MessageEventBusDestinationWebhook.ee';
+import type { MessageEventBus } from '../MessageEventBus/MessageEventBus';
 
 export function messageEventBusDestinationFromDb(
+	eventBusInstance: MessageEventBus,
 	dbData: EventDestinations,
 ): MessageEventBusDestination | null {
 	const destinationData = dbData.destination;
 	if ('__type' in destinationData) {
 		switch (destinationData.__type) {
 			case MessageEventBusDestinationTypeNames.sentry:
-				return MessageEventBusDestinationSentry.deserialize(destinationData);
+				return MessageEventBusDestinationSentry.deserialize(eventBusInstance, destinationData);
 			case MessageEventBusDestinationTypeNames.syslog:
-				return MessageEventBusDestinationSyslog.deserialize(destinationData);
+				return MessageEventBusDestinationSyslog.deserialize(eventBusInstance, destinationData);
 			case MessageEventBusDestinationTypeNames.webhook:
-				return MessageEventBusDestinationWebhook.deserialize(destinationData);
+				return MessageEventBusDestinationWebhook.deserialize(eventBusInstance, destinationData);
 			default:
-				console.log('MessageEventBusDestination __type unknown');
+				LoggerProxy.debug('MessageEventBusDestination __type unknown');
 		}
 	}
 	return null;
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
index bd04cbedcd6f46..0a5117b00b73ed 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestination.ee.ts
@@ -4,14 +4,17 @@ import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import * as Db from '@/Db';
 import type { AbstractEventMessage } from '../EventMessageClasses/AbstractEventMessage';
 import type { EventMessageTypes } from '../EventMessageClasses';
-import { eventBus } from '..';
 import type { DeleteResult, InsertResult } from 'typeorm';
+import type { EventMessageConfirmSource } from '../EventMessageClasses/EventMessageConfirm';
+import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export abstract class MessageEventBusDestination implements MessageEventBusDestinationOptions {
 	// Since you can't have static abstract functions - this just serves as a reminder that you need to implement these. Please.
 	// static abstract deserialize(): MessageEventBusDestination | null;
 	readonly id: string;
 
+	readonly eventBusInstance: MessageEventBus;
+
 	__type: MessageEventBusDestinationTypeNames;
 
 	label: string;
@@ -24,7 +27,8 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 
 	anonymizeAuditMessages: boolean;
 
-	constructor(options: MessageEventBusDestinationOptions) {
+	constructor(eventBusInstance: MessageEventBus, options: MessageEventBusDestinationOptions) {
+		this.eventBusInstance = eventBusInstance;
 		this.id = !options.id || options.id.length !== 36 ? uuid() : options.id;
 		this.__type = options.__type ?? MessageEventBusDestinationTypeNames.abstract;
 		this.label = options.label ?? 'Log Destination';
@@ -37,15 +41,21 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 
 	startListening() {
 		if (this.enabled) {
-			eventBus.on(this.getId(), async (msg: EventMessageTypes) => {
-				await this.receiveFromEventBus(msg);
-			});
+			this.eventBusInstance.on(
+				this.getId(),
+				async (
+					msg: EventMessageTypes,
+					confirmCallback: (message: EventMessageTypes, src: EventMessageConfirmSource) => void,
+				) => {
+					await this.receiveFromEventBus({ msg, confirmCallback });
+				},
+			);
 			LoggerProxy.debug(`${this.id} listener started`);
 		}
 	}
 
 	stopListening() {
-		eventBus.removeAllListeners(this.getId());
+		this.eventBusInstance.removeAllListeners(this.getId());
 	}
 
 	enable() {
@@ -81,7 +91,6 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 			skipUpdateIfNoValuesChanged: true,
 			conflictPaths: ['id'],
 		});
-		Db.collections.EventDestinations.createQueryBuilder().insert().into('something').onConflict('');
 		return dbResult;
 	}
 
@@ -105,7 +114,7 @@ export abstract class MessageEventBusDestination implements MessageEventBusDesti
 		};
 	}
 
-	abstract receiveFromEventBus(msg: AbstractEventMessage): Promise<boolean>;
+	abstract receiveFromEventBus(emitterPayload: MessageWithCallback): Promise<boolean>;
 
 	toString() {
 		return JSON.stringify(this.serialize());
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
index 4d515a83cc0a63..ab1c4ca379516c 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee.ts
@@ -3,16 +3,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import * as Sentry from '@sentry/node';
-import { eventBus } from '../MessageEventBus/MessageEventBus';
+import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSentryOptions,
 } from 'n8n-workflow';
-import { MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
-import type { EventMessageTypes } from '../EventMessageClasses';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
 import { N8N_VERSION } from '@/constants';
+import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export const isMessageEventBusDestinationSentryOptions = (
 	candidate: unknown,
@@ -34,8 +33,8 @@ export class MessageEventBusDestinationSentry
 
 	sentryClient?: Sentry.NodeClient;
 
-	constructor(options: MessageEventBusDestinationSentryOptions) {
-		super(options);
+	constructor(eventBusInstance: MessageEventBus, options: MessageEventBusDestinationSentryOptions) {
+		super(eventBusInstance, options);
 		this.label = options.label ?? 'Sentry DSN';
 		this.__type = options.__type ?? MessageEventBusDestinationTypeNames.sentry;
 		this.dsn = options.dsn;
@@ -54,7 +53,8 @@ export class MessageEventBusDestinationSentry
 		});
 	}
 
-	async receiveFromEventBus(msg: EventMessageTypes): Promise<boolean> {
+	async receiveFromEventBus(emitterPayload: MessageWithCallback): Promise<boolean> {
+		const { msg, confirmCallback } = emitterPayload;
 		let sendResult = false;
 		if (!this.sentryClient) return sendResult;
 		if (msg.eventName !== eventMessageGenericDestinationTestEvent) {
@@ -84,11 +84,12 @@ export class MessageEventBusDestinationSentry
 			);
 
 			if (sentryResult) {
-				eventBus.confirmSent(msg, { id: this.id, name: this.label });
+				// eventBus.confirmSent(msg, { id: this.id, name: this.label });
+				confirmCallback(msg, { id: this.id, name: this.label });
 				sendResult = true;
 			}
 		} catch (error) {
-			console.log(error);
+			if (error.message) LoggerProxy.debug(error.message as string);
 		}
 		return sendResult;
 	}
@@ -104,6 +105,7 @@ export class MessageEventBusDestinationSentry
 	}
 
 	static deserialize(
+		eventBusInstance: MessageEventBus,
 		data: MessageEventBusDestinationOptions,
 	): MessageEventBusDestinationSentry | null {
 		if (
@@ -111,7 +113,7 @@ export class MessageEventBusDestinationSentry
 			data.__type === MessageEventBusDestinationTypeNames.sentry &&
 			isMessageEventBusDestinationSentryOptions(data)
 		) {
-			return new MessageEventBusDestinationSentry(data);
+			return new MessageEventBusDestinationSentry(eventBusInstance, data);
 		}
 		return null;
 	}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
index fe7983abc895ca..13d6a1636c5ed3 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationSyslog.ee.ts
@@ -2,7 +2,6 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import syslog from 'syslog-client';
-import { eventBus } from '../MessageEventBus/MessageEventBus';
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationSyslogOptions,
@@ -10,8 +9,8 @@ import type {
 import { LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
-import type { EventMessageTypes } from '../EventMessageClasses';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
+import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export const isMessageEventBusDestinationSyslogOptions = (
 	candidate: unknown,
@@ -41,8 +40,8 @@ export class MessageEventBusDestinationSyslog
 
 	eol: string;
 
-	constructor(options: MessageEventBusDestinationSyslogOptions) {
-		super(options);
+	constructor(eventBusInstance: MessageEventBus, options: MessageEventBusDestinationSyslogOptions) {
+		super(eventBusInstance, options);
 		this.__type = options.__type ?? MessageEventBusDestinationTypeNames.syslog;
 		this.label = options.label ?? 'Syslog Server';
 
@@ -70,7 +69,8 @@ export class MessageEventBusDestinationSyslog
 		});
 	}
 
-	async receiveFromEventBus(msg: EventMessageTypes): Promise<boolean> {
+	async receiveFromEventBus(emitterPayload: MessageWithCallback): Promise<boolean> {
+		const { msg, confirmCallback } = emitterPayload;
 		let sendResult = false;
 		if (msg.eventName !== eventMessageGenericDestinationTestEvent) {
 			if (!isLogStreamingEnabled()) return sendResult;
@@ -92,16 +92,17 @@ export class MessageEventBusDestinationSyslog
 					timestamp: msg.ts.toJSDate(),
 				},
 				async (error) => {
-					if (error) {
-						console.log(error);
+					if (error?.message) {
+						LoggerProxy.debug(error.message);
 					} else {
-						eventBus.confirmSent(msg, { id: this.id, name: this.label });
+						// eventBus.confirmSent(msg, { id: this.id, name: this.label });
+						confirmCallback(msg, { id: this.id, name: this.label });
 						sendResult = true;
 					}
 				},
 			);
 		} catch (error) {
-			console.log(error);
+			if (error.message) LoggerProxy.debug(error.message as string);
 		}
 		if (msg.eventName === eventMessageGenericDestinationTestEvent) {
 			await new Promise((resolve) => setTimeout(resolve, 500));
@@ -124,6 +125,7 @@ export class MessageEventBusDestinationSyslog
 	}
 
 	static deserialize(
+		eventBusInstance: MessageEventBus,
 		data: MessageEventBusDestinationOptions,
 	): MessageEventBusDestinationSyslog | null {
 		if (
@@ -131,7 +133,7 @@ export class MessageEventBusDestinationSyslog
 			data.__type === MessageEventBusDestinationTypeNames.syslog &&
 			isMessageEventBusDestinationSyslogOptions(data)
 		) {
-			return new MessageEventBusDestinationSyslog(data);
+			return new MessageEventBusDestinationSyslog(eventBusInstance, data);
 		}
 		return null;
 	}
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
index 7cfee04af68614..95dcd340d67031 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
@@ -1,4 +1,3 @@
-/* eslint-disable import/no-cycle */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-return */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
@@ -6,23 +5,22 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
 import { MessageEventBusDestination } from './MessageEventBusDestination.ee';
-import type { AxiosRequestConfig, Method } from 'axios';
 import axios from 'axios';
-import { eventBus } from '../MessageEventBus/MessageEventBus';
-import type { EventMessageTypes } from '../EventMessageClasses';
+import type { AxiosRequestConfig, Method } from 'axios';
+import { jsonParse, LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import type {
 	MessageEventBusDestinationOptions,
 	MessageEventBusDestinationWebhookOptions,
 	MessageEventBusDestinationWebhookParameterItem,
 	MessageEventBusDestinationWebhookParameterOptions,
 } from 'n8n-workflow';
-import { jsonParse, LoggerProxy, MessageEventBusDestinationTypeNames } from 'n8n-workflow';
 import { CredentialsHelper } from '@/CredentialsHelper';
 import { UserSettings } from 'n8n-core';
 import { Agent as HTTPSAgent } from 'https';
 import config from '@/config';
 import { isLogStreamingEnabled } from '../MessageEventBus/MessageEventBusHelper';
 import { eventMessageGenericDestinationTestEvent } from '../EventMessageClasses/EventMessageGeneric';
+import type { MessageEventBus, MessageWithCallback } from '../MessageEventBus/MessageEventBus';
 
 export const isMessageEventBusDestinationWebhookOptions = (
 	candidate: unknown,
@@ -74,8 +72,11 @@ export class MessageEventBusDestinationWebhook
 
 	axiosRequestOptions: AxiosRequestConfig;
 
-	constructor(options: MessageEventBusDestinationWebhookOptions) {
-		super(options);
+	constructor(
+		eventBusInstance: MessageEventBus,
+		options: MessageEventBusDestinationWebhookOptions,
+	) {
+		super(eventBusInstance, options);
 		this.url = options.url;
 		this.label = options.label ?? 'Webhook Endpoint';
 		this.__type = options.__type ?? MessageEventBusDestinationTypeNames.webhook;
@@ -246,6 +247,7 @@ export class MessageEventBusDestinationWebhook
 	}
 
 	static deserialize(
+		eventBusInstance: MessageEventBus,
 		data: MessageEventBusDestinationOptions,
 	): MessageEventBusDestinationWebhook | null {
 		if (
@@ -253,12 +255,13 @@ export class MessageEventBusDestinationWebhook
 			data.__type === MessageEventBusDestinationTypeNames.webhook &&
 			isMessageEventBusDestinationWebhookOptions(data)
 		) {
-			return new MessageEventBusDestinationWebhook(data);
+			return new MessageEventBusDestinationWebhook(eventBusInstance, data);
 		}
 		return null;
 	}
 
-	async receiveFromEventBus(msg: EventMessageTypes): Promise<boolean> {
+	async receiveFromEventBus(emitterPayload: MessageWithCallback): Promise<boolean> {
+		const { msg, confirmCallback } = emitterPayload;
 		let sendResult = false;
 		if (msg.eventName !== eventMessageGenericDestinationTestEvent) {
 			if (!isLogStreamingEnabled()) return sendResult;
@@ -345,13 +348,13 @@ export class MessageEventBusDestinationWebhook
 			if (requestResponse) {
 				if (this.responseCodeMustMatch) {
 					if (requestResponse.status === this.expectedStatusCode) {
-						eventBus.confirmSent(msg, { id: this.id, name: this.label });
+						confirmCallback(msg, { id: this.id, name: this.label });
 						sendResult = true;
 					} else {
 						sendResult = false;
 					}
 				} else {
-					eventBus.confirmSent(msg, { id: this.id, name: this.label });
+					confirmCallback(msg, { id: this.id, name: this.label });
 					sendResult = true;
 				}
 			}
diff --git a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
index 44e76339f2fb77..c8dc5f74ba5930 100644
--- a/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
+++ b/packages/cli/src/eventbus/MessageEventBusWriter/MessageEventBusLogWriter.ts
@@ -36,7 +36,7 @@ export interface MessageEventBusLogWriterOptions {
 interface ReadMessagesFromLogFileResult {
 	loggedMessages: EventMessageTypes[];
 	sentMessages: EventMessageTypes[];
-	unfinishedExecutions: Set<string>;
+	unfinishedExecutions: Record<string, EventMessageTypes[]>;
 }
 
 /**
@@ -156,7 +156,7 @@ export class MessageEventBusLogWriter {
 		const results: ReadMessagesFromLogFileResult = {
 			loggedMessages: [],
 			sentMessages: [],
-			unfinishedExecutions: new Set<string>(),
+			unfinishedExecutions: {},
 		};
 		const logCount = logHistory
 			? Math.min(config.get('eventBus.logWriter.keepLogCount') as number, logHistory)
@@ -188,14 +188,28 @@ export class MessageEventBusLogWriter {
 						if (isEventMessageOptions(json) && json.__type !== undefined) {
 							const msg = getEventMessageObjectByType(json);
 							if (msg !== null) results.loggedMessages.push(msg);
-							if (msg?.eventName === 'n8n.workflow.started' && msg?.payload?.executionId) {
-								results.unfinishedExecutions.add(msg?.payload?.executionId as string);
-							} else if (
-								(msg?.eventName === 'n8n.workflow.success' ||
-									msg?.eventName === 'n8n.workflow.failed') &&
-								msg?.payload?.executionId
-							) {
-								results.unfinishedExecutions.delete(msg?.payload?.executionId as string);
+							if (msg?.eventName && msg.payload?.executionId) {
+								const executionId = msg.payload.executionId as string;
+								switch (msg.eventName) {
+									case 'n8n.workflow.started':
+										if (!Object.keys(results.unfinishedExecutions).includes(executionId)) {
+											results.unfinishedExecutions[executionId] = [];
+										}
+										results.unfinishedExecutions[executionId] = [msg];
+										break;
+									case 'n8n.workflow.success':
+									case 'n8n.workflow.failed':
+									case 'n8n.workflow.crashed':
+										delete results.unfinishedExecutions[executionId];
+										break;
+									case 'n8n.node.started':
+									case 'n8n.node.finished':
+										if (!Object.keys(results.unfinishedExecutions).includes(executionId)) {
+											results.unfinishedExecutions[executionId] = [];
+										}
+										results.unfinishedExecutions[executionId].push(msg);
+										break;
+								}
 							}
 						}
 						if (isEventMessageConfirm(json) && mode !== 'all') {
@@ -204,9 +218,10 @@ export class MessageEventBusLogWriter {
 								results.sentMessages.push(...removedMessage);
 							}
 						}
-					} catch {
+					} catch (error) {
 						LoggerProxy.error(
-							`Error reading line messages from file: ${logFileName}, line: ${line}`,
+							// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+							`Error reading line messages from file: ${logFileName}, line: ${line}, ${error.message}}`,
 						);
 					}
 				});
@@ -301,13 +316,13 @@ export class MessageEventBusLogWriter {
 		return (await this.getMessages('unsent')).loggedMessages;
 	}
 
-	async getUnfinishedExecutions(): Promise<Set<string>> {
+	async getUnfinishedExecutions(): Promise<Record<string, EventMessageTypes[]>> {
 		return (await this.getMessages('unfinished')).unfinishedExecutions;
 	}
 
 	async getUnsentAndUnfinishedExecutions(): Promise<{
 		unsentMessages: EventMessageTypes[];
-		unfinishedExecutions: Set<string>;
+		unfinishedExecutions: Record<string, EventMessageTypes[]>;
 	}> {
 		const result = await this.getMessages('unsent');
 		return {
diff --git a/packages/cli/src/eventbus/eventBusRoutes.ts b/packages/cli/src/eventbus/eventBusRoutes.ts
index bf30e295f04cf8..26d76e6c398e57 100644
--- a/packages/cli/src/eventbus/eventBusRoutes.ts
+++ b/packages/cli/src/eventbus/eventBusRoutes.ts
@@ -30,6 +30,7 @@ import type { User } from '../databases/entities/User';
 import * as ResponseHelper from '@/ResponseHelper';
 import type { EventMessageNodeOptions } from './EventMessageClasses/EventMessageNode';
 import { EventMessageNode } from './EventMessageClasses/EventMessageNode';
+import { recoverExecutionDataFromEventLogMessages } from './MessageEventBus/recoverEvents';
 
 export const eventBusRouter = express.Router();
 
@@ -102,6 +103,32 @@ eventBusRouter.get(
 	}),
 );
 
+eventBusRouter.get(
+	'/execution-recover/:id',
+	ResponseHelper.send(async (req: express.Request): Promise<any> => {
+		if (req.params?.id) {
+			let logHistory;
+			let applyToDb = true;
+			if (req.query?.logHistory) {
+				logHistory = parseInt(req.query.logHistory as string, 10);
+			}
+			if (req.query?.applyToDb) {
+				applyToDb = !!req.query.applyToDb;
+			}
+			const messages = await eventBus.getEventsByExecutionId(req.params.id, logHistory);
+			if (messages.length > 0) {
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+				const recoverResult = await recoverExecutionDataFromEventLogMessages(
+					req.params.id,
+					messages,
+					applyToDb,
+				);
+				return recoverResult;
+			}
+		}
+	}),
+);
+
 eventBusRouter.post(
 	'/event',
 	ResponseHelper.send(async (req: express.Request): Promise<any> => {
@@ -159,17 +186,23 @@ eventBusRouter.post(
 			switch (req.body.__type) {
 				case MessageEventBusDestinationTypeNames.sentry:
 					if (isMessageEventBusDestinationSentryOptions(req.body)) {
-						result = await eventBus.addDestination(new MessageEventBusDestinationSentry(req.body));
+						result = await eventBus.addDestination(
+							new MessageEventBusDestinationSentry(eventBus, req.body),
+						);
 					}
 					break;
 				case MessageEventBusDestinationTypeNames.webhook:
 					if (isMessageEventBusDestinationWebhookOptions(req.body)) {
-						result = await eventBus.addDestination(new MessageEventBusDestinationWebhook(req.body));
+						result = await eventBus.addDestination(
+							new MessageEventBusDestinationWebhook(eventBus, req.body),
+						);
 					}
 					break;
 				case MessageEventBusDestinationTypeNames.syslog:
 					if (isMessageEventBusDestinationSyslogOptions(req.body)) {
-						result = await eventBus.addDestination(new MessageEventBusDestinationSyslog(req.body));
+						result = await eventBus.addDestination(
+							new MessageEventBusDestinationSyslog(eventBus, req.body),
+						);
 					}
 					break;
 				default:
@@ -180,7 +213,10 @@ eventBusRouter.post(
 			}
 			if (result) {
 				await result.saveToDb();
-				return result;
+				return {
+					...result,
+					eventBusInstance: undefined,
+				};
 			}
 			throw new BadRequestError('There was an error adding the destination');
 		}
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index 8a5ad8b82b40c1..936d34ea7ddc75 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -3,7 +3,15 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 import { validate as jsonSchemaValidate } from 'jsonschema';
 import { BinaryDataManager } from 'n8n-core';
-import type { IDataObject, IWorkflowBase, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IWorkflowBase,
+	JsonObject,
+	ExecutionStatus,
+	IRunExecutionData,
+	NodeOperationError,
+	IExecutionsSummary,
+} from 'n8n-workflow';
 import { deepCopy, LoggerProxy, jsonParse, Workflow } from 'n8n-workflow';
 import type { FindOperator, FindOptionsWhere } from 'typeorm';
 import { In, IsNull, LessThanOrEqual, Not, Raw } from 'typeorm';
@@ -25,6 +33,7 @@ import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import * as Db from '@/Db';
 import * as GenericHelpers from '@/GenericHelpers';
+import { parse } from 'flatted';
 
 interface IGetExecutionsQueryFilter {
 	id?: FindOperator<string>;
@@ -32,6 +41,7 @@ interface IGetExecutionsQueryFilter {
 	mode?: string;
 	retryOf?: string;
 	retrySuccessId?: string;
+	status?: ExecutionStatus[];
 	workflowId?: string;
 	// eslint-disable-next-line @typescript-eslint/no-explicit-any
 	waitTill?: FindOperator<any> | boolean;
@@ -45,6 +55,10 @@ const schemaGetExecutionsQueryFilter = {
 		mode: { type: 'string' },
 		retryOf: { type: 'string' },
 		retrySuccessId: { type: 'string' },
+		status: {
+			type: 'array',
+			items: { type: 'string' },
+		},
 		waitTill: { type: 'boolean' },
 		workflowId: { anyOf: [{ type: 'integer' }, { type: 'string' }] },
 	},
@@ -193,7 +207,16 @@ export class ExecutionsService {
 				.map(({ id }) => id),
 		);
 
-		const findWhere: FindOptionsWhere<ExecutionEntity> = { workflowId: In(sharedWorkflowIds) };
+		const findWhere: FindOptionsWhere<ExecutionEntity> = {
+			workflowId: In(sharedWorkflowIds),
+		};
+		if (filter?.status) {
+			Object.assign(findWhere, { status: In(filter.status) });
+			delete filter.status; // remove status from filter so it does not get applied twice
+		}
+		if (filter?.finished) {
+			Object.assign(findWhere, { finished: filter.finished });
+		}
 
 		const rangeQuery: string[] = [];
 		const rangeQueryParams: {
@@ -257,7 +280,42 @@ export class ExecutionsService {
 			req.user,
 		);
 
-		const formattedExecutions = executions.map((execution) => {
+		const formattedExecutions: IExecutionsSummary[] = executions.map((execution) => {
+			// inject potential node execution errors into the execution response
+			const nodeExecutionStatus = {};
+			let lastNodeExecuted;
+			let executionError;
+			try {
+				const data = parse(execution.data) as IRunExecutionData;
+				lastNodeExecuted = data?.resultData?.lastNodeExecuted ?? '';
+				executionError = data?.resultData?.error;
+				if (data?.resultData?.runData) {
+					for (const key of Object.keys(data.resultData.runData)) {
+						const errors = data.resultData.runData[key]
+							?.filter((taskdata) => taskdata.error?.name)
+							?.map((taskdata) => {
+								if (taskdata.error?.name === 'NodeOperationError') {
+									return {
+										name: (taskdata.error as NodeOperationError).name,
+										message: (taskdata.error as NodeOperationError).message,
+										description: (taskdata.error as NodeOperationError).description,
+									};
+								} else {
+									return {
+										name: taskdata.error?.name,
+									};
+								}
+							});
+						Object.assign(nodeExecutionStatus, {
+							[key]: {
+								executionStatus: data.resultData.runData[key][0].executionStatus,
+								errors,
+								data: data.resultData.runData[key][0].data ?? undefined,
+							},
+						});
+					}
+				}
+			} catch {}
 			return {
 				id: execution.id,
 				finished: execution.finished,
@@ -269,9 +327,12 @@ export class ExecutionsService {
 				stoppedAt: execution.stoppedAt,
 				workflowId: execution.workflowData?.id ?? '',
 				workflowName: execution.workflowData?.name,
-			};
+				status: execution.status,
+				lastNodeExecuted,
+				executionError,
+				nodeExecutionStatus,
+			} as IExecutionsSummary;
 		});
-
 		return {
 			count,
 			results: formattedExecutions,
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index dbbbe63b737b05..90866f6268dac3 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -1,5 +1,6 @@
 import { LoggerProxy as Logger } from 'n8n-workflow';
 import type { IPushDataType } from '@/Interfaces';
+import { eventBus } from '../eventbus';
 
 export abstract class AbstractPush<T> {
 	protected connections: Record<string, T> = {};
@@ -10,6 +11,7 @@ export abstract class AbstractPush<T> {
 	protected add(sessionId: string, connection: T): void {
 		const { connections } = this;
 		Logger.debug('Add editor-UI session', { sessionId });
+		eventBus.emit('editorUiConnected', sessionId);
 
 		const existingConnection = connections[sessionId];
 		if (existingConnection) {
diff --git a/packages/cli/test/integration/eventbus.test.ts b/packages/cli/test/integration/eventbus.test.ts
index 00bd6d4752cf07..d30b542f146649 100644
--- a/packages/cli/test/integration/eventbus.test.ts
+++ b/packages/cli/test/integration/eventbus.test.ts
@@ -22,6 +22,7 @@ import { MessageEventBusDestinationWebhook } from '@/eventbus/MessageEventBusDes
 import { MessageEventBusDestinationSentry } from '@/eventbus/MessageEventBusDestination/MessageEventBusDestinationSentry.ee';
 import { EventMessageAudit } from '@/eventbus/EventMessageClasses/EventMessageAudit';
 import { v4 as uuid } from 'uuid';
+import { EventNamesTypes } from '../../src/eventbus/EventMessageClasses';
 
 jest.unmock('@/eventbus/MessageEventBus/MessageEventBus');
 jest.mock('axios');
@@ -62,12 +63,6 @@ const testSentryDestination: MessageEventBusDestinationSentryOptions = {
 	subscribedEvents: ['n8n.test.message', 'n8n.audit.user.updated'],
 };
 
-async function cleanLogs() {
-	eventBus.logWriter.cleanAllLogs();
-	const allMessages = await eventBus.getEventsAll();
-	expect(allMessages.length).toBe(0);
-}
-
 async function confirmIdInAll(id: string) {
 	const sent = await eventBus.getEventsAll();
 	expect(sent.length).toBeGreaterThan(0);
@@ -106,13 +101,13 @@ beforeAll(async () => {
 	config.set('eventBus.logWriter.logBaseName', 'n8n-test-logwriter');
 	config.set('eventBus.logWriter.keepLogCount', '1');
 	config.set('enterprise.features.logStreaming', true);
+
 	await eventBus.initialize();
 });
 
 beforeEach(async () => {
 	config.set('userManagement.disabled', false);
 	config.set('userManagement.isInstanceOwnerSetUp', true);
-	config.set('enterprise.features.logStreaming', false);
 });
 
 afterAll(async () => {
@@ -127,7 +122,10 @@ test('should have a running logwriter process', () => {
 });
 
 test('should have logwriter log messages', async () => {
-	const testMessage = new EventMessageGeneric({ eventName: 'n8n.test.message', id: uuid() });
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
 	await eventBus.send(testMessage);
 	await new Promise((resolve) => {
 		eventBus.logWriter.worker?.once('message', async (msg: { command: string; data: any }) => {
@@ -176,10 +174,13 @@ test('GET /eventbus/destination all returned destinations should exist in eventb
 	}
 });
 
+// this test (presumably the mocking) is causing the test suite to randomly fail
 test.skip('should send message to syslog', async () => {
-	const testMessage = new EventMessageGeneric({ eventName: 'n8n.test.message', id: uuid() });
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
 	config.set('enterprise.features.logStreaming', true);
-	// await cleanLogs();
 
 	const syslogDestination = eventBus.destinations[
 		testSyslogDestination.id!
@@ -217,11 +218,10 @@ test.skip('should send message to syslog', async () => {
 
 test.skip('should confirm send message if there are no subscribers', async () => {
 	const testMessageUnsubscribed = new EventMessageGeneric({
-		eventName: 'n8n.test.unsub',
+		eventName: 'n8n.test.unsub' as EventNamesTypes,
 		id: uuid(),
 	});
 	config.set('enterprise.features.logStreaming', true);
-	// await cleanLogs();
 
 	const syslogDestination = eventBus.destinations[
 		testSyslogDestination.id!
@@ -229,11 +229,6 @@ test.skip('should confirm send message if there are no subscribers', async () =>
 
 	syslogDestination.enable();
 
-	const mockedSyslogClientLog = jest.spyOn(syslogDestination.client, 'log');
-	mockedSyslogClientLog.mockImplementation((_m, _options, _cb) => {
-		return syslogDestination.client;
-	});
-
 	await eventBus.send(testMessageUnsubscribed);
 
 	await new Promise((resolve) => {
@@ -244,7 +239,6 @@ test.skip('should confirm send message if there are no subscribers', async () =>
 					await confirmIdInAll(testMessageUnsubscribed.id);
 				} else if (msg.command === 'confirmMessageSent') {
 					await confirmIdSent(testMessageUnsubscribed.id);
-					expect(mockedSyslogClientLog).toHaveBeenCalled();
 					syslogDestination.disable();
 					eventBus.logWriter.worker?.removeListener('message', handler002);
 					resolve(true);
@@ -264,7 +258,6 @@ test('should anonymize audit message to syslog ', async () => {
 		id: uuid(),
 	});
 	config.set('enterprise.features.logStreaming', true);
-	// await cleanLogs();
 
 	const syslogDestination = eventBus.destinations[
 		testSyslogDestination.id!
@@ -322,9 +315,11 @@ test('should anonymize audit message to syslog ', async () => {
 });
 
 test('should send message to webhook ', async () => {
-	const testMessage = new EventMessageGeneric({ eventName: 'n8n.test.message', id: uuid() });
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
 	config.set('enterprise.features.logStreaming', true);
-	// await cleanLogs();
 
 	const webhookDestination = eventBus.destinations[
 		testWebhookDestination.id!
@@ -355,9 +350,11 @@ test('should send message to webhook ', async () => {
 });
 
 test('should send message to sentry ', async () => {
-	const testMessage = new EventMessageGeneric({ eventName: 'n8n.test.message', id: uuid() });
+	const testMessage = new EventMessageGeneric({
+		eventName: 'n8n.test.message' as EventNamesTypes,
+		id: uuid(),
+	});
 	config.set('enterprise.features.logStreaming', true);
-	// await cleanLogs();
 
 	const sentryDestination = eventBus.destinations[
 		testSentryDestination.id!
diff --git a/packages/cli/test/unit/ActiveExecutions.test.ts b/packages/cli/test/unit/ActiveExecutions.test.ts
index 75e233d6623409..19c1d316e6a5be 100644
--- a/packages/cli/test/unit/ActiveExecutions.test.ts
+++ b/packages/cli/test/unit/ActiveExecutions.test.ts
@@ -156,6 +156,7 @@ function mockFullRunData(): IRun {
 		},
 		mode: 'manual',
 		startedAt: new Date(),
+		status: 'new',
 	};
 }
 
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 8cb90f43392c3b..b7179460ec8f0b 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -2292,6 +2292,9 @@ export function getExecuteFunctions(
 			prepareOutputData: NodeHelpers.prepareOutputData,
 			async putExecutionToWait(waitTill: Date): Promise<void> {
 				runExecutionData.waitTill = waitTill;
+				if (additionalData.setExecutionStatus) {
+					additionalData.setExecutionStatus('waiting');
+				}
 			},
 			sendMessageToUI(...args: any[]): void {
 				if (mode !== 'manual') {
diff --git a/packages/core/src/WorkflowExecute.ts b/packages/core/src/WorkflowExecute.ts
index 5969504df19318..17f09682036b6b 100644
--- a/packages/core/src/WorkflowExecute.ts
+++ b/packages/core/src/WorkflowExecute.ts
@@ -13,6 +13,7 @@ import PCancelable from 'p-cancelable';
 
 import type {
 	ExecutionError,
+	ExecutionStatus,
 	IConnection,
 	IDataObject,
 	IExecuteData,
@@ -46,6 +47,8 @@ export class WorkflowExecute {
 
 	private mode: WorkflowExecuteMode;
 
+	private status: ExecutionStatus;
+
 	constructor(
 		additionalData: IWorkflowExecuteAdditionalData,
 		mode: WorkflowExecuteMode,
@@ -53,6 +56,7 @@ export class WorkflowExecute {
 	) {
 		this.additionalData = additionalData;
 		this.mode = mode;
+		this.status = 'new';
 		this.runExecutionData = runExecutionData || {
 			startData: {},
 			resultData: {
@@ -85,6 +89,8 @@ export class WorkflowExecute {
 		destinationNode?: string,
 		pinData?: IPinData,
 	): PCancelable<IRun> {
+		this.status = 'running';
+
 		// Get the nodes to start workflow execution from
 		startNode = startNode || workflow.getStartNode(destinationNode);
 
@@ -157,6 +163,8 @@ export class WorkflowExecute {
 		let incomingNodeConnections: INodeConnections | undefined;
 		let connection: IConnection;
 
+		this.status = 'running';
+
 		const runIndex = 0;
 
 		// Initialize the nodeExecutionStack and waitingExecution with
@@ -682,6 +690,8 @@ export class WorkflowExecute {
 
 		const startedAt = new Date();
 
+		this.status = 'running';
+
 		const startNode = this.runExecutionData.executionData!.nodeExecutionStack[0].node.name;
 
 		let destinationNode: string | undefined;
@@ -758,6 +768,7 @@ export class WorkflowExecute {
 										main: executionData.data.main,
 									} as ITaskDataConnections,
 									source: [],
+									executionStatus: 'error',
 								},
 							],
 						},
@@ -1048,10 +1059,12 @@ export class WorkflowExecute {
 						startTime,
 						executionTime: new Date().getTime() - startTime,
 						source: !executionData.source ? [] : executionData.source.main,
+						executionStatus: 'success',
 					};
 
 					if (executionError !== undefined) {
 						taskData.error = executionError;
+						taskData.executionStatus = 'error';
 
 						if (executionData.node.continueOnFail === true) {
 							// Workflow should continue running even if node errors
@@ -1317,6 +1330,7 @@ export class WorkflowExecute {
 			mode: this.mode,
 			startedAt,
 			stoppedAt: new Date(),
+			status: this.status,
 		};
 
 		return fullRunData;
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index d20f6713020cb8..7d85aa9e35c871 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -28,6 +28,7 @@ import {
 	NodeParameterValueType,
 	INodeActionTypeDescription,
 	IDisplayOptions,
+	IExecutionsSummary,
 	IAbstractEventMessage,
 } from 'n8n-workflow';
 import { FAKE_DOOR_FEATURES } from './constants';
@@ -352,19 +353,6 @@ export interface IExecutionsStopData {
 	stoppedAt: Date;
 }
 
-export interface IExecutionsSummary {
-	id: string;
-	mode: WorkflowExecuteMode;
-	finished?: boolean;
-	retryOf?: string;
-	retrySuccessId?: string;
-	waitTill?: Date;
-	startedAt: Date;
-	stoppedAt?: Date;
-	workflowId: string;
-	workflowName?: string;
-}
-
 export interface IExecutionDeleteFilter {
 	deleteBefore?: Date;
 	filters?: IDataObject;
@@ -379,7 +367,13 @@ export type IPushData =
 	| PushDataConsoleMessage
 	| PushDataReloadNodeType
 	| PushDataRemoveNodeType
-	| PushDataTestWebhook;
+	| PushDataTestWebhook
+	| PushDataExecutionRecovered;
+
+type PushDataExecutionRecovered = {
+	data: IPushDataExecutionRecovered;
+	type: 'executionRecovered';
+};
 
 type PushDataExecutionFinished = {
 	data: IPushDataExecutionFinished;
@@ -429,6 +423,9 @@ export interface IPushDataExecutionStarted {
 	workflowId: string;
 	workflowName?: string;
 }
+export interface IPushDataExecutionRecovered {
+	executionId: string;
+}
 
 export interface IPushDataExecutionFinished {
 	data: IRun;
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index e511e98ec02136..ba27506d2e1f58 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -264,7 +264,7 @@ import {
 	IExecutionsSummary,
 	IWorkflowShortResponse,
 } from '@/Interface';
-import { IDataObject } from 'n8n-workflow';
+import type { ExecutionStatus, IDataObject } from 'n8n-workflow';
 import { range as _range } from 'lodash';
 import mixins from 'vue-typed-mixins';
 import { mapStores } from 'pinia';
@@ -272,8 +272,6 @@ import { useUIStore } from '@/stores/ui';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { setPageTitle } from '@/utils';
 
-type ExecutionStatus = 'failed' | 'success' | 'waiting' | 'running' | 'unknown';
-
 export default mixins(externalHooks, genericHelpers, executionHelpers, restApi, showMessage).extend(
 	{
 		name: 'ExecutionsList',
@@ -337,6 +335,14 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 						id: 'error',
 						name: this.$locale.baseText('executionsList.error'),
 					},
+					{
+						id: 'crashed',
+						name: this.$locale.baseText('executionsList.error'),
+					},
+					{
+						id: 'new',
+						name: this.$locale.baseText('executionsList.new'),
+					},
 					{
 						id: 'running',
 						name: this.$locale.baseText('executionsList.running'),
@@ -357,13 +363,12 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 			combinedExecutions(): IExecutionsSummary[] {
 				const returnData: IExecutionsSummary[] = [];
 
-				if (['ALL', 'running'].includes(this.filter.status)) {
+				if (['ALL', 'running', 'new'].includes(this.filter.status)) {
 					returnData.push(...this.activeExecutions);
 				}
-				if (['ALL', 'error', 'success', 'waiting'].includes(this.filter.status)) {
+				if (['ALL', 'error', 'crashed', 'success', 'waiting'].includes(this.filter.status)) {
 					returnData.push(...this.finishedExecutions);
 				}
-
 				return returnData;
 			},
 			combinedExecutionsCount(): number {
@@ -391,16 +396,31 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				return filter;
 			},
 			workflowFilterPast(): IDataObject {
-				const filter: IDataObject = {};
+				const queryFilter: IDataObject = {};
 				if (this.filter.workflowId !== 'ALL') {
-					filter.workflowId = this.filter.workflowId;
+					queryFilter.workflowId = this.filter.workflowId;
 				}
-				if (this.filter.status === 'waiting') {
-					filter.waitTill = true;
-				} else if (['error', 'success'].includes(this.filter.status)) {
-					filter.finished = this.filter.status === 'success';
+				switch (this.filter.status as ExecutionStatus) {
+					case 'waiting':
+						queryFilter.status = ['waiting'];
+						break;
+					case 'crashed':
+						queryFilter.status = ['crashed'];
+						break;
+					case 'new':
+						queryFilter.status = ['new'];
+						break;
+					case 'error':
+						queryFilter.status = ['failed', 'crashed', 'error'];
+						break;
+					case 'success':
+						queryFilter.status = ['success'];
+						break;
+					case 'running':
+						queryFilter.status = ['running'];
+						break;
 				}
-				return filter;
+				return queryFilter;
 			},
 			pageTitle() {
 				return this.$locale.baseText('executionsList.workflowExecutions');
@@ -793,19 +813,23 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				this.isDataLoading = false;
 			},
 			getStatus(execution: IExecutionsSummary): ExecutionStatus {
-				let status: ExecutionStatus = 'unknown';
-				if (execution.waitTill) {
-					status = 'waiting';
-				} else if (execution.stoppedAt === undefined) {
-					status = 'running';
-				} else if (execution.finished) {
-					status = 'success';
-				} else if (execution.stoppedAt !== null) {
-					status = 'failed';
-				} else {
-					status = 'unknown';
+				if (execution.status) return execution.status;
+				else {
+					// this should not happen but just in case
+					let status: ExecutionStatus = 'unknown';
+					if (execution.waitTill) {
+						status = 'waiting';
+					} else if (execution.stoppedAt === undefined) {
+						status = 'running';
+					} else if (execution.finished) {
+						status = 'success';
+					} else if (execution.stoppedAt !== null) {
+						status = 'failed';
+					} else {
+						status = 'unknown';
+					}
+					return status;
 				}
-				return status;
 			},
 			getRowClass(execution: IExecutionsSummary): string {
 				return [this.$style.execRow, this.$style[this.getStatus(execution)]].join(' ');
@@ -816,6 +840,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 
 				if (status === 'waiting') {
 					text = this.$locale.baseText('executionsList.waiting');
+				} else if (status === 'crashed') {
+					text = this.$locale.baseText('executionsList.error');
+				} else if (status === 'new') {
+					text = this.$locale.baseText('executionsList.new');
 				} else if (status === 'running') {
 					text = this.$locale.baseText('executionsList.running');
 				} else if (status === 'success') {
@@ -834,6 +862,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 
 				if (status === 'waiting') {
 					path = 'executionsList.statusWaiting';
+				} else if (status === 'crashed') {
+					path = 'executionsList.statusText';
+				} else if (status === 'new') {
+					path = 'executionsList.statusNew';
 				} else if (status === 'running') {
 					path = 'executionsList.statusRunning';
 				} else if (status === 'success') {
@@ -990,6 +1022,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 		color: var(--color-danger);
 	}
 
+	.crashed & {
+		color: var(--color-danger);
+	}
+
 	.waiting & {
 		color: var(--color-secondary);
 	}
@@ -1099,6 +1135,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 			background: var(--color-danger);
 		}
 
+		&.crashed td:first-child::before {
+			background: var(--color-danger);
+		}
+
 		&.success td:first-child::before {
 			background: var(--color-success);
 		}
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
index aaa602f0cacd08..2e86a0aeb330a5 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
@@ -46,7 +46,7 @@
 					>
 						{{
 							$locale.baseText('executionDetails.runningTimeFinished', {
-								interpolate: { time: executionUIDetails.runningTime },
+								interpolate: { time: executionUIDetails?.runningTime },
 							})
 						}}
 					</n8n-text>
@@ -191,7 +191,8 @@ export default mixins(executionHelpers, showMessage, restApi).extend({
 		}
 	}
 
-	&.error {
+	&.error,
+	&.crashed {
 		&,
 		& .executionLink {
 			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-danger-h), 94%, 80%);
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
index 43e727b1dd2171..bd5774a47ad3ce 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionPreview.vue
@@ -1,8 +1,5 @@
 <template>
-	<div
-		v-if="executionUIDetails && executionUIDetails.name === 'running'"
-		:class="$style.runningInfo"
-	>
+	<div v-if="executionUIDetails?.name === 'running'" :class="$style.runningInfo">
 		<div :class="$style.spinner">
 			<n8n-spinner type="ring" />
 		</div>
@@ -21,11 +18,11 @@
 		>
 			<div>
 				<n8n-text size="large" color="text-base" :bold="true" data-test-id="execution-time">{{
-					executionUIDetails.startTime
+					executionUIDetails?.startTime
 				}}</n8n-text
 				><br />
 				<n8n-spinner
-					v-if="executionUIDetails.name === 'running'"
+					v-if="executionUIDetails?.name === 'running'"
 					size="small"
 					:class="[$style.spinner, 'mr-4xs']"
 				/>
@@ -39,7 +36,7 @@
 				<n8n-text v-if="executionUIDetails.name === 'running'" color="text-base" size="medium">
 					{{
 						$locale.baseText('executionDetails.runningTimeRunning', {
-							interpolate: { time: executionUIDetails.runningTime },
+							interpolate: { time: executionUIDetails?.runningTime },
 						})
 					}}
 					| ID#{{ activeExecution.id }}
@@ -52,12 +49,16 @@
 				>
 					{{
 						$locale.baseText('executionDetails.runningTimeFinished', {
-							interpolate: { time: executionUIDetails.runningTime },
+							interpolate: { time: executionUIDetails?.runningTime ?? 'unknown' },
 						})
 					}}
 					| ID#{{ activeExecution.id }}
 				</n8n-text>
-				<n8n-text v-else-if="executionUIDetails.name === 'waiting'" color="text-base" size="medium">
+				<n8n-text
+					v-else-if="executionUIDetails?.name === 'waiting'"
+					color="text-base"
+					size="medium"
+				>
 					| ID#{{ activeExecution.id }}
 				</n8n-text>
 				<br /><n8n-text v-if="activeExecution.mode === 'retry'" color="text-base" size="medium">
@@ -78,7 +79,7 @@
 			</div>
 			<div>
 				<el-dropdown
-					v-if="executionUIDetails.name === 'error'"
+					v-if="executionUIDetails?.name === 'error'"
 					trigger="click"
 					class="mr-xs"
 					@command="handleRetryClick"
@@ -134,6 +135,7 @@ import { VIEWS } from '@/constants';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { Dropdown as ElDropdown } from 'element-ui';
+import { IAbstractEventMessage } from 'n8n-workflow';
 
 export default mixins(restApi, showMessage, executionHelpers).extend({
 	name: 'execution-preview',
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
index 69c190e0f1e7e4..282800047e3fb7 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
@@ -162,6 +162,8 @@ export default Vue.extend({
 		},
 		executionStatuses(): Array<{ id: string; name: string }> {
 			return [
+				{ id: 'crashed', name: this.$locale.baseText('executionsList.error') },
+				{ id: 'new', name: this.$locale.baseText('executionsList.new') },
 				{ id: 'error', name: this.$locale.baseText('executionsList.error') },
 				{ id: 'running', name: this.$locale.baseText('executionsList.running') },
 				{ id: 'success', name: this.$locale.baseText('executionsList.success') },
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 3bb7b2458e27bb..5ed330d808da23 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -117,6 +117,17 @@
 				$locale.baseText('ndv.input.noOutputData')
 			}}</n8n-text>
 		</template>
+
+		<template #recovered-artifical-output-data>
+			<div :class="$style.recoveredOutputData">
+				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
+					$locale.baseText('executionDetails.executionFailed.recoveredNodeTitle')
+				}}</n8n-text>
+				<n8n-text>
+					{{ $locale.baseText('executionDetails.executionFailed.recoveredNodeMessage') }}
+				</n8n-text>
+			</div>
+		</template>
 	</RunData>
 </template>
 
@@ -387,6 +398,16 @@ export default mixins(workflowHelpers).extend({
 	}
 }
 
+.recoveredOutputData {
+	margin: auto;
+	max-width: 250px;
+	text-align: center;
+
+	> *:first-child {
+		margin-bottom: var(--spacing-m);
+	}
+}
+
 .notConnected {
 	max-width: 300px;
 
diff --git a/packages/editor-ui/src/components/InviteUsersModal.vue b/packages/editor-ui/src/components/InviteUsersModal.vue
index db1f1fead39445..94a78158ad04ba 100644
--- a/packages/editor-ui/src/components/InviteUsersModal.vue
+++ b/packages/editor-ui/src/components/InviteUsersModal.vue
@@ -168,7 +168,6 @@ export default mixins(showMessage, copyPaste).extend({
 			return this.emailsCount >= 1;
 		},
 		invitedUsers(): IUser[] {
-			console.log(this.usersStore.allUsers, this.showInviteUrls);
 			return this.showInviteUrls
 				? this.usersStore.allUsers.filter((user) =>
 						this.showInviteUrls!.find((invite) => invite.user.id === user.id),
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 6f57fba76fe848..03a498c8ef947b 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -34,7 +34,7 @@
 							<font-awesome-icon icon="exclamation-triangle" />
 						</n8n-tooltip>
 					</div>
-					<div v-else-if="waiting" class="waiting">
+					<div v-else-if="waiting || nodeExecutionStatus === 'waiting'" class="waiting">
 						<n8n-tooltip placement="bottom">
 							<template #content>
 								<div v-text="waiting"></div>
@@ -46,6 +46,9 @@
 						<font-awesome-icon icon="thumbtack" />
 						<span v-if="workflowDataItems > 1" class="items-count"> {{ workflowDataItems }}</span>
 					</span>
+					<span v-else-if="nodeExecutionStatus === 'unknown'">
+						<!-- Do nothing, unknown means the node never executed -->
+					</span>
 					<span v-else-if="workflowDataItems" class="data-count">
 						<font-awesome-icon icon="check" />
 						<span v-if="workflowDataItems > 1" class="items-count"> {{ workflowDataItems }}</span>
@@ -136,7 +139,10 @@
 				</div>
 			</div>
 			<div
-				:class="{ 'disabled-linethrough': true, success: workflowDataItems > 0 }"
+				:class="{
+					'disabled-linethrough': true,
+					success: !['unknown'].includes(nodeExecutionStatus) && workflowDataItems > 0,
+				}"
 				v-if="showDisabledLinethrough"
 			></div>
 		</div>
@@ -228,8 +234,13 @@ export default mixins(
 			return this.workflowsStore.getWorkflowResultDataByNodeName(this.data?.name || '') || [];
 		},
 		hasIssues(): boolean {
+			if (
+				this.nodeExecutionStatus &&
+				['crashed', 'error', 'failed'].includes(this.nodeExecutionStatus)
+			)
+				return true;
 			if (this.hasPinData) return false;
-			if (this.data.issues !== undefined && Object.keys(this.data.issues).length) {
+			if (this.data?.issues !== undefined && Object.keys(this.data.issues).length) {
 				return true;
 			}
 			return false;
@@ -303,12 +314,31 @@ export default mixins(
 				executing: this.isExecuting,
 			};
 		},
+		nodeExecutionStatus(): string {
+			const nodeExecutionRunData = this.workflowsStore.getWorkflowRunData?.[this.name];
+			if (nodeExecutionRunData) {
+				return nodeExecutionRunData[0].executionStatus ?? '';
+			}
+			return '';
+		},
 		nodeIssues(): string[] {
-			if (this.data.issues === undefined) {
-				return [];
+			const issues: string[] = [];
+			const nodeExecutionRunData = this.workflowsStore.getWorkflowRunData?.[this.name];
+			if (nodeExecutionRunData) {
+				nodeExecutionRunData.forEach((executionRunData) => {
+					if (executionRunData.error) {
+						issues.push(
+							`${executionRunData.error.message}${
+								executionRunData.error.description ? ` (${executionRunData.error.description})` : ''
+							}`,
+						);
+					}
+				});
 			}
-
-			return NodeHelpers.nodeIssuesToString(this.data.issues, this.data);
+			if (this.data?.issues !== undefined) {
+				issues.push(...NodeHelpers.nodeIssuesToString(this.data.issues, this.data));
+			}
+			return issues;
 		},
 		nodeDisabledIcon(): string {
 			if (this.data.disabled === false) {
@@ -387,6 +417,8 @@ export default mixins(
 					borderColor = getStyleTokenValue('--color-danger');
 				} else if (this.waiting || this.showPinnedDataInfo) {
 					borderColor = getStyleTokenValue('--color-secondary');
+				} else if (this.nodeExecutionStatus === 'unknown') {
+					borderColor = getStyleTokenValue('--color-foreground-xdark');
 				} else if (this.workflowDataItems) {
 					borderColor = getStyleTokenValue('--color-success');
 				}
diff --git a/packages/editor-ui/src/components/OutputPanel.vue b/packages/editor-ui/src/components/OutputPanel.vue
index dc3fec231d9647..3810071352a472 100644
--- a/packages/editor-ui/src/components/OutputPanel.vue
+++ b/packages/editor-ui/src/components/OutputPanel.vue
@@ -80,6 +80,17 @@
 			</n8n-text>
 		</template>
 
+		<template #recovered-artifical-output-data>
+			<div :class="$style.recoveredOutputData">
+				<n8n-text tag="div" :bold="true" color="text-dark" size="large">{{
+					$locale.baseText('executionDetails.executionFailed.recoveredNodeTitle')
+				}}</n8n-text>
+				<n8n-text>
+					{{ $locale.baseText('executionDetails.executionFailed.recoveredNodeMessage') }}
+				</n8n-text>
+			</div>
+		</template>
+
 		<template #run-info v-if="!hasPinData && runsCount > 1">
 			<RunInfo :taskData="runTaskData" />
 		</template>
@@ -284,4 +295,26 @@ export default mixins(pinData).extend({
 	font-weight: var(--font-weight-bold);
 	font-size: var(--font-size-s);
 }
+
+.noOutputData {
+	max-width: 180px;
+
+	> *:first-child {
+		margin-bottom: var(--spacing-m);
+	}
+
+	> * {
+		margin-bottom: var(--spacing-2xs);
+	}
+}
+
+.recoveredOutputData {
+	margin: auto;
+	max-width: 250px;
+	text-align: center;
+
+	> *:first-child {
+		margin-bottom: var(--spacing-m);
+	}
+}
 </style>
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index f48ee8f1916c51..d44ddd8c7982fd 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -162,7 +162,7 @@
 		</div>
 
 		<div
-			v-else-if="hasNodeRun && dataCount > 0 && maxRunIndex === 0"
+			v-else-if="hasNodeRun && dataCount > 0 && maxRunIndex === 0 && !isArtificalRecoveredEventItem"
 			v-show="!editMode.enabled"
 			:class="$style.itemsCount"
 		>
@@ -216,6 +216,10 @@
 				</n8n-text>
 			</div>
 
+			<div v-else-if="hasNodeRun && isArtificalRecoveredEventItem" :class="$style.center">
+				<slot name="recovered-artifical-output-data"></slot>
+			</div>
+
 			<div v-else-if="hasNodeRun && hasRunError" :class="$style.stretchVertically">
 				<n8n-text v-if="isPaneTypeInput" :class="$style.center" size="large" tag="p" bold>
 					{{
@@ -244,7 +248,7 @@
 			</div>
 
 			<div v-else-if="hasNodeRun && jsonData && jsonData.length === 0" :class="$style.center">
-				<slot name="no-output-data"></slot>
+				<slot name="no-output-data">xxx</slot>
 			</div>
 
 			<div v-else-if="hasNodeRun && !showData" :class="$style.center">
@@ -679,6 +683,9 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 						this.hasPinData),
 			);
 		},
+		isArtificalRecoveredEventItem(): boolean {
+			return this.inputData?.[0]?.json?.isArtificalRecoveredEventItem !== undefined ?? false;
+		},
 		subworkflowExecutionError(): Error | null {
 			return this.workflowsStore.subWorkflowExecutionError;
 		},
diff --git a/packages/editor-ui/src/components/TitledList.vue b/packages/editor-ui/src/components/TitledList.vue
index a3368937de3481..64d1d64f3e77ac 100644
--- a/packages/editor-ui/src/components/TitledList.vue
+++ b/packages/editor-ui/src/components/TitledList.vue
@@ -2,7 +2,7 @@
 	<div class="titled-list">
 		<p v-text="title" />
 		<ul>
-			<li v-for="item in items" class="titled-list-item" :key="item" v-text="item" />
+			<li v-for="item in items" class="titled-list-item" :key="item" v-html="item" />
 		</ul>
 	</div>
 </template>
diff --git a/packages/editor-ui/src/mixins/executionsHelpers.ts b/packages/editor-ui/src/mixins/executionsHelpers.ts
index 6ba4e9d52d1315..36c540f9dee7dc 100644
--- a/packages/editor-ui/src/mixins/executionsHelpers.ts
+++ b/packages/editor-ui/src/mixins/executionsHelpers.ts
@@ -1,9 +1,9 @@
-import { IExecutionsSummary } from '@/Interface';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { i18n as locale } from '@/plugins/i18n';
 import { mapStores } from 'pinia';
 import mixins from 'vue-typed-mixins';
 import { genericHelpers } from './genericHelpers';
+import { IExecutionsSummary } from 'n8n-workflow';
 
 export interface IExecutionUIData {
 	name: string;
@@ -40,17 +40,17 @@ export const executionHelpers = mixins(genericHelpers).extend({
 				runningTime: '',
 			};
 
-			if (execution.waitTill) {
+			if (execution.status === 'waiting' || execution.waitTill) {
 				status.name = 'waiting';
 				status.label = this.$locale.baseText('executionsList.waiting');
-			} else if (execution.stoppedAt === undefined) {
+			} else if (execution.status === 'running' || execution.stoppedAt === undefined) {
 				status.name = 'running';
 				status.label = this.$locale.baseText('executionsList.running');
 				status.runningTime = this.displayTimer(
 					new Date().getTime() - new Date(execution.startedAt).getTime(),
 					true,
 				);
-			} else if (execution.finished) {
+			} else if (execution.status === 'success' || execution.finished) {
 				status.name = 'success';
 				status.label = this.$locale.baseText('executionsList.succeeded');
 				if (execution.stoppedAt) {
@@ -59,7 +59,23 @@ export const executionHelpers = mixins(genericHelpers).extend({
 						true,
 					);
 				}
-			} else if (execution.stoppedAt !== null) {
+			} else if (execution.status === 'crashed') {
+				status.name = 'crashed';
+				status.label = this.$locale.baseText('executionsList.error');
+				if (execution.stoppedAt) {
+					status.runningTime = this.displayTimer(
+						new Date(execution.stoppedAt).getTime() - new Date(execution.startedAt).getTime(),
+						true,
+					);
+				}
+			} else if (execution.status === 'new') {
+				status.name = 'new';
+				status.label = this.$locale.baseText('executionsList.new');
+			} else if (
+				execution.status === 'error' ||
+				execution.status === 'failed' ||
+				execution.stoppedAt !== null
+			) {
 				status.name = 'error';
 				status.label = this.$locale.baseText('executionsList.error');
 				if (execution.stoppedAt) {
diff --git a/packages/editor-ui/src/mixins/pushConnection.ts b/packages/editor-ui/src/mixins/pushConnection.ts
index 7ef18364fb0c90..4511e025ff1e7f 100644
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/mixins/pushConnection.ts
@@ -1,4 +1,9 @@
-import { IExecutionResponse, IExecutionsCurrentSummaryExtended, IPushData } from '@/Interface';
+import {
+	IExecutionResponse,
+	IExecutionsCurrentSummaryExtended,
+	IPushData,
+	IPushDataExecutionFinished,
+} from '@/Interface';
 
 import { externalHooks } from '@/mixins/externalHooks';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
@@ -10,6 +15,8 @@ import {
 	ExpressionError,
 	IDataObject,
 	INodeTypeNameVersion,
+	IRun,
+	IRunExecutionData,
 	IWorkflowBase,
 	SubworkflowOperationError,
 	TelemetryHelpers,
@@ -25,6 +32,7 @@ import { useWorkflowsStore } from '@/stores/workflows';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useCredentialsStore } from '@/stores/credentials';
 import { useSettingsStore } from '@/stores/settings';
+import { parse } from 'flatted';
 
 export const pushConnection = mixins(
 	externalHooks,
@@ -57,21 +65,6 @@ export const pushConnection = mixins(
 	},
 	methods: {
 		attemptReconnect() {
-			const isWorkflowRunning = this.uiStore.isActionActive('workflowRunning');
-			if (this.connectRetries > 3 && !this.lostConnection && isWorkflowRunning) {
-				this.lostConnection = true;
-
-				this.workflowsStore.executingNode = null;
-				this.uiStore.removeActiveAction('workflowRunning');
-
-				this.$showMessage({
-					title: this.$locale.baseText('pushConnection.executionFailed'),
-					message: this.$locale.baseText('pushConnection.executionFailed.message'),
-					type: 'error',
-					duration: 0,
-				});
-			}
-
 			this.pushConnect();
 		},
 
@@ -115,13 +108,17 @@ export const pushConnection = mixins(
 			this.connectRetries = 0;
 			this.lostConnection = false;
 			this.rootStore.pushConnectionActive = true;
+			this.clearAllStickyNotifications();
 			this.pushSource?.removeEventListener('open', this.onConnectionSuccess);
 		},
 
 		onConnectionError() {
 			this.pushDisconnect();
 			this.connectRetries++;
-			this.reconnectTimeout = setTimeout(this.attemptReconnect, this.connectRetries * 5000);
+			this.reconnectTimeout = setTimeout(
+				this.attemptReconnect,
+				Math.min(this.connectRetries * 3000, 30000), // maximum 30 seconds backoff
+			);
 		},
 
 		/**
@@ -186,7 +183,7 @@ export const pushConnection = mixins(
 		/**
 		 * Process a newly received message
 		 */
-		pushMessageReceived(event: Event, isRetry?: boolean): boolean {
+		async pushMessageReceived(event: Event, isRetry?: boolean): Promise<boolean> {
 			const retryAttempts = 5;
 			let receivedData: IPushData;
 			try {
@@ -229,11 +226,81 @@ export const pushConnection = mixins(
 				}
 			}
 
-			if (receivedData.type === 'executionFinished') {
+			// recovered execution data is handled like executionFinished data, however for security reasons
+			// we need to fetch the data from the server again rather than push it to all clients
+			let recoveredPushData: IPushDataExecutionFinished | undefined = undefined;
+			if (receivedData.type === 'executionRecovered') {
+				const recoveredExecutionId = receivedData.data?.executionId;
+				const isWorkflowRunning = this.uiStore.isActionActive('workflowRunning');
+				if (isWorkflowRunning && this.workflowsStore.activeExecutionId === recoveredExecutionId) {
+					// pull execution data for the recovered execution from the server
+					const executionData = await this.workflowsStore.fetchExecutionDataById(
+						this.workflowsStore.activeExecutionId,
+					);
+					if (executionData?.data) {
+						// data comes in as 'flatten' object, so we need to parse it
+						executionData.data = parse(
+							executionData.data as unknown as string,
+						) as IRunExecutionData;
+						const iRunExecutionData: IRunExecutionData = {
+							startData: executionData.data?.startData,
+							resultData: executionData.data?.resultData ?? { runData: {} },
+							executionData: executionData.data?.executionData,
+						};
+						if (
+							this.workflowsStore.workflowExecutionData?.workflowId === executionData.workflowId
+						) {
+							const activeRunData =
+								this.workflowsStore.workflowExecutionData?.data?.resultData?.runData;
+							if (activeRunData) {
+								for (const key of Object.keys(activeRunData)) {
+									iRunExecutionData.resultData.runData[key] = activeRunData[key];
+								}
+							}
+						}
+						const iRun: IRun = {
+							data: iRunExecutionData,
+							finished: executionData.finished,
+							mode: executionData.mode,
+							waitTill: executionData.data?.waitTill,
+							startedAt: executionData.startedAt,
+							stoppedAt: executionData.stoppedAt,
+							status: 'crashed',
+						};
+						if (executionData.data) {
+							recoveredPushData = {
+								executionId: executionData.id,
+								data: iRun,
+							};
+						}
+					}
+				}
+			}
+
+			if (receivedData.type === 'executionFinished' || receivedData.type === 'executionRecovered') {
 				// The workflow finished executing
-				const pushData = receivedData.data;
+				let pushData: IPushDataExecutionFinished;
+				if (receivedData.type === 'executionRecovered' && recoveredPushData !== undefined) {
+					pushData = recoveredPushData as IPushDataExecutionFinished;
+				} else {
+					pushData = receivedData.data as IPushDataExecutionFinished;
+				}
 
-				this.workflowsStore.finishActiveExecution(pushData);
+				if (this.workflowsStore.activeExecutionId === pushData.executionId) {
+					const activeRunData =
+						this.workflowsStore.workflowExecutionData?.data?.resultData?.runData;
+					if (activeRunData) {
+						for (const key of Object.keys(activeRunData)) {
+							if (
+								pushData.data.data.resultData.runData[key]?.[0]?.data?.main?.[0]?.[0]?.json
+									.isArtificalRecoveredEventItem === true &&
+								activeRunData[key].length > 0
+							)
+								pushData.data.data.resultData.runData[key] = activeRunData[key];
+						}
+					}
+					this.workflowsStore.finishActiveExecution(pushData);
+				}
 
 				if (!this.uiStore.isActionActive('workflowRunning')) {
 					// No workflow is running so ignore the messages
@@ -251,7 +318,13 @@ export const pushConnection = mixins(
 
 				const runDataExecuted = pushData.data;
 
-				const runDataExecutedErrorMessage = this.$getExecutionError(runDataExecuted.data);
+				let runDataExecutedErrorMessage = this.$getExecutionError(runDataExecuted.data);
+
+				if (pushData.data.status === 'crashed') {
+					runDataExecutedErrorMessage = this.$locale.baseText(
+						'pushConnection.executionFailed.message',
+					);
+				}
 
 				const lineNumber =
 					runDataExecuted &&
diff --git a/packages/editor-ui/src/mixins/restApi.ts b/packages/editor-ui/src/mixins/restApi.ts
index 0349722902e0f2..d479f38c8bac9c 100644
--- a/packages/editor-ui/src/mixins/restApi.ts
+++ b/packages/editor-ui/src/mixins/restApi.ts
@@ -27,6 +27,7 @@ import {
 	INodePropertyOptions,
 	INodeTypeDescription,
 	INodeTypeNameVersion,
+	IRunExecutionData,
 } from 'n8n-workflow';
 import { makeRestApiRequest } from '@/utils';
 import { mapStores } from 'pinia';
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 3460093297acba..df4cb84fe54396 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -405,6 +405,8 @@
 	"executionDetails.confirmMessage.message": "Are you sure that you want to delete the current execution?",
 	"executionDetails.deleteExecution": "Delete this execution",
 	"executionDetails.executionFailed": "Execution failed",
+	"executionDetails.executionFailed.recoveredNodeTitle": "Can’t show data",
+	"executionDetails.executionFailed.recoveredNodeMessage": "The execution was interrupted, so the data was not saved. Try fixing the workflow and re-executing.",
 	"executionDetails.executionId": "Execution ID",
 	"executionDetails.executionWaiting": "Execution waiting",
 	"executionDetails.executionWasSuccessful": "Execution was successful",
@@ -440,6 +442,8 @@
 	"executionsList.confirmMessage.headline": "Delete Executions?",
 	"executionsList.confirmMessage.message": "Are you sure that you want to delete the {numSelected} selected execution(s)?",
 	"executionsList.clearSelection": "Clear selection",
+	"executionsList.crashed": "Crashed",
+	"executionsList.new": "New",
 	"executionsList.error": "Failed",
 	"executionsList.filters": "Filters",
 	"executionsList.loadMore": "Load More",
@@ -468,7 +472,6 @@
 	"executionsList.showError.refreshData.title": "Problem loading data",
 	"executionsList.showError.retryExecution.title": "Problem with retry",
 	"executionsList.showError.stopExecution.title": "Problem stopping execution",
-	"executionsList.showError.getExecutionEvents.title": "Problem fetching execution events",
 	"executionsList.showMessage.handleDeleteSelected.title": "Execution deleted",
 	"executionsList.showMessage.retrySuccessfulFalse.title": "Retry unsuccessful",
 	"executionsList.showMessage.retrySuccessfulTrue.title": "Retry successful",
@@ -479,13 +482,15 @@
 	"executionsList.id": "Execution ID",
 	"executionsList.status": "Status",
 	"executionsList.statusText": "{status} in {time}",
+	"executionsList.statusCrashed": "{status}",
+	"executionsList.statusNew": "{status}",
 	"executionsList.statusRunning": "{status} for {time}",
 	"executionsList.statusWaiting": "{status} until {time}",
-	"executionsList.statusUnknown": "{status}",
+	"executionsList.statusUnknown": "Could not complete",
 	"executionsList.stopExecution": "Stop Execution",
 	"executionsList.success": "Success",
 	"executionsList.successRetry": "Success retry",
-	"executionsList.unknown": "Unknown",
+	"executionsList.unknown": "Could not complete",
 	"executionsList.unsavedWorkflow": "[UNSAVED WORKFLOW]",
 	"executionsList.waiting": "Waiting",
 	"executionsList.workflowExecutions": "All Executions",
@@ -983,10 +988,11 @@
 	"pushConnection.workflowExecutedSuccessfully": "Workflow executed successfully",
 	"pushConnectionTracker.cannotConnectToServer": "You have a connection issue or the server is down. <br />n8n should reconnect automatically once the issue is resolved.",
 	"pushConnectionTracker.connectionLost": "Connection lost",
+	"pushConnectionTracker.connectionLost.message": "Attempting to reconnect...",
 	"pushConnection.pollingNode.dataNotFound": "No {service} data found",
 	"pushConnection.pollingNode.dataNotFound.message": "We didn’t find any data in {service} to simulate an event. Please create one in {service} and try again.",
 	"pushConnection.executionFailed": "Execution failed",
-	"pushConnection.executionFailed.message": "There might not be enough memory to finish execution. Tips for avoiding this <a target=\"_blank\" href=\"https://docs.n8n.io/flow-logic/error-handling/memory-errors/\">here</a>",
+	"pushConnection.executionFailed.message": "There might not be enough memory to finish the execution. Tips for avoiding this <a target=\"_blank\" href=\"https://docs.n8n.io/flow-logic/error-handling/memory-errors/\">here</a>",
 	"resourceLocator.id.placeholder": "Enter ID...",
 	"resourceLocator.mode.id": "By ID",
 	"resourceLocator.mode.url": "By URL",
@@ -1146,7 +1152,6 @@
 	"settings.users.setupSMTPInfo": "You will need details of an {link} to complete the setup.",
 	"settings.users.setupSMTPInfo.link": "SMTP server",
 	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\">Instructions</a>",
-	"settings.users.smtpToAddUsersWarning": "Set up SMTP before adding users (so that n8n can send them invitation emails). <a target=\"_blank\" href=\"https://docs.n8n.io/hosting/authentication/user-management-self-hosted/\">Instructions</a>",
 	"settings.users.transferWorkflowsAndCredentials": "Transfer their workflows and credentials to another user",
 	"settings.users.transferredToUser": "Data transferred to {user}",
 	"settings.users.userDeleted": "User deleted",
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index 43d9260f8c6006..e7ab20a50249d4 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -9,7 +9,6 @@ import {
 import {
 	IExecutionResponse,
 	IExecutionsCurrentSummaryExtended,
-	IExecutionsSummary,
 	INewWorkflowData,
 	INodeUi,
 	INodeUpdatePropertiesInformation,
@@ -28,6 +27,7 @@ import {
 	IConnection,
 	IConnections,
 	IDataObject,
+	IExecutionsSummary,
 	INode,
 	INodeConnections,
 	INodeCredentials,
@@ -36,7 +36,9 @@ import {
 	INodeIssueData,
 	INodeParameters,
 	IPinData,
+	IRun,
 	IRunData,
+	IRunExecutionData,
 	ITaskData,
 	IWorkflowSettings,
 	NodeHelpers,
@@ -448,6 +450,10 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			this.workflowExecutionPairedItemMappings = getPairedItemsMapping(this.workflowExecutionData);
 		},
 
+		setWorkflowExecutionRunData(workflowResultData: IRunExecutionData): void {
+			if (this.workflowExecutionData) this.workflowExecutionData.data = workflowResultData;
+		},
+
 		setWorkflowSettings(workflowSettings: IWorkflowSettings): void {
 			Vue.set(this.workflow, 'settings', workflowSettings);
 		},
@@ -921,6 +927,11 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 
 			Vue.set(activeExecution, 'finished', finishedActiveExecution.data.finished);
 			Vue.set(activeExecution, 'stoppedAt', finishedActiveExecution.data.stoppedAt);
+			if (finishedActiveExecution.data) {
+				this.setWorkflowExecutionRunData(
+					finishedActiveExecution.data as unknown as IRunExecutionData,
+				);
+			}
 		},
 
 		setActiveExecutions(newActiveExecutions: IExecutionsCurrentSummaryExtended[]): void {
diff --git a/packages/editor-ui/src/utils/nodeViewUtils.ts b/packages/editor-ui/src/utils/nodeViewUtils.ts
index b3a4f50fcc7a5d..9388ecc550a333 100644
--- a/packages/editor-ui/src/utils/nodeViewUtils.ts
+++ b/packages/editor-ui/src/utils/nodeViewUtils.ts
@@ -541,7 +541,11 @@ export const getOutputSummary = (data: ITaskData[], nodeConnections: NodeInputCo
 	const outputMap: {
 		[sourceOutputIndex: string]: {
 			[targetNodeName: string]: {
-				[targetInputIndex: string]: { total: number; iterations: number };
+				[targetInputIndex: string]: {
+					total: number;
+					iterations: number;
+					isArtificalRecoveredEventItem?: boolean;
+				};
 			};
 		};
 	} = {};
@@ -554,6 +558,13 @@ export const getOutputSummary = (data: ITaskData[], nodeConnections: NodeInputCo
 		run.data.main.forEach((output: INodeExecutionData[] | null, i: number) => {
 			const sourceOutputIndex = i;
 
+			// executionData that was recovered by recoverEvents in the CLI will have an isArtificalRecoveredEventItem property
+			// to indicate that it was not part of the original executionData
+			// we do not want to count these items in the summary
+			// if (output?.[0]?.json?.isArtificalRecoveredEventItem) {
+			// 	return outputMap;
+			// }
+
 			if (!outputMap[sourceOutputIndex]) {
 				outputMap[sourceOutputIndex] = {};
 			}
@@ -589,10 +600,19 @@ export const getOutputSummary = (data: ITaskData[], nodeConnections: NodeInputCo
 					};
 				}
 
-				outputMap[sourceOutputIndex][targetNodeName][targetInputIndex].total += output
-					? output.length
-					: 0;
-				outputMap[sourceOutputIndex][targetNodeName][targetInputIndex].iterations += output ? 1 : 0;
+				if (output?.[0]?.json?.isArtificalRecoveredEventItem) {
+					outputMap[sourceOutputIndex][targetNodeName][
+						targetInputIndex
+					].isArtificalRecoveredEventItem = true;
+					outputMap[sourceOutputIndex][targetNodeName][targetInputIndex].total = 0;
+				} else {
+					outputMap[sourceOutputIndex][targetNodeName][targetInputIndex].total += output
+						? output.length
+						: 0;
+					outputMap[sourceOutputIndex][targetNodeName][targetInputIndex].iterations += output
+						? 1
+						: 0;
+				}
 			});
 		});
 	});
@@ -607,6 +627,13 @@ export const resetConnection = (connection: Connection) => {
 	connection.setPaintStyle(CONNECTOR_PAINT_STYLE_DEFAULT);
 };
 
+export const recoveredConnection = (connection: Connection) => {
+	connection.removeOverlay(OVERLAY_RUN_ITEMS_ID);
+	connection.addClass('success');
+	showOrHideMidpointArrow(connection);
+	connection.setPaintStyle(CONNECTOR_PAINT_STYLE_PRIMARY);
+};
+
 export const getRunItemsLabel = (output: { total: number; iterations: number }): string => {
 	let label = `${output.total}`;
 	label = output.total > 1 ? `${label} items` : `${label} item`;
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 84a3c005e75030..f5f854ea12b787 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -2869,7 +2869,9 @@ export default mixins(
 								if (connection) {
 									const output = outputMap[sourceOutputIndex][targetNodeName][targetInputIndex];
 
-									if (!output || !output.total) {
+									if (output.isArtificalRecoveredEventItem) {
+										NodeViewUtils.recoveredConnection(connection);
+									} else if ((!output || !output.total) && !output.isArtificalRecoveredEventItem) {
 										NodeViewUtils.resetConnection(connection);
 									} else {
 										NodeViewUtils.addConnectionOutputSuccess(connection, output);
diff --git a/packages/workflow/src/ExecutionStatus.ts b/packages/workflow/src/ExecutionStatus.ts
new file mode 100644
index 00000000000000..501bd683ede96b
--- /dev/null
+++ b/packages/workflow/src/ExecutionStatus.ts
@@ -0,0 +1,10 @@
+export type ExecutionStatus =
+	| 'canceled'
+	| 'crashed'
+	| 'error'
+	| 'failed'
+	| 'new'
+	| 'running'
+	| 'success'
+	| 'unknown'
+	| 'waiting';
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index ed7346d8a2406c..b113d0d8436a7f 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -16,6 +16,7 @@ import type { WorkflowOperationError } from './WorkflowErrors';
 import type { NodeApiError, NodeOperationError } from './NodeErrors';
 import type { ExpressionError } from './ExpressionError';
 import type { PathLike } from 'fs';
+import type { ExecutionStatus } from './ExecutionStatus';
 
 export interface IAdditionalCredentialOptions {
 	oauth2?: IOAuth2Options;
@@ -1533,6 +1534,7 @@ export interface IRun {
 	waitTill?: Date;
 	startedAt: Date;
 	stoppedAt?: Date;
+	status: ExecutionStatus;
 }
 
 // Contains all the data which is needed to execute a workflow and so also to
@@ -1567,6 +1569,7 @@ export interface IRunData {
 export interface ITaskData {
 	startTime: number;
 	executionTime: number;
+	executionStatus?: ExecutionStatus;
 	data?: ITaskDataConnections;
 	error?: ExecutionError;
 	source: Array<ISourceData | null>; // Is an array as nodes have multiple inputs
@@ -1661,6 +1664,7 @@ export interface IWorkflowExecuteAdditionalData {
 	httpResponse?: express.Response;
 	httpRequest?: express.Request;
 	restApiUrl: string;
+	setExecutionStatus?: (status: ExecutionStatus) => void;
 	sendMessageToUI?: (source: string, message: any) => void;
 	timezone: string;
 	webhookBaseUrl: string;
@@ -1852,3 +1856,31 @@ export type PublicInstalledNode = {
 export interface NodeExecutionWithMetadata extends INodeExecutionData {
 	pairedItem: IPairedItemData | IPairedItemData[];
 }
+
+export interface IExecutionsSummary {
+	id: string;
+	finished?: boolean;
+	mode: WorkflowExecuteMode;
+	retryOf?: string;
+	retrySuccessId?: string;
+	waitTill?: Date;
+	startedAt: Date;
+	stoppedAt?: Date;
+	workflowId: string;
+	workflowName?: string;
+	status?: ExecutionStatus;
+	lastNodeExecuted?: string;
+	executionError?: ExecutionError;
+	nodeExecutionStatus?: {
+		[key: string]: IExceutionSummaryNodeExecutionResult;
+	};
+}
+
+export interface IExceutionSummaryNodeExecutionResult {
+	executionStatus: ExecutionStatus;
+	errors?: Array<{
+		name?: string;
+		message?: string;
+		description?: string;
+	}>;
+}
diff --git a/packages/workflow/src/NodeErrors.ts b/packages/workflow/src/NodeErrors.ts
index 983206408b2585..c2225d46fbf4ff 100644
--- a/packages/workflow/src/NodeErrors.ts
+++ b/packages/workflow/src/NodeErrors.ts
@@ -84,6 +84,19 @@ export abstract class ExecutionBaseError extends Error {
 			this.cause = cause;
 		}
 	}
+
+	// eslint-disable-next-line @typescript-eslint/no-explicit-any
+	toJSON?(): any {
+		return {
+			message: this.message,
+			lineNumber: this.lineNumber,
+			timestamp: this.timestamp,
+			name: this.name,
+			description: this.description,
+			context: this.context,
+			cause: this.cause,
+		};
+	}
 }
 
 /**
diff --git a/packages/workflow/src/WorkflowErrors.ts b/packages/workflow/src/WorkflowErrors.ts
index 30326db3a69826..c161d4475fad55 100644
--- a/packages/workflow/src/WorkflowErrors.ts
+++ b/packages/workflow/src/WorkflowErrors.ts
@@ -10,6 +10,8 @@ export class WorkflowOperationError extends Error {
 
 	lineNumber: number | undefined;
 
+	description: string | undefined;
+
 	constructor(message: string, node?: INode) {
 		super(message);
 		this.name = this.constructor.name;
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 5e60cfb422c8d6..2cd0635257548e 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -8,6 +8,7 @@ export * from './Cron';
 export * from './DeferredPromise';
 export * from './Interfaces';
 export * from './MessageEventBus';
+export * from './ExecutionStatus';
 export * from './Expression';
 export * from './ExpressionError';
 export * from './NodeErrors';

From 12104bc4a3f0c77e140819c0823cd9166a72d031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 17 Feb 2023 10:58:48 +0100
Subject: [PATCH 246/358] refactor(core): Delete unused `GET /me` endpoint
 (no-changelog) (#5498)

---
 packages/cli/src/controllers/me.controller.ts |  8 --
 packages/cli/test/integration/me.api.test.ts  | 99 -------------------
 .../cli/test/integration/shared/constants.ts  |  1 -
 packages/editor-ui/src/api/users.ts           |  6 +-
 packages/editor-ui/src/stores/users.ts        | 11 ---
 5 files changed, 1 insertion(+), 124 deletions(-)

diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 603140715b028b..463716b5f73e48 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -49,14 +49,6 @@ export class MeController {
 		this.userRepository = repositories.User;
 	}
 
-	/**
-	 * Return the logged-in user.
-	 */
-	@Get('/')
-	async getCurrentUser(req: AuthenticatedRequest): Promise<PublicUser> {
-		return sanitizeUser(req.user);
-	}
-
 	/**
 	 * Update the logged-in user's settings, except password.
 	 */
diff --git a/packages/cli/test/integration/me.api.test.ts b/packages/cli/test/integration/me.api.test.ts
index 4335b62fb5bd5f..9a2d2cd7c586cc 100644
--- a/packages/cli/test/integration/me.api.test.ts
+++ b/packages/cli/test/integration/me.api.test.ts
@@ -40,39 +40,6 @@ afterAll(async () => {
 });
 
 describe('Owner shell', () => {
-	test('GET /me should return sanitized owner shell', async () => {
-		const ownerShell = await testDb.createUserShell(globalOwnerRole);
-
-		const response = await authAgent(ownerShell).get('/me');
-
-		expect(response.statusCode).toBe(200);
-
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			personalizationAnswers,
-			globalRole,
-			password,
-			resetPasswordToken,
-			isPending,
-			apiKey,
-		} = response.body.data;
-
-		expect(validator.isUUID(id)).toBe(true);
-		expect(email).toBeNull();
-		expect(firstName).toBeNull();
-		expect(lastName).toBeNull();
-		expect(personalizationAnswers).toBeNull();
-		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(isPending).toBe(true);
-		expect(globalRole.name).toBe('owner');
-		expect(globalRole.scope).toBe('global');
-		expect(apiKey).toBeUndefined();
-	});
-
 	test('PATCH /me should succeed with valid inputs', async () => {
 		const ownerShell = await testDb.createUserShell(globalOwnerRole);
 		const authOwnerShellAgent = authAgent(ownerShell);
@@ -234,39 +201,6 @@ describe('Member', () => {
 		);
 	});
 
-	test('GET /me should return sanitized member', async () => {
-		const member = await testDb.createUser({ globalRole: globalMemberRole });
-
-		const response = await authAgent(member).get('/me');
-
-		expect(response.statusCode).toBe(200);
-
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			personalizationAnswers,
-			globalRole,
-			password,
-			resetPasswordToken,
-			isPending,
-			apiKey,
-		} = response.body.data;
-
-		expect(validator.isUUID(id)).toBe(true);
-		expect(email).toBe(member.email);
-		expect(firstName).toBe(member.firstName);
-		expect(lastName).toBe(member.lastName);
-		expect(personalizationAnswers).toBeNull();
-		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(isPending).toBe(false);
-		expect(globalRole.name).toBe('member');
-		expect(globalRole.scope).toBe('global');
-		expect(apiKey).toBeUndefined();
-	});
-
 	test('PATCH /me should succeed with valid inputs', async () => {
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
 		const authMemberAgent = authAgent(member);
@@ -433,39 +367,6 @@ describe('Owner', () => {
 		config.set('userManagement.isInstanceOwnerSetUp', true);
 	});
 
-	test('GET /me should return sanitized owner', async () => {
-		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
-
-		const response = await authAgent(owner).get('/me');
-
-		expect(response.statusCode).toBe(200);
-
-		const {
-			id,
-			email,
-			firstName,
-			lastName,
-			personalizationAnswers,
-			globalRole,
-			password,
-			resetPasswordToken,
-			isPending,
-			apiKey,
-		} = response.body.data;
-
-		expect(validator.isUUID(id)).toBe(true);
-		expect(email).toBe(owner.email);
-		expect(firstName).toBe(owner.firstName);
-		expect(lastName).toBe(owner.lastName);
-		expect(personalizationAnswers).toBeNull();
-		expect(password).toBeUndefined();
-		expect(resetPasswordToken).toBeUndefined();
-		expect(isPending).toBe(false);
-		expect(globalRole.name).toBe('owner');
-		expect(globalRole.scope).toBe('global');
-		expect(apiKey).toBeUndefined();
-	});
-
 	test('PATCH /me should succeed with valid inputs', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const authOwnerAgent = authAgent(owner);
diff --git a/packages/cli/test/integration/shared/constants.ts b/packages/cli/test/integration/shared/constants.ts
index b7850ab46a12c3..c04c1e7c83f374 100644
--- a/packages/cli/test/integration/shared/constants.ts
+++ b/packages/cli/test/integration/shared/constants.ts
@@ -28,7 +28,6 @@ export const LOGGED_OUT_RESPONSE_BODY = {
  * Routes requiring a valid `n8n-auth` cookie for a user, either owner or member.
  */
 export const ROUTES_REQUIRING_AUTHENTICATION: Readonly<string[]> = [
-	'GET /me',
 	'PATCH /me',
 	'PATCH /me/password',
 	'POST /me/survey',
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index b876fd327a52e5..d7cabf2cbfae63 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -5,16 +5,12 @@ import {
 	IUserResponse,
 } from '@/Interface';
 import { IDataObject } from 'n8n-workflow';
-import { makeRestApiRequest } from '@/utils';
+import { makeRestApiRequest } from '@/utils/apiUtils';
 
 export function loginCurrentUser(context: IRestApiContext): Promise<IUserResponse | null> {
 	return makeRestApiRequest(context, 'GET', '/login');
 }
 
-export function getCurrentUser(context: IRestApiContext): Promise<IUserResponse | null> {
-	return makeRestApiRequest(context, 'GET', '/me');
-}
-
 export function login(
 	context: IRestApiContext,
 	params: { email: string; password: string },
diff --git a/packages/editor-ui/src/stores/users.ts b/packages/editor-ui/src/stores/users.ts
index 93e8304e0fc997..d7b3e79cc6a3d7 100644
--- a/packages/editor-ui/src/stores/users.ts
+++ b/packages/editor-ui/src/stores/users.ts
@@ -1,7 +1,6 @@
 import {
 	changePassword,
 	deleteUser,
-	getCurrentUser,
 	getInviteLink,
 	getUsers,
 	inviteUsers,
@@ -138,16 +137,6 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			}
 			Vue.set(this.currentUser, 'personalizationAnswers', answers);
 		},
-		async getCurrentUser(): Promise<IUserResponse | null> {
-			const rootStore = useRootStore();
-			const user = await getCurrentUser(rootStore.getRestApiContext);
-			if (user) {
-				this.addUsers([user]);
-				this.currentUserId = user.id;
-			}
-
-			return user;
-		},
 		async loginWithCookie(): Promise<void> {
 			const rootStore = useRootStore();
 			const user = await loginCurrentUser(rootStore.getRestApiContext);

From 561882f59972f80562dcce473eb71690688540fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 17 Feb 2023 10:59:09 +0100
Subject: [PATCH 247/358] refactor(core): Improve instance owner setup and add
 unit tests (no-changelog) (#5499)

* refactor(core): Avoid fetching all workflows and credentials for the owner setup screen

* refactor(core): Add unit tests for the owner controller
---
 .../cli/src/controllers/owner.controller.ts   |  48 +++++--
 packages/cli/src/requests.ts                  |   2 +-
 .../cli/test/integration/owner.api.test.ts    |  12 +-
 .../cli/test/integration/shared/constants.ts  |   5 +-
 .../unit/controllers/me.controller.test.ts    |  22 +--
 .../unit/controllers/owner.controller.test.ts | 134 ++++++++++++++++++
 packages/cli/test/unit/shared/testData.ts     |   6 +
 packages/editor-ui/src/api/users.ts           |   8 +-
 packages/editor-ui/src/stores/users.ts        |   4 +
 packages/editor-ui/src/views/SetupView.vue    |  14 +-
 10 files changed, 204 insertions(+), 51 deletions(-)
 create mode 100644 packages/cli/test/unit/controllers/owner.controller.test.ts
 create mode 100644 packages/cli/test/unit/shared/testData.ts

diff --git a/packages/cli/src/controllers/owner.controller.ts b/packages/cli/src/controllers/owner.controller.ts
index 31779f92e0f087..8040c5aaac5314 100644
--- a/packages/cli/src/controllers/owner.controller.ts
+++ b/packages/cli/src/controllers/owner.controller.ts
@@ -1,6 +1,6 @@
 import validator from 'validator';
 import { validateEntity } from '@/GenericHelpers';
-import { Post, RestController } from '@/decorators';
+import { Get, Post, RestController } from '@/decorators';
 import { BadRequestError } from '@/ResponseHelper';
 import {
 	hashPassword,
@@ -13,9 +13,10 @@ import type { Repository } from 'typeorm';
 import type { ILogger } from 'n8n-workflow';
 import type { Config } from '@/config';
 import { OwnerRequest } from '@/requests';
-import type { IDatabaseCollections, IInternalHooksClass } from '@/Interfaces';
+import type { IDatabaseCollections, IInternalHooksClass, ICredentialsDb } from '@/Interfaces';
 import type { Settings } from '@db/entities/Settings';
 import type { User } from '@db/entities/User';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 
 @RestController('/owner')
 export class OwnerController {
@@ -29,6 +30,10 @@ export class OwnerController {
 
 	private readonly settingsRepository: Repository<Settings>;
 
+	private readonly credentialsRepository: Repository<ICredentialsDb>;
+
+	private readonly workflowsRepository: Repository<WorkflowEntity>;
+
 	constructor({
 		config,
 		logger,
@@ -38,23 +43,38 @@ export class OwnerController {
 		config: Config;
 		logger: ILogger;
 		internalHooks: IInternalHooksClass;
-		repositories: Pick<IDatabaseCollections, 'User' | 'Settings'>;
+		repositories: Pick<IDatabaseCollections, 'User' | 'Settings' | 'Credentials' | 'Workflow'>;
 	}) {
 		this.config = config;
 		this.logger = logger;
 		this.internalHooks = internalHooks;
 		this.userRepository = repositories.User;
 		this.settingsRepository = repositories.Settings;
+		this.credentialsRepository = repositories.Credentials;
+		this.workflowsRepository = repositories.Workflow;
+	}
+
+	@Get('/pre-setup')
+	async preSetup(): Promise<{ credentials: number; workflows: number }> {
+		if (this.config.getEnv('userManagement.isInstanceOwnerSetUp')) {
+			throw new BadRequestError('Instance owner already setup');
+		}
+
+		const [credentials, workflows] = await Promise.all([
+			this.credentialsRepository.countBy({}),
+			this.workflowsRepository.countBy({}),
+		]);
+		return { credentials, workflows };
 	}
 
 	/**
 	 * Promote a shell into the owner of the n8n instance,
 	 * and enable `isInstanceOwnerSetUp` setting.
 	 */
-	@Post('/')
-	async promoteOwner(req: OwnerRequest.Post, res: Response) {
+	@Post('/setup')
+	async setupOwner(req: OwnerRequest.Post, res: Response) {
 		const { email, firstName, lastName, password } = req.body;
-		const { id: userId } = req.user;
+		const { id: userId, globalRole } = req.user;
 
 		if (this.config.getEnv('userManagement.isInstanceOwnerSetUp')) {
 			this.logger.debug(
@@ -63,7 +83,7 @@ export class OwnerController {
 					userId,
 				},
 			);
-			throw new BadRequestError('Invalid request');
+			throw new BadRequestError('Instance owner already setup');
 		}
 
 		if (!email || !validator.isEmail(email)) {
@@ -84,12 +104,8 @@ export class OwnerController {
 			throw new BadRequestError('First and last names are mandatory');
 		}
 
-		let owner = await this.userRepository.findOne({
-			relations: ['globalRole'],
-			where: { id: userId },
-		});
-
-		if (!owner || (owner.globalRole.scope === 'global' && owner.globalRole.name !== 'owner')) {
+		// TODO: This check should be in a middleware outside this class
+		if (globalRole.scope === 'global' && globalRole.name !== 'owner') {
 			this.logger.debug(
 				'Request to claim instance ownership failed because user shell does not exist or has wrong role!',
 				{
@@ -99,6 +115,8 @@ export class OwnerController {
 			throw new BadRequestError('Invalid request');
 		}
 
+		let owner = req.user;
+
 		Object.assign(owner, {
 			email,
 			firstName,
@@ -110,7 +128,7 @@ export class OwnerController {
 
 		owner = await this.userRepository.save(owner);
 
-		this.logger.info('Owner was set up successfully', { userId: req.user.id });
+		this.logger.info('Owner was set up successfully', { userId });
 
 		await this.settingsRepository.update(
 			{ key: 'userManagement.isInstanceOwnerSetUp' },
@@ -119,7 +137,7 @@ export class OwnerController {
 
 		this.config.set('userManagement.isInstanceOwnerSetUp', true);
 
-		this.logger.debug('Setting isInstanceOwnerSetUp updated successfully', { userId: req.user.id });
+		this.logger.debug('Setting isInstanceOwnerSetUp updated successfully', { userId });
 
 		await issueCookie(res, owner);
 
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index e0636d7611ac09..0a1be41429b3be 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -27,7 +27,7 @@ export type AuthenticatedRequest<
 	ResponseBody = {},
 	RequestBody = {},
 	RequestQuery = {},
-> = express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery> & {
+> = Omit<express.Request<RouteParams, ResponseBody, RequestBody, RequestQuery>, 'user'> & {
 	user: User;
 	mailer?: UserManagementMailer.UserManagementMailer;
 	globalMemberRole?: Role;
diff --git a/packages/cli/test/integration/owner.api.test.ts b/packages/cli/test/integration/owner.api.test.ts
index 546a6c65560963..0f0e79d5a6624e 100644
--- a/packages/cli/test/integration/owner.api.test.ts
+++ b/packages/cli/test/integration/owner.api.test.ts
@@ -38,7 +38,7 @@ afterAll(async () => {
 	await testDb.terminate();
 });
 
-test('POST /owner should create owner and enable isInstanceOwnerSetUp', async () => {
+test('POST /owner/setup should create owner and enable isInstanceOwnerSetUp', async () => {
 	const ownerShell = await testDb.createUserShell(globalOwnerRole);
 
 	const newOwnerData = {
@@ -48,7 +48,7 @@ test('POST /owner should create owner and enable isInstanceOwnerSetUp', async ()
 		password: randomValidPassword(),
 	};
 
-	const response = await authAgent(ownerShell).post('/owner').send(newOwnerData);
+	const response = await authAgent(ownerShell).post('/owner/setup').send(newOwnerData);
 
 	expect(response.statusCode).toBe(200);
 
@@ -90,7 +90,7 @@ test('POST /owner should create owner and enable isInstanceOwnerSetUp', async ()
 	expect(isInstanceOwnerSetUpSetting).toBe(true);
 });
 
-test('POST /owner should create owner with lowercased email', async () => {
+test('POST /owner/setup should create owner with lowercased email', async () => {
 	const ownerShell = await testDb.createUserShell(globalOwnerRole);
 
 	const newOwnerData = {
@@ -100,7 +100,7 @@ test('POST /owner should create owner with lowercased email', async () => {
 		password: randomValidPassword(),
 	};
 
-	const response = await authAgent(ownerShell).post('/owner').send(newOwnerData);
+	const response = await authAgent(ownerShell).post('/owner/setup').send(newOwnerData);
 
 	expect(response.statusCode).toBe(200);
 
@@ -113,13 +113,13 @@ test('POST /owner should create owner with lowercased email', async () => {
 	expect(storedOwner.email).toBe(newOwnerData.email.toLowerCase());
 });
 
-test('POST /owner should fail with invalid inputs', async () => {
+test('POST /owner/setup should fail with invalid inputs', async () => {
 	const ownerShell = await testDb.createUserShell(globalOwnerRole);
 	const authOwnerAgent = authAgent(ownerShell);
 
 	await Promise.all(
 		INVALID_POST_OWNER_PAYLOADS.map(async (invalidPayload) => {
-			const response = await authOwnerAgent.post('/owner').send(invalidPayload);
+			const response = await authOwnerAgent.post('/owner/setup').send(invalidPayload);
 			expect(response.statusCode).toBe(400);
 		}),
 	);
diff --git a/packages/cli/test/integration/shared/constants.ts b/packages/cli/test/integration/shared/constants.ts
index c04c1e7c83f374..3608225eaa1e1b 100644
--- a/packages/cli/test/integration/shared/constants.ts
+++ b/packages/cli/test/integration/shared/constants.ts
@@ -31,7 +31,7 @@ export const ROUTES_REQUIRING_AUTHENTICATION: Readonly<string[]> = [
 	'PATCH /me',
 	'PATCH /me/password',
 	'POST /me/survey',
-	'POST /owner',
+	'POST /owner/setup',
 	'GET /non-existent',
 ];
 
@@ -42,7 +42,8 @@ export const ROUTES_REQUIRING_AUTHORIZATION: Readonly<string[]> = [
 	'POST /users',
 	'DELETE /users/123',
 	'POST /users/123/reinvite',
-	'POST /owner',
+	'POST /owner/pre-setup',
+	'POST /owner/setup',
 	'POST /owner/skip-setup',
 ];
 
diff --git a/packages/cli/test/unit/controllers/me.controller.test.ts b/packages/cli/test/unit/controllers/me.controller.test.ts
index 1606915398c572..f926c4fc4fe872 100644
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -9,21 +9,18 @@ import { MeController } from '@/controllers';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { BadRequestError } from '@/ResponseHelper';
 import type { AuthenticatedRequest, MeRequest } from '@/requests';
+import { badPasswords } from '../shared/testData';
 
 describe('MeController', () => {
 	const logger = mock<ILogger>();
 	const externalHooks = mock<IExternalHooksClass>();
 	const internalHooks = mock<IInternalHooksClass>();
 	const userRepository = mock<Repository<User>>();
-
-	let controller: MeController;
-	beforeAll(() => {
-		controller = new MeController({
-			logger,
-			externalHooks,
-			internalHooks,
-			repositories: { User: userRepository },
-		});
+	const controller = new MeController({
+		logger,
+		externalHooks,
+		internalHooks,
+		repositories: { User: userRepository },
 	});
 
 	describe('updateCurrentUser', () => {
@@ -88,12 +85,7 @@ describe('MeController', () => {
 		});
 
 		describe('should throw if newPassword is not valid', () => {
-			Object.entries({
-				pass: 'Password must be 8 to 64 characters long. Password must contain at least 1 number. Password must contain at least 1 uppercase letter.',
-				password:
-					'Password must contain at least 1 number. Password must contain at least 1 uppercase letter.',
-				password1: 'Password must contain at least 1 uppercase letter.',
-			}).forEach(([newPassword, errorMessage]) => {
+			Object.entries(badPasswords).forEach(([newPassword, errorMessage]) => {
 				it(newPassword, async () => {
 					const req = mock<MeRequest.Password>({
 						user: mock({ password: passwordHash }),
diff --git a/packages/cli/test/unit/controllers/owner.controller.test.ts b/packages/cli/test/unit/controllers/owner.controller.test.ts
new file mode 100644
index 00000000000000..a460dc8bc53309
--- /dev/null
+++ b/packages/cli/test/unit/controllers/owner.controller.test.ts
@@ -0,0 +1,134 @@
+import type { Repository } from 'typeorm';
+import type { CookieOptions, Response } from 'express';
+import { anyObject, captor, mock } from 'jest-mock-extended';
+import type { ILogger } from 'n8n-workflow';
+import jwt from 'jsonwebtoken';
+import type { ICredentialsDb, IInternalHooksClass } from '@/Interfaces';
+import type { User } from '@db/entities/User';
+import type { Settings } from '@db/entities/Settings';
+import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
+import type { Config } from '@/config';
+import { BadRequestError } from '@/ResponseHelper';
+import type { OwnerRequest } from '@/requests';
+import { OwnerController } from '@/controllers';
+import { badPasswords } from '../shared/testData';
+import { AUTH_COOKIE_NAME } from '@/constants';
+
+describe('OwnerController', () => {
+	const config = mock<Config>();
+	const logger = mock<ILogger>();
+	const internalHooks = mock<IInternalHooksClass>();
+	const userRepository = mock<Repository<User>>();
+	const settingsRepository = mock<Repository<Settings>>();
+	const credentialsRepository = mock<Repository<ICredentialsDb>>();
+	const workflowsRepository = mock<Repository<WorkflowEntity>>();
+	const controller = new OwnerController({
+		config,
+		logger,
+		internalHooks,
+		repositories: {
+			User: userRepository,
+			Settings: settingsRepository,
+			Credentials: credentialsRepository,
+			Workflow: workflowsRepository,
+		},
+	});
+
+	describe('preSetup', () => {
+		it('should throw a BadRequestError if the instance owner is already setup', async () => {
+			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(true);
+			expect(controller.preSetup()).rejects.toThrowError(
+				new BadRequestError('Instance owner already setup'),
+			);
+		});
+
+		it('should a return credential and workflow count', async () => {
+			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+			credentialsRepository.countBy.mockResolvedValue(7);
+			workflowsRepository.countBy.mockResolvedValue(31);
+			const { credentials, workflows } = await controller.preSetup();
+			expect(credentials).toBe(7);
+			expect(workflows).toBe(31);
+		});
+	});
+
+	describe('setupOwner', () => {
+		it('should throw a BadRequestError if the instance owner is already setup', async () => {
+			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(true);
+			expect(controller.setupOwner(mock(), mock())).rejects.toThrowError(
+				new BadRequestError('Instance owner already setup'),
+			);
+		});
+
+		it('should throw a BadRequestError if the email is invalid', async () => {
+			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+			const req = mock<OwnerRequest.Post>({ body: { email: 'invalid email' } });
+			expect(controller.setupOwner(req, mock())).rejects.toThrowError(
+				new BadRequestError('Invalid email address'),
+			);
+		});
+
+		describe('should throw if the password is invalid', () => {
+			Object.entries(badPasswords).forEach(([password, errorMessage]) => {
+				it(password, async () => {
+					config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+					const req = mock<OwnerRequest.Post>({ body: { email: 'valid@email.com', password } });
+					expect(controller.setupOwner(req, mock())).rejects.toThrowError(
+						new BadRequestError(errorMessage),
+					);
+				});
+			});
+		});
+
+		it('should throw a BadRequestError if firstName & lastName are missing ', async () => {
+			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+			const req = mock<OwnerRequest.Post>({
+				body: { email: 'valid@email.com', password: 'NewPassword123', firstName: '', lastName: '' },
+			});
+			expect(controller.setupOwner(req, mock())).rejects.toThrowError(
+				new BadRequestError('First and last names are mandatory'),
+			);
+		});
+
+		it('should setup the instance owner successfully', async () => {
+			const user = mock<User>({
+				id: 'userId',
+				globalRole: { scope: 'global', name: 'owner' },
+				authIdentities: [],
+			});
+			const req = mock<OwnerRequest.Post>({
+				body: {
+					email: 'valid@email.com',
+					password: 'NewPassword123',
+					firstName: 'Jane',
+					lastName: 'Doe',
+				},
+				user,
+			});
+			const res = mock<Response>();
+			config.getEnv.calledWith('userManagement.isInstanceOwnerSetUp').mockReturnValue(false);
+			userRepository.save.calledWith(anyObject()).mockResolvedValue(user);
+			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
+
+			await controller.setupOwner(req, res);
+
+			expect(userRepository.save).toHaveBeenCalledWith(user);
+
+			const cookieOptions = captor<CookieOptions>();
+			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'signed-token', cookieOptions);
+			expect(cookieOptions.value.httpOnly).toBe(true);
+			expect(cookieOptions.value.sameSite).toBe('lax');
+		});
+	});
+
+	describe('skipSetup', () => {
+		it('should skip setting up the instance owner', async () => {
+			await controller.skipSetup();
+			expect(settingsRepository.update).toHaveBeenCalledWith(
+				{ key: 'userManagement.skipInstanceOwnerSetup' },
+				{ value: JSON.stringify(true) },
+			);
+			expect(config.set).toHaveBeenCalledWith('userManagement.skipInstanceOwnerSetup', true);
+		});
+	});
+});
diff --git a/packages/cli/test/unit/shared/testData.ts b/packages/cli/test/unit/shared/testData.ts
new file mode 100644
index 00000000000000..4bba6f3827133f
--- /dev/null
+++ b/packages/cli/test/unit/shared/testData.ts
@@ -0,0 +1,6 @@
+export const badPasswords = {
+	pass: 'Password must be 8 to 64 characters long. Password must contain at least 1 number. Password must contain at least 1 uppercase letter.',
+	password:
+		'Password must contain at least 1 number. Password must contain at least 1 uppercase letter.',
+	password1: 'Password must contain at least 1 uppercase letter.',
+};
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index d7cabf2cbfae63..bc14132d201d18 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -22,11 +22,17 @@ export async function logout(context: IRestApiContext): Promise<void> {
 	await makeRestApiRequest(context, 'POST', '/logout');
 }
 
+export function preOwnerSetup(
+	context: IRestApiContext,
+): Promise<{ credentials: number; workflows: number }> {
+	return makeRestApiRequest(context, 'GET', '/owner/pre-setup');
+}
+
 export function setupOwner(
 	context: IRestApiContext,
 	params: { firstName: string; lastName: string; email: string; password: string },
 ): Promise<IUserResponse> {
-	return makeRestApiRequest(context, 'POST', '/owner', params as unknown as IDataObject);
+	return makeRestApiRequest(context, 'POST', '/owner/setup', params as unknown as IDataObject);
 }
 
 export function skipOwnerSetup(context: IRestApiContext): Promise<void> {
diff --git a/packages/editor-ui/src/stores/users.ts b/packages/editor-ui/src/stores/users.ts
index d7b3e79cc6a3d7..9c7cf2b50cada4 100644
--- a/packages/editor-ui/src/stores/users.ts
+++ b/packages/editor-ui/src/stores/users.ts
@@ -7,6 +7,7 @@ import {
 	login,
 	loginCurrentUser,
 	logout,
+	preOwnerSetup,
 	reinvite,
 	sendForgotPasswordEmail,
 	setupOwner,
@@ -158,6 +159,9 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			await logout(rootStore.getRestApiContext);
 			this.currentUserId = null;
 		},
+		async preOwnerSetup() {
+			return preOwnerSetup(useRootStore().getRestApiContext);
+		},
 		async createOwner(params: {
 			firstName: string;
 			lastName: string;
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/editor-ui/src/views/SetupView.vue
index 2e33cd8a483944..5d24237a672ff3 100644
--- a/packages/editor-ui/src/views/SetupView.vue
+++ b/packages/editor-ui/src/views/SetupView.vue
@@ -28,9 +28,9 @@ export default mixins(showMessage, restApi).extend({
 		AuthView,
 	},
 	async mounted() {
-		const getAllCredentialsPromise = this.getAllCredentials();
-		const getAllWorkflowsPromise = this.getAllWorkflows();
-		await Promise.all([getAllCredentialsPromise, getAllWorkflowsPromise]);
+		const { credentials, workflows } = await this.usersStore.preOwnerSetup();
+		this.credentialsCount = credentials;
+		this.workflowsCount = workflows;
 	},
 	data() {
 		const FORM_CONFIG: IFormBoxConfig = {
@@ -102,14 +102,6 @@ export default mixins(showMessage, restApi).extend({
 		...mapStores(useCredentialsStore, useSettingsStore, useUIStore, useUsersStore),
 	},
 	methods: {
-		async getAllCredentials() {
-			const credentials = await this.credentialsStore.fetchAllCredentials();
-			this.credentialsCount = credentials.length;
-		},
-		async getAllWorkflows() {
-			const workflows = await this.restApi().getWorkflows();
-			this.workflowsCount = workflows.length;
-		},
 		async confirmSetupOrGoBack(): Promise<boolean> {
 			if (this.workflowsCount === 0 && this.credentialsCount === 0) {
 				return true;

From 9a1e7b52f7ce698f1492af15d0139fb015ba5d30 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Fri, 17 Feb 2023 15:08:26 +0100
Subject: [PATCH 248/358] feat(editor): Unify regular and trigger node creator
 panels (#5315)

* WIP: Merge TriggerHelperPanel with MainPanel

* WIP: Implement switching between views

* Remove logging

* WIP: Rework search

* Fix category toggling and search results display

* Fix node item description

* Sort actions based on the root view

* Adjust personalisation modal, make trigger canvas node round

* Linting fixes

* Fix filtering of API options

* Fix types and no result state

* Cleanup

* Linting fixes

* Adjust mode prop for node creator tracking

* Fix merging of core nodes and filtering of single placeholder actions

* Lint fixes

* Implement actions override, fix node creator view item spacing and increase click radius of trigger node icon

* Fix keyboard view navigation

* WIP: E2E Tests

* Address product review

* Minor fixes & cleanup

* Fix tests

* Some more test fixes

* Add specs to check actions and panels

* Update personalisation survey snapshot
---
 cypress/e2e/11-inline-expression-editor.cy.ts |   6 +-
 cypress/e2e/12-canvas.cy.ts                   |  11 +
 cypress/e2e/13-pinning.cy.ts                  |  10 +-
 .../14-data-transformation-expressions.cy.ts  |  15 +-
 cypress/e2e/14-mapping.cy.ts                  |  31 +-
 cypress/e2e/2-credentials.cy.ts               |   4 +-
 cypress/e2e/4-node-creator.cy.ts              | 114 ++--
 cypress/e2e/5-ndv.cy.ts                       |   6 +-
 cypress/e2e/6-code-node.cy.ts                 |   4 +-
 cypress/e2e/8-http-request-node.cy.ts         |   2 +-
 cypress/e2e/9-expression-editor-modal.cy.ts   |   8 +-
 cypress/pages/canvas-node.ts                  |  15 -
 cypress/pages/features/node-creator.ts        |   3 -
 cypress/pages/index.ts                        |   1 -
 cypress/pages/ndv.ts                          |   9 +-
 cypress/pages/workflow.ts                     |  15 +-
 .../N8nNodeCreatorNode/NodeCreatorNode.vue    |  14 +-
 .../N8nNodeCreatorNode/TriggerIcon.vue        |  65 ---
 .../src/components/N8nNodeIcon/NodeIcon.vue   |  10 +-
 packages/editor-ui/public/suggestednodes.png  | Bin 90624 -> 0 bytes
 packages/editor-ui/src/Interface.ts           |  30 +-
 packages/editor-ui/src/components/Node.vue    |  28 +-
 .../Node/NodeCreator/CategorizedItems.vue     | 486 +++++++++---------
 .../Node/NodeCreator/CategoryItem.vue         |  26 +-
 .../Node/NodeCreator/ItemIterator.vue         |  37 +-
 .../components/Node/NodeCreator/MainPanel.vue | 450 +++++++++++++---
 .../Node/NodeCreator/NodeCreator.vue          |  29 +-
 .../components/Node/NodeCreator/NodeItem.vue  |   4 +-
 .../components/Node/NodeCreator/SearchBar.vue |   2 +-
 .../Node/NodeCreator/SubcategoryItem.vue      | 109 +---
 .../Node/NodeCreator/TriggerHelperPanel.vue   | 449 ----------------
 .../Node/NodeCreator/TypeSelector.vue         |  59 ---
 .../components/Node/NodeCreator/ViewItem.vue  |  45 ++
 .../Node/NodeCreator/useMainPanelView.ts      | 198 +++++++
 .../src/components/PersonalizationModal.vue   |  39 +-
 .../PersonalizationModal.spec.ts.snap         |   2 +-
 packages/editor-ui/src/constants.ts           |   5 +
 .../src/plugins/i18n/locales/en.json          |  32 +-
 packages/editor-ui/src/plugins/icons.ts       |   6 +
 packages/editor-ui/src/stores/nodeCreator.ts  |  66 ++-
 .../editor-ui/src/utils/nodeTypesUtils.ts     |  22 +-
 packages/editor-ui/src/views/NodeView.vue     |  29 +-
 .../nodes/EditImage/EditImage.node.ts         |  11 +
 .../nodes/EmailSend/v2/EmailSendV2.node.ts    |   1 +
 packages/nodes-base/nodes/N8n/N8n.node.json   |   2 +-
 packages/nodes-base/nodes/N8n/N8n.node.ts     |   2 +-
 .../nodes/N8nTrigger/N8nTrigger.node.json     |   2 +-
 .../nodes/N8nTrigger/N8nTrigger.node.ts       |   2 +-
 .../SpreadsheetFile/SpreadsheetFile.node.ts   |   2 +-
 49 files changed, 1183 insertions(+), 1335 deletions(-)
 delete mode 100644 cypress/pages/canvas-node.ts
 delete mode 100644 packages/design-system/src/components/N8nNodeCreatorNode/TriggerIcon.vue
 delete mode 100644 packages/editor-ui/public/suggestednodes.png
 delete mode 100644 packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
 delete mode 100644 packages/editor-ui/src/components/Node/NodeCreator/TypeSelector.vue
 create mode 100644 packages/editor-ui/src/components/Node/NodeCreator/ViewItem.vue
 create mode 100644 packages/editor-ui/src/components/Node/NodeCreator/useMainPanelView.ts

diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index cbc4736e2b54de..10bc16fde8d8c8 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -10,7 +10,7 @@ describe('Inline expression editor', () => {
 
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
 		WorkflowPage.actions.addNodeToCanvas('Hacker News');
 		WorkflowPage.actions.openNode('Hacker News');
 		WorkflowPage.actions.openInlineExpressionEditor();
@@ -50,6 +50,7 @@ describe('Inline expression editor', () => {
 	});
 
 	it('should resolve array resolvables', () => {
+		WorkflowPage.getters.inlineExpressionEditorInput().clear();
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
 		WorkflowPage.getters.inlineExpressionEditorInput().type('[1, 2, 3]');
 		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^\[Array: \[1,2,3\]\]$/);
@@ -63,8 +64,9 @@ describe('Inline expression editor', () => {
 	});
 
 	it('should resolve $parameter[]', () => {
+		WorkflowPage.getters.inlineExpressionEditorInput().clear();
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
 		WorkflowPage.getters.inlineExpressionEditorInput().type('$parameter["operation"]');
-		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^get$/);
+		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^getAll$/);
 	});
 });
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index ac0bbd7bad992e..13d1bc6392464d 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -96,6 +96,7 @@ describe('Canvas Actions', () => {
 
 	it('should add merge node and test connections', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		for (let i = 0; i < 2; i++) {
 			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, true);
 			WorkflowPage.getters.nodeViewBackground().click(600 + i * 100, 200, { force: true });
@@ -138,6 +139,7 @@ describe('Canvas Actions', () => {
 
 	it('should add nodes and check execution success', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		for (let i = 0; i < 3; i++) {
 			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, true);
 		}
@@ -235,6 +237,7 @@ describe('Canvas Actions', () => {
 
 	it('should move node', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.actions.zoomToFit();
 		cy.drag('[data-test-id="canvas-node"].jtk-drag-selected', [50, 150]);
@@ -316,6 +319,7 @@ describe('Canvas Actions', () => {
 
 	it('should select nodes using arrow keys', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.wait(500);
 		cy.get('body').type('{leftArrow}');
@@ -326,6 +330,7 @@ describe('Canvas Actions', () => {
 
 	it('should select nodes using shift and arrow keys', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.wait(500);
 		cy.get('body').type('{shift}', { release: false }).type('{leftArrow}');
@@ -334,6 +339,7 @@ describe('Canvas Actions', () => {
 
 	it('should delete connections by pressing the delete button', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.nodeConnections().first().realHover();
 		cy.get('.connection-actions .delete').first().click({ force: true });
@@ -342,6 +348,7 @@ describe('Canvas Actions', () => {
 
 	it('should delete a connection by moving it away from endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.drag(WorkflowPage.getters.getEndpointSelector('input', CODE_NODE_NAME), [0, -100]);
 		WorkflowPage.getters.nodeConnections().should('have.length', 0);
@@ -349,6 +356,7 @@ describe('Canvas Actions', () => {
 
 	it('should disable node by pressing the disable button', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters
 			.canvasNodes()
@@ -360,6 +368,7 @@ describe('Canvas Actions', () => {
 
 	it('should disable node using keyboard shortcut', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters.canvasNodes().last().click();
 		WorkflowPage.actions.hitDisableNodeShortcut();
@@ -368,6 +377,7 @@ describe('Canvas Actions', () => {
 
 	it('should disable multiple nodes', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		cy.get('body').type('{esc}');
 		cy.get('body').type('{esc}');
@@ -389,6 +399,7 @@ describe('Canvas Actions', () => {
 
 	it('should duplicate node', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		WorkflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
 		WorkflowPage.getters
 			.canvasNodes()
diff --git a/cypress/e2e/13-pinning.cy.ts b/cypress/e2e/13-pinning.cy.ts
index 0b5f7b2683c9f9..f21320ca9c2b8a 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -12,8 +12,7 @@ describe('Data pinning', () => {
 	});
 
 	it('Should be able to pin node output', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
-		workflowPage.getters.canvasNodes().first().dblclick();
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true});
 		ndv.getters.container().should('be.visible');
 		ndv.getters.pinDataButton().should('not.exist');
 		ndv.getters.editPinnedDataButton().should('be.visible');
@@ -21,7 +20,9 @@ describe('Data pinning', () => {
 		ndv.actions.execute();
 
 		ndv.getters.outputDataContainer().should('be.visible');
-		ndv.getters.outputDataContainer().get('table').should('be.visible');
+		// We hover over the table to get rid of the pinning tooltip which would overlay the table
+		// slightly and cause the test to fail
+		ndv.getters.outputDataContainer().get('table').realHover().should('be.visible');
 		ndv.getters.outputTableRows().should('have.length', 2);
 		ndv.getters.outputTableHeaders().should('have.length.at.least', 10);
 		ndv.getters.outputTableHeaders().first().should('include.text', 'timestamp');
@@ -42,8 +43,7 @@ describe('Data pinning', () => {
 	});
 
 	it('Should be be able to set pinned data', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
-		workflowPage.getters.canvasNodes().first().dblclick();
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true});
 		ndv.getters.container().should('be.visible');
 		ndv.getters.pinDataButton().should('not.exist');
 		ndv.getters.editPinnedDataButton().should('be.visible');
diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
index 6f6b802926d9b5..a5186a8af52816 100644
--- a/cypress/e2e/14-data-transformation-expressions.cy.ts
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -26,7 +26,8 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible').contains(output);
+		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().contains(output);
 	});
 
 	it('$json + n8n string methods', () => {
@@ -40,7 +41,8 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible').contains(output);
+		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().contains(output);
 	});
 
 	it('$json + native numeric methods', () => {
@@ -54,7 +56,8 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible').contains(output);
+		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().contains(output);
 	});
 
 	it('$json + n8n numeric methods', () => {
@@ -68,7 +71,8 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible').contains(output);
+		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().contains(output);
 	});
 
 	it('$json + native array methods', () => {
@@ -82,7 +86,8 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible').contains(output);
+		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().contains(output);
 	});
 
 	it('$json + n8n array methods', () => {
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index ade387e454f6b3..846eafb6e5c9b6 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -1,8 +1,12 @@
-import { WorkflowPage, NDV, CanvasNode } from '../pages';
+import {
+	MANUAL_TRIGGER_NODE_NAME,
+	MANUAL_TRIGGER_NODE_DISPLAY_NAME,
+	SCHEDULE_TRIGGER_NODE_NAME,
+} from './../constants';
+import { WorkflowPage, NDV } from '../pages';
 
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
-const canvasNode = new CanvasNode();
 
 describe('Data mapping', () => {
 	beforeEach(() => {
@@ -20,7 +24,7 @@ describe('Data mapping', () => {
 		cy.fixture('Test_workflow-actions_paste-data.json').then((data) => {
 			cy.get('body').paste(JSON.stringify(data));
 		});
-		canvasNode.actions.openNode('Set');
+		workflowPage.actions.openNode('Set');
 		ndv.actions.executePrevious();
 		ndv.actions.switchInputMode('Table');
 		ndv.getters.inputDataContainer().get('table', { timeout: 10000 }).should('exist');
@@ -42,7 +46,7 @@ describe('Data mapping', () => {
 			cy.get('body').paste(JSON.stringify(data));
 		});
 
-		canvasNode.actions.openNode('Set');
+		workflowPage.actions.openNode('Set');
 		ndv.actions.switchInputMode('Table');
 		ndv.getters.inputDataContainer().get('table', { timeout: 10000 }).should('exist');
 
@@ -87,7 +91,7 @@ describe('Data mapping', () => {
 			cy.get('body').paste(JSON.stringify(data));
 		});
 
-		canvasNode.actions.openNode('Set');
+		workflowPage.actions.openNode('Set');
 		ndv.actions.switchInputMode('JSON');
 
 		ndv.getters.inputDataContainer().should('exist').find('.json-data')
@@ -115,7 +119,7 @@ describe('Data mapping', () => {
 			cy.get('body').paste(JSON.stringify(data));
 		});
 
-		canvasNode.actions.openNode('Set');
+		workflowPage.actions.openNode('Set');
 		ndv.actions.clearParameterInput('value');
 		cy.get('body').type('{esc}');
 
@@ -142,22 +146,22 @@ describe('Data mapping', () => {
 
 	it('maps expressions from previous nodes', () => {
 		cy.createFixtureWorkflow('Test_workflow_3.json', `My test workflow`);
-		canvasNode.actions.openNode('Set1');
+		workflowPage.actions.openNode('Set1');
 
-		ndv.actions.selectInputNode('Schedule Trigger');
+		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
 
 		ndv.getters.inputDataContainer()
 			.find('span').contains('count')
 			.realMouseDown();
 
 		ndv.actions.mapToParameter('value');
-		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $node["Schedule Trigger"].json.input[0].count }}');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', `{{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input[0].count }}`);
 		ndv.getters.parameterExpressionPreview('value')
 			.should('not.exist');
 
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.mapDataFromHeader(1, 'value');
-		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $node["Schedule Trigger"].json.input[0].count }} {{ $node["Schedule Trigger"].json.input }}');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', `{{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input[0].count }} {{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input }}`);
 		ndv.getters.parameterExpressionPreview('value')
 			.should('not.exist');
 
@@ -175,8 +179,9 @@ describe('Data mapping', () => {
 	});
 
 	it('maps keys to path', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger', {keepNdvOpen: true});
-
+		workflowPage.actions.addInitialNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
+		workflowPage.getters.canvasNodeByName(MANUAL_TRIGGER_NODE_DISPLAY_NAME).click();
+		workflowPage.actions.openNode(MANUAL_TRIGGER_NODE_DISPLAY_NAME);
 		ndv.actions.setPinnedData([
 			{
 				input: [
@@ -201,7 +206,7 @@ describe('Data mapping', () => {
 		ndv.actions.close();
 
 		workflowPage.actions.addNodeToCanvas('Item Lists');
-		canvasNode.actions.openNode('Item Lists');
+		workflowPage.actions.openNode('Item Lists');
 
 		ndv.getters.parameterInput('operation')
 			.click()
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 0249ab0bbdec9f..2ab64737028b72 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -253,7 +253,7 @@ describe('Credentials', () => {
 
 	it('should render custom node with n8n credential', () => {
 		workflowPage.actions.visit();
-		workflowPage.actions.addNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('E2E Node with native n8n credential', true, true);
 		workflowPage.getters.nodeCredentialsLabel().click();
 		cy.contains('Create New Credential').click();
@@ -263,7 +263,7 @@ describe('Credentials', () => {
 
 	it('should render custom node with custom credential', () => {
 		workflowPage.actions.visit();
-		workflowPage.actions.addNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('E2E Node with custom credential', true, true);
 		workflowPage.getters.nodeCredentialsLabel().click();
 		cy.contains('Create New Credential').click();
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index e70fddc777d20d..4f43684c933529 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,13 +1,16 @@
 import { NodeCreator } from '../pages/features/node-creator';
-import { INodeTypeDescription } from 'n8n-workflow';
 import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
 import { randFirstName, randLastName } from '@ngneat/falso';
+import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
+import { NDV } from '../pages/ndv';
 
 const email = DEFAULT_USER_EMAIL;
 const password = DEFAULT_USER_PASSWORD;
 const firstName = randFirstName();
 const lastName = randLastName();
 const nodeCreatorFeature = new NodeCreator();
+const WorkflowPage = new WorkflowPageClass();
+const NDVModal = new NDV();
 
 describe('Node Creator', () => {
 	before(() => {
@@ -27,30 +30,22 @@ describe('Node Creator', () => {
 
 		nodeCreatorFeature.getters
 			.nodeCreator()
-			.contains('When should this workflow run?')
+			.contains('Select a trigger')
 			.should('be.visible');
 
-		nodeCreatorFeature.getters.nodeCreatorTabs().should('not.exist');
-	});
-
-	it('should see all tabs when opening via plus button', () => {
-		nodeCreatorFeature.actions.openNodeCreator();
-		nodeCreatorFeature.getters.nodeCreatorTabs().should('exist');
-		nodeCreatorFeature.getters.selectedTab().should('have.text', 'Trigger');
 	});
 
 	it('should navigate subcategory', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
-		nodeCreatorFeature.getters.getCreatorItem('On App Event').click();
-		nodeCreatorFeature.getters.activeSubcategory().should('have.text', 'On App Event');
+		nodeCreatorFeature.getters.getCreatorItem('On app event').click();
+		nodeCreatorFeature.getters.activeSubcategory().should('have.text', 'On app event');
 		// Go back
 		nodeCreatorFeature.getters.activeSubcategory().find('button').click();
-		nodeCreatorFeature.getters.activeSubcategory().should('not.exist');
+		nodeCreatorFeature.getters.activeSubcategory().should('not.have.text', 'On app event');
 	});
 
 	it('should search for nodes', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
-		nodeCreatorFeature.getters.selectedTab().should('have.text', 'Trigger');
 
 		nodeCreatorFeature.getters.searchBar().find('input').type('manual');
 		nodeCreatorFeature.getters.creatorItem().should('have.length', 1);
@@ -72,92 +67,63 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.creatorItem().should('have.length', 0);
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear();
-		nodeCreatorFeature.getters.getCreatorItem('On App Event').click();
+		nodeCreatorFeature.getters.getCreatorItem('On app event').click();
 
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('edit image');
-		nodeCreatorFeature.getters.creatorItem().should('have.length', 0);
-		nodeCreatorFeature.getters
-			.noResults()
-			.should('exist')
-			.should('contain.text', 'To see all results, click here');
-
-		nodeCreatorFeature.getters.noResults().contains('click here').click();
-		nodeCreatorFeature.getters.nodeCreatorTabs().should('exist');
+		nodeCreatorFeature.getters.getCreatorItem('Results in other categories (1)').should('exist');
+		nodeCreatorFeature.getters.creatorItem().should('have.length', 2);
 		nodeCreatorFeature.getters.getCreatorItem('Edit Image').should('exist');
-		nodeCreatorFeature.getters.selectedTab().should('have.text', 'All');
-		nodeCreatorFeature.getters.searchBar().find('button').click();
-		nodeCreatorFeature.getters.searchBar().find('input').should('be.empty');
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('edit image123123');
+		nodeCreatorFeature.getters.creatorItem().should('have.length', 0);
 	});
 
-	it('should add manual trigger node', () => {
+	it('should check correct view panels', () => {
 		nodeCreatorFeature.getters.canvasAddButton().click();
-		nodeCreatorFeature.getters.getCreatorItem('Manually').click();
-
-		// TODO: Replace once we have canvas feature utils
-		cy.get('span').contains('Back to canvas').click();
+		WorkflowPage.actions.addNodeToCanvas('Manual', false);
 
 		nodeCreatorFeature.getters.canvasAddButton().should('not.be.visible');
 		nodeCreatorFeature.getters.nodeCreator().should('not.exist');
 
 		// TODO: Replace once we have canvas feature utils
-		cy.get('div').contains('Add first step').should('exist');
-	});
-	it('check if non-core nodes are rendered', () => {
-		cy.wait('@nodesIntercept').then((interception) => {
-			const nodes = interception.response?.body as INodeTypeDescription[];
+		cy.get('div').contains('Add first step').should('be.hidden');
+		nodeCreatorFeature.actions.openNodeCreator()
+		nodeCreatorFeature.getters
+			.nodeCreator()
+			.contains('What happens next?')
+			.should('be.visible');
 
-			const categorizedNodes = nodeCreatorFeature.actions.categorizeNodes(nodes);
-			nodeCreatorFeature.actions.openNodeCreator();
-			nodeCreatorFeature.actions.selectTab('All');
-
-			const categories = Object.keys(categorizedNodes);
-			categories.forEach((category: string) => {
-				// Core Nodes contains subcategories which we'll test separately
-				if (category === 'Core Nodes') return;
-
-				nodeCreatorFeature.actions.toggleCategory(category);
-
-				// Check if all nodes are present
-				nodeCreatorFeature.getters.nodeItemName().then(($elements) => {
-					const visibleNodes: string[] = [];
-					$elements.each((_, element) => {
-						visibleNodes.push(element.textContent?.trim() || '');
-					});
-					const visibleCategoryNodes = (categorizedNodes[category] as INodeTypeDescription[])
-						.filter((node) => !node.hidden)
-						.map((node) => node.displayName?.trim());
-
-					cy.wrap(visibleCategoryNodes).each((categoryNode: string) => {
-						expect(visibleNodes).to.include(categoryNode);
-					});
-				});
-
-				nodeCreatorFeature.actions.toggleCategory(category);
-			});
-		});
+			nodeCreatorFeature.getters.getCreatorItem('Add another trigger').click();
+			nodeCreatorFeature.getters.nodeCreator().contains('Select a trigger').should('be.visible');
+			nodeCreatorFeature.getters.activeSubcategory().find('button').should('exist');
+			nodeCreatorFeature.getters.activeSubcategory().find('button').click();
+			nodeCreatorFeature.getters
+				.nodeCreator()
+				.contains('What happens next?')
+				.should('be.visible');
 	});
 
+	it('should add node to canvas from actions panel', () => {
+		const editImageNode = 'Edit Image';
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type(editImageNode);
+		nodeCreatorFeature.getters.getCreatorItem(editImageNode).click();
+		nodeCreatorFeature.getters.activeSubcategory().should('have.text', editImageNode);
+		nodeCreatorFeature.getters.getCreatorItem('Crop Image').click();
+		NDVModal.getters.parameterInput('operation').should('contain.text', 'Crop');
+	})
+
 	it('should render and select community node', () => {
 		cy.intercept('GET', '/types/nodes.json').as('nodesIntercept');
 		cy.wait('@nodesIntercept').then(() => {
-			const customCategory = 'Custom Category';
 			const customNode = 'E2E Node';
-			const customNodeDescription = 'Demonstrate rendering of node';
 
 			nodeCreatorFeature.actions.openNodeCreator();
-			nodeCreatorFeature.actions.selectTab('All');
-
-			nodeCreatorFeature.getters.getCreatorItem(customCategory).should('exist');
+			nodeCreatorFeature.getters.searchBar().find('input').clear().type(customNode);
 
-			nodeCreatorFeature.actions.toggleCategory(customCategory);
 			nodeCreatorFeature.getters
 				.getCreatorItem(customNode)
 				.findChildByTestId('node-creator-item-tooltip')
 				.should('exist');
-			nodeCreatorFeature.getters
-				.getCreatorItem(customNode)
-				.contains(customNodeDescription)
-				.should('exist');
 			nodeCreatorFeature.actions.selectNode(customNode);
 
 			// TODO: Replace once we have canvas feature utils
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index c0e12a6ba2bb7a..350ad3a185e395 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -17,7 +17,7 @@ describe('NDV', () => {
 
 
 	it('should show up when double clicked on a node and close when Back to canvas clicked', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addInitialNodeToCanvas('Manual');
 		workflowPage.getters.canvasNodes().first().dblclick();
 		ndv.getters.container().should('be.visible');
 		ndv.getters.backToCanvas().click();
@@ -67,8 +67,8 @@ describe('NDV', () => {
 	});
 
 	it('should show validation errors only after blur or re-opening of NDV', () => {
-		workflowPage.actions.addNodeToCanvas('Manual Trigger');
-		workflowPage.actions.addNodeToCanvas('Airtable', true, true);
+		workflowPage.actions.addNodeToCanvas('Manual');
+		workflowPage.actions.addNodeToCanvas('Airtable', true, true, 'Read data from a table');
 		ndv.getters.container().should('be.visible');
 		cy.get('.has-issues').should('have.length', 0);
 		ndv.getters.parameterInput('table').find('input').eq(1).focus().blur();
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index b833eed003b1a3..540e4825a0f96f 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -12,7 +12,7 @@ describe('Code node', () => {
 
 	it('should execute the placeholder in all-items mode successfully', () => {
 		WorkflowPage.actions.visit();
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
 		WorkflowPage.actions.addNodeToCanvas('Code');
 		WorkflowPage.actions.openNode('Code');
 
@@ -23,7 +23,7 @@ describe('Code node', () => {
 
 	it('should execute the placeholder in each-item mode successfully', () => {
 		WorkflowPage.actions.visit();
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
 		WorkflowPage.actions.addNodeToCanvas('Code');
 		WorkflowPage.actions.openNode('Code');
 		ndv.getters.parameterInput('mode').click();
diff --git a/cypress/e2e/8-http-request-node.cy.ts b/cypress/e2e/8-http-request-node.cy.ts
index eb4d93c1713e4c..cc62b5182fba66 100644
--- a/cypress/e2e/8-http-request-node.cy.ts
+++ b/cypress/e2e/8-http-request-node.cy.ts
@@ -14,7 +14,7 @@ describe('HTTP Request node', () => {
 		cy.visit(workflowsPage.url);
 
 		workflowsPage.actions.createWorkflowFromCard();
-		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+		workflowPage.actions.addInitialNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('HTTP Request');
 		workflowPage.actions.openNode('HTTP Request');
 		ndv.actions.typeIntoParameterInput('url', 'https://catfact.ninja/fact');
diff --git a/cypress/e2e/9-expression-editor-modal.cy.ts b/cypress/e2e/9-expression-editor-modal.cy.ts
index 1a8909872de5f0..957c0505f55057 100644
--- a/cypress/e2e/9-expression-editor-modal.cy.ts
+++ b/cypress/e2e/9-expression-editor-modal.cy.ts
@@ -10,13 +10,14 @@ describe('Expression editor modal', () => {
 
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
-		WorkflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
+		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
 		WorkflowPage.actions.addNodeToCanvas('Hacker News');
 		WorkflowPage.actions.openNode('Hacker News');
 		WorkflowPage.actions.openExpressionEditorModal();
 	});
 
 	it('should resolve primitive resolvables', () => {
+		WorkflowPage.getters.expressionModalInput().clear();
 		WorkflowPage.getters.expressionModalInput().type('{{ 1 + 2');
 		WorkflowPage.getters.expressionModalOutput().contains(/^3$/);
 		WorkflowPage.getters.expressionModalInput().clear();
@@ -31,6 +32,7 @@ describe('Expression editor modal', () => {
 	});
 
 	it('should resolve object resolvables', () => {
+		WorkflowPage.getters.expressionModalInput().clear();
 		WorkflowPage.getters
 			.expressionModalInput()
 			.type('{{ { a : 1 }', { parseSpecialCharSequences: false });
@@ -45,6 +47,7 @@ describe('Expression editor modal', () => {
 	});
 
 	it('should resolve array resolvables', () => {
+		WorkflowPage.getters.expressionModalInput().clear();
 		WorkflowPage.getters.expressionModalInput().type('{{ [1, 2, 3]');
 		WorkflowPage.getters.expressionModalOutput().contains(/^\[Array: \[1,2,3\]\]$/);
 
@@ -55,7 +58,8 @@ describe('Expression editor modal', () => {
 	});
 
 	it('should resolve $parameter[]', () => {
+		WorkflowPage.getters.expressionModalInput().clear();
 		WorkflowPage.getters.expressionModalInput().type('{{ $parameter["operation"]');
-		WorkflowPage.getters.expressionModalOutput().contains(/^get$/);
+		WorkflowPage.getters.expressionModalOutput().contains(/^getAll$/);
 	});
 });
diff --git a/cypress/pages/canvas-node.ts b/cypress/pages/canvas-node.ts
deleted file mode 100644
index b0d0032320e5d7..00000000000000
--- a/cypress/pages/canvas-node.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { BasePage } from './base';
-
-export class CanvasNode extends BasePage {
-	getters = {
-		nodes: () => cy.getByTestId('canvas-node'),
-		nodeByName: (nodeName: string) =>
-			this.getters.nodes().filter(`:contains("${nodeName}")`),
-	};
-
-	actions = {
-		openNode: (nodeName: string) => {
-			this.getters.nodeByName(nodeName).eq(0).dblclick();
-		},
-	};
-}
diff --git a/cypress/pages/features/node-creator.ts b/cypress/pages/features/node-creator.ts
index 7db317a48e48eb..0899b188d57350 100644
--- a/cypress/pages/features/node-creator.ts
+++ b/cypress/pages/features/node-creator.ts
@@ -31,9 +31,6 @@ export class NodeCreator extends BasePage {
 		selectNode: (displayName: string) => {
 			this.getters.getCreatorItem(displayName).click();
 		},
-		selectTab: (tab: string) => {
-			this.getters.nodeCreatorTabs().contains(tab).click();
-		},
 		toggleCategory: (category: string) => {
 			this.getters.getCreatorItem(category).click();
 		},
diff --git a/cypress/pages/index.ts b/cypress/pages/index.ts
index 7b4c1e09319bf6..35ef30d5ec005d 100644
--- a/cypress/pages/index.ts
+++ b/cypress/pages/index.ts
@@ -9,4 +9,3 @@ export * from './settings-users';
 export * from './settings-log-streaming';
 export * from './sidebar';
 export * from './ndv';
-export * from './canvas-node';
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 9cc0285a4fbf69..94b648ccf48895 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -19,7 +19,7 @@ export class NDV extends BasePage {
 		digital: () => cy.getByTestId('ndv-run-data-display-mode'),
 		pinDataButton: () => cy.getByTestId('ndv-pin-data'),
 		editPinnedDataButton: () => cy.getByTestId('ndv-edit-pinned-data'),
-		pinnedDataEditor: () => this.getters.outputPanel().find('.monaco-editor'),
+		pinnedDataEditor: () => this.getters.outputPanel().find('.monaco-editor[role=code]'),
 		runDataPaneHeader: () => cy.getByTestId('run-data-pane-header'),
 		savePinnedDataButton: () => this.getters.runDataPaneHeader().find('button').contains('Save'),
 		outputTableRows: () => this.getters.outputDataContainer().find('table tr'),
@@ -71,10 +71,9 @@ export class NDV extends BasePage {
 		setPinnedData: (data: object) => {
 			this.getters.editPinnedDataButton().click();
 
-			const editor = this.getters.pinnedDataEditor();
-			editor.click();
-			editor.type(`{selectall}{backspace}`);
-			editor.type(JSON.stringify(data).replace(new RegExp('{', 'g'), '{{}'));
+			this.getters.pinnedDataEditor().click();
+			this.getters.pinnedDataEditor().type(`{selectall}{backspace}`);
+			this.getters.pinnedDataEditor().type(JSON.stringify(data).replace(new RegExp('{', 'g'), '{{}'));
 
 			this.actions.savePinnedData();
 		},
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index bf150e038a4d8e..2094726db8be7b 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -24,7 +24,7 @@ export class WorkflowPage extends BasePage {
 		canvasPlusButton: () => cy.getByTestId('canvas-plus-button'),
 		canvasNodes: () => cy.getByTestId('canvas-node'),
 		canvasNodeByName: (nodeName: string) =>
-			this.getters.canvasNodes().filter(`:contains("${nodeName}")`),
+			this.getters.canvasNodes().filter(`:contains(${nodeName})`),
 		getEndpointSelector: (type: 'input' | 'output' | 'plus', nodeName: string, index = 0) => {
 			return `[data-endpoint-name='${nodeName}'][data-endpoint-type='${type}'][data-input-index='${index}']`;
 		},
@@ -124,6 +124,7 @@ export class WorkflowPage extends BasePage {
 			nodeDisplayName: string,
 			plusButtonClick = true,
 			preventNdvClose?: boolean,
+			action?: string,
 		) => {
 			if (plusButtonClick) {
 				this.getters.nodeCreatorPlusButton().click();
@@ -131,11 +132,21 @@ export class WorkflowPage extends BasePage {
 
 			this.getters.nodeCreatorSearchBar().type(nodeDisplayName);
 			this.getters.nodeCreatorSearchBar().type('{enter}');
+			cy.wait(500)
+			cy.get('body').then((body) => {
+				if(body.find('[data-test-id=node-creator]').length > 0) {
+					if(action) {
+						cy.contains(action).click()
+					} else {
+						cy.getByTestId('item-iterator-item').eq(1).click()
+					}
+				}
+			})
 
 			if (!preventNdvClose) cy.get('body').type('{esc}');
 		},
 		openNode: (nodeTypeName: string) => {
-			this.getters.canvasNodeByName(nodeTypeName).dblclick();
+			this.getters.canvasNodeByName(nodeTypeName).first().dblclick();
 		},
 		openExpressionEditorModal: () => {
 			cy.contains('Expression').invoke('show').click();
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
index 4e0aef14a932f6..ebac11ac37641e 100644
--- a/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
+++ b/packages/design-system/src/components/N8nNodeCreatorNode/NodeCreatorNode.vue
@@ -13,7 +13,7 @@
 		<div>
 			<div :class="$style.details">
 				<span :class="$style.name" v-text="title" data-test-id="node-creator-item-name" />
-				<trigger-icon v-if="isTrigger" :class="$style.triggerIcon" />
+				<font-awesome-icon icon="bolt" v-if="isTrigger" size="xs" :class="$style.triggerIcon" />
 				<n8n-tooltip
 					v-if="!!$slots.tooltip"
 					placement="top"
@@ -36,7 +36,6 @@
 
 <script setup lang="ts">
 import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
-import TriggerIcon from './TriggerIcon.vue';
 import N8nTooltip from '../N8nTooltip';
 
 export interface Props {
@@ -60,14 +59,14 @@ defineEmits<{
 	align-items: center;
 	cursor: pointer;
 	z-index: 1;
-	padding: 11px 8px 11px 0;
+	padding: var(--spacing-xs) var(--spacing-2xs) var(--spacing-xs) 0;
 
 	&.hasAction {
 		user-select: none;
 	}
 }
 .creatorNode:hover .panelIcon {
-	color: var(--color-text-light);
+	color: var(--action-arrow-color-hover, var(--color-text-light));
 }
 
 .panelIcon {
@@ -76,7 +75,7 @@ defineEmits<{
 	justify-content: flex-end;
 	align-items: center;
 	margin-left: var(--spacing-2xs);
-	color: var(--color-text-lighter);
+	color: var(--action-arrow-color, var(--color-text-lighter));
 	cursor: pointer;
 	background: transparent;
 	border: none;
@@ -110,11 +109,12 @@ defineEmits<{
 	font-size: var(--font-size-2xs);
 	line-height: 1rem;
 	font-weight: 400;
-	color: var(--node-creator-description-colo, var(--color-text-base));
+	color: var(--node-creator-description-colos, var(--color-text-base));
 }
 
 .triggerIcon {
-	margin-left: var(--spacing-2xs);
+	margin-left: var(--spacing-3xs);
+	color: var(--color-primary);
 }
 </style>
 
diff --git a/packages/design-system/src/components/N8nNodeCreatorNode/TriggerIcon.vue b/packages/design-system/src/components/N8nNodeCreatorNode/TriggerIcon.vue
deleted file mode 100644
index dda6b227e72ec2..00000000000000
--- a/packages/design-system/src/components/N8nNodeCreatorNode/TriggerIcon.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-	<span :class="$style.trigger">
-		<svg
-			width="36px"
-			height="36px"
-			viewBox="0 0 36 36"
-			version="1.1"
-			xmlns="http://www.w3.org/2000/svg"
-			xmlns:xlink="http://www.w3.org/1999/xlink"
-		>
-			<title>Trigger node</title>
-			<g
-				id="/integrations-(V1-feature)"
-				stroke="none"
-				stroke-width="1"
-				fill="none"
-				fill-rule="evenodd"
-			>
-				<g
-					id="Individual-node-view"
-					transform="translate(-304.000000, -137.000000)"
-					fill-rule="nonzero"
-				>
-					<g id="left-column" transform="translate(120.000000, 131.000000)">
-						<g id="trigger-badge" transform="translate(178.000000, 0.000000)">
-							<g id="trigger-icon" transform="translate(6.857143, 6.857143)">
-								<g id="Icon" transform="translate(8.571429, 0.000000)" fill="#FF6150">
-									<polygon
-										id="Icon-Path"
-										points="7.14285714 21.4285714 0 21.4285714 10 1.42857143 10 12.8571429 17.1428571 12.8571429 7.14285714 32.8571429"
-									></polygon>
-								</g>
-								<rect id="ViewBox" x="0" y="0" width="34.2857143" height="34.2857143"></rect>
-							</g>
-						</g>
-					</g>
-				</g>
-			</g>
-		</svg>
-	</span>
-</template>
-
-<script lang="ts">
-export default {
-	name: 'TriggerIcon',
-};
-</script>
-
-<style lang="scss" module>
-.trigger {
-	background-color: var(--trigger-icon-background-color, var(--color-background-xlight));
-	border: 1px solid var(--trigger-icon-border-color, var(--color-background-xlight));
-	border-radius: 4px;
-	height: 16px;
-	width: 16px;
-	display: inline-block;
-	vertical-align: middle;
-	line-height: 16px;
-
-	> svg {
-		width: 100%;
-		height: 100%;
-	}
-}
-</style>
diff --git a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
index 80948018a34275..5520a1870d9f56 100644
--- a/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
+++ b/packages/design-system/src/components/N8nNodeIcon/NodeIcon.vue
@@ -12,7 +12,7 @@
 			<!-- ElementUI tooltip is prone to memory-leaking so we only render it if we really need it -->
 			<n8n-tooltip placement="top" :disabled="!showTooltip" v-if="showTooltip">
 				<template #content>{{ nodeTypeName }}</template>
-				<div v-if="type !== 'unknown'" :class="$style['icon']">
+				<div v-if="type !== 'unknown'" :class="$style.icon">
 					<img v-if="type === 'file'" :src="src" :class="$style.nodeIconImage" />
 					<font-awesome-icon v-else :icon="name" :style="fontStyleData" />
 				</div>
@@ -103,11 +103,11 @@ export default Vue.extend({
 
 <style lang="scss" module>
 .nodeIconWrapper {
-	width: 26px;
-	height: 26px;
+	width: var(--node-icon-size, 26px);
+	height: var(--node-icon-size, 26px);
 	border-radius: var(--border-radius-small);
-	color: #444;
-	line-height: 26px;
+	color: var(--node-icon-color, #444);
+	line-height: var(--node-icon-size, 26px);
 	font-size: 1.1em;
 	overflow: hidden;
 	text-align: center;
diff --git a/packages/editor-ui/public/suggestednodes.png b/packages/editor-ui/public/suggestednodes.png
deleted file mode 100644
index 6db63d5b2a7363a8893c0466b44afacf83d7d100..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 90624
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%0ATu%0dLSPP^CrvHdgIa7_HjT`I8%wRN
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
KMNUMnLSTYF;MigS

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 7d85aa9e35c871..2a972f8ba12fbe 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -31,8 +31,8 @@ import {
 	IExecutionsSummary,
 	IAbstractEventMessage,
 } from 'n8n-workflow';
-import { FAKE_DOOR_FEATURES } from './constants';
 import { SignInType } from './constants';
+import { FAKE_DOOR_FEATURES, TRIGGER_NODE_FILTER, REGULAR_NODE_FILTER } from './constants';
 import { BulkCommand, Undoable } from '@/models/history';
 
 export * from 'n8n-design-system/types';
@@ -758,13 +758,15 @@ export interface ISubcategoryItemProps {
 	subcategory: string;
 	description: string;
 	key?: string;
+	iconType: string;
 	icon?: string;
 	defaults?: INodeParameters;
-	iconData?: {
-		type: string;
-		icon?: string;
-		fileBuffer?: string;
-	};
+}
+export interface ViewItemProps {
+	withTopBorder: boolean;
+	title: string;
+	description: string;
+	icon: string;
 }
 
 export interface INodeItemProps {
@@ -779,10 +781,11 @@ export interface IActionItemProps {
 
 export interface ICategoryItemProps {
 	expanded: boolean;
+	category: string;
+	name: string;
 }
 
 export interface CreateElementBase {
-	category: string;
 	key: string;
 	includedByTrigger?: boolean;
 	includedByRegular?: boolean;
@@ -790,6 +793,7 @@ export interface CreateElementBase {
 
 export interface NodeCreateElement extends CreateElementBase {
 	type: 'node';
+	category?: string[];
 	properties: INodeItemProps;
 }
 
@@ -802,9 +806,14 @@ export interface SubcategoryCreateElement extends CreateElementBase {
 	type: 'subcategory';
 	properties: ISubcategoryItemProps;
 }
+export interface ViewCreateElement extends CreateElementBase {
+	type: 'view';
+	properties: ViewItemProps;
+}
 
 export interface ActionCreateElement extends CreateElementBase {
 	type: 'action';
+	category: string;
 	properties: IActionItemProps;
 }
 
@@ -812,6 +821,7 @@ export type INodeCreateElement =
 	| NodeCreateElement
 	| CategoryCreateElement
 	| SubcategoryCreateElement
+	| ViewCreateElement
 	| ActionCreateElement;
 
 export interface ICategoriesWithNodes {
@@ -1110,13 +1120,13 @@ export type IFakeDoorLocation =
 	| 'credentialsModal'
 	| 'workflowShareModal';
 
-export type INodeFilterType = 'Regular' | 'Trigger' | 'All';
+export type INodeFilterType = typeof REGULAR_NODE_FILTER | typeof TRIGGER_NODE_FILTER;
 
 export interface INodeCreatorState {
 	itemsFilter: string;
-	showTabs: boolean;
 	showScrim: boolean;
-	selectedType: INodeFilterType;
+	rootViewHistory: INodeFilterType[];
+	selectedView: INodeFilterType;
 }
 
 export interface ISettingsState {
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 03a498c8ef947b..203563af6ccf7b 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -1,6 +1,6 @@
 <template>
 	<div
-		class="node-wrapper"
+		:class="{ 'node-wrapper': true, 'node-wrapper--trigger': isTriggerNode }"
 		:style="nodePosition"
 		:id="nodeId"
 		data-test-id="canvas-node"
@@ -22,6 +22,9 @@
 				v-touch:start="touchStart"
 				v-touch:end="touchEnd"
 			>
+				<i class="trigger-icon">
+					<font-awesome-icon icon="bolt" size="lg" v-if="isTriggerNode" />
+				</i>
 				<div
 					v-if="!data.disabled"
 					:class="{ 'node-info-icon': true, 'shift-icon': shiftOutputCount }"
@@ -196,6 +199,7 @@ import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { EnableNodeToggleCommand } from '@/models/history';
+import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 
 export default mixins(
 	externalHooks,
@@ -208,6 +212,7 @@ export default mixins(
 	name: 'Node',
 	components: {
 		TitledList,
+		FontAwesomeIcon,
 		NodeIcon,
 	},
 	props: {
@@ -673,7 +678,6 @@ export default mixins(
 			border: 2px solid var(--color-foreground-xdark);
 			border-radius: var(--border-radius-large);
 			background-color: var(--color-background-xlight);
-
 			&.executing {
 				background-color: var(--color-primary-tint-3) !important;
 
@@ -793,6 +797,22 @@ export default mixins(
 			}
 		}
 	}
+	&--trigger .node-default .node-box {
+		border-radius: 32px 8px 8px 32px;
+	}
+	.trigger-icon {
+		position: absolute;
+		right: 100%;
+		top: 0;
+		bottom: 0;
+		margin: auto;
+		color: var(--color-primary);
+		align-items: center;
+		justify-content: center;
+		height: fit-content;
+		// Increase click radius of the bolt icon
+		padding: var(--spacing-2xs);
+	}
 }
 
 .select-background {
@@ -810,6 +830,10 @@ export default mixins(
 	top: -8px !important;
 	height: 116px;
 	width: 116px !important;
+
+	.node-wrapper--trigger & {
+		border-radius: 36px 8px 8px 36px;
+	}
 }
 
 .disabled-linethrough {
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue b/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
index 2455b1e7a75590..99fad864d1cac5 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
@@ -5,111 +5,78 @@
 			tabindex="0"
 			data-test-id="categorized-items"
 			:class="$style.categorizedItems"
-			:key="`${activeSubcategoryTitle}_transition`"
+			:key="`${activeSubcategoryTitle + selectedViewType}_transition`"
 			@keydown.capture="nodeFilterKeyDown"
 		>
-			<div v-if="$slots.header">
-				<slot name="header" />
-			</div>
-
 			<div
-				:class="$style.subcategoryHeader"
-				v-if="activeSubcategory"
+				:class="{
+					[$style.header]: true,
+					[$style.headerWithBackground]: activeSubcategory,
+				}"
 				data-test-id="categorized-items-subcategory"
 			>
-				<button :class="$style.subcategoryBackButton" @click="onSubcategoryClose">
+				<button
+					:class="$style.backButton"
+					@click="onBackButton"
+					v-if="isViewNavigated || activeSubcategory"
+				>
 					<font-awesome-icon :class="$style.subcategoryBackIcon" icon="arrow-left" size="2x" />
 				</button>
-				<node-icon
-					v-if="showSubcategoryIcon && activeSubcategory.properties.nodeType"
-					:class="$style.nodeIcon"
-					:nodeType="activeSubcategory.properties.nodeType"
-					:size="16"
-					:shrink="false"
-				/>
-				<span v-text="activeSubcategoryTitle" />
+				<div v-if="isRootView && $slots.header">
+					<slot name="header" />
+				</div>
+				<template v-if="activeSubcategory">
+					<n8n-node-icon
+						:class="$style.nodeIcon"
+						v-if="showSubcategoryIcon && activeSubcategory.properties.icon"
+						:type="activeSubcategory.properties.iconType || 'unknown'"
+						:src="activeSubcategory.properties.icon"
+						:name="activeSubcategory.properties.icon"
+						:color="activeSubcategory.properties.color"
+						:circle="false"
+						:showTooltip="false"
+						:size="16"
+					/>
+					<span v-text="activeSubcategoryTitle" />
+				</template>
+			</div>
+			<div
+				v-if="isRootView && $slots.description"
+				:class="{
+					[$style.description]: true,
+					[$style.descriptionOffset]: isViewNavigated || activeSubcategory,
+				}"
+			>
+				<slot name="description" />
 			</div>
 
 			<search-bar
 				v-if="alwaysShowSearch || isSearchVisible"
-				:key="nodeCreatorStore.selectedType"
-				:value="nodeCreatorStore.itemsFilter"
+				:key="nodeCreatorStore.selectedView"
+				:value="searchFilter"
 				:placeholder="
 					searchPlaceholder
 						? searchPlaceholder
 						: $locale.baseText('nodeCreator.searchBar.searchNodes')
 				"
-				ref="searchBar"
 				@input="onNodeFilterChange"
 			/>
 
-			<template v-if="searchFilter.length > 0 && filteredNodeTypes.length === 0">
-				<no-results
-					data-test-id="categorized-no-results"
-					:showRequest="
-						!$slots.noResultsTitle && !$slots.noResultsAction && filteredAllNodeTypes.length === 0
-					"
-					:show-icon="
-						!$slots.noResultsTitle && !$slots.noResultsAction && filteredAllNodeTypes.length === 0
-					"
-				>
-					<template v-if="$slots.noResultsTitle" #title>
-						<slot name="noResultsTitle" />
-					</template>
-					<!-- There are results in other sub-categories/tabs  -->
-					<template v-else-if="filteredAllNodeTypes.length > 0" #title>
-						<p v-html="$locale.baseText('nodeCreator.noResults.clickToSeeResults')" />
-					</template>
-					<template v-else #title>
-						<p v-text="$locale.baseText('nodeCreator.noResults.weDidntMakeThatYet')" />
-					</template>
-
-					<template v-if="$slots.noResultsAction" #action>
-						<slot name="noResultsAction" />
-					</template>
-					<template v-else-if="filteredAllNodeTypes.length === 0" #action>
-						{{ $locale.baseText('nodeCreator.noResults.dontWorryYouCanProbablyDoItWithThe') }}
-						<n8n-link
-							@click="selectHttpRequest"
-							v-if="[REGULAR_NODE_FILTER, ALL_NODE_FILTER].includes(nodeCreatorStore.selectedType)"
-						>
-							{{ $locale.baseText('nodeCreator.noResults.httpRequest') }}
-						</n8n-link>
-						<template v-if="nodeCreatorStore.selectedType === ALL_NODE_FILTER">
-							{{ $locale.baseText('nodeCreator.noResults.or') }}
-						</template>
-
-						<n8n-link
-							@click="selectWebhook"
-							v-if="[TRIGGER_NODE_FILTER, ALL_NODE_FILTER].includes(nodeCreatorStore.selectedType)"
-						>
-							{{ $locale.baseText('nodeCreator.noResults.webhook') }}
-						</n8n-link>
-						{{ $locale.baseText('nodeCreator.noResults.node') }}
-					</template>
-
-					<n8n-link
-						@click="selectWebhook"
-						v-if="[TRIGGER_NODE_FILTER, ALL_NODE_FILTER].includes(nodeCreatorStore.selectedType)"
-					>
-						{{ $locale.baseText('nodeCreator.noResults.webhook') }}
-						{{ $locale.baseText('nodeCreator.noResults.node') }}
-					</n8n-link>
-				</no-results>
-			</template>
-			<div :class="$style.scrollable" ref="scrollableContainer" v-else>
+			<div :class="$style.scrollable" ref="scrollableContainer">
 				<item-iterator
-					:elements="searchFilter.length === 0 ? renderedItems : filteredNodeTypes"
+					:elements="searchFilter.length === 0 ? renderedItems : mergedFilteredNodes"
 					:activeIndex="activeSubcategory ? activeSubcategoryIndex : activeIndex"
 					:with-actions-getter="withActionsGetter"
-					:lazyRender="lazyRender"
-					:enable-global-categories-counter="enableGlobalCategoriesCounter"
+					:with-description-getter="withDescriptionGetter"
+					:lazyRender="true"
 					@selected="selected"
 					@actionsOpen="$listeners.actionsOpen"
 					@nodeTypeSelected="$listeners.nodeTypeSelected"
-				>
-				</item-iterator>
-				<div :class="$style.footer" v-if="$slots.footer">
+				/>
+				<div v-if="searchFilter.length > 0 && mergedFilteredNodes.length === 0">
+					<slot name="noResults" />
+				</div>
+				<div :class="$style.footer" v-else-if="$slots.footer">
 					<slot name="footer" />
 				</div>
 			</div>
@@ -121,7 +88,6 @@
 import {
 	computed,
 	reactive,
-	onMounted,
 	watch,
 	getCurrentInstance,
 	toRefs,
@@ -130,30 +96,19 @@ import {
 	nextTick,
 } from 'vue';
 import camelcase from 'lodash.camelcase';
-
 import { externalHooks } from '@/mixins/externalHooks';
-import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
 import { INodeTypeDescription } from 'n8n-workflow';
 import ItemIterator from './ItemIterator.vue';
-import NoResults from './NoResults.vue';
 import SearchBar from './SearchBar.vue';
-import NodeIcon from '@/components/NodeIcon.vue';
 import {
 	INodeCreateElement,
 	ISubcategoryItemProps,
 	ICategoryItemProps,
-	ICategoriesWithNodes,
 	SubcategoryCreateElement,
 	NodeCreateElement,
+	CategoryCreateElement,
+	INodeItemProps,
 } from '@/Interface';
-import {
-	WEBHOOK_NODE_TYPE,
-	HTTP_REQUEST_NODE_TYPE,
-	ALL_NODE_FILTER,
-	TRIGGER_NODE_FILTER,
-	REGULAR_NODE_FILTER,
-	NODE_TYPE_COUNT_MAPPER,
-} from '@/constants';
 import { BaseTextKey } from '@/plugins/i18n';
 import { sublimeSearch, matchesNodeType, matchesSelectType } from '@/utils';
 import { useWorkflowsStore } from '@/stores/workflows';
@@ -161,45 +116,38 @@ import { useRootStore } from '@/stores/n8nRootStore';
 import { useNodeCreatorStore } from '@/stores/nodeCreator';
 
 export interface Props {
-	flatten?: boolean;
-	filterByType?: boolean;
 	showSubcategoryIcon?: boolean;
 	alwaysShowSearch?: boolean;
-	expandAllCategories?: boolean;
-	enableGlobalCategoriesCounter?: boolean;
+	hideOtherCategoryItems?: boolean;
+
 	lazyRender?: boolean;
 	searchPlaceholder?: string;
 	withActionsGetter?: (element: NodeCreateElement) => boolean;
+	withDescriptionGetter?: (element: NodeCreateElement) => boolean;
 	searchItems?: INodeCreateElement[];
-	excludedSubcategories?: string[];
 	firstLevelItems?: INodeCreateElement[];
-	initialActiveCategories?: string[];
-	initialActiveIndex?: number;
 	categorizedItems: INodeCreateElement[];
-	allItems: INodeCreateElement[];
-	categoriesWithNodes: ICategoriesWithNodes;
 	subcategoryOverride?: SubcategoryCreateElement | undefined;
+	allItems?: INodeCreateElement[];
 }
 
+const OTHER_RESULT_CATEGORY = 'searchAll';
 const props = withDefaults(defineProps<Props>(), {
-	filterByType: true,
+	allItems: () => [],
 	searchItems: () => [],
-	excludedSubcategories: () => [],
 	firstLevelItems: () => [],
-	initialActiveCategories: () => [],
 });
 
 const emit = defineEmits<{
 	(event: 'subcategoryClose', value: INodeCreateElement[]): void;
 	(event: 'onSubcategorySelected', value: INodeCreateElement): void;
 	(event: 'nodeTypeSelected', value: string[]): void;
+
 	(event: 'actionSelected', value: INodeCreateElement): void;
 	(event: 'actionsOpen', value: INodeTypeDescription): void;
 }>();
 
 const instance = getCurrentInstance();
-const { registerCustomAction, unregisterCustomAction } = useGlobalLinkActions();
-
 const { $externalHooks } = new externalHooks();
 
 const { defaultLocale } = useRootStore();
@@ -207,7 +155,7 @@ const { workflowId } = useWorkflowsStore();
 const nodeCreatorStore = useNodeCreatorStore();
 
 const state = reactive({
-	activeCategory: props.initialActiveCategories,
+	activeCategories: [] as string[],
 	// Keep track of activated subcategories so we could traverse back more than one level
 	activeSubcategoryHistory: [] as Array<{
 		scrollPosition: number;
@@ -215,22 +163,23 @@ const state = reactive({
 		activeIndex: number;
 		filter: string;
 	}>,
-	activeIndex: props.initialActiveIndex || 0,
+	activeIndex: 0,
 	activeSubcategoryIndex: 0,
-	ALL_NODE_FILTER,
-	TRIGGER_NODE_FILTER,
-	REGULAR_NODE_FILTER,
 	mainPanelContainer: null as HTMLElement | null,
 	transitionDirection: 'in',
 });
 const searchBar = ref<InstanceType<typeof SearchBar>>();
 const scrollableContainer = ref<InstanceType<typeof HTMLElement>>();
 
-const activeSubcategory = computed<INodeCreateElement | null>(
-	() =>
-		state.activeSubcategoryHistory[state.activeSubcategoryHistory.length - 1]?.subcategory || null,
-);
+const activeSubcategory = computed<INodeCreateElement | null>(() => {
+	return (
+		state.activeSubcategoryHistory[state.activeSubcategoryHistory.length - 1]?.subcategory || null
+	);
+});
 
+const categoriesKeys = computed(() =>
+	props.categorizedItems.filter((item) => item.type === 'category').map((item) => item.key),
+);
 const activeSubcategoryTitle = computed<string>(() => {
 	if (!activeSubcategory.value || !activeSubcategory.value.properties) return '';
 
@@ -252,12 +201,7 @@ const activeSubcategoryTitle = computed<string>(() => {
 
 const searchFilter = computed<string>(() => nodeCreatorStore.itemsFilter.toLowerCase().trim());
 
-const matchedTypeNodes = computed<INodeCreateElement[]>(() => {
-	if (!props.filterByType) return props.searchItems;
-	return props.searchItems.filter((el: INodeCreateElement) =>
-		matchesSelectType(el, nodeCreatorStore.selectedType),
-	);
-});
+const selectedViewType = computed(() => nodeCreatorStore.selectedView);
 
 const filteredNodeTypes = computed<INodeCreateElement[]>(() => {
 	const filter = searchFilter.value;
@@ -267,121 +211,151 @@ const filteredNodeTypes = computed<INodeCreateElement[]>(() => {
 		returnItems = props.searchItems.filter((el: INodeCreateElement) => {
 			return (
 				filter &&
-				matchesSelectType(el, nodeCreatorStore.selectedType) &&
+				matchesSelectType(el, nodeCreatorStore.selectedView) &&
 				matchesNodeType(el, filter)
 			);
 		});
 	} else {
-		const matchingNodes = props.filterByType
-			? props.searchItems.filter((el) => matchesSelectType(el, nodeCreatorStore.selectedType))
-			: props.searchItems;
+		const matchingNodes =
+			subcategorizedItems.value.length > 0 ? subcategorizedItems.value : props.searchItems;
 
-		const matchedCategorizedNodes = sublimeSearch<INodeCreateElement>(filter, matchingNodes, [
-			{ key: 'properties.nodeType.displayName', weight: 2 },
-			{ key: 'properties.nodeType.codex.alias', weight: 1 },
-		]);
-		returnItems = matchedCategorizedNodes.map(({ item }) => item);
+		returnItems = getFilteredNodes(matchingNodes);
 	}
-
 	return returnItems;
 });
 
-const filteredAllNodeTypes = computed<INodeCreateElement[]>(() => {
-	if (filteredNodeTypes.value.length > 0) return [];
+const isViewNavigated = computed(() => nodeCreatorStore.rootViewHistory.length > 1);
 
-	const matchedAllNodex = props.allItems.filter((el: INodeCreateElement) => {
-		return searchFilter.value && el.type === 'node' && matchesNodeType(el, searchFilter.value);
-	});
+const globalFilteredNodeTypes = computed<INodeCreateElement[]>(() => {
+	const result = getFilteredNodes(props.allItems).reduce((acc, item) => {
+		if (acc.find((el) => trimTriggerNodeName(el.key) === trimTriggerNodeName(item.key))) {
+			return acc;
+		}
+
+		return [...acc, item];
+	}, [] as INodeCreateElement[]);
 
-	return matchedAllNodex;
+	return result;
 });
 
-const categorized = computed<INodeCreateElement[]>(() => {
-	return props.categorizedItems.reduce((accu: INodeCreateElement[], el: INodeCreateElement) => {
-		if (
-			el.type === 'subcategory' &&
-			(props.excludedSubcategories || []).includes(
-				(el.properties as ISubcategoryItemProps).subcategory,
-			)
-		) {
-			return accu;
-		}
+const otherCategoryNodes = computed(() => {
+	const nodes = [];
 
-		if (el.type !== 'category' && !state.activeCategory.includes(el.category)) {
-			return accu;
-		}
+	// Get diff of nodes between `globalFilteredNodeTypes` and `filteredNodeTypes`
+	for (const node of globalFilteredNodeTypes.value) {
+		const isNodeInFiltered = filteredNodeTypes.value.find(
+			(el) => trimTriggerNodeName(el.key) === trimTriggerNodeName(node.key),
+		);
 
-		if (!matchesSelectType(el, nodeCreatorStore.selectedType)) {
-			return accu;
-		}
+		if (!isNodeInFiltered) nodes.push(node);
+	}
 
-		if (el.type === 'category') {
-			accu.push({
-				...el,
-				properties: {
-					expanded: state.activeCategory.includes(el.category),
-				},
-			} as INodeCreateElement);
-			return accu;
-		}
+	return nodes;
+});
 
-		accu.push(el);
-		return accu;
-	}, []);
+const mergedFilteredNodes = computed<INodeCreateElement[]>(() => {
+	if (props.hideOtherCategoryItems) return filteredNodeTypes.value;
+
+	const isExpanded = state.activeCategories.includes(OTHER_RESULT_CATEGORY);
+	const searchCategory: CategoryCreateElement = {
+		type: 'category',
+		key: OTHER_RESULT_CATEGORY,
+		properties: {
+			category: OTHER_RESULT_CATEGORY,
+			name: `Results in other categories (${otherCategoryNodes.value.length})`,
+			expanded: isExpanded,
+		},
+	};
+	const nodeTypes = [...filteredNodeTypes.value];
+
+	if (otherCategoryNodes.value.length > 0) {
+		nodeTypes.push(searchCategory);
+	}
+	if (isExpanded) {
+		nodeTypes.push(...otherCategoryNodes.value);
+	}
+
+	return nodeTypes;
 });
 
+const isRootView = computed(() => activeSubcategory.value === null);
+
 const subcategorizedItems = computed<INodeCreateElement[]>(() => {
 	if (!activeSubcategory.value) return [];
 
-	const category = activeSubcategory.value.category;
-	const subcategory = (activeSubcategory.value.properties as ISubcategoryItemProps).subcategory;
+	const items = props.searchItems.filter((el: INodeCreateElement) => {
+		if (!activeSubcategory.value) return false;
 
-	// If no category is set, we use all categorized nodes
-	const nodes = category
-		? props.categoriesWithNodes[category][subcategory].nodes
-		: categorized.value;
+		const subcategories = Object.values(
+			(el.properties as INodeItemProps).nodeType.codex?.subcategories || {},
+		).flat();
+		return subcategories.includes(activeSubcategory.value.key);
+	});
 
-	return nodes.filter((el: INodeCreateElement) =>
-		matchesSelectType(el, nodeCreatorStore.selectedType),
+	return items.filter((el: INodeCreateElement) =>
+		matchesSelectType(el, nodeCreatorStore.selectedView),
 	);
 });
 
+const filteredCategorizedItems = computed<INodeCreateElement[]>(() => {
+	let categoriesCount = 0;
+	const reducedItems = props.categorizedItems.reduce(
+		(acc: INodeCreateElement[], el: INodeCreateElement) => {
+			if (el.type === 'category') {
+				el.properties.expanded = state.activeCategories.includes(el.key);
+				categoriesCount++;
+				return [...acc, el];
+			}
+
+			if (el.type === 'action' && state.activeCategories.includes(el.category)) {
+				return [...acc, el];
+			}
+
+			return acc;
+		},
+		[],
+	);
+
+	// If there is only one category we don't show it
+	if (categoriesCount <= 1)
+		return reducedItems.filter((el: INodeCreateElement) => el.type !== 'category');
+
+	return reducedItems;
+});
+
 const renderedItems = computed<INodeCreateElement[]>(() => {
 	if (props.firstLevelItems.length > 0 && activeSubcategory.value === null)
 		return props.firstLevelItems;
-	if (props.flatten) return matchedTypeNodes.value;
-	if (subcategorizedItems.value.length === 0) return categorized.value;
 
-	const isSingleCategory =
-		subcategorizedItems.value.filter((item) => item.type === 'category').length === 1;
-	return isSingleCategory ? subcategorizedItems.value.slice(1) : subcategorizedItems.value;
+	// If active subcategory is * then we show all items
+	if (activeSubcategory.value?.key === '*') return props.searchItems;
+	// Otherwise we show only items that match the subcategory
+	if (subcategorizedItems.value.length > 0) return subcategorizedItems.value;
+
+	// Finally if none of the above is true we show the categorized items
+	return filteredCategorizedItems.value;
 });
 
 const isSearchVisible = computed<boolean>(() => {
 	if (subcategorizedItems.value.length === 0) return true;
 
-	let totalItems = 0;
-	for (const item of subcategorizedItems.value) {
-		// Category contains many nodes so we need to count all of them
-		// for the current selectedType
-		if (item.type === 'category') {
-			const categoryItems = props.categoriesWithNodes[item.key];
-			const categoryItemsCount = Object.values(categoryItems)?.[0];
-			const countKeys = NODE_TYPE_COUNT_MAPPER[nodeCreatorStore.selectedType];
-
-			for (const countKey of countKeys) {
-				totalItems += categoryItemsCount[countKey as 'triggerCount' | 'regularCount'];
-			}
-
-			continue;
-		}
-		// If it's not category, it must be just a node item so we count it as 1
-		totalItems += 1;
-	}
-	return totalItems > 9;
+	return subcategorizedItems.value.length > 9;
 });
 
 // Methods
+function trimTriggerNodeName(nodeName: string) {
+	return nodeName.toLowerCase().replace('trigger', '');
+}
+function getFilteredNodes(items: INodeCreateElement[]) {
+	// In order to support the old search we need to remove the 'trigger' part
+	const trimmedFilter = searchFilter.value.toLowerCase().replace('trigger', '');
+	return (
+		sublimeSearch<INodeCreateElement>(trimmedFilter, items, [
+			{ key: 'properties.nodeType.displayName', weight: 2 },
+			{ key: 'properties.nodeType.codex.alias', weight: 1 },
+		]) || []
+	).map(({ item }) => item);
+}
 function getScrollTop() {
 	return scrollableContainer.value?.scrollTop || 0;
 }
@@ -390,26 +364,10 @@ function setScrollTop(scrollTop: number) {
 		scrollableContainer.value.scrollTop = scrollTop;
 	}
 }
-function switchToAllTabAndFilter() {
-	const currentFilter = nodeCreatorStore.itemsFilter;
-	nodeCreatorStore.setShowTabs(true);
-	nodeCreatorStore.setSelectedType(ALL_NODE_FILTER);
-	state.activeSubcategoryHistory = [];
-
-	nextTick(() => onNodeFilterChange(currentFilter));
-}
-
 function onNodeFilterChange(filter: string) {
 	nodeCreatorStore.setFilter(filter);
 }
 
-function selectWebhook() {
-	emit('nodeTypeSelected', [WEBHOOK_NODE_TYPE]);
-}
-
-function selectHttpRequest() {
-	emit('nodeTypeSelected', [HTTP_REQUEST_NODE_TYPE]);
-}
 function nodeFilterKeyDown(e: KeyboardEvent) {
 	// We only want to propagate 'Escape' as it closes the node-creator and
 	// 'Tab' which toggles it
@@ -438,7 +396,7 @@ function nodeFilterKeyDown(e: KeyboardEvent) {
 		) {
 			selected(activeNodeType);
 		} else if (e.key === 'ArrowLeft') {
-			onSubcategoryClose();
+			onBackButton();
 		} else if (
 			e.key === 'ArrowRight' &&
 			activeNodeType?.type === 'category' &&
@@ -466,6 +424,8 @@ function nodeFilterKeyDown(e: KeyboardEvent) {
 		selected(activeNodeType);
 	} else if (e.key === 'ArrowRight' && activeNodeType?.type === 'subcategory') {
 		selected(activeNodeType);
+	} else if (e.key === 'ArrowRight' && activeNodeType?.type === 'view') {
+		selected(activeNodeType);
 	} else if (
 		e.key === 'ArrowRight' &&
 		activeNodeType?.type === 'category' &&
@@ -478,20 +438,29 @@ function nodeFilterKeyDown(e: KeyboardEvent) {
 		(activeNodeType.properties as ICategoryItemProps).expanded
 	) {
 		selected(activeNodeType);
+	} else if (e.key === 'ArrowLeft' && isViewNavigated.value) {
+		onBackButton();
 	} else if (e.key === 'ArrowRight' && ['node', 'action'].includes(activeNodeType?.type)) {
 		selected(activeNodeType);
 	}
 }
 function selected(element: INodeCreateElement) {
 	const typeHandler = {
-		category: () => onCategorySelected(element.category),
+		category: () => onCategorySelected(element),
 		subcategory: () => onSubcategorySelected(element),
 		node: () => onNodeSelected(element as NodeCreateElement),
 		action: () => onActionSelected(element),
+		view: () => onViewSelected(element),
 	};
 
 	typeHandler[element.type]();
 }
+function onViewSelected(view: Record<string, any>) {
+	state.transitionDirection = 'in';
+	state.activeIndex = 0;
+	nodeCreatorStore.setSelectedView(view.key);
+	nodeCreatorStore.setFilter('');
+}
 
 function onNodeSelected(element: NodeCreateElement) {
 	const hasActions = (element.properties.nodeType?.actions?.length || 0) > 0;
@@ -502,20 +471,19 @@ function onNodeSelected(element: NodeCreateElement) {
 	emit('nodeTypeSelected', [element.key]);
 }
 
-function onCategorySelected(category: string) {
-	if (state.activeCategory.includes(category)) {
-		state.activeCategory = state.activeCategory.filter((active: string) => active !== category);
+function onCategorySelected(element: CategoryCreateElement) {
+	const categoryKey = element.properties.category;
+	if (state.activeCategories.includes(categoryKey)) {
+		state.activeCategories = state.activeCategories.filter(
+			(active: string) => active !== categoryKey,
+		);
 	} else {
-		state.activeCategory = [...state.activeCategory, category];
+		state.activeCategories = [...state.activeCategories, categoryKey];
 		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.onCategoryExpanded', {
-			category_name: category,
+			category_name: categoryKey,
 			workflow_id: workflowId,
 		});
 	}
-
-	state.activeIndex = categorized.value.findIndex(
-		(el: INodeCreateElement) => el.category === category,
-	);
 }
 function onActionSelected(element: INodeCreateElement) {
 	emit('actionSelected', element);
@@ -533,7 +501,6 @@ function onSubcategorySelected(selected: INodeCreateElement, track = true) {
 	});
 	nodeCreatorStore.setFilter('');
 	emit('onSubcategorySelected', selected);
-	nodeCreatorStore.setShowTabs(false);
 	state.activeSubcategoryIndex = 0;
 
 	if (track) {
@@ -544,8 +511,14 @@ function onSubcategorySelected(selected: INodeCreateElement, track = true) {
 	}
 }
 
-async function onSubcategoryClose() {
+async function onBackButton() {
 	state.transitionDirection = 'out';
+	// Switching views
+	if (isRootView.value && isViewNavigated.value) {
+		nodeCreatorStore.closeCurrentView();
+		return;
+	}
+
 	const poppedSubCategory = state.activeSubcategoryHistory.pop();
 	onNodeFilterChange(poppedSubCategory?.filter || '');
 	await nextTick();
@@ -556,40 +529,30 @@ async function onSubcategoryClose() {
 	await nextTick();
 	setScrollTop(poppedSubCategory?.scrollPosition || 0);
 	state.activeSubcategoryIndex = poppedSubCategory?.activeIndex || 0;
-
-	if (!nodeCreatorStore.showScrim && state.activeSubcategoryHistory.length === 0) {
-		nodeCreatorStore.setShowTabs(true);
-	}
 }
 
-watch(
-	() => props.expandAllCategories,
-	(expandAll) => {
-		if (expandAll) state.activeCategory = Object.keys(props.categoriesWithNodes);
-	},
-);
-
 watch(
 	() => props.subcategoryOverride,
 	(subcategory) => {
 		if (subcategory) onSubcategorySelected(subcategory, false);
 	},
 );
-
-onMounted(() => {
-	registerCustomAction('showAllNodeCreatorNodes', switchToAllTabAndFilter);
-});
+watch(
+	() => props.categorizedItems,
+	() => {
+		state.activeCategories = [...categoriesKeys.value, OTHER_RESULT_CATEGORY];
+	},
+);
 
 onUnmounted(() => {
 	nodeCreatorStore.setFilter('');
-	unregisterCustomAction('showAllNodeCreatorNodes');
 });
 
 watch(filteredNodeTypes, (returnItems) => {
 	$externalHooks().run('nodeCreateList.filteredNodeTypesComputed', {
 		nodeFilter: nodeCreatorStore.itemsFilter,
 		result: returnItems,
-		selectedType: nodeCreatorStore.selectedType,
+		selectedType: nodeCreatorStore.selectedView,
 	});
 });
 
@@ -609,13 +572,13 @@ watch(
 		$externalHooks().run('nodeCreateList.nodeFilterChanged', {
 			oldValue,
 			newValue,
-			selectedType: nodeCreatorStore.selectedType,
+			selectedType: nodeCreatorStore.selectedView,
 			filteredNodes: filteredNodeTypes.value,
 		});
 		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.nodeFilterChanged', {
 			oldValue,
 			newValue,
-			selectedType: nodeCreatorStore.selectedType,
+			selectedType: nodeCreatorStore.selectedView,
 			filteredNodes: filteredNodeTypes.value,
 			workflow_id: workflowId,
 		});
@@ -650,6 +613,7 @@ const { activeSubcategoryIndex, activeIndex, mainPanelContainer } = toRefs(state
 	z-index: 1;
 }
 .nodeIcon {
+	--node-icon-size: 16px;
 	margin-right: var(--spacing-s);
 }
 .categorizedItems {
@@ -675,31 +639,39 @@ const { activeSubcategoryIndex, activeIndex, mainPanelContainer } = toRefs(state
 	z-index: 1;
 	margin-top: -1px;
 }
-.subcategoryHeader {
-	border-bottom: $node-creator-border-color solid 1px;
-	height: 50px;
-	background-color: $node-creator-subcategory-panel-header-bacground-color;
-
+.header {
 	font-size: var(--font-size-l);
 	font-weight: var(--font-weight-bold);
 	line-height: var(--font-line-height-compact);
 
 	display: flex;
 	align-items: center;
-	padding: 11px 15px;
-}
+	padding: var(--spacing-s) var(--spacing-s) var(--spacing-2xs);
 
-.subcategoryBackButton {
+	&.headerWithBackground {
+		border-bottom: $node-creator-border-color solid 1px;
+		height: 50px;
+		background-color: $node-creator-subcategory-panel-header-bacground-color;
+		padding: var(--spacing-s) var(--spacing-s);
+	}
+}
+.description {
+	padding: 0 var(--spacing-s) var(--spacing-2xs) var(--spacing-s);
+	margin-top: -4px;
+}
+.descriptionOffset {
+	margin-left: calc(var(--spacing-xl) + var(--spacing-4xs));
+}
+.backButton {
 	background: transparent;
 	border: none;
 	cursor: pointer;
-	padding: var(--spacing-s) 0;
+	padding: 0 var(--spacing-xs) 0 0;
 }
 
 .subcategoryBackIcon {
 	color: $node-creator-arrow-color;
 	height: 16px;
-	margin-right: var(--spacing-s);
 	padding: 0;
 }
 
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.vue
index 18363d692c457d..9dc5eba3fb0d16 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/CategoryItem.vue
@@ -1,34 +1,18 @@
 <template>
 	<div :class="$style.category">
-		<span :class="$style.name">
-			{{ renderCategoryName(item.category) }}{{ count !== undefined ? ` (${count})` : '' }}
-		</span>
-		<font-awesome-icon v-if="isExpanded" icon="chevron-down" :class="$style.arrow" />
+		<span :class="$style.name" v-text="item.name" />
+		<font-awesome-icon v-if="item.expanded" icon="chevron-down" :class="$style.arrow" />
 		<font-awesome-icon :class="$style.arrow" icon="chevron-up" v-else />
 	</div>
 </template>
 
 <script lang="ts" setup>
-import { computed, getCurrentInstance } from 'vue';
-import camelcase from 'lodash.camelcase';
-import { CategoryName } from '@/plugins/i18n';
-import { INodeCreateElement, ICategoryItemProps } from '@/Interface';
+import { ICategoryItemProps } from '@/Interface';
 
 export interface Props {
-	item: INodeCreateElement;
-	count?: number;
-}
-const props = defineProps<Props>();
-const instance = getCurrentInstance();
-
-const isExpanded = computed<boolean>(() => (props.item.properties as ICategoryItemProps).expanded);
-
-function renderCategoryName(categoryName: string) {
-	const camelCasedCategoryName = camelcase(categoryName) as CategoryName;
-	const key = `nodeCreator.categoryNames.${camelCasedCategoryName}` as const;
-
-	return instance?.proxy.$locale.exists(key) ? instance?.proxy.$locale.baseText(key) : categoryName;
+	item: ICategoryItemProps;
 }
+defineProps<Props>();
 </script>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ItemIterator.vue b/packages/editor-ui/src/components/Node/NodeCreator/ItemIterator.vue
index fcaa88eb0e4db3..8889fb88b40bb0 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/ItemIterator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ItemIterator.vue
@@ -20,18 +20,15 @@
 			ref="iteratorItems"
 			@click="wrappedEmit('selected', item)"
 		>
-			<category-item
-				v-if="item.type === 'category'"
-				:item="item"
-				:count="enableGlobalCategoriesCounter ? getCategoryCount(item) : undefined"
-			/>
+			<category-item v-if="item.type === 'category'" :item="item.properties" />
 
-			<subcategory-item v-else-if="item.type === 'subcategory'" :item="item" />
+			<subcategory-item v-else-if="item.type === 'subcategory'" :item="item.properties" />
 
 			<node-item
 				v-else-if="item.type === 'node'"
 				:nodeType="item.properties.nodeType"
 				:allow-actions="withActionsGetter && withActionsGetter(item)"
+				:allow-description="withDescriptionGetter && withDescriptionGetter(item)"
 				@dragstart="wrappedEmit('dragstart', item, $event)"
 				@dragend="wrappedEmit('dragend', item, $event)"
 				@nodeTypeSelected="$listeners.nodeTypeSelected"
@@ -45,6 +42,8 @@
 				@dragstart="wrappedEmit('dragstart', item, $event)"
 				@dragend="wrappedEmit('dragend', item, $event)"
 			/>
+
+			<view-item v-else-if="item.type === 'view'" :view="item.properties" />
 		</div>
 		<aside
 			v-for="item in elements.length"
@@ -58,15 +57,13 @@
 </template>
 
 <script setup lang="ts">
-import { INodeCreateElement, CategoryCreateElement, NodeCreateElement } from '@/Interface';
+import { INodeCreateElement, NodeCreateElement } from '@/Interface';
 import NodeItem from './NodeItem.vue';
 import SubcategoryItem from './SubcategoryItem.vue';
 import CategoryItem from './CategoryItem.vue';
 import ActionItem from './ActionItem.vue';
+import ViewItem from './ViewItem.vue';
 import { reactive, toRefs, onMounted, watch, onUnmounted, ref } from 'vue';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-import { NODE_TYPE_COUNT_MAPPER } from '@/constants';
 
 export interface Props {
 	elements: INodeCreateElement[];
@@ -74,6 +71,7 @@ export interface Props {
 	disabled?: boolean;
 	lazyRender?: boolean;
 	withActionsGetter?: (element: NodeCreateElement) => boolean;
+	withDescriptionGetter?: (element: NodeCreateElement) => boolean;
 	enableGlobalCategoriesCounter?: boolean;
 }
 
@@ -102,25 +100,6 @@ function wrappedEmit(
 
 	emit((event as 'selected') || 'dragstart' || 'dragend', element, $e);
 }
-function getCategoryCount(item: CategoryCreateElement) {
-	const { categoriesWithNodes } = useNodeTypesStore();
-
-	const currentCategory = categoriesWithNodes[item.category];
-	const subcategories = Object.keys(currentCategory);
-
-	// We need to sum subcategories count for the curent nodeType view
-	// to get the total count of category
-	const count = subcategories.reduce((accu: number, subcategory: string) => {
-		const countKeys = NODE_TYPE_COUNT_MAPPER[useNodeCreatorStore().selectedType];
-
-		for (const countKey of countKeys) {
-			accu += currentCategory[subcategory][countKey as 'triggerCount' | 'regularCount'];
-		}
-
-		return accu;
-	}, 0);
-	return count;
-}
 
 // Lazy render large items lists to prevent the browser from freezing
 // when loading many items.
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
index 81c271ecf433da..9ac55c8d2a414a 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
@@ -1,100 +1,408 @@
 <template>
-	<div class="container" ref="mainPanelContainer">
-		<div class="main-panel">
-			<trigger-helper-panel
-				v-if="nodeCreatorStore.selectedType === TRIGGER_NODE_FILTER"
-				@nodeTypeSelected="$listeners.nodeTypeSelected"
-			>
-				<template #header>
-					<type-selector />
-				</template>
-			</trigger-helper-panel>
-			<categorized-items
-				v-else
-				enable-global-categories-counter
-				:categorizedItems="categorizedItems"
-				:categoriesWithNodes="categoriesWithNodes"
-				:searchItems="searchItems"
-				:excludedSubcategories="[OTHER_TRIGGER_NODES_SUBCATEGORY]"
-				:initialActiveCategories="[CORE_NODES_CATEGORY]"
-				:allItems="categorizedItems"
-				@nodeTypeSelected="$listeners.nodeTypeSelected"
-				@actionsOpen="() => {}"
-			>
-				<template #header>
-					<type-selector />
-				</template>
-			</categorized-items>
-		</div>
+	<div :class="{ [$style.mainPanel]: true, [$style.isRoot]: isRoot }">
+		<CategorizedItems
+			:subcategoryOverride="nodeAppSubcategory"
+			:alwaysShowSearch="isActionsActive"
+			:hideOtherCategoryItems="isActionsActive"
+			:categorizedItems="computedCategorizedItems"
+			:searchItems="searchItems"
+			:withActionsGetter="shouldShowNodeActions"
+			:withDescriptionGetter="shouldShowNodeDescription"
+			:firstLevelItems="firstLevelItems"
+			:showSubcategoryIcon="isActionsActive"
+			:allItems="transformCreateElements(mergedAppNodes)"
+			:searchPlaceholder="searchPlaceholder"
+			@subcategoryClose="onSubcategoryClose"
+			@onSubcategorySelected="onSubcategorySelected"
+			@nodeTypeSelected="onNodeTypeSelected"
+			@actionsOpen="setActiveActionsNodeType"
+			@actionSelected="onActionSelected"
+		>
+			<template #noResults>
+				<no-results
+					data-test-id="categorized-no-results"
+					:showRequest="!isActionsActive"
+					:show-icon="!isActionsActive"
+				>
+					<template #title v-if="!isActionsActive">
+						<p v-text="$locale.baseText('nodeCreator.noResults.weDidntMakeThatYet')" />
+					</template>
+
+					<template v-if="isActionsActive" #action>
+						<p
+							v-if="containsAPIAction"
+							v-html="getCustomAPICallHintLocale('apiCallNoResult')"
+							class="clickable"
+							@click.stop="addHttpNode(true)"
+						/>
+						<p v-else v-text="$locale.baseText('nodeCreator.noResults.noMatchingActions')" />
+					</template>
+
+					<template v-else #action>
+						{{ $locale.baseText('nodeCreator.noResults.dontWorryYouCanProbablyDoItWithThe') }}
+						<n8n-link v-if="[REGULAR_NODE_FILTER].includes(selectedView)" @click="addHttpNode">
+							{{ $locale.baseText('nodeCreator.noResults.httpRequest') }}
+						</n8n-link>
+
+						<n8n-link v-if="[TRIGGER_NODE_FILTER].includes(selectedView)" @click="addWebHookNode()">
+							{{ $locale.baseText('nodeCreator.noResults.webhook') }}
+						</n8n-link>
+						{{ $locale.baseText('nodeCreator.noResults.node') }}
+					</template>
+				</no-results>
+			</template>
+
+			<template #header>
+				<p
+					v-if="isRoot && activeView && activeView.title"
+					v-text="activeView.title"
+					:class="$style.title"
+				/>
+			</template>
+			<template #description>
+				<p
+					v-if="isRoot && activeView && activeView.description"
+					v-text="activeView.description"
+					:class="$style.description"
+				/>
+			</template>
+			<template #footer v-if="activeNodeActions && containsAPIAction">
+				<span
+					v-html="getCustomAPICallHintLocale('apiCall')"
+					class="clickable"
+					@click.stop="addHttpNode(true)"
+				/>
+			</template>
+		</CategorizedItems>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { watch, getCurrentInstance, onMounted, onUnmounted } from 'vue';
-import { externalHooks } from '@/mixins/externalHooks';
-import TriggerHelperPanel from './TriggerHelperPanel.vue';
+import { reactive, toRefs, getCurrentInstance, computed, onUnmounted, ref } from 'vue';
+import {
+	INodeTypeDescription,
+	INodeActionTypeDescription,
+	INodeTypeNameVersion,
+} from 'n8n-workflow';
+import {
+	INodeCreateElement,
+	NodeCreateElement,
+	IActionItemProps,
+	SubcategoryCreateElement,
+	IUpdateInformation,
+} from '@/Interface';
 import {
-	ALL_NODE_FILTER,
-	TRIGGER_NODE_FILTER,
-	OTHER_TRIGGER_NODES_SUBCATEGORY,
 	CORE_NODES_CATEGORY,
+	WEBHOOK_NODE_TYPE,
+	EMAIL_IMAP_NODE_TYPE,
+	CUSTOM_API_CALL_NAME,
+	HTTP_REQUEST_NODE_TYPE,
+	STICKY_NODE_TYPE,
+	REGULAR_NODE_FILTER,
+	TRIGGER_NODE_FILTER,
+	N8N_NODE_TYPE,
 } from '@/constants';
 import CategorizedItems from './CategorizedItems.vue';
-import TypeSelector from './TypeSelector.vue';
-import { INodeCreateElement } from '@/Interface';
-import { useWorkflowsStore } from '@/stores/workflows';
 import { useNodeCreatorStore } from '@/stores/nodeCreator';
+import { getCategoriesWithNodes, getCategorizedList } from '@/utils';
+import { externalHooks } from '@/mixins/externalHooks';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
+import { BaseTextKey } from '@/plugins/i18n';
+import NoResults from './NoResults.vue';
+import { useRootStore } from '@/stores/n8nRootStore';
+import useMainPanelView from './useMainPanelView';
 
-export interface Props {
-	searchItems?: INodeCreateElement[];
-}
+const instance = getCurrentInstance();
 
-withDefaults(defineProps<Props>(), {
-	searchItems: () => [],
+const emit = defineEmits({
+	nodeTypeSelected: (nodeTypes: string[]) => true,
 });
 
-const instance = getCurrentInstance();
+const state = reactive({
+	isRoot: true,
+	selectedSubcategory: '',
+	activeNodeActions: null as INodeTypeDescription | null,
+});
+const { baseUrl } = useRootStore();
 const { $externalHooks } = new externalHooks();
-const { workflowId } = useWorkflowsStore();
-const nodeCreatorStore = useNodeCreatorStore();
-const { categorizedItems, categoriesWithNodes } = useNodeTypesStore();
-
-watch(
-	() => nodeCreatorStore.selectedType,
-	(newValue, oldValue) => {
-		$externalHooks().run('nodeCreateList.selectedTypeChanged', {
-			oldValue,
-			newValue,
-		});
-		instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.selectedTypeChanged', {
-			old_filter: oldValue,
-			new_filter: newValue,
-			workflow_id: workflowId,
+const {
+	mergedAppNodes,
+	getActionData,
+	getNodeTypesWithManualTrigger,
+	setAddedNodeActionParameters,
+} = useNodeCreatorStore();
+const { activeView } = useMainPanelView();
+const telemetry = instance?.proxy.$telemetry;
+const { isTriggerNode } = useNodeTypesStore();
+const containsAPIAction = computed(
+	() =>
+		state.activeNodeActions?.properties.some((p) =>
+			p.options?.find((o) => o.name === CUSTOM_API_CALL_NAME),
+		) === true,
+);
+
+const selectedView = computed(() => useNodeCreatorStore().selectedView);
+const computedCategorizedItems = computed(() => {
+	if (isActionsActive.value) {
+		return sortActions(getCategorizedList(computedCategoriesWithNodes.value, true));
+	}
+
+	return getCategorizedList(computedCategoriesWithNodes.value, true);
+});
+
+const nodeAppSubcategory = computed<SubcategoryCreateElement | undefined>(() => {
+	if (!state.activeNodeActions) return undefined;
+
+	const icon = state.activeNodeActions.iconUrl
+		? `${baseUrl}${state.activeNodeActions.iconUrl}`
+		: state.activeNodeActions.icon?.split(':')[1];
+
+	return {
+		type: 'subcategory',
+		key: state.activeNodeActions.name,
+		properties: {
+			subcategory: state.activeNodeActions.displayName,
+			description: '',
+			iconType: state.activeNodeActions.iconUrl ? 'file' : 'icon',
+			icon,
+			color: state.activeNodeActions.defaults.color,
+		},
+	};
+});
+const searchPlaceholder = computed(() => {
+	const nodeNameTitle = state.activeNodeActions?.displayName?.trim() as string;
+	const actionsSearchPlaceholder = instance?.proxy.$locale.baseText(
+		'nodeCreator.actionsCategory.searchActions',
+		{ interpolate: { nodeNameTitle } },
+	);
+
+	return isActionsActive.value ? actionsSearchPlaceholder : undefined;
+});
+
+const filteredMergedAppNodes = computed(() => {
+	const WHITELISTED_APP_CORE_NODES = [EMAIL_IMAP_NODE_TYPE, WEBHOOK_NODE_TYPE];
+
+	if (isAppEventSubcategory.value)
+		return mergedAppNodes.filter((node) => {
+			const isTrigger = isTriggerNode(node.name);
+			const isRegularNode = !isTrigger;
+			const isStickyNode = node.name === STICKY_NODE_TYPE;
+			const isCoreNode =
+				node.codex?.categories?.includes(CORE_NODES_CATEGORY) &&
+				!WHITELISTED_APP_CORE_NODES.includes(node.name);
+			const hasActions = (node.actions || []).length > 0;
+
+			// Never show core nodes and sticky node in the Apps subcategory
+			if (isCoreNode || isStickyNode) return false;
+
+			// Only show nodes without action within their view
+			if (!hasActions) {
+				return isRegularNode
+					? selectedView.value === REGULAR_NODE_FILTER
+					: selectedView.value === TRIGGER_NODE_FILTER;
+			}
+
+			return true;
 		});
-	},
+
+	return mergedAppNodes;
+});
+
+const computedCategoriesWithNodes = computed(() => {
+	if (!state.activeNodeActions) return getCategoriesWithNodes(filteredMergedAppNodes.value);
+
+	return getCategoriesWithNodes(selectedNodeActions.value, state.activeNodeActions.displayName);
+});
+
+const selectedNodeActions = computed<INodeActionTypeDescription[]>(
+	() => state.activeNodeActions?.actions ?? [],
 );
+const isAppEventSubcategory = computed(() => state.selectedSubcategory === '*');
+const isActionsActive = computed(() => state.activeNodeActions !== null);
+const firstLevelItems = computed(() => (isRoot.value ? activeView.value.items : []));
 
-onMounted(() => {
-	$externalHooks().run('nodeCreateList.mounted');
-	// Make sure tabs are visible on mount
-	nodeCreatorStore.setShowTabs(true);
+const searchItems = computed<INodeCreateElement[]>(() => {
+	return state.activeNodeActions
+		? transformCreateElements(selectedNodeActions.value)
+		: transformCreateElements(filteredMergedAppNodes.value);
 });
 
-onUnmounted(() => {
-	nodeCreatorStore.setSelectedType(ALL_NODE_FILTER);
-	$externalHooks().run('nodeCreateList.destroyed');
-	instance?.proxy.$telemetry.trackNodesPanel('nodeCreateList.destroyed', {
-		workflow_id: workflowId,
+// If the user is in the root view, we want to show trigger nodes first
+// otherwise we want to show them last
+function sortActions(nodeCreateElements: INodeCreateElement[]): INodeCreateElement[] {
+	const elements = {
+		trigger: [] as INodeCreateElement[],
+		regular: [] as INodeCreateElement[],
+	};
+
+	nodeCreateElements.forEach((el) => {
+		const isTriggersCategory = el.type === 'category' && el.key === 'Triggers';
+		const isTriggerAction = el.type === 'action' && el.category === 'Triggers';
+
+		elements[isTriggersCategory || isTriggerAction ? 'trigger' : 'regular'].push(el);
+	});
+
+	if (selectedView.value === TRIGGER_NODE_FILTER) {
+		return [...elements.trigger, ...elements.regular];
+	}
+
+	return [...elements.regular, ...elements.trigger];
+}
+
+function transformCreateElements(
+	createElements: Array<INodeTypeDescription | INodeActionTypeDescription>,
+): INodeCreateElement[] {
+	const sorted = [...createElements];
+
+	sorted.sort((a, b) => {
+		const textA = a.displayName.toLowerCase();
+		const textB = b.displayName.toLowerCase();
+		return textA < textB ? -1 : textA > textB ? 1 : 0;
 	});
+
+	return sorted.map((nodeType) => {
+		// N8n node is a special case since it's the only core node that is both trigger and regular
+		// if we have more cases like this we should add more robust logic
+		const isN8nNode = nodeType.name.includes(N8N_NODE_TYPE);
+		return {
+			type: 'node',
+			category: nodeType.codex?.categories,
+			key: nodeType.name,
+			properties: {
+				nodeType,
+				subcategory: state.activeNodeActions?.displayName ?? '',
+			},
+			includedByTrigger: isN8nNode || nodeType.group.includes('trigger'),
+			includedByRegular: isN8nNode || !nodeType.group.includes('trigger'),
+		};
+	});
+}
+
+function onNodeTypeSelected(nodeTypes: string[]) {
+	emit(
+		'nodeTypeSelected',
+		nodeTypes.length === 1 ? getNodeTypesWithManualTrigger(nodeTypes[0]) : nodeTypes,
+	);
+}
+function getCustomAPICallHintLocale(key: string) {
+	if (!state.activeNodeActions) return '';
+
+	const nodeNameTitle = state.activeNodeActions.displayName;
+	return instance?.proxy.$locale.baseText(`nodeCreator.actionsList.${key}` as BaseTextKey, {
+		interpolate: { nodeNameTitle },
+	});
+}
+
+function setActiveActionsNodeType(nodeType: INodeTypeDescription | null) {
+	state.activeNodeActions = nodeType;
+
+	if (nodeType) trackActionsView();
+}
+
+function onActionSelected(actionCreateElement: INodeCreateElement) {
+	const action = (actionCreateElement.properties as IActionItemProps).nodeType;
+	const actionUpdateData = getActionData(action);
+	emit('nodeTypeSelected', getNodeTypesWithManualTrigger(actionUpdateData.key));
+	setAddedNodeActionParameters(actionUpdateData, telemetry);
+}
+function addWebHookNode() {
+	emit('nodeTypeSelected', [WEBHOOK_NODE_TYPE]);
+}
+
+function addHttpNode(isAction: boolean) {
+	const updateData = {
+		name: '',
+		key: HTTP_REQUEST_NODE_TYPE,
+		value: {
+			authentication: 'predefinedCredentialType',
+		},
+	} as IUpdateInformation;
+
+	emit('nodeTypeSelected', [HTTP_REQUEST_NODE_TYPE]);
+	if (isAction) {
+		setAddedNodeActionParameters(updateData, telemetry, false);
+
+		const app_identifier = state.activeNodeActions?.name;
+		$externalHooks().run('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
+		telemetry?.trackNodesPanel('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
+	}
+}
+
+function onSubcategorySelected(subcategory: INodeCreateElement) {
+	state.isRoot = false;
+	state.selectedSubcategory = subcategory.key;
+}
+function onSubcategoryClose(activeSubcategories: INodeCreateElement[]) {
+	if (isActionsActive.value === true) setActiveActionsNodeType(null);
+
+	state.isRoot = activeSubcategories.length === 0;
+	state.selectedSubcategory = activeSubcategories[activeSubcategories.length - 1]?.key ?? '';
+}
+
+function shouldShowNodeDescription(node: NodeCreateElement) {
+	return (node.category || []).includes(CORE_NODES_CATEGORY);
+}
+
+function shouldShowNodeActions(node: INodeCreateElement) {
+	if (state.isRoot && useNodeCreatorStore().itemsFilter === '') return false;
+
+	return true;
+}
+
+function trackActionsView() {
+	const trigger_action_count = selectedNodeActions.value.filter((action) =>
+		action.name.toLowerCase().includes('trigger'),
+	).length;
+
+	const trackingPayload = {
+		app_identifier: state.activeNodeActions?.name,
+		actions: selectedNodeActions.value.map((action) => action.displayName),
+		regular_action_count: selectedNodeActions.value.length - trigger_action_count,
+		trigger_action_count,
+	};
+
+	$externalHooks().run('nodeCreateList.onViewActions', trackingPayload);
+	telemetry?.trackNodesPanel('nodeCreateList.onViewActions', trackingPayload);
+}
+
+onUnmounted(() => {
+	useNodeCreatorStore().resetRootViewHistory();
 });
+const { isRoot, activeNodeActions } = toRefs(state);
 </script>
 
-<style lang="scss" scoped>
-.container {
+<style lang="scss" module>
+.mainPanel {
+	--node-icon-color: var(--color-text-base);
 	height: 100%;
+	display: flex;
+	flex-direction: column;
+
+	// Remove node item border on the root level
+	&.isRoot {
+		--node-item-border: none;
+	}
 }
-.main-panel {
-	height: 100%;
+.itemCreator {
+	height: calc(100% - 120px);
+	padding-top: 1px;
+	overflow-y: auto;
+	overflow-x: visible;
+
+	&::-webkit-scrollbar {
+		display: none;
+	}
+}
+
+.title {
+	font-size: var(--font-size-l);
+	line-height: var(--font-line-height-xloose);
+	font-weight: var(--font-weight-bold);
+	color: var(--color-text-dark);
+}
+.description {
+	font-size: var(--font-size-s);
+	line-height: var(--font-line-height-loose);
+	color: var(--color-text-base);
 }
 </style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
index bd73ced378f22f..77415e2f063aac 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeCreator.vue
@@ -14,20 +14,17 @@
 				@mouseup="onMouseUp"
 				data-test-id="node-creator"
 			>
-				<main-panel @nodeTypeSelected="$listeners.nodeTypeSelected" :searchItems="searchItems" />
+				<main-panel @nodeTypeSelected="$listeners.nodeTypeSelected" />
 			</div>
 		</slide-transition>
 	</div>
 </template>
 
 <script setup lang="ts">
-import { computed, watch, reactive, toRefs } from 'vue';
-
-import { INodeCreateElement } from '@/Interface';
+import { watch, reactive, toRefs } from 'vue';
 import SlideTransition from '@/components/transitions/SlideTransition.vue';
 
 import MainPanel from './MainPanel.vue';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useNodeCreatorStore } from '@/stores/nodeCreator';
 
 export interface Props {
@@ -46,28 +43,6 @@ const state = reactive({
 	mousedownInsideEvent: null as MouseEvent | null,
 });
 
-const visibleNodeTypes = computed(() => useNodeTypesStore().visibleNodeTypes);
-const searchItems = computed<INodeCreateElement[]>(() => {
-	const sorted = [...visibleNodeTypes.value];
-	sorted.sort((a, b) => {
-		const textA = a.displayName.toLowerCase();
-		const textB = b.displayName.toLowerCase();
-		return textA < textB ? -1 : textA > textB ? 1 : 0;
-	});
-
-	return sorted.map((nodeType) => ({
-		type: 'node',
-		category: '',
-		key: `${nodeType.name}`,
-		properties: {
-			nodeType,
-			subcategory: '',
-		},
-		includedByTrigger: nodeType.group.includes('trigger'),
-		includedByRegular: !nodeType.group.includes('trigger'),
-	}));
-});
-
 function onClickOutside(event: Event) {
 	// We need to prevent cases where user would click inside the node creator
 	// and try to drag undraggable element. In that case the click event would
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
index a0c4cd0ca7c540..88676dc4c22935 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
@@ -6,7 +6,7 @@
 		@dragend="onDragEnd"
 		@click.stop="onClick"
 		:class="$style.nodeItem"
-		:description="allowActions ? undefined : description"
+		:description="allowDescription ? description : ''"
 		:title="displayName"
 		:isTrigger="!allowActions && isTriggerNode"
 		:show-action-arrow="showActionArrow"
@@ -53,11 +53,13 @@ export interface Props {
 	nodeType: INodeTypeDescription;
 	active?: boolean;
 	allowActions?: boolean;
+	allowDescription?: boolean;
 }
 
 const props = withDefaults(defineProps<Props>(), {
 	active: false,
 	allowActions: false,
+	allowDescription: false,
 });
 
 const emit = defineEmits<{
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue b/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
index e9470ccfed720d..988e2d2d809270 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/SearchBar.vue
@@ -80,7 +80,7 @@ defineExpose({
 .searchContainer {
 	display: flex;
 	height: 40px;
-	padding: var(--spacing-s) var(--spacing-xs);
+	padding: 0 var(--spacing-xs);
 	align-items: center;
 	margin: var(--search-margin, var(--spacing-s));
 	filter: drop-shadow(0px 2px 5px rgba(46, 46, 50, 0.04));
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
index f09aa4ee2c4cc8..507157f005ba4d 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
@@ -1,97 +1,38 @@
 <template>
-	<div :class="{ [$style.subcategory]: true, [$style.subcategoryWithIcon]: hasIcon }">
-		<node-icon v-if="hasIcon" :class="$style.subcategoryIcon" :nodeType="itemProperties" />
-		<div :class="$style.details">
-			<div :class="$style.title">
-				{{ $locale.baseText(`nodeCreator.subcategoryNames.${subcategoryName}`) }}
-			</div>
-			<div v-if="item.properties.description" :class="$style.description">
-				{{ $locale.baseText(`nodeCreator.subcategoryDescriptions.${subcategoryName}`) }}
-			</div>
-		</div>
-		<div :class="$style.action">
-			<font-awesome-icon :class="$style.arrow" icon="arrow-right" />
-		</div>
-	</div>
+	<n8n-node-creator-node
+		:class="$style.subCategory"
+		:title="$locale.baseText(`nodeCreator.subcategoryNames.${subcategoryName}`)"
+		:isTrigger="false"
+		:description="$locale.baseText(`nodeCreator.subcategoryDescriptions.${subcategoryName}`)"
+		:showActionArrow="true"
+	>
+		<template #icon>
+			<n8n-node-icon type="icon" :name="item.icon" :circle="false" :showTooltip="false" />
+		</template>
+	</n8n-node-creator-node>
 </template>
 
-<script lang="ts">
-import Vue, { PropType } from 'vue';
+<script setup lang="ts">
+import { ISubcategoryItemProps } from '@/Interface';
 import camelcase from 'lodash.camelcase';
+import { computed } from 'vue';
+export interface Props {
+	item: ISubcategoryItemProps;
+}
 
-import NodeIcon from '@/components/NodeIcon.vue';
-import { INodeCreateElement, ISubcategoryItemProps } from '@/Interface';
-export default Vue.extend({
-	components: {
-		NodeIcon,
-	},
-	props: {
-		item: {
-			type: Object as PropType<INodeCreateElement>,
-			required: true,
-		},
-	},
-	computed: {
-		itemProperties(): ISubcategoryItemProps {
-			return this.item.properties as ISubcategoryItemProps;
-		},
-		subcategoryName(): string {
-			return camelcase(this.itemProperties.subcategory);
-		},
-		hasIcon(): boolean {
-			return this.itemProperties.icon !== undefined || this.itemProperties.iconData !== undefined;
-		},
-	},
-});
+const props = defineProps<Props>();
+const subcategoryName = computed(() => camelcase(props.item.subcategory));
 </script>
 
 <style lang="scss" module>
-.subcategoryIcon {
-	min-width: 26px;
-	max-width: 26px;
-	margin-right: 15px;
-}
-
-.subcategory {
-	display: flex;
-	padding: 11px 16px 11px 30px;
-	user-select: none;
-}
-
-.subcategoryWithIcon {
+.subCategory {
+	--action-arrow-color: var(--color-text-light);
 	margin-left: 15px;
 	margin-right: 12px;
-	padding: 11px 8px 11px 0;
-}
-
-.details {
-	flex-grow: 1;
-	margin-right: 4px;
 }
-
-.title {
-	font-size: 14px;
-	font-weight: var(--font-weight-bold);
-	line-height: 16px;
-	margin-bottom: 3px;
-}
-
-.description {
-	font-size: var(--font-size-2xs);
-	line-height: 16px;
-	font-weight: 400;
-	color: $node-creator-description-color;
-}
-
-.action {
-	display: flex;
-	align-items: center;
-	margin-left: var(--spacing-2xs);
-}
-
-.arrow {
-	font-size: 12px;
-	width: 12px;
-	color: $node-creator-arrow-color;
+.withTopBorder {
+	border-top: 1px solid var(--color-foreground-base);
+	margin-top: var(--spacing-m);
+	padding-top: var(--spacing-l);
 }
 </style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
deleted file mode 100644
index 3ce89f63d167cf..00000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/TriggerHelperPanel.vue
+++ /dev/null
@@ -1,449 +0,0 @@
-<template>
-	<div :class="{ [$style.triggerHelperContainer]: true, [$style.isRoot]: isRoot }">
-		<categorized-items
-			:expandAllCategories="isActionsActive"
-			:subcategoryOverride="nodeAppSubcategory"
-			:alwaysShowSearch="isActionsActive"
-			:categorizedItems="computedCategorizedItems"
-			:categoriesWithNodes="computedCategoriesWithNodes"
-			:initialActiveIndex="0"
-			:searchItems="searchItems"
-			:withActionsGetter="shouldShowNodeActions"
-			:firstLevelItems="firstLevelItems"
-			:showSubcategoryIcon="isActionsActive"
-			:flatten="!isActionsActive && isAppEventSubcategory"
-			:filterByType="false"
-			:lazyRender="true"
-			:allItems="allNodes"
-			:searchPlaceholder="searchPlaceholder"
-			ref="categorizedItemsRef"
-			@subcategoryClose="onSubcategoryClose"
-			@onSubcategorySelected="onSubcategorySelected"
-			@nodeTypeSelected="onNodeTypeSelected"
-			@actionsOpen="setActiveActionsNodeType"
-			@actionSelected="onActionSelected"
-		>
-			<template #noResultsTitle v-if="isActionsActive">
-				<i />
-			</template>
-			<template #noResultsAction v-if="isActionsActive">
-				<p
-					v-if="containsAPIAction"
-					v-html="getCustomAPICallHintLocale('apiCallNoResult')"
-					class="clickable"
-					@click.stop="addHttpNode"
-				/>
-				<p v-else v-text="$locale.baseText('nodeCreator.noResults.noMatchingActions')" />
-			</template>
-
-			<template #header>
-				<slot name="header" />
-				<p
-					v-if="isRoot"
-					v-text="$locale.baseText('nodeCreator.triggerHelperPanel.title')"
-					:class="$style.title"
-				/>
-			</template>
-			<template #footer v-if="activeNodeActions && containsAPIAction">
-				<slot name="footer" />
-				<span
-					v-html="getCustomAPICallHintLocale('apiCall')"
-					class="clickable"
-					@click.stop="addHttpNode"
-				/>
-			</template>
-		</categorized-items>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { reactive, toRefs, getCurrentInstance, computed, onMounted, ref } from 'vue';
-import {
-	INodeTypeDescription,
-	INodeActionTypeDescription,
-	INodeTypeNameVersion,
-} from 'n8n-workflow';
-import {
-	INodeCreateElement,
-	IActionItemProps,
-	SubcategoryCreateElement,
-	IUpdateInformation,
-} from '@/Interface';
-import {
-	CORE_NODES_CATEGORY,
-	WEBHOOK_NODE_TYPE,
-	OTHER_TRIGGER_NODES_SUBCATEGORY,
-	EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
-	MANUAL_TRIGGER_NODE_TYPE,
-	SCHEDULE_TRIGGER_NODE_TYPE,
-	EMAIL_IMAP_NODE_TYPE,
-	CUSTOM_API_CALL_NAME,
-	HTTP_REQUEST_NODE_TYPE,
-	STICKY_NODE_TYPE,
-} from '@/constants';
-import CategorizedItems from './CategorizedItems.vue';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-import { getCategoriesWithNodes, getCategorizedList } from '@/utils';
-import { externalHooks } from '@/mixins/externalHooks';
-import { useNodeTypesStore } from '@/stores/nodeTypes';
-import { BaseTextKey } from '@/plugins/i18n';
-
-const instance = getCurrentInstance();
-const items: INodeCreateElement[] = [
-	{
-		key: '*',
-		type: 'subcategory',
-		title: instance?.proxy.$locale.baseText('nodeCreator.subcategoryNames.appTriggerNodes'),
-		properties: {
-			subcategory: 'App Trigger Nodes',
-			description: instance?.proxy.$locale.baseText(
-				'nodeCreator.subcategoryDescriptions.appTriggerNodes',
-			),
-			icon: 'fa:satellite-dish',
-			defaults: {
-				color: '#7D838F',
-			},
-		},
-	},
-	{
-		key: SCHEDULE_TRIGGER_NODE_TYPE,
-		type: 'node',
-		properties: {
-			nodeType: {
-				group: [],
-				name: SCHEDULE_TRIGGER_NODE_TYPE,
-				displayName: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName',
-				),
-				description: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.scheduleTriggerDescription',
-				),
-				icon: 'fa:clock',
-				defaults: {
-					color: '#7D838F',
-				},
-			},
-		},
-	},
-	{
-		key: WEBHOOK_NODE_TYPE,
-		type: 'node',
-		properties: {
-			nodeType: {
-				group: [],
-				name: WEBHOOK_NODE_TYPE,
-				displayName: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.webhookTriggerDisplayName',
-				),
-				description: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.webhookTriggerDescription',
-				),
-				iconData: {
-					type: 'file',
-					icon: 'webhook',
-					fileBuffer: '/static/webhook-icon.svg',
-				},
-				defaults: {
-					color: '#7D838F',
-				},
-			},
-		},
-	},
-	{
-		key: MANUAL_TRIGGER_NODE_TYPE,
-		type: 'node',
-		properties: {
-			nodeType: {
-				group: [],
-				name: MANUAL_TRIGGER_NODE_TYPE,
-				displayName: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.manualTriggerDisplayName',
-				),
-				description: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.manualTriggerDescription',
-				),
-				icon: 'fa:mouse-pointer',
-				defaults: {
-					color: '#7D838F',
-				},
-			},
-		},
-	},
-	{
-		key: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
-		type: 'node',
-		properties: {
-			nodeType: {
-				group: [],
-				name: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
-				displayName: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.workflowTriggerDisplayName',
-				),
-				description: instance?.proxy.$locale.baseText(
-					'nodeCreator.triggerHelperPanel.workflowTriggerDescription',
-				),
-				icon: 'fa:sign-out-alt',
-				defaults: {
-					color: '#7D838F',
-				},
-			},
-		},
-	},
-	{
-		type: 'subcategory',
-		key: OTHER_TRIGGER_NODES_SUBCATEGORY,
-		category: CORE_NODES_CATEGORY,
-		properties: {
-			subcategory: OTHER_TRIGGER_NODES_SUBCATEGORY,
-			description: instance?.proxy.$locale.baseText(
-				'nodeCreator.subcategoryDescriptions.otherTriggerNodes',
-			),
-			icon: 'fa:folder-open',
-			defaults: {
-				color: '#7D838F',
-			},
-		},
-	},
-];
-
-const emit = defineEmits({
-	nodeTypeSelected: (nodeTypes: string[]) => true,
-});
-
-const state = reactive({
-	isRoot: true,
-	selectedSubcategory: '',
-	activeNodeActions: null as INodeTypeDescription | null,
-	latestNodeData: null as INodeTypeDescription | null,
-});
-const categorizedItemsRef = ref<InstanceType<typeof CategorizedItems>>();
-
-const { $externalHooks } = new externalHooks();
-const {
-	mergedAppNodes,
-	setShowTabs,
-	getActionData,
-	getNodeTypesWithManualTrigger,
-	setAddedNodeActionParameters,
-} = useNodeCreatorStore();
-
-const { getNodeType } = useNodeTypesStore();
-
-const telemetry = instance?.proxy.$telemetry;
-const { categorizedItems: allNodes, isTriggerNode } = useNodeTypesStore();
-const containsAPIAction = computed(
-	() =>
-		activeNodeActions.value?.properties.some((p) =>
-			p.options?.find((o) => o.name === CUSTOM_API_CALL_NAME),
-		) === true,
-);
-
-const computedCategorizedItems = computed(() =>
-	getCategorizedList(computedCategoriesWithNodes.value, true),
-);
-
-const nodeAppSubcategory = computed<SubcategoryCreateElement | undefined>(() => {
-	if (!state.activeNodeActions) return undefined;
-
-	return {
-		type: 'subcategory',
-		properties: {
-			subcategory: state.activeNodeActions.displayName,
-			nodeType: {
-				description: '',
-				key: state.activeNodeActions.name,
-				iconUrl: state.activeNodeActions.iconUrl,
-				icon: state.activeNodeActions.icon,
-			},
-		},
-	};
-});
-const searchPlaceholder = computed(() => {
-	const nodeNameTitle = state.activeNodeActions?.displayName?.trim() as string;
-	const actionsSearchPlaceholder = instance?.proxy.$locale.baseText(
-		'nodeCreator.actionsCategory.searchActions',
-		{ interpolate: { nodeNameTitle } },
-	);
-
-	return isActionsActive.value ? actionsSearchPlaceholder : undefined;
-});
-
-const filteredMergedAppNodes = computed(() => {
-	const WHITELISTED_APP_CORE_NODES = [EMAIL_IMAP_NODE_TYPE, WEBHOOK_NODE_TYPE];
-
-	if (isAppEventSubcategory.value)
-		return mergedAppNodes.filter((node) => {
-			const isRegularNode = !isTriggerNode(node.name);
-			const isStickyNode = node.name === STICKY_NODE_TYPE;
-			const isCoreNode =
-				node.codex?.categories?.includes(CORE_NODES_CATEGORY) &&
-				!WHITELISTED_APP_CORE_NODES.includes(node.name);
-			const hasActions = (node.actions || []).length > 0;
-
-			if (isRegularNode && !hasActions) return false;
-			return !isCoreNode && !isStickyNode;
-		});
-
-	return mergedAppNodes;
-});
-
-const computedCategoriesWithNodes = computed(() => {
-	if (!state.activeNodeActions) return getCategoriesWithNodes(filteredMergedAppNodes.value, []);
-
-	return getCategoriesWithNodes(selectedNodeActions.value, [], state.activeNodeActions.displayName);
-});
-
-const selectedNodeActions = computed<INodeActionTypeDescription[]>(
-	() => state.activeNodeActions?.actions ?? [],
-);
-const isAppEventSubcategory = computed(() => state.selectedSubcategory === '*');
-const isActionsActive = computed(() => state.activeNodeActions !== null);
-const firstLevelItems = computed(() => (isRoot.value ? items : []));
-
-const isSearchActive = computed(() => useNodeCreatorStore().itemsFilter !== '');
-const searchItems = computed<INodeCreateElement[]>(() => {
-	const sorted = state.activeNodeActions
-		? [...selectedNodeActions.value]
-		: [...filteredMergedAppNodes.value];
-	sorted.sort((a, b) => {
-		const textA = a.displayName.toLowerCase();
-		const textB = b.displayName.toLowerCase();
-		return textA < textB ? -1 : textA > textB ? 1 : 0;
-	});
-
-	return sorted.map((nodeType) => ({
-		type: 'node',
-		category: '',
-		key: nodeType.name,
-		properties: {
-			nodeType,
-			subcategory: state.activeNodeActions ? state.activeNodeActions.displayName : '',
-		},
-		includedByTrigger: nodeType.group.includes('trigger'),
-		includedByRegular: !nodeType.group.includes('trigger'),
-	}));
-});
-
-function onNodeTypeSelected(nodeTypes: string[]) {
-	emit(
-		'nodeTypeSelected',
-		nodeTypes.length === 1 ? getNodeTypesWithManualTrigger(nodeTypes[0]) : nodeTypes,
-	);
-}
-function getCustomAPICallHintLocale(key: string) {
-	if (!state.activeNodeActions) return '';
-
-	const nodeNameTitle = state.activeNodeActions.displayName;
-	return instance?.proxy.$locale.baseText(`nodeCreator.actionsList.${key}` as BaseTextKey, {
-		interpolate: { nodeNameTitle },
-	});
-}
-
-function setActiveActionsNodeType(nodeType: INodeTypeDescription | null) {
-	state.activeNodeActions = nodeType;
-	setShowTabs(false);
-
-	if (nodeType) trackActionsView();
-}
-
-function onActionSelected(actionCreateElement: INodeCreateElement) {
-	const action = (actionCreateElement.properties as IActionItemProps).nodeType;
-	const actionUpdateData = getActionData(action);
-	emit('nodeTypeSelected', getNodeTypesWithManualTrigger(actionUpdateData.key));
-	setAddedNodeActionParameters(actionUpdateData, telemetry);
-}
-function addHttpNode() {
-	const app_identifier = state.activeNodeActions?.name;
-	let nodeCredentialType = '';
-	const nodeType = app_identifier ? getNodeType(app_identifier) : null;
-
-	if (nodeType && nodeType.credentials && nodeType.credentials.length > 0) {
-		nodeCredentialType = nodeType.credentials[0].name;
-	}
-
-	const updateData = {
-		name: '',
-		key: HTTP_REQUEST_NODE_TYPE,
-		value: {
-			authentication: 'predefinedCredentialType',
-			nodeCredentialType,
-		},
-	} as IUpdateInformation;
-
-	emit('nodeTypeSelected', [MANUAL_TRIGGER_NODE_TYPE, HTTP_REQUEST_NODE_TYPE]);
-	setAddedNodeActionParameters(updateData, telemetry, false);
-
-	$externalHooks().run('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
-	telemetry?.trackNodesPanel('nodeCreateList.onActionsCustmAPIClicked', { app_identifier });
-}
-
-function onSubcategorySelected(subcategory: INodeCreateElement) {
-	state.isRoot = false;
-	state.selectedSubcategory = subcategory.key;
-}
-function onSubcategoryClose(activeSubcategories: INodeCreateElement[]) {
-	if (isActionsActive.value === true) setActiveActionsNodeType(null);
-
-	state.isRoot = activeSubcategories.length === 0;
-	state.selectedSubcategory = activeSubcategories[activeSubcategories.length - 1]?.key ?? '';
-}
-
-function shouldShowNodeActions(node: INodeCreateElement) {
-	if (isAppEventSubcategory.value) return true;
-	if (state.isRoot && !isSearchActive.value) return false;
-	// Do not show actions for core category when searching
-	if (node.type === 'node')
-		return !node.properties.nodeType.codex?.categories?.includes(CORE_NODES_CATEGORY);
-
-	return false;
-}
-
-function trackActionsView() {
-	const trigger_action_count = selectedNodeActions.value.filter((action) =>
-		action.name.toLowerCase().includes('trigger'),
-	).length;
-
-	const trackingPayload = {
-		app_identifier: state.activeNodeActions?.name,
-		actions: selectedNodeActions.value.map((action) => action.displayName),
-		regular_action_count: selectedNodeActions.value.length - trigger_action_count,
-		trigger_action_count,
-	};
-
-	$externalHooks().run('nodeCreateList.onViewActions', trackingPayload);
-	telemetry?.trackNodesPanel('nodeCreateList.onViewActions', trackingPayload);
-}
-
-const { isRoot, activeNodeActions } = toRefs(state);
-</script>
-
-<style lang="scss" module>
-.triggerHelperContainer {
-	height: 100%;
-	display: flex;
-	flex-direction: column;
-
-	// Remove node item border on the root level
-	&.isRoot {
-		--node-item-border: none;
-	}
-}
-.itemCreator {
-	height: calc(100% - 120px);
-	padding-top: 1px;
-	overflow-y: auto;
-	overflow-x: visible;
-
-	&::-webkit-scrollbar {
-		display: none;
-	}
-}
-
-.title {
-	font-size: var(--font-size-l);
-	line-height: var(--font-line-height-xloose);
-	font-weight: var(--font-weight-bold);
-	color: var(--color-text-dark);
-	padding: var(--spacing-s) var(--spacing-s) var(--spacing-3xs);
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/TypeSelector.vue b/packages/editor-ui/src/components/Node/NodeCreator/TypeSelector.vue
deleted file mode 100644
index 38a28670df0317..00000000000000
--- a/packages/editor-ui/src/components/Node/NodeCreator/TypeSelector.vue
+++ /dev/null
@@ -1,59 +0,0 @@
-<template>
-	<div
-		class="type-selector"
-		v-if="nodeCreatorStore.showTabs"
-		data-test-id="node-creator-type-selector"
-	>
-		<el-tabs
-			stretch
-			:value="nodeCreatorStore.selectedType"
-			@input="nodeCreatorStore.setSelectedType"
-		>
-			<el-tab-pane
-				:label="$locale.baseText('nodeCreator.mainPanel.all')"
-				:name="ALL_NODE_FILTER"
-			></el-tab-pane>
-			<el-tab-pane
-				:label="$locale.baseText('nodeCreator.mainPanel.regular')"
-				:name="REGULAR_NODE_FILTER"
-			></el-tab-pane>
-			<el-tab-pane
-				:label="$locale.baseText('nodeCreator.mainPanel.trigger')"
-				:name="TRIGGER_NODE_FILTER"
-			></el-tab-pane>
-		</el-tabs>
-	</div>
-</template>
-
-<script setup lang="ts">
-import { ALL_NODE_FILTER, REGULAR_NODE_FILTER, TRIGGER_NODE_FILTER } from '@/constants';
-import { useNodeCreatorStore } from '@/stores/nodeCreator';
-
-const nodeCreatorStore = useNodeCreatorStore();
-</script>
-<style lang="scss" scoped>
-::v-deep .el-tabs__item {
-	padding: 0;
-}
-
-::v-deep .el-tabs__active-bar {
-	height: 1px;
-}
-
-::v-deep .el-tabs__nav-wrap::after {
-	height: 1px;
-}
-
-.type-selector {
-	text-align: center;
-	background-color: $node-creator-select-background-color;
-	::v-deep .el-tabs > div {
-		margin-bottom: 0;
-		z-index: 1;
-
-		.el-tabs__nav {
-			height: 43px;
-		}
-	}
-}
-</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/ViewItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/ViewItem.vue
new file mode 100644
index 00000000000000..b3313011379227
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/ViewItem.vue
@@ -0,0 +1,45 @@
+<template>
+	<n8n-node-creator-node
+		:class="{
+			[$style.view]: true,
+			[$style.withTopBorder]: view.withTopBorder,
+		}"
+		:title="view.title"
+		:isTrigger="false"
+		:description="view.description"
+		:showActionArrow="true"
+	>
+		<template #icon>
+			<n8n-node-icon
+				type="icon"
+				:name="view.icon"
+				:circle="false"
+				:showTooltip="false"
+			></n8n-node-icon>
+		</template>
+	</n8n-node-creator-node>
+</template>
+
+<script setup lang="ts">
+import { ViewItemProps } from '@/Interface';
+
+export interface Props {
+	view: ViewItemProps;
+}
+
+defineProps<Props>();
+</script>
+
+<style lang="scss" module>
+.view {
+	--action-arrow-color: var(--color-text-light);
+	margin-left: 15px;
+	margin-right: 12px;
+	padding: 11px 4px 11px 0;
+}
+.withTopBorder {
+	border-top: 1px solid var(--color-foreground-base);
+	margin-top: var(--spacing-xs);
+	padding-top: var(--spacing-l);
+}
+</style>
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/useMainPanelView.ts b/packages/editor-ui/src/components/Node/NodeCreator/useMainPanelView.ts
new file mode 100644
index 00000000000000..05ef090da04324
--- /dev/null
+++ b/packages/editor-ui/src/components/Node/NodeCreator/useMainPanelView.ts
@@ -0,0 +1,198 @@
+import { getCurrentInstance, computed } from 'vue';
+import {
+	CORE_NODES_CATEGORY,
+	WEBHOOK_NODE_TYPE,
+	OTHER_TRIGGER_NODES_SUBCATEGORY,
+	EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+	MANUAL_TRIGGER_NODE_TYPE,
+	SCHEDULE_TRIGGER_NODE_TYPE,
+	REGULAR_NODE_FILTER,
+	TRANSFORM_DATA_SUBCATEGORY,
+	FILES_SUBCATEGORY,
+	FLOWS_CONTROL_SUBCATEGORY,
+	HELPERS_SUBCATEGORY,
+	TRIGGER_NODE_FILTER,
+} from '@/constants';
+import { useNodeCreatorStore } from '@/stores/nodeCreator';
+
+export default () => {
+	const instance = getCurrentInstance();
+	const nodeCreatorStore = useNodeCreatorStore();
+
+	const VIEWS = [
+		{
+			value: REGULAR_NODE_FILTER,
+			title: instance?.proxy.$locale.baseText('nodeCreator.triggerHelperPanel.whatHappensNext'),
+			items: [
+				{
+					key: '*',
+					type: 'subcategory',
+					properties: {
+						subcategory: 'App Regular Nodes',
+						icon: 'globe',
+					},
+				},
+				{
+					type: 'subcategory',
+					key: TRANSFORM_DATA_SUBCATEGORY,
+					category: CORE_NODES_CATEGORY,
+					properties: {
+						subcategory: TRANSFORM_DATA_SUBCATEGORY,
+						icon: 'pen',
+					},
+				},
+				{
+					type: 'subcategory',
+					key: HELPERS_SUBCATEGORY,
+					category: CORE_NODES_CATEGORY,
+					properties: {
+						subcategory: HELPERS_SUBCATEGORY,
+						icon: 'toolbox',
+					},
+				},
+				{
+					type: 'subcategory',
+					key: FLOWS_CONTROL_SUBCATEGORY,
+					category: CORE_NODES_CATEGORY,
+					properties: {
+						subcategory: FLOWS_CONTROL_SUBCATEGORY,
+						icon: 'code-branch',
+					},
+				},
+				{
+					type: 'subcategory',
+					key: FILES_SUBCATEGORY,
+					category: CORE_NODES_CATEGORY,
+					properties: {
+						subcategory: FILES_SUBCATEGORY,
+						icon: 'file-alt',
+					},
+				},
+				{
+					key: TRIGGER_NODE_FILTER,
+					type: 'view',
+					properties: {
+						title: instance?.proxy.$locale.baseText(
+							'nodeCreator.triggerHelperPanel.addAnotherTrigger',
+						),
+						icon: 'bolt',
+						withTopBorder: true,
+						description: instance?.proxy.$locale.baseText(
+							'nodeCreator.triggerHelperPanel.addAnotherTriggerDescription',
+						),
+					},
+				},
+			],
+		},
+		{
+			value: TRIGGER_NODE_FILTER,
+			title: instance?.proxy.$locale.baseText('nodeCreator.triggerHelperPanel.selectATrigger'),
+			description: instance?.proxy.$locale.baseText(
+				'nodeCreator.triggerHelperPanel.selectATriggerDescription',
+			),
+			items: [
+				{
+					key: '*',
+					type: 'subcategory',
+					properties: {
+						subcategory: 'App Trigger Nodes',
+						icon: 'satellite-dish',
+					},
+				},
+				{
+					key: SCHEDULE_TRIGGER_NODE_TYPE,
+					type: 'node',
+					category: [CORE_NODES_CATEGORY],
+					properties: {
+						nodeType: {
+							group: [],
+							name: SCHEDULE_TRIGGER_NODE_TYPE,
+							displayName: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName',
+							),
+							description: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.scheduleTriggerDescription',
+							),
+							icon: 'fa:clock',
+						},
+					},
+				},
+				{
+					key: WEBHOOK_NODE_TYPE,
+					type: 'node',
+					category: [CORE_NODES_CATEGORY],
+					properties: {
+						nodeType: {
+							group: [],
+							name: WEBHOOK_NODE_TYPE,
+							displayName: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.webhookTriggerDisplayName',
+							),
+							description: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.webhookTriggerDescription',
+							),
+							iconData: {
+								type: 'file',
+								icon: 'webhook',
+								fileBuffer: '/static/webhook-icon.svg',
+							},
+						},
+					},
+				},
+				{
+					key: MANUAL_TRIGGER_NODE_TYPE,
+					type: 'node',
+					category: [CORE_NODES_CATEGORY],
+					properties: {
+						nodeType: {
+							group: [],
+							name: MANUAL_TRIGGER_NODE_TYPE,
+							displayName: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.manualTriggerDisplayName',
+							),
+							description: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.manualTriggerDescription',
+							),
+							icon: 'fa:mouse-pointer',
+						},
+					},
+				},
+				{
+					key: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+					type: 'node',
+					category: [CORE_NODES_CATEGORY],
+					properties: {
+						nodeType: {
+							group: [],
+							name: EXECUTE_WORKFLOW_TRIGGER_NODE_TYPE,
+							displayName: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.workflowTriggerDisplayName',
+							),
+							description: instance?.proxy.$locale.baseText(
+								'nodeCreator.triggerHelperPanel.workflowTriggerDescription',
+							),
+							icon: 'fa:sign-out-alt',
+						},
+					},
+				},
+				{
+					type: 'subcategory',
+					key: OTHER_TRIGGER_NODES_SUBCATEGORY,
+					category: CORE_NODES_CATEGORY,
+					properties: {
+						subcategory: OTHER_TRIGGER_NODES_SUBCATEGORY,
+						icon: 'folder-open',
+					},
+				},
+			],
+		},
+	];
+
+	const activeView = computed(() => {
+		return VIEWS.find((v) => v.value === nodeCreatorStore.selectedView) || VIEWS[0];
+	});
+
+	return {
+		activeView,
+	};
+};
diff --git a/packages/editor-ui/src/components/PersonalizationModal.vue b/packages/editor-ui/src/components/PersonalizationModal.vue
index b0606f52094f61..c4c4c6f399c258 100644
--- a/packages/editor-ui/src/components/PersonalizationModal.vue
+++ b/packages/editor-ui/src/components/PersonalizationModal.vue
@@ -1,12 +1,8 @@
 <template>
 	<Modal
 		:name="PERSONALIZATION_MODAL_KEY"
-		:title="
-			!submitted
-				? $locale.baseText('personalizationModal.customizeN8n')
-				: $locale.baseText('personalizationModal.thanks')
-		"
-		:subtitle="!submitted ? $locale.baseText('personalizationModal.theseQuestionsHelpUs') : ''"
+		:title="$locale.baseText('personalizationModal.customizeN8n')"
+		:subtitle="$locale.baseText('personalizationModal.theseQuestionsHelpUs')"
 		:centerTitle="true"
 		:showClose="false"
 		:eventBus="modalBus"
@@ -17,11 +13,7 @@
 		@enter="onSave"
 	>
 		<template #content>
-			<div v-if="submitted" :class="$style.submittedContainer">
-				<img :class="$style.demoImage" :src="rootStore.baseUrl + 'suggestednodes.png'" />
-				<n8n-text>{{ $locale.baseText('personalizationModal.lookOutForThingsMarked') }}</n8n-text>
-			</div>
-			<div :class="$style.container" v-else>
+			<div :class="$style.container">
 				<n8n-form-inputs
 					:inputs="survey"
 					:columnView="true"
@@ -33,16 +25,9 @@
 		<template #footer>
 			<div>
 				<n8n-button
-					v-if="submitted"
-					@click="closeDialog"
-					:label="$locale.baseText('personalizationModal.getStarted')"
-					float="right"
-				/>
-				<n8n-button
-					v-else
 					@click="onSave"
 					:loading="isSaving"
-					:label="$locale.baseText('personalizationModal.continue')"
+					:label="$locale.baseText('personalizationModal.getStarted')"
 					float="right"
 				/>
 			</div>
@@ -156,7 +141,6 @@ export default mixins(showMessage, workflowHelpers).extend({
 	name: 'PersonalizationModal',
 	data() {
 		return {
-			submitted: false,
 			isSaving: false,
 			PERSONALIZATION_MODAL_KEY,
 			otherWorkAreaFieldVisible: false,
@@ -646,12 +630,12 @@ export default mixins(showMessage, workflowHelpers).extend({
 				}
 
 				await this.fetchOnboardingPrompt();
-				this.submitted = true;
 			} catch (e) {
 				this.$showError(e, 'Error while submitting results');
 			}
 
 			this.$data.isSaving = false;
+			this.closeDialog();
 		},
 		async fetchOnboardingPrompt() {
 			if (
@@ -695,17 +679,4 @@ export default mixins(showMessage, workflowHelpers).extend({
 		margin-bottom: var(--spacing-m);
 	}
 }
-
-.submittedContainer {
-	* {
-		margin-bottom: var(--spacing-2xs);
-	}
-}
-
-.demoImage {
-	border-radius: var(--border-radius-large);
-	border: var(--border-base);
-	width: 100%;
-	height: 140px;
-}
 </style>
diff --git a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
index 02fffa30463532..6468a9a5c8854e 100644
--- a/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
+++ b/packages/editor-ui/src/components/__tests__/__snapshots__/PersonalizationModal.spec.ts.snap
@@ -274,7 +274,7 @@ exports[`PersonalizationModal.vue > should render correctly 1`] = `
         </div>
         <div class=\\"footer\\">
           <div><button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button primary medium float-right\\">
-              <!----><span>Continue</span></button></div>
+              <!----><span>Get started</span></button></div>
         </div>
       </div>
       <!---->
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 4a3f2f17ec4369..0a11af64c52d17 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -103,6 +103,7 @@ export const JIRA_TRIGGER_NODE_TYPE = 'n8n-nodes-base.jiraTrigger';
 export const MICROSOFT_EXCEL_NODE_TYPE = 'n8n-nodes-base.microsoftExcel';
 export const MANUAL_TRIGGER_NODE_TYPE = 'n8n-nodes-base.manualTrigger';
 export const MICROSOFT_TEAMS_NODE_TYPE = 'n8n-nodes-base.microsoftTeams';
+export const N8N_NODE_TYPE = 'n8n-nodes-base.n8n';
 export const NO_OP_NODE_TYPE = 'n8n-nodes-base.noOp';
 export const STICKY_NODE_TYPE = 'n8n-nodes-base.stickyNote';
 export const NOTION_TRIGGER_NODE_TYPE = 'n8n-nodes-base.notionTrigger';
@@ -168,6 +169,10 @@ export const UNCATEGORIZED_CATEGORY = 'Miscellaneous';
 export const UNCATEGORIZED_SUBCATEGORY = 'Helpers';
 export const PERSONALIZED_CATEGORY = 'Suggested Nodes';
 export const OTHER_TRIGGER_NODES_SUBCATEGORY = 'Other Trigger Nodes';
+export const TRANSFORM_DATA_SUBCATEGORY = 'Data Transformation';
+export const FILES_SUBCATEGORY = 'Files';
+export const FLOWS_CONTROL_SUBCATEGORY = 'Flow';
+export const HELPERS_SUBCATEGORY = 'Helpers';
 
 export const REQUEST_NODE_FORM_URL = 'https://n8n-community.typeform.com/to/K1fBVTZ3';
 
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index df4cb84fe54396..4b01c2260d1456 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -677,10 +677,10 @@
 	"node.discovery.pinData.canvas": "You can pin this output instead of waiting for a test event. Open node to do so.",
 	"node.discovery.pinData.ndv": "You can pin this output instead of waiting for a test event.",
 	"nodeBase.clickToAddNodeOrDragToConnect": "Click to add node<br />or drag to connect",
-	"nodeCreator.actionsCategory.operations": "Operations",
+	"nodeCreator.actionsCategory.actions": "Actions",
 	"nodeCreator.actionsCategory.onNewEvent": "On new {event} event",
 	"nodeCreator.actionsCategory.onEvent": "On {event}",
-	"nodeCreator.actionsCategory.recommended": "Recommended",
+	"nodeCreator.actionsCategory.triggers": "Triggers",
 	"nodeCreator.actionsCategory.searchActions": "Search {nodeNameTitle} Actions...",
 	"nodeCreator.actionsList.apiCall": "Didn't find the right event? Make a <a data-action='addHttpNode'>custom {nodeNameTitle} API call</a>",
 	"nodeCreator.actionsList.apiCallNoResult": "Nothing found — try making a <a data-action='addHttpNode'>custom {nodeNameTitle} API call</a>",
@@ -712,26 +712,33 @@
 	"nodeCreator.noResults.webhook": "Webhook",
 	"nodeCreator.searchBar.searchNodes": "Search nodes...",
 	"nodeCreator.subcategoryDescriptions.appTriggerNodes": "Runs the flow when something happens in an app like Telegram, Notion or Airtable",
-	"nodeCreator.subcategoryDescriptions.dataTransformation": "Manipulate data fields, run code",
-	"nodeCreator.subcategoryDescriptions.files": "Work with CSV, XML, text, images etc.",
-	"nodeCreator.subcategoryDescriptions.flow": "Branches, core triggers, merge data",
-	"nodeCreator.subcategoryDescriptions.helpers": "HTTP Requests (API calls), date and time, scrape HTML",
-	"nodeCreator.subcategoryDescriptions.otherTriggerNodes": "Runs the flow on workflow errors, file changes, and more",
-	"nodeCreator.subcategoryNames.appTriggerNodes": "On App Event",
-	"nodeCreator.subcategoryNames.dataTransformation": "Data Transformation",
+	"nodeCreator.subcategoryDescriptions.appRegularNodes": "Do something in an app or service like Google Sheets, Telegram or Notion",
+	"nodeCreator.subcategoryDescriptions.dataTransformation": "Manipulate data, run JavaScript code, etc.",
+	"nodeCreator.subcategoryDescriptions.files": "CSV, XLS, XML, text, images, etc.",
+	"nodeCreator.subcategoryDescriptions.flow": "IF, Switch, Wait, Compare and Merge data, etc.",
+	"nodeCreator.subcategoryDescriptions.helpers": "HTTP Requests (API Calls), date and time, scrape HTML, RSS, SSH, etc.",
+	"nodeCreator.subcategoryDescriptions.otherTriggerNodes": "Runs the flow on workflow errors, file changes, etc.",
+	"nodeCreator.subcategoryNames.appTriggerNodes": "On app event",
+	"nodeCreator.subcategoryNames.appRegularNodes": "Action in an app",
+	"nodeCreator.subcategoryNames.dataTransformation": "Data transformation",
 	"nodeCreator.subcategoryNames.files": "Files",
 	"nodeCreator.subcategoryNames.flow": "Flow",
 	"nodeCreator.subcategoryNames.helpers": "Helpers",
 	"nodeCreator.subcategoryNames.otherTriggerNodes": "Other ways...",
 	"nodeCreator.subcategoryTitles.otherTriggerNodes": "Other Trigger Nodes",
+	"nodeCreator.triggerHelperPanel.addAnotherTrigger": "Add another trigger",
+	"nodeCreator.triggerHelperPanel.addAnotherTriggerDescription": "Triggers start your workflow. Workflows can have multiple triggers.",
 	"nodeCreator.triggerHelperPanel.title": "When should this workflow run?",
-	"nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName": "On a Schedule",
+	"nodeCreator.triggerHelperPanel.scheduleTriggerDisplayName": "On a schedule",
 	"nodeCreator.triggerHelperPanel.scheduleTriggerDescription": "Runs the flow every day, hour, or custom interval",
-	"nodeCreator.triggerHelperPanel.webhookTriggerDisplayName": "On Webhook Call",
+	"nodeCreator.triggerHelperPanel.webhookTriggerDisplayName": "On webhook call",
 	"nodeCreator.triggerHelperPanel.webhookTriggerDescription": "Runs the flow when another app sends a webhook",
 	"nodeCreator.triggerHelperPanel.manualTriggerDisplayName": "Manually",
 	"nodeCreator.triggerHelperPanel.manualTriggerDescription": "Runs the flow on clicking a button in n8n",
-	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When Called By Another Workflow",
+	"nodeCreator.triggerHelperPanel.whatHappensNext": "What happens next?",
+	"nodeCreator.triggerHelperPanel.selectATrigger": "Select a trigger",
+	"nodeCreator.triggerHelperPanel.selectATriggerDescription": "A trigger is a step that starts your workflow",
+	"nodeCreator.triggerHelperPanel.workflowTriggerDisplayName": "When called by another workflow",
 	"nodeCreator.triggerHelperPanel.workflowTriggerDescription": "Runs the flow when called by the Execute Workflow node from a different workflow",
 	"nodeCredentials.createNew": "Create New Credential",
 	"nodeCredentials.credentialFor": "Credential for {credentialType}",
@@ -929,7 +936,6 @@
 	"personalizationModal.it": "IT",
 	"personalizationModal.legal": "Legal",
 	"personalizationModal.lessThan20People": "Less than 20 people",
-	"personalizationModal.lookOutForThingsMarked": "Look out for things marked with a ✨. They are personalized to make n8n more relevant to you.",
 	"personalizationModal.managedServiceProvider": "Managed service provider",
 	"personalizationModal.manufacturing": "Manufacturing",
 	"personalizationModal.marketing": "Marketing",
diff --git a/packages/editor-ui/src/plugins/icons.ts b/packages/editor-ui/src/plugins/icons.ts
index 86f4caf080dfc7..3d67c20fc2d421 100644
--- a/packages/editor-ui/src/plugins/icons.ts
+++ b/packages/editor-ui/src/plugins/icons.ts
@@ -11,6 +11,7 @@ import {
 	faArrowRight,
 	faAt,
 	faBan,
+	faBolt,
 	faBook,
 	faBoxOpen,
 	faBug,
@@ -46,6 +47,7 @@ import {
 	faExternalLinkAlt,
 	faExchangeAlt,
 	faFile,
+	faFileAlt,
 	faFileArchive,
 	faFileCode,
 	faFileDownload,
@@ -112,6 +114,7 @@ import {
 	faThumbtack,
 	faTimes,
 	faTimesCircle,
+	faToolbox,
 	faTrash,
 	faUndo,
 	faUnlink,
@@ -140,6 +143,7 @@ addIcon(faArrowLeft);
 addIcon(faArrowRight);
 addIcon(faAt);
 addIcon(faBan);
+addIcon(faBolt);
 addIcon(faBook);
 addIcon(faBoxOpen);
 addIcon(faBug);
@@ -176,6 +180,7 @@ addIcon(faExpandAlt);
 addIcon(faExternalLinkAlt);
 addIcon(faExchangeAlt);
 addIcon(faFile);
+addIcon(faFileAlt);
 addIcon(faFileArchive);
 addIcon(faFileCode);
 addIcon(faFileDownload);
@@ -243,6 +248,7 @@ addIcon(faThLarge);
 addIcon(faThumbtack);
 addIcon(faTimes);
 addIcon(faTimesCircle);
+addIcon(faToolbox);
 addIcon(faTrash);
 addIcon(faUndo);
 addIcon(faUnlink);
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index f7485247337fb2..e25831fdeb3898 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -14,16 +14,14 @@ import {
 	STORES,
 	MANUAL_TRIGGER_NODE_TYPE,
 	CORE_NODES_CATEGORY,
-	CALENDLY_TRIGGER_NODE_TYPE,
 	TRIGGER_NODE_FILTER,
-	WEBHOOK_NODE_TYPE,
 	STICKY_NODE_TYPE,
 } from '@/constants';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useWorkflowsStore } from './workflows';
 import { CUSTOM_API_CALL_KEY, ALL_NODE_FILTER } from '@/constants';
 import { INodeCreatorState, INodeFilterType, IUpdateInformation } from '@/Interface';
-import { i18n } from '@/plugins/i18n';
+import { BaseTextKey, i18n } from '@/plugins/i18n';
 import { externalHooks } from '@/mixins/externalHooks';
 import { Telemetry } from '@/plugins/telemetry';
 
@@ -42,7 +40,7 @@ const customNodeActionsParsers: {
 			(categoryItem): INodeActionTypeDescription => ({
 				...getNodeTypeBase(
 					nodeTypeDescription,
-					i18n.baseText('nodeCreator.actionsCategory.recommended'),
+					i18n.baseText('nodeCreator.actionsCategory.triggers'),
 				),
 				actionKey: categoryItem.value as string,
 				displayName: i18n.baseText('nodeCreator.actionsCategory.onEvent', {
@@ -81,7 +79,9 @@ function getNodeTypeBase(nodeTypeDescription: INodeTypeDescription, category: st
 		iconUrl: nodeTypeDescription.iconUrl,
 		icon: nodeTypeDescription.icon,
 		version: [1],
-		defaults: {},
+		defaults: {
+			...nodeTypeDescription.defaults,
+		},
 		inputs: [],
 		outputs: [],
 		properties: [],
@@ -104,10 +104,7 @@ function operationsCategory(
 	);
 
 	const items = filteredOutItems.map((item: INodePropertyOptions) => ({
-		...getNodeTypeBase(
-			nodeTypeDescription,
-			i18n.baseText('nodeCreator.actionsCategory.operations'),
-		),
+		...getNodeTypeBase(nodeTypeDescription, i18n.baseText('nodeCreator.actionsCategory.actions')),
 		actionKey: item.value as string,
 		displayName: item.action ?? startCase(item.name),
 		description: item.description ?? '',
@@ -123,9 +120,7 @@ function operationsCategory(
 	return items;
 }
 
-function recommendedCategory(
-	nodeTypeDescription: INodeTypeDescription,
-): INodeActionTypeDescription[] {
+function triggersCategory(nodeTypeDescription: INodeTypeDescription): INodeActionTypeDescription[] {
 	const matchingKeys = ['event', 'events', 'trigger on'];
 	const isTrigger = nodeTypeDescription.displayName?.toLowerCase().includes('trigger');
 	const matchedProperty = nodeTypeDescription.properties.find((property) =>
@@ -141,7 +136,7 @@ function recommendedCategory(
 			{
 				...getNodeTypeBase(
 					nodeTypeDescription,
-					i18n.baseText('nodeCreator.actionsCategory.recommended'),
+					i18n.baseText('nodeCreator.actionsCategory.triggers'),
 				),
 				actionKey: PLACEHOLDER_RECOMMENDED_ACTION_KEY,
 				displayName: i18n.baseText('nodeCreator.actionsCategory.onNewEvent', {
@@ -166,7 +161,7 @@ function recommendedCategory(
 		filteredOutItems.map((categoryItem: INodePropertyOptions) => ({
 			...getNodeTypeBase(
 				nodeTypeDescription,
-				i18n.baseText('nodeCreator.actionsCategory.recommended'),
+				i18n.baseText('nodeCreator.actionsCategory.triggers'),
 			),
 			actionKey: categoryItem.value as string,
 			displayName:
@@ -247,19 +242,26 @@ function resourceCategories(
 export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 	state: (): INodeCreatorState => ({
 		itemsFilter: '',
-		showTabs: true,
 		showScrim: false,
-		selectedType: ALL_NODE_FILTER,
+		selectedView: TRIGGER_NODE_FILTER,
+		rootViewHistory: [],
 	}),
 	actions: {
-		setShowTabs(isVisible: boolean) {
-			this.showTabs = isVisible;
-		},
 		setShowScrim(isVisible: boolean) {
 			this.showScrim = isVisible;
 		},
-		setSelectedType(selectedNodeType: INodeFilterType) {
-			this.selectedType = selectedNodeType;
+		setSelectedView(selectedNodeType: INodeFilterType) {
+			this.selectedView = selectedNodeType;
+			if (!this.rootViewHistory.includes(selectedNodeType)) {
+				this.rootViewHistory.push(selectedNodeType);
+			}
+		},
+		closeCurrentView() {
+			this.rootViewHistory.pop();
+			this.selectedView = this.rootViewHistory[this.rootViewHistory.length - 1];
+		},
+		resetRootViewHistory() {
+			this.rootViewHistory = [];
 		},
 		setFilter(search: string) {
 			this.itemsFilter = search;
@@ -295,16 +297,11 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 		visibleNodesWithActions(): INodeTypeDescription[] {
 			const nodes = deepCopy(useNodeTypesStore().visibleNodeTypes);
 			const nodesWithActions = nodes.map((node) => {
-				const isCoreNode = node.codex?.categories?.includes(CORE_NODES_CATEGORY);
-				// Core nodes shouldn't support actions
-				node.actions = [];
-				if (isCoreNode) return node;
-
-				node.actions.push(
-					...recommendedCategory(node),
+				node.actions = [
+					...triggersCategory(node),
 					...operationsCategory(node),
 					...resourceCategories(node),
-				);
+				];
 
 				return node;
 			});
@@ -322,20 +319,15 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 				})
 				.reduce((acc: Record<string, INodeTypeDescription>, node: INodeTypeDescription) => {
 					const clonedNode = deepCopy(node);
-					const isCoreNode = node.codex?.categories?.includes(CORE_NODES_CATEGORY);
 					const actions = node.actions || [];
 					// Do not merge core nodes
-					const normalizedName = isCoreNode
-						? node.name
-						: node.name.toLowerCase().replace('trigger', '');
+					const normalizedName = node.name.toLowerCase().replace('trigger', '');
 					const existingNode = acc[normalizedName];
 
 					if (existingNode) existingNode.actions?.push(...actions);
 					else acc[normalizedName] = clonedNode;
 
-					if (!isCoreNode) {
-						acc[normalizedName].displayName = node.displayName.replace('Trigger', '');
-					}
+					acc[normalizedName].displayName = node.displayName.replace('Trigger', '');
 
 					return acc;
 				}, {});
@@ -355,7 +347,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 				const { workflowTriggerNodes } = useWorkflowsStore();
 				const isTrigger = useNodeTypesStore().isTriggerNode(nodeType);
 				const workflowContainsTrigger = workflowTriggerNodes.length > 0;
-				const isTriggerPanel = useNodeCreatorStore().selectedType === TRIGGER_NODE_FILTER;
+				const isTriggerPanel = useNodeCreatorStore().selectedView === TRIGGER_NODE_FILTER;
 				const isStickyNode = nodeType === STICKY_NODE_TYPE;
 
 				const nodeTypes =
diff --git a/packages/editor-ui/src/utils/nodeTypesUtils.ts b/packages/editor-ui/src/utils/nodeTypesUtils.ts
index 991aed6e5c1858..4d74523c9d676e 100644
--- a/packages/editor-ui/src/utils/nodeTypesUtils.ts
+++ b/packages/editor-ui/src/utils/nodeTypesUtils.ts
@@ -4,7 +4,6 @@ import { useNodeTypesStore } from './../stores/nodeTypes';
 import { INodeCredentialDescription } from './../../../workflow/src/Interfaces';
 import {
 	CORE_NODES_CATEGORY,
-	RECOMMENDED_CATEGORY,
 	CUSTOM_NODES_CATEGORY,
 	SUBCATEGORY_DESCRIPTIONS,
 	UNCATEGORIZED_CATEGORY,
@@ -72,7 +71,7 @@ const addNodeToCategory = (
 	}
 	accu[category][subcategory].nodes.push({
 		type: nodeType.actionKey ? 'action' : 'node',
-		key: `${category}_${nodeType.name}`,
+		key: `${nodeType.name}`,
 		category,
 		properties: {
 			nodeType,
@@ -85,17 +84,12 @@ const addNodeToCategory = (
 
 export const getCategoriesWithNodes = (
 	nodeTypes: INodeTypeDescription[],
-	personalizedNodeTypes: string[],
 	uncategorizedSubcategory = UNCATEGORIZED_SUBCATEGORY,
 ): ICategoriesWithNodes => {
 	const sorted = [...nodeTypes].sort((a: INodeTypeDescription, b: INodeTypeDescription) =>
 		a.displayName > b.displayName ? 1 : -1,
 	);
 	const result = sorted.reduce((accu: ICategoriesWithNodes, nodeType: INodeTypeDescription) => {
-		if (personalizedNodeTypes.includes(nodeType.name)) {
-			addNodeToCategory(accu, nodeType, PERSONALIZED_CATEGORY, uncategorizedSubcategory);
-		}
-
 		if (!nodeType.codex || !nodeType.codex.categories) {
 			addNodeToCategory(accu, nodeType, UNCATEGORIZED_CATEGORY, uncategorizedSubcategory);
 			return accu;
@@ -125,14 +119,12 @@ const getCategories = (categoriesWithNodes: ICategoriesWithNodes): string[] => {
 		CUSTOM_NODES_CATEGORY,
 		UNCATEGORIZED_CATEGORY,
 		PERSONALIZED_CATEGORY,
-		RECOMMENDED_CATEGORY,
 	];
 	const categories = Object.keys(categoriesWithNodes);
 	const sorted = categories.filter((category: string) => !excludeFromSort.includes(category));
 	sorted.sort();
 
 	return [
-		RECOMMENDED_CATEGORY,
 		CORE_NODES_CATEGORY,
 		CUSTOM_NODES_CATEGORY,
 		PERSONALIZED_CATEGORY,
@@ -155,8 +147,9 @@ export const getCategorizedList = (
 		const categoryEl: INodeCreateElement = {
 			type: 'category',
 			key: category,
-			category,
 			properties: {
+				category,
+				name: category,
 				expanded: categoryIsExpanded,
 			},
 		};
@@ -179,7 +172,6 @@ export const getCategorizedList = (
 				const subcategoryEl: INodeCreateElement = {
 					type: 'subcategory',
 					key: `${category}_${subcategory}`,
-					category,
 					properties: {
 						subcategory,
 						description: SUBCATEGORY_DESCRIPTIONS[category][subcategory],
@@ -277,15 +269,15 @@ export const executionDataToJson = (inputData: INodeExecutionData[]): IDataObjec
 		[],
 	);
 
-export const matchesSelectType = (el: INodeCreateElement, selectedType: string) => {
-	if (selectedType === REGULAR_NODE_FILTER && el.includedByRegular) {
+export const matchesSelectType = (el: INodeCreateElement, selectedView: string) => {
+	if (selectedView === REGULAR_NODE_FILTER && el.includedByRegular) {
 		return true;
 	}
-	if (selectedType === TRIGGER_NODE_FILTER && el.includedByTrigger) {
+	if (selectedView === TRIGGER_NODE_FILTER && el.includedByTrigger) {
 		return true;
 	}
 
-	return selectedType === ALL_NODE_FILTER;
+	return selectedView === ALL_NODE_FILTER;
 };
 
 const matchesAlias = (nodeType: INodeTypeDescription, filter: string): boolean => {
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index f5f854ea12b787..34fd4062b113c9 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -196,6 +196,8 @@ import {
 	TRIGGER_NODE_FILTER,
 	EnterpriseEditionFeature,
 	POSTHOG_ASSUMPTION_TEST,
+	REGULAR_NODE_FILTER,
+	MANUAL_TRIGGER_NODE_TYPE,
 } from '@/constants';
 import { copyPaste } from '@/mixins/copyPaste';
 import { externalHooks } from '@/mixins/externalHooks';
@@ -752,10 +754,9 @@ export default mixins(
 		},
 		showTriggerCreator(source: string) {
 			if (this.createNodeActive) return;
-			this.nodeCreatorStore.setSelectedType(TRIGGER_NODE_FILTER);
+			this.nodeCreatorStore.setSelectedView(TRIGGER_NODE_FILTER);
 			this.nodeCreatorStore.setShowScrim(true);
 			this.onToggleNodeCreator({ source, createNodeActive: true });
-			this.$nextTick(() => this.nodeCreatorStore.setShowTabs(false));
 		},
 		async openExecution(executionId: string) {
 			this.startLoading();
@@ -1799,6 +1800,7 @@ export default mixins(
 			options: AddNodeOptions = {},
 			showDetail = true,
 			trackHistory = false,
+			isAutoAdd = false,
 		) {
 			const nodeTypeData: INodeTypeDescription | null =
 				this.nodeTypesStore.getNodeType(nodeTypeName);
@@ -1920,6 +1922,7 @@ export default mixins(
 				this.$externalHooks().run('nodeView.addNodeButton', { nodeTypeName });
 				const trackProperties: ITelemetryTrackProperties = {
 					node_type: nodeTypeName,
+					is_auto_add: isAutoAdd,
 					workflow_id: this.workflowsStore.workflowId,
 					drag_and_drop: options.dragAndDrop,
 				};
@@ -2005,6 +2008,7 @@ export default mixins(
 			options: AddNodeOptions = {},
 			showDetail = true,
 			trackHistory = false,
+			isAutoAdd = false,
 		) {
 			if (!this.editAllowedCheck()) {
 				return;
@@ -2016,7 +2020,13 @@ export default mixins(
 
 			this.historyStore.startRecordingUndo();
 
-			const newNodeData = await this.injectNode(nodeTypeName, options, showDetail, trackHistory);
+			const newNodeData = await this.injectNode(
+				nodeTypeName,
+				options,
+				showDetail,
+				trackHistory,
+				isAutoAdd,
+			);
 			if (!newNodeData) {
 				return;
 			}
@@ -3674,12 +3684,14 @@ export default mixins(
 			if (createNodeActive === this.createNodeActive) return;
 
 			// Default to the trigger tab in node creator if there's no trigger node yet
-			if (!this.containsTrigger) this.nodeCreatorStore.setSelectedType(TRIGGER_NODE_FILTER);
+			this.nodeCreatorStore.setSelectedView(
+				this.containsTrigger ? REGULAR_NODE_FILTER : TRIGGER_NODE_FILTER,
+			);
 
 			this.createNodeActive = createNodeActive;
 
 			const mode =
-				this.nodeCreatorStore.selectedType === TRIGGER_NODE_FILTER ? 'trigger' : 'default';
+				this.nodeCreatorStore.selectedView === TRIGGER_NODE_FILTER ? 'trigger' : 'regular';
 			this.$externalHooks().run('nodeView.createNodeActiveChanged', {
 				source,
 				mode,
@@ -3697,11 +3709,14 @@ export default mixins(
 			dragAndDrop: boolean,
 		) {
 			nodeTypes.forEach(({ nodeTypeName, position }, index) => {
+				const isManualTrigger = nodeTypeName === MANUAL_TRIGGER_NODE_TYPE;
+				const openNDV = !isManualTrigger && (nodeTypes.length === 1 || index > 0);
 				this.addNode(
 					nodeTypeName,
 					{ position, dragAndDrop },
-					nodeTypes.length === 1 || index > 0,
+					openNDV,
 					true,
+					nodeTypes.length > 1 && index < 1,
 				);
 				if (index === 0) return;
 				// If there's more than one node, we want to connect them
@@ -3717,7 +3732,7 @@ export default mixins(
 								this.connectTwoNodes(previouslyAddedNode.name, 0, lastAddedNode.name, 0),
 							);
 
-							// Position the added node to the right side of the previsouly added one
+							// Position the added node to the right side of the previously added one
 							lastAddedNode.position = [
 								previouslyAddedNode.position[0] + NodeViewUtils.NODE_SIZE * 2,
 								previouslyAddedNode.position[1],
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
index 4eb26b73db9630..efb8409e825196 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -22,56 +22,67 @@ const nodeOperations: INodePropertyOptions[] = [
 		name: 'Blur',
 		value: 'blur',
 		description: 'Adds a blur to the image and so makes it less sharp',
+		action: 'Blur Image',
 	},
 	{
 		name: 'Border',
 		value: 'border',
 		description: 'Adds a border to the image',
+		action: 'Border Image',
 	},
 	{
 		name: 'Composite',
 		value: 'composite',
 		description: 'Composite image on top of another one',
+		action: 'Composite Image',
 	},
 	{
 		name: 'Create',
 		value: 'create',
 		description: 'Create a new image',
+		action: 'Create Image',
 	},
 	{
 		name: 'Crop',
 		value: 'crop',
 		description: 'Crops the image',
+		action: 'Crop Image',
 	},
 	{
 		name: 'Draw',
 		value: 'draw',
 		description: 'Draw on image',
+		action: 'Draw Image',
 	},
 	{
 		name: 'Rotate',
 		value: 'rotate',
 		description: 'Rotate image',
+		action: 'Rotate Image',
 	},
 	{
 		name: 'Resize',
 		value: 'resize',
 		description: 'Change the size of image',
+		action: 'Resize Image',
 	},
 	{
 		name: 'Shear',
 		value: 'shear',
 		description: 'Shear image along the X or Y axis',
+		action: 'Shear Image',
 	},
 	{
 		name: 'Text',
 		value: 'text',
 		description: 'Adds text to image',
+		action: 'Apply Text to Image',
 	},
 	{
 		name: 'Transparent',
 		value: 'transparent',
 		description: 'Make a color in image transparent',
+		action: 'Add Transparency to Image',
 	},
 ];
 
diff --git a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
index f35ce59c2f2177..d4aeac740159d0 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
@@ -54,6 +54,7 @@ const versionDescription: INodeTypeDescription = {
 				{
 					name: 'Send',
 					value: 'send',
+					action: 'Send an Email',
 				},
 			],
 		},
diff --git a/packages/nodes-base/nodes/N8n/N8n.node.json b/packages/nodes-base/nodes/N8n/N8n.node.json
index 4c2c48d8383f11..34fe5023617eda 100644
--- a/packages/nodes-base/nodes/N8n/N8n.node.json
+++ b/packages/nodes-base/nodes/N8n/N8n.node.json
@@ -17,6 +17,6 @@
 	},
 	"alias": ["Workflow", "Execution"],
 	"subcategories": {
-		"Core Nodes": ["Helpers"]
+		"Core Nodes": ["Helpers", "Flow", "Other Trigger Nodes"]
 	}
 }
diff --git a/packages/nodes-base/nodes/N8n/N8n.node.ts b/packages/nodes-base/nodes/N8n/N8n.node.ts
index 0d9c36cff490f9..91f21bd5c76140 100644
--- a/packages/nodes-base/nodes/N8n/N8n.node.ts
+++ b/packages/nodes-base/nodes/N8n/N8n.node.ts
@@ -18,7 +18,7 @@ export class N8n implements INodeType {
 		group: ['transform'],
 		version: 1,
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Consume n8n API',
+		description: 'Handle events and perform actions on your n8n instance',
 		defaults: {
 			name: 'n8n',
 		},
diff --git a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json
index 1be5c3b24131f3..74882ce5839ee8 100644
--- a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json
+++ b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.json
@@ -11,6 +11,6 @@
 		]
 	},
 	"subcategories": {
-		"Core Nodes": ["Flow", "Other Trigger Nodes"]
+		"Core Nodes": ["Flow", "Other Trigger Nodes", "Helpers"]
 	}
 }
diff --git a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
index 25905de075c1ad..b8a4cf115a8f4e 100644
--- a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
+++ b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
@@ -10,7 +10,7 @@ export class N8nTrigger implements INodeType {
 		icon: 'file:n8nTrigger.svg',
 		group: ['trigger'],
 		version: 1,
-		description: 'Handle events from your n8n instance',
+		description: 'Handle events and perform actions on your n8n instance',
 		eventTriggerDescription: '',
 		mockManualExecution: true,
 		defaults: {
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
index 8d55b5b12f968d..0aa177e77b91d1 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
@@ -69,7 +69,7 @@ export class SpreadsheetFile implements INodeType {
 						name: 'Write to File',
 						value: 'toFile',
 						description: 'Writes the workflow data to a spreadsheet file',
-						action: 'Write the workflow data to a spreadsheet file',
+						action: 'Write data to a spreadsheet file',
 					},
 				],
 				default: 'fromFile',

From db702932f3f2b14a097e7f4364c06cbb4f001ebc Mon Sep 17 00:00:00 2001
From: Ahsan Virani <ahsan.virani@gmail.com>
Date: Mon, 20 Feb 2023 10:28:38 +0100
Subject: [PATCH 249/358] feat(core): Add configurable execution history limit
 (#5505)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Prune execution data when more than cofnfigured limit

* use stricter typings

* use `pruneDataMaxCount`

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 .../cli/src/WorkflowExecuteAdditionalData.ts   | 18 +++++++++++++++++-
 packages/cli/src/config/schema.ts              | 10 ++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index e24a6b586e3dfc..0743fe7421e1ea 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -43,6 +43,7 @@ import {
 } from 'n8n-workflow';
 
 import pick from 'lodash.pick';
+import type { FindOptionsWhere } from 'typeorm';
 import { LessThanOrEqual } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 import config from '@/config';
@@ -202,6 +203,7 @@ async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
 		throttling = true;
 		const timeout = config.getEnv('executions.pruneDataTimeout'); // in seconds
 		const maxAge = config.getEnv('executions.pruneDataMaxAge'); // in h
+		const maxCount = config.getEnv('executions.pruneDataMaxCount');
 		const date = new Date(); // today
 		date.setHours(date.getHours() - maxAge);
 
@@ -209,7 +211,21 @@ async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const utcDate = DateUtils.mixedDateToUtcDatetimeString(date);
 
-		const toPrune = { stoppedAt: LessThanOrEqual(utcDate) };
+		const toPrune: FindOptionsWhere<IExecutionFlattedDb> = { stoppedAt: LessThanOrEqual(utcDate) };
+
+		if (maxCount > 0) {
+			const executions = await Db.collections.Execution.find({
+				select: ['id'],
+				skip: maxCount,
+				take: 1,
+				order: { id: 'DESC' },
+			});
+
+			if (executions[0]) {
+				toPrune.id = LessThanOrEqual(executions[0].id);
+			}
+		}
+
 		const isBinaryModeDefaultMode = config.getEnv('binaryDataManager.mode') === 'default';
 		try {
 			const executions = isBinaryModeDefaultMode
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 9b91f411fb4eb5..1d660eb7247edd 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -325,6 +325,16 @@ export const schema = {
 			default: 3600,
 			env: 'EXECUTIONS_DATA_PRUNE_TIMEOUT',
 		},
+
+		// Additional pruning option to delete executions if total count exceeds the configured max.
+		// Deletes the oldest entries first
+		// Default is 0 = No limit
+		pruneDataMaxCount: {
+			doc: 'Maximum number of executions to keep in DB. Default 0 = no limit',
+			format: Number,
+			default: 0,
+			env: 'EXECUTIONS_DATA_PRUNE_MAX_COUNT',
+		},
 	},
 
 	queue: {

From 75a094a8c03afc40b7872cd2115d82e69455286e Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Mon, 20 Feb 2023 12:22:27 +0100
Subject: [PATCH 250/358] fix: Fixes an issue when saving an active workflow
 without triggers would cause n8n to be stuck (#5513)

fix: Allow saving and editing when an active workflow is saved without triggers
---
 packages/cli/src/workflows/workflows.services.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 601f34807dd5ee..1dd4c1b1c7e9f2 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -332,7 +332,11 @@ export class WorkflowsService {
 				);
 			} catch (error) {
 				// If workflow could not be activated set it again to inactive
-				await Db.collections.Workflow.update(workflowId, { active: false });
+				// and revert the versionId change so UI remains consistent
+				await Db.collections.Workflow.update(workflowId, {
+					active: false,
+					versionId: shared.workflow.versionId,
+				});
 
 				// Also set it in the returned data
 				updatedWorkflow.active = false;

From 1c0966957d8aeaccb4ef0bd6c624ee0351442f92 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 20 Feb 2023 15:59:38 +0100
Subject: [PATCH 251/358] fix(editor): Fix adding of wrong actions when
 filtering in the node actions panel (no-changelog) (#5518)

---
 cypress/e2e/4-node-creator.cy.ts                   | 14 ++++++++++++++
 packages/editor-ui/src/components/Node.vue         |  9 +++++++--
 .../src/components/Node/NodeCreator/MainPanel.vue  |  7 ++++---
 .../editor-ui/src/plugins/i18n/locales/en.json     |  1 +
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 4f43684c933529..4068b2c1fd29d1 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -112,6 +112,20 @@ describe('Node Creator', () => {
 		NDVModal.getters.parameterInput('operation').should('contain.text', 'Crop');
 	})
 
+	it('should search through actions and confirm added action', () => {
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('ftp');
+		nodeCreatorFeature.getters.searchBar().find('input').realPress('{rightarrow}');
+		nodeCreatorFeature.getters.activeSubcategory().should('have.text', 'FTP');
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type('file');
+		// Navigate to rename action which should be the 4th item
+		nodeCreatorFeature.getters.searchBar().find('input').realPress('{downarrow}');
+		nodeCreatorFeature.getters.searchBar().find('input').realPress('{downarrow}');
+		nodeCreatorFeature.getters.searchBar().find('input').realPress('{downarrow}');
+		nodeCreatorFeature.getters.searchBar().find('input').realPress('{rightarrow}');
+		NDVModal.getters.parameterInput('operation').should('contain.text', 'Rename');
+	})
+
 	it('should render and select community node', () => {
 		cy.intercept('GET', '/types/nodes.json').as('nodesIntercept');
 		cy.wait('@nodesIntercept').then(() => {
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 203563af6ccf7b..981dc9a38c9920 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -22,8 +22,13 @@
 				v-touch:start="touchStart"
 				v-touch:end="touchEnd"
 			>
-				<i class="trigger-icon">
-					<font-awesome-icon icon="bolt" size="lg" v-if="isTriggerNode" />
+				<i class="trigger-icon" v-if="isTriggerNode">
+					<n8n-tooltip placement="bottom">
+						<template #content>
+							<span v-html="$locale.baseText('node.thisIsATriggerNode')" />
+						</template>
+						<font-awesome-icon icon="bolt" size="lg" />
+					</n8n-tooltip>
 				</i>
 				<div
 					v-if="!data.disabled"
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
index 9ac55c8d2a414a..79166b9f3d1c58 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
@@ -223,7 +223,7 @@ const firstLevelItems = computed(() => (isRoot.value ? activeView.value.items :
 
 const searchItems = computed<INodeCreateElement[]>(() => {
 	return state.activeNodeActions
-		? transformCreateElements(selectedNodeActions.value)
+		? transformCreateElements(selectedNodeActions.value, 'action')
 		: transformCreateElements(filteredMergedAppNodes.value);
 });
 
@@ -251,6 +251,7 @@ function sortActions(nodeCreateElements: INodeCreateElement[]): INodeCreateEleme
 
 function transformCreateElements(
 	createElements: Array<INodeTypeDescription | INodeActionTypeDescription>,
+	type: 'node' | 'action' = 'node',
 ): INodeCreateElement[] {
 	const sorted = [...createElements];
 
@@ -265,7 +266,7 @@ function transformCreateElements(
 		// if we have more cases like this we should add more robust logic
 		const isN8nNode = nodeType.name.includes(N8N_NODE_TYPE);
 		return {
-			type: 'node',
+			type,
 			category: nodeType.codex?.categories,
 			key: nodeType.name,
 			properties: {
@@ -274,7 +275,7 @@ function transformCreateElements(
 			},
 			includedByTrigger: isN8nNode || nodeType.group.includes('trigger'),
 			includedByRegular: isN8nNode || !nodeType.group.includes('trigger'),
-		};
+		} as INodeCreateElement;
 	});
 }
 
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 4b01c2260d1456..77f03c9c87dbef 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -663,6 +663,7 @@
 	"ndv.pinData.error.tooLarge.description": "You can pin at most 12MB of output per workflow.",
 	"noTagsView.readyToOrganizeYourWorkflows": "Ready to organize your workflows?",
 	"noTagsView.withWorkflowTagsYouReFree": "With workflow tags, you're free to create the perfect tagging system for your flows",
+	"node.thisIsATriggerNode": "This is a Trigger node. <a target=\"_blank\" href=\"https://docs.n8n.io/workflows/components/nodes/\">Learn more</a>",
 	"node.activateDeactivateNode": "Activate/Deactivate Node",
 	"node.deleteNode": "Delete Node",
 	"node.disabled": "Disabled",

From 11b467137e7652c03c0578654b19dbc157b23220 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Mon, 20 Feb 2023 15:03:30 +0000
Subject: [PATCH 252/358] feat: Deprecate Read Binary File node (#5490)

---
 packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
index 453b13d1b8dfe9..3ebc9138357383 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
@@ -8,6 +8,7 @@ export class ReadBinaryFile implements INodeType {
 		icon: 'fa:file-import',
 		group: ['input'],
 		version: 1,
+		hidden: true,
 		description: 'Reads a binary file from disk',
 		defaults: {
 			name: 'Read Binary File',

From 1c476770a778b7d034924db847a8757c383bd281 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Mon, 20 Feb 2023 15:54:59 +0000
Subject: [PATCH 253/358] fix(S3 Node): Fix issue with get many buckets not
 outputting data (#5514)

---
 packages/nodes-base/nodes/S3/S3.node.ts | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index 2314e239c1eb8a..6cab88c6be41f3 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -185,7 +185,11 @@ export class S3 implements INodeType {
 							);
 							responseData = responseData.slice(0, qs.limit);
 						}
-						returnData.push.apply(returnData, responseData);
+						const executionData = this.helpers.constructExecutionMetaData(
+							this.helpers.returnJsonArray(responseData),
+							{ itemData: { item: i } },
+						);
+						returnData.push(...executionData);
 					}
 
 					//https://docs.aws.amazon.com/AmazonS3/latest/API/API_ListObjectsV2.html

From ee21b7a1cfed17936eb6bf50221b7f9983dd38e6 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Mon, 20 Feb 2023 16:04:43 +0000
Subject: [PATCH 254/358] fix(Baserow Node): Fix issue with get all not
 correctly using filters (#5519)

---
 packages/nodes-base/nodes/Baserow/Baserow.node.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
index 1a3ad1f4ce23ef..5b7fa2eb460fe4 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.ts
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -177,7 +177,7 @@ export class Baserow implements INodeType {
 
 					const { order, filters, filterType, search } = this.getNodeParameter(
 						'additionalOptions',
-						0,
+						i,
 					) as GetAllAdditionalOptions;
 
 					const qs: IDataObject = {};

From 26a20ed47e8f580504b80150d7550ecb9a49be0d Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:35:35 +0300
Subject: [PATCH 255/358] feat: Support feature flag evaluation server side
 (#5511)

* feat(editor): roll out schema view

* feat(editor): add posthog tracking

* refactor: use composables

* refactor: clean up console log

* refactor: clean up impl

* chore: clean up impl

* fix: fix demo var

* chore: add comment

* refactor: clean up

* chore: wrap error func

* refactor: clean up import

* refactor: make store

* feat: enable rudderstack usebeacon, move event to unload

* chore: clean up alert

* refactor: move tracking from hooks

* fix: reload flags on login

* fix: add func to setup

* fix: clear duplicate import

* chore: add console to tesT

* chore: add console to tesT

* fix: try reload

* chore: randomize instnace id for testing

* chore: randomize instnace id for testing

* chore: add console logs for testing

* chore: move random id to fe

* chore: use query param for testing

* feat: update PostHog api endpoint

* feat: update rs host

* feat: update rs host

* feat: update rs endpoints

* refactor: use api host for BE events as well

* refactor: refactor out posthog client

* feat: add feature flags to login

* feat: add feature flags to login

* feat: get feature flags to work

* feat: add created at to be events

* chore: add todos

* chore: clean up store

* chore: add created at to identify

* feat: add posthog config to settings

* feat: add bootstrapping

* chore: clean up

* chore: fix build

* fix: get dates to work

* fix: get posthog to recognize dates

* chore: refactor

* fix: update back to number

* fix: update key

* fix: get experiment evals to work

* feat: add posthog to signup router

* feat: add feature flags on sign up

* chore: clean up

* fix: fix import

* chore: clean up loading script

* feat: add timeout, fix: script loader

* fix: test timeout and get working on 8080

* refactor: move out posthog

* feat: add experiment tracking

* fix: clear tracked on reset

* fix: fix signup bug

* fix: handle errors when telmetry is disabled

* refactor: remove redundant await

* fix: add back posthog to telemetry

* test: fix test

* test: fix test

* test: add tests for posthog client

* lint: fix

* fix: fix issue with slow decide endpoint

* lint: fix

* lint: fix

* lint: fix

* lint: fix

* chore: address PR feedback

* chore: address PR feedback

* feat: add onboarding experiment
---
 packages/cli/src/Interfaces.ts                |  13 ++
 packages/cli/src/InternalHooksManager.ts      |   9 +-
 packages/cli/src/Server.ts                    |  19 ++-
 .../UserManagement/UserManagementHelper.ts    |  28 +++-
 packages/cli/src/WorkflowRunnerProcess.ts     |   7 +-
 packages/cli/src/commands/BaseCommand.ts      |   7 +-
 packages/cli/src/commands/start.ts            |  15 ---
 .../cli/src/controllers/auth.controller.ts    |  23 +++-
 .../cli/src/controllers/users.controller.ts   |   9 +-
 packages/cli/src/posthog/index.ts             |  57 ++++++++
 packages/cli/src/telemetry/index.ts           |  36 +----
 packages/cli/src/telemetry/scripts.ts         |  17 ---
 packages/cli/test/integration/shared/utils.ts |   6 +-
 packages/cli/test/unit/PostHog.test.ts        |  90 +++++++++++++
 packages/cli/test/unit/Telemetry.test.ts      |   8 +-
 packages/editor-ui/index.html                 |   2 +
 packages/editor-ui/src/App.vue                |  17 +--
 packages/editor-ui/src/Interface.ts           |  46 ++++++-
 packages/editor-ui/src/api/users.ts           |   7 +-
 .../editor-ui/src/components/Telemetry.vue    |   9 --
 packages/editor-ui/src/constants.ts           |  16 ++-
 .../editor-ui/src/plugins/telemetry/index.ts  |   2 +
 .../src/plugins/telemetry/telemetry.types.ts  |   4 -
 packages/editor-ui/src/stores/posthog.ts      | 124 ++++++++++++++++++
 packages/editor-ui/src/stores/telemetry.ts    |  21 +++
 packages/editor-ui/src/stores/users.ts        |  24 +++-
 packages/editor-ui/src/views/NodeView.vue     |   7 +-
 .../editor-ui/src/views/WorkflowsView.vue     |   8 +-
 packages/workflow/src/Interfaces.ts           |   4 +
 29 files changed, 513 insertions(+), 122 deletions(-)
 create mode 100644 packages/cli/src/posthog/index.ts
 delete mode 100644 packages/cli/src/telemetry/scripts.ts
 create mode 100644 packages/cli/test/unit/PostHog.test.ts
 create mode 100644 packages/editor-ui/src/stores/posthog.ts
 create mode 100644 packages/editor-ui/src/stores/telemetry.ts

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 8ec9b0ccbd01c9..7910ef38e240fa 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -22,6 +22,7 @@ import type {
 	WorkflowExecuteMode,
 	ExecutionStatus,
 	IExecutionsSummary,
+	FeatureFlags,
 } from 'n8n-workflow';
 
 import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
@@ -475,6 +476,14 @@ export interface IN8nUISettings {
 	versionNotifications: IVersionNotificationSettings;
 	instanceId: string;
 	telemetry: ITelemetrySettings;
+	posthog: {
+		enabled: boolean;
+		apiHost: string;
+		apiKey: string;
+		autocapture: boolean;
+		disableSessionRecording: boolean;
+		debug: boolean;
+	};
 	personalizationSurveyEnabled: boolean;
 	defaultLocale: string;
 	userManagement: IUserManagementSettings;
@@ -836,6 +845,10 @@ export interface PublicUser {
 	inviteAcceptUrl?: string;
 }
 
+export interface CurrentUser extends PublicUser {
+	featureFlags?: FeatureFlags;
+}
+
 export interface N8nApp {
 	app: Application;
 	restEndpoint: string;
diff --git a/packages/cli/src/InternalHooksManager.ts b/packages/cli/src/InternalHooksManager.ts
index a30a12c65e0de6..e78564a3d7db8f 100644
--- a/packages/cli/src/InternalHooksManager.ts
+++ b/packages/cli/src/InternalHooksManager.ts
@@ -1,6 +1,7 @@
 import type { INodeTypes } from 'n8n-workflow';
 import { InternalHooksClass } from '@/InternalHooks';
 import { Telemetry } from '@/telemetry';
+import type { PostHogClient } from './posthog';
 
 export class InternalHooksManager {
 	private static internalHooksInstance: InternalHooksClass;
@@ -13,9 +14,13 @@ export class InternalHooksManager {
 		throw new Error('InternalHooks not initialized');
 	}
 
-	static async init(instanceId: string, nodeTypes: INodeTypes): Promise<InternalHooksClass> {
+	static async init(
+		instanceId: string,
+		nodeTypes: INodeTypes,
+		postHog: PostHogClient,
+	): Promise<InternalHooksClass> {
 		if (!this.internalHooksInstance) {
-			const telemetry = new Telemetry(instanceId);
+			const telemetry = new Telemetry(instanceId, postHog);
 			await telemetry.init();
 			this.internalHooksInstance = new InternalHooksClass(telemetry, instanceId, nodeTypes);
 		}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 87e9b7463ea06e..8d2b740a200fa1 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -145,6 +145,7 @@ import { AbstractServer } from './AbstractServer';
 import { configureMetrics } from './metrics';
 import { setupBasicAuth } from './middlewares/basicAuth';
 import { setupExternalJWTAuth } from './middlewares/externalJWTAuth';
+import { PostHogClient } from './posthog';
 import { eventBus } from './eventbus';
 import { isSamlEnabled } from './Saml/helpers';
 
@@ -167,6 +168,8 @@ class Server extends AbstractServer {
 
 	credentialTypes: ICredentialTypes;
 
+	postHog: PostHogClient;
+
 	push: Push;
 
 	constructor() {
@@ -178,6 +181,7 @@ class Server extends AbstractServer {
 
 		this.activeExecutionsInstance = ActiveExecutions.getInstance();
 		this.waitTracker = WaitTracker();
+		this.postHog = new PostHogClient();
 
 		this.presetCredentialsLoaded = false;
 		this.endpointPresetCredentials = config.getEnv('credentials.overwrite.endpoint');
@@ -232,6 +236,16 @@ class Server extends AbstractServer {
 			},
 			instanceId: '',
 			telemetry: telemetrySettings,
+			posthog: {
+				enabled: config.getEnv('diagnostics.enabled'),
+				apiHost: config.getEnv('diagnostics.config.posthog.apiHost'),
+				apiKey: config.getEnv('diagnostics.config.posthog.apiKey'),
+				autocapture: false,
+				disableSessionRecording: config.getEnv(
+					'diagnostics.config.posthog.disableSessionRecording',
+				),
+				debug: config.getEnv('logs.level') === 'debug',
+			},
 			personalizationSurveyEnabled:
 				config.getEnv('personalization.enabled') && config.getEnv('diagnostics.enabled'),
 			defaultLocale: config.getEnv('defaultLocale'),
@@ -345,9 +359,10 @@ class Server extends AbstractServer {
 		const logger = LoggerProxy;
 		const internalHooks = InternalHooksManager.getInstance();
 		const mailer = getMailerInstance();
+		const postHog = this.postHog;
 
 		const controllers = [
-			new AuthController({ config, internalHooks, repositories, logger }),
+			new AuthController({ config, internalHooks, repositories, logger, postHog }),
 			new OwnerController({ config, internalHooks, repositories, logger }),
 			new MeController({ externalHooks, internalHooks, repositories, logger }),
 			new PasswordResetController({ config, externalHooks, internalHooks, repositories, logger }),
@@ -359,6 +374,7 @@ class Server extends AbstractServer {
 				repositories,
 				activeWorkflowRunner,
 				logger,
+				postHog,
 			}),
 		];
 		controllers.forEach((controller) => registerController(app, config, controller));
@@ -378,6 +394,7 @@ class Server extends AbstractServer {
 		await this.externalHooks.run('frontend.settings', [this.frontendSettings]);
 
 		await this.initLicense();
+		await this.postHog.init(this.frontendSettings.instanceId);
 
 		const publicApiEndpoint = config.getEnv('publicApi.path');
 		const excludeEndpoints = config.getEnv('security.excludeEndpoints');
diff --git a/packages/cli/src/UserManagement/UserManagementHelper.ts b/packages/cli/src/UserManagement/UserManagementHelper.ts
index a38a6ed3104b93..bd1c2d38811322 100644
--- a/packages/cli/src/UserManagement/UserManagementHelper.ts
+++ b/packages/cli/src/UserManagement/UserManagementHelper.ts
@@ -6,7 +6,7 @@ import { compare, genSaltSync, hash } from 'bcryptjs';
 
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
-import type { PublicUser, WhereClause } from '@/Interfaces';
+import type { CurrentUser, PublicUser, WhereClause } from '@/Interfaces';
 import type { User } from '@db/entities/User';
 import { MAX_PASSWORD_LENGTH, MIN_PASSWORD_LENGTH } from '@db/entities/User';
 import type { Role } from '@db/entities/Role';
@@ -15,6 +15,7 @@ import config from '@/config';
 import { getWebhookBaseUrl } from '@/WebhookHelpers';
 import { getLicense } from '@/License';
 import { RoleService } from '@/role/role.service';
+import type { PostHogClient } from '@/posthog';
 
 export async function getWorkflowOwner(workflowId: string): Promise<User> {
 	const workflowOwnerRole = await RoleService.get({ name: 'owner', scope: 'workflow' });
@@ -162,6 +163,31 @@ export function sanitizeUser(user: User, withoutKeys?: string[]): PublicUser {
 	return sanitizedUser;
 }
 
+export async function withFeatureFlags(
+	postHog: PostHogClient | undefined,
+	user: CurrentUser,
+): Promise<CurrentUser> {
+	if (!postHog) {
+		return user;
+	}
+
+	// native PostHog implementation has default 10s timeout and 3 retries.. which cannot be updated without affecting other functionality
+	// https://github.com/PostHog/posthog-js-lite/blob/a182de80a433fb0ffa6859c10fb28084d0f825c2/posthog-core/src/index.ts#L67
+	const timeoutPromise = new Promise<CurrentUser>((resolve) => {
+		setTimeout(() => {
+			resolve(user);
+		}, 1500);
+	});
+
+	const fetchPromise = new Promise<CurrentUser>(async (resolve) => {
+		user.featureFlags = await postHog.getFeatureFlags(user);
+
+		resolve(user);
+	});
+
+	return Promise.race([fetchPromise, timeoutPromise]);
+}
+
 export function addInviteLinkToUser(user: PublicUser, inviterId: string): PublicUser {
 	if (user.isPending) {
 		user.inviteAcceptUrl = generateUserInviteUrl(inviterId, user.id);
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index b8fd32f773b3d2..fe9a5eb64ac857 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -54,6 +54,7 @@ import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { initErrorHandling } from '@/ErrorReporting';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 import { getLicense } from './License';
+import { PostHogClient } from './posthog';
 
 class WorkflowRunnerProcess {
 	data: IWorkflowExecutionDataProcessWithExecution | undefined;
@@ -115,7 +116,11 @@ class WorkflowRunnerProcess {
 		await externalHooks.init();
 
 		const instanceId = userSettings.instanceId ?? '';
-		await InternalHooksManager.init(instanceId, nodeTypes);
+
+		const postHog = new PostHogClient();
+		await postHog.init(instanceId);
+
+		await InternalHooksManager.init(instanceId, nodeTypes, postHog);
 
 		const binaryDataConfig = config.getEnv('binaryDataManager');
 		await BinaryDataManager.init(binaryDataConfig);
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 65b6dd27fc87ff..13037cbf6c5571 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -18,6 +18,7 @@ import { NodeTypes } from '@/NodeTypes';
 import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import type { IExternalHooksClass } from '@/Interfaces';
+import { PostHogClient } from '@/posthog';
 
 export const UM_FIX_INSTRUCTION =
 	'Please fix the database by running ./packages/cli/bin/n8n user-management:reset';
@@ -48,7 +49,11 @@ export abstract class BaseCommand extends Command {
 		const credentialTypes = CredentialTypes(this.loadNodesAndCredentials);
 		CredentialsOverwrites(credentialTypes);
 
-		await InternalHooksManager.init(this.userSettings.instanceId ?? '', this.nodeTypes);
+		const instanceId = this.userSettings.instanceId ?? '';
+		const postHog = new PostHogClient();
+		await postHog.init(instanceId);
+
+		await InternalHooksManager.init(instanceId, this.nodeTypes, postHog);
 
 		await Db.init().catch(async (error: Error) =>
 			this.exitWithCrash('There was an error initializing DB', error),
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index c3761f02e768e4..0c0c37b53791cf 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -26,7 +26,6 @@ import * as TestWebhooks from '@/TestWebhooks';
 import { WaitTracker } from '@/WaitTracker';
 import { getAllInstalledPackages } from '@/CommunityNodes/packageModel';
 import { handleLdapInit } from '@/Ldap/helpers';
-import { createPostHogLoadingScript } from '@/telemetry/scripts';
 import { EDITOR_UI_DIST_DIR, GENERATED_STATIC_DIR } from '@/constants';
 import { eventBus } from '@/eventbus';
 import { BaseCommand } from './BaseCommand';
@@ -154,20 +153,6 @@ export class Start extends BaseCommand {
 			}, '');
 		}
 
-		if (config.getEnv('diagnostics.enabled')) {
-			const phLoadingScript = createPostHogLoadingScript({
-				apiKey: config.getEnv('diagnostics.config.posthog.apiKey'),
-				apiHost: config.getEnv('diagnostics.config.posthog.apiHost'),
-				autocapture: false,
-				disableSessionRecording: config.getEnv(
-					'diagnostics.config.posthog.disableSessionRecording',
-				),
-				debug: config.getEnv('logs.level') === 'debug',
-			});
-
-			scriptsString += phLoadingScript;
-		}
-
 		const closingTitleTag = '</title>';
 		const compileFile = async (fileName: string) => {
 			const filePath = path.join(EDITOR_UI_DIST_DIR, fileName);
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index 05edd7f663502a..0db2cbee3517b9 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -1,7 +1,7 @@
 import validator from 'validator';
 import { Get, Post, RestController } from '@/decorators';
 import { AuthError, BadRequestError, InternalServerError } from '@/ResponseHelper';
-import { sanitizeUser } from '@/UserManagement/UserManagementHelper';
+import { sanitizeUser, withFeatureFlags } from '@/UserManagement/UserManagementHelper';
 import { issueCookie, resolveJwt } from '@/auth/jwt';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { Request, Response } from 'express';
@@ -11,8 +11,14 @@ import { LoginRequest, UserRequest } from '@/requests';
 import type { Repository } from 'typeorm';
 import { In } from 'typeorm';
 import type { Config } from '@/config';
-import type { PublicUser, IDatabaseCollections, IInternalHooksClass } from '@/Interfaces';
+import type {
+	PublicUser,
+	IDatabaseCollections,
+	IInternalHooksClass,
+	CurrentUser,
+} from '@/Interfaces';
 import { handleEmailLogin, handleLdapLogin } from '@/auth';
+import type { PostHogClient } from '@/posthog';
 
 @RestController()
 export class AuthController {
@@ -24,21 +30,26 @@ export class AuthController {
 
 	private readonly userRepository: Repository<User>;
 
+	private readonly postHog?: PostHogClient;
+
 	constructor({
 		config,
 		logger,
 		internalHooks,
 		repositories,
+		postHog,
 	}: {
 		config: Config;
 		logger: ILogger;
 		internalHooks: IInternalHooksClass;
 		repositories: Pick<IDatabaseCollections, 'User'>;
+		postHog?: PostHogClient;
 	}) {
 		this.config = config;
 		this.logger = logger;
 		this.internalHooks = internalHooks;
 		this.userRepository = repositories.User;
+		this.postHog = postHog;
 	}
 
 	/**
@@ -56,7 +67,7 @@ export class AuthController {
 
 		if (user) {
 			await issueCookie(res, user);
-			return sanitizeUser(user);
+			return withFeatureFlags(this.postHog, sanitizeUser(user));
 		}
 
 		throw new AuthError('Wrong username or password. Do you have caps lock on?');
@@ -66,7 +77,7 @@ export class AuthController {
 	 * Manually check the `n8n-auth` cookie.
 	 */
 	@Get('/login')
-	async currentUser(req: Request, res: Response): Promise<PublicUser> {
+	async currentUser(req: Request, res: Response): Promise<CurrentUser> {
 		// Manually check the existing cookie.
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
 		const cookieContents = req.cookies?.[AUTH_COOKIE_NAME] as string | undefined;
@@ -76,7 +87,7 @@ export class AuthController {
 			// If logged in, return user
 			try {
 				user = await resolveJwt(cookieContents);
-				return sanitizeUser(user);
+				return await withFeatureFlags(this.postHog, sanitizeUser(user));
 			} catch (error) {
 				res.clearCookie(AUTH_COOKIE_NAME);
 			}
@@ -102,7 +113,7 @@ export class AuthController {
 		}
 
 		await issueCookie(res, user);
-		return sanitizeUser(user);
+		return withFeatureFlags(this.postHog, sanitizeUser(user));
 	}
 
 	/**
diff --git a/packages/cli/src/controllers/users.controller.ts b/packages/cli/src/controllers/users.controller.ts
index a71682ffb4e12b..ddb8a5c6cceeab 100644
--- a/packages/cli/src/controllers/users.controller.ts
+++ b/packages/cli/src/controllers/users.controller.ts
@@ -16,6 +16,7 @@ import {
 	isUserManagementEnabled,
 	sanitizeUser,
 	validatePassword,
+	withFeatureFlags,
 } from '@/UserManagement/UserManagementHelper';
 import { issueCookie } from '@/auth/jwt';
 import { BadRequestError, InternalServerError, NotFoundError } from '@/ResponseHelper';
@@ -33,6 +34,7 @@ import type {
 } from '@/Interfaces';
 import type { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import { AuthIdentity } from '@db/entities/AuthIdentity';
+import type { PostHogClient } from '@/posthog';
 
 @RestController('/users')
 export class UsersController {
@@ -56,6 +58,8 @@ export class UsersController {
 
 	private mailer: UserManagementMailer;
 
+	private postHog?: PostHogClient;
+
 	constructor({
 		config,
 		logger,
@@ -64,6 +68,7 @@ export class UsersController {
 		repositories,
 		activeWorkflowRunner,
 		mailer,
+		postHog,
 	}: {
 		config: Config;
 		logger: ILogger;
@@ -75,6 +80,7 @@ export class UsersController {
 		>;
 		activeWorkflowRunner: ActiveWorkflowRunner;
 		mailer: UserManagementMailer;
+		postHog?: PostHogClient;
 	}) {
 		this.config = config;
 		this.logger = logger;
@@ -86,6 +92,7 @@ export class UsersController {
 		this.sharedWorkflowRepository = repositories.SharedWorkflow;
 		this.activeWorkflowRunner = activeWorkflowRunner;
 		this.mailer = mailer;
+		this.postHog = postHog;
 	}
 
 	/**
@@ -327,7 +334,7 @@ export class UsersController {
 		await this.externalHooks.run('user.profile.update', [invitee.email, sanitizeUser(invitee)]);
 		await this.externalHooks.run('user.password.update', [invitee.email, invitee.password]);
 
-		return sanitizeUser(updatedUser);
+		return withFeatureFlags(this.postHog, sanitizeUser(updatedUser));
 	}
 
 	@Get('/')
diff --git a/packages/cli/src/posthog/index.ts b/packages/cli/src/posthog/index.ts
new file mode 100644
index 00000000000000..a84173be24928a
--- /dev/null
+++ b/packages/cli/src/posthog/index.ts
@@ -0,0 +1,57 @@
+import type { PostHog } from 'posthog-node';
+import type { FeatureFlags, ITelemetryTrackProperties } from 'n8n-workflow';
+import config from '@/config';
+import type { PublicUser } from '..';
+
+export class PostHogClient {
+	private postHog?: PostHog;
+
+	private instanceId?: string;
+
+	async init(instanceId: string) {
+		this.instanceId = instanceId;
+		const enabled = config.getEnv('diagnostics.enabled');
+		if (!enabled) {
+			return;
+		}
+
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		const { PostHog } = await import('posthog-node');
+		this.postHog = new PostHog(config.getEnv('diagnostics.config.posthog.apiKey'), {
+			host: config.getEnv('diagnostics.config.posthog.apiHost'),
+		});
+
+		const logLevel = config.getEnv('logs.level');
+		if (logLevel === 'debug') {
+			this.postHog.debug(true);
+		}
+	}
+
+	async stop(): Promise<void> {
+		if (this.postHog) {
+			return this.postHog.shutdown();
+		}
+	}
+
+	track(payload: { userId: string; event: string; properties: ITelemetryTrackProperties }): void {
+		this.postHog?.capture({
+			distinctId: payload.userId,
+			sendFeatureFlags: true,
+			...payload,
+		});
+	}
+
+	async getFeatureFlags(user: Pick<PublicUser, 'id' | 'createdAt'>): Promise<FeatureFlags> {
+		if (!this.postHog) return Promise.resolve({});
+
+		const fullId = [this.instanceId, user.id].join('#');
+
+		// cannot use local evaluation because that requires PostHog personal api key with org-wide
+		// https://github.com/PostHog/posthog/issues/4849
+		return this.postHog.getAllFlags(fullId, {
+			personProperties: {
+				created_at_timestamp: user.createdAt.getTime().toString(),
+			},
+		});
+	}
+}
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 66376b67f8a464..981798474d29b2 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import type RudderStack from '@rudderstack/rudder-sdk-node';
-import type { PostHog } from 'posthog-node';
+import type { PostHogClient } from '../posthog';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import { LoggerProxy } from 'n8n-workflow';
 import config from '@/config';
@@ -31,13 +31,11 @@ interface IExecutionsBuffer {
 export class Telemetry {
 	private rudderStack?: RudderStack;
 
-	private postHog?: PostHog;
-
 	private pulseIntervalReference: NodeJS.Timeout;
 
 	private executionCountsBuffer: IExecutionsBuffer = {};
 
-	constructor(private instanceId: string) {}
+	constructor(private instanceId: string, private postHog: PostHogClient) {}
 
 	async init() {
 		const enabled = config.getEnv('diagnostics.enabled');
@@ -58,12 +56,6 @@ export class Telemetry {
 			const { default: RudderStack } = await import('@rudderstack/rudder-sdk-node');
 			this.rudderStack = new RudderStack(key, url, { logLevel });
 
-			// eslint-disable-next-line @typescript-eslint/naming-convention
-			const { PostHog } = await import('posthog-node');
-			this.postHog = new PostHog(config.getEnv('diagnostics.config.posthog.apiKey'), {
-				host: config.getEnv('diagnostics.config.posthog.apiHost'),
-			});
-
 			this.startPulse();
 		}
 	}
@@ -137,10 +129,8 @@ export class Telemetry {
 	async trackN8nStop(): Promise<void> {
 		clearInterval(this.pulseIntervalReference);
 		void this.track('User instance stopped');
-		return new Promise<void>((resolve) => {
-			if (this.postHog) {
-				this.postHog.shutdown();
-			}
+		return new Promise<void>(async (resolve) => {
+			await this.postHog.stop();
 
 			if (this.rudderStack) {
 				this.rudderStack.flush(resolve);
@@ -192,11 +182,7 @@ export class Telemetry {
 				};
 
 				if (withPostHog) {
-					this.postHog?.capture({
-						distinctId: payload.userId,
-						sendFeatureFlags: true,
-						...payload,
-					});
+					this.postHog?.track(payload);
 				}
 
 				return this.rudderStack.track(payload, resolve);
@@ -206,19 +192,7 @@ export class Telemetry {
 		});
 	}
 
-	async isFeatureFlagEnabled(
-		featureFlagName: string,
-		{ user_id: userId }: ITelemetryTrackProperties = {},
-	): Promise<boolean | undefined> {
-		if (!this.postHog) return Promise.resolve(false);
-
-		const fullId = [this.instanceId, userId].join('#');
-
-		return this.postHog.isFeatureEnabled(featureFlagName, fullId);
-	}
-
 	// test helpers
-
 	getCountsBuffer(): IExecutionsBuffer {
 		return this.executionCountsBuffer;
 	}
diff --git a/packages/cli/src/telemetry/scripts.ts b/packages/cli/src/telemetry/scripts.ts
deleted file mode 100644
index 04c014ead0a979..00000000000000
--- a/packages/cli/src/telemetry/scripts.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * Create a script to init PostHog, for embedding before the Vue bundle in `<head>` in `index.html`.
- */
-export const createPostHogLoadingScript = ({
-	apiKey,
-	apiHost,
-	autocapture,
-	disableSessionRecording,
-	debug,
-}: {
-	apiKey: string;
-	apiHost: string;
-	autocapture: boolean;
-	disableSessionRecording: boolean;
-	debug: boolean;
-}) =>
-	`<script>!function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled onFeatureFlags".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[]);posthog.init('${apiKey}',{api_host:'${apiHost}', autocapture: ${autocapture.toString()}, disable_session_recording: ${disableSessionRecording.toString()}, debug:${debug.toString()}})</script>`;
diff --git a/packages/cli/test/integration/shared/utils.ts b/packages/cli/test/integration/shared/utils.ts
index adbd5986cbebd7..3407d1b82f75f1 100644
--- a/packages/cli/test/integration/shared/utils.ts
+++ b/packages/cli/test/integration/shared/utils.ts
@@ -74,6 +74,7 @@ import * as testDb from '../shared/testDb';
 import { v4 as uuid } from 'uuid';
 import { handleLdapInit } from '@/Ldap/helpers';
 import { ldapController } from '@/Ldap/routes/ldap.controller.ee';
+import { PostHogClient } from '@/posthog';
 
 const loadNodesAndCredentials: INodesAndCredentials = {
 	loaded: { nodes: {}, credentials: {} },
@@ -107,8 +108,11 @@ export async function initTestServer({
 	const logger = getLogger();
 	LoggerProxy.init(logger);
 
+	const postHog = new PostHogClient();
+	postHog.init('test-instance-id');
+
 	// Pre-requisite: Mock the telemetry module before calling.
-	await InternalHooksManager.init('test-instance-id', mockNodeTypes);
+	await InternalHooksManager.init('test-instance-id', mockNodeTypes, postHog);
 
 	testServer.app.use(bodyParser.json());
 	testServer.app.use(bodyParser.urlencoded({ extended: true }));
diff --git a/packages/cli/test/unit/PostHog.test.ts b/packages/cli/test/unit/PostHog.test.ts
new file mode 100644
index 00000000000000..47e736014e6d9b
--- /dev/null
+++ b/packages/cli/test/unit/PostHog.test.ts
@@ -0,0 +1,90 @@
+import { PostHog } from 'posthog-node';
+import { PostHogClient } from '@/posthog';
+import config from '@/config';
+
+jest.mock('posthog-node');
+
+describe('PostHog', () => {
+	const instanceId = 'test-id';
+	const userId = 'distinct-id';
+	const apiKey = 'api-key';
+	const apiHost = 'api-host';
+
+	beforeAll(() => {
+		config.set('diagnostics.config.posthog.apiKey', apiKey);
+		config.set('diagnostics.config.posthog.apiHost', apiHost);
+	});
+
+	beforeEach(() => {
+		config.set('diagnostics.enabled', true);
+		jest.resetAllMocks();
+	});
+
+	it('inits PostHog correctly', async () => {
+		const ph = new PostHogClient();
+		await ph.init(instanceId);
+
+		expect(PostHog.prototype.constructor).toHaveBeenCalledWith(apiKey, {host: apiHost});
+	});
+
+	it('does not initialize or track if diagnostics are not enabled', async () => {
+		config.set('diagnostics.enabled', false);
+
+		const ph = new PostHogClient();
+		await ph.init(instanceId);
+
+		ph.track({
+			userId: 'test',
+			event: 'test',
+			properties: {},
+		});
+
+		expect(PostHog.prototype.constructor).not.toHaveBeenCalled();
+		expect(PostHog.prototype.capture).not.toHaveBeenCalled();
+	});
+
+	it('captures PostHog events', async () => {
+		const event = 'test event';
+		const properties = {
+			user_id: 'test',
+			test: true,
+		};
+
+		const ph = new PostHogClient();
+		await ph.init(instanceId);
+
+		ph.track({
+			userId,
+			event,
+			properties,
+		});
+
+		expect(PostHog.prototype.capture).toHaveBeenCalledWith({
+			distinctId: userId,
+			event,
+			userId,
+			properties,
+			sendFeatureFlags: true,
+		});
+	});
+
+	it('gets feature flags', async () => {
+		const createdAt = new Date();
+		const ph = new PostHogClient();
+		await ph.init(instanceId);
+
+		ph.getFeatureFlags({
+			id: userId,
+			createdAt,
+		});
+
+		expect(PostHog.prototype.getAllFlags).toHaveBeenCalledWith(
+			`${instanceId}#${userId}`,
+			{
+				personProperties: {
+					created_at_timestamp: createdAt.getTime().toString(),
+				},
+			}
+		);
+	});
+});
\ No newline at end of file
diff --git a/packages/cli/test/unit/Telemetry.test.ts b/packages/cli/test/unit/Telemetry.test.ts
index 8c671eff08a2c2..67f4fec532ed02 100644
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/test/unit/Telemetry.test.ts
@@ -1,6 +1,7 @@
 import { Telemetry } from '@/telemetry';
 import config from '@/config';
 import { flushPromises } from './Helpers';
+import { PostHogClient } from '@/posthog';
 
 jest.unmock('@/telemetry');
 jest.mock('@/license/License.service', () => {
@@ -10,6 +11,7 @@ jest.mock('@/license/License.service', () => {
 		},
 	};
 });
+jest.mock('@/posthog');
 
 describe('Telemetry', () => {
 	let startPulseSpy: jest.SpyInstance;
@@ -39,7 +41,11 @@ describe('Telemetry', () => {
 
 	beforeEach(() => {
 		spyTrack.mockClear();
-		telemetry = new Telemetry(instanceId);
+
+		const postHog = new PostHogClient();
+		postHog.init(instanceId);
+
+		telemetry = new Telemetry(instanceId, postHog);
 		(telemetry as any).rudderStack = {
 			flush: () => {},
 			identify: () => {},
diff --git a/packages/editor-ui/index.html b/packages/editor-ui/index.html
index 0dc44757dc0728..35923d36b5a520 100644
--- a/packages/editor-ui/index.html
+++ b/packages/editor-ui/index.html
@@ -8,6 +8,8 @@
 		<script type="text/javascript">
 			window.BASE_PATH = '/{{BASE_PATH}}/';
 		</script>
+		<script>!function(t,e){var o,n,p,r;e.__SV||(window.posthog=e,e._i=[],e.init=function(i,s,a){function g(t,e){var o=e.split(".");2==o.length&&(t=t[o[0]],e=o[1]),t[e]=function(){t.push([e].concat(Array.prototype.slice.call(arguments,0)))}}(p=t.createElement("script")).type="text/javascript",p.async=!0,p.src=s.api_host+"/static/array.js",(r=t.getElementsByTagName("script")[0]).parentNode.insertBefore(p,r);var u=e;for(void 0!==a?u=e[a]=[]:a="posthog",u.people=u.people||[],u.toString=function(t){var e="posthog";return"posthog"!==a&&(e+="."+a),t||(e+=" (stub)"),e},u.people.toString=function(){return u.toString(1)+".people (stub)"},o="capture identify alias people.set people.set_once set_config register register_once unregister opt_out_capturing has_opted_out_capturing opt_in_capturing reset isFeatureEnabled getFeatureFlag onFeatureFlags reloadFeatureFlags".split(" "),n=0;n<o.length;n++)g(u,o[n]);e._i.push([i,s,a])},e.__SV=1)}(document,window.posthog||[])</script>
+
 		<title>n8n.io - Workflow Automation</title>
 	</head>
 	<body>
diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index 358717f13a9678..fa1d40a00e470f 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -30,7 +30,7 @@
 import Modals from './components/Modals.vue';
 import LoadingView from './views/LoadingView.vue';
 import Telemetry from './components/Telemetry.vue';
-import { HIRING_BANNER, LOCAL_STORAGE_THEME, POSTHOG_ASSUMPTION_TEST, VIEWS } from './constants';
+import { HIRING_BANNER, LOCAL_STORAGE_THEME, VIEWS } from './constants';
 
 import mixins from 'vue-typed-mixins';
 import { showMessage } from '@/mixins/showMessage';
@@ -179,17 +179,6 @@ export default mixins(showMessage, userHelpers, restApi, historyHelper).extend({
 				window.document.body.classList.add(`theme-${theme}`);
 			}
 		},
-		trackExperiments() {
-			const assumption = window.posthog?.getFeatureFlag?.(POSTHOG_ASSUMPTION_TEST);
-			const isVideo = assumption === 'assumption-video';
-			const isDemo = assumption === 'assumption-demo';
-
-			if (isVideo) {
-				this.$telemetry.track('User is part of video experiment');
-			} else if (isDemo) {
-				this.$telemetry.track('User is part of demo experiment');
-			}
-		},
 	},
 	async mounted() {
 		this.setTheme();
@@ -206,10 +195,6 @@ export default mixins(showMessage, userHelpers, restApi, historyHelper).extend({
 		if (this.defaultLocale !== 'en') {
 			await this.nodeTypesStore.getNodeTranslationHeaders();
 		}
-
-		setTimeout(() => {
-			this.trackExperiments();
-		}, 0);
 	},
 	watch: {
 		$route(route) {
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 2a972f8ba12fbe..dffc17b4ca581c 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -30,6 +30,7 @@ import {
 	IDisplayOptions,
 	IExecutionsSummary,
 	IAbstractEventMessage,
+	FeatureFlags,
 } from 'n8n-workflow';
 import { SignInType } from './constants';
 import { FAKE_DOOR_FEATURES, TRIGGER_NODE_FILTER, REGULAR_NODE_FILTER } from './constants';
@@ -37,6 +38,37 @@ import { BulkCommand, Undoable } from '@/models/history';
 
 export * from 'n8n-design-system/types';
 
+declare global {
+	interface Window {
+		posthog?: {
+			init(
+				key: string,
+				options?: {
+					api_host?: string;
+					autocapture?: boolean;
+					disable_session_recording?: boolean;
+					debug?: boolean;
+					bootstrap?: {
+						distinctId?: string;
+						isIdentifiedID?: boolean;
+						featureFlags: FeatureFlags;
+					};
+				},
+			): void;
+			isFeatureEnabled?(flagName: string): boolean;
+			getFeatureFlag?(flagName: string): boolean | string;
+			identify?(
+				id: string,
+				userProperties?: Record<string, string | number>,
+				userPropertiesOnce?: Record<string, string>,
+			): void;
+			reset?(resetDeviceId?: boolean): void;
+			onFeatureFlags?(callback: (keys: string[], map: FeatureFlags) => void): void;
+			reloadFeatureFlags?(): void;
+		};
+	}
+}
+
 export type EndpointStyle = {
 	width?: number;
 	height?: number;
@@ -551,13 +583,17 @@ export interface IUserResponse {
 	signInType?: SignInType;
 }
 
+export interface CurrentUserResponse extends IUserResponse {
+	featureFlags?: FeatureFlags;
+}
+
 export interface IUser extends IUserResponse {
 	isDefaultUser: boolean;
 	isPendingUser: boolean;
 	isOwner: boolean;
 	inviteAcceptUrl?: string;
 	fullName?: string;
-	createdAt?: Date;
+	createdAt?: string;
 }
 
 export interface IVersionNotificationSettings {
@@ -704,6 +740,14 @@ export interface IN8nUISettings {
 		enabled: boolean;
 		host: string;
 	};
+	posthog: {
+		enabled: boolean;
+		apiHost: string;
+		apiKey: string;
+		autocapture: boolean;
+		disableSessionRecording: boolean;
+		debug: boolean;
+	};
 	executionMode: string;
 	pushBackend: 'sse' | 'websocket';
 	communityNodesEnabled: boolean;
diff --git a/packages/editor-ui/src/api/users.ts b/packages/editor-ui/src/api/users.ts
index bc14132d201d18..50b7b9043e2d4c 100644
--- a/packages/editor-ui/src/api/users.ts
+++ b/packages/editor-ui/src/api/users.ts
@@ -1,4 +1,5 @@
 import {
+	CurrentUserResponse,
 	IInviteResponse,
 	IPersonalizationLatestVersion,
 	IRestApiContext,
@@ -7,14 +8,14 @@ import {
 import { IDataObject } from 'n8n-workflow';
 import { makeRestApiRequest } from '@/utils/apiUtils';
 
-export function loginCurrentUser(context: IRestApiContext): Promise<IUserResponse | null> {
+export function loginCurrentUser(context: IRestApiContext): Promise<CurrentUserResponse | null> {
 	return makeRestApiRequest(context, 'GET', '/login');
 }
 
 export function login(
 	context: IRestApiContext,
 	params: { email: string; password: string },
-): Promise<IUserResponse> {
+): Promise<CurrentUserResponse> {
 	return makeRestApiRequest(context, 'POST', '/login', params);
 }
 
@@ -55,7 +56,7 @@ export function signup(
 		lastName: string;
 		password: string;
 	},
-): Promise<IUserResponse> {
+): Promise<CurrentUserResponse> {
 	const { inviteeId, ...props } = params;
 	return makeRestApiRequest(
 		context,
diff --git a/packages/editor-ui/src/components/Telemetry.vue b/packages/editor-ui/src/components/Telemetry.vue
index a2084af1bcfca8..26b5279832020a 100644
--- a/packages/editor-ui/src/components/Telemetry.vue
+++ b/packages/editor-ui/src/components/Telemetry.vue
@@ -53,11 +53,6 @@ export default mixins(externalHooks).extend({
 				versionCli: this.rootStore.versionCli,
 			});
 
-			this.$externalHooks().run('telemetry.currentUserIdChanged', {
-				instanceId: this.rootStore.instanceId,
-				userId: this.currentUserId,
-			});
-
 			this.isTelemetryInitialized = true;
 		},
 	},
@@ -69,10 +64,6 @@ export default mixins(externalHooks).extend({
 			if (this.isTelemetryEnabled) {
 				this.$telemetry.identify(this.rootStore.instanceId, userId);
 			}
-			this.$externalHooks().run('telemetry.currentUserIdChanged', {
-				instanceId: this.rootStore.instanceId,
-				userId,
-			});
 		},
 		isTelemetryEnabledOnRoute(enabled) {
 			if (enabled) {
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 0a11af64c52d17..b97ba14864268c 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -506,4 +506,18 @@ export const EXPRESSION_EDITOR_PARSER_TIMEOUT = 15_000; // ms
 export const KEEP_AUTH_IN_NDV_FOR_NODES = [HTTP_REQUEST_NODE_TYPE, WEBHOOK_NODE_TYPE];
 export const MAIN_AUTH_FIELD_NAME = 'authentication';
 export const NODE_RESOURCE_FIELD_NAME = 'resource';
-export const POSTHOG_ASSUMPTION_TEST = 'adore-assumption-tests';
+
+export const ASSUMPTION_EXPERIMENT = {
+	name: 'adore-assumption-tests-1',
+	control: 'control',
+	demo: 'assumption-demo',
+	video: 'assumption-video',
+};
+
+export const ONBOARDING_EXPERIMENT = {
+	name: 'onboarding-checklist',
+	control: 'control',
+	variant: 'variant',
+};
+
+export const EXPERIMENTS_TO_TRACK = [ASSUMPTION_EXPERIMENT.name, ONBOARDING_EXPERIMENT.name];
diff --git a/packages/editor-ui/src/plugins/telemetry/index.ts b/packages/editor-ui/src/plugins/telemetry/index.ts
index 1958b591db37c0..f4fcbdfb3c7600 100644
--- a/packages/editor-ui/src/plugins/telemetry/index.ts
+++ b/packages/editor-ui/src/plugins/telemetry/index.ts
@@ -6,6 +6,7 @@ import type { INodeCreateElement } from '@/Interface';
 import type { IUserNodesPanelSession } from './telemetry.types';
 import { useSettingsStore } from '@/stores/settings';
 import { useRootStore } from '@/stores/n8nRootStore';
+import { useTelemetryStore } from '@/stores/telemetry';
 
 export class Telemetry {
 	private pageEventQueue: Array<{ route: Route }>;
@@ -60,6 +61,7 @@ export class Telemetry {
 			configUrl: 'https://api-rs.n8n.io',
 			...logging,
 		});
+		useTelemetryStore().init(this);
 
 		this.identify(instanceId, userId, versionCli);
 
diff --git a/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts b/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
index aedd823e6db99f..960875d920311f 100644
--- a/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
+++ b/packages/editor-ui/src/plugins/telemetry/telemetry.types.ts
@@ -9,10 +9,6 @@ declare module 'vue/types/vue' {
 declare global {
 	interface Window {
 		rudderanalytics: RudderStack;
-		posthog: {
-			isFeatureEnabled(flagName: string): boolean;
-			getFeatureFlag(flagName: string): boolean | string;
-		};
 	}
 }
 
diff --git a/packages/editor-ui/src/stores/posthog.ts b/packages/editor-ui/src/stores/posthog.ts
new file mode 100644
index 00000000000000..d476bb64d794f4
--- /dev/null
+++ b/packages/editor-ui/src/stores/posthog.ts
@@ -0,0 +1,124 @@
+import { ref, Ref, watch } from 'vue';
+import { defineStore } from 'pinia';
+import { useUsersStore } from '@/stores/users';
+import { useRootStore } from '@/stores/n8nRootStore';
+import { useSettingsStore } from './settings';
+import { FeatureFlags } from 'n8n-workflow';
+import { EXPERIMENTS_TO_TRACK } from '@/constants';
+import { useTelemetryStore } from './telemetry';
+
+export const usePostHogStore = defineStore('posthog', () => {
+	const usersStore = useUsersStore();
+	const settingsStore = useSettingsStore();
+	const telemetryStore = useTelemetryStore();
+	const rootStore = useRootStore();
+
+	const featureFlags: Ref<FeatureFlags | null> = ref(null);
+	const initialized: Ref<boolean> = ref(false);
+	const trackedDemoExp: Ref<FeatureFlags> = ref({});
+
+	const reset = () => {
+		window.posthog?.reset?.();
+		featureFlags.value = null;
+		trackedDemoExp.value = {};
+	};
+
+	const getVariant = (experiment: keyof FeatureFlags): FeatureFlags[keyof FeatureFlags] => {
+		return featureFlags.value?.[experiment];
+	};
+
+	const isVariantEnabled = (experiment: string, variant: string) => {
+		return getVariant(experiment) === variant;
+	};
+
+	const identify = () => {
+		const instanceId = rootStore.instanceId;
+		const user = usersStore.currentUser;
+		const traits: Record<string, string | number> = { instance_id: instanceId };
+
+		if (user && typeof user.createdAt === 'string') {
+			traits.created_at_timestamp = new Date(user.createdAt).getTime();
+		}
+
+		// For PostHog, main ID _cannot_ be `undefined` as done for RudderStack.
+		const id = user ? `${instanceId}#${user.id}` : instanceId;
+		window.posthog?.identify?.(id, traits);
+	};
+
+	const init = (evaluatedFeatureFlags?: FeatureFlags) => {
+		if (!window.posthog) {
+			return;
+		}
+
+		const config = settingsStore.settings.posthog;
+		if (!config.enabled) {
+			return;
+		}
+
+		const userId = usersStore.currentUserId;
+		if (!userId) {
+			return;
+		}
+
+		const instanceId = rootStore.instanceId;
+		const distinctId = `${instanceId}#${userId}`;
+
+		const options: Parameters<typeof window.posthog.init>[1] = {
+			api_host: config.apiHost,
+			autocapture: config.autocapture,
+			disable_session_recording: config.disableSessionRecording,
+			debug: config.debug,
+		};
+
+		if (evaluatedFeatureFlags) {
+			featureFlags.value = evaluatedFeatureFlags;
+			options.bootstrap = {
+				distinctId,
+				featureFlags: evaluatedFeatureFlags,
+			};
+		}
+
+		window.posthog?.init(config.apiKey, options);
+
+		identify();
+
+		initialized.value = true;
+	};
+
+	const trackExperiment = (name: string) => {
+		const curr = featureFlags.value;
+		const prev = trackedDemoExp.value;
+
+		if (!curr || curr[name] === undefined) {
+			return;
+		}
+
+		if (curr[name] === prev[name]) {
+			return;
+		}
+
+		const variant = curr[name];
+		telemetryStore.track('User is part of experiment', {
+			name,
+			variant,
+		});
+
+		trackedDemoExp.value[name] = variant;
+	};
+
+	watch(
+		() => featureFlags.value,
+		() => {
+			setTimeout(() => {
+				EXPERIMENTS_TO_TRACK.forEach(trackExperiment);
+			}, 0);
+		},
+	);
+
+	return {
+		init,
+		isVariantEnabled,
+		getVariant,
+		reset,
+	};
+});
diff --git a/packages/editor-ui/src/stores/telemetry.ts b/packages/editor-ui/src/stores/telemetry.ts
new file mode 100644
index 00000000000000..26338651a439ec
--- /dev/null
+++ b/packages/editor-ui/src/stores/telemetry.ts
@@ -0,0 +1,21 @@
+import type { Telemetry } from '@/plugins/telemetry';
+import { ITelemetryTrackProperties } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import { ref, Ref } from 'vue';
+
+export const useTelemetryStore = defineStore('telemetry', () => {
+	const telemetry: Ref<Telemetry | undefined> = ref();
+
+	const init = (tel: Telemetry) => {
+		telemetry.value = tel;
+	};
+
+	const track = (event: string, properties?: ITelemetryTrackProperties) => {
+		telemetry.value?.track(event, properties);
+	};
+
+	return {
+		init,
+		track,
+	};
+});
diff --git a/packages/editor-ui/src/stores/users.ts b/packages/editor-ui/src/stores/users.ts
index 9c7cf2b50cada4..8d3963c86653c5 100644
--- a/packages/editor-ui/src/stores/users.ts
+++ b/packages/editor-ui/src/stores/users.ts
@@ -34,6 +34,7 @@ import { getPersonalizedNodeTypes, isAuthorized, PERMISSIONS, ROLE } from '@/uti
 import { defineStore } from 'pinia';
 import Vue from 'vue';
 import { useRootStore } from './n8nRootStore';
+import { usePostHogStore } from './posthog';
 import { useSettingsStore } from './settings';
 import { useUIStore } from './ui';
 
@@ -141,23 +142,32 @@ export const useUsersStore = defineStore(STORES.USERS, {
 		async loginWithCookie(): Promise<void> {
 			const rootStore = useRootStore();
 			const user = await loginCurrentUser(rootStore.getRestApiContext);
-			if (user) {
-				this.addUsers([user]);
-				this.currentUserId = user.id;
+			if (!user) {
+				return;
 			}
+
+			this.addUsers([user]);
+			this.currentUserId = user.id;
+
+			usePostHogStore().init(user.featureFlags);
 		},
 		async loginWithCreds(params: { email: string; password: string }): Promise<void> {
 			const rootStore = useRootStore();
 			const user = await login(rootStore.getRestApiContext, params);
-			if (user) {
-				this.addUsers([user]);
-				this.currentUserId = user.id;
+			if (!user) {
+				return;
 			}
+
+			this.addUsers([user]);
+			this.currentUserId = user.id;
+
+			usePostHogStore().init(user.featureFlags);
 		},
 		async logout(): Promise<void> {
 			const rootStore = useRootStore();
 			await logout(rootStore.getRestApiContext);
 			this.currentUserId = null;
+			usePostHogStore().reset();
 		},
 		async preOwnerSetup() {
 			return preOwnerSetup(useRootStore().getRestApiContext);
@@ -197,6 +207,8 @@ export const useUsersStore = defineStore(STORES.USERS, {
 				this.addUsers([user]);
 				this.currentUserId = user.id;
 			}
+
+			usePostHogStore().init(user.featureFlags);
 		},
 		async sendForgotPasswordEmail(params: { email: string }): Promise<void> {
 			const rootStore = useRootStore();
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 34fd4062b113c9..0dd1d2bea55019 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -195,7 +195,7 @@ import {
 	WEBHOOK_NODE_TYPE,
 	TRIGGER_NODE_FILTER,
 	EnterpriseEditionFeature,
-	POSTHOG_ASSUMPTION_TEST,
+	ASSUMPTION_EXPERIMENT,
 	REGULAR_NODE_FILTER,
 	MANUAL_TRIGGER_NODE_TYPE,
 } from '@/constants';
@@ -300,6 +300,7 @@ import {
 	ready,
 } from '@jsplumb/browser-ui';
 import { N8nPlusEndpoint } from '@/plugins/endpoints/N8nPlusEndpointType';
+import { usePostHogStore } from '@/stores/posthog';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -2458,7 +2459,9 @@ export default mixins(
 		},
 		async tryToAddWelcomeSticky(): Promise<void> {
 			const newWorkflow = this.workflowData;
-			if (window.posthog?.getFeatureFlag?.(POSTHOG_ASSUMPTION_TEST) === 'assumption-video') {
+			if (
+				usePostHogStore().isVariantEnabled(ASSUMPTION_EXPERIMENT.name, ASSUMPTION_EXPERIMENT.video)
+			) {
 				// For novice users (onboardingFlowEnabled == true)
 				// Inject welcome sticky note and zoom to fit
 
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index abe2a082adffd9..ca7143202a9222 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -127,7 +127,7 @@ import PageViewLayout from '@/components/layouts/PageViewLayout.vue';
 import PageViewLayoutList from '@/components/layouts/PageViewLayoutList.vue';
 import WorkflowCard from '@/components/WorkflowCard.vue';
 import TemplateCard from '@/components/TemplateCard.vue';
-import { EnterpriseEditionFeature, POSTHOG_ASSUMPTION_TEST, VIEWS } from '@/constants';
+import { EnterpriseEditionFeature, ASSUMPTION_EXPERIMENT, VIEWS } from '@/constants';
 import { debounceHelper } from '@/mixins/debounce';
 import Vue from 'vue';
 import { ITag, IUser, IWorkflowDb } from '@/Interface';
@@ -137,6 +137,7 @@ import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
 import { useUsersStore } from '@/stores/users';
 import { useWorkflowsStore } from '@/stores/workflows';
+import { usePostHogStore } from '@/stores/posthog';
 
 type IResourcesListLayoutInstance = Vue & { sendFiltersTelemetry: (source: string) => void };
 
@@ -183,7 +184,10 @@ export default mixins(showMessage, debounceHelper).extend({
 			return !!this.workflowsStore.activeWorkflows.length;
 		},
 		isDemoTest(): boolean {
-			return window.posthog?.getFeatureFlag?.(POSTHOG_ASSUMPTION_TEST) === 'assumption-demo';
+			return usePostHogStore().isVariantEnabled(
+				ASSUMPTION_EXPERIMENT.name,
+				ASSUMPTION_EXPERIMENT.demo,
+			);
 		},
 		statusFilterOptions(): Array<{ label: string; value: string | boolean }> {
 			return [
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index b113d0d8436a7f..1f9372c2c36cdb 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -1812,6 +1812,10 @@ export interface ITelemetrySettings {
 	config?: ITelemetryClientConfig;
 }
 
+export interface FeatureFlags {
+	[featureFlag: string]: string | boolean | undefined;
+}
+
 export interface IConnectedNode {
 	name: string;
 	indicies: number[];

From f0f8d59fee223c6bc9f8459890ed4a31ef8cb0af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:21:04 +0100
Subject: [PATCH 256/358] fix(core): Do not allow arbitrary path traversal in
 the credential-translation endpoint (#5522)

---
 packages/cli/src/Server.ts                    | 45 +-------------
 packages/cli/src/TranslationHelpers.ts        | 16 -----
 packages/cli/src/controllers/index.ts         |  1 +
 .../src/controllers/translation.controller.ts | 58 +++++++++++++++++++
 packages/cli/test/setup-mocks.ts              |  2 +
 .../translation.controller.test.ts            | 40 +++++++++++++
 6 files changed, 103 insertions(+), 59 deletions(-)
 create mode 100644 packages/cli/src/controllers/translation.controller.ts
 create mode 100644 packages/cli/test/unit/controllers/translation.controller.test.ts

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 8d2b740a200fa1..a5832346bde259 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -57,7 +57,6 @@ import history from 'connect-history-api-fallback';
 import config from '@/config';
 import * as Queue from '@/Queue';
 import { InternalHooksManager } from '@/InternalHooksManager';
-import { getCredentialTranslationPath } from '@/TranslationHelpers';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 
 import { nodesController } from '@/api/nodes.api';
@@ -88,6 +87,7 @@ import {
 	MeController,
 	OwnerController,
 	PasswordResetController,
+	TranslationController,
 	UsersController,
 } from '@/controllers';
 
@@ -366,6 +366,7 @@ class Server extends AbstractServer {
 			new OwnerController({ config, internalHooks, repositories, logger }),
 			new MeController({ externalHooks, internalHooks, repositories, logger }),
 			new PasswordResetController({ config, externalHooks, internalHooks, repositories, logger }),
+			new TranslationController(config, this.credentialTypes),
 			new UsersController({
 				config,
 				mailer,
@@ -606,48 +607,6 @@ class Server extends AbstractServer {
 			),
 		);
 
-		this.app.get(
-			`/${this.restEndpoint}/credential-translation`,
-			ResponseHelper.send(
-				async (
-					req: express.Request & { query: { credentialType: string } },
-					res: express.Response,
-				): Promise<object | null> => {
-					const translationPath = getCredentialTranslationPath({
-						locale: this.frontendSettings.defaultLocale,
-						credentialType: req.query.credentialType,
-					});
-
-					try {
-						return require(translationPath);
-					} catch (error) {
-						return null;
-					}
-				},
-			),
-		);
-
-		// Returns node information based on node names and versions
-		const headersPath = pathJoin(NODES_BASE_DIR, 'dist', 'nodes', 'headers');
-		this.app.get(
-			`/${this.restEndpoint}/node-translation-headers`,
-			ResponseHelper.send(
-				async (req: express.Request, res: express.Response): Promise<object | void> => {
-					try {
-						await fsAccess(`${headersPath}.js`);
-					} catch (_) {
-						return; // no headers available
-					}
-
-					try {
-						return require(headersPath);
-					} catch (error) {
-						res.status(500).send('Failed to load headers file');
-					}
-				},
-			),
-		);
-
 		// ----------------------------------------
 		// Node-Types
 		// ----------------------------------------
diff --git a/packages/cli/src/TranslationHelpers.ts b/packages/cli/src/TranslationHelpers.ts
index cc4319b04f2834..dd829534a6d785 100644
--- a/packages/cli/src/TranslationHelpers.ts
+++ b/packages/cli/src/TranslationHelpers.ts
@@ -1,7 +1,6 @@
 import { join, dirname } from 'path';
 import { readdir } from 'fs/promises';
 import type { Dirent } from 'fs';
-import { NODES_BASE_DIR } from '@/constants';
 
 const ALLOWED_VERSIONED_DIRNAME_LENGTH = [2, 3]; // e.g. v1, v10
 
@@ -47,18 +46,3 @@ export async function getNodeTranslationPath({
 		? join(nodeDir, `v${maxVersion}`, 'translations', locale, `${nodeType}.json`)
 		: join(nodeDir, 'translations', locale, `${nodeType}.json`);
 }
-
-/**
- * Get the full path to a credential translation file in `/dist`.
- */
-export function getCredentialTranslationPath({
-	locale,
-	credentialType,
-}: {
-	locale: string;
-	credentialType: string;
-}): string {
-	const credsPath = join(NODES_BASE_DIR, 'dist', 'credentials');
-
-	return join(credsPath, 'translations', locale, `${credentialType}.json`);
-}
diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
index 2ee7c7fd064ece..37ce548a540dca 100644
--- a/packages/cli/src/controllers/index.ts
+++ b/packages/cli/src/controllers/index.ts
@@ -2,4 +2,5 @@ export { AuthController } from './auth.controller';
 export { MeController } from './me.controller';
 export { OwnerController } from './owner.controller';
 export { PasswordResetController } from './passwordReset.controller';
+export { TranslationController } from './translation.controller';
 export { UsersController } from './users.controller';
diff --git a/packages/cli/src/controllers/translation.controller.ts b/packages/cli/src/controllers/translation.controller.ts
new file mode 100644
index 00000000000000..8d24f9e11365e7
--- /dev/null
+++ b/packages/cli/src/controllers/translation.controller.ts
@@ -0,0 +1,58 @@
+import type { Request } from 'express';
+import { ICredentialTypes } from 'n8n-workflow';
+import { join } from 'path';
+import { access } from 'fs/promises';
+import { Get, RestController } from '@/decorators';
+import { BadRequestError, InternalServerError } from '@/ResponseHelper';
+import { Config } from '@/config';
+import { NODES_BASE_DIR } from '@/constants';
+
+export const CREDENTIAL_TRANSLATIONS_DIR = 'n8n-nodes-base/dist/credentials/translations';
+export const NODE_HEADERS_PATH = join(NODES_BASE_DIR, 'dist/nodes/headers');
+
+export declare namespace TranslationRequest {
+	export type Credential = Request<{}, {}, {}, { credentialType: string }>;
+}
+
+@RestController('/')
+export class TranslationController {
+	constructor(private config: Config, private credentialTypes: ICredentialTypes) {}
+
+	@Get('/credential-translation')
+	async getCredentialTranslation(req: TranslationRequest.Credential) {
+		const { credentialType } = req.query;
+
+		if (!this.credentialTypes.recognizes(credentialType))
+			throw new BadRequestError(`Invalid Credential type: "${credentialType}"`);
+
+		const defaultLocale = this.config.getEnv('defaultLocale');
+		const translationPath = join(
+			CREDENTIAL_TRANSLATIONS_DIR,
+			defaultLocale,
+			`${credentialType}.json`,
+		);
+
+		try {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+			return require(translationPath);
+		} catch (error) {
+			return null;
+		}
+	}
+
+	@Get('/node-translation-headers')
+	async getNodeTranslationHeaders() {
+		try {
+			await access(`${NODE_HEADERS_PATH}.js`);
+		} catch (_) {
+			return; // no headers available
+		}
+
+		try {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+			return require(NODE_HEADERS_PATH);
+		} catch (error) {
+			throw new InternalServerError('Failed to load headers file');
+		}
+	}
+}
diff --git a/packages/cli/test/setup-mocks.ts b/packages/cli/test/setup-mocks.ts
index 1a9bb4e9c0a15c..c6db2d147cdc8e 100644
--- a/packages/cli/test/setup-mocks.ts
+++ b/packages/cli/test/setup-mocks.ts
@@ -1,3 +1,5 @@
+import 'reflect-metadata';
+
 jest.mock('@sentry/node');
 jest.mock('@n8n_io/license-sdk');
 jest.mock('@/telemetry');
diff --git a/packages/cli/test/unit/controllers/translation.controller.test.ts b/packages/cli/test/unit/controllers/translation.controller.test.ts
new file mode 100644
index 00000000000000..a24d462f818189
--- /dev/null
+++ b/packages/cli/test/unit/controllers/translation.controller.test.ts
@@ -0,0 +1,40 @@
+import { mock } from 'jest-mock-extended';
+import type { ICredentialTypes } from 'n8n-workflow';
+import type { Config } from '@/config';
+import {
+	TranslationController,
+	TranslationRequest,
+	CREDENTIAL_TRANSLATIONS_DIR,
+} from '@/controllers/translation.controller';
+import { BadRequestError } from '@/ResponseHelper';
+
+describe('TranslationController', () => {
+	const config = mock<Config>();
+	const credentialTypes = mock<ICredentialTypes>();
+	const controller = new TranslationController(config, credentialTypes);
+
+	describe('getCredentialTranslation', () => {
+		it('should throw 400 on invalid credential types', async () => {
+			const credentialType = 'not-a-valid-credential-type';
+			const req = mock<TranslationRequest.Credential>({ query: { credentialType } });
+			credentialTypes.recognizes.calledWith(credentialType).mockReturnValue(false);
+
+			expect(controller.getCredentialTranslation(req)).rejects.toThrowError(
+				new BadRequestError(`Invalid Credential type: "${credentialType}"`),
+			);
+		});
+
+		it('should return translation json on valid credential types', async () => {
+			const credentialType = 'credential-type';
+			const req = mock<TranslationRequest.Credential>({ query: { credentialType } });
+			config.getEnv.calledWith('defaultLocale').mockReturnValue('de');
+			credentialTypes.recognizes.calledWith(credentialType).mockReturnValue(true);
+			const response = { translation: 'string' };
+			jest.mock(`${CREDENTIAL_TRANSLATIONS_DIR}/de/credential-type.json`, () => response, {
+				virtual: true,
+			});
+
+			expect(await controller.getCredentialTranslation(req)).toEqual(response);
+		});
+	});
+});

From eef257406730a989ec8e7a056c3d4234300fdb25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:21:17 +0100
Subject: [PATCH 257/358] fix(core): Do not allow arbitrary path traversal in
 BinaryDataManager (#5523)

---
 packages/cli/src/Server.ts                    | 34 +++++++++++--------
 .../core/src/BinaryDataManager/FileSystem.ts  | 27 +++++++++------
 packages/core/src/errors.ts                   |  5 +++
 packages/core/src/index.ts                    |  1 +
 4 files changed, 42 insertions(+), 25 deletions(-)
 create mode 100644 packages/core/src/errors.ts

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index a5832346bde259..c90835b2853023 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -33,6 +33,7 @@ import {
 	LoadNodeParameterOptions,
 	LoadNodeListSearch,
 	UserSettings,
+	FileNotFoundError,
 } from 'n8n-core';
 
 import type {
@@ -1149,21 +1150,26 @@ class Server extends AbstractServer {
 				// TODO UM: check if this needs permission check for UM
 				const identifier = req.params.path;
 				const binaryDataManager = BinaryDataManager.getInstance();
-				const binaryPath = binaryDataManager.getBinaryPath(identifier);
-				let { mode, fileName, mimeType } = req.query;
-				if (!fileName || !mimeType) {
-					try {
-						const metadata = await binaryDataManager.getBinaryMetadata(identifier);
-						fileName = metadata.fileName;
-						mimeType = metadata.mimeType;
-						res.setHeader('Content-Length', metadata.fileSize);
-					} catch {}
-				}
-				if (mimeType) res.setHeader('Content-Type', mimeType);
-				if (mode === 'download') {
-					res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
+				try {
+					const binaryPath = binaryDataManager.getBinaryPath(identifier);
+					let { mode, fileName, mimeType } = req.query;
+					if (!fileName || !mimeType) {
+						try {
+							const metadata = await binaryDataManager.getBinaryMetadata(identifier);
+							fileName = metadata.fileName;
+							mimeType = metadata.mimeType;
+							res.setHeader('Content-Length', metadata.fileSize);
+						} catch {}
+					}
+					if (mimeType) res.setHeader('Content-Type', mimeType);
+					if (mode === 'download') {
+						res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
+					}
+					res.sendFile(binaryPath);
+				} catch (error) {
+					if (error instanceof FileNotFoundError) res.writeHead(404).end();
+					else throw error;
 				}
-				res.sendFile(binaryPath);
 			},
 		);
 
diff --git a/packages/core/src/BinaryDataManager/FileSystem.ts b/packages/core/src/BinaryDataManager/FileSystem.ts
index b66093b3d2f01b..df033569752f11 100644
--- a/packages/core/src/BinaryDataManager/FileSystem.ts
+++ b/packages/core/src/BinaryDataManager/FileSystem.ts
@@ -7,6 +7,7 @@ import type { BinaryMetadata } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
 import type { IBinaryDataConfig, IBinaryDataManager } from '../Interfaces';
+import { FileNotFoundError } from '../errors';
 
 const PREFIX_METAFILE = 'binarymeta';
 const PREFIX_PERSISTED_METAFILE = 'persistedmeta';
@@ -85,17 +86,17 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 	}
 
 	getBinaryPath(identifier: string): string {
-		return path.join(this.storagePath, identifier);
+		return this.resolveStoragePath(identifier);
 	}
 
 	getMetadataPath(identifier: string): string {
-		return path.join(this.storagePath, `${identifier}.metadata`);
+		return this.resolveStoragePath(`${identifier}.metadata`);
 	}
 
 	async markDataForDeletionByExecutionId(executionId: string): Promise<void> {
 		const tt = new Date(new Date().getTime() + this.binaryDataTTL * 60000);
 		return fs.writeFile(
-			path.join(this.getBinaryDataMetaPath(), `${PREFIX_METAFILE}_${executionId}_${tt.valueOf()}`),
+			this.resolveStoragePath('meta', `${PREFIX_METAFILE}_${executionId}_${tt.valueOf()}`),
 			'',
 		);
 	}
@@ -116,8 +117,8 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 		const timeAtNextHour = currentTime + 3600000 - (currentTime % 3600000);
 		const timeoutTime = timeAtNextHour + this.persistedBinaryDataTTL * 60000;
 
-		const filePath = path.join(
-			this.getBinaryDataPersistMetaPath(),
+		const filePath = this.resolveStoragePath(
+			'persistMeta',
 			`${PREFIX_PERSISTED_METAFILE}_${executionId}_${timeoutTime}`,
 		);
 
@@ -170,21 +171,18 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 		const newBinaryDataId = this.generateFileName(prefix);
 
 		return fs
-			.copyFile(
-				path.join(this.storagePath, binaryDataId),
-				path.join(this.storagePath, newBinaryDataId),
-			)
+			.copyFile(this.resolveStoragePath(binaryDataId), this.resolveStoragePath(newBinaryDataId))
 			.then(() => newBinaryDataId);
 	}
 
 	async deleteBinaryDataByExecutionId(executionId: string): Promise<void> {
 		const regex = new RegExp(`${executionId}_*`);
-		const filenames = await fs.readdir(path.join(this.storagePath));
+		const filenames = await fs.readdir(this.storagePath);
 
 		const proms = filenames.reduce(
 			(allProms, filename) => {
 				if (regex.test(filename)) {
-					allProms.push(fs.rm(path.join(this.storagePath, filename)));
+					allProms.push(fs.rm(this.resolveStoragePath(filename)));
 				}
 
 				return allProms;
@@ -253,4 +251,11 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 			throw new Error(`Error finding file: ${filePath}`);
 		}
 	}
+
+	private resolveStoragePath(...args: string[]) {
+		const returnPath = path.join(this.storagePath, ...args);
+		if (path.relative(this.storagePath, returnPath).startsWith('..'))
+			throw new FileNotFoundError('Invalid path detected');
+		return returnPath;
+	}
 }
diff --git a/packages/core/src/errors.ts b/packages/core/src/errors.ts
new file mode 100644
index 00000000000000..c425675c893714
--- /dev/null
+++ b/packages/core/src/errors.ts
@@ -0,0 +1,5 @@
+export class FileNotFoundError extends Error {
+	constructor(readonly filePath: string) {
+		super(`File not found: ${filePath}`);
+	}
+}
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index cef794cfa5835b..7a77667f595a5d 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -15,6 +15,7 @@ export * from './LoadNodeListSearch';
 export * from './NodeExecuteFunctions';
 export * from './WorkflowExecute';
 export { eventEmitter, NodeExecuteFunctions, UserSettings };
+export * from './errors';
 
 declare module 'http' {
 	export interface IncomingMessage {

From 510855d9581f07e5081a7bc11377cd6216ba7edf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:22:54 +0100
Subject: [PATCH 258/358] fix(core): User update endpoint should only allow
 updating email, firstName, and lastName (#5526)

---
 packages/cli/package.json                     |  1 +
 packages/cli/src/GenericHelpers.ts            |  3 +-
 packages/cli/src/controllers/me.controller.ts | 35 +++++++-------
 packages/cli/src/databases/entities/User.ts   |  5 +-
 packages/cli/src/requests.ts                  | 23 +++++++--
 .../unit/controllers/me.controller.test.ts    | 48 ++++++++++++++++---
 pnpm-lock.yaml                                | 26 ++++++----
 7 files changed, 101 insertions(+), 40 deletions(-)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6c7f275e800d9f..df23a55365583c 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -129,6 +129,7 @@
     "callsites": "^3.1.0",
     "change-case": "^4.1.1",
     "class-validator": "^0.14.0",
+    "class-transformer": "^0.5.1",
     "client-oauth2": "^4.2.5",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^1.6.0",
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index 7d8011abdec59c..c33e4dff88cc58 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -22,6 +22,7 @@ import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { TagEntity } from '@db/entities/TagEntity';
 import type { User } from '@db/entities/User';
+import type { UserUpdatePayload } from '@/requests';
 
 /**
  * Returns the base URL n8n is reachable from
@@ -99,7 +100,7 @@ export async function generateUniqueName(
 }
 
 export async function validateEntity(
-	entity: WorkflowEntity | CredentialsEntity | TagEntity | User,
+	entity: WorkflowEntity | CredentialsEntity | TagEntity | User | UserUpdatePayload,
 ): Promise<void> {
 	const errors = await validate(entity);
 
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 463716b5f73e48..5c830a6803baf2 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -1,4 +1,5 @@
 import validator from 'validator';
+import { plainToInstance } from 'class-transformer';
 import { Delete, Get, Patch, Post, RestController } from '@/decorators';
 import {
 	compareHash,
@@ -7,13 +8,13 @@ import {
 	validatePassword,
 } from '@/UserManagement/UserManagementHelper';
 import { BadRequestError } from '@/ResponseHelper';
-import { User } from '@db/entities/User';
+import type { User } from '@db/entities/User';
 import { validateEntity } from '@/GenericHelpers';
 import { issueCookie } from '@/auth/jwt';
 import { Response } from 'express';
 import type { Repository } from 'typeorm';
 import type { ILogger } from 'n8n-workflow';
-import { AuthenticatedRequest, MeRequest } from '@/requests';
+import { AuthenticatedRequest, MeRequest, UserUpdatePayload } from '@/requests';
 import type {
 	PublicUser,
 	IDatabaseCollections,
@@ -53,38 +54,40 @@ export class MeController {
 	 * Update the logged-in user's settings, except password.
 	 */
 	@Patch('/')
-	async updateCurrentUser(req: MeRequest.Settings, res: Response): Promise<PublicUser> {
-		const { email } = req.body;
+	async updateCurrentUser(req: MeRequest.UserUpdate, res: Response): Promise<PublicUser> {
+		const { id: userId, email: currentEmail } = req.user;
+		const payload = plainToInstance(UserUpdatePayload, req.body);
+
+		const { email } = payload;
 		if (!email) {
 			this.logger.debug('Request to update user email failed because of missing email in payload', {
-				userId: req.user.id,
-				payload: req.body,
+				userId,
+				payload,
 			});
 			throw new BadRequestError('Email is mandatory');
 		}
 
 		if (!validator.isEmail(email)) {
 			this.logger.debug('Request to update user email failed because of invalid email in payload', {
-				userId: req.user.id,
+				userId,
 				invalidEmail: email,
 			});
 			throw new BadRequestError('Invalid email address');
 		}
 
-		const { email: currentEmail } = req.user;
-		const newUser = new User();
-
-		Object.assign(newUser, req.user, req.body);
+		await validateEntity(payload);
 
-		await validateEntity(newUser);
-
-		const user = await this.userRepository.save(newUser);
+		await this.userRepository.update(userId, payload);
+		const user = await this.userRepository.findOneOrFail({
+			where: { id: userId },
+			relations: { globalRole: true },
+		});
 
-		this.logger.info('User updated successfully', { userId: user.id });
+		this.logger.info('User updated successfully', { userId });
 
 		await issueCookie(res, user);
 
-		const updatedKeys = Object.keys(req.body);
+		const updatedKeys = Object.keys(payload);
 		void this.internalHooks.onUserUpdate({
 			user,
 			fields_changed: updatedKeys,
diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index 6cba438f7942ab..d62bf8482fc26f 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -111,6 +111,9 @@ export class User extends AbstractEntity implements IUser {
 	@AfterLoad()
 	@AfterUpdate()
 	computeIsPending(): void {
-		this.isPending = this.password === null;
+		this.isPending =
+			this.globalRole?.name === 'owner' && this.globalRole.scope === 'global'
+				? false
+				: this.password === null;
 	}
 }
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index 0a1be41429b3be..f8c5af17b4a840 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -10,11 +10,28 @@ import type {
 	IWorkflowSettings,
 } from 'n8n-workflow';
 
+import { IsEmail, IsString, Length } from 'class-validator';
+import { NoXss } from '@db/utils/customValidators';
 import type { PublicUser, IExecutionDeleteFilter, IWorkflowDb } from '@/Interfaces';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import type * as UserManagementMailer from '@/UserManagement/email/UserManagementMailer';
 
+export class UserUpdatePayload implements Pick<User, 'email' | 'firstName' | 'lastName'> {
+	@IsEmail()
+	email: string;
+
+	@NoXss()
+	@IsString({ message: 'First name must be of type string.' })
+	@Length(1, 32, { message: 'First name must be $constraint1 to $constraint2 characters long.' })
+	firstName: string;
+
+	@NoXss()
+	@IsString({ message: 'Last name must be of type string.' })
+	@Length(1, 32, { message: 'Last name must be $constraint1 to $constraint2 characters long.' })
+	lastName: string;
+}
+
 export type AuthlessRequest<
 	RouteParams = {},
 	ResponseBody = {},
@@ -144,11 +161,7 @@ export declare namespace ExecutionRequest {
 // ----------------------------------
 
 export declare namespace MeRequest {
-	export type Settings = AuthenticatedRequest<
-		{},
-		{},
-		Pick<PublicUser, 'email' | 'firstName' | 'lastName'>
-	>;
+	export type UserUpdate = AuthenticatedRequest<{}, {}, UserUpdatePayload>;
 	export type Password = AuthenticatedRequest<
 		{},
 		{},
diff --git a/packages/cli/test/unit/controllers/me.controller.test.ts b/packages/cli/test/unit/controllers/me.controller.test.ts
index f926c4fc4fe872..4acfbaa5092baf 100644
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -25,40 +25,74 @@ describe('MeController', () => {
 
 	describe('updateCurrentUser', () => {
 		it('should throw BadRequestError if email is missing in the payload', async () => {
-			const req = mock<MeRequest.Settings>({});
+			const req = mock<MeRequest.UserUpdate>({});
 			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
 				new BadRequestError('Email is mandatory'),
 			);
 		});
 
 		it('should throw BadRequestError if email is invalid', async () => {
-			const req = mock<MeRequest.Settings>({ body: { email: 'invalid-email' } });
+			const req = mock<MeRequest.UserUpdate>({ body: { email: 'invalid-email' } });
 			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
 				new BadRequestError('Invalid email address'),
 			);
 		});
 
 		it('should update the user in the DB, and issue a new cookie', async () => {
-			const req = mock<MeRequest.Settings>({
-				user: mock({ id: '123', password: 'password', authIdentities: [] }),
-				body: { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' },
+			const user = mock<User>({
+				id: '123',
+				password: 'password',
+				authIdentities: [],
+				globalRoleId: '1',
 			});
+			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
+			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
 			const res = mock<Response>();
-			userRepository.save.calledWith(anyObject()).mockResolvedValue(req.user);
+			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 
 			await controller.updateCurrentUser(req, res);
 
+			expect(userRepository.update).toHaveBeenCalled();
+
 			const cookieOptions = captor<CookieOptions>();
 			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'signed-token', cookieOptions);
 			expect(cookieOptions.value.httpOnly).toBe(true);
 			expect(cookieOptions.value.sameSite).toBe('lax');
 
 			expect(externalHooks.run).toHaveBeenCalledWith('user.profile.update', [
-				req.user.email,
+				user.email,
 				anyObject(),
 			]);
 		});
+
+		it('should not allow updating any other fields on a user besides email and name', async () => {
+			const user = mock<User>({
+				id: '123',
+				password: 'password',
+				authIdentities: [],
+				globalRoleId: '1',
+			});
+			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
+			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
+			const res = mock<Response>();
+			userRepository.findOneOrFail.mockResolvedValue(user);
+			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
+
+			// Add invalid data to the request payload
+			Object.assign(reqBody, { id: '0', globalRoleId: '42' });
+
+			await controller.updateCurrentUser(req, res);
+
+			expect(userRepository.update).toHaveBeenCalled();
+
+			const updatedUser = userRepository.update.mock.calls[0][1];
+			expect(updatedUser.email).toBe(reqBody.email);
+			expect(updatedUser.firstName).toBe(reqBody.firstName);
+			expect(updatedUser.lastName).toBe(reqBody.lastName);
+			expect(updatedUser.id).not.toBe('0');
+			expect(updatedUser.globalRoleId).not.toBe('42');
+		});
 	});
 
 	describe('updatePassword', () => {
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 055fb2d89c4d02..9e45e143d5363e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -163,6 +163,7 @@ importers:
       callsites: ^3.1.0
       change-case: ^4.1.1
       chokidar: 3.5.2
+      class-transformer: ^0.5.1
       class-validator: ^0.14.0
       client-oauth2: ^4.2.5
       compression: ^1.7.4
@@ -259,6 +260,7 @@ importers:
       bull: 4.10.2
       callsites: 3.1.0
       change-case: 4.1.2
+      class-transformer: 0.5.1
       class-validator: 0.14.0
       client-oauth2: 4.3.3
       compression: 1.7.4
@@ -4138,7 +4140,7 @@ packages:
     dependencies:
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/preview-api': 7.0.0-beta.46
@@ -4346,7 +4348,7 @@ packages:
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/docs-tools': 7.0.0-beta.46
       '@storybook/global': 5.0.0
       '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
@@ -4566,7 +4568,7 @@ packages:
       '@babel/core': 7.20.12
       '@babel/preset-env': 7.20.2_@babel+core@7.20.12
       '@babel/types': 7.20.7
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/csf-tools': 7.0.0-beta.46
       '@storybook/node-logger': 7.0.0-beta.46
       '@storybook/types': 7.0.0-beta.46
@@ -4606,7 +4608,7 @@ packages:
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/types': 7.0.0-beta.46
@@ -4677,7 +4679,7 @@ packages:
       '@storybook/builder-manager': 7.0.0-beta.46
       '@storybook/core-common': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/csf-tools': 7.0.0-beta.46
       '@storybook/docs-mdx': 0.0.1-next.6
       '@storybook/global': 5.0.0
@@ -4747,7 +4749,7 @@ packages:
     resolution: {integrity: sha512-H7zXfL1wf/1jWi5MaFISt/taxE41fgpV/uLfi5CHcHLX9ZgeQs2B/2utpUgwvBsxiL+E/jKAt5cLeuZCIvglMg==}
     dependencies:
       '@babel/types': 7.20.7
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/types': 7.0.0-beta.46
       fs-extra: 11.1.0
       recast: 0.23.1
@@ -4762,8 +4764,8 @@ packages:
       lodash: 4.17.21
     dev: true
 
-  /@storybook/csf/0.0.2-next.9:
-    resolution: {integrity: sha512-ECOLMK425s+z8oA0aVAhBhhquuwTsZrM4oha/5De44JG8uYGXhqVrv/l27oxZEkwytuiQu+9f65HxYli+DY+3w==}
+  /@storybook/csf/0.0.2-next.10:
+    resolution: {integrity: sha512-m2PFgBP/xRIF85VrDhvesn9ktaD2pN3VUjvMqkAL/cINp/3qXsCyI81uw7N5VEOkQAbWrY2FcydnvEPDEdE8fA==}
     dependencies:
       type-fest: 2.19.0
     dev: true
@@ -4799,7 +4801,7 @@ packages:
       '@storybook/channels': 7.0.0-beta.46
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/router': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
@@ -4889,7 +4891,7 @@ packages:
       '@storybook/channels': 7.0.0-beta.46
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/types': 7.0.0-beta.46
       '@types/qs': 6.9.7
@@ -8090,6 +8092,10 @@ packages:
     resolution: {integrity: sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==}
     dev: false
 
+  /class-transformer/0.5.1:
+    resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==}
+    dev: false
+
   /class-utils/0.3.6:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
     engines: {node: '>=0.10.0'}

From 684d71752064e25143e09666e539b91b3dcd5f71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 21 Feb 2023 11:27:15 +0100
Subject: [PATCH 259/358] fix(editor): Fix unexpected date rendering on
 front-end (#5528)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🔥 Remove front-end date rendering logic that changes date timezone to workflow TZ
---
 packages/editor-ui/src/components/RunDataJson.vue  |  8 ++------
 packages/editor-ui/src/components/RunDataTable.vue | 11 +----------
 packages/editor-ui/src/utils/typesUtils.ts         | 14 --------------
 3 files changed, 3 insertions(+), 30 deletions(-)

diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 149c2fa0634e97..97f5d365a97353 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -73,7 +73,7 @@ import VueJsonPretty from 'vue-json-pretty';
 import { LOCAL_STORAGE_MAPPING_FLAG } from '@/constants';
 import { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from '@/components/Draggable.vue';
-import { parseDate, executionDataToJson, isString, shorten } from '@/utils';
+import { executionDataToJson, isString, shorten } from '@/utils';
 import { INodeUi } from '@/Interface';
 import { externalHooks } from '@/mixins/externalHooks';
 import { mapStores } from 'pinia';
@@ -210,11 +210,7 @@ export default mixins(externalHooks).extend({
 			}, 1000); // ensure dest data gets set if drop
 		},
 		getContent(value: unknown): string {
-			if (isString(value)) {
-				const parsedDate = parseDate(value, this.workflowsStore.workflow.settings?.timezone);
-				return parsedDate ? parsedDate.toString() : `"${value}"`;
-			}
-			return JSON.stringify(value);
+			return isString(value) ? `"${value}"` : JSON.stringify(value);
 		},
 		getListItemName(path: string): string {
 			return path.replace(/^(\["?\d"?]\.?)/g, '');
diff --git a/packages/editor-ui/src/components/RunDataTable.vue b/packages/editor-ui/src/components/RunDataTable.vue
index 383e905e196176..9f092a7fd7d519 100644
--- a/packages/editor-ui/src/components/RunDataTable.vue
+++ b/packages/editor-ui/src/components/RunDataTable.vue
@@ -159,7 +159,7 @@
 <script lang="ts">
 /* eslint-disable prefer-spread */
 import { INodeUi, ITableData, NDVState } from '@/Interface';
-import { getPairedItemId, parseDate } from '@/utils';
+import { getPairedItemId } from '@/utils';
 import Vue, { PropType } from 'vue';
 import mixins from 'vue-typed-mixins';
 import { GenericValue, IDataObject, INodeExecutionData } from 'n8n-workflow';
@@ -171,7 +171,6 @@ import { useWorkflowsStore } from '@/stores/workflows';
 import { useNDVStore } from '@/stores/ndv';
 import MappingPill from './MappingPill.vue';
 import { getMappedExpression } from '@/utils/mappingUtils';
-import { DateTime } from 'luxon';
 
 const MAX_COLUMNS_LIMIT = 40;
 
@@ -366,25 +365,17 @@ export default mixins(externalHooks).extend({
 				return this.$locale.baseText('runData.emptyString');
 			}
 			if (typeof value === 'string') {
-				const parsedDate = parseDate(value, this.workflowsStore.workflow.settings?.timezone);
-				if (parsedDate) {
-					return parsedDate.toString();
-				}
 				return value.replaceAll('\n', '\\n');
 			}
-
 			if (Array.isArray(value) && value.length === 0) {
 				return this.$locale.baseText('runData.emptyArray');
 			}
-
 			if (typeof value === 'object' && value !== null && Object.keys(value).length === 0) {
 				return this.$locale.baseText('runData.emptyObject');
 			}
-
 			if (value === null || value === undefined) {
 				return `[${value}]`;
 			}
-
 			return value;
 		},
 		onDragStart() {
diff --git a/packages/editor-ui/src/utils/typesUtils.ts b/packages/editor-ui/src/utils/typesUtils.ts
index 12c43b0ba631c2..2e27a749f82900 100644
--- a/packages/editor-ui/src/utils/typesUtils.ts
+++ b/packages/editor-ui/src/utils/typesUtils.ts
@@ -249,17 +249,3 @@ export const getSchema = (input: Optional<Primitives | object>, path = ''): Sche
 
 	return schema;
 };
-
-// Convert UTC dates that come from back-end to workflow timezone
-export const parseDate = (input: string, timezone: string | undefined): DateTime | null => {
-	const isUTCDate = /\d{4}-[01]\d-[0-3]\dT[0-2]\d:[0-5]\d:[0-5]\d\.\d+([+-][0-2]\d:[0-5]\d|Z)/.test(
-		input,
-	);
-	if (isUTCDate) {
-		const date = new Date(Date.parse(input));
-		if (date.toString() !== 'Invalid Date') {
-			return DateTime.fromJSDate(date, { zone: timezone });
-		}
-	}
-	return null;
-};

From f58573dba30eba8fe3d844d1b7b2dbbb8d51b8b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 11:52:22 +0100
Subject: [PATCH 260/358] fix(core): Do not explicitly bypass auth on urls
 containing `.svg` (#5525)

---
 packages/cli/src/middlewares/auth.ts | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/packages/cli/src/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
index a0c13d4f2176ac..070b86dd09e132 100644
--- a/packages/cli/src/middlewares/auth.ts
+++ b/packages/cli/src/middlewares/auth.ts
@@ -3,11 +3,12 @@ import jwt from 'jsonwebtoken';
 import cookieParser from 'cookie-parser';
 import passport from 'passport';
 import { Strategy } from 'passport-jwt';
+import { sync as globSync } from 'fast-glob';
 import { LoggerProxy as Logger } from 'n8n-workflow';
 import type { JwtPayload } from '@/Interfaces';
 import type { AuthenticatedRequest } from '@/requests';
 import config from '@/config';
-import { AUTH_COOKIE_NAME } from '@/constants';
+import { AUTH_COOKIE_NAME, EDITOR_UI_DIST_DIR } from '@/constants';
 import { issueCookie, resolveJwtContent } from '@/auth/jwt';
 import {
 	isAuthenticatedRequest,
@@ -61,6 +62,10 @@ const refreshExpiringCookie: RequestHandler = async (req: AuthenticatedRequest,
 
 const passportMiddleware = passport.authenticate('jwt', { session: false }) as RequestHandler;
 
+const staticAssets = globSync(['**/*.html', '**/*.svg', '**/*.png', '**/*.ico'], {
+	cwd: EDITOR_UI_DIST_DIR,
+});
+
 /**
  * This sets up the auth middlewares in the correct order
  */
@@ -79,12 +84,7 @@ export const setupAuthMiddlewares = (
 			// TODO: refactor me!!!
 			// skip authentication for preflight requests
 			req.method === 'OPTIONS' ||
-			req.url === '/index.html' ||
-			req.url === '/favicon.ico' ||
-			req.url.startsWith('/css/') ||
-			req.url.startsWith('/js/') ||
-			req.url.startsWith('/fonts/') ||
-			req.url.includes('.svg') ||
+			staticAssets.includes(req.url.slice(1)) ||
 			req.url.startsWith(`/${restEndpoint}/settings`) ||
 			req.url.startsWith(`/${restEndpoint}/login`) ||
 			req.url.startsWith(`/${restEndpoint}/logout`) ||

From 5d74a2f89a31ee1a386a52d0d71858f73d734e31 Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:16:18 +0200
Subject: [PATCH 261/358] fix(Postgres Node): Fix for tables containing field
 named json

---
 .../nodes/Postgres/Postgres.node.functions.ts | 30 ++++++++++++-------
 .../nodes/Postgres/Postgres.node.ts           |  4 +--
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
index 5999dc91f938e3..4aa41b87a867eb 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
@@ -71,6 +71,15 @@ export function generateReturning(pgp: pgPromise.IMain<{}, pg.IClient>, returnin
 	);
 }
 
+export function wrapData(data: IDataObject[]): INodeExecutionData[] {
+	if (!Array.isArray(data)) {
+		return [{ json: data }];
+	}
+	return data.map((item) => ({
+		json: item,
+	}));
+}
+
 /**
  * Executes the given SQL query on the database.
  *
@@ -185,7 +194,7 @@ export async function pgQueryV2(
 	if (mode === 'multiple') {
 		return (await db.multi(pgp.helpers.concat(allQueries)))
 			.map((result, i) => {
-				return this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(result), {
+				return this.helpers.constructExecutionMetaData(wrapData(result), {
 					itemData: { item: i },
 				});
 			})
@@ -197,7 +206,7 @@ export async function pgQueryV2(
 				try {
 					const transactionResult = await t.any(allQueries[i].query, allQueries[i].values);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(transactionResult),
+						wrapData(transactionResult),
 						{ itemData: { item: i } },
 					);
 					result.push(...executionData);
@@ -221,7 +230,7 @@ export async function pgQueryV2(
 				try {
 					const transactionResult = await t.any(allQueries[i].query, allQueries[i].values);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(transactionResult),
+						wrapData(transactionResult),
 						{ itemData: { item: i } },
 					);
 					result.push(...executionData);
@@ -373,7 +382,7 @@ export async function pgInsertV2(
 		const queryResult = await db.any(query);
 		return queryResult
 			.map((result, i) => {
-				return this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(result), {
+				return this.helpers.constructExecutionMetaData(wrapData(result), {
 					itemData: { item: i },
 				});
 			})
@@ -386,7 +395,7 @@ export async function pgInsertV2(
 				try {
 					const insertResult = await t.one(pgp.helpers.insert(itemCopy, cs) + returning);
 					result.push(
-						...this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(insertResult), {
+						...this.helpers.constructExecutionMetaData(wrapData(insertResult), {
 							itemData: { item: i },
 						}),
 					);
@@ -411,10 +420,9 @@ export async function pgInsertV2(
 				try {
 					const insertResult = await t.oneOrNone(pgp.helpers.insert(itemCopy, cs) + returning);
 					if (insertResult !== null) {
-						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(insertResult),
-							{ itemData: { item: i } },
-						);
+						const executionData = this.helpers.constructExecutionMetaData(wrapData(insertResult), {
+							itemData: { item: i },
+						});
 						result.push(...executionData);
 					}
 				} catch (err) {
@@ -644,7 +652,7 @@ export async function pgUpdateV2(
 								returning,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(transactionResult),
+							wrapData(transactionResult),
 							{ itemData: { item: i } },
 						);
 						result.push(...executionData);
@@ -672,7 +680,7 @@ export async function pgUpdateV2(
 								returning,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(independentResult),
+							wrapData(independentResult),
 							{ itemData: { item: i } },
 						);
 						result.push(...executionData);
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index a840cddb7620af..d93620741a1cd8 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -12,7 +12,7 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import pgPromise from 'pg-promise';
 
-import { pgInsertV2, pgQueryV2, pgUpdate } from './Postgres.node.functions';
+import { pgInsertV2, pgQueryV2, pgUpdate, wrapData } from './Postgres.node.functions';
 
 export class Postgres implements INodeType {
 	description: INodeTypeDescription = {
@@ -389,7 +389,7 @@ export class Postgres implements INodeType {
 				this.continueOnFail(),
 			);
 
-			returnItems = this.helpers.returnJsonArray(updateItems);
+			returnItems = wrapData(updateItems);
 		} else {
 			pgp.end();
 			throw new NodeOperationError(

From 3ae005cafecf51ce3d475c88bab73fd92d112be7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:04:35 +0100
Subject: [PATCH 262/358] ci: Setup a semi-automated release process
 (no-changelog) (#5504)

* ci: Setup a semi-automated release process (no-changelog)

* create tag/release before deleting the temporary branch
---
 .github/scripts/bump-versions.mjs       | 52 +++++++++++++++++++
 .github/scripts/package.json            |  6 +++
 .github/workflows/check-pr-title.yml    |  2 +
 .github/workflows/release-create-pr.yml | 69 +++++++++++++++++++++++++
 .github/workflows/release-publish.yml   | 57 ++++++++++++++++++++
 CONTRIBUTING.md                         | 23 +++++++--
 package.json                            |  4 +-
 packages/cli/package.json               |  8 +--
 packages/core/package.json              |  2 +-
 packages/editor-ui/package.json         |  4 +-
 packages/editor-ui/vite.config.ts       | 24 +++------
 packages/node-dev/package.json          |  4 +-
 packages/nodes-base/package.json        |  4 +-
 packages/workflow/package.json          |  1 -
 pnpm-lock.yaml                          | 28 +++++-----
 15 files changed, 240 insertions(+), 48 deletions(-)
 create mode 100644 .github/scripts/bump-versions.mjs
 create mode 100644 .github/scripts/package.json
 create mode 100644 .github/workflows/release-create-pr.yml
 create mode 100644 .github/workflows/release-publish.yml

diff --git a/.github/scripts/bump-versions.mjs b/.github/scripts/bump-versions.mjs
new file mode 100644
index 00000000000000..da45c92a8035dd
--- /dev/null
+++ b/.github/scripts/bump-versions.mjs
@@ -0,0 +1,52 @@
+import semver from 'semver';
+import { writeFile, readFile } from 'fs/promises';
+import { resolve } from 'path';
+import child_process from 'child_process';
+import { promisify } from 'util';
+import assert from 'assert';
+
+const exec = promisify(child_process.exec);
+
+const rootDir = process.cwd();
+const releaseType = process.env.RELEASE_TYPE;
+assert.match(releaseType, /^(patch|minor|major)$/, 'Invalid RELEASE_TYPE');
+
+// TODO: if releaseType is `auto` determine release type based on the changelog
+
+const lastTag = (await exec('git describe --tags --match "n8n@*" --abbrev=0')).stdout.trim();
+const packages = JSON.parse((await exec('pnpm ls -r --only-projects --json')).stdout);
+
+const packageMap = {};
+for (let { name, path, version, private: isPrivate, dependencies } of packages) {
+	if (isPrivate && path !== rootDir) continue;
+	if (path === rootDir) name = 'monorepo-root';
+
+	const isDirty = await exec(`git diff --quiet HEAD ${lastTag} -- ${path}`)
+		.then(() => false)
+		.catch((error) => true);
+
+	packageMap[name] = { path, isDirty, version };
+}
+
+assert.ok(packageMap['n8n'].isDirty, 'No changes found since the last release');
+
+// Keep the monorepo version up to date with the released version
+packageMap['monorepo-root'].version = packageMap['n8n'].version;
+
+for (const packageName in packageMap) {
+	const { path, version, isDirty } = packageMap[packageName];
+	const packageFile = resolve(path, 'package.json');
+	const packageJson = JSON.parse(await readFile(packageFile, 'utf-8'));
+
+	packageJson.version = packageMap[packageName].nextVersion =
+		isDirty ||
+		Object.keys(packageJson.dependencies).some(
+			(dependencyName) => packageMap[dependencyName]?.isDirty,
+		)
+			? semver.inc(version, releaseType)
+			: version;
+
+	await writeFile(packageFile, JSON.stringify(packageJson, null, 2) + '\n');
+}
+
+console.log(packageMap['n8n'].nextVersion);
diff --git a/.github/scripts/package.json b/.github/scripts/package.json
new file mode 100644
index 00000000000000..60f945f3f507bc
--- /dev/null
+++ b/.github/scripts/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "semver": "^7.3.8",
+    "conventional-changelog-cli": "^2.2.2"
+  }
+}
diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
index 85011b7045d3c6..9ac4d71da564c1 100644
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -6,6 +6,8 @@ on:
       - opened
       - edited
       - synchronize
+    branches:
+      - '!release/*'
 
 jobs:
   check-pr-title:
diff --git a/.github/workflows/release-create-pr.yml b/.github/workflows/release-create-pr.yml
new file mode 100644
index 00000000000000..1a4e5668a1b676
--- /dev/null
+++ b/.github/workflows/release-create-pr.yml
@@ -0,0 +1,69 @@
+name: 'Release: Create Pull Request'
+
+on:
+  workflow_dispatch:
+    inputs:
+      base-branch:
+        description: 'The branch to create this release PR from.'
+        required: true
+        default: 'master'
+
+      release-type:
+        description: 'A SemVer release type.'
+        required: true
+        type: choice
+        default: 'minor'
+        options:
+          - patch
+          - minor
+
+jobs:
+  create-release-pr:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    timeout-minutes: 5
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.base-branch }}
+
+      - name: Push the base branch
+        run: |
+          git push -f origin ${{ github.event.inputs.base-branch }}:"release/${{ github.event.inputs.release-type }}"
+
+      - uses: pnpm/action-setup@v2.2.4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+      - run: npm install --prefix=.github/scripts --no-package-lock
+
+      - name: Bump package versions
+        run: |
+          echo "NEXT_RELEASE=$(node .github/scripts/bump-versions.mjs)" >> $GITHUB_ENV
+          pnpm i --lockfile-only
+        env:
+          RELEASE_TYPE: ${{ github.event.inputs.release-type }}
+
+      - name: Generate Changelog
+        run: npx conventional-changelog-cli -p angular -i CHANGELOG.md -s -t n8n@
+
+      - name: Push the release branch, and Create the PR
+        uses: peter-evans/create-pull-request@v4
+        with:
+          base: 'release/${{ github.event.inputs.release-type }}'
+          branch: 'release/${{ env.NEXT_RELEASE }}'
+          commit-message: ':rocket: Release ${{ env.NEXT_RELEASE }}'
+          delete-branch: true
+          labels: 'release'
+          title: ':rocket: Release ${{ env.NEXT_RELEASE }}'
+          # 'TODO: add generated changelog to the body. create a script to generate custom changelog'
+          body: ''
+
+      # TODO: post PR link to slack
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
new file mode 100644
index 00000000000000..466ce2eacfa207
--- /dev/null
+++ b/.github/workflows/release-publish.yml
@@ -0,0 +1,57 @@
+name: 'Release: Publish'
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - 'release/patch'
+      - 'release/minor'
+
+jobs:
+  publish-release:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v2.2.4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: 'pnpm'
+      - run: pnpm install --frozen-lockfile
+
+      - name: Build
+        run: pnpm build
+
+      - name: Publish to NPM
+        run: |
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+          pnpm publish -r --publish-branch ${{github.event.pull_request.base.ref}} --access public
+          echo "RELEASE=$(node -e 'console.log(require("./package.json").version)')" >> $GITHUB_ENV
+
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          commit: ${{github.event.pull_request.base.ref}}
+          tag: 'n8n@${{env.RELEASE}}'
+
+      - name: Merge Release into 'master'
+        run: |
+          git fetch origin
+          git checkout --track origin/master
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git merge --ff origin/${{github.event.pull_request.base.ref}}
+          git push origin master
+          git push origin :${{github.event.pull_request.base.ref}}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c3408bff24faa..6960d5ce28f6fc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,15 +11,16 @@ Great that you are here and you want to contribute to n8n
   - [Development setup](#development-setup)
     - [Requirements](#requirements)
       - [Node.js](#nodejs)
+      - [pnpm](#pnpm)
+        - [pnpm workspaces](#pnpm-workspaces)
+      - [corepack](#corepack)
       - [Build tools](#build-tools)
-      - [pnpm workspaces](#pnpm-workspaces)
     - [Actual n8n setup](#actual-n8n-setup)
     - [Start](#start)
   - [Development cycle](#development-cycle)
     - [Test suite](#test-suite)
+  - [Releasing](#releasing)
   - [Create custom nodes](#create-custom-nodes)
-  - [Create a new node to contribute to n8n](#create-a-new-node-to-contribute-to-n8n)
-  - [Checklist before submitting a new node](#checklist-before-submitting-a-new-node)
   - [Extend documentation](#extend-documentation)
   - [Contributor License Agreement](#contributor-license-agreement)
 
@@ -195,6 +196,22 @@ If that gets executed in one of the package folders it will only run the tests
 of this package. If it gets executed in the n8n-root folder it will run all
 tests of all packages.
 
+## Releasing
+
+To start a release, trigger [this workflow](https://github.com/n8n-io/n8n/actions/workflows/release-create-pr.yml) with the SemVer release type, and select a branch to cut this release from. This workflow will then
+
+1. Bump versions of packages that have changed or have dependencies that have changed
+2. Update the Changelog
+3. Create a new branch called `release/${VERSION}`, and
+4. Create a new pull-request to track any further changes that need to be included in this release
+
+Once ready to release, simply merge the pull-request.
+This triggers [another workflow](https://github.com/n8n-io/n8n/actions/workflows/release-publish.yml), that will
+
+1. Build and publish the packages that have a new version in this release
+2. Create a new tag, and GitHub release from squashed release commit
+3. Merge the squashed release commit back into `master`
+
 ## Create custom nodes
 
 Learn about [building nodes](https://docs.n8n.io/integrations/creating-nodes/) to create custom nodes for n8n. You can create community nodes and make them available using [npm](https://www.npmjs.com/).
diff --git a/package.json b/package.json
index 530c323e4ccd86..5a55493af9256c 100644
--- a/package.json
+++ b/package.json
@@ -34,10 +34,10 @@
     "test:e2e:all": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless'"
   },
   "dependencies": {
-    "n8n": "*"
+    "n8n": "workspace:*"
   },
   "devDependencies": {
-    "@n8n_io/eslint-config": "*",
+    "@n8n_io/eslint-config": "workspace:*",
     "@ngneat/falso": "^6.1.0",
     "@types/jest": "^29.2.2",
     "@types/supertest": "^2.0.12",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index df23a55365583c..d64fbcaecd0773 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -170,10 +170,10 @@
     "lodash.unset": "^4.5.2",
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
-    "n8n-core": "~0.155.0",
-    "n8n-editor-ui": "~0.182.0",
-    "n8n-nodes-base": "~0.214.0",
-    "n8n-workflow": "~0.137.0",
+    "n8n-core": "workspace:*",
+    "n8n-editor-ui": "workspace:*",
+    "n8n-nodes-base": "workspace:*",
+    "n8n-workflow": "workspace:*",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
diff --git a/packages/core/package.json b/packages/core/package.json
index 53932ea78db3d3..96585c2491c71f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,7 +55,7 @@
     "form-data": "^4.0.0",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.137.0",
+    "n8n-workflow": "workspace:*",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "pretty-bytes": "^5.6.0",
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index eb4ead029a0320..56c76aaa1c4d08 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -63,8 +63,8 @@
     "lodash.set": "^4.3.2",
     "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
-    "n8n-design-system": "~0.54.0",
-    "n8n-workflow": "~0.137.0",
+    "n8n-design-system": "workspace:*",
+    "n8n-workflow": "workspace:*",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.0.22",
     "prettier": "^2.8.3",
diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
index 82d3be9ee7d0d1..1277051887334b 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.ts
@@ -7,8 +7,6 @@ import { defineConfig as defineVitestConfig } from 'vitest/config';
 
 import packageJSON from './package.json';
 
-const isCI = process.env.CI === 'true';
-
 const vendorChunks = ['vue', 'vue-router'];
 const n8nChunks = ['n8n-workflow', 'n8n-design-system'];
 const ignoreChunks = [
@@ -63,18 +61,14 @@ export default mergeConfig(
 		},
 		plugins: [
 			vue(),
-			...(!isCI
-				? [
-						legacy({
-							targets: ['defaults', 'not IE 11'],
-						}),
-						monacoEditorPlugin({
-							publicPath: 'assets/monaco-editor',
-							customDistPath: (root: string, buildOutDir: string, base: string) =>
-								`${root}/${buildOutDir}/assets/monaco-editor`,
-						}),
-				  ]
-				: []),
+			legacy({
+				targets: ['defaults', 'not IE 11'],
+			}),
+			monacoEditorPlugin({
+				publicPath: 'assets/monaco-editor',
+				customDistPath: (root: string, buildOutDir: string, base: string) =>
+					`${root}/${buildOutDir}/assets/monaco-editor`,
+			}),
 		],
 		resolve: {
 			alias: [
@@ -113,11 +107,9 @@ export default mergeConfig(
 			},
 		},
 		build: {
-			minify: !isCI,
 			assetsInlineLimit: 0,
 			sourcemap: false,
 			rollupOptions: {
-				treeshake: !isCI,
 				output: {
 					manualChunks: {
 						vendor: vendorChunks,
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 94b8dc3b2f3372..b873b7c64f211c 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.155.0",
-    "n8n-workflow": "~0.137.0",
+    "n8n-core": "workspace:*",
+    "n8n-workflow": "workspace:*",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 99b6cbbd51ebcd..73ef88e91fe48e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -758,7 +758,7 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "~0.137.0"
+    "n8n-workflow": "workspace:*"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
@@ -797,7 +797,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "~0.155.0",
+    "n8n-core": "workspace:*",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 5814aa2169c1a3..0a89d973c0287b 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -39,7 +39,6 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@n8n_io/eslint-config": "",
     "@types/crypto-js": "^4.1.1",
     "@types/deep-equal": "^1.0.1",
     "@types/express": "^4.17.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 9e45e143d5363e..137ae4a86e1836 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,7 +26,7 @@ importers:
 
   .:
     specifiers:
-      '@n8n_io/eslint-config': '*'
+      '@n8n_io/eslint-config': workspace:*
       '@ngneat/falso': ^6.1.0
       '@types/jest': ^29.2.2
       '@types/supertest': ^2.0.12
@@ -37,7 +37,7 @@ importers:
       jest-environment-jsdom: ^29.4.2
       jest-mock: ^29.4.2
       jest-mock-extended: ^3.0.1
-      n8n: '*'
+      n8n: workspace:*
       nock: ^13.2.9
       node-fetch: ^2.6.7
       p-limit: ^3.1.0
@@ -208,10 +208,10 @@ importers:
       luxon: ^3.1.0
       mock-jwks: ^1.0.9
       mysql2: ~2.3.3
-      n8n-core: ~0.155.0
-      n8n-editor-ui: ~0.182.0
-      n8n-nodes-base: ~0.214.0
-      n8n-workflow: ~0.137.0
+      n8n-core: workspace:*
+      n8n-editor-ui: workspace:*
+      n8n-nodes-base: workspace:*
+      n8n-workflow: workspace:*
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
       oauth-1.0a: ^2.2.6
@@ -405,7 +405,7 @@ importers:
       form-data: ^4.0.0
       lodash.get: ^4.4.2
       mime-types: ^2.1.27
-      n8n-workflow: ~0.137.0
+      n8n-workflow: workspace:*
       oauth-1.0a: ^2.2.6
       p-cancelable: ^2.0.0
       pretty-bytes: ^5.6.0
@@ -592,8 +592,8 @@ importers:
       lodash.set: ^4.3.2
       luxon: ^3.1.0
       monaco-editor: ^0.33.0
-      n8n-design-system: ~0.54.0
-      n8n-workflow: ~0.137.0
+      n8n-design-system: workspace:*
+      n8n-workflow: workspace:*
       normalize-wheel: ^1.0.1
       pinia: ^2.0.22
       prettier: ^2.8.3
@@ -723,8 +723,8 @@ importers:
       change-case: ^4.1.1
       fast-glob: ^3.2.5
       inquirer: ^7.0.1
-      n8n-core: ~0.155.0
-      n8n-workflow: ~0.137.0
+      n8n-core: workspace:*
+      n8n-workflow: workspace:*
       oauth-1.0a: ^2.2.6
       replace-in-file: ^6.0.0
       request: ^2.88.2
@@ -816,8 +816,8 @@ importers:
       mqtt: 4.2.6
       mssql: ^8.1.2
       mysql2: ~2.3.0
-      n8n-core: ~0.155.0
-      n8n-workflow: ~0.137.0
+      n8n-core: workspace:*
+      n8n-workflow: workspace:*
       node-html-markdown: ^1.1.3
       node-ssh: ^12.0.0
       nodemailer: ^6.7.1
@@ -933,7 +933,6 @@ importers:
 
   packages/workflow:
     specifiers:
-      '@n8n_io/eslint-config': ''
       '@n8n_io/riot-tmpl': ^2.0.0
       '@types/crypto-js': ^4.1.1
       '@types/deep-equal': ^1.0.1
@@ -978,7 +977,6 @@ importers:
       transliteration: 2.3.5
       xml2js: 0.4.23
     devDependencies:
-      '@n8n_io/eslint-config': link:../@n8n_io/eslint-config
       '@types/crypto-js': 4.1.1
       '@types/deep-equal': 1.0.1
       '@types/express': 4.17.14

From fe782c8f6a43974a807921ab4a01b286ee7b388f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:04:35 +0100
Subject: [PATCH 263/358] ci: Setup a semi-automated release process
 (no-changelog) (#5504)

* ci: Setup a semi-automated release process (no-changelog)

* create tag/release before deleting the temporary branch
---
 .github/scripts/bump-versions.mjs       | 52 +++++++++++++++++++
 .github/scripts/package.json            |  6 +++
 .github/workflows/check-pr-title.yml    |  2 +
 .github/workflows/release-create-pr.yml | 69 +++++++++++++++++++++++++
 .github/workflows/release-publish.yml   | 57 ++++++++++++++++++++
 CONTRIBUTING.md                         | 23 +++++++--
 package.json                            |  4 +-
 packages/cli/package.json               |  8 +--
 packages/core/package.json              |  2 +-
 packages/editor-ui/package.json         |  4 +-
 packages/editor-ui/vite.config.ts       | 24 +++------
 packages/node-dev/package.json          |  4 +-
 packages/nodes-base/package.json        |  4 +-
 packages/workflow/package.json          |  1 -
 pnpm-lock.yaml                          | 28 +++++-----
 15 files changed, 240 insertions(+), 48 deletions(-)
 create mode 100644 .github/scripts/bump-versions.mjs
 create mode 100644 .github/scripts/package.json
 create mode 100644 .github/workflows/release-create-pr.yml
 create mode 100644 .github/workflows/release-publish.yml

diff --git a/.github/scripts/bump-versions.mjs b/.github/scripts/bump-versions.mjs
new file mode 100644
index 00000000000000..da45c92a8035dd
--- /dev/null
+++ b/.github/scripts/bump-versions.mjs
@@ -0,0 +1,52 @@
+import semver from 'semver';
+import { writeFile, readFile } from 'fs/promises';
+import { resolve } from 'path';
+import child_process from 'child_process';
+import { promisify } from 'util';
+import assert from 'assert';
+
+const exec = promisify(child_process.exec);
+
+const rootDir = process.cwd();
+const releaseType = process.env.RELEASE_TYPE;
+assert.match(releaseType, /^(patch|minor|major)$/, 'Invalid RELEASE_TYPE');
+
+// TODO: if releaseType is `auto` determine release type based on the changelog
+
+const lastTag = (await exec('git describe --tags --match "n8n@*" --abbrev=0')).stdout.trim();
+const packages = JSON.parse((await exec('pnpm ls -r --only-projects --json')).stdout);
+
+const packageMap = {};
+for (let { name, path, version, private: isPrivate, dependencies } of packages) {
+	if (isPrivate && path !== rootDir) continue;
+	if (path === rootDir) name = 'monorepo-root';
+
+	const isDirty = await exec(`git diff --quiet HEAD ${lastTag} -- ${path}`)
+		.then(() => false)
+		.catch((error) => true);
+
+	packageMap[name] = { path, isDirty, version };
+}
+
+assert.ok(packageMap['n8n'].isDirty, 'No changes found since the last release');
+
+// Keep the monorepo version up to date with the released version
+packageMap['monorepo-root'].version = packageMap['n8n'].version;
+
+for (const packageName in packageMap) {
+	const { path, version, isDirty } = packageMap[packageName];
+	const packageFile = resolve(path, 'package.json');
+	const packageJson = JSON.parse(await readFile(packageFile, 'utf-8'));
+
+	packageJson.version = packageMap[packageName].nextVersion =
+		isDirty ||
+		Object.keys(packageJson.dependencies).some(
+			(dependencyName) => packageMap[dependencyName]?.isDirty,
+		)
+			? semver.inc(version, releaseType)
+			: version;
+
+	await writeFile(packageFile, JSON.stringify(packageJson, null, 2) + '\n');
+}
+
+console.log(packageMap['n8n'].nextVersion);
diff --git a/.github/scripts/package.json b/.github/scripts/package.json
new file mode 100644
index 00000000000000..60f945f3f507bc
--- /dev/null
+++ b/.github/scripts/package.json
@@ -0,0 +1,6 @@
+{
+  "dependencies": {
+    "semver": "^7.3.8",
+    "conventional-changelog-cli": "^2.2.2"
+  }
+}
diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
index 85011b7045d3c6..9ac4d71da564c1 100644
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -6,6 +6,8 @@ on:
       - opened
       - edited
       - synchronize
+    branches:
+      - '!release/*'
 
 jobs:
   check-pr-title:
diff --git a/.github/workflows/release-create-pr.yml b/.github/workflows/release-create-pr.yml
new file mode 100644
index 00000000000000..1a4e5668a1b676
--- /dev/null
+++ b/.github/workflows/release-create-pr.yml
@@ -0,0 +1,69 @@
+name: 'Release: Create Pull Request'
+
+on:
+  workflow_dispatch:
+    inputs:
+      base-branch:
+        description: 'The branch to create this release PR from.'
+        required: true
+        default: 'master'
+
+      release-type:
+        description: 'A SemVer release type.'
+        required: true
+        type: choice
+        default: 'minor'
+        options:
+          - patch
+          - minor
+
+jobs:
+  create-release-pr:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+      pull-requests: write
+
+    timeout-minutes: 5
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+          ref: ${{ github.event.inputs.base-branch }}
+
+      - name: Push the base branch
+        run: |
+          git push -f origin ${{ github.event.inputs.base-branch }}:"release/${{ github.event.inputs.release-type }}"
+
+      - uses: pnpm/action-setup@v2.2.4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+      - run: npm install --prefix=.github/scripts --no-package-lock
+
+      - name: Bump package versions
+        run: |
+          echo "NEXT_RELEASE=$(node .github/scripts/bump-versions.mjs)" >> $GITHUB_ENV
+          pnpm i --lockfile-only
+        env:
+          RELEASE_TYPE: ${{ github.event.inputs.release-type }}
+
+      - name: Generate Changelog
+        run: npx conventional-changelog-cli -p angular -i CHANGELOG.md -s -t n8n@
+
+      - name: Push the release branch, and Create the PR
+        uses: peter-evans/create-pull-request@v4
+        with:
+          base: 'release/${{ github.event.inputs.release-type }}'
+          branch: 'release/${{ env.NEXT_RELEASE }}'
+          commit-message: ':rocket: Release ${{ env.NEXT_RELEASE }}'
+          delete-branch: true
+          labels: 'release'
+          title: ':rocket: Release ${{ env.NEXT_RELEASE }}'
+          # 'TODO: add generated changelog to the body. create a script to generate custom changelog'
+          body: ''
+
+      # TODO: post PR link to slack
diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
new file mode 100644
index 00000000000000..466ce2eacfa207
--- /dev/null
+++ b/.github/workflows/release-publish.yml
@@ -0,0 +1,57 @@
+name: 'Release: Publish'
+
+on:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - 'release/patch'
+      - 'release/minor'
+
+jobs:
+  publish-release:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: write
+
+    timeout-minutes: 10
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+
+      - uses: pnpm/action-setup@v2.2.4
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: 'pnpm'
+      - run: pnpm install --frozen-lockfile
+
+      - name: Build
+        run: pnpm build
+
+      - name: Publish to NPM
+        run: |
+          echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
+          pnpm publish -r --publish-branch ${{github.event.pull_request.base.ref}} --access public
+          echo "RELEASE=$(node -e 'console.log(require("./package.json").version)')" >> $GITHUB_ENV
+
+      - name: Create Release
+        uses: ncipollo/release-action@v1
+        with:
+          commit: ${{github.event.pull_request.base.ref}}
+          tag: 'n8n@${{env.RELEASE}}'
+
+      - name: Merge Release into 'master'
+        run: |
+          git fetch origin
+          git checkout --track origin/master
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          git merge --ff origin/${{github.event.pull_request.base.ref}}
+          git push origin master
+          git push origin :${{github.event.pull_request.base.ref}}
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6c3408bff24faa..6960d5ce28f6fc 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,15 +11,16 @@ Great that you are here and you want to contribute to n8n
   - [Development setup](#development-setup)
     - [Requirements](#requirements)
       - [Node.js](#nodejs)
+      - [pnpm](#pnpm)
+        - [pnpm workspaces](#pnpm-workspaces)
+      - [corepack](#corepack)
       - [Build tools](#build-tools)
-      - [pnpm workspaces](#pnpm-workspaces)
     - [Actual n8n setup](#actual-n8n-setup)
     - [Start](#start)
   - [Development cycle](#development-cycle)
     - [Test suite](#test-suite)
+  - [Releasing](#releasing)
   - [Create custom nodes](#create-custom-nodes)
-  - [Create a new node to contribute to n8n](#create-a-new-node-to-contribute-to-n8n)
-  - [Checklist before submitting a new node](#checklist-before-submitting-a-new-node)
   - [Extend documentation](#extend-documentation)
   - [Contributor License Agreement](#contributor-license-agreement)
 
@@ -195,6 +196,22 @@ If that gets executed in one of the package folders it will only run the tests
 of this package. If it gets executed in the n8n-root folder it will run all
 tests of all packages.
 
+## Releasing
+
+To start a release, trigger [this workflow](https://github.com/n8n-io/n8n/actions/workflows/release-create-pr.yml) with the SemVer release type, and select a branch to cut this release from. This workflow will then
+
+1. Bump versions of packages that have changed or have dependencies that have changed
+2. Update the Changelog
+3. Create a new branch called `release/${VERSION}`, and
+4. Create a new pull-request to track any further changes that need to be included in this release
+
+Once ready to release, simply merge the pull-request.
+This triggers [another workflow](https://github.com/n8n-io/n8n/actions/workflows/release-publish.yml), that will
+
+1. Build and publish the packages that have a new version in this release
+2. Create a new tag, and GitHub release from squashed release commit
+3. Merge the squashed release commit back into `master`
+
 ## Create custom nodes
 
 Learn about [building nodes](https://docs.n8n.io/integrations/creating-nodes/) to create custom nodes for n8n. You can create community nodes and make them available using [npm](https://www.npmjs.com/).
diff --git a/package.json b/package.json
index 530c323e4ccd86..5a55493af9256c 100644
--- a/package.json
+++ b/package.json
@@ -34,10 +34,10 @@
     "test:e2e:all": "cross-env E2E_TESTS=true start-server-and-test start http://localhost:5678/favicon.ico 'cypress run --headless'"
   },
   "dependencies": {
-    "n8n": "*"
+    "n8n": "workspace:*"
   },
   "devDependencies": {
-    "@n8n_io/eslint-config": "*",
+    "@n8n_io/eslint-config": "workspace:*",
     "@ngneat/falso": "^6.1.0",
     "@types/jest": "^29.2.2",
     "@types/supertest": "^2.0.12",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 6b1f9227b312e4..4e17130ca5cc9d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -167,10 +167,10 @@
     "lodash.unset": "^4.5.2",
     "luxon": "^3.1.0",
     "mysql2": "~2.3.3",
-    "n8n-core": "~0.155.0",
-    "n8n-editor-ui": "~0.182.0",
-    "n8n-nodes-base": "~0.214.0",
-    "n8n-workflow": "~0.137.0",
+    "n8n-core": "workspace:*",
+    "n8n-editor-ui": "workspace:*",
+    "n8n-nodes-base": "workspace:*",
+    "n8n-workflow": "workspace:*",
     "nodemailer": "^6.7.1",
     "oauth-1.0a": "^2.2.6",
     "open": "^7.0.0",
diff --git a/packages/core/package.json b/packages/core/package.json
index 53932ea78db3d3..96585c2491c71f 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -55,7 +55,7 @@
     "form-data": "^4.0.0",
     "lodash.get": "^4.4.2",
     "mime-types": "^2.1.27",
-    "n8n-workflow": "~0.137.0",
+    "n8n-workflow": "workspace:*",
     "oauth-1.0a": "^2.2.6",
     "p-cancelable": "^2.0.0",
     "pretty-bytes": "^5.6.0",
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index eb4ead029a0320..56c76aaa1c4d08 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -63,8 +63,8 @@
     "lodash.set": "^4.3.2",
     "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
-    "n8n-design-system": "~0.54.0",
-    "n8n-workflow": "~0.137.0",
+    "n8n-design-system": "workspace:*",
+    "n8n-workflow": "workspace:*",
     "normalize-wheel": "^1.0.1",
     "pinia": "^2.0.22",
     "prettier": "^2.8.3",
diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
index 82d3be9ee7d0d1..1277051887334b 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.ts
@@ -7,8 +7,6 @@ import { defineConfig as defineVitestConfig } from 'vitest/config';
 
 import packageJSON from './package.json';
 
-const isCI = process.env.CI === 'true';
-
 const vendorChunks = ['vue', 'vue-router'];
 const n8nChunks = ['n8n-workflow', 'n8n-design-system'];
 const ignoreChunks = [
@@ -63,18 +61,14 @@ export default mergeConfig(
 		},
 		plugins: [
 			vue(),
-			...(!isCI
-				? [
-						legacy({
-							targets: ['defaults', 'not IE 11'],
-						}),
-						monacoEditorPlugin({
-							publicPath: 'assets/monaco-editor',
-							customDistPath: (root: string, buildOutDir: string, base: string) =>
-								`${root}/${buildOutDir}/assets/monaco-editor`,
-						}),
-				  ]
-				: []),
+			legacy({
+				targets: ['defaults', 'not IE 11'],
+			}),
+			monacoEditorPlugin({
+				publicPath: 'assets/monaco-editor',
+				customDistPath: (root: string, buildOutDir: string, base: string) =>
+					`${root}/${buildOutDir}/assets/monaco-editor`,
+			}),
 		],
 		resolve: {
 			alias: [
@@ -113,11 +107,9 @@ export default mergeConfig(
 			},
 		},
 		build: {
-			minify: !isCI,
 			assetsInlineLimit: 0,
 			sourcemap: false,
 			rollupOptions: {
-				treeshake: !isCI,
 				output: {
 					manualChunks: {
 						vendor: vendorChunks,
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 94b8dc3b2f3372..b873b7c64f211c 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -59,8 +59,8 @@
     "change-case": "^4.1.1",
     "fast-glob": "^3.2.5",
     "inquirer": "^7.0.1",
-    "n8n-core": "~0.155.0",
-    "n8n-workflow": "~0.137.0",
+    "n8n-core": "workspace:*",
+    "n8n-workflow": "workspace:*",
     "oauth-1.0a": "^2.2.6",
     "replace-in-file": "^6.0.0",
     "request": "^2.88.2",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 99b6cbbd51ebcd..73ef88e91fe48e 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -758,7 +758,7 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "~0.137.0"
+    "n8n-workflow": "workspace:*"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
@@ -797,7 +797,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "~0.155.0",
+    "n8n-core": "workspace:*",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 5814aa2169c1a3..0a89d973c0287b 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -39,7 +39,6 @@
     "dist/**/*"
   ],
   "devDependencies": {
-    "@n8n_io/eslint-config": "",
     "@types/crypto-js": "^4.1.1",
     "@types/deep-equal": "^1.0.1",
     "@types/express": "^4.17.6",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 055fb2d89c4d02..d5ef4137485010 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -26,7 +26,7 @@ importers:
 
   .:
     specifiers:
-      '@n8n_io/eslint-config': '*'
+      '@n8n_io/eslint-config': workspace:*
       '@ngneat/falso': ^6.1.0
       '@types/jest': ^29.2.2
       '@types/supertest': ^2.0.12
@@ -37,7 +37,7 @@ importers:
       jest-environment-jsdom: ^29.4.2
       jest-mock: ^29.4.2
       jest-mock-extended: ^3.0.1
-      n8n: '*'
+      n8n: workspace:*
       nock: ^13.2.9
       node-fetch: ^2.6.7
       p-limit: ^3.1.0
@@ -207,10 +207,10 @@ importers:
       luxon: ^3.1.0
       mock-jwks: ^1.0.9
       mysql2: ~2.3.3
-      n8n-core: ~0.155.0
-      n8n-editor-ui: ~0.182.0
-      n8n-nodes-base: ~0.214.0
-      n8n-workflow: ~0.137.0
+      n8n-core: workspace:*
+      n8n-editor-ui: workspace:*
+      n8n-nodes-base: workspace:*
+      n8n-workflow: workspace:*
       nodemailer: ^6.7.1
       nodemon: ^2.0.2
       oauth-1.0a: ^2.2.6
@@ -403,7 +403,7 @@ importers:
       form-data: ^4.0.0
       lodash.get: ^4.4.2
       mime-types: ^2.1.27
-      n8n-workflow: ~0.137.0
+      n8n-workflow: workspace:*
       oauth-1.0a: ^2.2.6
       p-cancelable: ^2.0.0
       pretty-bytes: ^5.6.0
@@ -590,8 +590,8 @@ importers:
       lodash.set: ^4.3.2
       luxon: ^3.1.0
       monaco-editor: ^0.33.0
-      n8n-design-system: ~0.54.0
-      n8n-workflow: ~0.137.0
+      n8n-design-system: workspace:*
+      n8n-workflow: workspace:*
       normalize-wheel: ^1.0.1
       pinia: ^2.0.22
       prettier: ^2.8.3
@@ -721,8 +721,8 @@ importers:
       change-case: ^4.1.1
       fast-glob: ^3.2.5
       inquirer: ^7.0.1
-      n8n-core: ~0.155.0
-      n8n-workflow: ~0.137.0
+      n8n-core: workspace:*
+      n8n-workflow: workspace:*
       oauth-1.0a: ^2.2.6
       replace-in-file: ^6.0.0
       request: ^2.88.2
@@ -814,8 +814,8 @@ importers:
       mqtt: 4.2.6
       mssql: ^8.1.2
       mysql2: ~2.3.0
-      n8n-core: ~0.155.0
-      n8n-workflow: ~0.137.0
+      n8n-core: workspace:*
+      n8n-workflow: workspace:*
       node-html-markdown: ^1.1.3
       node-ssh: ^12.0.0
       nodemailer: ^6.7.1
@@ -931,7 +931,6 @@ importers:
 
   packages/workflow:
     specifiers:
-      '@n8n_io/eslint-config': ''
       '@n8n_io/riot-tmpl': ^2.0.0
       '@types/crypto-js': ^4.1.1
       '@types/deep-equal': ^1.0.1
@@ -976,7 +975,6 @@ importers:
       transliteration: 2.3.5
       xml2js: 0.4.23
     devDependencies:
-      '@n8n_io/eslint-config': link:../@n8n_io/eslint-config
       '@types/crypto-js': 4.1.1
       '@types/deep-equal': 1.0.1
       '@types/express': 4.17.14

From 7400c35a48e60c784c36e4946ef6a7d91d73321e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:24:02 +0100
Subject: [PATCH 264/358] :rocket: Release 0.216.1 (#5531)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* :rocket: Release 0.216.1

* fix(core): Do not allow arbitrary path traversal in the credential-translation endpoint (#5522)

* fix(core): Do not allow arbitrary path traversal in BinaryDataManager (#5523)

* fix(core): User update endpoint should only allow updating email, firstName, and lastName (#5526)

* fix(core): Do not explicitly bypass auth on urls containing `.svg` (#5525)

* :books: Update CHANGELOG.md

---------

Co-authored-by: janober <janober@users.noreply.github.com>
Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 CHANGELOG.md                                  | 12 +++
 package.json                                  |  2 +-
 packages/cli/package.json                     |  3 +-
 packages/cli/src/GenericHelpers.ts            |  3 +-
 packages/cli/src/Server.ts                    | 79 ++++++-------------
 packages/cli/src/TranslationHelpers.ts        | 16 ----
 packages/cli/src/controllers/index.ts         |  1 +
 packages/cli/src/controllers/me.controller.ts | 35 ++++----
 .../src/controllers/translation.controller.ts | 58 ++++++++++++++
 packages/cli/src/databases/entities/User.ts   |  5 +-
 packages/cli/src/middlewares/auth.ts          | 14 ++--
 packages/cli/src/requests.ts                  | 23 ++++--
 packages/cli/test/setup-mocks.ts              |  2 +
 .../unit/controllers/me.controller.test.ts    | 48 +++++++++--
 .../translation.controller.test.ts            | 40 ++++++++++
 packages/core/package.json                    |  2 +-
 .../core/src/BinaryDataManager/FileSystem.ts  | 27 ++++---
 packages/core/src/errors.ts                   |  5 ++
 packages/core/src/index.ts                    |  1 +
 packages/editor-ui/package.json               |  2 +-
 packages/node-dev/package.json                |  2 +-
 packages/nodes-base/package.json              |  2 +-
 packages/workflow/package.json                |  2 +-
 pnpm-lock.yaml                                | 26 +++---
 24 files changed, 272 insertions(+), 138 deletions(-)
 create mode 100644 packages/cli/src/controllers/translation.controller.ts
 create mode 100644 packages/cli/test/unit/controllers/translation.controller.test.ts
 create mode 100644 packages/core/src/errors.ts

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ea8b39bffaa41..1ba0cebe5452f1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## [0.216.1](https://github.com/n8n-io/n8n/compare/n8n@0.216.0...n8n@0.216.1) (2023-02-21)
+
+
+### Bug Fixes
+
+* **core:** Do not allow arbitrary path traversal in BinaryDataManager ([#5523](https://github.com/n8n-io/n8n/issues/5523)) ([40b9784](https://github.com/n8n-io/n8n/commit/40b97846483fe7c58229c156acb66f43a5a79dc3))
+* **core:** Do not allow arbitrary path traversal in the credential-translation endpoint ([#5522](https://github.com/n8n-io/n8n/issues/5522)) ([fb07d77](https://github.com/n8n-io/n8n/commit/fb07d77106bb4933758c63bbfb87f591bf4a27dd))
+* **core:** Do not explicitly bypass auth on urls containing `.svg` ([#5525](https://github.com/n8n-io/n8n/issues/5525)) ([27adea7](https://github.com/n8n-io/n8n/commit/27adea70459329fc0dddabee69e10c9d1453835f))
+* **core:** User update endpoint should only allow updating email, firstName, and lastName ([#5526](https://github.com/n8n-io/n8n/issues/5526)) ([5599221](https://github.com/n8n-io/n8n/commit/5599221007cb09cb81f0623874fafc6cd481384c))
+
+
+
 # [0.216.0](https://github.com/n8n-io/n8n/compare/n8n@0.215.2...n8n@0.216.0) (2023-02-16)
 
 
diff --git a/package.json b/package.json
index 5a55493af9256c..73d50b1db79edb 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.216.0",
+  "version": "0.216.1",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 4e17130ca5cc9d..30a1e3905eb131 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.216.0",
+  "version": "0.216.1",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
@@ -127,6 +127,7 @@
     "callsites": "^3.1.0",
     "change-case": "^4.1.1",
     "class-validator": "^0.14.0",
+    "class-transformer": "^0.5.1",
     "client-oauth2": "^4.2.5",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^1.6.0",
diff --git a/packages/cli/src/GenericHelpers.ts b/packages/cli/src/GenericHelpers.ts
index e3940a620b7c34..613e450e3b36e4 100644
--- a/packages/cli/src/GenericHelpers.ts
+++ b/packages/cli/src/GenericHelpers.ts
@@ -22,6 +22,7 @@ import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 import type { TagEntity } from '@db/entities/TagEntity';
 import type { User } from '@db/entities/User';
+import type { UserUpdatePayload } from '@/requests';
 
 /**
  * Returns the base URL n8n is reachable from
@@ -99,7 +100,7 @@ export async function generateUniqueName(
 }
 
 export async function validateEntity(
-	entity: WorkflowEntity | CredentialsEntity | TagEntity | User,
+	entity: WorkflowEntity | CredentialsEntity | TagEntity | User | UserUpdatePayload,
 ): Promise<void> {
 	const errors = await validate(entity);
 
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index c65300131668d9..166b75af2b41e0 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -33,6 +33,7 @@ import {
 	LoadNodeParameterOptions,
 	LoadNodeListSearch,
 	UserSettings,
+	FileNotFoundError,
 } from 'n8n-core';
 
 import type {
@@ -55,7 +56,6 @@ import history from 'connect-history-api-fallback';
 import config from '@/config';
 import * as Queue from '@/Queue';
 import { InternalHooksManager } from '@/InternalHooksManager';
-import { getCredentialTranslationPath } from '@/TranslationHelpers';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 
 import { nodesController } from '@/api/nodes.api';
@@ -86,6 +86,7 @@ import {
 	MeController,
 	OwnerController,
 	PasswordResetController,
+	TranslationController,
 	UsersController,
 } from '@/controllers';
 
@@ -347,6 +348,7 @@ class Server extends AbstractServer {
 			new OwnerController({ config, internalHooks, repositories, logger }),
 			new MeController({ externalHooks, internalHooks, repositories, logger }),
 			new PasswordResetController({ config, externalHooks, internalHooks, repositories, logger }),
+			new TranslationController(config, this.credentialTypes),
 			new UsersController({
 				config,
 				mailer,
@@ -585,48 +587,6 @@ class Server extends AbstractServer {
 			),
 		);
 
-		this.app.get(
-			`/${this.restEndpoint}/credential-translation`,
-			ResponseHelper.send(
-				async (
-					req: express.Request & { query: { credentialType: string } },
-					res: express.Response,
-				): Promise<object | null> => {
-					const translationPath = getCredentialTranslationPath({
-						locale: this.frontendSettings.defaultLocale,
-						credentialType: req.query.credentialType,
-					});
-
-					try {
-						return require(translationPath);
-					} catch (error) {
-						return null;
-					}
-				},
-			),
-		);
-
-		// Returns node information based on node names and versions
-		const headersPath = pathJoin(NODES_BASE_DIR, 'dist', 'nodes', 'headers');
-		this.app.get(
-			`/${this.restEndpoint}/node-translation-headers`,
-			ResponseHelper.send(
-				async (req: express.Request, res: express.Response): Promise<object | void> => {
-					try {
-						await fsAccess(`${headersPath}.js`);
-					} catch (_) {
-						return; // no headers available
-					}
-
-					try {
-						return require(headersPath);
-					} catch (error) {
-						res.status(500).send('Failed to load headers file');
-					}
-				},
-			),
-		);
-
 		// ----------------------------------------
 		// Node-Types
 		// ----------------------------------------
@@ -1160,21 +1120,26 @@ class Server extends AbstractServer {
 				// TODO UM: check if this needs permission check for UM
 				const identifier = req.params.path;
 				const binaryDataManager = BinaryDataManager.getInstance();
-				const binaryPath = binaryDataManager.getBinaryPath(identifier);
-				let { mode, fileName, mimeType } = req.query;
-				if (!fileName || !mimeType) {
-					try {
-						const metadata = await binaryDataManager.getBinaryMetadata(identifier);
-						fileName = metadata.fileName;
-						mimeType = metadata.mimeType;
-						res.setHeader('Content-Length', metadata.fileSize);
-					} catch {}
-				}
-				if (mimeType) res.setHeader('Content-Type', mimeType);
-				if (mode === 'download') {
-					res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
+				try {
+					const binaryPath = binaryDataManager.getBinaryPath(identifier);
+					let { mode, fileName, mimeType } = req.query;
+					if (!fileName || !mimeType) {
+						try {
+							const metadata = await binaryDataManager.getBinaryMetadata(identifier);
+							fileName = metadata.fileName;
+							mimeType = metadata.mimeType;
+							res.setHeader('Content-Length', metadata.fileSize);
+						} catch {}
+					}
+					if (mimeType) res.setHeader('Content-Type', mimeType);
+					if (mode === 'download') {
+						res.setHeader('Content-Disposition', `attachment; filename="${fileName}"`);
+					}
+					res.sendFile(binaryPath);
+				} catch (error) {
+					if (error instanceof FileNotFoundError) res.writeHead(404).end();
+					else throw error;
 				}
-				res.sendFile(binaryPath);
 			},
 		);
 
diff --git a/packages/cli/src/TranslationHelpers.ts b/packages/cli/src/TranslationHelpers.ts
index cc4319b04f2834..dd829534a6d785 100644
--- a/packages/cli/src/TranslationHelpers.ts
+++ b/packages/cli/src/TranslationHelpers.ts
@@ -1,7 +1,6 @@
 import { join, dirname } from 'path';
 import { readdir } from 'fs/promises';
 import type { Dirent } from 'fs';
-import { NODES_BASE_DIR } from '@/constants';
 
 const ALLOWED_VERSIONED_DIRNAME_LENGTH = [2, 3]; // e.g. v1, v10
 
@@ -47,18 +46,3 @@ export async function getNodeTranslationPath({
 		? join(nodeDir, `v${maxVersion}`, 'translations', locale, `${nodeType}.json`)
 		: join(nodeDir, 'translations', locale, `${nodeType}.json`);
 }
-
-/**
- * Get the full path to a credential translation file in `/dist`.
- */
-export function getCredentialTranslationPath({
-	locale,
-	credentialType,
-}: {
-	locale: string;
-	credentialType: string;
-}): string {
-	const credsPath = join(NODES_BASE_DIR, 'dist', 'credentials');
-
-	return join(credsPath, 'translations', locale, `${credentialType}.json`);
-}
diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
index 2ee7c7fd064ece..37ce548a540dca 100644
--- a/packages/cli/src/controllers/index.ts
+++ b/packages/cli/src/controllers/index.ts
@@ -2,4 +2,5 @@ export { AuthController } from './auth.controller';
 export { MeController } from './me.controller';
 export { OwnerController } from './owner.controller';
 export { PasswordResetController } from './passwordReset.controller';
+export { TranslationController } from './translation.controller';
 export { UsersController } from './users.controller';
diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 603140715b028b..be2f5f32c26467 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -1,4 +1,5 @@
 import validator from 'validator';
+import { plainToInstance } from 'class-transformer';
 import { Delete, Get, Patch, Post, RestController } from '@/decorators';
 import {
 	compareHash,
@@ -7,13 +8,13 @@ import {
 	validatePassword,
 } from '@/UserManagement/UserManagementHelper';
 import { BadRequestError } from '@/ResponseHelper';
-import { User } from '@db/entities/User';
+import type { User } from '@db/entities/User';
 import { validateEntity } from '@/GenericHelpers';
 import { issueCookie } from '@/auth/jwt';
 import { Response } from 'express';
 import type { Repository } from 'typeorm';
 import type { ILogger } from 'n8n-workflow';
-import { AuthenticatedRequest, MeRequest } from '@/requests';
+import { AuthenticatedRequest, MeRequest, UserUpdatePayload } from '@/requests';
 import type {
 	PublicUser,
 	IDatabaseCollections,
@@ -61,38 +62,40 @@ export class MeController {
 	 * Update the logged-in user's settings, except password.
 	 */
 	@Patch('/')
-	async updateCurrentUser(req: MeRequest.Settings, res: Response): Promise<PublicUser> {
-		const { email } = req.body;
+	async updateCurrentUser(req: MeRequest.UserUpdate, res: Response): Promise<PublicUser> {
+		const { id: userId, email: currentEmail } = req.user;
+		const payload = plainToInstance(UserUpdatePayload, req.body);
+
+		const { email } = payload;
 		if (!email) {
 			this.logger.debug('Request to update user email failed because of missing email in payload', {
-				userId: req.user.id,
-				payload: req.body,
+				userId,
+				payload,
 			});
 			throw new BadRequestError('Email is mandatory');
 		}
 
 		if (!validator.isEmail(email)) {
 			this.logger.debug('Request to update user email failed because of invalid email in payload', {
-				userId: req.user.id,
+				userId,
 				invalidEmail: email,
 			});
 			throw new BadRequestError('Invalid email address');
 		}
 
-		const { email: currentEmail } = req.user;
-		const newUser = new User();
-
-		Object.assign(newUser, req.user, req.body);
+		await validateEntity(payload);
 
-		await validateEntity(newUser);
-
-		const user = await this.userRepository.save(newUser);
+		await this.userRepository.update(userId, payload);
+		const user = await this.userRepository.findOneOrFail({
+			where: { id: userId },
+			relations: { globalRole: true },
+		});
 
-		this.logger.info('User updated successfully', { userId: user.id });
+		this.logger.info('User updated successfully', { userId });
 
 		await issueCookie(res, user);
 
-		const updatedKeys = Object.keys(req.body);
+		const updatedKeys = Object.keys(payload);
 		void this.internalHooks.onUserUpdate({
 			user,
 			fields_changed: updatedKeys,
diff --git a/packages/cli/src/controllers/translation.controller.ts b/packages/cli/src/controllers/translation.controller.ts
new file mode 100644
index 00000000000000..8d24f9e11365e7
--- /dev/null
+++ b/packages/cli/src/controllers/translation.controller.ts
@@ -0,0 +1,58 @@
+import type { Request } from 'express';
+import { ICredentialTypes } from 'n8n-workflow';
+import { join } from 'path';
+import { access } from 'fs/promises';
+import { Get, RestController } from '@/decorators';
+import { BadRequestError, InternalServerError } from '@/ResponseHelper';
+import { Config } from '@/config';
+import { NODES_BASE_DIR } from '@/constants';
+
+export const CREDENTIAL_TRANSLATIONS_DIR = 'n8n-nodes-base/dist/credentials/translations';
+export const NODE_HEADERS_PATH = join(NODES_BASE_DIR, 'dist/nodes/headers');
+
+export declare namespace TranslationRequest {
+	export type Credential = Request<{}, {}, {}, { credentialType: string }>;
+}
+
+@RestController('/')
+export class TranslationController {
+	constructor(private config: Config, private credentialTypes: ICredentialTypes) {}
+
+	@Get('/credential-translation')
+	async getCredentialTranslation(req: TranslationRequest.Credential) {
+		const { credentialType } = req.query;
+
+		if (!this.credentialTypes.recognizes(credentialType))
+			throw new BadRequestError(`Invalid Credential type: "${credentialType}"`);
+
+		const defaultLocale = this.config.getEnv('defaultLocale');
+		const translationPath = join(
+			CREDENTIAL_TRANSLATIONS_DIR,
+			defaultLocale,
+			`${credentialType}.json`,
+		);
+
+		try {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+			return require(translationPath);
+		} catch (error) {
+			return null;
+		}
+	}
+
+	@Get('/node-translation-headers')
+	async getNodeTranslationHeaders() {
+		try {
+			await access(`${NODE_HEADERS_PATH}.js`);
+		} catch (_) {
+			return; // no headers available
+		}
+
+		try {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-return
+			return require(NODE_HEADERS_PATH);
+		} catch (error) {
+			throw new InternalServerError('Failed to load headers file');
+		}
+	}
+}
diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index 6cba438f7942ab..d62bf8482fc26f 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -111,6 +111,9 @@ export class User extends AbstractEntity implements IUser {
 	@AfterLoad()
 	@AfterUpdate()
 	computeIsPending(): void {
-		this.isPending = this.password === null;
+		this.isPending =
+			this.globalRole?.name === 'owner' && this.globalRole.scope === 'global'
+				? false
+				: this.password === null;
 	}
 }
diff --git a/packages/cli/src/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
index a0c13d4f2176ac..070b86dd09e132 100644
--- a/packages/cli/src/middlewares/auth.ts
+++ b/packages/cli/src/middlewares/auth.ts
@@ -3,11 +3,12 @@ import jwt from 'jsonwebtoken';
 import cookieParser from 'cookie-parser';
 import passport from 'passport';
 import { Strategy } from 'passport-jwt';
+import { sync as globSync } from 'fast-glob';
 import { LoggerProxy as Logger } from 'n8n-workflow';
 import type { JwtPayload } from '@/Interfaces';
 import type { AuthenticatedRequest } from '@/requests';
 import config from '@/config';
-import { AUTH_COOKIE_NAME } from '@/constants';
+import { AUTH_COOKIE_NAME, EDITOR_UI_DIST_DIR } from '@/constants';
 import { issueCookie, resolveJwtContent } from '@/auth/jwt';
 import {
 	isAuthenticatedRequest,
@@ -61,6 +62,10 @@ const refreshExpiringCookie: RequestHandler = async (req: AuthenticatedRequest,
 
 const passportMiddleware = passport.authenticate('jwt', { session: false }) as RequestHandler;
 
+const staticAssets = globSync(['**/*.html', '**/*.svg', '**/*.png', '**/*.ico'], {
+	cwd: EDITOR_UI_DIST_DIR,
+});
+
 /**
  * This sets up the auth middlewares in the correct order
  */
@@ -79,12 +84,7 @@ export const setupAuthMiddlewares = (
 			// TODO: refactor me!!!
 			// skip authentication for preflight requests
 			req.method === 'OPTIONS' ||
-			req.url === '/index.html' ||
-			req.url === '/favicon.ico' ||
-			req.url.startsWith('/css/') ||
-			req.url.startsWith('/js/') ||
-			req.url.startsWith('/fonts/') ||
-			req.url.includes('.svg') ||
+			staticAssets.includes(req.url.slice(1)) ||
 			req.url.startsWith(`/${restEndpoint}/settings`) ||
 			req.url.startsWith(`/${restEndpoint}/login`) ||
 			req.url.startsWith(`/${restEndpoint}/logout`) ||
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index e0636d7611ac09..9171d2f9c32f7c 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -10,11 +10,28 @@ import type {
 	IWorkflowSettings,
 } from 'n8n-workflow';
 
+import { IsEmail, IsString, Length } from 'class-validator';
+import { NoXss } from '@db/utils/customValidators';
 import type { PublicUser, IExecutionDeleteFilter, IWorkflowDb } from '@/Interfaces';
 import type { Role } from '@db/entities/Role';
 import type { User } from '@db/entities/User';
 import type * as UserManagementMailer from '@/UserManagement/email/UserManagementMailer';
 
+export class UserUpdatePayload implements Pick<User, 'email' | 'firstName' | 'lastName'> {
+	@IsEmail()
+	email: string;
+
+	@NoXss()
+	@IsString({ message: 'First name must be of type string.' })
+	@Length(1, 32, { message: 'First name must be $constraint1 to $constraint2 characters long.' })
+	firstName: string;
+
+	@NoXss()
+	@IsString({ message: 'Last name must be of type string.' })
+	@Length(1, 32, { message: 'Last name must be $constraint1 to $constraint2 characters long.' })
+	lastName: string;
+}
+
 export type AuthlessRequest<
 	RouteParams = {},
 	ResponseBody = {},
@@ -144,11 +161,7 @@ export declare namespace ExecutionRequest {
 // ----------------------------------
 
 export declare namespace MeRequest {
-	export type Settings = AuthenticatedRequest<
-		{},
-		{},
-		Pick<PublicUser, 'email' | 'firstName' | 'lastName'>
-	>;
+	export type UserUpdate = AuthenticatedRequest<{}, {}, UserUpdatePayload>;
 	export type Password = AuthenticatedRequest<
 		{},
 		{},
diff --git a/packages/cli/test/setup-mocks.ts b/packages/cli/test/setup-mocks.ts
index 1a9bb4e9c0a15c..c6db2d147cdc8e 100644
--- a/packages/cli/test/setup-mocks.ts
+++ b/packages/cli/test/setup-mocks.ts
@@ -1,3 +1,5 @@
+import 'reflect-metadata';
+
 jest.mock('@sentry/node');
 jest.mock('@n8n_io/license-sdk');
 jest.mock('@/telemetry');
diff --git a/packages/cli/test/unit/controllers/me.controller.test.ts b/packages/cli/test/unit/controllers/me.controller.test.ts
index 1606915398c572..de57d031a9c255 100644
--- a/packages/cli/test/unit/controllers/me.controller.test.ts
+++ b/packages/cli/test/unit/controllers/me.controller.test.ts
@@ -28,40 +28,74 @@ describe('MeController', () => {
 
 	describe('updateCurrentUser', () => {
 		it('should throw BadRequestError if email is missing in the payload', async () => {
-			const req = mock<MeRequest.Settings>({});
+			const req = mock<MeRequest.UserUpdate>({});
 			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
 				new BadRequestError('Email is mandatory'),
 			);
 		});
 
 		it('should throw BadRequestError if email is invalid', async () => {
-			const req = mock<MeRequest.Settings>({ body: { email: 'invalid-email' } });
+			const req = mock<MeRequest.UserUpdate>({ body: { email: 'invalid-email' } });
 			expect(controller.updateCurrentUser(req, mock())).rejects.toThrowError(
 				new BadRequestError('Invalid email address'),
 			);
 		});
 
 		it('should update the user in the DB, and issue a new cookie', async () => {
-			const req = mock<MeRequest.Settings>({
-				user: mock({ id: '123', password: 'password', authIdentities: [] }),
-				body: { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' },
+			const user = mock<User>({
+				id: '123',
+				password: 'password',
+				authIdentities: [],
+				globalRoleId: '1',
 			});
+			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
+			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
 			const res = mock<Response>();
-			userRepository.save.calledWith(anyObject()).mockResolvedValue(req.user);
+			userRepository.findOneOrFail.mockResolvedValue(user);
 			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
 
 			await controller.updateCurrentUser(req, res);
 
+			expect(userRepository.update).toHaveBeenCalled();
+
 			const cookieOptions = captor<CookieOptions>();
 			expect(res.cookie).toHaveBeenCalledWith(AUTH_COOKIE_NAME, 'signed-token', cookieOptions);
 			expect(cookieOptions.value.httpOnly).toBe(true);
 			expect(cookieOptions.value.sameSite).toBe('lax');
 
 			expect(externalHooks.run).toHaveBeenCalledWith('user.profile.update', [
-				req.user.email,
+				user.email,
 				anyObject(),
 			]);
 		});
+
+		it('should not allow updating any other fields on a user besides email and name', async () => {
+			const user = mock<User>({
+				id: '123',
+				password: 'password',
+				authIdentities: [],
+				globalRoleId: '1',
+			});
+			const reqBody = { email: 'valid@email.com', firstName: 'John', lastName: 'Potato' };
+			const req = mock<MeRequest.UserUpdate>({ user, body: reqBody });
+			const res = mock<Response>();
+			userRepository.findOneOrFail.mockResolvedValue(user);
+			jest.spyOn(jwt, 'sign').mockImplementation(() => 'signed-token');
+
+			// Add invalid data to the request payload
+			Object.assign(reqBody, { id: '0', globalRoleId: '42' });
+
+			await controller.updateCurrentUser(req, res);
+
+			expect(userRepository.update).toHaveBeenCalled();
+
+			const updatedUser = userRepository.update.mock.calls[0][1];
+			expect(updatedUser.email).toBe(reqBody.email);
+			expect(updatedUser.firstName).toBe(reqBody.firstName);
+			expect(updatedUser.lastName).toBe(reqBody.lastName);
+			expect(updatedUser.id).not.toBe('0');
+			expect(updatedUser.globalRoleId).not.toBe('42');
+		});
 	});
 
 	describe('updatePassword', () => {
diff --git a/packages/cli/test/unit/controllers/translation.controller.test.ts b/packages/cli/test/unit/controllers/translation.controller.test.ts
new file mode 100644
index 00000000000000..a24d462f818189
--- /dev/null
+++ b/packages/cli/test/unit/controllers/translation.controller.test.ts
@@ -0,0 +1,40 @@
+import { mock } from 'jest-mock-extended';
+import type { ICredentialTypes } from 'n8n-workflow';
+import type { Config } from '@/config';
+import {
+	TranslationController,
+	TranslationRequest,
+	CREDENTIAL_TRANSLATIONS_DIR,
+} from '@/controllers/translation.controller';
+import { BadRequestError } from '@/ResponseHelper';
+
+describe('TranslationController', () => {
+	const config = mock<Config>();
+	const credentialTypes = mock<ICredentialTypes>();
+	const controller = new TranslationController(config, credentialTypes);
+
+	describe('getCredentialTranslation', () => {
+		it('should throw 400 on invalid credential types', async () => {
+			const credentialType = 'not-a-valid-credential-type';
+			const req = mock<TranslationRequest.Credential>({ query: { credentialType } });
+			credentialTypes.recognizes.calledWith(credentialType).mockReturnValue(false);
+
+			expect(controller.getCredentialTranslation(req)).rejects.toThrowError(
+				new BadRequestError(`Invalid Credential type: "${credentialType}"`),
+			);
+		});
+
+		it('should return translation json on valid credential types', async () => {
+			const credentialType = 'credential-type';
+			const req = mock<TranslationRequest.Credential>({ query: { credentialType } });
+			config.getEnv.calledWith('defaultLocale').mockReturnValue('de');
+			credentialTypes.recognizes.calledWith(credentialType).mockReturnValue(true);
+			const response = { translation: 'string' };
+			jest.mock(`${CREDENTIAL_TRANSLATIONS_DIR}/de/credential-type.json`, () => response, {
+				virtual: true,
+			});
+
+			expect(await controller.getCredentialTranslation(req)).toEqual(response);
+		});
+	});
+});
diff --git a/packages/core/package.json b/packages/core/package.json
index 96585c2491c71f..60ec9df01be8a8 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.155.0",
+  "version": "0.155.1",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/core/src/BinaryDataManager/FileSystem.ts b/packages/core/src/BinaryDataManager/FileSystem.ts
index b66093b3d2f01b..df033569752f11 100644
--- a/packages/core/src/BinaryDataManager/FileSystem.ts
+++ b/packages/core/src/BinaryDataManager/FileSystem.ts
@@ -7,6 +7,7 @@ import type { BinaryMetadata } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
 import type { IBinaryDataConfig, IBinaryDataManager } from '../Interfaces';
+import { FileNotFoundError } from '../errors';
 
 const PREFIX_METAFILE = 'binarymeta';
 const PREFIX_PERSISTED_METAFILE = 'persistedmeta';
@@ -85,17 +86,17 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 	}
 
 	getBinaryPath(identifier: string): string {
-		return path.join(this.storagePath, identifier);
+		return this.resolveStoragePath(identifier);
 	}
 
 	getMetadataPath(identifier: string): string {
-		return path.join(this.storagePath, `${identifier}.metadata`);
+		return this.resolveStoragePath(`${identifier}.metadata`);
 	}
 
 	async markDataForDeletionByExecutionId(executionId: string): Promise<void> {
 		const tt = new Date(new Date().getTime() + this.binaryDataTTL * 60000);
 		return fs.writeFile(
-			path.join(this.getBinaryDataMetaPath(), `${PREFIX_METAFILE}_${executionId}_${tt.valueOf()}`),
+			this.resolveStoragePath('meta', `${PREFIX_METAFILE}_${executionId}_${tt.valueOf()}`),
 			'',
 		);
 	}
@@ -116,8 +117,8 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 		const timeAtNextHour = currentTime + 3600000 - (currentTime % 3600000);
 		const timeoutTime = timeAtNextHour + this.persistedBinaryDataTTL * 60000;
 
-		const filePath = path.join(
-			this.getBinaryDataPersistMetaPath(),
+		const filePath = this.resolveStoragePath(
+			'persistMeta',
 			`${PREFIX_PERSISTED_METAFILE}_${executionId}_${timeoutTime}`,
 		);
 
@@ -170,21 +171,18 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 		const newBinaryDataId = this.generateFileName(prefix);
 
 		return fs
-			.copyFile(
-				path.join(this.storagePath, binaryDataId),
-				path.join(this.storagePath, newBinaryDataId),
-			)
+			.copyFile(this.resolveStoragePath(binaryDataId), this.resolveStoragePath(newBinaryDataId))
 			.then(() => newBinaryDataId);
 	}
 
 	async deleteBinaryDataByExecutionId(executionId: string): Promise<void> {
 		const regex = new RegExp(`${executionId}_*`);
-		const filenames = await fs.readdir(path.join(this.storagePath));
+		const filenames = await fs.readdir(this.storagePath);
 
 		const proms = filenames.reduce(
 			(allProms, filename) => {
 				if (regex.test(filename)) {
-					allProms.push(fs.rm(path.join(this.storagePath, filename)));
+					allProms.push(fs.rm(this.resolveStoragePath(filename)));
 				}
 
 				return allProms;
@@ -253,4 +251,11 @@ export class BinaryDataFileSystem implements IBinaryDataManager {
 			throw new Error(`Error finding file: ${filePath}`);
 		}
 	}
+
+	private resolveStoragePath(...args: string[]) {
+		const returnPath = path.join(this.storagePath, ...args);
+		if (path.relative(this.storagePath, returnPath).startsWith('..'))
+			throw new FileNotFoundError('Invalid path detected');
+		return returnPath;
+	}
 }
diff --git a/packages/core/src/errors.ts b/packages/core/src/errors.ts
new file mode 100644
index 00000000000000..c425675c893714
--- /dev/null
+++ b/packages/core/src/errors.ts
@@ -0,0 +1,5 @@
+export class FileNotFoundError extends Error {
+	constructor(readonly filePath: string) {
+		super(`File not found: ${filePath}`);
+	}
+}
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index cef794cfa5835b..7a77667f595a5d 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -15,6 +15,7 @@ export * from './LoadNodeListSearch';
 export * from './NodeExecuteFunctions';
 export * from './WorkflowExecute';
 export { eventEmitter, NodeExecuteFunctions, UserSettings };
+export * from './errors';
 
 declare module 'http' {
 	export interface IncomingMessage {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 56c76aaa1c4d08..7863b7193acf36 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.182.0",
+  "version": "0.182.1",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index b873b7c64f211c..0447533dbfd4e4 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.94.0",
+  "version": "0.94.1",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 73ef88e91fe48e..f83852c5b2ec37 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.214.0",
+  "version": "0.214.1",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 0a89d973c0287b..ee1bc2cb27561d 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.137.0",
+  "version": "0.137.1",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index d5ef4137485010..137ae4a86e1836 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -163,6 +163,7 @@ importers:
       callsites: ^3.1.0
       change-case: ^4.1.1
       chokidar: 3.5.2
+      class-transformer: ^0.5.1
       class-validator: ^0.14.0
       client-oauth2: ^4.2.5
       compression: ^1.7.4
@@ -259,6 +260,7 @@ importers:
       bull: 4.10.2
       callsites: 3.1.0
       change-case: 4.1.2
+      class-transformer: 0.5.1
       class-validator: 0.14.0
       client-oauth2: 4.3.3
       compression: 1.7.4
@@ -4136,7 +4138,7 @@ packages:
     dependencies:
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/preview-api': 7.0.0-beta.46
@@ -4344,7 +4346,7 @@ packages:
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/components': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/docs-tools': 7.0.0-beta.46
       '@storybook/global': 5.0.0
       '@storybook/manager-api': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
@@ -4564,7 +4566,7 @@ packages:
       '@babel/core': 7.20.12
       '@babel/preset-env': 7.20.2_@babel+core@7.20.12
       '@babel/types': 7.20.7
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/csf-tools': 7.0.0-beta.46
       '@storybook/node-logger': 7.0.0-beta.46
       '@storybook/types': 7.0.0-beta.46
@@ -4604,7 +4606,7 @@ packages:
       react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
     dependencies:
       '@storybook/client-logger': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/types': 7.0.0-beta.46
@@ -4675,7 +4677,7 @@ packages:
       '@storybook/builder-manager': 7.0.0-beta.46
       '@storybook/core-common': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/csf-tools': 7.0.0-beta.46
       '@storybook/docs-mdx': 0.0.1-next.6
       '@storybook/global': 5.0.0
@@ -4745,7 +4747,7 @@ packages:
     resolution: {integrity: sha512-H7zXfL1wf/1jWi5MaFISt/taxE41fgpV/uLfi5CHcHLX9ZgeQs2B/2utpUgwvBsxiL+E/jKAt5cLeuZCIvglMg==}
     dependencies:
       '@babel/types': 7.20.7
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/types': 7.0.0-beta.46
       fs-extra: 11.1.0
       recast: 0.23.1
@@ -4760,8 +4762,8 @@ packages:
       lodash: 4.17.21
     dev: true
 
-  /@storybook/csf/0.0.2-next.9:
-    resolution: {integrity: sha512-ECOLMK425s+z8oA0aVAhBhhquuwTsZrM4oha/5De44JG8uYGXhqVrv/l27oxZEkwytuiQu+9f65HxYli+DY+3w==}
+  /@storybook/csf/0.0.2-next.10:
+    resolution: {integrity: sha512-m2PFgBP/xRIF85VrDhvesn9ktaD2pN3VUjvMqkAL/cINp/3qXsCyI81uw7N5VEOkQAbWrY2FcydnvEPDEdE8fA==}
     dependencies:
       type-fest: 2.19.0
     dev: true
@@ -4797,7 +4799,7 @@ packages:
       '@storybook/channels': 7.0.0-beta.46
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/router': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/theming': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
@@ -4887,7 +4889,7 @@ packages:
       '@storybook/channels': 7.0.0-beta.46
       '@storybook/client-logger': 7.0.0-beta.46
       '@storybook/core-events': 7.0.0-beta.46
-      '@storybook/csf': 0.0.2-next.9
+      '@storybook/csf': 0.0.2-next.10
       '@storybook/global': 5.0.0
       '@storybook/types': 7.0.0-beta.46
       '@types/qs': 6.9.7
@@ -8088,6 +8090,10 @@ packages:
     resolution: {integrity: sha512-kgMuFyE78OC6Dyu3Dy7vcx4uy97EIbVxJB/B0eJ3bUNAkwdNcxYzgKltnyADiYwsR7SEqkkUPsEUT//OVS6XMA==}
     dev: false
 
+  /class-transformer/0.5.1:
+    resolution: {integrity: sha512-SQa1Ws6hUbfC98vKGxZH3KFY0Y1lm5Zm0SY8XX9zbK7FJCyVEac3ATW0RIpwzW+oOfmHE5PMPufDG9hCfoEOMw==}
+    dev: false
+
   /class-utils/0.3.6:
     resolution: {integrity: sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==}
     engines: {node: '>=0.10.0'}

From d47d0086cc2b0af5338598de1fc496b9d825f9a4 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:34:39 +0300
Subject: [PATCH 265/358] feat: Add new event hooks (#5530)

* feat: Add new event hooks

* fix: update event
---
 packages/editor-ui/src/components/ParameterInputFull.vue | 5 ++++-
 packages/editor-ui/src/constants.ts                      | 2 +-
 packages/editor-ui/src/stores/posthog.ts                 | 6 ++++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 4d015a82946945..7bb4d22f4a0ea7 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -89,8 +89,9 @@ import { INodeParameters, INodeProperties, INodePropertyMode, IParameterLabel }
 import { BaseTextKey } from '@/plugins/i18n';
 import { mapStores } from 'pinia';
 import { useNDVStore } from '@/stores/ndv';
+import { externalHooks } from '@/mixins/externalHooks';
 
-export default mixins(showMessage).extend({
+export default mixins(showMessage, externalHooks).extend({
 	name: 'parameter-input-full',
 	components: {
 		ParameterOptions,
@@ -326,6 +327,8 @@ export default mixins(showMessage).extend({
 							hasExpressionMapping(prevValue),
 						success: true,
 					});
+
+					this.$externalHooks().run('parameterInputFull.mappedData');
 				}
 				this.forceShowExpression = false;
 			}, 200);
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index b97ba14864268c..f058b7a2ab6312 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -515,7 +515,7 @@ export const ASSUMPTION_EXPERIMENT = {
 };
 
 export const ONBOARDING_EXPERIMENT = {
-	name: 'onboarding-checklist',
+	name: 'checklist_001',
 	control: 'control',
 	variant: 'variant',
 };
diff --git a/packages/editor-ui/src/stores/posthog.ts b/packages/editor-ui/src/stores/posthog.ts
index d476bb64d794f4..0523a76c44a3b3 100644
--- a/packages/editor-ui/src/stores/posthog.ts
+++ b/packages/editor-ui/src/stores/posthog.ts
@@ -6,6 +6,8 @@ import { useSettingsStore } from './settings';
 import { FeatureFlags } from 'n8n-workflow';
 import { EXPERIMENTS_TO_TRACK } from '@/constants';
 import { useTelemetryStore } from './telemetry';
+import { runExternalHook } from '@/mixins/externalHooks';
+import { useWebhooksStore } from './webhooks';
 
 export const usePostHogStore = defineStore('posthog', () => {
 	const usersStore = useUsersStore();
@@ -104,6 +106,10 @@ export const usePostHogStore = defineStore('posthog', () => {
 		});
 
 		trackedDemoExp.value[name] = variant;
+		runExternalHook('posthog.featureFlagsUpdated', useWebhooksStore(), {
+			name,
+			variant,
+		});
 	};
 
 	watch(

From 7ecd5e59eca01ca2b1a01e0a3e3871bd5d322eea Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 21 Feb 2023 15:42:00 +0200
Subject: [PATCH 266/358] fix(Compare Datasets Node): UI tweaks and fixes

---
 .../CompareDatasets/CompareDatasets.node.ts   |  26 +++-
 .../nodes/CompareDatasets/GenericFunctions.ts | 132 +++++-------------
 .../nodes/Merge/v2/GenericFunctions.ts        |  93 +-----------
 .../nodes-base/test/utils/utilities.test.ts   |  31 ++++
 packages/nodes-base/utils/utilities.ts        | 105 +++++++++++++-
 5 files changed, 195 insertions(+), 192 deletions(-)
 create mode 100644 packages/nodes-base/test/utils/utilities.test.ts

diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
index 4acc603164d129..8cccc59d346ad1 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
@@ -13,7 +13,7 @@ export class CompareDatasets implements INodeType {
 		name: 'compareDatasets',
 		icon: 'file:compare.svg',
 		group: ['transform'],
-		version: 1,
+		version: [1, 2],
 		description: 'Compare two inputs for changes',
 		defaults: { name: 'Compare Datasets' },
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-inputs-wrong-regular-node
@@ -94,6 +94,19 @@ export class CompareDatasets implements INodeType {
 					},
 				],
 			},
+			{
+				displayName: 'Fuzzy Compare',
+				name: 'fuzzyCompare',
+				type: 'boolean',
+				default: false,
+				description:
+					"Whether to tolerate small type differences when comparing fields. E.g. the number 3 and the string '3' are treated as the same.",
+				displayOptions: {
+					show: {
+						'@version': [2],
+					},
+				},
+			},
 			{
 				displayName: 'Prefer',
 				name: 'preferWhenMix',
@@ -155,6 +168,11 @@ export class CompareDatasets implements INodeType {
 						default: false,
 						description:
 							"Whether to tolerate small type differences when comparing fields. E.g. the number 3 and the string '3' are treated as the same.",
+						displayOptions: {
+							hide: {
+								'@version': [2],
+							},
+						},
 					},
 					{
 						displayName: 'Disable Dot Notation',
@@ -194,6 +212,12 @@ export class CompareDatasets implements INodeType {
 
 		const options = this.getNodeParameter('options', 0, {});
 
+		options.nodeVersion = this.getNode().typeVersion;
+
+		if (options.nodeVersion === 2) {
+			options.fuzzyCompare = this.getNodeParameter('fuzzyCompare', 0, false) as boolean;
+		}
+
 		const input1 = checkInput(
 			this.getInputData(0),
 			matchFields.map((pair) => pair.field1),
diff --git a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
index dad28183233fe9..9e6116c8189c68 100644
--- a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
@@ -1,6 +1,7 @@
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
-import { difference, get, intersection, isEmpty, isEqual, isNull, omit, set, union } from 'lodash';
+
+import { difference, get, intersection, isEmpty, omit, set, union } from 'lodash';
+import { fuzzyCompare } from '../../utils/utilities';
 
 type PairToMatch = {
 	field1: string;
@@ -14,11 +15,18 @@ type EntryMatches = {
 
 type CompareFunction = <T, U>(a: T, b: U) => boolean;
 
+const processNullishValueFunction = (version: number) => {
+	if (version === 2) {
+		return <T>(value: T) => (value === undefined ? null : value);
+	}
+	return <T>(value: T) => value || null;
+};
+
 function compareItems(
 	item1: INodeExecutionData,
 	item2: INodeExecutionData,
 	fieldsToMatch: PairToMatch[],
-	resolve: string,
+	options: IDataObject,
 	skipFields: string[],
 	isEntriesEqual: CompareFunction,
 ) {
@@ -46,20 +54,28 @@ function compareItems(
 	const skipped: IDataObject = {};
 
 	differentKeys.forEach((key) => {
-		switch (resolve) {
+		const processNullishValue = processNullishValueFunction(options.nodeVersion as number);
+
+		switch (options.resolve) {
 			case 'preferInput1':
-				different[key] = item1.json[key] || null;
+				different[key] = processNullishValue(item1.json[key]);
 				break;
 			case 'preferInput2':
-				different[key] = item2.json[key] || null;
+				different[key] = processNullishValue(item2.json[key]);
 				break;
 			default:
-				const input1 = item1.json[key] || null;
-				const input2 = item2.json[key] || null;
+				const input1 = processNullishValue(item1.json[key]);
+				const input2 = processNullishValue(item2.json[key]);
+
+				let [firstInputName, secondInputName] = ['input1', 'input2'];
+				if (options.nodeVersion === 2) {
+					[firstInputName, secondInputName] = ['inputA', 'inputB'];
+				}
+
 				if (skipFields.includes(key)) {
-					skipped[key] = { input1, input2 };
+					skipped[key] = { [firstInputName]: input1, [secondInputName]: input2 };
 				} else {
-					different[key] = { input1, input2 };
+					different[key] = { [firstInputName]: input1, [secondInputName]: input2 };
 				}
 		}
 	});
@@ -160,93 +176,6 @@ function findFirstMatch(
 	return [{ entry: data[index], index }];
 }
 
-const parseStringAndCompareToObject = (str: string, arr: IDataObject) => {
-	try {
-		const parsedArray = jsonParse(str);
-		return isEqual(parsedArray, arr);
-	} catch (error) {
-		return false;
-	}
-};
-
-function isFalsy<T>(value: T) {
-	if (isNull(value)) return true;
-	if (typeof value === 'string' && value === '') return true;
-	if (Array.isArray(value) && value.length === 0) return true;
-	return false;
-}
-
-const fuzzyCompare =
-	(options: IDataObject) =>
-	<T, U>(item1: T, item2: U) => {
-		//Fuzzy compare is disabled, so we do strict comparison
-		if (!options.fuzzyCompare) return isEqual(item1, item2);
-
-		//Both types are the same, so we do strict comparison
-		if (!isNull(item1) && !isNull(item2) && typeof item1 === typeof item2) {
-			return isEqual(item1, item2);
-		}
-
-		//Null, empty strings, empty arrays all treated as the same
-		if (isFalsy(item1) && isFalsy(item2)) return true;
-
-		//When a field is missing in one branch and isFalsy() in another, treat them as matching
-		if (isFalsy(item1) && item2 === undefined) return true;
-		if (item1 === undefined && isFalsy(item2)) return true;
-
-		//Compare numbers and strings representing that number
-		if (typeof item1 === 'number' && typeof item2 === 'string') {
-			return item1.toString() === item2;
-		}
-
-		if (typeof item1 === 'string' && typeof item2 === 'number') {
-			return item1 === item2.toString();
-		}
-
-		//Compare objects/arrays and their stringified version
-		if (!isNull(item1) && typeof item1 === 'object' && typeof item2 === 'string') {
-			return parseStringAndCompareToObject(item2, item1 as IDataObject);
-		}
-
-		if (!isNull(item2) && typeof item1 === 'string' && typeof item2 === 'object') {
-			return parseStringAndCompareToObject(item1, item2 as IDataObject);
-		}
-
-		//Compare booleans and strings representing the boolean (’true’, ‘True’, ‘TRUE’)
-		if (typeof item1 === 'boolean' && typeof item2 === 'string') {
-			if (item1 === true && item2.toLocaleLowerCase() === 'true') return true;
-			if (item1 === false && item2.toLocaleLowerCase() === 'false') return true;
-		}
-
-		if (typeof item2 === 'boolean' && typeof item1 === 'string') {
-			if (item2 === true && item1.toLocaleLowerCase() === 'true') return true;
-			if (item2 === false && item1.toLocaleLowerCase() === 'false') return true;
-		}
-
-		//Compare booleans and the numbers/string 0 and 1
-		if (typeof item1 === 'boolean' && typeof item2 === 'number') {
-			if (item1 === true && item2 === 1) return true;
-			if (item1 === false && item2 === 0) return true;
-		}
-
-		if (typeof item2 === 'boolean' && typeof item1 === 'number') {
-			if (item2 === true && item1 === 1) return true;
-			if (item2 === false && item1 === 0) return true;
-		}
-
-		if (typeof item1 === 'boolean' && typeof item2 === 'string') {
-			if (item1 === true && item2 === '1') return true;
-			if (item1 === false && item2 === '0') return true;
-		}
-
-		if (typeof item2 === 'boolean' && typeof item1 === 'string') {
-			if (item2 === true && item1 === '1') return true;
-			if (item2 === false && item1 === '0') return true;
-		}
-
-		return isEqual(item1, item2);
-	};
-
 export function findMatches(
 	input1: INodeExecutionData[],
 	input2: INodeExecutionData[],
@@ -256,7 +185,12 @@ export function findMatches(
 	const data1 = [...input1];
 	const data2 = [...input2];
 
-	const isEntriesEqual = fuzzyCompare(options);
+	let compareVersion = 1;
+	if (options.nodeVersion === 2) {
+		compareVersion = 2;
+	}
+
+	const isEntriesEqual = fuzzyCompare(options.fuzzyCompare as boolean, compareVersion);
 	const disableDotNotation = (options.disableDotNotation as boolean) || false;
 	const multipleMatches = (options.multipleMatches as string) || 'first';
 	const skipFields = ((options.skipFields as string) || '').split(',').map((field) => field.trim());
@@ -370,7 +304,7 @@ export function findMatches(
 								entryMatches.entry,
 								match,
 								fieldsToMatch,
-								options.resolve as string,
+								options,
 								skipFields,
 								isEntriesEqual,
 							),
diff --git a/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts b/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
index 7ceb7afc897db3..7a1a4a14bc07fc 100644
--- a/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
@@ -5,9 +5,9 @@ import type {
 	INodeExecutionData,
 	IPairedItemData,
 } from 'n8n-workflow';
-import { jsonParse } from 'n8n-workflow';
 
-import { assign, assignWith, get, isEqual, isNull, merge, mergeWith } from 'lodash';
+import { assign, assignWith, get, merge, mergeWith } from 'lodash';
+import { fuzzyCompare } from '../../../utils/utilities';
 
 type PairToMatch = {
 	field1: string;
@@ -122,93 +122,6 @@ function findFirstMatch(
 	return [{ entry: data[index], index }];
 }
 
-const parseStringAndCompareToObject = (str: string, arr: IDataObject) => {
-	try {
-		const parsedArray = jsonParse(str);
-		return isEqual(parsedArray, arr);
-	} catch (error) {
-		return false;
-	}
-};
-
-function isFalsy<T>(value: T) {
-	if (isNull(value)) return true;
-	if (typeof value === 'string' && value === '') return true;
-	if (Array.isArray(value) && value.length === 0) return true;
-	return false;
-}
-
-const fuzzyCompare =
-	(options: IDataObject) =>
-	<T, U>(item1: T, item2: U) => {
-		//Fuzzy compare is disabled, so we do strict comparison
-		if (!options.fuzzyCompare) return isEqual(item1, item2);
-
-		//Both types are the same, so we do strict comparison
-		if (!isNull(item1) && !isNull(item2) && typeof item1 === typeof item2) {
-			return isEqual(item1, item2);
-		}
-
-		//Null, empty strings, empty arrays all treated as the same
-		if (isFalsy(item1) && isFalsy(item2)) return true;
-
-		//When a field is missing in one branch and isFalsy() in another, treat them as matching
-		if (isFalsy(item1) && item2 === undefined) return true;
-		if (item1 === undefined && isFalsy(item2)) return true;
-
-		//Compare numbers and strings representing that number
-		if (typeof item1 === 'number' && typeof item2 === 'string') {
-			return item1.toString() === item2;
-		}
-
-		if (typeof item1 === 'string' && typeof item2 === 'number') {
-			return item1 === item2.toString();
-		}
-
-		//Compare objects/arrays and their stringified version
-		if (!isNull(item1) && typeof item1 === 'object' && typeof item2 === 'string') {
-			return parseStringAndCompareToObject(item2, item1 as IDataObject);
-		}
-
-		if (!isNull(item2) && typeof item1 === 'string' && typeof item2 === 'object') {
-			return parseStringAndCompareToObject(item1, item2 as IDataObject);
-		}
-
-		//Compare booleans and strings representing the boolean (’true’, ‘True’, ‘TRUE’)
-		if (typeof item1 === 'boolean' && typeof item2 === 'string') {
-			if (item1 === true && item2.toLocaleLowerCase() === 'true') return true;
-			if (item1 === false && item2.toLocaleLowerCase() === 'false') return true;
-		}
-
-		if (typeof item2 === 'boolean' && typeof item1 === 'string') {
-			if (item2 === true && item1.toLocaleLowerCase() === 'true') return true;
-			if (item2 === false && item1.toLocaleLowerCase() === 'false') return true;
-		}
-
-		//Compare booleans and the numbers/string 0 and 1
-		if (typeof item1 === 'boolean' && typeof item2 === 'number') {
-			if (item1 === true && item2 === 1) return true;
-			if (item1 === false && item2 === 0) return true;
-		}
-
-		if (typeof item2 === 'boolean' && typeof item1 === 'number') {
-			if (item2 === true && item1 === 1) return true;
-			if (item2 === false && item1 === 0) return true;
-		}
-
-		if (typeof item1 === 'boolean' && typeof item2 === 'string') {
-			if (item1 === true && item2 === '1') return true;
-			if (item1 === false && item2 === '0') return true;
-		}
-
-		if (typeof item2 === 'boolean' && typeof item1 === 'string') {
-			if (item2 === true && item1 === '1') return true;
-			if (item2 === false && item1 === '0') return true;
-		}
-
-		return isEqual(item1, item2);
-	};
-
 export function findMatches(
 	input1: INodeExecutionData[],
 	input2: INodeExecutionData[],
@@ -222,7 +135,7 @@ export function findMatches(
 		[data1, data2] = [data2, data1];
 	}
 
-	const isEntriesEqual = fuzzyCompare(options);
+	const isEntriesEqual = fuzzyCompare(options.fuzzyCompare as boolean);
 	const disableDotNotation = options.disableDotNotation || false;
 	const multipleMatches = (options.multipleMatches as string) || 'all';
 
diff --git a/packages/nodes-base/test/utils/utilities.test.ts b/packages/nodes-base/test/utils/utilities.test.ts
new file mode 100644
index 00000000000000..78fa5631bc0c55
--- /dev/null
+++ b/packages/nodes-base/test/utils/utilities.test.ts
@@ -0,0 +1,31 @@
+import { fuzzyCompare } from '../../utils/utilities';
+
+//most test cases for fuzzyCompare are done in Compare Datasets node tests
+describe('Test fuzzyCompare', () => {
+	it('should do strict comparison', () => {
+		const compareFunction = fuzzyCompare(false);
+
+		expect(compareFunction(1, '1')).toEqual(false);
+	});
+
+	it('should do fuzzy comparison', () => {
+		const compareFunction = fuzzyCompare(true);
+
+		expect(compareFunction(1, '1')).toEqual(true);
+	});
+
+	it('should treat null, 0 and "0" as equal', () => {
+		const compareFunction = fuzzyCompare(true, 2);
+
+		expect(compareFunction(null, null)).toEqual(true);
+		expect(compareFunction(null, 0)).toEqual(true);
+		expect(compareFunction(null, '0')).toEqual(true);
+	});
+
+	it('should not treat null, 0 and "0" as equal', () => {
+		const compareFunction = fuzzyCompare(true);
+
+		expect(compareFunction(null, 0)).toEqual(false);
+		expect(compareFunction(null, '0')).toEqual(false);
+	});
+});
diff --git a/packages/nodes-base/utils/utilities.ts b/packages/nodes-base/utils/utilities.ts
index 6cf759bbe4c6f3..0ec385078f46cd 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -1,6 +1,7 @@
-import { IDisplayOptions, INodeProperties } from 'n8n-workflow';
+import type { IDataObject, IDisplayOptions, INodeProperties } from 'n8n-workflow';
+import { jsonParse } from 'n8n-workflow';
 
-import { merge } from 'lodash';
+import { isEqual, isNull, merge } from 'lodash';
 
 /**
  * Creates an array of elements split into groups the length of `size`.
@@ -71,3 +72,103 @@ export function updateDisplayOptions(
 		};
 	});
 }
+
+function isFalsy<T>(value: T) {
+	if (isNull(value)) return true;
+	if (typeof value === 'string' && value === '') return true;
+	if (Array.isArray(value) && value.length === 0) return true;
+	return false;
+}
+
+const parseStringAndCompareToObject = (str: string, arr: IDataObject) => {
+	try {
+		const parsedArray = jsonParse(str);
+		return isEqual(parsedArray, arr);
+	} catch (error) {
+		return false;
+	}
+};
+
+export const fuzzyCompare = (useFuzzyCompare: boolean, compareVersion = 1) => {
+	if (!useFuzzyCompare) {
+		//Fuzzy compare is false we do strict comparison
+		return <T, U>(item1: T, item2: U) => isEqual(item1, item2);
+	}
+
+	return <T, U>(item1: T, item2: U) => {
+		//Both types are the same, so we do strict comparison
+		if (!isNull(item1) && !isNull(item2) && typeof item1 === typeof item2) {
+			return isEqual(item1, item2);
+		}
+
+		if (compareVersion >= 2) {
+			//Null, 0 and "0" treated as equal
+			if (isNull(item1) && (isNull(item2) || item2 === 0 || item2 === '0')) {
+				return true;
+			}
+
+			if (isNull(item2) && (isNull(item1) || item1 === 0 || item1 === '0')) {
+				return true;
+			}
+		}
+
+		//Null, empty strings, empty arrays all treated as the same
+		if (isFalsy(item1) && isFalsy(item2)) return true;
+
+		//When a field is missing in one branch and isFalsy() in another, treat them as matching
+		if (isFalsy(item1) && item2 === undefined) return true;
+		if (item1 === undefined && isFalsy(item2)) return true;
+
+		//Compare numbers and strings representing that number
+		if (typeof item1 === 'number' && typeof item2 === 'string') {
+			return item1.toString() === item2;
+		}
+
+		if (typeof item1 === 'string' && typeof item2 === 'number') {
+			return item1 === item2.toString();
+		}
+
+		//Compare objects/arrays and their stringified version
+		if (!isNull(item1) && typeof item1 === 'object' && typeof item2 === 'string') {
+			return parseStringAndCompareToObject(item2, item1 as IDataObject);
+		}
+
+		if (!isNull(item2) && typeof item1 === 'string' && typeof item2 === 'object') {
+			return parseStringAndCompareToObject(item1, item2 as IDataObject);
+		}
+
+		//Compare booleans and strings representing the boolean (’true’, ‘True’, ‘TRUE’)
+		if (typeof item1 === 'boolean' && typeof item2 === 'string') {
+			if (item1 === true && item2.toLocaleLowerCase() === 'true') return true;
+			if (item1 === false && item2.toLocaleLowerCase() === 'false') return true;
+		}
+
+		if (typeof item2 === 'boolean' && typeof item1 === 'string') {
+			if (item2 === true && item1.toLocaleLowerCase() === 'true') return true;
+			if (item2 === false && item1.toLocaleLowerCase() === 'false') return true;
+		}
+
+		//Compare booleans and the numbers/string 0 and 1
+		if (typeof item1 === 'boolean' && typeof item2 === 'number') {
+			if (item1 === true && item2 === 1) return true;
+			if (item1 === false && item2 === 0) return true;
+		}
+
+		if (typeof item2 === 'boolean' && typeof item1 === 'number') {
+			if (item2 === true && item1 === 1) return true;
+			if (item2 === false && item1 === 0) return true;
+		}
+
+		if (typeof item1 === 'boolean' && typeof item2 === 'string') {
+			if (item1 === true && item2 === '1') return true;
+			if (item1 === false && item2 === '0') return true;
+		}
+
+		if (typeof item2 === 'boolean' && typeof item1 === 'string') {
+			if (item2 === true && item1 === '1') return true;
+			if (item2 === false && item1 === '0') return true;
+		}
+
+		return isEqual(item1, item2);
+	};
+};

From f1589d4f0f9f7cc7beec12d9f6598f8286484989 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Tue, 21 Feb 2023 14:49:59 +0100
Subject: [PATCH 267/358] feat: Add Required path name mapping to multiple
 nodes (#5369)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ Add requiresDataPath to Set

* Add Data path mapping to rename keys

* Add required path name to airtable

* Add required data path

* Add required data path to airtable trigger

* Fix multiple keyword for required path

* ⚡️use multiple for Airtable ignore fields

---------

Co-authored-by: Marcus <marcus@n8n.io>
---
 packages/nodes-base/nodes/Airtable/Airtable.node.ts        | 5 +++++
 packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts | 1 +
 packages/nodes-base/nodes/MySql/MySql.node.ts              | 2 ++
 packages/nodes-base/nodes/Postgres/Postgres.node.ts        | 1 +
 packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts    | 1 +
 packages/nodes-base/nodes/Set/Set.node.ts                  | 3 +++
 6 files changed, 13 insertions(+)

diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 0cc6e96c6e067d..7dde15bb0d2618 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -186,6 +186,7 @@ export class Airtable implements INodeType {
 					multipleValues: true,
 					multipleValueButtonText: 'Add Field',
 				},
+				requiresDataPath: 'single',
 				displayOptions: {
 					show: {
 						addAllFields: [false],
@@ -264,6 +265,7 @@ export class Airtable implements INodeType {
 				name: 'downloadFieldNames',
 				type: 'string',
 				required: true,
+				requiresDataPath: 'multiple',
 				displayOptions: {
 					show: {
 						operation: ['list'],
@@ -291,6 +293,7 @@ export class Airtable implements INodeType {
 						displayName: 'Fields',
 						name: 'fields',
 						type: 'string',
+						requiresDataPath: 'single',
 						typeOptions: {
 							multipleValues: true,
 							multipleValueButtonText: 'Add Field',
@@ -419,6 +422,7 @@ export class Airtable implements INodeType {
 					multipleValues: true,
 					multipleValueButtonText: 'Add Field',
 				},
+				requiresDataPath: 'single',
 				displayOptions: {
 					show: {
 						updateAllFields: [false],
@@ -461,6 +465,7 @@ export class Airtable implements INodeType {
 						displayName: 'Ignore Fields',
 						name: 'ignoreFields',
 						type: 'string',
+						requiresDataPath: 'multiple',
 						displayOptions: {
 							show: {
 								'/operation': ['update'],
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index 1b16d6a2b4aff5..5ca532fe05a4c7 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -163,6 +163,7 @@ export class AirtableTrigger implements INodeType {
 						displayName: 'Fields',
 						name: 'fields',
 						type: 'string',
+						requiresDataPath: 'multiple',
 						default: '',
 						// eslint-disable-next-line n8n-nodes-base/node-param-description-miscased-id
 						description:
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 6bf107ed35f0b7..0182a83af185f2 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -126,6 +126,7 @@ export class MySql implements INodeType {
 						operation: ['insert'],
 					},
 				},
+				requiresDataPath: 'multiple',
 				default: '',
 				placeholder: 'id,name,description',
 				description:
@@ -231,6 +232,7 @@ export class MySql implements INodeType {
 				displayName: 'Columns',
 				name: 'columns',
 				type: 'string',
+				requiresDataPath: 'multiple',
 				displayOptions: {
 					show: {
 						operation: ['update'],
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index d93620741a1cd8..2fe841c2d7ab6d 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -193,6 +193,7 @@ export class Postgres implements INodeType {
 				displayName: 'Return Fields',
 				name: 'returnFields',
 				type: 'string',
+				requiresDataPath: 'multiple',
 				displayOptions: {
 					show: {
 						operation: ['insert', 'update'],
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index 8ebb0286828455..092303ebb17a45 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -51,6 +51,7 @@ export class RenameKeys implements INodeType {
 								type: 'string',
 								default: '',
 								placeholder: 'currentKey',
+								requiresDataPath: 'single',
 								description:
 									'The current name of the key. It is also possible to define deep keys by using dot-notation like for example: "level1.level2.currentKey".',
 							},
diff --git a/packages/nodes-base/nodes/Set/Set.node.ts b/packages/nodes-base/nodes/Set/Set.node.ts
index de669880c531f8..7ae7b9f3c04614 100644
--- a/packages/nodes-base/nodes/Set/Set.node.ts
+++ b/packages/nodes-base/nodes/Set/Set.node.ts
@@ -52,6 +52,7 @@ export class Set implements INodeType {
 								displayName: 'Name',
 								name: 'name',
 								type: 'string',
+								requiresDataPath: 'single',
 								default: 'propertyName',
 								description:
 									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
@@ -75,6 +76,7 @@ export class Set implements INodeType {
 								name: 'name',
 								type: 'string',
 								default: 'propertyName',
+								requiresDataPath: 'single',
 								description:
 									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
 							},
@@ -96,6 +98,7 @@ export class Set implements INodeType {
 								name: 'name',
 								type: 'string',
 								default: 'propertyName',
+								requiresDataPath: 'single',
 								description:
 									'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
 							},

From 35a7856de5dac7592184bb2c37a105a6d8d6a8b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 16:02:31 +0100
Subject: [PATCH 268/358] ci: Release process improvements (no-changelog)
 (#5535)

* ci: Switch release workflows to trigger when releases are published (no-changelog)

* ci: Allow creating releases from tags and commits as well
---
 .github/workflows/check-documentation-urls.yml | 5 ++---
 .github/workflows/docker-images.yml            | 5 ++---
 .github/workflows/release-create-pr.yml        | 5 +++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/check-documentation-urls.yml b/.github/workflows/check-documentation-urls.yml
index c8e405457ddf25..6e352d2016afc7 100644
--- a/.github/workflows/check-documentation-urls.yml
+++ b/.github/workflows/check-documentation-urls.yml
@@ -1,9 +1,8 @@
 name: Check Documentation URLs
 
 on:
-  push:
-    tags:
-      - n8n@*
+  release:
+    types: [published]
   schedule:
     - cron: '0 0 * * *'
   workflow_dispatch:
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index 5d79fba12e80c1..ad40b97d98a6c8 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -1,9 +1,8 @@
 name: Docker Image CI
 
 on:
-  push:
-    tags:
-      - n8n@*
+  release:
+    types: [published]
 
 jobs:
   build:
diff --git a/.github/workflows/release-create-pr.yml b/.github/workflows/release-create-pr.yml
index 1a4e5668a1b676..cb0f359f4579a6 100644
--- a/.github/workflows/release-create-pr.yml
+++ b/.github/workflows/release-create-pr.yml
@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
     inputs:
       base-branch:
-        description: 'The branch to create this release PR from.'
+        description: 'The branch, tag, or commit to create this release PR from.'
         required: true
         default: 'master'
 
@@ -36,7 +36,8 @@ jobs:
 
       - name: Push the base branch
         run: |
-          git push -f origin ${{ github.event.inputs.base-branch }}:"release/${{ github.event.inputs.release-type }}"
+          git checkout -b "release/${{ github.event.inputs.release-type }}"
+          git push -f origin "release/${{ github.event.inputs.release-type }}"
 
       - uses: pnpm/action-setup@v2.2.4
       - uses: actions/setup-node@v3

From b3e1793ac0f304ea72d565097b6766bc278e1238 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Tue, 21 Feb 2023 15:20:28 +0000
Subject: [PATCH 269/358] fix(Discourse Node): Fix issue with credential test
 not working (#5520)

---
 packages/nodes-base/credentials/DiscourseApi.credentials.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/credentials/DiscourseApi.credentials.ts b/packages/nodes-base/credentials/DiscourseApi.credentials.ts
index c5981d6600dbad..f409edf4dacb9f 100644
--- a/packages/nodes-base/credentials/DiscourseApi.credentials.ts
+++ b/packages/nodes-base/credentials/DiscourseApi.credentials.ts
@@ -57,7 +57,7 @@ export class DiscourseApi implements ICredentialType {
 	test: ICredentialTestRequest = {
 		request: {
 			baseURL: '={{$credentials.url}}',
-			url: '/admin/groups.json',
+			url: '/groups.json',
 			method: 'GET',
 		},
 	};

From aca94bb9953314c9c1a82203d7079d383039cfdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 19:16:51 +0100
Subject: [PATCH 270/358] ci: Merge back released tag to master as Jan
 (no-changelog) (#5540)

---
 .github/workflows/release-publish.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/release-publish.yml b/.github/workflows/release-publish.yml
index 466ce2eacfa207..b8b03ab8e19975 100644
--- a/.github/workflows/release-publish.yml
+++ b/.github/workflows/release-publish.yml
@@ -50,8 +50,8 @@ jobs:
         run: |
           git fetch origin
           git checkout --track origin/master
-          git config user.name github-actions
-          git config user.email github-actions@github.com
-          git merge --ff origin/${{github.event.pull_request.base.ref}}
+          git config user.name "Jan Oberhauser"
+          git config user.email jan.oberhauser@gmail.com
+          git merge --ff n8n@${{env.RELEASE}}
           git push origin master
           git push origin :${{github.event.pull_request.base.ref}}

From 52f740b9e8e1dfd046e28854e7fe04e262198ee1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 21 Feb 2023 19:21:56 +0100
Subject: [PATCH 271/358] refactor(core): Use an IoC container to manage
 singleton classes [Part-1] (no-changelog) (#5509)

* add typedi

* convert ActiveWorkflowRunner into an injectable service

* convert ExternalHooks into an injectable service

* convert InternalHooks into an injectable service

* convert LoadNodesAndCredentials into an injectable service

* convert NodeTypes and CredentialTypes into an injectable service

* convert ActiveExecutions into an injectable service

* convert WaitTracker into an injectable service

* convert Push into an injectable service

* convert ActiveWebhooks and  TestWebhooks into an injectable services

* handle circular references, and log errors when a circular dependency is found
---
 package.json                                  |   3 +-
 packages/cli/bin/n8n                          |   1 +
 packages/cli/package.json                     |   3 +
 packages/cli/src/AbstractServer.ts            |  13 ++-
 packages/cli/src/ActiveExecutions.ts          |  13 +--
 packages/{core => cli}/src/ActiveWebhooks.ts  |   4 +-
 packages/cli/src/ActiveWorkflowRunner.ts      | 105 +++++++-----------
 packages/cli/src/CredentialTypes.ts           |  29 +----
 packages/cli/src/CredentialsHelper.ts         |   6 +-
 packages/cli/src/ExternalHooks.ts             |  15 +--
 packages/cli/src/InternalHooks.ts             |  22 ++--
 packages/cli/src/InternalHooksManager.ts      |  30 -----
 packages/cli/src/Ldap/LdapSync.ee.ts          |   7 +-
 packages/cli/src/Ldap/helpers.ts              |   9 +-
 .../cli/src/Ldap/routes/ldap.controller.ee.ts |   5 +-
 packages/cli/src/LoadNodesAndCredentials.ts   |  24 ++--
 packages/cli/src/NodeTypes.ts                 |  23 +---
 packages/cli/src/PublicApi/index.ts           |   5 +-
 .../credentials/credentials.handler.ts        |   3 +-
 .../credentials/credentials.middleware.ts     |   3 +-
 .../credentials/credentials.service.ts        |   5 +-
 .../handlers/executions/executions.handler.ts |  11 +-
 .../handlers/workflows/workflows.handler.ts   |  24 ++--
 packages/cli/src/Queue.ts                     |   7 +-
 packages/cli/src/ReloadNodesAndCredentials.ts |   8 +-
 packages/cli/src/Server.ts                    |  42 +++----
 packages/cli/src/TestWebhooks.ts              |  21 +---
 packages/cli/src/WaitTracker.ts               |  20 +---
 packages/cli/src/WaitingWebhooks.ts           |   3 +-
 packages/cli/src/WebhookHelpers.ts            |   5 +-
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  43 +++----
 packages/cli/src/WorkflowHelpers.ts           |   3 +-
 packages/cli/src/WorkflowRunner.ts            |  24 ++--
 packages/cli/src/WorkflowRunnerProcess.ts     |  25 +++--
 packages/cli/src/api/nodeTypes.api.ts         |   5 +-
 packages/cli/src/api/nodes.api.ts             |  27 ++---
 packages/cli/src/api/tags.api.ts              |  17 ++-
 packages/cli/src/audit/risks/nodes.risk.ts    |   4 +-
 packages/cli/src/auth/methods/email.ts        |   5 +-
 packages/cli/src/auth/methods/ldap.ts         |   5 +-
 packages/cli/src/commands/BaseCommand.ts      |  20 ++--
 packages/cli/src/commands/audit.ts            |   5 +-
 packages/cli/src/commands/execute.ts          |   5 +-
 packages/cli/src/commands/executeBatch.ts     |   7 +-
 packages/cli/src/commands/start.ts            |  32 +++---
 packages/cli/src/commands/webhook.ts          |   5 +-
 .../credentials/credentials.controller.ee.ts  |   5 +-
 .../src/credentials/credentials.controller.ts |   5 +-
 .../src/credentials/credentials.service.ts    |   9 +-
 .../src/credentials/oauth2Credential.api.ts   |   5 +-
 ...0580449-PurgeInvalidWorkflowConnections.ts |   3 +-
 ...0580449-PurgeInvalidWorkflowConnections.ts |   3 +-
 ...0580449-PurgeInvalidWorkflowConnections.ts |   3 +-
 .../eventbus/MessageEventBus/recoverEvents.ts |  30 ++---
 packages/cli/src/events/WorkflowStatistics.ts |   7 +-
 .../cli/src/executions/executions.service.ts  |   9 +-
 packages/cli/src/index.ts                     |   8 +-
 .../cli/src/license/license.controller.ts     |   7 +-
 packages/cli/src/posthog/index.ts             |   4 +-
 packages/cli/src/push/abstract.push.ts        |   2 +-
 packages/cli/src/push/index.ts                |  40 ++++---
 packages/cli/src/push/types.ts                |   4 -
 packages/cli/src/telemetry/index.ts           |  12 +-
 .../src/workflows/workflows.controller.ee.ts  |  11 +-
 .../cli/src/workflows/workflows.controller.ts |   9 +-
 .../cli/src/workflows/workflows.services.ts   |  33 +++---
 .../test/integration/audit/nodes.risk.test.ts |   7 ++
 .../integration/commands/reset.cmd.test.ts    |   7 ++
 .../cli/test/integration/nodes.api.test.ts    |  17 +--
 packages/cli/test/integration/shared/utils.ts |  45 +++++---
 .../test/unit/ActiveWorkflowRunner.test.ts    |  82 +++++++-------
 .../cli/test/unit/CredentialTypes.test.ts     |  64 +++++------
 .../cli/test/unit/CredentialsHelper.test.ts   |   8 +-
 packages/cli/test/unit/Events.test.ts         |  46 ++++----
 packages/cli/test/unit/Helpers.ts             |   9 +-
 packages/cli/test/unit/Telemetry.test.ts      |   3 +-
 packages/core/src/index.ts                    |   1 -
 patches/typedi@0.10.0.patch                   |  12 ++
 pnpm-lock.yaml                                |  13 +++
 79 files changed, 592 insertions(+), 632 deletions(-)
 rename packages/{core => cli}/src/ActiveWebhooks.ts (98%)
 delete mode 100644 packages/cli/src/InternalHooksManager.ts
 create mode 100644 patches/typedi@0.10.0.patch

diff --git a/package.json b/package.json
index 73d50b1db79edb..880b34fd2b52fb 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,8 @@
       "qqjs>globby": "^11.1.0"
     },
     "patchedDependencies": {
-      "element-ui@2.15.12": "patches/element-ui@2.15.12.patch"
+      "element-ui@2.15.12": "patches/element-ui@2.15.12.patch",
+      "typedi@0.10.0": "patches/typedi@0.10.0.patch"
     }
   }
 }
diff --git a/packages/cli/bin/n8n b/packages/cli/bin/n8n
index 75712a12e9fa45..0591b1ef5fad4f 100755
--- a/packages/cli/bin/n8n
+++ b/packages/cli/bin/n8n
@@ -34,6 +34,7 @@ process.env.OCLIF_TS_NODE = '0';
 
 require('express-async-errors');
 require('source-map-support').install();
+require('reflect-metadata');
 
 require('@oclif/command')
 	.run()
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2f08433a396869..bc8ae65e17c8a6 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -109,6 +109,7 @@
     "mock-jwks": "^1.0.9",
     "nodemon": "^2.0.2",
     "run-script-os": "^1.0.7",
+    "ts-essentials": "^7.0.3",
     "tsc-alias": "^1.8.2",
     "tsconfig-paths": "^4.1.2"
   },
@@ -188,6 +189,7 @@
     "posthog-node": "^2.2.2",
     "prom-client": "^13.1.0",
     "psl": "^1.8.0",
+    "reflect-metadata": "^0.1.13",
     "replacestream": "^4.0.3",
     "semver": "^7.3.8",
     "shelljs": "^0.8.5",
@@ -196,6 +198,7 @@
     "sse-channel": "^4.0.0",
     "swagger-ui-express": "^4.3.0",
     "syslog-client": "^1.1.1",
+    "typedi": "^0.10.0",
     "typeorm": "^0.3.12",
     "uuid": "^8.3.2",
     "validator": "13.7.0",
diff --git a/packages/cli/src/AbstractServer.ts b/packages/cli/src/AbstractServer.ts
index ee01a639a15b53..1ce52759aa76d5 100644
--- a/packages/cli/src/AbstractServer.ts
+++ b/packages/cli/src/AbstractServer.ts
@@ -1,3 +1,4 @@
+import { Container } from 'typedi';
 import { readFile } from 'fs/promises';
 import type { Server } from 'http';
 import type { Url } from 'url';
@@ -12,7 +13,7 @@ import type { WebhookHttpMethod } from 'n8n-workflow';
 import { ErrorReporterProxy as ErrorReporter, LoggerProxy as Logger } from 'n8n-workflow';
 import config from '@/config';
 import { N8N_VERSION, inDevelopment } from '@/constants';
-import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as Db from '@/Db';
 import type { IExternalHooksClass } from '@/Interfaces';
 import { ExternalHooks } from '@/ExternalHooks';
@@ -23,7 +24,7 @@ import {
 	ServiceUnavailableError,
 } from '@/ResponseHelper';
 import { corsMiddleware } from '@/middlewares';
-import * as TestWebhooks from '@/TestWebhooks';
+import { TestWebhooks } from '@/TestWebhooks';
 import { WaitingWebhooks } from '@/WaitingWebhooks';
 import { WEBHOOK_METHODS } from '@/WebhookHelpers';
 
@@ -36,7 +37,7 @@ export abstract class AbstractServer {
 
 	protected externalHooks: IExternalHooksClass;
 
-	protected activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner;
+	protected activeWorkflowRunner: ActiveWorkflowRunner;
 
 	protected protocol: string;
 
@@ -71,8 +72,8 @@ export abstract class AbstractServer {
 		this.endpointWebhookTest = config.getEnv('endpoints.webhookTest');
 		this.endpointWebhookWaiting = config.getEnv('endpoints.webhookWaiting');
 
-		this.externalHooks = ExternalHooks();
-		this.activeWorkflowRunner = ActiveWorkflowRunner.getInstance();
+		this.externalHooks = Container.get(ExternalHooks);
+		this.activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
 	}
 
 	private async setupErrorHandlers() {
@@ -338,7 +339,7 @@ export abstract class AbstractServer {
 	// ----------------------------------------
 	protected setupTestWebhookEndpoint() {
 		const endpoint = this.endpointWebhookTest;
-		const testWebhooks = TestWebhooks.getInstance();
+		const testWebhooks = Container.get(TestWebhooks);
 
 		// Register all test webhook requests (for testing via the UI)
 		this.app.all(`/${endpoint}/*`, async (req, res) => {
diff --git a/packages/cli/src/ActiveExecutions.ts b/packages/cli/src/ActiveExecutions.ts
index 23102daf4ed431..d73f6255bac0d2 100644
--- a/packages/cli/src/ActiveExecutions.ts
+++ b/packages/cli/src/ActiveExecutions.ts
@@ -26,7 +26,9 @@ import type {
 } from '@/Interfaces';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
+import { Service } from 'typedi';
 
+@Service()
 export class ActiveExecutions {
 	private activeExecutions: {
 		[index: string]: IExecutingWorkflowData;
@@ -34,7 +36,6 @@ export class ActiveExecutions {
 
 	/**
 	 * Add a new active execution
-	 *
 	 */
 	async add(
 		executionData: IWorkflowExecutionDataProcess,
@@ -253,13 +254,3 @@ export class ActiveExecutions {
 		return this.activeExecutions[executionId].status;
 	}
 }
-
-let activeExecutionsInstance: ActiveExecutions | undefined;
-
-export function getInstance(): ActiveExecutions {
-	if (activeExecutionsInstance === undefined) {
-		activeExecutionsInstance = new ActiveExecutions();
-	}
-
-	return activeExecutionsInstance;
-}
diff --git a/packages/core/src/ActiveWebhooks.ts b/packages/cli/src/ActiveWebhooks.ts
similarity index 98%
rename from packages/core/src/ActiveWebhooks.ts
rename to packages/cli/src/ActiveWebhooks.ts
index e11adfb1e3c1c6..8e3dcda62ddca3 100644
--- a/packages/core/src/ActiveWebhooks.ts
+++ b/packages/cli/src/ActiveWebhooks.ts
@@ -1,3 +1,4 @@
+import { Service } from 'typedi';
 import type {
 	IWebhookData,
 	WebhookHttpMethod,
@@ -6,8 +7,9 @@ import type {
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 
-import * as NodeExecuteFunctions from './NodeExecuteFunctions';
+import * as NodeExecuteFunctions from 'n8n-core';
 
+@Service()
 export class ActiveWebhooks {
 	private workflowWebhooks: {
 		[key: string]: IWebhookData[];
diff --git a/packages/cli/src/ActiveWorkflowRunner.ts b/packages/cli/src/ActiveWorkflowRunner.ts
index cc803ee6060757..b632a104f3cc53 100644
--- a/packages/cli/src/ActiveWorkflowRunner.ts
+++ b/packages/cli/src/ActiveWorkflowRunner.ts
@@ -8,6 +8,8 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
+
+import { Container, Service } from 'typedi';
 import { ActiveWorkflows, NodeExecuteFunctions } from 'n8n-core';
 
 import type {
@@ -55,7 +57,7 @@ import config from '@/config';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { WebhookEntity } from '@db/entities/WebhookEntity';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import { createErrorExecution } from '@/GenericHelpers';
 import { WORKFLOW_REACTIVATE_INITIAL_TIMEOUT, WORKFLOW_REACTIVATE_MAX_TIMEOUT } from '@/constants';
 import { NodeTypes } from '@/NodeTypes';
@@ -68,8 +70,9 @@ import { START_NODES } from './constants';
 const WEBHOOK_PROD_UNREGISTERED_HINT =
 	"The workflow must be active for a production URL to run successfully. You can activate the workflow using the toggle in the top-right of the editor. Note that unlike test URL calls, production URL calls aren't shown on the canvas (only in the executions list)";
 
+@Service()
 export class ActiveWorkflowRunner {
-	private activeWorkflows: ActiveWorkflows | null = null;
+	private activeWorkflows = new ActiveWorkflows();
 
 	private activationErrors: {
 		[key: string]: IActivationError;
@@ -79,9 +82,7 @@ export class ActiveWorkflowRunner {
 		[key: string]: IQueuedWorkflowActivations;
 	} = {};
 
-	constructor() {
-		this.activeWorkflows = new ActiveWorkflows();
-	}
+	constructor(private externalHooks: ExternalHooks) {}
 
 	// eslint-disable-next-line @typescript-eslint/explicit-module-boundary-types
 	async init() {
@@ -133,7 +134,7 @@ export class ActiveWorkflowRunner {
 					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 					Logger.info(`               ${error.message}`);
 					Logger.error(
-						`Issue on intital workflow activation try "${workflowData.name}" (startup)`,
+						`Issue on initial workflow activation try "${workflowData.name}" (startup)`,
 						{
 							workflowName: workflowData.name,
 							workflowId: workflowData.id,
@@ -148,21 +149,18 @@ export class ActiveWorkflowRunner {
 			}
 			Logger.verbose('Finished initializing active workflows (startup)');
 		}
-		const externalHooks = ExternalHooks();
-		await externalHooks.run('activeWorkflows.initialized', []);
+
+		await this.externalHooks.run('activeWorkflows.initialized', []);
 	}
 
 	/**
 	 * Removes all the currently active workflows
-	 *
 	 */
 	async removeAll(): Promise<void> {
 		let activeWorkflowIds: string[] = [];
 		Logger.verbose('Call to remove all active workflows received (removeAll)');
 
-		if (this.activeWorkflows !== null) {
-			activeWorkflowIds.push.apply(activeWorkflowIds, this.activeWorkflows.allActiveWorkflows());
-		}
+		activeWorkflowIds.push.apply(activeWorkflowIds, this.activeWorkflows.allActiveWorkflows());
 
 		const activeWorkflows = await this.getActiveWorkflows();
 		activeWorkflowIds = [
@@ -183,7 +181,6 @@ export class ActiveWorkflowRunner {
 
 	/**
 	 * Checks if a webhook for the given method and path exists and executes the workflow.
-	 *
 	 */
 	async executeWebhook(
 		httpMethod: WebhookHttpMethod,
@@ -192,11 +189,6 @@ export class ActiveWorkflowRunner {
 		res: express.Response,
 	): Promise<IResponseCallbackData> {
 		Logger.debug(`Received webhook "${httpMethod}" for path "${path}"`);
-		if (this.activeWorkflows === null) {
-			throw new ResponseHelper.NotFoundError(
-				'The "activeWorkflows" instance did not get initialized yet.',
-			);
-		}
 
 		// Reset request parameters
 		req.params = {};
@@ -279,7 +271,7 @@ export class ActiveWorkflowRunner {
 			);
 		}
 
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 		const workflow = new Workflow({
 			id: webhook.workflowId,
 			name: workflowData.name,
@@ -482,6 +474,7 @@ export class ActiveWorkflowRunner {
 				try {
 					await this.removeWorkflowWebhooks(workflow.id as string);
 				} catch (error) {
+					ErrorReporter.error(error);
 					Logger.error(
 						// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
 						`Could not remove webhooks of workflow "${workflow.id}" because of error: "${error.message}"`,
@@ -521,7 +514,7 @@ export class ActiveWorkflowRunner {
 			throw new Error(`Could not find workflow with id "${workflowId}"`);
 		}
 
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 		const workflow = new Workflow({
 			id: workflowId,
 			name: workflowData.name,
@@ -645,7 +638,7 @@ export class ActiveWorkflowRunner {
 
 				if (donePromise) {
 					executePromise.then((executionId) => {
-						ActiveExecutions.getInstance()
+						Container.get(ActiveExecutions)
 							.getPostExecutePromise(executionId)
 							.then(donePromise.resolve)
 							.catch(donePromise.reject);
@@ -702,7 +695,7 @@ export class ActiveWorkflowRunner {
 
 				if (donePromise) {
 					executePromise.then((executionId) => {
-						ActiveExecutions.getInstance()
+						Container.get(ActiveExecutions)
 							.getPostExecutePromise(executionId)
 							.then(donePromise.resolve)
 							.catch(donePromise.reject);
@@ -723,7 +716,7 @@ export class ActiveWorkflowRunner {
 
 				// Remove the workflow as "active"
 
-				await this.activeWorkflows?.remove(workflowData.id);
+				await this.activeWorkflows.remove(workflowData.id);
 				this.activationErrors[workflowData.id] = {
 					time: new Date().getTime(),
 					error: {
@@ -777,10 +770,6 @@ export class ActiveWorkflowRunner {
 		activation: WorkflowActivateMode,
 		workflowData?: IWorkflowDb,
 	): Promise<void> {
-		if (this.activeWorkflows === null) {
-			throw new Error('The "activeWorkflows" instance did not get initialized yet.');
-		}
-
 		let workflowInstance: Workflow;
 		try {
 			if (workflowData === undefined) {
@@ -793,7 +782,7 @@ export class ActiveWorkflowRunner {
 			if (!workflowData) {
 				throw new Error(`Could not find workflow with id "${workflowId}".`);
 			}
-			const nodeTypes = NodeTypes();
+			const nodeTypes = Container.get(NodeTypes);
 			workflowInstance = new Workflow({
 				id: workflowId,
 				name: workflowData.name,
@@ -978,47 +967,31 @@ export class ActiveWorkflowRunner {
 	 */
 	// TODO: this should happen in a transaction
 	async remove(workflowId: string): Promise<void> {
-		if (this.activeWorkflows !== null) {
-			// Remove all the webhooks of the workflow
-			try {
-				await this.removeWorkflowWebhooks(workflowId);
-			} catch (error) {
-				ErrorReporter.error(error);
-				Logger.error(
-					// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-					`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
-				);
-			}
-
-			if (this.activationErrors[workflowId] !== undefined) {
-				// If there were any activation errors delete them
-				delete this.activationErrors[workflowId];
-			}
-
-			if (this.queuedWorkflowActivations[workflowId] !== undefined) {
-				this.removeQueuedWorkflowActivation(workflowId);
-			}
-
-			// if it's active in memory then it's a trigger
-			// so remove from list of actives workflows
-			if (this.activeWorkflows.isActive(workflowId)) {
-				await this.activeWorkflows.remove(workflowId);
-				Logger.verbose(`Successfully deactivated workflow "${workflowId}"`, { workflowId });
-			}
-
-			return;
+		// Remove all the webhooks of the workflow
+		try {
+			await this.removeWorkflowWebhooks(workflowId);
+		} catch (error) {
+			ErrorReporter.error(error);
+			Logger.error(
+				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+				`Could not remove webhooks of workflow "${workflowId}" because of error: "${error.message}"`,
+			);
 		}
 
-		throw new Error('The "activeWorkflows" instance did not get initialized yet.');
-	}
-}
+		if (this.activationErrors[workflowId] !== undefined) {
+			// If there were any activation errors delete them
+			delete this.activationErrors[workflowId];
+		}
 
-let workflowRunnerInstance: ActiveWorkflowRunner | undefined;
+		if (this.queuedWorkflowActivations[workflowId] !== undefined) {
+			this.removeQueuedWorkflowActivation(workflowId);
+		}
 
-export function getInstance(): ActiveWorkflowRunner {
-	if (workflowRunnerInstance === undefined) {
-		workflowRunnerInstance = new ActiveWorkflowRunner();
+		// if it's active in memory then it's a trigger
+		// so remove from list of actives workflows
+		if (this.activeWorkflows.isActive(workflowId)) {
+			await this.activeWorkflows.remove(workflowId);
+			Logger.verbose(`Successfully deactivated workflow "${workflowId}"`, { workflowId });
+		}
 	}
-
-	return workflowRunnerInstance;
 }
diff --git a/packages/cli/src/CredentialTypes.ts b/packages/cli/src/CredentialTypes.ts
index 2b0c331b82617e..597ff1dfa78daa 100644
--- a/packages/cli/src/CredentialTypes.ts
+++ b/packages/cli/src/CredentialTypes.ts
@@ -1,14 +1,12 @@
 import { loadClassInIsolation } from 'n8n-core';
-import type {
-	ICredentialType,
-	ICredentialTypes,
-	INodesAndCredentials,
-	LoadedClass,
-} from 'n8n-workflow';
+import type { ICredentialType, ICredentialTypes, LoadedClass } from 'n8n-workflow';
+import { Service } from 'typedi';
 import { RESPONSE_ERROR_MESSAGES } from './constants';
+import { LoadNodesAndCredentials } from './LoadNodesAndCredentials';
 
-class CredentialTypesClass implements ICredentialTypes {
-	constructor(private nodesAndCredentials: INodesAndCredentials) {
+@Service()
+export class CredentialTypes implements ICredentialTypes {
+	constructor(private nodesAndCredentials: LoadNodesAndCredentials) {
 		nodesAndCredentials.credentialTypes = this;
 	}
 
@@ -64,18 +62,3 @@ class CredentialTypesClass implements ICredentialTypes {
 		return this.nodesAndCredentials.known.credentials;
 	}
 }
-
-let credentialTypesInstance: CredentialTypesClass | undefined;
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export function CredentialTypes(nodesAndCredentials?: INodesAndCredentials): CredentialTypesClass {
-	if (!credentialTypesInstance) {
-		if (nodesAndCredentials) {
-			credentialTypesInstance = new CredentialTypesClass(nodesAndCredentials);
-		} else {
-			throw new Error('CredentialTypes not initialized yet');
-		}
-	}
-
-	return credentialTypesInstance;
-}
diff --git a/packages/cli/src/CredentialsHelper.ts b/packages/cli/src/CredentialsHelper.ts
index ea7f78556668bb..643b12f8e16df4 100644
--- a/packages/cli/src/CredentialsHelper.ts
+++ b/packages/cli/src/CredentialsHelper.ts
@@ -32,7 +32,6 @@ import type {
 	IHttpRequestHelper,
 	INodeTypeData,
 	INodeTypes,
-	ICredentialTypes,
 } from 'n8n-workflow';
 import {
 	ICredentialsHelper,
@@ -54,6 +53,7 @@ import { CredentialTypes } from '@/CredentialTypes';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
 import { whereClause } from './UserManagement/UserManagementHelper';
 import { RESPONSE_ERROR_MESSAGES } from './constants';
+import { Container } from 'typedi';
 
 const mockNode = {
 	name: '',
@@ -87,8 +87,8 @@ const mockNodeTypes: INodeTypes = {
 export class CredentialsHelper extends ICredentialsHelper {
 	constructor(
 		encryptionKey: string,
-		private credentialTypes: ICredentialTypes = CredentialTypes(),
-		private nodeTypes: INodeTypes = NodeTypes(),
+		private credentialTypes = Container.get(CredentialTypes),
+		private nodeTypes = Container.get(NodeTypes),
 	) {
 		super(encryptionKey);
 	}
diff --git a/packages/cli/src/ExternalHooks.ts b/packages/cli/src/ExternalHooks.ts
index 70e14e54e06e09..56743062797b9a 100644
--- a/packages/cli/src/ExternalHooks.ts
+++ b/packages/cli/src/ExternalHooks.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/no-var-requires */
 /* eslint-disable import/no-dynamic-require */
 /* eslint-disable no-restricted-syntax */
+import { Service } from 'typedi';
 import * as Db from '@/Db';
 import type {
 	IExternalHooksClass,
@@ -10,7 +11,8 @@ import type {
 
 import config from '@/config';
 
-class ExternalHooksClass implements IExternalHooksClass {
+@Service()
+export class ExternalHooks implements IExternalHooksClass {
 	externalHooks: {
 		[key: string]: Array<() => {}>;
 	} = {};
@@ -103,14 +105,3 @@ class ExternalHooksClass implements IExternalHooksClass {
 		return !!this.externalHooks[hookName];
 	}
 }
-
-let externalHooksInstance: ExternalHooksClass | undefined;
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export function ExternalHooks(): ExternalHooksClass {
-	if (externalHooksInstance === undefined) {
-		externalHooksInstance = new ExternalHooksClass();
-	}
-
-	return externalHooksInstance;
-}
diff --git a/packages/cli/src/InternalHooks.ts b/packages/cli/src/InternalHooks.ts
index 84102e62e36526..5661c7ca6eb4c8 100644
--- a/packages/cli/src/InternalHooks.ts
+++ b/packages/cli/src/InternalHooks.ts
@@ -1,12 +1,12 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { Service } from 'typedi';
 import { snakeCase } from 'change-case';
 import { BinaryDataManager } from 'n8n-core';
 import type {
 	ExecutionStatus,
 	INodesGraphResult,
-	INodeTypes,
 	IRun,
 	ITelemetryTrackProperties,
 	IWorkflowBase,
@@ -22,13 +22,14 @@ import type {
 	IExecutionTrackProperties,
 	IWorkflowExecutionDataProcess,
 } from '@/Interfaces';
-import type { Telemetry } from '@/telemetry';
+import { Telemetry } from '@/telemetry';
 import type { AuthProviderType } from '@db/entities/AuthIdentity';
 import { RoleService } from './role/role.service';
 import { eventBus } from './eventbus';
 import type { User } from '@db/entities/User';
 import { N8N_VERSION } from '@/constants';
 import * as Db from '@/Db';
+import { NodeTypes } from './NodeTypes';
 
 function userToPayload(user: User): {
 	userId: string;
@@ -46,12 +47,17 @@ function userToPayload(user: User): {
 	};
 }
 
-export class InternalHooksClass implements IInternalHooksClass {
-	constructor(
-		private telemetry: Telemetry,
-		private instanceId: string,
-		private nodeTypes: INodeTypes,
-	) {}
+@Service()
+export class InternalHooks implements IInternalHooksClass {
+	private instanceId: string;
+
+	constructor(private telemetry: Telemetry, private nodeTypes: NodeTypes) {}
+
+	async init(instanceId: string) {
+		this.instanceId = instanceId;
+		this.telemetry.setInstanceId(instanceId);
+		await this.telemetry.init();
+	}
 
 	async onServerStarted(
 		diagnosticInfo: IDiagnosticInfo,
diff --git a/packages/cli/src/InternalHooksManager.ts b/packages/cli/src/InternalHooksManager.ts
deleted file mode 100644
index e78564a3d7db8f..00000000000000
--- a/packages/cli/src/InternalHooksManager.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import type { INodeTypes } from 'n8n-workflow';
-import { InternalHooksClass } from '@/InternalHooks';
-import { Telemetry } from '@/telemetry';
-import type { PostHogClient } from './posthog';
-
-export class InternalHooksManager {
-	private static internalHooksInstance: InternalHooksClass;
-
-	static getInstance(): InternalHooksClass {
-		if (this.internalHooksInstance) {
-			return this.internalHooksInstance;
-		}
-
-		throw new Error('InternalHooks not initialized');
-	}
-
-	static async init(
-		instanceId: string,
-		nodeTypes: INodeTypes,
-		postHog: PostHogClient,
-	): Promise<InternalHooksClass> {
-		if (!this.internalHooksInstance) {
-			const telemetry = new Telemetry(instanceId, postHog);
-			await telemetry.init();
-			this.internalHooksInstance = new InternalHooksClass(telemetry, instanceId, nodeTypes);
-		}
-
-		return this.internalHooksInstance;
-	}
-}
diff --git a/packages/cli/src/Ldap/LdapSync.ee.ts b/packages/cli/src/Ldap/LdapSync.ee.ts
index 2b4ffb91ce6aef..5b8d552f0c87e6 100644
--- a/packages/cli/src/Ldap/LdapSync.ee.ts
+++ b/packages/cli/src/Ldap/LdapSync.ee.ts
@@ -15,7 +15,8 @@ import {
 import type { User } from '@db/entities/User';
 import type { Role } from '@db/entities/Role';
 import type { RunningMode, SyncStatus } from '@db/entities/AuthProviderSyncHistory';
-import { InternalHooksManager } from '@/InternalHooksManager';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export class LdapSync {
 	private intervalId: NodeJS.Timeout | undefined = undefined;
@@ -104,7 +105,7 @@ export class LdapSync {
 		);
 
 		if (usersToDisable.length) {
-			void InternalHooksManager.getInstance().onLdapUsersDisabled({
+			void Container.get(InternalHooks).onLdapUsersDisabled({
 				reason: 'ldap_update',
 				users: usersToDisable.length,
 				user_ids: usersToDisable,
@@ -144,7 +145,7 @@ export class LdapSync {
 			error: errorMessage,
 		});
 
-		void InternalHooksManager.getInstance().onLdapSyncFinished({
+		void Container.get(InternalHooks).onLdapSyncFinished({
 			type: !this.intervalId ? 'scheduled' : `manual_${mode}`,
 			succeeded: true,
 			users_synced: usersToCreate.length + usersToUpdate.length + usersToDisable.length,
diff --git a/packages/cli/src/Ldap/helpers.ts b/packages/cli/src/Ldap/helpers.ts
index 927d23963f5acf..654734abcc7c5b 100644
--- a/packages/cli/src/Ldap/helpers.ts
+++ b/packages/cli/src/Ldap/helpers.ts
@@ -22,9 +22,10 @@ import {
 	LDAP_LOGIN_LABEL,
 } from './constants';
 import type { ConnectionSecurity, LdapConfig } from './types';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { jsonParse, LoggerProxy as Logger } from 'n8n-workflow';
 import { getLicense } from '@/License';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 /**
  *  Check whether the LDAP feature is disabled in the instance
@@ -162,7 +163,7 @@ export const updateLdapConfig = async (ldapConfig: LdapConfig): Promise<void> =>
 		const ldapUsers = await getLdapUsers();
 		if (ldapUsers.length) {
 			await deleteAllLdapIdentities();
-			void InternalHooksManager.getInstance().onLdapUsersDisabled({
+			void Container.get(InternalHooks).onLdapUsersDisabled({
 				reason: 'ldap_update',
 				users: ldapUsers.length,
 				user_ids: ldapUsers.map((user) => user.id),
@@ -185,7 +186,7 @@ export const handleLdapInit = async (): Promise<void> => {
 	if (!isLdapEnabled()) {
 		const ldapUsers = await getLdapUsers();
 		if (ldapUsers.length) {
-			void InternalHooksManager.getInstance().onLdapUsersDisabled({
+			void Container.get(InternalHooks).onLdapUsersDisabled({
 				reason: 'ldap_feature_deactivated',
 				users: ldapUsers.length,
 				user_ids: ldapUsers.map((user) => user.id),
@@ -238,7 +239,7 @@ export const findAndAuthenticateLdapUser = async (
 		);
 	} catch (e) {
 		if (e instanceof Error) {
-			void InternalHooksManager.getInstance().onLdapLoginSyncFailed({
+			void Container.get(InternalHooks).onLdapLoginSyncFailed({
 				error: e.message,
 			});
 			Logger.error('LDAP - Error during search', { message: e.message });
diff --git a/packages/cli/src/Ldap/routes/ldap.controller.ee.ts b/packages/cli/src/Ldap/routes/ldap.controller.ee.ts
index 53e9d60d8f7af3..aac5938415d7e6 100644
--- a/packages/cli/src/Ldap/routes/ldap.controller.ee.ts
+++ b/packages/cli/src/Ldap/routes/ldap.controller.ee.ts
@@ -2,9 +2,10 @@ import express from 'express';
 import { LdapManager } from '../LdapManager.ee';
 import { getLdapConfig, getLdapSynchronizations, updateLdapConfig } from '../helpers';
 import type { LdapConfiguration } from '../types';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import pick from 'lodash.pick';
 import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from '../constants';
+import { InternalHooks } from '@/InternalHooks';
+import { Container } from 'typedi';
 
 export const ldapController = express.Router();
 
@@ -42,7 +43,7 @@ ldapController.put('/config', async (req: LdapConfiguration.Update, res: express
 
 	const data = await getLdapConfig();
 
-	void InternalHooksManager.getInstance().onUserUpdatedLdapSettings({
+	void Container.get(InternalHooks).onUserUpdatedLdapSettings({
 		user_id: req.user.id,
 		...pick(data, NON_SENSIBLE_LDAP_CONFIG_PROPERTIES),
 	});
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 0f0f8f2c4b502e..4003f6ee58e7f2 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -31,13 +31,11 @@ import {
 	CUSTOM_API_CALL_NAME,
 	inTest,
 } from '@/constants';
-import {
-	persistInstalledPackageData,
-	removePackageFromDatabase,
-} from '@/CommunityNodes/packageModel';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
+import { Service } from 'typedi';
 
-export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
+@Service()
+export class LoadNodesAndCredentials implements INodesAndCredentials {
 	known: KnownNodesAndCredentials = { nodes: {}, credentials: {} };
 
 	loaded: LoadedNodesAndCredentials = { nodes: {}, credentials: {} };
@@ -202,6 +200,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		if (loader.loadedNodes.length > 0) {
 			// Save info to DB
 			try {
+				const { persistInstalledPackageData } = await import('@/CommunityNodes/packageModel');
 				const installedPackage = await persistInstalledPackageData(loader);
 				await this.postProcessLoaders();
 				await this.generateTypesForFrontend();
@@ -229,6 +228,7 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 
 		await executeCommand(command);
 
+		const { removePackageFromDatabase } = await import('@/CommunityNodes/packageModel');
 		await removePackageFromDatabase(installedPackage);
 
 		if (packageName in this.loaders) {
@@ -264,6 +264,9 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		if (loader.loadedNodes.length > 0) {
 			// Save info to DB
 			try {
+				const { persistInstalledPackageData, removePackageFromDatabase } = await import(
+					'@/CommunityNodes/packageModel'
+				);
 				await removePackageFromDatabase(installedPackage);
 				const newlyInstalledPackage = await persistInstalledPackageData(loader);
 				await this.postProcessLoaders();
@@ -420,14 +423,3 @@ export class LoadNodesAndCredentialsClass implements INodesAndCredentials {
 		throw new Error('Could not find "node_modules" folder!');
 	}
 }
-
-let packagesInformationInstance: LoadNodesAndCredentialsClass | undefined;
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export function LoadNodesAndCredentials(): LoadNodesAndCredentialsClass {
-	if (packagesInformationInstance === undefined) {
-		packagesInformationInstance = new LoadNodesAndCredentialsClass();
-	}
-
-	return packagesInformationInstance;
-}
diff --git a/packages/cli/src/NodeTypes.ts b/packages/cli/src/NodeTypes.ts
index 070831d3a32d17..b2dfb4d2d8f660 100644
--- a/packages/cli/src/NodeTypes.ts
+++ b/packages/cli/src/NodeTypes.ts
@@ -1,6 +1,5 @@
 import { loadClassInIsolation } from 'n8n-core';
 import type {
-	INodesAndCredentials,
 	INodeType,
 	INodeTypeDescription,
 	INodeTypes,
@@ -8,10 +7,13 @@ import type {
 	LoadedClass,
 } from 'n8n-workflow';
 import { NodeHelpers } from 'n8n-workflow';
+import { Service } from 'typedi';
 import { RESPONSE_ERROR_MESSAGES } from './constants';
+import { LoadNodesAndCredentials } from './LoadNodesAndCredentials';
 
-export class NodeTypesClass implements INodeTypes {
-	constructor(private nodesAndCredentials: INodesAndCredentials) {
+@Service()
+export class NodeTypes implements INodeTypes {
+	constructor(private nodesAndCredentials: LoadNodesAndCredentials) {
 		// Some nodeTypes need to get special parameters applied like the
 		// polling nodes the polling times
 		this.applySpecialNodeParameters();
@@ -75,18 +77,3 @@ export class NodeTypesClass implements INodeTypes {
 		return this.nodesAndCredentials.known.nodes;
 	}
 }
-
-let nodeTypesInstance: NodeTypesClass | undefined;
-
-// eslint-disable-next-line @typescript-eslint/naming-convention
-export function NodeTypes(nodesAndCredentials?: INodesAndCredentials): NodeTypesClass {
-	if (!nodeTypesInstance) {
-		if (nodesAndCredentials) {
-			nodeTypesInstance = new NodeTypesClass(nodesAndCredentials);
-		} else {
-			throw new Error('NodeTypes not initialized yet');
-		}
-	}
-
-	return nodeTypesInstance;
-}
diff --git a/packages/cli/src/PublicApi/index.ts b/packages/cli/src/PublicApi/index.ts
index d7054d892953bb..fa27212db42c4d 100644
--- a/packages/cli/src/PublicApi/index.ts
+++ b/packages/cli/src/PublicApi/index.ts
@@ -13,8 +13,9 @@ import type { JsonObject } from 'swagger-ui-express';
 
 import config from '@/config';
 import * as Db from '@/Db';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 async function createApiRouter(
 	version: string,
@@ -100,7 +101,7 @@ async function createApiRouter(
 
 						if (!user) return false;
 
-						void InternalHooksManager.getInstance().onUserInvokedApi({
+						void Container.get(InternalHooks).onUserInvokedApi({
 							user_id: user.id,
 							path: req.path,
 							method: req.method,
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
index 6c7af614f164ba..22f814a2096373 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.handler.ts
@@ -19,6 +19,7 @@ import {
 	saveCredential,
 	toJsonSchema,
 } from './credentials.service';
+import { Container } from 'typedi';
 
 export = {
 	createCredential: [
@@ -87,7 +88,7 @@ export = {
 			const { credentialTypeName } = req.params;
 
 			try {
-				CredentialTypes().getByName(credentialTypeName);
+				Container.get(CredentialTypes).getByName(credentialTypeName);
 			} catch (error) {
 				return res.status(404).json({ message: 'Not Found' });
 			}
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
index 52d928ddf9cfdb..097a50e5e67e10 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
@@ -7,6 +7,7 @@ import { CredentialsHelper } from '@/CredentialsHelper';
 import { CredentialTypes } from '@/CredentialTypes';
 import type { CredentialRequest } from '../../../types';
 import { toJsonSchema } from './credentials.service';
+import { Container } from 'typedi';
 
 export const validCredentialType = (
 	req: CredentialRequest.Create,
@@ -14,7 +15,7 @@ export const validCredentialType = (
 	next: express.NextFunction,
 ): express.Response | void => {
 	try {
-		CredentialTypes().getByName(req.body.type);
+		Container.get(CredentialTypes).getByName(req.body.type);
 	} catch (_) {
 		return res.status(400).json({ message: 'req.body.type is not a known type' });
 	}
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
index cb5acbadda485a..d1a44c8c08a82a 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.service.ts
@@ -8,6 +8,7 @@ import type { User } from '@db/entities/User';
 import { ExternalHooks } from '@/ExternalHooks';
 import type { IDependency, IJsonSchema } from '../../../types';
 import type { CredentialRequest } from '@/requests';
+import { Container } from 'typedi';
 
 export async function getCredentials(credentialId: string): Promise<ICredentialsDb | null> {
 	return Db.collections.Credentials.findOneBy({ id: credentialId });
@@ -62,7 +63,7 @@ export async function saveCredential(
 		scope: 'credential',
 	});
 
-	await ExternalHooks().run('credentials.create', [encryptedData]);
+	await Container.get(ExternalHooks).run('credentials.create', [encryptedData]);
 
 	return Db.transaction(async (transactionManager) => {
 		const savedCredential = await transactionManager.save<CredentialsEntity>(credential);
@@ -84,7 +85,7 @@ export async function saveCredential(
 }
 
 export async function removeCredential(credentials: CredentialsEntity): Promise<ICredentialsDb> {
-	await ExternalHooks().run('credentials.delete', [credentials.id]);
+	await Container.get(ExternalHooks).run('credentials.delete', [credentials.id]);
 	return Db.collections.Credentials.remove(credentials);
 }
 
diff --git a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
index ba1dcaf11dc89c..f3cbab6a3d09f3 100644
--- a/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/executions/executions.handler.ts
@@ -8,12 +8,13 @@ import {
 	deleteExecution,
 	getExecutionsCount,
 } from './executions.service';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import { authorize, validCursor } from '../../shared/middlewares/global.middleware';
 import type { ExecutionRequest } from '../../../types';
 import { getSharedWorkflowIds } from '../workflows/workflows.service';
 import { encodeNextCursor } from '../../shared/services/pagination.service';
-import { InternalHooksManager } from '@/InternalHooksManager';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export = {
 	deleteExecution: [
@@ -66,7 +67,7 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			void InternalHooksManager.getInstance().onUserRetrievedExecution({
+			void Container.get(InternalHooks).onUserRetrievedExecution({
 				user_id: req.user.id,
 				public_api: true,
 			});
@@ -95,7 +96,7 @@ export = {
 			}
 
 			// get running workflows so we exclude them from the result
-			const runningExecutionsIds = ActiveExecutions.getInstance()
+			const runningExecutionsIds = Container.get(ActiveExecutions)
 				.getActiveExecutions()
 				.map(({ id }) => id);
 
@@ -116,7 +117,7 @@ export = {
 
 			const count = await getExecutionsCount(filters);
 
-			void InternalHooksManager.getInstance().onUserRetrievedAllExecutions({
+			void Container.get(InternalHooks).onUserRetrievedAllExecutions({
 				user_id: req.user.id,
 				public_api: true,
 			});
diff --git a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
index c56c658c2bd4db..4c7e0906a88c17 100644
--- a/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/workflows/workflows.handler.ts
@@ -1,12 +1,11 @@
 import type express from 'express';
-
+import { Container } from 'typedi';
 import type { FindManyOptions, FindOptionsWhere } from 'typeorm';
 import { In } from 'typeorm';
 
-import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import config from '@/config';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { ExternalHooks } from '@/ExternalHooks';
 import { addNodeIds, replaceInvalidCredentials } from '@/WorkflowHelpers';
 import type { WorkflowRequest } from '../../../types';
@@ -29,6 +28,7 @@ import {
 	parseTagNames,
 } from './workflows.service';
 import { WorkflowsService } from '@/workflows/workflows.services';
+import { InternalHooks } from '@/InternalHooks';
 
 export = {
 	createWorkflow: [
@@ -50,8 +50,8 @@ export = {
 
 			const createdWorkflow = await createWorkflow(workflow, req.user, role);
 
-			await ExternalHooks().run('workflow.afterCreate', [createdWorkflow]);
-			void InternalHooksManager.getInstance().onWorkflowCreated(req.user, createdWorkflow, true);
+			await Container.get(ExternalHooks).run('workflow.afterCreate', [createdWorkflow]);
+			void Container.get(InternalHooks).onWorkflowCreated(req.user, createdWorkflow, true);
 
 			return res.json(createdWorkflow);
 		},
@@ -84,7 +84,7 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			void InternalHooksManager.getInstance().onUserRetrievedWorkflow({
+			void Container.get(InternalHooks).onUserRetrievedWorkflow({
 				user_id: req.user.id,
 				public_api: true,
 			});
@@ -145,7 +145,7 @@ export = {
 				count = await getWorkflowsCount(query);
 			}
 
-			void InternalHooksManager.getInstance().onUserRetrievedAllWorkflows({
+			void Container.get(InternalHooks).onUserRetrievedAllWorkflows({
 				user_id: req.user.id,
 				public_api: true,
 			});
@@ -182,7 +182,7 @@ export = {
 			await replaceInvalidCredentials(updateData);
 			addNodeIds(updateData);
 
-			const workflowRunner = ActiveWorkflowRunner.getInstance();
+			const workflowRunner = Container.get(ActiveWorkflowRunner);
 
 			if (sharedWorkflow.workflow.active) {
 				// When workflow gets saved always remove it as the triggers could have been
@@ -210,8 +210,8 @@ export = {
 
 			const updatedWorkflow = await getWorkflowById(sharedWorkflow.workflowId);
 
-			await ExternalHooks().run('workflow.afterUpdate', [updateData]);
-			void InternalHooksManager.getInstance().onWorkflowSaved(req.user, updateData, true);
+			await Container.get(ExternalHooks).run('workflow.afterUpdate', [updateData]);
+			void Container.get(InternalHooks).onWorkflowSaved(req.user, updateData, true);
 
 			return res.json(updatedWorkflow);
 		},
@@ -231,7 +231,7 @@ export = {
 
 			if (!sharedWorkflow.workflow.active) {
 				try {
-					await ActiveWorkflowRunner.getInstance().add(sharedWorkflow.workflowId, 'activate');
+					await Container.get(ActiveWorkflowRunner).add(sharedWorkflow.workflowId, 'activate');
 				} catch (error) {
 					if (error instanceof Error) {
 						return res.status(400).json({ message: error.message });
@@ -263,7 +263,7 @@ export = {
 				return res.status(404).json({ message: 'Not Found' });
 			}
 
-			const workflowRunner = ActiveWorkflowRunner.getInstance();
+			const workflowRunner = Container.get(ActiveWorkflowRunner);
 
 			if (sharedWorkflow.workflow.active) {
 				await workflowRunner.remove(sharedWorkflow.workflowId);
diff --git a/packages/cli/src/Queue.ts b/packages/cli/src/Queue.ts
index 88ba6c1a53df2e..fb494ba8d3b43f 100644
--- a/packages/cli/src/Queue.ts
+++ b/packages/cli/src/Queue.ts
@@ -2,8 +2,9 @@ import type Bull from 'bull';
 import type { RedisOptions } from 'ioredis';
 import type { IExecuteResponsePromiseData } from 'n8n-workflow';
 import config from '@/config';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import * as WebhookHelpers from '@/WebhookHelpers';
+import { Container } from 'typedi';
 
 export type JobId = Bull.JobId;
 export type Job = Bull.Job<JobData>;
@@ -26,7 +27,7 @@ export interface WebhookResponse {
 export class Queue {
 	private jobQueue: JobQueue;
 
-	constructor(private activeExecutions: ActiveExecutions.ActiveExecutions) {}
+	constructor(private activeExecutions: ActiveExecutions) {}
 
 	async init() {
 		const prefix = config.getEnv('queue.bull.prefix');
@@ -95,7 +96,7 @@ let activeQueueInstance: Queue | undefined;
 
 export async function getInstance(): Promise<Queue> {
 	if (activeQueueInstance === undefined) {
-		activeQueueInstance = new Queue(ActiveExecutions.getInstance());
+		activeQueueInstance = new Queue(Container.get(ActiveExecutions));
 		await activeQueueInstance.init();
 	}
 
diff --git a/packages/cli/src/ReloadNodesAndCredentials.ts b/packages/cli/src/ReloadNodesAndCredentials.ts
index f0fde3ba3a53f3..9abc08c7f4bfeb 100644
--- a/packages/cli/src/ReloadNodesAndCredentials.ts
+++ b/packages/cli/src/ReloadNodesAndCredentials.ts
@@ -1,13 +1,13 @@
 import path from 'path';
 import { realpath, access } from 'fs/promises';
 
-import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
-import type { NodeTypesClass } from '@/NodeTypes';
+import type { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import type { NodeTypes } from '@/NodeTypes';
 import type { Push } from '@/push';
 
 export const reloadNodesAndCredentials = async (
-	loadNodesAndCredentials: LoadNodesAndCredentialsClass,
-	nodeTypes: NodeTypesClass,
+	loadNodesAndCredentials: LoadNodesAndCredentials,
+	nodeTypes: NodeTypes,
 	push: Push,
 ) => {
 	// eslint-disable-next-line import/no-extraneous-dependencies
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index c90835b2853023..aed725c7ae8475 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -57,7 +57,6 @@ import history from 'connect-history-api-fallback';
 
 import config from '@/config';
 import * as Queue from '@/Queue';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 
 import { nodesController } from '@/api/nodes.api';
@@ -67,7 +66,6 @@ import {
 	GENERATED_STATIC_DIR,
 	inDevelopment,
 	N8N_VERSION,
-	NODES_BASE_DIR,
 	RESPONSE_ERROR_MESSAGES,
 	TEMPLATES_DIR,
 } from '@/constants';
@@ -114,7 +112,7 @@ import type {
 	IExecutionsStopData,
 	IN8nUISettings,
 } from '@/Interfaces';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import {
 	CredentialsHelper,
 	getCredentialForUser,
@@ -123,11 +121,8 @@ import {
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
 import { CredentialTypes } from '@/CredentialTypes';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
-import type { NodeTypesClass } from '@/NodeTypes';
 import { NodeTypes } from '@/NodeTypes';
 import * as ResponseHelper from '@/ResponseHelper';
-import type { WaitTrackerClass } from '@/WaitTracker';
 import { WaitTracker } from '@/WaitTracker';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
@@ -136,8 +131,7 @@ import { eventBusRouter } from '@/eventbus/eventBusRoutes';
 import { isLogStreamingEnabled } from '@/eventbus/MessageEventBus/MessageEventBusHelper';
 import { getLicense } from '@/License';
 import { licenseController } from './license/license.controller';
-import type { Push } from '@/push';
-import { getPushInstance, setupPushServer, setupPushHandler } from '@/push';
+import { Push, setupPushServer, setupPushHandler } from '@/push';
 import { setupAuthMiddlewares } from './middlewares';
 import { initEvents } from './events';
 import { ldapController } from './Ldap/routes/ldap.controller.ee';
@@ -149,23 +143,25 @@ import { setupExternalJWTAuth } from './middlewares/externalJWTAuth';
 import { PostHogClient } from './posthog';
 import { eventBus } from './eventbus';
 import { isSamlEnabled } from './Saml/helpers';
+import { Container } from 'typedi';
+import { InternalHooks } from './InternalHooks';
 
 const exec = promisify(callbackExec);
 
 class Server extends AbstractServer {
 	endpointPresetCredentials: string;
 
-	waitTracker: WaitTrackerClass;
+	waitTracker: WaitTracker;
 
-	activeExecutionsInstance: ActiveExecutions.ActiveExecutions;
+	activeExecutionsInstance: ActiveExecutions;
 
 	frontendSettings: IN8nUISettings;
 
 	presetCredentialsLoaded: boolean;
 
-	loadNodesAndCredentials: LoadNodesAndCredentialsClass;
+	loadNodesAndCredentials: LoadNodesAndCredentials;
 
-	nodeTypes: NodeTypesClass;
+	nodeTypes: NodeTypes;
 
 	credentialTypes: ICredentialTypes;
 
@@ -176,18 +172,18 @@ class Server extends AbstractServer {
 	constructor() {
 		super();
 
-		this.nodeTypes = NodeTypes();
-		this.credentialTypes = CredentialTypes();
-		this.loadNodesAndCredentials = LoadNodesAndCredentials();
+		this.loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
+		this.credentialTypes = Container.get(CredentialTypes);
+		this.nodeTypes = Container.get(NodeTypes);
 
-		this.activeExecutionsInstance = ActiveExecutions.getInstance();
-		this.waitTracker = WaitTracker();
-		this.postHog = new PostHogClient();
+		this.activeExecutionsInstance = Container.get(ActiveExecutions);
+		this.waitTracker = Container.get(WaitTracker);
+		this.postHog = Container.get(PostHogClient);
 
 		this.presetCredentialsLoaded = false;
 		this.endpointPresetCredentials = config.getEnv('credentials.overwrite.endpoint');
 
-		this.push = getPushInstance();
+		this.push = Container.get(Push);
 
 		if (process.env.E2E_TESTS === 'true') {
 			this.app.use('/e2e', require('./api/e2e.api').e2eController);
@@ -358,7 +354,7 @@ class Server extends AbstractServer {
 		setupAuthMiddlewares(app, ignoredEndpoints, this.restEndpoint, repositories.User);
 
 		const logger = LoggerProxy;
-		const internalHooks = InternalHooksManager.getInstance();
+		const internalHooks = Container.get(InternalHooks);
 		const mailer = getMailerInstance();
 		const postHog = this.postHog;
 
@@ -1182,9 +1178,7 @@ class Server extends AbstractServer {
 			`/${this.restEndpoint}/settings`,
 			ResponseHelper.send(
 				async (req: express.Request, res: express.Response): Promise<IN8nUISettings> => {
-					void InternalHooksManager.getInstance().onFrontendSettingsAPI(
-						req.headers.sessionid as string,
-					);
+					void Container.get(InternalHooks).onFrontendSettingsAPI(req.headers.sessionid as string);
 
 					return this.getSettingsForFrontend();
 				},
@@ -1355,6 +1349,6 @@ export async function start(): Promise<void> {
 		order: { createdAt: 'ASC' },
 		where: {},
 	}).then(async (workflow) =>
-		InternalHooksManager.getInstance().onServerStarted(diagnosticInfo, workflow?.createdAt),
+		Container.get(InternalHooks).onServerStarted(diagnosticInfo, workflow?.createdAt),
 	);
 }
diff --git a/packages/cli/src/TestWebhooks.ts b/packages/cli/src/TestWebhooks.ts
index 12ec4a68270722..e3b7b4fb035c29 100644
--- a/packages/cli/src/TestWebhooks.ts
+++ b/packages/cli/src/TestWebhooks.ts
@@ -2,8 +2,7 @@
 /* eslint-disable @typescript-eslint/no-non-null-assertion */
 /* eslint-disable no-param-reassign */
 import type express from 'express';
-
-import { ActiveWebhooks } from 'n8n-core';
+import { Service } from 'typedi';
 
 import type {
 	IWebhookData,
@@ -13,16 +12,18 @@ import type {
 	WorkflowActivateMode,
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
+
+import { ActiveWebhooks } from '@/ActiveWebhooks';
 import type { IResponseCallbackData, IWorkflowDb } from '@/Interfaces';
-import type { Push } from '@/push';
-import { getPushInstance } from '@/push';
+import { Push } from '@/push';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 
 const WEBHOOK_TEST_UNREGISTERED_HINT =
 	"Click the 'Execute workflow' button on the canvas, then try again. (In test mode, the webhook only works for one call after you click this button)";
 
-class TestWebhooks {
+@Service()
+export class TestWebhooks {
 	private testWebhookData: {
 		[key: string]: {
 			sessionId?: string;
@@ -286,13 +287,3 @@ class TestWebhooks {
 		return this.activeWebhooks.removeAll(workflows);
 	}
 }
-
-let testWebhooksInstance: TestWebhooks | undefined;
-
-export function getInstance(): TestWebhooks {
-	if (testWebhooksInstance === undefined) {
-		testWebhooksInstance = new TestWebhooks(new ActiveWebhooks(), getPushInstance());
-	}
-
-	return testWebhooksInstance;
-}
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 06ca1c988d3c89..435f4e9aa775b7 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -17,7 +17,7 @@ import { DateUtils } from 'typeorm/util/DateUtils';
 import config from '@/config';
 import * as Db from '@/Db';
 import * as ResponseHelper from '@/ResponseHelper';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import type {
 	IExecutionFlattedDb,
 	IExecutionsStopData,
@@ -25,9 +25,11 @@ import type {
 } from '@/Interfaces';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
+import { Container, Service } from 'typedi';
 
-export class WaitTrackerClass {
-	activeExecutionsInstance: ActiveExecutions.ActiveExecutions;
+@Service()
+export class WaitTracker {
+	activeExecutionsInstance: ActiveExecutions;
 
 	private waitingExecutions: {
 		[key: string]: {
@@ -39,7 +41,7 @@ export class WaitTrackerClass {
 	mainTimer: NodeJS.Timeout;
 
 	constructor() {
-		this.activeExecutionsInstance = ActiveExecutions.getInstance();
+		this.activeExecutionsInstance = Container.get(ActiveExecutions);
 
 		// Poll every 60 seconds a list of upcoming executions
 		this.mainTimer = setInterval(() => {
@@ -189,13 +191,3 @@ export class WaitTrackerClass {
 		});
 	}
 }
-
-let waitTrackerInstance: WaitTrackerClass | undefined;
-
-export function WaitTracker(): WaitTrackerClass {
-	if (waitTrackerInstance === undefined) {
-		waitTrackerInstance = new WaitTrackerClass();
-	}
-
-	return waitTrackerInstance;
-}
diff --git a/packages/cli/src/WaitingWebhooks.ts b/packages/cli/src/WaitingWebhooks.ts
index 29c7856b2ce48e..262ff289631c7d 100644
--- a/packages/cli/src/WaitingWebhooks.ts
+++ b/packages/cli/src/WaitingWebhooks.ts
@@ -13,6 +13,7 @@ import { NodeTypes } from '@/NodeTypes';
 import type { IExecutionResponse, IResponseCallbackData, IWorkflowDb } from '@/Interfaces';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
 import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
+import { Container } from 'typedi';
 
 export class WaitingWebhooks {
 	async executeWebhook(
@@ -78,7 +79,7 @@ export class WaitingWebhooks {
 
 		const { workflowData } = fullExecutionData;
 
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 		const workflow = new Workflow({
 			id: workflowData.id!.toString(),
 			name: workflowData.name,
diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index b4d7af5246c6f3..aa73abd3a388b3 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -52,10 +52,11 @@ import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import type { User } from '@db/entities/User';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
+import { Container } from 'typedi';
 
 export const WEBHOOK_METHODS = ['DELETE', 'GET', 'HEAD', 'PATCH', 'POST', 'PUT'];
 
@@ -460,7 +461,7 @@ export async function executeWebhook(
 		);
 
 		// Get a promise which resolves when the workflow did execute and send then response
-		const executePromise = ActiveExecutions.getInstance().getPostExecutePromise(
+		const executePromise = Container.get(ActiveExecutions).getPostExecutePromise(
 			executionId,
 		) as Promise<IExecutionDb | undefined>;
 		executePromise
diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index 0743fe7421e1ea..f5291be49f9f0f 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -48,7 +48,7 @@ import { LessThanOrEqual } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 import config from '@/config';
 import * as Db from '@/Db';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import { CredentialsHelper } from '@/CredentialsHelper';
 import { ExternalHooks } from '@/ExternalHooks';
 import type {
@@ -60,9 +60,8 @@ import type {
 	IWorkflowExecutionDataProcess,
 	IWorkflowErrorData,
 } from '@/Interfaces';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { NodeTypes } from '@/NodeTypes';
-import { getPushInstance } from '@/push';
+import { Push } from '@/push';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
@@ -70,6 +69,8 @@ import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { findSubworkflowStart } from '@/utils';
 import { PermissionChecker } from './UserManagement/PermissionChecker';
 import { WorkflowsService } from './workflows/workflows.services';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
 
@@ -280,7 +281,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = getPushInstance();
+				const pushInstance = Container.get(Push);
 				pushInstance.send('nodeExecuteBefore', { executionId, nodeName }, sessionId);
 			},
 		],
@@ -298,7 +299,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					workflowId: this.workflowData.id,
 				});
 
-				const pushInstance = getPushInstance();
+				const pushInstance = Container.get(Push);
 				pushInstance.send('nodeExecuteAfter', { executionId, nodeName, data }, sessionId);
 			},
 		],
@@ -315,7 +316,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 				if (sessionId === undefined) {
 					return;
 				}
-				const pushInstance = getPushInstance();
+				const pushInstance = Container.get(Push);
 				pushInstance.send(
 					'executionStarted',
 					{
@@ -381,7 +382,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 					retryOf,
 				};
 
-				const pushInstance = getPushInstance();
+				const pushInstance = Container.get(Push);
 				pushInstance.send('executionFinished', sendData, sessionId);
 			},
 		],
@@ -389,7 +390,7 @@ function hookFunctionsPush(): IWorkflowExecuteHooks {
 }
 
 export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowExecuteHooks {
-	const externalHooks = ExternalHooks();
+	const externalHooks = Container.get(ExternalHooks);
 
 	return {
 		workflowExecuteBefore: [
@@ -923,10 +924,10 @@ async function executeWorkflow(
 		parentWorkflowSettings?: IWorkflowSettings;
 	},
 ): Promise<Array<INodeExecutionData[] | null> | IWorkflowExecuteProcess> {
-	const externalHooks = ExternalHooks();
+	const externalHooks = Container.get(ExternalHooks);
 	await externalHooks.init();
 
-	const nodeTypes = NodeTypes();
+	const nodeTypes = Container.get(NodeTypes);
 
 	const workflowData =
 		options.loadedWorkflowData ??
@@ -956,10 +957,10 @@ async function executeWorkflow(
 		executionId =
 			options.parentExecutionId !== undefined
 				? options.parentExecutionId
-				: await ActiveExecutions.getInstance().add(runData);
+				: await Container.get(ActiveExecutions).add(runData);
 	}
 
-	void InternalHooksManager.getInstance().onWorkflowBeforeExecute(executionId || '', runData);
+	void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId || '', runData);
 
 	let data;
 	try {
@@ -1062,7 +1063,7 @@ async function executeWorkflow(
 
 	await externalHooks.run('workflow.postExecute', [data, workflowData, executionId]);
 
-	void InternalHooksManager.getInstance().onWorkflowPostExecute(
+	void Container.get(InternalHooks).onWorkflowPostExecute(
 		executionId,
 		workflowData,
 		data,
@@ -1072,11 +1073,11 @@ async function executeWorkflow(
 	if (data.finished === true) {
 		// Workflow did finish successfully
 
-		ActiveExecutions.getInstance().remove(executionId, data);
+		Container.get(ActiveExecutions).remove(executionId, data);
 		const returnData = WorkflowHelpers.getDataLastExecutedNodeData(data);
 		return returnData!.data!.main;
 	}
-	ActiveExecutions.getInstance().remove(executionId, data);
+	Container.get(ActiveExecutions).remove(executionId, data);
 	// Workflow did fail
 	const { error } = data.data.resultData;
 	// eslint-disable-next-line @typescript-eslint/no-throw-literal
@@ -1092,7 +1093,7 @@ export function setExecutionStatus(status: ExecutionStatus) {
 		return;
 	}
 	Logger.debug(`Setting execution status for ${this.executionId} to "${status}"`);
-	ActiveExecutions.getInstance()
+	Container.get(ActiveExecutions)
 		.setStatus(this.executionId, status)
 		.catch((error) => {
 			Logger.debug(`Setting execution status "${status}" failed: ${error.message}`);
@@ -1108,7 +1109,7 @@ export function sendMessageToUI(source: string, messages: any[]) {
 
 	// Push data to session which started workflow
 	try {
-		const pushInstance = getPushInstance();
+		const pushInstance = Container.get(Push);
 		pushInstance.send(
 			'sendConsoleMessage',
 			{
@@ -1229,7 +1230,7 @@ export function getWorkflowHooksWorkerMain(
 		this: WorkflowHooks,
 		nodeName: string,
 	): Promise<void> {
-		void InternalHooksManager.getInstance().onNodeBeforeExecute(
+		void Container.get(InternalHooks).onNodeBeforeExecute(
 			this.executionId,
 			this.workflowData,
 			nodeName,
@@ -1239,7 +1240,7 @@ export function getWorkflowHooksWorkerMain(
 		this: WorkflowHooks,
 		nodeName: string,
 	): Promise<void> {
-		void InternalHooksManager.getInstance().onNodePostExecute(
+		void Container.get(InternalHooks).onNodePostExecute(
 			this.executionId,
 			this.workflowData,
 			nodeName,
@@ -1281,7 +1282,7 @@ export function getWorkflowHooksMain(
 		this: WorkflowHooks,
 		nodeName: string,
 	): Promise<void> {
-		void InternalHooksManager.getInstance().onNodeBeforeExecute(
+		void Container.get(InternalHooks).onNodeBeforeExecute(
 			this.executionId,
 			this.workflowData,
 			nodeName,
@@ -1292,7 +1293,7 @@ export function getWorkflowHooksMain(
 		this: WorkflowHooks,
 		nodeName: string,
 	): Promise<void> {
-		void InternalHooksManager.getInstance().onNodePostExecute(
+		void Container.get(InternalHooks).onNodePostExecute(
 			this.executionId,
 			this.workflowData,
 			nodeName,
diff --git a/packages/cli/src/WorkflowHelpers.ts b/packages/cli/src/WorkflowHelpers.ts
index 958030b51aa38c..b2d01cd0ead1e1 100644
--- a/packages/cli/src/WorkflowHelpers.ts
+++ b/packages/cli/src/WorkflowHelpers.ts
@@ -32,6 +32,7 @@ import type { User } from '@db/entities/User';
 import { whereClause } from '@/UserManagement/UserManagementHelper';
 import omit from 'lodash.omit';
 import { PermissionChecker } from './UserManagement/PermissionChecker';
+import { Container } from 'typedi';
 
 const ERROR_TRIGGER_TYPE = config.getEnv('nodes.errorTriggerType');
 
@@ -108,7 +109,7 @@ export async function executeErrorWorkflow(
 		}
 
 		const executionMode = 'error';
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 
 		const workflowInstance = new Workflow({
 			id: workflowId,
diff --git a/packages/cli/src/WorkflowRunner.ts b/packages/cli/src/WorkflowRunner.ts
index 8d61c13723a03c..53b2a566a4173e 100644
--- a/packages/cli/src/WorkflowRunner.ts
+++ b/packages/cli/src/WorkflowRunner.ts
@@ -33,7 +33,7 @@ import PCancelable from 'p-cancelable';
 import { join as pathJoin } from 'path';
 import { fork } from 'child_process';
 
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import config from '@/config';
 import * as Db from '@/Db';
 import { ExternalHooks } from '@/ExternalHooks';
@@ -49,25 +49,25 @@ import * as ResponseHelper from '@/ResponseHelper';
 import * as WebhookHelpers from '@/WebhookHelpers';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { initErrorHandling } from '@/ErrorReporting';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
-import type { Push } from '@/push';
-import { getPushInstance } from '@/push';
+import { Push } from '@/push';
 import { eventBus } from './eventbus';
 import { recoverExecutionDataFromEventLogMessages } from './eventbus/MessageEventBus/recoverEvents';
+import { Container } from 'typedi';
+import { InternalHooks } from './InternalHooks';
 
 export class WorkflowRunner {
-	activeExecutions: ActiveExecutions.ActiveExecutions;
+	activeExecutions: ActiveExecutions;
 
 	push: Push;
 
 	jobQueue: Queue.JobQueue;
 
 	constructor() {
-		this.push = getPushInstance();
-		this.activeExecutions = ActiveExecutions.getInstance();
+		this.push = Container.get(Push);
+		this.activeExecutions = Container.get(ActiveExecutions);
 	}
 
 	/**
@@ -130,7 +130,7 @@ export class WorkflowRunner {
 
 			const executionFlattedData = await Db.collections.Execution.findOneBy({ id: executionId });
 
-			void InternalHooksManager.getInstance().onWorkflowCrashed(
+			void Container.get(InternalHooks).onWorkflowCrashed(
 				executionId,
 				executionMode,
 				executionFlattedData?.workflowData,
@@ -187,14 +187,14 @@ export class WorkflowRunner {
 			executionId = await this.runSubprocess(data, loadStaticData, executionId, responsePromise);
 		}
 
-		void InternalHooksManager.getInstance().onWorkflowBeforeExecute(executionId, data);
+		void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId, data);
 
 		const postExecutePromise = this.activeExecutions.getPostExecutePromise(executionId);
 
-		const externalHooks = ExternalHooks();
+		const externalHooks = Container.get(ExternalHooks);
 		postExecutePromise
 			.then(async (executionData) => {
-				void InternalHooksManager.getInstance().onWorkflowPostExecute(
+				void Container.get(InternalHooks).onWorkflowPostExecute(
 					executionId!,
 					data.workflowData,
 					executionData,
@@ -241,7 +241,7 @@ export class WorkflowRunner {
 			data.workflowData.staticData = await WorkflowHelpers.getStaticDataById(workflowId);
 		}
 
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 
 		// Soft timeout to stop workflow execution after current running node
 		// Changes were made by adding the `workflowTimeout` to the `additionalData`
diff --git a/packages/cli/src/WorkflowRunnerProcess.ts b/packages/cli/src/WorkflowRunnerProcess.ts
index fe9a5eb64ac857..60c9bc1cf02948 100644
--- a/packages/cli/src/WorkflowRunnerProcess.ts
+++ b/packages/cli/src/WorkflowRunnerProcess.ts
@@ -7,6 +7,8 @@
 /* eslint-disable @typescript-eslint/no-use-before-define */
 /* eslint-disable @typescript-eslint/unbound-method */
 import 'source-map-support/register';
+import 'reflect-metadata';
+import { Container } from 'typedi';
 import type { IProcessMessage } from 'n8n-core';
 import { BinaryDataManager, UserSettings, WorkflowExecute } from 'n8n-core';
 
@@ -49,11 +51,11 @@ import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData'
 import { getLogger } from '@/Logger';
 
 import config from '@/config';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { generateFailedExecutionFromError } from '@/WorkflowHelpers';
 import { initErrorHandling } from '@/ErrorReporting';
 import { PermissionChecker } from '@/UserManagement/PermissionChecker';
 import { getLicense } from './License';
+import { InternalHooks } from './InternalHooks';
 import { PostHogClient } from './posthog';
 
 class WorkflowRunnerProcess {
@@ -104,23 +106,20 @@ class WorkflowRunnerProcess {
 
 		const userSettings = await UserSettings.prepareUserSettings();
 
-		const loadNodesAndCredentials = LoadNodesAndCredentials();
+		const loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
 		await loadNodesAndCredentials.init();
 
-		const nodeTypes = NodeTypes(loadNodesAndCredentials);
-		const credentialTypes = CredentialTypes(loadNodesAndCredentials);
+		const nodeTypes = Container.get(NodeTypes);
+		const credentialTypes = Container.get(CredentialTypes);
 		CredentialsOverwrites(credentialTypes);
 
 		// Load all external hooks
-		const externalHooks = ExternalHooks();
+		const externalHooks = Container.get(ExternalHooks);
 		await externalHooks.init();
 
 		const instanceId = userSettings.instanceId ?? '';
-
-		const postHog = new PostHogClient();
-		await postHog.init(instanceId);
-
-		await InternalHooksManager.init(instanceId, nodeTypes, postHog);
+		await Container.get(PostHogClient).init(instanceId);
+		await Container.get(InternalHooks).init(instanceId);
 
 		const binaryDataConfig = config.getEnv('binaryDataManager');
 		await BinaryDataManager.init(binaryDataConfig);
@@ -234,7 +233,7 @@ class WorkflowRunnerProcess {
 				};
 			});
 
-			void InternalHooksManager.getInstance().onWorkflowBeforeExecute(executionId || '', runData);
+			void Container.get(InternalHooks).onWorkflowBeforeExecute(executionId || '', runData);
 
 			let result: IRun;
 			try {
@@ -255,7 +254,7 @@ class WorkflowRunnerProcess {
 				const { workflow } = executeWorkflowFunctionOutput;
 				result = await workflowExecute.processRunExecutionData(workflow);
 				await externalHooks.run('workflow.postExecute', [result, workflowData, executionId]);
-				void InternalHooksManager.getInstance().onWorkflowPostExecute(
+				void Container.get(InternalHooks).onWorkflowPostExecute(
 					executionId,
 					workflowData,
 					result,
@@ -513,6 +512,8 @@ process.on('message', async (message: IProcessMessage) => {
 			workflowRunner.executionIdCallback(message.data.executionId);
 		}
 	} catch (error) {
+		workflowRunner.logger.error(error.message);
+
 		// Catch all uncaught errors and forward them to parent process
 		const executionError = {
 			...error,
diff --git a/packages/cli/src/api/nodeTypes.api.ts b/packages/cli/src/api/nodeTypes.api.ts
index 6c55d195661bee..de37b549f5b78b 100644
--- a/packages/cli/src/api/nodeTypes.api.ts
+++ b/packages/cli/src/api/nodeTypes.api.ts
@@ -8,6 +8,7 @@ import config from '@/config';
 import { NodeTypes } from '@/NodeTypes';
 import * as ResponseHelper from '@/ResponseHelper';
 import { getNodeTranslationPath } from '@/TranslationHelpers';
+import { Container } from 'typedi';
 
 export const nodeTypesController = express.Router();
 
@@ -21,7 +22,7 @@ nodeTypesController.post(
 
 		if (defaultLocale === 'en') {
 			return nodeInfos.reduce<INodeTypeDescription[]>((acc, { name, version }) => {
-				const { description } = NodeTypes().getByNameAndVersion(name, version);
+				const { description } = Container.get(NodeTypes).getByNameAndVersion(name, version);
 				acc.push(description);
 				return acc;
 			}, []);
@@ -32,7 +33,7 @@ nodeTypesController.post(
 			version: number,
 			nodeTypes: INodeTypeDescription[],
 		) {
-			const { description, sourcePath } = NodeTypes().getWithSourcePath(name, version);
+			const { description, sourcePath } = Container.get(NodeTypes).getWithSourcePath(name, version);
 			const translationPath = await getNodeTranslationPath({
 				nodeSourcePath: sourcePath,
 				longNodeType: description.name,
diff --git a/packages/cli/src/api/nodes.api.ts b/packages/cli/src/api/nodes.api.ts
index 05e5ede065ba6d..2b2ade1784fc12 100644
--- a/packages/cli/src/api/nodes.api.ts
+++ b/packages/cli/src/api/nodes.api.ts
@@ -2,7 +2,6 @@ import express from 'express';
 import type { PublicInstalledPackage } from 'n8n-workflow';
 
 import config from '@/config';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import * as ResponseHelper from '@/ResponseHelper';
 
@@ -33,7 +32,9 @@ import { isAuthenticatedRequest } from '@/UserManagement/UserManagementHelper';
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { CommunityPackages } from '@/Interfaces';
 import type { NodeRequest } from '@/requests';
-import { getPushInstance } from '@/push';
+import { Push } from '@/push';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 const { PACKAGE_NOT_INSTALLED, PACKAGE_NAME_NOT_PROVIDED } = RESPONSE_ERROR_MESSAGES;
 
@@ -116,14 +117,14 @@ nodesController.post(
 		let installedPackage: InstalledPackages;
 
 		try {
-			installedPackage = await LoadNodesAndCredentials().loadNpmModule(
+			installedPackage = await Container.get(LoadNodesAndCredentials).loadNpmModule(
 				parsed.packageName,
 				parsed.version,
 			);
 		} catch (error) {
 			const errorMessage = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
 
-			void InternalHooksManager.getInstance().onCommunityPackageInstallFinished({
+			void Container.get(InternalHooks).onCommunityPackageInstallFinished({
 				user: req.user,
 				input_string: name,
 				package_name: parsed.packageName,
@@ -141,7 +142,7 @@ nodesController.post(
 
 		if (!hasLoaded) removePackageFromMissingList(name);
 
-		const pushInstance = getPushInstance();
+		const pushInstance = Container.get(Push);
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
@@ -151,7 +152,7 @@ nodesController.post(
 			});
 		});
 
-		void InternalHooksManager.getInstance().onCommunityPackageInstallFinished({
+		void Container.get(InternalHooks).onCommunityPackageInstallFinished({
 			user: req.user,
 			input_string: name,
 			package_name: parsed.packageName,
@@ -238,7 +239,7 @@ nodesController.delete(
 		}
 
 		try {
-			await LoadNodesAndCredentials().removeNpmModule(name, installedPackage);
+			await Container.get(LoadNodesAndCredentials).removeNpmModule(name, installedPackage);
 		} catch (error) {
 			const message = [
 				`Error removing package "${name}"`,
@@ -248,7 +249,7 @@ nodesController.delete(
 			throw new ResponseHelper.InternalServerError(message);
 		}
 
-		const pushInstance = getPushInstance();
+		const pushInstance = Container.get(Push);
 
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
@@ -258,7 +259,7 @@ nodesController.delete(
 			});
 		});
 
-		void InternalHooksManager.getInstance().onCommunityPackageDeleteFinished({
+		void Container.get(InternalHooks).onCommunityPackageDeleteFinished({
 			user: req.user,
 			package_name: name,
 			package_version: installedPackage.installedVersion,
@@ -290,12 +291,12 @@ nodesController.patch(
 		}
 
 		try {
-			const newInstalledPackage = await LoadNodesAndCredentials().updateNpmModule(
+			const newInstalledPackage = await Container.get(LoadNodesAndCredentials).updateNpmModule(
 				parseNpmPackageName(name).packageName,
 				previouslyInstalledPackage,
 			);
 
-			const pushInstance = getPushInstance();
+			const pushInstance = Container.get(Push);
 
 			// broadcast to connected frontends that node list has been updated
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
@@ -312,7 +313,7 @@ nodesController.patch(
 				});
 			});
 
-			void InternalHooksManager.getInstance().onCommunityPackageUpdateFinished({
+			void Container.get(InternalHooks).onCommunityPackageUpdateFinished({
 				user: req.user,
 				package_name: name,
 				package_version_current: previouslyInstalledPackage.installedVersion,
@@ -325,7 +326,7 @@ nodesController.patch(
 			return newInstalledPackage;
 		} catch (error) {
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				const pushInstance = getPushInstance();
+				const pushInstance = Container.get(Push);
 				pushInstance.send('removeNodeType', {
 					name: node.type,
 					version: node.latestVersion,
diff --git a/packages/cli/src/api/tags.api.ts b/packages/cli/src/api/tags.api.ts
index c888673e68c039..6c13c44b5136a6 100644
--- a/packages/cli/src/api/tags.api.ts
+++ b/packages/cli/src/api/tags.api.ts
@@ -9,15 +9,14 @@ import express from 'express';
 
 import * as Db from '@/Db';
 import { ExternalHooks } from '@/ExternalHooks';
-import type { IExternalHooksClass, ITagWithCountDb } from '@/Interfaces';
+import type { ITagWithCountDb } from '@/Interfaces';
 import * as ResponseHelper from '@/ResponseHelper';
 import config from '@/config';
 import * as TagHelpers from '@/TagHelpers';
 import { validateEntity } from '@/GenericHelpers';
 import { TagEntity } from '@db/entities/TagEntity';
 import type { TagsRequest } from '@/requests';
-
-export const externalHooks: IExternalHooksClass = ExternalHooks();
+import { Container } from 'typedi';
 
 export const tagsController = express.Router();
 
@@ -50,12 +49,12 @@ tagsController.post(
 		const newTag = new TagEntity();
 		newTag.name = req.body.name.trim();
 
-		await externalHooks.run('tag.beforeCreate', [newTag]);
+		await Container.get(ExternalHooks).run('tag.beforeCreate', [newTag]);
 
 		await validateEntity(newTag);
 		const tag = await Db.collections.Tag.save(newTag);
 
-		await externalHooks.run('tag.afterCreate', [tag]);
+		await Container.get(ExternalHooks).run('tag.afterCreate', [tag]);
 
 		return tag;
 	}),
@@ -74,12 +73,12 @@ tagsController.patch(
 		newTag.id = id;
 		newTag.name = name.trim();
 
-		await externalHooks.run('tag.beforeUpdate', [newTag]);
+		await Container.get(ExternalHooks).run('tag.beforeUpdate', [newTag]);
 
 		await validateEntity(newTag);
 		const tag = await Db.collections.Tag.save(newTag);
 
-		await externalHooks.run('tag.afterUpdate', [tag]);
+		await Container.get(ExternalHooks).run('tag.afterUpdate', [tag]);
 
 		return tag;
 	}),
@@ -100,11 +99,11 @@ tagsController.delete(
 		}
 		const id = req.params.id;
 
-		await externalHooks.run('tag.beforeDelete', [id]);
+		await Container.get(ExternalHooks).run('tag.beforeDelete', [id]);
 
 		await Db.collections.Tag.delete({ id });
 
-		await externalHooks.run('tag.afterDelete', [id]);
+		await Container.get(ExternalHooks).run('tag.afterDelete', [id]);
 
 		return true;
 	}),
diff --git a/packages/cli/src/audit/risks/nodes.risk.ts b/packages/cli/src/audit/risks/nodes.risk.ts
index 032fd13663a2c5..042f34aa8b29e7 100644
--- a/packages/cli/src/audit/risks/nodes.risk.ts
+++ b/packages/cli/src/audit/risks/nodes.risk.ts
@@ -12,6 +12,7 @@ import {
 } from '@/audit/constants';
 import type { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import type { Risk } from '@/audit/types';
+import { Container } from 'typedi';
 
 async function getCommunityNodeDetails() {
 	const installedPackages = await getAllInstalledPackages();
@@ -32,7 +33,8 @@ async function getCommunityNodeDetails() {
 async function getCustomNodeDetails() {
 	const customNodeTypes: Risk.CustomNodeDetails[] = [];
 
-	for (const customDir of LoadNodesAndCredentials().getCustomDirectories()) {
+	const nodesAndCredentials = Container.get(LoadNodesAndCredentials);
+	for (const customDir of nodesAndCredentials.getCustomDirectories()) {
 		const customNodeFiles = await glob('**/*.node.js', { cwd: customDir, absolute: true });
 
 		for (const nodeFile of customNodeFiles) {
diff --git a/packages/cli/src/auth/methods/email.ts b/packages/cli/src/auth/methods/email.ts
index b3d6bf3363c085..c55d8a29642373 100644
--- a/packages/cli/src/auth/methods/email.ts
+++ b/packages/cli/src/auth/methods/email.ts
@@ -1,8 +1,9 @@
 import * as Db from '@/Db';
 import type { User } from '@db/entities/User';
 import { compareHash } from '@/UserManagement/UserManagementHelper';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import * as ResponseHelper from '@/ResponseHelper';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export const handleEmailLogin = async (
 	email: string,
@@ -21,7 +22,7 @@ export const handleEmailLogin = async (
 	// so suggest to reset the password to gain access to the instance.
 	const ldapIdentity = user?.authIdentities?.find((i) => i.providerType === 'ldap');
 	if (user && ldapIdentity) {
-		void InternalHooksManager.getInstance().userLoginFailedDueToLdapDisabled({
+		void Container.get(InternalHooks).userLoginFailedDueToLdapDisabled({
 			user_id: user.id,
 		});
 
diff --git a/packages/cli/src/auth/methods/ldap.ts b/packages/cli/src/auth/methods/ldap.ts
index fe4e71c458cb37..826c33bbb417a4 100644
--- a/packages/cli/src/auth/methods/ldap.ts
+++ b/packages/cli/src/auth/methods/ldap.ts
@@ -1,4 +1,4 @@
-import { InternalHooksManager } from '@/InternalHooksManager';
+import { InternalHooks } from '@/InternalHooks';
 import {
 	createLdapUserOnLocalDb,
 	findAndAuthenticateLdapUser,
@@ -12,6 +12,7 @@ import {
 	updateLdapUserOnLocalDb,
 } from '@/Ldap/helpers';
 import type { User } from '@db/entities/User';
+import { Container } from 'typedi';
 
 export const handleLdapLogin = async (
 	loginId: string,
@@ -51,7 +52,7 @@ export const handleLdapLogin = async (
 		} else {
 			const role = await getLdapUserRole();
 			const user = await createLdapUserOnLocalDb(role, ldapAttributesValues, ldapId);
-			void InternalHooksManager.getInstance().onUserSignup(user, {
+			void Container.get(InternalHooks).onUserSignup(user, {
 				user_type: 'ldap',
 				was_disabled_ldap_user: false,
 			});
diff --git a/packages/cli/src/commands/BaseCommand.ts b/packages/cli/src/commands/BaseCommand.ts
index 13037cbf6c5571..96e19f1d163363 100644
--- a/packages/cli/src/commands/BaseCommand.ts
+++ b/packages/cli/src/commands/BaseCommand.ts
@@ -1,5 +1,6 @@
 import { Command } from '@oclif/command';
 import { ExitError } from '@oclif/errors';
+import { Container } from 'typedi';
 import type { INodeTypes } from 'n8n-workflow';
 import { LoggerProxy, ErrorReporterProxy as ErrorReporter, sleep } from 'n8n-workflow';
 import type { IUserSettings } from 'n8n-core';
@@ -11,13 +12,12 @@ import * as CrashJournal from '@/CrashJournal';
 import { inTest } from '@/constants';
 import { CredentialTypes } from '@/CredentialTypes';
 import { CredentialsOverwrites } from '@/CredentialsOverwrites';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { initErrorHandling } from '@/ErrorReporting';
 import { ExternalHooks } from '@/ExternalHooks';
 import { NodeTypes } from '@/NodeTypes';
-import type { LoadNodesAndCredentialsClass } from '@/LoadNodesAndCredentials';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import type { IExternalHooksClass } from '@/Interfaces';
+import { InternalHooks } from '@/InternalHooks';
 import { PostHogClient } from '@/posthog';
 
 export const UM_FIX_INSTRUCTION =
@@ -28,7 +28,7 @@ export abstract class BaseCommand extends Command {
 
 	protected externalHooks: IExternalHooksClass;
 
-	protected loadNodesAndCredentials: LoadNodesAndCredentialsClass;
+	protected loadNodesAndCredentials: LoadNodesAndCredentials;
 
 	protected nodeTypes: INodeTypes;
 
@@ -43,17 +43,15 @@ export abstract class BaseCommand extends Command {
 		// Make sure the settings exist
 		this.userSettings = await UserSettings.prepareUserSettings();
 
-		this.loadNodesAndCredentials = LoadNodesAndCredentials();
+		this.loadNodesAndCredentials = Container.get(LoadNodesAndCredentials);
 		await this.loadNodesAndCredentials.init();
-		this.nodeTypes = NodeTypes(this.loadNodesAndCredentials);
-		const credentialTypes = CredentialTypes(this.loadNodesAndCredentials);
+		this.nodeTypes = Container.get(NodeTypes);
+		const credentialTypes = Container.get(CredentialTypes);
 		CredentialsOverwrites(credentialTypes);
 
 		const instanceId = this.userSettings.instanceId ?? '';
-		const postHog = new PostHogClient();
-		await postHog.init(instanceId);
-
-		await InternalHooksManager.init(instanceId, this.nodeTypes, postHog);
+		await Container.get(PostHogClient).init(instanceId);
+		await Container.get(InternalHooks).init(instanceId);
 
 		await Db.init().catch(async (error: Error) =>
 			this.exitWithCrash('There was an error initializing DB', error),
@@ -88,7 +86,7 @@ export abstract class BaseCommand extends Command {
 	}
 
 	protected async initExternalHooks() {
-		this.externalHooks = ExternalHooks();
+		this.externalHooks = Container.get(ExternalHooks);
 		await this.externalHooks.init();
 	}
 
diff --git a/packages/cli/src/commands/audit.ts b/packages/cli/src/commands/audit.ts
index ceac790ea58658..0c1555ccdf86ce 100644
--- a/packages/cli/src/commands/audit.ts
+++ b/packages/cli/src/commands/audit.ts
@@ -1,10 +1,11 @@
 import { flags } from '@oclif/command';
 import { audit } from '@/audit';
 import { RISK_CATEGORIES } from '@/audit/constants';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import config from '@/config';
 import type { Risk } from '@/audit/types';
 import { BaseCommand } from './BaseCommand';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export class SecurityAudit extends BaseCommand {
 	static description = 'Generate a security audit report for this n8n instance';
@@ -56,7 +57,7 @@ export class SecurityAudit extends BaseCommand {
 			process.stdout.write(JSON.stringify(result, null, 2));
 		}
 
-		void InternalHooksManager.getInstance().onAuditGeneratedViaCli();
+		void Container.get(InternalHooks).onAuditGeneratedViaCli();
 	}
 
 	async catch(error: Error) {
diff --git a/packages/cli/src/commands/execute.ts b/packages/cli/src/commands/execute.ts
index 6a3d655e032615..63bbb863ed4019 100644
--- a/packages/cli/src/commands/execute.ts
+++ b/packages/cli/src/commands/execute.ts
@@ -4,7 +4,7 @@ import { PLACEHOLDER_EMPTY_WORKFLOW_ID } from 'n8n-core';
 import type { IWorkflowBase } from 'n8n-workflow';
 import { ExecutionBaseError } from 'n8n-workflow';
 
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import * as Db from '@/Db';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import { WorkflowRunner } from '@/WorkflowRunner';
@@ -13,6 +13,7 @@ import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
 import { findCliWorkflowStart } from '@/utils';
 import { initEvents } from '@/events';
 import { BaseCommand } from './BaseCommand';
+import { Container } from 'typedi';
 
 export class Execute extends BaseCommand {
 	static description = '\nExecutes a given workflow';
@@ -117,7 +118,7 @@ export class Execute extends BaseCommand {
 		const workflowRunner = new WorkflowRunner();
 		const executionId = await workflowRunner.run(runData);
 
-		const activeExecutions = ActiveExecutions.getInstance();
+		const activeExecutions = Container.get(ActiveExecutions);
 		const data = await activeExecutions.getPostExecutePromise(executionId);
 
 		if (data === undefined) {
diff --git a/packages/cli/src/commands/executeBatch.ts b/packages/cli/src/commands/executeBatch.ts
index 897f5211ae2bda..8a441592ad7401 100644
--- a/packages/cli/src/commands/executeBatch.ts
+++ b/packages/cli/src/commands/executeBatch.ts
@@ -7,7 +7,7 @@ import { sep } from 'path';
 import { diff } from 'json-diff';
 import pick from 'lodash.pick';
 
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import * as Db from '@/Db';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
@@ -16,6 +16,7 @@ import { getInstanceOwner } from '@/UserManagement/UserManagementHelper';
 import { findCliWorkflowStart } from '@/utils';
 import { initEvents } from '@/events';
 import { BaseCommand } from './BaseCommand';
+import { Container } from 'typedi';
 
 const re = /\d+/;
 
@@ -101,7 +102,7 @@ export class ExecuteBatch extends BaseCommand {
 		}
 
 		ExecuteBatch.cancelled = true;
-		const activeExecutionsInstance = ActiveExecutions.getInstance();
+		const activeExecutionsInstance = Container.get(ActiveExecutions);
 		const stopPromises = activeExecutionsInstance
 			.getActiveExecutions()
 			.map(async (execution) => activeExecutionsInstance.stopExecution(execution.id));
@@ -597,7 +598,7 @@ export class ExecuteBatch extends BaseCommand {
 				const workflowRunner = new WorkflowRunner();
 				const executionId = await workflowRunner.run(runData);
 
-				const activeExecutions = ActiveExecutions.getInstance();
+				const activeExecutions = Container.get(ActiveExecutions);
 				const data = await activeExecutions.getPostExecutePromise(executionId);
 				if (gotCancel || ExecuteBatch.cancelled) {
 					clearTimeout(timeoutTimer);
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index 0c0c37b53791cf..c65383816984fd 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/await-thenable */
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
+import { Container } from 'typedi';
 import path from 'path';
 import { mkdir } from 'fs/promises';
 import { createReadStream, createWriteStream, existsSync } from 'fs';
@@ -16,26 +17,23 @@ import { LoggerProxy, sleep, jsonParse } from 'n8n-workflow';
 import { createHash } from 'crypto';
 import config from '@/config';
 
-import * as ActiveExecutions from '@/ActiveExecutions';
-import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
+import { ActiveExecutions } from '@/ActiveExecutions';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as Db from '@/Db';
 import * as GenericHelpers from '@/GenericHelpers';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import * as Server from '@/Server';
-import * as TestWebhooks from '@/TestWebhooks';
-import { WaitTracker } from '@/WaitTracker';
+import { TestWebhooks } from '@/TestWebhooks';
 import { getAllInstalledPackages } from '@/CommunityNodes/packageModel';
 import { handleLdapInit } from '@/Ldap/helpers';
 import { EDITOR_UI_DIST_DIR, GENERATED_STATIC_DIR } from '@/constants';
 import { eventBus } from '@/eventbus';
 import { BaseCommand } from './BaseCommand';
+import { InternalHooks } from '@/InternalHooks';
 
 // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-var-requires
 const open = require('open');
 const pipeline = promisify(stream.pipeline);
 
-let activeWorkflowRunner: ActiveWorkflowRunner.ActiveWorkflowRunner | undefined;
-
 export class Start extends BaseCommand {
 	static description = 'Starts n8n. Makes Web-UI available and starts active workflows';
 
@@ -62,6 +60,8 @@ export class Start extends BaseCommand {
 		}),
 	};
 
+	protected activeWorkflowRunner = Container.get(ActiveWorkflowRunner);
+
 	/**
 	 * Opens the UI in browser
 	 */
@@ -86,7 +86,7 @@ export class Start extends BaseCommand {
 
 		try {
 			// Stop with trying to activate workflows that could not be activated
-			activeWorkflowRunner?.removeAllQueuedWorkflowActivations();
+			this.activeWorkflowRunner.removeAllQueuedWorkflowActivations();
 
 			await this.externalHooks.run('n8n.stop', []);
 
@@ -97,25 +97,25 @@ export class Start extends BaseCommand {
 				await this.exitSuccessFully();
 			}, 30000);
 
-			await InternalHooksManager.getInstance().onN8nStop();
+			await Container.get(InternalHooks).onN8nStop();
 
 			const skipWebhookDeregistration = config.getEnv(
 				'endpoints.skipWebhooksDeregistrationOnShutdown',
 			);
 
 			const removePromises = [];
-			if (activeWorkflowRunner !== undefined && !skipWebhookDeregistration) {
-				removePromises.push(activeWorkflowRunner.removeAll());
+			if (!skipWebhookDeregistration) {
+				removePromises.push(this.activeWorkflowRunner.removeAll());
 			}
 
 			// Remove all test webhooks
-			const testWebhooks = TestWebhooks.getInstance();
+			const testWebhooks = Container.get(TestWebhooks);
 			removePromises.push(testWebhooks.removeAll());
 
 			await Promise.all(removePromises);
 
 			// Wait for active workflow executions to finish
-			const activeExecutionsInstance = ActiveExecutions.getInstance();
+			const activeExecutionsInstance = Container.get(ActiveExecutions);
 			let executingWorkflows = activeExecutionsInstance.getActiveExecutions();
 
 			let count = 0;
@@ -329,10 +329,7 @@ export class Start extends BaseCommand {
 		await Server.start();
 
 		// Start to get active workflows and run their triggers
-		activeWorkflowRunner = ActiveWorkflowRunner.getInstance();
-		await activeWorkflowRunner.init();
-
-		WaitTracker();
+		await this.activeWorkflowRunner.init();
 
 		await handleLdapInit();
 
@@ -378,6 +375,7 @@ export class Start extends BaseCommand {
 	}
 
 	async catch(error: Error) {
+		console.log(error.stack);
 		await this.exitWithCrash('Exiting due to an error.', error);
 	}
 }
diff --git a/packages/cli/src/commands/webhook.ts b/packages/cli/src/commands/webhook.ts
index 2bacd79128e7ae..aada27f3cdc03a 100644
--- a/packages/cli/src/commands/webhook.ts
+++ b/packages/cli/src/commands/webhook.ts
@@ -1,9 +1,10 @@
 import { flags } from '@oclif/command';
 import { LoggerProxy, sleep } from 'n8n-workflow';
 import config from '@/config';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import { WebhookServer } from '@/WebhookServer';
 import { BaseCommand } from './BaseCommand';
+import { Container } from 'typedi';
 
 export class Webhook extends BaseCommand {
 	static description = 'Starts n8n webhook process. Intercepts only production URLs.';
@@ -32,7 +33,7 @@ export class Webhook extends BaseCommand {
 			}, 30000);
 
 			// Wait for active workflow executions to finish
-			const activeExecutionsInstance = ActiveExecutions.getInstance();
+			const activeExecutionsInstance = Container.get(ActiveExecutions);
 			let executingWorkflows = activeExecutionsInstance.getActiveExecutions();
 
 			let count = 0;
diff --git a/packages/cli/src/credentials/credentials.controller.ee.ts b/packages/cli/src/credentials/credentials.controller.ee.ts
index 8596f8ca5137d3..c780aec062c536 100644
--- a/packages/cli/src/credentials/credentials.controller.ee.ts
+++ b/packages/cli/src/credentials/credentials.controller.ee.ts
@@ -2,7 +2,6 @@ import express from 'express';
 import type { INodeCredentialTestResult } from 'n8n-workflow';
 import { deepCopy, LoggerProxy } from 'n8n-workflow';
 import * as Db from '@/Db';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import * as ResponseHelper from '@/ResponseHelper';
 import type { CredentialsEntity } from '@db/entities/CredentialsEntity';
 
@@ -10,6 +9,8 @@ import type { CredentialRequest } from '@/requests';
 import { isSharingEnabled, rightDiff } from '@/UserManagement/UserManagementHelper';
 import { EECredentialsService as EECredentials } from './credentials.service.ee';
 import type { CredentialWithSharings } from './credentials.types';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const EECredentialsController = express.Router();
@@ -174,7 +175,7 @@ EECredentialsController.put(
 			}
 		});
 
-		void InternalHooksManager.getInstance().onUserSharedCredentials({
+		void Container.get(InternalHooks).onUserSharedCredentials({
 			user: req.user,
 			credential_name: credential.name,
 			credential_type: credential.type,
diff --git a/packages/cli/src/credentials/credentials.controller.ts b/packages/cli/src/credentials/credentials.controller.ts
index db7774421d76de..6a4223ba2b9a85 100644
--- a/packages/cli/src/credentials/credentials.controller.ts
+++ b/packages/cli/src/credentials/credentials.controller.ts
@@ -5,7 +5,6 @@ import type { INodeCredentialTestResult } from 'n8n-workflow';
 import { deepCopy, LoggerProxy } from 'n8n-workflow';
 
 import * as GenericHelpers from '@/GenericHelpers';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import * as ResponseHelper from '@/ResponseHelper';
 import config from '@/config';
 import { getLogger } from '@/Logger';
@@ -14,6 +13,8 @@ import { CredentialsService } from './credentials.service';
 
 import type { ICredentialsDb } from '@/Interfaces';
 import type { CredentialRequest } from '@/requests';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export const credentialsController = express.Router();
 
@@ -130,7 +131,7 @@ credentialsController.post(
 		const encryptedData = CredentialsService.createEncryptedData(key, null, newCredential);
 		const credential = await CredentialsService.save(newCredential, encryptedData, req.user);
 
-		void InternalHooksManager.getInstance().onUserCreatedCredentials({
+		void Container.get(InternalHooks).onUserCreatedCredentials({
 			user: req.user,
 			credential_name: newCredential.name,
 			credential_type: credential.type,
diff --git a/packages/cli/src/credentials/credentials.service.ts b/packages/cli/src/credentials/credentials.service.ts
index ea6926a5ca36d3..8d5d99455af1fa 100644
--- a/packages/cli/src/credentials/credentials.service.ts
+++ b/packages/cli/src/credentials/credentials.service.ts
@@ -24,6 +24,7 @@ import { ExternalHooks } from '@/ExternalHooks';
 import type { User } from '@db/entities/User';
 import type { CredentialRequest } from '@/requests';
 import { CredentialTypes } from '@/CredentialTypes';
+import { Container } from 'typedi';
 
 export class CredentialsService {
 	static async get(
@@ -205,7 +206,7 @@ export class CredentialsService {
 		credentialId: string,
 		newCredentialData: ICredentialsDb,
 	): Promise<ICredentialsDb | null> {
-		await ExternalHooks().run('credentials.update', [newCredentialData]);
+		await Container.get(ExternalHooks).run('credentials.update', [newCredentialData]);
 
 		// Update the credentials in DB
 		await Db.collections.Credentials.update(credentialId, newCredentialData);
@@ -224,7 +225,7 @@ export class CredentialsService {
 		const newCredential = new CredentialsEntity();
 		Object.assign(newCredential, credential, encryptedData);
 
-		await ExternalHooks().run('credentials.create', [encryptedData]);
+		await Container.get(ExternalHooks).run('credentials.create', [encryptedData]);
 
 		const role = await Db.collections.Role.findOneByOrFail({
 			name: 'owner',
@@ -256,7 +257,7 @@ export class CredentialsService {
 	}
 
 	static async delete(credentials: CredentialsEntity): Promise<void> {
-		await ExternalHooks().run('credentials.delete', [credentials.id]);
+		await Container.get(ExternalHooks).run('credentials.delete', [credentials.id]);
 
 		await Db.collections.Credentials.remove(credentials);
 	}
@@ -279,7 +280,7 @@ export class CredentialsService {
 	): ICredentialDataDecryptedObject {
 		const copiedData = deepCopy(data);
 
-		const credTypes = CredentialTypes();
+		const credTypes = Container.get(CredentialTypes);
 		let credType: ICredentialType;
 		try {
 			credType = credTypes.getByName(credential.type);
diff --git a/packages/cli/src/credentials/oauth2Credential.api.ts b/packages/cli/src/credentials/oauth2Credential.api.ts
index 8c6b758d4fad9b..06a48b110b7369 100644
--- a/packages/cli/src/credentials/oauth2Credential.api.ts
+++ b/packages/cli/src/credentials/oauth2Credential.api.ts
@@ -30,6 +30,7 @@ import type { OAuthRequest } from '@/requests';
 import { ExternalHooks } from '@/ExternalHooks';
 import config from '@/config';
 import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
+import { Container } from 'typedi';
 
 export const oauth2CredentialController = express.Router();
 
@@ -129,7 +130,7 @@ oauth2CredentialController.get(
 			state: stateEncodedStr,
 		};
 
-		await ExternalHooks().run('oauth2.authenticate', [oAuthOptions]);
+		await Container.get(ExternalHooks).run('oauth2.authenticate', [oAuthOptions]);
 
 		const oAuthObj = new ClientOAuth2(oAuthOptions);
 
@@ -281,7 +282,7 @@ oauth2CredentialController.get(
 				delete oAuth2Parameters.clientSecret;
 			}
 
-			await ExternalHooks().run('oauth2.callback', [oAuth2Parameters]);
+			await Container.get(ExternalHooks).run('oauth2.callback', [oAuth2Parameters]);
 
 			const oAuthObj = new ClientOAuth2(oAuth2Parameters);
 
diff --git a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
index ed104c21229e1a..2a805d09171986 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -3,6 +3,7 @@ import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/mi
 import { NodeTypes } from '@/NodeTypes';
 import { IConnections, INode } from 'n8n-workflow';
 import { getLogger } from '@/Logger';
+import { Container } from 'typedi';
 
 export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
 	name = 'PurgeInvalidWorkflowConnections1675940580449';
@@ -21,7 +22,7 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 			FROM \`${tablePrefix}workflow_entity\`
 		`);
 
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 
 		workflows.forEach(async (workflow) => {
 			let connections: IConnections =
diff --git a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
index 7534742ce401b9..8a87ef8919e061 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -3,6 +3,7 @@ import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/mi
 import { NodeTypes } from '@/NodeTypes';
 import { IConnections, INode } from 'n8n-workflow';
 import { getLogger } from '@/Logger';
+import { Container } from 'typedi';
 export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
 	name = 'PurgeInvalidWorkflowConnections1675940580449';
 
@@ -17,7 +18,7 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 			FROM "${tablePrefix}workflow_entity"
 		`);
 
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 
 		workflows.forEach(async (workflow) => {
 			let connections: IConnections = workflow.connections;
diff --git a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
index 459c4782140c59..fe03f3ccaea6b3 100644
--- a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -3,6 +3,7 @@ import { getTablePrefix, logMigrationEnd, logMigrationStart } from '@db/utils/mi
 import { NodeTypes } from '@/NodeTypes';
 import { IConnections, INode } from 'n8n-workflow';
 import { getLogger } from '@/Logger';
+import { Container } from 'typedi';
 
 export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationInterface {
 	name = 'PurgeInvalidWorkflowConnections1675940580449';
@@ -18,7 +19,7 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 			FROM "${tablePrefix}workflow_entity"
 		`);
 
-		const nodeTypes = NodeTypes();
+		const nodeTypes = Container.get(NodeTypes);
 
 		workflows.forEach(async (workflow) => {
 			let connections: IConnections = JSON.parse(workflow.connections);
diff --git a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
index 3647c888ecf5dd..88399233f2dec0 100644
--- a/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
+++ b/packages/cli/src/eventbus/MessageEventBus/recoverEvents.ts
@@ -4,11 +4,12 @@ import { NodeOperationError, WorkflowOperationError } from 'n8n-workflow';
 import * as Db from '@/Db';
 import type { EventMessageTypes, EventNamesTypes } from '../EventMessageClasses';
 import type { DateTime } from 'luxon';
-import { InternalHooksManager } from '../../InternalHooksManager';
-import { getPushInstance } from '@/push';
+import { Push } from '@/push';
 import type { IPushDataExecutionRecovered } from '../../Interfaces';
 import { workflowExecutionCompleted } from '../../events/WorkflowStatistics';
 import { eventBus } from './MessageEventBus';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export async function recoverExecutionDataFromEventLogMessages(
 	executionId: string,
@@ -151,16 +152,19 @@ export async function recoverExecutionDataFromEventLogMessages(
 				status: 'crashed',
 				stoppedAt: lastNodeRunTimestamp?.toJSDate(),
 			});
-			const internalHooks = InternalHooksManager.getInstance();
-			await internalHooks.onWorkflowPostExecute(executionId, executionEntry.workflowData, {
-				data: executionData,
-				finished: false,
-				mode: executionEntry.mode,
-				waitTill: executionEntry.waitTill ?? undefined,
-				startedAt: executionEntry.startedAt,
-				stoppedAt: lastNodeRunTimestamp?.toJSDate(),
-				status: 'crashed',
-			});
+			await Container.get(InternalHooks).onWorkflowPostExecute(
+				executionId,
+				executionEntry.workflowData,
+				{
+					data: executionData,
+					finished: false,
+					mode: executionEntry.mode,
+					waitTill: executionEntry.waitTill ?? undefined,
+					startedAt: executionEntry.startedAt,
+					stoppedAt: lastNodeRunTimestamp?.toJSDate(),
+					status: 'crashed',
+				},
+			);
 			const iRunData: IRun = {
 				data: executionData,
 				finished: false,
@@ -178,7 +182,7 @@ export async function recoverExecutionDataFromEventLogMessages(
 			eventBus.once('editorUiConnected', function handleUiBackUp() {
 				// add a small timeout to make sure the UI is back up
 				setTimeout(() => {
-					getPushInstance().send('executionRecovered', {
+					Container.get(Push).send('executionRecovered', {
 						executionId,
 					} as IPushDataExecutionRecovered);
 				}, 1000);
diff --git a/packages/cli/src/events/WorkflowStatistics.ts b/packages/cli/src/events/WorkflowStatistics.ts
index a3b09bbef4723c..34b191b45ae6cd 100644
--- a/packages/cli/src/events/WorkflowStatistics.ts
+++ b/packages/cli/src/events/WorkflowStatistics.ts
@@ -1,9 +1,10 @@
 import type { INode, IRun, IWorkflowBase } from 'n8n-workflow';
 import * as Db from '@/Db';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { StatisticsNames } from '@db/entities/WorkflowStatistics';
 import { getWorkflowOwner } from '@/UserManagement/UserManagementHelper';
 import { QueryFailedError } from 'typeorm';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export async function workflowExecutionCompleted(
 	workflowData: IWorkflowBase,
@@ -46,7 +47,7 @@ export async function workflowExecutionCompleted(
 		};
 
 		// Send the metrics
-		await InternalHooksManager.getInstance().onFirstProductionWorkflowSuccess(metrics);
+		await Container.get(InternalHooks).onFirstProductionWorkflowSuccess(metrics);
 	} catch (error) {
 		if (!(error instanceof QueryFailedError)) {
 			throw error;
@@ -101,5 +102,5 @@ export async function nodeFetchedData(
 	}
 
 	// Send metrics to posthog
-	await InternalHooksManager.getInstance().onFirstWorkflowDataLoad(metrics);
+	await Container.get(InternalHooks).onFirstWorkflowDataLoad(metrics);
 }
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index 936d34ea7ddc75..9aa23a0797a061 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -15,7 +15,7 @@ import type {
 import { deepCopy, LoggerProxy, jsonParse, Workflow } from 'n8n-workflow';
 import type { FindOperator, FindOptionsWhere } from 'typeorm';
 import { In, IsNull, LessThanOrEqual, Not, Raw } from 'typeorm';
-import * as ActiveExecutions from '@/ActiveExecutions';
+import { ActiveExecutions } from '@/ActiveExecutions';
 import config from '@/config';
 import type { User } from '@db/entities/User';
 import type { ExecutionEntity } from '@db/entities/ExecutionEntity';
@@ -34,6 +34,7 @@ import { WorkflowRunner } from '@/WorkflowRunner';
 import * as Db from '@/Db';
 import * as GenericHelpers from '@/GenericHelpers';
 import { parse } from 'flatted';
+import { Container } from 'typedi';
 
 interface IGetExecutionsQueryFilter {
 	id?: FindOperator<string>;
@@ -202,7 +203,7 @@ export class ExecutionsService {
 
 		// We may have manual executions even with queue so we must account for these.
 		executingWorkflowIds.push(
-			...ActiveExecutions.getInstance()
+			...Container.get(ActiveExecutions)
 				.getActiveExecutions()
 				.map(({ id }) => id),
 		);
@@ -446,7 +447,7 @@ export class ExecutionsService {
 			}
 
 			data.workflowData = workflowData;
-			const nodeTypes = NodeTypes();
+			const nodeTypes = Container.get(NodeTypes);
 			const workflowInstance = new Workflow({
 				id: workflowData.id as string,
 				name: workflowData.name,
@@ -481,7 +482,7 @@ export class ExecutionsService {
 		const workflowRunner = new WorkflowRunner();
 		const retriedExecutionId = await workflowRunner.run(data);
 
-		const executionData = await ActiveExecutions.getInstance().getPostExecutePromise(
+		const executionData = await Container.get(ActiveExecutions).getPostExecutePromise(
 			retriedExecutionId,
 		);
 
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 152ae625dc0a5f..81b43dd31745f1 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -2,18 +2,13 @@
 export * from './CredentialsHelper';
 export * from './CredentialTypes';
 export * from './CredentialsOverwrites';
-export * from './ExternalHooks';
 export * from './Interfaces';
-export * from './InternalHooksManager';
-export * from './LoadNodesAndCredentials';
 export * from './NodeTypes';
-export * from './WaitTracker';
 export * from './WaitingWebhooks';
 export * from './WorkflowCredentials';
 export * from './WorkflowRunner';
 
-import * as ActiveExecutions from './ActiveExecutions';
-import * as ActiveWorkflowRunner from './ActiveWorkflowRunner';
+import { ActiveExecutions } from './ActiveExecutions';
 import * as Db from './Db';
 import * as GenericHelpers from './GenericHelpers';
 import * as ResponseHelper from './ResponseHelper';
@@ -26,7 +21,6 @@ import * as WorkflowHelpers from './WorkflowHelpers';
 
 export {
 	ActiveExecutions,
-	ActiveWorkflowRunner,
 	Db,
 	GenericHelpers,
 	ResponseHelper,
diff --git a/packages/cli/src/license/license.controller.ts b/packages/cli/src/license/license.controller.ts
index dc59ad8445e7d0..71a28336f7834a 100644
--- a/packages/cli/src/license/license.controller.ts
+++ b/packages/cli/src/license/license.controller.ts
@@ -5,12 +5,13 @@ import { LoggerProxy } from 'n8n-workflow';
 
 import { getLogger } from '@/Logger';
 import * as ResponseHelper from '@/ResponseHelper';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import type { ILicensePostResponse, ILicenseReadResponse } from '@/Interfaces';
 import { LicenseService } from './License.service';
 import { getLicense } from '@/License';
 import type { AuthenticatedRequest, LicenseRequest } from '@/requests';
 import { isInstanceOwner } from '@/PublicApi/v1/handlers/users/users.service';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export const licenseController = express.Router();
 
@@ -115,14 +116,14 @@ licenseController.post(
 			await license.renew();
 		} catch (e) {
 			// not awaiting so as not to make the endpoint hang
-			void InternalHooksManager.getInstance().onLicenseRenewAttempt({ success: false });
+			void Container.get(InternalHooks).onLicenseRenewAttempt({ success: false });
 			if (e instanceof Error) {
 				throw new ResponseHelper.BadRequestError(e.message);
 			}
 		}
 
 		// not awaiting so as not to make the endpoint hang
-		void InternalHooksManager.getInstance().onLicenseRenewAttempt({ success: true });
+		void Container.get(InternalHooks).onLicenseRenewAttempt({ success: true });
 
 		// Return the read data, plus the management JWT
 		return {
diff --git a/packages/cli/src/posthog/index.ts b/packages/cli/src/posthog/index.ts
index a84173be24928a..e513e366366cf2 100644
--- a/packages/cli/src/posthog/index.ts
+++ b/packages/cli/src/posthog/index.ts
@@ -1,8 +1,10 @@
+import { Service } from 'typedi';
 import type { PostHog } from 'posthog-node';
 import type { FeatureFlags, ITelemetryTrackProperties } from 'n8n-workflow';
 import config from '@/config';
-import type { PublicUser } from '..';
+import type { PublicUser } from '@/Interfaces';
 
+@Service()
 export class PostHogClient {
 	private postHog?: PostHog;
 
diff --git a/packages/cli/src/push/abstract.push.ts b/packages/cli/src/push/abstract.push.ts
index 90866f6268dac3..633cb126a8f0b1 100644
--- a/packages/cli/src/push/abstract.push.ts
+++ b/packages/cli/src/push/abstract.push.ts
@@ -29,7 +29,7 @@ export abstract class AbstractPush<T> {
 		}
 	}
 
-	send<D>(type: IPushDataType, data: D, sessionId: string | undefined = undefined) {
+	send<D>(type: IPushDataType, data: D, sessionId: string | undefined) {
 		const { connections } = this;
 		if (sessionId !== undefined && connections[sessionId] === undefined) {
 			Logger.error(`The session "${sessionId}" is not registered.`, { sessionId });
diff --git a/packages/cli/src/push/index.ts b/packages/cli/src/push/index.ts
index 54675b1ef8c2c5..63615605d60fc3 100644
--- a/packages/cli/src/push/index.ts
+++ b/packages/cli/src/push/index.ts
@@ -4,21 +4,35 @@ import type { Socket } from 'net';
 import type { Application, RequestHandler } from 'express';
 import { Server as WSServer } from 'ws';
 import { parse as parseUrl } from 'url';
+import { Container, Service } from 'typedi';
 import config from '@/config';
 import { resolveJwt } from '@/auth/jwt';
 import { AUTH_COOKIE_NAME } from '@/constants';
 import { SSEPush } from './sse.push';
 import { WebSocketPush } from './websocket.push';
-import type { Push, PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
-export type { Push } from './types';
+import type { PushResponse, SSEPushRequest, WebSocketPushRequest } from './types';
+import type { IPushDataType } from '@/Interfaces';
 
 const useWebSockets = config.getEnv('push.backend') === 'websocket';
 
-let pushInstance: Push;
-export const getPushInstance = () => {
-	if (!pushInstance) pushInstance = useWebSockets ? new WebSocketPush() : new SSEPush();
-	return pushInstance;
-};
+@Service()
+export class Push {
+	private backend = useWebSockets ? new WebSocketPush() : new SSEPush();
+
+	handleRequest(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) {
+		if (req.ws) {
+			(this.backend as WebSocketPush).add(req.query.sessionId, req.ws);
+		} else if (!useWebSockets) {
+			(this.backend as SSEPush).add(req.query.sessionId, { req, res });
+		} else {
+			res.status(401).send('Unauthorized');
+		}
+	}
+
+	send<D>(type: IPushDataType, data: D, sessionId: string | undefined = undefined) {
+		this.backend.send(type, data, sessionId);
+	}
+}
 
 export const setupPushServer = (restEndpoint: string, server: Server, app: Application) => {
 	if (useWebSockets) {
@@ -48,7 +62,6 @@ export const setupPushHandler = (
 	app: Application,
 	isUserManagementEnabled: boolean,
 ) => {
-	const push = getPushInstance();
 	const endpoint = `/${restEndpoint}/push`;
 
 	const pushValidationMiddleware: RequestHandler = async (
@@ -89,17 +102,10 @@ export const setupPushHandler = (
 		next();
 	};
 
+	const push = Container.get(Push);
 	app.use(
 		endpoint,
 		pushValidationMiddleware,
-		(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) => {
-			if (req.ws) {
-				(push as WebSocketPush).add(req.query.sessionId, req.ws);
-			} else if (!useWebSockets) {
-				(push as SSEPush).add(req.query.sessionId, { req, res });
-			} else {
-				res.status(401).send('Unauthorized');
-			}
-		},
+		(req: SSEPushRequest | WebSocketPushRequest, res: PushResponse) => push.handleRequest(req, res),
 	);
 };
diff --git a/packages/cli/src/push/types.ts b/packages/cli/src/push/types.ts
index 531ab604781e06..26baea050b1245 100644
--- a/packages/cli/src/push/types.ts
+++ b/packages/cli/src/push/types.ts
@@ -1,12 +1,8 @@
 import type { Request, Response } from 'express';
 import type { WebSocket } from 'ws';
-import type { SSEPush } from './sse.push';
-import type { WebSocketPush } from './websocket.push';
 
 // TODO: move all push related types here
 
-export type Push = SSEPush | WebSocketPush;
-
 export type PushRequest = Request<{}, {}, {}, { sessionId: string }>;
 
 export type SSEPushRequest = PushRequest & { ws: undefined };
diff --git a/packages/cli/src/telemetry/index.ts b/packages/cli/src/telemetry/index.ts
index 981798474d29b2..516c76f653b59e 100644
--- a/packages/cli/src/telemetry/index.ts
+++ b/packages/cli/src/telemetry/index.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unsafe-call */
 /* eslint-disable @typescript-eslint/no-unsafe-member-access */
 import type RudderStack from '@rudderstack/rudder-sdk-node';
-import type { PostHogClient } from '../posthog';
+import { PostHogClient } from '@/posthog';
 import type { ITelemetryTrackProperties } from 'n8n-workflow';
 import { LoggerProxy } from 'n8n-workflow';
 import config from '@/config';
@@ -10,6 +10,7 @@ import { getLogger } from '@/Logger';
 import { getLicense } from '@/License';
 import { LicenseService } from '@/license/License.service';
 import { N8N_VERSION } from '@/constants';
+import { Service } from 'typedi';
 
 type ExecutionTrackDataKey = 'manual_error' | 'manual_success' | 'prod_error' | 'prod_success';
 
@@ -28,14 +29,21 @@ interface IExecutionsBuffer {
 	};
 }
 
+@Service()
 export class Telemetry {
+	private instanceId: string;
+
 	private rudderStack?: RudderStack;
 
 	private pulseIntervalReference: NodeJS.Timeout;
 
 	private executionCountsBuffer: IExecutionsBuffer = {};
 
-	constructor(private instanceId: string, private postHog: PostHogClient) {}
+	constructor(private postHog: PostHogClient) {}
+
+	setInstanceId(instanceId: string) {
+		this.instanceId = instanceId;
+	}
 
 	async init() {
 		const enabled = config.getEnv('diagnostics.enabled');
diff --git a/packages/cli/src/workflows/workflows.controller.ee.ts b/packages/cli/src/workflows/workflows.controller.ee.ts
index 410b699fced582..833b319a28eb43 100644
--- a/packages/cli/src/workflows/workflows.controller.ee.ts
+++ b/packages/cli/src/workflows/workflows.controller.ee.ts
@@ -1,7 +1,6 @@
 import express from 'express';
 import { v4 as uuid } from 'uuid';
 import * as Db from '@/Db';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import config from '@/config';
@@ -18,6 +17,8 @@ import { EECredentialsService as EECredentials } from '../credentials/credential
 import type { IExecutionPushResponse } from '@/Interfaces';
 import * as GenericHelpers from '@/GenericHelpers';
 import { In } from 'typeorm';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export const EEWorkflowController = express.Router();
@@ -75,7 +76,7 @@ EEWorkflowController.put(
 			}
 		});
 
-		void InternalHooksManager.getInstance().onWorkflowSharingUpdate(
+		void Container.get(InternalHooks).onWorkflowSharingUpdate(
 			workflowId,
 			req.user.id,
 			shareWithIds,
@@ -126,7 +127,7 @@ EEWorkflowController.post(
 
 		await validateEntity(newWorkflow);
 
-		await ExternalHooks().run('workflow.create', [newWorkflow]);
+		await Container.get(ExternalHooks).run('workflow.create', [newWorkflow]);
 
 		const { tags: tagIds } = req.body;
 
@@ -190,8 +191,8 @@ EEWorkflowController.post(
 			});
 		}
 
-		await ExternalHooks().run('workflow.afterCreate', [savedWorkflow]);
-		void InternalHooksManager.getInstance().onWorkflowCreated(req.user, newWorkflow, false);
+		await Container.get(ExternalHooks).run('workflow.afterCreate', [savedWorkflow]);
+		void Container.get(InternalHooks).onWorkflowCreated(req.user, newWorkflow, false);
 
 		return savedWorkflow;
 	}),
diff --git a/packages/cli/src/workflows/workflows.controller.ts b/packages/cli/src/workflows/workflows.controller.ts
index 686f1f6b65ba8b..979f4b852fc964 100644
--- a/packages/cli/src/workflows/workflows.controller.ts
+++ b/packages/cli/src/workflows/workflows.controller.ts
@@ -15,7 +15,6 @@ import * as TagHelpers from '@/TagHelpers';
 import { SharedWorkflow } from '@db/entities/SharedWorkflow';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { validateEntity } from '@/GenericHelpers';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { ExternalHooks } from '@/ExternalHooks';
 import { getLogger } from '@/Logger';
 import type { WorkflowRequest } from '@/requests';
@@ -24,6 +23,8 @@ import { EEWorkflowController } from './workflows.controller.ee';
 import { WorkflowsService } from './workflows.services';
 import { whereClause } from '@/UserManagement/UserManagementHelper';
 import { In } from 'typeorm';
+import { Container } from 'typedi';
+import { InternalHooks } from '@/InternalHooks';
 
 export const workflowsController = express.Router();
 
@@ -57,7 +58,7 @@ workflowsController.post(
 
 		await validateEntity(newWorkflow);
 
-		await ExternalHooks().run('workflow.create', [newWorkflow]);
+		await Container.get(ExternalHooks).run('workflow.create', [newWorkflow]);
 
 		const { tags: tagIds } = req.body;
 
@@ -106,8 +107,8 @@ workflowsController.post(
 			});
 		}
 
-		await ExternalHooks().run('workflow.afterCreate', [savedWorkflow]);
-		void InternalHooksManager.getInstance().onWorkflowCreated(req.user, newWorkflow, false);
+		await Container.get(ExternalHooks).run('workflow.afterCreate', [savedWorkflow]);
+		void Container.get(InternalHooks).onWorkflowCreated(req.user, newWorkflow, false);
 
 		return savedWorkflow;
 	}),
diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 1dd4c1b1c7e9f2..2b736faf15f556 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -1,3 +1,4 @@
+import { Container } from 'typedi';
 import { validate as jsonSchemaValidate } from 'jsonschema';
 import type { INode, IPinData, JsonObject } from 'n8n-workflow';
 import { NodeApiError, jsonParse, LoggerProxy, Workflow } from 'n8n-workflow';
@@ -5,9 +6,8 @@ import type { FindOptionsSelect, FindOptionsWhere, UpdateResult } from 'typeorm'
 import { In } from 'typeorm';
 import pick from 'lodash.pick';
 import { v4 as uuid } from 'uuid';
-import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as Db from '@/Db';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import * as ResponseHelper from '@/ResponseHelper';
 import * as WorkflowHelpers from '@/WorkflowHelpers';
 import config from '@/config';
@@ -22,10 +22,11 @@ import type { IWorkflowDb, IWorkflowExecutionDataProcess } from '@/Interfaces';
 import { NodeTypes } from '@/NodeTypes';
 import { WorkflowRunner } from '@/WorkflowRunner';
 import * as WorkflowExecuteAdditionalData from '@/WorkflowExecuteAdditionalData';
-import * as TestWebhooks from '@/TestWebhooks';
+import { TestWebhooks } from '@/TestWebhooks';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 import { isSharingEnabled, whereClause } from '@/UserManagement/UserManagementHelper';
 import type { WorkflowForList } from '@/workflows/workflows.types';
+import { InternalHooks } from '@/InternalHooks';
 
 export type IGetWorkflowsQueryFilter = Pick<
 	FindOptionsWhere<WorkflowEntity>,
@@ -91,7 +92,7 @@ export class WorkflowsService {
 			nodes: workflow.nodes,
 			connections: workflow.connections,
 			active: workflow.active,
-			nodeTypes: NodeTypes(),
+			nodeTypes: Container.get(NodeTypes),
 		}).getParentNodes(startNodeName);
 
 		let checkNodeName = '';
@@ -236,12 +237,12 @@ export class WorkflowsService {
 
 		WorkflowHelpers.addNodeIds(workflow);
 
-		await ExternalHooks().run('workflow.update', [workflow]);
+		await Container.get(ExternalHooks).run('workflow.update', [workflow]);
 
 		if (shared.workflow.active) {
 			// When workflow gets saved always remove it as the triggers could have been
 			// changed and so the changes would not take effect
-			await ActiveWorkflowRunner.getInstance().remove(workflowId);
+			await Container.get(ActiveWorkflowRunner).remove(workflowId);
 		}
 
 		if (workflow.settings) {
@@ -319,14 +320,14 @@ export class WorkflowsService {
 			});
 		}
 
-		await ExternalHooks().run('workflow.afterUpdate', [updatedWorkflow]);
-		void InternalHooksManager.getInstance().onWorkflowSaved(user, updatedWorkflow, false);
+		await Container.get(ExternalHooks).run('workflow.afterUpdate', [updatedWorkflow]);
+		void Container.get(InternalHooks).onWorkflowSaved(user, updatedWorkflow, false);
 
 		if (updatedWorkflow.active) {
 			// When the workflow is supposed to be active add it again
 			try {
-				await ExternalHooks().run('workflow.activate', [updatedWorkflow]);
-				await ActiveWorkflowRunner.getInstance().add(
+				await Container.get(ExternalHooks).run('workflow.activate', [updatedWorkflow]);
+				await Container.get(ActiveWorkflowRunner).add(
 					workflowId,
 					shared.workflow.active ? 'update' : 'activate',
 				);
@@ -383,14 +384,14 @@ export class WorkflowsService {
 				nodes: workflowData.nodes,
 				connections: workflowData.connections,
 				active: false,
-				nodeTypes: NodeTypes(),
+				nodeTypes: Container.get(NodeTypes),
 				staticData: undefined,
 				settings: workflowData.settings,
 			});
 
 			const additionalData = await WorkflowExecuteAdditionalData.getBase(user.id);
 
-			const needsWebhook = await TestWebhooks.getInstance().needsWebhookData(
+			const needsWebhook = await Container.get(TestWebhooks).needsWebhookData(
 				workflowData,
 				workflow,
 				additionalData,
@@ -436,7 +437,7 @@ export class WorkflowsService {
 	}
 
 	static async delete(user: User, workflowId: string): Promise<WorkflowEntity | undefined> {
-		await ExternalHooks().run('workflow.delete', [workflowId]);
+		await Container.get(ExternalHooks).run('workflow.delete', [workflowId]);
 
 		const sharedWorkflow = await Db.collections.SharedWorkflow.findOne({
 			relations: ['workflow', 'role'],
@@ -454,13 +455,13 @@ export class WorkflowsService {
 
 		if (sharedWorkflow.workflow.active) {
 			// deactivate before deleting
-			await ActiveWorkflowRunner.getInstance().remove(workflowId);
+			await Container.get(ActiveWorkflowRunner).remove(workflowId);
 		}
 
 		await Db.collections.Workflow.delete(workflowId);
 
-		void InternalHooksManager.getInstance().onWorkflowDeleted(user, workflowId, false);
-		await ExternalHooks().run('workflow.afterDelete', [workflowId]);
+		void Container.get(InternalHooks).onWorkflowDeleted(user, workflowId, false);
+		await Container.get(ExternalHooks).run('workflow.afterDelete', [workflowId]);
 
 		return sharedWorkflow.workflow;
 	}
diff --git a/packages/cli/test/integration/audit/nodes.risk.test.ts b/packages/cli/test/integration/audit/nodes.risk.test.ts
index d9fac17b4a04e9..384850c5594c8c 100644
--- a/packages/cli/test/integration/audit/nodes.risk.test.ts
+++ b/packages/cli/test/integration/audit/nodes.risk.test.ts
@@ -6,6 +6,13 @@ import { OFFICIAL_RISKY_NODE_TYPES, NODES_REPORT } from '@/audit/constants';
 import { getRiskSection, MOCK_PACKAGE, saveManualTriggerWorkflow } from './utils';
 import * as testDb from '../shared/testDb';
 import { toReportTitle } from '@/audit/utils';
+import { mockInstance } from '../shared/utils';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { NodeTypes } from '@/NodeTypes';
+
+const nodesAndCredentials = mockInstance(LoadNodesAndCredentials);
+nodesAndCredentials.getCustomDirectories.mockReturnValue([]);
+mockInstance(NodeTypes);
 
 beforeAll(async () => {
 	await testDb.init();
diff --git a/packages/cli/test/integration/commands/reset.cmd.test.ts b/packages/cli/test/integration/commands/reset.cmd.test.ts
index ca1c207760c110..8fc239d9107ed6 100644
--- a/packages/cli/test/integration/commands/reset.cmd.test.ts
+++ b/packages/cli/test/integration/commands/reset.cmd.test.ts
@@ -2,10 +2,17 @@ import * as Db from '@/Db';
 import { Reset } from '@/commands/user-management/reset';
 import type { Role } from '@db/entities/Role';
 import * as testDb from '../shared/testDb';
+import { mockInstance } from '../shared/utils';
+import { InternalHooks } from '@/InternalHooks';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { NodeTypes } from '@/NodeTypes';
 
 let globalOwnerRole: Role;
 
 beforeAll(async () => {
+	mockInstance(InternalHooks);
+	mockInstance(LoadNodesAndCredentials);
+	mockInstance(NodeTypes);
 	await testDb.init();
 
 	globalOwnerRole = await testDb.getGlobalOwnerRole();
diff --git a/packages/cli/test/integration/nodes.api.test.ts b/packages/cli/test/integration/nodes.api.test.ts
index e3496e87acafba..9e20ca1b746f0b 100644
--- a/packages/cli/test/integration/nodes.api.test.ts
+++ b/packages/cli/test/integration/nodes.api.test.ts
@@ -20,6 +20,12 @@ import type { Role } from '@db/entities/Role';
 import type { AuthAgent } from './shared/types';
 import type { InstalledNodes } from '@db/entities/InstalledNodes';
 import { COMMUNITY_PACKAGE_VERSION } from './shared/constants';
+import { NodeTypes } from '@/NodeTypes';
+import { Push } from '@/push';
+
+const mockLoadNodesAndCredentials = utils.mockInstance(LoadNodesAndCredentials);
+utils.mockInstance(NodeTypes);
+utils.mockInstance(Push);
 
 jest.mock('@/CommunityNodes/helpers', () => {
 	return {
@@ -213,7 +219,7 @@ test('POST /nodes should allow installing packages that could not be loaded', as
 	mocked(hasPackageLoaded).mockReturnValueOnce(false);
 	mocked(checkNpmPackageStatus).mockResolvedValueOnce({ status: 'OK' });
 
-	jest.spyOn(LoadNodesAndCredentials(), 'loadNpmModule').mockImplementationOnce(mockedEmptyPackage);
+	mockLoadNodesAndCredentials.loadNpmModule.mockImplementationOnce(mockedEmptyPackage);
 
 	const { statusCode } = await authAgent(ownerShell).post('/nodes').send({
 		name: utils.installedPackagePayload().packageName,
@@ -267,9 +273,7 @@ test('DELETE /nodes should reject if package is not installed', async () => {
 test('DELETE /nodes should uninstall package', async () => {
 	const ownerShell = await testDb.createUserShell(globalOwnerRole);
 
-	const removeSpy = jest
-		.spyOn(LoadNodesAndCredentials(), 'removeNpmModule')
-		.mockImplementationOnce(jest.fn());
+	const removeSpy = mockLoadNodesAndCredentials.removeNpmModule.mockImplementationOnce(jest.fn());
 
 	mocked(findInstalledPackage).mockImplementationOnce(mockedEmptyPackage);
 
@@ -310,9 +314,8 @@ test('PATCH /nodes reject if package is not installed', async () => {
 test('PATCH /nodes should update a package', async () => {
 	const ownerShell = await testDb.createUserShell(globalOwnerRole);
 
-	const updateSpy = jest
-		.spyOn(LoadNodesAndCredentials(), 'updateNpmModule')
-		.mockImplementationOnce(mockedEmptyPackage);
+	const updateSpy =
+		mockLoadNodesAndCredentials.updateNpmModule.mockImplementationOnce(mockedEmptyPackage);
 
 	mocked(findInstalledPackage).mockImplementationOnce(mockedEmptyPackage);
 
diff --git a/packages/cli/test/integration/shared/utils.ts b/packages/cli/test/integration/shared/utils.ts
index 3407d1b82f75f1..ba28f16732656b 100644
--- a/packages/cli/test/integration/shared/utils.ts
+++ b/packages/cli/test/integration/shared/utils.ts
@@ -1,3 +1,4 @@
+import { Container } from 'typedi';
 import { randomBytes } from 'crypto';
 import { existsSync } from 'fs';
 
@@ -25,14 +26,15 @@ import {
 import superagent from 'superagent';
 import request from 'supertest';
 import { URL } from 'url';
+import { mock } from 'jest-mock-extended';
+import { DeepPartial } from 'ts-essentials';
 import config from '@/config';
 import * as Db from '@/Db';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
 import { CredentialTypes } from '@/CredentialTypes';
 import { ExternalHooks } from '@/ExternalHooks';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { NodeTypes } from '@/NodeTypes';
-import * as ActiveWorkflowRunner from '@/ActiveWorkflowRunner';
+import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import { nodesController } from '@/api/nodes.api';
 import { workflowsController } from '@/workflows/workflows.controller';
 import { AUTH_COOKIE_NAME, NODE_PACKAGE_PREFIX } from '@/constants';
@@ -74,16 +76,25 @@ import * as testDb from '../shared/testDb';
 import { v4 as uuid } from 'uuid';
 import { handleLdapInit } from '@/Ldap/helpers';
 import { ldapController } from '@/Ldap/routes/ldap.controller.ee';
+import { InternalHooks } from '@/InternalHooks';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { PostHogClient } from '@/posthog';
 
+export const mockInstance = <T>(
+	ctor: new (...args: any[]) => T,
+	data: DeepPartial<T> | undefined = undefined,
+) => {
+	const instance = mock<T>(data);
+	Container.set(ctor, instance);
+	return instance;
+};
+
 const loadNodesAndCredentials: INodesAndCredentials = {
 	loaded: { nodes: {}, credentials: {} },
 	known: { nodes: {}, credentials: {} },
 	credentialTypes: {} as ICredentialTypes,
 };
-
-const mockNodeTypes = NodeTypes(loadNodesAndCredentials);
-CredentialTypes(loadNodesAndCredentials);
+Container.set(LoadNodesAndCredentials, loadNodesAndCredentials);
 
 /**
  * Initialize a test server.
@@ -108,11 +119,9 @@ export async function initTestServer({
 	const logger = getLogger();
 	LoggerProxy.init(logger);
 
-	const postHog = new PostHogClient();
-	postHog.init('test-instance-id');
-
-	// Pre-requisite: Mock the telemetry module before calling.
-	await InternalHooksManager.init('test-instance-id', mockNodeTypes, postHog);
+	// Mock all telemetry.
+	mockInstance(InternalHooks);
+	mockInstance(PostHogClient);
 
 	testServer.app.use(bodyParser.json());
 	testServer.app.use(bodyParser.urlencoded({ extended: true }));
@@ -137,7 +146,7 @@ export async function initTestServer({
 		endpointGroups.includes('users') ||
 		endpointGroups.includes('passwordReset')
 	) {
-		testServer.externalHooks = ExternalHooks();
+		testServer.externalHooks = Container.get(ExternalHooks);
 	}
 
 	const [routerEndpoints, functionEndpoints] = classifyEndpointGroups(endpointGroups);
@@ -167,8 +176,8 @@ export async function initTestServer({
 	}
 
 	if (functionEndpoints.length) {
-		const externalHooks = ExternalHooks();
-		const internalHooks = InternalHooksManager.getInstance();
+		const externalHooks = Container.get(ExternalHooks);
+		const internalHooks = Container.get(InternalHooks);
 		const mailer = UserManagementMailer.getInstance();
 		const repositories = Db.collections;
 
@@ -218,7 +227,7 @@ export async function initTestServer({
 							externalHooks,
 							internalHooks,
 							repositories,
-							activeWorkflowRunner: ActiveWorkflowRunner.getInstance(),
+							activeWorkflowRunner: Container.get(ActiveWorkflowRunner),
 							logger,
 						}),
 					);
@@ -261,8 +270,8 @@ const classifyEndpointGroups = (endpointGroups: EndpointGroup[]) => {
 /**
  * Initialize node types.
  */
-export async function initActiveWorkflowRunner(): Promise<ActiveWorkflowRunner.ActiveWorkflowRunner> {
-	const workflowRunner = ActiveWorkflowRunner.getInstance();
+export async function initActiveWorkflowRunner(): Promise<ActiveWorkflowRunner> {
+	const workflowRunner = Container.get(ActiveWorkflowRunner);
 	workflowRunner.init();
 	return workflowRunner;
 }
@@ -303,7 +312,7 @@ export function gitHubCredentialType(): ICredentialType {
  * Initialize node types.
  */
 export async function initCredentialsTypes(): Promise<void> {
-	loadNodesAndCredentials.loaded.credentials = {
+	Container.get(LoadNodesAndCredentials).loaded.credentials = {
 		githubApi: {
 			type: gitHubCredentialType(),
 			sourcePath: '',
@@ -322,7 +331,7 @@ export async function initLdapManager(): Promise<void> {
  * Initialize node types.
  */
 export async function initNodeTypes() {
-	loadNodesAndCredentials.loaded.nodes = {
+	Container.get(LoadNodesAndCredentials).loaded.nodes = {
 		'n8n-nodes-base.start': {
 			sourcePath: '',
 			type: {
diff --git a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
index e45dd334cb0ce5..395b85d3772602 100644
--- a/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
+++ b/packages/cli/test/unit/ActiveWorkflowRunner.test.ts
@@ -1,7 +1,13 @@
 import { v4 as uuid } from 'uuid';
 import { mocked } from 'jest-mock';
 
-import { ICredentialTypes, LoggerProxy, NodeOperationError, Workflow } from 'n8n-workflow';
+import {
+	ICredentialTypes,
+	INodesAndCredentials,
+	LoggerProxy,
+	NodeOperationError,
+	Workflow,
+} from 'n8n-workflow';
 
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
 import * as Db from '@/Db';
@@ -10,12 +16,17 @@ import { SharedWorkflow } from '@/databases/entities/SharedWorkflow';
 import { Role } from '@/databases/entities/Role';
 import { User } from '@/databases/entities/User';
 import { getLogger } from '@/Logger';
-import { NodeTypes } from '@/NodeTypes';
-import { CredentialTypes } from '@/CredentialTypes';
 import { randomEmail, randomName } from '../integration/shared/random';
 import * as Helpers from './Helpers';
 import { WorkflowExecuteAdditionalData } from '@/index';
+
 import { WorkflowRunner } from '@/WorkflowRunner';
+import { mock } from 'jest-mock-extended';
+import { ExternalHooks } from '@/ExternalHooks';
+import { Container } from 'typedi';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
+import { mockInstance } from '../integration/shared/utils';
+import { Push } from '@/push';
 
 /**
  * TODO:
@@ -112,19 +123,6 @@ jest.mock('@/Db', () => {
 	};
 });
 
-const mockExternalHooksRunFunction = jest.fn();
-
-jest.mock('@/ExternalHooks', () => {
-	return {
-		ExternalHooks: () => {
-			return {
-				run: () => mockExternalHooksRunFunction(),
-				init: () => Promise.resolve(),
-			};
-		},
-	};
-});
-
 const workflowCheckIfCanBeActivated = jest.fn(() => true);
 
 jest
@@ -140,30 +138,26 @@ const workflowExecuteAdditionalDataExecuteErrorWorkflowSpy = jest.spyOn(
 );
 
 describe('ActiveWorkflowRunner', () => {
+	let externalHooks: ExternalHooks;
 	let activeWorkflowRunner: ActiveWorkflowRunner;
 
 	beforeAll(async () => {
 		LoggerProxy.init(getLogger());
-		NodeTypes({
+		const nodesAndCredentials: INodesAndCredentials = {
 			loaded: {
 				nodes: MOCK_NODE_TYPES_DATA,
 				credentials: {},
 			},
 			known: { nodes: {}, credentials: {} },
 			credentialTypes: {} as ICredentialTypes,
-		});
-		CredentialTypes({
-			loaded: {
-				nodes: MOCK_NODE_TYPES_DATA,
-				credentials: {},
-			},
-			known: { nodes: {}, credentials: {} },
-			credentialTypes: {} as ICredentialTypes,
-		});
+		};
+		Container.set(LoadNodesAndCredentials, nodesAndCredentials);
+		mockInstance(Push);
 	});
 
 	beforeEach(() => {
-		activeWorkflowRunner = new ActiveWorkflowRunner();
+		externalHooks = mock();
+		activeWorkflowRunner = new ActiveWorkflowRunner(externalHooks);
 	});
 
 	afterEach(async () => {
@@ -173,84 +167,84 @@ describe('ActiveWorkflowRunner', () => {
 	});
 
 	test('Should initialize activeWorkflowRunner with empty list of active workflows and call External Hooks', async () => {
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(0);
 		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
 		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
-		expect(mockExternalHooksRunFunction).toHaveBeenCalledTimes(1);
+		expect(externalHooks.run).toHaveBeenCalledTimes(1);
 	});
 
 	test('Should initialize activeWorkflowRunner with one active workflow', async () => {
 		databaseActiveWorkflowsCount = 1;
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
 			databaseActiveWorkflowsCount,
 		);
 		expect(mocked(Db.collections.Workflow.find)).toHaveBeenCalled();
 		expect(mocked(Db.collections.Webhook.clear)).toHaveBeenCalled();
-		expect(mockExternalHooksRunFunction).toHaveBeenCalled();
+		expect(externalHooks.run).toHaveBeenCalled();
 	});
 
 	test('Should make sure function checkIfWorkflowCanBeActivated was called for every workflow', async () => {
 		databaseActiveWorkflowsCount = 2;
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		expect(workflowCheckIfCanBeActivated).toHaveBeenCalledTimes(databaseActiveWorkflowsCount);
 	});
 
 	test('Call to removeAll should remove every workflow', async () => {
 		databaseActiveWorkflowsCount = 2;
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
 			databaseActiveWorkflowsCount,
 		);
-		void (await activeWorkflowRunner.removeAll());
+		await activeWorkflowRunner.removeAll();
 		expect(removeFunction).toHaveBeenCalledTimes(databaseActiveWorkflowsCount);
 	});
 
 	test('Call to remove should also call removeWorkflowWebhooks', async () => {
 		databaseActiveWorkflowsCount = 1;
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		expect(await activeWorkflowRunner.getActiveWorkflows()).toHaveLength(
 			databaseActiveWorkflowsCount,
 		);
-		void (await activeWorkflowRunner.remove('1'));
+		await activeWorkflowRunner.remove('1');
 		expect(removeWebhooksFunction).toHaveBeenCalledTimes(1);
 	});
 
 	test('Call to isActive should return true for valid workflow', async () => {
 		databaseActiveWorkflowsCount = 1;
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		expect(await activeWorkflowRunner.isActive('1')).toBe(true);
 	});
 
 	test('Call to isActive should return false for invalid workflow', async () => {
 		databaseActiveWorkflowsCount = 1;
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		expect(await activeWorkflowRunner.isActive('2')).toBe(false);
 	});
 
 	test('Calling add should call checkIfWorkflowCanBeActivated', async () => {
 		// Initialize with default (0) workflows
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		generateWorkflows(1);
-		void (await activeWorkflowRunner.add('1', 'activate'));
+		await activeWorkflowRunner.add('1', 'activate');
 		expect(workflowCheckIfCanBeActivated).toHaveBeenCalledTimes(1);
 	});
 
 	test('runWorkflow should call run method in WorkflowRunner', async () => {
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		const workflow = generateWorkflows(1);
 		const additionalData = await WorkflowExecuteAdditionalData.getBase('fake-user-id');
 
 		workflowRunnerRun.mockImplementationOnce(() => Promise.resolve('invalid-execution-id'));
 
-		void (await activeWorkflowRunner.runWorkflow(
+		await activeWorkflowRunner.runWorkflow(
 			workflow[0],
 			workflow[0].nodes[0],
 			[[]],
 			additionalData,
 			'trigger',
-		));
+		);
 
 		expect(workflowRunnerRun).toHaveBeenCalledTimes(1);
 	});
@@ -258,7 +252,7 @@ describe('ActiveWorkflowRunner', () => {
 	test('executeErrorWorkflow should call function with same name in WorkflowExecuteAdditionalData', async () => {
 		const workflowData = generateWorkflows(1)[0];
 		const error = new NodeOperationError(workflowData.nodes[0], 'Fake error message');
-		void (await activeWorkflowRunner.init());
+		await activeWorkflowRunner.init();
 		activeWorkflowRunner.executeErrorWorkflow(error, workflowData, 'trigger');
 		expect(workflowExecuteAdditionalDataExecuteErrorWorkflowSpy).toHaveBeenCalledTimes(1);
 	});
diff --git a/packages/cli/test/unit/CredentialTypes.test.ts b/packages/cli/test/unit/CredentialTypes.test.ts
index 35eb0c321cca27..bf188989ca0951 100644
--- a/packages/cli/test/unit/CredentialTypes.test.ts
+++ b/packages/cli/test/unit/CredentialTypes.test.ts
@@ -1,47 +1,47 @@
 import type { ICredentialTypes, INodesAndCredentials } from 'n8n-workflow';
 import { CredentialTypes } from '@/CredentialTypes';
+import { Container } from 'typedi';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
-describe('ActiveExecutions', () => {
-	let credentialTypes: ICredentialTypes;
+describe('CredentialTypes', () => {
+	const mockNodesAndCredentials: INodesAndCredentials = {
+		loaded: {
+			nodes: {},
+			credentials: {
+				fakeFirstCredential: {
+					type: {
+						name: 'fakeFirstCredential',
+						displayName: 'Fake First Credential',
+						properties: [],
+					},
+					sourcePath: '',
+				},
+				fakeSecondCredential: {
+					type: {
+						name: 'fakeSecondCredential',
+						displayName: 'Fake Second Credential',
+						properties: [],
+					},
+					sourcePath: '',
+				},
+			},
+		},
+		known: { nodes: {}, credentials: {} },
+		credentialTypes: {} as ICredentialTypes,
+	};
 
-	beforeEach(() => {
-		credentialTypes = CredentialTypes(mockNodesAndCredentials());
-	});
+	Container.set(LoadNodesAndCredentials, mockNodesAndCredentials);
+
+	const credentialTypes = Container.get(CredentialTypes);
 
 	test('Should throw error when calling invalid credential name', () => {
 		expect(() => credentialTypes.getByName('fakeThirdCredential')).toThrowError();
 	});
 
 	test('Should return correct credential type for valid name', () => {
-		const mockedCredentialTypes = mockNodesAndCredentials().loaded.credentials;
+		const mockedCredentialTypes = mockNodesAndCredentials.loaded.credentials;
 		expect(credentialTypes.getByName('fakeFirstCredential')).toStrictEqual(
 			mockedCredentialTypes.fakeFirstCredential.type,
 		);
 	});
 });
-
-const mockNodesAndCredentials = (): INodesAndCredentials => ({
-	loaded: {
-		nodes: {},
-		credentials: {
-			fakeFirstCredential: {
-				type: {
-					name: 'fakeFirstCredential',
-					displayName: 'Fake First Credential',
-					properties: [],
-				},
-				sourcePath: '',
-			},
-			fakeSecondCredential: {
-				type: {
-					name: 'fakeSecondCredential',
-					displayName: 'Fake Second Credential',
-					properties: [],
-				},
-				sourcePath: '',
-			},
-		},
-	},
-	known: { nodes: {}, credentials: {} },
-	credentialTypes: {} as ICredentialTypes,
-});
diff --git a/packages/cli/test/unit/CredentialsHelper.test.ts b/packages/cli/test/unit/CredentialsHelper.test.ts
index 50f191deb701d1..efa43aeb13886a 100644
--- a/packages/cli/test/unit/CredentialsHelper.test.ts
+++ b/packages/cli/test/unit/CredentialsHelper.test.ts
@@ -12,6 +12,9 @@ import {
 import { CredentialsHelper } from '@/CredentialsHelper';
 import { CredentialTypes } from '@/CredentialTypes';
 import * as Helpers from './Helpers';
+import { Container } from 'typedi';
+import { NodeTypes } from '@/NodeTypes';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 
 const TEST_ENCRYPTION_KEY = 'test';
 const mockNodesAndCredentials: INodesAndCredentials = {
@@ -19,6 +22,7 @@ const mockNodesAndCredentials: INodesAndCredentials = {
 	known: { nodes: {}, credentials: {} },
 	credentialTypes: {} as ICredentialTypes,
 };
+Container.set(LoadNodesAndCredentials, mockNodesAndCredentials);
 
 describe('CredentialsHelper', () => {
 	describe('authenticate', () => {
@@ -215,7 +219,7 @@ describe('CredentialsHelper', () => {
 			qs: {},
 		};
 
-		const nodeTypes = Helpers.NodeTypes();
+		const nodeTypes = Helpers.NodeTypes() as unknown as NodeTypes;
 
 		const workflow = new Workflow({
 			nodes: [node],
@@ -235,7 +239,7 @@ describe('CredentialsHelper', () => {
 					},
 				};
 
-				const credentialTypes = CredentialTypes(mockNodesAndCredentials);
+				const credentialTypes = Container.get(CredentialTypes);
 
 				const credentialsHelper = new CredentialsHelper(
 					TEST_ENCRYPTION_KEY,
diff --git a/packages/cli/test/unit/Events.test.ts b/packages/cli/test/unit/Events.test.ts
index 258be2d172ab9e..0c72e8f40562c7 100644
--- a/packages/cli/test/unit/Events.test.ts
+++ b/packages/cli/test/unit/Events.test.ts
@@ -3,23 +3,13 @@ import { QueryFailedError } from 'typeorm';
 import config from '@/config';
 import { Db } from '@/index';
 import { nodeFetchedData, workflowExecutionCompleted } from '@/events/WorkflowStatistics';
-import { InternalHooksManager } from '@/InternalHooksManager';
 import { getLogger } from '@/Logger';
-import  * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
+import * as UserManagementHelper from '@/UserManagement/UserManagementHelper';
+import { InternalHooks } from '@/InternalHooks';
+import { mockInstance } from '../integration/shared/utils';
 
 const FAKE_USER_ID = 'abcde-fghij';
 
-const mockedFirstProductionWorkflowSuccess = jest.fn((...args) => {});
-const mockedFirstWorkflowDataLoad = jest.fn((...args) => {});
-
-jest.spyOn(InternalHooksManager, 'getInstance').mockImplementation((...args) => {
-	const actual = jest.requireActual('@/InternalHooks');
-	return {
-		...actual,
-		onFirstProductionWorkflowSuccess: mockedFirstProductionWorkflowSuccess,
-		onFirstWorkflowDataLoad: mockedFirstWorkflowDataLoad,
-	};
-});
 jest.mock('@/Db', () => {
 	return {
 		collections: {
@@ -30,11 +20,13 @@ jest.mock('@/Db', () => {
 		},
 	};
 });
-jest.spyOn(UserManagementHelper, 'getWorkflowOwner').mockImplementation(async (workflowId) => {
+jest.spyOn(UserManagementHelper, 'getWorkflowOwner').mockImplementation(async (_workflowId) => {
 	return { id: FAKE_USER_ID };
 });
 
 describe('Events', () => {
+	const internalHooks = mockInstance(InternalHooks);
+
 	beforeAll(() => {
 		config.set('diagnostics.enabled', true);
 		config.set('deployment.type', 'n8n-testing');
@@ -47,8 +39,8 @@ describe('Events', () => {
 	});
 
 	beforeEach(() => {
-		mockedFirstProductionWorkflowSuccess.mockClear();
-		mockedFirstWorkflowDataLoad.mockClear();
+		internalHooks.onFirstProductionWorkflowSuccess.mockClear();
+		internalHooks.onFirstWorkflowDataLoad.mockClear();
 	});
 
 	afterEach(() => {});
@@ -72,8 +64,8 @@ describe('Events', () => {
 				startedAt: new Date(),
 			};
 			await workflowExecutionCompleted(workflow, runData);
-			expect(mockedFirstProductionWorkflowSuccess).toBeCalledTimes(1);
-			expect(mockedFirstProductionWorkflowSuccess).toHaveBeenNthCalledWith(1, {
+			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(1);
+			expect(internalHooks.onFirstProductionWorkflowSuccess).toHaveBeenNthCalledWith(1, {
 				user_id: FAKE_USER_ID,
 				workflow_id: workflow.id,
 			});
@@ -97,12 +89,12 @@ describe('Events', () => {
 				startedAt: new Date(),
 			};
 			await workflowExecutionCompleted(workflow, runData);
-			expect(mockedFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
 		});
 
 		test('should not send metrics for updated entries', async () => {
 			// Call the function with a fail insert, ensure update is called *and* metrics aren't sent
-			Db.collections.WorkflowStatistics.insert.mockImplementationOnce((...args) => {
+			Db.collections.WorkflowStatistics.insert.mockImplementationOnce(() => {
 				throw new QueryFailedError('invalid insert', [], '');
 			});
 			const workflow = {
@@ -121,7 +113,7 @@ describe('Events', () => {
 				startedAt: new Date(),
 			};
 			await workflowExecutionCompleted(workflow, runData);
-			expect(mockedFirstProductionWorkflowSuccess).toBeCalledTimes(0);
+			expect(internalHooks.onFirstProductionWorkflowSuccess).toBeCalledTimes(0);
 		});
 	});
 
@@ -138,8 +130,8 @@ describe('Events', () => {
 				parameters: {},
 			};
 			await nodeFetchedData(workflowId, node);
-			expect(mockedFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(mockedFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
+			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(1);
+			expect(internalHooks.onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
 				user_id: FAKE_USER_ID,
 				workflow_id: workflowId,
 				node_type: node.type,
@@ -165,8 +157,8 @@ describe('Events', () => {
 				},
 			};
 			await nodeFetchedData(workflowId, node);
-			expect(mockedFirstWorkflowDataLoad).toBeCalledTimes(1);
-			expect(mockedFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
+			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(1);
+			expect(internalHooks.onFirstWorkflowDataLoad).toHaveBeenNthCalledWith(1, {
 				user_id: FAKE_USER_ID,
 				workflow_id: workflowId,
 				node_type: node.type,
@@ -178,7 +170,7 @@ describe('Events', () => {
 
 		test('should not send metrics for entries that already have the flag set', async () => {
 			// Fetch data for workflow 2 which is set up to not be altered in the mocks
-			Db.collections.WorkflowStatistics.insert.mockImplementationOnce((...args) => {
+			Db.collections.WorkflowStatistics.insert.mockImplementationOnce(() => {
 				throw new QueryFailedError('invalid insert', [], '');
 			});
 			const workflowId = '1';
@@ -191,7 +183,7 @@ describe('Events', () => {
 				parameters: {},
 			};
 			await nodeFetchedData(workflowId, node);
-			expect(mockedFirstWorkflowDataLoad).toBeCalledTimes(0);
+			expect(internalHooks.onFirstWorkflowDataLoad).toBeCalledTimes(0);
 		});
 	});
 });
diff --git a/packages/cli/test/unit/Helpers.ts b/packages/cli/test/unit/Helpers.ts
index afe90f68704a14..1f2f9b49b737c6 100644
--- a/packages/cli/test/unit/Helpers.ts
+++ b/packages/cli/test/unit/Helpers.ts
@@ -1,14 +1,13 @@
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import {
-	INodesAndCredentials,
 	INodeType,
 	INodeTypeData,
 	INodeTypes,
-	ITriggerFunctions,
-	ITriggerResponse,
 	IVersionedNodeType,
 	NodeHelpers,
 } from 'n8n-workflow';
 
+// TODO: delete this
 class NodeTypesClass implements INodeTypes {
 	nodeTypes: INodeTypeData = {
 		'test.set': {
@@ -80,7 +79,7 @@ class NodeTypesClass implements INodeTypes {
 		},
 	};
 
-	constructor(nodesAndCredentials?: INodesAndCredentials) {
+	constructor(nodesAndCredentials?: LoadNodesAndCredentials) {
 		if (nodesAndCredentials?.loaded?.nodes) {
 			this.nodeTypes = nodesAndCredentials?.loaded?.nodes;
 		}
@@ -97,7 +96,7 @@ class NodeTypesClass implements INodeTypes {
 
 let nodeTypesInstance: NodeTypesClass | undefined;
 
-export function NodeTypes(nodesAndCredentials?: INodesAndCredentials): NodeTypesClass {
+export function NodeTypes(nodesAndCredentials?: LoadNodesAndCredentials): NodeTypesClass {
 	if (nodeTypesInstance === undefined) {
 		nodeTypesInstance = new NodeTypesClass(nodesAndCredentials);
 	}
diff --git a/packages/cli/test/unit/Telemetry.test.ts b/packages/cli/test/unit/Telemetry.test.ts
index 67f4fec532ed02..5c5b4019d06aa4 100644
--- a/packages/cli/test/unit/Telemetry.test.ts
+++ b/packages/cli/test/unit/Telemetry.test.ts
@@ -45,7 +45,8 @@ describe('Telemetry', () => {
 		const postHog = new PostHogClient();
 		postHog.init(instanceId);
 
-		telemetry = new Telemetry(instanceId, postHog);
+		telemetry = new Telemetry(postHog);
+		telemetry.setInstanceId(instanceId);
 		(telemetry as any).rudderStack = {
 			flush: () => {},
 			identify: () => {},
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 7a77667f595a5d..34deb18f363a16 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -3,7 +3,6 @@ import * as NodeExecuteFunctions from './NodeExecuteFunctions';
 import * as UserSettings from './UserSettings';
 
 export * from './ActiveWorkflows';
-export * from './ActiveWebhooks';
 export * from './BinaryDataManager';
 export * from './ClassLoader';
 export * from './Constants';
diff --git a/patches/typedi@0.10.0.patch b/patches/typedi@0.10.0.patch
new file mode 100644
index 00000000000000..38f3b73e28c34f
--- /dev/null
+++ b/patches/typedi@0.10.0.patch
@@ -0,0 +1,12 @@
+diff --git a/cjs/container-instance.class.js b/cjs/container-instance.class.js
+index e473b1e652aa0b6e7462f7ba93fcef2812483b20..1e2ac7e5cb7943f5226a2bc25fa83bee0470f90c 100644
+--- a/cjs/container-instance.class.js
++++ b/cjs/container-instance.class.js
+@@ -234,6 +234,7 @@ class ContainerInstance {
+      */
+     initializeParams(target, paramTypes) {
+         return paramTypes.map((paramType, index) => {
++            if (paramType === undefined) throw new ReferenceError('Cannot inject an `undefined` dependency. Possibly a circular dependency detected');
+             const paramHandler = container_class_1.Container.handlers.find(handler => {
+                 /**
+                  * @Inject()-ed values are stored as parameter handlers and they reference their target
\ No newline at end of file
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 137ae4a86e1836..53d44a83fc3823 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -21,6 +21,9 @@ patchedDependencies:
   element-ui@2.15.12:
     hash: prckukfdop5sl2her6de25cod4
     path: patches/element-ui@2.15.12.patch
+  typedi@0.10.0:
+    hash: syy565ld7euwcedfbmx53j2qc4
+    path: patches/typedi@0.10.0.patch
 
 importers:
 
@@ -227,6 +230,7 @@ importers:
       posthog-node: ^2.2.2
       prom-client: ^13.1.0
       psl: ^1.8.0
+      reflect-metadata: ^0.1.13
       replacestream: ^4.0.3
       run-script-os: ^1.0.7
       semver: ^7.3.8
@@ -236,8 +240,10 @@ importers:
       sse-channel: ^4.0.0
       swagger-ui-express: ^4.3.0
       syslog-client: ^1.1.1
+      ts-essentials: ^7.0.3
       tsc-alias: ^1.8.2
       tsconfig-paths: ^4.1.2
+      typedi: ^0.10.0
       typeorm: ^0.3.12
       uuid: ^8.3.2
       validator: 13.7.0
@@ -320,6 +326,7 @@ importers:
       posthog-node: 2.2.2
       prom-client: 13.2.0
       psl: 1.9.0
+      reflect-metadata: 0.1.13
       replacestream: 4.0.3
       semver: 7.3.8
       shelljs: 0.8.5
@@ -328,6 +335,7 @@ importers:
       sse-channel: 4.0.0
       swagger-ui-express: 4.5.0_express@4.18.2
       syslog-client: 1.1.1
+      typedi: 0.10.0
       typeorm: 0.3.12_pgelcv6ef3switkrteavpif3pq
       uuid: 8.3.2
       validator: 13.7.0
@@ -381,6 +389,7 @@ importers:
       mock-jwks: 1.0.9_nock@13.2.9
       nodemon: 2.0.20
       run-script-os: 1.1.6
+      ts-essentials: 7.0.3_typescript@4.9.4
       tsc-alias: 1.8.2
       tsconfig-paths: 4.1.2
 
@@ -19491,6 +19500,10 @@ packages:
   /typedarray/0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
+  /typedi/0.10.0:
+    resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==}
+    dev: false
+
   /typeorm/0.3.12_pgelcv6ef3switkrteavpif3pq:
     resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
     engines: {node: '>= 12.9.0'}

From 17eff4d7d6692bfdc251bfa16ce7334858642ce5 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Tue, 21 Feb 2023 21:44:46 +0100
Subject: [PATCH 272/358] fix(core): Fix execution status filters (#5533)

* fix status filters

* fix countfilter

* add migrations to backfill status

* fix migrations
---
 packages/cli/src/Interfaces.ts                |  1 +
 packages/cli/src/Server.ts                    |  8 ++++++
 packages/cli/src/WaitTracker.ts               |  1 +
 .../1676996103000-MigrateExecutionStatus.ts   | 28 +++++++++++++++++++
 .../src/databases/migrations/mysqldb/index.ts |  2 ++
 .../1676996103000-MigrateExecutionStatus.ts   | 28 +++++++++++++++++++
 .../databases/migrations/postgresdb/index.ts  |  2 ++
 .../1676996103000-MigrateExecutionStatus.ts   | 28 +++++++++++++++++++
 .../src/databases/migrations/sqlite/index.ts  |  2 ++
 .../cli/src/executions/executionHelpers.ts    | 18 ++++++++++++
 .../cli/src/executions/executions.service.ts  | 16 ++++++++++-
 packages/editor-ui/src/Interface.ts           |  2 ++
 12 files changed, 135 insertions(+), 1 deletion(-)
 create mode 100644 packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts
 create mode 100644 packages/cli/src/executions/executionHelpers.ts

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 7910ef38e240fa..d1ea87ffac06e8 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -225,6 +225,7 @@ export interface IExecutionsStopData {
 	mode: WorkflowExecuteMode;
 	startedAt: Date;
 	stoppedAt?: Date;
+	status: ExecutionStatus;
 }
 
 export interface IExecutionsCurrentSummary {
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index aed725c7ae8475..efeabb4f42f2ea 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -145,6 +145,7 @@ import { eventBus } from './eventbus';
 import { isSamlEnabled } from './Saml/helpers';
 import { Container } from 'typedi';
 import { InternalHooks } from './InternalHooks';
+import { getStatusUsingPreviousExecutionStatusMethod } from './executions/executionHelpers';
 
 const exec = promisify(callbackExec);
 
@@ -986,6 +987,9 @@ class Server extends AbstractServer {
 						if (!executions.length) return [];
 
 						return executions.map((execution) => {
+							if (!execution.status) {
+								execution.status = getStatusUsingPreviousExecutionStatusMethod(execution);
+							}
 							return {
 								id: execution.id,
 								workflowId: execution.workflowId,
@@ -1020,6 +1024,7 @@ class Server extends AbstractServer {
 							mode: data.mode,
 							retryOf: data.retryOf,
 							startedAt: new Date(data.startedAt),
+							status: data.status,
 						});
 					}
 
@@ -1072,6 +1077,7 @@ class Server extends AbstractServer {
 							startedAt: new Date(result.startedAt),
 							stoppedAt: result.stoppedAt ? new Date(result.stoppedAt) : undefined,
 							finished: result.finished,
+							status: result.status,
 						} as IExecutionsStopData;
 					}
 
@@ -1098,6 +1104,7 @@ class Server extends AbstractServer {
 							? new Date(fullExecutionData.stoppedAt)
 							: undefined,
 						finished: fullExecutionData.finished,
+						status: fullExecutionData.status,
 					};
 
 					return returnData;
@@ -1116,6 +1123,7 @@ class Server extends AbstractServer {
 						startedAt: new Date(result.startedAt),
 						stoppedAt: result.stoppedAt ? new Date(result.stoppedAt) : undefined,
 						finished: result.finished,
+						status: result.status,
 					};
 				}
 
diff --git a/packages/cli/src/WaitTracker.ts b/packages/cli/src/WaitTracker.ts
index 435f4e9aa775b7..b36d49856f8e14 100644
--- a/packages/cli/src/WaitTracker.ts
+++ b/packages/cli/src/WaitTracker.ts
@@ -144,6 +144,7 @@ export class WaitTracker {
 			startedAt: new Date(fullExecutionData.startedAt),
 			stoppedAt: fullExecutionData.stoppedAt ? new Date(fullExecutionData.stoppedAt) : undefined,
 			finished: fullExecutionData.finished,
+			status: fullExecutionData.status,
 		};
 	}
 
diff --git a/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts b/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts
new file mode 100644
index 00000000000000..6c196148fc571a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1676996103000-MigrateExecutionStatus.ts
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
+	name = 'MigrateExecutionStatus1676996103000';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='waiting' WHERE status IS NULL AND \`waitTill\` IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='failed' WHERE status IS NULL AND finished=0 AND \`stoppedAt\` IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='success' WHERE status IS NULL AND finished=1 AND \`stoppedAt\` IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='crashed' WHERE status IS NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index af0240b4d20f24..db7ab0ff419d8c 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -32,6 +32,7 @@ import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-Dele
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
+import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -68,4 +69,5 @@ export const mysqlMigrations = [
 	CreateLdapEntities1674509946020,
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
+	MigrateExecutionStatus1676996103000,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts b/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts
new file mode 100644
index 00000000000000..fdfec47d7ed349
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1676996103000-MigrateExecutionStatus.ts
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
+	name = 'MigrateExecutionStatus1676996103000';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'waiting' WHERE "status" IS NULL AND "waitTill" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" IS NULL AND "finished"=false AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" IS NULL AND "finished"=true AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'crashed' WHERE "status" IS NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 1c19fa86bc3449..32b48f626c7617 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -30,6 +30,7 @@ import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-Dele
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
+import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
 
 export const postgresMigrations = [
 	InitialMigration1587669153312,
@@ -64,4 +65,5 @@ export const postgresMigrations = [
 	CreateLdapEntities1674509946020,
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
+	MigrateExecutionStatus1676996103000,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts b/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts
new file mode 100644
index 00000000000000..78334751ed7fa8
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1676996103000-MigrateExecutionStatus.ts
@@ -0,0 +1,28 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class MigrateExecutionStatus1676996103000 implements MigrationInterface {
+	name = 'MigrateExecutionStatus1676996103000';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'waiting' WHERE "status" IS NULL AND "waitTill" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" IS NULL AND "finished"=0 AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" IS NULL AND "finished"=1 AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'crashed' WHERE "status" IS NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index 01cd22f226ab30..eadb90effcc3c4 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -29,6 +29,7 @@ import { DeleteExecutionsWithWorkflows1673268682475 } from './1673268682475-Dele
 import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntities';
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
+import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
 
 const sqliteMigrations = [
 	InitialMigration1588102412422,
@@ -62,6 +63,7 @@ const sqliteMigrations = [
 	CreateLdapEntities1674509946020,
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
+	MigrateExecutionStatus1676996103000,
 ];
 
 export { sqliteMigrations };
diff --git a/packages/cli/src/executions/executionHelpers.ts b/packages/cli/src/executions/executionHelpers.ts
new file mode 100644
index 00000000000000..21ee792b05cbcc
--- /dev/null
+++ b/packages/cli/src/executions/executionHelpers.ts
@@ -0,0 +1,18 @@
+import type { IExecutionFlattedDb } from '../Interfaces';
+import type { ExecutionStatus } from 'n8n-workflow';
+
+export function getStatusUsingPreviousExecutionStatusMethod(
+	execution: IExecutionFlattedDb,
+): ExecutionStatus {
+	if (execution.waitTill) {
+		return 'waiting';
+	} else if (execution.stoppedAt === undefined) {
+		return 'running';
+	} else if (execution.finished) {
+		return 'success';
+	} else if (execution.stoppedAt !== null) {
+		return 'failed';
+	} else {
+		return 'unknown';
+	}
+}
diff --git a/packages/cli/src/executions/executions.service.ts b/packages/cli/src/executions/executions.service.ts
index 9aa23a0797a061..a4f9d05dcd4e45 100644
--- a/packages/cli/src/executions/executions.service.ts
+++ b/packages/cli/src/executions/executions.service.ts
@@ -35,6 +35,7 @@ import * as Db from '@/Db';
 import * as GenericHelpers from '@/GenericHelpers';
 import { parse } from 'flatted';
 import { Container } from 'typedi';
+import { getStatusUsingPreviousExecutionStatusMethod } from './executionHelpers';
 
 interface IGetExecutionsQueryFilter {
 	id?: FindOperator<string>;
@@ -213,7 +214,6 @@ export class ExecutionsService {
 		};
 		if (filter?.status) {
 			Object.assign(findWhere, { status: In(filter.status) });
-			delete filter.status; // remove status from filter so it does not get applied twice
 		}
 		if (filter?.finished) {
 			Object.assign(findWhere, { finished: filter.finished });
@@ -259,12 +259,18 @@ export class ExecutionsService {
 				'execution.startedAt',
 				'execution.stoppedAt',
 				'execution.workflowData',
+				'execution.status',
 			])
 			.orderBy('id', 'DESC')
 			.take(limit)
 			.where(findWhere);
 
 		const countFilter = deepCopy(filter ?? {});
+		// deepcopy breaks the In operator so we need to reapply it
+		if (filter?.status) {
+			Object.assign(filter, { status: In(filter.status) });
+			Object.assign(countFilter, { status: In(filter.status) });
+		}
 
 		if (filter) {
 			this.massageFilters(filter as IDataObject);
@@ -286,6 +292,10 @@ export class ExecutionsService {
 			const nodeExecutionStatus = {};
 			let lastNodeExecuted;
 			let executionError;
+			// fill execution status for old executions that will return null
+			if (!execution.status) {
+				execution.status = getStatusUsingPreviousExecutionStatusMethod(execution);
+			}
 			try {
 				const data = parse(execution.data) as IRunExecutionData;
 				lastNodeExecuted = data?.resultData?.lastNodeExecuted ?? '';
@@ -363,6 +373,10 @@ export class ExecutionsService {
 			return undefined;
 		}
 
+		if (!execution.status) {
+			execution.status = getStatusUsingPreviousExecutionStatusMethod(execution);
+		}
+
 		if (req.query.unflattedResponse === 'true') {
 			return ResponseHelper.unflattenExecutionData(execution);
 		}
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index dffc17b4ca581c..2d3bb99517200e 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -31,6 +31,7 @@ import {
 	IExecutionsSummary,
 	IAbstractEventMessage,
 	FeatureFlags,
+	ExecutionStatus,
 } from 'n8n-workflow';
 import { SignInType } from './constants';
 import { FAKE_DOOR_FEATURES, TRIGGER_NODE_FILTER, REGULAR_NODE_FILTER } from './constants';
@@ -383,6 +384,7 @@ export interface IExecutionsStopData {
 	mode: WorkflowExecuteMode;
 	startedAt: Date;
 	stoppedAt: Date;
+	status: ExecutionStatus;
 }
 
 export interface IExecutionDeleteFilter {

From 8d84e684cf5d565a6cc85c38ddb7b40047614466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 22 Feb 2023 13:14:29 +0100
Subject: [PATCH 273/358] ci: Check PR title on all branches, except release
 branches (no-changelog) (#5545)

---
 .github/workflows/check-pr-title.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
index 9ac4d71da564c1..f515d900e91475 100644
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -7,6 +7,7 @@ on:
       - edited
       - synchronize
     branches:
+      - '**'
       - '!release/*'
 
 jobs:

From 0fbb3f0f026432f1aea87b106a0c1f732f93c792 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Wed, 22 Feb 2023 14:20:06 +0100
Subject: [PATCH 274/358] fix(core): Do not remove empty output connections
 arrays in PurgeInvalidWorkflowConnections migration (#5546)

fix(cli): Do not remove empty output connections arrays in PurgeInvalidWorkflowConnections migration
---
 ...75940580449-PurgeInvalidWorkflowConnections.ts | 15 ---------------
 ...75940580449-PurgeInvalidWorkflowConnections.ts | 15 ---------------
 ...75940580449-PurgeInvalidWorkflowConnections.ts | 15 ---------------
 3 files changed, 45 deletions(-)

diff --git a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
index 2a805d09171986..5acf8c8b264f45 100644
--- a/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -58,22 +58,7 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
 						);
 					});
-
-					// Filter out output connection items that are empty
-					connection[outputConnectionName] = connection[outputConnectionName].filter(
-						(item) => item.length > 0,
-					);
-
-					// Delete the output connection container if it is empty
-					if (connection[outputConnectionName].length === 0) {
-						delete connection[outputConnectionName];
-					}
 				});
-
-				// Finally delete the source node if it has no output connections
-				if (Object.keys(connection).length === 0) {
-					delete connections[sourceNodeName];
-				}
 			});
 
 			// Update database with new connections
diff --git a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
index 8a87ef8919e061..1da69497e765ce 100644
--- a/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -50,22 +50,7 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
 						);
 					});
-
-					// Filter out output connection items that are empty
-					connection[outputConnectionName] = connection[outputConnectionName].filter(
-						(item) => item.length > 0,
-					);
-
-					// Delete the output connection container if it is empty
-					if (connection[outputConnectionName].length === 0) {
-						delete connection[outputConnectionName];
-					}
 				});
-
-				// Finally delete the source node if it has no output connections
-				if (Object.keys(connection).length === 0) {
-					delete connections[sourceNodeName];
-				}
 			});
 
 			// Update database with new connections
diff --git a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
index fe03f3ccaea6b3..8207f2c8f3f2d4 100644
--- a/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1675940580449-PurgeInvalidWorkflowConnections.ts
@@ -51,22 +51,7 @@ export class PurgeInvalidWorkflowConnections1675940580449 implements MigrationIn
 								!nodesThatCannotReceiveInput.includes(outgoingConnections.node),
 						);
 					});
-
-					// Filter out output connection items that are empty
-					connection[outputConnectionName] = connection[outputConnectionName].filter(
-						(item) => item.length > 0,
-					);
-
-					// Delete the output connection container if it is empty
-					if (connection[outputConnectionName].length === 0) {
-						delete connection[outputConnectionName];
-					}
 				});
-
-				// Finally delete the source node if it has no output connections
-				if (Object.keys(connection).length === 0) {
-					delete connections[sourceNodeName];
-				}
 			});
 
 			// Update database with new connections

From e2514393335e555af47c9aca4f81b31608df9cb5 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <janober@users.noreply.github.com>
Date: Wed, 22 Feb 2023 15:54:52 +0100
Subject: [PATCH 275/358] fix(Discord Node): Fix wrong error message being
 displayed (#5547)

---
 packages/nodes-base/nodes/Discord/Discord.node.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/Discord/Discord.node.ts b/packages/nodes-base/nodes/Discord/Discord.node.ts
index e656db9d872dbc..905de0805ed2c5 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.ts
+++ b/packages/nodes-base/nodes/Discord/Discord.node.ts
@@ -133,16 +133,16 @@ export class Discord implements INodeType {
 				try {
 					//@ts-expect-error
 					body.embeds = JSON.parse(options.embeds);
-					if (!Array.isArray(body.embeds)) {
-						throw new NodeOperationError(this.getNode(), 'Embeds must be an array of embeds.', {
-							itemIndex: i,
-						});
-					}
 				} catch (e) {
 					throw new NodeOperationError(this.getNode(), 'Embeds must be valid JSON.', {
 						itemIndex: i,
 					});
 				}
+				if (!Array.isArray(body.embeds)) {
+					throw new NodeOperationError(this.getNode(), 'Embeds must be an array of embeds.', {
+						itemIndex: i,
+					});
+				}
 			}
 			if (options.username) {
 				body.username = options.username as string;

From 1bff044252009d8794229b7e533265eaf478146e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 23 Feb 2023 08:51:08 +0100
Subject: [PATCH 276/358] refactor(WhatsApp Node): Avoid using
 BinaryDataManager directly from n8n-core (#5544)

---
 .../nodes/WhatsApp/MediaFunctions.ts          | 52 ++++++++++---------
 .../nodes/WhatsApp/MessageFunctions.ts        | 37 ++-----------
 2 files changed, 33 insertions(+), 56 deletions(-)

diff --git a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
index c2f1624228048d..40298e00ab9191 100644
--- a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
@@ -3,38 +3,42 @@ import { NodeOperationError } from 'n8n-workflow';
 
 import FormData from 'form-data';
 
-export async function setupUpload(
+export async function getUploadFormData(
 	this: IExecuteSingleFunctions,
-	requestOptions: IHttpRequestOptions,
-) {
-	const mediaPropertyName = this.getNodeParameter('mediaPropertyName') as string;
-	if (!mediaPropertyName) {
-		return requestOptions;
-	}
-	if (this.getInputData().binary?.[mediaPropertyName] === undefined || !mediaPropertyName.trim()) {
-		throw new NodeOperationError(this.getNode(), 'Could not find file in node input data', {
-			description: `There’s no key called '${mediaPropertyName}' with binary data in it`,
-		});
-	}
-	const binaryFile = this.getInputData().binary![mediaPropertyName]!;
+): Promise<{ fileName: string; formData: FormData }> {
+	const mediaPropertyName = ((this.getNodeParameter('mediaPropertyName') as string) || '').trim();
+	if (!mediaPropertyName)
+		throw new NodeOperationError(this.getNode(), 'Parameter "mediaPropertyName" is not defined');
+
+	const { binary: binaryData } = this.getInputData();
+	if (!binaryData) throw new NodeOperationError(this.getNode(), 'Binary data missing in input');
+
+	const binaryFile = binaryData[mediaPropertyName];
+	if (binaryFile === undefined)
+		throw new NodeOperationError(this.getNode(), 'Could not find file in node input data');
+
 	const mediaFileName = (this.getNodeParameter('additionalFields') as IDataObject).mediaFileName as
 		| string
 		| undefined;
-	const binaryFileName = binaryFile.fileName;
-	if (!mediaFileName && !binaryFileName) {
+
+	const fileName = mediaFileName || binaryFile.fileName;
+	if (!fileName)
 		throw new NodeOperationError(this.getNode(), 'No file name given for media upload.');
-	}
-	const mimeType = binaryFile.mimeType;
 
 	const buffer = await this.helpers.getBinaryDataBuffer(mediaPropertyName);
 
-	const data = new FormData();
-	data.append('file', buffer, {
-		contentType: mimeType,
-		filename: mediaFileName || binaryFileName,
-	});
-	data.append('messaging_product', 'whatsapp');
+	const formData = new FormData();
+	formData.append('file', buffer, { contentType: binaryFile.mimeType, filename: fileName });
+	formData.append('messaging_product', 'whatsapp');
 
-	requestOptions.body = data;
+	return { fileName, formData };
+}
+
+export async function setupUpload(
+	this: IExecuteSingleFunctions,
+	requestOptions: IHttpRequestOptions,
+) {
+	const uploadData = await getUploadFormData.call(this);
+	requestOptions.body = uploadData.formData;
 	return requestOptions;
 }
diff --git a/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts b/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
index 09aafd989c394a..ec0e217b546ea5 100644
--- a/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MessageFunctions.ts
@@ -1,5 +1,4 @@
 import set from 'lodash.set';
-import { BinaryDataManager } from 'n8n-core';
 import type {
 	IDataObject,
 	IExecuteSingleFunctions,
@@ -8,9 +7,9 @@ import type {
 	INodeExecutionData,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
 
-import FormData from 'form-data';
+import { getUploadFormData } from './MediaFunctions';
 
 interface WhatsAppApiError {
 	error: {
@@ -62,29 +61,7 @@ export async function mediaUploadFromItem(
 	this: IExecuteSingleFunctions,
 	requestOptions: IHttpRequestOptions,
 ) {
-	const mediaPropertyName = this.getNodeParameter('mediaPropertyName') as string;
-	if (this.getInputData().binary?.[mediaPropertyName] === undefined) {
-		throw new NodeOperationError(
-			this.getNode(),
-			`The binary property "${mediaPropertyName}" does not exist. So no file can be written!`,
-		);
-	}
-	const binaryFile = this.getInputData().binary![mediaPropertyName]!;
-	const mediaFileName = (this.getNodeParameter('additionalFields') as IDataObject).mediaFilename as
-		| string
-		| undefined;
-	const binaryFileName = binaryFile.fileName;
-	if (!mediaFileName && !binaryFileName) {
-		throw new NodeOperationError(this.getNode(), 'No file name given for media upload.');
-	}
-	const mimeType = binaryFile.mimeType;
-
-	const data = new FormData();
-	data.append('file', await BinaryDataManager.getInstance().retrieveBinaryData(binaryFile), {
-		contentType: mimeType,
-		filename: mediaFileName || binaryFileName,
-	});
-	data.append('messaging_product', 'whatsapp');
+	const uploadData = await getUploadFormData.call(this);
 
 	const phoneNumberId = this.getNodeParameter('phoneNumberId') as string;
 
@@ -92,7 +69,7 @@ export async function mediaUploadFromItem(
 		url: `/${phoneNumberId}/media`,
 		baseURL: requestOptions.baseURL,
 		method: 'POST',
-		body: data,
+		body: uploadData.formData,
 	})) as IDataObject;
 
 	const operation = this.getNodeParameter('messageType') as string;
@@ -101,11 +78,7 @@ export async function mediaUploadFromItem(
 	}
 	set(requestOptions.body as IDataObject, `${operation}.id`, result.id);
 	if (operation === 'document') {
-		set(
-			requestOptions.body as IDataObject,
-			`${operation}.filename`,
-			mediaFileName || binaryFileName,
-		);
+		set(requestOptions.body as IDataObject, `${operation}.filename`, uploadData.fileName);
 	}
 
 	return requestOptions;

From 4a209e1dd98ea4b43d0a4d9cd688615cd6d4d5dd Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Thu, 23 Feb 2023 09:31:46 +0100
Subject: [PATCH 277/358] feat: Hide sensible value in Auth Header Credentials
 and Auth Query Credentials (#5534)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡️ Enable passord type on value

* ⚡️ Enable password type on query auth cred
---
 packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts | 3 +++
 packages/nodes-base/credentials/HttpQueryAuth.credentials.ts  | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts b/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts
index 22e4545f0f78cb..304b44d7fcc2bd 100644
--- a/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts
+++ b/packages/nodes-base/credentials/HttpHeaderAuth.credentials.ts
@@ -22,6 +22,9 @@ export class HttpHeaderAuth implements ICredentialType {
 			displayName: 'Value',
 			name: 'value',
 			type: 'string',
+			typeOptions: {
+				password: true,
+			},
 			default: '',
 		},
 	];
diff --git a/packages/nodes-base/credentials/HttpQueryAuth.credentials.ts b/packages/nodes-base/credentials/HttpQueryAuth.credentials.ts
index 713c30bae58946..c2ae9c474138b3 100644
--- a/packages/nodes-base/credentials/HttpQueryAuth.credentials.ts
+++ b/packages/nodes-base/credentials/HttpQueryAuth.credentials.ts
@@ -22,6 +22,9 @@ export class HttpQueryAuth implements ICredentialType {
 			displayName: 'Value',
 			name: 'value',
 			type: 'string',
+			typeOptions: {
+				password: true,
+			},
 			default: '',
 		},
 	];

From 3af3db160b5798fe948159b6f3dd48ec743512e7 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Thu, 23 Feb 2023 08:33:43 +0000
Subject: [PATCH 278/358] fix: fix typo in error messages when a property does
 not exist (#4310)

---
 .../nodes/Aws/Rekognition/AwsRekognition.node.ts     |  2 +-
 packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts       |  2 +-
 .../nodes/Aws/Textract/AwsTextract.node.ts           |  2 +-
 .../v1/actions/employeeDocument/upload/execute.ts    |  2 +-
 .../nodes/BambooHr/v1/actions/file/upload/execute.ts |  2 +-
 packages/nodes-base/nodes/Box/Box.node.ts            |  2 +-
 .../nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts    |  2 +-
 .../nodes-base/nodes/Compression/Compression.node.ts |  4 ++--
 packages/nodes-base/nodes/Cortex/Cortex.node.ts      |  6 +++---
 packages/nodes-base/nodes/Dropbox/Dropbox.node.ts    |  2 +-
 .../nodes/Facebook/FacebookGraphApi.node.ts          |  2 +-
 packages/nodes-base/nodes/Ftp/Ftp.node.ts            |  4 ++--
 packages/nodes-base/nodes/Github/Github.node.ts      |  2 +-
 packages/nodes-base/nodes/Gitlab/Gitlab.node.ts      |  2 +-
 .../nodes/Google/CloudStorage/ObjectDescription.ts   |  2 +-
 .../nodes/Google/Drive/GoogleDrive.node.ts           |  2 +-
 .../nodes-base/nodes/Google/YouTube/YouTube.node.ts  |  4 ++--
 .../nodes/HttpRequest/V1/HttpRequestV1.node.ts       |  4 ++--
 .../nodes/HttpRequest/V2/HttpRequestV2.node.ts       |  4 ++--
 .../nodes-base/nodes/HumanticAI/HumanticAi.node.ts   |  4 ++--
 packages/nodes-base/nodes/Jira/Jira.node.ts          |  2 +-
 packages/nodes-base/nodes/Keap/Keap.node.ts          |  4 ++--
 packages/nodes-base/nodes/Line/Line.node.ts          |  2 +-
 packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts  |  2 +-
 packages/nodes-base/nodes/Matrix/GenericFunctions.ts |  2 +-
 .../Microsoft/OneDrive/MicrosoftOneDrive.node.ts     |  2 +-
 .../nodes/Microsoft/Outlook/GenericFunctions.ts      |  2 +-
 .../nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts |  2 +-
 packages/nodes-base/nodes/Mindee/Mindee.node.ts      |  4 ++--
 .../nodes-base/nodes/NextCloud/NextCloud.node.ts     |  2 +-
 packages/nodes-base/nodes/NocoDB/NocoDB.node.ts      |  4 ++--
 .../nodes-base/nodes/Pipedrive/Pipedrive.node.ts     |  2 +-
 .../nodes-base/nodes/Pushbullet/Pushbullet.node.ts   |  2 +-
 packages/nodes-base/nodes/Pushover/Pushover.node.ts  |  2 +-
 .../nodes/RespondToWebhook/RespondToWebhook.node.ts  |  2 +-
 packages/nodes-base/nodes/S3/S3.node.ts              |  2 +-
 .../nodes-base/nodes/SendInBlue/GenericFunctions.ts  |  2 +-
 .../nodes-base/nodes/ServiceNow/ServiceNow.node.ts   |  2 +-
 packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts   |  2 +-
 packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts   |  2 +-
 packages/nodes-base/nodes/Ssh/Ssh.node.ts            |  2 +-
 packages/nodes-base/nodes/TheHive/TheHive.node.ts    |  8 ++++----
 packages/nodes-base/nodes/Twist/Twist.node.ts        | 12 ++++++------
 packages/nodes-base/nodes/Xml/Xml.node.ts            |  2 +-
 packages/nodes-base/nodes/Zulip/Zulip.node.ts        |  2 +-
 45 files changed, 64 insertions(+), 64 deletions(-)

diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
index fee4e219567e2d..0e63a26fd5ca2f 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
@@ -426,7 +426,7 @@ export class AwsRekognition implements INodeType {
 								if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryPropertyName}" does not exists on item!`,
+										`Item has no binary property called "${binaryPropertyName}"`,
 										{ itemIndex: i },
 									);
 								}
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index 04838794ba51de..d5c368b1c68c0b 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -847,7 +847,7 @@ export class AwsS3 implements INodeType {
 							if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
index 8d8e0d667819d0..ab89528b97c7b5 100644
--- a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
@@ -128,7 +128,7 @@ export class AwsTextract implements INodeType {
 					if ((items[i].binary as IBinaryKeyData)[binaryProperty] === undefined) {
 						throw new NodeOperationError(
 							this.getNode(),
-							`No binary data property "${binaryProperty}" does not exists on item!`,
+							`Item has no binary property called "${binaryProperty}"`,
 							{ itemIndex: i },
 						);
 					}
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts
index 9d18024e98ee8c..defb028535c954 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts
@@ -25,7 +25,7 @@ export async function upload(this: IExecuteFunctions, index: number) {
 	if (items[index]!.binary![propertyNameUpload] === undefined) {
 		throw new NodeOperationError(
 			this.getNode(),
-			`No binary data property "${propertyNameUpload}" does not exists on item!`,
+			`Item has no binary property called "${propertyNameUpload}"`,
 			{ itemIndex: index },
 		);
 	}
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts
index 67156c4601a7fa..3644ae4537f9f6 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts
@@ -25,7 +25,7 @@ export async function upload(this: IExecuteFunctions, index: number) {
 	if (items[index]!.binary![propertyNameUpload] === undefined) {
 		throw new NodeOperationError(
 			this.getNode(),
-			`No binary data property "${propertyNameUpload}" does not exists on item!`,
+			`Item has no binary property called "${propertyNameUpload}"`,
 			{ itemIndex: index },
 		);
 	}
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index ec9577238f22cf..498bfad8e9cfec 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -288,7 +288,7 @@ export class Box implements INodeType {
 							if (items[i].binary[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts b/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
index 0b4db0b19b880c..57c59fe74fb59f 100644
--- a/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
+++ b/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
@@ -83,7 +83,7 @@ export class CitrixAdc implements INodeType {
 						if (item.binary[binaryProperty] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryProperty}" does not exists on item!`,
+								`The binary data property "${binaryProperty}" does not exists on item!`,
 							);
 						}
 
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.ts b/packages/nodes-base/nodes/Compression/Compression.node.ts
index 0f220739ae5870..da697216cf13e7 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression/Compression.node.ts
@@ -205,7 +205,7 @@ export class Compression implements INodeType {
 						if (items[i].binary[binaryPropertyName] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 								{ itemIndex: i },
 							);
 						}
@@ -276,7 +276,7 @@ export class Compression implements INodeType {
 						if (items[i].binary[binaryPropertyName] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 								{ itemIndex: i },
 							);
 						}
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 60109476e202c5..45933f2b4a8f0e 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -206,7 +206,7 @@ export class Cortex implements INodeType {
 							if (item.binary[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
@@ -352,7 +352,7 @@ export class Cortex implements INodeType {
 												if (item.binary[binaryPropertyName] === undefined) {
 													throw new NodeOperationError(
 														this.getNode(),
-														`No binary data property '${binaryPropertyName}' does not exists on item!`,
+														`Item has no binary property called "${binaryPropertyName}"`,
 														{ itemIndex: i },
 													);
 												}
@@ -386,7 +386,7 @@ export class Cortex implements INodeType {
 									if (item.binary[binaryPropertyName] === undefined) {
 										throw new NodeOperationError(
 											this.getNode(),
-											`No binary data property "${binaryPropertyName}" does not exists on item!`,
+											`Item has no binary property called "${binaryPropertyName}"`,
 											{ itemIndex: i },
 										);
 									}
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index 642a1f500fe724..8a09f9c7316fa7 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -774,7 +774,7 @@ export class Dropbox implements INodeType {
 							if (item.binary[propertyNameUpload] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${propertyNameUpload}" does not exists on item!`,
+									`Item has no binary property called "${propertyNameUpload}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 9164b6bf9e8ce7..4b10c8e2ff5bf1 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -386,7 +386,7 @@ export class FacebookGraphApi implements INodeType {
 				if (item.binary[binaryPropertyName] === undefined) {
 					throw new NodeOperationError(
 						this.getNode(),
-						`No binary data property "${binaryPropertyName}" does not exists on item!`,
+						`Item has no binary property called "${binaryPropertyName}"`,
 						{ itemIndex },
 					);
 				}
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index b6c04851bee33c..71e8d49ed5f05f 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -637,7 +637,7 @@ export class Ftp implements INodeType {
 							if (itemBinaryData === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${propertyNameUpload}" does not exists on item!`,
+									`Item has no binary property called "${propertyNameUpload}"`,
 									{ itemIndex: i },
 								);
 							}
@@ -763,7 +763,7 @@ export class Ftp implements INodeType {
 							if (itemBinaryData === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${propertyNameUpload}" does not exists on item!`,
+									`Item has no binary property called "${propertyNameUpload}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index bc24c32bf6b89a..5dac88eb7f47bf 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -1835,7 +1835,7 @@ export class Github implements INodeType {
 							if (item.binary[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index 4f33ee0489d168..a4023ced8a6cbf 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -1586,7 +1586,7 @@ export class Gitlab implements INodeType {
 							if (item.binary[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
index 661f33c026ad6d..1ea47efdd37c75 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
@@ -160,7 +160,7 @@ export const objectOperations: INodeProperties[] = [
 									if (item.binary[binaryPropertyName] === undefined) {
 										throw new NodeOperationError(
 											this.getNode(),
-											`No binary data property "${binaryPropertyName}" does not exist on item!`,
+											`Item has no binary property called "${binaryPropertyName}"`,
 											{ itemIndex: this.getItemIndex() },
 										);
 									}
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index dffd96ccbc529f..e57b4682411ccd 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -2448,7 +2448,7 @@ export class GoogleDrive implements INodeType {
 							if (binary === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${propertyNameUpload}" does not exists on item!`,
+									`Item has no binary property called "${propertyNameUpload}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 78a10cc13120c2..b1e7494223871d 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -402,7 +402,7 @@ export class YouTube implements INodeType {
 						if (item.binary[binaryProperty] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryProperty}" does not exists on item!`,
+								`Item has no binary property called "${binaryProperty}"`,
 								{ itemIndex: i },
 							);
 						}
@@ -867,7 +867,7 @@ export class YouTube implements INodeType {
 						if (binaryData === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryProperty}" does not exists on item!`,
+								`Item has no binary property called "${binaryProperty}"`,
 								{ itemIndex: i },
 							);
 						}
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index a8400c3e46bc7d..125da63a10ac71 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -749,7 +749,7 @@ export class HttpRequestV1 implements INodeType {
 								if (item.binary[binaryPropertyName] === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryPropertyName}" does not exists on item!`,
+										`Item has no binary property called "${binaryPropertyName}"`,
 										{ itemIndex },
 									);
 								}
@@ -787,7 +787,7 @@ export class HttpRequestV1 implements INodeType {
 									if (item.binary[binaryPropertyName] === undefined) {
 										throw new NodeOperationError(
 											this.getNode(),
-											`No binary data property "${binaryPropertyName}" does not exists on item!`,
+											`Item has no binary property called "${binaryPropertyName}"`,
 										);
 									}
 
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index b1d8b024a30a1f..5b85cf4fee4df4 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -787,7 +787,7 @@ export class HttpRequestV2 implements INodeType {
 								if (item.binary[binaryPropertyName] === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryPropertyName}" does not exists on item!`,
+										`Item has no binary property called "${binaryPropertyName}"`,
 										{ itemIndex },
 									);
 								}
@@ -825,7 +825,7 @@ export class HttpRequestV2 implements INodeType {
 									if (item.binary[binaryPropertyName] === undefined) {
 										throw new NodeOperationError(
 											this.getNode(),
-											`No binary data property "${binaryPropertyName}" does not exists on item!`,
+											`Item has no binary property called "${binaryPropertyName}"`,
 										);
 									}
 
diff --git a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
index dd208abb0c2f26..de626c53443ef1 100644
--- a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
+++ b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
@@ -86,7 +86,7 @@ export class HumanticAi implements INodeType {
 						if (binaryData === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 								{ itemIndex: i },
 							);
 						}
@@ -159,7 +159,7 @@ export class HumanticAi implements INodeType {
 						if (binaryData === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 								{ itemIndex: i },
 							);
 						}
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 8e0fab831660cb..37aabd30637652 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1069,7 +1069,7 @@ export class Jira implements INodeType {
 					if (binaryData === undefined) {
 						throw new NodeOperationError(
 							this.getNode(),
-							`No binary data property "${binaryPropertyName}" does not exists on item!`,
+							`Item has no binary property called "${binaryPropertyName}"`,
 							{ itemIndex: i },
 						);
 					}
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 30fa2fc9c365c7..68aea197ebe617 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -758,7 +758,7 @@ export class Keap implements INodeType {
 								if (item[property as string] === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`Binary data property "${property}" does not exists on item!`,
+										`Item has no binary property called "${property}"`,
 										{ itemIndex: i },
 									);
 								}
@@ -840,7 +840,7 @@ export class Keap implements INodeType {
 						if (item[binaryPropertyName] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 								{ itemIndex: i },
 							);
 						}
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index 8cec35fb9d0b6c..ab7c00e7b58cb4 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -106,7 +106,7 @@ export class Line implements INodeType {
 								if (items[i].binary[image.binaryProperty] === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${image.binaryProperty}" does not exists on item!`,
+										`Item has no binary property called "${image.binaryProperty}"`,
 										{ itemIndex: i },
 									);
 								}
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index 07ae1ba6d6d570..c3fccf6a7b6fd3 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -150,7 +150,7 @@ export class LinkedIn implements INodeType {
 							if (item.binary[propertyNameUpload] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${propertyNameUpload}" does not exists on item!`,
+									`Item has no binary property called "${propertyNameUpload}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index 39a86bbb373309..321223315c004f 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -198,7 +198,7 @@ export async function handleMatrixCall(
 			) {
 				throw new NodeOperationError(
 					this.getNode(),
-					`No binary data property "${binaryPropertyName}" does not exists on item!`,
+					`Item has no binary property called "${binaryPropertyName}"`,
 				);
 			}
 
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index 957903bc67ec7a..dfd3d538588dda 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -206,7 +206,7 @@ export class MicrosoftOneDrive implements INodeType {
 							if (items[i].binary[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
index a4256b9f50255c..4784cd6f3c72e1 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
@@ -241,7 +241,7 @@ export async function binaryToAttachments(
 			if (binary[binaryPropertyName] === undefined) {
 				throw new NodeOperationError(
 					this.getNode(),
-					`No binary data property "${binaryPropertyName}" does not exists on item!`,
+					`Item has no binary property called "${binaryPropertyName}"`,
 					{ itemIndex: i },
 				);
 			}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
index a99cc502fb460a..95c180cb79d57a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
@@ -641,7 +641,7 @@ export class MicrosoftOutlook implements INodeType {
 						if (items[i].binary[binaryPropertyName] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 								{ itemIndex: i },
 							);
 						}
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index 8d160bd3d72280..72cc1fbc406f79 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -178,7 +178,7 @@ export class Mindee implements INodeType {
 						if (binaryData === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 							);
 						}
 						if (version === 1) {
@@ -249,7 +249,7 @@ export class Mindee implements INodeType {
 						if (binaryData === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 							);
 						}
 						if (version === 1) {
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index bf73c70bde4f2c..69fba75c92c2ef 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -915,7 +915,7 @@ export class NextCloud implements INodeType {
 							if (item.binary[propertyNameUpload] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${propertyNameUpload}" does not exists on item!`,
+									`Item has no binary property called "${propertyNameUpload}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
index e955d93380ae57..bffbefd5578a16 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -273,7 +273,7 @@ export class NocoDB implements INodeType {
 								if (binaryPropertyName && !items[i].binary![binaryPropertyName]) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`Binary property ${binaryPropertyName} does not exist on item!`,
+										`Item has no binary property called "${binaryPropertyName}"`,
 										{ itemIndex: i },
 									);
 								}
@@ -583,7 +583,7 @@ export class NocoDB implements INodeType {
 								if (binaryPropertyName && !items[i].binary![binaryPropertyName]) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`Binary property ${binaryPropertyName} does not exist on item!`,
+										`Item has no binary property called "${binaryPropertyName}"`,
 										{ itemIndex: i },
 									);
 								}
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index f95f49f1c7b98c..bdcccc7a6d47b9 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -4350,7 +4350,7 @@ export class Pipedrive implements INodeType {
 						if (item.binary[binaryPropertyName] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryPropertyName}" does not exists on item!`,
+								`Item has no binary property called "${binaryPropertyName}"`,
 								{ itemIndex: i },
 							);
 						}
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 1bd0f5eebbed29..2283d9882936cc 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -416,7 +416,7 @@ export class Pushbullet implements INodeType {
 							if (items[i].binary[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index e68d546060fb00..94bca1060231e3 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -353,7 +353,7 @@ export class Pushover implements INodeType {
 								if (binaryData === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryPropertyName}" does not exists on item!`,
+										`Item has no binary property called "${binaryPropertyName}"`,
 										{ itemIndex: i },
 									);
 								}
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index c85f3dad5f35d4..8af6f7be067c8e 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -244,7 +244,7 @@ export class RespondToWebhook implements INodeType {
 			if (binaryData === undefined) {
 				throw new NodeOperationError(
 					this.getNode(),
-					`No binary data property "${responseBinaryPropertyName}" does not exists on item!`,
+					`Item has no binary property called "${responseBinaryPropertyName}"`,
 				);
 			}
 
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index 6cab88c6be41f3..341efa1e0d65e8 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -846,7 +846,7 @@ export class S3 implements INodeType {
 							if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
index 36d7fc2c3b93de..61519aef7e4926 100644
--- a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
@@ -91,7 +91,7 @@ export namespace SendInBlueNode {
 					if (item.binary![binaryPropertyAttachmentName] === undefined) {
 						throw new NodeOperationError(
 							this.getNode(),
-							`No binary data property “${binaryPropertyAttachmentName}” exists on item!`,
+							`Item has no binary property called "${binaryPropertyName}"`,
 						);
 					}
 
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
index 1cb9592b0881ca..0c80b680952ab3 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -612,7 +612,7 @@ export class ServiceNow implements INodeType {
 						} else {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${inputDataFieldName}" does not exists on item!`,
+								`Item has no binary property called "${inputDataFieldName}"`,
 								{ itemIndex: i },
 							);
 						}
diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
index 261129648e631b..fc409eb6aec5c9 100644
--- a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
+++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
@@ -1102,7 +1102,7 @@ export class SlackV1 implements INodeType {
 							) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 6304df6bf1e8d2..0d0afcc2e16966 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -1068,7 +1068,7 @@ export class SlackV2 implements INodeType {
 							) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${binaryPropertyName}" does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 5d28ba8861775e..b846ecb67971e0 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -356,7 +356,7 @@ export class Ssh implements INodeType {
 							if (item.binary[propertyNameUpload] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property "${propertyNameUpload}" does not exists on item!`,
+									`Item has no binary property called "${propertyNameUpload}"`,
 									{ itemIndex: i },
 								);
 							}
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index 5df283dbbb2786..6e35b7ef58b0bc 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -442,7 +442,7 @@ export class TheHive implements INodeType {
 										if (item.binary[binaryPropertyName] === undefined) {
 											throw new NodeOperationError(
 												this.getNode(),
-												`No binary data property '${binaryPropertyName}' does not exists on item!`,
+												`Item has no binary property called "${binaryPropertyName}"`,
 												{ itemIndex: i },
 											);
 										}
@@ -719,7 +719,7 @@ export class TheHive implements INodeType {
 										if (item.binary[binaryPropertyName] === undefined) {
 											throw new NodeOperationError(
 												this.getNode(),
-												`No binary data property '${binaryPropertyName}' does not exists on item!`,
+												`Item has no binary property called "${binaryPropertyName}"`,
 												{ itemIndex: i },
 											);
 										}
@@ -914,7 +914,7 @@ export class TheHive implements INodeType {
 							if (item.binary[binaryPropertyName] === undefined) {
 								throw new NodeOperationError(
 									this.getNode(),
-									`No binary data property '${binaryPropertyName}' does not exists on item!`,
+									`Item has no binary property called "${binaryPropertyName}"`,
 									{ itemIndex: i },
 								);
 							}
@@ -1770,7 +1770,7 @@ export class TheHive implements INodeType {
 								if (item.binary[binaryPropertyName] === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property '${binaryPropertyName}' does not exists on item!`,
+										`Item has no binary property called "${binaryPropertyName}"`,
 										{ itemIndex: i },
 									);
 								}
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index 1830d89e859c5a..6992ac7b0c006c 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -261,7 +261,7 @@ export class Twist implements INodeType {
 								if (binaryData === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryProperty}" does not exists on item!`,
+										`Item has no binary property called "${binaryProperty}"`,
 										{ itemIndex: i },
 									);
 								}
@@ -370,7 +370,7 @@ export class Twist implements INodeType {
 								if (binaryData === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryProperty}" does not exists on item!`,
+										`Item has no binary property called "${binaryProperty}"`,
 										{ itemIndex: i },
 									);
 								}
@@ -449,7 +449,7 @@ export class Twist implements INodeType {
 								if (binaryData === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryProperty}" does not exists on item!`,
+										`Item has no binary property called "${binaryProperty}"`,
 										{ itemIndex: i },
 									);
 								}
@@ -574,7 +574,7 @@ export class Twist implements INodeType {
 								if (binaryData === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryProperty}" does not exists on item!`,
+										`Item has no binary property called "${binaryProperty}"`,
 										{ itemIndex: i },
 									);
 								}
@@ -658,7 +658,7 @@ export class Twist implements INodeType {
 								if (binaryData === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryProperty}" does not exists on item!`,
+										`Item has no binary property called "${binaryProperty}"`,
 										{ itemIndex: i },
 									);
 								}
@@ -766,7 +766,7 @@ export class Twist implements INodeType {
 								if (binaryData === undefined) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`No binary data property "${binaryProperty}" does not exists on item!`,
+										`Item has no binary property called "${binaryProperty}"`,
 										{ itemIndex: i },
 									);
 								}
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.ts b/packages/nodes-base/nodes/Xml/Xml.node.ts
index 302dcd641e1b99..ef02376007c0f4 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -239,7 +239,7 @@ export class Xml implements INodeType {
 					if (item.json[dataPropertyName] === undefined) {
 						throw new NodeOperationError(
 							this.getNode(),
-							`No json property "${dataPropertyName}" does not exists on item!`,
+							`Item has no JSON property called "${dataPropertyName}"`,
 							{ itemIndex },
 						);
 					}
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index f2840bdc40b968..4bed35caa8001c 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -200,7 +200,7 @@ export class Zulip implements INodeType {
 						if (items[i].binary[binaryProperty] === undefined) {
 							throw new NodeOperationError(
 								this.getNode(),
-								`No binary data property "${binaryProperty}" does not exists on item!`,
+								`Item has no binary property called "${binaryProperty}"`,
 								{ itemIndex: i },
 							);
 						}

From f965469e13a45d3a7b796dfd6be44573bf8b13d0 Mon Sep 17 00:00:00 2001
From: Jonathan Bennetts <jonathan.bennetts@gmail.com>
Date: Thu, 23 Feb 2023 08:34:41 +0000
Subject: [PATCH 279/358] fix(Google Calendar Node): Fix incorrect labels for
 start and end times when getting all events (#5529)

---
 .../nodes/Google/Calendar/EventDescription.ts | 28 +++++++++----------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
index 7bc486862b39ca..6383c04a0d44de 100644
--- a/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/EventDescription.ts
@@ -642,6 +642,20 @@ export const eventFields: INodeProperties[] = [
 			},
 		},
 		options: [
+			{
+				displayName: 'After',
+				name: 'timeMin',
+				type: 'dateTime',
+				default: '',
+				description: 'At least some part of the event must be after this time',
+			},
+			{
+				displayName: 'Before',
+				name: 'timeMax',
+				type: 'dateTime',
+				default: '',
+				description: 'At least some part of the event must be before this time',
+			},
 			{
 				displayName: 'iCalUID',
 				name: 'iCalUID',
@@ -708,20 +722,6 @@ export const eventFields: INodeProperties[] = [
 				description:
 					'Whether to expand recurring events into instances and only return single one-off events and instances of recurring events, but not the underlying recurring events themselves',
 			},
-			{
-				displayName: 'Start Time',
-				name: 'timeMax',
-				type: 'dateTime',
-				default: '',
-				description: "Upper bound (exclusive) for an event's start time to filter by",
-			},
-			{
-				displayName: 'End Time',
-				name: 'timeMin',
-				type: 'dateTime',
-				default: '',
-				description: "Lower bound (exclusive) for an event's end time to filter by",
-			},
 			{
 				displayName: 'Timezone',
 				name: 'timeZone',

From 4998ab23508adf9a244885509b2d5c7c9c9c48f0 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 23 Feb 2023 09:48:42 +0100
Subject: [PATCH 280/358] fix(editor): Fix an issue with zoom and canvas nodes
 connections (#5548)

---
 .../plugins/endpoints/N8nPlusEndpointType.ts  |   7 +-
 packages/editor-ui/src/stores/canvas.ts       |  10 +
 packages/editor-ui/src/views/NodeView.vue     | 736 +++++++++---------
 3 files changed, 401 insertions(+), 352 deletions(-)

diff --git a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
index 8ad5c72943eb10..377bba677001f3 100644
--- a/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
+++ b/packages/editor-ui/src/plugins/endpoints/N8nPlusEndpointType.ts
@@ -18,7 +18,8 @@ interface N8nPlusEndpointParams extends EndpointRepresentationParams {
 }
 export const PlusStalkOverlay = 'plus-stalk';
 export const HoverMessageOverlay = 'hover-message';
-
+export const N8nPlusEndpointType = 'N8nPlus';
+export const EVENT_PLUS_ENDPOINT_CLICK = 'eventPlusEndpointClick';
 export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpoint> {
 	params: N8nPlusEndpointParams;
 	label: string;
@@ -38,7 +39,7 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 		this.bindEvents();
 	}
 
-	static type = 'N8nPlus';
+	static type = N8nPlusEndpointType;
 	type = N8nPlusEndpoint.type;
 
 	setupOverlays() {
@@ -100,7 +101,7 @@ export class N8nPlusEndpoint extends EndpointRepresentation<ComputedN8nPlusEndpo
 	};
 	fireClickEvent = (endpoint: Endpoint) => {
 		if (endpoint === this.endpoint) {
-			this.instance.fire('plusEndpointClick', this.endpoint);
+			this.instance.fire(EVENT_PLUS_ENDPOINT_CLICK, this.endpoint);
 		}
 	};
 	setHoverMessageVisible = (endpoint: Endpoint) => {
diff --git a/packages/editor-ui/src/stores/canvas.ts b/packages/editor-ui/src/stores/canvas.ts
index d4bb7333fdbf9a..565dc24ef50675 100644
--- a/packages/editor-ui/src/stores/canvas.ts
+++ b/packages/editor-ui/src/stores/canvas.ts
@@ -28,6 +28,9 @@ import {
 	PLACEHOLDER_TRIGGER_NODE_SIZE,
 	CONNECTOR_FLOWCHART_TYPE,
 	GRID_SIZE,
+	CONNECTOR_PAINT_STYLE_DEFAULT,
+	CONNECTOR_PAINT_STYLE_PRIMARY,
+	CONNECTOR_ARROW_OVERLAYS,
 } from '@/utils/nodeViewUtils';
 import { PointXY } from '@jsplumb/util';
 
@@ -153,6 +156,13 @@ export const useCanvasStore = defineStore('canvas', () => {
 			container,
 			connector: CONNECTOR_FLOWCHART_TYPE,
 			resizeObserver: false,
+			endpoint: {
+				type: 'Dot',
+				options: { radius: 5 },
+			},
+			paintStyle: CONNECTOR_PAINT_STYLE_DEFAULT,
+			hoverPaintStyle: CONNECTOR_PAINT_STYLE_PRIMARY,
+			connectionOverlays: CONNECTOR_ARROW_OVERLAYS,
 			dragOptions: {
 				cursor: 'pointer',
 				grid: { w: GRID_SIZE, h: GRID_SIZE },
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 0dd1d2bea55019..4980afa26b5697 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -161,7 +161,7 @@
 </template>
 
 <script lang="ts">
-import Vue, { ComponentInstance } from 'vue';
+import Vue from 'vue';
 import { mapStores } from 'pinia';
 
 import {
@@ -299,7 +299,11 @@ import {
 	BrowserJsPlumbInstance,
 	ready,
 } from '@jsplumb/browser-ui';
-import { N8nPlusEndpoint } from '@/plugins/endpoints/N8nPlusEndpointType';
+import {
+	N8nPlusEndpoint,
+	N8nPlusEndpointType,
+	EVENT_PLUS_ENDPOINT_CLICK,
+} from '@/plugins/endpoints/N8nPlusEndpointType';
 import { usePostHogStore } from '@/stores/posthog';
 
 interface AddNodeOptions {
@@ -1939,11 +1943,12 @@ export default mixins(
 			// current node. But only if it's added manually by the user (not by undo/redo mechanism)
 			if (trackHistory) {
 				this.deselectAllNodes();
-				if (showDetail) {
-					setTimeout(() => {
-						this.nodeSelectedByName(newNodeData.name, nodeTypeName !== STICKY_NODE_TYPE);
-					});
-				}
+				setTimeout(() => {
+					this.nodeSelectedByName(
+						newNodeData.name,
+						showDetail && nodeTypeName !== STICKY_NODE_TYPE,
+					);
+				});
 			}
 
 			return newNodeData;
@@ -2051,396 +2056,430 @@ export default mixins(
 			}
 			this.historyStore.stopRecordingUndo();
 		},
-		initNodeView() {
-			this.instance?.importDefaults({
-				endpoint: {
-					type: 'Dot',
-					options: { radius: 5 },
-				},
-				paintStyle: NodeViewUtils.CONNECTOR_PAINT_STYLE_DEFAULT,
-				hoverPaintStyle: NodeViewUtils.CONNECTOR_PAINT_STYLE_PRIMARY,
-				connectionOverlays: NodeViewUtils.CONNECTOR_ARROW_OVERLAYS,
-			});
+		insertNodeAfterSelected(info: {
+			sourceId: string;
+			index: number;
+			eventSource: string;
+			connection?: Connection;
+		}) {
+			// Get the node and set it as active that new nodes
+			// which get created get automatically connected
+			// to it.
+			const sourceNode = this.workflowsStore.getNodeById(info.sourceId);
+			if (!sourceNode) {
+				return;
+			}
 
-			const insertNodeAfterSelected = (info: {
-				sourceId: string;
-				index: number;
-				eventSource: string;
-				connection?: Connection;
-			}) => {
-				// Get the node and set it as active that new nodes
-				// which get created get automatically connected
-				// to it.
-				const sourceNode = this.workflowsStore.getNodeById(info.sourceId);
-				if (!sourceNode) {
-					return;
-				}
+			this.uiStore.lastSelectedNode = sourceNode.name;
+			this.uiStore.lastSelectedNodeOutputIndex = info.index;
+			this.newNodeInsertPosition = null;
 
-				this.uiStore.lastSelectedNode = sourceNode.name;
-				this.uiStore.lastSelectedNodeOutputIndex = info.index;
-				this.newNodeInsertPosition = null;
+			if (info.connection) {
+				this.lastSelectedConnection = info.connection;
+			}
 
-				if (info.connection) {
-					this.lastSelectedConnection = info.connection;
+			this.onToggleNodeCreator({ source: info.eventSource, createNodeActive: true });
+		},
+		onEventConnectionAbort(connection: Connection) {
+			try {
+				if (this.dropPrevented) {
+					this.dropPrevented = false;
+					return;
 				}
 
-				this.onToggleNodeCreator({ source: info.eventSource, createNodeActive: true });
-			};
-
-			this.instance.bind(EVENT_CONNECTION_ABORT, (connection: Connection) => {
-				try {
-					if (this.dropPrevented) {
-						this.dropPrevented = false;
-						return;
-					}
-
-					if (this.pullConnActiveNodeName) {
-						const sourceNode = this.workflowsStore.getNodeById(connection.parameters.nodeId);
-						if (sourceNode) {
-							const sourceNodeName = sourceNode.name;
-							const outputIndex = connection.parameters.index;
+				if (this.pullConnActiveNodeName) {
+					const sourceNode = this.workflowsStore.getNodeById(connection.parameters.nodeId);
+					if (sourceNode) {
+						const sourceNodeName = sourceNode.name;
+						const outputIndex = connection.parameters.index;
 
-							this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
-							this.pullConnActiveNodeName = null;
-							this.dropPrevented = true;
-						}
-						return;
+						this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
+						this.pullConnActiveNodeName = null;
+						this.dropPrevented = true;
 					}
-
-					insertNodeAfterSelected({
-						sourceId: connection.parameters.nodeId,
-						index: connection.parameters.index,
-						eventSource: 'node_connection_drop',
-					});
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
+					return;
 				}
-			});
 
-			this.instance.bind(INTERCEPT_BEFORE_DROP, (info: BeforeDropParams) => {
-				try {
-					const sourceInfo = info.connection.endpoints[0].parameters;
-					const targetInfo = info.dropEndpoint.parameters;
+				this.insertNodeAfterSelected({
+					sourceId: connection.parameters.nodeId,
+					index: connection.parameters.index,
+					eventSource: 'node_connection_drop',
+				});
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+			}
+		},
+		onInterceptBeforeDrop(info: BeforeDropParams) {
+			try {
+				const sourceInfo = info.connection.endpoints[0].parameters;
+				const targetInfo = info.dropEndpoint.parameters;
 
-					const sourceNodeName = this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name || '';
-					const targetNodeName = this.workflowsStore.getNodeById(targetInfo.nodeId)?.name || '';
+				const sourceNodeName = this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name || '';
+				const targetNodeName = this.workflowsStore.getNodeById(targetInfo.nodeId)?.name || '';
 
-					// check for duplicates
-					if (
-						this.getConnection(sourceNodeName, sourceInfo.index, targetNodeName, targetInfo.index)
-					) {
-						this.dropPrevented = true;
-						this.pullConnActiveNodeName = null;
-						return false;
-					}
+				// check for duplicates
+				if (
+					this.getConnection(sourceNodeName, sourceInfo.index, targetNodeName, targetInfo.index)
+				) {
+					this.dropPrevented = true;
+					this.pullConnActiveNodeName = null;
+					return false;
+				}
 
-					return true;
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
-					return true;
+				return true;
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+				return true;
+			}
+		},
+		onEventConnection(info: ConnectionEstablishedParams) {
+			try {
+				const sourceInfo = info.sourceEndpoint.parameters;
+				const targetInfo = info.targetEndpoint.parameters;
+
+				const sourceNodeName = this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name;
+				const targetNodeName = this.workflowsStore.getNodeById(targetInfo.nodeId)?.name;
+
+				if (sourceNodeName && targetNodeName) {
+					info.connection.__meta = {
+						sourceNodeName,
+						sourceOutputIndex: sourceInfo.index,
+						targetNodeName,
+						targetOutputIndex: targetInfo.index,
+					};
 				}
-			});
 
-			this.instance.bind(EVENT_CONNECTION, (info: ConnectionEstablishedParams) => {
-				try {
-					const sourceInfo = info.sourceEndpoint.parameters;
-					const targetInfo = info.targetEndpoint.parameters;
-
-					const sourceNodeName = this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name;
-					const targetNodeName = this.workflowsStore.getNodeById(targetInfo.nodeId)?.name;
-
-					if (sourceNodeName && targetNodeName) {
-						info.connection.__meta = {
-							sourceNodeName,
-							sourceOutputIndex: sourceInfo.index,
-							targetNodeName,
-							targetOutputIndex: targetInfo.index,
-						};
-					}
+				NodeViewUtils.resetConnection(info.connection);
+				NodeViewUtils.moveBackInputLabelPosition(info.targetEndpoint);
 
-					NodeViewUtils.resetConnection(info.connection);
-					NodeViewUtils.moveBackInputLabelPosition(info.targetEndpoint);
+				const connectionData: [IConnection, IConnection] = [
+					{
+						node: sourceNodeName,
+						type: sourceInfo.type,
+						index: sourceInfo.index,
+					},
+					{
+						node: targetNodeName,
+						type: targetInfo.type,
+						index: targetInfo.index,
+					},
+				];
 
-					const connectionData: [IConnection, IConnection] = [
-						{
-							node: sourceNodeName,
-							type: sourceInfo.type,
-							index: sourceInfo.index,
+				this.dropPrevented = true;
+				this.workflowsStore.addConnection({ connection: connectionData });
+				this.uiStore.stateIsDirty = true;
+				if (!this.suspendRecordingDetachedConnections) {
+					this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
+				}
+				if (!this.isReadOnly) {
+					NodeViewUtils.addConnectionActionsOverlay(
+						info.connection,
+						() => {
+							this.activeConnection = null;
+							this.__deleteJSPlumbConnection(info.connection);
 						},
-						{
-							node: targetNodeName,
-							type: targetInfo.type,
-							index: targetInfo.index,
+						() => {
+							this.insertNodeAfterSelected({
+								sourceId: info.sourceEndpoint.parameters.nodeId,
+								index: sourceInfo.index,
+								connection: info.connection,
+								eventSource: 'node_connection_action',
+							});
 						},
-					];
-
-					this.dropPrevented = true;
-					this.workflowsStore.addConnection({ connection: connectionData });
-					this.uiStore.stateIsDirty = true;
-					if (!this.suspendRecordingDetachedConnections) {
-						this.historyStore.pushCommandToUndo(new AddConnectionCommand(connectionData));
-					}
-					if (!this.isReadOnly) {
-						NodeViewUtils.addConnectionActionsOverlay(
-							info.connection,
-							() => {
-								this.activeConnection = null;
-								this.__deleteJSPlumbConnection(info.connection);
-							},
-							() => {
-								insertNodeAfterSelected({
-									sourceId: info.sourceEndpoint.parameters.nodeId,
-									index: sourceInfo.index,
-									connection: info.connection,
-									eventSource: 'node_connection_action',
-								});
-							},
+					);
+					setTimeout(() => {
+						NodeViewUtils.addConnectionTestData(
+							info.source,
+							info.target,
+							'canvas' in info.connection.connector
+								? (info.connection.connector.canvas as HTMLElement)
+								: undefined,
 						);
-						setTimeout(() => {
-							NodeViewUtils.addConnectionTestData(
-								info.source,
-								info.target,
-								'canvas' in info.connection.connector
-									? (info.connection.connector.canvas as HTMLElement)
-									: undefined,
-							);
-						}, 0);
-					}
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
+					}, 0);
 				}
-			});
-
-			this.instance.bind(EVENT_DRAG_MOVE, () => {
-				this.instance?.connections.forEach((connection) => {
-					NodeViewUtils.showOrHideItemsLabel(connection);
-					NodeViewUtils.showOrHideMidpointArrow(connection);
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+			}
+		},
+		onDragMove() {
+			this.instance?.connections.forEach((connection) => {
+				NodeViewUtils.showOrHideItemsLabel(connection);
+				NodeViewUtils.showOrHideMidpointArrow(connection);
 
-					Object.values(connection.overlays).forEach((overlay) => {
-						if (!overlay.canvas) return;
-						this.instance?.repaint(overlay.canvas);
-					});
+				Object.values(connection.overlays).forEach((overlay) => {
+					if (!overlay.canvas) return;
+					this.instance?.repaint(overlay.canvas);
 				});
 			});
-			this.instance.bind(EVENT_CONNECTION_MOUSEOVER, (connection: Connection) => {
-				try {
-					if (this.exitTimer !== undefined) {
-						clearTimeout(this.exitTimer);
-						this.exitTimer = undefined;
-					}
-
-					if (
-						this.isReadOnly ||
-						this.enterTimer ||
-						!connection ||
-						connection === this.activeConnection
-					)
-						return;
-
-					if (this.activeConnection) NodeViewUtils.hideConnectionActions(this.activeConnection);
-
-					this.enterTimer = setTimeout(() => {
-						this.enterTimer = undefined;
-						if (connection) {
-							NodeViewUtils.showConnectionActions(connection);
-							this.activeConnection = connection;
-						}
-					}, 150);
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
+		},
+		onConnectionMouseOver(connection: Connection) {
+			try {
+				if (this.exitTimer !== undefined) {
+					clearTimeout(this.exitTimer);
+					this.exitTimer = undefined;
 				}
-			});
-			this.instance.bind(EVENT_CONNECTION_MOUSEOUT, (connection: Connection) => {
-				try {
-					if (this.exitTimer) return;
 
-					if (this.enterTimer) {
-						clearTimeout(this.enterTimer);
-						this.enterTimer = undefined;
-					}
+				if (
+					this.isReadOnly ||
+					this.enterTimer ||
+					!connection ||
+					connection === this.activeConnection
+				)
+					return;
 
-					if (this.isReadOnly || !connection || this.activeConnection?.id !== connection.id) return;
+				if (this.activeConnection) NodeViewUtils.hideConnectionActions(this.activeConnection);
 
-					this.exitTimer = setTimeout(() => {
-						this.exitTimer = undefined;
+				this.enterTimer = setTimeout(() => {
+					this.enterTimer = undefined;
+					if (connection) {
+						NodeViewUtils.showConnectionActions(connection);
+						this.activeConnection = connection;
+					}
+				}, 150);
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+			}
+		},
+		onConnectionMouseOut(connection: Connection) {
+			try {
+				if (this.exitTimer) return;
 
-						if (connection && this.activeConnection === connection) {
-							NodeViewUtils.hideConnectionActions(this.activeConnection);
-							this.activeConnection = null;
-						}
-					}, 500);
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
+				if (this.enterTimer) {
+					clearTimeout(this.enterTimer);
+					this.enterTimer = undefined;
 				}
-			});
 
-			this.instance.bind(EVENT_CONNECTION_MOVED, (info: ConnectionMovedParams) => {
-				try {
-					// When a connection gets moved from one node to another it for some reason
-					// calls the "connection" event but not the "connectionDetached" one. So we listen
-					// additionally to the "connectionMoved" event and then only delete the existing connection.
+				if (this.isReadOnly || !connection || this.activeConnection?.id !== connection.id) return;
 
-					NodeViewUtils.resetInputLabelPosition(info.connection);
+				this.exitTimer = setTimeout(() => {
+					this.exitTimer = undefined;
 
-					const sourceInfo = info.connection.parameters;
-					const targetInfo = info.originalEndpoint.parameters;
+					if (connection && this.activeConnection === connection) {
+						NodeViewUtils.hideConnectionActions(this.activeConnection);
+						this.activeConnection = null;
+					}
+				}, 500);
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+			}
+		},
+		onConnectionMoved(info: ConnectionMovedParams) {
+			try {
+				// When a connection gets moved from one node to another it for some reason
+				// calls the "connection" event but not the "connectionDetached" one. So we listen
+				// additionally to the "connectionMoved" event and then only delete the existing connection.
 
-					const connectionInfo = [
-						{
-							node: this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name || '',
-							type: sourceInfo.type,
-							index: sourceInfo.index,
-						},
-						{
-							node: this.workflowsStore.getNodeById(targetInfo.nodeId)?.name || '',
-							type: targetInfo.type,
-							index: targetInfo.index,
-						},
-					] as [IConnection, IConnection];
+				NodeViewUtils.resetInputLabelPosition(info.connection);
 
-					this.__removeConnection(connectionInfo, false);
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
-				}
-			});
-			this.instance.bind(EVENT_ENDPOINT_MOUSEOVER, (endpoint: Endpoint, mouse) => {
-				// This event seems bugged. It gets called constantly even when the mouse is not over the endpoint
-				// if the endpoint has a connection attached to it. So we need to check if the mouse is actually over
-				// the endpoint.
-				if (!endpoint.isTarget || mouse.target !== endpoint.endpoint.canvas) return;
-				this.instance.setHover(endpoint, true);
-			});
-			this.instance.bind(EVENT_ENDPOINT_MOUSEOUT, (endpoint: Endpoint) => {
-				if (!endpoint.isTarget) return;
-				this.instance.setHover(endpoint, false);
-			});
-			this.instance.bind(EVENT_CONNECTION_DETACHED, async (info: ConnectionDetachedParams) => {
-				try {
-					const connectionInfo: [IConnection, IConnection] | null = getConnectionInfo(info);
-					NodeViewUtils.resetInputLabelPosition(info.targetEndpoint);
-					info.connection.removeOverlays();
-					this.__removeConnectionByConnectionInfo(info, false, false);
-
-					if (this.pullConnActiveNodeName) {
-						// establish new connection when dragging connection from one node to another
-						this.historyStore.startRecordingUndo();
-						const sourceNode = this.workflowsStore.getNodeById(info.connection.parameters.nodeId);
-						const sourceNodeName = sourceNode.name;
-						const outputIndex = info.connection.parameters.index;
+				const sourceInfo = info.connection.parameters;
+				const targetInfo = info.originalEndpoint.parameters;
 
-						if (connectionInfo) {
-							this.historyStore.pushCommandToUndo(new RemoveConnectionCommand(connectionInfo));
-						}
-						this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
-						this.pullConnActiveNodeName = null;
-						await this.$nextTick();
-						this.historyStore.stopRecordingUndo();
-					} else if (
-						!this.historyStore.bulkInProgress &&
-						!this.suspendRecordingDetachedConnections &&
-						connectionInfo
-					) {
-						// Ff connection being detached by user, save this in history
-						// but skip if it's detached as a side effect of bulk undo/redo or node rename process
-						const removeCommand = new RemoveConnectionCommand(connectionInfo, this);
-						this.historyStore.pushCommandToUndo(removeCommand);
+				const connectionInfo = [
+					{
+						node: this.workflowsStore.getNodeById(sourceInfo.nodeId)?.name || '',
+						type: sourceInfo.type,
+						index: sourceInfo.index,
+					},
+					{
+						node: this.workflowsStore.getNodeById(targetInfo.nodeId)?.name || '',
+						type: targetInfo.type,
+						index: targetInfo.index,
+					},
+				] as [IConnection, IConnection];
+
+				this.__removeConnection(connectionInfo, false);
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+			}
+		},
+		onEndpointMouseOver(endpoint: Endpoint, mouse) {
+			// This event seems bugged. It gets called constantly even when the mouse is not over the endpoint
+			// if the endpoint has a connection attached to it. So we need to check if the mouse is actually over
+			// the endpoint.
+			if (!endpoint.isTarget || mouse.target !== endpoint.endpoint.canvas) return;
+			this.instance.setHover(endpoint, true);
+		},
+		onEndpointMouseOut(endpoint: Endpoint) {
+			if (!endpoint.isTarget) return;
+			this.instance.setHover(endpoint, false);
+		},
+		async onConnectionDetached(info: ConnectionDetachedParams) {
+			try {
+				const connectionInfo: [IConnection, IConnection] | null = getConnectionInfo(info);
+				NodeViewUtils.resetInputLabelPosition(info.targetEndpoint);
+				info.connection.removeOverlays();
+				this.__removeConnectionByConnectionInfo(info, false, false);
+
+				if (this.pullConnActiveNodeName) {
+					// establish new connection when dragging connection from one node to another
+					this.historyStore.startRecordingUndo();
+					const sourceNode = this.workflowsStore.getNodeById(info.connection.parameters.nodeId);
+					const sourceNodeName = sourceNode.name;
+					const outputIndex = info.connection.parameters.index;
+
+					if (connectionInfo) {
+						this.historyStore.pushCommandToUndo(new RemoveConnectionCommand(connectionInfo));
 					}
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
-				}
-			});
-			this.instance.bind(EVENT_CONNECTION_DRAG, (connection: Connection) => {
-				// The overlays are visible by default so we need to hide the midpoint arrow
-				// manually
-				connection.overlays['midpoint-arrow']?.setVisible(false);
-				try {
+					this.connectTwoNodes(sourceNodeName, outputIndex, this.pullConnActiveNodeName, 0);
 					this.pullConnActiveNodeName = null;
-					this.pullConnActive = true;
-					this.newNodeInsertPosition = null;
-					NodeViewUtils.resetConnection(connection);
+					await this.$nextTick();
+					this.historyStore.stopRecordingUndo();
+				} else if (
+					!this.historyStore.bulkInProgress &&
+					!this.suspendRecordingDetachedConnections &&
+					connectionInfo
+				) {
+					// Ff connection being detached by user, save this in history
+					// but skip if it's detached as a side effect of bulk undo/redo or node rename process
+					const removeCommand = new RemoveConnectionCommand(connectionInfo, this);
+					this.historyStore.pushCommandToUndo(removeCommand);
+				}
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+			}
+		},
+		onConnectionDrag(connection: Connection) {
+			// The overlays are visible by default so we need to hide the midpoint arrow
+			// manually
+			connection.overlays['midpoint-arrow']?.setVisible(false);
+			try {
+				this.pullConnActiveNodeName = null;
+				this.pullConnActive = true;
+				this.newNodeInsertPosition = null;
+				NodeViewUtils.resetConnection(connection);
 
-					const nodes = [...document.querySelectorAll('.node-wrapper')];
+				const nodes = [...document.querySelectorAll('.node-wrapper')];
 
-					const onMouseMove = (e: MouseEvent | TouchEvent) => {
-						if (!connection) {
-							return;
-						}
+				const onMouseMove = (e: MouseEvent | TouchEvent) => {
+					if (!connection) {
+						return;
+					}
 
-						const element = document.querySelector('.jtk-endpoint.jtk-drag-hover');
-						if (element) {
-							const endpoint = element.jtk.endpoint;
-							NodeViewUtils.showDropConnectionState(connection, endpoint);
-							return;
-						}
+					const element = document.querySelector('.jtk-endpoint.jtk-drag-hover');
+					if (element) {
+						const endpoint = element.jtk.endpoint;
+						NodeViewUtils.showDropConnectionState(connection, endpoint);
+						return;
+					}
 
-						const inputMargin = 24;
-						const intersecting = nodes.find((element: Element) => {
-							const { top, left, right, bottom } = element.getBoundingClientRect();
-							const [x, y] = NodeViewUtils.getMousePosition(e);
-							if (top <= y && bottom >= y && left - inputMargin <= x && right >= x) {
-								const nodeName = (element as HTMLElement).dataset['name'] as string;
-								const node = this.workflowsStore.getNodeByName(nodeName) as INodeUi | null;
-								if (node) {
-									const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
-									if (nodeType && nodeType.inputs && nodeType.inputs.length === 1) {
-										this.pullConnActiveNodeName = node.name;
-										const endpointUUID = this.getInputEndpointUUID(nodeName, 0);
-										if (endpointUUID) {
-											const endpoint = this.instance?.getEndpoint(endpointUUID);
-
-											NodeViewUtils.showDropConnectionState(connection, endpoint);
-
-											return true;
-										}
+					const inputMargin = 24;
+					const intersecting = nodes.find((element: Element) => {
+						const { top, left, right, bottom } = element.getBoundingClientRect();
+						const [x, y] = NodeViewUtils.getMousePosition(e);
+						if (top <= y && bottom >= y && left - inputMargin <= x && right >= x) {
+							const nodeName = (element as HTMLElement).dataset['name'] as string;
+							const node = this.workflowsStore.getNodeByName(nodeName) as INodeUi | null;
+							if (node) {
+								const nodeType = this.nodeTypesStore.getNodeType(node.type, node.typeVersion);
+								if (nodeType && nodeType.inputs && nodeType.inputs.length === 1) {
+									this.pullConnActiveNodeName = node.name;
+									const endpointUUID = this.getInputEndpointUUID(nodeName, 0);
+									if (endpointUUID) {
+										const endpoint = this.instance?.getEndpoint(endpointUUID);
+
+										NodeViewUtils.showDropConnectionState(connection, endpoint);
+
+										return true;
 									}
 								}
 							}
+						}
 
-							return false;
-						});
+						return false;
+					});
 
-						if (!intersecting) {
-							NodeViewUtils.showPullConnectionState(connection);
-							this.pullConnActiveNodeName = null;
-						}
-					};
+					if (!intersecting) {
+						NodeViewUtils.showPullConnectionState(connection);
+						this.pullConnActiveNodeName = null;
+					}
+				};
 
-					const onMouseUp = (e: MouseEvent | TouchEvent) => {
-						this.pullConnActive = false;
-						this.newNodeInsertPosition = this.getMousePositionWithinNodeView(e);
-						NodeViewUtils.resetConnectionAfterPull(connection);
-						window.removeEventListener('mousemove', onMouseMove);
-						window.removeEventListener('mouseup', onMouseUp);
-					};
+				const onMouseUp = (e: MouseEvent | TouchEvent) => {
+					this.pullConnActive = false;
+					this.newNodeInsertPosition = this.getMousePositionWithinNodeView(e);
+					NodeViewUtils.resetConnectionAfterPull(connection);
+					window.removeEventListener('mousemove', onMouseMove);
+					window.removeEventListener('mouseup', onMouseUp);
+				};
 
-					window.addEventListener('mousemove', onMouseMove);
-					window.addEventListener('touchmove', onMouseMove);
-					window.addEventListener('mouseup', onMouseUp);
-					window.addEventListener('touchend', onMouseMove);
-				} catch (e) {
-					console.error(e); // eslint-disable-line no-console
-				}
-			});
+				window.addEventListener('mousemove', onMouseMove);
+				window.addEventListener('touchmove', onMouseMove);
+				window.addEventListener('mouseup', onMouseUp);
+				window.addEventListener('touchend', onMouseMove);
+			} catch (e) {
+				console.error(e); // eslint-disable-line no-console
+			}
+		},
+		onConnectionDragAbortDetached(connection: Connection) {
+			Object.values(this.instance?.endpointsByElement)
+				.flatMap((endpoints) => Object.values(endpoints))
+				.filter((endpoint) => endpoint.endpoint.type === 'N8nPlus')
+				.forEach((endpoint) => setTimeout(() => endpoint.instance.revalidate(endpoint.element), 0));
+		},
+		onPlusEndpointClick(endpoint: Endpoint) {
+			if (endpoint && endpoint.__meta) {
+				this.insertNodeAfterSelected({
+					sourceId: endpoint.__meta.nodeId,
+					index: endpoint.__meta.index,
+					eventSource: 'plus_endpoint',
+				});
+			}
+		},
+		bindCanvasEvents() {
+			this.instance.bind(EVENT_CONNECTION_ABORT, this.onEventConnectionAbort);
+
+			this.instance.bind(INTERCEPT_BEFORE_DROP, this.onInterceptBeforeDrop);
+
+			this.instance.bind(EVENT_CONNECTION, this.onEventConnection);
+
+			this.instance.bind(EVENT_DRAG_MOVE, this.onDragMove);
+			this.instance.bind(EVENT_CONNECTION_MOUSEOVER, this.onConnectionMouseOver);
+			this.instance.bind(EVENT_CONNECTION_MOUSEOUT, this.onConnectionMouseOut);
+
+			this.instance.bind(EVENT_CONNECTION_MOVED, this.onConnectionMoved);
+			this.instance.bind(EVENT_ENDPOINT_MOUSEOVER, this.onEndpointMouseOver);
+			this.instance.bind(EVENT_ENDPOINT_MOUSEOUT, this.onEndpointMouseOut);
+			this.instance.bind(EVENT_CONNECTION_DETACHED, this.onConnectionDetached);
+			this.instance.bind(EVENT_CONNECTION_DRAG, this.onConnectionDrag);
 			this.instance.bind(
 				[EVENT_CONNECTION_DRAG, EVENT_CONNECTION_ABORT, EVENT_CONNECTION_DETACHED],
-				(connection: Connection) => {
-					Object.values(this.instance?.endpointsByElement)
-						.flatMap((endpoints) => Object.values(endpoints))
-						.filter((endpoint) => endpoint.endpoint.type === 'N8nPlus')
-						.forEach((endpoint) =>
-							setTimeout(() => endpoint.instance.revalidate(endpoint.element), 0),
-						);
-				},
+				this.onConnectionDragAbortDetached,
 			);
-			this.instance.bind('plusEndpointClick', (endpoint: Endpoint) => {
-				if (endpoint && endpoint.__meta) {
-					insertNodeAfterSelected({
-						sourceId: endpoint.__meta.nodeId,
-						index: endpoint.__meta.index,
-						eventSource: 'plus_endpoint',
-					});
+			this.instance.bind(EVENT_PLUS_ENDPOINT_CLICK, this.onPlusEndpointClick);
+		},
+		unbindCanvasEvents() {
+			this.instance.unbind(EVENT_CONNECTION_ABORT, this.onEventConnectionAbort);
+
+			this.instance.unbind(INTERCEPT_BEFORE_DROP, this.onInterceptBeforeDrop);
+
+			this.instance.unbind(EVENT_CONNECTION, this.onEventConnection);
+
+			this.instance.unbind(EVENT_DRAG_MOVE, this.onDragMove);
+			this.instance.unbind(EVENT_CONNECTION_MOUSEOVER, this.onConnectionMouseOver);
+			this.instance.unbind(EVENT_CONNECTION_MOUSEOUT, this.onConnectionMouseOut);
+
+			this.instance.unbind(EVENT_CONNECTION_MOVED, this.onConnectionMoved);
+			this.instance.unbind(EVENT_ENDPOINT_MOUSEOVER, this.onEndpointMouseOver);
+			this.instance.unbind(EVENT_ENDPOINT_MOUSEOUT, this.onEndpointMouseOut);
+			this.instance.unbind(EVENT_CONNECTION_DETACHED, this.onConnectionDetached);
+			this.instance.unbind(EVENT_CONNECTION_DRAG, this.onConnectionDrag);
+
+			this.instance.unbind(EVENT_CONNECTION_DRAG, this.onConnectionDragAbortDetached);
+			this.instance.unbind(EVENT_CONNECTION_ABORT, this.onConnectionDragAbortDetached);
+			this.instance.unbind(EVENT_CONNECTION_DETACHED, this.onConnectionDragAbortDetached);
+			this.instance.unbind(EVENT_PLUS_ENDPOINT_CLICK, this.onPlusEndpointClick);
+
+			// Get all the endpoints and unbind the events
+			const elements = this.instance.getManagedElements();
+			for (const element of Object.values(elements)) {
+				const endpoints = element.endpoints;
+				for (const endpoint of endpoints || []) {
+					const endpointInstance = endpoint?.endpoint;
+					if (endpointInstance && endpointInstance.type === N8nPlusEndpointType) {
+						(endpointInstance as N8nPlusEndpoint).unbindEvents();
+					}
 				}
-			});
+			}
 		},
 		async newWorkflow(): Promise<void> {
 			this.startLoading();
@@ -3826,7 +3865,7 @@ export default mixins(
 		ready(async () => {
 			try {
 				try {
-					this.initNodeView();
+					this.bindCanvasEvents();
 				} catch {} // This will break if mounted after jsplumb has been initiated from executions preview, so continue if it breaks
 				await this.initView();
 				if (window.top) {
@@ -3894,8 +3933,7 @@ export default mixins(
 			this.showTriggerCreator('trigger_placeholder_button');
 		}
 		this.uiStore.addFirstStepOnLoad = false;
-
-		this.initNodeView();
+		this.bindCanvasEvents();
 		document.addEventListener('keydown', this.keyDown);
 		document.addEventListener('keyup', this.keyUp);
 		window.addEventListener('message', this.onPostMessageReceived);
@@ -3918,6 +3956,7 @@ export default mixins(
 		this.canvasStore.isDemo = this.isDemo;
 	},
 	deactivated() {
+		this.unbindCanvasEvents();
 		document.removeEventListener('keydown', this.keyDown);
 		document.removeEventListener('keyup', this.keyUp);
 		window.removeEventListener('message', this.onPostMessageReceived);
@@ -3936,7 +3975,6 @@ export default mixins(
 		dataPinningEventBus.$off('pin-data', this.addPinDataConnections);
 		dataPinningEventBus.$off('unpin-data', this.removePinDataConnections);
 		nodeViewEventBus.$off('saveWorkflow', this.saveCurrentWorkflowExternal);
-		this.instance.unbind();
 	},
 	destroyed() {
 		this.resetWorkspace();

From 7c517cb5300481908dd653426089a6a9291e79ca Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Thu, 23 Feb 2023 11:13:21 +0100
Subject: [PATCH 281/358] fix(editor): Remove 'crashed' status from filter
 (#5524)

* fix(editor): remove 'crashed' status from filter

* fix(editor): remove 'crashed' and 'new' status from filter

* fix(editor): add 'status' to response

* fix(editor): create request filter for workflow level execution filtering

* fix(editor): update filters

* fix(editor): simplify condition

* fix(editor): update filters

* fix(editor): optimizing data loading flow

* fix(editor): always load past executions
---
 packages/editor-ui/src/Interface.ts           |  4 +-
 .../src/components/ExecutionsList.vue         | 41 ++++--------
 .../ExecutionsView/ExecutionCard.vue          |  3 +-
 .../ExecutionsView/ExecutionsList.vue         | 66 +++++++++++--------
 .../ExecutionsView/ExecutionsSidebar.vue      |  5 +-
 .../editor-ui/src/mixins/executionsHelpers.ts | 28 ++++----
 packages/editor-ui/src/mixins/restApi.ts      |  6 +-
 .../src/plugins/i18n/locales/en.json          |  4 --
 packages/editor-ui/src/stores/workflows.ts    | 29 +++-----
 9 files changed, 81 insertions(+), 105 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 2d3bb99517200e..58a38d38684919 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -133,9 +133,9 @@ export interface IExternalHooks {
 export interface IRestApi {
 	getActiveWorkflows(): Promise<string[]>;
 	getActivationError(id: string): Promise<IActivationError | undefined>;
-	getCurrentExecutions(filter: object): Promise<IExecutionsCurrentSummaryExtended[]>;
+	getCurrentExecutions(filter: IDataObject): Promise<IExecutionsCurrentSummaryExtended[]>;
 	getPastExecutions(
-		filter: object,
+		filter: IDataObject,
 		limit: number,
 		lastId?: string,
 		firstId?: string,
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index ba27506d2e1f58..fcd3f8214c15b8 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -335,14 +335,6 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 						id: 'error',
 						name: this.$locale.baseText('executionsList.error'),
 					},
-					{
-						id: 'crashed',
-						name: this.$locale.baseText('executionsList.error'),
-					},
-					{
-						id: 'new',
-						name: this.$locale.baseText('executionsList.new'),
-					},
 					{
 						id: 'running',
 						name: this.$locale.baseText('executionsList.running'),
@@ -363,10 +355,10 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 			combinedExecutions(): IExecutionsSummary[] {
 				const returnData: IExecutionsSummary[] = [];
 
-				if (['ALL', 'running', 'new'].includes(this.filter.status)) {
+				if (['ALL', 'running'].includes(this.filter.status)) {
 					returnData.push(...this.activeExecutions);
 				}
-				if (['ALL', 'error', 'crashed', 'success', 'waiting'].includes(this.filter.status)) {
+				if (['ALL', 'error', 'success', 'waiting'].includes(this.filter.status)) {
 					returnData.push(...this.finishedExecutions);
 				}
 				return returnData;
@@ -404,14 +396,8 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 					case 'waiting':
 						queryFilter.status = ['waiting'];
 						break;
-					case 'crashed':
-						queryFilter.status = ['crashed'];
-						break;
-					case 'new':
-						queryFilter.status = ['new'];
-						break;
 					case 'error':
-						queryFilter.status = ['failed', 'crashed', 'error'];
+						queryFilter.status = ['failed', 'crashed'];
 						break;
 					case 'success':
 						queryFilter.status = ['success'];
@@ -813,8 +799,9 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				this.isDataLoading = false;
 			},
 			getStatus(execution: IExecutionsSummary): ExecutionStatus {
-				if (execution.status) return execution.status;
-				else {
+				if (execution.status) {
+					return execution.status;
+				} else {
 					// this should not happen but just in case
 					let status: ExecutionStatus = 'unknown';
 					if (execution.waitTill) {
@@ -843,7 +830,7 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				} else if (status === 'crashed') {
 					text = this.$locale.baseText('executionsList.error');
 				} else if (status === 'new') {
-					text = this.$locale.baseText('executionsList.new');
+					text = this.$locale.baseText('executionsList.running');
 				} else if (status === 'running') {
 					text = this.$locale.baseText('executionsList.running');
 				} else if (status === 'success') {
@@ -865,7 +852,7 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 				} else if (status === 'crashed') {
 					path = 'executionsList.statusText';
 				} else if (status === 'new') {
-					path = 'executionsList.statusNew';
+					path = 'executionsList.statusRunning';
 				} else if (status === 'running') {
 					path = 'executionsList.statusRunning';
 				} else if (status === 'success') {
@@ -1018,14 +1005,11 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 	font-size: var(--font-size-s);
 	font-weight: var(--font-weight-bold);
 
+	.crashed &,
 	.failed & {
 		color: var(--color-danger);
 	}
 
-	.crashed & {
-		color: var(--color-danger);
-	}
-
 	.waiting & {
 		color: var(--color-secondary);
 	}
@@ -1034,6 +1018,7 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 		font-weight: var(--font-weight-normal);
 	}
 
+	.new &,
 	.running & {
 		color: var(--color-warning);
 	}
@@ -1131,18 +1116,16 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 			background: var(--color-primary-tint-3);
 		}
 
+		&.crashed td:first-child::before,
 		&.failed td:first-child::before {
 			background: var(--color-danger);
 		}
 
-		&.crashed td:first-child::before {
-			background: var(--color-danger);
-		}
-
 		&.success td:first-child::before {
 			background: var(--color-success);
 		}
 
+		&.new td:first-child::before,
 		&.running td:first-child::before {
 			background: var(--color-warning);
 		}
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
index 2e86a0aeb330a5..a1e0f41f0cddaf 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionCard.vue
@@ -191,8 +191,7 @@ export default mixins(executionHelpers, showMessage, restApi).extend({
 		}
 	}
 
-	&.error,
-	&.crashed {
+	&.error {
 		&,
 		& .executionLink {
 			border-left: var(--spacing-4xs) var(--border-style-base) hsl(var(--color-danger-h), 94%, 80%);
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index c0246589d827e9..53b97ca84bcfd8 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -26,20 +26,15 @@ import ExecutionsSidebar from '@/components/ExecutionsView/ExecutionsSidebar.vue
 import {
 	MAIN_HEADER_TABS,
 	MODAL_CANCEL,
-	MODAL_CLOSE,
 	MODAL_CONFIRMED,
 	PLACEHOLDER_EMPTY_WORKFLOW_ID,
 	VIEWS,
 	WEBHOOK_NODE_TYPE,
 } from '@/constants';
+import { IExecutionsListResponse, INodeUi, ITag, IWorkflowDb } from '@/Interface';
 import {
-	IExecutionsListResponse,
+	ExecutionStatus,
 	IExecutionsSummary,
-	INodeUi,
-	ITag,
-	IWorkflowDb,
-} from '@/Interface';
-import {
 	IConnection,
 	IConnections,
 	IDataObject,
@@ -71,7 +66,7 @@ export default mixins(
 	debounceHelper,
 	workflowHelpers,
 ).extend({
-	name: 'executions-view',
+	name: 'executions-list',
 	components: {
 		ExecutionsSidebar,
 	},
@@ -87,9 +82,7 @@ export default mixins(
 		hidePreview(): boolean {
 			const activeNotPresent =
 				this.filterApplied &&
-				(this.executions as IExecutionsSummary[]).find(
-					(ex) => ex.id === this.activeExecution.id,
-				) === undefined;
+				!(this.executions as IExecutionsSummary[]).find((ex) => ex.id === this.activeExecution?.id);
 			return this.loading || !this.executions.length || activeNotPresent;
 		},
 		filterApplied(): boolean {
@@ -107,6 +100,31 @@ export default mixins(
 		totalFinishedExecutionsCount(): number {
 			return this.workflowsStore.getTotalFinishedExecutionsCount;
 		},
+		requestFilter(): IDataObject {
+			const rFilter: IDataObject = { workflowId: this.currentWorkflow };
+			if (this.filter.status === 'waiting') {
+				rFilter.waitTill = true;
+			} else if (this.filter.status !== '') {
+				rFilter.finished = this.filter.status === 'success';
+			}
+
+			switch (this.filter.status as ExecutionStatus) {
+				case 'waiting':
+					rFilter.status = ['waiting'];
+					break;
+				case 'error':
+					rFilter.status = ['failed', 'crashed'];
+					break;
+				case 'success':
+					rFilter.status = ['success'];
+					break;
+				case 'running':
+					rFilter.status = ['running'];
+					break;
+			}
+
+			return rFilter;
+		},
 	},
 	watch: {
 		$route(to: Route, from: Route) {
@@ -179,7 +197,7 @@ export default mixins(
 				await this.openWorkflow(this.$route.params.name);
 				this.uiStore.nodeViewInitialized = false;
 				if (this.workflowsStore.currentWorkflowExecutions.length === 0) {
-					this.setExecutions();
+					await this.setExecutions();
 				}
 				if (this.activeExecution) {
 					this.$router
@@ -193,7 +211,7 @@ export default mixins(
 		},
 		async onLoadMore(): Promise<void> {
 			if (!this.loadingMore) {
-				this.callDebounced('loadMore', { debounceTime: 1000 });
+				await this.callDebounced('loadMore', { debounceTime: 1000 });
 			}
 		},
 		async loadMore(limit = 20): Promise<void> {
@@ -211,15 +229,9 @@ export default mixins(
 				lastId = lastItem.id;
 			}
 
-			const requestFilter: IDataObject = { workflowId: this.currentWorkflow };
-			if (this.filter.status === 'waiting') {
-				requestFilter.waitTill = true;
-			} else if (this.filter.status !== '') {
-				requestFilter.finished = this.filter.status === 'success';
-			}
 			let data: IExecutionsListResponse;
 			try {
-				data = await this.restApi().getPastExecutions(requestFilter, limit, lastId);
+				data = await this.restApi().getPastExecutions(this.requestFilter, limit, lastId);
 			} catch (error) {
 				this.loadingMore = false;
 				this.$showError(error, this.$locale.baseText('executionsList.showError.loadMore.title'));
@@ -344,7 +356,7 @@ export default mixins(
 
 					if (existingStillRunning && currentFinished) {
 						existingExecutions[executionIndex] = currentItem;
-						if (currentItem.id === this.activeExecution.id) {
+						if (currentItem.id === this.activeExecution?.id) {
 							updatedActiveExecution = currentItem;
 						}
 					}
@@ -371,7 +383,7 @@ export default mixins(
 			if (updatedActiveExecution !== null) {
 				this.workflowsStore.activeWorkflowExecution = updatedActiveExecution;
 			} else {
-				const activeInList = existingExecutions.some((ex) => ex.id === this.activeExecution.id);
+				const activeInList = existingExecutions.some((ex) => ex.id === this.activeExecution?.id);
 				if (!activeInList && this.executions.length > 0) {
 					this.$router
 						.push({
@@ -390,7 +402,7 @@ export default mixins(
 				return [];
 			}
 			try {
-				return await this.workflowsStore.loadCurrentWorkflowExecutions(this.filter);
+				return await this.workflowsStore.loadCurrentWorkflowExecutions(this.requestFilter);
 			} catch (error) {
 				if (error.errorCode === NO_NETWORK_ERROR_CODE) {
 					this.$showMessage(
@@ -452,7 +464,10 @@ export default mixins(
 			}
 
 			// stop if the execution wasn't found in the first 1000 lookups
-			if (attemptCount >= 10) return;
+			if (attemptCount >= 10) {
+				this.workflowsStore.activeWorkflowExecution = null;
+				return;
+			}
 
 			// Fetch next batch of executions
 			await this.loadMore(100);
@@ -619,8 +634,7 @@ export default mixins(
 			}
 		},
 		async loadActiveWorkflows(): Promise<void> {
-			const activeWorkflows = await this.restApi().getActiveWorkflows();
-			this.workflowsStore.activeWorkflows = activeWorkflows;
+			this.workflowsStore.activeWorkflows = await this.restApi().getActiveWorkflows();
 		},
 		async onRetryExecution(payload: { execution: IExecutionsSummary; command: string }) {
 			const loadWorkflow = payload.command === 'current-workflow';
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
index 282800047e3fb7..d2d8e953c7dd04 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsSidebar.vue
@@ -115,8 +115,7 @@
 <script lang="ts">
 import ExecutionCard from '@/components/ExecutionsView/ExecutionCard.vue';
 import ExecutionsInfoAccordion from '@/components/ExecutionsView/ExecutionsInfoAccordion.vue';
-import { VIEWS } from '../../constants';
-import { range as _range } from 'lodash';
+import { VIEWS } from '@/constants';
 import { IExecutionsSummary } from '@/Interface';
 import { Route } from 'vue-router';
 import Vue from 'vue';
@@ -162,8 +161,6 @@ export default Vue.extend({
 		},
 		executionStatuses(): Array<{ id: string; name: string }> {
 			return [
-				{ id: 'crashed', name: this.$locale.baseText('executionsList.error') },
-				{ id: 'new', name: this.$locale.baseText('executionsList.new') },
 				{ id: 'error', name: this.$locale.baseText('executionsList.error') },
 				{ id: 'running', name: this.$locale.baseText('executionsList.running') },
 				{ id: 'success', name: this.$locale.baseText('executionsList.success') },
diff --git a/packages/editor-ui/src/mixins/executionsHelpers.ts b/packages/editor-ui/src/mixins/executionsHelpers.ts
index 36c540f9dee7dc..2f178330782e65 100644
--- a/packages/editor-ui/src/mixins/executionsHelpers.ts
+++ b/packages/editor-ui/src/mixins/executionsHelpers.ts
@@ -43,37 +43,31 @@ export const executionHelpers = mixins(genericHelpers).extend({
 			if (execution.status === 'waiting' || execution.waitTill) {
 				status.name = 'waiting';
 				status.label = this.$locale.baseText('executionsList.waiting');
-			} else if (execution.status === 'running' || execution.stoppedAt === undefined) {
+			} else if (
+				execution.status === 'running' ||
+				execution.status === 'new' ||
+				execution.stoppedAt === undefined
+			) {
 				status.name = 'running';
 				status.label = this.$locale.baseText('executionsList.running');
-				status.runningTime = this.displayTimer(
-					new Date().getTime() - new Date(execution.startedAt).getTime(),
-					true,
-				);
-			} else if (execution.status === 'success' || execution.finished) {
-				status.name = 'success';
-				status.label = this.$locale.baseText('executionsList.succeeded');
-				if (execution.stoppedAt) {
+				if (execution.startedAt) {
 					status.runningTime = this.displayTimer(
-						new Date(execution.stoppedAt).getTime() - new Date(execution.startedAt).getTime(),
+						new Date().getTime() - new Date(execution.startedAt).getTime(),
 						true,
 					);
 				}
-			} else if (execution.status === 'crashed') {
-				status.name = 'crashed';
-				status.label = this.$locale.baseText('executionsList.error');
+			} else if (execution.status === 'success' || execution.finished) {
+				status.name = 'success';
+				status.label = this.$locale.baseText('executionsList.succeeded');
 				if (execution.stoppedAt) {
 					status.runningTime = this.displayTimer(
 						new Date(execution.stoppedAt).getTime() - new Date(execution.startedAt).getTime(),
 						true,
 					);
 				}
-			} else if (execution.status === 'new') {
-				status.name = 'new';
-				status.label = this.$locale.baseText('executionsList.new');
 			} else if (
-				execution.status === 'error' ||
 				execution.status === 'failed' ||
+				execution.status === 'crashed' ||
 				execution.stoppedAt !== null
 			) {
 				status.name = 'error';
diff --git a/packages/editor-ui/src/mixins/restApi.ts b/packages/editor-ui/src/mixins/restApi.ts
index d479f38c8bac9c..f14d197815cc40 100644
--- a/packages/editor-ui/src/mixins/restApi.ts
+++ b/packages/editor-ui/src/mixins/restApi.ts
@@ -77,7 +77,9 @@ export const restApi = Vue.extend({
 				getActivationError: (id: string): Promise<IActivationError | undefined> => {
 					return self.restApi().makeRestApiRequest('GET', `/active/error/${id}`);
 				},
-				getCurrentExecutions: (filter: object): Promise<IExecutionsCurrentSummaryExtended[]> => {
+				getCurrentExecutions: (
+					filter: IDataObject,
+				): Promise<IExecutionsCurrentSummaryExtended[]> => {
 					let sendData = {};
 					if (filter) {
 						sendData = {
@@ -179,7 +181,7 @@ export const restApi = Vue.extend({
 				// Returns all saved executions
 				// TODO: For sure needs some kind of default filter like last day, with max 10 results, ...
 				getPastExecutions: (
-					filter: object,
+					filter: IDataObject,
 					limit: number,
 					lastId?: string,
 					firstId?: string,
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index 77f03c9c87dbef..bc172f28be9104 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -442,8 +442,6 @@
 	"executionsList.confirmMessage.headline": "Delete Executions?",
 	"executionsList.confirmMessage.message": "Are you sure that you want to delete the {numSelected} selected execution(s)?",
 	"executionsList.clearSelection": "Clear selection",
-	"executionsList.crashed": "Crashed",
-	"executionsList.new": "New",
 	"executionsList.error": "Failed",
 	"executionsList.filters": "Filters",
 	"executionsList.loadMore": "Load More",
@@ -482,8 +480,6 @@
 	"executionsList.id": "Execution ID",
 	"executionsList.status": "Status",
 	"executionsList.statusText": "{status} in {time}",
-	"executionsList.statusCrashed": "{status}",
-	"executionsList.statusNew": "{status}",
 	"executionsList.statusRunning": "{status} for {time}",
 	"executionsList.statusWaiting": "{status} until {time}",
 	"executionsList.statusUnknown": "Could not complete",
diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index e7ab20a50249d4..b8af7235af3e87 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -938,33 +938,24 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 			Vue.set(this, 'activeExecutions', newActiveExecutions);
 		},
 
-		async loadCurrentWorkflowExecutions(filter: {
-			finished: boolean;
-			status: string;
-		}): Promise<IExecutionsSummary[]> {
+		async loadCurrentWorkflowExecutions(requestFilter: IDataObject): Promise<IExecutionsSummary[]> {
 			let activeExecutions = [];
 			let finishedExecutions = [];
-			const requestFilter: IDataObject = { workflowId: this.workflowId };
 
-			if (!this.workflowId) {
+			if (!requestFilter.workflowId) {
 				return [];
 			}
 			try {
 				const rootStore = useRootStore();
-				if (filter.status === '' || !filter.finished) {
-					activeExecutions = await getCurrentExecutions(rootStore.getRestApiContext, requestFilter);
-				}
-				if (filter.status === '' || filter.finished) {
-					if (filter.status === 'waiting') {
-						requestFilter.waitTill = true;
-					} else if (filter.status !== '') {
-						requestFilter.finished = filter.status === 'success';
-					}
-					finishedExecutions = await getFinishedExecutions(
-						rootStore.getRestApiContext,
-						requestFilter,
-					);
+				if (!requestFilter.status || !requestFilter.finished) {
+					activeExecutions = await getCurrentExecutions(rootStore.getRestApiContext, {
+						workflowId: requestFilter.workflowId,
+					});
 				}
+				finishedExecutions = await getFinishedExecutions(
+					rootStore.getRestApiContext,
+					requestFilter,
+				);
 				this.finishedExecutionsCount = finishedExecutions.count;
 				return [...activeExecutions, ...(finishedExecutions.results || [])];
 			} catch (error) {

From a53f3998a25de28c7848d5b5ef401772c7d57748 Mon Sep 17 00:00:00 2001
From: romainminaud <romain.minaud@gmail.com>
Date: Thu, 23 Feb 2023 11:43:03 +0100
Subject: [PATCH 282/358] feat: Check new n8n version at start (no-changelog)
 (#5542)

check new version at start

Co-authored-by: Alex Grozav <alex@grozav.com>
---
 packages/editor-ui/src/views/WorkflowsView.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index ca7143202a9222..f27d2addecbf52 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -119,6 +119,7 @@
 
 <script lang="ts">
 import { showMessage } from '@/mixins/showMessage';
+import { newVersions } from '@/mixins/newVersions';
 import mixins from 'vue-typed-mixins';
 
 import SettingsView from './SettingsView.vue';
@@ -147,7 +148,7 @@ const StatusFilter = {
 	ALL: '',
 };
 
-export default mixins(showMessage, debounceHelper).extend({
+export default mixins(showMessage, debounceHelper, newVersions).extend({
 	name: 'WorkflowsView',
 	components: {
 		ResourcesListLayout,
@@ -271,6 +272,7 @@ export default mixins(showMessage, debounceHelper).extend({
 		},
 	},
 	mounted() {
+		this.checkForNewVersions();
 		this.usersStore.showPersonalizationSurvey();
 	},
 });

From e2d7c1804f2d5da15d96edeefd50c5b8e2753fd1 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Thu, 23 Feb 2023 13:00:28 +0100
Subject: [PATCH 283/358] fix(editor): Apply correct IRunExecutionData to
 finished workflow (#5552)

fix wrong IRunExecutionData being applied
---
 packages/editor-ui/src/stores/workflows.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/stores/workflows.ts b/packages/editor-ui/src/stores/workflows.ts
index b8af7235af3e87..6d9e43363b4ce9 100644
--- a/packages/editor-ui/src/stores/workflows.ts
+++ b/packages/editor-ui/src/stores/workflows.ts
@@ -927,10 +927,8 @@ export const useWorkflowsStore = defineStore(STORES.WORKFLOWS, {
 
 			Vue.set(activeExecution, 'finished', finishedActiveExecution.data.finished);
 			Vue.set(activeExecution, 'stoppedAt', finishedActiveExecution.data.stoppedAt);
-			if (finishedActiveExecution.data) {
-				this.setWorkflowExecutionRunData(
-					finishedActiveExecution.data as unknown as IRunExecutionData,
-				);
+			if (finishedActiveExecution.data && (finishedActiveExecution.data as IRun).data) {
+				this.setWorkflowExecutionRunData((finishedActiveExecution.data as IRun).data);
 			}
 		},
 

From f0695827f5bc3a1076184ce8d539cecd4449cec6 Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Thu, 23 Feb 2023 17:16:05 +0200
Subject: [PATCH 284/358] feat: Migrate packages from lodash to lodash-es
 (no-changelog) (#5538)

---
 packages/editor-ui/package.json               |   5 -
 .../src/components/CollectionParameter.vue    |   2 +-
 .../src/components/ExecutionsList.vue         |   2 +-
 .../ExecutionsView/ExecutionsList.vue         |   2 +-
 .../components/FixedCollectionParameter.vue   |   2 +-
 .../src/components/MultipleParameter.vue      |   2 +-
 .../src/components/NDVDraggablePanels.vue     |   2 +-
 packages/editor-ui/src/components/Node.vue    |   2 +-
 .../Node/NodeCreator/CategorizedItems.vue     |   4 +-
 .../Node/NodeCreator/SubcategoryItem.vue      |   4 +-
 .../editor-ui/src/components/NodeSettings.vue |   2 +-
 .../src/components/ParameterInput.vue         |   2 +-
 .../src/components/ParameterInputList.vue     |   2 +-
 .../EventDestinationSettingsModal.ee.vue      |   2 +-
 packages/editor-ui/src/mixins/copyPaste.ts    |   2 +-
 packages/editor-ui/src/mixins/debounce.ts     |   2 +-
 packages/editor-ui/src/mixins/nodeHelpers.ts  |   2 +-
 .../editor-ui/src/mixins/workflowHelpers.ts   |   2 +-
 .../plugins/connectors/N8nCustomConnector.ts  |   2 +-
 packages/editor-ui/src/stores/nodeCreator.ts  |   2 +-
 packages/editor-ui/vite.config.ts             |  17 +-
 .../nodes/ActionNetwork/GenericFunctions.ts   |   3 +-
 .../nodes/Asana/GenericFunctions.ts           |   2 +-
 .../nodes/Aws/AwsSnsTrigger.node.ts           |   2 +-
 .../CertificateManager/GenericFunctions.ts    |   2 +-
 .../nodes/Aws/ELB/GenericFunctions.ts         |   2 +-
 .../nodes/Aws/Rekognition/GenericFunctions.ts |   2 +-
 .../nodes/Aws/S3/GenericFunctions.ts          |   2 +-
 .../nodes/Aws/SES/GenericFunctions.ts         |   2 +-
 .../nodes/Aws/Transcribe/GenericFunctions.ts  |   2 +-
 .../nodes/Bitwarden/Bitwarden.node.ts         |   3 +-
 .../nodes/Cisco/Webex/GenericFunctions.ts     |   2 +-
 .../nodes/CompareDatasets/GenericFunctions.ts |   8 +-
 .../nodes/Copper/GenericFunctions.ts          |   3 +-
 .../nodes-base/nodes/Cortex/Cortex.node.ts    |   2 +-
 .../nodes-base/nodes/Crypto/Crypto.node.ts    |   2 +-
 .../nodes/CustomerIo/GenericFunctions.ts      |   2 +-
 .../nodes/DateTime/DateTime.node.ts           |   2 +-
 packages/nodes-base/nodes/ERPNext/utils.ts    |   4 +-
 .../Elasticsearch/Elasticsearch.node.ts       |   2 +-
 .../EmailReadImap/v1/EmailReadImapV1.node.ts  |  11 +-
 .../EmailReadImap/v2/EmailReadImapV2.node.ts  |  11 +-
 .../nodes-base/nodes/Emelia/Emelia.node.ts    |   2 +-
 .../nodes/Freshservice/GenericFunctions.ts    |   2 +-
 .../nodes/FreshworksCrm/GenericFunctions.ts   |   2 +-
 .../nodes/GoToWebinar/GoToWebinar.node.ts     |   3 +-
 .../nodes/Google/Gmail/GenericFunctions.ts    |   2 +-
 .../nodes/Google/Gmail/v1/GmailV1.node.ts     |   2 +-
 .../Google/Sheet/GoogleSheetsTrigger.utils.ts |   3 +-
 .../nodes/Google/Sheet/v1/GoogleSheet.ts      |   2 +-
 .../Google/Sheet/v2/helpers/GoogleSheet.ts    |   2 +-
 .../nodes/HelpScout/GenericFunctions.ts       |   2 +-
 .../nodes/InvoiceNinja/GenericFunctions.ts    |   2 +-
 .../nodes/ItemLists/ItemLists.node.ts         |  11 +-
 .../nodes/ItemLists/summarize.operation.ts    |   2 +-
 packages/nodes-base/nodes/Jira/Jira.node.ts   |   2 +-
 .../nodes/KoBoToolbox/GenericFunctions.ts     |  58 +-
 .../nodes-base/nodes/Lemlist/Lemlist.node.ts  |   3 +-
 .../nodes/Mandrill/GenericFunctions.ts        |   4 +-
 .../nodes/Mandrill/Mandrill.node.ts           |  25 +-
 .../nodes/Markdown/Markdown.node.ts           |   3 +-
 .../nodes/Matrix/GenericFunctions.ts          |   1 -
 .../nodes-base/nodes/Merge/v1/MergeV1.node.ts |   2 +-
 .../nodes/Merge/v2/GenericFunctions.ts        |   6 +-
 .../nodes-base/nodes/Merge/v2/MergeV2.node.ts |   2 +-
 .../nodes/MondayCom/GenericFunctions.ts       |   2 +-
 .../nodes/MongoDb/GenericFunctions.ts         |   3 +-
 .../MoveBinaryData/MoveBinaryData.node.ts     |   4 +-
 .../nodes/QuickBooks/GenericFunctions.ts      |   3 +-
 .../nodes/QuickBooks/QuickBooks.node.ts       |   2 +-
 .../nodes/Raindrop/Raindrop.node.ts           |   3 +-
 packages/nodes-base/nodes/Redis/Redis.node.ts |   2 +-
 .../nodes/RenameKeys/RenameKeys.node.ts       |   4 +-
 .../nodes-base/nodes/S3/GenericFunctions.ts   |   2 +-
 .../nodes/SeaTable/GenericFunctions.ts        |   2 -
 packages/nodes-base/nodes/Set/Set.node.ts     |   2 +-
 .../nodes/Slack/V1/GenericFunctions.ts        |   4 +-
 .../nodes/Slack/V2/GenericFunctions.ts        |   4 +-
 .../nodes/Spotify/GenericFunctions.ts         |   2 +-
 .../nodes-base/nodes/Stripe/Stripe.node.ts    |   2 +-
 packages/nodes-base/nodes/Stripe/helpers.ts   |   4 +-
 .../nodes-base/nodes/TheHive/TheHive.node.ts  |   2 +-
 .../nodes/TravisCi/GenericFunctions.ts        |   2 +-
 .../Venafi/Datacenter/GenericFunctions.ts     |   2 +-
 .../Venafi/ProtectCloud/GenericFunctions.ts   |   2 +-
 packages/nodes-base/nodes/Wise/Wise.node.ts   |   2 +-
 .../nodes/WooCommerce/GenericFunctions.ts     |   2 +-
 .../nodes/Zammad/GenericFunctions.ts          |   2 +-
 .../nodes-base/nodes/Zoho/GenericFunctions.ts |   3 +-
 packages/nodes-base/package.json              |  85 ++-
 pnpm-lock.yaml                                | 494 +++++++++++++++++-
 91 files changed, 737 insertions(+), 182 deletions(-)

diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 7863b7193acf36..454a3ef8cb22de 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -56,11 +56,6 @@
     "jquery": "^3.4.1",
     "jsonpath": "^1.1.1",
     "lodash-es": "^4.17.21",
-    "lodash.camelcase": "^4.3.0",
-    "lodash.debounce": "^4.0.8",
-    "lodash.get": "^4.4.2",
-    "lodash.orderby": "^4.6.0",
-    "lodash.set": "^4.3.2",
     "luxon": "^3.1.0",
     "monaco-editor": "^0.33.0",
     "n8n-design-system": "workspace:*",
diff --git a/packages/editor-ui/src/components/CollectionParameter.vue b/packages/editor-ui/src/components/CollectionParameter.vue
index a9ef55d9bb4e9f..edcadf64729337 100644
--- a/packages/editor-ui/src/components/CollectionParameter.vue
+++ b/packages/editor-ui/src/components/CollectionParameter.vue
@@ -52,7 +52,7 @@ import { deepCopy, INodeProperties, INodePropertyOptions } from 'n8n-workflow';
 
 import { nodeHelpers } from '@/mixins/nodeHelpers';
 
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 
 import mixins from 'vue-typed-mixins';
 import { Component } from 'vue';
diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index fcd3f8214c15b8..b890db34ce9d53 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -265,7 +265,7 @@ import {
 	IWorkflowShortResponse,
 } from '@/Interface';
 import type { ExecutionStatus, IDataObject } from 'n8n-workflow';
-import { range as _range } from 'lodash';
+import { range as _range } from 'lodash-es';
 import mixins from 'vue-typed-mixins';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
diff --git a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
index 53b97ca84bcfd8..badfa3bf4d2825 100644
--- a/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsView/ExecutionsList.vue
@@ -48,7 +48,7 @@ import { showMessage } from '@/mixins/showMessage';
 import { v4 as uuid } from 'uuid';
 import { Route } from 'vue-router';
 import { executionHelpers } from '@/mixins/executionsHelpers';
-import { range as _range } from 'lodash';
+import { range as _range } from 'lodash-es';
 import { debounceHelper } from '@/mixins/debounce';
 import { getNodeViewTab, NO_NETWORK_ERROR_CODE } from '@/utils';
 import { workflowHelpers } from '@/mixins/workflowHelpers';
diff --git a/packages/editor-ui/src/components/FixedCollectionParameter.vue b/packages/editor-ui/src/components/FixedCollectionParameter.vue
index 01938d77af9151..fdae7a368f4665 100644
--- a/packages/editor-ui/src/components/FixedCollectionParameter.vue
+++ b/packages/editor-ui/src/components/FixedCollectionParameter.vue
@@ -124,7 +124,7 @@ import {
 	isINodePropertyCollectionList,
 } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 
 export default Vue.extend({
 	name: 'FixedCollectionParameter',
diff --git a/packages/editor-ui/src/components/MultipleParameter.vue b/packages/editor-ui/src/components/MultipleParameter.vue
index a7e0741570e7ea..3d8e912d0a8f71 100644
--- a/packages/editor-ui/src/components/MultipleParameter.vue
+++ b/packages/editor-ui/src/components/MultipleParameter.vue
@@ -90,7 +90,7 @@ import { deepCopy, INodeParameters, INodeProperties } from 'n8n-workflow';
 import CollectionParameter from '@/components/CollectionParameter.vue';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 
 export default Vue.extend({
 	name: 'MultipleParameter',
diff --git a/packages/editor-ui/src/components/NDVDraggablePanels.vue b/packages/editor-ui/src/components/NDVDraggablePanels.vue
index 5ff5cc40e51295..25fd9662404ca6 100644
--- a/packages/editor-ui/src/components/NDVDraggablePanels.vue
+++ b/packages/editor-ui/src/components/NDVDraggablePanels.vue
@@ -38,7 +38,7 @@
 
 <script lang="ts">
 import Vue, { PropType } from 'vue';
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 
 import { INodeTypeDescription } from 'n8n-workflow';
 import PanelDragButton from './PanelDragButton.vue';
diff --git a/packages/editor-ui/src/components/Node.vue b/packages/editor-ui/src/components/Node.vue
index 981dc9a38c9920..337dac50fe6c7a 100644
--- a/packages/editor-ui/src/components/Node.vue
+++ b/packages/editor-ui/src/components/Node.vue
@@ -189,7 +189,7 @@ import TitledList from '@/components/TitledList.vue';
 
 import mixins from 'vue-typed-mixins';
 
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 import { getStyleTokenValue, getTriggerNodeServiceName } from '@/utils';
 import {
 	IExecutionsSummary,
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue b/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
index 99fad864d1cac5..06dd3245d8e9ee 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/CategorizedItems.vue
@@ -95,7 +95,7 @@ import {
 	onUnmounted,
 	nextTick,
 } from 'vue';
-import camelcase from 'lodash.camelcase';
+import { camelCase } from 'lodash-es';
 import { externalHooks } from '@/mixins/externalHooks';
 import { INodeTypeDescription } from 'n8n-workflow';
 import ItemIterator from './ItemIterator.vue';
@@ -184,7 +184,7 @@ const activeSubcategoryTitle = computed<string>(() => {
 	if (!activeSubcategory.value || !activeSubcategory.value.properties) return '';
 
 	const subcategory = (activeSubcategory.value.properties as ISubcategoryItemProps).subcategory;
-	const subcategoryName = camelcase(subcategory);
+	const subcategoryName = camelCase(subcategory);
 
 	const titleLocaleKey = `nodeCreator.subcategoryTitles.${subcategoryName}` as BaseTextKey;
 	const nameLocaleKey = `nodeCreator.subcategoryNames.${subcategoryName}` as BaseTextKey;
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
index 507157f005ba4d..903b45cb3e38cc 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/SubcategoryItem.vue
@@ -14,14 +14,14 @@
 
 <script setup lang="ts">
 import { ISubcategoryItemProps } from '@/Interface';
-import camelcase from 'lodash.camelcase';
+import { camelCase } from 'lodash-es';
 import { computed } from 'vue';
 export interface Props {
 	item: ISubcategoryItemProps;
 }
 
 const props = defineProps<Props>();
-const subcategoryName = computed(() => camelcase(props.item.subcategory));
+const subcategoryName = computed(() => camelCase(props.item.subcategory));
 </script>
 
 <style lang="scss" module>
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 658d1076db58bb..2bfd979c43e3b9 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -188,7 +188,7 @@ import ParameterInputList from '@/components/ParameterInputList.vue';
 import NodeCredentials from '@/components/NodeCredentials.vue';
 import NodeSettingsTabs from '@/components/NodeSettingsTabs.vue';
 import NodeWebhooks from '@/components/NodeWebhooks.vue';
-import { get, set, unset } from 'lodash';
+import { get, set, unset } from 'lodash-es';
 
 import { externalHooks } from '@/mixins/externalHooks';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
diff --git a/packages/editor-ui/src/components/ParameterInput.vue b/packages/editor-ui/src/components/ParameterInput.vue
index d15faa918157eb..c9664b1f96b65d 100644
--- a/packages/editor-ui/src/components/ParameterInput.vue
+++ b/packages/editor-ui/src/components/ParameterInput.vue
@@ -319,7 +319,7 @@
 <script lang="ts">
 /* eslint-disable prefer-spread */
 
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 
 import { INodeUi, INodeUpdatePropertiesInformation } from '@/Interface';
 import {
diff --git a/packages/editor-ui/src/components/ParameterInputList.vue b/packages/editor-ui/src/components/ParameterInputList.vue
index 3236190635381a..668ed3588a209f 100644
--- a/packages/editor-ui/src/components/ParameterInputList.vue
+++ b/packages/editor-ui/src/components/ParameterInputList.vue
@@ -124,7 +124,7 @@ import { workflowHelpers } from '@/mixins/workflowHelpers';
 import ParameterInputFull from '@/components/ParameterInputFull.vue';
 import ImportParameter from '@/components/ImportParameter.vue';
 
-import { get, set } from 'lodash';
+import { get, set } from 'lodash-es';
 
 import mixins from 'vue-typed-mixins';
 import { Component, PropType } from 'vue';
diff --git a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
index 0b793d1d813d0b..26ac3480707bc0 100644
--- a/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
+++ b/packages/editor-ui/src/components/SettingsLogStreaming/EventDestinationSettingsModal.ee.vue
@@ -172,7 +172,7 @@
 </template>
 
 <script lang="ts">
-import { get, set, unset } from 'lodash';
+import { get, set, unset } from 'lodash-es';
 import { mapStores } from 'pinia';
 import mixins from 'vue-typed-mixins';
 import { useLogStreamingStore } from '../../stores/logStreamingStore';
diff --git a/packages/editor-ui/src/mixins/copyPaste.ts b/packages/editor-ui/src/mixins/copyPaste.ts
index 4eb325dbf5feaf..eee52394d99ac7 100644
--- a/packages/editor-ui/src/mixins/copyPaste.ts
+++ b/packages/editor-ui/src/mixins/copyPaste.ts
@@ -3,7 +3,7 @@
  * defined on the component which uses this mixin
  */
 import Vue from 'vue';
-import { debounce } from 'lodash';
+import { debounce } from 'lodash-es';
 
 export const copyPaste = Vue.extend({
 	data() {
diff --git a/packages/editor-ui/src/mixins/debounce.ts b/packages/editor-ui/src/mixins/debounce.ts
index 08b2d6f7348a6e..7c491780aaf3db 100644
--- a/packages/editor-ui/src/mixins/debounce.ts
+++ b/packages/editor-ui/src/mixins/debounce.ts
@@ -1,4 +1,4 @@
-import { debounce } from 'lodash';
+import { debounce } from 'lodash-es';
 import Vue from 'vue';
 
 export const debounceHelper = Vue.extend({
diff --git a/packages/editor-ui/src/mixins/nodeHelpers.ts b/packages/editor-ui/src/mixins/nodeHelpers.ts
index f0914069cf9954..e859295107dfa9 100644
--- a/packages/editor-ui/src/mixins/nodeHelpers.ts
+++ b/packages/editor-ui/src/mixins/nodeHelpers.ts
@@ -34,7 +34,7 @@ import {
 
 import { restApi } from '@/mixins/restApi';
 
-import { get } from 'lodash';
+import { get } from 'lodash-es';
 
 import mixins from 'vue-typed-mixins';
 import { isObjectLiteral } from '@/utils';
diff --git a/packages/editor-ui/src/mixins/workflowHelpers.ts b/packages/editor-ui/src/mixins/workflowHelpers.ts
index 647c9c1a26d8b4..e3bdecac32d5c6 100644
--- a/packages/editor-ui/src/mixins/workflowHelpers.ts
+++ b/packages/editor-ui/src/mixins/workflowHelpers.ts
@@ -48,7 +48,7 @@ import { restApi } from '@/mixins/restApi';
 import { nodeHelpers } from '@/mixins/nodeHelpers';
 import { showMessage } from '@/mixins/showMessage';
 
-import { isEqual } from 'lodash';
+import { isEqual } from 'lodash-es';
 
 import mixins from 'vue-typed-mixins';
 import { v4 as uuid } from 'uuid';
diff --git a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
index a8f01f61d3dd38..75ec0a6ec5831e 100644
--- a/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
+++ b/packages/editor-ui/src/plugins/connectors/N8nCustomConnector.ts
@@ -12,7 +12,7 @@ import {
 } from '@jsplumb/core';
 import { AnchorPlacement, ConnectorOptions, Geometry, PaintAxis } from '@jsplumb/common';
 import { BezierSegment } from '@jsplumb/connector-bezier';
-import { isArray } from 'lodash';
+import { isArray } from 'lodash-es';
 import { deepCopy } from 'n8n-workflow';
 
 export interface N8nConnectorOptions extends ConnectorOptions {}
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index e25831fdeb3898..ad0e50fac351c0 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -1,4 +1,4 @@
-import { startCase } from 'lodash';
+import { startCase } from 'lodash-es';
 import { defineStore } from 'pinia';
 import {
 	INodePropertyCollection,
diff --git a/packages/editor-ui/vite.config.ts b/packages/editor-ui/vite.config.ts
index 1277051887334b..b14dcc93438e4e 100644
--- a/packages/editor-ui/vite.config.ts
+++ b/packages/editor-ui/vite.config.ts
@@ -16,11 +16,6 @@ const ignoreChunks = [
 	'@fontsource/open-sans',
 	'normalize-wheel',
 	'stream-browserify',
-	'lodash.camelcase',
-	'lodash.debounce',
-	'lodash.get',
-	'lodash.orderby',
-	'lodash.set',
 ];
 
 const isScopedPackageToIgnore = (str: string) => /@codemirror\//.test(str);
@@ -44,11 +39,6 @@ function renderChunks() {
 
 const publicPath = process.env.VUE_APP_PUBLIC_PATH || '/';
 
-const lodashAliases = ['orderBy', 'camelCase', 'cloneDeep', 'isEqual', 'startCase'].map((name) => ({
-	find: new RegExp(`^lodash.${name}$`, 'i'),
-	replacement: require.resolve(`lodash-es/${name}`),
-}));
-
 const { NODE_ENV } = process.env;
 
 export default mergeConfig(
@@ -78,9 +68,12 @@ export default mergeConfig(
 					find: /^n8n-design-system\//,
 					replacement: resolve(__dirname, '..', 'design-system', 'src') + '/',
 				},
-				...lodashAliases,
+				...['orderBy', 'camelCase', 'cloneDeep', 'isEqual', 'startCase'].map((name) => ({
+					find: new RegExp(`^lodash.${name}$`, 'i'),
+					replacement: require.resolve(`lodash-es/${name}`),
+				})),
 				{
-					find: /^lodash.(.+)$/,
+					find: /^lodash\.(.+)$/,
 					replacement: 'lodash-es/$1',
 				},
 				{
diff --git a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
index c2c584f0caf234..2aa053856811a7 100644
--- a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
@@ -4,7 +4,8 @@ import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
-import { flow, omit } from 'lodash';
+import flow from 'lodash.flow';
+import omit from 'lodash.omit';
 
 import type {
 	AllFieldsUi,
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index 38e5ab0088ac99..5b92e21917c355 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	INodePropertyOptions,
 } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 /**
  * Make an API request to Asana
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index 15b24346c9fd09..e9644a736e916a 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -12,7 +12,7 @@ import { jsonParse, NodeOperationError } from 'n8n-workflow';
 
 import { awsApiRequestSOAP } from './GenericFunctions';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export class AwsSnsTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
index 1fafbb0f1a7f54..fe6a7de8068e2c 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 import type {
 	IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
index 0353900c91f982..dd9835b220478c 100644
--- a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 import { parseString } from 'xml2js';
 
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
index 54e1be89037679..e608da4c67e41c 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 import { parseString } from 'xml2js';
 
diff --git a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
index b3973860858ffc..34e39cf8c3ed60 100644
--- a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 import { parseString } from 'xml2js';
 
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
index 35f078372bf398..62321049dc3173 100644
--- a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -10,7 +10,7 @@ import type {
 import type { IDataObject, IHttpRequestOptions } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
index 9ce6edb56fb671..a0fc777f52b55e 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
@@ -15,7 +15,7 @@ import type {
 import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 function getEndpointForService(
 	service: string,
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index 3e98fd0b7ed140..c2f2467b63c0a5 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -33,7 +33,8 @@ import type {
 } from './descriptions/MemberDescription';
 import { memberFields, memberOperations } from './descriptions/MemberDescription';
 
-import { isEmpty, partialRight } from 'lodash';
+import isEmpty from 'lodash.isempty';
+import partialRight from 'lodash.partialright';
 
 export class Bitwarden implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
index 9ae21308d06278..389f5eadc36f6e 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -10,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash.upperfirst';
 
 import { createHash } from 'crypto';
 
diff --git a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
index 9e6116c8189c68..6452179e11350d 100644
--- a/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/GenericFunctions.ts
@@ -1,6 +1,12 @@
 import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 
-import { difference, get, intersection, isEmpty, omit, set, union } from 'lodash';
+import difference from 'lodash.difference';
+import get from 'lodash.get';
+import intersection from 'lodash.intersection';
+import isEmpty from 'lodash.isempty';
+import omit from 'lodash.omit';
+import set from 'lodash.set';
+import union from 'lodash.union';
 import { fuzzyCompare } from '../../utils/utilities';
 
 type PairToMatch = {
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index b2518b7c8a250d..eee2f44d336806 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -13,7 +13,8 @@ import type {
 import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { flow, omit } from 'lodash';
+import flow from 'lodash.flow';
+import omit from 'lodash.omit';
 
 import type {
 	AddressFixedCollection,
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 45933f2b4a8f0e..7eba5a1ea11939 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -18,7 +18,7 @@ import { responderFields, respondersOperations } from './ResponderDescription';
 
 import { jobFields, jobOperations } from './JobDescription';
 
-import { upperFirst } from 'lodash';
+import upperFirst from 'lodash.upperfirst';
 
 import type { IJob } from './AnalyzerInterface';
 
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.ts b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
index 646896d99b4a2f..b150425129ffb4 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
@@ -1,4 +1,4 @@
-import { set } from 'lodash';
+import set from 'lodash.set';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
diff --git a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
index 176026bee1cb24..bbbe12a78b5d3e 100644
--- a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n
 
 import type { IDataObject, IHttpRequestMethods, IHttpRequestOptions } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export async function customerIoApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/DateTime/DateTime.node.ts b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
index 38701532e11a3c..099b3d1c51e2dd 100644
--- a/packages/nodes-base/nodes/DateTime/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
@@ -9,7 +9,7 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy, NodeOperationError } from 'n8n-workflow';
 
-import { set } from 'lodash';
+import set from 'lodash.set';
 
 import moment from 'moment-timezone';
 
diff --git a/packages/nodes-base/nodes/ERPNext/utils.ts b/packages/nodes-base/nodes/ERPNext/utils.ts
index 95c25770d96fef..2f31c2b86ac9e0 100644
--- a/packages/nodes-base/nodes/ERPNext/utils.ts
+++ b/packages/nodes-base/nodes/ERPNext/utils.ts
@@ -1,4 +1,6 @@
-import { flow, sortBy, uniqBy } from 'lodash';
+import flow from 'lodash.flow';
+import sortBy from 'lodash.sortby';
+import uniqBy from 'lodash.uniqby';
 
 export type DocumentProperties = {
 	customProperty: Array<{ field: string; value: string }>;
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index 6b5d44c10e38df..be5b2f0721605e 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -14,7 +14,7 @@ import { documentFields, documentOperations, indexFields, indexOperations } from
 
 import type { DocumentGetAllOptions, FieldsUiValues } from './types';
 
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 
 export class Elasticsearch implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index 748f4d7f504e97..13f88a403f622c 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -22,7 +22,8 @@ import { connect as imapConnect, getParts } from 'imap-simple';
 import type { Source as ParserSource } from 'mailparser';
 import { simpleParser } from 'mailparser';
 
-import _ from 'lodash';
+import isEmpty from 'lodash.isempty';
+import find from 'lodash.find';
 
 export async function parseRawEmail(
 	this: ITriggerFunctions,
@@ -241,7 +242,7 @@ export class EmailReadImapV1 implements INodeType {
 					if (credentials.secure) {
 						tlsOptions.servername = credentials.host as string;
 					}
-					if (!_.isEmpty(tlsOptions)) {
+					if (!isEmpty(tlsOptions)) {
 						config.imap.tlsOptions = tlsOptions;
 					}
 					const conn = imapConnect(config).then(async (entry) => {
@@ -385,7 +386,7 @@ export class EmailReadImapV1 implements INodeType {
 					) {
 						staticData.lastMessageUid = message.attributes.uid;
 					}
-					const part = _.find(message.parts, { which: '' });
+					const part = find(message.parts, { which: '' });
 
 					if (part === undefined) {
 						throw new NodeOperationError(this.getNode(), 'Email part could not be parsed.');
@@ -474,7 +475,7 @@ export class EmailReadImapV1 implements INodeType {
 					) {
 						staticData.lastMessageUid = message.attributes.uid;
 					}
-					const part = _.find(message.parts, { which: 'TEXT' });
+					const part = find(message.parts, { which: 'TEXT' });
 
 					if (part === undefined) {
 						throw new NodeOperationError(this.getNode(), 'Email part could not be parsed.');
@@ -569,7 +570,7 @@ export class EmailReadImapV1 implements INodeType {
 				tlsOptions.servername = credentials.host as string;
 			}
 
-			if (!_.isEmpty(tlsOptions)) {
+			if (!isEmpty(tlsOptions)) {
 				config.imap.tlsOptions = tlsOptions;
 			}
 
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index 3295aaa27a7a1c..0d71a8eb1384ee 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -21,7 +21,8 @@ import { connect as imapConnect, getParts } from 'imap-simple';
 import type { Source as ParserSource } from 'mailparser';
 import { simpleParser } from 'mailparser';
 
-import _ from 'lodash';
+import isEmpty from 'lodash.isempty';
+import find from 'lodash.find';
 import type { ICredentialsDataImap } from '../../../credentials/Imap.credentials';
 import { isCredentialsDataImap } from '../../../credentials/Imap.credentials';
 
@@ -240,7 +241,7 @@ export class EmailReadImapV2 implements INodeType {
 						if (credentials.secure) {
 							tlsOptions.servername = credentials.host;
 						}
-						if (!_.isEmpty(tlsOptions)) {
+						if (!isEmpty(tlsOptions)) {
 							config.imap.tlsOptions = tlsOptions;
 						}
 						const connection = await imapConnect(config);
@@ -393,7 +394,7 @@ export class EmailReadImapV2 implements INodeType {
 					) {
 						staticData.lastMessageUid = message.attributes.uid;
 					}
-					const part = _.find(message.parts, { which: '' });
+					const part = find(message.parts, { which: '' });
 
 					if (part === undefined) {
 						throw new NodeOperationError(this.getNode(), 'Email part could not be parsed.');
@@ -482,7 +483,7 @@ export class EmailReadImapV2 implements INodeType {
 					) {
 						staticData.lastMessageUid = message.attributes.uid;
 					}
-					const part = _.find(message.parts, { which: 'TEXT' });
+					const part = find(message.parts, { which: 'TEXT' });
 
 					if (part === undefined) {
 						throw new NodeOperationError(this.getNode(), 'Email part could not be parsed.');
@@ -580,7 +581,7 @@ export class EmailReadImapV2 implements INodeType {
 				tlsOptions.servername = credentials.host;
 			}
 
-			if (!_.isEmpty(tlsOptions)) {
+			if (!isEmpty(tlsOptions)) {
 				config.imap.tlsOptions = tlsOptions;
 			}
 
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.ts b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
index 58d4d78ea9a7cc..36d3045c6b6e71 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.ts
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
@@ -14,7 +14,7 @@ import { campaignFields, campaignOperations } from './CampaignDescription';
 
 import { contactListFields, contactListOperations } from './ContactListDescription';
 
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash.isempty';
 
 export class Emelia implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
index 36c1f21939dd48..e88886895f802d 100644
--- a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
@@ -12,7 +12,7 @@ import type {
 
 import type { OptionsWithUri } from 'request';
 
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 
 export async function freshserviceApiRequest(
 	this: IExecuteFunctions | IHookFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
index 21eba0f47a0de8..376c5c702c45a6 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
@@ -12,7 +12,7 @@ import type {
 	ViewsResponse,
 } from './types';
 
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 
 export async function freshworksCrmApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index 16932f791e2c9e..5cca0919a389c1 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -36,7 +36,8 @@ import {
 	loadWebinarSessions,
 } from './GenericFunctions';
 
-import { isEmpty, omit } from 'lodash';
+import isEmpty from 'lodash.isempty';
+import omit from 'lodash.omit';
 
 import moment from 'moment-timezone';
 
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index 3bc7cfb9dc2b03..228c11cb3d1b2d 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -19,7 +19,7 @@ import jwt from 'jsonwebtoken';
 
 import { DateTime } from 'luxon';
 
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash.isempty';
 
 export interface IEmail {
 	from?: string;
diff --git a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
index d97a6edec0f748..b6d041df516252 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -29,7 +29,7 @@ import { labelFields, labelOperations } from './LabelDescription';
 
 import { draftFields, draftOperations } from './DraftDescription';
 
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash.isempty';
 
 const versionDescription: INodeTypeDescription = {
 	displayName: 'Gmail',
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
index 25969716fc04b2..a7044941a66986 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.utils.ts
@@ -3,7 +3,8 @@ import { apiRequest } from './v2/transport';
 import type { SheetDataRow, SheetRangeData } from './v2/helpers/GoogleSheets.types';
 
 import * as XLSX from 'xlsx';
-import { isEqual, zip } from 'lodash';
+import isEqual from 'lodash.isequal';
+import zip from 'lodash.zip';
 
 export const BINARY_MIME_TYPE = 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
index 70b2b0d6ce8df1..7bd56df0fe7745 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
@@ -7,7 +7,7 @@ import { googleApiRequest } from './GenericFunctions';
 
 import { utils as xlsxUtils } from 'xlsx';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export interface ISheetOptions {
 	scope: string[];
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
index 19fd626ed2e038..c3fb40b0f8b469 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
@@ -3,7 +3,7 @@ import { NodeOperationError } from 'n8n-workflow';
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import { apiRequest } from '../transport';
 import { utils as xlsxUtils } from 'xlsx';
-import { get } from 'lodash';
+import get from 'lodash.get';
 import type {
 	ILookupValues,
 	ISheetUpdateData,
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index 161c1a715a8537..146b6724664e88 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -10,7 +10,7 @@ import type {
 import type { IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export async function helpscoutApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index 46fcc660d9578b..ae0dc2e604f8bb 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -10,7 +10,7 @@ import type {
 import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export const eventID: { [key: string]: string } = {
 	create_client: '1',
diff --git a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
index d7aa9b384634ac..11011680f1afb5 100644
--- a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
@@ -11,7 +11,16 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { get, isEmpty, isEqual, isObject, lt, merge, pick, reduce, set, unset } from 'lodash';
+import get from 'lodash.get';
+import isEmpty from 'lodash.isempty';
+import isEqual from 'lodash.isequal';
+import isObject from 'lodash.isobject';
+import lt from 'lodash.lt';
+import merge from 'lodash.merge';
+import pick from 'lodash.pick';
+import reduce from 'lodash.reduce';
+import set from 'lodash.set';
+import unset from 'lodash.unset';
 
 const compareItems = (
 	obj: INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ItemLists/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/summarize.operation.ts
index 24d8f6fc6a27b1..0e0db54bcb7c0c 100644
--- a/packages/nodes-base/nodes/ItemLists/summarize.operation.ts
+++ b/packages/nodes-base/nodes/ItemLists/summarize.operation.ts
@@ -7,7 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 type AggregationType =
 	| 'append'
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 37aabd30637652..4336afd5f58d90 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1,4 +1,4 @@
-import { mergeWith } from 'lodash';
+import mergeWith from 'lodash.mergewith';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
diff --git a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
index 7cb1ace5c42dc7..8e41846cca7706 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
@@ -9,7 +9,21 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-workflow';
 
-import _ from 'lodash';
+import set from 'lodash.set';
+import concat from 'lodash.concat';
+import split from 'lodash.split';
+import every from 'lodash.every';
+import toString from 'lodash.tostring';
+import toNumber from 'lodash.tonumber';
+import isString from 'lodash.isstring';
+import compact from 'lodash.compact';
+import first from 'lodash.first';
+import last from 'lodash.last';
+import clone from 'lodash.clone';
+import some from 'lodash.some';
+import isArray from 'lodash.isarray';
+import trim from 'lodash.trim';
+import escapeRegExp from 'lodash.escaperegexp';
 
 export async function koBoToolboxApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
@@ -21,7 +35,7 @@ export async function koBoToolboxApiRequest(
 	const returnAll = !!option.returnAll;
 	if (returnAll) {
 		// Override manual pagination options
-		_.set(option, 'qs.limit', 3000);
+		set(option, 'qs.limit', 3000);
 		// Don't pass this custom param to helpers.httpRequest
 		delete option.returnAll;
 	}
@@ -49,7 +63,7 @@ export async function koBoToolboxApiRequest(
 			options,
 		);
 		// Append or set results
-		results = response.results ? _.concat(results || [], response.results) : response;
+		results = response.results ? concat(results || [], response.results) : response;
 		if (returnAll && response.next) {
 			options.url = response.next;
 		} else {
@@ -76,30 +90,30 @@ export async function koBoToolboxRawRequest(
 function parseGeoPoint(geoPoint: string): null | number[] {
 	// Check if it looks like a "lat lon z precision" flat string e.g. "-1.931161 30.079811 0 0" (lat, lon, elevation, precision)
 	// NOTE: we are discarding the elevation and precision values since they're not (well) supported in GeoJSON
-	const coordinates = _.split(geoPoint, ' ');
+	const coordinates = split(geoPoint, ' ');
 	if (
 		coordinates.length >= 2 &&
-		_.every(coordinates, (coord) => coord && /^-?\d+(?:\.\d+)?$/.test(_.toString(coord)))
+		every(coordinates, (coord) => coord && /^-?\d+(?:\.\d+)?$/.test(toString(coord)))
 	) {
 		// NOTE: GeoJSON uses lon, lat, while most common systems use lat, lon order!
-		return [_.toNumber(coordinates[1]), _.toNumber(coordinates[0])];
+		return [toNumber(coordinates[1]), toNumber(coordinates[0])];
 	}
 	return null;
 }
 
 export function parseStringList(value: string): string[] {
-	return _.split(_.toString(value), /[\s,]+/);
+	return split(toString(value), /[\s,]+/);
 }
 
 const matchWildcard = (value: string, pattern: string): boolean => {
-	const regex = new RegExp(`^${_.escapeRegExp(pattern).replace('\\*', '.*')}$`);
+	const regex = new RegExp(`^${escapeRegExp(pattern).replace('\\*', '.*')}$`);
 	return regex.test(value);
 };
 
 const formatValue = (value: any, format: string): any => {
-	if (_.isString(value)) {
+	if (isString(value)) {
 		// Sanitize value
-		value = _.toString(value);
+		value = toString(value);
 
 		// Parse geoPoints
 		const geoPoint = parseGeoPoint(value);
@@ -114,11 +128,11 @@ const formatValue = (value: any, format: string): any => {
 		const points = value.split(';');
 		if (points.length >= 2 && /^[-\d\.\s;]+$/.test(value)) {
 			// Using the GeoJSON format as per https://geojson.org/
-			const coordinates = _.compact(points.map(parseGeoPoint));
+			const coordinates = compact(points.map(parseGeoPoint));
 			// Only return if all values are properly parsed
 			if (coordinates.length === points.length) {
 				// If the shape is closed, declare it as Polygon, otherwise as LineString
-				if (_.first(points) === _.last(points)) {
+				if (first(points) === last(points)) {
 					return {
 						type: 'Polygon',
 						coordinates: [coordinates],
@@ -131,12 +145,12 @@ const formatValue = (value: any, format: string): any => {
 
 		// Parse numbers
 		if ('number' === format) {
-			return _.toNumber(value);
+			return toNumber(value);
 		}
 
 		// Split multi-select
 		if ('multiSelect' === format) {
-			return _.split(_.toString(value), ' ');
+			return split(toString(value), ' ');
 		}
 	}
 
@@ -152,29 +166,29 @@ export function formatSubmission(
 	const response = {} as IDataObject;
 
 	for (const key of Object.keys(submission)) {
-		let value = _.clone(submission[key]);
+		let value = clone(submission[key]);
 		// Sanitize key names: split by group, trim _
 		const sanitizedKey = key
 			.split('/')
-			.map((k) => _.trim(k, ' _'))
+			.map((k) => trim(k, ' _'))
 			.join('.');
 		const leafKey = sanitizedKey.split('.').pop() || '';
 		let format = 'string';
-		if (_.some(numberMasks, (mask) => matchWildcard(leafKey, mask))) {
+		if (some(numberMasks, (mask) => matchWildcard(leafKey, mask))) {
 			format = 'number';
 		}
-		if (_.some(selectMasks, (mask) => matchWildcard(leafKey, mask))) {
+		if (some(selectMasks, (mask) => matchWildcard(leafKey, mask))) {
 			format = 'multiSelect';
 		}
 
 		value = formatValue(value, format);
 
-		_.set(response, sanitizedKey, value);
+		set(response, sanitizedKey, value);
 	}
 
 	// Reformat _geolocation
 	if (
-		_.isArray(response.geolocation) &&
+		isArray(response.geolocation) &&
 		response.geolocation.length === 2 &&
 		response.geolocation[0] &&
 		response.geolocation[1]
@@ -210,7 +224,7 @@ export async function downloadAttachments(
 		for (const [index, attachment] of attachmentList.entries()) {
 			// look for the question name linked to this attachment
 			const fileName = attachment.filename;
-			const sanitizedFileName = _.toString(fileName).replace(/_[^_]+(?=\.\w+)/, ''); // strip suffix
+			const sanitizedFileName = toString(fileName).replace(/_[^_]+(?=\.\w+)/, ''); // strip suffix
 
 			let relatedQuestion = null;
 			if ('question' === options.binaryNamingScheme) {
@@ -218,7 +232,7 @@ export async function downloadAttachments(
 					// The logic to map attachments to question is sometimes ambiguous:
 					// - If the attachment is linked to a question, the question's value is the same as the attachment's filename (with spaces replaced by underscores)
 					// - BUT sometimes the attachment's filename has an extra suffix, e.g. "My_Picture_0OdlaKJ.jpg", would map to the question "picture": "My Picture.jpg"
-					const sanitizedQuestionValue = _.toString(submission[question]).replace(/\s/g, '_'); // replace spaces with underscores
+					const sanitizedQuestionValue = toString(submission[question]).replace(/\s/g, '_'); // replace spaces with underscores
 					if (sanitizedFileName === sanitizedQuestionValue) {
 						relatedQuestion = question;
 						// Just use the first match...
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
index ad081593acb1fd..cd3937715522b0 100644
--- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
@@ -23,7 +23,8 @@ import {
 
 import { lemlistApiRequest, lemlistApiRequestAllItems } from './GenericFunctions';
 
-import { isEmpty, omit } from 'lodash';
+import isEmpty from 'lodash.isempty';
+import omit from 'lodash.omit';
 
 export class Lemlist implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
index 1e3d12d73f16d4..9fc677ca8002ab 100644
--- a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import _ from 'lodash';
+import map from 'lodash.map';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mandrillApiRequest(
@@ -39,7 +39,7 @@ export function getToEmailArray(toEmail: string): any {
 	let toEmailArray;
 	if (toEmail.split(',').length > 0) {
 		const array = toEmail.split(',');
-		toEmailArray = _.map(array, (email) => {
+		toEmailArray = map(array, (email) => {
 			return {
 				email,
 				type: 'to',
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index 1d7b6da77cff0c..c5b0f4a82db979 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -20,7 +20,8 @@ import {
 
 import moment from 'moment';
 
-import _ from 'lodash';
+import map from 'lodash.map';
+import isEmpty from 'lodash.isempty';
 
 interface Attachments {
 	type: string;
@@ -792,9 +793,9 @@ export class Mandrill implements INodeType {
 						);
 					} else {
 						const headersUi = this.getNodeParameter('headersUi', i) as IDataObject;
-						if (!_.isEmpty(headersUi)) {
+						if (!isEmpty(headersUi)) {
 							// @ts-ignore
-							body.message.headers = _.map(headersUi.headersValues, (o) => {
+							body.message.headers = map(headersUi.headersValues, (o) => {
 								const aux: IDataObject = {};
 								// @ts-ignore
 								aux[o.name] = o.value;
@@ -803,9 +804,9 @@ export class Mandrill implements INodeType {
 						}
 
 						const metadataUi = this.getNodeParameter('metadataUi', i) as IDataObject;
-						if (!_.isEmpty(metadataUi)) {
+						if (!isEmpty(metadataUi)) {
 							// @ts-ignore
-							body.message.metadata = _.map(metadataUi.metadataValues, (o: IDataObject) => {
+							body.message.metadata = map(metadataUi.metadataValues, (o: IDataObject) => {
 								const aux: IDataObject = {};
 								aux[o.name as string] = o.value;
 								return aux;
@@ -813,9 +814,9 @@ export class Mandrill implements INodeType {
 						}
 
 						const mergeVarsUi = this.getNodeParameter('mergeVarsUi', i) as IDataObject;
-						if (!_.isEmpty(mergeVarsUi)) {
+						if (!isEmpty(mergeVarsUi)) {
 							// @ts-ignore
-							body.message.global_merge_vars = _.map(
+							body.message.global_merge_vars = map(
 								// @ts-ignore
 								mergeVarsUi.mergeVarsValues,
 								(o: IDataObject) => {
@@ -830,13 +831,13 @@ export class Mandrill implements INodeType {
 						const attachmentsUi = this.getNodeParameter('attachmentsUi', i) as IDataObject;
 						let attachmentsBinary: Attachments[] = [],
 							attachmentsValues: Attachments[] = [];
-						if (!_.isEmpty(attachmentsUi)) {
+						if (!isEmpty(attachmentsUi)) {
 							if (
 								attachmentsUi.hasOwnProperty('attachmentsValues') &&
-								!_.isEmpty(attachmentsUi.attachmentsValues)
+								!isEmpty(attachmentsUi.attachmentsValues)
 							) {
 								// @ts-ignore
-								attachmentsValues = _.map(attachmentsUi.attachmentsValues, (o: IDataObject) => {
+								attachmentsValues = map(attachmentsUi.attachmentsValues, (o: IDataObject) => {
 									const aux: IDataObject = {};
 									// @ts-ignore
 									aux.name = o.name;
@@ -848,11 +849,11 @@ export class Mandrill implements INodeType {
 
 							if (
 								attachmentsUi.hasOwnProperty('attachmentsBinary') &&
-								!_.isEmpty(attachmentsUi.attachmentsBinary) &&
+								!isEmpty(attachmentsUi.attachmentsBinary) &&
 								items[i].binary
 							) {
 								// @ts-ignore
-								attachmentsBinary = _.map(attachmentsUi.attachmentsBinary, (o: IDataObject) => {
+								attachmentsBinary = map(attachmentsUi.attachmentsBinary, (o: IDataObject) => {
 									if (items[i].binary!.hasOwnProperty(o.property as string)) {
 										const aux: IDataObject = {};
 										aux.name = items[i].binary![o.property as string].fileName || 'unknown';
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.ts b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
index d8e4fe35fff4a6..bf29ecea6c547f 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.ts
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
@@ -13,7 +13,8 @@ import { Converter } from 'showdown';
 
 import { NodeHtmlMarkdown } from 'node-html-markdown';
 
-import { isEmpty, set } from 'lodash';
+import isEmpty from 'lodash.isempty';
+import set from 'lodash.set';
 
 export class Markdown implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index 321223315c004f..a3da9e63e5c98d 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -5,7 +5,6 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import _ from 'lodash';
 import { v4 as uuid } from 'uuid';
 
 export async function matrixApiRequest(
diff --git a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
index 704b8900c9052d..a809f2bf766522 100644
--- a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
+++ b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
@@ -1,5 +1,5 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
diff --git a/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts b/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
index 7a1a4a14bc07fc..a3448fb6787e3e 100644
--- a/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Merge/v2/GenericFunctions.ts
@@ -6,7 +6,11 @@ import type {
 	IPairedItemData,
 } from 'n8n-workflow';
 
-import { assign, assignWith, get, merge, mergeWith } from 'lodash';
+import assign from 'lodash.assign';
+import assignWith from 'lodash.assignwith';
+import get from 'lodash.get';
+import merge from 'lodash.merge';
+import mergeWith from 'lodash.mergewith';
 import { fuzzyCompare } from '../../../utils/utilities';
 
 type PairToMatch = {
diff --git a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
index de3ee69cbdfbd3..7ba84c4cb99733 100644
--- a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
+++ b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type { IExecuteFunctions } from 'n8n-core';
 
-import { merge } from 'lodash';
+import merge from 'lodash.merge';
 
 import type {
 	IDataObject,
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index 7e9436423dc455..c261a355bab92a 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export async function mondayComApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
index 5fcdf2a3dd5c81..436df9b5ea3b66 100644
--- a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
@@ -9,7 +9,8 @@ import type {
 	IMongoParametricCredentials,
 } from './mongoDb.types';
 
-import { get, set } from 'lodash';
+import get from 'lodash.get';
+import set from 'lodash.set';
 
 /**
  * Standard way of building the MongoDB connection string, unless overridden with a provided string
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index 1526f7f6be8349..962222c5ca40a6 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
@@ -1,4 +1,6 @@
-import { get, set, unset } from 'lodash';
+import get from 'lodash.get';
+import set from 'lodash.set';
+import unset from 'lodash.unset';
 import prettyBytes from 'pretty-bytes';
 
 import type { IExecuteFunctions } from 'n8n-core';
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 3a845211c58d7e..781018b1268f65 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -12,7 +12,8 @@ import type { CustomField, GeneralAddress, Ref } from './descriptions/Shared.int
 
 import { capitalCase } from 'change-case';
 
-import { omit, pickBy } from 'lodash';
+import omit from 'lodash.omit';
+import pickBy from 'lodash.pickby';
 
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index e57f9517a90c2e..6995be6889c32b 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -48,7 +48,7 @@ import {
 
 import { capitalCase } from 'change-case';
 
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash.isempty';
 
 import type { QuickBooksOAuth2Credentials, TransactionFields } from './types';
 
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 2eeaf8fa117f0d..1af43d719d2cd9 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -9,7 +9,8 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { isEmpty, omit } from 'lodash';
+import isEmpty from 'lodash.isempty';
+import omit from 'lodash.omit';
 
 import { raindropApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index d98a24616c2db5..402ff56f0fe6dc 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -12,7 +12,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { set } from 'lodash';
+import set from 'lodash.set';
 import redis from 'redis';
 
 import util from 'util';
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index 092303ebb17a45..37756aca7f15e0 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -7,7 +7,9 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
-import { get, set, unset } from 'lodash';
+import get from 'lodash.get';
+import set from 'lodash.set';
+import unset from 'lodash.unset';
 
 interface IRenameKey {
 	currentKey: string;
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index 275e7ec8cc9367..e08b53a580239a 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -1,7 +1,7 @@
 import type { Request } from 'aws4';
 import { sign } from 'aws4';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
index 7d8f455a081cf1..c876995c98ec3d 100644
--- a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
@@ -19,8 +19,6 @@ import type {
 	IRowObject,
 } from './Interfaces';
 
-import _ from 'lodash';
-
 const userBaseUri = (uri?: string) => {
 	if (uri === undefined) {
 		return uri;
diff --git a/packages/nodes-base/nodes/Set/Set.node.ts b/packages/nodes-base/nodes/Set/Set.node.ts
index 7ae7b9f3c04614..97ca8b8571e9f7 100644
--- a/packages/nodes-base/nodes/Set/Set.node.ts
+++ b/packages/nodes-base/nodes/Set/Set.node.ts
@@ -7,7 +7,7 @@ import type {
 } from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
-import { set } from 'lodash';
+import set from 'lodash.set';
 
 export class Set implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
index 3c984fb1208f24..8622542355582c 100644
--- a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions
 import type { IDataObject, IOAuth2Options, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import _ from 'lodash';
+import get from 'lodash.get';
 
 export async function slackApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
@@ -99,7 +99,7 @@ export async function slackApiRequestAllItems(
 	}
 	do {
 		responseData = await slackApiRequest.call(this, method, endpoint, body, query);
-		query.cursor = _.get(responseData, 'response_metadata.next_cursor');
+		query.cursor = get(responseData, 'response_metadata.next_cursor');
 		query.page++;
 		returnData.push.apply(returnData, responseData[propertyName]);
 	} while (
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index 72143524375be7..e43a9a8540bae7 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -4,7 +4,7 @@ import type { IDataObject, IOAuth2Options } from 'n8n-workflow';
 
 import { NodeOperationError } from 'n8n-workflow';
 
-import _ from 'lodash';
+import get from 'lodash.get';
 
 export async function slackApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
@@ -105,7 +105,7 @@ export async function slackApiRequestAllItems(
 	}
 	do {
 		responseData = await slackApiRequest.call(this, method, endpoint, body, query);
-		query.cursor = _.get(responseData, 'response_metadata.next_cursor');
+		query.cursor = get(responseData, 'response_metadata.next_cursor');
 		query.page++;
 		returnData.push.apply(
 			returnData,
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index 27e7e0e1992e37..7c4ccc71073ed9 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 import type { IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 /**
  * Make an API request to Spotify
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
index 848f70d390e60d..ef2279e5b2dc11 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -10,7 +10,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import { isEmpty } from 'lodash';
+import isEmpty from 'lodash.isempty';
 
 import {
 	adjustChargeFields,
diff --git a/packages/nodes-base/nodes/Stripe/helpers.ts b/packages/nodes-base/nodes/Stripe/helpers.ts
index 02bbb42778ba80..09372f9474c54c 100644
--- a/packages/nodes-base/nodes/Stripe/helpers.ts
+++ b/packages/nodes-base/nodes/Stripe/helpers.ts
@@ -1,6 +1,8 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import { flow, isEmpty, omit } from 'lodash';
+import flow from 'lodash.flow';
+import isEmpty from 'lodash.isempty';
+import omit from 'lodash.omit';
 
 import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
 
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index 6e35b7ef58b0bc..8a3b2fab0632a8 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -36,7 +36,7 @@ import {
 	theHiveApiRequest,
 } from './GenericFunctions';
 
-import { set } from 'lodash';
+import set from 'lodash.set';
 
 export class TheHive implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index e44e1c75a3484b..081b3623b5d05d 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -10,7 +10,7 @@ import type {
 import type { IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export async function travisciApiRequest(
 	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
index 05721cc57fb23c..67db0efe004d2b 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
@@ -9,7 +9,7 @@ import type {
 
 import type { IDataObject } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 export async function venafiApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IPollFunctions,
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
index 99f454bd061d4c..c11e511d3ea939 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions
 import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
-import { get } from 'lodash';
+import get from 'lodash.get';
 
 import * as nacl_factory from 'js-nacl';
 
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index 133b5628065442..ffa665bd968937 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -33,7 +33,7 @@ import type {
 } from './GenericFunctions';
 import { wiseApiRequest } from './GenericFunctions';
 
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 
 import moment from 'moment-timezone';
 
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index de809e029b43ed..e8b9345fa81c74 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -16,7 +16,7 @@ import { createHash } from 'crypto';
 
 import { snakeCase } from 'change-case';
 
-import { omit } from 'lodash';
+import omit from 'lodash.omit';
 
 export async function woocommerceApiRequest(
 	this:
diff --git a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
index b339a6d4cd7405..9ecd25962d5097 100644
--- a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
@@ -5,7 +5,7 @@ import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
-import { flow } from 'lodash';
+import flow from 'lodash.flow';
 
 import type { Zammad } from './types';
 
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index e1aa73e09872c4..60f9cddf44835a 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -5,7 +5,8 @@ import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import { flow, sortBy } from 'lodash';
+import flow from 'lodash.flow';
+import sortBy from 'lodash.sortby';
 
 import type {
 	AllFields,
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index f83852c5b2ec37..01b67097ba7299 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -739,7 +739,47 @@
     "@types/gm": "^1.25.0",
     "@types/imap-simple": "^4.2.0",
     "@types/jsonwebtoken": "^9.0.1",
-    "@types/lodash.set": "^4.3.6",
+    "@types/lodash": "^4.14.191",
+    "@types/lodash.assign": "^4",
+    "@types/lodash.assignwith": "^4",
+    "@types/lodash.clone": "^4",
+    "@types/lodash.compact": "^3",
+    "@types/lodash.concat": "^4",
+    "@types/lodash.difference": "^4",
+    "@types/lodash.escaperegexp": "^4",
+    "@types/lodash.every": "^4",
+    "@types/lodash.find": "^4",
+    "@types/lodash.first": "^3",
+    "@types/lodash.flow": "^3",
+    "@types/lodash.get": "^4",
+    "@types/lodash.intersection": "^4",
+    "@types/lodash.isarray": "^4",
+    "@types/lodash.isempty": "^4",
+    "@types/lodash.isequal": "^4",
+    "@types/lodash.isobject": "^3",
+    "@types/lodash.isstring": "^4",
+    "@types/lodash.last": "^3",
+    "@types/lodash.lt": "^3",
+    "@types/lodash.map": "^4",
+    "@types/lodash.merge": "^4",
+    "@types/lodash.mergewith": "^4",
+    "@types/lodash.omit": "^4",
+    "@types/lodash.partialright": "^4",
+    "@types/lodash.pick": "^4",
+    "@types/lodash.pickby": "^4",
+    "@types/lodash.reduce": "^4",
+    "@types/lodash.set": "^4",
+    "@types/lodash.some": "^4",
+    "@types/lodash.sortby": "^4",
+    "@types/lodash.split": "^4",
+    "@types/lodash.tonumber": "^4",
+    "@types/lodash.tostring": "^4",
+    "@types/lodash.trim": "^4",
+    "@types/lodash.union": "^4",
+    "@types/lodash.uniqby": "^4",
+    "@types/lodash.unset": "^4",
+    "@types/lodash.upperfirst": "^4",
+    "@types/lodash.zip": "^4",
     "@types/lossless-json": "^1.0.0",
     "@types/mailparser": "^2.7.3",
     "@types/mime-types": "^2.1.0",
@@ -785,9 +825,46 @@
     "js-nacl": "^1.4.0",
     "jsonwebtoken": "^9.0.0",
     "kafkajs": "^1.14.0",
-    "lodash.get": "^4.4.2",
-    "lodash.set": "^4.3.2",
-    "lodash.unset": "^4.5.2",
+    "lodash.assign": "^4",
+    "lodash.assignwith": "^4",
+    "lodash.clone": "^4",
+    "lodash.compact": "^3",
+    "lodash.concat": "^4",
+    "lodash.difference": "^4",
+    "lodash.escaperegexp": "^4",
+    "lodash.every": "^4",
+    "lodash.find": "^4",
+    "lodash.first": "^3",
+    "lodash.flow": "^3",
+    "lodash.get": "^4",
+    "lodash.intersection": "^4",
+    "lodash.isarray": "^4",
+    "lodash.isempty": "^4",
+    "lodash.isequal": "^4",
+    "lodash.isobject": "^3",
+    "lodash.isstring": "^4",
+    "lodash.last": "^3",
+    "lodash.lt": "^3",
+    "lodash.map": "^4",
+    "lodash.merge": "^4",
+    "lodash.mergewith": "^4",
+    "lodash.omit": "^4",
+    "lodash.partialright": "^4",
+    "lodash.pick": "^4",
+    "lodash.pickby": "^4",
+    "lodash.reduce": "^4",
+    "lodash.set": "^4",
+    "lodash.some": "^4",
+    "lodash.sortby": "^4",
+    "lodash.split": "^4",
+    "lodash.tonumber": "^4",
+    "lodash.tostring": "^4",
+    "lodash.trim": "^4",
+    "lodash.union": "^4",
+    "lodash.uniqby": "^4",
+    "lodash.unset": "^4",
+    "lodash.upperfirst": "^4",
+    "lodash.zip": "^4",
     "lossless-json": "^1.0.4",
     "luxon": "^3.1.0",
     "mailparser": "^3.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 53d44a83fc3823..8b7f9d7d3a0a0e 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -594,11 +594,6 @@ importers:
       jshint: ^2.9.7
       jsonpath: ^1.1.1
       lodash-es: ^4.17.21
-      lodash.camelcase: ^4.3.0
-      lodash.debounce: ^4.0.8
-      lodash.get: ^4.4.2
-      lodash.orderby: ^4.6.0
-      lodash.set: ^4.3.2
       luxon: ^3.1.0
       monaco-editor: ^0.33.0
       n8n-design-system: workspace:*
@@ -662,11 +657,6 @@ importers:
       jquery: 3.6.1
       jsonpath: 1.1.1
       lodash-es: 4.17.21
-      lodash.camelcase: 4.3.0
-      lodash.debounce: 4.0.8
-      lodash.get: 4.4.2
-      lodash.orderby: 4.6.0
-      lodash.set: 4.3.2
       luxon: 3.1.1
       monaco-editor: 0.33.0
       n8n-design-system: link:../design-system
@@ -772,7 +762,47 @@ importers:
       '@types/imap-simple': ^4.2.0
       '@types/js-nacl': ^1.3.0
       '@types/jsonwebtoken': ^9.0.1
-      '@types/lodash.set': ^4.3.6
+      '@types/lodash': ^4.14.191
+      '@types/lodash.assign': ^4
+      '@types/lodash.assignwith': ^4
+      '@types/lodash.clone': ^4
+      '@types/lodash.compact': ^3
+      '@types/lodash.concat': ^4
+      '@types/lodash.difference': ^4
+      '@types/lodash.escaperegexp': ^4
+      '@types/lodash.every': ^4
+      '@types/lodash.find': ^4
+      '@types/lodash.first': ^3
+      '@types/lodash.flow': ^3
+      '@types/lodash.get': ^4
+      '@types/lodash.intersection': ^4
+      '@types/lodash.isarray': ^4
+      '@types/lodash.isempty': ^4
+      '@types/lodash.isequal': ^4
+      '@types/lodash.isobject': ^3
+      '@types/lodash.isstring': ^4
+      '@types/lodash.last': ^3
+      '@types/lodash.lt': ^3
+      '@types/lodash.map': ^4
+      '@types/lodash.merge': ^4
+      '@types/lodash.mergewith': ^4
+      '@types/lodash.omit': ^4
+      '@types/lodash.partialright': ^4
+      '@types/lodash.pick': ^4
+      '@types/lodash.pickby': ^4
+      '@types/lodash.reduce': ^4
+      '@types/lodash.set': ^4
+      '@types/lodash.some': ^4
+      '@types/lodash.sortby': ^4
+      '@types/lodash.split': ^4
+      '@types/lodash.tonumber': ^4
+      '@types/lodash.tostring': ^4
+      '@types/lodash.trim': ^4
+      '@types/lodash.union': ^4
+      '@types/lodash.uniqby': ^4
+      '@types/lodash.unset': ^4
+      '@types/lodash.upperfirst': ^4
+      '@types/lodash.zip': ^4
       '@types/lossless-json': ^1.0.0
       '@types/mailparser': ^2.7.3
       '@types/mime-types': ^2.1.0
@@ -813,9 +843,46 @@ importers:
       js-nacl: ^1.4.0
       jsonwebtoken: 9.0.0
       kafkajs: ^1.14.0
-      lodash.get: ^4.4.2
-      lodash.set: ^4.3.2
-      lodash.unset: ^4.5.2
+      lodash.assign: ^4
+      lodash.assignwith: ^4
+      lodash.clone: ^4
+      lodash.compact: ^3
+      lodash.concat: ^4
+      lodash.difference: ^4
+      lodash.escaperegexp: ^4
+      lodash.every: ^4
+      lodash.find: ^4
+      lodash.first: ^3
+      lodash.flow: ^3
+      lodash.get: ^4
+      lodash.intersection: ^4
+      lodash.isarray: ^4
+      lodash.isempty: ^4
+      lodash.isequal: ^4
+      lodash.isobject: ^3
+      lodash.isstring: ^4
+      lodash.last: ^3
+      lodash.lt: ^3
+      lodash.map: ^4
+      lodash.merge: ^4
+      lodash.mergewith: ^4
+      lodash.omit: ^4
+      lodash.partialright: ^4
+      lodash.pick: ^4
+      lodash.pickby: ^4
+      lodash.reduce: ^4
+      lodash.set: ^4
+      lodash.some: ^4
+      lodash.sortby: ^4
+      lodash.split: ^4
+      lodash.tonumber: ^4
+      lodash.tostring: ^4
+      lodash.trim: ^4
+      lodash.union: ^4
+      lodash.uniqby: ^4
+      lodash.unset: ^4
+      lodash.upperfirst: ^4
+      lodash.zip: ^4
       lossless-json: ^1.0.4
       luxon: ^3.1.0
       mailparser: ^3.2.0
@@ -873,9 +940,46 @@ importers:
       js-nacl: 1.4.0
       jsonwebtoken: 9.0.0
       kafkajs: 1.16.0
+      lodash.assign: 4.2.0
+      lodash.assignwith: 4.2.0
+      lodash.clone: 4.5.0
+      lodash.compact: 3.0.1
+      lodash.concat: 4.5.0
+      lodash.difference: 4.5.0
+      lodash.escaperegexp: 4.1.2
+      lodash.every: 4.6.0
+      lodash.find: 4.6.0
+      lodash.first: 3.0.0
+      lodash.flow: 3.5.0
       lodash.get: 4.4.2
+      lodash.intersection: 4.4.0
+      lodash.isarray: 4.0.0
+      lodash.isempty: 4.4.0
+      lodash.isequal: 4.5.0
+      lodash.isobject: 3.0.2
+      lodash.isstring: 4.0.1
+      lodash.last: 3.0.0
+      lodash.lt: 3.9.2
+      lodash.map: 4.6.0
+      lodash.merge: 4.6.2
+      lodash.mergewith: 4.6.2
+      lodash.omit: 4.5.0
+      lodash.partialright: 4.2.1
+      lodash.pick: 4.4.0
+      lodash.pickby: 4.6.0
+      lodash.reduce: 4.6.0
       lodash.set: 4.3.2
+      lodash.some: 4.6.0
+      lodash.sortby: 4.7.0
+      lodash.split: 4.4.2
+      lodash.tonumber: 4.0.3
+      lodash.tostring: 4.1.4
+      lodash.trim: 4.5.1
+      lodash.union: 4.6.0
+      lodash.uniqby: 4.7.0
       lodash.unset: 4.5.2
+      lodash.upperfirst: 4.3.1
+      lodash.zip: 4.2.0
       lossless-json: 1.0.5
       luxon: 3.1.1
       mailparser: 3.5.0
@@ -919,7 +1023,47 @@ importers:
       '@types/gm': 1.25.0
       '@types/imap-simple': 4.2.5
       '@types/jsonwebtoken': 9.0.1
+      '@types/lodash': 4.14.191
+      '@types/lodash.assign': 4.2.7
+      '@types/lodash.assignwith': 4.2.7
+      '@types/lodash.clone': 4.5.7
+      '@types/lodash.compact': 3.0.7
+      '@types/lodash.concat': 4.5.7
+      '@types/lodash.difference': 4.5.7
+      '@types/lodash.escaperegexp': 4.1.7
+      '@types/lodash.every': 4.6.7
+      '@types/lodash.find': 4.6.7
+      '@types/lodash.first': 3.0.7
+      '@types/lodash.flow': 3.5.7
+      '@types/lodash.get': 4.4.7
+      '@types/lodash.intersection': 4.4.7
+      '@types/lodash.isarray': 4.0.7
+      '@types/lodash.isempty': 4.4.7
+      '@types/lodash.isequal': 4.5.6
+      '@types/lodash.isobject': 3.0.7
+      '@types/lodash.isstring': 4.0.7
+      '@types/lodash.last': 3.0.7
+      '@types/lodash.lt': 3.9.7
+      '@types/lodash.map': 4.6.13
+      '@types/lodash.merge': 4.6.7
+      '@types/lodash.mergewith': 4.6.7
+      '@types/lodash.omit': 4.5.7
+      '@types/lodash.partialright': 4.2.7
+      '@types/lodash.pick': 4.4.7
+      '@types/lodash.pickby': 4.6.7
+      '@types/lodash.reduce': 4.6.7
       '@types/lodash.set': 4.3.7
+      '@types/lodash.some': 4.6.7
+      '@types/lodash.sortby': 4.7.7
+      '@types/lodash.split': 4.4.7
+      '@types/lodash.tonumber': 4.0.7
+      '@types/lodash.tostring': 4.1.7
+      '@types/lodash.trim': 4.5.7
+      '@types/lodash.union': 4.6.7
+      '@types/lodash.uniqby': 4.7.7
+      '@types/lodash.unset': 4.5.7
+      '@types/lodash.upperfirst': 4.3.7
+      '@types/lodash.zip': 4.2.7
       '@types/lossless-json': 1.0.1
       '@types/mailparser': 2.7.4
       '@types/mime-types': 2.1.1
@@ -2911,7 +3055,7 @@ packages:
       debug: 4.3.4
       espree: 9.4.0
       globals: 13.17.0
-      ignore: 5.2.0
+      ignore: 5.2.4
       import-fresh: 3.3.0
       js-yaml: 4.1.0
       minimatch: 3.1.2
@@ -5531,34 +5675,124 @@ packages:
       '@types/lodash': 4.14.186
     dev: true
 
+  /@types/lodash.assign/4.2.7:
+    resolution: {integrity: sha512-FABtilcXqbXBj9jnSqgTbmr0Wy3lhDgMkGtNfcE+wipuKi2/fv7wB9rCeJfLi1H/qt1YxVAENtQkdKisYIwFKg==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.assignwith/4.2.7:
+    resolution: {integrity: sha512-7NbtlOcZFkjIS/vXkppYruo/RvSkTHj1BcumhCIxQSLCh50SmRIPqXrogRijwB3yy/3ULsiw9ZRn4ihw9oHHHg==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
   /@types/lodash.camelcase/4.3.7:
     resolution: {integrity: sha512-Nfi6jpo9vuEOSIJP+mpbTezKyEt75DQlbwjiDvs/JctWkbnHDoyQo5lWqdvgNiJmVUjcmkfvlrvSEgJYvurOKg==}
     dependencies:
       '@types/lodash': 4.14.186
     dev: true
 
+  /@types/lodash.clone/4.5.7:
+    resolution: {integrity: sha512-jugWYM+xBUQCpWbn7p6BSbf8bRMHtJYnEIGZYngbStaU0aN4VFgAAkGgsc+MtHuepBOmjyUGiGv+dHnQQIGLZA==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.compact/3.0.7:
+    resolution: {integrity: sha512-yHP+S4QY9C/OLWc+Ei7A1rdwGcBgwFOaW20eZU8qA42dNRwUWnGltDAmKg5ICVGrgJKTokv0gsz1dsQl1gKA2w==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.concat/4.5.7:
+    resolution: {integrity: sha512-qgF1loqQByL+CW9UbSU1lTLOZmjnIdxQYn3EQsFpGaE/eZyIoOGdACM4jsG6WIAv8WZkto6QhvtAgl3v1wn3WQ==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
   /@types/lodash.debounce/4.0.7:
     resolution: {integrity: sha512-X1T4wMZ+gT000M2/91SYj0d/7JfeNZ9PeeOldSNoE/lunLeQXKvkmIumI29IaKMotU/ln/McOIvgzZcQ/3TrSA==}
     dependencies:
       '@types/lodash': 4.14.191
     dev: true
 
+  /@types/lodash.difference/4.5.7:
+    resolution: {integrity: sha512-L7r80ymosy9HiqndKY9XfWeneRwOqAramdAL184pQhlS5PB+J3sKnpgUCBh7r9E6Rsdf4D4bty7t7HEC5Jny1Q==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.escaperegexp/4.1.7:
+    resolution: {integrity: sha512-2TfHizz0jsnyVkV4X1PMyk6KkibXTBHM43X+6BCR3KE6KgADdbirSF+oiEvPQl6mwuHXZjkxar9d4AFYORgfww==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.every/4.6.7:
+    resolution: {integrity: sha512-WmQWJILnkXbWny8/M5/IJEXFm5+MTCiBHbRLgYuxaEKD7KKAViys5qMJ7nvytF33ZMtLYXVFNYYI62BCr0UMtg==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.find/4.6.7:
+    resolution: {integrity: sha512-ESwK5k3nf9ufS+M2niH06/gjrREihHobyWQLs5c5+O93uar3N9s0rNx8bBfG9zLYVaPBJEsEIk06hm5ccstF5w==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.first/3.0.7:
+    resolution: {integrity: sha512-CYgaLK5ylAMDJN2k2hnKlAnNSqBnk4s97OABI/fXJXnWb+IDjgBJ8Y1qNgw8TTmk/Pz05OshDFhoNIf9ry9esA==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.flow/3.5.7:
+    resolution: {integrity: sha512-F3avAQHJPiewhugySHZ8CUgnYRiJwauOU5/PQdxWs8VU3WDbPnyea1XQ8rC8VT+08J43Ycz9fH1QD+isJukAxA==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
   /@types/lodash.get/4.4.7:
     resolution: {integrity: sha512-af34Mj+KdDeuzsJBxc/XeTtOx0SZHZNLd+hdrn+PcKGQs0EG2TJTzQAOTCZTgDJCArahlCzLWSy8c2w59JRz7Q==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.intersection/4.4.7:
     resolution: {integrity: sha512-7ukD2s54bmRNNpiH9ApEErO4H6mB8+WmXFr/6RpP3e/n7h3UFhEJC7QwLcoWAqOrYCIRFMAAwDf3ambSsW8c5Q==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.isarray/4.0.7:
+    resolution: {integrity: sha512-j4LGkaWRU3siKODqnY9xffwoJgnpp4TYsfCxDhRSZwIbX4qD+TkH483r6+mqGkgqlnP08NhjQYhDXPLWgA2uxQ==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.isempty/4.4.7:
+    resolution: {integrity: sha512-YOzlpoIn9jrfHzjIukKnu9Le3tmi+0PhUdOt2rMpJW/4J6jX7s0HeBatXdh9QckLga8qt4EKBxVIEqtEq6pzLg==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.isequal/4.5.6:
     resolution: {integrity: sha512-Ww4UGSe3DmtvLLJm2F16hDwEQSv7U0Rr8SujLUA2wHI2D2dm8kPu6Et+/y303LfjTIwSBKXB/YTUcAKpem/XEg==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.isobject/3.0.7:
+    resolution: {integrity: sha512-nuC74gk3hEmpY4Jq5xIfQc9uoWg2ozVIqS7OwS9xPncFr+d6ULBDpBBOcSaJKm2euKANHBeRGNEaHMAddIzSfA==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.isstring/4.0.7:
+    resolution: {integrity: sha512-gt4q4n1Who4JxLeFR/kduS2Tia+biQk/zdbIkOfMvAldXHJdcC5SsvZREchkwa4CwKK+DqhIm3wfigFYzNKS8Q==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.iteratee/4.7.7:
@@ -5567,22 +5801,64 @@ packages:
       '@types/lodash': 4.14.186
     dev: true
 
+  /@types/lodash.last/3.0.7:
+    resolution: {integrity: sha512-hh43wZke0moPkPAqi8WS5VSH+qb2O1Ln8pootwpWv3dTTa0htqFcdAxqfxGNf52XxDem6SDlaf0Ks/f95Qo3Vw==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.lt/3.9.7:
+    resolution: {integrity: sha512-PVkUcZFQL9PViFol5hz6JAI4jj5mtnCZo5J1mDN2GaLMmMP46sZRii2v3cvmWOvlSEV+LGvxpo+DVnWHLWAAqw==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.map/4.6.13:
+    resolution: {integrity: sha512-kppRBzlpuvQQsr7R2nv/DDDZds8fglRFNAK70WUOkOC18KOcuQ22oQF9Kgy5Z2v/eDNkBm0ltrT6FThSkuWwow==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
   /@types/lodash.merge/4.6.7:
     resolution: {integrity: sha512-OwxUJ9E50gw3LnAefSHJPHaBLGEKmQBQ7CZe/xflHkyy/wH2zVyEIAKReHvVrrn7zKdF58p16We9kMfh7v0RRQ==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.mergewith/4.6.7:
+    resolution: {integrity: sha512-3m+lkO5CLRRYU0fhGRp7zbsGi6+BZj0uTVSwvcKU+nSlhjA9/QRNfuSGnD2mX6hQA7ZbmcCkzk5h4ZYGOtk14A==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.omit/4.5.7:
     resolution: {integrity: sha512-6q6cNg0tQ6oTWjSM+BcYMBhan54P/gLqBldG4AuXd3nKr0oeVekWNS4VrNEu3BhCSDXtGapi7zjhnna0s03KpA==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.partialright/4.2.7:
+    resolution: {integrity: sha512-6RiMKczgdzVFbLXkZynaL+1FgNRQN1YhnKb3wxb04yaIuT+5QUaT+70xx60uOSaZwNd9fvPVVxhPQHL9MP3YHg==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.pick/4.4.7:
     resolution: {integrity: sha512-HgdyKz7/1+oeoVzbpu1XiX/Bti9AUksHtOILH38T07aKvqoirzcdOsrO2+Yg3L51Hv/8m1MetvHZEUGeABiTiQ==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.pickby/4.6.7:
+    resolution: {integrity: sha512-4ebXRusuLflfscbD0PUX4eVknDHD9Yf+uMtBIvA/hrnTqeAzbuHuDjvnYriLjUrI9YrhCPVKUf4wkRSXJQ6gig==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.reduce/4.6.7:
+    resolution: {integrity: sha512-HwJ3H45BNHhSLciBZSd8oAxrz0d+ko5mXVHIeanmu0WpFiwkMg+XAv1Pp4FUsdNW34S6J60+tJbH30aULOe5MA==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.remove/4.7.7:
@@ -5594,13 +5870,49 @@ packages:
   /@types/lodash.set/4.3.7:
     resolution: {integrity: sha512-bS5Wkg/nrT82YUfkNYPSccFrNZRL+irl7Yt4iM6OTSQ0VZJED2oUIVm15NkNtUAQ8SRhCe+axqERUV6MJgkeEg==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.some/4.6.7:
+    resolution: {integrity: sha512-RA8+uBPdrCNxuUFQUVQ0exAJ2iU1L4UyltrmhChbZXYsEewS2QRE7wIcp1sHsjUpwA+6++Yfk/lupGLYr6zbUg==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.sortby/4.7.7:
+    resolution: {integrity: sha512-J/4IS+jQopGBrrRetBXDCX0KnSeXJZ0rOTmGAxR9MWGV24YdHxX8IRi9LCGAU9GKWlBov9KRSfQpuup9PReqrw==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.split/4.4.7:
     resolution: {integrity: sha512-4L/89eW9ZFOkJscM/u0nRwWaN5jHK/esQ71FHuVgePAtBD9YRdYS4cM1HRyIxN3xAoRRrw1Ohf2HQjSk0zwuqA==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.tonumber/4.0.7:
+    resolution: {integrity: sha512-+hJ7A8gssoiVJVNM9x+9ljzeg/EsmI3FdrElUYSfqAHFvlt/2Oc8hBJdIS1lZDkVV0pNMABaDVmtygu2yZstGg==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.tostring/4.1.7:
+    resolution: {integrity: sha512-bcLdE0foFSalisXPfZj2ukqnD6b+pg/JJoeU3szUopQG6H5emLwzZhwXkCHhDv5q23JTQz0d0er4KVpN2USZoQ==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.trim/4.5.7:
+    resolution: {integrity: sha512-ZKqKyxHdZz/nnCWJoame6iMHuH3uPMik750o0K75tsLuZ6SJV+18Dca/u9RPDHYO6kVdbROWM/e/8DcZZjCcMw==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.union/4.6.7:
+    resolution: {integrity: sha512-6HXM6tsnHJzKgJE0gA/LhTGf/7AbjUk759WZ1MziVm+OBNAATHhdgj+a3KVE8g76GCLAnN4ZEQQG1EGgtBIABA==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.unionby/4.8.7:
@@ -5618,13 +5930,25 @@ packages:
   /@types/lodash.uniqby/4.7.7:
     resolution: {integrity: sha512-sv2g6vkCIvEUsK5/Vq17haoZaisfj2EWW8mP7QWlnKi6dByoNmeuHDDXHR7sabuDqwO4gvU7ModIL22MmnOocg==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash.unset/4.5.7:
     resolution: {integrity: sha512-/i371dATnLQ4tazwcX/n+rGk3M6RnMbA3lJKrKFjELicPExmZ1LcKtGfHBECuPS2TTl3yDuaFmWtmfACVuBBAQ==}
     dependencies:
-      '@types/lodash': 4.14.186
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.upperfirst/4.3.7:
+    resolution: {integrity: sha512-CrBjoB4lO6h7tXNMBUl1eh/w0KdMosiEOXOoD5DMECsA/kDWo/WQfOt1KyGKVvgwK3I6cKAY6z8LymKiMazLFg==}
+    dependencies:
+      '@types/lodash': 4.14.191
+    dev: true
+
+  /@types/lodash.zip/4.2.7:
+    resolution: {integrity: sha512-wRtK2bZ0HYXkJkeldrD35qOquGn5GOmp8+o886N18Aqw2DGFLP7JCTEb00j3xQZ+PCMTyfMS2OMbLUwah+bcyg==}
+    dependencies:
+      '@types/lodash': 4.14.191
     dev: true
 
   /@types/lodash/4.14.186:
@@ -10396,7 +10720,7 @@ packages:
       glob-parent: 6.0.2
       globals: 13.17.0
       grapheme-splitter: 1.0.4
-      ignore: 5.2.0
+      ignore: 5.2.4
       import-fresh: 3.3.0
       imurmurhash: 0.1.4
       is-glob: 4.0.3
@@ -14113,25 +14437,66 @@ packages:
     resolution: {integrity: sha512-mKnC+QJ9pWVzv+C4/U3rRsHapFfHvQFoFB92e52xeyGMcX6/OlIl78je1u8vePzYZSkkogMPJ2yjxxsb89cxyw==}
     dev: false
 
-  /lodash.camelcase/4.3.0:
-    resolution: {integrity: sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==}
+  /lodash.assign/4.2.0:
+    resolution: {integrity: sha512-hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==}
+    dev: false
+
+  /lodash.assignwith/4.2.0:
+    resolution: {integrity: sha512-ZznplvbvtjK2gMvnQ1BR/zqPFZmS6jbK4p+6Up4xcRYA7yMIwxHCfbTcrYxXKzzqLsQ05eJPVznEW3tuwV7k1g==}
+    dev: false
+
+  /lodash.clone/4.5.0:
+    resolution: {integrity: sha512-GhrVeweiTD6uTmmn5hV/lzgCQhccwReIVRLHp7LT4SopOjqEZ5BbX8b5WWEtAKasjmy8hR7ZPwsYlxRCku5odg==}
     dev: false
 
   /lodash.clonedeep/4.5.0:
     resolution: {integrity: sha512-H5ZhCF25riFd9uB5UCkVKo61m3S/xZk1x4wA6yp/L3RFP6Z/eHH1ymQcGLo7J3GMPfm0V/7m1tryHuGVxpqEBQ==}
     dev: false
 
+  /lodash.compact/3.0.1:
+    resolution: {integrity: sha512-2ozeiPi+5eBXW1CLtzjk8XQFhQOEMwwfxblqeq6EGyTxZJ1bPATqilY0e6g2SLQpP4KuMeuioBhEnWz5Pr7ICQ==}
+    dev: false
+
+  /lodash.concat/4.5.0:
+    resolution: {integrity: sha512-US6b1Nqek3shg2qmv1IjTN5P7tPL1RKu77VpdGtVprxmnTI/HlsHGqI2Oa5Irznk0ZB5IXHwocMeMZK8vf4+CA==}
+    dev: false
+
   /lodash.debounce/4.0.8:
     resolution: {integrity: sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow==}
+    dev: true
 
   /lodash.defaults/4.2.0:
     resolution: {integrity: sha512-qjxPLHd3r5DnsdGacqOMU6pb/avJzdh9tFX2ymgoZE27BmjXrNy/y4LoaiTeAb+O3gL8AfpJGtqfX/ae2leYYQ==}
     dev: false
 
+  /lodash.difference/4.5.0:
+    resolution: {integrity: sha512-dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==}
+    dev: false
+
+  /lodash.escaperegexp/4.1.2:
+    resolution: {integrity: sha512-TM9YBvyC84ZxE3rgfefxUWiQKLilstD6k7PTGt6wfbtXF8ixIJLOL3VYyV/z+ZiPLsVxAsKAFVwWlWeb2Y8Yyw==}
+    dev: false
+
+  /lodash.every/4.6.0:
+    resolution: {integrity: sha512-isF82d+65/sNvQ3aaQAW7LLHnnTxSN/2fm4rhYyuufLzA4VtHz6y6S5vFwe6PQVr2xdqUOyxBbTNKDpnmeu50w==}
+    dev: false
+
+  /lodash.find/4.6.0:
+    resolution: {integrity: sha512-yaRZoAV3Xq28F1iafWN1+a0rflOej93l1DQUejs3SZ41h2O9UJBoS9aueGjPDgAl4B6tPC0NuuchLKaDQQ3Isg==}
+    dev: false
+
+  /lodash.first/3.0.0:
+    resolution: {integrity: sha512-FnBs6c5eWZY1P88K2+NHiLZjp+pBRbLbt9kDGBCtiY+tfRGhR7LmIxTphpspmRXxyQeJXM5LHoq62yVjcBjcCw==}
+    dev: false
+
   /lodash.flatten/4.4.0:
     resolution: {integrity: sha512-C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==}
     dev: false
 
+  /lodash.flow/3.5.0:
+    resolution: {integrity: sha512-ff3BX/tSioo+XojX4MOsOMhJw0nZoUEF011LX8g8d3gvjVbxd89cCio4BCXronjxcTUIJUoqKEUA+n4CqvvRPw==}
+    dev: false
+
   /lodash.get/4.4.2:
     resolution: {integrity: sha512-z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==}
 
@@ -14143,9 +14508,22 @@ packages:
     resolution: {integrity: sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==}
     dev: false
 
+  /lodash.isarray/4.0.0:
+    resolution: {integrity: sha512-V8ViWvoNlXpCrB6Ewaj3ScRXUpmCvqp4tJUxa3dlovuJj/8lp3SND5Kw4v5OeuHgoyw4qJN+gl36qZqp6WYQ6g==}
+    deprecated: This package is deprecated. Use Array.isArray.
+    dev: false
+
+  /lodash.isempty/4.4.0:
+    resolution: {integrity: sha512-oKMuF3xEeqDltrGMfDxAPGIVMSSRv8tbRSODbrs4KGsRRLEhrW8N8Rd4DRgB2+621hY8A8XwwrTVhXWpxFvMzg==}
+    dev: false
+
   /lodash.isequal/4.5.0:
     resolution: {integrity: sha512-pDo3lu8Jhfjqls6GkMgpahsF9kCyayhgykjyLMNFTKWrpVdAQtYyB4muAMWozBB4ig/dtWAmsMxLEI8wuz+DYQ==}
 
+  /lodash.isobject/3.0.2:
+    resolution: {integrity: sha512-3/Qptq2vr7WeJbB4KHUSKlq8Pl7ASXi3UG6CMbBm8WRtXi8+GHm7mKaU3urfpSEzWe2wCIChs6/sdocUsTKJiA==}
+    dev: false
+
   /lodash.isstring/4.0.1:
     resolution: {integrity: sha512-0wJxfxH1wgO3GrbuP+dTTk7op+6L41QCXbGINEmD+ny/G/eCqGzxyCsh7159S+mgDDcoarnBw6PC1PS5+wUGgw==}
     dev: false
@@ -14154,6 +14532,18 @@ packages:
     resolution: {integrity: sha512-yv3cSQZmfpbIKo4Yo45B1taEvxjNvcpF1CEOc0Y6dEyvhPIfEJE3twDwPgWTPQubcSgXyBwBKG6wpQvWMDOf6Q==}
     dev: false
 
+  /lodash.last/3.0.0:
+    resolution: {integrity: sha512-14mq7rSkCxG4XMy9lF2FbIOqqgF0aH0NfPuQ3LPR3vIh0kHnUvIYP70dqa1Hf47zyXfQ8FzAg0MYOQeSuE1R7A==}
+    dev: false
+
+  /lodash.lt/3.9.2:
+    resolution: {integrity: sha512-WMyxj1+48IlnUWMYALOD6+o61apx5xdiXDtHBOp6QlkeZ19QpX7LiqHMXCnZWGd35QMZoZV/iJIhIhM01WPz3A==}
+    dev: false
+
+  /lodash.map/4.6.0:
+    resolution: {integrity: sha512-worNHGKLDetmcEYDvh2stPCrrQRkP20E4l0iIS7F8EvzMqBBi7ltvFN5m1HvTf1P7Jk1txKhvFcmYsCr8O2F1Q==}
+    dev: false
+
   /lodash.memoize/4.1.2:
     resolution: {integrity: sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==}
     dev: true
@@ -14161,6 +14551,10 @@ packages:
   /lodash.merge/4.6.2:
     resolution: {integrity: sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==}
 
+  /lodash.mergewith/4.6.2:
+    resolution: {integrity: sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==}
+    dev: false
+
   /lodash.omit/4.5.0:
     resolution: {integrity: sha512-XeqSp49hNGmlkj2EJlfrQFIzQ6lXdNro9sddtQzcJY8QaoC2GO0DT7xaIokHeyM+mIT0mPMlPvkYzg2xCuHdZg==}
     dev: false
@@ -14173,10 +14567,22 @@ packages:
     resolution: {integrity: sha512-T0rZxKmghOOf5YPnn8EY5iLYeWCpZq8G41FfqoVHH5QDTAFaghJRmAdLiadEDq+ztgM2q5PjA+Z1fOwGrLgmtg==}
     dev: false
 
+  /lodash.partialright/4.2.1:
+    resolution: {integrity: sha512-yebmPMQZH7i4El6SdJTW9rn8irWl8VTcsmiWqm/I4sY8/ZjbSo0Z512HL6soeAu3mh5rhx5uIIo6kYJOQXbCxw==}
+    dev: false
+
   /lodash.pick/4.4.0:
     resolution: {integrity: sha512-hXt6Ul/5yWjfklSGvLQl8vM//l3FtyHZeuelpzK6mm99pNvN9yTDruNZPEJZD1oWrqo+izBmB7oUfWgcCX7s4Q==}
     dev: false
 
+  /lodash.pickby/4.6.0:
+    resolution: {integrity: sha512-AZV+GsS/6ckvPOVQPXSiFFacKvKB4kOQu6ynt9wz0F3LO4R9Ij4K1ddYsIytDpSgLz88JHd9P+oaLeej5/Sl7Q==}
+    dev: false
+
+  /lodash.reduce/4.6.0:
+    resolution: {integrity: sha512-6raRe2vxCYBhpBu+B+TtNGUzah+hQjVdu3E17wfusjyrXBka2nBS8OH/gjVZ5PvHOhWmIZTYri09Z6n/QfnNMw==}
+    dev: false
+
   /lodash.remove/4.7.0:
     resolution: {integrity: sha512-GnwkSsEXGXirSxh3YI+jc/qvptE2DV8ZjA4liK0NT1MJ3mNDMFhX3bY+4Wr8onlNItYuPp7/4u19Fi55mvzkTw==}
     dev: false
@@ -14185,6 +14591,14 @@ packages:
     resolution: {integrity: sha512-4hNPN5jlm/N/HLMCO43v8BXKq9Z7QdAGc/VGrRD61w8gN9g/6jF9A4L1pbUgBLCffi0w9VsXfTOij5x8iTyFvg==}
     dev: false
 
+  /lodash.some/4.6.0:
+    resolution: {integrity: sha512-j7MJE+TuT51q9ggt4fSgVqro163BEFjAt3u97IqU+JA2DkWl80nFTrowzLpZ/BnpN7rrl0JA/593NAdd8p/scQ==}
+    dev: false
+
+  /lodash.sortby/4.7.0:
+    resolution: {integrity: sha512-HDWXG8isMntAyRF5vZ7xKuEvOhT4AhlRt/3czTSjvGUxjYCBVRQY48ViDHyfYz9VIoBkW4TMGQNapx+l3RUwdA==}
+    dev: false
+
   /lodash.split/4.4.2:
     resolution: {integrity: sha512-kn1IDX0aHfg0FsnPIyxCHTamZXt3YK3aExRH1LW8YhzP6+sCldTm8+E4aIg+nSmM6R4eqdWGrXWtfYI961bwIw==}
     dev: false
@@ -14193,6 +14607,22 @@ packages:
     resolution: {integrity: sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==}
     dev: false
 
+  /lodash.tonumber/4.0.3:
+    resolution: {integrity: sha512-SY0SwuPOHRwKcCNTdsntPYb+Zddz5mDUIVFABzRMqmAiL41pMeyoQFGxYAw5zdc9NnH4pbJqiqqp5ckfxa+zSA==}
+    dev: false
+
+  /lodash.tostring/4.1.4:
+    resolution: {integrity: sha512-xWHJ0LY7cSz/C/4ghNNiYA1Ong0VLdzAzrjDHvOzN+eJHzDEHme2+k+w/9Pk8dtdwcASMUbxN1/mtj6mFI25Ng==}
+    dev: false
+
+  /lodash.trim/4.5.1:
+    resolution: {integrity: sha512-nJAlRl/K+eiOehWKDzoBVrSMhK0K3A3YQsUNXHQa5yIrKBAhsZgSu3KoAFoFT+mEgiyBHddZ0pRk1ITpIp90Wg==}
+    dev: false
+
+  /lodash.union/4.6.0:
+    resolution: {integrity: sha512-c4pB2CdGrGdjMKYLA+XiRDO7Y0PRQbm/Gzg8qMj+QH+pFVAoTp5sBpO0odL3FjoPCGjK96p6qsP+yQoiLoOBcw==}
+    dev: false
+
   /lodash.unionby/4.8.0:
     resolution: {integrity: sha512-e60kn4GJIunNkw6v9MxRnUuLYI/Tyuanch7ozoCtk/1irJTYBj+qNTxr5B3qVflmJhwStJBv387Cb+9VOfABMg==}
     dev: false
@@ -14209,6 +14639,14 @@ packages:
     resolution: {integrity: sha512-bwKX88k2JhCV9D1vtE8+naDKlLiGrSmf8zi/Y9ivFHwbmRfA8RxS/aVJ+sIht2XOwqoNr4xUPUkGZpc1sHFEKg==}
     dev: false
 
+  /lodash.upperfirst/4.3.1:
+    resolution: {integrity: sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==}
+    dev: false
+
+  /lodash.zip/4.2.0:
+    resolution: {integrity: sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==}
+    dev: false
+
   /lodash.zipobject/4.1.3:
     resolution: {integrity: sha512-A9SzX4hMKWS25MyalwcOnNoplyHbkNVsjidhTp8ru0Sj23wY9GWBKS8gAIGDSAqeWjIjvE4KBEl24XXAs+v4wQ==}
     dev: false

From a72ef218177da246b596f8e22a2c1f7f514b2bd6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Feb 2023 18:21:17 +0100
Subject: [PATCH 285/358] :rocket: Release 0.217.0 (#5553)

---
 CHANGELOG.md                        | 75 +++++++++++++++++++++++++++++
 package.json                        |  2 +-
 packages/cli/package.json           |  2 +-
 packages/core/package.json          |  2 +-
 packages/design-system/package.json |  2 +-
 packages/editor-ui/package.json     |  2 +-
 packages/node-dev/package.json      |  2 +-
 packages/nodes-base/package.json    |  2 +-
 packages/workflow/package.json      |  2 +-
 9 files changed, 83 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ba0cebe5452f1..d6cc121e529cdb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,78 @@
+# [0.217.0](https://github.com/n8n-io/n8n/compare/n8n@0.216.1...n8n@0.217.0) (2023-02-23)
+
+
+### Bug Fixes
+
+* **Baserow Node:** Fix issue with get all not correctly using filters ([#5519](https://github.com/n8n-io/n8n/issues/5519)) ([ee21b7a](https://github.com/n8n-io/n8n/commit/ee21b7a1cfed17936eb6bf50221b7f9983dd38e6))
+* **Compare Datasets Node:** UI tweaks and fixes ([7ecd5e5](https://github.com/n8n-io/n8n/commit/7ecd5e59eca01ca2b1a01e0a3e3871bd5d322eea))
+* **core:** Do not allow arbitrary path traversal in BinaryDataManager ([#5523](https://github.com/n8n-io/n8n/issues/5523)) ([eef2574](https://github.com/n8n-io/n8n/commit/eef257406730a989ec8e7a056c3d4234300fdb25))
+* **core:** Do not allow arbitrary path traversal in the credential-translation endpoint ([#5522](https://github.com/n8n-io/n8n/issues/5522)) ([f0f8d59](https://github.com/n8n-io/n8n/commit/f0f8d59fee223c6bc9f8459890ed4a31ef8cb0af))
+* **core:** Do not explicitly bypass auth on urls containing `.svg` ([#5525](https://github.com/n8n-io/n8n/issues/5525)) ([f58573d](https://github.com/n8n-io/n8n/commit/f58573dba30eba8fe3d844d1b7b2dbbb8d51b8b5))
+* **core:** Do not remove empty output connections arrays in PurgeInvalidWorkflowConnections migration ([#5546](https://github.com/n8n-io/n8n/issues/5546)) ([0fbb3f0](https://github.com/n8n-io/n8n/commit/0fbb3f0f026432f1aea87b106a0c1f732f93c792))
+* **core:** Fix execution status filters ([#5533](https://github.com/n8n-io/n8n/issues/5533)) ([17eff4d](https://github.com/n8n-io/n8n/commit/17eff4d7d6692bfdc251bfa16ce7334858642ce5))
+* **core:** User update endpoint should only allow updating email, firstName, and lastName ([#5526](https://github.com/n8n-io/n8n/issues/5526)) ([510855d](https://github.com/n8n-io/n8n/commit/510855d9581f07e5081a7bc11377cd6216ba7edf))
+* **Discord Node:** Fix wrong error message being displayed ([#5547](https://github.com/n8n-io/n8n/issues/5547)) ([e251439](https://github.com/n8n-io/n8n/commit/e2514393335e555af47c9aca4f81b31608df9cb5))
+* **Discourse Node:** Fix issue with credential test not working ([#5520](https://github.com/n8n-io/n8n/issues/5520)) ([b3e1793](https://github.com/n8n-io/n8n/commit/b3e1793ac0f304ea72d565097b6766bc278e1238))
+* **editor:** Apply correct IRunExecutionData to finished workflow ([#5552](https://github.com/n8n-io/n8n/issues/5552)) ([e2d7c18](https://github.com/n8n-io/n8n/commit/e2d7c1804f2d5da15d96edeefd50c5b8e2753fd1))
+* **editor:** Fix an issue with zoom and canvas nodes connections ([#5548](https://github.com/n8n-io/n8n/issues/5548)) ([4998ab2](https://github.com/n8n-io/n8n/commit/4998ab23508adf9a244885509b2d5c7c9c9c48f0))
+* **editor:** Fix unexpected date rendering on front-end ([#5528](https://github.com/n8n-io/n8n/issues/5528)) ([684d717](https://github.com/n8n-io/n8n/commit/684d71752064e25143e09666e539b91b3dcd5f71))
+* **editor:** Remove 'crashed' status from filter ([#5524](https://github.com/n8n-io/n8n/issues/5524)) ([7c517cb](https://github.com/n8n-io/n8n/commit/7c517cb5300481908dd653426089a6a9291e79ca))
+* fix typo in error messages when a property does not exist ([#4310](https://github.com/n8n-io/n8n/issues/4310)) ([3af3db1](https://github.com/n8n-io/n8n/commit/3af3db160b5798fe948159b6f3dd48ec743512e7))
+* Fixes an issue when saving an active workflow without triggers would cause n8n to be stuck ([#5513](https://github.com/n8n-io/n8n/issues/5513)) ([75a094a](https://github.com/n8n-io/n8n/commit/75a094a8c03afc40b7872cd2115d82e69455286e))
+* **Google Calendar Node:** Fix incorrect labels for start and end times when getting all events ([#5529](https://github.com/n8n-io/n8n/issues/5529)) ([f965469](https://github.com/n8n-io/n8n/commit/f965469e13a45d3a7b796dfd6be44573bf8b13d0))
+* **Postgres Node:** Fix for tables containing field named json ([5d74a2f](https://github.com/n8n-io/n8n/commit/5d74a2f89a31ee1a386a52d0d71858f73d734e31))
+* **S3 Node:** Fix issue with get many buckets not outputting data ([#5514](https://github.com/n8n-io/n8n/issues/5514)) ([1c47677](https://github.com/n8n-io/n8n/commit/1c476770a778b7d034924db847a8757c383bd281))
+
+
+### Features
+
+* Add new event hooks ([#5530](https://github.com/n8n-io/n8n/issues/5530)) ([d47d008](https://github.com/n8n-io/n8n/commit/d47d0086cc2b0af5338598de1fc496b9d825f9a4))
+* Add Required path name mapping to multiple nodes ([#5369](https://github.com/n8n-io/n8n/issues/5369)) ([f1589d4](https://github.com/n8n-io/n8n/commit/f1589d4f0f9f7cc7beec12d9f6598f8286484989))
+* **core:** Add configurable execution history limit ([#5505](https://github.com/n8n-io/n8n/issues/5505)) ([db70293](https://github.com/n8n-io/n8n/commit/db702932f3f2b14a097e7f4364c06cbb4f001ebc))
+* **core:** Add execution runData recovery and status field ([#5112](https://github.com/n8n-io/n8n/issues/5112)) ([d143f3f](https://github.com/n8n-io/n8n/commit/d143f3f2ec9ce42cfa4db2b41dab019b7b42f379))
+* **core:** Add saml feature flag ([#5494](https://github.com/n8n-io/n8n/issues/5494)) ([3a9c257](https://github.com/n8n-io/n8n/commit/3a9c257f55a87890c7456601de13f182cec89fde))
+* Deprecate Read Binary File node ([#5490](https://github.com/n8n-io/n8n/issues/5490)) ([11b4671](https://github.com/n8n-io/n8n/commit/11b467137e7652c03c0578654b19dbc157b23220))
+* **editor:** Unify regular and trigger node creator panels ([#5315](https://github.com/n8n-io/n8n/issues/5315)) ([9a1e7b5](https://github.com/n8n-io/n8n/commit/9a1e7b52f7ce698f1492af15d0139fb015ba5d30))
+* Hide sensitive value in Auth Header Credentials and Auth Query Credentials ([#5534](https://github.com/n8n-io/n8n/issues/5534)) ([4a209e1](https://github.com/n8n-io/n8n/commit/4a209e1dd98ea4b43d0a4d9cd688615cd6d4d5dd))
+* Support feature flag evaluation server side ([#5511](https://github.com/n8n-io/n8n/issues/5511)) ([26a20ed](https://github.com/n8n-io/n8n/commit/26a20ed47e8f580504b80150d7550ecb9a49be0d))
+
+
+
+## [0.216.2](https://github.com/n8n-io/n8n/compare/n8n@0.216.1...n8n@0.216.2) (2023-02-23)
+
+
+### Bug Fixes
+
+* **core:** Do not remove empty output connections arrays in PurgeInvalidWorkflowConnections migration ([#5546](https://github.com/n8n-io/n8n/issues/5546)) ([ac86abe](https://github.com/n8n-io/n8n/commit/ac86abe2457d9f54fcd23ac0c8d5f39d565bdcdf))
+
+
+
+## [0.215.3](https://github.com/n8n-io/n8n/compare/n8n@0.215.2...n8n@0.215.3) (2023-02-23)
+
+
+### Bug Fixes
+
+* **core:** Do not allow arbitrary path traversal in BinaryDataManager ([#5523](https://github.com/n8n-io/n8n/issues/5523)) ([f7079da](https://github.com/n8n-io/n8n/commit/f7079daecd210a3a2a94e07c4782d15ee2a995e0))
+* **core:** Do not allow arbitrary path traversal in the credential-translation endpoint ([#5522](https://github.com/n8n-io/n8n/issues/5522)) ([14d2a88](https://github.com/n8n-io/n8n/commit/14d2a88120c966a6493c3a64a7a2925af0731b8f))
+* **core:** Do not explicitly bypass auth on urls containing `.svg` ([#5525](https://github.com/n8n-io/n8n/issues/5525)) ([0b568ee](https://github.com/n8n-io/n8n/commit/0b568ee5c3d3259aaa43f757ded5583bf9d1e221))
+* **core:** Do not remove empty output connections arrays in PurgeInvalidWorkflowConnections migration ([#5546](https://github.com/n8n-io/n8n/issues/5546)) ([a31cb05](https://github.com/n8n-io/n8n/commit/a31cb05fecb3c7fcb8f3def33206bb7676358561))
+* **core:** User update endpoint should only allow updating email, firstName, and lastName ([#5526](https://github.com/n8n-io/n8n/issues/5526)) ([d530e20](https://github.com/n8n-io/n8n/commit/d530e20669e90e12a2d2895ae31d0018a53b817a))
+
+
+
+## [0.214.4](https://github.com/n8n-io/n8n/compare/n8n@0.214.3...n8n@0.214.4) (2023-02-23)
+
+
+### Bug Fixes
+
+* **core:** Do not allow arbitrary path traversal in BinaryDataManager ([#5523](https://github.com/n8n-io/n8n/issues/5523)) ([df3f23e](https://github.com/n8n-io/n8n/commit/df3f23e2b8103a15632521e4ba6cf332693acf81))
+* **core:** Do not allow arbitrary path traversal in the credential-translation endpoint ([#5522](https://github.com/n8n-io/n8n/issues/5522)) ([397e42d](https://github.com/n8n-io/n8n/commit/397e42d63e80577a0b897873a1d2f19533e27da7))
+* **core:** Do not explicitly bypass auth on urls containing `.svg` ([#5525](https://github.com/n8n-io/n8n/issues/5525)) ([a8ca2b1](https://github.com/n8n-io/n8n/commit/a8ca2b1aea687256c7d7d3525a2c50659935d7b8))
+* **core:** Do not remove empty output connections arrays in PurgeInvalidWorkflowConnections migration ([#5546](https://github.com/n8n-io/n8n/issues/5546)) ([e6a554f](https://github.com/n8n-io/n8n/commit/e6a554f884d0d8d1e5c3890745986ecc179846d5))
+* **core:** User update endpoint should only allow updating email, firstName, and lastName ([#5526](https://github.com/n8n-io/n8n/issues/5526)) ([d622827](https://github.com/n8n-io/n8n/commit/d6228276a26d9dc1bf2b2c5452bc0644b6df0c63))
+
+
+
 ## [0.216.1](https://github.com/n8n-io/n8n/compare/n8n@0.216.0...n8n@0.216.1) (2023-02-21)
 
 
diff --git a/package.json b/package.json
index 880b34fd2b52fb..25a33f4cc7dce9 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.216.1",
+  "version": "0.217.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index bc8ae65e17c8a6..ecc7163c585e2a 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.216.1",
+  "version": "0.217.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/core/package.json b/packages/core/package.json
index 60ec9df01be8a8..861e9386ac6cfe 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.155.1",
+  "version": "0.156.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index e820e7b0c2233b..23c8c283333499 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "0.54.0",
+  "version": "0.55.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 7863b7193acf36..69cd0b36a46260 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.182.1",
+  "version": "0.183.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 0447533dbfd4e4..bd46798d559847 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.94.1",
+  "version": "0.95.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index f83852c5b2ec37..7797b0ece2d951 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.214.1",
+  "version": "0.215.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index ee1bc2cb27561d..a2f574fde16717 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.137.1",
+  "version": "0.138.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 46d9ac6c6f55a505716c8951f93b149713bcbe35 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Fri, 24 Feb 2023 14:53:49 +0100
Subject: [PATCH 286/358] fix: Prevent executions from displaying as running
 forever (#5563)

* fix: Prevent executions from displaying as running forever

* fix: Correct migration query
---
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  9 +++++---
 ...7236788851-UpdateRunningExecutionStatus.ts | 22 +++++++++++++++++++
 .../src/databases/migrations/mysqldb/index.ts |  2 ++
 ...7236854063-UpdateRunningExecutionStatus.ts | 22 +++++++++++++++++++
 .../databases/migrations/postgresdb/index.ts  |  2 ++
 ...7237073720-UpdateRunningExecutionStatus.ts | 22 +++++++++++++++++++
 .../src/databases/migrations/sqlite/index.ts  |  2 ++
 7 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index f5291be49f9f0f..cf21a80ca457da 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -472,7 +472,6 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
 					fullExecutionData.status = 'running';
 
 					const flattenedExecutionData = ResponseHelper.flattenExecutionData(fullExecutionData);
-
 					await Db.collections.Execution.update(
 						this.executionId,
 						flattenedExecutionData as IExecutionFlattedDb,
@@ -578,7 +577,11 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 							saveDataSuccessExecution;
 					}
 
-					const workflowDidSucceed = !fullRunData.data.resultData.error;
+					const workflowHasCrashed = fullRunData.status === 'crashed';
+					const workflowDidSucceed = !fullRunData.data.resultData.error && !workflowHasCrashed;
+					let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed';
+					if (workflowHasCrashed) workflowStatusFinal = 'crashed';
+
 					if (
 						(workflowDidSucceed && saveDataSuccessExecution === 'none') ||
 						(!workflowDidSucceed && saveDataErrorExecution === 'none')
@@ -626,7 +629,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						stoppedAt: fullRunData.stoppedAt,
 						workflowData: pristineWorkflowData,
 						waitTill: fullRunData.waitTill,
-						status: fullRunData.status,
+						status: workflowStatusFinal,
 					};
 
 					if (this.retryOf !== undefined) {
diff --git a/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
new file mode 100644
index 00000000000000..12225e7623e012
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class UpdateRunningExecutionStatus1677236788851 implements MigrationInterface {
+	name = 'UpdateRunningExecutionStatus1677236788851';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='failed' WHERE status = 'running' AND finished=0 AND \`stoppedAt\` IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='success' WHERE status = 'running' AND finished=1 AND \`stoppedAt\` IS NOT NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index db7ab0ff419d8c..b67441e08f26c1 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -33,6 +33,7 @@ import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntit
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
+import { UpdateRunningExecutionStatus1677236788851 } from './1677236788851-UpdateRunningExecutionStatus';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -70,4 +71,5 @@ export const mysqlMigrations = [
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
 	MigrateExecutionStatus1676996103000,
+	UpdateRunningExecutionStatus1677236788851,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
new file mode 100644
index 00000000000000..cc017549039c8a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class UpdateRunningExecutionStatus1677236854063 implements MigrationInterface {
+	name = 'UpdateRunningExecutionStatus1677236854063';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" = 'running' AND "finished"=false AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" = 'running' AND "finished"=true AND "stoppedAt" IS NOT NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 32b48f626c7617..9aa75b16ed1db2 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -31,6 +31,7 @@ import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntit
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
+import { UpdateRunningExecutionStatus1677236854063 } from './1677236854063-UpdateRunningExecutionStatus';
 
 export const postgresMigrations = [
 	InitialMigration1587669153312,
@@ -66,4 +67,5 @@ export const postgresMigrations = [
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
 	MigrateExecutionStatus1676996103000,
+	UpdateRunningExecutionStatus1677236854063,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts
new file mode 100644
index 00000000000000..335fd27c1f376f
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class UpdateRunningExecutionStatus1677237073720 implements MigrationInterface {
+	name = 'UpdateRunningExecutionStatus1677237073720';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" = 'running' AND "finished"=0 AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" = 'running' AND "finished"=1 AND "stoppedAt" IS NOT NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index eadb90effcc3c4..42782c2430c7bb 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -30,6 +30,7 @@ import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntit
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
+import { UpdateRunningExecutionStatus1677237073720 } from './1677237073720-UpdateRunningExecutionStatus';
 
 const sqliteMigrations = [
 	InitialMigration1588102412422,
@@ -64,6 +65,7 @@ const sqliteMigrations = [
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
 	MigrateExecutionStatus1676996103000,
+	UpdateRunningExecutionStatus1677237073720,
 ];
 
 export { sqliteMigrations };

From b30db10d898fa791d99d13192ef411cace4f7c05 Mon Sep 17 00:00:00 2001
From: Omar Ajoue <krynble@gmail.com>
Date: Fri, 24 Feb 2023 14:53:49 +0100
Subject: [PATCH 287/358] fix: Prevent executions from displaying as running
 forever (#5563)

* fix: Prevent executions from displaying as running forever

* fix: Correct migration query
---
 .../cli/src/WorkflowExecuteAdditionalData.ts  |  9 +++++---
 ...7236788851-UpdateRunningExecutionStatus.ts | 22 +++++++++++++++++++
 .../src/databases/migrations/mysqldb/index.ts |  2 ++
 ...7236854063-UpdateRunningExecutionStatus.ts | 22 +++++++++++++++++++
 .../databases/migrations/postgresdb/index.ts  |  2 ++
 ...7237073720-UpdateRunningExecutionStatus.ts | 22 +++++++++++++++++++
 .../src/databases/migrations/sqlite/index.ts  |  2 ++
 7 files changed, 78 insertions(+), 3 deletions(-)
 create mode 100644 packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
 create mode 100644 packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
 create mode 100644 packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index f5291be49f9f0f..cf21a80ca457da 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -472,7 +472,6 @@ export function hookFunctionsPreExecute(parentProcessMode?: string): IWorkflowEx
 					fullExecutionData.status = 'running';
 
 					const flattenedExecutionData = ResponseHelper.flattenExecutionData(fullExecutionData);
-
 					await Db.collections.Execution.update(
 						this.executionId,
 						flattenedExecutionData as IExecutionFlattedDb,
@@ -578,7 +577,11 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 							saveDataSuccessExecution;
 					}
 
-					const workflowDidSucceed = !fullRunData.data.resultData.error;
+					const workflowHasCrashed = fullRunData.status === 'crashed';
+					const workflowDidSucceed = !fullRunData.data.resultData.error && !workflowHasCrashed;
+					let workflowStatusFinal: ExecutionStatus = workflowDidSucceed ? 'success' : 'failed';
+					if (workflowHasCrashed) workflowStatusFinal = 'crashed';
+
 					if (
 						(workflowDidSucceed && saveDataSuccessExecution === 'none') ||
 						(!workflowDidSucceed && saveDataErrorExecution === 'none')
@@ -626,7 +629,7 @@ function hookFunctionsSave(parentProcessMode?: string): IWorkflowExecuteHooks {
 						stoppedAt: fullRunData.stoppedAt,
 						workflowData: pristineWorkflowData,
 						waitTill: fullRunData.waitTill,
-						status: fullRunData.status,
+						status: workflowStatusFinal,
 					};
 
 					if (this.retryOf !== undefined) {
diff --git a/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
new file mode 100644
index 00000000000000..12225e7623e012
--- /dev/null
+++ b/packages/cli/src/databases/migrations/mysqldb/1677236788851-UpdateRunningExecutionStatus.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class UpdateRunningExecutionStatus1677236788851 implements MigrationInterface {
+	name = 'UpdateRunningExecutionStatus1677236788851';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='failed' WHERE status = 'running' AND finished=0 AND \`stoppedAt\` IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE \`${tablePrefix}execution_entity\` SET status='success' WHERE status = 'running' AND finished=1 AND \`stoppedAt\` IS NOT NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/mysqldb/index.ts b/packages/cli/src/databases/migrations/mysqldb/index.ts
index db7ab0ff419d8c..b67441e08f26c1 100644
--- a/packages/cli/src/databases/migrations/mysqldb/index.ts
+++ b/packages/cli/src/databases/migrations/mysqldb/index.ts
@@ -33,6 +33,7 @@ import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntit
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
+import { UpdateRunningExecutionStatus1677236788851 } from './1677236788851-UpdateRunningExecutionStatus';
 
 export const mysqlMigrations = [
 	InitialMigration1588157391238,
@@ -70,4 +71,5 @@ export const mysqlMigrations = [
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
 	MigrateExecutionStatus1676996103000,
+	UpdateRunningExecutionStatus1677236788851,
 ];
diff --git a/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
new file mode 100644
index 00000000000000..cc017549039c8a
--- /dev/null
+++ b/packages/cli/src/databases/migrations/postgresdb/1677236854063-UpdateRunningExecutionStatus.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class UpdateRunningExecutionStatus1677236854063 implements MigrationInterface {
+	name = 'UpdateRunningExecutionStatus1677236854063';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" = 'running' AND "finished"=false AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" = 'running' AND "finished"=true AND "stoppedAt" IS NOT NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/postgresdb/index.ts b/packages/cli/src/databases/migrations/postgresdb/index.ts
index 32b48f626c7617..9aa75b16ed1db2 100644
--- a/packages/cli/src/databases/migrations/postgresdb/index.ts
+++ b/packages/cli/src/databases/migrations/postgresdb/index.ts
@@ -31,6 +31,7 @@ import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntit
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
+import { UpdateRunningExecutionStatus1677236854063 } from './1677236854063-UpdateRunningExecutionStatus';
 
 export const postgresMigrations = [
 	InitialMigration1587669153312,
@@ -66,4 +67,5 @@ export const postgresMigrations = [
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
 	MigrateExecutionStatus1676996103000,
+	UpdateRunningExecutionStatus1677236854063,
 ];
diff --git a/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts b/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts
new file mode 100644
index 00000000000000..335fd27c1f376f
--- /dev/null
+++ b/packages/cli/src/databases/migrations/sqlite/1677237073720-UpdateRunningExecutionStatus.ts
@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from 'typeorm';
+import { logMigrationEnd, logMigrationStart } from '@db/utils/migrationHelpers';
+import config from '@/config';
+
+export class UpdateRunningExecutionStatus1677237073720 implements MigrationInterface {
+	name = 'UpdateRunningExecutionStatus1677237073720';
+	public async up(queryRunner: QueryRunner): Promise<void> {
+		logMigrationStart(this.name);
+		const tablePrefix = config.getEnv('database.tablePrefix');
+
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'failed' WHERE "status" = 'running' AND "finished"=0 AND "stoppedAt" IS NOT NULL;`,
+		);
+		await queryRunner.query(
+			`UPDATE "${tablePrefix}execution_entity" SET "status" = 'success' WHERE "status" = 'running' AND "finished"=1 AND "stoppedAt" IS NOT NULL;`,
+		);
+
+		logMigrationEnd(this.name);
+	}
+
+	public async down(queryRunner: QueryRunner): Promise<void> {}
+}
diff --git a/packages/cli/src/databases/migrations/sqlite/index.ts b/packages/cli/src/databases/migrations/sqlite/index.ts
index eadb90effcc3c4..42782c2430c7bb 100644
--- a/packages/cli/src/databases/migrations/sqlite/index.ts
+++ b/packages/cli/src/databases/migrations/sqlite/index.ts
@@ -30,6 +30,7 @@ import { CreateLdapEntities1674509946020 } from './1674509946020-CreateLdapEntit
 import { PurgeInvalidWorkflowConnections1675940580449 } from './1675940580449-PurgeInvalidWorkflowConnections';
 import { AddStatusToExecutions1674138566000 } from './1674138566000-AddStatusToExecutions';
 import { MigrateExecutionStatus1676996103000 } from './1676996103000-MigrateExecutionStatus';
+import { UpdateRunningExecutionStatus1677237073720 } from './1677237073720-UpdateRunningExecutionStatus';
 
 const sqliteMigrations = [
 	InitialMigration1588102412422,
@@ -64,6 +65,7 @@ const sqliteMigrations = [
 	PurgeInvalidWorkflowConnections1675940580449,
 	AddStatusToExecutions1674138566000,
 	MigrateExecutionStatus1676996103000,
+	UpdateRunningExecutionStatus1677237073720,
 ];
 
 export { sqliteMigrations };

From 973518819599e473a2ee885a5e10bafcbd2a7946 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 24 Feb 2023 16:21:55 +0100
Subject: [PATCH 288/358] :rocket: Release 0.217.1 (#5565)

---
 CHANGELOG.md              | 9 +++++++++
 package.json              | 2 +-
 packages/cli/package.json | 2 +-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d6cc121e529cdb..4b7bd296039375 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,12 @@
+## [0.217.1](https://github.com/n8n-io/n8n/compare/n8n@0.217.0...n8n@0.217.1) (2023-02-24)
+
+
+### Bug Fixes
+
+* Prevent executions from displaying as running forever ([#5563](https://github.com/n8n-io/n8n/issues/5563)) ([b30db10](https://github.com/n8n-io/n8n/commit/b30db10d898fa791d99d13192ef411cace4f7c05))
+
+
+
 # [0.217.0](https://github.com/n8n-io/n8n/compare/n8n@0.216.1...n8n@0.217.0) (2023-02-23)
 
 
diff --git a/package.json b/package.json
index 25a33f4cc7dce9..0b205e4a350050 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.217.0",
+  "version": "0.217.1",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index ecc7163c585e2a..2cad4b97375fa2 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.217.0",
+  "version": "0.217.1",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 88de6613bda2d4f133410b05c5c2a8d2f1ba838f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 24 Feb 2023 18:02:34 +0100
Subject: [PATCH 289/358] fix(core): Fix execution pruning queries (#5562)

* fix(core): Execution pruning should delete query should use the `OR` operator

* fix(core): Prune executions in a chunk to avoid sqlite error "Expression tree is too large"

* reduce the memory usage during execution pruning
---
 .../cli/src/WorkflowExecuteAdditionalData.ts  | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index cf21a80ca457da..4488af126cb8cd 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -44,7 +44,7 @@ import {
 
 import pick from 'lodash.pick';
 import type { FindOptionsWhere } from 'typeorm';
-import { LessThanOrEqual } from 'typeorm';
+import { LessThanOrEqual, In } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 import config from '@/config';
 import * as Db from '@/Db';
@@ -212,7 +212,9 @@ async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const utcDate = DateUtils.mixedDateToUtcDatetimeString(date);
 
-		const toPrune: FindOptionsWhere<IExecutionFlattedDb> = { stoppedAt: LessThanOrEqual(utcDate) };
+		const toPrune: Array<FindOptionsWhere<IExecutionFlattedDb>> = [
+			{ stoppedAt: LessThanOrEqual(utcDate) },
+		];
 
 		if (maxCount > 0) {
 			const executions = await Db.collections.Execution.find({
@@ -223,27 +225,29 @@ async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
 			});
 
 			if (executions[0]) {
-				toPrune.id = LessThanOrEqual(executions[0].id);
+				toPrune.push({ id: LessThanOrEqual(executions[0].id) });
 			}
 		}
 
 		const isBinaryModeDefaultMode = config.getEnv('binaryDataManager.mode') === 'default';
 		try {
-			const executions = isBinaryModeDefaultMode
-				? []
-				: await Db.collections.Execution.find({
-						select: ['id'],
-						where: toPrune,
-				  });
-			await Db.collections.Execution.delete(toPrune);
 			setTimeout(() => {
 				throttling = false;
 			}, timeout * 1000);
-			// Mark binary data for deletion for all executions
-			if (!isBinaryModeDefaultMode)
-				await BinaryDataManager.getInstance().markDataForDeletionByExecutionIds(
-					executions.map(({ id }) => id),
-				);
+			let executionIds: Array<IExecutionFlattedDb['id']>;
+			do {
+				executionIds = (
+					await Db.collections.Execution.find({
+						select: ['id'],
+						where: toPrune,
+						take: 100,
+					})
+				).map(({ id }) => id);
+				await Db.collections.Execution.delete({ id: In(executionIds) });
+				// Mark binary data for deletion for all executions
+				if (!isBinaryModeDefaultMode)
+					await BinaryDataManager.getInstance().markDataForDeletionByExecutionIds(executionIds);
+			} while (executionIds.length > 0);
 		} catch (error) {
 			ErrorReporter.error(error);
 			throttling = false;

From d09ca875ec3a0d3b02950a8272f396cbe5b18130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 24 Feb 2023 18:07:35 +0100
Subject: [PATCH 290/358] ci: Do not reset the server for every e2e sub-test
 (no-changelog) (#5521)

---
 cypress/e2e/10-undo-redo.cy.ts                |  11 +-
 cypress/e2e/12-canvas.cy.ts                   |  44 +++--
 cypress/e2e/13-pinning.cy.ts                  |   9 +-
 .../14-data-transformation-expressions.cy.ts  |  19 +-
 cypress/e2e/14-mapping.cy.ts                  | 187 +++++++++++-------
 cypress/e2e/15-scheduler-node.cy.ts           |  62 +++---
 cypress/e2e/16-webhook-node.cy.ts             | 149 +++++++-------
 cypress/e2e/17-workflow-tags.cy.ts            |   5 +-
 cypress/e2e/18-user-management.cy.ts          |  50 +++--
 cypress/e2e/19-execution.cy.ts                | 146 ++++++++++----
 cypress/e2e/2-credentials.cy.ts               |   4 +-
 cypress/e2e/20-workflow-executions.cy.ts      |  17 +-
 cypress/e2e/4-node-creator.cy.ts              |  30 +--
 cypress/e2e/5-ndv.cy.ts                       |   5 +-
 cypress/e2e/6-code-node.cy.ts                 |   2 +-
 cypress/e2e/7-workflow-actions.cy.ts          |   5 +-
 cypress/e2e/8-http-request-node.cy.ts         |   2 +-
 17 files changed, 472 insertions(+), 275 deletions(-)

diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 541da069c48322..b8f238b8f2fb2c 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -10,9 +10,12 @@ const WorkflowPage = new WorkflowPageClass();
 const ndv = new NDV();
 
 describe('Undo/Redo', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		WorkflowPage.actions.visit();
 		cy.waitForLoad();
 	});
@@ -38,7 +41,11 @@ describe('Undo/Redo', () => {
 	it('should undo/redo adding node in the middle', () => {
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		WorkflowPage.actions.addNodeToCanvas(CODE_NODE_NAME);
-		WorkflowPage.actions.addNodeBetweenNodes(SCHEDULE_TRIGGER_NODE_NAME, CODE_NODE_NAME, SET_NODE_NAME)
+		WorkflowPage.actions.addNodeBetweenNodes(
+			SCHEDULE_TRIGGER_NODE_NAME,
+			CODE_NODE_NAME,
+			SET_NODE_NAME,
+		);
 		WorkflowPage.actions.zoomToFit();
 		WorkflowPage.actions.hitUndo();
 		WorkflowPage.getters.canvasNodes().should('have.have.length', 2);
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index 13d1bc6392464d..e0f984d13ab2aa 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -21,9 +21,12 @@ const ZOOM_OUT_X2_FACTOR = 0.64;
 const RENAME_NODE_NAME = 'Something else';
 
 describe('Canvas Actions', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		WorkflowPage.actions.visit();
 		cy.waitForLoad();
 	});
@@ -46,14 +49,16 @@ describe('Canvas Actions', () => {
 		// Change connection from Set to Set1
 		cy.draganddrop(
 			WorkflowPage.getters.getEndpointSelector('input', SET_NODE_NAME),
-			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`)
-		)
+			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`),
+		);
 
-		WorkflowPage.getters.canvasNodeInputEndpointByName(`${SET_NODE_NAME}1`).should('have.class', 'jtk-endpoint-connected');
+		WorkflowPage.getters
+			.canvasNodeInputEndpointByName(`${SET_NODE_NAME}1`)
+			.should('have.class', 'jtk-endpoint-connected');
 
 		cy.get('.jtk-connector').should('have.length', 1);
 		// Disconnect Set1
-		cy.drag(WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`), [-200, 100])
+		cy.drag(WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`), [-200, 100]);
 		cy.get('.jtk-connector').should('have.length', 0);
 	});
 
@@ -67,7 +72,10 @@ describe('Canvas Actions', () => {
 		WorkflowPage.getters.canvasPlusButton().should('be.visible');
 		WorkflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME, true);
 
-		cy.drag(WorkflowPage.getters.getEndpointSelector('plus', SCHEDULE_TRIGGER_NODE_NAME), [100, 100])
+		cy.drag(
+			WorkflowPage.getters.getEndpointSelector('plus', SCHEDULE_TRIGGER_NODE_NAME),
+			[100, 100],
+		);
 
 		WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
 		WorkflowPage.actions.addNodeToCanvas(IF_NODE_NAME, false);
@@ -79,18 +87,20 @@ describe('Canvas Actions', () => {
 
 		// Switch has 4 output endpoints
 		for (let i = 0; i < 4; i++) {
-			WorkflowPage.getters.canvasNodePlusEndpointByName(SWITCH_NODE_NAME, i).click({ force: true })
+			WorkflowPage.getters.canvasNodePlusEndpointByName(SWITCH_NODE_NAME, i).click({ force: true });
 			WorkflowPage.getters.nodeCreatorSearchBar().should('be.visible');
 			WorkflowPage.actions.addNodeToCanvas(SET_NODE_NAME, false);
 			WorkflowPage.actions.zoomToFit();
 		}
 		WorkflowPage.actions.saveWorkflowOnButtonClick();
-		cy.reload()
+		cy.reload();
 		cy.waitForLoad();
 		// Make sure all connections are there after reload
 		for (let i = 0; i < 4; i++) {
 			const setName = `${SET_NODE_NAME}${i > 0 ? i : ''}`;
-			WorkflowPage.getters.canvasNodeInputEndpointByName(setName).should('have.class', 'jtk-endpoint-connected');
+			WorkflowPage.getters
+				.canvasNodeInputEndpointByName(setName)
+				.should('have.class', 'jtk-endpoint-connected');
 		}
 	});
 
@@ -109,26 +119,26 @@ describe('Canvas Actions', () => {
 		// Connect manual to Set1
 		cy.draganddrop(
 			WorkflowPage.getters.getEndpointSelector('output', MANUAL_TRIGGER_NODE_DISPLAY_NAME),
-			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`)
-		)
+			WorkflowPage.getters.getEndpointSelector('input', `${SET_NODE_NAME}1`),
+		);
 
 		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 2);
 
 		// Connect Set1 and Set2 to merge
 		cy.draganddrop(
 			WorkflowPage.getters.getEndpointSelector('plus', SET_NODE_NAME),
-			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 0)
-		)
+			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 0),
+		);
 		cy.draganddrop(
 			WorkflowPage.getters.getEndpointSelector('plus', `${SET_NODE_NAME}1`),
-			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 1)
-		)
+			WorkflowPage.getters.getEndpointSelector('input', MERGE_NODE_NAME, 1),
+		);
 
 		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 4);
 
 		// Make sure all connections are there after save & reload
 		WorkflowPage.actions.saveWorkflowOnButtonClick();
-		cy.reload()
+		cy.reload();
 		cy.waitForLoad();
 
 		cy.get('.rect-input-endpoint.jtk-endpoint-connected').should('have.length', 4);
@@ -156,7 +166,7 @@ describe('Canvas Actions', () => {
 		cy.get('.plus-draggable-endpoint').filter(':visible').should('not.have.class', 'ep-success');
 		cy.get('.jtk-connector.success').should('have.length', 3);
 		cy.get('.jtk-connector').should('have.length', 4);
-	})
+	});
 
 	it('should add a connected node using plus endpoint', () => {
 		WorkflowPage.actions.addNodeToCanvas(MANUAL_TRIGGER_NODE_NAME);
diff --git a/cypress/e2e/13-pinning.cy.ts b/cypress/e2e/13-pinning.cy.ts
index f21320ca9c2b8a..cea2c4fef731f7 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -4,15 +4,18 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Data pinning', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		workflowPage.actions.visit();
 		cy.waitForLoad();
 	});
 
 	it('Should be able to pin node output', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true});
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.getters.container().should('be.visible');
 		ndv.getters.pinDataButton().should('not.exist');
 		ndv.getters.editPinnedDataButton().should('be.visible');
@@ -43,7 +46,7 @@ describe('Data pinning', () => {
 	});
 
 	it('Should be be able to set pinned data', () => {
-		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true});
+		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.getters.container().should('be.visible');
 		ndv.getters.pinDataButton().should('not.exist');
 		ndv.getters.editPinnedDataButton().should('be.visible');
diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
index a5186a8af52816..10827653935726 100644
--- a/cypress/e2e/14-data-transformation-expressions.cy.ts
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -4,15 +4,20 @@ const wf = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Data transformation expressions', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		wf.actions.visit();
 		cy.waitForLoad();
 
 		cy.window()
 			// @ts-ignore
-			.then(win => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload));
+			.then(
+				(win) => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload),
+			);
 	});
 
 	it('$json + native string methods', () => {
@@ -26,7 +31,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
 	});
 
@@ -41,7 +46,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
 	});
 
@@ -56,7 +61,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
 	});
 
@@ -71,7 +76,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
 	});
 
@@ -86,7 +91,7 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible')
+		ndv.getters.outputDataContainer().should('be.visible');
 		ndv.getters.outputDataContainer().contains(output);
 	});
 
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 846eafb6e5c9b6..ff6ee35a5222a9 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -9,15 +9,20 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Data mapping', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		workflowPage.actions.visit();
 		cy.waitForLoad();
 
 		cy.window()
 			// @ts-ignore
-			.then(win => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload))
+			.then(
+				(win) => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload),
+			);
 	});
 
 	it('maps expressions from table header', () => {
@@ -30,15 +35,29 @@ describe('Data mapping', () => {
 		ndv.getters.inputDataContainer().get('table', { timeout: 10000 }).should('exist');
 
 		ndv.getters.nodeParameters().find('input[placeholder*="Add Value"]').click();
-		ndv.getters.nodeParameters().find('.el-select-dropdown__list li:nth-child(3)').should('have.text', 'String').click();
-		ndv.getters.parameterInput('name').should('have.length', 1).find('input').should('have.value', 'propertyName');
-		ndv.getters.parameterInput('value').should('have.length', 1).find('input').should('have.value', '');
+		ndv.getters
+			.nodeParameters()
+			.find('.el-select-dropdown__list li:nth-child(3)')
+			.should('have.text', 'String')
+			.click();
+		ndv.getters
+			.parameterInput('name')
+			.should('have.length', 1)
+			.find('input')
+			.should('have.value', 'propertyName');
+		ndv.getters
+			.parameterInput('value')
+			.should('have.length', 1)
+			.find('input')
+			.should('have.value', '');
 
 		ndv.actions.mapDataFromHeader(1, 'value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.timestamp }}');
 
 		ndv.actions.mapDataFromHeader(2, 'value');
-		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.timestamp }} {{ $json["Readable date"] }}');
+		ndv.getters
+			.inlineExpressionEditorInput()
+			.should('have.text', '{{ $json.timestamp }} {{ $json["Readable date"] }}');
 	});
 
 	it('maps expressions from table json, and resolves value based on hover', () => {
@@ -50,40 +69,56 @@ describe('Data mapping', () => {
 		ndv.actions.switchInputMode('Table');
 		ndv.getters.inputDataContainer().get('table', { timeout: 10000 }).should('exist');
 
-		ndv.getters.parameterInput('name').should('have.length', 1).find('input').should('have.value', 'other');
-		ndv.getters.parameterInput('value').should('have.length', 1).find('input').should('have.value', '');
-
-		ndv.getters.inputTbodyCell(1, 0).find('span').contains('count').trigger('mousedown', {force: true});
+		ndv.getters
+			.parameterInput('name')
+			.should('have.length', 1)
+			.find('input')
+			.should('have.value', 'other');
+		ndv.getters
+			.parameterInput('value')
+			.should('have.length', 1)
+			.find('input')
+			.should('have.value', '');
+
+		ndv.getters
+			.inputTbodyCell(1, 0)
+			.find('span')
+			.contains('count')
+			.trigger('mousedown', { force: true });
 		ndv.actions.mapToParameter('value');
 
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
-		ndv.getters.parameterExpressionPreview('value').should('include.text', '0')
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0');
 
 		ndv.getters.inputTbodyCell(1, 0).realHover();
-		ndv.getters.parameterExpressionPreview('value')
+		ndv.getters
+			.parameterExpressionPreview('value')
 			.should('include.text', '0')
 			.invoke('css', 'color')
 			.should('equal', 'rgb(125, 125, 135)');
 
 		ndv.getters.inputTbodyCell(2, 0).realHover();
-		ndv.getters.parameterExpressionPreview('value')
-				.should('include.text', '1')
-				.invoke('css', 'color')
-				.should('equal', 'rgb(125, 125, 135)');
+		ndv.getters
+			.parameterExpressionPreview('value')
+			.should('include.text', '1')
+			.invoke('css', 'color')
+			.should('equal', 'rgb(125, 125, 135)');
 
 		ndv.actions.execute();
 
 		ndv.getters.outputTbodyCell(1, 0).realHover();
-		ndv.getters.parameterExpressionPreview('value')
+		ndv.getters
+			.parameterExpressionPreview('value')
 			.should('include.text', '0')
 			.invoke('css', 'color')
 			.should('equal', 'rgb(125, 125, 135)'); // todo update color
 
 		ndv.getters.outputTbodyCell(2, 0).realHover();
-		ndv.getters.parameterExpressionPreview('value')
-				.should('include.text', '1')
-				.invoke('css', 'color')
-				.should('equal', 'rgb(125, 125, 135)');
+		ndv.getters
+			.parameterExpressionPreview('value')
+			.should('include.text', '1')
+			.invoke('css', 'color')
+			.should('equal', 'rgb(125, 125, 135)');
 	});
 
 	it('maps expressions from json view', () => {
@@ -94,24 +129,34 @@ describe('Data mapping', () => {
 		workflowPage.actions.openNode('Set');
 		ndv.actions.switchInputMode('JSON');
 
-		ndv.getters.inputDataContainer().should('exist').find('.json-data')
-			.should('have.text', '[{"input":[{"count":0,"with space":"!!","with.dot":"!!","with"quotes":"!!"}]},{"input":[{"count":1}]}]')
-			.find('span').contains('"count"')
+		ndv.getters
+			.inputDataContainer()
+			.should('exist')
+			.find('.json-data')
+			.should(
+				'have.text',
+				'[{"input":[{"count":0,"with space":"!!","with.dot":"!!","with"quotes":"!!"}]},{"input":[{"count":1}]}]',
+			)
+			.find('span')
+			.contains('"count"')
 			.realMouseDown();
 
 		ndv.actions.mapToParameter('value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
-		ndv.getters.parameterExpressionPreview('value')
-			.should('include.text', '0');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0');
 
-		ndv.getters.inputDataContainer().find('.json-data')
-			.find('span').contains('"input"')
+		ndv.getters
+			.inputDataContainer()
+			.find('.json-data')
+			.find('span')
+			.contains('"input"')
 			.realMouseDown();
 
 		ndv.actions.mapToParameter('value');
-		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.getters.parameterExpressionPreview('value')
-			.should('include.text', '0 [object Object]');
+		ndv.getters
+			.inlineExpressionEditorInput()
+			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
 	});
 
 	it('maps expressions from schema view', () => {
@@ -123,25 +168,19 @@ describe('Data mapping', () => {
 		ndv.actions.clearParameterInput('value');
 		cy.get('body').type('{esc}');
 
-		ndv.getters.inputDataContainer()
-			.should('exist')
-			.find('span').contains('count')
-			.realMouseDown();
-
+		ndv.getters.inputDataContainer().should('exist').find('span').contains('count').realMouseDown();
 
 		ndv.actions.mapToParameter('value');
 		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
-		ndv.getters.parameterExpressionPreview('value')
-			.should('include.text', '0');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0');
 
-		ndv.getters.inputDataContainer()
-			.find('span').contains('input')
-			.realMouseDown();
+		ndv.getters.inputDataContainer().find('span').contains('input').realMouseDown();
 
 		ndv.actions.mapToParameter('value');
-		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
-		ndv.getters.parameterExpressionPreview('value')
-			.should('include.text', '0 [object Object]');
+		ndv.getters
+			.inlineExpressionEditorInput()
+			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
 	});
 
 	it('maps expressions from previous nodes', () => {
@@ -150,32 +189,33 @@ describe('Data mapping', () => {
 
 		ndv.actions.selectInputNode(SCHEDULE_TRIGGER_NODE_NAME);
 
-		ndv.getters.inputDataContainer()
-			.find('span').contains('count')
-			.realMouseDown();
+		ndv.getters.inputDataContainer().find('span').contains('count').realMouseDown();
 
 		ndv.actions.mapToParameter('value');
-		ndv.getters.inlineExpressionEditorInput().should('have.text', `{{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input[0].count }}`);
-		ndv.getters.parameterExpressionPreview('value')
-			.should('not.exist');
+		ndv.getters
+			.inlineExpressionEditorInput()
+			.should('have.text', `{{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input[0].count }}`);
+		ndv.getters.parameterExpressionPreview('value').should('not.exist');
 
 		ndv.actions.switchInputMode('Table');
 		ndv.actions.mapDataFromHeader(1, 'value');
-		ndv.getters.inlineExpressionEditorInput().should('have.text', `{{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input[0].count }} {{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input }}`);
-		ndv.getters.parameterExpressionPreview('value')
-			.should('not.exist');
+		ndv.getters
+			.inlineExpressionEditorInput()
+			.should(
+				'have.text',
+				`{{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input[0].count }} {{ $node["${SCHEDULE_TRIGGER_NODE_NAME}"].json.input }}`,
+			);
+		ndv.getters.parameterExpressionPreview('value').should('not.exist');
 
 		ndv.actions.selectInputNode('Set');
 
 		ndv.actions.executePrevious();
 		ndv.getters.executingLoader().should('not.exist');
 		ndv.getters.inputDataContainer().should('exist');
-		ndv.getters.parameterExpressionPreview('value')
-			.should('include.text', '0 [object Object]');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
 
 		ndv.getters.inputTbodyCell(2, 0).realHover();
-		ndv.getters.parameterExpressionPreview('value')
-			.should('include.text', '1 [object Object]');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '1 [object Object]');
 	});
 
 	it('maps keys to path', () => {
@@ -186,20 +226,20 @@ describe('Data mapping', () => {
 			{
 				input: [
 					{
-						"hello.world": {
-							"my count": 0,
+						'hello.world': {
+							'my count': 0,
 						},
-					}
-				]
+					},
+				],
 			},
 			{
 				input: [
 					{
-						"hello.world": {
-							"my count": 1,
-						}
-					}
-				]
+						'hello.world': {
+							'my count': 1,
+						},
+					},
+				],
 			},
 		]);
 
@@ -208,21 +248,18 @@ describe('Data mapping', () => {
 		workflowPage.actions.addNodeToCanvas('Item Lists');
 		workflowPage.actions.openNode('Item Lists');
 
-		ndv.getters.parameterInput('operation')
-			.click()
-			.find('li').contains('Sort')
-			.click();
+		ndv.getters.parameterInput('operation').click().find('li').contains('Sort').click();
 
 		ndv.getters.nodeParameters().find('button').contains('Add Field To Sort By').click();
 
-		ndv.getters.inputDataContainer()
-			.find('span').contains('my count')
-			.realMouseDown();
+		ndv.getters.inputDataContainer().find('span').contains('my count').realMouseDown();
 
 		ndv.actions.mapToParameter('fieldName');
 
 		ndv.getters.inlineExpressionEditorInput().should('have.length', 0);
-		ndv.getters.parameterInput('fieldName')
-			.find('input').should('have.value', 'input[0]["hello.world"]["my count"]');
+		ndv.getters
+			.parameterInput('fieldName')
+			.find('input')
+			.should('have.value', 'input[0]["hello.world"]["my count"]');
 	});
 });
diff --git a/cypress/e2e/15-scheduler-node.cy.ts b/cypress/e2e/15-scheduler-node.cy.ts
index 65dae8f4d7e1df..922972263a0659 100644
--- a/cypress/e2e/15-scheduler-node.cy.ts
+++ b/cypress/e2e/15-scheduler-node.cy.ts
@@ -5,7 +5,7 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Schedule Trigger node', async () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
 	});
@@ -42,34 +42,44 @@ describe('Schedule Trigger node', async () => {
 		workflowPage.actions.activateWorkflow();
 		workflowPage.getters.activatorSwitch().should('have.class', 'is-checked');
 
-		cy.request("GET", '/rest/workflows').then((response) => {
-			expect(response.status).to.eq(200);
-			expect(response.body.data).to.have.length(1);
-			const workflowId = response.body.data[0].id.toString();
-			expect(workflowId).to.not.be.empty;
-			return workflowId;
-		}).then((workflowId) => {
-			cy.wait(1200);
-			cy.request("GET", '/rest/executions').then((response) => {
+		cy.request('GET', '/rest/workflows')
+			.then((response) => {
 				expect(response.status).to.eq(200);
-				expect(response.body.data.results.length).to.be.greaterThan(0);
-				const matchingExecutions = response.body.data.results.filter((execution: any) => execution.workflowId === workflowId);
-				expect(matchingExecutions).to.have.length(1);
+				expect(response.body.data).to.have.length(1);
+				const workflowId = response.body.data[0].id.toString();
+				expect(workflowId).to.not.be.empty;
 				return workflowId;
-			}).then((workflowId) => {
+			})
+			.then((workflowId) => {
 				cy.wait(1200);
-				cy.request("GET", '/rest/executions').then((response) => {
-					expect(response.status).to.eq(200);
-					expect(response.body.data.results.length).to.be.greaterThan(0);
-					const matchingExecutions = response.body.data.results.filter((execution: any) => execution.workflowId === workflowId);
-					expect(matchingExecutions).to.have.length(2);
-				}).then(()=>{
-					workflowPage.actions.activateWorkflow();
-					workflowPage.getters.activatorSwitch().should('not.have.class', 'is-checked');
-					cy.visit(workflowsPage.url);
-					workflowsPage.actions.deleteWorkFlow('Schedule Trigger Workflow');
-				});
+				cy.request('GET', '/rest/executions')
+					.then((response) => {
+						expect(response.status).to.eq(200);
+						expect(response.body.data.results.length).to.be.greaterThan(0);
+						const matchingExecutions = response.body.data.results.filter(
+							(execution: any) => execution.workflowId === workflowId,
+						);
+						expect(matchingExecutions).to.have.length(1);
+						return workflowId;
+					})
+					.then((workflowId) => {
+						cy.wait(1200);
+						cy.request('GET', '/rest/executions')
+							.then((response) => {
+								expect(response.status).to.eq(200);
+								expect(response.body.data.results.length).to.be.greaterThan(0);
+								const matchingExecutions = response.body.data.results.filter(
+									(execution: any) => execution.workflowId === workflowId,
+								);
+								expect(matchingExecutions).to.have.length(2);
+							})
+							.then(() => {
+								workflowPage.actions.activateWorkflow();
+								workflowPage.getters.activatorSwitch().should('not.have.class', 'is-checked');
+								cy.visit(workflowsPage.url);
+								workflowsPage.actions.deleteWorkFlow('Schedule Trigger Workflow');
+							});
+					});
 			});
-		});
 	});
 });
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 07495cc4b0c572..3ed3c342cf7531 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -27,7 +27,7 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 		respondWith,
 		responseData,
 		executeNow = true,
-		} = options;
+	} = options;
 
 	workflowPage.actions.addInitialNodeToCanvas('Webhook');
 	workflowPage.actions.openNode('Webhook');
@@ -47,43 +47,43 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 	if (authentication) {
 		cy.getByTestId('parameter-input-authentication').click();
 		cy.getByTestId('parameter-input-authentication')
-		.find('.el-select-dropdown')
-		.find('.option-headline')
-		.contains(authentication)
-		.click();
+			.find('.el-select-dropdown')
+			.find('.option-headline')
+			.contains(authentication)
+			.click();
 	}
 
 	if (responseCode) {
 		cy.getByTestId('parameter-input-responseCode')
-		.find('.parameter-input')
-		.find('input')
-		.clear()
-		.type(responseCode.toString());
+			.find('.parameter-input')
+			.find('input')
+			.clear()
+			.type(responseCode.toString());
 	}
 
 	if (respondWith) {
 		cy.getByTestId('parameter-input-responseMode').click();
 		cy.getByTestId('parameter-input-responseMode')
-		.find('.el-select-dropdown')
-		.find('.option-headline')
-		.contains(respondWith)
-		.click();
+			.find('.el-select-dropdown')
+			.find('.option-headline')
+			.contains(respondWith)
+			.click();
 	}
 
 	if (responseData) {
 		cy.getByTestId('parameter-input-responseData').click();
 		cy.getByTestId('parameter-input-responseData')
-		.find('.el-select-dropdown')
-		.find('.option-headline')
-		.contains(responseData)
-		.click();
+			.find('.el-select-dropdown')
+			.find('.option-headline')
+			.contains(responseData)
+			.click();
 	}
 
 	if (executeNow) {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
-		cy.request(method, '/webhook-test/'+ webhookPath).then((response) => {
+		cy.request(method, '/webhook-test/' + webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			ndv.getters.outputPanel().contains('headers');
 		});
@@ -91,36 +91,41 @@ const simpleWebhookCall = (options: SimpleWebhookCallOptions) => {
 };
 
 describe('Webhook Trigger node', async () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		workflowPage.actions.visit();
 		cy.waitForLoad();
 
 		cy.window()
 			// @ts-ignore
-			.then(win => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload));
+			.then(
+				(win) => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload),
+			);
 	});
 
 	it('should listen for a GET request', () => {
-		simpleWebhookCall({method: 'GET', webhookPath: uuid(), executeNow: true});
+		simpleWebhookCall({ method: 'GET', webhookPath: uuid(), executeNow: true });
 	});
 
 	it('should listen for a POST request', () => {
-		simpleWebhookCall({method: 'POST', webhookPath: uuid(), executeNow: true});
+		simpleWebhookCall({ method: 'POST', webhookPath: uuid(), executeNow: true });
 	});
 
 	it('should listen for a DELETE request', () => {
-		simpleWebhookCall({method: 'DELETE', webhookPath: uuid(), executeNow: true});
+		simpleWebhookCall({ method: 'DELETE', webhookPath: uuid(), executeNow: true });
 	});
 	it('should listen for a HEAD request', () => {
-		simpleWebhookCall({method: 'HEAD', webhookPath: uuid(), executeNow: true});
+		simpleWebhookCall({ method: 'HEAD', webhookPath: uuid(), executeNow: true });
 	});
 	it('should listen for a PATCH request', () => {
-		simpleWebhookCall({method: 'PATCH', webhookPath: uuid(), executeNow: true});
+		simpleWebhookCall({ method: 'PATCH', webhookPath: uuid(), executeNow: true });
 	});
 	it('should listen for a PUT request', () => {
-		simpleWebhookCall({method: 'PUT', webhookPath: uuid(), executeNow: true});
+		simpleWebhookCall({ method: 'PUT', webhookPath: uuid(), executeNow: true });
 	});
 
 	it('should listen for a GET request and respond with Respond to Webhook node', () => {
@@ -138,7 +143,10 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
 		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
-		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('MyValue');
+		cy.get('.fixed-collection-parameter')
+			.getByTestId('parameter-input-name')
+			.clear()
+			.type('MyValue');
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
 		ndv.getters.backToCanvas().click();
 
@@ -147,7 +155,7 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
 		});
@@ -165,7 +173,7 @@ describe('Webhook Trigger node', async () => {
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
 			expect(response.status).to.eq(201);
 		});
 	});
@@ -184,14 +192,17 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.openNode('Set');
 		cy.get('.add-option').click();
 		cy.get('.add-option').find('.el-select-dropdown__item').contains('Number').click();
-		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('MyValue');
+		cy.get('.fixed-collection-parameter')
+			.getByTestId('parameter-input-name')
+			.clear()
+			.type('MyValue');
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().type('1234');
 		ndv.getters.backToCanvas().click();
 
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.eq(1234);
 		});
@@ -213,10 +224,14 @@ describe('Webhook Trigger node', async () => {
 		cy.get('.add-option').click();
 		cy.get('.add-option').find('.el-select-dropdown__item').contains('String').click();
 		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-name').clear().type('data');
-		cy.get('.fixed-collection-parameter').getByTestId('parameter-input-value').clear().find('input').invoke('val', cowBase64).trigger('blur');
+		cy.get('.fixed-collection-parameter')
+			.getByTestId('parameter-input-value')
+			.clear()
+			.find('input')
+			.invoke('val', cowBase64)
+			.trigger('blur');
 		ndv.getters.backToCanvas().click();
 
-
 		workflowPage.actions.addNodeToCanvas('Move Binary Data');
 		workflowPage.actions.zoomToFit();
 
@@ -232,7 +247,7 @@ describe('Webhook Trigger node', async () => {
 		workflowPage.actions.executeWorkflow();
 		cy.wait(waitForWebhook);
 
-		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(Object.keys(response.body).includes('data')).to.be.true;
 		});
@@ -249,7 +264,7 @@ describe('Webhook Trigger node', async () => {
 		});
 		ndv.actions.execute();
 		cy.wait(waitForWebhook);
-		cy.request('GET', '/webhook-test/'+ webhookPath).then((response) => {
+		cy.request('GET', '/webhook-test/' + webhookPath).then((response) => {
 			expect(response.status).to.eq(200);
 			expect(response.body.MyValue).to.be.undefined;
 		});
@@ -273,28 +288,29 @@ describe('Webhook Trigger node', async () => {
 		cy.wait(waitForWebhook);
 		cy.request({
 			method: 'GET',
-			url: '/webhook-test/'+ webhookPath,
+			url: '/webhook-test/' + webhookPath,
 			auth: {
-				'user': 'username',
-				'pass': 'password',
+				user: 'username',
+				pass: 'password',
 			},
 			failOnStatusCode: false,
 		})
-		.then((response) => {
-			expect(response.status).to.eq(403);
-		}).then(() => {
-			cy.request({
-				method: 'GET',
-				url: '/webhook-test/'+ webhookPath,
-				auth: {
-					'user': 'test',
-					'pass': 'test',
-				},
-				failOnStatusCode: true,
-			}).then((response) => {
-				expect(response.status).to.eq(200);
+			.then((response) => {
+				expect(response.status).to.eq(403);
+			})
+			.then(() => {
+				cy.request({
+					method: 'GET',
+					url: '/webhook-test/' + webhookPath,
+					auth: {
+						user: 'test',
+						pass: 'test',
+					},
+					failOnStatusCode: true,
+				}).then((response) => {
+					expect(response.status).to.eq(200);
+				});
 			});
-		});
 	});
 
 	it('should listen for a GET request with Header Authentication', () => {
@@ -315,25 +331,26 @@ describe('Webhook Trigger node', async () => {
 		cy.wait(waitForWebhook);
 		cy.request({
 			method: 'GET',
-			url: '/webhook-test/'+ webhookPath,
+			url: '/webhook-test/' + webhookPath,
 			headers: {
 				test: 'wrong',
 			},
 			failOnStatusCode: false,
 		})
-		.then((response) => {
-			expect(response.status).to.eq(403);
-		}).then(() => {
-			cy.request({
-				method: 'GET',
-				url: '/webhook-test/'+ webhookPath,
-				headers: {
-					test: 'test',
-				},
-				failOnStatusCode: true,
-			}).then((response) => {
-				expect(response.status).to.eq(200);
+			.then((response) => {
+				expect(response.status).to.eq(403);
+			})
+			.then(() => {
+				cy.request({
+					method: 'GET',
+					url: '/webhook-test/' + webhookPath,
+					headers: {
+						test: 'test',
+					},
+					failOnStatusCode: true,
+				}).then((response) => {
+					expect(response.status).to.eq(200);
+				});
 			});
-		});
 	});
 });
diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 87926bf0f240d3..27c3e0b0b577de 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -5,9 +5,12 @@ const wf = new WorkflowPage();
 const TEST_TAGS = ['Tag 1', 'Tag 2', 'Tag 3'];
 
 describe('Workflow tags', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		wf.actions.visit();
 		cy.waitForLoad();
 	});
diff --git a/cypress/e2e/18-user-management.cy.ts b/cypress/e2e/18-user-management.cy.ts
index f01cee784422ef..f06ba3d6559d9b 100644
--- a/cypress/e2e/18-user-management.cy.ts
+++ b/cypress/e2e/18-user-management.cy.ts
@@ -42,8 +42,8 @@ const updatedPersonalData = {
 	newLastName: 'Else',
 	newEmail: 'something_else@acme.corp',
 	newPassword: 'Keybo4rd',
-	invalidPasswords: ['abc', 'longEnough', 'longenough123']
-}
+	invalidPasswords: ['abc', 'longEnough', 'longenough123'],
+};
 
 const usersSettingsPage = new SettingsUsersPage();
 const workflowPage = new WorkflowPage();
@@ -67,7 +67,7 @@ describe('User Management', () => {
 	});
 
 	it('should prevent non-owners to access UM settings', () => {
-		usersSettingsPage.actions.loginAndVisit(users[0].email, users[0].password, false)
+		usersSettingsPage.actions.loginAndVisit(users[0].email, users[0].password, false);
 	});
 
 	it('should allow instance owner to access UM settings', () => {
@@ -79,7 +79,10 @@ describe('User Management', () => {
 		// All items in user list should be there
 		usersSettingsPage.getters.userListItems().should('have.length', 3);
 		// List item for current user should have the `Owner` badge
-		usersSettingsPage.getters.userItem(instanceOwner.email).find('.n8n-badge:contains("Owner")').should('exist');
+		usersSettingsPage.getters
+			.userItem(instanceOwner.email)
+			.find('.n8n-badge:contains("Owner")')
+			.should('exist');
 		// Other users list items should contain action pop-up list
 		usersSettingsPage.getters.userActionsToggle(users[0].email).should('exist');
 		usersSettingsPage.getters.userActionsToggle(users[1].email).should('exist');
@@ -106,8 +109,13 @@ describe('User Management', () => {
 
 	it(`should allow user to change their personal data`, () => {
 		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
-		personalSettingsPage.actions.updateFirstAndLastName(updatedPersonalData.newFirstName, updatedPersonalData.newLastName);
-		personalSettingsPage.getters.currentUserName().should('contain', `${updatedPersonalData.newFirstName} ${updatedPersonalData.newLastName}`);
+		personalSettingsPage.actions.updateFirstAndLastName(
+			updatedPersonalData.newFirstName,
+			updatedPersonalData.newLastName,
+		);
+		personalSettingsPage.getters
+			.currentUserName()
+			.should('contain', `${updatedPersonalData.newFirstName} ${updatedPersonalData.newLastName}`);
 		workflowPage.getters.successToast().should('contain', 'Personal details updated');
 	});
 
@@ -121,18 +129,30 @@ describe('User Management', () => {
 	it(`shouldn't allow user to change password if old password is wrong`, () => {
 		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
 		personalSettingsPage.actions.updatePassword('iCannotRemember', updatedPersonalData.newPassword);
-		workflowPage.getters.errorToast().closest('div').should('contain', 'Provided current password is incorrect.');
+		workflowPage.getters
+			.errorToast()
+			.closest('div')
+			.should('contain', 'Provided current password is incorrect.');
 	});
 
 	it(`should change current user password`, () => {
 		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, instanceOwner.password);
-		personalSettingsPage.actions.updatePassword(instanceOwner.password, updatedPersonalData.newPassword);
+		personalSettingsPage.actions.updatePassword(
+			instanceOwner.password,
+			updatedPersonalData.newPassword,
+		);
 		workflowPage.getters.successToast().should('contain', 'Password updated');
-		personalSettingsPage.actions.loginWithNewData(instanceOwner.email, updatedPersonalData.newPassword);
+		personalSettingsPage.actions.loginWithNewData(
+			instanceOwner.email,
+			updatedPersonalData.newPassword,
+		);
 	});
 
 	it(`shouldn't allow users to set invalid email`, () => {
-		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, updatedPersonalData.newPassword);
+		personalSettingsPage.actions.loginAndVisit(
+			instanceOwner.email,
+			updatedPersonalData.newPassword,
+		);
 		// try without @ part
 		personalSettingsPage.actions.tryToSetInvalidEmail(updatedPersonalData.newEmail.split('@')[0]);
 		// try without domain
@@ -140,9 +160,15 @@ describe('User Management', () => {
 	});
 
 	it(`should change user email`, () => {
-		personalSettingsPage.actions.loginAndVisit(instanceOwner.email, updatedPersonalData.newPassword);
+		personalSettingsPage.actions.loginAndVisit(
+			instanceOwner.email,
+			updatedPersonalData.newPassword,
+		);
 		personalSettingsPage.actions.updateEmail(updatedPersonalData.newEmail);
 		workflowPage.getters.successToast().should('contain', 'Personal details updated');
-		personalSettingsPage.actions.loginWithNewData(updatedPersonalData.newEmail, updatedPersonalData.newPassword);
+		personalSettingsPage.actions.loginWithNewData(
+			updatedPersonalData.newEmail,
+			updatedPersonalData.newPassword,
+		);
 	});
 });
diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index 37b9561f6f74f1..79b60d9dc670d3 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -5,10 +5,13 @@ const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPageClass();
 const ndv = new NDV();
 
-describe('Execution',() => {
-	beforeEach(() => {
+describe('Execution', () => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		cy.visit('/');
 	});
 
@@ -34,17 +37,36 @@ describe('Execution',() => {
 		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
 
 		// Check canvas nodes after 1st step (workflow passed the manual trigger node
-		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Manual')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-sync-alt'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check').should('not.exist'));
 
 		cy.wait(2000);
 
 		// Check canvas nodes after 2nd step (waiting node finished its execution and the http request node is about to start)
-		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Manual')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
 
 		// Clear execution data
 		workflowPage.getters.clearExecutionDataButton().should('be.visible');
@@ -77,20 +99,39 @@ describe('Execution',() => {
 		workflowPage.getters.stopExecutionWaitingForWebhookButton().should('not.exist');
 
 		// Check canvas nodes after 1st step (workflow passed the manual trigger node
-		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
-
+		workflowPage.getters
+			.canvasNodeByName('Manual')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-sync-alt'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check').should('not.exist'));
 
 		cy.wait(1000);
 		workflowPage.getters.stopExecutionButton().click();
 
 		// Check canvas nodes after workflow stopped
-		workflowPage.getters.canvasNodeByName('Manual').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt').should('not.visible'));
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Manual')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-sync-alt').should('not.visible'));
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check').should('not.exist'));
 
 		// Clear execution data
 		workflowPage.getters.clearExecutionDataButton().should('be.visible');
@@ -140,17 +181,36 @@ describe('Execution',() => {
 		});
 
 		// Check canvas nodes after 1st step (workflow passed the manual trigger node
-		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Webhook')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-sync-alt'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check').should('not.exist'));
 
 		cy.wait(2000);
 
 		// Check canvas nodes after 2nd step (waiting node finished its execution and the http request node is about to start)
-		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check')).should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Webhook')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
 
 		// Clear execution data
 		workflowPage.getters.clearExecutionDataButton().should('be.visible');
@@ -200,19 +260,39 @@ describe('Execution',() => {
 		});
 
 		// Check canvas nodes after 1st step (workflow passed the manual trigger node
-		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check').should('not.exist'));
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Webhook')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-sync-alt'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check').should('not.exist'));
 
 		cy.wait(1000);
 		workflowPage.getters.stopExecutionWaitingForWebhookButton().click();
 
 		// Check canvas nodes after workflow stopped
-		workflowPage.getters.canvasNodeByName('Webhook').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-check')).should('be.visible');
-		workflowPage.getters.canvasNodeByName('Wait').within(() => cy.get('.fa-sync-alt').should('not.visible'));
-		workflowPage.getters.canvasNodeByName('Set').within(() => cy.get('.fa-check').should('not.exist'));
+		workflowPage.getters
+			.canvasNodeByName('Webhook')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-check'))
+			.should('be.visible');
+		workflowPage.getters
+			.canvasNodeByName('Wait')
+			.within(() => cy.get('.fa-sync-alt').should('not.visible'));
+		workflowPage.getters
+			.canvasNodeByName('Set')
+			.within(() => cy.get('.fa-check').should('not.exist'));
 
 		// Clear execution data
 		workflowPage.getters.clearExecutionDataButton().should('be.visible');
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 2ab64737028b72..82cfa427a39b9b 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -259,7 +259,7 @@ describe('Credentials', () => {
 		cy.contains('Create New Credential').click();
 		credentialsModal.getters.editCredentialModal().should('be.visible');
 		credentialsModal.getters.editCredentialModal().should('contain.text', 'Notion API');
-	})
+	});
 
 	it('should render custom node with custom credential', () => {
 		workflowPage.actions.visit();
@@ -269,5 +269,5 @@ describe('Credentials', () => {
 		cy.contains('Create New Credential').click();
 		credentialsModal.getters.editCredentialModal().should('be.visible');
 		credentialsModal.getters.editCredentialModal().should('contain.text', 'Custom E2E Credential');
-	})
+	});
 });
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index bd7dc0a2108b16..b40f26be915f00 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -1,5 +1,5 @@
-import { WorkflowPage } from "../pages";
-import { WorkflowExecutionsTab } from "../pages/workflow-executions-tab";
+import { WorkflowPage } from '../pages';
+import { WorkflowExecutionsTab } from '../pages/workflow-executions-tab';
 
 const workflowPage = new WorkflowPage();
 const executionsTab = new WorkflowExecutionsTab();
@@ -9,6 +9,9 @@ describe('Current Workflow Executions', () => {
 	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		workflowPage.actions.visit();
 		cy.waitForLoad();
 		cy.createFixtureWorkflow('Test_workflow_4_executions_view.json', `My test workflow`);
@@ -20,12 +23,14 @@ describe('Current Workflow Executions', () => {
 		executionsTab.getters.executionListItems().should('have.length', 11);
 		executionsTab.getters.successfulExecutionListItems().should('have.length', 9);
 		executionsTab.getters.failedExecutionListItems().should('have.length', 2);
-		executionsTab.getters.executionListItems().first().invoke('attr','class').should('match', /_active_/);
+		executionsTab.getters
+			.executionListItems()
+			.first()
+			.invoke('attr', 'class')
+			.should('match', /_active_/);
 	});
-
 });
 
-
 const createMockExecutions = () => {
 	workflowPage.actions.turnOnManualExecutionSaving();
 	executionsTab.actions.createManualExecutions(5);
@@ -37,4 +42,4 @@ const createMockExecutions = () => {
 	executionsTab.actions.createManualExecutions(4);
 	executionsTab.actions.switchToExecutionsTab();
 	cy.waitForLoad();
-}
+};
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 4068b2c1fd29d1..9850ab14c147d6 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -28,11 +28,7 @@ describe('Node Creator', () => {
 	it('should open node creator on trigger tab if no trigger is on canvas', () => {
 		nodeCreatorFeature.getters.canvasAddButton().click();
 
-		nodeCreatorFeature.getters
-			.nodeCreator()
-			.contains('Select a trigger')
-			.should('be.visible');
-
+		nodeCreatorFeature.getters.nodeCreator().contains('Select a trigger').should('be.visible');
 	});
 
 	it('should navigate subcategory', () => {
@@ -86,20 +82,14 @@ describe('Node Creator', () => {
 
 		// TODO: Replace once we have canvas feature utils
 		cy.get('div').contains('Add first step').should('be.hidden');
-		nodeCreatorFeature.actions.openNodeCreator()
-		nodeCreatorFeature.getters
-			.nodeCreator()
-			.contains('What happens next?')
-			.should('be.visible');
-
-			nodeCreatorFeature.getters.getCreatorItem('Add another trigger').click();
-			nodeCreatorFeature.getters.nodeCreator().contains('Select a trigger').should('be.visible');
-			nodeCreatorFeature.getters.activeSubcategory().find('button').should('exist');
-			nodeCreatorFeature.getters.activeSubcategory().find('button').click();
-			nodeCreatorFeature.getters
-				.nodeCreator()
-				.contains('What happens next?')
-				.should('be.visible');
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters.nodeCreator().contains('What happens next?').should('be.visible');
+
+		nodeCreatorFeature.getters.getCreatorItem('Add another trigger').click();
+		nodeCreatorFeature.getters.nodeCreator().contains('Select a trigger').should('be.visible');
+		nodeCreatorFeature.getters.activeSubcategory().find('button').should('exist');
+		nodeCreatorFeature.getters.activeSubcategory().find('button').click();
+		nodeCreatorFeature.getters.nodeCreator().contains('What happens next?').should('be.visible');
 	});
 
 	it('should add node to canvas from actions panel', () => {
@@ -110,7 +100,7 @@ describe('Node Creator', () => {
 		nodeCreatorFeature.getters.activeSubcategory().should('have.text', editImageNode);
 		nodeCreatorFeature.getters.getCreatorItem('Crop Image').click();
 		NDVModal.getters.parameterInput('operation').should('contain.text', 'Crop');
-	})
+	});
 
 	it('should search through actions and confirm added action', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 350ad3a185e395..9025725e558fcd 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -6,16 +6,17 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('NDV', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
 
+	beforeEach(() => {
 		workflowsPage.actions.createWorkflowFromCard();
 		workflowPage.actions.renameWorkflow(uuid());
 		workflowPage.actions.saveWorkflowOnButtonClick();
 	});
 
-
 	it('should show up when double clicked on a node and close when Back to canvas clicked', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Manual');
 		workflowPage.getters.canvasNodes().first().dblclick();
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 540e4825a0f96f..0e4a16d933567e 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -5,7 +5,7 @@ const WorkflowPage = new WorkflowPageClass();
 const ndv = new NDV();
 
 describe('Code node', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
 	});
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index aeb3752ec2c4b4..4742bb3cbcc08a 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -14,9 +14,12 @@ const DUPLICATE_WORKFLOW_TAG = 'Duplicate';
 const WorkflowPage = new WorkflowPageClass();
 
 describe('Workflow Actions', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
+	});
+
+	beforeEach(() => {
 		WorkflowPage.actions.visit();
 		cy.waitForLoad();
 	});
diff --git a/cypress/e2e/8-http-request-node.cy.ts b/cypress/e2e/8-http-request-node.cy.ts
index cc62b5182fba66..11c9619472a32a 100644
--- a/cypress/e2e/8-http-request-node.cy.ts
+++ b/cypress/e2e/8-http-request-node.cy.ts
@@ -5,7 +5,7 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('HTTP Request node', () => {
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
 	});

From 40a934bbb4f6eed80aa5c1de6814c0e0eea65ebd Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Fri, 24 Feb 2023 20:37:19 +0100
Subject: [PATCH 291/358] feat(core): Add SAML login setup (#5515)

* initial commit with sample data

* basic saml setup

* cleanup console logs

* limit saml endpoints through middleware

* basic login and token issue

* saml service and cleanup

* refactor and create user

* get/set saml prefs

* fix authentication issue

* redirect to user details

* merge fix

* add generated password to saml user

* update user from attributes where possible

* refactor and fix creating new user

* rename saml prefs key

* minor cleanup

* Update packages/cli/src/config/schema.ts

Co-authored-by: Omar Ajoue <krynble@gmail.com>

* Update packages/cli/src/config/schema.ts

Co-authored-by: Omar Ajoue <krynble@gmail.com>

* Update packages/cli/src/controllers/auth.controller.ts

Co-authored-by: Omar Ajoue <krynble@gmail.com>

* code review changes

* fix default saml enabled

* remove console.log

* fix isSamlLicensed

---------

Co-authored-by: Omar Ajoue <krynble@gmail.com>
---
 packages/cli/package.json                     |   3 +-
 packages/cli/src/ResponseHelper.ts            |   2 +-
 packages/cli/src/Saml/helpers.ts              |  10 -
 packages/cli/src/Server.ts                    |  20 +-
 packages/cli/src/commands/start.ts            |   2 +-
 packages/cli/src/config/schema.ts             |  26 ++
 .../cli/src/controllers/auth.controller.ts    |  30 ++-
 .../src/databases/entities/AuthIdentity.ts    |   2 +-
 packages/cli/src/middlewares/auth.ts          |   4 +
 packages/cli/src/sso/saml/constants.ts        |  25 ++
 .../saml/middleware/samlEnabledMiddleware.ts  |  24 ++
 .../routes/saml.controller.protected.ee.ts    | 105 ++++++++
 .../saml/routes/saml.controller.public.ee.ts  |  17 ++
 packages/cli/src/sso/saml/saml.service.ee.ts  | 228 ++++++++++++++++++
 packages/cli/src/sso/saml/samlHelpers.ts      | 136 +++++++++++
 .../cli/src/sso/saml/serviceProvider.ee.ts    |  39 +++
 packages/cli/src/sso/saml/types/requests.ts   |   7 +
 .../sso/saml/types/samlAttributeMapping.ts    |   6 +
 .../cli/src/sso/saml/types/samlPreferences.ts |   7 +
 .../src/sso/saml/types/samlUserAttributes.ts  |   6 +
 packages/cli/src/sso/ssoHelpers.ts            |  13 +
 packages/workflow/src/Authentication.ts       |   1 +
 packages/workflow/src/index.ts                |   1 +
 pnpm-lock.yaml                                |  54 ++++-
 24 files changed, 746 insertions(+), 22 deletions(-)
 delete mode 100644 packages/cli/src/Saml/helpers.ts
 create mode 100644 packages/cli/src/sso/saml/constants.ts
 create mode 100644 packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
 create mode 100644 packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
 create mode 100644 packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts
 create mode 100644 packages/cli/src/sso/saml/saml.service.ee.ts
 create mode 100644 packages/cli/src/sso/saml/samlHelpers.ts
 create mode 100644 packages/cli/src/sso/saml/serviceProvider.ee.ts
 create mode 100644 packages/cli/src/sso/saml/types/requests.ts
 create mode 100644 packages/cli/src/sso/saml/types/samlAttributeMapping.ts
 create mode 100644 packages/cli/src/sso/saml/types/samlPreferences.ts
 create mode 100644 packages/cli/src/sso/saml/types/samlUserAttributes.ts
 create mode 100644 packages/cli/src/sso/ssoHelpers.ts
 create mode 100644 packages/workflow/src/Authentication.ts

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2cad4b97375fa2..2469d344da6738 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -76,8 +76,8 @@
     "@types/json-diff": "^0.5.1",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/localtunnel": "^1.9.0",
-    "@types/lodash.get": "^4.4.6",
     "@types/lodash.debounce": "^4.0.7",
+    "@types/lodash.get": "^4.4.6",
     "@types/lodash.intersection": "^4.4.7",
     "@types/lodash.iteratee": "^4.7.7",
     "@types/lodash.merge": "^4.6.6",
@@ -191,6 +191,7 @@
     "psl": "^1.8.0",
     "reflect-metadata": "^0.1.13",
     "replacestream": "^4.0.3",
+    "samlify": "^2.8.9",
     "semver": "^7.3.8",
     "shelljs": "^0.8.5",
     "source-map-support": "^0.5.21",
diff --git a/packages/cli/src/ResponseHelper.ts b/packages/cli/src/ResponseHelper.ts
index b7b22336d58366..f69349de26f12b 100644
--- a/packages/cli/src/ResponseHelper.ts
+++ b/packages/cli/src/ResponseHelper.ts
@@ -190,7 +190,7 @@ export function send<T, R extends Request, S extends Response>(
 		try {
 			const data = await processFunction(req, res);
 
-			sendSuccessResponse(res, data, raw);
+			if (!res.headersSent) sendSuccessResponse(res, data, raw);
 		} catch (error) {
 			if (error instanceof Error) {
 				if (!(error instanceof ResponseError) || error.httpStatusCode > 404) {
diff --git a/packages/cli/src/Saml/helpers.ts b/packages/cli/src/Saml/helpers.ts
deleted file mode 100644
index c12f02cdba15bb..00000000000000
--- a/packages/cli/src/Saml/helpers.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-import { getLicense } from '../License';
-import { isUserManagementEnabled } from '../UserManagement/UserManagementHelper';
-
-/**
- *  Check whether the SAML feature is licensed and enabled in the instance
- */
-export function isSamlEnabled(): boolean {
-	const license = getLicense();
-	return isUserManagementEnabled() && license.isSamlEnabled();
-}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index efeabb4f42f2ea..13cb901ac64d19 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -142,10 +142,13 @@ import { setupBasicAuth } from './middlewares/basicAuth';
 import { setupExternalJWTAuth } from './middlewares/externalJWTAuth';
 import { PostHogClient } from './posthog';
 import { eventBus } from './eventbus';
-import { isSamlEnabled } from './Saml/helpers';
 import { Container } from 'typedi';
 import { InternalHooks } from './InternalHooks';
 import { getStatusUsingPreviousExecutionStatusMethod } from './executions/executionHelpers';
+import { isSamlLicensed } from './sso/saml/samlHelpers';
+import { samlControllerPublic } from './sso/saml/routes/saml.controller.public.ee';
+import { SamlService } from './sso/saml/saml.service.ee';
+import { samlControllerProtected } from './sso/saml/routes/saml.controller.protected.ee';
 
 const exec = promisify(callbackExec);
 
@@ -318,7 +321,7 @@ class Server extends AbstractServer {
 			sharing: isSharingEnabled(),
 			logStreaming: isLogStreamingEnabled(),
 			ldap: isLdapEnabled(),
-			saml: isSamlEnabled(),
+			saml: isSamlLicensed(),
 		});
 
 		if (isLdapEnabled()) {
@@ -495,6 +498,19 @@ class Server extends AbstractServer {
 			this.app.use(`/${this.restEndpoint}/ldap`, ldapController);
 		}
 
+		// ----------------------------------------
+		// SAML
+		// ----------------------------------------
+
+		// initialize SamlService
+		await SamlService.getInstance().init();
+
+		// public SAML endpoints
+		this.app.use(`/${this.restEndpoint}/sso/saml`, samlControllerPublic);
+		this.app.use(`/${this.restEndpoint}/sso/saml`, samlControllerProtected);
+
+		// ----------------------------------------
+
 		// Returns parameter values which normally get loaded from an external API or
 		// get generated dynamically
 		this.app.get(
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index c65383816984fd..ada08e48ecf9a1 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -237,7 +237,7 @@ export class Start extends BaseCommand {
 		// Load settings from database and set them to config.
 		const databaseSettings = await Db.collections.Settings.findBy({ loadOnStartup: true });
 		databaseSettings.forEach((setting) => {
-			config.set(setting.key, jsonParse(setting.value));
+			config.set(setting.key, jsonParse(setting.value, { fallbackValue: setting.value }));
 		});
 
 		config.set('nodes.packagesMissing', '');
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 1d660eb7247edd..78e728c33a6249 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -813,6 +813,11 @@ export const schema = {
 				},
 			},
 		},
+		authenticationMethod: {
+			doc: 'How to authenticate users (e.g. "email", "ldap", "saml")',
+			format: ['email', 'ldap', 'saml'] as const,
+			default: 'email',
+		},
 	},
 
 	externalFrontendHooksUrls: {
@@ -1006,6 +1011,27 @@ export const schema = {
 		},
 	},
 
+	sso: {
+		justInTimeProvisioning: {
+			format: Boolean,
+			default: true,
+			doc: 'Whether to automatically create users when they login via SSO.',
+		},
+		redirectLoginToSso: {
+			format: Boolean,
+			default: true,
+			doc: 'Whether to automatically redirect users from login dialog to initialize SSO flow.',
+		},
+		saml: {
+			enabled: {
+				format: Boolean,
+				default: false,
+				doc: 'Whether to enable SAML SSO.',
+			},
+		},
+	},
+
+	// TODO: move into sso settings
 	ldap: {
 		loginEnabled: {
 			format: Boolean,
diff --git a/packages/cli/src/controllers/auth.controller.ts b/packages/cli/src/controllers/auth.controller.ts
index 0db2cbee3517b9..5092d1ea66b152 100644
--- a/packages/cli/src/controllers/auth.controller.ts
+++ b/packages/cli/src/controllers/auth.controller.ts
@@ -19,6 +19,8 @@ import type {
 } from '@/Interfaces';
 import { handleEmailLogin, handleLdapLogin } from '@/auth';
 import type { PostHogClient } from '@/posthog';
+import { isSamlCurrentAuthenticationMethod } from '../sso/ssoHelpers';
+import { SamlUrls } from '../sso/saml/constants';
 
 @RestController()
 export class AuthController {
@@ -57,14 +59,34 @@ export class AuthController {
 	 * Authless endpoint.
 	 */
 	@Post('/login')
-	async login(req: LoginRequest, res: Response): Promise<PublicUser> {
+	async login(req: LoginRequest, res: Response): Promise<PublicUser | undefined> {
 		const { email, password } = req.body;
 		if (!email) throw new Error('Email is required to log in');
 		if (!password) throw new Error('Password is required to log in');
 
-		const user =
-			(await handleLdapLogin(email, password)) ?? (await handleEmailLogin(email, password));
-
+		let user: User | undefined;
+
+		if (isSamlCurrentAuthenticationMethod()) {
+			// attempt to fetch user data with the credentials, but don't log in yet
+			const preliminaryUser = await handleEmailLogin(email, password);
+			// if the user is an owner, continue with the login
+			if (preliminaryUser?.globalRole?.name === 'owner') {
+				user = preliminaryUser;
+			} else {
+				// TODO:SAML - uncomment this block when we have a way to redirect users to the SSO flow
+				// if (doRedirectUsersFromLoginToSsoFlow()) {
+				res.redirect(SamlUrls.restInitSSO);
+				return;
+				// return withFeatureFlags(this.postHog, sanitizeUser(preliminaryUser));
+				// } else {
+				// throw new AuthError(
+				// 	'Login with username and password is disabled due to SAML being the default authentication method. Please use SAML to log in.',
+				// );
+				// }
+			}
+		} else {
+			user = (await handleLdapLogin(email, password)) ?? (await handleEmailLogin(email, password));
+		}
 		if (user) {
 			await issueCookie(res, user);
 			return withFeatureFlags(this.postHog, sanitizeUser(user));
diff --git a/packages/cli/src/databases/entities/AuthIdentity.ts b/packages/cli/src/databases/entities/AuthIdentity.ts
index cfe8ab270aafeb..7069206287826b 100644
--- a/packages/cli/src/databases/entities/AuthIdentity.ts
+++ b/packages/cli/src/databases/entities/AuthIdentity.ts
@@ -2,7 +2,7 @@ import { Column, Entity, ManyToOne, PrimaryColumn, Unique } from 'typeorm';
 import { AbstractEntity } from './AbstractEntity';
 import { User } from './User';
 
-export type AuthProviderType = 'ldap' | 'email'; //| 'saml' | 'google';
+export type AuthProviderType = 'ldap' | 'email' | 'saml'; // | 'google';
 
 @Entity()
 @Unique(['providerId', 'providerType'])
diff --git a/packages/cli/src/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
index 070b86dd09e132..34c76ea592b8d1 100644
--- a/packages/cli/src/middlewares/auth.ts
+++ b/packages/cli/src/middlewares/auth.ts
@@ -18,6 +18,7 @@ import {
 } from '@/UserManagement/UserManagementHelper';
 import type { Repository } from 'typeorm';
 import type { User } from '@db/entities/User';
+import { SamlUrls } from '../sso/saml/constants';
 
 const jwtFromRequest = (req: Request) => {
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -95,6 +96,9 @@ export const setupAuthMiddlewares = (
 			req.url.startsWith(`/${restEndpoint}/change-password`) ||
 			req.url.startsWith(`/${restEndpoint}/oauth2-credential/callback`) ||
 			req.url.startsWith(`/${restEndpoint}/oauth1-credential/callback`) ||
+			req.url.startsWith(`/${restEndpoint}/sso/saml${SamlUrls.metadata}`) ||
+			req.url.startsWith(`/${restEndpoint}/sso/saml${SamlUrls.initSSO}`) ||
+			req.url.startsWith(`/${restEndpoint}/sso/saml${SamlUrls.acs}`) ||
 			isAuthExcluded(req.url, ignoredEndpoints)
 		) {
 			return next();
diff --git a/packages/cli/src/sso/saml/constants.ts b/packages/cli/src/sso/saml/constants.ts
new file mode 100644
index 00000000000000..16565fa712c05c
--- /dev/null
+++ b/packages/cli/src/sso/saml/constants.ts
@@ -0,0 +1,25 @@
+export class SamlUrls {
+	static readonly samlRESTRoot = '/rest/sso/saml';
+
+	static readonly initSSO = '/initsso';
+
+	static readonly restInitSSO = this.samlRESTRoot + this.initSSO;
+
+	static readonly acs = '/acs';
+
+	static readonly restAcs = this.samlRESTRoot + this.acs;
+
+	static readonly metadata = '/metadata';
+
+	static readonly restMetadata = this.samlRESTRoot + this.metadata;
+
+	static readonly config = '/config';
+
+	static readonly restConfig = this.samlRESTRoot + this.config;
+
+	static readonly defaultRedirect = '/';
+
+	static readonly samlOnboarding = '/settings/personal'; // TODO:SAML: implement signup page
+}
+
+export const SAML_PREFERENCES_DB_KEY = 'features.saml';
diff --git a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
new file mode 100644
index 00000000000000..bcd1005e1fde9a
--- /dev/null
+++ b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
@@ -0,0 +1,24 @@
+import type { RequestHandler } from 'express';
+import type { AuthenticatedRequest } from '../../../requests';
+import { isSamlCurrentAuthenticationMethod } from '../../ssoHelpers';
+import { isSamlEnabled, isSamlLicensed } from '../samlHelpers';
+
+export const samlLicensedOwnerMiddleware: RequestHandler = (
+	req: AuthenticatedRequest,
+	res,
+	next,
+) => {
+	if (isSamlLicensed() && req.user?.globalRole.name === 'owner') {
+		next();
+	} else {
+		res.status(401).json({ status: 'error', message: 'Unauthorized' });
+	}
+};
+
+export const samlLicensedAndEnabledMiddleware: RequestHandler = (req, res, next) => {
+	if (isSamlEnabled() && isSamlLicensed() && isSamlCurrentAuthenticationMethod()) {
+		next();
+	} else {
+		res.status(401).json({ status: 'error', message: 'Unauthorized' });
+	}
+};
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
new file mode 100644
index 00000000000000..9879cbe82c5b3e
--- /dev/null
+++ b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
@@ -0,0 +1,105 @@
+import express from 'express';
+import {
+	samlLicensedAndEnabledMiddleware,
+	samlLicensedOwnerMiddleware,
+} from '../middleware/samlEnabledMiddleware';
+import { SamlService } from '../saml.service.ee';
+import { SamlUrls } from '../constants';
+import type { SamlConfiguration } from '../types/requests';
+import { AuthError } from '../../../ResponseHelper';
+import { issueCookie } from '../../../auth/jwt';
+
+export const samlControllerProtected = express.Router();
+
+/**
+ * GET /sso/saml/config
+ * Return SAML config
+ */
+samlControllerProtected.get(
+	SamlUrls.config,
+	samlLicensedOwnerMiddleware,
+	async (req: SamlConfiguration.Read, res: express.Response) => {
+		const prefs = await SamlService.getInstance().getSamlPreferences();
+		return res.send(prefs);
+	},
+);
+
+/**
+ * POST /sso/saml/config
+ * Return SAML config
+ */
+samlControllerProtected.post(
+	SamlUrls.config,
+	samlLicensedOwnerMiddleware,
+	async (req: SamlConfiguration.Update, res: express.Response) => {
+		const result = await SamlService.getInstance().setSamlPreferences({
+			metadata: req.body.metadata,
+			mapping: req.body.mapping,
+		});
+		return res.send(result);
+	},
+);
+
+/**
+ * GET /sso/saml/acs
+ * Assertion Consumer Service endpoint
+ */
+samlControllerProtected.get(
+	SamlUrls.acs,
+	samlLicensedAndEnabledMiddleware,
+	async (req: express.Request, res: express.Response) => {
+		const loginResult = await SamlService.getInstance().handleSamlLogin(req, 'redirect');
+		if (loginResult) {
+			if (loginResult.authenticatedUser) {
+				await issueCookie(res, loginResult.authenticatedUser);
+				if (loginResult.onboardingRequired) {
+					return res.redirect(SamlUrls.samlOnboarding);
+				} else {
+					return res.redirect(SamlUrls.defaultRedirect);
+				}
+			}
+		}
+		throw new AuthError('SAML Authentication failed');
+	},
+);
+
+/**
+ * POST /sso/saml/acs
+ * Assertion Consumer Service endpoint
+ */
+samlControllerProtected.post(
+	SamlUrls.acs,
+	samlLicensedAndEnabledMiddleware,
+	async (req: express.Request, res: express.Response) => {
+		const loginResult = await SamlService.getInstance().handleSamlLogin(req, 'post');
+		if (loginResult) {
+			if (loginResult.authenticatedUser) {
+				await issueCookie(res, loginResult.authenticatedUser);
+				if (loginResult.onboardingRequired) {
+					return res.redirect(SamlUrls.samlOnboarding);
+				} else {
+					return res.redirect(SamlUrls.defaultRedirect);
+				}
+			}
+		}
+		throw new AuthError('SAML Authentication failed');
+	},
+);
+
+/**
+ * GET /sso/saml/initsso
+ * Access URL for implementing SP-init SSO
+ */
+samlControllerProtected.get(
+	SamlUrls.initSSO,
+	samlLicensedAndEnabledMiddleware,
+	async (req: express.Request, res: express.Response) => {
+		const url = SamlService.getInstance().getRedirectLoginRequestUrl();
+		if (url) {
+			// TODO:SAML: redirect to the URL on the client side
+			return res.status(301).send(url);
+		} else {
+			throw new AuthError('SAML redirect failed, please check your SAML configuration.');
+		}
+	},
+);
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts
new file mode 100644
index 00000000000000..33e9427f70c7ef
--- /dev/null
+++ b/packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts
@@ -0,0 +1,17 @@
+import express from 'express';
+import { SamlUrls } from '../constants';
+import { getServiceProviderInstance } from '../serviceProvider.ee';
+
+/**
+ * SSO Endpoints that are public
+ */
+
+export const samlControllerPublic = express.Router();
+
+/**
+ * GET /sso/saml/metadata
+ * Return Service Provider metadata
+ */
+samlControllerPublic.get(SamlUrls.metadata, async (req: express.Request, res: express.Response) => {
+	return res.header('Content-Type', 'text/xml').send(getServiceProviderInstance().getMetadata());
+});
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
new file mode 100644
index 00000000000000..b5a2fe637b94ab
--- /dev/null
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -0,0 +1,228 @@
+import type express from 'express';
+import * as Db from '@/Db';
+import type { User } from '@/databases/entities/User';
+import { jsonParse, LoggerProxy } from 'n8n-workflow';
+import { AuthError } from '@/ResponseHelper';
+import { getServiceProviderInstance } from './serviceProvider.ee';
+import type { SamlUserAttributes } from './types/samlUserAttributes';
+import type { SamlAttributeMapping } from './types/samlAttributeMapping';
+import { isSsoJustInTimeProvisioningEnabled } from '../ssoHelpers';
+import type { SamlPreferences } from './types/samlPreferences';
+import { SAML_PREFERENCES_DB_KEY } from './constants';
+import type { IdentityProviderInstance } from 'samlify';
+import { IdentityProvider } from 'samlify';
+import {
+	createUserFromSamlAttributes,
+	getMappedSamlAttributesFromFlowResult,
+	updateUserFromSamlAttributes,
+} from './samlHelpers';
+
+export class SamlService {
+	private static instance: SamlService;
+
+	private identityProviderInstance: IdentityProviderInstance | undefined;
+
+	private _attributeMapping: SamlAttributeMapping = {
+		email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
+		firstName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname',
+		lastName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname',
+		userPrincipalName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn',
+	};
+
+	public get attributeMapping(): SamlAttributeMapping {
+		return this._attributeMapping;
+	}
+
+	public set attributeMapping(mapping: SamlAttributeMapping) {
+		// TODO:SAML: add validation
+		this._attributeMapping = mapping;
+	}
+
+	private _metadata = '';
+
+	public get metadata(): string {
+		return this._metadata;
+	}
+
+	public set metadata(metadata: string) {
+		this._metadata = metadata;
+	}
+
+	constructor() {
+		this.loadSamlPreferences()
+			.then(() => {
+				LoggerProxy.debug('Initializing SAML service');
+			})
+			.catch(() => {
+				LoggerProxy.error('Error initializing SAML service');
+			});
+	}
+
+	static getInstance(): SamlService {
+		if (!SamlService.instance) {
+			SamlService.instance = new SamlService();
+		}
+		return SamlService.instance;
+	}
+
+	async init(): Promise<void> {
+		await this.loadSamlPreferences();
+	}
+
+	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
+		if (this.identityProviderInstance === undefined || forceRecreate) {
+			this.identityProviderInstance = IdentityProvider({
+				metadata: this.metadata,
+			});
+		}
+
+		return this.identityProviderInstance;
+	}
+
+	getRedirectLoginRequestUrl(): string {
+		const loginRequest = getServiceProviderInstance().createLoginRequest(
+			this.getIdentityProviderInstance(),
+			'redirect',
+		);
+		//TODO:SAML: debug logging
+		LoggerProxy.debug(loginRequest.context);
+		return loginRequest.context;
+	}
+
+	async handleSamlLogin(
+		req: express.Request,
+		binding: 'post' | 'redirect',
+	): Promise<
+		| {
+				authenticatedUser: User | undefined;
+				attributes: SamlUserAttributes;
+				onboardingRequired: boolean;
+		  }
+		| undefined
+	> {
+		const attributes = await this.getAttributesFromLoginResponse(req, binding);
+		if (attributes.email) {
+			const user = await Db.collections.User.findOne({
+				where: { email: attributes.email },
+				relations: ['globalRole', 'authIdentities'],
+			});
+			if (user) {
+				// Login path for existing users that are fully set up
+				if (
+					user.authIdentities.find(
+						(e) => e.providerType === 'saml' && e.providerId === attributes.userPrincipalName,
+					)
+				) {
+					return {
+						authenticatedUser: user,
+						attributes,
+						onboardingRequired: false,
+					};
+				} else {
+					// Login path for existing users that are NOT fully set up for SAML
+					const updatedUser = await updateUserFromSamlAttributes(user, attributes);
+					return {
+						authenticatedUser: updatedUser,
+						attributes,
+						onboardingRequired: true,
+					};
+				}
+			} else {
+				// New users to be created JIT based on SAML attributes
+				if (isSsoJustInTimeProvisioningEnabled()) {
+					const newUser = await createUserFromSamlAttributes(attributes);
+					return {
+						authenticatedUser: newUser,
+						attributes,
+						onboardingRequired: true,
+					};
+				}
+			}
+		}
+		return undefined;
+	}
+
+	async getSamlPreferences(): Promise<SamlPreferences> {
+		return {
+			mapping: this.attributeMapping,
+			metadata: this.metadata,
+		};
+	}
+
+	async setSamlPreferences(prefs: SamlPreferences): Promise<void> {
+		this.attributeMapping = prefs.mapping;
+		this.metadata = prefs.metadata;
+		this.getIdentityProviderInstance(true);
+		await this.saveSamlPreferences();
+	}
+
+	async loadSamlPreferences(): Promise<SamlPreferences | undefined> {
+		const samlPreferences = await Db.collections.Settings.findOne({
+			where: { key: SAML_PREFERENCES_DB_KEY },
+		});
+		if (samlPreferences) {
+			const prefs = jsonParse<SamlPreferences>(samlPreferences.value);
+			if (prefs) {
+				this.attributeMapping = prefs.mapping;
+				this.metadata = prefs.metadata;
+			}
+			return prefs;
+		}
+		return;
+	}
+
+	async saveSamlPreferences(): Promise<void> {
+		const samlPreferences = await Db.collections.Settings.findOne({
+			where: { key: SAML_PREFERENCES_DB_KEY },
+		});
+		if (samlPreferences) {
+			samlPreferences.value = JSON.stringify({
+				mapping: this.attributeMapping,
+				metadata: this.metadata,
+			});
+			samlPreferences.loadOnStartup = true;
+			await Db.collections.Settings.save(samlPreferences);
+		} else {
+			await Db.collections.Settings.save({
+				key: SAML_PREFERENCES_DB_KEY,
+				value: JSON.stringify({
+					mapping: this.attributeMapping,
+					metadata: this.metadata,
+				}),
+				loadOnStartup: true,
+			});
+		}
+	}
+
+	async getAttributesFromLoginResponse(
+		req: express.Request,
+		binding: 'post' | 'redirect',
+	): Promise<SamlUserAttributes> {
+		let parsedSamlResponse;
+		try {
+			parsedSamlResponse = await getServiceProviderInstance().parseLoginResponse(
+				this.getIdentityProviderInstance(),
+				binding,
+				req,
+			);
+		} catch (error) {
+			throw error;
+			// throw new AuthError('SAML Authentication failed. Could not parse SAML response.');
+		}
+		const { attributes, missingAttributes } = getMappedSamlAttributesFromFlowResult(
+			parsedSamlResponse,
+			this.attributeMapping,
+		);
+		if (!attributes) {
+			throw new AuthError('SAML Authentication failed. Invalid SAML response.');
+		}
+		if (!attributes.email && missingAttributes.length > 0) {
+			throw new AuthError(
+				`SAML Authentication failed. Invalid SAML response (missing attributes: ${missingAttributes.join(
+					', ',
+				)}).`,
+			);
+		}
+		return attributes;
+	}
+}
diff --git a/packages/cli/src/sso/saml/samlHelpers.ts b/packages/cli/src/sso/saml/samlHelpers.ts
new file mode 100644
index 00000000000000..20733e1fe5089a
--- /dev/null
+++ b/packages/cli/src/sso/saml/samlHelpers.ts
@@ -0,0 +1,136 @@
+import config from '@/config';
+import * as Db from '@/Db';
+import { AuthIdentity } from '../../databases/entities/AuthIdentity';
+import { User } from '../../databases/entities/User';
+import { getLicense } from '../../License';
+import { AuthError } from '../../ResponseHelper';
+import { hashPassword, isUserManagementEnabled } from '../../UserManagement/UserManagementHelper';
+import type { SamlPreferences } from './types/samlPreferences';
+import type { SamlUserAttributes } from './types/samlUserAttributes';
+import type { FlowResult } from 'samlify/types/src/flow';
+import type { SamlAttributeMapping } from './types/samlAttributeMapping';
+/**
+ *  Check whether the SAML feature is licensed and enabled in the instance
+ */
+export function isSamlEnabled(): boolean {
+	return config.getEnv('sso.saml.enabled');
+}
+
+export function isSamlLicensed(): boolean {
+	const license = getLicense();
+	return (
+		isUserManagementEnabled() &&
+		(license.isSamlEnabled() || config.getEnv('enterprise.features.saml'))
+	);
+}
+
+export const isSamlPreferences = (candidate: unknown): candidate is SamlPreferences => {
+	const o = candidate as SamlPreferences;
+	return typeof o === 'object' && typeof o.metadata === 'string' && typeof o.mapping === 'object';
+};
+
+export function generatePassword(): string {
+	const length = 18;
+	const charset = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
+	const charsetNoNumbers = 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+	const randomNumber = Math.floor(Math.random() * 10);
+	const randomUpper = charset.charAt(Math.floor(Math.random() * charsetNoNumbers.length));
+	const randomNumberPosition = Math.floor(Math.random() * length);
+	const randomUpperPosition = Math.floor(Math.random() * length);
+	let password = '';
+	for (let i = 0, n = charset.length; i < length; ++i) {
+		password += charset.charAt(Math.floor(Math.random() * n));
+	}
+	password =
+		password.substring(0, randomNumberPosition) +
+		randomNumber.toString() +
+		password.substring(randomNumberPosition);
+	password =
+		password.substring(0, randomUpperPosition) +
+		randomUpper +
+		password.substring(randomUpperPosition);
+	return password;
+}
+
+export async function createUserFromSamlAttributes(attributes: SamlUserAttributes): Promise<User> {
+	const user = new User();
+	const authIdentity = new AuthIdentity();
+	user.email = attributes.email;
+	user.firstName = attributes.firstName;
+	user.lastName = attributes.lastName;
+	user.globalRole = await Db.collections.Role.findOneOrFail({
+		where: { name: 'member', scope: 'global' },
+	});
+	// generates a password that is not used or known to the user
+	user.password = await hashPassword(generatePassword());
+	authIdentity.providerId = attributes.userPrincipalName;
+	authIdentity.providerType = 'saml';
+	authIdentity.user = user;
+	const resultAuthIdentity = await Db.collections.AuthIdentity.save(authIdentity);
+	if (!resultAuthIdentity) throw new AuthError('Could not create AuthIdentity');
+	user.authIdentities = [authIdentity];
+	const resultUser = await Db.collections.User.save(user);
+	if (!resultUser) throw new AuthError('Could not create User');
+	return resultUser;
+}
+
+export async function updateUserFromSamlAttributes(
+	user: User,
+	attributes: SamlUserAttributes,
+): Promise<User> {
+	if (!attributes.email) throw new AuthError('Email is required to update user');
+	if (!user) throw new AuthError('User not found');
+	let samlAuthIdentity = user?.authIdentities.find((e) => e.providerType === 'saml');
+	if (!samlAuthIdentity) {
+		samlAuthIdentity = new AuthIdentity();
+		samlAuthIdentity.providerId = attributes.userPrincipalName;
+		samlAuthIdentity.providerType = 'saml';
+		samlAuthIdentity.user = user;
+		user.authIdentities.push(samlAuthIdentity);
+	} else {
+		samlAuthIdentity.providerId = attributes.userPrincipalName;
+	}
+	await Db.collections.AuthIdentity.save(samlAuthIdentity);
+	user.firstName = attributes.firstName;
+	user.lastName = attributes.lastName;
+	const resultUser = await Db.collections.User.save(user);
+	if (!resultUser) throw new AuthError('Could not create User');
+	return resultUser;
+}
+
+type GetMappedSamlReturn = {
+	attributes: SamlUserAttributes | undefined;
+	missingAttributes: string[];
+};
+
+export function getMappedSamlAttributesFromFlowResult(
+	flowResult: FlowResult,
+	attributeMapping: SamlAttributeMapping,
+): GetMappedSamlReturn {
+	const result: GetMappedSamlReturn = {
+		attributes: undefined,
+		missingAttributes: [] as string[],
+	};
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+	if (flowResult?.extract?.attributes) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+		const attributes = flowResult.extract.attributes as { [key: string]: string };
+		// TODO:SAML: fetch mapped attributes from flowResult.extract.attributes and create or login user
+		const email = attributes[attributeMapping.email];
+		const firstName = attributes[attributeMapping.firstName];
+		const lastName = attributes[attributeMapping.lastName];
+		const userPrincipalName = attributes[attributeMapping.userPrincipalName];
+
+		result.attributes = {
+			email,
+			firstName,
+			lastName,
+			userPrincipalName,
+		};
+		if (!email) result.missingAttributes.push(attributeMapping.email);
+		if (!userPrincipalName) result.missingAttributes.push(attributeMapping.userPrincipalName);
+		if (!firstName) result.missingAttributes.push(attributeMapping.firstName);
+		if (!lastName) result.missingAttributes.push(attributeMapping.lastName);
+	}
+	return result;
+}
diff --git a/packages/cli/src/sso/saml/serviceProvider.ee.ts b/packages/cli/src/sso/saml/serviceProvider.ee.ts
new file mode 100644
index 00000000000000..b99bc71a185ad8
--- /dev/null
+++ b/packages/cli/src/sso/saml/serviceProvider.ee.ts
@@ -0,0 +1,39 @@
+import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
+import type { ServiceProviderInstance } from 'samlify';
+import { ServiceProvider, setSchemaValidator } from 'samlify';
+import { SamlUrls } from './constants';
+
+let serviceProviderInstance: ServiceProviderInstance | undefined;
+
+setSchemaValidator({
+	// eslint-disable-next-line @typescript-eslint/no-unused-vars
+	validate: async (response: string) => {
+		// TODO:SAML: implment validation
+		return Promise.resolve('skipped');
+	},
+});
+
+const metadata = `
+<EntityDescriptor
+ xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+ xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+ xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+ entityID="${getInstanceBaseUrl() + SamlUrls.restMetadata}">
+    <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+        <AssertionConsumerService isDefault="true" index="0" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="${
+					getInstanceBaseUrl() + SamlUrls.restAcs
+				}"/>
+    </SPSSODescriptor>
+</EntityDescriptor>
+`;
+
+export function getServiceProviderInstance(): ServiceProviderInstance {
+	if (serviceProviderInstance === undefined) {
+		serviceProviderInstance = ServiceProvider({
+			metadata,
+		});
+	}
+
+	return serviceProviderInstance;
+}
diff --git a/packages/cli/src/sso/saml/types/requests.ts b/packages/cli/src/sso/saml/types/requests.ts
new file mode 100644
index 00000000000000..c9beab0c21bdcc
--- /dev/null
+++ b/packages/cli/src/sso/saml/types/requests.ts
@@ -0,0 +1,7 @@
+import type { AuthenticatedRequest } from '../../../requests';
+import type { SamlPreferences } from './samlPreferences';
+
+export declare namespace SamlConfiguration {
+	type Read = AuthenticatedRequest<{}, {}, {}, {}>;
+	type Update = AuthenticatedRequest<{}, {}, SamlPreferences, {}>;
+}
diff --git a/packages/cli/src/sso/saml/types/samlAttributeMapping.ts b/packages/cli/src/sso/saml/types/samlAttributeMapping.ts
new file mode 100644
index 00000000000000..af7dd76e23f7c0
--- /dev/null
+++ b/packages/cli/src/sso/saml/types/samlAttributeMapping.ts
@@ -0,0 +1,6 @@
+export interface SamlAttributeMapping {
+	email: string;
+	firstName: string;
+	lastName: string;
+	userPrincipalName: string;
+}
diff --git a/packages/cli/src/sso/saml/types/samlPreferences.ts b/packages/cli/src/sso/saml/types/samlPreferences.ts
new file mode 100644
index 00000000000000..d57f10b9ae3c6a
--- /dev/null
+++ b/packages/cli/src/sso/saml/types/samlPreferences.ts
@@ -0,0 +1,7 @@
+import type { SamlAttributeMapping } from './samlAttributeMapping';
+
+export interface SamlPreferences {
+	mapping: SamlAttributeMapping;
+	metadata: string;
+	//TODO:SAML: add fields for separate SAML settins to generate metadata from
+}
diff --git a/packages/cli/src/sso/saml/types/samlUserAttributes.ts b/packages/cli/src/sso/saml/types/samlUserAttributes.ts
new file mode 100644
index 00000000000000..fa3c849f657231
--- /dev/null
+++ b/packages/cli/src/sso/saml/types/samlUserAttributes.ts
@@ -0,0 +1,6 @@
+export interface SamlUserAttributes {
+	email: string;
+	firstName: string;
+	lastName: string;
+	userPrincipalName: string;
+}
diff --git a/packages/cli/src/sso/ssoHelpers.ts b/packages/cli/src/sso/ssoHelpers.ts
new file mode 100644
index 00000000000000..f00ddc0fe5b8c5
--- /dev/null
+++ b/packages/cli/src/sso/ssoHelpers.ts
@@ -0,0 +1,13 @@
+import config from '@/config';
+
+export function isSamlCurrentAuthenticationMethod(): boolean {
+	return config.getEnv('userManagement.authenticationMethod') === 'saml';
+}
+
+export function isSsoJustInTimeProvisioningEnabled(): boolean {
+	return config.getEnv('sso.justInTimeProvisioning');
+}
+
+export function doRedirectUsersFromLoginToSsoFlow(): boolean {
+	return config.getEnv('sso.redirectLoginToSso');
+}
diff --git a/packages/workflow/src/Authentication.ts b/packages/workflow/src/Authentication.ts
new file mode 100644
index 00000000000000..b743e1ecab4e0f
--- /dev/null
+++ b/packages/workflow/src/Authentication.ts
@@ -0,0 +1 @@
+export type AuthenticationMethod = 'none' | 'email' | 'ldap' | 'saml';
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index 2cd0635257548e..e956f38a230cda 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -4,6 +4,7 @@ import * as NodeHelpers from './NodeHelpers';
 import * as ObservableObject from './ObservableObject';
 import * as TelemetryHelpers from './TelemetryHelpers';
 
+export * from './Authentication';
 export * from './Cron';
 export * from './DeferredPromise';
 export * from './Interfaces';
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8b7f9d7d3a0a0e..6375d3ca6d5e49 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -233,6 +233,7 @@ importers:
       reflect-metadata: ^0.1.13
       replacestream: ^4.0.3
       run-script-os: ^1.0.7
+      samlify: ^2.8.9
       semver: ^7.3.8
       shelljs: ^0.8.5
       source-map-support: ^0.5.21
@@ -328,6 +329,7 @@ importers:
       psl: 1.9.0
       reflect-metadata: 0.1.13
       replacestream: 4.0.3
+      samlify: 2.8.9
       semver: 7.3.8
       shelljs: 0.8.5
       source-map-support: 0.5.21
@@ -1215,6 +1217,15 @@ packages:
       z-schema: 4.2.4
     dev: true
 
+  /@authenio/xml-encryption/2.0.2:
+    resolution: {integrity: sha512-cTlrKttbrRHEw3W+0/I609A2Matj5JQaRvfLtEIGZvlN0RaPi+3ANsMeqAyCAVlH/lUIW2tmtBlSMni74lcXeg==}
+    engines: {node: '>=12'}
+    dependencies:
+      '@xmldom/xmldom': 0.8.6
+      escape-html: 1.0.3
+      xpath: 0.0.32
+    dev: false
+
   /@aw-web-design/x-default-browser/1.4.88:
     resolution: {integrity: sha512-AkEmF0wcwYC2QkhK703Y83fxWARttIWXDmQN8+cof8FmFZ5BRhnNXGymeb1S73bOCLfWjYELxtujL56idCN/XA==}
     hasBin: true
@@ -6886,6 +6897,11 @@ packages:
       '@xtuc/long': 4.2.2
     dev: true
 
+  /@xmldom/xmldom/0.8.6:
+    resolution: {integrity: sha512-uRjjusqpoqfmRkTaNuLJ2VohVr67Q5YwDATW3VU7PfzTj6IRaihGrYI7zckGZjxQPBIp63nfvJbM+Yu5ICh0Bg==}
+    engines: {node: '>=10.0.0'}
+    dev: false
+
   /@xtuc/ieee754/1.2.0:
     resolution: {integrity: sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==}
     dev: true
@@ -8242,7 +8258,6 @@ packages:
   /camelcase/6.3.0:
     resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==}
     engines: {node: '>=10'}
-    dev: true
 
   /caniuse-lite/1.0.30001445:
     resolution: {integrity: sha512-8sdQIdMztYmzfTMO6KfLny878Ln9c2M0fc7EH60IjlP4Dc4PiCy7K2Vl3ITmWgOyPgVQKa5x+UP/KqFsxj4mBg==}
@@ -15539,7 +15554,6 @@ packages:
   /node-forge/1.3.1:
     resolution: {integrity: sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==}
     engines: {node: '>= 6.13.0'}
-    dev: true
 
   /node-gyp-build-optional-packages/5.0.3:
     resolution: {integrity: sha512-k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==}
@@ -16132,6 +16146,10 @@ packages:
     resolution: {integrity: sha512-HAKu/fG3HpHFO0AA8WE8q2g+gBJaZ9MG7fcKk+IJPLTGAD6Psw4443l+9DGRbOIh3/aXr7Phy0TjilYivJo5XQ==}
     dev: false
 
+  /pako/1.0.11:
+    resolution: {integrity: sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==}
+    dev: false
+
   /param-case/3.0.4:
     resolution: {integrity: sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==}
     dependencies:
@@ -17947,6 +17965,21 @@ packages:
   /safer-buffer/2.1.2:
     resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
 
+  /samlify/2.8.9:
+    resolution: {integrity: sha512-+HHxkBweHwWEEiFWelGhTTX2Zv/7Tjh6xbZPYUURe7JWp1N9cO2jUOiSb13gTzCEXtffye+Ld7M/f2gCU5+B2Q==}
+    dependencies:
+      '@authenio/xml-encryption': 2.0.2
+      '@xmldom/xmldom': 0.8.6
+      camelcase: 6.3.0
+      node-forge: 1.3.1
+      node-rsa: 1.1.1
+      pako: 1.0.11
+      uuid: 8.3.2
+      xml: 1.0.1
+      xml-crypto: 3.0.1
+      xpath: 0.0.32
+    dev: false
+
   /sanitize-html/2.9.0:
     resolution: {integrity: sha512-KY1hpSbqFNcpoLf+nP7iStbP5JfQZ2Nd19ZEE7qFsQqRdp+sO5yX/e5+HoG9puFAcSTEpzQuihfKUltDcLlQjg==}
     dependencies:
@@ -21568,11 +21601,23 @@ packages:
       word: 0.3.0
     dev: false
 
+  /xml-crypto/3.0.1:
+    resolution: {integrity: sha512-7XrwB3ujd95KCO6+u9fidb8ajvRJvIfGNWD0XLJoTWlBKz+tFpUzEYxsN+Il/6/gHtEs1RgRh2RH+TzhcWBZUw==}
+    engines: {node: '>=0.4.0'}
+    dependencies:
+      '@xmldom/xmldom': 0.8.6
+      xpath: 0.0.32
+    dev: false
+
   /xml-name-validator/4.0.0:
     resolution: {integrity: sha512-ICP2e+jsHvAj2E2lIHxa5tjXRlKDJo4IdvPvCXbXQGdzSfmSpNVyIKMvoZHjDY9DP0zV17iI85o90vRFXNccRw==}
     engines: {node: '>=12'}
     dev: true
 
+  /xml/1.0.1:
+    resolution: {integrity: sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==}
+    dev: false
+
   /xml2js/0.4.19:
     resolution: {integrity: sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==}
     dependencies:
@@ -21602,6 +21647,11 @@ packages:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
     dev: true
 
+  /xpath/0.0.32:
+    resolution: {integrity: sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==}
+    engines: {node: '>=0.6.0'}
+    dev: false
+
   /xregexp/2.0.0:
     resolution: {integrity: sha512-xl/50/Cf32VsGq/1R8jJE5ajH1yMCQkpmoS10QbFZWl2Oor4H0Me64Pu2yxvsRWK3m6soJbmGfzSR7BYmDcWAA==}
     dev: false

From 1942fd82323183fb31af671ccb8d22f6a4798d7f Mon Sep 17 00:00:00 2001
From: Giulio Andreini <g.andreini@gmail.com>
Date: Mon, 27 Feb 2023 07:25:57 +0100
Subject: [PATCH 292/358] feat(editor): Show parameter hint on multilines
 (#5014)

Single/multi line for hints.
---
 .../editor-ui/src/components/ParameterInputHint.vue | 13 +++++++++----
 .../src/components/ParameterInputWrapper.vue        |  1 +
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/editor-ui/src/components/ParameterInputHint.vue b/packages/editor-ui/src/components/ParameterInputHint.vue
index 125eb74f53d92d..f0a39b4e0a1cd0 100644
--- a/packages/editor-ui/src/components/ParameterInputHint.vue
+++ b/packages/editor-ui/src/components/ParameterInputHint.vue
@@ -1,12 +1,15 @@
 <template>
 	<n8n-text size="small" color="text-base" tag="div" v-if="hint">
-		<div v-if="!renderHTML" :class="{ [$style.hint]: true, [$style.highlight]: highlight }">
+		<div
+			v-if="!renderHTML"
+			:class="{ [$style.singleline]: singleLine, [$style.highlight]: highlight }"
+		>
 			{{ hint }}
 		</div>
 		<div
 			v-else
 			ref="hint"
-			:class="{ [$style.hint]: true, [$style.highlight]: highlight }"
+			:class="{ [$style.singleline]: singleLine, [$style.highlight]: highlight }"
 			v-html="sanitizeHtml(hint)"
 		></div>
 	</n8n-text>
@@ -25,6 +28,9 @@ export default Vue.extend({
 		highlight: {
 			type: Boolean,
 		},
+		singleLine: {
+			type: Boolean,
+		},
 		renderHTML: {
 			type: Boolean,
 			default: false,
@@ -42,12 +48,11 @@ export default Vue.extend({
 </script>
 
 <style lang="scss" module>
-.hint {
+.singleline {
 	white-space: nowrap;
 	overflow: hidden;
 	text-overflow: ellipsis;
 }
-
 .highlight {
 	color: var(--color-secondary);
 }
diff --git a/packages/editor-ui/src/components/ParameterInputWrapper.vue b/packages/editor-ui/src/components/ParameterInputWrapper.vue
index 0fc39cefdde73e..441c3979cbf37a 100644
--- a/packages/editor-ui/src/components/ParameterInputWrapper.vue
+++ b/packages/editor-ui/src/components/ParameterInputWrapper.vue
@@ -29,6 +29,7 @@
 			data-test-id="parameter-expression-preview"
 			:highlight="!!(expressionOutput && targetItem)"
 			:hint="expressionOutput"
+			:singleLine="true"
 		/>
 		<input-hint
 			v-else-if="parameterHint"

From ea2035b5102853d2aa7e5e01d70e06acf4abd3d8 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Mon, 27 Feb 2023 12:25:45 +0100
Subject: [PATCH 293/358] fix(core): Fix Filtering of Workflow by Tags (#5570)

---
 packages/cli/src/workflows/workflows.services.ts       |  2 +-
 packages/cli/test/integration/shared/testDb.ts         |  1 +
 .../test/integration/workflows.controller.ee.test.ts   | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 2b736faf15f556..58a0a56a7b5b40 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -164,7 +164,7 @@ export class WorkflowsService {
 
 		if (!config.getEnv('workflowTagsDisabled')) {
 			relations.push('tags');
-			select.tags = { name: true };
+			select.tags = { id: true, name: true };
 		}
 
 		if (isSharingEnabled()) {
diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
index a0e9dc52f46fce..4b26eb1625857e 100644
--- a/packages/cli/test/integration/shared/testDb.ts
+++ b/packages/cli/test/integration/shared/testDb.ts
@@ -401,6 +401,7 @@ export async function createManyWorkflows(
 
 /**
  * Store a workflow in the DB (without a trigger) and optionally assign it to a user.
+ * @param attributes workflow attributes
  * @param user user to assign the workflow to
  */
 export async function createWorkflow(attributes: Partial<WorkflowEntity> = {}, user?: User) {
diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
index b03bbebc74cd97..d43e9f790e54c9 100644
--- a/packages/cli/test/integration/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows.controller.ee.test.ts
@@ -154,6 +154,7 @@ describe('GET /workflows', () => {
 	test('should return workflows without nodes, sharing and credential usage details', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
+		const tag = await testDb.createTag({ name: 'test' });
 
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
@@ -175,6 +176,7 @@ describe('GET /workflows', () => {
 						},
 					},
 				],
+				tags: [tag],
 			},
 			owner,
 		);
@@ -193,6 +195,14 @@ describe('GET /workflows', () => {
 		expect(fetchedWorkflow.sharedWith).not.toBeDefined()
 		expect(fetchedWorkflow.usedCredentials).not.toBeDefined()
 		expect(fetchedWorkflow.nodes).not.toBeDefined()
+		expect(fetchedWorkflow.tags).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					id: expect.any(String),
+					name: expect.any(String)
+				})
+			])
+		)
 	});
 });
 

From 2137ae23d789af765a7555028e9651029f88cadc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 24 Feb 2023 18:02:34 +0100
Subject: [PATCH 294/358] fix(core): Fix execution pruning queries (#5562)

* fix(core): Execution pruning should delete query should use the `OR` operator

* fix(core): Prune executions in a chunk to avoid sqlite error "Expression tree is too large"

* reduce the memory usage during execution pruning
---
 .../cli/src/WorkflowExecuteAdditionalData.ts  | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/packages/cli/src/WorkflowExecuteAdditionalData.ts b/packages/cli/src/WorkflowExecuteAdditionalData.ts
index cf21a80ca457da..4488af126cb8cd 100644
--- a/packages/cli/src/WorkflowExecuteAdditionalData.ts
+++ b/packages/cli/src/WorkflowExecuteAdditionalData.ts
@@ -44,7 +44,7 @@ import {
 
 import pick from 'lodash.pick';
 import type { FindOptionsWhere } from 'typeorm';
-import { LessThanOrEqual } from 'typeorm';
+import { LessThanOrEqual, In } from 'typeorm';
 import { DateUtils } from 'typeorm/util/DateUtils';
 import config from '@/config';
 import * as Db from '@/Db';
@@ -212,7 +212,9 @@ async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
 		// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 		const utcDate = DateUtils.mixedDateToUtcDatetimeString(date);
 
-		const toPrune: FindOptionsWhere<IExecutionFlattedDb> = { stoppedAt: LessThanOrEqual(utcDate) };
+		const toPrune: Array<FindOptionsWhere<IExecutionFlattedDb>> = [
+			{ stoppedAt: LessThanOrEqual(utcDate) },
+		];
 
 		if (maxCount > 0) {
 			const executions = await Db.collections.Execution.find({
@@ -223,27 +225,29 @@ async function pruneExecutionData(this: WorkflowHooks): Promise<void> {
 			});
 
 			if (executions[0]) {
-				toPrune.id = LessThanOrEqual(executions[0].id);
+				toPrune.push({ id: LessThanOrEqual(executions[0].id) });
 			}
 		}
 
 		const isBinaryModeDefaultMode = config.getEnv('binaryDataManager.mode') === 'default';
 		try {
-			const executions = isBinaryModeDefaultMode
-				? []
-				: await Db.collections.Execution.find({
-						select: ['id'],
-						where: toPrune,
-				  });
-			await Db.collections.Execution.delete(toPrune);
 			setTimeout(() => {
 				throttling = false;
 			}, timeout * 1000);
-			// Mark binary data for deletion for all executions
-			if (!isBinaryModeDefaultMode)
-				await BinaryDataManager.getInstance().markDataForDeletionByExecutionIds(
-					executions.map(({ id }) => id),
-				);
+			let executionIds: Array<IExecutionFlattedDb['id']>;
+			do {
+				executionIds = (
+					await Db.collections.Execution.find({
+						select: ['id'],
+						where: toPrune,
+						take: 100,
+					})
+				).map(({ id }) => id);
+				await Db.collections.Execution.delete({ id: In(executionIds) });
+				// Mark binary data for deletion for all executions
+				if (!isBinaryModeDefaultMode)
+					await BinaryDataManager.getInstance().markDataForDeletionByExecutionIds(executionIds);
+			} while (executionIds.length > 0);
 		} catch (error) {
 			ErrorReporter.error(error);
 			throttling = false;

From 51eedaccd427ec11b12fbf43d9dd3f0ebe9633d2 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Mon, 27 Feb 2023 12:25:45 +0100
Subject: [PATCH 295/358] fix(core): Fix Filtering of Workflow by Tags (#5570)

---
 packages/cli/src/workflows/workflows.services.ts       |  2 +-
 packages/cli/test/integration/shared/testDb.ts         |  1 +
 .../test/integration/workflows.controller.ee.test.ts   | 10 ++++++++++
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/packages/cli/src/workflows/workflows.services.ts b/packages/cli/src/workflows/workflows.services.ts
index 2b736faf15f556..58a0a56a7b5b40 100644
--- a/packages/cli/src/workflows/workflows.services.ts
+++ b/packages/cli/src/workflows/workflows.services.ts
@@ -164,7 +164,7 @@ export class WorkflowsService {
 
 		if (!config.getEnv('workflowTagsDisabled')) {
 			relations.push('tags');
-			select.tags = { name: true };
+			select.tags = { id: true, name: true };
 		}
 
 		if (isSharingEnabled()) {
diff --git a/packages/cli/test/integration/shared/testDb.ts b/packages/cli/test/integration/shared/testDb.ts
index a0e9dc52f46fce..4b26eb1625857e 100644
--- a/packages/cli/test/integration/shared/testDb.ts
+++ b/packages/cli/test/integration/shared/testDb.ts
@@ -401,6 +401,7 @@ export async function createManyWorkflows(
 
 /**
  * Store a workflow in the DB (without a trigger) and optionally assign it to a user.
+ * @param attributes workflow attributes
  * @param user user to assign the workflow to
  */
 export async function createWorkflow(attributes: Partial<WorkflowEntity> = {}, user?: User) {
diff --git a/packages/cli/test/integration/workflows.controller.ee.test.ts b/packages/cli/test/integration/workflows.controller.ee.test.ts
index b03bbebc74cd97..d43e9f790e54c9 100644
--- a/packages/cli/test/integration/workflows.controller.ee.test.ts
+++ b/packages/cli/test/integration/workflows.controller.ee.test.ts
@@ -154,6 +154,7 @@ describe('GET /workflows', () => {
 	test('should return workflows without nodes, sharing and credential usage details', async () => {
 		const owner = await testDb.createUser({ globalRole: globalOwnerRole });
 		const member = await testDb.createUser({ globalRole: globalMemberRole });
+		const tag = await testDb.createTag({ name: 'test' });
 
 		const savedCredential = await saveCredential(randomCredentialPayload(), { user: owner });
 
@@ -175,6 +176,7 @@ describe('GET /workflows', () => {
 						},
 					},
 				],
+				tags: [tag],
 			},
 			owner,
 		);
@@ -193,6 +195,14 @@ describe('GET /workflows', () => {
 		expect(fetchedWorkflow.sharedWith).not.toBeDefined()
 		expect(fetchedWorkflow.usedCredentials).not.toBeDefined()
 		expect(fetchedWorkflow.nodes).not.toBeDefined()
+		expect(fetchedWorkflow.tags).toEqual(
+			expect.arrayContaining([
+				expect.objectContaining({
+					id: expect.any(String),
+					name: expect.any(String)
+				})
+			])
+		)
 	});
 });
 

From 43eec66828b2e03418402742c9695e08b1165bdd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:35:59 +0100
Subject: [PATCH 296/358] fix(core): Revert `isPending` check on the user
 entity (#5571)

---
 packages/cli/src/databases/entities/User.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index d62bf8482fc26f..6cba438f7942ab 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -111,9 +111,6 @@ export class User extends AbstractEntity implements IUser {
 	@AfterLoad()
 	@AfterUpdate()
 	computeIsPending(): void {
-		this.isPending =
-			this.globalRole?.name === 'owner' && this.globalRole.scope === 'global'
-				? false
-				: this.password === null;
+		this.isPending = this.password === null;
 	}
 }

From a19ec6ac94ac2ed6ab96bf7fe2216cdd2324228b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:35:59 +0100
Subject: [PATCH 297/358] fix(core): Revert `isPending` check on the user
 entity (#5571)

---
 packages/cli/src/databases/entities/User.ts | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/packages/cli/src/databases/entities/User.ts b/packages/cli/src/databases/entities/User.ts
index d62bf8482fc26f..6cba438f7942ab 100644
--- a/packages/cli/src/databases/entities/User.ts
+++ b/packages/cli/src/databases/entities/User.ts
@@ -111,9 +111,6 @@ export class User extends AbstractEntity implements IUser {
 	@AfterLoad()
 	@AfterUpdate()
 	computeIsPending(): void {
-		this.isPending =
-			this.globalRole?.name === 'owner' && this.globalRole.scope === 'global'
-				? false
-				: this.password === null;
+		this.isPending = this.password === null;
 	}
 }

From 948b37592f2efc4b92bad23a235dd908b950d6ef Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 27 Feb 2023 12:42:56 +0100
Subject: [PATCH 298/358] :rocket: Release 0.217.2 (#5573)

---
 CHANGELOG.md              | 11 +++++++++++
 package.json              |  2 +-
 packages/cli/package.json |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b7bd296039375..38d9c9e343f86a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,14 @@
+## [0.217.2](https://github.com/n8n-io/n8n/compare/n8n@0.217.1...n8n@0.217.2) (2023-02-27)
+
+
+### Bug Fixes
+
+* **core:** Fix execution pruning queries ([#5562](https://github.com/n8n-io/n8n/issues/5562)) ([2137ae2](https://github.com/n8n-io/n8n/commit/2137ae23d789af765a7555028e9651029f88cadc))
+* **core:** Fix Filtering of Workflow by Tags ([#5570](https://github.com/n8n-io/n8n/issues/5570)) ([51eedac](https://github.com/n8n-io/n8n/commit/51eedaccd427ec11b12fbf43d9dd3f0ebe9633d2))
+* **core:** Revert `isPending` check on the user entity ([#5571](https://github.com/n8n-io/n8n/issues/5571)) ([43eec66](https://github.com/n8n-io/n8n/commit/43eec66828b2e03418402742c9695e08b1165bdd))
+
+
+
 ## [0.217.1](https://github.com/n8n-io/n8n/compare/n8n@0.217.0...n8n@0.217.1) (2023-02-24)
 
 
diff --git a/package.json b/package.json
index 0b205e4a350050..0ad9b44fa7354c 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.217.1",
+  "version": "0.217.2",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 2cad4b97375fa2..cd4d66f3bb8644 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.217.1",
+  "version": "0.217.2",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From bb4db58819b6624de98249125f1ffb8c491d21ef Mon Sep 17 00:00:00 2001
From: Michael Kret <88898367+michael-radency@users.noreply.github.com>
Date: Tue, 28 Feb 2023 05:39:43 +0200
Subject: [PATCH 299/358] fix(core): Remove linting exceptions in nodes-base,
 @typescript-eslint/no-unsafe-argument (no-changelog)

---
 packages/nodes-base/.eslintrc.js              |   2 +-
 .../nodes/ActionNetwork/ActionNetwork.node.ts |   6 +-
 .../nodes/ActionNetwork/GenericFunctions.ts   |   6 +-
 .../ActiveCampaign/ActiveCampaign.node.ts     |   2 +-
 .../ActiveCampaignTrigger.node.ts             |   2 +-
 .../nodes/ActiveCampaign/GenericFunctions.ts  |  10 +-
 .../AcuitySchedulingTrigger.node.ts           |   4 +-
 .../AcuityScheduling/GenericFunctions.ts      |   4 +-
 .../nodes/Affinity/Affinity.node.ts           |   2 +-
 .../nodes/Affinity/AffinityTrigger.node.ts    |   5 +-
 .../nodes/Affinity/GenericFunctions.ts        |   8 +-
 .../nodes/AgileCrm/AgileCrm.node.ts           |   1 +
 .../nodes/AgileCrm/GenericFunctions.ts        |  10 +-
 .../nodes/Airtable/Airtable.node.ts           |  13 +-
 .../nodes/Airtable/AirtableTrigger.node.ts    |   7 +-
 .../nodes/Airtable/GenericFunctions.ts        |   4 +-
 .../nodes-base/nodes/Amqp/AmqpTrigger.node.ts |   8 +-
 .../nodes/ApiTemplateIo/ApiTemplateIo.node.ts |  26 ++--
 .../nodes/ApiTemplateIo/GenericFunctions.ts   |   5 +-
 packages/nodes-base/nodes/Asana/Asana.node.ts |  28 ++--
 .../nodes/Asana/AsanaTrigger.node.ts          |   2 +-
 .../nodes/Asana/GenericFunctions.ts           |  11 +-
 .../nodes/Automizy/Automizy.node.ts           |  16 +--
 .../nodes/Automizy/GenericFunctions.ts        |   8 +-
 .../nodes/Autopilot/Autopilot.node.ts         |   2 +-
 .../nodes/Autopilot/AutopilotTrigger.node.ts  |   2 +-
 .../nodes/Autopilot/GenericFunctions.ts       |   8 +-
 .../nodes-base/nodes/Aws/AwsLambda.node.ts    |   2 +-
 .../AwsCertificateManager.node.ts             |   2 +-
 .../CertificateManager/GenericFunctions.ts    |   8 +-
 .../nodes/Aws/Comprehend/GenericFunctions.ts  |   4 +-
 .../nodes/Aws/DynamoDB/AwsDynamoDB.node.ts    |   9 +-
 .../nodes/Aws/DynamoDB/GenericFunctions.ts    |   4 +-
 .../nodes-base/nodes/Aws/DynamoDB/utils.ts    |   2 +-
 .../nodes-base/nodes/Aws/ELB/AwsElb.node.ts   |   9 +-
 .../nodes/Aws/ELB/GenericFunctions.ts         |   8 +-
 .../nodes-base/nodes/Aws/GenericFunctions.ts  |   8 +-
 .../Aws/Rekognition/AwsRekognition.node.ts    |   2 +-
 .../nodes/Aws/Rekognition/GenericFunctions.ts |   8 +-
 .../nodes-base/nodes/Aws/S3/AwsS3.node.ts     |  32 ++---
 .../nodes/Aws/S3/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Aws/SES/AwsSes.node.ts   |   2 +-
 .../nodes/Aws/SES/GenericFunctions.ts         |  12 +-
 .../nodes-base/nodes/Aws/SQS/AwsSqs.node.ts   |   5 +-
 .../nodes/Aws/Textract/GenericFunctions.ts    |  13 +-
 .../nodes/Aws/Transcribe/GenericFunctions.ts  |  10 +-
 .../v1/actions/companyReport/get/execute.ts   |   4 +-
 .../v1/actions/employee/get/execute.ts        |   2 +-
 .../v1/actions/employee/getAll/execute.ts     |   4 +-
 .../employeeDocument/download/execute.ts      |   2 +-
 .../employeeDocument/getAll/execute.ts        |   4 +-
 .../v1/actions/file/download/execute.ts       |   2 +-
 .../v1/actions/file/getAll/execute.ts         |   4 +-
 .../nodes/BambooHr/v1/actions/router.ts       |   1 +
 .../nodes/BambooHr/v1/transport/index.ts      |   4 +-
 .../nodes/Bannerbear/Bannerbear.node.ts       |   4 +-
 .../nodes/Bannerbear/GenericFunctions.ts      |   6 +-
 .../nodes-base/nodes/Baserow/Baserow.node.ts  |  12 +-
 .../nodes/Baserow/GenericFunctions.ts         |   8 +-
 .../nodes/Beeminder/Beeminder.node.ts         |   8 +-
 .../nodes/Beeminder/GenericFunctions.ts       |   4 +-
 .../nodes/Bitbucket/BitbucketTrigger.node.ts  |   2 +-
 .../nodes/Bitbucket/GenericFunctions.ts       |   8 +-
 packages/nodes-base/nodes/Bitly/Bitly.node.ts |   2 +-
 .../nodes/Bitly/GenericFunctions.ts           |   8 +-
 .../nodes/Bitwarden/Bitwarden.node.ts         |  28 ++--
 .../nodes/Bitwarden/GenericFunctions.ts       |  13 +-
 packages/nodes-base/nodes/Box/Box.node.ts     |   6 +-
 .../nodes-base/nodes/Box/GenericFunctions.ts  |   8 +-
 .../nodes/Brandfetch/Brandfetch.node.ts       |  12 +-
 .../nodes/Brandfetch/GenericFunctions.ts      |   8 +-
 .../nodes-base/nodes/Bubble/Bubble.node.ts    |   2 +-
 .../nodes/Bubble/GenericFunctions.ts          |   6 +-
 .../nodes-base/nodes/Cal/CalTrigger.node.ts   |   8 +-
 .../nodes-base/nodes/Cal/GenericFunctions.ts  |   3 +-
 .../nodes/Calendly/GenericFunctions.ts        |   2 +-
 .../nodes/Chargebee/Chargebee.node.ts         |   5 +-
 .../nodes/Chargebee/ChargebeeTrigger.node.ts  |   9 +-
 .../nodes/CircleCi/CircleCi.node.ts           |   8 +-
 .../nodes/CircleCi/GenericFunctions.ts        |   8 +-
 .../nodes/Cisco/Webex/CiscoWebex.node.ts      |  18 +--
 .../nodes/Cisco/Webex/GenericFunctions.ts     |   7 +-
 .../nodes/Citrix/ADC/CitrixAdc.node.ts        |   4 +-
 .../nodes/Clearbit/Clearbit.node.ts           |   2 +-
 .../nodes/Clearbit/GenericFunctions.ts        |   6 +-
 .../nodes-base/nodes/ClickUp/ClickUp.node.ts  |   2 +-
 .../nodes/ClickUp/ClickUpTrigger.node.ts      |   2 +-
 .../nodes/ClickUp/GenericFunctions.ts         |   6 +-
 .../nodes/Clockify/Clockify.node.ts           |   2 +-
 .../nodes/Clockify/GenericFunctions.ts        |   2 +-
 .../nodes/Cloudflare/Cloudflare.node.ts       |   9 +-
 .../nodes/Cloudflare/GenericFunctions.ts      |   6 +-
 .../nodes/Cockpit/GenericFunctions.ts         |   6 +-
 packages/nodes-base/nodes/Coda/Coda.node.ts   |  42 +++---
 .../nodes-base/nodes/Coda/GenericFunctions.ts |   8 +-
 packages/nodes-base/nodes/Code/Sandbox.ts     |  18 ++-
 .../nodes/CoinGecko/CoinGecko.node.ts         |   6 +-
 .../nodes/CoinGecko/GenericFunctions.ts       |   8 +-
 .../nodes/Contentful/Contentful.node.ts       |  10 +-
 .../nodes/Contentful/GenericFunctions.ts      |   6 +-
 .../nodes/ConvertKit/ConvertKit.node.ts       |   2 +-
 .../nodes/ConvertKit/GenericFunctions.ts      |   8 +-
 .../nodes-base/nodes/Copper/Copper.node.ts    |   2 +-
 .../nodes/Copper/CopperTrigger.node.ts        |   2 +-
 .../nodes/Copper/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Cortex/Cortex.node.ts    |   2 +-
 .../nodes/Cortex/GenericFunctions.ts          |   2 +-
 .../CustomerIo/CustomerIoTrigger.node.ts      |   5 +-
 packages/nodes-base/nodes/DeepL/DeepL.node.ts |   2 +-
 .../nodes/Demio/GenericFunctions.ts           |   4 +-
 packages/nodes-base/nodes/Dhl/Dhl.node.ts     |   2 +-
 .../nodes-base/nodes/Dhl/GenericFunctions.ts  |   5 +-
 .../nodes/Discourse/Discourse.node.ts         |   2 +-
 .../nodes/Discourse/GenericFunctions.ts       |   4 +-
 .../nodes-base/nodes/Disqus/Disqus.node.ts    |   2 +-
 .../nodes/Disqus/GenericFunctions.ts          |   8 +-
 .../nodes/Drift/GenericFunctions.ts           |   6 +-
 .../nodes-base/nodes/Dropbox/Dropbox.node.ts  |  16 ++-
 .../nodes/Dropbox/GenericFunctions.ts         |  15 ++-
 .../nodes/Dropcontact/Dropcontact.node.ts     |   4 +-
 .../nodes-base/nodes/ERPNext/ERPNext.node.ts  |   4 +-
 .../nodes/ERPNext/GenericFunctions.ts         |   6 +-
 packages/nodes-base/nodes/Egoi/Egoi.node.ts   |   4 +-
 .../nodes-base/nodes/Egoi/GenericFunctions.ts |   8 +-
 .../ElasticSecurity/ElasticSecurity.node.ts   |   2 +-
 .../ElasticSecurity/GenericFunctions.ts       |   6 +-
 .../Elasticsearch/Elasticsearch.node.ts       |   6 +-
 .../Elastic/Elasticsearch/GenericFunctions.ts |   6 +-
 .../EmailReadImap/v1/EmailReadImapV1.node.ts  |  12 +-
 .../EmailReadImap/v2/EmailReadImapV2.node.ts  |  14 +-
 .../nodes-base/nodes/Emelia/Emelia.node.ts    |   8 +-
 .../nodes/Emelia/EmeliaTrigger.node.ts        |   3 +-
 .../nodes/Emelia/GenericFunctions.ts          |   2 +-
 .../Eventbrite/EventbriteTrigger.node.ts      |  11 +-
 .../nodes/Eventbrite/GenericFunctions.ts      |   4 +-
 .../nodes/Facebook/FacebookGraphApi.node.ts   |   3 +-
 .../nodes/Facebook/FacebookTrigger.node.ts    |   3 +-
 .../nodes/Facebook/GenericFunctions.ts        |   5 +-
 .../nodes/Figma/GenericFunctions.ts           |   6 +-
 .../nodes/FileMaker/FileMaker.node.ts         |  15 ++-
 .../nodes/FileMaker/GenericFunctions.ts       |  10 +-
 packages/nodes-base/nodes/Flow/Flow.node.ts   |  11 +-
 .../nodes-base/nodes/Flow/FlowTrigger.node.ts |   2 +-
 .../nodes-base/nodes/Flow/GenericFunctions.ts |   8 +-
 .../nodes/FormIo/FormIoTrigger.node.ts        |   5 +-
 .../nodes/FormIo/GenericFunctions.ts          |   4 +-
 .../nodes/Formstack/GenericFunctions.ts       |   6 +-
 .../nodes/Freshdesk/Freshdesk.node.ts         |   2 +-
 .../nodes/Freshdesk/GenericFunctions.ts       |   8 +-
 .../nodes/Freshservice/Freshservice.node.ts   |   3 +-
 .../nodes/Freshservice/GenericFunctions.ts    |  12 +-
 .../nodes/FreshworksCrm/FreshworksCrm.node.ts |   2 +-
 .../nodes/FreshworksCrm/GenericFunctions.ts   |   8 +-
 packages/nodes-base/nodes/Ftp/Ftp.node.ts     |   5 +-
 .../nodes/Function/Function.node.ts           |   2 +-
 .../nodes/FunctionItem/FunctionItem.node.ts   |   2 +-
 .../nodes/GetResponse/GenericFunctions.ts     |   8 +-
 .../nodes/GetResponse/GetResponse.node.ts     |   2 +-
 .../GetResponse/GetResponseTrigger.node.ts    |   3 +-
 .../nodes/Ghost/GenericFunctions.ts           |   2 +-
 packages/nodes-base/nodes/Ghost/Ghost.node.ts |   2 +-
 .../nodes/Github/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Github/Github.node.ts    |   2 +-
 .../nodes/Github/GithubTrigger.node.ts        |   3 +-
 .../nodes/Gitlab/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Gitlab/Gitlab.node.ts    |   4 +-
 .../nodes/Gitlab/GitlabTrigger.node.ts        |   5 +-
 .../nodes/GoToWebinar/GenericFunctions.ts     |  19 ++-
 .../nodes/GoToWebinar/GoToWebinar.node.ts     |   2 +-
 .../Google/Analytics/v1/GenericFunctions.ts   |  14 +-
 .../Analytics/v1/GoogleAnalyticsV1.node.ts    |   3 +-
 .../actions/report/get.universal.operation.ts |   3 +-
 .../actions/userActivity/search.operation.ts  |   2 +-
 .../Google/Analytics/v2/helpers/utils.ts      |   2 +-
 .../Google/Analytics/v2/transport/index.ts    |  18 ++-
 .../nodes/Google/BigQuery/GenericFunctions.ts |   4 +-
 .../Google/BigQuery/GoogleBigQuery.node.ts    |  13 +-
 .../nodes/Google/Books/GenericFunctions.ts    |   8 +-
 .../nodes/Google/Books/GoogleBooks.node.ts    |   2 +-
 .../nodes/Google/Calendar/GenericFunctions.ts |   7 +-
 .../Google/Calendar/GoogleCalendar.node.ts    |  15 ++-
 .../nodes/Google/Chat/GenericFunctions.ts     |   7 +-
 .../nodes/Google/Chat/GoogleChat.node.ts      |   4 +-
 .../CloudNaturalLanguage/GenericFunctions.ts  |   6 +-
 .../nodes/Google/Contacts/GenericFunctions.ts |  10 +-
 .../Google/Contacts/GoogleContacts.node.ts    |   2 +-
 .../nodes/Google/Docs/GenericFunctions.ts     |   6 +-
 .../nodes/Google/Docs/GoogleDocs.node.ts      |  15 ++-
 .../nodes/Google/Drive/GenericFunctions.ts    |   8 +-
 .../nodes/Google/Drive/GoogleDrive.node.ts    |  24 ++--
 .../CloudFirestore/GenericFunctions.ts        |  12 +-
 .../GoogleFirebaseCloudFirestore.node.ts      |  18 +--
 .../RealtimeDatabase/GenericFunctions.ts      |   4 +-
 .../GoogleFirebaseRealtimeDatabase.node.ts    |   5 +-
 .../Google/GSuiteAdmin/GSuiteAdmin.node.ts    |   2 +-
 .../Google/GSuiteAdmin/GenericFunctions.ts    |   8 +-
 .../nodes/Google/Gmail/GenericFunctions.ts    |  21 +--
 .../nodes/Google/Gmail/GmailTrigger.node.ts   |   4 +-
 .../nodes/Google/Gmail/v1/GmailV1.node.ts     |   6 +-
 .../nodes/Google/Gmail/v2/GmailV2.node.ts     |  19 +--
 .../Google/Perspective/GenericFunctions.ts    |   4 +-
 .../Perspective/GooglePerspective.node.ts     |   3 +-
 .../Google/Sheet/GoogleSheetsTrigger.node.ts  |   2 +-
 .../nodes/Google/Sheet/v1/GenericFunctions.ts |   8 +-
 .../Google/Sheet/v1/GoogleSheetsV1.node.ts    |   6 +-
 .../v2/actions/sheet/create.operation.ts      |   2 +-
 .../v2/actions/sheet/remove.operation.ts      |   2 +-
 .../actions/spreadsheet/create.operation.ts   |   2 +-
 .../nodes/Google/Sheet/v2/transport/index.ts  |  13 +-
 .../nodes/Google/Slides/GenericFunctions.ts   |   4 +-
 .../nodes/Google/Slides/GoogleSlides.node.ts  |  17 ++-
 .../nodes/Google/Task/GenericFunctions.ts     |   6 +-
 .../nodes/Google/Task/GoogleTasks.node.ts     |   2 +-
 .../Google/Translate/GenericFunctions.ts      |   8 +-
 .../Google/Translate/GoogleTranslate.node.ts  |   3 +-
 .../nodes/Google/YouTube/GenericFunctions.ts  |   8 +-
 .../nodes/Google/YouTube/YouTube.node.ts      |   4 +-
 .../nodes/Gotify/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Gotify/Gotify.node.ts    |   2 +-
 .../nodes/Grafana/GenericFunctions.ts         |   4 +-
 .../nodes-base/nodes/Grafana/Grafana.node.ts  |   4 +-
 .../nodes-base/nodes/GraphQL/GraphQL.node.ts  |   9 +-
 .../nodes/Grist/GenericFunctions.ts           |   4 +-
 packages/nodes-base/nodes/Grist/Grist.node.ts |   2 +-
 .../nodes/Gumroad/GenericFunctions.ts         |   6 +-
 .../nodes/Gumroad/GumroadTrigger.node.ts      |   2 +-
 .../nodes/HackerNews/GenericFunctions.ts      |   6 +-
 .../nodes/HackerNews/HackerNews.node.ts       |   2 +-
 .../nodes-base/nodes/HaloPSA/HaloPSA.node.ts  |  18 +--
 .../nodes/Harvest/GenericFunctions.ts         |   8 +-
 .../nodes-base/nodes/Harvest/Harvest.node.ts  |  84 ++++++------
 .../nodes/HelpScout/GenericFunctions.ts       |  10 +-
 .../nodes/HelpScout/HelpScout.node.ts         |   6 +-
 .../nodes/HighLevel/GenericFunctions.ts       |   2 +-
 .../nodes/HomeAssistant/GenericFunctions.ts   |  15 ++-
 .../nodes/HomeAssistant/HomeAssistant.node.ts |   2 +-
 packages/nodes-base/nodes/Html/Html.node.ts   |   5 +-
 .../HttpRequest/V1/HttpRequestV1.node.ts      |  13 +-
 .../HttpRequest/V2/HttpRequestV2.node.ts      |  12 +-
 .../HttpRequest/V3/HttpRequestV3.node.ts      |  13 +-
 .../nodes/Hubspot/GenericFunctions.ts         |   2 +-
 .../nodes-base/nodes/Hubspot/Hubspot.node.ts  |   6 +-
 .../nodes/Hubspot/HubspotTrigger.node.ts      |   2 +-
 .../nodes/HumanticAI/GenericFunctions.ts      |   8 +-
 .../nodes/Hunter/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Hunter/Hunter.node.ts    |   6 +-
 .../nodes/Intercom/GenericFunctions.ts        |   6 +-
 .../nodes/Intercom/Intercom.node.ts           |  19 +--
 .../nodes/InvoiceNinja/GenericFunctions.ts    |   2 +-
 .../nodes/InvoiceNinja/InvoiceNinja.node.ts   |   2 +-
 .../nodes/Iterable/GenericFunctions.ts        |   8 +-
 .../nodes/Iterable/Iterable.node.ts           |  19 +--
 .../nodes/Jenkins/GenericFunctions.ts         |   4 +-
 .../nodes-base/nodes/Jenkins/Jenkins.node.ts  |   7 +-
 .../nodes-base/nodes/Jira/GenericFunctions.ts |   8 +-
 packages/nodes-base/nodes/Jira/Jira.node.ts   |  41 +++---
 .../nodes-base/nodes/Jira/JiraTrigger.node.ts |  10 +-
 .../nodes/JotForm/GenericFunctions.ts         |   6 +-
 .../nodes/JotForm/JotFormTrigger.node.ts      |  12 +-
 .../nodes-base/nodes/Keap/GenericFunctions.ts |   8 +-
 packages/nodes-base/nodes/Keap/Keap.node.ts   |   6 +-
 .../nodes/Kitemaker/GenericFunctions.ts       |   9 +-
 .../nodes/Kitemaker/Kitemaker.node.ts         |  14 +-
 .../nodes/KoBoToolbox/GenericFunctions.ts     |  11 +-
 .../nodes/KoBoToolbox/KoBoToolbox.node.ts     |  14 +-
 .../KoBoToolbox/KoBoToolboxTrigger.node.ts    |   6 +-
 .../nodes/Lemlist/GenericFunctions.ts         |   2 +-
 .../nodes-base/nodes/Lemlist/Lemlist.node.ts  |   2 +-
 .../nodes/Lemlist/LemlistTrigger.node.ts      |   2 +-
 .../nodes-base/nodes/Line/GenericFunctions.ts |   6 +-
 packages/nodes-base/nodes/Line/Line.node.ts   |   2 +-
 .../nodes/Linear/GenericFunctions.ts          |   2 +-
 .../nodes-base/nodes/Linear/Linear.node.ts    |   2 +-
 .../nodes/LingvaNex/GenericFunctions.ts       |   6 +-
 .../nodes/LinkedIn/GenericFunctions.ts        |   5 +-
 .../nodes/LinkedIn/LinkedIn.node.ts           |   3 +-
 .../LocalFileTrigger/LocalFileTrigger.node.ts |   2 +-
 .../nodes/Magento/GenericFunctions.ts         |   8 +-
 .../nodes-base/nodes/Magento/Magento2.node.ts |   2 +-
 .../nodes/Mailcheck/GenericFunctions.ts       |   2 +-
 .../nodes/Mailchimp/GenericFunctions.ts       |   8 +-
 .../nodes/Mailchimp/Mailchimp.node.ts         |   2 +-
 .../nodes/Mailchimp/MailchimpTrigger.node.ts  |   6 +-
 .../nodes/MailerLite/GenericFunctions.ts      |   8 +-
 .../nodes/MailerLite/MailerLite.node.ts       |   2 +-
 .../nodes-base/nodes/Mailgun/Mailgun.node.ts  |   5 +-
 .../nodes/Mailjet/GenericFunctions.ts         |   4 +-
 .../nodes-base/nodes/Mailjet/Mailjet.node.ts  |   2 +-
 .../nodes/Mailjet/MailjetTrigger.node.ts      |   2 +-
 .../nodes/Mandrill/GenericFunctions.ts        |   3 +-
 .../nodes/Mandrill/Mandrill.node.ts           |   5 +-
 .../nodes/Marketstack/GenericFunctions.ts     |   6 +-
 .../nodes/Marketstack/Marketstack.node.ts     |   2 +-
 .../nodes/Matrix/GenericFunctions.ts          |  10 +-
 .../nodes-base/nodes/Matrix/Matrix.node.ts    |   2 +-
 .../v1/actions/channel/addUser/execute.ts     |   2 +-
 .../v1/actions/channel/create/execute.ts      |   2 +-
 .../v1/actions/channel/del/execute.ts         |   2 +-
 .../v1/actions/channel/members/execute.ts     |   4 +-
 .../v1/actions/channel/restore/execute.ts     |   2 +-
 .../v1/actions/channel/search/execute.ts      |   2 +-
 .../v1/actions/channel/statistics/execute.ts  |   2 +-
 .../v1/actions/message/del/execute.ts         |   2 +-
 .../v1/actions/message/post/execute.ts        |   2 +-
 .../actions/message/postEphemeral/execute.ts  |   2 +-
 .../v1/actions/reaction/create/execute.ts     |   2 +-
 .../v1/actions/reaction/del/execute.ts        |   2 +-
 .../v1/actions/reaction/getAll/execute.ts     |   2 +-
 .../v1/actions/user/create/execute.ts         |   2 +-
 .../v1/actions/user/deactive/execute.ts       |   2 +-
 .../v1/actions/user/getAll/execute.ts         |   2 +-
 .../v1/actions/user/getByEmail/execute.ts     |   2 +-
 .../v1/actions/user/getById/execute.ts        |   2 +-
 .../v1/actions/user/invite/execute.ts         |   2 +-
 .../nodes/Mattermost/v1/transport/index.ts    |   2 +-
 .../nodes/Mautic/GenericFunctions.ts          |   6 +-
 .../nodes-base/nodes/Mautic/Mautic.node.ts    |  10 +-
 .../nodes/Mautic/MauticTrigger.node.ts        |   4 +-
 .../nodes/Medium/GenericFunctions.ts          |   4 +-
 .../nodes/MessageBird/GenericFunctions.ts     |   4 +-
 .../Microsoft/Dynamics/GenericFunctions.ts    |   6 +-
 .../Dynamics/MicrosoftDynamicsCrm.node.ts     |   2 +-
 .../nodes/Microsoft/Excel/GenericFunctions.ts |   8 +-
 .../Microsoft/Excel/MicrosoftExcel.node.ts    |  11 +-
 .../GraphSecurity/GenericFunctions.ts         |  10 +-
 .../MicrosoftGraphSecurity.node.ts            |   4 +-
 .../Microsoft/OneDrive/GenericFunctions.ts    |  10 +-
 .../OneDrive/MicrosoftOneDrive.node.ts        |  11 +-
 .../Microsoft/Outlook/GenericFunctions.ts     |  15 +--
 .../Outlook/MicrosoftOutlook.node.ts          |  43 +++---
 .../nodes/Microsoft/Sql/GenericFunctions.ts   |   2 +-
 .../nodes/Microsoft/Sql/MicrosoftSql.node.ts  |   2 +-
 .../nodes/Microsoft/Teams/GenericFunctions.ts |   8 +-
 .../Microsoft/Teams/MicrosoftTeams.node.ts    |   4 +-
 .../nodes/Microsoft/ToDo/GenericFunctions.ts  |   8 +-
 .../Microsoft/ToDo/MicrosoftToDo.node.ts      |   2 +-
 .../nodes/Mindee/GenericFunctions.ts          |   6 +-
 .../nodes-base/nodes/Mindee/Mindee.node.ts    |  12 +-
 .../nodes-base/nodes/Misp/GenericFunctions.ts |   6 +-
 packages/nodes-base/nodes/Misp/Misp.node.ts   |   2 +-
 .../nodes/MondayCom/GenericFunctions.ts       |   6 +-
 .../nodes/MondayCom/MondayCom.node.ts         |   2 +-
 .../nodes-base/nodes/MongoDb/MongoDb.node.ts  |  19 ++-
 .../nodes/MonicaCrm/GenericFunctions.ts       |   6 +-
 .../nodes/MonicaCrm/MonicaCrm.node.ts         |   2 +-
 .../MoveBinaryData/MoveBinaryData.node.ts     |   2 +-
 .../nodes/Msg91/GenericFunctions.ts           |   4 +-
 packages/nodes-base/nodes/MySql/MySql.node.ts |   3 +-
 .../nodes-base/nodes/N8n/GenericFunctions.ts  |   2 +-
 .../nodes-base/nodes/Nasa/GenericFunctions.ts |   6 +-
 packages/nodes-base/nodes/Nasa/Nasa.node.ts   |  10 +-
 .../nodes/Netlify/GenericFunctions.ts         |   8 +-
 .../nodes-base/nodes/Netlify/Netlify.node.ts  |   2 +-
 .../nodes/Netlify/NetlifyTrigger.node.ts      |   3 +-
 .../nodes/NextCloud/NextCloud.node.ts         |  25 ++--
 .../nodes/NocoDB/GenericFunctions.ts          |   6 +-
 .../nodes-base/nodes/NocoDB/NocoDB.node.ts    |  35 +++--
 .../nodes/Notion/GenericFunctions.ts          | 123 ++++++++++--------
 .../nodes/Notion/NotionTrigger.node.ts        |   4 +-
 .../nodes/Notion/v1/NotionV1.node.ts          |  38 +++---
 .../nodes/Notion/v2/NotionV2.node.ts          |  44 +++----
 .../nodes-base/nodes/Odoo/GenericFunctions.ts |   2 +-
 .../nodes/OneSimpleApi/GenericFunctions.ts    |   4 +-
 .../nodes/OneSimpleApi/OneSimpleApi.node.ts   |   6 +-
 .../nodes/Onfleet/GenericFunctions.ts         |   3 +-
 .../nodes-base/nodes/Onfleet/Onfleet.node.ts  |   2 +-
 packages/nodes-base/nodes/Onfleet/Onfleet.ts  |  14 +-
 .../nodes/Onfleet/OnfleetTrigger.node.ts      |   4 +-
 .../nodes/OpenThesaurus/GenericFunctions.ts   |   4 +-
 .../nodes/OpenThesaurus/OpenThesaurus.node.ts |   2 +-
 .../OpenWeatherMap/OpenWeatherMap.node.ts     |   5 +-
 .../nodes/Orbit/GenericFunctions.ts           |  10 +-
 packages/nodes-base/nodes/Orbit/Orbit.node.ts |   5 +-
 .../nodes-base/nodes/Oura/GenericFunctions.ts |   4 +-
 packages/nodes-base/nodes/Oura/Oura.node.ts   |   4 +-
 .../nodes/Paddle/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Paddle/Paddle.node.ts    |   5 +-
 .../nodes/PagerDuty/GenericFunctions.ts       |   8 +-
 .../nodes/PagerDuty/PagerDuty.node.ts         |   2 +-
 .../nodes/PayPal/GenericFunctions.ts          |  12 +-
 .../nodes-base/nodes/PayPal/PayPal.node.ts    |   2 +-
 .../nodes/PayPal/PayPalTrigger.node.ts        |  12 +-
 .../nodes/Peekalink/GenericFunctions.ts       |   4 +-
 .../nodes/Phantombuster/GenericFunctions.ts   |   7 +-
 .../nodes/Phantombuster/Phantombuster.node.ts |   4 +-
 .../nodes/PhilipsHue/GenericFunctions.ts      |   9 +-
 .../nodes/PhilipsHue/PhilipsHue.node.ts       |   9 +-
 .../nodes/Pipedrive/GenericFunctions.ts       |  10 +-
 .../nodes/Pipedrive/Pipedrive.node.ts         |   4 +-
 .../nodes/Pipedrive/PipedriveTrigger.node.ts  |   4 +-
 .../nodes/Plivo/GenericFunctions.ts           |   4 +-
 packages/nodes-base/nodes/Plivo/Plivo.node.ts |   4 +-
 .../nodes/PostHog/GenericFunctions.ts         |   6 +-
 .../nodes-base/nodes/PostHog/PostHog.node.ts  |   8 +-
 .../nodes/Postgres/Postgres.node.functions.ts |  25 ++--
 .../nodes/Postmark/GenericFunctions.ts        |   6 +-
 .../nodes/Postmark/PostmarkTrigger.node.ts    |  10 +-
 .../nodes/ProfitWell/GenericFunctions.ts      |  14 +-
 .../nodes/ProfitWell/ProfitWell.node.ts       |   3 +-
 .../nodes/Pushbullet/GenericFunctions.ts      |   9 +-
 .../nodes/Pushbullet/Pushbullet.node.ts       |   4 +-
 .../nodes/Pushcut/GenericFunctions.ts         |   7 +-
 .../nodes/Pushover/GenericFunctions.ts        |  11 +-
 .../nodes/Pushover/Pushover.node.ts           |   4 +-
 .../nodes/QuickBase/GenericFunctions.ts       |  12 +-
 .../nodes/QuickBase/QuickBase.node.ts         |  30 ++---
 .../nodes/QuickBooks/GenericFunctions.ts      |   9 +-
 .../nodes/QuickBooks/QuickBooks.node.ts       |  10 +-
 .../nodes/Raindrop/GenericFunctions.ts        |   4 +-
 .../nodes/Raindrop/Raindrop.node.ts           |   4 +-
 .../nodes/Reddit/GenericFunctions.ts          |  10 +-
 .../nodes-base/nodes/Reddit/Reddit.node.ts    |   7 +-
 .../nodes/Rocketchat/GenericFunctions.ts      |   3 +-
 .../nodes/Rocketchat/Rocketchat.node.ts       |   2 +-
 .../nodes/RssFeedRead/RssFeedRead.node.ts     |   3 +-
 .../nodes-base/nodes/Rundeck/RundeckApi.ts    |   4 +-
 .../nodes-base/nodes/S3/GenericFunctions.ts   |  12 +-
 packages/nodes-base/nodes/S3/S3.node.ts       |  39 +++---
 .../nodes/Salesforce/GenericFunctions.ts      |  13 +-
 .../nodes/Salesforce/Salesforce.node.ts       |  69 +++++-----
 .../nodes/Salesmate/GenericFunctions.ts       |   9 +-
 .../nodes/Salesmate/Salesmate.node.ts         |   8 +-
 .../nodes/SeaTable/GenericFunctions.ts        |  10 +-
 .../nodes/SeaTable/SeaTable.node.ts           |  12 +-
 .../SecurityScorecard/GenericFunctions.ts     |   6 +-
 .../SecurityScorecard.node.ts                 |   8 +-
 .../nodes/Segment/GenericFunctions.ts         |   2 +-
 .../nodes/SendGrid/GenericFunctions.ts        |   7 +-
 .../nodes/SendGrid/SendGrid.node.ts           |  16 +--
 .../nodes/SendInBlue/GenericFunctions.ts      |   4 +-
 .../nodes/Sendy/GenericFunctions.ts           |   5 +-
 packages/nodes-base/nodes/Sendy/Sendy.node.ts |   9 +-
 .../nodes/SentryIo/GenericFunctions.ts        |  13 +-
 .../nodes/SentryIo/SentryIo.node.ts           |   2 +-
 .../nodes/ServiceNow/GenericFunctions.ts      |   6 +-
 .../nodes/ServiceNow/ServiceNow.node.ts       |   4 +-
 .../nodes/Shopify/GenericFunctions.ts         |   4 +-
 .../nodes-base/nodes/Shopify/Shopify.node.ts  |   2 +-
 .../nodes/Shopify/ShopifyTrigger.node.ts      |   3 +-
 .../nodes/Signl4/GenericFunctions.ts          |   4 +-
 .../nodes/Slack/V1/GenericFunctions.ts        |   4 +-
 .../nodes-base/nodes/Slack/V1/SlackV1.node.ts |   4 +-
 .../nodes/Slack/V2/GenericFunctions.ts        |   4 +-
 .../nodes-base/nodes/Slack/V2/SlackV2.node.ts |   4 +-
 .../nodes/Sms77/GenericFunctions.ts           |   4 +-
 .../SplitInBatches/SplitInBatches.node.ts     |   5 +-
 .../nodes/Splunk/GenericFunctions.ts          |   8 +-
 .../nodes-base/nodes/Splunk/Splunk.node.ts    |   2 +-
 .../nodes/Spontit/GenericFunctions.ts         |  10 +-
 .../nodes/Spotify/GenericFunctions.ts         |   5 +-
 .../nodes-base/nodes/Spotify/Spotify.node.ts  |   2 +-
 .../SpreadsheetFile/SpreadsheetFile.node.ts   |   2 +-
 .../nodes/SseTrigger/SseTrigger.node.ts       |   7 +-
 .../nodes/Stackby/GenericFunction.ts          |   8 +-
 .../nodes-base/nodes/Stackby/Stackby.node.ts  |  11 +-
 .../nodes/Storyblok/GenericFunctions.ts       |  18 ++-
 .../nodes/Storyblok/Storyblok.node.ts         |   2 +-
 .../nodes/Strapi/GenericFunctions.ts          |  18 ++-
 .../nodes-base/nodes/Strapi/Strapi.node.ts    |  10 +-
 .../nodes/Strava/GenericFunctions.ts          |  18 ++-
 .../nodes-base/nodes/Strava/Strava.node.ts    |   2 +-
 .../nodes-base/nodes/Stripe/Stripe.node.ts    |   2 +-
 .../nodes/Stripe/StripeTrigger.node.ts        |  13 +-
 packages/nodes-base/nodes/Stripe/helpers.ts   |   2 +-
 .../nodes/Supabase/GenericFunctions.ts        |   8 +-
 .../nodes/Supabase/Supabase.node.ts           |  12 +-
 .../nodes/SurveyMonkey/GenericFunctions.ts    |  16 +--
 .../SurveyMonkey/SurveyMonkeyTrigger.node.ts  |   5 +-
 .../v1/actions/contact/create/execute.ts      |   2 +-
 .../v1/actions/contact/del/execute.ts         |   2 +-
 .../v1/actions/contact/get/execute.ts         |   2 +-
 .../v1/actions/contact/getAll/execute.ts      |   2 +-
 .../v1/actions/contact/update/execute.ts      |   2 +-
 .../v1/actions/customer/create/execute.ts     |   2 +-
 .../v1/actions/customer/del/execute.ts        |   2 +-
 .../v1/actions/customer/get/execute.ts        |   2 +-
 .../v1/actions/customer/getAll/execute.ts     |   2 +-
 .../v1/actions/customer/update/execute.ts     |   6 +-
 .../v1/actions/rmm/create/execute.ts          |   2 +-
 .../SyncroMSP/v1/actions/rmm/del/execute.ts   |   2 +-
 .../SyncroMSP/v1/actions/rmm/get/execute.ts   |   2 +-
 .../v1/actions/rmm/getAll/execute.ts          |   2 +-
 .../SyncroMSP/v1/actions/rmm/mute/execute.ts  |   2 +-
 .../nodes/SyncroMSP/v1/actions/router.ts      |   4 +-
 .../v1/actions/ticket/create/execute.ts       |   2 +-
 .../v1/actions/ticket/del/execute.ts          |   2 +-
 .../v1/actions/ticket/get/execute.ts          |   2 +-
 .../v1/actions/ticket/getAll/execute.ts       |   2 +-
 .../v1/actions/ticket/update/execute.ts       |   2 +-
 .../nodes/SyncroMSP/v1/transport/index.ts     |   5 +-
 .../nodes/Taiga/GenericFunctions.ts           |  10 +-
 packages/nodes-base/nodes/Taiga/Taiga.node.ts |   2 +-
 .../nodes/Tapfiliate/GenericFunctions.ts      |  14 +-
 .../nodes/Tapfiliate/Tapfiliate.node.ts       |   8 +-
 .../nodes/Telegram/GenericFunctions.ts        |   4 +-
 .../nodes/Telegram/Telegram.node.ts           |  10 +-
 .../nodes/Telegram/TelegramTrigger.node.ts    |   3 +-
 .../nodes/TheHive/GenericFunctions.ts         |   7 +-
 .../nodes-base/nodes/TheHive/TheHive.node.ts  |  38 +++---
 .../nodes/Todoist/GenericFunctions.ts         |  11 +-
 .../nodes/Todoist/v1/OperationHandler.ts      |   4 +-
 .../nodes/Todoist/v2/OperationHandler.ts      |   4 +-
 .../nodes/Toggl/GenericFunctions.ts           |  11 +-
 .../nodes/Toggl/TogglTrigger.node.ts          |   3 +-
 .../nodes/TravisCi/GenericFunctions.ts        |  19 ++-
 .../nodes/TravisCi/TravisCi.node.ts           |   2 +-
 .../nodes/Trello/GenericFunctions.ts          |   2 +-
 .../nodes-base/nodes/Trello/Trello.node.ts    |   2 +-
 .../nodes/Twist/GenericFunctions.ts           |  10 +-
 packages/nodes-base/nodes/Twist/Twist.node.ts |  24 ++--
 .../nodes/Twitter/GenericFunctions.ts         |  17 +--
 .../nodes/Twitter/TweetInterface.ts           |  15 +++
 .../nodes-base/nodes/Twitter/Twitter.node.ts  |   8 +-
 .../nodes/Typeform/GenericFunctions.ts        |   6 +-
 .../nodes/UProc/GenericFunctions.ts           |   9 +-
 .../UnleashedSoftware/GenericFunctions.ts     |  18 ++-
 .../UnleashedSoftware.node.ts                 |  24 +++-
 .../nodes/Uplead/GenericFunctions.ts          |   7 +-
 .../nodes/UptimeRobot/GenericFunctions.ts     |   6 +-
 .../nodes/UptimeRobot/UptimeRobot.node.ts     |   4 +-
 .../nodes/UrlScanIo/GenericFunctions.ts       |   2 +-
 .../nodes/UrlScanIo/UrlScanIo.node.ts         |   6 +-
 .../Venafi/Datacenter/GenericFunctions.ts     |   2 +-
 .../VenafiTlsProtectDatacenter.node.ts        |  13 +-
 .../Venafi/ProtectCloud/GenericFunctions.ts   |  10 +-
 .../VenafiTlsProtectCloud.node.ts             |  13 +-
 .../nodes-base/nodes/Vero/GenericFunctions.ts |   6 +-
 packages/nodes-base/nodes/Vero/Vero.node.ts   |  41 +++---
 .../nodes/Vonage/GenericFunctions.ts          |   7 +-
 packages/nodes-base/nodes/Wait/Wait.node.ts   |   2 +-
 .../nodes/Webflow/GenericFunctions.ts         |   6 +-
 .../nodes-base/nodes/Webflow/Webflow.node.ts  |   2 +-
 .../nodes/Webflow/WebflowTrigger.node.ts      |   3 +-
 .../nodes-base/nodes/Webhook/Webhook.node.ts  |   2 +-
 .../nodes-base/nodes/Wise/GenericFunctions.ts |  16 ++-
 packages/nodes-base/nodes/Wise/Wise.node.ts   |  11 +-
 .../nodes-base/nodes/Wise/WiseTrigger.node.ts |   3 +-
 .../nodes/WooCommerce/GenericFunctions.ts     |   4 +-
 .../nodes/WooCommerce/WooCommerce.node.ts     |   3 +-
 .../WooCommerce/WooCommerceTrigger.node.ts    |   3 +-
 .../nodes/Wordpress/GenericFunctions.ts       |  10 +-
 .../nodes/Wordpress/Wordpress.node.ts         |   2 +-
 .../nodes/Workable/GenericFunctions.ts        |   6 +-
 .../nodes/Wufoo/GenericFunctions.ts           |   2 +-
 .../nodes/Wufoo/WufooTrigger.node.ts          |   7 +-
 .../nodes-base/nodes/Xero/GenericFunctions.ts |   5 +-
 packages/nodes-base/nodes/Xero/Xero.node.ts   |   2 +-
 .../nodes/Yourls/GenericFunctions.ts          |   5 +-
 .../nodes/Zammad/GenericFunctions.ts          |   6 +-
 .../nodes-base/nodes/Zammad/Zammad.node.ts    |   2 +-
 .../nodes/Zendesk/GenericFunctions.ts         |   6 +-
 .../nodes-base/nodes/Zendesk/Zendesk.node.ts  |   7 +-
 .../nodes/Zendesk/ZendeskTrigger.node.ts      |  12 +-
 .../nodes-base/nodes/Zoho/GenericFunctions.ts |   8 +-
 .../nodes-base/nodes/Zoho/ZohoCrm.node.ts     |   2 +-
 .../nodes-base/nodes/Zoom/GenericFunctions.ts |   7 +-
 packages/nodes-base/nodes/Zoom/Zoom.node.ts   |   2 +-
 .../nodes/Zulip/GenericFunctions.ts           |  12 +-
 packages/nodes-base/nodes/Zulip/Zulip.node.ts |   2 +-
 packages/nodes-base/utils/utilities.ts        |   2 +-
 560 files changed, 2227 insertions(+), 1919 deletions(-)

diff --git a/packages/nodes-base/.eslintrc.js b/packages/nodes-base/.eslintrc.js
index 98f30a79913a37..f517dd8c4823f5 100644
--- a/packages/nodes-base/.eslintrc.js
+++ b/packages/nodes-base/.eslintrc.js
@@ -22,7 +22,7 @@ module.exports = {
 		'@typescript-eslint/naming-convention': ['error', { selector: 'memberLike', format: null }],
 		'@typescript-eslint/no-explicit-any': 'off', //812 warnings, better to fix in separate PR
 		'@typescript-eslint/no-non-null-assertion': 'off', //665 errors, better to fix in separate PR
-		'@typescript-eslint/no-unsafe-argument': 'off', //1538 errors, better to fix in separate PR
+		// '@typescript-eslint/no-unsafe-argument': 'off', //1538 errors, better to fix in separate PR
 		'@typescript-eslint/no-unsafe-assignment': 'off', //7084 problems, better to fix in separate PR
 		'@typescript-eslint/no-unsafe-call': 'off', //541 errors, better to fix in separate PR
 		'@typescript-eslint/no-unsafe-member-access': 'off', //4591 errors, better to fix in separate PR
diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
index 793dde2aa2a230..e7aa0c69cc6aab 100644
--- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
@@ -481,10 +481,12 @@ export class ActionNetwork implements INodeType {
 					response =
 						operation === 'getAll'
 							? response.map((entry: Response) => simplifyResponse(entry, resource))
-							: simplifyResponse(response, resource);
+							: simplifyResponse(response as Response, resource);
 				}
 
-				Array.isArray(response) ? returnData.push(...response) : returnData.push(response);
+				Array.isArray(response)
+					? returnData.push(...(response as IDataObject[]))
+					: returnData.push(response as IDataObject);
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ error: error.message });
diff --git a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
index 2aa053856811a7..1de5b018fb3749 100644
--- a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
@@ -81,14 +81,16 @@ export async function handleListing(
 	do {
 		responseData = await actionNetworkApiRequest.call(this, method, endpoint, body, qs);
 		const items = responseData._embedded[itemsKey];
-		returnData.push(...items);
+		returnData.push(...(items as IDataObject[]));
 
 		if (!returnAll && returnData.length >= limit) {
 			return returnData.slice(0, limit);
 		}
 
 		if (responseData._links?.next?.href) {
-			const queryString = new URLSearchParams(responseData._links.next.href.split('?')[1]);
+			const queryString = new URLSearchParams(
+				responseData._links.next.href.split('?')[1] as string,
+			);
 			qs.page = queryString.get('page') as string;
 		}
 	} while (responseData._links?.next);
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index 2cbadde818fe82..4941acf03b99cc 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -1182,7 +1182,7 @@ export class ActiveCampaign implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
index ce2eaea8f5493b..1d316e9ab0ebbe 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
@@ -169,7 +169,7 @@ export class ActiveCampaignTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
index db7ffc0c8f4c31..54c81b3901f333 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions, INodeProperties } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, INodeProperties, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -49,7 +49,7 @@ export async function activeCampaignApiRequest(
 		);
 
 		if (responseData.success === false) {
-			throw new NodeApiError(this.getNode(), responseData);
+			throw new NodeApiError(this.getNode(), responseData as JsonObject);
 		}
 
 		if (dataKey === undefined) {
@@ -58,7 +58,7 @@ export async function activeCampaignApiRequest(
 			return responseData[dataKey] as IDataObject;
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -91,12 +91,12 @@ export async function activeCampaignApiRequestAllItems(
 		responseData = await activeCampaignApiRequest.call(this, method, endpoint, body, query);
 
 		if (dataKey === undefined) {
-			returnData.push.apply(returnData, responseData);
+			returnData.push.apply(returnData, responseData as IDataObject[]);
 			if (returnData !== undefined) {
 				itemsReceived += returnData.length;
 			}
 		} else {
-			returnData.push.apply(returnData, responseData[dataKey]);
+			returnData.push.apply(returnData, responseData[dataKey] as IDataObject[]);
 			if (responseData[dataKey] !== undefined) {
 				itemsReceived += responseData[dataKey].length;
 			}
diff --git a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
index d9747b2694d6a2..85377674d3f1d4 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
@@ -168,7 +168,7 @@ export class AcuitySchedulingTrigger implements INodeType {
 		if (!resolveData) {
 			// Return the data as it got received
 			return {
-				workflowData: [this.helpers.returnJsonArray(req.body)],
+				workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 			};
 		}
 
@@ -179,7 +179,7 @@ export class AcuitySchedulingTrigger implements INodeType {
 		const responseData = await acuitySchedulingApiRequest.call(this, 'GET', endpoint, {});
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(responseData)],
+			workflowData: [this.helpers.returnJsonArray(responseData as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
index b0ea38712f859e..2492be7c8fc24c 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
@@ -6,7 +6,7 @@ import type {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function acuitySchedulingApiRequest(
@@ -58,6 +58,6 @@ export async function acuitySchedulingApiRequest(
 			);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
index d475394a069752..6d85aad421d991 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
@@ -415,7 +415,7 @@ export class Affinity implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
index 5dc788effb41b3..05205fa16b358e 100644
--- a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
+++ b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
@@ -167,7 +167,10 @@ export class AffinityTrigger implements INodeType {
 				const events = this.getNodeParameter('events') as string[];
 
 				for (const webhook of responseData) {
-					if (eventsExist(webhook.subscriptions, events) && webhook.webhook_url === webhookUrl) {
+					if (
+						eventsExist(webhook.subscriptions as string[], events) &&
+						webhook.webhook_url === webhookUrl
+					) {
 						// Set webhook-id to be sure that it can be deleted
 						const webhookData = this.getWorkflowStaticData('node');
 						webhookData.webhookId = webhook.id as string;
diff --git a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
index 110a06379211e8..1266077e8d30f9 100644
--- a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
@@ -3,7 +3,7 @@ import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function affinityApiRequest(
@@ -32,7 +32,7 @@ export async function affinityApiRequest(
 		uri: uri || `${endpoint}${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 	if (!Object.keys(query).length) {
@@ -42,7 +42,7 @@ export async function affinityApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -64,7 +64,7 @@ export async function affinityApiRequestAllItems(
 		responseData = await affinityApiRequest.call(this, method, resource, body, query);
 		// @ts-ignore
 		query.page_token = responseData.page_token;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.page_token !== undefined && responseData.page_token !== null);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index 56d3ac169a3669..ad24cc3bad5534 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -191,6 +191,7 @@ export class AgileCrm implements INodeType {
 					}
 
 					if (simple) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						responseData = simplifyResponse(responseData);
 					}
 				} else if (operation === 'create') {
diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
index 0d89b9fe88bed0..7269b7f985483b 100644
--- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { IContactUpdate } from './ContactInterface';
@@ -51,7 +51,7 @@ export async function agileCrmApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -79,7 +79,7 @@ export async function agileCrmApiRequestAllItems(
 			sendAsForm,
 		);
 		if (responseData.length !== 0) {
-			returnData.push.apply(returnData, responseData);
+			returnData.push.apply(returnData, responseData as IDataObject[]);
 			if (sendAsForm) {
 				body.cursor = responseData[responseData.length - 1].cursor;
 			} else {
@@ -169,9 +169,9 @@ export async function agileCrmApiRequestUpdate(
 		return lastSuccesfulUpdateReturn;
 	} catch (error) {
 		if (successfulUpdates.length === 0) {
-			throw new NodeApiError(this.getNode(), error);
+			throw new NodeApiError(this.getNode(), error as JsonObject);
 		} else {
-			throw new NodeApiError(this.getNode(), error, {
+			throw new NodeApiError(this.getNode(), error as JsonObject, {
 				message: `Not all properties updated. Updated properties: ${successfulUpdates.join(', ')}`,
 				description: error.message,
 				httpCode: error.statusCode,
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 7dde15bb0d2618..494b9899b00799 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -8,6 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import type { IRecord } from './GenericFunctions';
 import { apiRequest, apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
 
 export class Airtable implements INodeType {
@@ -567,7 +568,7 @@ export class Airtable implements INodeType {
 
 						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records),
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -609,7 +610,7 @@ export class Airtable implements INodeType {
 						responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records),
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -654,7 +655,7 @@ export class Airtable implements INodeType {
 					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 				}
 
-				returnData.push.apply(returnData, responseData.records);
+				returnData.push.apply(returnData, responseData.records as INodeExecutionData[]);
 
 				if (downloadAttachments === true) {
 					const downloadFieldNames = (
@@ -662,7 +663,7 @@ export class Airtable implements INodeType {
 					).split(',');
 					const data = await downloadRecordAttachments.call(
 						this,
-						responseData.records,
+						responseData.records as IRecord[],
 						downloadFieldNames,
 					);
 					return [data];
@@ -704,7 +705,7 @@ export class Airtable implements INodeType {
 					responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -786,7 +787,7 @@ export class Airtable implements INodeType {
 						responseData = await apiRequest.call(this, requestMethod, endpoint, data, qs);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.records),
+							this.helpers.returnJsonArray(responseData.records as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index 5ca532fe05a4c7..9902557e047e20 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -8,6 +8,7 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
+import type { IRecord } from './GenericFunctions';
 import { apiRequestAllItems, downloadRecordAttachments } from './GenericFunctions';
 
 import moment from 'moment';
@@ -245,7 +246,11 @@ export class AirtableTrigger implements INodeType {
 				const downloadFieldNames = (this.getNodeParameter('downloadFieldNames', 0) as string).split(
 					',',
 				);
-				const data = await downloadRecordAttachments.call(this, records, downloadFieldNames);
+				const data = await downloadRecordAttachments.call(
+					this,
+					records as IRecord[],
+					downloadFieldNames,
+				);
 				return [data];
 			}
 
diff --git a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
index 88aed757e940b9..6b046a1e5a6523 100644
--- a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
@@ -86,7 +86,7 @@ export async function apiRequestAllItems(
 
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData.records);
+		returnData.push.apply(returnData, responseData.records as IDataObject[]);
 
 		query.offset = responseData.offset;
 	} while (responseData.offset !== undefined);
@@ -113,7 +113,7 @@ export async function downloadRecordAttachments(
 						encoding: null,
 					});
 					element.binary![`${fieldName}_${index}`] = await this.helpers.prepareBinaryData(
-						Buffer.from(file),
+						Buffer.from(file as string),
 						attachment.filename,
 						attachment.type,
 					);
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index 6661de29624ae6..68dcd10e210e2e 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -168,23 +168,23 @@ export class AmqpTrigger implements INodeType {
 			if (options.jsonConvertByteArrayToString === true && data.body.content !== undefined) {
 				// The buffer is not ready... Stringify and parse back to load it.
 				const cont = deepCopy(data.body.content);
-				data.body = String.fromCharCode.apply(null, cont.data);
+				data.body = String.fromCharCode.apply(null, cont.data as number[]);
 			}
 
 			if (options.jsonConvertByteArrayToString === true && data.body.content !== undefined) {
 				// The buffer is not ready... Stringify and parse back to load it.
 				const cont = deepCopy(data.body.content);
-				data.body = String.fromCharCode.apply(null, cont.data);
+				data.body = String.fromCharCode.apply(null, cont.data as number[]);
 			}
 
 			if (options.jsonConvertByteArrayToString === true && data.body.content !== undefined) {
 				// The buffer is not ready... Stringify and parse back to load it.
 				const content = deepCopy(data.body.content);
-				data.body = String.fromCharCode.apply(null, content.data);
+				data.body = String.fromCharCode.apply(null, content.data as number[]);
 			}
 
 			if (options.jsonParseBody === true) {
-				data.body = jsonParse(data.body);
+				data.body = jsonParse(data.body as string);
 			}
 			if (options.onlyBody === true) {
 				data = data.body;
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
index 3cf254681a710a..cbdd192a3e3c95 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
@@ -364,7 +364,7 @@ export class ApiTemplateIo implements INodeType {
 					try {
 						responseData = await apiTemplateIoApiRequest.call(this, 'GET', '/account-information');
 
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ json: { error: error.message } });
@@ -437,11 +437,11 @@ export class ApiTemplateIo implements INodeType {
 
 						if (download) {
 							const binaryProperty = this.getNodeParameter('binaryProperty', i);
-							const data = await downloadImage.call(this, responseData.download_url);
+							const data = await downloadImage.call(this, responseData.download_url as string);
 							const fileName = responseData.download_url.split('/').pop();
 							const binaryData = await this.helpers.prepareBinaryData(
-								data,
-								options.fileName || fileName,
+								data as Buffer,
+								(options.fileName as string) || (fileName as string),
 							);
 							responseData = {
 								json: responseData,
@@ -450,7 +450,7 @@ export class ApiTemplateIo implements INodeType {
 								},
 							};
 						}
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ json: { error: error.message } });
@@ -517,15 +517,21 @@ export class ApiTemplateIo implements INodeType {
 							}
 						}
 
-						responseData = await apiTemplateIoApiRequest.call(this, 'POST', '/create', qs, data);
+						responseData = await apiTemplateIoApiRequest.call(
+							this,
+							'POST',
+							'/create',
+							qs,
+							data as IDataObject,
+						);
 
 						if (download) {
 							const binaryProperty = this.getNodeParameter('binaryProperty', i);
-							const imageData = await downloadImage.call(this, responseData.download_url);
+							const imageData = await downloadImage.call(this, responseData.download_url as string);
 							const fileName = responseData.download_url.split('/').pop();
 							const binaryData = await this.helpers.prepareBinaryData(
-								imageData,
-								options.fileName || fileName,
+								imageData as Buffer,
+								(options.fileName || fileName) as string,
 							);
 							responseData = {
 								json: responseData,
@@ -534,7 +540,7 @@ export class ApiTemplateIo implements INodeType {
 								},
 							};
 						}
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ json: { error: error.message } });
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
index 698255c0223e17..aef669dae22c91 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
@@ -1,6 +1,7 @@
 import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
+import type { JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function apiTemplateIoApiRequest(
@@ -39,11 +40,11 @@ export async function apiTemplateIoApiRequest(
 			options,
 		);
 		if (response.status === 'error') {
-			throw new NodeApiError(this.getNode(), response.message);
+			throw new NodeApiError(this.getNode(), response.message as JsonObject);
 		}
 		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index 9cd61f28a27e77..3029c56f1ac515 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -1691,7 +1692,9 @@ export class Asana implements INodeType {
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData.data === undefined) {
-					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+						message: 'No data got returned',
+					});
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1730,7 +1733,9 @@ export class Asana implements INodeType {
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData.data === undefined) {
-					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+						message: 'No data got returned',
+					});
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1818,7 +1823,7 @@ export class Asana implements INodeType {
 				try {
 					taskData = await asanaApiRequest.call(this, 'GET', `/tasks/${taskId}`, {});
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error, {
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
 						message: `Could not find task with id "${taskId}" so tags could not be loaded.`,
 					});
 				}
@@ -1827,7 +1832,9 @@ export class Asana implements INodeType {
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {}, { workspace });
 
 				if (responseData.data === undefined) {
-					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+						message: 'No data got returned',
+					});
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -1863,7 +1870,9 @@ export class Asana implements INodeType {
 				const responseData = await asanaApiRequest.call(this, 'GET', endpoint, {});
 
 				if (responseData.data === undefined) {
-					throw new NodeApiError(this.getNode(), responseData, { message: 'No data got returned' });
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
+						message: 'No data got returned',
+					});
 				}
 
 				const returnData: INodePropertyOptions[] = [];
@@ -2400,9 +2409,12 @@ export class Asana implements INodeType {
 				}
 
 				returnData.push(
-					...this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), {
-						itemData: { item: i },
-					}),
+					...this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{
+							itemData: { item: i },
+						},
+					),
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
index dc173916bdf47a..f85f6f7c0a2a2f 100644
--- a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
@@ -240,7 +240,7 @@ export class AsanaTrigger implements INodeType {
 		// }
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body.events)],
+			workflowData: [this.helpers.returnJsonArray(req.body.events as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index 5b92e21917c355..519dc6a338fb0a 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -51,9 +51,16 @@ export async function asanaApiRequestAllItems(
 	query.limit = 100;
 
 	do {
-		responseData = await asanaApiRequest.call(this, method, endpoint, body, query, uri);
+		responseData = await asanaApiRequest.call(
+			this,
+			method,
+			endpoint,
+			body as IDataObject,
+			query,
+			uri,
+		);
 		uri = get(responseData, 'next_page.uri');
-		returnData.push.apply(returnData, responseData.data);
+		returnData.push.apply(returnData, responseData.data as IDataObject[]);
 	} while (responseData.next_page !== null);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.ts b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
index 68dff56343f17f..9e77f5141925b6 100644
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.ts
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
@@ -164,7 +164,7 @@ export class Automizy implements INodeType {
 					);
 					responseData = responseData.contacts;
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
@@ -186,7 +186,7 @@ export class Automizy implements INodeType {
 
 					responseData = await automizyApiRequest.call(this, 'GET', `/contacts/${contactId}`);
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
@@ -228,7 +228,7 @@ export class Automizy implements INodeType {
 					}
 
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
@@ -258,7 +258,7 @@ export class Automizy implements INodeType {
 
 					responseData = await automizyApiRequest.call(this, 'PATCH', `/contacts/${email}`, body);
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
@@ -274,7 +274,7 @@ export class Automizy implements INodeType {
 
 					responseData = await automizyApiRequest.call(this, 'POST', '/smart-lists', body);
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
@@ -296,7 +296,7 @@ export class Automizy implements INodeType {
 
 					responseData = await automizyApiRequest.call(this, 'GET', `/smart-lists/${listId}`);
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
@@ -332,7 +332,7 @@ export class Automizy implements INodeType {
 					}
 
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
@@ -354,7 +354,7 @@ export class Automizy implements INodeType {
 					);
 
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 				}
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
index d4d6e6f7511d7c..7fd08548a1235f 100644
--- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function automizyApiRequest(
@@ -28,7 +28,7 @@ export async function automizyApiRequest(
 	};
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		if (Object.keys(qs).length === 0) {
@@ -40,7 +40,7 @@ export async function automizyApiRequest(
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -61,7 +61,7 @@ export async function automizyApiRequestAllItems(
 	do {
 		responseData = await automizyApiRequest.call(this, method, endpoint, body, query);
 		query.page++;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.pageCount !== responseData.page);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
index 4250c87babe89f..3d17b80198780b 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
@@ -300,7 +300,7 @@ export class Autopilot implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
index afeac949556879..2bb4a136971167 100644
--- a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
@@ -124,7 +124,7 @@ export class AutopilotTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
index 87616ade6e63a6..bd73190879b998 100644
--- a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function autopilotApiRequest(
@@ -32,7 +32,7 @@ export async function autopilotApiRequest(
 		uri: uri || `${endpoint}${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 	if (!Object.keys(query).length) {
@@ -42,7 +42,7 @@ export async function autopilotApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -64,7 +64,7 @@ export async function autopilotApiRequestAllItems(
 	do {
 		responseData = await autopilotApiRequest.call(this, method, endpoint, body, query);
 		endpoint = `${base}/${responseData.bookmark}`;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		if (query.limit && returnData.length >= query.limit && !returnAll) {
 			return returnData;
 		}
diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index d53f5cf14912d8..a7e31607416ac8 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -193,7 +193,7 @@ export class AwsLambda implements INodeType {
 						_errorMessage += `\n\nStack trace:\n${responseData.stackTrace}`;
 					}
 
-					throw new NodeApiError(this.getNode(), responseData);
+					throw new NodeApiError(this.getNode(), responseData as JsonObject);
 				} else {
 					returnData.push({
 						result: responseData,
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
index 1b1833a09333f2..39397a999bad88 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
@@ -216,7 +216,7 @@ export class AwsCertificateManager implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
index fe6a7de8068e2c..ec178291b38aed 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, IHttpRequestOptions } from 'n8n-workflow';
+import type { IDataObject, IHttpRequestOptions, JsonObject } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
@@ -37,7 +37,7 @@ export async function awsApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -52,7 +52,7 @@ export async function awsApiRequestREST(
 ): Promise<any> {
 	const response = await awsApiRequest.call(this, service, method, path, body, query, headers);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (e) {
 		return response;
 	}
@@ -80,7 +80,7 @@ export async function awsApiRequestAllItems(
 			});
 			data.NextToken = responseData.NextToken;
 		}
-		returnData.push.apply(returnData, get(responseData, propertyName));
+		returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 	} while (responseData.NextToken !== undefined);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
index 76f88c9825f480..f8742dc5223d7a 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
@@ -43,7 +43,7 @@ export async function awsApiRequestREST(
 ): Promise<any> {
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -60,7 +60,7 @@ export async function awsApiRequestSOAP(
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
index 87e8d6d9e6fe1c..39158c26eaf3ad 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
@@ -17,6 +17,7 @@ import { itemFields, itemOperations } from './ItemDescription';
 import type {
 	FieldsUiValues,
 	IAttributeNameUi,
+	IAttributeValue,
 	IAttributeValueUi,
 	IRequestBody,
 	PutItemUi,
@@ -229,10 +230,10 @@ export class AwsDynamoDB implements INodeType {
 
 						responseData = await awsApiRequest.call(this, 'dynamodb', 'POST', '/', body, headers);
 
-						if (!Object.keys(responseData).length) {
+						if (!Object.keys(responseData as IDataObject).length) {
 							responseData = { success: true };
 						} else if (simple) {
-							responseData = decodeItem(responseData.Attributes);
+							responseData = decodeItem(responseData.Attributes as IAttributeValue);
 						}
 					} else if (operation === 'get') {
 						// ----------------------------------
@@ -293,7 +294,7 @@ export class AwsDynamoDB implements INodeType {
 						responseData = responseData.Item;
 
 						if (simple && responseData) {
-							responseData = decodeItem(responseData);
+							responseData = decodeItem(responseData as IAttributeValue);
 						}
 					} else if (operation === 'getAll') {
 						// ----------------------------------
@@ -392,7 +393,7 @@ export class AwsDynamoDB implements INodeType {
 						}
 					}
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
index c0fd7d04d91125..b23784527c6321 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
@@ -33,7 +33,7 @@ export async function awsApiRequest(
 
 	try {
 		return JSON.parse(
-			await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions),
+			(await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions)) as string,
 		);
 	} catch (error) {
 		const errorMessage =
@@ -72,7 +72,7 @@ export async function awsApiRequestAllItems(
 		if (responseData.LastEvaluatedKey) {
 			body!.ExclusiveStartKey = responseData.LastEvaluatedKey;
 		}
-		returnData.push(...responseData.Items);
+		returnData.push(...(responseData.Items as IDataObject[]));
 	} while (responseData.LastEvaluatedKey !== undefined);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts b/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts
index 3a85e46c813eac..a55e9ff46d2758 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/utils.ts
@@ -96,7 +96,7 @@ function decodeAttribute(type: AttributeValueType, attribute: string | IAttribut
 
 export function validateJSON(input: any): object {
 	try {
-		return JSON.parse(input);
+		return JSON.parse(input as string);
 	} catch (error) {
 		throw new Error('Items must be a valid JSON');
 	}
diff --git a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
index 6382af1e5fadf8..bacedf2714c7d9 100644
--- a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
@@ -443,9 +443,12 @@ export class AwsElb implements INodeType {
 				}
 
 				returnData.push(
-					...this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), {
-						itemData: { item: i },
-					}),
+					...this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject),
+						{
+							itemData: { item: i },
+						},
+					),
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
index dd9835b220478c..e2f5537e5156cc 100644
--- a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
@@ -68,7 +68,7 @@ export async function awsApiRequestREST(
 		region,
 	);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (e) {
 		return response;
 	}
@@ -98,7 +98,7 @@ export async function awsApiRequestSOAP(
 	);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
@@ -149,9 +149,9 @@ export async function awsApiRequestSOAPAllItems(
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
-				returnData.push.apply(returnData, get(responseData, propertyName));
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 			} else {
-				returnData.push(get(responseData, propertyName));
+				returnData.push(get(responseData, propertyName) as IDataObject);
 			}
 		}
 	} while (
diff --git a/packages/nodes-base/nodes/Aws/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
index 4ac8db754d9601..bd5d124ea35c76 100644
--- a/packages/nodes-base/nodes/Aws/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IHttpRequestOptions } from 'n8n-workflow';
+import type { IHttpRequestOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
@@ -34,7 +34,7 @@ export async function awsApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error, { parseXml: true });
+		throw new NodeApiError(this.getNode(), error as JsonObject, { parseXml: true });
 	}
 }
 
@@ -48,7 +48,7 @@ export async function awsApiRequestREST(
 ): Promise<any> {
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -65,7 +65,7 @@ export async function awsApiRequestSOAP(
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseXml(response, { explicitArray: false }, (err, data) => {
+			parseXml(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
index 0e63a26fd5ca2f..fa028bfcd38d26 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
@@ -472,7 +472,7 @@ export class AwsRekognition implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
index e608da4c67e41c..482dd6b723efe8 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -67,7 +67,7 @@ export async function awsApiRequestREST(
 		region,
 	);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -97,7 +97,7 @@ export async function awsApiRequestSOAP(
 	);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
@@ -147,9 +147,9 @@ export async function awsApiRequestSOAPAllItems(
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
-				returnData.push.apply(returnData, get(responseData, propertyName));
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 			} else {
-				returnData.push(get(responseData, propertyName));
+				returnData.push(get(responseData, propertyName) as IDataObject);
 			}
 		}
 		if (query.limit && query.limit <= returnData.length) {
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index d5c368b1c68c0b..f34b1642ae3a07 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -201,7 +201,7 @@ export class AwsS3 implements INodeType {
 							responseData = responseData.slice(0, qs.limit);
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -274,7 +274,7 @@ export class AwsS3 implements INodeType {
 							responseData = responseData.ListBucketResult.Contents;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -314,7 +314,7 @@ export class AwsS3 implements INodeType {
 							qs,
 							headers,
 							{},
-							region,
+							region as string,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
 							this.helpers.returnJsonArray({ success: true }),
@@ -343,7 +343,7 @@ export class AwsS3 implements INodeType {
 							{ 'list-type': 2, prefix: folderKey },
 							{},
 							{},
-							region,
+							region as string,
 						);
 
 						// folder empty then just delete it
@@ -357,7 +357,7 @@ export class AwsS3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 
 							responseData = { deleted: [{ Key: folderKey }] };
@@ -395,7 +395,7 @@ export class AwsS3 implements INodeType {
 								{ delete: '' },
 								headers,
 								{},
-								region,
+								region as string,
 							);
 
 							responseData = { deleted: responseData.DeleteResult.Deleted };
@@ -439,7 +439,7 @@ export class AwsS3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 						} else {
 							qs.limit = this.getNodeParameter('limit', 0);
@@ -453,7 +453,7 @@ export class AwsS3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 						}
 						if (Array.isArray(responseData)) {
@@ -574,10 +574,10 @@ export class AwsS3 implements INodeType {
 							qs,
 							headers,
 							{},
-							region,
+							region as string,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.CopyObjectResult),
+							this.helpers.returnJsonArray(responseData.CopyObjectResult as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -612,7 +612,7 @@ export class AwsS3 implements INodeType {
 							qs,
 							{},
 							{ encoding: null, resolveWithFullResponse: true },
-							region,
+							region as string,
 						);
 
 						let mimeType: string | undefined;
@@ -671,7 +671,7 @@ export class AwsS3 implements INodeType {
 							qs,
 							{},
 							{},
-							region,
+							region as string,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
 							this.helpers.returnJsonArray({ success: true }),
@@ -714,7 +714,7 @@ export class AwsS3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 						} else {
 							qs.limit = this.getNodeParameter('limit', 0);
@@ -728,7 +728,7 @@ export class AwsS3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 							responseData = responseData.splice(0, qs.limit);
 						}
@@ -873,7 +873,7 @@ export class AwsS3 implements INodeType {
 								qs,
 								headers,
 								{},
-								region,
+								region as string,
 							);
 						} else {
 							const fileContent = this.getNodeParameter('fileContent', i) as string;
@@ -893,7 +893,7 @@ export class AwsS3 implements INodeType {
 								qs,
 								headers,
 								{},
-								region,
+								region as string,
 							);
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
diff --git a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
index 34e39cf8c3ed60..cd5556dfb1fe16 100644
--- a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
@@ -65,7 +65,7 @@ export async function awsApiRequestREST(
 		region,
 	);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -95,7 +95,7 @@ export async function awsApiRequestSOAP(
 	);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
@@ -145,9 +145,9 @@ export async function awsApiRequestSOAPAllItems(
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
-				returnData.push.apply(returnData, get(responseData, propertyName));
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 			} else {
-				returnData.push(get(responseData, propertyName));
+				returnData.push(get(responseData, propertyName) as IDataObject);
 			}
 		}
 		if (query.limit && query.limit <= returnData.length) {
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index 6cbe0158f6082f..aaf33419c4835e 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -1282,7 +1282,7 @@ export class AwsSes implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
index 62321049dc3173..82ced0804407d2 100644
--- a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, IHttpRequestOptions } from 'n8n-workflow';
+import type { IDataObject, IHttpRequestOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
@@ -37,7 +37,7 @@ export async function awsApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'aws', requestOptions);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error, { parseXml: true });
+		throw new NodeApiError(this.getNode(), error as JsonObject, { parseXml: true });
 	}
 }
 
@@ -51,7 +51,7 @@ export async function awsApiRequestREST(
 ): Promise<any> {
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -68,7 +68,7 @@ export async function awsApiRequestSOAP(
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
@@ -109,9 +109,9 @@ export async function awsApiRequestSOAPAllItems(
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
-				returnData.push.apply(returnData, get(responseData, propertyName));
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 			} else {
-				returnData.push(get(responseData, propertyName));
+				returnData.push(get(responseData, propertyName) as IDataObject);
 			}
 		}
 	} while (
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index 2195ba76d05e06..436615a406b62c 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -255,7 +256,7 @@ export class AwsSqs implements INodeType {
 					// loads first 1000 queues from SQS
 					data = await awsApiRequestSOAP.call(this, 'sqs', 'GET', `?${params.join('&')}`);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				let queues = data.ListQueuesResponse.ListQueuesResult.QueueUrl;
@@ -385,7 +386,7 @@ export class AwsSqs implements INodeType {
 						`${queuePath}?${params.join('&')}`,
 					);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				const result = responseData.SendMessageResponse.SendMessageResult;
diff --git a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
index 1adb59bd68a948..3d49d2d1b098fd 100644
--- a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
@@ -18,6 +18,7 @@ import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IHttpRequestOptions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -64,15 +65,15 @@ export async function awsApiRequest(
 		if (error?.response?.data || error?.response?.body) {
 			const errorMessage = error?.response?.data || error?.response?.body;
 			if (errorMessage.includes('AccessDeniedException')) {
-				const user = JSON.parse(errorMessage).Message.split(' ')[1];
-				throw new NodeApiError(this.getNode(), error, {
+				const user = JSON.parse(errorMessage as string).Message.split(' ')[1];
+				throw new NodeApiError(this.getNode(), error as JsonObject, {
 					message: 'Unauthorized — please check your AWS policy configuration',
 					description: `Make sure an identity-based policy allows user ${user} to perform textract:AnalyzeExpense`,
 				});
 			}
 		}
 
-		throw new NodeApiError(this.getNode(), error); // no XML parsing needed
+		throw new NodeApiError(this.getNode(), error as JsonObject); // no XML parsing needed
 	}
 }
 
@@ -86,7 +87,7 @@ export async function awsApiRequestREST(
 ): Promise<any> {
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -103,7 +104,7 @@ export async function awsApiRequestSOAP(
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
@@ -177,7 +178,7 @@ export async function validateCredentials(
 	const response = await this.helpers.request(options);
 
 	return new Promise((resolve, reject) => {
-		parseString(response, { explicitArray: false }, (err, data) => {
+		parseString(response as string, { explicitArray: false }, (err, data) => {
 			if (err) {
 				return reject(err);
 			}
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
index a0fc777f52b55e..3dff43e92f6091 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
@@ -12,7 +12,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
+import type { ICredentialDataDecryptedObject, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
@@ -67,7 +67,7 @@ export async function awsApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error); // no XML parsing needed
+		throw new NodeApiError(this.getNode(), error as JsonObject); // no XML parsing needed
 	}
 }
 
@@ -81,7 +81,7 @@ export async function awsApiRequestREST(
 ): Promise<any> {
 	const response = await awsApiRequest.call(this, service, method, path, body, headers);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -116,9 +116,9 @@ export async function awsApiRequestRESTAllItems(
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
-				returnData.push.apply(returnData, get(responseData, propertyName));
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 			} else {
-				returnData.push(get(responseData, propertyName));
+				returnData.push(get(responseData, propertyName) as IDataObject);
 			}
 		}
 	} while (
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
index 32e750949b3007..653756c1caa7c5 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
@@ -26,7 +26,7 @@ export async function get(this: IExecuteFunctions, index: number) {
 			{},
 			{ resolveWithFullResponse: true },
 		);
-		return this.helpers.returnJsonArray(responseData.body);
+		return this.helpers.returnJsonArray(responseData.body as IDataObject);
 	}
 
 	const output: string = this.getNodeParameter('output', index) as string;
@@ -40,7 +40,7 @@ export async function get(this: IExecuteFunctions, index: number) {
 	mimeType = mimeType ? mimeType.split(';').find((value) => value.includes('/')) : undefined;
 	const contentDisposition = response.headers['content-disposition'];
 	const fileNameRegex = /(?<=filename=").*\b/;
-	const match = fileNameRegex.exec(contentDisposition);
+	const match = fileNameRegex.exec(contentDisposition as string);
 	let fileName = '';
 
 	// file name was found
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts
index f91534e76ece1e..f434a06174fc06 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts
@@ -31,5 +31,5 @@ export async function get(this: IExecuteFunctions, index: number): Promise<INode
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body);
 
 	//return
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts
index 744a2a1bbfa8b2..e640af2ad3c10a 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts
@@ -21,9 +21,9 @@ export async function getAll(
 
 	//return limited result
 	if (!returnAll && responseData.employees.length > limit) {
-		return this.helpers.returnJsonArray(responseData.employees.slice(0, limit));
+		return this.helpers.returnJsonArray(responseData.employees.slice(0, limit) as IDataObject[]);
 	}
 
 	//return all result
-	return this.helpers.returnJsonArray(responseData.employees);
+	return this.helpers.returnJsonArray(responseData.employees as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
index 49625eb6a3218a..71cd2a6cebb20d 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
@@ -27,7 +27,7 @@ export async function download(this: IExecuteFunctions, index: number) {
 	mimeType = mimeType ? mimeType.split(';').find((value) => value.includes('/')) : undefined;
 	const contentDisposition = response.headers['content-disposition'];
 	const fileNameRegex = /(?<=filename=").*\b/;
-	const match = fileNameRegex.exec(contentDisposition);
+	const match = fileNameRegex.exec(contentDisposition as string);
 	let fileName = '';
 
 	// file name was found
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts
index ec8a82a060650d..64fe5fc066fa81 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts
@@ -46,9 +46,9 @@ export async function getAll(
 
 	//return limited result
 	if (!returnAll && responseData.categories.length > limit) {
-		return this.helpers.returnJsonArray(responseData.categories.slice(0, limit));
+		return this.helpers.returnJsonArray(responseData.categories.slice(0, limit) as IDataObject[]);
 	}
 
 	//return
-	return this.helpers.returnJsonArray(responseData.categories);
+	return this.helpers.returnJsonArray(responseData.categories as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
index 279034b0202e7b..8e9eef4a720bef 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
@@ -27,7 +27,7 @@ export async function download(this: IExecuteFunctions, index: number) {
 	mimeType = mimeType ? mimeType.split(';').find((value) => value.includes('/')) : undefined;
 	const contentDisposition = response.headers['content-disposition'];
 	const fileNameRegex = /(?<=filename=").*\b/;
-	const match = fileNameRegex.exec(contentDisposition);
+	const match = fileNameRegex.exec(contentDisposition as string);
 	let fileName = '';
 
 	// file name was found
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts
index 74701ee4c280d6..944a39f5535b89 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts
@@ -41,9 +41,9 @@ export async function getAll(
 
 	//return limited result
 	if (!returnAll && responseData.categories.length > limit) {
-		return this.helpers.returnJsonArray(responseData.categories.slice(0, limit));
+		return this.helpers.returnJsonArray(responseData.categories.slice(0, limit) as IDataObject[]);
 	}
 
 	//return
-	return this.helpers.returnJsonArray(responseData.categories);
+	return this.helpers.returnJsonArray(responseData.categories as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
index af8368b329a2cf..55ce4f657bbaec 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-unsafe-argument */
 import type { IExecuteFunctions } from 'n8n-core';
 
 import type { INodeExecutionData } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
index 35250372965bc5..920718fb51db2e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUrl } from 'request';
@@ -55,6 +55,6 @@ export async function apiRequest(
 	} catch (error) {
 		const description = error?.response?.headers['x-bamboohr-error-messsage'] || '';
 		const message = error?.message || '';
-		throw new NodeApiError(this.getNode(), error, { message, description });
+		throw new NodeApiError(this.getNode(), error as JsonObject, { message, description });
 	}
 }
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
index b57182572f9322..ebdb752e5070c8 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
@@ -161,7 +161,7 @@ export class Bannerbear implements INodeType {
 							});
 						};
 
-						responseData = await promise(responseData.uid);
+						responseData = await promise(responseData.uid as string);
 					}
 				}
 				//https://developers.bannerbear.com/#get-a-specific-image
@@ -184,7 +184,7 @@ export class Bannerbear implements INodeType {
 			if (Array.isArray(responseData)) {
 				returnData.push.apply(returnData, responseData as IDataObject[]);
 			} else {
-				returnData.push(responseData);
+				returnData.push(responseData as IDataObject);
 			}
 		}
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
index f0e8a53adbb398..0934bf07a53472 100644
--- a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
@@ -30,7 +30,7 @@ export async function bannerbearApiRequest(
 		uri: uri || `https://api.bannerbear.com/v2${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.form;
 	}
 	if (!Object.keys(query).length) {
@@ -40,7 +40,7 @@ export async function bannerbearApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
index 5b7fa2eb460fe4..0c84aa3f1576f0 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.ts
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -229,9 +229,9 @@ export class Baserow implements INodeType {
 					const endpoint = `/api/database/rows/table/${tableId}/${rowId}/`;
 					const row = await baserowApiRequest.call(this, 'GET', endpoint, jwtToken);
 
-					mapper.idsToNames(row);
+					mapper.idsToNames(row as Row);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(row),
+						this.helpers.returnJsonArray(row as Row),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -268,9 +268,9 @@ export class Baserow implements INodeType {
 					const endpoint = `/api/database/rows/table/${tableId}/`;
 					const createdRow = await baserowApiRequest.call(this, 'POST', endpoint, jwtToken, body);
 
-					mapper.idsToNames(createdRow);
+					mapper.idsToNames(createdRow as Row);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(createdRow),
+						this.helpers.returnJsonArray(createdRow as Row),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -309,9 +309,9 @@ export class Baserow implements INodeType {
 					const endpoint = `/api/database/rows/table/${tableId}/${rowId}/`;
 					const updatedRow = await baserowApiRequest.call(this, 'PATCH', endpoint, jwtToken, body);
 
-					mapper.idsToNames(updatedRow);
+					mapper.idsToNames(updatedRow as Row);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(updatedRow),
+						this.helpers.returnJsonArray(updatedRow as Row),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Baserow/GenericFunctions.ts b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
index 79b1faf2085d5f..8b1c5e1f22aac5 100644
--- a/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { IExecuteFunctions } from 'n8n-core';
 
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { Accumulator, BaserowCredentials, LoadedResource } from './types';
@@ -42,7 +42,7 @@ export async function baserowApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -68,7 +68,7 @@ export async function baserowApiRequestAllItems(
 
 	do {
 		responseData = await baserowApiRequest.call(this, method, endpoint, jwtToken, body, qs);
-		returnData.push(...responseData.results);
+		returnData.push(...(responseData.results as IDataObject[]));
 
 		if (!returnAll && returnData.length > limit) {
 			return returnData.slice(0, limit);
@@ -101,7 +101,7 @@ export async function getJwtToken(
 		const { token } = (await this.helpers.request(options)) as { token: string };
 		return token;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index fa74f9f547e866..697022c75e3b83 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
@@ -318,7 +318,7 @@ export class Beeminder implements INodeType {
 						}
 						results = await createDatapoint.call(this, data);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(results),
+							this.helpers.returnJsonArray(results as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -336,7 +336,7 @@ export class Beeminder implements INodeType {
 
 						results = await getAllDatapoints.call(this, data);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(results),
+							this.helpers.returnJsonArray(results as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -353,7 +353,7 @@ export class Beeminder implements INodeType {
 						}
 						results = await updateDatapoint.call(this, data);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(results),
+							this.helpers.returnJsonArray(results as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -365,7 +365,7 @@ export class Beeminder implements INodeType {
 						};
 						results = await deleteDatapoint.call(this, data);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(results),
+							this.helpers.returnJsonArray(results as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
index 99e36be756130c..7cd7b31e56d651 100644
--- a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
@@ -22,7 +22,7 @@ export async function beeminderApiRequest(
 		json: true,
 	};
 
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 
@@ -48,7 +48,7 @@ export async function beeminderApiRequestAllItems(
 	do {
 		responseData = await beeminderApiRequest.call(this, method, endpoint, body, query);
 		query.page++;
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 	} while (responseData.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
index afa3ed76040d0e..69109f98325c53 100644
--- a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
+++ b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
@@ -329,7 +329,7 @@ export class BitbucketTrigger implements INodeType {
 			return {};
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
index 62f4b37f1fdb3d..0f9ce524fb9892 100644
--- a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function bitbucketApiRequest(
@@ -31,14 +31,14 @@ export async function bitbucketApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -64,7 +64,7 @@ export async function bitbucketApiRequestAllItems(
 	do {
 		responseData = await bitbucketApiRequest.call(this, method, resource, body, query, uri);
 		uri = responseData.next;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.next !== undefined);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index 87d7d51887361a..887e099b6bac1f 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -207,7 +207,7 @@ export class Bitly implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
index fd5960a62ce859..067eb40615e634 100644
--- a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function bitlyApiRequest(
@@ -30,7 +30,7 @@ export async function bitlyApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -46,7 +46,7 @@ export async function bitlyApiRequest(
 			});
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -71,7 +71,7 @@ export async function bitlyApiRequestAllItems(
 
 	do {
 		responseData = await bitlyApiRequest.call(this, method, resource, body, query, uri);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		if (responseData.pagination?.next) {
 			uri = responseData.pagination.next;
 		}
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index c2f2467b63c0a5..3988a47bbc37af 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -147,7 +147,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = `/public/collections/${id}`;
 					responseData = await bitwardenApiRequest.call(this, 'GET', endpoint, {}, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -160,7 +160,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = '/public/collections';
 					responseData = await handleGetAll.call(this, i, 'GET', endpoint, {}, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -199,7 +199,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = `/public/collections/${id}`;
 					responseData = await bitwardenApiRequest.call(this, 'PUT', endpoint, {}, body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -220,7 +220,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = '/public/events';
 					responseData = await handleGetAll.call(this, i, 'GET', endpoint, qs, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -260,7 +260,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = '/public/groups';
 					responseData = await bitwardenApiRequest.call(this, 'POST', endpoint, {}, body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -288,7 +288,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = `/public/groups/${id}`;
 					responseData = await bitwardenApiRequest.call(this, 'GET', endpoint, {}, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -301,7 +301,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = '/public/groups';
 					responseData = await handleGetAll.call(this, i, 'GET', endpoint, {}, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -316,7 +316,7 @@ export class Bitwarden implements INodeType {
 					responseData = await bitwardenApiRequest.call(this, 'GET', endpoint, {}, {});
 					responseData = responseData.map((memberId: string) => ({ memberId }));
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -378,7 +378,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = `/public/groups/${groupId}`;
 					responseData = await bitwardenApiRequest.call(this, 'PUT', endpoint, {}, body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -439,7 +439,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = '/public/members/';
 					responseData = await bitwardenApiRequest.call(this, 'POST', endpoint, {}, body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -468,7 +468,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = `/public/members/${id}`;
 					responseData = await bitwardenApiRequest.call(this, 'GET', endpoint, {}, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -481,7 +481,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = '/public/members';
 					responseData = await handleGetAll.call(this, i, 'GET', endpoint, {}, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -496,7 +496,7 @@ export class Bitwarden implements INodeType {
 					responseData = await bitwardenApiRequest.call(this, 'GET', endpoint, {}, {});
 					responseData = responseData.map((groupId: string) => ({ groupId }));
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -542,7 +542,7 @@ export class Bitwarden implements INodeType {
 					const endpoint = `/public/members/${id}`;
 					responseData = await bitwardenApiRequest.call(this, 'PUT', endpoint, {}, body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
index 213d0e7316b5c2..91169e74647e24 100644
--- a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -61,7 +66,7 @@ export async function bitwardenApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -95,7 +100,7 @@ export async function getAccessToken(
 		const { access_token } = await this.helpers.request(options);
 		return access_token;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -130,7 +135,7 @@ export async function loadResource(this: ILoadOptionsFunctions, resource: string
 	const token = await getAccessToken.call(this);
 	const endpoint = `/public/${resource}`;
 
-	const { data } = await bitwardenApiRequest.call(this, 'GET', endpoint, {}, {}, token);
+	const { data } = await bitwardenApiRequest.call(this, 'GET', endpoint, {}, {}, token as string);
 
 	data.forEach(({ id, name, externalId }: { id: string; name: string; externalId?: string }) => {
 		returnData.push({
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index 498bfad8e9cfec..c24cbb902ba7f2 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -149,11 +149,11 @@ export class Box implements INodeType {
 
 						items[i] = newItem;
 
-						const data = Buffer.from(responseData.body);
+						const data = Buffer.from(responseData.body as string);
 
 						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
 							data as unknown as Buffer,
-							fileName,
+							fileName as string,
 							mimeType,
 						);
 					}
@@ -524,7 +524,7 @@ export class Box implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts
index 05469a59bd6316..098b8a6c9eba03 100644
--- a/packages/nodes-base/nodes/Box/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, IOAuth2Options } from 'n8n-workflow';
+import type { IDataObject, IOAuth2Options, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function boxApiRequest(
@@ -33,7 +33,7 @@ export async function boxApiRequest(
 	options = Object.assign({}, options, option);
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -44,7 +44,7 @@ export async function boxApiRequest(
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'boxOAuth2Api', options, oAuth2Options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -65,7 +65,7 @@ export async function boxApiRequestAllItems(
 	do {
 		responseData = await boxApiRequest.call(this, method, endpoint, body, query);
 		query.offset = (responseData.offset as number) + query.limit;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData[propertyName].length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
index 37ca58da342d71..43314f2933dd1e 100644
--- a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
+++ b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
@@ -198,7 +198,7 @@ export class Brandfetch implements INodeType {
 
 									newItem.binary![`${imageType}_${imageFormat}`] =
 										await this.helpers.prepareBinaryData(
-											data,
+											data as Buffer,
 											`${imageType}_${domain}.${imageFormat}`,
 										);
 
@@ -212,7 +212,7 @@ export class Brandfetch implements INodeType {
 						}
 					} else {
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response.response),
+							this.helpers.returnJsonArray(response.response as IDataObject),
 							{ itemData: { item: i } },
 						);
 						responseData.push(...executionData);
@@ -227,7 +227,7 @@ export class Brandfetch implements INodeType {
 
 					const response = await brandfetchApiRequest.call(this, 'POST', '/color', body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(response),
+						this.helpers.returnJsonArray(response as IDataObject),
 						{ itemData: { item: i } },
 					);
 					responseData.push(...executionData);
@@ -241,7 +241,7 @@ export class Brandfetch implements INodeType {
 
 					const response = await brandfetchApiRequest.call(this, 'POST', '/font', body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(response),
+						this.helpers.returnJsonArray(response as IDataObject),
 						{ itemData: { item: i } },
 					);
 					responseData.push(...executionData);
@@ -255,7 +255,7 @@ export class Brandfetch implements INodeType {
 
 					const response = await brandfetchApiRequest.call(this, 'POST', '/company', body);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(response),
+						this.helpers.returnJsonArray(response as IDataObject),
 						{ itemData: { item: i } },
 					);
 					responseData.push(...executionData);
@@ -270,7 +270,7 @@ export class Brandfetch implements INodeType {
 					const response = await brandfetchApiRequest.call(this, 'POST', '/industry', body);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(response),
+						this.helpers.returnJsonArray(response as IDataObject),
 						{ itemData: { item: i } },
 					);
 					responseData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
index 5fc03ca3671977..afbc6a657e46dc 100644
--- a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function brandfetchApiRequest(
@@ -39,7 +39,7 @@ export async function brandfetchApiRequest(
 			delete options.headers;
 		}
 
-		if (!Object.keys(body).length) {
+		if (!Object.keys(body as IDataObject).length) {
 			delete options.body;
 		}
 		if (!Object.keys(qs).length) {
@@ -49,11 +49,11 @@ export async function brandfetchApiRequest(
 		const response = await this.helpers.request(options);
 
 		if (response.statusCode && response.statusCode !== 200) {
-			throw new NodeApiError(this.getNode(), response);
+			throw new NodeApiError(this.getNode(), response as JsonObject);
 		}
 
 		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.ts b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
index 8d0b6887c9ce7b..e6f0f3a8cfa19e 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.ts
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
@@ -174,7 +174,7 @@ export class Bubble implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
index 0775a93e2cf528..62a6438f03167c 100644
--- a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -51,7 +51,7 @@ export async function bubbleApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -73,7 +73,7 @@ export async function bubbleApiRequestAllItems(
 	do {
 		responseData = await bubbleApiRequest.call(this, method, endpoint, body, qs);
 		qs.cursor += qs.limit;
-		returnData.push.apply(returnData, responseData.response.results);
+		returnData.push.apply(returnData, responseData.response.results as IDataObject[]);
 	} while (responseData.response.remaining !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
index 884f5d0cbc1a4b..a4dd358c79836c 100644
--- a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
@@ -1,6 +1,7 @@
 import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
 
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
@@ -121,7 +122,6 @@ export class CalTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -196,9 +196,9 @@ export class CalTrigger implements INodeType {
 		return {
 			workflowData: [
 				this.helpers.returnJsonArray({
-					triggerEvent: req.body.triggerEvent,
-					createdAt: req.body.createdAt,
-					...req.body.payload,
+					triggerEvent: req.body.triggerEvent as string,
+					createdAt: req.body.createdAt as string,
+					...(req.body.payload as IDataObject),
 				}),
 			],
 		};
diff --git a/packages/nodes-base/nodes/Cal/GenericFunctions.ts b/packages/nodes-base/nodes/Cal/GenericFunctions.ts
index f84174c890dd84..4910c0d5b6e7f5 100644
--- a/packages/nodes-base/nodes/Cal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cal/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	IHttpRequestOptions,
 	INodePropertyOptions,
 	IWebhookFunctions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -36,7 +37,7 @@ export async function calApiRequest(
 	try {
 		return await this.helpers.httpRequestWithAuthentication.call(this, 'calApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
index 87f1dce09b9c6e..46d473605f9a6c 100644
--- a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
@@ -50,7 +50,7 @@ export async function calendlyApiRequest(
 		json: true,
 	};
 
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.form;
 	}
 	if (!Object.keys(query).length) {
diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
index c231d1e3ebf778..2a97d652c15a11 100644
--- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 	NodeParameterValue,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
@@ -597,7 +598,7 @@ export class Chargebee implements INodeType {
 				try {
 					responseData = await this.helpers.request(options);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				if (resource === 'invoice' && operation === 'list') {
@@ -620,7 +621,7 @@ export class Chargebee implements INodeType {
 					returnData.push(...responseData);
 				} else {
 					responseData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...responseData);
diff --git a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
index bcefe8cc7fa1a7..19298dc8bebd5c 100644
--- a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
@@ -1,6 +1,11 @@
 import type { IWebhookFunctions } from 'n8n-core';
 
-import type { INodeType, INodeTypeDescription, IWebhookResponseData } from 'n8n-workflow';
+import type {
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
 
 export class ChargebeeTrigger implements INodeType {
 	description: INodeTypeDescription = {
@@ -236,7 +241,7 @@ export class ChargebeeTrigger implements INodeType {
 		}
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
index b1bd7fd0a9e98d..48f2831739fbf5 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
@@ -74,7 +74,7 @@ export class CircleCi implements INodeType {
 
 						responseData = await circleciApiRequest.call(this, 'GET', endpoint, {}, qs);
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
@@ -108,7 +108,7 @@ export class CircleCi implements INodeType {
 							responseData = responseData.splice(0, qs.limit);
 						}
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
@@ -135,13 +135,13 @@ export class CircleCi implements INodeType {
 
 						responseData = await circleciApiRequest.call(this, 'POST', endpoint, body, qs);
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
 				}
 
-				returnData.push(...responseData);
+				returnData.push(...(responseData as INodeExecutionData[]));
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ error: error.message, json: {}, itemIndex: i });
diff --git a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
index 9c5840974b8f6f..41b2a775949feb 100644
--- a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function circleciApiRequest(
@@ -33,13 +33,13 @@ export async function circleciApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -62,7 +62,7 @@ export async function circleciApiRequestAllItems(
 
 	do {
 		responseData = await circleciApiRequest.call(this, method, resource, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query['page-token'] = responseData.next_page_token;
 	} while (responseData.next_page_token !== undefined && responseData.next_page_token !== null);
 	return returnData;
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
index e21f821b1b4e57..8ce1a5b930ca70 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
@@ -212,7 +212,7 @@ export class CiscoWebex implements INodeType {
 							responseData = await webexApiRequest.call(this, 'POST', '/messages', body);
 						}
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					} else if (operation === 'delete') {
@@ -240,7 +240,7 @@ export class CiscoWebex implements INodeType {
 						const endpoint = `/messages/${messageId}`;
 						responseData = await webexApiRequest.call(this, 'GET', endpoint);
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					} else if (operation === 'getAll') {
@@ -274,7 +274,7 @@ export class CiscoWebex implements INodeType {
 							responseData = responseData.items;
 						}
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.items),
+							this.helpers.returnJsonArray(responseData.items as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					} else if (operation === 'update') {
@@ -302,7 +302,7 @@ export class CiscoWebex implements INodeType {
 
 						responseData = await webexApiRequest.call(this, 'PUT', endpoint, body);
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
@@ -342,7 +342,7 @@ export class CiscoWebex implements INodeType {
 
 						responseData = await webexApiRequest.call(this, 'POST', '/meetings', body);
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
@@ -393,7 +393,7 @@ export class CiscoWebex implements INodeType {
 							{ headers },
 						);
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
@@ -433,7 +433,7 @@ export class CiscoWebex implements INodeType {
 							responseData = responseData.items;
 						}
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
@@ -491,13 +491,13 @@ export class CiscoWebex implements INodeType {
 
 						responseData = await webexApiRequest.call(this, 'PUT', `/meetings/${meetingId}`, body);
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 					}
 				}
 
-				returnData.push(...responseData);
+				returnData.push(...(responseData as INodeExecutionData[]));
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ error: error.toString(), json: {}, itemIndex: i });
diff --git a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
index 389f5eadc36f6e..77e6a0be3c6045 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	IDataObject,
 	INodeProperties,
 	IWebhookFunctions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -35,7 +36,7 @@ export async function webexApiRequest(
 		if (Object.keys(option).length !== 0) {
 			options = Object.assign({}, options, option);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		if (Object.keys(qs).length === 0) {
@@ -46,7 +47,7 @@ export async function webexApiRequest(
 			tokenType: 'Bearer',
 		});
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -73,7 +74,7 @@ export async function webexApiRequestAllItems(
 		if (responseData.headers.link) {
 			uri = responseData.headers.link.split(';')[0].replace('<', '').replace('>', '');
 		}
-		returnData.push.apply(returnData, responseData.body[propertyName]);
+		returnData.push.apply(returnData, responseData.body[propertyName] as IDataObject[]);
 	} while (responseData.headers.link?.includes('rel="next"'));
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts b/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
index 57c59fe74fb59f..5822ce070116d7 100644
--- a/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
+++ b/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
@@ -130,8 +130,8 @@ export class CitrixAdc implements INodeType {
 						const file = systemfile[0];
 
 						const binaryData = await this.helpers.prepareBinaryData(
-							Buffer.from(file.filecontent, 'base64'),
-							file.filename,
+							Buffer.from(file.filecontent as string, 'base64'),
+							file.filename as string,
 						);
 
 						responseData = {
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index c4794b47e32c18..d99106f185b44f 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -153,7 +153,7 @@ export class Clearbit implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
index 116c882bccd41a..f443e8f2372b1c 100644
--- a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function clearbitApiRequest(
@@ -31,12 +31,12 @@ export async function clearbitApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index 5f4cf438497e41..37fb535552172c 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -1625,7 +1625,7 @@ export class ClickUp implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
index ba4b1d4dbaa54d..3f88c19f466393 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
@@ -338,7 +338,7 @@ export class ClickUpTrigger implements INodeType {
 			return {};
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
index f0949081de8968..40182083ffd2c2 100644
--- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, IOAuth2Options } from 'n8n-workflow';
+import type { IDataObject, IOAuth2Options, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function clickupApiRequest(
@@ -56,7 +56,7 @@ export async function clickupApiRequest(
 			);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -76,7 +76,7 @@ export async function clickupApiRequestAllItems(
 
 	do {
 		responseData = await clickupApiRequest.call(this, method, resource, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query.page++;
 		if (query.limit && query.limit <= returnData.length) {
 			return returnData;
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
index 8ddf595c9c2c43..1b7357c993dd13 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.ts
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -836,7 +836,7 @@ export class Clockify implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
index 149cadb17eb61a..1f898ade8c3b3b 100644
--- a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
@@ -49,7 +49,7 @@ export async function clockifyApiRequestAllItems(
 	do {
 		responseData = await clockifyApiRequest.call(this, method, endpoint, body, query);
 
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 
 		if (query.limit && returnData.length >= query.limit) {
 			return returnData;
diff --git a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
index e09b30bc0f681f..24defa030cf28b 100644
--- a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
+++ b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
@@ -160,9 +160,12 @@ export class Cloudflare implements INodeType {
 				}
 
 				returnData.push(
-					...this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), {
-						itemData: { item: i },
-					}),
+					...this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{
+							itemData: { item: i },
+						},
+					),
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
index ecf8c222297d30..ff586129a7d5aa 100644
--- a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IPollFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function cloudflareApiRequest(
@@ -36,7 +36,7 @@ export async function cloudflareApiRequest(
 		}
 		return await this.helpers.requestWithAuthentication.call(this, 'cloudflareApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -56,7 +56,7 @@ export async function cloudflareApiRequestAllItems(
 	do {
 		responseData = await cloudflareApiRequest.call(this, method, endpoint, body, query);
 		query.page++;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.result_info.total_pages !== responseData.result_info.page);
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
index 1e6fe13e6d0181..0dd1539abd52b6 100644
--- a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
@@ -1,5 +1,5 @@
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 import type { OptionsWithUri } from 'request';
 
@@ -29,14 +29,14 @@ export async function cockpitApiRequest(
 
 	options = Object.assign({}, options, option);
 
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index 5eeb58b40ab381..76d1361d0a355f 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import { codaApiRequest, codaApiRequestAllItems } from './GenericFunctions';
@@ -331,13 +332,16 @@ export class Coda implements INodeType {
 						responseData = await codaApiRequest.call(this, 'GET', endpoint, {}, qs);
 						if (options.rawData === true) {
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
+								this.helpers.returnJsonArray(responseData as IDataObject[]),
 								{ itemData: { item: i } },
 							);
 							returnData.push(...executionData);
 						} else {
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray({ id: responseData.id, ...responseData.values }),
+								this.helpers.returnJsonArray({
+									id: responseData.id as string,
+									...(responseData.values as IDataObject),
+								}),
 								{ itemData: { item: i } },
 							);
 							returnData.push(...executionData);
@@ -400,13 +404,14 @@ export class Coda implements INodeType {
 					if (this.continueOnFail()) {
 						return [this.helpers.returnJsonArray({ error: error.message })];
 					}
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				if (options.rawData === true) {
-					return [this.helpers.returnJsonArray(responseData)];
+					return [this.helpers.returnJsonArray(responseData as IDataObject[])];
 				} else {
 					for (const item of responseData) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						returnData.push({
 							id: item.id,
 							...item.values,
@@ -456,7 +461,7 @@ export class Coda implements INodeType {
 						const columnId = this.getNodeParameter('columnId', i) as string;
 						const endpoint = `/docs/${docId}/tables/${tableId}/rows/${rowId}/buttons/${columnId}`;
 						responseData = await codaApiRequest.call(this, 'POST', endpoint, {});
-						returnData.push(responseData);
+						returnData.push(responseData as INodeExecutionData);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							const executionErrorData = this.helpers.constructExecutionMetaData(
@@ -481,7 +486,7 @@ export class Coda implements INodeType {
 						const endpoint = `/docs/${docId}/tables/${tableId}/columns/${columnId}`;
 						responseData = await codaApiRequest.call(this, 'GET', endpoint, {});
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -515,7 +520,7 @@ export class Coda implements INodeType {
 							responseData = responseData.items;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -544,7 +549,7 @@ export class Coda implements INodeType {
 						const endpoint = `/docs/${docId}/formulas/${formulaId}`;
 						responseData = await codaApiRequest.call(this, 'GET', endpoint, {});
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -577,7 +582,7 @@ export class Coda implements INodeType {
 							responseData = responseData.items;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -606,7 +611,7 @@ export class Coda implements INodeType {
 						const endpoint = `/docs/${docId}/controls/${controlId}`;
 						responseData = await codaApiRequest.call(this, 'GET', endpoint, {});
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -639,7 +644,7 @@ export class Coda implements INodeType {
 							responseData = responseData.items;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -667,7 +672,7 @@ export class Coda implements INodeType {
 					const endpoint = `/docs/${docId}/tables/${viewId}`;
 					responseData = await codaApiRequest.call(this, 'GET', endpoint, {});
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -689,7 +694,7 @@ export class Coda implements INodeType {
 							responseData = responseData.items;
 						}
 						responseData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...responseData);
@@ -746,13 +751,14 @@ export class Coda implements INodeType {
 					if (this.continueOnFail()) {
 						return [this.helpers.returnJsonArray({ error: error.message })];
 					}
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				if (options.rawData === true) {
-					return [this.helpers.returnJsonArray(responseData)];
+					return [this.helpers.returnJsonArray(responseData as IDataObject[])];
 				} else {
 					for (const item of responseData) {
+						// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 						returnData.push({
 							id: item.id,
 							...item.values,
@@ -771,7 +777,7 @@ export class Coda implements INodeType {
 						const endpoint = `/docs/${docId}/tables/${viewId}/rows/${rowId}`;
 						responseData = await codaApiRequest.call(this, 'DELETE', endpoint);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -800,7 +806,7 @@ export class Coda implements INodeType {
 						const endpoint = `/docs/${docId}/tables/${viewId}/rows/${rowId}/buttons/${columnId}`;
 						responseData = await codaApiRequest.call(this, 'POST', endpoint);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -833,7 +839,7 @@ export class Coda implements INodeType {
 							responseData = responseData.items;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index 83260a59cd7f6c..13636430bad918 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function codaApiRequest(
@@ -24,14 +24,14 @@ export async function codaApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -60,7 +60,7 @@ export async function codaApiRequestAllItems(
 		responseData = await codaApiRequest.call(this, method, resource, body, query, uri);
 		uri = responseData.nextPageLink;
 		// @ts-ignore
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageLink !== undefined && responseData.nextPageLink !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index 9f946eb1d5e4cd..c8374d3a3846f9 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -6,7 +6,13 @@ import { ExecutionError } from './ExecutionError';
 import type { CodeNodeMode } from './utils';
 import { isObject, REQUIRED_N8N_ITEM_KEYS } from './utils';
 
-import type { IExecuteFunctions, IWorkflowDataProxyData, WorkflowExecuteMode } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	IWorkflowDataProxyData,
+	WorkflowExecuteMode,
+} from 'n8n-workflow';
 
 export class Sandbox extends NodeVM {
 	private jsCode = '';
@@ -59,6 +65,7 @@ export class Sandbox extends NodeVM {
 				error.message = (quoted as string) + '. Did you mean `$input.all()`?';
 			}
 
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 			throw new ExecutionError(error);
 		}
 
@@ -82,7 +89,7 @@ export class Sandbox extends NodeVM {
 			 * item keys to be wrapped in `json` when normalizing items below.
 			 */
 			const mustHaveTopLevelN8nKey = executionResult.some((item) =>
-				Object.keys(item).find((key) => REQUIRED_N8N_ITEM_KEYS.has(key)),
+				Object.keys(item as IDataObject).find((key) => REQUIRED_N8N_ITEM_KEYS.has(key)),
 			);
 
 			for (const item of executionResult) {
@@ -95,7 +102,7 @@ export class Sandbox extends NodeVM {
 				}
 
 				if (mustHaveTopLevelN8nKey) {
-					Object.keys(item).forEach((key) => {
+					Object.keys(item as IDataObject).forEach((key) => {
 						if (REQUIRED_N8N_ITEM_KEYS.has(key)) return;
 						throw new ValidationError({
 							message: `Unknown top-level item key: ${key}`,
@@ -131,7 +138,7 @@ export class Sandbox extends NodeVM {
 			}
 		}
 
-		return normalizeItems(executionResult);
+		return normalizeItems(executionResult as INodeExecutionData[]);
 	}
 
 	private async runCodeEachItem() {
@@ -170,6 +177,7 @@ export class Sandbox extends NodeVM {
 				error.message = (quoted as string) + '. Did you mean `$input.item.json`?';
 			}
 
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 			throw new ExecutionError(error, this.itemIndex);
 		}
 
@@ -203,7 +211,7 @@ export class Sandbox extends NodeVM {
 		// and another top-level key is unrecognized, then the user mis-added a property
 		// directly on the item, when they intended to add it on the `json` property
 
-		Object.keys(executionResult).forEach((key) => {
+		Object.keys(executionResult as IDataObject).forEach((key) => {
 			if (REQUIRED_N8N_ITEM_KEYS.has(key)) return;
 
 			throw new ValidationError({
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index 63f20e14bb07ba..33587e894e64ef 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -369,7 +369,7 @@ export class CoinGecko implements INodeType {
 							const marketCaps = respData.market_caps[idx][1];
 							const totalVolume = respData.total_volumes[idx][1];
 							responseData.push({
-								time: moment(time).toISOString(),
+								time: moment(time as string).toISOString(),
 								price,
 								marketCaps,
 								totalVolume,
@@ -397,7 +397,7 @@ export class CoinGecko implements INodeType {
 						for (let idx = 0; idx < responseData.length; idx++) {
 							const [time, open, high, low, close] = responseData[idx];
 							responseData[idx] = {
-								time: moment(time).toISOString(),
+								time: moment(time as string).toISOString(),
 								open,
 								high,
 								low,
@@ -473,7 +473,7 @@ export class CoinGecko implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
index aac10abd58be64..afbb2f702b2313 100644
--- a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function coinGeckoApiRequest(
@@ -30,14 +30,14 @@ export async function coinGeckoApiRequest(
 	options = Object.assign({}, options, option);
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -64,7 +64,7 @@ export async function coinGeckoRequestAllItems(
 		if (propertyName !== '') {
 			respData = responseData[propertyName];
 		}
-		returnData.push.apply(returnData, respData);
+		returnData.push.apply(returnData, respData as IDataObject[]);
 	} while (respData.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index f312fc8a9458a4..e2e775e9f228d9 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -201,7 +201,7 @@ export class Contentful implements INodeType {
 								const assets: IDataObject[] = [];
 
 								responseData.map((asset: any) => {
-									assets.push(asset.fields);
+									assets.push(asset.fields as IDataObject);
 								});
 								responseData = assets;
 							}
@@ -221,7 +221,7 @@ export class Contentful implements INodeType {
 								const assets: IDataObject[] = [];
 
 								responseData.map((asset: any) => {
-									assets.push(asset.fields);
+									assets.push(asset.fields as IDataObject);
 								});
 								responseData = assets;
 							}
@@ -300,7 +300,7 @@ export class Contentful implements INodeType {
 								const assets: IDataObject[] = [];
 
 								responseData.map((asset: any) => {
-									assets.push(asset.fields);
+									assets.push(asset.fields as IDataObject);
 								});
 								responseData = assets;
 							}
@@ -320,7 +320,7 @@ export class Contentful implements INodeType {
 								const assets: IDataObject[] = [];
 
 								responseData.map((asset: any) => {
-									assets.push(asset.fields);
+									assets.push(asset.fields as IDataObject);
 								});
 								responseData = assets;
 							}
@@ -359,7 +359,7 @@ export class Contentful implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
index 905d706d203c92..c43fcc0b5bdbca 100644
--- a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions
 
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function contentfulApiRequest(
@@ -36,7 +36,7 @@ export async function contentfulApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function contenfulApiRequestAllItems(
 	do {
 		responseData = await contentfulApiRequest.call(this, method, resource, body, query);
 		query.skip = (query.skip + 1) * query.limit;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (returnData.length < responseData.total);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 6dcb6e003b3140..0090cf618502f8 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -479,7 +479,7 @@ export class ConvertKit implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
index 59677219a03662..8204a97e09f8bc 100644
--- a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function convertKitApiRequest(
@@ -30,7 +30,7 @@ export async function convertKitApiRequest(
 
 	options = Object.assign({}, options, option);
 
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -41,13 +41,13 @@ export async function convertKitApiRequest(
 		qs.api_secret = credentials.apiSecret;
 	}
 
-	if (Object.keys(options.qs).length === 0) {
+	if (Object.keys(options.qs as IDataObject).length === 0) {
 		delete options.qs;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.ts b/packages/nodes-base/nodes/Copper/Copper.node.ts
index ef539b1b868e90..d7fd7f46456622 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.ts
+++ b/packages/nodes-base/nodes/Copper/Copper.node.ts
@@ -628,7 +628,7 @@ export class Copper implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
index 8a924cc12d2067..fd96e528b448c5 100644
--- a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
+++ b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
@@ -161,7 +161,7 @@ export class CopperTrigger implements INodeType {
 		}
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index eee2f44d336806..9c29a3cdfc2c72 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -10,7 +10,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
+import type { ICredentialDataDecryptedObject, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import flow from 'lodash.flow';
@@ -62,14 +62,14 @@ export async function copperApiRequest(
 		delete options.qs;
 	}
 
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -167,7 +167,7 @@ export async function copperApiRequestAllItems(
 	do {
 		responseData = await copperApiRequest.call(this, method, resource, body, qs, uri, option);
 		totalItems = responseData.headers['x-pw-total'];
-		returnData.push(...responseData.body);
+		returnData.push(...(responseData.body as IDataObject[]));
 	} while (totalItems > returnData.length);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 7eba5a1ea11939..495b415c9ce6ee 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -295,7 +295,7 @@ export class Cortex implements INodeType {
 
 							body = {
 								responderId,
-								label: getEntityLabel(entityJson),
+								label: getEntityLabel(entityJson as IDataObject),
 								dataType: `thehive:${entityType}`,
 								data: entityJson,
 								tlp: entityJson.tlp || 2,
diff --git a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
index f74730c1df4645..3298ed4fbfb462 100644
--- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
@@ -34,7 +34,7 @@ export async function cortexApiRequest(
 	if (Object.keys(option).length !== 0) {
 		options = Object.assign({}, options, option);
 	}
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	if (Object.keys(query).length === 0) {
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
index 91ed6e791c1354..dbde86f5e07d40 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
@@ -244,7 +244,10 @@ export class CustomerIoTrigger implements INodeType {
 				}
 
 				for (const webhook of webhooks) {
-					if (webhook.endpoint === webhookUrl && eventExists(currentEvents, webhook.events)) {
+					if (
+						webhook.endpoint === webhookUrl &&
+						eventExists(currentEvents, webhook.events as IDataObject)
+					) {
 						webhookData.webhookId = webhook.id;
 						return true;
 					}
diff --git a/packages/nodes-base/nodes/DeepL/DeepL.node.ts b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
index d13aeb492296e2..f7839ada0420c3 100644
--- a/packages/nodes-base/nodes/DeepL/DeepL.node.ts
+++ b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
@@ -130,7 +130,7 @@ export class DeepL implements INodeType {
 
 						const { translations } = await deepLApiRequest.call(this, 'GET', '/translate', body);
 						const [translation] = translations;
-						const translationJsonArray = this.helpers.returnJsonArray(translation);
+						const translationJsonArray = this.helpers.returnJsonArray(translation as IDataObject[]);
 						const executionData = this.helpers.constructExecutionMetaData(translationJsonArray, {
 							itemData: { item: i },
 						});
diff --git a/packages/nodes-base/nodes/Demio/GenericFunctions.ts b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
index 06a66078f0e760..c4a224455b7677 100644
--- a/packages/nodes-base/nodes/Demio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function demioApiRequest(
@@ -38,6 +38,6 @@ export async function demioApiRequest(
 
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Dhl/Dhl.node.ts b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
index dbb311dd43dcf4..924d54171cde51 100644
--- a/packages/nodes-base/nodes/Dhl/Dhl.node.ts
+++ b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
@@ -142,7 +142,7 @@ export class Dhl implements INodeType {
 
 						responseData = await dhlApiRequest.call(this, 'GET', '/track/shipments', {}, qs);
 
-						returnData.push(...responseData.shipments);
+						returnData.push(...(responseData.shipments as IDataObject[]));
 					}
 				}
 			} catch (error) {
diff --git a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
index 74cb6ab37352c5..4c167c3b17fac4 100644
--- a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
@@ -11,6 +11,7 @@ import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IDataObject,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -37,14 +38,14 @@ export async function dhlApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 51745c49706b57..322cee5c95e145 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -421,7 +421,7 @@ export class Discourse implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
index d3ec81962d4edb..175f375aed4c1f 100644
--- a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
@@ -25,7 +25,7 @@ export async function discourseApiRequest(
 	};
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		return await this.helpers.requestWithAuthentication.call(this, 'discourseApi', options);
@@ -48,7 +48,7 @@ export async function discourseApiRequestAllItems(
 	query.page = 1;
 	do {
 		responseData = await discourseApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 		query.page++;
 	} while (responseData.length !== 0);
 	return returnData;
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
index c3db8f77412618..a07e083595327d 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
@@ -605,7 +605,7 @@ export class Disqus implements INodeType {
 						try {
 							const responseData = await disqusApiRequest.call(this, requestMethod, qs, endpoint);
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData.response),
+								this.helpers.returnJsonArray(responseData.response as IDataObject[]),
 								{ itemData: { item: i } },
 							);
 							returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
index d72793cf863278..4ae9521f87b72e 100644
--- a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function disqusApiRequest(
@@ -39,13 +39,13 @@ export async function disqusApiRequest(
 	};
 
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -69,7 +69,7 @@ export async function disqusApiRequestAllItems(
 		do {
 			responseData = await disqusApiRequest.call(this, method, qs, uri, body, option);
 			qs.cursor = responseData.cursor.id;
-			returnData.push.apply(returnData, responseData.response);
+			returnData.push.apply(returnData, responseData.response as IDataObject[]);
 		} while (responseData.cursor.more === true && responseData.cursor.hasNext === true);
 		return returnData;
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/Drift/GenericFunctions.ts b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
index 6fef0d3a2f85a0..6b6df1041f1206 100644
--- a/packages/nodes-base/nodes/Drift/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function driftApiRequest(
@@ -24,7 +24,7 @@ export async function driftApiRequest(
 		json: true,
 	};
 
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.form;
 	}
 	if (!Object.keys(query).length) {
@@ -45,6 +45,6 @@ export async function driftApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'driftOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index 8a09f9c7316fa7..edcce4c51c0c61 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -932,9 +932,9 @@ export class Dropbox implements INodeType {
 				}
 
 				if (resource === 'file' && operation === 'upload') {
-					const data = JSON.parse(responseData);
+					const data = JSON.parse(responseData as string);
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(data),
+						this.helpers.returnJsonArray(data as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -958,7 +958,7 @@ export class Dropbox implements INodeType {
 
 					const filePathDownload = this.getNodeParameter('path', i) as string;
 					items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
-						Buffer.from(responseData),
+						Buffer.from(responseData as string),
 						filePathDownload,
 					);
 				} else if (resource === 'folder' && operation === 'list') {
@@ -1000,20 +1000,22 @@ export class Dropbox implements INodeType {
 				} else if (resource === 'search' && operation === 'query') {
 					let data = responseData;
 					if (returnAll) {
-						data = simple ? simplify(responseData) : responseData;
+						data = simple ? simplify(responseData as IDataObject[]) : responseData;
 					} else {
-						data = simple ? simplify(responseData[property]) : responseData[property];
+						data = simple
+							? simplify(responseData[property] as IDataObject[])
+							: responseData[property];
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(data),
+						this.helpers.returnJsonArray(data as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
 					returnData.push(...executionData);
 				} else {
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
index 3943862e14dd04..e5832f6a6b915b 100644
--- a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -42,7 +42,7 @@ export async function dropboxApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'dropboxOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -67,13 +67,20 @@ export async function dropboxpiRequestAllItems(
 
 	let responseData;
 	do {
-		responseData = await dropboxApiRequest.call(this, method, endpoint, body, query, headers);
+		responseData = await dropboxApiRequest.call(
+			this,
+			method,
+			endpoint,
+			body as IDataObject,
+			query,
+			headers,
+		);
 		const cursor = responseData.cursor;
 		if (cursor !== undefined) {
 			endpoint = paginationEndpoint[resource] as string;
 			body = { cursor };
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.has_more !== false);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
index 84d6ac5493ba47..35acbbfd57d834 100644
--- a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
+++ b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
@@ -330,7 +330,7 @@ export class Dropcontact implements INodeType {
 					}
 				} else {
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{
 							itemData: mapPairedItemsFrom(entryData),
 						},
@@ -363,7 +363,7 @@ export class Dropcontact implements INodeType {
 						}
 					}
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData.data),
+						this.helpers.returnJsonArray(responseData.data as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
index 716955c4908002..f2ef75328f4f24 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
@@ -90,6 +90,7 @@ export class ERPNext implements INodeType {
 
 				docFields.unshift({ name: '*', value: '*' });
 
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				return processNames(docFields);
 			},
 			async getDocFields(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
@@ -107,6 +108,7 @@ export class ERPNext implements INodeType {
 					},
 				);
 
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				return processNames(docFields);
 			},
 		},
@@ -284,7 +286,7 @@ export class ERPNext implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
index fb4492a8e1dbe2..3e419c7b357705 100644
--- a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
@@ -38,11 +38,11 @@ export async function erpNextApiRequest(
 
 	options = Object.assign({}, options, option);
 
-	if (!Object.keys(options.body).length) {
+	if (!Object.keys(options.body as IDataObject).length) {
 		delete options.body;
 	}
 
-	if (!Object.keys(options.qs).length) {
+	if (!Object.keys(options.qs as IDataObject).length) {
 		delete options.qs;
 	}
 	try {
@@ -77,7 +77,7 @@ export async function erpNextApiRequestAllItems(
 
 	do {
 		responseData = await erpNextApiRequest.call(this, method, resource, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query.limit_start += query.limit_page_length - 1;
 	} while (responseData.data && responseData.data.length > 0);
 
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index 4d7ad4ff27a18d..daee3b0b068bbc 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -632,6 +632,7 @@ export class Egoi implements INodeType {
 						}
 
 						if (simple) {
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							const data = (await simplify.call(this, [responseData], listId))[0];
 
 							responseData = {
@@ -675,6 +676,7 @@ export class Egoi implements INodeType {
 						}
 
 						if (simple) {
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							responseData = await simplify.call(this, responseData, listId);
 						}
 					}
@@ -749,7 +751,7 @@ export class Egoi implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
index 0671c10ca2a226..5a2c5b0c61c7fc 100644
--- a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 interface IContact {
@@ -43,14 +43,14 @@ export async function egoiApiRequest(
 		json: true,
 	};
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -80,7 +80,7 @@ export async function egoiApiRequestAllItems(
 
 	do {
 		responseData = await egoiApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query.offset += query.count;
 	} while (responseData[propertyName] && responseData[propertyName].length !== 0);
 
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
index e02571cb58b702..4aeb4e5d0702d7 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
@@ -574,7 +574,7 @@ export class ElasticSecurity implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
index 38b728ba23a657..7f242de187fc70 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -55,7 +55,7 @@ export async function elasticSecurityApiRequest(
 			error.error.error = `${error.error.error}: ${error.error.message}`;
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -78,7 +78,7 @@ export async function elasticSecurityApiRequestAllItems(
 
 		const items = resource === 'case' ? responseData.cases : responseData;
 
-		returnData.push(...items);
+		returnData.push(...(items as IDataObject[]));
 	} while (returnData.length < responseData.total);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index be5b2f0721605e..1fe89b8ab44463 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -331,7 +331,9 @@ export class Elasticsearch implements INodeType {
 					// https://www.elastic.co/guide/en/elasticsearch/reference/current/indices-aliases.html
 
 					responseData = await elasticsearchApiRequest.call(this, 'GET', '/_aliases');
-					responseData = Object.keys(responseData).map((index) => ({ indexId: index }));
+					responseData = Object.keys(responseData as IDataObject).map((index) => ({
+						indexId: index,
+					}));
 
 					const returnAll = this.getNodeParameter('returnAll', i);
 
@@ -342,7 +344,7 @@ export class Elasticsearch implements INodeType {
 				}
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
index 09f3cbc885f7df..e4503280c83a0a 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
@@ -38,7 +38,7 @@ export async function elasticsearchApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'elasticsearchApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -71,7 +71,7 @@ export async function elasticsearchApiRequestAllItems(
 
 		responseData = await elasticsearchApiRequest.call(this, 'GET', '/_search', requestBody, qs);
 		if (responseData?.hits?.hits) {
-			returnData = returnData.concat(responseData.hits.hits);
+			returnData = returnData.concat(responseData.hits.hits as IDataObject[]);
 			const lastHitIndex = responseData.hits.hits.length - 1;
 			//Sort values for the last returned hit with the tiebreaker value
 			searchAfter = responseData.hits.hits[lastHitIndex].sort;
@@ -88,7 +88,7 @@ export async function elasticsearchApiRequestAllItems(
 			responseData = await elasticsearchApiRequest.call(this, 'GET', '/_search', requestBody, qs);
 
 			if (responseData?.hits?.hits?.length) {
-				returnData = returnData.concat(responseData.hits.hits);
+				returnData = returnData.concat(responseData.hits.hits as IDataObject[]);
 				const lastHitIndex = responseData.hits.hits.length - 1;
 				searchAfter = responseData.hits.hits[lastHitIndex].sort;
 				pit = responseData.pit_id;
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index 13f88a403f622c..9da9a45059b368 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -323,8 +323,8 @@ export class EmailReadImapV1 implements INodeType {
 					.then(async (partData) => {
 						// Return it in the format n8n expects
 						return this.helpers.prepareBinaryData(
-							partData,
-							attachmentPart.disposition.params.filename,
+							partData as Buffer,
+							attachmentPart.disposition.params.filename as string,
 						);
 					});
 
@@ -393,7 +393,7 @@ export class EmailReadImapV1 implements INodeType {
 					}
 					const parsedEmail = await parseRawEmail.call(
 						this,
-						part.body,
+						part.body as Buffer,
 						dataPropertyAttachmentsPrefixName,
 					);
 
@@ -437,7 +437,7 @@ export class EmailReadImapV1 implements INodeType {
 					});
 
 					messageBody = messageHeader[0].body;
-					for (propertyName of Object.keys(messageBody)) {
+					for (propertyName of Object.keys(messageBody as IDataObject)) {
 						if (messageBody[propertyName].length) {
 							if (topLevelProperties.includes(propertyName)) {
 								newEmail.json[propertyName] = messageBody[propertyName][0];
@@ -579,7 +579,7 @@ export class EmailReadImapV1 implements INodeType {
 			return imapConnect(config).then(async (conn) => {
 				conn.on('error', async (error) => {
 					const errorCode = error.code.toUpperCase();
-					if (['ECONNRESET', 'EPIPE'].includes(errorCode)) {
+					if (['ECONNRESET', 'EPIPE'].includes(errorCode as string)) {
 						Logger.verbose(`IMAP connection was reset (${errorCode}) - reconnecting.`, { error });
 						try {
 							connection = await establishConnection();
@@ -591,7 +591,7 @@ export class EmailReadImapV1 implements INodeType {
 						}
 					} else {
 						Logger.error('Email Read Imap node encountered a connection error', { error });
-						this.emitError(error);
+						this.emitError(error as Error);
 					}
 				});
 				return conn;
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index 0d71a8eb1384ee..a2ca0f0bd75380 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -331,8 +331,8 @@ export class EmailReadImapV2 implements INodeType {
 					.then(async (partData) => {
 						// Return it in the format n8n expects
 						return this.helpers.prepareBinaryData(
-							partData,
-							attachmentPart.disposition.params.filename,
+							partData as Buffer,
+							attachmentPart.disposition.params.filename as string,
 						);
 					});
 
@@ -401,7 +401,7 @@ export class EmailReadImapV2 implements INodeType {
 					}
 					const parsedEmail = await parseRawEmail.call(
 						this,
-						part.body,
+						part.body as Buffer,
 						dataPropertyAttachmentsPrefixName,
 					);
 
@@ -445,7 +445,7 @@ export class EmailReadImapV2 implements INodeType {
 					});
 
 					messageBody = messageHeader[0].body;
-					for (propertyName of Object.keys(messageBody)) {
+					for (propertyName of Object.keys(messageBody as IDataObject)) {
 						if (messageBody[propertyName].length) {
 							if (topLevelProperties.includes(propertyName)) {
 								newEmail.json[propertyName] = messageBody[propertyName][0];
@@ -567,7 +567,7 @@ export class EmailReadImapV2 implements INodeType {
 					}
 				},
 				onupdate: async (seqno: number, info) => {
-					Logger.verbose(`Email Read Imap:update ${seqno}`, info);
+					Logger.verbose(`Email Read Imap:update ${seqno}`, info as IDataObject);
 				},
 			};
 
@@ -603,7 +603,7 @@ export class EmailReadImapV2 implements INodeType {
 					Logger.verbose(`IMAP connection experienced an error: (${errorCode})`, { error });
 					// eslint-disable-next-line @typescript-eslint/no-use-before-define
 					await closeFunction();
-					this.emitError(error);
+					this.emitError(error as Error);
 				});
 				return conn;
 			});
@@ -625,7 +625,7 @@ export class EmailReadImapV2 implements INodeType {
 					connection = await establishConnection();
 					await connection.openBox(mailbox);
 				} catch (error) {
-					Logger.error(error);
+					Logger.error(error as string);
 				} finally {
 					isCurrentlyReconnecting = false;
 				}
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.ts b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
index 36d3045c6b6e71..e54052a82b579d 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.ts
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
@@ -165,7 +165,7 @@ export class Emelia implements INodeType {
 						});
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.data.createCampaign),
+							this.helpers.returnJsonArray(responseData.data.createCampaign as IDataObject),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -210,7 +210,7 @@ export class Emelia implements INodeType {
 						});
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.data.campaign),
+							this.helpers.returnJsonArray(responseData.data.campaign as IDataObject),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -252,7 +252,7 @@ export class Emelia implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(campaigns),
+							this.helpers.returnJsonArray(campaigns as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -423,7 +423,7 @@ export class Emelia implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(contactLists),
+							this.helpers.returnJsonArray(contactLists as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.ts b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.ts
index 657294efc83198..82214f4a3f1982 100644
--- a/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Emelia/EmeliaTrigger.node.ts
@@ -1,4 +1,5 @@
 import type {
+	IDataObject,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
@@ -174,7 +175,7 @@ export class EmeliaTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
index bf04a3dbc8e9f3..043000f5b6ea77 100644
--- a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
@@ -50,7 +50,7 @@ export async function emeliaGraphqlRequest(
 	const response = await emeliaApiRequest.call(this, 'POST', '/graphql', body);
 
 	if (response.errors) {
-		throw new NodeApiError(this.getNode(), response);
+		throw new NodeApiError(this.getNode(), response as JsonObject);
 	}
 
 	return response;
diff --git a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
index a3853249098916..4a4e3ecbb6d4b1 100644
--- a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
+++ b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -248,7 +249,7 @@ export class EventbriteTrigger implements INodeType {
 				};
 
 				for (const webhook of webhooks) {
-					if (webhook.endpoint_url === webhookUrl && check(actions, webhook.actions)) {
+					if (webhook.endpoint_url === webhookUrl && check(actions, webhook.actions as string[])) {
 						webhookData.webhookId = webhook.id;
 						return true;
 					}
@@ -297,7 +298,7 @@ export class EventbriteTrigger implements INodeType {
 		const req = this.getRequestObject();
 
 		if (req.body.api_url === undefined) {
-			throw new NodeApiError(this.getNode(), req.body, {
+			throw new NodeApiError(this.getNode(), req.body as JsonObject, {
 				message: 'The received data does not contain required "api_url" property!',
 			});
 		}
@@ -307,7 +308,7 @@ export class EventbriteTrigger implements INodeType {
 		if (!resolveData) {
 			// Return the data as it got received
 			return {
-				workflowData: [this.helpers.returnJsonArray(req.body)],
+				workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 			};
 		}
 
@@ -328,11 +329,11 @@ export class EventbriteTrigger implements INodeType {
 			'',
 			{},
 			undefined,
-			req.body.api_url,
+			req.body.api_url as string,
 		);
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(responseData)],
+			workflowData: [this.helpers.returnJsonArray(responseData as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
index 8e6d88a7e97ad8..dba22be6abc409 100644
--- a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
@@ -35,7 +35,7 @@ export async function eventbriteApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -75,7 +75,7 @@ export async function eventbriteApiRequestAllItems(
 	do {
 		responseData = await eventbriteApiRequest.call(this, method, resource, body, query);
 		query.continuation = responseData.pagination.continuation;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (
 		responseData.pagination?.has_more_items !== undefined &&
 		responseData.pagination.has_more_items !== false
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index 4b10c8e2ff5bf1..b53df356e72c92 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -413,7 +414,7 @@ export class FacebookGraphApi implements INodeType {
 				response = await this.helpers.request(requestOptions);
 			} catch (error) {
 				if (!this.continueOnFail()) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				let errorItem;
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index 9e14cdb0e79b40..b0b613b9dd9987 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -220,7 +221,7 @@ export class FacebookTrigger implements INodeType {
 
 				if (responseData.success !== true) {
 					// Facebook did not return success, so something went wrong
-					throw new NodeApiError(this.getNode(), responseData, {
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 						message: 'Facebook webhook creation response did not contain the expected data.',
 					});
 				}
diff --git a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
index 9a1034f88b8d57..9cc6aa60a72a00 100644
--- a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { capitalCase } from 'change-case';
@@ -53,7 +53,7 @@ export async function facebookApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -554,6 +554,7 @@ export function getFields(object: string) {
 		],
 	} as { [key: string]: any };
 
+	// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 	return [{ name: '*', value: '*' }].concat(data[object] || []).map((fieldObject: IDataObject) => ({
 		...fieldObject,
 		name: fieldObject.value !== '*' ? capitalCase(fieldObject.value as string) : fieldObject.value,
diff --git a/packages/nodes-base/nodes/Figma/GenericFunctions.ts b/packages/nodes-base/nodes/Figma/GenericFunctions.ts
index 73ff4f4b8089f3..3fb79a1cad47b7 100644
--- a/packages/nodes-base/nodes/Figma/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Figma/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function figmaApiRequest(
@@ -30,12 +30,12 @@ export async function figmaApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index affa5602cd88a7..329e2f2c4d4c63 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -1,6 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -604,7 +605,7 @@ export class FileMaker implements INodeType {
 				try {
 					returnData = await layoutsApiRequest.call(this);
 				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error);
+					throw new NodeOperationError(this.getNode(), error as Error);
 				}
 
 				return returnData;
@@ -620,7 +621,7 @@ export class FileMaker implements INodeType {
 				try {
 					layouts = await layoutsApiRequest.call(this);
 				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error);
+					throw new NodeOperationError(this.getNode(), error as Error);
 				}
 				for (const layout of layouts) {
 					returnData.push({
@@ -638,7 +639,7 @@ export class FileMaker implements INodeType {
 				try {
 					fields = await getFields.call(this);
 				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error);
+					throw new NodeOperationError(this.getNode(), error as Error);
 				}
 				for (const field of fields) {
 					returnData.push({
@@ -656,7 +657,7 @@ export class FileMaker implements INodeType {
 				try {
 					scripts = await getScripts.call(this);
 				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error);
+					throw new NodeOperationError(this.getNode(), error as Error);
 				}
 				for (const script of scripts) {
 					if (!script.isFolder) {
@@ -676,9 +677,9 @@ export class FileMaker implements INodeType {
 				try {
 					portals = await getPortals.call(this);
 				} catch (error) {
-					throw new NodeOperationError(this.getNode(), error);
+					throw new NodeOperationError(this.getNode(), error as Error);
 				}
-				Object.keys(portals).forEach((portal) => {
+				Object.keys(portals as IDataObject).forEach((portal) => {
 					returnData.push({
 						name: portal,
 						value: portal,
@@ -830,7 +831,7 @@ export class FileMaker implements INodeType {
 				returnData.push({ json: response });
 			}
 		} catch (error) {
-			await logout.call(this, token);
+			await logout.call(this, token as string);
 
 			if (error.node) {
 				throw error;
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index 28ef2681324406..9607aaaec2ae0c 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, INodePropertyOptions } from 'n8n-workflow';
+import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -71,7 +71,7 @@ export async function getToken(
 
 		return response.response.token;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -115,11 +115,11 @@ export async function layoutsApiRequest(
 
 	try {
 		const responseData = await this.helpers.request(options);
-		const items = parseLayouts(responseData.response.layouts);
+		const items = parseLayouts(responseData.response.layouts as LayoutObject[]);
 		items.sort((a, b) => (a.name > b.name ? 0 : 1));
 		return items;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -223,7 +223,7 @@ export async function getScripts(this: ILoadOptionsFunctions): Promise<any> {
 
 	try {
 		const responseData = await this.helpers.request(options);
-		const items = parseScriptsList(responseData.response.scripts);
+		const items = parseScriptsList(responseData.response.scripts as ScriptObject[]);
 		items.sort((a, b) => (a.name > b.name ? 0 : 1));
 		return items;
 	} catch (error) {
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index 3479c50b77f7dc..ce38b63cb89696 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import { flowApiRequest, FlowApiRequestAllItems } from './GenericFunctions';
@@ -124,7 +125,7 @@ export class Flow implements INodeType {
 						responseData = await flowApiRequest.call(this, 'POST', '/tasks', body);
 						responseData = responseData.task;
 					} catch (error) {
-						throw new NodeApiError(this.getNode(), error);
+						throw new NodeApiError(this.getNode(), error as JsonObject);
 					}
 				}
 				//https://developer.getflow.com/api/#tasks_update-a-task
@@ -192,7 +193,7 @@ export class Flow implements INodeType {
 						responseData = await flowApiRequest.call(this, 'PUT', `/tasks/${taskId}`, body);
 						responseData = responseData.task;
 					} catch (error) {
-						throw new NodeApiError(this.getNode(), error);
+						throw new NodeApiError(this.getNode(), error as JsonObject);
 					}
 				}
 				//https://developer.getflow.com/api/#tasks_get-task
@@ -206,7 +207,7 @@ export class Flow implements INodeType {
 					try {
 						responseData = await flowApiRequest.call(this, 'GET', `/tasks/${taskId}`, {}, qs);
 					} catch (error) {
-						throw new NodeApiError(this.getNode(), error);
+						throw new NodeApiError(this.getNode(), error as JsonObject);
 					}
 				}
 				//https://developer.getflow.com/api/#tasks_get-tasks
@@ -257,13 +258,13 @@ export class Flow implements INodeType {
 							responseData = responseData.tasks;
 						}
 					} catch (error) {
-						throw new NodeApiError(this.getNode(), error, { itemIndex: i });
+						throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: i });
 					}
 				}
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
index 62c4e59262f78b..fadc50ce2d9860 100644
--- a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
@@ -193,7 +193,7 @@ export class FlowTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
index 9b54bdeb9f2c62..70903c45230f04 100644
--- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function flowApiRequest(
@@ -29,14 +29,14 @@ export async function flowApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -67,7 +67,7 @@ export async function FlowApiRequestAllItems(
 		});
 		uri = responseData.headers.link;
 		// @ts-ignore
-		returnData.push.apply(returnData, responseData.body[propertyName]);
+		returnData.push.apply(returnData, responseData.body[propertyName] as IDataObject[]);
 	} while (responseData.headers.link !== undefined && responseData.headers.link !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts b/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts
index 02d582f8968235..5217c75924b3ee 100644
--- a/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts
@@ -1,6 +1,7 @@
 import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
 
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
@@ -139,7 +140,7 @@ export class FormIoTrigger implements INodeType {
 						if (
 							action.settings.url === webhookUrl &&
 							action.method.length === method.length &&
-							action.method.every((value: any) => method.includes(value))
+							action.method.every((value: any) => method.includes(value as string))
 						) {
 							webhookData.webhookId = action._id;
 							return true;
@@ -205,7 +206,7 @@ export class FormIoTrigger implements INodeType {
 			response = response.data;
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(response)],
+			workflowData: [this.helpers.returnJsonArray(response as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
index 35f954796d35e3..0a4c85e5d042e6 100644
--- a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 interface IFormIoCredentials {
@@ -75,6 +75,6 @@ export async function formIoApiRequest(
 	try {
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Formstack/GenericFunctions.ts b/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
index 75f1e65fc5f3fb..52ec0bda448ab2 100644
--- a/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, INodePropertyOptions } from 'n8n-workflow';
+import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -80,7 +80,7 @@ export async function apiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'formstackOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -115,7 +115,7 @@ export async function apiRequestAllItems(
 		query.page += 1;
 
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		returnData.items.push.apply(returnData.items, responseData[dataKey]);
+		returnData.items.push.apply(returnData.items, responseData[dataKey] as IDataObject[]);
 	} while (
 		responseData.total !== undefined &&
 		Math.ceil(responseData.total / query.per_page) > query.page
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 7ae5848d46c5d1..2e43a258a404c5 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -1405,7 +1405,7 @@ export class Freshdesk implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
index 385b06b7d484b2..823b16134c792f 100644
--- a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
@@ -3,7 +3,7 @@ import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function freshdeskApiRequest(
@@ -33,7 +33,7 @@ export async function freshdeskApiRequest(
 		uri: uri || `https://${credentials.domain}.${endpoint}${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 	if (!Object.keys(query).length) {
@@ -43,7 +43,7 @@ export async function freshdeskApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -67,7 +67,7 @@ export async function freshdeskApiRequestAllItems(
 		if (responseData.headers.link) {
 			uri = responseData.headers.link.split(';')[0].replace('<', '').replace('>', '');
 		}
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 	} while (responseData.headers.link?.includes('rel="next"'));
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
index 66181396e064b1..2775d7de0ca9d9 100644
--- a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
+++ b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
@@ -237,6 +237,7 @@ export class Freshservice implements INodeType {
 				fields = fields
 					.concat(...asset_type_fields.map((data) => data.fields))
 					.map((data) => ({ name: data.label, id: data.name }));
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				return toOptions(fields);
 			},
 
@@ -1384,7 +1385,7 @@ export class Freshservice implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
index e88886895f802d..c75db17b6e16e6 100644
--- a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type {
@@ -54,19 +54,19 @@ export async function freshserviceApiRequest(
 
 			if (numberOfErrors === 1) {
 				const [validationError] = error.error.errors;
-				throw new NodeApiError(this.getNode(), error, {
+				throw new NodeApiError(this.getNode(), error as JsonObject, {
 					message,
 					description: `For ${validationError.field}: ${validationError.message}`,
 				});
 			} else if (numberOfErrors > 1) {
-				throw new NodeApiError(this.getNode(), error, {
+				throw new NodeApiError(this.getNode(), error as JsonObject, {
 					message,
 					description: "For more information, expand 'details' below and look at 'cause' section",
 				});
 			}
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -83,10 +83,10 @@ export async function freshserviceApiRequestAllItems(
 
 	do {
 		const responseData = await freshserviceApiRequest.call(this, method, endpoint, body, qs);
-		const key = Object.keys(responseData)[0];
+		const key = Object.keys(responseData as IDataObject)[0];
 		items = responseData[key];
 		if (!items.length) return returnData;
-		returnData.push(...items);
+		returnData.push(...(items as IDataObject[]));
 		qs.page++;
 	} while (items.length >= 30);
 
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
index c346483cfb3b31..86c3058a4eb886 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
@@ -989,7 +989,7 @@ export class FreshworksCrm implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
index 376c5c702c45a6..d57a1e643bbd2b 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -42,7 +42,7 @@ export async function freshworksCrmApiRequest(
 		const credentialsType = 'freshworksCrmApi';
 		return await this.helpers.requestWithAuthentication.call(this, credentialsType, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -90,8 +90,8 @@ export async function freshworksCrmApiRequestAllItems(
 
 	do {
 		response = await freshworksCrmApiRequest.call(this, method, endpoint, body, qs);
-		const key = Object.keys(response)[0];
-		returnData.push(...response[key]);
+		const key = Object.keys(response as IDataObject)[0];
+		returnData.push(...(response[key] as IDataObject[]));
 		qs.page++;
 	} while (response.meta.total_pages && qs.page <= response.meta.total_pages);
 
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index 71e8d49ed5f05f..18b0ac9f4818be 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import { createWriteStream } from 'fs';
@@ -783,7 +784,7 @@ export class Ftp implements INodeType {
 									await ftp!.mkdir(dirPath, true);
 									await ftp!.put(uploadData, remotePath);
 								} else {
-									throw new NodeApiError(this.getNode(), error);
+									throw new NodeApiError(this.getNode(), error as JsonObject);
 								}
 							}
 						} else {
@@ -797,7 +798,7 @@ export class Ftp implements INodeType {
 									await ftp!.mkdir(dirPath, true);
 									await ftp!.put(buffer, remotePath);
 								} else {
-									throw new NodeApiError(this.getNode(), error);
+									throw new NodeApiError(this.getNode(), error as JsonObject);
 								}
 							}
 						}
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index 0511055a1f33ab..a186f2d6276be5 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -227,7 +227,7 @@ return items;`,
 					const lineParts = stackLines.find((line: string) => line.includes('Function')).split(':');
 					if (lineParts.length > 2) {
 						const lineNumber = lineParts.splice(-2, 1);
-						if (!isNaN(lineNumber)) {
+						if (!isNaN(lineNumber as number)) {
 							error.message = `${error.message} [Line ${lineNumber}]`;
 						}
 					}
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index 6e39d8f31a5322..cf58cf0e5b6e45 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -206,7 +206,7 @@ return item;`,
 								.split(':');
 							if (lineParts.length > 2) {
 								const lineNumber = lineParts.splice(-2, 1);
-								if (!isNaN(lineNumber)) {
+								if (!isNaN(lineNumber as number)) {
 									error.message = `${error.message} [Line ${lineNumber} | Item Index: ${itemIndex}]`;
 									return Promise.reject(error);
 								}
diff --git a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
index 0aa7c097b2eec9..e7d1367827603f 100644
--- a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function getresponseApiRequest(
@@ -34,7 +34,7 @@ export async function getresponseApiRequest(
 	};
 	try {
 		options = Object.assign({}, options, option);
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -45,7 +45,7 @@ export async function getresponseApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'getResponseOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -73,7 +73,7 @@ export async function getResponseApiRequestAllItems(
 			{ resolveWithFullResponse: true },
 		);
 		query.page++;
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 	} while (responseData.headers.TotalPages !== responseData.headers.CurrentPage);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index 9541504d097bd8..b2f1abfb823faa 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -293,7 +293,7 @@ export class GetResponse implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
index d587d69ce1abc6..e290dc1f8ef0bb 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -166,7 +167,7 @@ export class GetResponseTrigger implements INodeType {
 
 					if (data.url !== webhookUrl) {
 						if (!deleteCurrentSubscription) {
-							throw new NodeApiError(this.getNode(), data, {
+							throw new NodeApiError(this.getNode(), data as JsonObject, {
 								message: `The webhook (${data.url}) is active in the account. Delete it manually or set the parameter "Delete Current Subscription" to true, and the node will delete it for you.`,
 							});
 						}
diff --git a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
index 6db387cfe5cac9..7fe74a3b70f698 100644
--- a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
@@ -64,7 +64,7 @@ export async function ghostApiRequestAllItems(
 	do {
 		responseData = await ghostApiRequest.call(this, method, endpoint, body, query);
 		query.page = responseData.meta.pagination.next;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (query.page !== null);
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index 88009a4449d703..2f0e93ba90c818 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -341,7 +341,7 @@ export class Ghost implements INodeType {
 					}
 				}
 
-				responseData = this.helpers.returnJsonArray(responseData);
+				responseData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData),
 					{ itemData: { item: i } },
diff --git a/packages/nodes-base/nodes/Github/GenericFunctions.ts b/packages/nodes-base/nodes/Github/GenericFunctions.ts
index d25f4e588b89ca..cb99b5fb3dc43e 100644
--- a/packages/nodes-base/nodes/Github/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Github/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 /**
@@ -56,7 +56,7 @@ export async function githubApiRequest(
 
 		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -101,11 +101,11 @@ export async function githubApiRequestAllItems(
 	query.page = 1;
 
 	do {
-		responseData = await githubApiRequest.call(this, method, endpoint, body, query, {
+		responseData = await githubApiRequest.call(this, method, endpoint, body as IDataObject, query, {
 			resolveWithFullResponse: true,
 		});
 		query.page++;
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 	} while (responseData.headers.link?.includes('next'));
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index 5dac88eb7f47bf..c91733ac9e0e85 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -2250,7 +2250,7 @@ export class Github implements INodeType {
 					overwriteDataOperationsArray.includes(fullOperation)
 				) {
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 518f2d0d873801..63298d219bdb69 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -535,7 +536,7 @@ export class GithubTrigger implements INodeType {
 
 				if (responseData.id === undefined || responseData.active !== true) {
 					// Required data is missing so was not successful
-					throw new NodeApiError(this.getNode(), responseData, {
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 						message: 'Github webhook creation response did not contain the expected data.',
 					});
 				}
diff --git a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
index e7c32c463b33e6..7f1738483994fa 100644
--- a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import type { OptionsWithUri } from 'request';
 
@@ -47,7 +47,7 @@ export async function gitlabApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'gitlabOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -67,11 +67,11 @@ export async function gitlabApiRequestAllItems(
 	query.page = 1;
 
 	do {
-		responseData = await gitlabApiRequest.call(this, method, endpoint, body, query, {
+		responseData = await gitlabApiRequest.call(this, method, endpoint, body as IDataObject, query, {
 			resolveWithFullResponse: true,
 		});
 		query.page++;
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 	} while (responseData.headers.link?.includes('next'));
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index a4023ced8a6cbf..e2f4837677c223 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -1302,7 +1302,7 @@ export class Gitlab implements INodeType {
 			if (this.continueOnFail()) {
 				return [this.helpers.returnJsonArray([{ error: error.message }])];
 			}
-			throw new NodeOperationError(this.getNode(), error);
+			throw new NodeOperationError(this.getNode(), error as Error);
 		}
 
 		// Operations which overwrite the returned data
@@ -1720,7 +1720,7 @@ export class Gitlab implements INodeType {
 					overwriteDataOperationsArray.includes(fullOperation)
 				) {
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index f9f4056da3c2b1..e0bc0667d228fa 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -250,12 +251,12 @@ export class GitlabTrigger implements INodeType {
 				try {
 					responseData = await gitlabApiRequest.call(this, 'POST', endpoint, body);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				if (responseData.id === undefined) {
 					// Required data is missing so was not successful
-					throw new NodeApiError(this.getNode(), responseData, {
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 						message: 'GitLab webhook creation response did not contain the expected data.',
 					});
 				}
diff --git a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
index 3037100c7a5605..b40544b45d47fc 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import type {
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -70,9 +75,9 @@ export async function goToWebinarApiRequest(
 		}
 
 		// https://stackoverflow.com/questions/62190724/getting-gotowebinar-registrant
-		return losslessJSON.parse(response, convertLosslessNumber);
+		return losslessJSON.parse(response as string, convertLosslessNumber);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -100,12 +105,12 @@ export async function goToWebinarApiRequestAllItems(
 	do {
 		responseData = await goToWebinarApiRequest.call(this, method, endpoint, qs, body);
 
-		if (responseData.page && parseInt(responseData.page.totalElements, 10) === 0) {
+		if (responseData.page && parseInt(responseData.page.totalElements as string, 10) === 0) {
 			return [];
 		} else if (responseData._embedded?.[key]) {
-			returnData.push(...responseData._embedded[key]);
+			returnData.push(...(responseData._embedded[key] as IDataObject[]));
 		} else {
-			returnData.push(...responseData);
+			returnData.push(...(responseData as IDataObject[]));
 		}
 
 		if (qs.limit && returnData.length >= qs.limit) {
@@ -114,7 +119,7 @@ export async function goToWebinarApiRequestAllItems(
 		}
 	} while (
 		responseData.totalElements &&
-		parseInt(responseData.totalElements, 10) > returnData.length
+		parseInt(responseData.totalElements as string, 10) > returnData.length
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index 5cca0919a389c1..4dcce9f04643b2 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -646,7 +646,7 @@ export class GoToWebinar implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
index f4902752f8fbb8..165e625af47cd2 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -43,9 +43,13 @@ export async function googleApiRequest(
 			const [message, ...rest] = parsedError.error.message.split('\n');
 			const description = rest.join('\n');
 			const httpCode = parsedError.error.code;
-			throw new NodeApiError(this.getNode(), error, { message, description, httpCode });
+			throw new NodeApiError(this.getNode(), error as JsonObject, {
+				message,
+				description,
+				httpCode,
+			});
 		}
-		throw new NodeApiError(this.getNode(), error, { message: error.message });
+		throw new NodeApiError(this.getNode(), error as JsonObject, { message: error.message });
 	}
 }
 
@@ -69,7 +73,7 @@ export async function googleApiRequestAllItems(
 		} else {
 			body.pageToken = responseData.nextPageToken;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (
 		(responseData.nextPageToken !== undefined && responseData.nextPageToken !== '') ||
 		responseData[propertyName]?.[0].nextPageToken !== undefined
@@ -119,7 +123,7 @@ export function merge(responseData: [any]) {
 	for (const {
 		data: { rows },
 	} of responseData) {
-		allRows.push(...rows);
+		allRows.push(...(rows as IDataObject[]));
 	}
 	response.data.rows = allRows as [];
 	return [response];
diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
index a99aac1146ac5a..31cf06033537c1 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
@@ -245,6 +245,7 @@ export class GoogleAnalyticsV1 implements INodeType {
 						if (simple) {
 							responseData = simplify(responseData);
 						} else if (returnAll && responseData.length > 1) {
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							responseData = merge(responseData);
 						}
 					}
@@ -284,7 +285,7 @@ export class GoogleAnalyticsV1 implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
index b5adbd6859708d..ff3cb1f40a4d3b 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
@@ -713,11 +713,12 @@ export async function execute(
 	if (simple) {
 		responseData = simplify(responseData);
 	} else if (returnAll && responseData.length > 1) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		responseData = merge(responseData);
 	}
 
 	const executionData = this.helpers.constructExecutionMetaData(
-		this.helpers.returnJsonArray(responseData),
+		this.helpers.returnJsonArray(responseData as IDataObject[]),
 		{ itemData: { item: index } },
 	);
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
index f0e633cbd1524e..dfa6f79a1dac98 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
@@ -150,7 +150,7 @@ export async function execute(
 	}
 
 	const executionData = this.helpers.constructExecutionMetaData(
-		this.helpers.returnJsonArray(responseData),
+		this.helpers.returnJsonArray(responseData as IDataObject[]),
 		{ itemData: { item: index } },
 	);
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
index a01f7dc6082b71..71d37220539b1e 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
@@ -47,7 +47,7 @@ export function merge(responseData: [any]) {
 	for (const {
 		data: { rows },
 	} of responseData) {
-		allRows.push(...rows);
+		allRows.push(...(rows as IDataObject[]));
 	}
 	response.data.rows = allRows as [];
 	return [response];
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
index 7370f2be766f3e..ce4a824003ff21 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -48,10 +48,14 @@ export async function googleApiRequest(
 				const [message, ...rest] = parsedError.error.message.split('\n');
 				const description = rest.join('\n');
 				const httpCode = parsedError.error.code;
-				throw new NodeApiError(this.getNode(), error, { message, description, httpCode });
+				throw new NodeApiError(this.getNode(), error as JsonObject, {
+					message,
+					description,
+					httpCode,
+				});
 			}
 		}
-		throw new NodeApiError(this.getNode(), error, { message: error.message });
+		throw new NodeApiError(this.getNode(), error as JsonObject, { message: error.message });
 	}
 }
 
@@ -75,16 +79,16 @@ export async function googleApiRequestAllItems(
 		query.offset = 0;
 
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query, uri);
-		rows = rows.concat(responseData.rows);
+		rows = rows.concat(responseData.rows as IDataObject[]);
 		query.offset = rows.length;
 
 		while (responseData.rowCount > rows.length) {
 			responseData = await googleApiRequest.call(this, method, endpoint, body, query, uri);
-			rows = rows.concat(responseData.rows);
+			rows = rows.concat(responseData.rows as IDataObject[]);
 			query.offset = rows.length;
 		}
 		responseData.rows = rows;
-		returnData.push(responseData);
+		returnData.push(responseData as IDataObject);
 	} else {
 		do {
 			responseData = await googleApiRequest.call(this, method, endpoint, body, query, uri);
@@ -94,7 +98,7 @@ export async function googleApiRequestAllItems(
 			} else {
 				body.pageToken = responseData.nextPageToken;
 			}
-			returnData.push.apply(returnData, responseData[propertyName]);
+			returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		} while (
 			(responseData.nextPageToken !== undefined && responseData.nextPageToken !== '') ||
 			responseData[propertyName]?.[0].nextPageToken !== undefined
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
index a484bfc27519ac..9f62de8ba1f8d6 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
@@ -87,7 +87,7 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -131,7 +131,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.pageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.pageToken !== undefined && responseData.pageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
index 3a7f905190fc69..ce340591ee0ba9 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -192,7 +193,7 @@ export class GoogleBigQuery implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: 0 } },
 					);
 					returnData.push(...executionData);
@@ -204,7 +205,7 @@ export class GoogleBigQuery implements INodeType {
 						);
 						returnData.push(...executionErrorData);
 					}
-					throw new NodeApiError(this.getNode(), error, { itemIndex: 0 });
+					throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: 0 });
 				}
 			} else if (operation === 'getAll') {
 				// ----------------------------------
@@ -262,10 +263,12 @@ export class GoogleBigQuery implements INodeType {
 						if (!returnAll) {
 							responseData = responseData.rows;
 						}
-						responseData = simple ? simplify(responseData, fields) : responseData;
+						responseData = simple
+							? simplify(responseData as IDataObject[], fields as string[])
+							: responseData;
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -278,7 +281,7 @@ export class GoogleBigQuery implements INodeType {
 							returnData.push(...executionErrorData);
 							continue;
 						}
-						throw new NodeApiError(this.getNode(), error, { itemIndex: i });
+						throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: i });
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
index 298ef8fb46602d..593538153fade2 100644
--- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -94,7 +94,7 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -120,7 +120,7 @@ export async function googleApiRequest(
 			error.statusCode = '401';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -140,7 +140,7 @@ export async function googleApiRequestAllItems(
 
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData[propertyName] || []);
+		returnData.push.apply(returnData, (responseData[propertyName] as IDataObject[]) || []);
 	} while (returnData.length < responseData.totalItems);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
index 33e80c46e474dc..64a1efdedbd40c 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
@@ -507,7 +507,7 @@ export class GoogleBooks implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index e2bb7202ce061f..2379b78698f4bd 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	INodeListSearchItems,
 	INodeListSearchResult,
 	IPollFunctions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -36,13 +37,13 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleCalendarOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -63,7 +64,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 5ff26395be324d..9079fb1c34ccf1 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -109,7 +110,7 @@ export class GoogleCalendar implements INodeType {
 			async getColors(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const { event } = await googleApiRequest.call(this, 'GET', '/calendar/v3/colors');
-				for (const key of Object.keys(event)) {
+				for (const key of Object.keys(event as IDataObject)) {
 					const colorName = `Background: ${event[key].background} - Foreground: ${event[key].foreground}`;
 					const colorId = key;
 					returnData.push({
@@ -168,9 +169,13 @@ export class GoogleCalendar implements INodeType {
 						);
 
 						if (responseData.calendars[calendarId].errors) {
-							throw new NodeApiError(this.getNode(), responseData.calendars[calendarId], {
-								itemIndex: i,
-							});
+							throw new NodeApiError(
+								this.getNode(),
+								responseData.calendars[calendarId] as JsonObject,
+								{
+									itemIndex: i,
+								},
+							);
 						}
 
 						if (outputFormat === 'availability') {
@@ -579,7 +584,7 @@ export class GoogleCalendar implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
index 9cbcb03882ce32..ec12705ab5d9e3 100644
--- a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
@@ -7,6 +7,7 @@ import type {
 	ICredentialTestFunctions,
 	IDataObject,
 	INodeProperties,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -96,7 +97,7 @@ export async function googleApiRequest(
 		json: true,
 	};
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -123,7 +124,7 @@ export async function googleApiRequest(
 			error.statusCode = '401';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 	if (Object.keys(responseData as IDataObject).length !== 0) {
 		return responseData;
@@ -149,7 +150,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
index fe7a73fbd0b3ad..5c7393802ec424 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
@@ -246,7 +246,7 @@ export class GoogleChat implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 
 						items[i].binary![binaryPropertyName] = await this.helpers.prepareBinaryData(
-							responseData,
+							responseData as Buffer,
 							endpoint,
 						);
 					}
@@ -536,7 +536,7 @@ export class GoogleChat implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
index 3d7a1d56247749..0e5da0904ad1bd 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -30,7 +30,7 @@ export async function googleApiRequest(
 	options = Object.assign({}, options, option);
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
@@ -40,6 +40,6 @@ export async function googleApiRequest(
 			options,
 		);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
index 0b8d0b9c3ca04a..da6cee4c58d5f3 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -29,14 +29,14 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleContactsOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -57,7 +57,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
@@ -98,7 +98,7 @@ export function cleanData(responseData: any) {
 	}
 	for (let y = 0; y < responseData.length; y++) {
 		const object: { [key: string]: any } = {};
-		for (const key of Object.keys(responseData[y])) {
+		for (const key of Object.keys(responseData[y] as IDataObject)) {
 			if (key === 'metadata') {
 				continue;
 			}
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index b71bb825300ce8..0cb2e6bce4414a 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -505,7 +505,7 @@ export class GoogleContacts implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
index 17b67f685248b8..3537c88587bdd4 100644
--- a/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -112,7 +112,7 @@ export async function googleApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'googleDocsOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -135,7 +135,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query, uri);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
index 2e2d1fa5c91df2..f9b552cabf33f0 100644
--- a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -144,7 +145,9 @@ export class GoogleDocs implements INodeType {
 						'https://www.googleapis.com/drive/v3/drives',
 					);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error, { message: 'Error in loading Drives' });
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: 'Error in loading Drives',
+					});
 				}
 
 				for (const drive of drives) {
@@ -183,7 +186,9 @@ export class GoogleDocs implements INodeType {
 						'https://www.googleapis.com/drive/v3/files',
 					);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error, { message: 'Error in loading Folders' });
+					throw new NodeApiError(this.getNode(), error as JsonObject, {
+						message: 'Error in loading Folders',
+					});
 				}
 
 				for (const folder of folders) {
@@ -494,8 +499,8 @@ export class GoogleDocs implements INodeType {
 						);
 
 						if (simple) {
-							if (Object.keys(responseData.replies[0]).length !== 0) {
-								const key = Object.keys(responseData.replies[0])[0];
+							if (Object.keys(responseData.replies[0] as IDataObject).length !== 0) {
+								const key = Object.keys(responseData.replies[0] as IDataObject)[0];
 								responseData = responseData.replies[0][key];
 							} else {
 								responseData = {};
@@ -517,7 +522,7 @@ export class GoogleDocs implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
index ded6d7b49bc0db..f526e1e454b9dd 100644
--- a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IPollFunctions } from 'n8n-workflow';
+import type { IDataObject, IPollFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -99,7 +99,7 @@ export async function googleApiRequest(
 	options = Object.assign({}, options, option);
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -121,7 +121,7 @@ export async function googleApiRequest(
 			error.statusCode = '401';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -142,7 +142,7 @@ export async function googleApiRequestAllItems(
 
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index e57b4682411ccd..3f7f198c6764eb 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -2069,7 +2069,7 @@ export class GoogleDrive implements INodeType {
 						});
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
+							this.helpers.returnJsonArray(response as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -2115,7 +2115,7 @@ export class GoogleDrive implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
+							this.helpers.returnJsonArray(response as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -2176,7 +2176,7 @@ export class GoogleDrive implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
+							this.helpers.returnJsonArray(response as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -2217,7 +2217,7 @@ export class GoogleDrive implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
+							this.helpers.returnJsonArray(response as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -2320,8 +2320,8 @@ export class GoogleDrive implements INodeType {
 
 						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
 							response.body as unknown as Readable,
-							fileName,
-							mimeType,
+							fileName as string,
+							mimeType as string,
 						);
 					} else if (operation === 'list') {
 						// ----------------------------------
@@ -2412,7 +2412,7 @@ export class GoogleDrive implements INodeType {
 						const version = this.getNode().typeVersion;
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(files),
+							this.helpers.returnJsonArray(files as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -2496,7 +2496,7 @@ export class GoogleDrive implements INodeType {
 									json: false,
 								},
 							);
-							uploadId = JSON.parse(response).id;
+							uploadId = JSON.parse(response as string).id;
 						} else {
 							const resumableUpload = await googleApiRequest.call(
 								this,
@@ -2591,7 +2591,7 @@ export class GoogleDrive implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
+							this.helpers.returnJsonArray(response as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -2636,7 +2636,7 @@ export class GoogleDrive implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -2664,7 +2664,7 @@ export class GoogleDrive implements INodeType {
 						const response = await googleApiRequest.call(this, 'POST', '/drive/v3/files', body, qs);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
+							this.helpers.returnJsonArray(response as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -2729,7 +2729,7 @@ export class GoogleDrive implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(response),
+							this.helpers.returnJsonArray(response as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index 446e8807924010..bc43ff40a92a70 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -30,7 +30,7 @@ export async function googleApiRequest(
 		json: true,
 	};
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -41,7 +41,7 @@ export async function googleApiRequest(
 			options,
 		);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -63,7 +63,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query, uri);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
@@ -97,7 +97,7 @@ export function jsonToDocument(value: string | number | IDataObject | IDataObjec
 		const obj = {};
 		for (const o of Object.keys(value)) {
 			//@ts-ignore
-			obj[o] = jsonToDocument(value[o]);
+			obj[o] = jsonToDocument(value[o] as IDataObject);
 		}
 		return { mapValue: { fields: obj } };
 	}
@@ -136,7 +136,7 @@ export function documentToJson(fields: IDataObject): IDataObject {
 				return value as IDataObject;
 			} else if ('mapValue' === key) {
 				//@ts-ignore
-				return documentToJson(value!.fields || {});
+				return documentToJson((value!.fields as IDataObject) || {});
 			} else if ('arrayValue' === key) {
 				// @ts-ignore
 				const list = value.values as IDataObject[];
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
index a32b4fc194d0f7..6dce53e0d3b45a 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
@@ -130,7 +130,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: 0 } },
 				);
 
@@ -150,7 +150,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 							// @ts-ignore
 							if (item.json[column]) {
 								// @ts-ignore
-								document.fields[column] = jsonToDocument(item.json[column]);
+								document.fields[column] = jsonToDocument(item.json[column] as IDataObject);
 							} else {
 								// @ts-ignore
 								document.fields[column] = jsonToDocument(null);
@@ -166,11 +166,11 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 						responseData.id = (responseData.name as string).split('/').pop();
 
 						if (simple) {
-							responseData = fullDocumentToJson(responseData);
+							responseData = fullDocumentToJson(responseData as IDataObject);
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -213,7 +213,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: 0 } },
 				);
 
@@ -256,7 +256,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 						// @ts-ignore
 						if (item.json.hasOwnProperty(column)) {
 							// @ts-ignore
-							document[column] = jsonToDocument(item.json[column]);
+							document[column] = jsonToDocument(item.json[column] as IDataObject);
 						} else {
 							// @ts-ignore
 							document[column] = jsonToDocument(null);
@@ -288,7 +288,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 					Object.assign(writeResults[i], items[i].json);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(writeResults[i]),
+						this.helpers.returnJsonArray(writeResults[i] as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -358,7 +358,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -395,7 +395,7 @@ export class GoogleFirebaseCloudFirestore implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: 0 } },
 				);
 
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
index 7ea04f3c05c98a..877c3a29fdb09c 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
@@ -35,7 +35,7 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -77,7 +77,7 @@ export async function googleApiRequestAllItems(
 			uri,
 		);
 		qs.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[resource]);
+		returnData.push.apply(returnData, responseData[resource] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
index 65ff3739380921..f69ec937c70733 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -217,7 +218,7 @@ export class GoogleFirebaseRealtimeDatabase implements INodeType {
 
 				if (responseData === null) {
 					if (operation === 'get') {
-						throw new NodeApiError(this.getNode(), responseData, {
+						throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 							message: 'Requested entity was not found.',
 						});
 					} else if (method === 'DELETE') {
@@ -243,7 +244,7 @@ export class GoogleFirebaseRealtimeDatabase implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
index 5604f40363d554..e4d9b99990367a 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -418,7 +418,7 @@ export class GSuiteAdmin implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
index 29c6f2acf84928..2e0c631d876018 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -29,13 +29,13 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'gSuiteAdminOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -56,7 +56,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index 228c11cb3d1b2d..b7111196588d59 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -10,6 +10,7 @@ import type {
 	IDataObject,
 	INodeExecutionData,
 	IPollFunctions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -161,7 +162,7 @@ export async function googleApiRequest(
 						resource.charAt(0).toUpperCase() + resource.slice(1)
 					} IDs should look something like this: 182b676d244938bd`,
 				};
-				throw new NodeApiError(this.getNode(), error, errorOptions);
+				throw new NodeApiError(this.getNode(), error as JsonObject, errorOptions);
 			}
 		}
 
@@ -174,7 +175,7 @@ export async function googleApiRequest(
 				message: `${resource.charAt(0).toUpperCase() + resource.slice(1)} not found`,
 				description: '',
 			};
-			throw new NodeApiError(this.getNode(), error, errorOptions);
+			throw new NodeApiError(this.getNode(), error as JsonObject, errorOptions);
 		}
 
 		if (error.httpCode === '409') {
@@ -184,7 +185,7 @@ export async function googleApiRequest(
 					message: 'Label name exists already',
 					description: '',
 				};
-				throw new NodeApiError(this.getNode(), error, errorOptions);
+				throw new NodeApiError(this.getNode(), error as JsonObject, errorOptions);
 			}
 		}
 
@@ -193,7 +194,7 @@ export async function googleApiRequest(
 				message: error?.body?.error_description || 'Authorization error',
 				description: (error as Error).message,
 			};
-			throw new NodeApiError(this.getNode(), error, errorOptions);
+			throw new NodeApiError(this.getNode(), error as JsonObject, errorOptions);
 		}
 
 		if (
@@ -204,10 +205,10 @@ export async function googleApiRequest(
 				message: error.description,
 				description: '',
 			};
-			throw new NodeApiError(this.getNode(), error, errorOptions);
+			throw new NodeApiError(this.getNode(), error as JsonObject, errorOptions);
 		}
 
-		throw new NodeApiError(this.getNode(), error, {
+		throw new NodeApiError(this.getNode(), error as JsonObject, {
 			message: error.message,
 			description: error.description,
 		});
@@ -220,7 +221,7 @@ export async function parseRawEmail(
 	messageData: any,
 	dataPropertyNameDownload: string,
 ): Promise<INodeExecutionData> {
-	const messageEncoded = Buffer.from(messageData.raw, 'base64').toString('utf8');
+	const messageEncoded = Buffer.from(messageData.raw as string, 'base64').toString('utf8');
 	const responseData = await simpleParser(messageEncoded);
 
 	const headers: IDataObject = {};
@@ -333,9 +334,9 @@ export async function googleApiRequestAllItems(
 	query.maxResults = 100;
 
 	do {
-		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
+		responseData = await googleApiRequest.call(this, method, endpoint, body as IDataObject, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
@@ -621,7 +622,7 @@ export async function replayToEmail(
 		options.replyToSenderOnly === undefined ? false : (options.replyToSenderOnly as boolean);
 
 	const prepareEmailString = (email: string) => {
-		if (email.includes(emailAddress)) return;
+		if (email.includes(emailAddress as string)) return;
 		if (email.includes('<') && email.includes('>')) {
 			to += `${email}, `;
 		} else {
diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index d14363e9473945..8f7b389773e891 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
@@ -294,7 +294,9 @@ export class GmailTrigger implements INodeType {
 			}
 
 			if (simple) {
-				responseData = this.helpers.returnJsonArray(await simplifyOutput.call(this, responseData));
+				responseData = this.helpers.returnJsonArray(
+					await simplifyOutput.call(this, responseData as IDataObject[]),
+				);
 			}
 		} catch (error) {
 			if (this.getMode() === 'manual' || !webhookData.lastTimeChecked) {
diff --git a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
index b6d041df516252..f89e3ef264a3b5 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -589,7 +589,7 @@ export class GmailV1 implements INodeType {
 						}
 
 						if (format !== 'resolved') {
-							responseData = this.helpers.returnJsonArray(responseData);
+							responseData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 						}
 					}
 					if (operation === 'delete') {
@@ -821,13 +821,13 @@ export class GmailV1 implements INodeType {
 						}
 
 						if (format !== 'resolved') {
-							responseData = this.helpers.returnJsonArray(responseData);
+							responseData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 						}
 					}
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
index 7e1deb2387e303..4e9e5c55ccce66 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
@@ -262,7 +262,7 @@ export class GmailV2 implements INodeType {
 
 						responseData = await googleApiRequest.call(this, 'GET', '/gmail/v1/users/me/labels');
 
-						responseData = this.helpers.returnJsonArray(responseData.labels);
+						responseData = this.helpers.returnJsonArray(responseData.labels as IDataObject[]);
 
 						if (!returnAll) {
 							const limit = this.getNodeParameter('limit', i);
@@ -372,7 +372,7 @@ export class GmailV2 implements INodeType {
 								dataPropertyNameDownload,
 							);
 						} else {
-							const [json, _] = await simplifyOutput.call(this, [responseData]);
+							const [json, _] = await simplifyOutput.call(this, [responseData as IDataObject]);
 							nodeExecutionData = { json };
 						}
 
@@ -442,7 +442,7 @@ export class GmailV2 implements INodeType {
 
 						if (simple) {
 							responseData = this.helpers.returnJsonArray(
-								await simplifyOutput.call(this, responseData),
+								await simplifyOutput.call(this, responseData as IDataObject[]),
 							);
 						}
 					}
@@ -694,10 +694,13 @@ export class GmailV2 implements INodeType {
 
 						if (onlyMessages) {
 							responseData = this.helpers.returnJsonArray(
-								await simplifyOutput.call(this, responseData.messages),
+								await simplifyOutput.call(this, responseData.messages as IDataObject[]),
 							);
 						} else {
-							responseData.messages = await simplifyOutput.call(this, responseData.messages);
+							responseData.messages = await simplifyOutput.call(
+								this,
+								responseData.messages as IDataObject[],
+							);
 							responseData = [{ json: responseData }];
 						}
 					}
@@ -733,7 +736,7 @@ export class GmailV2 implements INodeType {
 							responseData = [];
 						}
 
-						responseData = this.helpers.returnJsonArray(responseData);
+						responseData = this.helpers.returnJsonArray(responseData as IDataObject[]);
 					}
 					if (operation === 'reply') {
 						const messageIdGmail = this.getNodeParameter('messageId', i) as string;
@@ -783,7 +786,7 @@ export class GmailV2 implements INodeType {
 				//------------------------------------------------------------------//
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{
 						itemData: { item: i },
 					},
@@ -795,7 +798,7 @@ export class GmailV2 implements INodeType {
 					returnData.push({ json: { error: error.message }, pairedItem: { item: i } });
 					continue;
 				}
-				throw new NodeOperationError(this.getNode(), error, {
+				throw new NodeOperationError(this.getNode(), error as Error, {
 					description: error.description,
 					itemIndex: i,
 				});
diff --git a/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
index 3b2993dc5ad625..66b658d2dc0d4b 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -29,6 +29,6 @@ export async function googleApiRequest(
 	try {
 		return await this.helpers.requestOAuth2.call(this, 'googlePerspectiveOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index 350eb29e52ff32..2b35201f902c47 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
@@ -275,7 +276,7 @@ export class GooglePerspective implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as JsonObject),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
index e4bcb37816b194..514c12d95270cd 100644
--- a/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/GoogleSheetsTrigger.node.ts
@@ -597,7 +597,7 @@ export class GoogleSheetsTrigger implements INodeType {
 				const previousRevisionSheetData =
 					sheetBinaryToArrayOfArrays(
 						previousRevisionBinaryData,
-						sheetName,
+						sheetName as string,
 						rangeDefinition === 'specifyRangeA1' ? range : undefined,
 					) || [];
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
index 713d35a3c008c3..1603395fd12f37 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { ICredentialTestFunctions, IDataObject } from 'n8n-workflow';
+import type { ICredentialTestFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -102,7 +102,7 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -124,7 +124,7 @@ export async function googleApiRequest(
 			error.statusCode = '401';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -145,7 +145,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
index 5c9c3ff5ac0f29..1ca0e728cb6d97 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
@@ -201,7 +201,7 @@ export class GoogleSheetsV1 implements INodeType {
 							Object.assign(responseData, responseData.replies[0].addSheet.properties);
 							delete responseData.replies;
 						}
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ error: error.message });
@@ -366,7 +366,7 @@ export class GoogleSheetsV1 implements INodeType {
 							{ requests },
 						);
 						delete responseData.replies;
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ error: error.message });
@@ -479,7 +479,7 @@ export class GoogleSheetsV1 implements INodeType {
 
 						responseData = await googleApiRequest.call(this, 'POST', '/v4/spreadsheets', body);
 
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ error: error.message });
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
index 70946a6e1568b3..5f0493e5a82394 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
@@ -121,7 +121,7 @@ export async function execute(
 
 		existingSheetNames.push(sheetTitle);
 
-		returnData.push(responseData);
+		returnData.push(responseData as IDataObject);
 	}
 	return this.helpers.returnJsonArray(returnData);
 }
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
index 442cd2a0da5128..8e5855d289765b 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
@@ -27,7 +27,7 @@ export async function execute(
 			{ requests },
 		);
 		delete responseData.replies;
-		returnData.push(responseData);
+		returnData.push(responseData as IDataObject);
 	}
 
 	return this.helpers.returnJsonArray(returnData);
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
index 060babac7345bd..7fb605cd01513f 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
@@ -146,7 +146,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 		body.properties.locale = options.locale ? (options.locale as string) : undefined;
 
 		const response = await apiRequest.call(this, 'POST', '/v4/spreadsheets', body);
-		returnData.push(response);
+		returnData.push(response as IDataObject);
 	}
 
 	return this.helpers.returnJsonArray(returnData);
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
index 6608e3f04fb81f..790eec4b4e2b41 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
@@ -1,6 +1,11 @@
 import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { ICredentialTestFunctions, IDataObject, IPollFunctions } from 'n8n-workflow';
+import type {
+	ICredentialTestFunctions,
+	IDataObject,
+	IPollFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import moment from 'moment-timezone';
 import jwt from 'jsonwebtoken';
@@ -129,10 +134,10 @@ export async function apiRequest(
 			const message = 'Missing permissions for Google Sheet';
 			const description =
 				"Please check that the account you're using has the right permissions. (If you're trying to modify the sheet, you'll need edit access.)";
-			throw new NodeApiError(this.getNode(), error, { message, description });
+			throw new NodeApiError(this.getNode(), error as JsonObject, { message, description });
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -153,7 +158,7 @@ export async function apiRequestAllItems(
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query, url);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
index 2e191ffc960dfe..c86ca96574691f 100644
--- a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -117,6 +117,6 @@ export async function googleApiRequest(
 			error.statusCode = '401';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
index bd4be230c43df0..53956c45e3658c 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
@@ -413,7 +413,7 @@ export class GoogleSlides implements INodeType {
 							`/presentations/${presentationId}/pages/${pageObjectId}`,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -443,7 +443,10 @@ export class GoogleSlides implements INodeType {
 							});
 
 							const fileName = pageObjectId + '.png';
-							const binaryData = await this.helpers.prepareBinaryData(data, fileName || fileName);
+							const binaryData = await this.helpers.prepareBinaryData(
+								data as Buffer,
+								fileName || fileName,
+							);
 							const executionData = this.helpers.constructExecutionMetaData(
 								[
 									{
@@ -459,7 +462,7 @@ export class GoogleSlides implements INodeType {
 							returnData.push(...executionData);
 						} else {
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
+								this.helpers.returnJsonArray(responseData as IDataObject),
 								{ itemData: { item: i } },
 							);
 
@@ -483,7 +486,7 @@ export class GoogleSlides implements INodeType {
 						responseData = await googleApiRequest.call(this, 'POST', '/presentations', body);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -501,7 +504,7 @@ export class GoogleSlides implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -526,7 +529,7 @@ export class GoogleSlides implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -569,7 +572,7 @@ export class GoogleSlides implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
index f010899f9b82b9..31c03c05a4438a 100644
--- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -35,7 +35,7 @@ export async function googleApiRequest(
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'googleTasksOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -55,7 +55,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index 795afdf8a671a2..04416c22e86ad5 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -254,7 +254,7 @@ export class GoogleTasks implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
index a6605e1b2060c3..b842cb6b61ab7b 100644
--- a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -97,7 +97,7 @@ export async function googleApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -117,7 +117,7 @@ export async function googleApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'googleTranslateOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -138,7 +138,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
index 89a33aed7b8a0e..3e808a7d7327c7 100644
--- a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
@@ -1,6 +1,7 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -203,7 +204,7 @@ export class GoogleTranslate implements INodeType {
 					const [translation] = response.data.translations;
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(translation),
+						this.helpers.returnJsonArray(translation as IDataObject),
 						{ itemData: { item: i } },
 					);
 
diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
index 00e4bbde099f76..656cb94a5f530e 100644
--- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
@@ -28,14 +28,14 @@ export async function googleApiRequest(
 	try {
 		options = Object.assign({}, options, option);
 
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'youTubeOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -56,7 +56,7 @@ export async function googleApiRequestAllItems(
 	do {
 		responseData = await googleApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index b1e7494223871d..ceb9fc5cded9fd 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -430,7 +430,7 @@ export class YouTube implements INodeType {
 							requestOptions,
 						);
 
-						const { url } = JSON.parse(response);
+						const { url } = JSON.parse(response as string);
 
 						qs.part = 'brandingSettings';
 
@@ -1105,7 +1105,7 @@ export class YouTube implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
index 614119b687999d..43fc6ba74b556f 100644
--- a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function gotifyApiRequest(
@@ -29,14 +29,14 @@ export async function gotifyApiRequest(
 		json: true,
 	};
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function gotifyApiRequestAllItems(
 		if (responseData.paging.next) {
 			uri = responseData.paging.next;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.paging.next);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.ts b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
index 26673409a6df9a..018f6e104e0e10 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.ts
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
@@ -214,7 +214,7 @@ export class Gotify implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Grafana/GenericFunctions.ts b/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
index baacff028025ad..21d10ea33cd829 100644
--- a/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -69,7 +69,7 @@ export async function grafanaApiRequest(
 				'Invalid credentials or error in establishing connection with given credentials';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Grafana/Grafana.node.ts b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
index 0dad6964e3a44a..92dcd3d1c09b9c 100644
--- a/packages/nodes-base/nodes/Grafana/Grafana.node.ts
+++ b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
@@ -480,8 +480,8 @@ export class Grafana implements INodeType {
 				}
 
 				Array.isArray(responseData)
-					? returnData.push(...responseData)
-					: returnData.push(responseData);
+					? returnData.push(...(responseData as IDataObject[]))
+					: returnData.push(responseData as IDataObject);
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ error: error.message });
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index c1a9d3c525533e..92badb367d499a 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -392,7 +393,9 @@ export class GraphQL implements INodeType {
 						};
 						if (typeof requestOptions.body.variables === 'string') {
 							try {
-								requestOptions.body.variables = JSON.parse(requestOptions.body.variables || '{}');
+								requestOptions.body.variables = JSON.parse(
+									(requestOptions.body.variables as string) || '{}',
+								);
 							} catch (error) {
 								throw new NodeOperationError(
 									this.getNode(),
@@ -448,10 +451,10 @@ export class GraphQL implements INodeType {
 						const message =
 							response.errors?.map((error: IDataObject) => error.message).join(', ') ||
 							'Unexpected error';
-						throw new NodeApiError(this.getNode(), response.errors, { message });
+						throw new NodeApiError(this.getNode(), response.errors as JsonObject, { message });
 					}
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(response),
+						this.helpers.returnJsonArray(response as IDataObject),
 						{ itemData: { item: itemIndex } },
 					);
 					returnItems.push(...executionData);
diff --git a/packages/nodes-base/nodes/Grist/GenericFunctions.ts b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
index 101def1a1f2d92..3a2d77be8b58a3 100644
--- a/packages/nodes-base/nodes/Grist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type {
@@ -52,7 +52,7 @@ export async function gristApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index c529165f1749c3..7b7f9a593d9028 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -258,7 +258,7 @@ export class Grist implements INodeType {
 				throw error;
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
index ec3f6ebb0a9593..54ef0cca825984 100644
--- a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
@@ -6,7 +6,7 @@ import type {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function gumroadApiRequest(
@@ -35,13 +35,13 @@ export async function gumroadApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
index 0e7a58c407add9..bdea5643853e73 100644
--- a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
@@ -136,7 +136,7 @@ export class GumroadTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
index 341f98e7200978..fce70da36b54cb 100644
--- a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -25,7 +25,7 @@ export async function hackerNewsApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -50,7 +50,7 @@ export async function hackerNewsApiRequestAllItems(
 
 	do {
 		responseData = await hackerNewsApiRequest.call(this, method, endpoint, qs);
-		returnData.push.apply(returnData, responseData.hits);
+		returnData.push.apply(returnData, responseData.hits as IDataObject[]);
 
 		if (returnData !== undefined) {
 			itemsReceived += returnData.length;
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
index 5452b1eec9f5b9..3c23bcea1292dc 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
@@ -343,7 +343,7 @@ export class HackerNews implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
index e7358f131e6b08..2a46185a749314 100644
--- a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
+++ b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
@@ -278,7 +278,7 @@ export class HaloPSA implements INodeType {
 							tokens.access_token,
 						);
 						responseData = simplify
-							? simplifyHaloPSAGetOutput([response], simplifiedOutput)
+							? simplifyHaloPSAGetOutput([response] as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -314,7 +314,7 @@ export class HaloPSA implements INodeType {
 							response = clients;
 						}
 						responseData = simplify
-							? simplifyHaloPSAGetOutput(response, simplifiedOutput)
+							? simplifyHaloPSAGetOutput(response as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -385,7 +385,7 @@ export class HaloPSA implements INodeType {
 							tokens.access_token,
 						);
 						responseData = simplify
-							? simplifyHaloPSAGetOutput([response], simplifiedOutput)
+							? simplifyHaloPSAGetOutput([response] as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -421,7 +421,7 @@ export class HaloPSA implements INodeType {
 							response = sites;
 						}
 						responseData = simplify
-							? simplifyHaloPSAGetOutput(response, simplifiedOutput)
+							? simplifyHaloPSAGetOutput(response as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -494,7 +494,7 @@ export class HaloPSA implements INodeType {
 							tokens.access_token,
 						);
 						responseData = simplify
-							? simplifyHaloPSAGetOutput([response], simplifiedOutput)
+							? simplifyHaloPSAGetOutput([response] as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -530,7 +530,7 @@ export class HaloPSA implements INodeType {
 							response = tickets;
 						}
 						responseData = simplify
-							? simplifyHaloPSAGetOutput(response, simplifiedOutput)
+							? simplifyHaloPSAGetOutput(response as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -602,7 +602,7 @@ export class HaloPSA implements INodeType {
 							tokens.access_token,
 						);
 						responseData = simplify
-							? simplifyHaloPSAGetOutput([response], simplifiedOutput)
+							? simplifyHaloPSAGetOutput([response] as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -638,7 +638,7 @@ export class HaloPSA implements INodeType {
 							response = users;
 						}
 						responseData = simplify
-							? simplifyHaloPSAGetOutput(response, simplifiedOutput)
+							? simplifyHaloPSAGetOutput(response as IDataObject[], simplifiedOutput)
 							: response;
 					}
 
@@ -661,7 +661,7 @@ export class HaloPSA implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
index 9018d1bb2232b7..312c949dac9984 100644
--- a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function harvestApiRequest(
@@ -33,7 +33,7 @@ export async function harvestApiRequest(
 	};
 
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
@@ -50,7 +50,7 @@ export async function harvestApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'harvestOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -74,7 +74,7 @@ export async function harvestApiRequestAllItems(
 	do {
 		responseData = await harvestApiRequest.call(this, method, qs, uri, body, option);
 		qs.page = responseData.next_page;
-		returnData.push.apply(returnData, responseData[resource]);
+		returnData.push.apply(returnData, responseData[resource] as IDataObject[]);
 	} while (responseData.next_page);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index 36bf2568f7ecf5..b2931ba2341cea 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -230,7 +230,7 @@ export class Harvest implements INodeType {
 
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -269,7 +269,7 @@ export class Harvest implements INodeType {
 							body,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -298,7 +298,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -315,7 +315,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -332,7 +332,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -349,7 +349,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -366,7 +366,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -392,7 +392,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -418,7 +418,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -458,7 +458,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -484,7 +484,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -501,7 +501,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -527,7 +527,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -571,7 +571,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -597,7 +597,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -614,7 +614,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -640,7 +640,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -670,7 +670,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -699,7 +699,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -725,7 +725,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -742,7 +742,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -768,7 +768,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -809,7 +809,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -835,7 +835,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -852,7 +852,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -876,7 +876,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -902,7 +902,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -942,7 +942,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -968,7 +968,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -985,7 +985,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1011,7 +1011,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1051,7 +1051,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1077,7 +1077,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1094,7 +1094,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1120,7 +1120,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1162,7 +1162,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1188,7 +1188,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1205,7 +1205,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1231,7 +1231,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1271,7 +1271,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1297,7 +1297,7 @@ export class Harvest implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -1314,7 +1314,7 @@ export class Harvest implements INodeType {
 						const responseData = await harvestApiRequest.call(this, requestMethod, qs, endpoint);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index 146b6724664e88..4d21b8f51e47bd 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
@@ -36,13 +36,13 @@ export async function helpscoutApiRequest(
 		if (Object.keys(option).length !== 0) {
 			options = Object.assign({}, options, option);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'helpScoutOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -58,12 +58,12 @@ export async function helpscoutApiRequestAllItems(
 	const returnData: IDataObject[] = [];
 
 	let responseData;
-	let uri;
+	let uri: undefined | string = undefined;
 
 	do {
 		responseData = await helpscoutApiRequest.call(this, method, endpoint, body, query, uri);
 		uri = get(responseData, '_links.next.href');
-		returnData.push.apply(returnData, get(responseData, propertyName));
+		returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 		if (query.limit && query.limit <= returnData.length) {
 			return returnData;
 		}
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index 1d1e39e6d52bd4..d68f840a5cdc97 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -217,7 +217,7 @@ export class HelpScout implements INodeType {
 						const id = responseData.headers['resource-id'];
 						const uri = responseData.headers.location;
 						if (resolveData) {
-							responseData = await helpscoutApiRequest.call(this, 'GET', '', {}, {}, uri);
+							responseData = await helpscoutApiRequest.call(this, 'GET', '', {}, {}, uri as string);
 						} else {
 							responseData = {
 								id,
@@ -335,7 +335,7 @@ export class HelpScout implements INodeType {
 						const id = responseData.headers['resource-id'];
 						const uri = responseData.headers.location;
 						if (resolveData) {
-							responseData = await helpscoutApiRequest.call(this, 'GET', '', {}, {}, uri);
+							responseData = await helpscoutApiRequest.call(this, 'GET', '', {}, {}, uri as string);
 						} else {
 							responseData = {
 								id,
@@ -573,7 +573,7 @@ export class HelpScout implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts b/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts
index 0be43214fa6134..25af2a5d2470ad 100644
--- a/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HighLevel/GenericFunctions.ts
@@ -184,7 +184,7 @@ export async function taskUpdatePreSendAction(
 		const responseData = await highLevelApiRequest.call(this, 'GET', resource);
 		body.title = body.title || responseData.title;
 		// the api response dueDate has to be formatted or it will error on update
-		body.dueDate = body.dueDate || dateToIsoSupressMillis(responseData.dueDate);
+		body.dueDate = body.dueDate || dateToIsoSupressMillis(responseData.dueDate as string);
 		requestOptions.body = body;
 	}
 	return requestOptions;
diff --git a/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
index 153c07b5d2d8f8..89e4dac2a301bf 100644
--- a/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, INodePropertyOptions } from 'n8n-workflow';
+import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function homeAssistantApiRequest(
@@ -32,7 +32,7 @@ export async function homeAssistantApiRequest(
 	};
 
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
@@ -40,7 +40,7 @@ export async function homeAssistantApiRequest(
 			return await this.helpers.request(options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -72,13 +72,18 @@ export async function getHomeAssistantServices(
 	if (domain === '') {
 		// If no domain specified return domains
 		const domains = services.map(({ domain: service }: IDataObject) => service as string).sort();
-		returnData.push(...domains.map((service: string) => ({ name: service, value: service })));
+		returnData.push(
+			...(domains.map((service: string) => ({
+				name: service,
+				value: service,
+			})) as INodePropertyOptions[]),
+		);
 		return returnData;
 	} else {
 		// If we have a domain, return all relevant services
 		const domainServices = services.filter((service: IDataObject) => service.domain === domain);
 		for (const domainService of domainServices) {
-			for (const [serviceID, value] of Object.entries(domainService.services)) {
+			for (const [serviceID, value] of Object.entries(domainService.services as IDataObject)) {
 				const serviceProperties = value as IDataObject;
 				const serviceName = serviceProperties.description || serviceID;
 				returnData.push({
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
index ddc69e1e53da84..9e04244765bdd7 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -453,7 +453,7 @@ export class HomeAssistant implements INodeType {
 				throw error;
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index 75b8a0b2ed8667..6c08ece69d6560 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -256,7 +256,10 @@ export class Html implements INodeType {
 					let html = this.getNodeParameter('html', itemIndex) as string;
 
 					for (const resolvable of getResolvables(html)) {
-						html = html.replace(resolvable, this.evaluateExpression(resolvable, itemIndex) as any);
+						html = html.replace(
+							resolvable,
+							this.evaluateExpression(resolvable, itemIndex) as string,
+						);
 					}
 
 					const result = this.helpers.constructExecutionMetaData(
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index 125da63a10ac71..0dbad1a8e503d4 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
@@ -23,6 +24,8 @@ interface OptionDataParamters {
 	[key: string]: OptionData;
 }
 
+type OptionsWithUriKeys = keyof OptionsWithUri;
+
 export class HttpRequestV1 implements INodeType {
 	description: INodeTypeDescription;
 
@@ -826,7 +829,9 @@ export class HttpRequestV1 implements INodeType {
 						// If it is not an object && bodyContentType is not 'raw' it must be JSON so parse it
 						try {
 							// @ts-ignore
-							requestOptions[optionData.name] = JSON.parse(requestOptions[optionData.name]);
+							requestOptions[optionData.name] = JSON.parse(
+								requestOptions[optionData.name as OptionsWithUriKeys] as string,
+							);
 						} catch (error) {
 							throw new NodeOperationError(
 								this.getNode(),
@@ -985,7 +990,7 @@ export class HttpRequestV1 implements INodeType {
 			if (response!.status !== 'fulfilled') {
 				if (!this.continueOnFail()) {
 					// throw error;
-					throw new NodeApiError(this.getNode(), response);
+					throw new NodeApiError(this.getNode(), response as JsonObject);
 				} else {
 					// Return the actual reason as error
 					returnItems.push({
@@ -1040,14 +1045,14 @@ export class HttpRequestV1 implements INodeType {
 					newItem.json = returnItem;
 
 					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response!.body,
+						response!.body as Buffer,
 						fileName,
 					);
 				} else {
 					newItem.json = items[itemIndex].json;
 
 					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response!,
+						response! as Buffer,
 						fileName,
 					);
 				}
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index 5b85cf4fee4df4..89fabccbaf7f36 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
@@ -25,6 +26,7 @@ interface OptionDataParamters {
 	[key: string]: OptionData;
 }
 
+type OptionsWithUriKeys = keyof OptionsWithUri;
 export class HttpRequestV2 implements INodeType {
 	description: INodeTypeDescription;
 
@@ -864,7 +866,9 @@ export class HttpRequestV2 implements INodeType {
 						// If it is not an object && bodyContentType is not 'raw' it must be JSON so parse it
 						try {
 							// @ts-ignore
-							requestOptions[optionData.name] = JSON.parse(requestOptions[optionData.name]);
+							requestOptions[optionData.name] = JSON.parse(
+								requestOptions[optionData.name as OptionsWithUriKeys] as string,
+							);
 						} catch (error) {
 							throw new NodeOperationError(
 								this.getNode(),
@@ -1037,7 +1041,7 @@ export class HttpRequestV2 implements INodeType {
 			if (response!.status !== 'fulfilled') {
 				if (!this.continueOnFail()) {
 					// throw error;
-					throw new NodeApiError(this.getNode(), response);
+					throw new NodeApiError(this.getNode(), response as JsonObject);
 				} else {
 					// Return the actual reason as error
 					returnItems.push({
@@ -1092,14 +1096,14 @@ export class HttpRequestV2 implements INodeType {
 					newItem.json = returnItem;
 
 					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response!.body,
+						response!.body as Buffer,
 						fileName,
 					);
 				} else {
 					newItem.json = items[itemIndex].json;
 
 					newItem.binary![dataPropertyName] = await this.helpers.prepareBinaryData(
-						response!,
+						response! as Buffer,
 						fileName,
 					);
 				}
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index af4eada7bdfbf5..45570b6df239e5 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeBaseDescription,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
@@ -1307,9 +1308,9 @@ export class HttpRequestV3 implements INodeType {
 			if (response!.status !== 'fulfilled') {
 				if (!this.continueOnFail()) {
 					if (autoDetectResponseFormat && response.reason.error instanceof Buffer) {
-						response.reason.error = Buffer.from(response.reason.error).toString();
+						response.reason.error = Buffer.from(response.reason.error as Buffer).toString();
 					}
-					throw new NodeApiError(this.getNode(), response);
+					throw new NodeApiError(this.getNode(), response as JsonObject);
 				} else {
 					// Return the actual reason as error
 					returnItems.push({
@@ -1349,7 +1350,7 @@ export class HttpRequestV3 implements INodeType {
 						0,
 						false,
 					) as boolean;
-					const data = Buffer.from(response.body).toString();
+					const data = Buffer.from(response.body as Buffer).toString();
 					response.body = jsonParse(data, {
 						...(neverError
 							? { fallbackValue: {} }
@@ -1359,7 +1360,7 @@ export class HttpRequestV3 implements INodeType {
 					responseFormat = 'file';
 				} else {
 					responseFormat = 'text';
-					const data = Buffer.from(response.body).toString();
+					const data = Buffer.from(response.body as Buffer).toString();
 					response.body = !data ? undefined : data;
 				}
 			}
@@ -1408,14 +1409,14 @@ export class HttpRequestV3 implements INodeType {
 					newItem.json = returnItem;
 
 					newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(
-						response!.body,
+						response!.body as Buffer,
 						fileName,
 					);
 				} else {
 					newItem.json = items[itemIndex].json;
 
 					newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(
-						response!,
+						response! as Buffer,
 						fileName,
 					);
 				}
diff --git a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
index 7d627d9f3460dd..a380a222bd7766 100644
--- a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
@@ -97,7 +97,7 @@ export async function hubspotApiRequestAllItems(
 		if (responseData.paging) {
 			body.after = responseData.paging.next.after;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		//ticket:getAll endpoint does not support setting a limit, so return once the limit is reached
 		if (query.limit && query.limit <= returnData.length && endpoint.includes('/tickets/paged')) {
 			return returnData;
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
index 2ac6d125a50abb..c547ab70bfa229 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -959,7 +959,7 @@ export class Hubspot implements INodeType {
 						`/contacts/v1/lists/${listId}/add`,
 						body,
 					);
-					returnData.push(responseData);
+					returnData.push(responseData as INodeExecutionData);
 				}
 				//https://legacydocs.hubspot.com/docs/methods/lists/remove_contact_from_list
 				if (operation === 'remove') {
@@ -975,7 +975,7 @@ export class Hubspot implements INodeType {
 						`/contacts/v1/lists/${listId}/remove`,
 						body,
 					);
-					returnData.push(responseData);
+					returnData.push(responseData as INodeExecutionData);
 				}
 			} catch (error) {
 				if (this.continueOnFail()) {
@@ -2720,7 +2720,7 @@ export class Hubspot implements INodeType {
 						}
 					}
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index da60ba00917727..583728492abac4 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -436,7 +436,7 @@ export class HubspotTrigger implements INodeType {
 			delete bodyData[i].objectId;
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(bodyData)],
+			workflowData: [this.helpers.returnJsonArray(bodyData as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
index 0df68d93d877f1..fb952ac9318d90 100644
--- a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function humanticAiApiRequest(
@@ -35,18 +35,18 @@ export async function humanticAiApiRequest(
 		options = Object.assign({}, options, option);
 		options.qs.apikey = credentials.apiKey;
 
-		if (Object.keys(options.body).length === 0) {
+		if (Object.keys(options.body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
 		const response = await this.helpers.request(options);
 
 		if (response.data && response.data.status === 'error') {
-			throw new NodeApiError(this.getNode(), response.data);
+			throw new NodeApiError(this.getNode(), response.data as JsonObject);
 		}
 
 		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
index 3ee85baf23670b..601830fd0658da 100644
--- a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
@@ -5,7 +5,7 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function hunterApiRequest(
@@ -28,13 +28,13 @@ export async function hunterApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function hunterApiRequestAllItems(
 
 	do {
 		responseData = await hunterApiRequest.call(this, method, resource, body, query);
-		returnData.push(responseData[propertyName]);
+		returnData.push(responseData[propertyName] as IDataObject);
 		query.offset += query.limit;
 	} while (
 		responseData.meta?.results !== undefined &&
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.ts b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
index 37e29a0efc28ac..e630a5da88146f 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.ts
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
@@ -319,7 +319,7 @@ export class Hunter implements INodeType {
 								}
 								(tempReturnData.emails as IDataObject[]).push.apply(
 									tempReturnData.emails,
-									responseData[index].emails,
+									responseData[index].emails as IDataObject[],
 								);
 							}
 
@@ -337,7 +337,7 @@ export class Hunter implements INodeType {
 
 						if (Array.isArray(responseData)) {
 							for (const data of responseData) {
-								tempReturnData.push.apply(tempReturnData, data.emails);
+								tempReturnData.push.apply(tempReturnData, data.emails as IDataObject[]);
 							}
 						} else {
 							tempReturnData = responseData.emails;
@@ -366,7 +366,7 @@ export class Hunter implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
index 97211dc10ff41e..4a3d927bcb462b 100644
--- a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function intercomApiRequest(
@@ -38,7 +38,7 @@ export async function intercomApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -66,7 +66,7 @@ export async function intercomApiRequestAllItems(
 	do {
 		responseData = await intercomApiRequest.call(this, endpoint, method, body, query, uri);
 		uri = responseData.pages.next;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.pages?.next !== null);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index 3c7b93592ef15a..83faa932d6f5d7 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import { leadFields, leadOperations } from './LeadDescription';
@@ -82,7 +83,7 @@ export class Intercom implements INodeType {
 				try {
 					response = await intercomApiRequest.call(this, '/companies', 'GET');
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 				const companies = response.companies;
 				for (const company of companies) {
@@ -201,7 +202,7 @@ export class Intercom implements INodeType {
 						try {
 							responseData = await intercomApiRequest.call(this, '/contacts', 'POST', body);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					if (operation === 'get') {
@@ -224,7 +225,7 @@ export class Intercom implements INodeType {
 								responseData = responseData.contacts;
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					if (operation === 'getAll') {
@@ -248,7 +249,7 @@ export class Intercom implements INodeType {
 								responseData = responseData.contacts;
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					if (operation === 'delete') {
@@ -262,7 +263,7 @@ export class Intercom implements INodeType {
 								responseData = await intercomApiRequest.call(this, '/contacts', 'DELETE', {}, qs);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 				}
@@ -377,7 +378,7 @@ export class Intercom implements INodeType {
 						try {
 							responseData = await intercomApiRequest.call(this, '/users', 'POST', body, qs);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					if (operation === 'get') {
@@ -399,7 +400,7 @@ export class Intercom implements INodeType {
 								responseData = await intercomApiRequest.call(this, '/users', 'GET', {}, qs);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					if (operation === 'getAll') {
@@ -423,7 +424,7 @@ export class Intercom implements INodeType {
 								responseData = responseData.users;
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					if (operation === 'delete') {
@@ -614,7 +615,7 @@ export class Intercom implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index ae0dc2e604f8bb..f88d099802f4e7 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -74,7 +74,7 @@ export async function invoiceNinjaApiRequestAllItems(
 		if (next) {
 			uri = next;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.meta?.pagination?.links?.next);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index 54e668a1af261a..b02c2754cdcb34 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -1006,7 +1006,7 @@ export class InvoiceNinja implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
index 6011e08f872ff8..11735fd71a09e2 100644
--- a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function iterableApiRequest(
@@ -32,13 +32,13 @@ export async function iterableApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function iterableApiRequestAllItems(
 	do {
 		responseData = await iterableApiRequest.call(this, method, endpoint, body, query);
 		query.pageToken = responseData.nextPageToken;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextPageToken !== undefined && responseData.nextPageToken !== '');
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index fbb0adea09a2dc..f61998e8a2eb32 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -142,7 +143,7 @@ export class Iterable implements INodeType {
 
 				responseData = await iterableApiRequest.call(this, 'POST', '/events/trackBulk', { events });
 
-				returnData.push(responseData);
+				returnData.push(responseData as IDataObject);
 			}
 		}
 
@@ -189,7 +190,7 @@ export class Iterable implements INodeType {
 						}
 					}
 
-					returnData.push(responseData);
+					returnData.push(responseData as IDataObject);
 				}
 			}
 
@@ -213,11 +214,11 @@ export class Iterable implements INodeType {
 
 					if (!this.continueOnFail()) {
 						if (responseData.code !== 'Success') {
-							throw new NodeApiError(this.getNode(), responseData);
+							throw new NodeApiError(this.getNode(), responseData as JsonObject);
 						}
 					}
 
-					returnData.push(responseData);
+					returnData.push(responseData as IDataObject);
 				}
 			}
 
@@ -241,8 +242,8 @@ export class Iterable implements INodeType {
 					responseData = await iterableApiRequest.call(this, 'GET', endpoint, {}, qs);
 
 					if (!this.continueOnFail()) {
-						if (Object.keys(responseData).length === 0) {
-							throw new NodeApiError(this.getNode(), responseData, {
+						if (Object.keys(responseData as IDataObject).length === 0) {
+							throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 								message: 'User not found',
 								httpCode: '404',
 							});
@@ -250,7 +251,7 @@ export class Iterable implements INodeType {
 					}
 
 					responseData = responseData.user || {};
-					returnData.push(responseData);
+					returnData.push(responseData as IDataObject);
 				}
 			}
 		}
@@ -283,7 +284,7 @@ export class Iterable implements INodeType {
 
 				responseData = await iterableApiRequest.call(this, 'POST', '/lists/subscribe', body);
 
-				returnData.push(responseData);
+				returnData.push(responseData as IDataObject);
 			}
 
 			if (operation === 'remove') {
@@ -317,7 +318,7 @@ export class Iterable implements INodeType {
 
 				responseData = await iterableApiRequest.call(this, 'POST', '/lists/unsubscribe', body);
 
-				returnData.push(responseData);
+				returnData.push(responseData as IDataObject);
 			}
 		}
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
index eafe83cdd2f1c8..40ce7625459ff4 100644
--- a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export function tolerateTrailingSlash(baseUrl: string) {
@@ -42,6 +42,6 @@ export async function jenkinsApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts b/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
index 364720edd1675b..47bd1db76f7441 100644
--- a/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
+++ b/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
@@ -10,6 +10,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -538,7 +539,7 @@ export class Jenkins implements INodeType {
 							if (error.httpCode === '302') {
 								responseData = { success: true };
 							} else {
-								throw new NodeApiError(this.getNode(), error);
+								throw new NodeApiError(this.getNode(), error as JsonObject);
 							}
 						}
 					}
@@ -590,7 +591,7 @@ export class Jenkins implements INodeType {
 							if (error.httpCode === '503') {
 								responseData = { success: true };
 							} else {
-								throw new NodeApiError(this.getNode(), error);
+								throw new NodeApiError(this.getNode(), error as JsonObject);
 							}
 						}
 					}
@@ -602,7 +603,7 @@ export class Jenkins implements INodeType {
 							if (error.httpCode === '503') {
 								responseData = { success: true };
 							} else {
-								throw new NodeApiError(this.getNode(), error);
+								throw new NodeApiError(this.getNode(), error as JsonObject);
 							}
 						}
 					}
diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index c4988e44a80fbe..ac1e5a53228a68 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, INodeListSearchItems } from 'n8n-workflow';
+import type { IDataObject, INodeListSearchItems, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function jiraSoftwareCloudApiRequest(
@@ -49,7 +49,7 @@ export async function jiraSoftwareCloudApiRequest(
 		Object.assign(options, option);
 	}
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -63,7 +63,7 @@ export async function jiraSoftwareCloudApiRequest(
 			error.description?.includes &&
 			error.description.includes("Field 'priority' cannot be set")
 		) {
-			throw new NodeApiError(this.getNode(), error, {
+			throw new NodeApiError(this.getNode(), error as JsonObject, {
 				message:
 					"Field 'priority' cannot be set. You need to add the Priority field to your Jira Project's Issue Types.",
 			});
@@ -91,7 +91,7 @@ export async function jiraSoftwareCloudApiRequestAllItems(
 
 	do {
 		responseData = await jiraSoftwareCloudApiRequest.call(this, endpoint, method, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query.startAt = (responseData.startAt as number) + (responseData.maxResults as number);
 		body.startAt = (responseData.startAt as number) + (responseData.maxResults as number);
 	} while (
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 4336afd5f58d90..65393eeff5d82c 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -327,9 +327,9 @@ export class Jira implements INodeType {
 					.find((o: any) => o.id === projectId)
 					.issuetypes.find((o: any) => o.id === issueTypeId).fields;
 
-				for (const key of Object.keys(fields)) {
+				for (const key of Object.keys(fields as IDataObject)) {
 					const field = fields[key];
-					if (field.schema && Object.keys(field.schema).includes('customId')) {
+					if (field.schema && Object.keys(field.schema as IDataObject).includes('customId')) {
 						returnData.push({
 							name: field.name,
 							value: field.key || field.fieldId,
@@ -599,7 +599,7 @@ export class Jira implements INodeType {
 					responseData = await jiraSoftwareCloudApiRequest.call(this, '/api/2/issue', 'POST', body);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -784,7 +784,7 @@ export class Jira implements INodeType {
 						if (
 							(qs.expand as string).toLowerCase().indexOf('renderedfields') !== -1 &&
 							responseData.renderedFields &&
-							Object.keys(responseData.renderedFields).length
+							Object.keys(responseData.renderedFields as IDataObject[]).length
 						) {
 							responseData.fields = mergeWith(
 								responseData.fields,
@@ -793,6 +793,7 @@ export class Jira implements INodeType {
 							);
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
+							// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 							this.helpers.returnJsonArray(simplifyIssueOutput(responseData)),
 							{ itemData: { item: i } },
 						);
@@ -800,7 +801,7 @@ export class Jira implements INodeType {
 						returnData.push(...executionData);
 					} else {
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -848,7 +849,7 @@ export class Jira implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -880,7 +881,7 @@ export class Jira implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -985,7 +986,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1016,7 +1017,7 @@ export class Jira implements INodeType {
 					responseData = responseData.transitions;
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1094,7 +1095,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1135,7 +1136,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1158,7 +1159,7 @@ export class Jira implements INodeType {
 
 						(returnData[index].binary as IBinaryKeyData)[binaryPropertyName] =
 							await this.helpers.prepareBinaryData(
-								buffer,
+								buffer as Buffer,
 								attachment.json.filename as string,
 								attachment.json.mimeType as string,
 							);
@@ -1187,7 +1188,7 @@ export class Jira implements INodeType {
 					responseData = responseData.map((data: IDataObject) => ({ json: data }));
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1208,7 +1209,7 @@ export class Jira implements INodeType {
 						);
 						(returnData[index].binary as IBinaryKeyData)[binaryPropertyName] =
 							await this.helpers.prepareBinaryData(
-								buffer,
+								buffer as Buffer,
 								attachment.json.filename as string,
 								attachment.json.mimeType as string,
 							);
@@ -1277,7 +1278,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1300,7 +1301,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1338,7 +1339,7 @@ export class Jira implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1422,7 +1423,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1456,7 +1457,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -1501,7 +1502,7 @@ export class Jira implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index 797bb9b0e3f2fc..c5f5b26db72a80 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -373,8 +373,8 @@ export class JiraTrigger implements INodeType {
 				const webhooks = await jiraSoftwareCloudApiRequest.call(this, endpoint, 'GET', {});
 
 				for (const webhook of webhooks) {
-					if (webhook.url === webhookUrl && eventExists(events, webhook.events)) {
-						webhookData.webhookId = getId(webhook.self);
+					if (webhook.url === webhookUrl && eventExists(events, webhook.events as string[])) {
+						webhookData.webhookId = getId(webhook.self as string);
 						return true;
 					}
 				}
@@ -443,14 +443,14 @@ export class JiraTrigger implements INodeType {
 					}
 				}
 
-				if (Object.keys(parameters).length) {
-					const params = new URLSearchParams(parameters).toString();
+				if (Object.keys(parameters as IDataObject).length) {
+					const params = new URLSearchParams(parameters as string).toString();
 					body.url = `${body.url}?${decodeURIComponent(params)}`;
 				}
 
 				const responseData = await jiraSoftwareCloudApiRequest.call(this, endpoint, 'POST', body);
 
-				webhookData.webhookId = getId(responseData.self);
+				webhookData.webhookId = getId(responseData.self as string);
 
 				return true;
 			},
diff --git a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
index 5799335f835d32..5e02b3fee3a228 100644
--- a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
@@ -6,7 +6,7 @@ import type {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function jotformApiRequest(
@@ -36,7 +36,7 @@ export async function jotformApiRequest(
 		uri: uri || `https://${credentials.apiDomain || 'api.jotform.com'}${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.form;
 	}
 	options = Object.assign({}, options, option);
@@ -44,6 +44,6 @@ export async function jotformApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
index 98c99621d254d3..77efa6d85719f4 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
@@ -113,13 +113,13 @@ export class JotFormTrigger implements INodeType {
 				try {
 					const responseData = await jotformApiRequest.call(this, 'GET', endpoint);
 
-					const webhookUrls = Object.values(responseData.content);
+					const webhookUrls = Object.values(responseData.content as IDataObject);
 					const webhookUrl = this.getNodeWebhookUrl('default');
 					if (!webhookUrls.includes(webhookUrl)) {
 						return false;
 					}
 
-					const webhookIds = Object.keys(responseData.content);
+					const webhookIds = Object.keys(responseData.content as IDataObject);
 					webhookData.webhookId = webhookIds[webhookUrls.indexOf(webhookUrl)];
 				} catch (error) {
 					return false;
@@ -136,7 +136,7 @@ export class JotFormTrigger implements INodeType {
 					//webhookURL: 'https://en0xsizp3qyt7f.x.pipedream.net/',
 				};
 				const { content } = await jotformApiRequest.call(this, 'POST', endpoint, body);
-				webhookData.webhookId = Object.keys(content)[0];
+				webhookData.webhookId = Object.keys(content as IDataObject)[0];
 				return true;
 			},
 			async delete(this: IHookFunctions): Promise<boolean> {
@@ -190,14 +190,16 @@ export class JotFormTrigger implements INodeType {
 
 				// Create a dictionary to resolve the keys
 				const questionNames: IDataObject = {};
-				for (const question of Object.values<IQuestionData>(responseData.content)) {
+				for (const question of Object.values<IQuestionData>(
+					responseData.content as IQuestionData[],
+				)) {
 					questionNames[question.name] = question.text;
 				}
 
 				// Resolve the keys
 				let questionKey: string;
 				const questionsData: IDataObject = {};
-				for (const key of Object.keys(rawRequest)) {
+				for (const key of Object.keys(rawRequest as IDataObject)) {
 					if (!key.includes('_')) {
 						continue;
 					}
diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index 5086836cb332fa..31b0f62fbe9380 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
@@ -38,13 +38,13 @@ export async function keapApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'keapOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -66,7 +66,7 @@ export async function keapApiRequestAllItems(
 	do {
 		responseData = await keapApiRequest.call(this, method, endpoint, body, query, uri);
 		uri = responseData.next;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (returnData.length < responseData.count);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index 68aea197ebe617..d90467d44d1de0 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -181,7 +181,7 @@ export class Keap implements INodeType {
 			async getCountries(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const { countries } = await keapApiRequest.call(this, 'GET', '/locales/countries');
-				for (const key of Object.keys(countries)) {
+				for (const key of Object.keys(countries as IDataObject)) {
 					const countryName = countries[key];
 					const countryId = key;
 					returnData.push({
@@ -201,7 +201,7 @@ export class Keap implements INodeType {
 					'GET',
 					`/locales/countries/${countryCode}/provinces`,
 				);
-				for (const key of Object.keys(provinces)) {
+				for (const key of Object.keys(provinces as IDataObject)) {
 					const provinceName = provinces[key];
 					const provinceId = key;
 					returnData.push({
@@ -858,7 +858,7 @@ export class Keap implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
index 9e6d28eb2532cc..e193d8f5ae8ae0 100644
--- a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function kitemakerRequest(
@@ -24,7 +24,7 @@ export async function kitemakerRequest(
 	const responseData = await this.helpers.request.call(this, options);
 
 	if (responseData.errors) {
-		throw new NodeApiError(this.getNode(), responseData);
+		throw new NodeApiError(this.getNode(), responseData as JsonObject);
 	}
 
 	return responseData;
@@ -56,7 +56,7 @@ export async function kitemakerRequestAllItems(
 	do {
 		responseData = await kitemakerRequest.call(this, body);
 		body.variables.cursor = responseData.data[group].cursor;
-		returnData.push(...responseData.data[group][items]);
+		returnData.push(...(responseData.data[group][items] as IDataObject[]));
 
 		if (!returnAll && returnData.length > limit) {
 			return returnData.slice(0, limit);
@@ -66,8 +66,9 @@ export async function kitemakerRequestAllItems(
 	return returnData;
 }
 
+export type LoadOptions = { name?: string; username?: string; title?: string; id: string };
 export function createLoadOptions(
-	resources: Array<{ name?: string; username?: string; title?: string; id: string }>,
+	resources: LoadOptions[],
 ): Array<{ name: string; value: string }> {
 	return resources.map((option) => {
 		if (option.username) return { name: option.username, value: option.id };
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
index 3535c15c91eda1..7f6a0ee0d863bf 100644
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
@@ -1,6 +1,7 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeType,
@@ -18,6 +19,7 @@ import {
 	workItemOperations,
 } from './descriptions';
 
+import type { LoadOptions } from './GenericFunctions';
 import { createLoadOptions, kitemakerRequest, kitemakerRequestAllItems } from './GenericFunctions';
 
 import {
@@ -102,7 +104,7 @@ export class Kitemaker implements INodeType {
 					},
 				} = responseData;
 
-				return createLoadOptions(spaces[0].labels);
+				return createLoadOptions(spaces[0].labels as LoadOptions[]);
 			},
 
 			async getSpaces(this: ILoadOptionsFunctions) {
@@ -113,7 +115,7 @@ export class Kitemaker implements INodeType {
 					},
 				} = responseData;
 
-				return createLoadOptions(spaces);
+				return createLoadOptions(spaces as LoadOptions[]);
 			},
 
 			async getStatuses(this: ILoadOptionsFunctions) {
@@ -133,7 +135,7 @@ export class Kitemaker implements INodeType {
 				} = responseData;
 				const space = spaces.find((e: { [x: string]: string }) => e.id === spaceId);
 
-				return createLoadOptions(space.statuses);
+				return createLoadOptions(space.statuses as LoadOptions[]);
 			},
 
 			async getUsers(this: ILoadOptionsFunctions) {
@@ -144,7 +146,7 @@ export class Kitemaker implements INodeType {
 					},
 				} = responseData;
 
-				return createLoadOptions(users);
+				return createLoadOptions(users as LoadOptions[]);
 			},
 
 			async getWorkItems(this: ILoadOptionsFunctions) {
@@ -161,7 +163,7 @@ export class Kitemaker implements INodeType {
 					},
 				} = responseData;
 
-				return createLoadOptions(workItems);
+				return createLoadOptions(workItems as LoadOptions[]);
 			},
 		},
 	};
@@ -320,7 +322,7 @@ export class Kitemaker implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
index 8e41846cca7706..417ac88fbd8721 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
@@ -116,7 +116,7 @@ const formatValue = (value: any, format: string): any => {
 		value = toString(value);
 
 		// Parse geoPoints
-		const geoPoint = parseGeoPoint(value);
+		const geoPoint = parseGeoPoint(value as string);
 		if (geoPoint) {
 			return {
 				type: 'Point',
@@ -126,12 +126,13 @@ const formatValue = (value: any, format: string): any => {
 
 		// Check if it's a closed polygon geo-shape: -1.954117 30.085159 0 0;-1.955005 30.084622 0 0;-1.956057 30.08506 0 0;-1.956393 30.086229 0 0;-1.955853 30.087143 0 0;-1.954609 30.08725 0 0;-1.953966 30.086735 0 0;-1.953805 30.085897 0 0;-1.954117 30.085159 0 0
 		const points = value.split(';');
-		if (points.length >= 2 && /^[-\d\.\s;]+$/.test(value)) {
+		if (points.length >= 2 && /^[-\d\.\s;]+$/.test(value as string)) {
 			// Using the GeoJSON format as per https://geojson.org/
-			const coordinates = compact(points.map(parseGeoPoint));
+			const coordinates = compact(points.map(parseGeoPoint) as number[]);
 			// Only return if all values are properly parsed
 			if (coordinates.length === points.length) {
 				// If the shape is closed, declare it as Polygon, otherwise as LineString
+				// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 				if (first(points) === last(points)) {
 					return {
 						type: 'Polygon',
@@ -284,8 +285,8 @@ export async function downloadAttachments(
 				}
 
 				binaryItem.binary![binaryName] = await this.helpers.prepareBinaryData(
-					response.body,
-					fileName,
+					response.body as Buffer,
+					fileName as string,
 				);
 			}
 		}
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
index ac7ad4abb986d2..3c70469384248d 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
@@ -200,7 +200,11 @@ export class KoBoToolbox implements INodeType {
 						// Download related attachments
 						for (const submission of responseData) {
 							binaryItems.push(
-								await downloadAttachments.call(this, submission, submissionQueryOptions),
+								await downloadAttachments.call(
+									this,
+									submission as IDataObject,
+									submissionQueryOptions,
+								),
 							);
 						}
 					}
@@ -237,7 +241,9 @@ export class KoBoToolbox implements INodeType {
 					if (options.download) {
 						// Download related attachments
 						for (const submission of responseData) {
-							binaryItems.push(await downloadAttachments.call(this, submission, options));
+							binaryItems.push(
+								await downloadAttachments.call(this, submission as IDataObject, options),
+							);
 						}
 					}
 				}
@@ -415,8 +421,8 @@ export class KoBoToolbox implements INodeType {
 						console.dir(response);
 
 						binaryItem.binary![binaryPropertyName] = await this.helpers.prepareBinaryData(
-							response,
-							responseData[0].metadata.filename,
+							response as Buffer,
+							responseData[0].metadata.filename as string,
 						);
 
 						binaryItems.push(binaryItem);
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
index 2b3c59e58177d5..6da071ff27548a 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolboxTrigger.node.ts
@@ -145,13 +145,15 @@ export class KoBoToolboxTrigger implements INodeType {
 
 		// prettier-ignore
 		const responseData = formatOptions.reformat
-			? formatSubmission(req.body, parseStringList(formatOptions.selectMask as string), parseStringList(formatOptions.numberMask as string))
+			? formatSubmission(req.body as IDataObject, parseStringList(formatOptions.selectMask as string), parseStringList(formatOptions.numberMask as string))
 			: req.body;
 
 		if (formatOptions.download) {
 			// Download related attachments
 			return {
-				workflowData: [[await downloadAttachments.call(this, responseData, formatOptions)]],
+				workflowData: [
+					[await downloadAttachments.call(this, responseData as IDataObject, formatOptions)],
+				],
 			};
 		} else {
 			return {
diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index bcf9dbce377062..7864c94a01e06a 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -59,7 +59,7 @@ export async function lemlistApiRequestAllItems(
 
 	do {
 		responseData = await lemlistApiRequest.call(this, method, endpoint, {}, qs);
-		returnData.push(...responseData);
+		returnData.push(...(responseData as IDataObject[]));
 		qs.offset += qs.limit;
 	} while (responseData.length !== 0);
 	return returnData;
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
index cd3937715522b0..759ab50bbdbf8b 100644
--- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
@@ -301,7 +301,7 @@ export class Lemlist implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
index d1843f778151cb..d23b3ed413cdae 100644
--- a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
@@ -137,7 +137,7 @@ export class LemlistTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Line/GenericFunctions.ts b/packages/nodes-base/nodes/Line/GenericFunctions.ts
index 36512c7a9a1239..1139837e365036 100644
--- a/packages/nodes-base/nodes/Line/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Line/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function lineApiRequest(
@@ -33,7 +33,7 @@ export async function lineApiRequest(
 	options = Object.assign({}, options, option);
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -41,6 +41,6 @@ export async function lineApiRequest(
 			tokenType: 'Bearer',
 		});
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index ab7c00e7b58cb4..377c90136651e4 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -143,7 +143,7 @@ export class Line implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Linear/GenericFunctions.ts b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
index 1b3879203bd40b..03a9bd75a2467a 100644
--- a/packages/nodes-base/nodes/Linear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
@@ -59,7 +59,7 @@ export async function linearApiRequestAllItems(
 
 	do {
 		responseData = await linearApiRequest.call(this, body);
-		returnData.push.apply(returnData, get(responseData, `${propertyName}.nodes`));
+		returnData.push.apply(returnData, get(responseData, `${propertyName}.nodes`) as IDataObject[]);
 		body.variables.after = get(responseData, `${propertyName}.pageInfo.endCursor`);
 	} while (get(responseData, `${propertyName}.pageInfo.hasNextPage`));
 	return returnData;
diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
index e04b07aace9463..577e83074c9fd7 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.ts
+++ b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -265,7 +265,7 @@ export class Linear implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
index 640bacba01ba1d..84e6c7d2b273dd 100644
--- a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function lingvaNexApiRequest(
@@ -38,11 +38,11 @@ export async function lingvaNexApiRequest(
 		const response = await this.helpers.request(options);
 
 		if (response.err !== null) {
-			throw new NodeApiError(this.getNode(), response);
+			throw new NodeApiError(this.getNode(), response as JsonObject);
 		}
 
 		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
index 9ab7711ab8a146..7fb62b2496d025 100644
--- a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
@@ -1,6 +1,7 @@
 import type { OptionsWithUrl } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function linkedInApiRequest(
@@ -29,7 +30,7 @@ export async function linkedInApiRequest(
 		options.encoding = null;
 	}
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -38,7 +39,7 @@ export async function linkedInApiRequest(
 			tokenType: 'Bearer',
 		});
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index c3fccf6a7b6fd3..eee851e9d5abd2 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -1,5 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -256,7 +257,7 @@ export class LinkedIn implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
index e16681c06fa1a9..ac2b341d894a20 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -197,7 +197,7 @@ export class LocalFileTrigger implements INodeType {
 		};
 
 		for (const eventName of events) {
-			watcher.on(eventName, (pathString) => executeTrigger(eventName, pathString));
+			watcher.on(eventName, (pathString) => executeTrigger(eventName, pathString as string));
 		}
 
 		async function closeFunction() {
diff --git a/packages/nodes-base/nodes/Magento/GenericFunctions.ts b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
index 6d9092060ca285..a0550d891f800c 100644
--- a/packages/nodes-base/nodes/Magento/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, INodeProperties, INodePropertyOptions } from 'n8n-workflow';
+import type { IDataObject, INodeProperties, INodePropertyOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { Address, Filter, FilterGroup, ProductAttribute, Search } from './Types';
@@ -35,13 +35,13 @@ export async function magentoApiRequest(
 
 	try {
 		options = Object.assign({}, options, option);
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.requestWithAuthentication.call(this, 'magento2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -60,7 +60,7 @@ export async function magentoApiRequestAllItems(
 
 	do {
 		responseData = await magentoApiRequest.call(this, method, resource, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query.current_page = query.current_page ? (query.current_page as number)++ : 1;
 	} while (returnData.length < responseData.total_count);
 
diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.ts b/packages/nodes-base/nodes/Magento/Magento2.node.ts
index fadf642d5512d9..59a720262185df 100644
--- a/packages/nodes-base/nodes/Magento/Magento2.node.ts
+++ b/packages/nodes-base/nodes/Magento/Magento2.node.ts
@@ -793,7 +793,7 @@ export class Magento2 implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
index 8e17aff83df478..af2c376024a3f5 100644
--- a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
@@ -38,7 +38,7 @@ export async function mailCheckApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		return await this.helpers.request.call(this, options);
diff --git a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
index a659a94d8838e5..141d871461cd5b 100644
--- a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 async function getMetadata(
@@ -51,7 +51,7 @@ export async function mailchimpApiRequest(
 		json: true,
 	};
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -78,7 +78,7 @@ export async function mailchimpApiRequest(
 			});
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -100,7 +100,7 @@ export async function mailchimpApiRequestAllItems(
 
 	do {
 		responseData = await mailchimpApiRequest.call(this, endpoint, method, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query.offset += query.count;
 	} while (responseData[propertyName] && responseData[propertyName].length !== 0);
 
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index 8ee510ef9c4584..bb126b5051190d 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -2186,7 +2186,7 @@ export class Mailchimp implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 524edc6def38ae..68ac48f1c06891 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -1,11 +1,13 @@
 import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
 
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import { mailchimpApiRequest } from './GenericFunctions';
@@ -201,7 +203,7 @@ export class MailchimpTrigger implements INodeType {
 						}
 						throw error;
 					}
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 				return true;
 			},
@@ -285,7 +287,7 @@ export class MailchimpTrigger implements INodeType {
 			return {};
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
index 140e0daa2b75ad..6808b57be70563 100644
--- a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mailerliteApiRequest(
@@ -32,13 +32,13 @@ export async function mailerliteApiRequest(
 		json: true,
 	};
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function mailerliteApiRequestAllItems(
 
 	do {
 		responseData = await mailerliteApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 		query.offset = query.offset + query.limit;
 	} while (responseData.length !== 0);
 	return returnData;
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
index 72f4b3c0c5a4d2..407f4b7a619239 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
@@ -194,7 +194,7 @@ export class MailerLite implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index fc45a8ff4dbe8e..f5f70fa92aba53 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -184,11 +185,11 @@ export class Mailgun implements INodeType {
 						options,
 					);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: itemIndex } },
 				);
 
diff --git a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
index afb79c950108eb..c474cc1f156080 100644
--- a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
@@ -43,7 +43,7 @@ export async function mailjetApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -69,7 +69,7 @@ export async function mailjetApiRequestAllItems(
 		responseData = await mailjetApiRequest.call(this, method, endpoint, body, query, undefined, {
 			resolveWithFullResponse: true,
 		});
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 		query.Offset = query.Offset + query.Limit;
 	} while (responseData.length !== 0);
 	return returnData;
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index f4bb00d46a0299..be82c8372addc5 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -305,7 +305,7 @@ export class Mailjet implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
index 371e0942b2b458..dd15d13ab44f0a 100644
--- a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
@@ -127,7 +127,7 @@ export class MailjetTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
index 9fc677ca8002ab..4a00dd917682db 100644
--- a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
@@ -3,6 +3,7 @@ import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
 import map from 'lodash.map';
+import type { JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mandrillApiRequest(
@@ -31,7 +32,7 @@ export async function mandrillApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index c5b0f4a82db979..3b429a14a65081 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -693,7 +694,7 @@ export class Mandrill implements INodeType {
 				try {
 					templates = await mandrillApiRequest.call(this, '/templates', 'POST', '/list');
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 				for (const template of templates) {
 					const templateName = template.name;
@@ -886,7 +887,7 @@ export class Mandrill implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts b/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
index eec8f80e712be9..8281ced75b2b38 100644
--- a/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function marketstackApiRequest(
@@ -32,7 +32,7 @@ export async function marketstackApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -53,7 +53,7 @@ export async function marketstackApiRequestAllItems(
 
 	do {
 		responseData = await marketstackApiRequest.call(this, method, endpoint, body, qs);
-		returnData.push(...responseData.data);
+		returnData.push(...(responseData.data as IDataObject[]));
 
 		if (!returnAll && returnData.length > limit) {
 			return returnData.slice(0, limit);
diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
index 6f553eb848dd06..e848d3687746cf 100644
--- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
+++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
@@ -174,7 +174,7 @@ export class Marketstack implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index a3da9e63e5c98d..27118875375911 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
@@ -46,9 +46,9 @@ export async function matrixApiRequest(
 		// When working with images, the request cannot be JSON (it's raw binary data)
 		// But the output is JSON so we have to parse it manually.
 		//@ts-ignore
-		return options.overridePrefix === 'media' ? JSON.parse(response) : response;
+		return options.overridePrefix === 'media' ? JSON.parse(response as string) : response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -148,7 +148,7 @@ export async function handleMatrixCall(
 						{},
 						qs,
 					);
-					returnData.push.apply(returnData, responseData.chunk);
+					returnData.push.apply(returnData, responseData.chunk as IDataObject[]);
 					from = responseData.end;
 				} while (responseData.chunk.length > 0);
 			} else {
@@ -169,7 +169,7 @@ export async function handleMatrixCall(
 					{},
 					qs,
 				);
-				returnData.push.apply(returnData, responseData.chunk);
+				returnData.push.apply(returnData, responseData.chunk as IDataObject[]);
 			}
 
 			return returnData;
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index 46edec80f11437..9739af5c5b3446 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -146,7 +146,7 @@ export class Matrix implements INodeType {
 			try {
 				const responseData = await handleMatrixCall.call(this, items[i], i, resource, operation);
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts
index 3c275fbc4dd171..700bd8e0589ca0 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts
@@ -19,5 +19,5 @@ export async function addUser(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts
index 34991a07078408..1713512827419d 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts
@@ -22,5 +22,5 @@ export async function create(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts
index a72c7007b85a59..43187ef1906810 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts
@@ -14,5 +14,5 @@ export async function del(this: IExecuteFunctions, index: number): Promise<INode
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts
index 3d1e3db305671f..a735f72e549189 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts
@@ -34,7 +34,7 @@ export async function members(
 		if (resolveData) {
 			const userIds: string[] = [];
 			for (const data of responseData) {
-				userIds.push(data.user_id);
+				userIds.push(data.user_id as string);
 			}
 			if (userIds.length > 0) {
 				responseData = await apiRequest.call(this, 'POST', 'users/ids', userIds, qs);
@@ -42,5 +42,5 @@ export async function members(
 		}
 	}
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts
index 4436c089081d6f..fed5e848fdb984 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts
@@ -17,5 +17,5 @@ export async function restore(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts
index 47d1b70297d246..0945ea25477647 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts
@@ -24,5 +24,5 @@ export async function search(
 		responseData = responseData.slice(0, limit);
 	}
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts
index 6164cd36ab2f0c..5b48083a12e1d0 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts
@@ -17,5 +17,5 @@ export async function statistics(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts
index eb6fef7741b3fa..8fe76503e38ad2 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts
@@ -14,5 +14,5 @@ export async function del(this: IExecuteFunctions, index: number): Promise<INode
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
index 8cae875e0e249d..163038f2286bcd 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
@@ -84,5 +84,5 @@ export async function post(this: IExecuteFunctions, index: number): Promise<INod
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts
index 6f4816b24065b5..1595d4e708b7b2 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts
@@ -22,5 +22,5 @@ export async function postEphemeral(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts
index 37dbd3e5624449..6b3c3ae2ad29e1 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts
@@ -20,5 +20,5 @@ export async function create(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts
index f2f0dab39e9c7b..638c10c4c4f2f7 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts
@@ -16,5 +16,5 @@ export async function del(this: IExecuteFunctions, index: number): Promise<INode
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts
index 8ec544f0c87594..f0fddda9dfe5f7 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts
@@ -20,5 +20,5 @@ export async function getAll(
 	if (limit > 0) {
 		responseData = responseData.slice(0, limit);
 	}
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts
index 16da1743cb44f4..d117fb34a2a8ad 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts
@@ -35,5 +35,5 @@ export async function create(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts
index 2951d59b57c14e..626a10ae67bf2d 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts
@@ -16,5 +16,5 @@ export async function deactive(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
index 64563bc24e1862..dc83aaaa8317cd 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
@@ -110,5 +110,5 @@ export async function getAll(
 		responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 	}
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts
index 3ddcfba5b023c4..b5f1f22a74f42d 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts
@@ -17,5 +17,5 @@ export async function getByEmail(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts
index 9c7015c4b863d5..3bacfd7e4be99c 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts
@@ -21,5 +21,5 @@ export async function getById(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts
index bfa4e76d83977a..4bc861b511c941 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts
@@ -19,5 +19,5 @@ export async function invite(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
index 2e2919c3097311..2a5626edfe93f0 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
@@ -48,7 +48,7 @@ export async function apiRequestAllItems(
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
 		query.page++;
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 	} while (responseData.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
index 88ade4287b937d..3afea8b3874b33 100644
--- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
@@ -52,7 +52,7 @@ export async function mauticApiRequest(
 
 		if (returnData.errors) {
 			// They seem to to sometimes return 200 status but still error.
-			throw new NodeApiError(this.getNode(), returnData);
+			throw new NodeApiError(this.getNode(), returnData as JsonObject);
 		}
 
 		return returnData;
@@ -82,13 +82,13 @@ export async function mauticApiRequestAllItems(
 
 	do {
 		responseData = await mauticApiRequest.call(this, method, endpoint, body, query);
-		const values = Object.values(responseData[propertyName]);
+		const values = Object.values(responseData[propertyName] as IDataObject[]);
 		//@ts-ignore
 		returnData.push.apply(returnData, values);
 		query.start += query.limit;
 	} while (
 		responseData.total !== undefined &&
-		returnData.length - parseInt(responseData.total, 10) < 0
+		returnData.length - parseInt(responseData.total as string, 10) < 0
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index ca307e18a140ef..3db55530a7e785 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -569,10 +569,10 @@ export class Mautic implements INodeType {
 							qs.start = 0;
 							responseData = await mauticApiRequest.call(this, 'GET', '/companies', {}, qs);
 							if (responseData.errors) {
-								throw new NodeApiError(this.getNode(), responseData);
+								throw new NodeApiError(this.getNode(), responseData as JsonObject);
 							}
 							responseData = responseData.companies;
-							responseData = Object.values(responseData);
+							responseData = Object.values(responseData as IDataObject[]);
 						}
 						if (simple) {
 							//@ts-ignore
@@ -856,10 +856,10 @@ export class Mautic implements INodeType {
 							qs.start = 0;
 							responseData = await mauticApiRequest.call(this, 'GET', '/contacts', {}, qs);
 							if (responseData.errors) {
-								throw new NodeApiError(this.getNode(), responseData);
+								throw new NodeApiError(this.getNode(), responseData as JsonObject);
 							}
 							responseData = responseData.contacts;
-							responseData = Object.values(responseData);
+							responseData = Object.values(responseData as IDataObject[]);
 						}
 						if (options.rawData === false) {
 							//@ts-ignore
@@ -1017,7 +1017,7 @@ export class Mautic implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
index ac96509b387b6b..e9dace1619f565 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
@@ -110,7 +110,7 @@ export class MauticTrigger implements INodeType {
 			async getEvents(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const { triggers } = await mauticApiRequest.call(this, 'GET', '/hooks/triggers');
-				for (const [key, value] of Object.entries(triggers)) {
+				for (const [key, value] of Object.entries(triggers as IDataObject)) {
 					const eventId = key;
 					const eventName = (value as IDataObject).label as string;
 					const eventDecription = (value as IDataObject).description as string;
@@ -175,7 +175,7 @@ export class MauticTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Medium/GenericFunctions.ts b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
index 89058098b7d12c..9fff315afc16ca 100644
--- a/packages/nodes-base/nodes/Medium/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mediumApiRequest(
@@ -45,6 +45,6 @@ export async function mediumApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'mediumOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
index 5e6cd3c757a028..f09bb3d9d6adcf 100644
--- a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -35,6 +35,6 @@ export async function messageBirdApiRequest(
 		}
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
index 8029580ea88e78..cf1ad138a7353c 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, INodeProperties, INodePropertyOptions } from 'n8n-workflow';
+import type { IDataObject, INodeProperties, INodePropertyOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
@@ -42,7 +42,7 @@ export async function microsoftApiRequest(
 			property: 'id_token',
 		});
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -64,7 +64,7 @@ export async function microsoftApiRequestAllItems(
 	do {
 		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
 		uri = responseData['@odata.nextLink'];
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData['@odata.nextLink'] !== undefined);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
index f58a6360ce7a23..07a59c8a085c35 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
@@ -276,7 +276,7 @@ export class MicrosoftDynamicsCrm implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
index b30ff95c9cb2b9..707035b716a3fe 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
@@ -30,7 +30,7 @@ export async function microsoftApiRequest(
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftExcelOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -55,7 +55,7 @@ export async function microsoftApiRequestAllItems(
 		if (uri?.includes('$top')) {
 			delete query.$top;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData['@odata.nextLink'] !== undefined);
 
 	return returnData;
@@ -79,7 +79,7 @@ export async function microsoftApiRequestAllItemsSkip(
 	do {
 		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
 		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.value.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index 554e973fc88820..99d624ec871179 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -235,7 +236,7 @@ export class MicrosoftExcel implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: 0 } },
 					);
 
@@ -296,7 +297,7 @@ export class MicrosoftExcel implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -432,7 +433,7 @@ export class MicrosoftExcel implements INodeType {
 						columns = columns.map((column: IDataObject) => column.name);
 
 						if (!columns.includes(lookupColumn)) {
-							throw new NodeApiError(this.getNode(), responseData, {
+							throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 								message: `Column ${lookupColumn} does not exist on the table selected`,
 							});
 						}
@@ -555,7 +556,7 @@ export class MicrosoftExcel implements INodeType {
 						returnData.push(...executionData);
 					} else if (responseData !== undefined) {
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -632,7 +633,7 @@ export class MicrosoftExcel implements INodeType {
 							const keyRow = this.getNodeParameter('keyRow', i) as number;
 							const dataStartRow = this.getNodeParameter('dataStartRow', i) as number;
 							if (responseData.values === null) {
-								throw new NodeApiError(this.getNode(), responseData, {
+								throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 									message: 'Range did not return data',
 								});
 							}
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
index 487ace632786a7..b3efc2004cd5e6 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -50,7 +50,7 @@ export async function msGraphSecurityApiRequest(
 		const nestedMessage = error?.error?.error?.message;
 
 		if (nestedMessage.startsWith('{"')) {
-			error = JSON.parse(nestedMessage);
+			error = JSON.parse(nestedMessage as string);
 		}
 
 		if (nestedMessage.startsWith('Http request failed with statusCode=BadRequest')) {
@@ -58,16 +58,16 @@ export async function msGraphSecurityApiRequest(
 		} else if (nestedMessage.startsWith('Http request failed with')) {
 			const stringified = nestedMessage.split(': ').pop();
 			if (stringified) {
-				error = JSON.parse(stringified);
+				error = JSON.parse(stringified as string);
 			}
 		}
 
-		if (['Invalid filter clause', 'Invalid ODATA query filter'].includes(nestedMessage)) {
+		if (['Invalid filter clause', 'Invalid ODATA query filter'].includes(nestedMessage as string)) {
 			error.error.error.message +=
 				' - Please check that your query parameter syntax is correct: https://docs.microsoft.com/en-us/graph/query-parameters#filter-parameter';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
index 87b3f5a2685840..c99cdb7e02972d 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
@@ -224,8 +224,8 @@ export class MicrosoftGraphSecurity implements INodeType {
 			}
 
 			Array.isArray(responseData)
-				? returnData.push(...responseData)
-				: returnData.push(responseData);
+				? returnData.push(...(responseData as IDataObject[]))
+				: returnData.push(responseData as IDataObject);
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
index 423397ad6683ab..8844245db33a27 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
@@ -33,13 +33,13 @@ export async function microsoftApiRequest(
 		if (Object.keys(qs).length === 0) {
 			delete options.qs;
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftOneDriveOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -64,7 +64,7 @@ export async function microsoftApiRequestAllItems(
 		if (uri?.includes('$top')) {
 			delete query.$top;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData['@odata.nextLink'] !== undefined);
 
 	return returnData;
@@ -88,7 +88,7 @@ export async function microsoftApiRequestAllItemsSkip(
 	do {
 		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
 		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.value.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index dfd3d538588dda..c35b2dfc369d78 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -109,7 +110,7 @@ export class MicrosoftOneDrive implements INodeType {
 						const fileName = responseData.name;
 
 						if (responseData.file === undefined) {
-							throw new NodeApiError(this.getNode(), responseData, {
+							throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 								message: 'The ID you provided does not belong to a file.',
 							});
 						}
@@ -148,11 +149,11 @@ export class MicrosoftOneDrive implements INodeType {
 
 						items[i] = newItem;
 
-						const data = Buffer.from(responseData.body);
+						const data = Buffer.from(responseData.body as Buffer);
 
 						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
 							data as unknown as Buffer,
-							fileName,
+							fileName as string,
 							mimeType,
 						);
 					}
@@ -234,7 +235,7 @@ export class MicrosoftOneDrive implements INodeType {
 								{},
 							);
 
-							responseData = JSON.parse(responseData);
+							responseData = JSON.parse(responseData as string);
 						} else {
 							const body = this.getNodeParameter('fileContent', i) as string;
 							if (fileName === '') {
@@ -356,7 +357,7 @@ export class MicrosoftOneDrive implements INodeType {
 				throw error;
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
index 4784cd6f3c72e1..a8c8ace50333b7 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
@@ -3,7 +3,7 @@ import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
@@ -41,14 +41,13 @@ export async function microsoftApiRequest(
 			options.headers = Object.assign({}, options.headers, headers);
 		}
 
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftOutlookOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -79,7 +78,7 @@ export async function microsoftApiRequestAllItems(
 			headers,
 		);
 		uri = responseData['@odata.nextLink'];
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData['@odata.nextLink'] !== undefined);
 
 	return returnData;
@@ -112,7 +111,7 @@ export async function microsoftApiRequestAllItemsSkip(
 			headers,
 		);
 		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.value.length !== 0);
 
 	return returnData;
@@ -208,8 +207,8 @@ export async function downloadAttachments(
 				const data = Buffer.from(response.body as string, 'utf8');
 				element.binary![`${prefix}${index}`] = await this.helpers.prepareBinaryData(
 					data as unknown as Buffer,
-					attachment.name,
-					attachment.contentType,
+					attachment.name as string,
+					attachment.contentType as string,
 				);
 			}
 		}
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
index 95c180cb79d57a..c083dc15443293 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
@@ -8,6 +8,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -188,7 +189,11 @@ export class MicrosoftOutlook implements INodeType {
 
 						if (additionalFields.dataPropertyAttachmentsPrefixName) {
 							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
-							const data = await downloadAttachments.call(this, responseData, prefix);
+							const data = await downloadAttachments.call(
+								this,
+								responseData as IDataObject,
+								prefix,
+							);
 							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(data),
 								{ itemData: { item: i } },
@@ -196,7 +201,7 @@ export class MicrosoftOutlook implements INodeType {
 							returnData.push(...executionData);
 						} else {
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
+								this.helpers.returnJsonArray(responseData as IDataObject),
 								{ itemData: { item: i } },
 							);
 							returnData.push(...executionData);
@@ -237,7 +242,7 @@ export class MicrosoftOutlook implements INodeType {
 							{},
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -284,7 +289,7 @@ export class MicrosoftOutlook implements INodeType {
 						responseData = await microsoftApiRequest.call(this, 'POST', '/messages', body, {});
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -397,7 +402,7 @@ export class MicrosoftOutlook implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -501,7 +506,11 @@ export class MicrosoftOutlook implements INodeType {
 
 						if (additionalFields.dataPropertyAttachmentsPrefixName) {
 							const prefix = additionalFields.dataPropertyAttachmentsPrefixName as string;
-							const data = await downloadAttachments.call(this, responseData, prefix);
+							const data = await downloadAttachments.call(
+								this,
+								responseData as IDataObject,
+								prefix,
+							);
 							const executionData = this.helpers.constructExecutionMetaData(
 								this.helpers.returnJsonArray(data),
 								{ itemData: { item: i } },
@@ -509,7 +518,7 @@ export class MicrosoftOutlook implements INodeType {
 							returnData.push(...executionData);
 						} else {
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
+								this.helpers.returnJsonArray(responseData as IDataObject[]),
 								{ itemData: { item: i } },
 							);
 							returnData.push(...executionData);
@@ -684,7 +693,7 @@ export class MicrosoftOutlook implements INodeType {
 							const uploadUrl = responseData.uploadUrl;
 
 							if (uploadUrl === undefined) {
-								throw new NodeApiError(this.getNode(), responseData, {
+								throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 									message: 'Failed to get upload session',
 								});
 							}
@@ -793,7 +802,7 @@ export class MicrosoftOutlook implements INodeType {
 						const data = Buffer.from(response.body as string, 'utf8');
 						items[i].binary![dataPropertyNameDownload] = await this.helpers.prepareBinaryData(
 							data as unknown as Buffer,
-							fileName,
+							fileName as string,
 							mimeType,
 						);
 					} catch (error) {
@@ -827,7 +836,7 @@ export class MicrosoftOutlook implements INodeType {
 							qs,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -878,7 +887,7 @@ export class MicrosoftOutlook implements INodeType {
 							responseData = responseData.value;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -924,7 +933,7 @@ export class MicrosoftOutlook implements INodeType {
 
 						responseData = await microsoftApiRequest.call(this, 'POST', endpoint, body);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -991,7 +1000,7 @@ export class MicrosoftOutlook implements INodeType {
 							qs,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -1038,7 +1047,7 @@ export class MicrosoftOutlook implements INodeType {
 							responseData = responseData.value;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -1091,7 +1100,7 @@ export class MicrosoftOutlook implements INodeType {
 							responseData = responseData.value;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -1126,7 +1135,7 @@ export class MicrosoftOutlook implements INodeType {
 							body,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -1176,7 +1185,7 @@ export class MicrosoftOutlook implements INodeType {
 							responseData = responseData.value;
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
index 6a7360d201d71a..1b8e5322546b6a 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/GenericFunctions.ts
@@ -88,7 +88,7 @@ export async function executeQueryQueue(
  * @param {IDataObject} item The item to extract
  */
 export function extractValues(item: IDataObject): string {
-	return `(${Object.values(item as any)
+	return `(${Object.values(item)
 		.map((val) => {
 			//the column cannot be found in the input
 			//so, set it to null in the sql query
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 30b913473fe040..7593797f066ddc 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -395,7 +395,7 @@ export class MicrosoftSql implements INodeType {
 									.request()
 									.query(
 										`DELETE FROM ${table} WHERE "${deleteKey}" IN ${extractDeleteValues(
-											deleteValues,
+											deleteValues as IDataObject[],
 											deleteKey,
 										)};`,
 									);
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
index abfe976f18f0e1..79f692281b8746 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
@@ -32,7 +32,7 @@ export async function microsoftApiRequest(
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftTeamsOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -53,7 +53,7 @@ export async function microsoftApiRequestAllItems(
 	do {
 		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query, uri);
 		uri = responseData['@odata.nextLink'];
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		if (query.limit && query.limit <= returnData.length) {
 			return returnData;
 		}
@@ -80,7 +80,7 @@ export async function microsoftApiRequestAllItemsSkip(
 	do {
 		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
 		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.value.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
index 87778897c2609a..18bcaf6fd372d7 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
@@ -220,7 +220,7 @@ export class MicrosoftTeams implements INodeType {
 					'GET',
 					`/v1.0/planner/plans/${planId}/details`,
 				);
-				for (const key of Object.keys(categoryDescriptions)) {
+				for (const key of Object.keys(categoryDescriptions as IDataObject)) {
 					if (categoryDescriptions[key] !== null) {
 						returnData.push({
 							name: categoryDescriptions[key],
@@ -629,7 +629,7 @@ export class MicrosoftTeams implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
index 65aedc8e184d17..940b626c1e3c86 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
@@ -35,7 +35,7 @@ export async function microsoftApiRequest(
 		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'microsoftToDoOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function microsoftApiRequestAllItems(
 		if (uri?.includes('$top')) {
 			delete query.$top;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData['@odata.nextLink'] !== undefined);
 
 	return returnData;
@@ -82,7 +82,7 @@ export async function microsoftApiRequestAllItemsSkip(
 	do {
 		responseData = await microsoftApiRequest.call(this, method, endpoint, body, query);
 		query.$skip += query.$top;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.value.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
index 1cf43bb811d481..256929753e53d9 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
@@ -410,7 +410,7 @@ export class MicrosoftToDo implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
index 571a88354837a7..3c095c411512a9 100644
--- a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mindeeApiRequest(
@@ -39,7 +39,7 @@ export async function mindeeApiRequest(
 		json: true,
 	};
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		if (Object.keys(qs).length === 0) {
@@ -51,7 +51,7 @@ export async function mindeeApiRequest(
 
 		return await this.helpers.requestWithAuthentication.call(this, service, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index 72cc1fbc406f79..30db7901f445e5 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -221,9 +221,11 @@ export class Mindee implements INodeType {
 						}
 						if (!rawData) {
 							if (version === 1) {
-								responseData = cleanDataPreviousApiVersions(responseData.predictions);
+								responseData = cleanDataPreviousApiVersions(
+									responseData.predictions as IDataObject[],
+								);
 							} else if (version === 3) {
-								responseData = cleanData(responseData.document);
+								responseData = cleanData(responseData.document as IDataObject);
 							}
 						}
 					}
@@ -295,9 +297,11 @@ export class Mindee implements INodeType {
 						}
 						if (!rawData) {
 							if (version === 1) {
-								responseData = cleanDataPreviousApiVersions(responseData.predictions);
+								responseData = cleanDataPreviousApiVersions(
+									responseData.predictions as IDataObject[],
+								);
 							} else if (version === 3) {
-								responseData = cleanData(responseData.document);
+								responseData = cleanData(responseData.document as IDataObject);
 							}
 						}
 					}
diff --git a/packages/nodes-base/nodes/Misp/GenericFunctions.ts b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
index c4508d10b81c8a..5c79b7f5a41906 100644
--- a/packages/nodes-base/nodes/Misp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -51,7 +51,7 @@ export async function mispApiRequest(
 		const errors = error?.error?.errors;
 
 		if (errors) {
-			const key = Object.keys(errors)[0];
+			const key = Object.keys(errors as IDataObject)[0];
 
 			if (key !== undefined) {
 				let message = errors[key].join();
@@ -64,7 +64,7 @@ export async function mispApiRequest(
 			}
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Misp/Misp.node.ts b/packages/nodes-base/nodes/Misp/Misp.node.ts
index 7231ab65f0de99..73f6a3cdcc780b 100644
--- a/packages/nodes-base/nodes/Misp/Misp.node.ts
+++ b/packages/nodes-base/nodes/Misp/Misp.node.ts
@@ -747,7 +747,7 @@ export class Misp implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index c261a355bab92a..86ef8348fe5bf0 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
@@ -38,7 +38,7 @@ export async function mondayComApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'mondayComOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -56,7 +56,7 @@ export async function mondayComApiRequestAllItems(
 
 	do {
 		responseData = await mondayComApiRequest.call(this, body);
-		returnData.push.apply(returnData, get(responseData, propertyName));
+		returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 		body.variables.page++;
 	} while (get(responseData, propertyName).length > 0);
 	return returnData;
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index 760577fa572580..cd297ae78ce1dd 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -728,7 +728,7 @@ export class MondayCom implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 78237edb2e80f2..96d1e9f91109ad 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -21,7 +21,12 @@ import {
 	validateAndResolveMongoCredentials,
 } from './GenericFunctions';
 
-import type { FindOneAndReplaceOptions, FindOneAndUpdateOptions, UpdateOptions } from 'mongodb';
+import type {
+	FindOneAndReplaceOptions,
+	FindOneAndUpdateOptions,
+	UpdateOptions,
+	Sort,
+} from 'mongodb';
 import { MongoClient, ObjectId } from 'mongodb';
 
 import type { IMongoParametricCredentials } from './mongoDb.types';
@@ -97,12 +102,12 @@ export class MongoDb implements INodeType {
 				const queryParameter = JSON.parse(this.getNodeParameter('query', 0) as string);
 
 				if (queryParameter._id && typeof queryParameter._id === 'string') {
-					queryParameter._id = new ObjectId(queryParameter._id);
+					queryParameter._id = new ObjectId(queryParameter._id as string);
 				}
 
 				const query = mdb
 					.collection(this.getNodeParameter('collection', 0) as string)
-					.aggregate(queryParameter);
+					.aggregate(queryParameter as Document[]);
 
 				responseData = await query.toArray();
 			} catch (error) {
@@ -120,7 +125,7 @@ export class MongoDb implements INodeType {
 			try {
 				const { deletedCount } = await mdb
 					.collection(this.getNodeParameter('collection', 0) as string)
-					.deleteMany(JSON.parse(this.getNodeParameter('query', 0) as string));
+					.deleteMany(JSON.parse(this.getNodeParameter('query', 0) as string) as Document);
 
 				responseData = [{ deletedCount }];
 			} catch (error) {
@@ -139,17 +144,17 @@ export class MongoDb implements INodeType {
 				const queryParameter = JSON.parse(this.getNodeParameter('query', 0) as string);
 
 				if (queryParameter._id && typeof queryParameter._id === 'string') {
-					queryParameter._id = new ObjectId(queryParameter._id);
+					queryParameter._id = new ObjectId(queryParameter._id as string);
 				}
 
 				let query = mdb
 					.collection(this.getNodeParameter('collection', 0) as string)
-					.find(queryParameter);
+					.find(queryParameter as Document);
 
 				const options = this.getNodeParameter('options', 0);
 				const limit = options.limit as number;
 				const skip = options.skip as number;
-				const sort = options.sort && JSON.parse(options.sort as string);
+				const sort: Sort = options.sort && JSON.parse(options.sort as string);
 				if (skip > 0) {
 					query = query.skip(skip);
 				}
diff --git a/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts b/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
index 8c7ca01ebd38e3..8693602db7a8f2 100644
--- a/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -52,7 +52,7 @@ export async function monicaCrmApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -76,7 +76,7 @@ export async function monicaCrmApiRequestAllItems(
 
 	do {
 		responseData = await monicaCrmApiRequest.call(this, method, endpoint, body, qs);
-		returnData.push(...responseData.data);
+		returnData.push(...(responseData.data as IDataObject[]));
 
 		if (!forLoader && !returnAll && returnData.length > limit) {
 			return returnData.slice(0, limit);
diff --git a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
index 8885aa52a5332f..df5d5899d1ace0 100644
--- a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
@@ -1166,7 +1166,7 @@ export class MonicaCrm implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index 962222c5ca40a6..eceb14fee7c62f 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
@@ -23,7 +23,7 @@ iconv.encodingExists('utf8');
 const bomAware: string[] = [];
 const encodeDecodeOptions: INodePropertyOptions[] = [];
 const encodings = (iconv as any).encodings;
-Object.keys(encodings).forEach((encoding) => {
+Object.keys(encodings as IDataObject).forEach((encoding) => {
 	if (!(encoding.startsWith('_') || typeof encodings[encoding] === 'string')) {
 		// only encodings without direct alias or internals
 		if (encodings[encoding].bomAware) {
diff --git a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
index 34a5992a380a97..f13a91da9f1ccb 100644
--- a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -33,6 +33,6 @@ export async function msg91ApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index 0182a83af185f2..de4a90dff49500 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -336,7 +336,8 @@ export class MySql implements INodeType {
 					.map((_item) => insertPlaceholder)
 					.join(',')};`;
 				const queryItems = insertItems.reduce(
-					(collection, item) => collection.concat(Object.values(item as any)),
+					(collection: IDataObject[], item) =>
+						collection.concat(Object.values(item) as IDataObject[]),
 					[],
 				);
 
diff --git a/packages/nodes-base/nodes/N8n/GenericFunctions.ts b/packages/nodes-base/nodes/N8n/GenericFunctions.ts
index 48f628f064d8b6..585030ef46d7d4 100644
--- a/packages/nodes-base/nodes/N8n/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/N8n/GenericFunctions.ts
@@ -69,7 +69,7 @@ export async function apiRequestAllItems(
 		query.cursor = nextCursor;
 		query.limit = 100;
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData.data);
+		returnData.push.apply(returnData, responseData.data as IDataObject[]);
 		nextCursor = responseData.nextCursor as string | undefined;
 	} while (nextCursor);
 	return returnData;
diff --git a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
index 5d8f3b0ad585ec..ee90e6065202e6 100644
--- a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function nasaApiRequest(
@@ -31,7 +31,7 @@ export async function nasaApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -53,7 +53,7 @@ export async function nasaApiRequestAllItems(
 	do {
 		responseData = await nasaApiRequest.call(this, method, resource, query, {}, uri);
 		uri = responseData.links.next;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.links.next !== undefined);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 09cfb1004fe748..4f9a01a685274e 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -1045,7 +1045,7 @@ export class Nasa implements INodeType {
 				}
 
 				if (resource === 'asteroidNeoFeed') {
-					const date = Object.keys(responseData)[0];
+					const date = Object.keys(responseData as IDataObject)[0];
 					responseData = responseData[date];
 				}
 
@@ -1065,7 +1065,7 @@ export class Nasa implements INodeType {
 
 					items[i] = newItem;
 
-					items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(data);
+					items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(data as Buffer);
 				}
 
 				if (resource === 'astronomyPictureOfTheDay') {
@@ -1080,7 +1080,7 @@ export class Nasa implements INodeType {
 							endpoint,
 							qs,
 							{ encoding: null },
-							responseData.hdurl,
+							responseData.hdurl as string,
 						);
 
 						const filename = (responseData.hdurl as string).split('/');
@@ -1099,14 +1099,14 @@ export class Nasa implements INodeType {
 						items[i] = newItem;
 
 						items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(
-							data,
+							data as Buffer,
 							filename[filename.length - 1],
 						);
 					}
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
index 109429d57a28b0..580b68d6885ac8 100644
--- a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function netlifyApiRequest(
@@ -31,7 +31,7 @@ export async function netlifyApiRequest(
 		json: true,
 	};
 
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 
@@ -46,7 +46,7 @@ export async function netlifyApiRequest(
 
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -69,7 +69,7 @@ export async function netlifyRequestAllItems(
 			resolveWithFullResponse: true,
 		});
 		query.page++;
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 	} while (responseData.headers.link.includes('next'));
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.ts b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
index c0d766915942c4..6f48029e6473b1 100644
--- a/packages/nodes-base/nodes/Netlify/Netlify.node.ts
+++ b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
@@ -189,7 +189,7 @@ export class Netlify implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
index 16b8a3624789c1..af54927fa9e9b5 100644
--- a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
@@ -112,7 +112,6 @@ export class NetlifyTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -207,7 +206,7 @@ export class NetlifyTrigger implements INodeType {
 		}
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(response)],
+			workflowData: [this.helpers.returnJsonArray(response as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 69fba75c92c2ef..25d1dd13a4c0a6 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -6,6 +6,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -1146,20 +1147,23 @@ export class NextCloud implements INodeType {
 					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 
 					items[i].binary![binaryPropertyName] = await this.helpers.prepareBinaryData(
-						responseData,
+						responseData as Buffer,
 						endpoint,
 					);
 				} else if (['file', 'folder'].includes(resource) && operation === 'share') {
 					// eslint-disable-next-line @typescript-eslint/no-loop-func
 					const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
-						parseString(responseData, { explicitArray: false }, (err, data) => {
+						parseString(responseData as string, { explicitArray: false }, (err, data) => {
 							if (err) {
 								return reject(err);
 							}
 
 							if (data.ocs.meta.status !== 'ok') {
 								return reject(
-									new NodeApiError(this.getNode(), data.ocs.meta.message || data.ocs.meta.status),
+									new NodeApiError(
+										this.getNode(),
+										(data.ocs.meta.message as JsonObject) || (data.ocs.meta.status as JsonObject),
+									),
 								);
 							}
 
@@ -1172,14 +1176,17 @@ export class NextCloud implements INodeType {
 					if (operation !== 'getAll') {
 						// eslint-disable-next-line @typescript-eslint/no-loop-func
 						const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
-							parseString(responseData, { explicitArray: false }, (err, data) => {
+							parseString(responseData as string, { explicitArray: false }, (err, data) => {
 								if (err) {
 									return reject(err);
 								}
 
 								if (data.ocs.meta.status !== 'ok') {
 									return reject(
-										new NodeApiError(this.getNode(), data.ocs.meta.message || data.ocs.meta.status),
+										new NodeApiError(
+											this.getNode(),
+											(data.ocs.meta.message || data.ocs.meta.status) as JsonObject,
+										),
 									);
 								}
 
@@ -1195,13 +1202,15 @@ export class NextCloud implements INodeType {
 					} else {
 						// eslint-disable-next-line @typescript-eslint/no-loop-func
 						const jsonResponseData: IDataObject[] = await new Promise((resolve, reject) => {
-							parseString(responseData, { explicitArray: false }, (err, data) => {
+							parseString(responseData as string, { explicitArray: false }, (err, data) => {
 								if (err) {
 									return reject(err);
 								}
 
 								if (data.ocs.meta.status !== 'ok') {
-									return reject(new NodeApiError(this.getNode(), data.ocs.meta.message));
+									return reject(
+										new NodeApiError(this.getNode(), data.ocs.meta.message as JsonObject),
+									);
 								}
 
 								if (typeof data.ocs.data.users.element === 'string') {
@@ -1219,7 +1228,7 @@ export class NextCloud implements INodeType {
 				} else if (resource === 'folder' && operation === 'list') {
 					// eslint-disable-next-line @typescript-eslint/no-loop-func
 					const jsonResponseData: IDataObject = await new Promise((resolve, reject) => {
-						parseString(responseData, { explicitArray: false }, (err, data) => {
+						parseString(responseData as string, { explicitArray: false }, (err, data) => {
 							if (err) {
 								return reject(err);
 							}
diff --git a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
index 25f3d33c0e58fb..53bdf653ca65a8 100644
--- a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
@@ -82,7 +82,9 @@ export async function apiRequestAllItems(
 
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		version === 1 ? returnData.push(...responseData) : returnData.push(...responseData.list);
+		version === 1
+			? returnData.push(...(responseData as IDataObject[]))
+			: returnData.push(...(responseData.list as IDataObject[]));
 
 		query.offset += query.limit;
 	} while (version === 1 ? responseData.length !== 0 : responseData.pageInfo.isLastPage !== true);
@@ -105,7 +107,7 @@ export async function downloadRecordAttachments(
 				for (const [index, attachment] of jsonParse<IAttachment[]>(
 					record[fieldName] as string,
 				).entries()) {
-					const file = await apiRequest.call(this, 'GET', '', {}, {}, attachment.url, {
+					const file: Buffer = await apiRequest.call(this, 'GET', '', {}, {}, attachment.url, {
 						json: false,
 						encoding: null,
 					});
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
index bffbefd5578a16..24c7ccaa099b24 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -334,7 +335,7 @@ export class NocoDB implements INodeType {
 					if (this.continueOnFail()) {
 						returnData.push({ error: error.toString() });
 					}
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 			}
 
@@ -354,7 +355,13 @@ export class NocoDB implements INodeType {
 				}
 
 				try {
-					responseData = await apiRequest.call(this, requestMethod, endPoint, body, qs);
+					responseData = (await apiRequest.call(
+						this,
+						requestMethod,
+						endPoint,
+						body,
+						qs,
+					)) as number[];
 					if (version === 1) {
 						returnData.push(...items.map((item) => item.json));
 					} else if (version === 2) {
@@ -381,7 +388,7 @@ export class NocoDB implements INodeType {
 					if (this.continueOnFail()) {
 						returnData.push({ error: error.toString() });
 					}
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 			}
 
@@ -426,7 +433,7 @@ export class NocoDB implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -437,7 +444,7 @@ export class NocoDB implements INodeType {
 							).split(',');
 							const response = await downloadRecordAttachments.call(
 								this,
-								responseData,
+								responseData as IDataObject[],
 								downloadFieldNames,
 							);
 							data.push(...response);
@@ -475,7 +482,7 @@ export class NocoDB implements INodeType {
 						responseData = await apiRequest.call(this, requestMethod, endPoint, {}, qs);
 
 						if (version === 2) {
-							if (Object.keys(responseData).length === 0) {
+							if (Object.keys(responseData as IDataObject).length === 0) {
 								// Get did fail
 								const errorMessage = `The row with the ID "${id}" could not be queried. It probably doesn't exist.`;
 								if (this.continueOnFail()) {
@@ -498,7 +505,7 @@ export class NocoDB implements INodeType {
 							).split(',');
 							const data = await downloadRecordAttachments.call(
 								this,
-								[responseData],
+								[responseData as IDataObject],
 								downloadFieldNames,
 							);
 							const newItem = {
@@ -514,7 +521,7 @@ export class NocoDB implements INodeType {
 							newItems.push(...executionData);
 						} else {
 							const executionData = this.helpers.constructExecutionMetaData(
-								this.helpers.returnJsonArray(responseData),
+								this.helpers.returnJsonArray(responseData as IDataObject),
 								{ itemData: { item: i } },
 							);
 
@@ -530,7 +537,7 @@ export class NocoDB implements INodeType {
 							newItems.push(...executionData);
 							continue;
 						}
-						throw new NodeApiError(this.getNode(), error, { itemIndex: i });
+						throw new NodeApiError(this.getNode(), error as JsonObject, { itemIndex: i });
 					}
 				}
 				return this.prepareOutputData(newItems);
@@ -630,7 +637,13 @@ export class NocoDB implements INodeType {
 				}
 
 				try {
-					responseData = await apiRequest.call(this, requestMethod, endPoint, body, qs);
+					responseData = (await apiRequest.call(
+						this,
+						requestMethod,
+						endPoint,
+						body,
+						qs,
+					)) as number[];
 
 					if (version === 1) {
 						returnData.push(...body);
@@ -658,7 +671,7 @@ export class NocoDB implements INodeType {
 					if (this.continueOnFail()) {
 						returnData.push({ error: error.toString() });
 					}
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 			}
 		}
diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
index 949c540e3b7d7f..08fbc3cd1fcf97 100644
--- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
@@ -14,6 +14,7 @@ import type {
 	INodeExecutionData,
 	INodeProperties,
 	IPollFunctions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -72,7 +73,7 @@ export async function notionApiRequest(
 			json: true,
 		};
 		options = Object.assign({}, options, option);
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		if (!uri) {
@@ -80,7 +81,7 @@ export async function notionApiRequest(
 		}
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -107,7 +108,7 @@ export async function notionApiRequestAllItems(
 		} else {
 			body.start_cursor = next_cursor;
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		if (query.limit && query.limit <= returnData.length) {
 			return returnData;
 		}
@@ -192,23 +193,20 @@ function getLink(text: { textLink: string; isLink: boolean }) {
 	return {};
 }
 
-function getTexts(
-	texts: [
-		{
-			textType: string;
-			text: string;
-			isLink: boolean;
-			range: boolean;
-			textLink: string;
-			mentionType: string;
-			dateStart: string;
-			dateEnd: string;
-			date: string;
-			annotationUi: IDataObject;
-			expression: string;
-		},
-	],
-) {
+type TextData = {
+	textType: string;
+	text: string;
+	isLink: boolean;
+	range: boolean;
+	textLink: string;
+	mentionType: string;
+	dateStart: string;
+	dateEnd: string;
+	date: string;
+	annotationUi: IDataObject;
+	expression: string;
+};
+function getTexts(texts: TextData[]) {
 	const results = [];
 	for (const text of texts) {
 		if (text.textType === 'text') {
@@ -261,7 +259,7 @@ function getTextBlocks(block: IDataObject) {
 		text:
 			block.richText === false
 				? formatText(block.textContent as string).text
-				: getTexts(((block.text as IDataObject).text as any) || []),
+				: getTexts(((block.text as IDataObject).text as TextData[]) || []),
 	};
 }
 
@@ -305,7 +303,7 @@ function getPropertyKeyValue(
 			if (value.richText === false) {
 				result = { rich_text: [{ text: { content: value.textContent } }] };
 			} else {
-				result = { rich_text: getTexts(value.text.text) };
+				result = { rich_text: getTexts(value.text.text as TextData[]) };
 			}
 			break;
 		case 'title':
@@ -324,10 +322,10 @@ function getPropertyKeyValue(
 			result = {
 				type: 'relation',
 				relation: value.relationValue
-					.filter((relation: any) => {
+					.filter((relation: IDataObject) => {
 						return relation && typeof relation === 'string';
 					})
-					.reduce((acc: [], cur: any) => {
+					.reduce((acc: string[], cur: string) => {
 						return acc.concat(cur.split(',').map((relation: string) => relation.trim()));
 					}, [])
 					.filter((relation: string) => {
@@ -384,21 +382,21 @@ function getPropertyKeyValue(
 			};
 			break;
 		case 'date':
-			const format = getDateFormat(value.includeTime);
+			const format = getDateFormat(value.includeTime as boolean);
 			const timezoneValue = value.timezone === 'default' ? timezone : value.timezone;
 			if (value.range === true) {
 				result = {
 					type: 'date',
 					date: {
-						start: moment.tz(value.dateStart, timezoneValue).format(format),
-						end: moment.tz(value.dateEnd, timezoneValue).format(format),
+						start: moment.tz(value.dateStart as number, timezoneValue as string).format(format),
+						end: moment.tz(value.dateEnd as number, timezoneValue as string).format(format),
 					},
 				};
 			} else {
 				result = {
 					type: 'date',
 					date: {
-						start: moment.tz(value.date, timezoneValue).format(format),
+						start: moment.tz(value.date as number, timezoneValue as string).format(format),
 						end: null,
 					},
 				};
@@ -448,7 +446,13 @@ export function mapProperties(
 			(property) =>
 				[
 					`${property.key.split('|')[0]}`,
-					getPropertyKeyValue.call(this, property, property.key.split('|')[1], timezone, version),
+					getPropertyKeyValue.call(
+						this,
+						property,
+						property.key.split('|')[1] as string,
+						timezone,
+						version,
+					),
 				] as const,
 		)
 		.filter(([, value]) => value)
@@ -472,7 +476,7 @@ export function mapSorting(data: SortData[]) {
 
 export function mapFilters(filtersList: IDataObject[], timezone: string) {
 	return filtersList.reduce((obj, value: { [key: string]: any }) => {
-		let key = getNameAndType(value.key).type;
+		let key = getNameAndType(value.key as string).type;
 
 		let valuePropertyName =
 			key === 'last_edited_time' ? value[camelCase(key)] : value[`${camelCase(key)}Value`];
@@ -500,16 +504,16 @@ export function mapFilters(filtersList: IDataObject[], timezone: string) {
 		}
 
 		if (value.type === 'formula') {
-			const vpropertyName = value[`${camelCase(value.returnType)}Value`];
+			const vpropertyName = value[`${camelCase(value.returnType as string)}Value`];
 
 			return Object.assign(obj, {
-				['property']: getNameAndType(value.key).name,
+				['property']: getNameAndType(value.key as string).name,
 				[key]: { [value.returnType]: { [`${value.condition}`]: vpropertyName } },
 			});
 		}
 
 		return Object.assign(obj, {
-			['property']: getNameAndType(value.key).name,
+			['property']: getNameAndType(value.key as string).name,
 			[key]: { [`${value.condition}`]: valuePropertyName },
 		});
 	}, {});
@@ -518,9 +522,9 @@ export function mapFilters(filtersList: IDataObject[], timezone: string) {
 function simplifyProperty(property: any) {
 	let result: any;
 	const type = (property as IDataObject).type as string;
-	if (['text'].includes(property.type)) {
+	if (['text'].includes(property.type as string)) {
 		result = property.plain_text;
-	} else if (['rich_text', 'title'].includes(property.type)) {
+	} else if (['rich_text', 'title'].includes(property.type as string)) {
 		if (Array.isArray(property[type]) && property[type].length !== 0) {
 			result = property[type].map((text: any) => simplifyProperty(text) as string).join('');
 		} else {
@@ -536,32 +540,32 @@ function simplifyProperty(property: any) {
 			'email',
 			'phone_number',
 			'date',
-		].includes(property.type)
+		].includes(property.type as string)
 	) {
 		result = property[type];
-	} else if (['created_by', 'last_edited_by', 'select'].includes(property.type)) {
+	} else if (['created_by', 'last_edited_by', 'select'].includes(property.type as string)) {
 		result = property[type] ? property[type].name : null;
-	} else if (['people'].includes(property.type)) {
+	} else if (['people'].includes(property.type as string)) {
 		if (Array.isArray(property[type])) {
 			result = property[type].map((person: any) => person.person?.email || {});
 		} else {
 			result = property[type];
 		}
-	} else if (['multi_select'].includes(property.type)) {
+	} else if (['multi_select'].includes(property.type as string)) {
 		if (Array.isArray(property[type])) {
 			result = property[type].map((e: IDataObject) => e.name || {});
 		} else {
 			result = property[type].options.map((e: IDataObject) => e.name || {});
 		}
-	} else if (['relation'].includes(property.type)) {
+	} else if (['relation'].includes(property.type as string)) {
 		if (Array.isArray(property[type])) {
 			result = property[type].map((e: IDataObject) => e.id || {});
 		} else {
 			result = property[type].database_id;
 		}
-	} else if (['formula'].includes(property.type)) {
+	} else if (['formula'].includes(property.type as string)) {
 		result = property[type][property[type].type];
-	} else if (['rollup'].includes(property.type)) {
+	} else if (['rollup'].includes(property.type as string)) {
 		const rollupFunction = property[type].function as string;
 		if (rollupFunction.startsWith('count') || rollupFunction.includes('empty')) {
 			result = property[type].number;
@@ -570,13 +574,13 @@ function simplifyProperty(property: any) {
 			}
 		} else if (rollupFunction.startsWith('show') && property[type].type === 'array') {
 			const elements = property[type].array.map(simplifyProperty).flat();
-			result = rollupFunction === 'show_unique' ? [...new Set(elements)] : elements;
+			result = rollupFunction === 'show_unique' ? [...new Set(elements as string)] : elements;
 		}
-	} else if (['files'].includes(property.type)) {
+	} else if (['files'].includes(property.type as string)) {
 		result = property[type].map(
 			(file: { type: string; [key: string]: any }) => file[file.type].url,
 		);
-	} else if (['status'].includes(property.type)) {
+	} else if (['status'].includes(property.type as string)) {
 		result = property[type].name;
 	}
 	return result;
@@ -584,7 +588,7 @@ function simplifyProperty(property: any) {
 
 export function simplifyProperties(properties: any) {
 	const results: any = {};
-	for (const key of Object.keys(properties)) {
+	for (const key of Object.keys(properties as IDataObject)) {
 		results[`${key}`] = simplifyProperty(properties[key]);
 	}
 	return results;
@@ -620,20 +624,20 @@ export function simplifyObjects(objects: any, download = false, version = 2) {
 		} else if (object === 'page' && parent.type === 'database_id') {
 			results.push({
 				id,
-				...(version === 2 ? { name: getPropertyTitle(properties) } : {}),
+				...(version === 2 ? { name: getPropertyTitle(properties as IDataObject) } : {}),
 				...(version === 2 ? { url } : {}),
 				...(version === 2
-					? { ...prepend('property', simplifyProperties(properties)) }
+					? { ...prepend('property', simplifyProperties(properties) as IDataObject) }
 					: { ...simplifyProperties(properties) }),
-			});
+			} as IDataObject);
 		} else if (download && json.object === 'page' && json.parent.type === 'database_id') {
 			results.push({
 				json: {
 					id: json.id,
-					...(version === 2 ? { name: getPropertyTitle(json.properties) } : {}),
+					...(version === 2 ? { name: getPropertyTitle(json.properties as IDataObject) } : {}),
 					...(version === 2 ? { url: json.url } : {}),
 					...(version === 2
-						? { ...prepend('property', simplifyProperties(json.properties)) }
+						? { ...prepend('property', simplifyProperties(json.properties) as IDataObject) }
 						: { ...simplifyProperties(json.properties) }),
 				},
 				binary,
@@ -790,8 +794,19 @@ export function getConditions() {
 	return elements;
 }
 
+export type FileRecord = {
+	properties: {
+		[key: string]:
+			| any
+			| {
+					id: string;
+					type: string;
+					files: [{ external: { url: string } } | { file: { url: string } }];
+			  };
+	};
+};
 // prettier-ignore
-export async function downloadFiles(this: IExecuteFunctions | IPollFunctions, records: [{ properties: { [key: string]: any | { id: string; type: string; files: [{ external: { url: string } } | { file: { url: string } }] } } }]): Promise<INodeExecutionData[]> {
+export async function downloadFiles(this: IExecuteFunctions | IPollFunctions, records: FileRecord[]): Promise<INodeExecutionData[]> {
 
 	const elements: INodeExecutionData[] = [];
 	for (const record of records) {
@@ -807,10 +822,10 @@ export async function downloadFiles(this: IExecuteFunctions | IPollFunctions, re
 							'',
 							{},
 							{},
-							file?.file?.url || file?.external?.url,
+							file?.file?.url as string || file?.external?.url as string,
 							{ json: false, encoding: null },
 						);
-						element.binary![`${key}_${index}`] = await this.helpers.prepareBinaryData(data);
+						element.binary![`${key}_${index}`] = await this.helpers.prepareBinaryData(data as Buffer);
 					}
 				}
 			}
diff --git a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
index a008a646cb18d9..7fe53f7f286a3e 100644
--- a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
@@ -216,7 +216,7 @@ export class NotionTrigger implements INodeType {
 		}
 
 		// if something changed after the last check
-		if (Array.isArray(data) && data.length && Object.keys(data[0]).length !== 0) {
+		if (Array.isArray(data) && data.length && Object.keys(data[0] as IDataObject).length !== 0) {
 			do {
 				body.page_size = 10;
 				const { results, has_more, next_cursor } = await notionApiRequest.call(
@@ -228,7 +228,7 @@ export class NotionTrigger implements INodeType {
 					'',
 					option,
 				);
-				records.push(...results);
+				records.push(...(results as IDataObject[]));
 				hasMore = has_more;
 				if (next_cursor !== null) {
 					body.start_cursor = next_cursor;
diff --git a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
index 71709bbdf7759c..a52e16b35c720c 100644
--- a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
+++ b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
@@ -10,6 +10,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import type { SortData } from '../GenericFunctions';
 import {
 	extractDatabaseId,
 	extractDatabaseMentionRLC,
@@ -51,7 +52,7 @@ export class NotionV1 implements INodeType {
 					extractValue: true,
 				}) as string;
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties)) {
+				for (const key of Object.keys(properties as IDataObject)) {
 					//remove parameters that cannot be set from the API.
 					if (
 						![
@@ -62,7 +63,7 @@ export class NotionV1 implements INodeType {
 							'formula',
 							'files',
 							'rollup',
-						].includes(properties[key].type)
+						].includes(properties[key].type as string)
 					) {
 						returnData.push({
 							name: `${key} - (${properties[key].type})`,
@@ -87,7 +88,7 @@ export class NotionV1 implements INodeType {
 					extractValue: true,
 				}) as string;
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties)) {
+				for (const key of Object.keys(properties as IDataObject)) {
 					returnData.push({
 						name: `${key} - (${properties[key].type})`,
 						value: `${key}|${properties[key].type}`,
@@ -155,7 +156,7 @@ export class NotionV1 implements INodeType {
 					parent: { database_id: databaseId },
 				} = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties)) {
+				for (const key of Object.keys(properties as IDataObject)) {
 					//remove parameters that cannot be set from the API.
 					if (
 						![
@@ -165,7 +166,7 @@ export class NotionV1 implements INodeType {
 							'last_edited_by',
 							'formula',
 							'files',
-						].includes(properties[key].type)
+						].includes(properties[key].type as string)
 					) {
 						returnData.push({
 							name: `${key} - (${properties[key].type})`,
@@ -254,7 +255,7 @@ export class NotionV1 implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(block),
+						this.helpers.returnJsonArray(block as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -288,7 +289,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -305,7 +306,7 @@ export class NotionV1 implements INodeType {
 					responseData = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -333,7 +334,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -379,7 +380,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -394,7 +395,7 @@ export class NotionV1 implements INodeType {
 					}) as string;
 					const returnAll = this.getNodeParameter('returnAll', i);
 					const filters = this.getNodeParameter('options.filter', i, {}) as IDataObject;
-					const sort = this.getNodeParameter('options.sort.sortValue', i, []) as IDataObject[];
+					const sort = this.getNodeParameter('options.sort.sortValue', i, []) as SortData[];
 					const body: IDataObject = {
 						filter: {},
 					};
@@ -418,7 +419,6 @@ export class NotionV1 implements INodeType {
 						delete body.filter;
 					}
 					if (sort) {
-						//@ts-expect-error
 						body.sorts = mapSorting(sort);
 					}
 					if (returnAll) {
@@ -446,7 +446,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -477,7 +477,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -492,7 +492,7 @@ export class NotionV1 implements INodeType {
 					responseData = await notionApiRequest.call(this, 'GET', `/users/${userId}`);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -510,7 +510,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -549,7 +549,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -566,7 +566,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -619,7 +619,7 @@ export class NotionV1 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
index 566fab9f5019e1..ac897f15c1cd21 100644
--- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
+++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -11,7 +11,7 @@ import type {
 } from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
-import type { SortData } from '../GenericFunctions';
+import type { SortData, FileRecord } from '../GenericFunctions';
 import {
 	downloadFiles,
 	extractDatabaseId,
@@ -55,7 +55,7 @@ export class NotionV2 implements INodeType {
 					extractValue: true,
 				}) as string;
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties)) {
+				for (const key of Object.keys(properties as IDataObject)) {
 					//remove parameters that cannot be set from the API.
 					if (
 						![
@@ -65,7 +65,7 @@ export class NotionV2 implements INodeType {
 							'last_edited_by',
 							'formula',
 							'rollup',
-						].includes(properties[key].type)
+						].includes(properties[key].type as string)
 					) {
 						returnData.push({
 							name: `${key}`,
@@ -90,7 +90,7 @@ export class NotionV2 implements INodeType {
 					extractValue: true,
 				}) as string;
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties)) {
+				for (const key of Object.keys(properties as IDataObject)) {
 					returnData.push({
 						name: `${key}`,
 						value: `${key}|${properties[key].type}`,
@@ -161,7 +161,7 @@ export class NotionV2 implements INodeType {
 					parent: { database_id: databaseId },
 				} = await notionApiRequest.call(this, 'GET', `/pages/${pageId}`);
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
-				for (const key of Object.keys(properties)) {
+				for (const key of Object.keys(properties as IDataObject)) {
 					//remove parameters that cannot be set from the API.
 					if (
 						![
@@ -171,7 +171,7 @@ export class NotionV2 implements INodeType {
 							'last_edited_by',
 							'formula',
 							'rollup',
-						].includes(properties[key].type)
+						].includes(properties[key].type as string)
 					) {
 						returnData.push({
 							name: `${key}`,
@@ -261,7 +261,7 @@ export class NotionV2 implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(block),
+						this.helpers.returnJsonArray(block as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -302,7 +302,7 @@ export class NotionV2 implements INodeType {
 					}));
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -323,7 +323,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -355,7 +355,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -407,7 +407,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -422,7 +422,7 @@ export class NotionV2 implements INodeType {
 				}) as string;
 				const { properties } = await notionApiRequest.call(this, 'GET', `/databases/${databaseId}`);
 				let titleKey = '';
-				for (const key of Object.keys(properties)) {
+				for (const key of Object.keys(properties as IDataObject)) {
 					if (properties[key].type === 'title') {
 						titleKey = key;
 					}
@@ -479,7 +479,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -498,7 +498,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -569,14 +569,14 @@ export class NotionV2 implements INodeType {
 						responseData = responseData.results;
 					}
 					if (download) {
-						responseData = await downloadFiles.call(this, responseData);
+						responseData = await downloadFiles.call(this, responseData as FileRecord[]);
 					}
 					if (simple) {
 						responseData = simplifyObjects(responseData, download);
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -607,7 +607,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -622,7 +622,7 @@ export class NotionV2 implements INodeType {
 					responseData = await notionApiRequest.call(this, 'GET', `/users/${userId}`);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -640,7 +640,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -663,7 +663,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -700,7 +700,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -751,7 +751,7 @@ export class NotionV2 implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
index a74707cd01e274..08fb3ab67a011d 100644
--- a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
@@ -125,7 +125,7 @@ export async function odooJSONRPCRequest(
 
 		const responce = await this.helpers.request(options);
 		if (responce.error) {
-			throw new NodeApiError(this.getNode(), responce.error.data, {
+			throw new NodeApiError(this.getNode(), responce.error.data as JsonObject, {
 				message: responce.error.data.message,
 			});
 		}
diff --git a/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts b/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
index 352fecebac14ca..b7e89bb44a7064 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function oneSimpleApiRequest(
@@ -36,6 +36,6 @@ export async function oneSimpleApiRequest(
 		const responseData = await this.helpers.request(options);
 		return responseData;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
index 9fafb7619bb918..8bd650526b16bf 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
@@ -692,7 +692,7 @@ export class OneSimpleApi implements INodeType {
 								'',
 								{},
 								{},
-								response.url,
+								response.url as string,
 								{ json: false, encoding: null },
 							)) as Buffer;
 							responseData = {
@@ -739,7 +739,7 @@ export class OneSimpleApi implements INodeType {
 								'',
 								{},
 								{},
-								response.url,
+								response.url as string,
 								{ json: false, encoding: null },
 							)) as Buffer;
 							responseData = {
@@ -844,7 +844,7 @@ export class OneSimpleApi implements INodeType {
 								'',
 								{},
 								{},
-								response.url,
+								response.url as string,
 								{ json: false, encoding: null },
 							)) as Buffer;
 							responseData = {
diff --git a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
index 62fb47349d3bd1..998a090cdcd1ec 100644
--- a/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Onfleet/GenericFunctions.ts
@@ -41,7 +41,6 @@ export async function onfleetApiRequest(
 		json: true,
 	};
 	try {
-		//@ts-ignore
 		return await this.helpers.request(options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
@@ -64,7 +63,7 @@ export async function onfleetApiRequestAllItems(
 	do {
 		responseData = await onfleetApiRequest.call(this, method, endpoint, body, query);
 		query.lastId = responseData.lastId;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.lastId !== undefined);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
index 7595f3b337d0ac..2e8af446e22de6 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
@@ -196,6 +196,6 @@ export class Onfleet implements INodeType {
 		const responseData = await operations[resource].call(this, `${resource}s`, operation, items);
 
 		// Map data to n8n data
-		return [this.helpers.returnJsonArray(responseData)];
+		return [this.helpers.returnJsonArray(responseData as IDataObject)];
 	}
 }
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
index 8ba44c9e4866c5..26dc7873791930 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.ts
@@ -853,7 +853,7 @@ export class Onfleet {
 						tasks = tasks.tasks;
 						tasks = tasks.splice(0, limit);
 					}
-					responseData.push(...tasks);
+					responseData.push(...(tasks as IDataObject[]));
 				} else if (operation === 'complete') {
 					/* -------------------------------------------------------------------------- */
 					/*                            Force complete a task                           */
@@ -1061,7 +1061,7 @@ export class Onfleet {
 						const limit = this.getNodeParameter('limit', 0);
 						adminUsers = adminUsers.slice(0, limit);
 					}
-					responseData.push(...adminUsers);
+					responseData.push(...(adminUsers as IDataObject[]));
 				} else if (operation === 'create') {
 					/* -------------------------------------------------------------------------- */
 					/*                             Create a new admin                             */
@@ -1123,7 +1123,7 @@ export class Onfleet {
 						const limit = this.getNodeParameter('limit', 0);
 						hubs = hubs.slice(0, limit);
 					}
-					responseData.push(...hubs);
+					responseData.push(...(hubs as IDataObject[]));
 				} else if (operation === 'create') {
 					/* -------------------------------------------------------------------------- */
 					/*                              Create a new hub                              */
@@ -1203,7 +1203,7 @@ export class Onfleet {
 						workers = workers.slice(0, limit);
 					}
 
-					responseData.push(...workers);
+					responseData.push(...(workers as IDataObject[]));
 				} else if (operation === 'get') {
 					/* -------------------------------------------------------------------------- */
 					/*                                Get a worker                                */
@@ -1290,7 +1290,9 @@ export class Onfleet {
 					/* -------------------------------------------------------------------------- */
 					/*                              Get all webhooks                              */
 					/* -------------------------------------------------------------------------- */
-					responseData.push(...(await onfleetApiRequest.call(this, 'GET', resource)));
+					responseData.push(
+						...((await onfleetApiRequest.call(this, 'GET', resource)) as IDataObject[]),
+					);
 				} else if (operation === 'create') {
 					/* -------------------------------------------------------------------------- */
 					/*                            Create a new webhook                            */
@@ -1403,7 +1405,7 @@ export class Onfleet {
 						teams = teams.slice(0, limit);
 					}
 
-					responseData.push(...teams);
+					responseData.push(...(teams as IDataObject[]));
 				} else if (operation === 'get') {
 					/* -------------------------------------------------------------------------- */
 					/*                              Get a single team                             */
diff --git a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
index 6eecb46eb223b4..ed4fb7b032705f 100644
--- a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
@@ -3,6 +3,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
@@ -51,7 +52,6 @@ export class OnfleetTrigger implements INodeType {
 		properties: [eventDisplay, eventNameField],
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -101,7 +101,7 @@ export class OnfleetTrigger implements INodeType {
 					const webhook = await onfleetApiRequest.call(this, 'POST', path, body);
 
 					if (webhook.id === undefined) {
-						throw new NodeApiError(this.getNode(), webhook, {
+						throw new NodeApiError(this.getNode(), webhook as JsonObject, {
 							message: 'Onfleet webhook creation response did not contain the expected data',
 						});
 					}
diff --git a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
index 9c743d1953d29f..52e51d52d2e54d 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function openThesaurusApiRequest(
@@ -37,6 +37,6 @@ export async function openThesaurusApiRequest(
 
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
index 0f65f7da7030ab..c46b247206402d 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
@@ -167,7 +167,7 @@ export class OpenThesaurus implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
index f8704942ba9e1c..6497cd8b1e8a8f 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -270,11 +271,11 @@ export class OpenWeatherMap implements INodeType {
 				try {
 					responseData = await this.helpers.request(options);
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
index cdfb12e5fb2357..4e7fd71a86a171 100644
--- a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { JsonObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { IRelation } from './Interfaces';
@@ -39,7 +39,7 @@ export async function orbitApiRequest(
 
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -100,14 +100,14 @@ export async function orbitApiRequestAllItems(
 
 	do {
 		responseData = await orbitApiRequest.call(this, method, resource, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 
 		if (query.resolveIdentities === true) {
-			resolveIdentities(responseData);
+			resolveIdentities(responseData as IRelation);
 		}
 
 		if (query.resolveMember === true) {
-			resolveMember(responseData);
+			resolveMember(responseData as IRelation);
 		}
 
 		query.page++;
diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 85a84af03f4a21..87244f60b0941b 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -20,6 +20,7 @@ import { noteFields, noteOperations } from './NoteDescription';
 import { postFields, postOperations } from './PostDescription';
 
 import moment from 'moment';
+import type { IRelation } from './Interfaces';
 
 export class Orbit implements INodeType {
 	description: INodeTypeDescription = {
@@ -281,7 +282,7 @@ export class Orbit implements INodeType {
 							`/${workspaceId}/members/${memberId}`,
 						);
 						if (resolve) {
-							resolveIdentities(responseData);
+							resolveIdentities(responseData as IRelation);
 						}
 						responseData = responseData.data;
 					}
@@ -525,7 +526,7 @@ export class Orbit implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Oura/GenericFunctions.ts b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
index 1a6ce1e56fe179..e4205c299c740c 100644
--- a/packages/nodes-base/nodes/Oura/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function ouraApiRequest(
@@ -44,6 +44,6 @@ export async function ouraApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.ts b/packages/nodes-base/nodes/Oura/Oura.node.ts
index 4c11af67ae97a4..182410146528c4 100644
--- a/packages/nodes-base/nodes/Oura/Oura.node.ts
+++ b/packages/nodes-base/nodes/Oura/Oura.node.ts
@@ -148,8 +148,8 @@ export class Oura implements INodeType {
 			}
 
 			Array.isArray(responseData)
-				? returnData.push(...responseData)
-				: returnData.push(responseData);
+				? returnData.push(...(responseData as IDataObject[]))
+				: returnData.push(responseData as IDataObject);
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
index d17fe6be9816ee..2943d59994a8e9 100644
--- a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { JsonObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function paddleApiRequest(
@@ -47,12 +47,12 @@ export async function paddleApiRequest(
 		const response = await this.helpers.request(options);
 
 		if (!response.success) {
-			throw new NodeApiError(this.getNode(), response);
+			throw new NodeApiError(this.getNode(), response as JsonObject);
 		}
 
 		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -74,7 +74,7 @@ export async function paddleApiRequestAllItems(
 
 	do {
 		responseData = await paddleApiRequest.call(this, endpoint, method, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		body.page++;
 	} while (
 		responseData[propertyName].length !== 0 &&
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index 363d52c75abb70..be4cfbc7d2ae50 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -119,7 +120,7 @@ export class Paddle implements INodeType {
 
 				// Alert user if there's no payments present to be loaded into payments property
 				if (paymentResponse.response === undefined || paymentResponse.response.length === 0) {
-					throw new NodeApiError(this.getNode(), paymentResponse, {
+					throw new NodeApiError(this.getNode(), paymentResponse as JsonObject, {
 						message: 'No payments on account.',
 					});
 				}
@@ -532,7 +533,7 @@ export class Paddle implements INodeType {
 				throw error;
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
index 04ca75fefd86b0..80540ffa548cd7 100644
--- a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { JsonObject, IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
@@ -33,7 +33,7 @@ export async function pagerDutyApiRequest(
 		},
 	};
 
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.form;
 	}
 	if (!Object.keys(query).length) {
@@ -53,7 +53,7 @@ export async function pagerDutyApiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'pagerDutyOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -75,7 +75,7 @@ export async function pagerDutyApiRequestAllItems(
 	do {
 		responseData = await pagerDutyApiRequest.call(this, method, endpoint, body, query);
 		query.offset++;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.more);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index 6aeeb8a94bc0f5..58f123a5cec6fb 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
@@ -456,7 +456,7 @@ export class PagerDuty implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
index 37bb8f52182a2d..f2d8298eb2a1c0 100644
--- a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
@@ -9,7 +9,7 @@ import type {
 } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { JsonObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 function getEnvironment(env: string) {
@@ -48,7 +48,7 @@ async function getAccessToken(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeOperationError(this.getNode(), error);
+		throw new NodeOperationError(this.getNode(), error as Error);
 	}
 }
 
@@ -84,7 +84,7 @@ export async function payPalApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -119,9 +119,9 @@ export async function payPalApiRequestAllItems(
 
 	do {
 		responseData = await payPalApiRequest.call(this, endpoint, method, body, query, uri);
-		uri = getNext(responseData.links);
-		returnData.push.apply(returnData, responseData[propertyName]);
-	} while (getNext(responseData.links) !== undefined);
+		uri = getNext(responseData.links as IDataObject[]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
+	} while (getNext(responseData.links as IDataObject[]) !== undefined);
 
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
index c0947953822713..a65d4751759875 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
@@ -236,7 +236,7 @@ export class PayPal implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index 1a2b5b5d007235..2e97ed5f3bf29e 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import { payPalApiRequest, upperFist } from './GenericFunctions';
@@ -72,10 +73,10 @@ export class PayPalTrigger implements INodeType {
 					const endpoint = '/notifications/webhooks-event-types';
 					events = await payPalApiRequest.call(this, endpoint, 'GET');
 				} catch (error) {
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 				for (const event of events.event_types) {
-					const eventName = upperFist(event.name);
+					const eventName = upperFist(event.name as string);
 					const eventId = event.name;
 					const eventDescription = event.description;
 
@@ -90,7 +91,6 @@ export class PayPalTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -108,7 +108,7 @@ export class PayPalTrigger implements INodeType {
 						delete webhookData.webhookId;
 						return false;
 					}
-					throw new NodeApiError(this.getNode(), error);
+					throw new NodeApiError(this.getNode(), error as JsonObject);
 				}
 				return true;
 			},
@@ -167,7 +167,7 @@ export class PayPalTrigger implements INodeType {
 		// if sanbox omit verification
 		if (env === 'sanbox') {
 			return {
-				workflowData: [this.helpers.returnJsonArray(req.body)],
+				workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 			};
 		}
 
@@ -199,7 +199,7 @@ export class PayPalTrigger implements INodeType {
 			return {};
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
index 46d320ec24c864..bde7d1fd324a6f 100644
--- a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { JsonObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function peekalinkApiRequest(
@@ -37,6 +37,6 @@ export async function peekalinkApiRequest(
 
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
index b22538d394fbd6..add08a50b15b86 100644
--- a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { JsonObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function phantombusterApiRequest(
@@ -23,13 +23,12 @@ export async function phantombusterApiRequest(
 		json: true,
 	};
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestWithAuthentication.call(this, 'phantombusterApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 791f258f8d0811..1be88c0bb36830 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -165,7 +165,7 @@ export class Phantombuster implements INodeType {
 							if (resultObject === null) {
 								responseData = {};
 							} else {
-								responseData = JSON.parse(resultObject);
+								responseData = JSON.parse(resultObject as string);
 							}
 						}
 					}
@@ -248,7 +248,7 @@ export class Phantombuster implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
index fb9b2736f8c2d0..2058b6e199e745 100644
--- a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { JsonObject, IDataObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function philipsHueApiRequest(
@@ -30,7 +30,7 @@ export async function philipsHueApiRequest(
 			options.headers = Object.assign({}, options.headers, headers);
 		}
 
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -38,20 +38,19 @@ export async function philipsHueApiRequest(
 			delete options.qs;
 		}
 
-		//@ts-ignore
 		const response = await this.helpers.requestOAuth2.call(this, 'philipsHueOAuth2Api', options, {
 			tokenType: 'Bearer',
 		});
 		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
 export async function getUser(this: IExecuteFunctions | ILoadOptionsFunctions): Promise<any> {
 	const { whitelist } = await philipsHueApiRequest.call(this, 'GET', '/api/0/config', {}, {});
 	//check if there is a n8n user
-	for (const user of Object.keys(whitelist)) {
+	for (const user of Object.keys(whitelist as IDataObject)) {
 		if (whitelist[user].name === 'n8n') {
 			return user;
 		}
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 75b6a3d75d9fec..2564309de0f7be 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -1,6 +1,7 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
 import type {
+	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -65,11 +66,11 @@ export class PhilipsHue implements INodeType {
 
 				const groups = await philipsHueApiRequest.call(this, 'GET', `/api/${user}/groups`);
 
-				for (const light of Object.keys(lights)) {
+				for (const light of Object.keys(lights as IDataObject)) {
 					let lightName = lights[light].name;
 					const lightId = light;
 
-					for (const groupId of Object.keys(groups)) {
+					for (const groupId of Object.keys(groups as IDataObject)) {
 						if (groups[groupId].type === 'Room' && groups[groupId].lights.includes(lightId)) {
 							lightName = `${groups[groupId].name}: ${lightName}`;
 						}
@@ -156,7 +157,7 @@ export class PhilipsHue implements INodeType {
 
 					const lights = await philipsHueApiRequest.call(this, 'GET', `/api/${user}/lights`);
 
-					responseData = Object.values(lights);
+					responseData = Object.values(lights as IDataObject);
 
 					if (!returnAll) {
 						const limit = this.getNodeParameter('limit', i);
@@ -176,7 +177,7 @@ export class PhilipsHue implements INodeType {
 				}
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
index dd13224ddd3ae8..6b994b9ccd2e08 100644
--- a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, INodePropertyOptions } from 'n8n-workflow';
+import type { JsonObject, IDataObject, INodePropertyOptions } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -77,7 +77,7 @@ export async function pipedriveApiRequest(
 		}
 
 		if (responseData.success === false) {
-			throw new NodeApiError(this.getNode(), responseData);
+			throw new NodeApiError(this.getNode(), responseData as JsonObject);
 		}
 
 		return {
@@ -85,7 +85,7 @@ export async function pipedriveApiRequest(
 			data: responseData.data === null ? [] : responseData.data,
 		};
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -116,9 +116,9 @@ export async function pipedriveApiRequestAllItems(
 		responseData = await pipedriveApiRequest.call(this, method, endpoint, body, query);
 		// the search path returns data diferently
 		if (responseData.data.items) {
-			returnData.push.apply(returnData, responseData.data.items);
+			returnData.push.apply(returnData, responseData.data.items as IDataObject[]);
 		} else {
-			returnData.push.apply(returnData, responseData.data);
+			returnData.push.apply(returnData, responseData.data as IDataObject[]);
 		}
 
 		query.start = responseData.additionalData.pagination.next_start;
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index bdcccc7a6d47b9..5bca7f6d2f617c 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -4850,7 +4850,7 @@ export class Pipedrive implements INodeType {
 					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 
 					items[i].binary![binaryPropertyName] = await this.helpers.prepareBinaryData(
-						responseData.data,
+						responseData.data as Buffer,
 					);
 				} else {
 					if (responseData.data === null) {
@@ -4878,7 +4878,7 @@ export class Pipedrive implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index 5d5ee811fa48a3..bf0b044916f167 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -2,6 +2,7 @@ import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
 
 import type {
 	ICredentialDataDecryptedObject,
+	IDataObject,
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
@@ -209,7 +210,6 @@ export class PipedriveTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -353,7 +353,7 @@ export class PipedriveTrigger implements INodeType {
 		}
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
index 138d9b2a98d005..c6f57e17b62193 100644
--- a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -39,6 +39,6 @@ export async function plivoApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Plivo/Plivo.node.ts b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
index ed57e9b5c9add0..1099b6942e563e 100644
--- a/packages/nodes-base/nodes/Plivo/Plivo.node.ts
+++ b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
@@ -142,8 +142,8 @@ export class Plivo implements INodeType {
 			}
 
 			Array.isArray(responseData)
-				? returnData.push(...responseData)
-				: returnData.push(responseData);
+				? returnData.push(...(responseData as IDataObject[]))
+				: returnData.push(responseData as IDataObject);
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
index 52810b3d05bb1b..871b00ef4c5382 100644
--- a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUrl } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function posthogApiRequest(
@@ -32,12 +32,12 @@ export async function posthogApiRequest(
 	};
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index e61ba2f5b1f65f..f16b6721d820d1 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -121,7 +121,7 @@ export class PostHog implements INodeType {
 
 						responseData = await posthogApiRequest.call(this, 'POST', '/batch', event);
 
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ error: error.message });
@@ -173,7 +173,7 @@ export class PostHog implements INodeType {
 
 					responseData = await posthogApiRequest.call(this, 'POST', '/capture', { batch: events });
 
-					returnData.push(responseData);
+					returnData.push(responseData as IDataObject);
 				} catch (error) {
 					if (this.continueOnFail()) {
 						returnData.push({ error: error.message });
@@ -217,7 +217,7 @@ export class PostHog implements INodeType {
 
 						responseData = await posthogApiRequest.call(this, 'POST', '/batch', event);
 
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ error: error.message });
@@ -273,7 +273,7 @@ export class PostHog implements INodeType {
 
 						responseData = await posthogApiRequest.call(this, 'POST', '/batch', event);
 
-						returnData.push(responseData);
+						returnData.push(responseData as IDataObject);
 					} catch (error) {
 						if (this.continueOnFail()) {
 							returnData.push({ error: error.message });
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
index 4aa41b87a867eb..a13c45759a40c8 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
@@ -194,7 +194,7 @@ export async function pgQueryV2(
 	if (mode === 'multiple') {
 		return (await db.multi(pgp.helpers.concat(allQueries)))
 			.map((result, i) => {
-				return this.helpers.constructExecutionMetaData(wrapData(result), {
+				return this.helpers.constructExecutionMetaData(wrapData(result as IDataObject[]), {
 					itemData: { item: i },
 				});
 			})
@@ -206,7 +206,7 @@ export async function pgQueryV2(
 				try {
 					const transactionResult = await t.any(allQueries[i].query, allQueries[i].values);
 					const executionData = this.helpers.constructExecutionMetaData(
-						wrapData(transactionResult),
+						wrapData(transactionResult as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					result.push(...executionData);
@@ -230,7 +230,7 @@ export async function pgQueryV2(
 				try {
 					const transactionResult = await t.any(allQueries[i].query, allQueries[i].values);
 					const executionData = this.helpers.constructExecutionMetaData(
-						wrapData(transactionResult),
+						wrapData(transactionResult as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					result.push(...executionData);
@@ -319,7 +319,7 @@ export async function pgInsert(
 				try {
 					const insertResult = await t.oneOrNone(pgp.helpers.insert(itemCopy, cs) + returning);
 					if (insertResult !== null) {
-						result.push(insertResult);
+						result.push(insertResult as IDataObject);
 					}
 				} catch (err) {
 					if (!continueOnFail) {
@@ -382,7 +382,7 @@ export async function pgInsertV2(
 		const queryResult = await db.any(query);
 		return queryResult
 			.map((result, i) => {
-				return this.helpers.constructExecutionMetaData(wrapData(result), {
+				return this.helpers.constructExecutionMetaData(wrapData(result as IDataObject[]), {
 					itemData: { item: i },
 				});
 			})
@@ -395,7 +395,7 @@ export async function pgInsertV2(
 				try {
 					const insertResult = await t.one(pgp.helpers.insert(itemCopy, cs) + returning);
 					result.push(
-						...this.helpers.constructExecutionMetaData(wrapData(insertResult), {
+						...this.helpers.constructExecutionMetaData(wrapData(insertResult as IDataObject[]), {
 							itemData: { item: i },
 						}),
 					);
@@ -420,9 +420,12 @@ export async function pgInsertV2(
 				try {
 					const insertResult = await t.oneOrNone(pgp.helpers.insert(itemCopy, cs) + returning);
 					if (insertResult !== null) {
-						const executionData = this.helpers.constructExecutionMetaData(wrapData(insertResult), {
-							itemData: { item: i },
-						});
+						const executionData = this.helpers.constructExecutionMetaData(
+							wrapData(insertResult as IDataObject[]),
+							{
+								itemData: { item: i },
+							},
+						);
 						result.push(...executionData);
 					}
 				} catch (err) {
@@ -652,7 +655,7 @@ export async function pgUpdateV2(
 								returning,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							wrapData(transactionResult),
+							wrapData(transactionResult as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						result.push(...executionData);
@@ -680,7 +683,7 @@ export async function pgUpdateV2(
 								returning,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							wrapData(independentResult),
+							wrapData(independentResult as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						result.push(...executionData);
diff --git a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
index 3a1f39a5fb5175..3aa05b8d1d73e2 100644
--- a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function postmarkApiRequest(
@@ -23,7 +23,7 @@ export async function postmarkApiRequest(
 		uri: 'https://api.postmarkapp.com' + endpoint,
 		json: true,
 	};
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	options = Object.assign({}, options, option);
@@ -31,7 +31,7 @@ export async function postmarkApiRequest(
 	try {
 		return await this.helpers.requestWithAuthentication.call(this, 'postmarkApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
index bf2b08cc0bbe81..58f26c5cf94c25 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
@@ -1,6 +1,11 @@
 import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
 
-import type { INodeType, INodeTypeDescription, IWebhookResponseData } from 'n8n-workflow';
+import type {
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
 
 import {
 	convertTriggerObjectToStringArray,
@@ -105,7 +110,6 @@ export class PostmarkTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -246,7 +250,7 @@ export class PostmarkTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
index a63bed6e8c1e44..8edc2dc44b05a7 100644
--- a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function profitWellApiRequest(
@@ -37,13 +37,13 @@ export async function profitWellApiRequest(
 
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
-
-export function simplifyDailyMetrics(responseData: {
+export type Metrics = {
 	[key: string]: [{ date: string; value: number | null }];
-}) {
+};
+export function simplifyDailyMetrics(responseData: Metrics) {
 	const data: IDataObject[] = [];
 	const keys = Object.keys(responseData);
 	const dates = responseData[keys[0]].map((e) => e.date);
@@ -59,9 +59,7 @@ export function simplifyDailyMetrics(responseData: {
 	return data;
 }
 
-export function simplifyMontlyMetrics(responseData: {
-	[key: string]: [{ date: string; value: number | null }];
-}) {
+export function simplifyMontlyMetrics(responseData: Metrics) {
 	const data: IDataObject = {};
 	for (const key of Object.keys(responseData)) {
 		for (const [index] of responseData[key].entries()) {
diff --git a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
index 2a164a489b1922..a70976f772e41e 100644
--- a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
+++ b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
@@ -9,6 +9,7 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
+import type { Metrics } from './GenericFunctions';
 import {
 	profitWellApiRequest,
 	simplifyDailyMetrics,
@@ -121,7 +122,7 @@ export class ProfitWell implements INodeType {
 						}
 
 						responseData = await profitWellApiRequest.call(this, 'GET', `/metrics/${type}`, {}, qs);
-						responseData = responseData.data;
+						responseData = responseData.data as Metrics;
 
 						if (simple) {
 							if (type === 'daily') {
diff --git a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
index c978899e87e691..6b4ace5ac9b94f 100644
--- a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushbulletApiRequest(
@@ -23,16 +23,15 @@ export async function pushbulletApiRequest(
 		json: true,
 	};
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		if (Object.keys(option).length !== 0) {
 			Object.assign(options, option);
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'pushbulletOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -51,7 +50,7 @@ export async function pushbulletApiRequestAllItems(
 
 	do {
 		responseData = await pushbulletApiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.cursor !== undefined);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 2283d9882936cc..55f9dd5d826d4f 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -436,7 +436,7 @@ export class Pushbullet implements INodeType {
 							});
 
 							//upload the file
-							await pushbulletApiRequest.call(this, 'POST', '', {}, {}, uploadUrl, {
+							await pushbulletApiRequest.call(this, 'POST', '', {}, {}, uploadUrl as string, {
 								formData: {
 									file: {
 										value: dataBuffer,
@@ -504,7 +504,7 @@ export class Pushbullet implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
index c0ccdcb23ac66f..0a8117dca61211 100644
--- a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushcutApiRequest(
@@ -28,15 +28,14 @@ export async function pushcutApiRequest(
 		json: true,
 	};
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 		if (Object.keys(option).length !== 0) {
 			Object.assign(options, option);
 		}
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
index 41193de81203f7..03b185f7903f9d 100644
--- a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHttpRequestMethods, IHttpRequestOptions } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushoverApiRequest(
@@ -24,12 +29,12 @@ export async function pushoverApiRequest(
 	};
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
 		return await this.helpers.requestWithAuthentication.call(this, 'pushoverApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index 94bca1060231e3..a64142e81f1693 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -285,7 +285,7 @@ export class Pushover implements INodeType {
 			async getSounds(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const { sounds } = await pushoverApiRequest.call(this, 'GET', '/sounds.json', {});
 				const returnData: INodePropertyOptions[] = [];
-				for (const key of Object.keys(sounds)) {
+				for (const key of Object.keys(sounds as IDataObject)) {
 					returnData.push({
 						name: sounds[key],
 						value: key,
@@ -373,7 +373,7 @@ export class Pushover implements INodeType {
 
 						responseData = await pushoverApiRequest.call(this, 'POST', '/messages.json', body);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
index 72bdbdbcb3bc0a..448d762c36ec95 100644
--- a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function quickbaseApiRequest(
@@ -44,7 +44,7 @@ export async function quickbaseApiRequest(
 			json: true,
 		};
 
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
 
@@ -55,16 +55,16 @@ export async function quickbaseApiRequest(
 		if (Object.keys(option).length !== 0) {
 			Object.assign(options, option);
 		}
-		//@ts-ignore
+
 		return await this.helpers?.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
 //@ts-ignore
 // prettier-ignore
-export async function getFieldsObject(this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions, tableId: string): any { 
+export async function getFieldsObject(this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions, tableId: string): any {
 	const fieldsLabelKey: { [key: string]: number } = {};
 	const fieldsIdKey: { [key: number]: string } = {};
 	const data = await quickbaseApiRequest.call(this, 'GET', '/fields', {}, { tableId });
@@ -116,7 +116,7 @@ export async function quickbaseApiRequestAllItems(
 
 		for (const record of data) {
 			const recordData: IDataObject = {};
-			for (const [key, value] of Object.entries(record)) {
+			for (const [key, value] of Object.entries(record as IDataObject)) {
 				recordData[fieldsIdKey[key]] = (value as IDataObject).value;
 			}
 			responseData.push(recordData);
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index 1a971d017cbaf0..d24241e69376d4 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -149,7 +149,7 @@ export class QuickBase implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -176,7 +176,7 @@ export class QuickBase implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -220,7 +220,7 @@ export class QuickBase implements INodeType {
 					);
 
 					//content-disposition': 'attachment; filename="dog-puppy-on-garden-royalty-free-image-1586966191.jpg"',
-					const contentDisposition = responseData.headers['content-disposition'];
+					const contentDisposition: string = responseData.headers['content-disposition'];
 
 					const data = Buffer.from(responseData.body as string, 'base64');
 
@@ -287,7 +287,7 @@ export class QuickBase implements INodeType {
 
 					for (const record of records) {
 						const recordData: IDataObject = {};
-						for (const [key, value] of Object.entries(record)) {
+						for (const [key, value] of Object.entries(record as IDataObject)) {
 							recordData[key] = (value as IDataObject).value;
 						}
 						responseData.push(recordData);
@@ -295,7 +295,7 @@ export class QuickBase implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: 0 } },
 				);
 
@@ -316,7 +316,7 @@ export class QuickBase implements INodeType {
 					responseData = await quickbaseApiRequest.call(this, 'DELETE', '/records', body);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -374,14 +374,14 @@ export class QuickBase implements INodeType {
 
 						for (const record of records) {
 							const data: IDataObject = {};
-							for (const [key, value] of Object.entries(record)) {
+							for (const [key, value] of Object.entries(record as IDataObject)) {
 								data[fieldsIdKey[key]] = (value as IDataObject).value;
 							}
 							responseData.push(data);
 						}
 					}
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -457,7 +457,7 @@ export class QuickBase implements INodeType {
 
 					for (const record of records) {
 						const recordData: IDataObject = {};
-						for (const [key, value] of Object.entries(record)) {
+						for (const [key, value] of Object.entries(record as IDataObject)) {
 							recordData[fieldsIdKey[key]] = (value as IDataObject).value;
 						}
 						responseData.push(recordData);
@@ -465,7 +465,7 @@ export class QuickBase implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: 0 } },
 				);
 
@@ -540,7 +540,7 @@ export class QuickBase implements INodeType {
 
 					for (const record of records) {
 						const recordData: IDataObject = {};
-						for (const [key, value] of Object.entries(record)) {
+						for (const [key, value] of Object.entries(record as IDataObject)) {
 							recordData[key] = (value as IDataObject).value;
 						}
 						responseData.push(recordData);
@@ -548,7 +548,7 @@ export class QuickBase implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: 0 } },
 				);
 
@@ -597,7 +597,7 @@ export class QuickBase implements INodeType {
 
 						for (const record of records) {
 							const data: IDataObject = {};
-							for (const [key, value] of Object.entries(record)) {
+							for (const [key, value] of Object.entries(record as IDataObject)) {
 								data[fieldsIdKey[key]] = (value as IDataObject).value;
 							}
 							responseData.push(data);
@@ -605,7 +605,7 @@ export class QuickBase implements INodeType {
 					}
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
@@ -630,7 +630,7 @@ export class QuickBase implements INodeType {
 					);
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 781018b1268f65..6cdce056418dd7 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -5,6 +5,7 @@ import type {
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -87,7 +88,7 @@ export async function quickBooksApiRequest(
 	try {
 		return await this.helpers.requestOAuth2.call(this, 'quickBooksOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -132,9 +133,9 @@ export async function quickBooksApiRequestAllItems(
 		try {
 			const nonResource = originalQuery.split(' ')?.pop();
 			if (nonResource === 'CreditMemo' || nonResource === 'Term' || nonResource === 'TaxCode') {
-				returnData.push(...responseData.QueryResponse[nonResource]);
+				returnData.push(...(responseData.QueryResponse[nonResource] as IDataObject[]));
 			} else {
-				returnData.push(...responseData.QueryResponse[capitalCase(resource)]);
+				returnData.push(...(responseData.QueryResponse[capitalCase(resource)] as IDataObject[]));
 			}
 		} catch (error) {
 			return [];
@@ -235,7 +236,7 @@ export async function handleBinaryData(
 	const data = await quickBooksApiRequest.call(this, 'GET', endpoint, {}, {}, { encoding: null });
 
 	items[i].binary = items[i].binary ?? {};
-	items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(data);
+	items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(data as Buffer);
 	items[i].binary![binaryProperty].fileName = fileName;
 	items[i].binary![binaryProperty].fileExtension = 'pdf';
 
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 6995be6889c32b..71adde2bafe659 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -50,7 +50,7 @@ import { capitalCase } from 'change-case';
 
 import isEmpty from 'lodash.isempty';
 
-import type { QuickBooksOAuth2Credentials, TransactionFields } from './types';
+import type { QuickBooksOAuth2Credentials, TransactionFields, TransactionReport } from './types';
 
 export class QuickBooks implements INodeType {
 	description: INodeTypeDescription = {
@@ -1046,12 +1046,12 @@ export class QuickBooks implements INodeType {
 
 						const simplifyResponse = this.getNodeParameter('simple', i, true) as boolean;
 
-						if (!Object.keys(responseData?.Rows).length) {
+						if (!Object.keys(responseData?.Rows as IDataObject).length) {
 							responseData = [];
 						}
 
 						if (simplifyResponse && !Array.isArray(responseData)) {
-							responseData = simplifyTransactionReport(responseData);
+							responseData = simplifyTransactionReport(responseData as TransactionReport);
 						}
 					}
 				} else if (resource === 'vendor') {
@@ -1148,7 +1148,7 @@ export class QuickBooks implements INodeType {
 				throw error;
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 
@@ -1162,7 +1162,7 @@ export class QuickBooks implements INodeType {
 			['get'].includes(operation) &&
 			download
 		) {
-			return this.prepareOutputData(responseData);
+			return this.prepareOutputData(responseData as INodeExecutionData[]);
 		} else {
 			return this.prepareOutputData(returnData);
 		}
diff --git a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
index 8f69a3a81bf008..8ac15e6131f456 100644
--- a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -45,6 +45,6 @@ export async function raindropApiRequest(
 			includeCredentialsOnRefreshOnBody: true,
 		});
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 1af43d719d2cd9..956ded4f7f9e6c 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -430,8 +430,8 @@ export class Raindrop implements INodeType {
 				}
 
 				Array.isArray(responseData)
-					? returnData.push(...responseData)
-					: returnData.push(responseData);
+					? returnData.push(...(responseData as IDataObject[]))
+					: returnData.push(responseData as IDataObject);
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ error: error.message });
diff --git a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
index 8465f71c07c75a..8137433b2b56bb 100644
--- a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
@@ -76,11 +76,15 @@ export async function redditApiRequestAllItems(
 		}
 
 		if (endpoint === 'api/search_subreddits.json') {
-			responseData.subreddits.forEach((child: any) => returnData.push(child));
+			responseData.subreddits.forEach((child: any) => returnData.push(child as IDataObject));
 		} else if (resource === 'postComment' && operation === 'getAll') {
-			responseData[1].data.children.forEach((child: any) => returnData.push(child.data));
+			responseData[1].data.children.forEach((child: any) =>
+				returnData.push(child.data as IDataObject),
+			);
 		} else {
-			responseData.data.children.forEach((child: any) => returnData.push(child.data));
+			responseData.data.children.forEach((child: any) =>
+				returnData.push(child.data as IDataObject),
+			);
 		}
 		if (qs.limit && returnData.length >= qs.limit && !returnAll) {
 			return returnData;
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
index 306fa9fc2065dd..6ca92747cf0574 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -321,12 +322,12 @@ export class Reddit implements INodeType {
 						} else if (details === 'friends') {
 							responseData = responseData.data.children;
 							if (!responseData.length) {
-								throw new NodeApiError(this.getNode(), responseData);
+								throw new NodeApiError(this.getNode(), responseData as JsonObject);
 							}
 						} else if (details === 'karma') {
 							responseData = responseData.data;
 							if (!responseData.length) {
-								throw new NodeApiError(this.getNode(), responseData);
+								throw new NodeApiError(this.getNode(), responseData as JsonObject);
 							}
 						} else if (details === 'trophies') {
 							responseData = responseData.data.trophies.map((trophy: IDataObject) => trophy.data);
@@ -422,7 +423,7 @@ export class Reddit implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as JsonObject),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
index 079b911b428af0..06b2d81842deb7 100644
--- a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
@@ -1,6 +1,7 @@
 import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
+import type { IDataObject } from 'n8n-workflow';
 
 export async function rocketchatApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
@@ -20,7 +21,7 @@ export async function rocketchatApiRequest(
 		uri: `${credentials.domain}/api/v1${resource}.${operation}`,
 		json: true,
 	};
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	return this.helpers.requestWithAuthentication.call(this, 'rocketchatApi', options);
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index 842fb9250543ec..6a28fab7009a64 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -479,7 +479,7 @@ export class Rocketchat implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
index a400369be9e5fe..5fe3cb70a79c5d 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
@@ -72,7 +72,7 @@ export class RssFeedRead implements INodeType {
 					);
 				}
 
-				throw new NodeOperationError(this.getNode(), error);
+				throw new NodeOperationError(this.getNode(), error as Error);
 			}
 
 			const returnData: IDataObject[] = [];
@@ -80,7 +80,6 @@ export class RssFeedRead implements INodeType {
 			// For now we just take the items and ignore everything else
 			if (feed.items) {
 				feed.items.forEach((item) => {
-					// @ts-ignore
 					returnData.push(item);
 				});
 			}
diff --git a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
index 670e2d1131a6c0..bc86f7567cf1b2 100644
--- a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
+++ b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export interface RundeckCredentials {
@@ -36,7 +36,7 @@ export class RundeckApi {
 				options,
 			);
 		} catch (error) {
-			throw new NodeApiError(this.executeFunctions.getNode(), error);
+			throw new NodeApiError(this.executeFunctions.getNode(), error as JsonObject);
 		}
 	}
 
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index e08b53a580239a..0afe0d4b16548a 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -14,7 +14,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { URL } from 'url';
@@ -92,7 +92,7 @@ export async function s3ApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -119,7 +119,7 @@ export async function s3ApiRequestREST(
 		region,
 	);
 	try {
-		return JSON.parse(response);
+		return JSON.parse(response as string);
 	} catch (error) {
 		return response;
 	}
@@ -149,7 +149,7 @@ export async function s3ApiRequestSOAP(
 	);
 	try {
 		return await new Promise((resolve, reject) => {
-			parseString(response, { explicitArray: false }, (err, data) => {
+			parseString(response as string, { explicitArray: false }, (err, data) => {
 				if (err) {
 					return reject(err);
 				}
@@ -199,9 +199,9 @@ export async function s3ApiRequestSOAPAllItems(
 		}
 		if (get(responseData, propertyName)) {
 			if (Array.isArray(get(responseData, propertyName))) {
-				returnData.push.apply(returnData, get(responseData, propertyName));
+				returnData.push.apply(returnData, get(responseData, propertyName) as IDataObject[]);
 			} else {
-				returnData.push(get(responseData, propertyName));
+				returnData.push(get(responseData, propertyName) as IDataObject);
 			}
 		}
 		if (query.limit && query.limit <= returnData.length) {
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index 341efa1e0d65e8..896ac5d36a0ad3 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -12,6 +12,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -96,7 +97,7 @@ export class S3 implements INodeType {
 						try {
 							credentials = await this.getCredentials('s3');
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 
 						const name = this.getNodeParameter('name', i) as string;
@@ -186,7 +187,7 @@ export class S3 implements INodeType {
 							responseData = responseData.slice(0, qs.limit);
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -260,7 +261,7 @@ export class S3 implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -305,7 +306,7 @@ export class S3 implements INodeType {
 							qs,
 							headers,
 							{},
-							region,
+							region as string,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
 							this.helpers.returnJsonArray({ success: true }),
@@ -335,7 +336,7 @@ export class S3 implements INodeType {
 							{ 'list-type': 2, prefix: folderKey },
 							{},
 							{},
-							region,
+							region as string,
 						);
 
 						// folder empty then just delete it
@@ -349,7 +350,7 @@ export class S3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 
 							responseData = { deleted: [{ Key: folderKey }] };
@@ -387,7 +388,7 @@ export class S3 implements INodeType {
 								{ delete: '' },
 								headers,
 								{},
-								region,
+								region as string,
 							);
 
 							responseData = { deleted: responseData.DeleteResult.Deleted };
@@ -432,7 +433,7 @@ export class S3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 						} else {
 							qs.limit = this.getNodeParameter('limit', 0);
@@ -446,7 +447,7 @@ export class S3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 						}
 						if (Array.isArray(responseData)) {
@@ -460,7 +461,7 @@ export class S3 implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -568,10 +569,10 @@ export class S3 implements INodeType {
 							qs,
 							headers,
 							{},
-							region,
+							region as string,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData.CopyObjectResult),
+							this.helpers.returnJsonArray(responseData.CopyObjectResult as IDataObject),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -607,7 +608,7 @@ export class S3 implements INodeType {
 							qs,
 							{},
 							{ encoding: null, resolveWithFullResponse: true },
-							region,
+							region as string,
 						);
 
 						let mimeType: string | undefined;
@@ -666,7 +667,7 @@ export class S3 implements INodeType {
 							qs,
 							{},
 							{},
-							region,
+							region as string,
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
@@ -711,7 +712,7 @@ export class S3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 						} else {
 							qs.limit = this.getNodeParameter('limit', 0);
@@ -725,7 +726,7 @@ export class S3 implements INodeType {
 								qs,
 								{},
 								{},
-								region,
+								region as string,
 							);
 							responseData = responseData.splice(0, qs.limit);
 						}
@@ -739,7 +740,7 @@ export class S3 implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -867,7 +868,7 @@ export class S3 implements INodeType {
 								qs,
 								headers,
 								{},
-								region,
+								region as string,
 							);
 						} else {
 							const fileContent = this.getNodeParameter('fileContent', i) as string;
@@ -887,7 +888,7 @@ export class S3 implements INodeType {
 								qs,
 								headers,
 								{},
-								region,
+								region as string,
 							);
 						}
 
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index aed08d19228e10..28741b4c00365a 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, INodePropertyOptions } from 'n8n-workflow';
+import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
 import { LoggerProxy as Logger, NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
@@ -29,11 +29,10 @@ function getOptions(
 		json: true,
 	};
 
-	if (!Object.keys(options.body).length) {
+	if (!Object.keys(options.body as IDataObject).length) {
 		delete options.body;
 	}
 
-	//@ts-ignore
 	return options;
 }
 
@@ -130,11 +129,11 @@ export async function salesforceApiRequest(
 				`Authentication for "Salesforce" node is using "OAuth2". Invoking URI ${options.uri}`,
 			);
 			Object.assign(options, option);
-			//@ts-ignore
+
 			return await this.helpers.requestOAuth2.call(this, credentialsType, options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -155,7 +154,7 @@ export async function salesforceApiRequestAllItems(
 	do {
 		responseData = await salesforceApiRequest.call(this, method, endpoint, body, query, uri);
 		uri = `${endpoint}/${responseData.nextRecordsUrl?.split('/')?.pop()}`;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.nextRecordsUrl !== undefined && responseData.nextRecordsUrl !== null);
 
 	return returnData;
@@ -178,7 +177,7 @@ export function sortOptions(options: INodePropertyOptions[]): void {
 }
 
 export function getValue(value: any) {
-	if (moment(value).isValid()) {
+	if (moment(value as string).isValid()) {
 		return value;
 	} else if (typeof value === 'string') {
 		return `'${value}'`;
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 5e647ab4115795..95997fcd7d688b 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { LoggerProxy as Logger, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -1158,8 +1159,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -1271,8 +1271,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -1316,7 +1315,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/delete-lead-id
@@ -1329,7 +1328,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/lead/${leadId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Lead/get-lead
@@ -1482,8 +1481,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -1613,8 +1611,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -1662,7 +1659,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/delete-contact-id
@@ -1675,7 +1672,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/contact/${contactId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Contact/get-contact
@@ -1733,8 +1730,7 @@ export class Salesforce implements INodeType {
 							const customFields = customFieldsUi.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -1767,8 +1763,7 @@ export class Salesforce implements INodeType {
 							const customFields = customFieldsUi.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -1816,7 +1811,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					if (operation === 'delete') {
@@ -1829,7 +1824,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/${customObject}/${recordId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 				}
@@ -1942,8 +1937,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -2012,8 +2006,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -2061,7 +2054,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/delete-opportunity-id
@@ -2074,7 +2067,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/opportunity/${opportunityId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Opportunity/get-opportunity
@@ -2193,8 +2186,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -2302,8 +2294,7 @@ export class Salesforce implements INodeType {
 								.customFieldsValues as IDataObject[];
 							if (customFields) {
 								for (const customField of customFields) {
-									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -2351,7 +2342,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Account/delete-account-id
@@ -2364,7 +2355,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/account/${accountId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Account/get-account
@@ -2454,7 +2445,7 @@ export class Salesforce implements INodeType {
 							if (customFields) {
 								for (const customField of customFields) {
 									//@ts-ignore
-									body[customField.fieldId] = customField.value;
+									body[customField.fieldId as string] = customField.value;
 								}
 							}
 						}
@@ -2566,7 +2557,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Case/delete-case-id
@@ -2579,7 +2570,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/case/${caseId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Case/get-case
@@ -2829,7 +2820,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Task/delete-task-id
@@ -2842,7 +2833,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/task/${taskId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Task/get-task
@@ -2961,7 +2952,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Attachment/delete-attachment-id
@@ -2974,7 +2965,7 @@ export class Salesforce implements INodeType {
 								`/sobjects/attachment/${attachmentId}`,
 							);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developer.salesforce.com/docs/api-explorer/sobject/Attachment/get-attachment-id
@@ -3016,7 +3007,7 @@ export class Salesforce implements INodeType {
 								);
 							}
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 				}
@@ -3084,7 +3075,7 @@ export class Salesforce implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
index c650b40ac3a311..e1d5926f88458f 100644
--- a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
@@ -6,7 +6,8 @@ import type {
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function salesmateApiRequest(
@@ -38,13 +39,13 @@ export async function salesmateApiRequest(
 		uri: uri || `https://apis.salesmate.io${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -64,7 +65,7 @@ export async function salesmateApiRequestAllItems(
 	query.rows = 25;
 	do {
 		responseData = await salesmateApiRequest.call(this, method, resource, body, query);
-		returnData.push.apply(returnData, responseData[propertyName].data);
+		returnData.push.apply(returnData, responseData[propertyName].data as IDataObject[]);
 		query.pageNo++;
 	} while (
 		responseData[propertyName].totalPages !== undefined &&
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index e7898cd5764435..ed8aa56bcce2f5 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -281,7 +281,7 @@ export class Salesmate implements INodeType {
 					responseData = responseData.Data;
 
 					if (!rawData) {
-						responseData = simplifySalesmateData(responseData);
+						responseData = simplifySalesmateData(responseData as IDataObject[]);
 					}
 				}
 				if (operation === 'getAll') {
@@ -473,7 +473,7 @@ export class Salesmate implements INodeType {
 					responseData = responseData.Data;
 
 					if (!rawData) {
-						responseData = simplifySalesmateData(responseData);
+						responseData = simplifySalesmateData(responseData as IDataObject[]);
 					}
 				}
 				if (operation === 'getAll') {
@@ -683,7 +683,7 @@ export class Salesmate implements INodeType {
 					responseData = responseData.Data;
 
 					if (!rawData) {
-						responseData = simplifySalesmateData(responseData);
+						responseData = simplifySalesmateData(responseData as IDataObject[]);
 					}
 				}
 				if (operation === 'getAll') {
@@ -782,7 +782,7 @@ export class Salesmate implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
index c876995c98ec3d..543c96877816da 100644
--- a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { IExecuteFunctions } from 'n8n-core';
 
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, ILoadOptionsFunctions, IPollFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, IPollFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { TDtableMetadataColumns, TDtableViewColumns, TEndpointVariableName } from './types';
@@ -97,7 +97,7 @@ export async function seaTableApiRequest(
 		json: true,
 	};
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -108,7 +108,7 @@ export async function seaTableApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -142,7 +142,7 @@ export async function setableApiRequestAllItems(
 			query,
 		)) as unknown as IRow[];
 		//@ts-ignore
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		query.start = +query.start + segment;
 	} while (responseData && responseData.length > segment - 1);
 
@@ -280,7 +280,7 @@ function rowFormatColumn(input: unknown): boolean | number | string | string[] |
 		return input;
 	} else if (Array.isArray(input) && input.every((i) => typeof i === 'object')) {
 		const returnItems = [] as string[];
-		input.every((i) => returnItems.push(i.display_value));
+		input.every((i) => returnItems.push(i.display_value as string));
 		return returnItems;
 	}
 
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
index 8bcc91875ee88b..dac8668c7b7162 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
@@ -200,7 +200,7 @@ export class SeaTable implements INodeType {
 							);
 						}
 
-						const newRowInsertData = rowMapKeyToName(responseData, tableColumns);
+						const newRowInsertData = rowMapKeyToName(responseData as IRow, tableColumns);
 
 						qs.table_name = tableName;
 						qs.convert = true;
@@ -208,7 +208,9 @@ export class SeaTable implements INodeType {
 							this,
 							ctx,
 							'GET',
-							`/dtable-server/api/v1/dtables/{{dtable_uuid}}/rows/${encodeURIComponent(insertId)}/`,
+							`/dtable-server/api/v1/dtables/{{dtable_uuid}}/rows/${encodeURIComponent(
+								insertId as string,
+							)}/`,
 							body,
 							qs,
 						);
@@ -222,7 +224,7 @@ export class SeaTable implements INodeType {
 						}
 
 						const row = rowFormatColumns(
-							{ ...newRowInsertData, ...newRow },
+							{ ...newRowInsertData, ...(newRow as IRow) },
 							tableColumns.map(({ name }) => name).concat(['_id', '_ctime', '_mtime']),
 						);
 
@@ -322,7 +324,7 @@ export class SeaTable implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(rows),
+							this.helpers.returnJsonArray(rows as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 
@@ -424,7 +426,7 @@ export class SeaTable implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray({ _id: rowId, ...responseData }),
+							this.helpers.returnJsonArray({ _id: rowId, ...(responseData as IDataObject) }),
 							{ itemData: { item: i } },
 						);
 
diff --git a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
index 3c5750f9950db6..0d1e3da9922b67 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function scorecardApiRequest(
@@ -32,7 +32,7 @@ export async function scorecardApiRequest(
 		options = Object.assign({}, options, option);
 	}
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -42,7 +42,7 @@ export async function scorecardApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
index 7c17845fd6a314..fe339a2add74ee 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
@@ -353,7 +353,7 @@ export class SecurityScorecard implements INodeType {
 					}
 
 					if (simple) {
-						responseData = simplify(responseData);
+						responseData = simplify(responseData as IDataObject[]);
 					}
 
 					returnData.push.apply(returnData, responseData as IDataObject[]);
@@ -387,7 +387,7 @@ export class SecurityScorecard implements INodeType {
 					}
 
 					if (simple) {
-						responseData = simplify(responseData);
+						responseData = simplify(responseData as IDataObject[]);
 					}
 
 					returnData.push.apply(returnData, responseData as IDataObject[]);
@@ -456,7 +456,7 @@ export class SecurityScorecard implements INodeType {
 					}
 
 					if (simple) {
-						responseData = simplify(responseData);
+						responseData = simplify(responseData as IDataObject[]);
 					}
 
 					returnData.push.apply(returnData, responseData as IDataObject[]);
@@ -492,7 +492,7 @@ export class SecurityScorecard implements INodeType {
 					}
 
 					if (simple) {
-						responseData = simplify(responseData);
+						responseData = simplify(responseData as IDataObject[]);
 					}
 
 					returnData.push.apply(returnData, responseData as IDataObject[]);
diff --git a/packages/nodes-base/nodes/Segment/GenericFunctions.ts b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
index c5b32555d565a9..8d977cd44de536 100644
--- a/packages/nodes-base/nodes/Segment/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
@@ -32,7 +32,7 @@ export async function segmentApiRequest(
 		uri: uri || `https://api.segment.io/v1${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 	return this.helpers.requestWithAuthentication.call(this, 'segmentApi', options);
diff --git a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
index c91f5e17f14669..8b692dc48851c1 100644
--- a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
@@ -28,7 +28,7 @@ export async function sendGridApiRequest(
 		json: true,
 	};
 
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -55,9 +55,10 @@ export async function sendGridApiRequestAllItems(
 	let uri;
 
 	do {
-		responseData = await sendGridApiRequest.call(this, endpoint, method, body, query, uri);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+		responseData = await sendGridApiRequest.call(this, endpoint, method, body, query, uri); // posible bug, as function does not have uri parameter
 		uri = responseData._metadata.next;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		if (query.limit && returnData.length >= query.limit) {
 			return returnData;
 		}
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
index e62454e2b9e788..09e8769da12076 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -169,7 +169,7 @@ export class SendGrid implements INodeType {
 							responseData = responseData.splice(0, limit);
 						}
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -210,7 +210,7 @@ export class SendGrid implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -305,7 +305,7 @@ export class SendGrid implements INodeType {
 						{ list_ids: lists, contacts },
 						qs,
 					);
-					returnData.push(responseData);
+					returnData.push(responseData as INodeExecutionData);
 				} catch (error) {
 					if (this.continueOnFail()) {
 						returnData.push({ json: { error: error.message } });
@@ -331,7 +331,7 @@ export class SendGrid implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -368,7 +368,7 @@ export class SendGrid implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -399,7 +399,7 @@ export class SendGrid implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -429,7 +429,7 @@ export class SendGrid implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -490,7 +490,7 @@ export class SendGrid implements INodeType {
 							qs,
 						);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
index 61519aef7e4926..5465ff99d49121 100644
--- a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
@@ -121,7 +121,7 @@ export namespace SendInBlueNode {
 
 				return requestOptions;
 			} catch (err) {
-				throw new NodeOperationError(this.getNode(), err);
+				throw new NodeOperationError(this.getNode(), err as Error);
 			}
 		}
 
@@ -367,7 +367,7 @@ export namespace SendInBlueWebhookApi {
 			options,
 		);
 
-		return jsonParse(webhookId);
+		return jsonParse(webhookId as string);
 	};
 
 	export const deleteWebhook = async (ref: IHookFunctions, webhookId: string) => {
diff --git a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
index 8a574ddcd04b1f..7766ecb2ad88c0 100644
--- a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function sendyApiRequest(
@@ -31,9 +31,8 @@ export async function sendyApiRequest(
 	};
 
 	try {
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index be45e56e3cfa20..6064b1caa53e65 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -5,6 +5,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -141,10 +142,10 @@ export class Sendy implements INodeType {
 
 					const success = ['Campaign created', 'Campaign created and now sending'];
 
-					if (success.includes(responseData)) {
+					if (success.includes(responseData as string)) {
 						responseData = { message: responseData };
 					} else {
-						throw new NodeApiError(this.getNode(), responseData, { httpCode: '400' });
+						throw new NodeApiError(this.getNode(), responseData as JsonObject, { httpCode: '400' });
 					}
 				}
 			}
@@ -199,7 +200,7 @@ export class Sendy implements INodeType {
 						'List does not exist',
 					];
 
-					if (!errors.includes(responseData)) {
+					if (!errors.includes(responseData as string)) {
 						responseData = { count: responseData };
 					} else {
 						throw new NodeOperationError(
@@ -287,7 +288,7 @@ export class Sendy implements INodeType {
 						'Complained',
 					];
 
-					if (status.includes(responseData)) {
+					if (status.includes(responseData as string)) {
 						responseData = { status: responseData };
 					} else {
 						throw new NodeOperationError(
diff --git a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
index f09bf720ea0964..133c4ced19845b 100644
--- a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function sentryIoApiRequest(
@@ -38,7 +38,7 @@ export async function sentryIoApiRequest(
 		uri: uri || `https://sentry.io${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 
@@ -70,13 +70,12 @@ export async function sentryIoApiRequest(
 				Authorization: `Bearer ${credentials?.token}`,
 			};
 
-			//@ts-ignore
 			return await this.helpers.request(options);
 		} else {
 			return await this.helpers.requestOAuth2.call(this, 'sentryIoOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -121,12 +120,12 @@ export async function sentryApiRequestAllItems(
 			resolveWithFullResponse: true,
 		});
 		link = responseData.headers.link;
-		uri = getNext(link);
-		returnData.push.apply(returnData, responseData.body);
+		uri = getNext(link as string);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 		if (query.limit && query.limit >= returnData.length) {
 			return;
 		}
-	} while (hasMore(link));
+	} while (hasMore(link as string));
 
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index 14e724ee2d2d53..6d7f42361bd9d1 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -727,7 +727,7 @@ export class SentryIo implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
index 5507f919fd3fcf..c564bf1055f0ad 100644
--- a/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
@@ -34,7 +34,7 @@ export async function serviceNowApiRequest(
 		uri: uri || `https://${credentials.subdomain}.service-now.com/api${resource}`,
 		json: true,
 	};
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.body;
 	}
 
@@ -73,7 +73,7 @@ export async function serviceNowRequestAllItems(
 	responseData = await serviceNowApiRequest.call(this, method, resource, body, query, undefined, {
 		resolveWithFullResponse: true,
 	});
-	returnData.push.apply(returnData, responseData.body.result);
+	returnData.push.apply(returnData, responseData.body.result as IDataObject[]);
 
 	const quantity = responseData.headers['x-total-count'];
 	const iterations = Math.round(quantity / page) + (quantity % page ? 1 : 0);
@@ -85,7 +85,7 @@ export async function serviceNowRequestAllItems(
 			resolveWithFullResponse: true,
 		});
 
-		returnData.push.apply(returnData, responseData.body.result);
+		returnData.push.apply(returnData, responseData.body.result as IDataObject[]);
 	}
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
index 0c80b680952ab3..c1f9f114917299 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -536,8 +536,8 @@ export class ServiceNow implements INodeType {
 									[outputField]: await serviceNowDownloadAttachment.call(
 										this,
 										endpoint,
-										fileMetadata.file_name,
-										fileMetadata.content_type,
+										fileMetadata.file_name as string,
+										fileMetadata.content_type as string,
 									),
 								},
 							};
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index 9a7aac1400b4b2..42fe31b94093cd 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -58,7 +58,7 @@ export async function shopifyApiRequest(
 	if (Object.keys(option).length !== 0) {
 		Object.assign(options, option);
 	}
-	if (Object.keys(body).length === 0) {
+	if (Object.keys(body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	if (Object.keys(query).length === 0) {
@@ -104,7 +104,7 @@ export async function shopifyApiRequestAllItems(
 		if (responseData.headers.link) {
 			uri = responseData.headers.link.split(';')[0].replace('<', '').replace('>', '');
 		}
-		returnData.push.apply(returnData, responseData.body[propertyName]);
+		returnData.push.apply(returnData, responseData.body[propertyName] as IDataObject[]);
 	} while (responseData.headers.link?.includes('rel="next"'));
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index 13c158656108ad..ecef6c4cb64b25 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -454,7 +454,7 @@ export class Shopify implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index a99f2a796e1868..f07642c0c26b2b 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
@@ -330,7 +330,6 @@ export class ShopifyTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -427,7 +426,7 @@ export class ShopifyTrigger implements INodeType {
 			return {};
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
index c74b7871696fc0..b4ea190af15518 100644
--- a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -45,6 +45,6 @@ export async function SIGNL4ApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
index 8622542355582c..1c7be15513576f 100644
--- a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
@@ -98,10 +98,10 @@ export async function slackApiRequestAllItems(
 		query.limit = 100;
 	}
 	do {
-		responseData = await slackApiRequest.call(this, method, endpoint, body, query);
+		responseData = await slackApiRequest.call(this, method, endpoint, body as IDataObject, query);
 		query.cursor = get(responseData, 'response_metadata.next_cursor');
 		query.page++;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (
 		(responseData.response_metadata?.next_cursor !== undefined &&
 			responseData.response_metadata.next_cursor !== '' &&
diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
index fc409eb6aec5c9..cf97def17b75f1 100644
--- a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
+++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
@@ -490,7 +490,7 @@ export class SlackV1 implements INodeType {
 									{},
 									{ user: member },
 								);
-								data.push(user);
+								data.push(user as IDataObject);
 							}
 							responseData = data;
 						}
@@ -1380,7 +1380,7 @@ export class SlackV1 implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index e43a9a8540bae7..00780840c3b384 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -104,12 +104,12 @@ export async function slackApiRequestAllItems(
 		query.limit = 100;
 	}
 	do {
-		responseData = await slackApiRequest.call(this, method, endpoint, body, query);
+		responseData = await slackApiRequest.call(this, method, endpoint, body as IDataObject, query);
 		query.cursor = get(responseData, 'response_metadata.next_cursor');
 		query.page++;
 		returnData.push.apply(
 			returnData,
-			responseData[propertyName].matches ?? responseData[propertyName],
+			(responseData[propertyName].matches as IDataObject[]) ?? responseData[propertyName],
 		);
 	} while (
 		(responseData.response_metadata?.next_cursor !== undefined &&
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 0d0afcc2e16966..da2dedff5facb4 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -587,7 +587,7 @@ export class SlackV2 implements INodeType {
 									{},
 									{ user: member },
 								);
-								data.push(user);
+								data.push(user as IDataObject);
 							}
 							responseData = data;
 						}
@@ -1325,7 +1325,7 @@ export class SlackV2 implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
index 49e47c32421f46..fe69007a6afc14 100644
--- a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -36,7 +36,7 @@ export async function sms77ApiRequest(
 	const response = await this.helpers.requestWithAuthentication.call(this, 'sms77Api', options);
 
 	if (response.success !== '100') {
-		throw new NodeApiError(this.getNode(), response, {
+		throw new NodeApiError(this.getNode(), response as JsonObject, {
 			message: 'Invalid sms77 credentials or API error!',
 		});
 	}
diff --git a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
index 5616b9ddeefdac..3dfbce35ebdd17 100644
--- a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
@@ -89,7 +89,10 @@ export class SplitInBatches implements INodeType {
 		} else {
 			// The node has been called before. So return the next batch of items.
 			nodeContext.currentRunIndex += 1;
-			returnItems.push.apply(returnItems, nodeContext.items.splice(0, batchSize));
+			returnItems.push.apply(
+				returnItems,
+				(nodeContext.items as INodeExecutionData[]).splice(0, batchSize),
+			);
 
 			const addSourceOverwrite = (pairedItem: IPairedItemData | number): IPairedItemData => {
 				if (typeof pairedItem === 'number') {
diff --git a/packages/nodes-base/nodes/Splunk/GenericFunctions.ts b/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
index b24aea42a3757f..7e6301a5cbf9b8 100644
--- a/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -140,17 +140,17 @@ export async function splunkApiRequest(
 		return await this.helpers.request(options).then(parseXml);
 	} catch (error) {
 		if (error?.cause?.code === 'ECONNREFUSED') {
-			throw new NodeApiError(this.getNode(), { ...error, code: 401 });
+			throw new NodeApiError(this.getNode(), { ...(error as JsonObject), code: 401 });
 		}
 
-		const rawError = (await parseXml(error.error)) as SplunkError;
+		const rawError = (await parseXml(error.error as string)) as SplunkError;
 		error = extractErrorDescription(rawError);
 
 		if ('fatal' in error) {
 			error = { error: error.fatal };
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Splunk/Splunk.node.ts b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
index f83f8fc40fdadd..a7fe0fa3c84aa3 100644
--- a/packages/nodes-base/nodes/Splunk/Splunk.node.ts
+++ b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
@@ -464,7 +464,7 @@ export class Splunk implements INodeType {
 			}
 
 			Array.isArray(responseData)
-				? returnData.push(...responseData)
+				? returnData.push(...(responseData as IDataObject[]))
 				: returnData.push(responseData as IDataObject);
 		}
 
diff --git a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
index 509d1d08095079..ddcbe5883a9eff 100644
--- a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function spontitApiRequest(
@@ -17,7 +17,7 @@ export async function spontitApiRequest(
 
 	body: any = {},
 	qs: IDataObject = {},
-): Promise<any> {
+) {
 	const credentials = await this.getCredentials('spontitApi');
 
 	try {
@@ -32,12 +32,12 @@ export async function spontitApiRequest(
 			uri: `https://api.spontit.com/v3${resource}`,
 			json: true,
 		};
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
+
 		return await this.helpers?.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index 7c4ccc71073ed9..b95025cf96afc2 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
@@ -37,7 +37,7 @@ export async function spotifyApiRequest(
 	try {
 		return await this.helpers.requestOAuth2.call(this, 'spotifyOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -57,6 +57,7 @@ export async function spotifyApiRequestAllItems(
 
 	do {
 		responseData = await spotifyApiRequest.call(this, method, endpoint, body, query, uri);
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
 		returnData.push.apply(returnData, get(responseData, propertyName));
 		uri = responseData.next || responseData[propertyName.split('.')[0]].next;
 		//remove the query as the query parameters are already included in the next, else api throws error.
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 93d6ec32268d07..812c28697b4820 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -1308,7 +1308,7 @@ export class Spotify implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
index 0aa177e77b91d1..ea08c2d698dec2 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
@@ -456,7 +456,7 @@ export class SpreadsheetFile implements INodeType {
 						[sheetName]: ws,
 					},
 				};
-				const wbout = xlsxWrite(wb, wopts);
+				const wbout: Buffer = xlsxWrite(wb, wopts);
 
 				// Create a new item with only the binary spreadsheet data
 				const newItem: INodeExecutionData = {
diff --git a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
index 3acac9ca53d976..99ef24dbc2bacc 100644
--- a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
+++ b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
@@ -1,6 +1,7 @@
 import EventSource from 'eventsource';
+
 import type { ITriggerFunctions } from 'n8n-core';
-import type { INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
 export class SseTrigger implements INodeType {
@@ -38,7 +39,9 @@ export class SseTrigger implements INodeType {
 		const eventSource = new EventSource(url);
 
 		eventSource.onmessage = (event) => {
-			const eventData = jsonParse<any>(event.data, { errorMessage: 'Invalid JSON for event data' });
+			const eventData = jsonParse<IDataObject>(event.data as string, {
+				errorMessage: 'Invalid JSON for event data',
+			});
 			this.emit([this.helpers.returnJsonArray([eventData])]);
 		};
 
diff --git a/packages/nodes-base/nodes/Stackby/GenericFunction.ts b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
index ed294a6ceafda2..1eead3da6ff024 100644
--- a/packages/nodes-base/nodes/Stackby/GenericFunction.ts
+++ b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
@@ -2,7 +2,7 @@ import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n
 
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, IPollFunctions } from 'n8n-workflow';
+import type { IDataObject, IPollFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -43,7 +43,7 @@ export async function apiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function apiRequestAllItems(
 	endpoint: string,
 	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	query.maxrecord = 100;
 
 	query.offset = 0;
@@ -70,7 +70,7 @@ export async function apiRequestAllItems(
 
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 		query.offset += query.maxrecord;
 	} while (responseData.length !== 0);
 
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index 428301d29a262d..57faef5a977f01 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -189,8 +189,7 @@ export class Stackby implements INodeType {
 					responseData = await apiRequest.call(this, 'GET', `/rowlist/${stackId}/${table}`, {}, qs);
 					returnData.push.apply(
 						returnData,
-
-						responseData.map((data: any) => data.field),
+						responseData.map((data: any) => data.field) as INodeExecutionData[],
 					);
 				} catch (error) {
 					if (this.continueOnFail()) {
@@ -223,7 +222,7 @@ export class Stackby implements INodeType {
 					responseData = responseData.records;
 
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData),
+						this.helpers.returnJsonArray(responseData as IDataObject),
 						{ itemData: { item: i } },
 					);
 
@@ -280,8 +279,7 @@ export class Stackby implements INodeType {
 
 				returnData.push.apply(
 					returnData,
-
-					responseData.map((data: any) => data.field),
+					responseData.map((data: any) => data.field) as INodeExecutionData[],
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
@@ -330,8 +328,7 @@ export class Stackby implements INodeType {
 
 					returnData.push.apply(
 						returnData,
-
-						responseData.map((data: any) => data.field),
+						responseData.map((data: any) => data.field) as INodeExecutionData[],
 					);
 				} catch (error) {
 					if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
index 789ec2d4ac6c30..aaa49387fbd58d 100644
--- a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
@@ -7,18 +7,17 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function storyblokApiRequest(
 	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const authenticationMethod = this.getNodeParameter('source', 0) as string;
 
 	let options: OptionsWithUri = {
@@ -34,7 +33,7 @@ export async function storyblokApiRequest(
 
 	options = Object.assign({}, options, option);
 
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -57,7 +56,7 @@ export async function storyblokApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -66,10 +65,9 @@ export async function storyblokApiRequestAllItems(
 	propertyName: string,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
@@ -81,7 +79,7 @@ export async function storyblokApiRequestAllItems(
 	do {
 		responseData = await storyblokApiRequest.call(this, method, resource, body, query);
 		query.page++;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData[propertyName].length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
index dcb1bbcb3c7d6c..144aaa7c0a5e99 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
@@ -343,7 +343,7 @@ export class Storyblok implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
index 09f39b56de7ddc..4e7e7081a8a9f8 100644
--- a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function strapiApiRequest(
@@ -15,11 +15,11 @@ export async function strapiApiRequest(
 	method: string,
 	resource: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
-): Promise<any> {
+) {
 	const credentials = await this.getCredentials('strapiApi');
 
 	try {
@@ -44,10 +44,9 @@ export async function strapiApiRequest(
 			delete options.body;
 		}
 
-		//@ts-ignore
 		return await this.helpers?.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -78,11 +77,10 @@ export async function strapiApiRequestAllItems(
 	this: IHookFunctions | ILoadOptionsFunctions | IExecuteFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
 	headers: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 	const { apiVersion } = await this.getCredentials('strapiApi');
 
@@ -101,7 +99,7 @@ export async function strapiApiRequestAllItems(
 				headers,
 			));
 			query['pagination[page]'] += query['pagination[pageSize]'];
-			returnData.push.apply(returnData, responseData);
+			returnData.push.apply(returnData, responseData as IDataObject[]);
 		} while (responseData.length !== 0);
 	} else {
 		query._limit = 20;
@@ -117,7 +115,7 @@ export async function strapiApiRequestAllItems(
 				headers,
 			);
 			query._start += query._limit;
-			returnData.push.apply(returnData, responseData);
+			returnData.push.apply(returnData, responseData as IDataObject[]);
 		} while (responseData.length !== 0);
 	}
 	return returnData;
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index b674e0d12e59b9..8497db42a35f3a 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -146,7 +146,7 @@ export class Strapi implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -169,7 +169,7 @@ export class Strapi implements INodeType {
 						);
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -272,7 +272,7 @@ export class Strapi implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -299,7 +299,7 @@ export class Strapi implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
@@ -342,7 +342,7 @@ export class Strapi implements INodeType {
 						}
 
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(responseData),
+							this.helpers.returnJsonArray(responseData as IDataObject),
 							{ itemData: { item: i } },
 						);
 
diff --git a/packages/nodes-base/nodes/Strava/GenericFunctions.ts b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
index df6c04ccd2898d..401ae71d576450 100644
--- a/packages/nodes-base/nodes/Strava/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function stravaApiRequest(
@@ -20,12 +20,11 @@ export async function stravaApiRequest(
 		| IWebhookFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
-): Promise<any> {
+) {
 	const options: OptionsWithUri = {
 		method,
 		form: body,
@@ -50,16 +49,15 @@ export async function stravaApiRequest(
 				body.client_id = credentials.clientId;
 				body.client_secret = credentials.clientSecret;
 			}
-			//@ts-ignore
+
 			return await this.helpers?.request(options);
 		} else {
-			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, 'stravaOAuth2Api', options, {
 				includeCredentialsOnRefreshOnBody: true,
 			});
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -68,9 +66,9 @@ export async function stravaApiRequestAllItems(
 	method: string,
 	resource: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
@@ -82,7 +80,7 @@ export async function stravaApiRequestAllItems(
 	do {
 		responseData = await stravaApiRequest.call(this, method, resource, body, query);
 		query.page++;
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 	} while (responseData.length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index c9e1f9e31b31be..eb463da10dcd47 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -184,7 +184,7 @@ export class Strava implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
index ef2279e5b2dc11..204103a45b7442 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -478,7 +478,7 @@ export class Stripe implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index 0716196c6d5257..6109a8a0ef1315 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -1,7 +1,13 @@
 /* eslint-disable n8n-nodes-base/node-param-description-excess-final-period */
 import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
 
-import type { INodeType, INodeTypeDescription, IWebhookResponseData } from 'n8n-workflow';
+import type {
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { stripeApiRequest } from './helpers';
@@ -819,7 +825,6 @@ export class StripeTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -877,7 +882,7 @@ export class StripeTrigger implements INodeType {
 					responseData.status !== 'enabled'
 				) {
 					// Required data is missing so was not successful
-					throw new NodeApiError(this.getNode(), responseData, {
+					throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 						message: 'Stripe webhook creation response did not contain the expected data.',
 					});
 				}
@@ -929,7 +934,7 @@ export class StripeTrigger implements INodeType {
 		}
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Stripe/helpers.ts b/packages/nodes-base/nodes/Stripe/helpers.ts
index 09372f9474c54c..adef1ecdf5703c 100644
--- a/packages/nodes-base/nodes/Stripe/helpers.ts
+++ b/packages/nodes-base/nodes/Stripe/helpers.ts
@@ -125,7 +125,7 @@ export async function handleListing(
 
 	do {
 		responseData = await stripeApiRequest.call(this, 'GET', `/${resource}s`, {}, qs);
-		returnData.push(...responseData.data);
+		returnData.push(...(responseData.data as IDataObject[]));
 
 		if (!returnAll && returnData.length >= limit) {
 			return returnData.slice(0, limit);
diff --git a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
index c90b775c142a5a..9b76b0750259a2 100644
--- a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
@@ -14,6 +14,7 @@ import type {
 	IDataObject,
 	INodeProperties,
 	IPairedItemData,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -26,12 +27,11 @@ export async function supabaseApiRequest(
 		| IWebhookFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject | IDataObject[] = {},
 	qs: IDataObject = {},
 	uri?: string,
 	headers: IDataObject = {},
-): Promise<any> {
+) {
 	const credentials = (await this.getCredentials('supabaseApi')) as {
 		host: string;
 		serviceRole: string;
@@ -56,7 +56,7 @@ export async function supabaseApiRequest(
 		}
 		return await this.helpers.requestWithAuthentication.call(this, 'supabaseApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index 2129ead358ebf9..7b92a5b5578fe8 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
@@ -75,7 +75,7 @@ export class Supabase implements INodeType {
 			async getTables(this: ILoadOptionsFunctions): Promise<INodePropertyOptions[]> {
 				const returnData: INodePropertyOptions[] = [];
 				const { paths } = await supabaseApiRequest.call(this, 'GET', '/');
-				for (const path of Object.keys(paths)) {
+				for (const path of Object.keys(paths as IDataObject)) {
 					//omit introspection path
 					if (path === '/') continue;
 					returnData.push({
@@ -89,7 +89,7 @@ export class Supabase implements INodeType {
 				const returnData: INodePropertyOptions[] = [];
 				const tableName = this.getCurrentNodeParameter('tableId') as string;
 				const { definitions } = await supabaseApiRequest.call(this, 'GET', '/');
-				for (const column of Object.keys(definitions[tableName].properties)) {
+				for (const column of Object.keys(definitions[tableName].properties as IDataObject)) {
 					returnData.push({
 						name: `${column} - (${definitions[tableName].properties[column].type})`,
 						value: column,
@@ -233,7 +233,7 @@ export class Supabase implements INodeType {
 						throw error;
 					}
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(rows),
+						this.helpers.returnJsonArray(rows as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -273,7 +273,7 @@ export class Supabase implements INodeType {
 						throw error;
 					}
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(rows),
+						this.helpers.returnJsonArray(rows as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -316,7 +316,7 @@ export class Supabase implements INodeType {
 					try {
 						rows = await supabaseApiRequest.call(this, 'GET', endpoint, {}, qs);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(rows),
+							this.helpers.returnJsonArray(rows as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
@@ -392,7 +392,7 @@ export class Supabase implements INodeType {
 					try {
 						updatedRow = await supabaseApiRequest.call(this, 'PATCH', endpoint, record, qs);
 						const executionData = this.helpers.constructExecutionMetaData(
-							this.helpers.returnJsonArray(updatedRow),
+							this.helpers.returnJsonArray(updatedRow as IDataObject[]),
 							{ itemData: { item: i } },
 						);
 						returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
index 28caf5ce90ff33..35701fe881c404 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function surveyMonkeyApiRequest(
@@ -10,11 +10,11 @@ export async function surveyMonkeyApiRequest(
 	method: string,
 	resource: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
 	const endpoint = 'https://api.surveymonkey.com/v3';
@@ -41,15 +41,15 @@ export async function surveyMonkeyApiRequest(
 	try {
 		if (authenticationMethod === 'accessToken') {
 			const credentials = await this.getCredentials('surveyMonkeyApi');
-			// @ts-ignore
-			options.headers.Authorization = `bearer ${credentials.accessToken}`;
+
+			(options.headers as IDataObject).Authorization = `bearer ${credentials.accessToken}`;
 
 			return await this.helpers.request(options);
 		} else {
 			return await this.helpers.requestOAuth2?.call(this, 'surveyMonkeyOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +59,7 @@ export async function surveyMonkeyRequestAllItems(
 	method: string,
 	endpoint: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
@@ -72,7 +72,7 @@ export async function surveyMonkeyRequestAllItems(
 	do {
 		responseData = await surveyMonkeyApiRequest.call(this, method, endpoint, body, query, uri);
 		uri = responseData.links.next;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.links.next);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 079db5992639b5..09f2125eaf2825 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -355,7 +355,6 @@ export class SurveyMonkeyTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -497,7 +496,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 			const data: Buffer[] = [];
 
 			req.on('data', (chunk) => {
-				data.push(chunk);
+				data.push(chunk as Buffer);
 			});
 
 			req.on('end', async () => {
@@ -542,7 +541,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 						);
 
 						for (const page of pages) {
-							questions.push.apply(questions, page.questions);
+							questions.push.apply(questions, page.questions as IQuestion[]);
 						}
 
 						for (const page of responseData.pages as IDataObject[]) {
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts
index 5c254251cc9802..d1bfc3cfe52f40 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts
@@ -34,5 +34,5 @@ export async function createContact(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts
index 4448bf711f9469..479b161257886d 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts
@@ -16,5 +16,5 @@ export async function deleteContact(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts
index c16601c687031a..8486cf109fd0c6 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts
@@ -16,5 +16,5 @@ export async function getContact(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts
index 999fff01d253b0..050ca6b0deb3e3 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts
@@ -22,6 +22,6 @@ export async function getAll(
 	} else {
 		const limit = this.getNodeParameter('limit', index);
 		responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-		return this.helpers.returnJsonArray(responseData.contacts.splice(0, limit));
+		return this.helpers.returnJsonArray(responseData.contacts.splice(0, limit) as IDataObject[]);
 	}
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts
index 1f36bc4b377b1b..09516fba10f2d3 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts
@@ -37,5 +37,5 @@ export async function updateContact(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts
index f3ff770800ecf9..7894aeac04b6c2 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts
@@ -51,5 +51,5 @@ export async function addCustomer(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData.customer);
+	return this.helpers.returnJsonArray(responseData.customer as IDataObject);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts
index 3c9f748effc5b6..a3b125a9f8bc26 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts
@@ -16,5 +16,5 @@ export async function deleteCustomer(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts
index 623ff1aa5eb368..2fcfea10d167d6 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts
@@ -16,5 +16,5 @@ export async function getCustomer(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData.customer);
+	return this.helpers.returnJsonArray(responseData.customer as IDataObject);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts
index 5a735b3143174c..5e3061c0f43378 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts
@@ -36,6 +36,6 @@ export async function getAll(
 		return this.helpers.returnJsonArray(responseData);
 	} else {
 		responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-		return this.helpers.returnJsonArray(responseData.customers);
+		return this.helpers.returnJsonArray(responseData.customers as IDataObject[]);
 	}
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts
index 2701197579830d..28f17846ea0f40 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
@@ -53,10 +53,10 @@ export async function updateCustomer(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 	if (!responseData.customer) {
-		throw new NodeApiError(this.getNode(), responseData, {
+		throw new NodeApiError(this.getNode(), responseData as JsonObject, {
 			httpCode: '404',
 			message: 'Customer ID not found',
 		});
 	}
-	return this.helpers.returnJsonArray(responseData.customer);
+	return this.helpers.returnJsonArray(responseData.customer as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts
index 0b4f30f884637a..a5ece78df8389f 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts
@@ -28,5 +28,5 @@ export async function addAlert(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData.alert);
+	return this.helpers.returnJsonArray(responseData.alert as IDataObject);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts
index 0102d1b977845f..310508c6731268 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts
@@ -16,5 +16,5 @@ export async function deleteAlert(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts
index 0fa9ebe8ce005e..2507aff8324427 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts
@@ -16,5 +16,5 @@ export async function getAlert(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData.rmm_alert);
+	return this.helpers.returnJsonArray(responseData.rmm_alert as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts
index cd769b10d295b5..70de352c3b21a5 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts
@@ -34,6 +34,6 @@ export async function getAll(
 		return this.helpers.returnJsonArray(responseData);
 	} else {
 		responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-		return this.helpers.returnJsonArray(responseData.rmm_alerts);
+		return this.helpers.returnJsonArray(responseData.rmm_alerts as IDataObject[]);
 	}
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts
index ecac9f1264e79a..895589e6cd70d6 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts
@@ -20,5 +20,5 @@ export async function muteAlert(
 	body.mute_for = mute;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
index 86832c37d51d0c..0cf33100725b0a 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import * as customer from './customer';
@@ -51,7 +51,7 @@ export async function router(this: IExecuteFunctions): Promise<INodeExecutionDat
 				);
 				operationResult.push(...executionErrorData);
 			} else {
-				throw new NodeApiError(this.getNode(), err, { itemIndex: i });
+				throw new NodeApiError(this.getNode(), err as JsonObject, { itemIndex: i });
 			}
 		}
 	}
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts
index 48e79b64b2f666..346d8de4d1a843 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts
@@ -33,5 +33,5 @@ export async function createTicket(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData.ticket);
+	return this.helpers.returnJsonArray(responseData.ticket as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts
index d73af3ed974a2d..1b4691045ddb02 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts
@@ -16,5 +16,5 @@ export async function deleteTicket(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData);
+	return this.helpers.returnJsonArray(responseData as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts
index a46a8ece8863e9..a48a0c1a576d81 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts
@@ -16,5 +16,5 @@ export async function getTicket(
 	const body = {} as IDataObject;
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-	return this.helpers.returnJsonArray(responseData.ticket);
+	return this.helpers.returnJsonArray(responseData.ticket as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts
index 07b7c68e035a63..e385957d174f36 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts
@@ -30,6 +30,6 @@ export async function getAll(
 		return this.helpers.returnJsonArray(responseData);
 	} else {
 		responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
-		return this.helpers.returnJsonArray(responseData.tickets);
+		return this.helpers.returnJsonArray(responseData.tickets as IDataObject[]);
 	}
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts
index 9dc418acf105f6..83c66957dc4b6d 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts
@@ -37,5 +37,5 @@ export async function updateTicket(
 
 	const responseData = await apiRequest.call(this, requestMethod, endpoint, body, qs);
 
-	return this.helpers.returnJsonArray(responseData.ticket);
+	return this.helpers.returnJsonArray(responseData.ticket as IDataObject[]);
 }
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
index 78be613349c65f..4976d5542e7f8e 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
@@ -6,6 +6,7 @@ import type {
 	ICredentialTestFunctions,
 	IDataObject,
 	IHttpRequestOptions,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
@@ -34,7 +35,7 @@ export async function apiRequest(
 	try {
 		return await this.helpers.httpRequest(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -53,7 +54,7 @@ export async function apiRequestAllItems(
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
 		query.page++;
-		returnData = returnData.concat(responseData[endpoint]);
+		returnData = returnData.concat(responseData[endpoint] as IDataObject[]);
 	} while (responseData[endpoint].length !== 0);
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index 34bca831784c99..06e7ae9ecbfc72 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -8,7 +8,7 @@ import type {
 	IWebhookFunctions,
 } from 'n8n-core';
 
-import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
+import type { ICredentialDataDecryptedObject, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { createHash } from 'crypto';
@@ -44,7 +44,7 @@ export async function getAuthorization(
 
 		return response.auth_token;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -90,7 +90,7 @@ export async function taigaApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -99,7 +99,7 @@ export async function taigaApiRequestAllItems(
 	method: string,
 	resource: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
 ): Promise<any> {
 	const returnData: IDataObject[] = [];
@@ -112,7 +112,7 @@ export async function taigaApiRequestAllItems(
 		responseData = await taigaApiRequest.call(this, method, resource, body, query, uri, {
 			resolveWithFullResponse: true,
 		});
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 		uri = responseData.headers['x-pagination-next'];
 		if (query.limit && returnData.length >= query.limit) {
 			return returnData;
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
index 4afe6afa4c5d1b..e1c7d4c2a561c1 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.ts
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -575,7 +575,7 @@ export class Taiga implements INodeType {
 			}
 
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 
diff --git a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
index b0ea4e63326ea3..fd52d966f8a708 100644
--- a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function tapfiliateApiRequest(
@@ -15,11 +15,11 @@ export async function tapfiliateApiRequest(
 	method: string,
 	endpoint: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string | undefined,
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const credentials = await this.getCredentials('tapfiliateApi');
 
 	const options: OptionsWithUri = {
@@ -43,7 +43,7 @@ export async function tapfiliateApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -52,9 +52,9 @@ export async function tapfiliateApiRequestAllItems(
 	method: string,
 	endpoint: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
@@ -65,7 +65,7 @@ export async function tapfiliateApiRequestAllItems(
 		responseData = await tapfiliateApiRequest.call(this, method, endpoint, body, query, '', {
 			resolveWithFullResponse: true,
 		});
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 		query.page++;
 	} while (responseData.headers.link.includes('next'));
 
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
index e9b4dcad32f1bc..178eeda0c04e3d 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
@@ -81,8 +81,8 @@ export class Tapfiliate implements INodeType {
 				const programs = await tapfiliateApiRequestAllItems.call(this, 'GET', '/programs/');
 				for (const program of programs) {
 					returnData.push({
-						name: program.title,
-						value: program.id,
+						name: program.title as string,
+						value: program.id as string,
 					});
 				}
 				return returnData;
@@ -131,7 +131,7 @@ export class Tapfiliate implements INodeType {
 							delete body.companyName;
 						}
 						responseData = await tapfiliateApiRequest.call(this, 'POST', '/affiliates/', body);
-						returnData.push(responseData);
+						returnData.push(responseData as INodeExecutionData);
 					}
 					if (operation === 'delete') {
 						//https://tapfiliate.com/docs/rest/#affiliates-affiliate-delete
@@ -297,7 +297,7 @@ export class Tapfiliate implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
index fbe553a755dbc2..331a4136fcda45 100644
--- a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 // Interface in n8n
@@ -176,7 +176,7 @@ export async function apiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 404ef41fcf0108..8a0b228214780a 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -2024,7 +2024,11 @@ export class Telegram implements INodeType {
 						);
 
 						const fileName = filePath.split('/').pop();
-						const data = await this.helpers.prepareBinaryData(file.body, fileName);
+
+						const data = await this.helpers.prepareBinaryData(
+							file.body as Buffer,
+							fileName as string,
+						);
 
 						returnData.push({
 							json: responseData,
@@ -2035,7 +2039,7 @@ export class Telegram implements INodeType {
 					}
 				} else if (resource === 'chat' && operation === 'administrators') {
 					const executionData = this.helpers.constructExecutionMetaData(
-						this.helpers.returnJsonArray(responseData.result),
+						this.helpers.returnJsonArray(responseData.result as IDataObject[]),
 						{ itemData: { item: i } },
 					);
 					returnData.push(...executionData);
@@ -2043,7 +2047,7 @@ export class Telegram implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index fb8ace77409ece..9236918c474bf8 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -164,7 +164,6 @@ export class TelegramTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore (because of request)
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -281,7 +280,7 @@ export class TelegramTrigger implements INodeType {
 
 				const binaryData = await this.helpers.prepareBinaryData(
 					data as unknown as Buffer,
-					fileName,
+					fileName as string,
 				);
 
 				return {
diff --git a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
index 01e4bc87e96564..6362d93e8be5ba 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -12,12 +12,11 @@ export async function theHiveApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const credentials = await this.getCredentials('theHiveApi');
 
 	let options: OptionsWithUri = {
@@ -132,7 +131,7 @@ export async function prepareCustomFields(
 		const hiveCustomFields =
 			version === 'v1'
 				? requestResult
-				: Object.keys(requestResult).map((key) => requestResult[key]);
+				: Object.keys(requestResult as IDataObject).map((key) => requestResult[key]);
 		// Build reference to type mapping object
 		const referenceTypeMapping = hiveCustomFields.reduce(
 			(acc: IDataObject, curr: IDataObject) => ((acc[curr.reference as string] = curr.type), acc),
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index 8a3b2fab0632a8..d868d230253022 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -160,7 +160,7 @@ export class TheHive implements INodeType {
 				const customFields =
 					version === 'v1'
 						? requestResult
-						: Object.keys(requestResult).map((key) => requestResult[key]);
+						: Object.keys(requestResult as IDataObject).map((key) => requestResult[key]);
 
 				for (const field of customFields) {
 					returnData.push({
@@ -219,7 +219,7 @@ export class TheHive implements INodeType {
 						};
 					});
 				} else {
-					returnData = Object.keys(dataTypes).map((key) => {
+					returnData = Object.keys(dataTypes as IDataObject).map((key) => {
 						const dataType = dataTypes[key] as string;
 
 						return {
@@ -325,7 +325,7 @@ export class TheHive implements INodeType {
 				if (resource === 'alert') {
 					if (operation === 'count') {
 						const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
-						const countQueryAttributs: any = prepareOptional(filters);
+						const countQueryAttributs = prepareOptional(filters);
 
 						const _countSearchQuery: IQueryObject = And();
 
@@ -537,7 +537,7 @@ export class TheHive implements INodeType {
 						const version = credentials.apiVersion;
 
 						const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
-						const queryAttributs: any = prepareOptional(filters);
+						const queryAttributs = prepareOptional(filters);
 						const options = this.getNodeParameter('options', i);
 
 						const _searchQuery: IQueryObject = And();
@@ -741,7 +741,7 @@ export class TheHive implements INodeType {
 
 				if (resource === 'observable') {
 					if (operation === 'count') {
-						const countQueryAttributs: any = prepareOptional(
+						const countQueryAttributs = prepareOptional(
 							this.getNodeParameter('filters', i, {}) as INodeParameters,
 						);
 						const _countSearchQuery: IQueryObject = And();
@@ -759,8 +759,12 @@ export class TheHive implements INodeType {
 								(_countSearchQuery['_and'] as IQueryObject[]).push(
 									Between(
 										'startDate',
-										countQueryAttributs['range']['dateRange']['fromDate'],
-										countQueryAttributs['range']['dateRange']['toDate'],
+										((countQueryAttributs['range'] as IDataObject)['dateRange'] as IDataObject)[
+											'fromDate'
+										],
+										((countQueryAttributs['range'] as IDataObject)['dateRange'] as IDataObject)[
+											'toDate'
+										],
 									),
 								);
 							} else {
@@ -1060,7 +1064,7 @@ export class TheHive implements INodeType {
 
 						const version = credentials.apiVersion;
 
-						const queryAttributs: any = prepareOptional(
+						const queryAttributs = prepareOptional(
 							this.getNodeParameter('filters', i, {}) as INodeParameters,
 						);
 
@@ -1081,8 +1085,12 @@ export class TheHive implements INodeType {
 								(_searchQuery['_and'] as IQueryObject[]).push(
 									Between(
 										'startDate',
-										queryAttributs['range']['dateRange']['fromDate'],
-										queryAttributs['range']['dateRange']['toDate'],
+										((queryAttributs['range'] as IDataObject)['dateRange'] as IDataObject)[
+											'fromDate'
+										],
+										((queryAttributs['range'] as IDataObject)['dateRange'] as IDataObject)[
+											'toDate'
+										],
 									),
 								);
 							} else {
@@ -1169,7 +1177,7 @@ export class TheHive implements INodeType {
 				if (resource === 'case') {
 					if (operation === 'count') {
 						const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
-						const countQueryAttributs: any = prepareOptional(filters);
+						const countQueryAttributs = prepareOptional(filters);
 
 						const _countSearchQuery: IQueryObject = And();
 
@@ -1338,7 +1346,7 @@ export class TheHive implements INodeType {
 						const version = credentials.apiVersion;
 
 						const filters = this.getNodeParameter('filters', i, {}) as INodeParameters;
-						const queryAttributs: any = prepareOptional(filters);
+						const queryAttributs = prepareOptional(filters);
 
 						const _searchQuery: IQueryObject = And();
 
@@ -1439,7 +1447,7 @@ export class TheHive implements INodeType {
 
 				if (resource === 'task') {
 					if (operation === 'count') {
-						const countQueryAttributs: any = prepareOptional(
+						const countQueryAttributs = prepareOptional(
 							this.getNodeParameter('filters', i, {}) as INodeParameters,
 						);
 
@@ -1653,7 +1661,7 @@ export class TheHive implements INodeType {
 
 						const version = credentials.apiVersion;
 
-						const queryAttributs: any = prepareOptional(
+						const queryAttributs = prepareOptional(
 							this.getNodeParameter('filters', i, {}) as INodeParameters,
 						);
 
@@ -1955,7 +1963,7 @@ export class TheHive implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
index cabb09e18b09ca..0333ab51704f43 100644
--- a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export type Context = IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions;
@@ -17,8 +17,7 @@ export async function todoistApiRequest(
 	this: Context,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 ): Promise<any> {
 	const authentication = this.getNodeParameter('authentication', 0) as string;
@@ -40,7 +39,7 @@ export async function todoistApiRequest(
 		const credentialType = authentication === 'apiKey' ? 'todoistApi' : 'todoistOAuth2Api';
 		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -59,7 +58,7 @@ export async function todoistSyncRequest(
 		json: true,
 	};
 
-	if (Object.keys(body).length !== 0) {
+	if (Object.keys(body as IDataObject).length !== 0) {
 		options.body = body;
 	}
 
@@ -67,6 +66,6 @@ export async function todoistSyncRequest(
 		const credentialType = authentication === 'oAuth2' ? 'todoistOAuth2Api' : 'todoistApi';
 		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
index bd7d6bc5300632..8225bad42e4028 100644
--- a/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/OperationHandler.ts
@@ -104,7 +104,7 @@ export class CreateHandler implements OperationHandler {
 			body.parent_id = options.parentId as string;
 		}
 
-		const data = await todoistApiRequest.call(ctx, 'POST', '/tasks', body);
+		const data = await todoistApiRequest.call(ctx, 'POST', '/tasks', body as IDataObject);
 
 		return {
 			data,
@@ -247,7 +247,7 @@ export class UpdateHandler implements OperationHandler {
 			body.due_lang = updateFields.dueLang as string;
 		}
 
-		await todoistApiRequest.call(ctx, 'POST', `/tasks/${id}`, body);
+		await todoistApiRequest.call(ctx, 'POST', `/tasks/${id}`, body as IDataObject);
 
 		return { success: true };
 	}
diff --git a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
index 014670e0a0f7c7..179d958be7ec08 100644
--- a/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/OperationHandler.ts
@@ -95,7 +95,7 @@ export class CreateHandler implements OperationHandler {
 			body.parent_id = options.parentId as string;
 		}
 
-		const data = await todoistApiRequest.call(ctx, 'POST', '/tasks', body);
+		const data = await todoistApiRequest.call(ctx, 'POST', '/tasks', body as IDataObject);
 
 		return {
 			data,
@@ -238,7 +238,7 @@ export class UpdateHandler implements OperationHandler {
 			body.due_lang = updateFields.dueLang as string;
 		}
 
-		await todoistApiRequest.call(ctx, 'POST', `/tasks/${id}`, body);
+		await todoistApiRequest.call(ctx, 'POST', `/tasks/${id}`, body as IDataObject);
 
 		return { success: true };
 	}
diff --git a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
index 862ee97ade38c8..ab2d57e586f8da 100644
--- a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
@@ -9,7 +9,7 @@ import type {
 	ITriggerFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function togglApiRequest(
@@ -22,11 +22,10 @@ export async function togglApiRequest(
 		| ILoadOptionsFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	query?: IDataObject,
 	uri?: string,
-): Promise<any> {
+) {
 	const credentials = await this.getCredentials('togglApi');
 	const headerWithAuthentication = Object.assign(
 		{},
@@ -45,12 +44,12 @@ export async function togglApiRequest(
 		body,
 		json: true,
 	};
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index c8bcdb2f5159af..6afbef01506d24 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -68,7 +69,7 @@ export class TogglTrigger implements INodeType {
 			timeEntries = await togglApiRequest.call(this, 'GET', endpoint, {}, qs);
 			webhookData.lastTimeChecked = qs.end_date;
 		} catch (error) {
-			throw new NodeApiError(this.getNode(), error);
+			throw new NodeApiError(this.getNode(), error as JsonObject);
 		}
 		if (Array.isArray(timeEntries) && timeEntries.length !== 0) {
 			return [this.helpers.returnJsonArray(timeEntries)];
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index 081b3623b5d05d..8cadef352aea79 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
@@ -16,12 +16,11 @@ export async function travisciApiRequest(
 	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject | string = {},
 	qs: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const credentials = await this.getCredentials('travisCiApi');
 	let options: OptionsWithUri = {
 		headers: {
@@ -37,13 +36,13 @@ export async function travisciApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -57,21 +56,21 @@ export async function travisciApiRequestAllItems(
 	method: string,
 	resource: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
 
 	do {
 		responseData = await travisciApiRequest.call(this, method, resource, body, query);
-		const path = get(responseData, '@pagination.next.@href');
+		const path = get(responseData, '@pagination.next.@href') as string;
 		if (path !== undefined) {
 			const parsedPath = new URLSearchParams(path);
 			query = Object.fromEntries(parsedPath);
 		}
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData['@pagination'].is_last !== true);
 	return returnData;
 }
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
index e9e14198d93f5f..896b3f4f520848 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
@@ -158,7 +158,7 @@ export class TravisCi implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 
diff --git a/packages/nodes-base/nodes/Trello/GenericFunctions.ts b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
index b5b4405ff338b5..6af4306c4e02db 100644
--- a/packages/nodes-base/nodes/Trello/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
@@ -45,7 +45,7 @@ export async function apiRequestAllItems(
 
 	do {
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
-		returnData.push.apply(returnData, responseData);
+		returnData.push.apply(returnData, responseData as IDataObject[]);
 		if (responseData.length !== 0) {
 			query.before = responseData[responseData.length - 1].id;
 		}
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index bd8ea97c477458..6a02d4eee983e3 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -900,7 +900,7 @@ export class Trello implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Twist/GenericFunctions.ts b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
index 27f8f081fa3d7a..2d5af978e4019c 100644
--- a/packages/nodes-base/nodes/Twist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
@@ -2,18 +2,17 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function twistApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
 	method: string,
 	endpoint: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const options: OptionsWithUri = {
 		method,
 		body,
@@ -33,9 +32,8 @@ export async function twistApiRequest(
 	Object.assign(options, option);
 
 	try {
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'twistOAuth2Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index 6992ac7b0c006c..0262339160feb8 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -269,7 +269,7 @@ export class Twist implements INodeType {
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
-									await twistApiRequest.call(
+									(await twistApiRequest.call(
 										this,
 										'POST',
 										'/attachments/upload',
@@ -286,7 +286,7 @@ export class Twist implements INodeType {
 												attachment_id: uuid(),
 											},
 										},
-									),
+									)) as IDataObject,
 								);
 							}
 
@@ -378,7 +378,7 @@ export class Twist implements INodeType {
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
-									await twistApiRequest.call(
+									(await twistApiRequest.call(
 										this,
 										'POST',
 										'/attachments/upload',
@@ -395,7 +395,7 @@ export class Twist implements INodeType {
 												attachment_id: uuid(),
 											},
 										},
-									),
+									)) as IDataObject,
 								);
 							}
 
@@ -457,7 +457,7 @@ export class Twist implements INodeType {
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
-									await twistApiRequest.call(
+									(await twistApiRequest.call(
 										this,
 										'POST',
 										'/attachments/upload',
@@ -474,7 +474,7 @@ export class Twist implements INodeType {
 												attachment_id: uuid(),
 											},
 										},
-									),
+									)) as IDataObject,
 								);
 							}
 
@@ -582,7 +582,7 @@ export class Twist implements INodeType {
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
-									await twistApiRequest.call(
+									(await twistApiRequest.call(
 										this,
 										'POST',
 										'/attachments/upload',
@@ -599,7 +599,7 @@ export class Twist implements INodeType {
 												attachment_id: uuid(),
 											},
 										},
-									),
+									)) as IDataObject,
 								);
 							}
 
@@ -666,7 +666,7 @@ export class Twist implements INodeType {
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
-									await twistApiRequest.call(
+									(await twistApiRequest.call(
 										this,
 										'POST',
 										'/attachments/upload',
@@ -683,7 +683,7 @@ export class Twist implements INodeType {
 												attachment_id: uuid(),
 											},
 										},
-									),
+									)) as IDataObject,
 								);
 							}
 
@@ -774,7 +774,7 @@ export class Twist implements INodeType {
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
-									await twistApiRequest.call(
+									(await twistApiRequest.call(
 										this,
 										'POST',
 										'/attachments/upload',
@@ -791,7 +791,7 @@ export class Twist implements INodeType {
 												attachment_id: uuid(),
 											},
 										},
-									),
+									)) as IDataObject,
 								);
 							}
 
diff --git a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
index 794a3d3229f22c..32481f2344b30b 100644
--- a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
@@ -7,19 +7,18 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IBinaryKeyData, IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IBinaryKeyData, IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
 export async function twitterApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions | IHookFunctions,
 	method: string,
 	resource: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	qs: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	let options: OptionsWithUrl = {
 		method,
 		body,
@@ -37,10 +36,9 @@ export async function twitterApiRequest(
 		if (Object.keys(qs).length === 0) {
 			delete options.qs;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth1.call(this, 'twitterOAuth1Api', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -49,10 +47,9 @@ export async function twitterApiRequestAllItems(
 	propertyName: string,
 	method: string,
 	endpoint: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
@@ -62,7 +59,7 @@ export async function twitterApiRequestAllItems(
 	do {
 		responseData = await twitterApiRequest.call(this, method, endpoint, body, query);
 		query.since_id = responseData.search_metadata.max_id;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData.search_metadata?.next_results);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Twitter/TweetInterface.ts b/packages/nodes-base/nodes/Twitter/TweetInterface.ts
index fee604601bd43b..05fb67e26035ac 100644
--- a/packages/nodes-base/nodes/Twitter/TweetInterface.ts
+++ b/packages/nodes-base/nodes/Twitter/TweetInterface.ts
@@ -1,3 +1,5 @@
+import type { IDataObject } from 'n8n-workflow';
+
 export interface ITweet {
 	auto_populate_reply_metadata?: boolean;
 	display_coordinates?: boolean;
@@ -8,3 +10,16 @@ export interface ITweet {
 	status: string;
 	in_reply_to_status_id?: string;
 }
+
+export interface ITweetCreate {
+	type: 'message_create';
+	message_create: {
+		target: {
+			recipient_id: string;
+		};
+		message_data: {
+			text: string;
+			attachment?: IDataObject;
+		};
+	};
+}
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.ts b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
index b96e9c21833ee3..37945c90339330 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.ts
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
@@ -19,7 +19,7 @@ import {
 	uploadAttachments,
 } from './GenericFunctions';
 
-import type { ITweet } from './TweetInterface';
+import type { ITweet, ITweetCreate } from './TweetInterface';
 
 import ISO6391 from 'iso-639-1';
 
@@ -105,7 +105,7 @@ export class Twitter implements INodeType {
 						const userId = this.getNodeParameter('userId', i) as string;
 						const text = this.getNodeParameter('text', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
-						const body: IDataObject = {
+						const body: ITweetCreate = {
 							type: 'message_create',
 							message_create: {
 								target: {
@@ -126,14 +126,12 @@ export class Twitter implements INodeType {
 							});
 
 							const medias = await uploadAttachments.call(this, attachmentProperties, items, i);
-							//@ts-ignore
 							body.message_create.message_data.attachment = {
 								type: 'media',
 								//@ts-ignore
 								media: { id: medias[0].media_id_string },
 							};
 						} else {
-							//@ts-ignore
 							delete body.message_create.message_data.attachment;
 						}
 
@@ -314,7 +312,7 @@ export class Twitter implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
index 520d1182f93127..825f63d275d133 100644
--- a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, INodePropertyOptions } from 'n8n-workflow';
+import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -59,7 +59,7 @@ export async function apiRequest(
 			return await this.helpers.requestOAuth2.call(this, 'typeformOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -95,7 +95,7 @@ export async function apiRequestAllItems(
 
 		responseData = await apiRequest.call(this, method, endpoint, body, query);
 
-		returnData.items.push.apply(returnData.items, responseData.items);
+		returnData.items.push.apply(returnData.items, responseData.items as IDataObject[]);
 	} while (responseData.page_count !== undefined && responseData.page_count > query.page);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/UProc/GenericFunctions.ts b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
index ee55454aa03dfd..2c7b2b4ec7b6d8 100644
--- a/packages/nodes-base/nodes/UProc/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
@@ -5,7 +5,12 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject, IHttpRequestMethods, IHttpRequestOptions } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function uprocApiRequest(
@@ -27,6 +32,6 @@ export async function uprocApiRequest(
 	try {
 		return await this.helpers.httpRequestWithAuthentication.call(this, 'uprocApi', options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
index de4f055b40b90d..a2f508dd6b7443 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { createHmac } from 'crypto';
@@ -18,12 +18,11 @@ export async function unleashedApiRequest(
 	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
 	method: string,
 	path: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
 	pageNumber?: number,
 	headers?: object,
-): Promise<any> {
+) {
 	const paginatedPath = pageNumber ? `/${path}/${pageNumber}` : `/${path}`;
 
 	const options: OptionsWithUrl = {
@@ -56,7 +55,7 @@ export async function unleashedApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -65,10 +64,9 @@ export async function unleashedApiRequestAllItems(
 	propertyName: string,
 	method: string,
 	endpoint: string,
-
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 	let responseData;
 	let pageNumber = 1;
@@ -77,7 +75,7 @@ export async function unleashedApiRequestAllItems(
 
 	do {
 		responseData = await unleashedApiRequest.call(this, method, endpoint, body, query, pageNumber);
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		pageNumber++;
 	} while (
 		(responseData.Pagination.PageNumber as number) <
@@ -101,7 +99,7 @@ export function convertNETDates(item: { [key: string]: any }) {
 			}
 		}
 		if (type === 'object' && item[path]) {
-			convertNETDates(item[path]);
+			convertNETDates(item[path] as IDataObject);
 		}
 	});
 }
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index 3d14fc4b6c4762..f09ae141f59164 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
@@ -71,7 +71,7 @@ export class UnleashedSoftware implements INodeType {
 		const returnData: INodeExecutionData[] = [];
 		const length = items.length;
 		const qs: IDataObject = {};
-		let responseData;
+		let responseData: IDataObject | IDataObject[] = [];
 
 		for (let i = 0; i < length; i++) {
 			const resource = this.getNodeParameter('resource', 0);
@@ -113,8 +113,15 @@ export class UnleashedSoftware implements INodeType {
 					} else {
 						const limit = this.getNodeParameter('limit', i);
 						qs.pageSize = limit;
-						responseData = await unleashedApiRequest.call(this, 'GET', '/SalesOrders', {}, qs, 1);
-						responseData = responseData.Items;
+						responseData = (await unleashedApiRequest.call(
+							this,
+							'GET',
+							'/SalesOrders',
+							{},
+							qs,
+							1,
+						)) as IDataObject;
+						responseData = responseData.Items as IDataObject[];
 					}
 					convertNETDates(responseData);
 					responseData = this.helpers.constructExecutionMetaData(
@@ -157,8 +164,15 @@ export class UnleashedSoftware implements INodeType {
 					} else {
 						const limit = this.getNodeParameter('limit', i);
 						qs.pageSize = limit;
-						responseData = await unleashedApiRequest.call(this, 'GET', '/StockOnHand', {}, qs, 1);
-						responseData = responseData.Items;
+						responseData = (await unleashedApiRequest.call(
+							this,
+							'GET',
+							'/StockOnHand',
+							{},
+							qs,
+							1,
+						)) as IDataObject;
+						responseData = responseData.Items as IDataObject[];
 					}
 
 					convertNETDates(responseData);
diff --git a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
index bb67b598613cbc..e91947e2143485 100644
--- a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
@@ -5,7 +5,8 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function upleadApiRequest(
@@ -28,12 +29,12 @@ export async function upleadApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts b/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
index c7edce491f55f9..d378c7f55ad3de 100644
--- a/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function uptimeRobotApiRequest(
@@ -30,10 +30,10 @@ export async function uptimeRobotApiRequest(
 	try {
 		const responseData = await this.helpers.request(options);
 		if (responseData.stat !== 'ok') {
-			throw new NodeOperationError(this.getNode(), responseData);
+			throw new NodeOperationError(this.getNode(), responseData as Error);
 		}
 		return responseData;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
index d2b632a2fc99f5..b8eff069f2250e 100644
--- a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
@@ -419,8 +419,8 @@ export class UptimeRobot implements INodeType {
 					}
 				}
 				Array.isArray(responseData)
-					? returnData.push(...responseData)
-					: returnData.push(responseData);
+					? returnData.push(...(responseData as IDataObject[]))
+					: returnData.push(responseData as IDataObject);
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ error: error.message });
diff --git a/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts b/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
index dfd679219d7007..49e116bf29b42f 100644
--- a/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
@@ -45,7 +45,7 @@ export async function handleListing(
 
 	do {
 		responseData = await urlScanIoApiRequest.call(this, 'GET', endpoint, {}, qs);
-		returnData.push(...responseData.results);
+		returnData.push(...(responseData.results as IDataObject[]));
 
 		if (!returnAll && returnData.length > limit) {
 			return returnData.slice(0, limit);
diff --git a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
index 8a59430b4a7fa8..398b79b043e10e 100644
--- a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
@@ -125,13 +125,13 @@ export class UrlScanIo implements INodeType {
 						}
 
 						responseData = await urlScanIoApiRequest.call(this, 'POST', '/scan', body);
-						responseData = normalizeId(responseData);
+						responseData = normalizeId(responseData as IDataObject);
 					}
 				}
 
 				Array.isArray(responseData)
-					? returnData.push(...responseData)
-					: returnData.push(responseData);
+					? returnData.push(...(responseData as IDataObject[]))
+					: returnData.push(responseData as IDataObject);
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ error: error.message });
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
index 67db0efe004d2b..26f9060a2a5c1b 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
@@ -73,7 +73,7 @@ export async function venafiApiRequestAllItems(
 	do {
 		responseData = await venafiApiRequest.call(this, method, endpoint, body, query);
 		endpoint = get(responseData, '_links[0].Next');
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData._links?.[0].Next);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
index 6eb5b4fd0e7497..9d498b8d6a5896 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
@@ -138,8 +138,8 @@ export class VenafiTlsProtectDatacenter implements INodeType {
 						);
 
 						const binaryData = await this.helpers.prepareBinaryData(
-							Buffer.from(responseData.CertificateData, 'base64'),
-							responseData.Filename,
+							Buffer.from(responseData.CertificateData as BufferEncoding, 'base64'),
+							responseData.Filename as string,
 						);
 
 						responseData = {
@@ -238,9 +238,12 @@ export class VenafiTlsProtectDatacenter implements INodeType {
 				}
 
 				returnData.push(
-					...this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), {
-						itemData: { item: i },
-					}),
+					...this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{
+							itemData: { item: i },
+						},
+					),
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
index c11e511d3ea939..792f0626ceae0c 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
@@ -66,9 +66,9 @@ export async function venafiApiRequestAllItems(
 	method: string,
 	endpoint: string,
 
-	body: any = {},
+	body: IDataObject = {},
 	query: IDataObject = {},
-): Promise<any> {
+) {
 	const returnData: IDataObject[] = [];
 
 	let responseData;
@@ -76,7 +76,7 @@ export async function venafiApiRequestAllItems(
 	do {
 		responseData = await venafiApiRequest.call(this, method, endpoint, body, query);
 		endpoint = get(responseData, '_links[0].Next');
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData._links?.[0].Next);
 
 	return returnData;
@@ -119,14 +119,14 @@ export async function encryptPassphrase(
 				try {
 					const passphraseUTF8 = nacl.encode_utf8(passphrase) as string;
 					const keyPassBuffer = nacl.crypto_box_seal(passphraseUTF8, Buffer.from(pubKey, 'base64'));
-					encryptedKeyPass = Buffer.from(keyPassBuffer).toString('base64');
+					encryptedKeyPass = Buffer.from(keyPassBuffer as Buffer).toString('base64');
 
 					const storePassphraseUTF8 = nacl.encode_utf8(storePassphrase) as string;
 					const keyStorePassBuffer = nacl.crypto_box_seal(
 						storePassphraseUTF8,
 						Buffer.from(pubKey, 'base64'),
 					);
-					encryptedKeyStorePass = Buffer.from(keyStorePassBuffer).toString('base64');
+					encryptedKeyStorePass = Buffer.from(keyStorePassBuffer as Buffer).toString('base64');
 
 					return resolve([encryptedKeyPass, encryptedKeyStorePass]);
 				} catch (error) {
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
index 7c717069c739c1..2a34b0d6723ea0 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
@@ -370,7 +370,7 @@ export class VenafiTlsProtectCloud implements INodeType {
 							);
 						}
 
-						const contentDisposition = responseData.headers['content-disposition'];
+						const contentDisposition: string = responseData.headers['content-disposition'];
 						const fileNameRegex = /(?<=filename=").*\b/;
 						const match = fileNameRegex.exec(contentDisposition);
 						let fileName = '';
@@ -380,7 +380,7 @@ export class VenafiTlsProtectCloud implements INodeType {
 						}
 
 						const binaryData = await this.helpers.prepareBinaryData(
-							Buffer.from(responseData.body),
+							Buffer.from(responseData.body as Buffer),
 							fileName,
 						);
 
@@ -474,9 +474,12 @@ export class VenafiTlsProtectCloud implements INodeType {
 				}
 
 				returnData.push(
-					...this.helpers.constructExecutionMetaData(this.helpers.returnJsonArray(responseData), {
-						itemData: { item: i },
-					}),
+					...this.helpers.constructExecutionMetaData(
+						this.helpers.returnJsonArray(responseData as IDataObject[]),
+						{
+							itemData: { item: i },
+						},
+					),
 				);
 			} catch (error) {
 				if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/Vero/GenericFunctions.ts b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
index 6654964d2c73d1..2557c5b34f3d47 100644
--- a/packages/nodes-base/nodes/Vero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function veroApiRequest(
@@ -27,13 +27,13 @@ export async function veroApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index d0ae43aaa6cc62..38d2c67f616176 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -4,6 +4,7 @@ import type {
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import { validateJSON, veroApiRequest } from './GenericFunctions';
@@ -73,11 +74,10 @@ export class Vero implements INodeType {
 						const id = this.getNodeParameter('id', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 						const jsonActive = this.getNodeParameter('jsonParameters', i);
-						const body = {
+						const body: IDataObject = {
 							id,
 						};
 						if (additionalFields.email) {
-							// @ts-ignore
 							body.email = additionalFields.email as string;
 						}
 						if (!jsonActive) {
@@ -85,12 +85,10 @@ export class Vero implements INodeType {
 								this.getNodeParameter('dataAttributesUi', i) as IDataObject
 							).dataAttributesValues as IDataObject[];
 							if (dataAttributesValues) {
-								const dataAttributes = {};
+								const dataAttributes: IDataObject = {};
 								for (let index = 0; index < dataAttributesValues.length; index++) {
-									// @ts-ignore
-									dataAttributes[dataAttributesValues[index].key] =
+									dataAttributes[dataAttributesValues[index].key as string] =
 										dataAttributesValues[index].value;
-									// @ts-ignore
 									body.data = dataAttributes;
 								}
 							}
@@ -99,14 +97,13 @@ export class Vero implements INodeType {
 								this.getNodeParameter('dataAttributesJson', i) as string,
 							);
 							if (dataAttributesJson) {
-								// @ts-ignore
 								body.data = dataAttributesJson;
 							}
 						}
 						try {
 							responseData = await veroApiRequest.call(this, 'POST', '/users/track', body);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developers.getvero.com/?bash#users-alias
@@ -120,7 +117,7 @@ export class Vero implements INodeType {
 						try {
 							responseData = await veroApiRequest.call(this, 'PUT', '/users/reidentify', body);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developers.getvero.com/?bash#users-unsubscribe
@@ -138,7 +135,7 @@ export class Vero implements INodeType {
 						try {
 							responseData = await veroApiRequest.call(this, 'POST', `/users/${operation}`, body);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 					//https://developers.getvero.com/?bash#tags-add
@@ -146,21 +143,19 @@ export class Vero implements INodeType {
 					if (operation === 'addTags' || operation === 'removeTags') {
 						const id = this.getNodeParameter('id', i) as string;
 						const tags = (this.getNodeParameter('tags', i) as string).split(',');
-						const body = {
+						const body: IDataObject = {
 							id,
 						};
 						if (operation === 'addTags') {
-							// @ts-ignore
 							body.add = JSON.stringify(tags);
 						}
 						if (operation === 'removeTags') {
-							// @ts-ignore
 							body.remove = JSON.stringify(tags);
 						}
 						try {
 							responseData = await veroApiRequest.call(this, 'PUT', '/users/tags/edit', body);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 				}
@@ -172,7 +167,7 @@ export class Vero implements INodeType {
 						const email = this.getNodeParameter('email', i) as string;
 						const eventName = this.getNodeParameter('eventName', i) as string;
 						const jsonActive = this.getNodeParameter('jsonParameters', i);
-						const body = {
+						const body: IDataObject = {
 							identity: { id, email },
 							event_name: eventName,
 							email,
@@ -182,12 +177,10 @@ export class Vero implements INodeType {
 								this.getNodeParameter('dataAttributesUi', i) as IDataObject
 							).dataAttributesValues as IDataObject[];
 							if (dataAttributesValues) {
-								const dataAttributes = {};
+								const dataAttributes: IDataObject = {};
 								for (let index = 0; index < dataAttributesValues.length; index++) {
-									// @ts-ignore
-									dataAttributes[dataAttributesValues[index].key] =
+									dataAttributes[dataAttributesValues[index].key as string] =
 										dataAttributesValues[index].value;
-									// @ts-ignore
 									body.data = JSON.stringify(dataAttributes);
 								}
 							}
@@ -195,12 +188,10 @@ export class Vero implements INodeType {
 								this.getNodeParameter('extraAttributesUi', i) as IDataObject
 							).extraAttributesValues as IDataObject[];
 							if (extraAttributesValues) {
-								const extraAttributes = {};
+								const extraAttributes: IDataObject = {};
 								for (let index = 0; index < extraAttributesValues.length; index++) {
-									// @ts-ignore
-									extraAttributes[extraAttributesValues[index].key] =
+									extraAttributes[extraAttributesValues[index].key as string] =
 										extraAttributesValues[index].value;
-									// @ts-ignore
 									body.extras = JSON.stringify(extraAttributes);
 								}
 							}
@@ -209,21 +200,19 @@ export class Vero implements INodeType {
 								this.getNodeParameter('dataAttributesJson', i) as string,
 							);
 							if (dataAttributesJson) {
-								// @ts-ignore
 								body.data = JSON.stringify(dataAttributesJson);
 							}
 							const extraAttributesJson = validateJSON(
 								this.getNodeParameter('extraAttributesJson', i) as string,
 							);
 							if (extraAttributesJson) {
-								// @ts-ignore
 								body.extras = JSON.stringify(extraAttributesJson);
 							}
 						}
 						try {
 							responseData = await veroApiRequest.call(this, 'POST', '/events/track', body);
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 				}
diff --git a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
index 8330cea740c5db..376bde7a2e36e3 100644
--- a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function vonageApiRequest(
@@ -29,12 +29,11 @@ export async function vonageApiRequest(
 	};
 
 	try {
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.request.call(this, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index f8527fd4f51193..5fe8e461535019 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -758,7 +758,7 @@ export class Wait implements INodeType {
 					workflowData: [[returnItem]],
 				};
 			} catch (error) {
-				throw new NodeOperationError(this.getNode(), error);
+				throw new NodeOperationError(this.getNode(), error as Error);
 			} finally {
 				await binaryFile.cleanup();
 			}
diff --git a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index 1a49358f917035..485054a482793a 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -41,11 +41,11 @@ export async function webflowApiRequest(
 	};
 	options = Object.assign({}, options, option);
 
-	if (Object.keys(options.qs).length === 0) {
+	if (Object.keys(options.qs as IDataObject).length === 0) {
 		delete options.qs;
 	}
 
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	return this.helpers.requestWithAuthentication.call(this, credentialsType, options);
@@ -70,7 +70,7 @@ export async function webflowApiRequestAllItems(
 		if (responseData.offset !== undefined) {
 			query.offset += query.limit;
 		}
-		returnData.push.apply(returnData, responseData.items);
+		returnData.push.apply(returnData, responseData.items as IDataObject[]);
 	} while (returnData.length < responseData.total);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.ts b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
index 5c7036f57c8c6b..bc6019e1fbcd95 100644
--- a/packages/nodes-base/nodes/Webflow/Webflow.node.ts
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
@@ -275,7 +275,7 @@ export class Webflow implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index 580db4d5322484..0fc80f5d015a87 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -195,7 +195,6 @@ export class WebflowTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -268,7 +267,7 @@ export class WebflowTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject[])],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index c9f6f165ecffdc..a1a9efa138fa7e 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -570,7 +570,7 @@ export class Webhook implements INodeType {
 					workflowData: [[returnItem]],
 				};
 			} catch (error) {
-				throw new NodeOperationError(this.getNode(), error);
+				throw new NodeOperationError(this.getNode(), error as Error);
 			} finally {
 				await binaryFile.cleanup();
 			}
diff --git a/packages/nodes-base/nodes/Wise/GenericFunctions.ts b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
index 0390987710a812..75d2030dc4e206 100644
--- a/packages/nodes-base/nodes/Wise/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
@@ -2,7 +2,12 @@ import { createSign } from 'crypto';
 
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, IHttpRequestOptions, ILoadOptionsFunctions } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IHttpRequestOptions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
@@ -62,7 +67,7 @@ export async function wiseApiRequest(
 		response = await this.helpers.httpRequest(options);
 	} catch (error) {
 		delete error.config;
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 
 	if (response.statusCode >= 200 && response.statusCode < 300) {
@@ -93,7 +98,7 @@ export async function wiseApiRequest(
 		} catch (error) {
 			throw new NodeApiError(this.getNode(), {
 				message: 'Error signing SCA request, check your private key',
-				...error,
+				...(error as JsonObject),
 			});
 		}
 		// Retry the request with signed token
@@ -106,7 +111,10 @@ export async function wiseApiRequest(
 			});
 		}
 	} else {
-		throw new NodeApiError(this.getNode(), { ...response, message: response.statusMessage });
+		throw new NodeApiError(this.getNode(), {
+			...(response as JsonObject),
+			message: response.statusMessage,
+		});
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index ffa665bd968937..f7a66d0893da9b 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -3,6 +3,7 @@ import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
 	ILoadOptionsFunctions,
+	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
@@ -256,7 +257,7 @@ export class Wise implements INodeType {
 
 							items[i].binary = items[i].binary ?? {};
 							items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(
-								data,
+								data as Buffer,
 								this.getNodeParameter('fileName', i) as string,
 							);
 
@@ -484,7 +485,7 @@ export class Wise implements INodeType {
 
 							items[i].binary = items[i].binary ?? {};
 							items[i].binary![binaryProperty] = await this.helpers.prepareBinaryData(
-								data,
+								data as Buffer,
 								this.getNodeParameter('fileName', i) as string,
 							);
 
@@ -539,12 +540,12 @@ export class Wise implements INodeType {
 			}
 
 			Array.isArray(responseData)
-				? returnData.push(...responseData)
-				: returnData.push(responseData);
+				? returnData.push(...(responseData as IDataObject[]))
+				: returnData.push(responseData as IDataObject);
 		}
 
 		if (binaryOutput && responseData !== undefined) {
-			return this.prepareOutputData(responseData);
+			return this.prepareOutputData(responseData as INodeExecutionData[]);
 		}
 
 		return [this.helpers.returnJsonArray(returnData)];
diff --git a/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts b/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
index 2245abd3f56cb7..411973723c7c3f 100644
--- a/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
@@ -93,7 +93,6 @@ export class WiseTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -186,7 +185,7 @@ export class WiseTrigger implements INodeType {
 		}
 
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index e8b9345fa81c74..e054792a018c22 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -43,7 +43,7 @@ export async function woocommerceApiRequest(
 		json: true,
 	};
 
-	if (!Object.keys(body).length) {
+	if (!Object.keys(body as IDataObject).length) {
 		delete options.form;
 	}
 	options = Object.assign({}, options, option);
@@ -72,7 +72,7 @@ export async function woocommerceApiRequestAllItems(
 		if (nextLink) {
 			uri = nextLink.split(';')[0].replace(/<(.*)>/, '$1');
 		}
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 	} while (responseData.headers.link?.includes('rel="next"'));
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index 6702ffcc18cce6..c048a8dd2df10f 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -419,7 +419,6 @@ export class WooCommerce implements INodeType {
 						body.line_items = lineItems;
 						setMetadata(lineItems);
 						toSnakeCase(lineItems);
-						//@ts-ignore
 					}
 					const metadata = (this.getNodeParameter('metadataUi', i) as IDataObject)
 						.metadataValues as IDataObject[];
@@ -579,7 +578,7 @@ export class WooCommerce implements INodeType {
 				}
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject[]),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
index cbc5a3b2806037..e95fa4fecc8b14 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
@@ -100,7 +100,6 @@ export class WooCommerceTrigger implements INodeType {
 		],
 	};
 
-	// @ts-ignore
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -177,7 +176,7 @@ export class WooCommerceTrigger implements INodeType {
 			return {};
 		}
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
index de77b7c117a0d8..1188962605d362 100644
--- a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function wordpressApiRequest(
@@ -30,14 +30,14 @@ export async function wordpressApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		const credentialType = 'wordpressApi';
 		return await this.helpers.requestWithAuthentication.call(this, credentialType, options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -61,11 +61,11 @@ export async function wordpressApiRequestAllItems(
 		responseData = await wordpressApiRequest.call(this, method, endpoint, body, query, undefined, {
 			resolveWithFullResponse: true,
 		});
-		returnData.push.apply(returnData, responseData.body);
+		returnData.push.apply(returnData, responseData.body as IDataObject[]);
 	} while (
 		responseData.headers['x-wp-totalpages'] !== undefined &&
 		responseData.headers['x-wp-totalpages'] !== '0' &&
-		parseInt(responseData.headers['x-wp-totalpages'], 10) !== query.page
+		parseInt(responseData.headers['x-wp-totalpages'] as string, 10) !== query.page
 	);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index 2dcc16c19b0285..99aaefcb999db2 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -420,7 +420,7 @@ export class Wordpress implements INodeType {
 					}
 				}
 				const exectutionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...exectutionData);
diff --git a/packages/nodes-base/nodes/Workable/GenericFunctions.ts b/packages/nodes-base/nodes/Workable/GenericFunctions.ts
index 6bb20d4320c630..9ebb0d4ffae312 100644
--- a/packages/nodes-base/nodes/Workable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Workable/GenericFunctions.ts
@@ -7,7 +7,7 @@ import type {
 	ILoadOptionsFunctions,
 } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function workableApiRequest(
@@ -34,12 +34,12 @@ export async function workableApiRequest(
 		json: true,
 	};
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
index d1a4173d2224cd..cfa62b5037f6f8 100644
--- a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
@@ -31,7 +31,7 @@ export async function wufooApiRequest(
 	};
 
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0 || method === 'PUT') {
+	if (Object.keys(options.body as IDataObject).length === 0 || method === 'PUT') {
 		delete options.body;
 	}
 
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
index e427fd132b57dc..d971ea9e4dbe9f 100644
--- a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
@@ -98,7 +98,6 @@ export class WufooTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore
 	webhookMethods = {
 		default: {
 			// No API endpoint to allow checking of existing webhooks.
@@ -154,7 +153,7 @@ export class WufooTrigger implements INodeType {
 			return {};
 		}
 
-		const fieldsObject = jsonParse<any>(req.body.FieldStructure, {
+		const fieldsObject = jsonParse<any>(req.body.FieldStructure as string, {
 			errorMessage: "Invalid JSON in request body field 'FieldStructure'",
 		});
 
@@ -209,10 +208,10 @@ export class WufooTrigger implements INodeType {
 				entryId: req.body.EntryId as number,
 				dateCreated: req.body.DateCreated as Date,
 				formId: req.body.FormId as string,
-				formStructure: jsonParse(req.body.FormStructure, {
+				formStructure: jsonParse(req.body.FormStructure as string, {
 					errorMessage: "Invalid JSON in request body field 'FormStructure'",
 				}),
-				fieldStructure: jsonParse(req.body.FieldStructure, {
+				fieldStructure: jsonParse(req.body.FieldStructure as string, {
 					errorMessage: "Invalid JSON in request body field 'FieldStructure'",
 				}),
 				entries,
diff --git a/packages/nodes-base/nodes/Xero/GenericFunctions.ts b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
index ff6f3ab088211f..7aacd700005ea4 100644
--- a/packages/nodes-base/nodes/Xero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
@@ -33,10 +33,9 @@ export async function xeroApiRequest(
 		if (Object.keys(headers).length !== 0) {
 			options.headers = Object.assign({}, options.headers, headers);
 		}
-		if (Object.keys(body).length === 0) {
+		if (Object.keys(body as IDataObject).length === 0) {
 			delete options.body;
 		}
-		//@ts-ignore
 		return await this.helpers.requestOAuth2.call(this, 'xeroOAuth2Api', options);
 	} catch (error) {
 		throw new NodeApiError(this.getNode(), error as JsonObject);
@@ -60,7 +59,7 @@ export async function xeroApiRequestAllItems(
 	do {
 		responseData = await xeroApiRequest.call(this, method, endpoint, body, query);
 		query.page++;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 	} while (responseData[propertyName].length !== 0);
 
 	return returnData;
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index cc16e033b920f0..3e141b4ccba94d 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -719,7 +719,7 @@ export class Xero implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
index 71f9cfd6ae2405..d0a2609db720a8 100644
--- a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function yourlsApiRequest(
@@ -25,7 +25,6 @@ export async function yourlsApiRequest(
 		json: true,
 	};
 	try {
-		//@ts-ignore
 		const response = await this.helpers.request.call(this, options);
 
 		if (response.status === 'fail') {
@@ -37,6 +36,6 @@ export async function yourlsApiRequest(
 
 		return response;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
diff --git a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
index 9ecd25962d5097..37722b10776792 100644
--- a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
@@ -1,6 +1,6 @@
 import type { IExecuteFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
@@ -76,7 +76,7 @@ export async function zammadApiRequest(
 			error.error.error = 'An entity with this name already exists.';
 		}
 
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -98,7 +98,7 @@ export async function zammadApiRequestAllItems(
 
 	do {
 		responseData = await zammadApiRequest.call(this, method, endpoint, body, qs);
-		returnData.push(...responseData);
+		returnData.push(...(responseData as IDataObject[]));
 
 		if (limit && returnData.length > limit) {
 			return returnData.slice(0, limit);
diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.ts b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
index 7ce7f65564bdcb..8a71a93d265f48 100644
--- a/packages/nodes-base/nodes/Zammad/Zammad.node.ts
+++ b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
@@ -746,7 +746,7 @@ export class Zammad implements INodeType {
 				}
 
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
index e32b8237575f8f..6c06ab7f6637ff 100644
--- a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
@@ -26,7 +26,7 @@ export async function zendeskApiRequest(
 	qs: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const authenticationMethod = this.getNodeParameter('authentication', 0);
 
 	let credentials;
@@ -49,7 +49,7 @@ export async function zendeskApiRequest(
 	};
 
 	options = Object.assign({}, options, option);
-	if (Object.keys(options.body).length === 0) {
+	if (Object.keys(options.body as IDataObject).length === 0) {
 		delete options.body;
 	}
 
@@ -80,7 +80,7 @@ export async function zendeskApiRequestAllItems(
 	do {
 		responseData = await zendeskApiRequest.call(this, method, resource, body, query, uri);
 		uri = responseData.next_page;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		if (query.limit && query.limit <= returnData.length) {
 			return returnData;
 		}
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index 9d0d40f3dc199b..084e384c3620f3 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -7,6 +7,7 @@ import type {
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
+	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
@@ -141,7 +142,7 @@ export class Zendesk implements INodeType {
 					'/ticket_fields',
 				);
 				for (const field of fields) {
-					if (customFields.includes(field.type)) {
+					if (customFields.includes(field.type as string)) {
 						const fieldName = field.title;
 						const fieldId = field.id;
 						returnData.push({
@@ -477,7 +478,7 @@ export class Zendesk implements INodeType {
 							);
 							responseData = responseData.ticket;
 						} catch (error) {
-							throw new NodeApiError(this.getNode(), error);
+							throw new NodeApiError(this.getNode(), error as JsonObject);
 						}
 					}
 				}
@@ -787,7 +788,7 @@ export class Zendesk implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index f7993da931e4b5..1525caf0ccc795 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -165,7 +165,7 @@ export class ZendeskTrigger implements INodeType {
 					'/ticket_fields',
 				);
 				for (const field of fields) {
-					if (customFields.includes(field.type) && field.removable && field.active) {
+					if (customFields.includes(field.type as string) && field.removable && field.active) {
 						const fieldName = field.title;
 						const fieldId = field.id;
 						returnData.push({
@@ -218,7 +218,6 @@ export class ZendeskTrigger implements INodeType {
 		},
 	};
 
-	// @ts-ignore
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
@@ -316,7 +315,6 @@ export class ZendeskTrigger implements INodeType {
 
 					if (options.fields) {
 						for (const field of options.fields as string[]) {
-							// @ts-ignore
 							message[field] = `{{${field}}}`;
 						}
 					} else {
@@ -400,8 +398,10 @@ export class ZendeskTrigger implements INodeType {
 							.webhook as IDataObject;
 					}
 
-					// @ts-ignore
-					bodyTrigger.trigger.actions[0].value = [target.id, JSON.stringify(message)];
+					((bodyTrigger.trigger as IDataObject).actions as IDataObject[])[0].value = [
+						target.id,
+						JSON.stringify(message),
+					];
 
 					const { trigger } = await zendeskApiRequest.call(this, 'POST', '/triggers', bodyTrigger);
 					webhookData.webhookId = trigger.id;
@@ -427,7 +427,7 @@ export class ZendeskTrigger implements INodeType {
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
 		const req = this.getRequestObject();
 		return {
-			workflowData: [this.helpers.returnJsonArray(req.body)],
+			workflowData: [this.helpers.returnJsonArray(req.body as IDataObject)],
 		};
 	}
 }
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index 60f9cddf44835a..ad94e0e0ebc857 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
 
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import flow from 'lodash.flow';
@@ -68,11 +68,11 @@ export async function zohoApiRequest(
 
 		if (responseData === undefined) return [];
 
-		throwOnErrorStatus.call(this, responseData);
+		throwOnErrorStatus.call(this, responseData as IDataObject);
 
 		return responseData;
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -95,7 +95,7 @@ export async function zohoApiRequestAllItems(
 	do {
 		responseData = await zohoApiRequest.call(this, method, endpoint, body, qs);
 		if (Array.isArray(responseData) && !responseData.length) return returnData;
-		returnData.push(...responseData.data);
+		returnData.push(...(responseData.data as IDataObject[]));
 		qs.page++;
 	} while (responseData.info.more_records !== undefined && responseData.info.more_records === true);
 
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index e4dff450d1e985..3dfe8016ef54c8 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -1326,7 +1326,7 @@ export class ZohoCrm implements INodeType {
 				throw error;
 			}
 			const executionData = this.helpers.constructExecutionMetaData(
-				this.helpers.returnJsonArray(responseData),
+				this.helpers.returnJsonArray(responseData as IDataObject),
 				{ itemData: { item: i } },
 			);
 			returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
index a8484d8b6c56b9..754779fe2b96f5 100644
--- a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
@@ -2,7 +2,7 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function zoomApiRequest(
@@ -38,11 +38,10 @@ export async function zoomApiRequest(
 		if (authenticationMethod === 'accessToken') {
 			return await this.helpers.requestWithAuthentication.call(this, 'zoomApi', options);
 		} else {
-			//@ts-ignore
 			return await this.helpers.requestOAuth2.call(this, 'zoomOAuth2Api', options);
 		}
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
@@ -68,7 +67,7 @@ export async function zoomApiRequestAllItems(
 	do {
 		responseData = await zoomApiRequest.call(this, method, endpoint, body, query);
 		query.page_number++;
-		returnData.push.apply(returnData, responseData[propertyName]);
+		returnData.push.apply(returnData, responseData[propertyName] as IDataObject[]);
 		// zoom free plan rate limit is 1 request/second
 		// TODO just wait when the plan is free
 		await wait();
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index 7479802a5f9777..72c8d79fa31d77 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -775,7 +775,7 @@ export class Zoom implements INodeType {
 				// 	}
 				// }
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
index 378831c6f91eca..59509ad7572b9e 100644
--- a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
@@ -2,7 +2,11 @@ import type { OptionsWithUri } from 'request';
 
 import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type { IMessage } from './MessageInterface';
+import type { IStream } from './StreamInterface';
+import type { IUser } from './UserInterface';
+
+import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function zulipApiRequest(
@@ -10,11 +14,11 @@ export async function zulipApiRequest(
 	method: string,
 	resource: string,
 
-	body: any = {},
+	body: IMessage | IStream | IUser = {},
 	query: IDataObject = {},
 	uri?: string,
 	option: IDataObject = {},
-): Promise<any> {
+) {
 	const credentials = await this.getCredentials('zulipApi');
 
 	const endpoint = `${credentials.url}/api/v1`;
@@ -43,7 +47,7 @@ export async function zulipApiRequest(
 	try {
 		return await this.helpers.request(options);
 	} catch (error) {
-		throw new NodeApiError(this.getNode(), error);
+		throw new NodeApiError(this.getNode(), error as JsonObject);
 	}
 }
 
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index 4bed35caa8001c..e26be1c8284e39 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -465,7 +465,7 @@ export class Zulip implements INodeType {
 					}
 				}
 				const executionData = this.helpers.constructExecutionMetaData(
-					this.helpers.returnJsonArray(responseData),
+					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
 				returnData.push(...executionData);
diff --git a/packages/nodes-base/utils/utilities.ts b/packages/nodes-base/utils/utilities.ts
index 0ec385078f46cd..28fa916896bf35 100644
--- a/packages/nodes-base/utils/utilities.ts
+++ b/packages/nodes-base/utils/utilities.ts
@@ -48,7 +48,7 @@ export function chunk(array: any[], size = 1) {
 export function flatten(nestedArray: any[][]) {
 	const result = [];
 
-	(function loop(array: any[]) {
+	(function loop(array: any[] | any) {
 		for (let i = 0; i < array.length; i++) {
 			if (Array.isArray(array[i])) {
 				loop(array[i]);

From ae634407a47de33d77cb81ae7ce11362e8485fd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Milorad=20FIlipovi=C4=87?= <milorad@n8n.io>
Date: Tue, 28 Feb 2023 05:34:03 +0100
Subject: [PATCH 300/358] feat(editor): Add missing documentation to
 autocomplete items for inline code editor (#5560)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ⚡ Added documentation for extension functions with arguments

* ⚡ Adding custom autocomplete item types. This enables us to show different items with same labels.

* 📚 Adding missing info for extensions autocomplete items

* ⚡ Added Luxon autocomplete docs

* 💡 Completing Luxon static methods autocomplete documentation

* ⚡ Refactoring Luxon autocomplete logic

* ⚡ Handling the case when autocomplete item doesn't have defined inline documentation

* ⚡ Added correct doc info to Luxon instance properties

* ✨ Added missing documentation and notice footer for autocomplete popup.

* 👕 Fixing lint error

* ✔️ Removing `Object.hasOwn` function, since it's not supported in node v14
---
 .../completions/datatype.completions.ts       | 204 ++++---
 .../luxon.instance.docs.ts                    | 551 ++++++++++++++++++
 .../luxon.static.docs.ts                      | 250 ++++++++
 .../codemirror/completions/typeGuards.ts      |   5 +
 .../plugins/codemirror/completions/types.ts   |   4 +
 packages/editor-ui/src/plugins/i18n/index.ts  |  21 +-
 .../src/plugins/i18n/locales/en.json          |  67 ++-
 .../src/styles/autocomplete-theme.scss        |  15 +
 .../src/Extensions/ArrayExtensions.ts         | 123 +++-
 .../workflow/src/Extensions/DateExtensions.ts |  56 +-
 .../src/Extensions/NumberExtensions.ts        |  27 +-
 .../src/Extensions/ObjectExtensions.ts        |  33 +-
 .../src/Extensions/StringExtensions.ts        |  96 ++-
 .../src/NativeMethods/Array.methods.ts        |   2 +-
 .../src/NativeMethods/String.methods.ts       |   4 +-
 15 files changed, 1279 insertions(+), 179 deletions(-)
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
 create mode 100644 packages/editor-ui/src/plugins/codemirror/completions/typeGuards.ts

diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
index 6f8392bf9f77d8..e64158059efd29 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -14,11 +14,12 @@ import {
 	stripExcessParens,
 } from './utils';
 import type { Completion, CompletionContext, CompletionResult } from '@codemirror/autocomplete';
-import type { ExtensionTypeName, FnToDoc, Resolved } from './types';
+import type { AutocompleteOptionType, ExtensionTypeName, FnToDoc, Resolved } from './types';
 import { sanitizeHtml } from '@/utils';
 import { NativeDoc } from 'n8n-workflow/src/Extensions/Extensions';
-
-type AutocompleteOptionType = 'function' | 'keyword';
+import { isFunctionOption } from './typeGuards';
+import { luxonInstanceDocs } from './nativesAutocompleteDocs/luxon.instance.docs';
+import { luxonStaticDocs } from './nativesAutocompleteDocs/luxon.static.docs';
 
 /**
  * Resolution-based completions offered according to datatype.
@@ -59,7 +60,7 @@ export function datatypeCompletions(context: CompletionContext): CompletionResul
 	if (options.length === 0) return null;
 
 	if (tail !== '') {
-		options = options.filter((o) => prefixMatch(o.label, tail));
+		options = options.filter((o) => prefixMatch(o.label, tail) && o.label !== tail);
 	}
 
 	return {
@@ -103,7 +104,6 @@ function datatypeOptions(resolved: Resolved, toResolve: string) {
 
 			return arrayMethods.filter((m) => !NUMBER_ONLY_ARRAY_EXTENSIONS.has(m.label));
 		}
-
 		return arrayMethods;
 	}
 
@@ -120,7 +120,7 @@ export const natives = (typeName: ExtensionTypeName): Completion[] => {
 	if (!natives) return [];
 
 	const nativeProps = natives.properties ? toOptions(natives.properties, typeName, 'keyword') : [];
-	const nativeMethods = toOptions(natives.functions, typeName, 'function');
+	const nativeMethods = toOptions(natives.functions, typeName, 'native-function');
 
 	return [...nativeProps, ...nativeMethods];
 };
@@ -131,67 +131,75 @@ export const extensions = (typeName: ExtensionTypeName) => {
 	if (!extensions) return [];
 
 	const fnToDoc = Object.entries(extensions.functions).reduce<FnToDoc>((acc, [fnName, fn]) => {
-		if (fn.length !== 1) return acc; // @TODO_NEXT_PHASE: Remove to allow extensions which take args
-
 		return { ...acc, [fnName]: { doc: fn.doc } };
 	}, {});
 
-	return toOptions(fnToDoc, typeName);
+	return toOptions(fnToDoc, typeName, 'extension-function');
 };
 
 export const toOptions = (
 	fnToDoc: FnToDoc,
 	typeName: ExtensionTypeName,
-	optionType: AutocompleteOptionType = 'function',
+	optionType: AutocompleteOptionType = 'native-function',
 ) => {
 	return Object.entries(fnToDoc)
 		.sort((a, b) => a[0].localeCompare(b[0]))
 		.map(([fnName, fn]) => {
-			const option: Completion = {
-				label: optionType === 'function' ? fnName + '()' : fnName,
-				type: optionType,
-			};
+			return createCompletionOption(typeName, fnName, optionType, fn);
+		});
+};
 
-			option.info = () => {
-				const tooltipContainer = document.createElement('div');
-				tooltipContainer.classList.add('autocomplete-info-container');
-
-				if (!fn.doc?.description) return null;
-
-				const header =
-					optionType === 'function'
-						? createFunctionHeader(typeName, fn)
-						: createPropHeader(typeName, fn);
-				header.classList.add('autocomplete-info-header');
-				tooltipContainer.appendChild(header);
-
-				const descriptionBody = document.createElement('div');
-				descriptionBody.classList.add('autocomplete-info-description');
-				const descriptionText = document.createElement('p');
-				descriptionText.innerHTML = sanitizeHtml(
-					fn.doc.description.replace(/`(.*?)`/g, '<code>$1</code>'),
-				);
-				descriptionBody.appendChild(descriptionText);
-				if (fn.doc.docURL) {
-					const descriptionLink = document.createElement('a');
-					descriptionLink.setAttribute('target', '_blank');
-					descriptionLink.setAttribute('href', fn.doc.docURL);
-					descriptionLink.innerText = i18n.autocompleteUIValues['docLinkLabel'] || 'Learn more';
-					descriptionLink.addEventListener('mousedown', (event: MouseEvent) => {
-						// This will prevent documentation popup closing before click
-						// event gets to links
-						event.preventDefault();
-					});
-					descriptionLink.classList.add('autocomplete-info-doc-link');
-					descriptionBody.appendChild(descriptionLink);
-				}
-				tooltipContainer.appendChild(descriptionBody);
-
-				return tooltipContainer;
-			};
+const createCompletionOption = (
+	typeName: string,
+	name: string,
+	optionType: AutocompleteOptionType,
+	docInfo: { doc?: DocMetadata | undefined },
+): Completion => {
+	const option: Completion = {
+		label: isFunctionOption(optionType) ? name + '()' : name,
+		type: optionType,
+	};
 
-			return option;
-		});
+	option.info = () => {
+		const tooltipContainer = document.createElement('div');
+		tooltipContainer.classList.add('autocomplete-info-container');
+
+		if (!docInfo.doc) return null;
+
+		const header = isFunctionOption(optionType)
+			? createFunctionHeader(typeName, docInfo)
+			: createPropHeader(typeName, docInfo);
+		header.classList.add('autocomplete-info-header');
+		tooltipContainer.appendChild(header);
+
+		if (docInfo.doc.description) {
+			const descriptionBody = document.createElement('div');
+			descriptionBody.classList.add('autocomplete-info-description');
+			const descriptionText = document.createElement('p');
+			descriptionText.innerHTML = sanitizeHtml(
+				docInfo.doc.description.replace(/`(.*?)`/g, '<code>$1</code>'),
+			);
+			descriptionBody.appendChild(descriptionText);
+			if (docInfo.doc.docURL) {
+				const descriptionLink = document.createElement('a');
+				descriptionLink.setAttribute('target', '_blank');
+				descriptionLink.setAttribute('href', docInfo.doc.docURL);
+				descriptionLink.innerText = i18n.autocompleteUIValues['docLinkLabel'] || 'Learn more';
+				descriptionLink.addEventListener('mousedown', (event: MouseEvent) => {
+					// This will prevent documentation popup closing before click
+					// event gets to links
+					event.preventDefault();
+				});
+				descriptionLink.classList.add('autocomplete-info-doc-link');
+				descriptionBody.appendChild(descriptionLink);
+			}
+			tooltipContainer.appendChild(descriptionBody);
+		}
+
+		return tooltipContainer;
+	};
+
+	return option;
 };
 
 const createFunctionHeader = (typeName: string, fn: { doc?: DocMetadata | undefined }) => {
@@ -199,10 +207,12 @@ const createFunctionHeader = (typeName: string, fn: { doc?: DocMetadata | undefi
 	if (fn.doc) {
 		const typeNameSpan = document.createElement('span');
 		typeNameSpan.innerHTML = typeName.slice(0, 1).toUpperCase() + typeName.slice(1) + '.';
+		header.appendChild(typeNameSpan);
 
 		const functionNameSpan = document.createElement('span');
 		functionNameSpan.classList.add('autocomplete-info-name');
 		functionNameSpan.innerHTML = `${fn.doc.name}`;
+		header.appendChild(functionNameSpan);
 		let functionArgs = '(';
 		if (fn.doc.args) {
 			functionArgs += fn.doc.args
@@ -219,14 +229,12 @@ const createFunctionHeader = (typeName: string, fn: { doc?: DocMetadata | undefi
 		const argsSpan = document.createElement('span');
 		argsSpan.classList.add('autocomplete-info-name-args');
 		argsSpan.innerText = functionArgs;
-
-		const returnTypeSpan = document.createElement('span');
-		returnTypeSpan.innerHTML = ': ' + fn.doc.returnType;
-
-		header.appendChild(typeNameSpan);
-		header.appendChild(functionNameSpan);
 		header.appendChild(argsSpan);
-		header.appendChild(returnTypeSpan);
+		if (fn.doc.returnType) {
+			const returnTypeSpan = document.createElement('span');
+			returnTypeSpan.innerHTML = ': ' + fn.doc.returnType;
+			header.appendChild(returnTypeSpan);
+		}
 	}
 	return header;
 };
@@ -285,9 +293,18 @@ const objectOptions = (toResolve: string, resolved: IDataObject) => {
 			};
 
 			const infoKey = [name, key].join('.');
-			const info = i18n.proxyVars[infoKey];
-
-			if (info) option.info = info;
+			option.info = createCompletionOption(
+				'Object',
+				key,
+				isFunction ? 'native-function' : 'keyword',
+				{
+					doc: {
+						name: key,
+						returnType: typeof resolved[key],
+						description: i18n.proxyVars[infoKey],
+					},
+				},
+			).info;
 
 			return option;
 		});
@@ -325,17 +342,8 @@ export const luxonInstanceOptions = () => {
 		.sort(([a], [b]) => a.localeCompare(b))
 		.map(([key, descriptor]) => {
 			const isFunction = typeof descriptor.value === 'function';
-
-			const option: Completion = {
-				label: isFunction ? key + '()' : key,
-				type: isFunction ? 'function' : 'keyword',
-			};
-
-			const info = i18n.luxonInstance[key];
-
-			if (info) option.info = info;
-
-			return option;
+			const optionType = isFunction ? 'native-function' : 'keyword';
+			return createLuxonAutocompleteOption(key, optionType, luxonInstanceDocs, i18n.luxonInstance);
 		});
 };
 
@@ -349,17 +357,47 @@ export const luxonStaticOptions = () => {
 		.filter((key) => !SKIP.has(key) && !key.includes('_'))
 		.sort((a, b) => a.localeCompare(b))
 		.map((key) => {
-			const option: Completion = {
-				label: key + '()',
-				type: 'function',
-			};
-
-			const info = i18n.luxonStatic[key];
+			return createLuxonAutocompleteOption(
+				key,
+				'native-function',
+				luxonStaticDocs,
+				i18n.luxonStatic,
+			);
+		});
+};
 
-			if (info) option.info = info;
+const createLuxonAutocompleteOption = (
+	name: string,
+	type: AutocompleteOptionType,
+	docDefinition: NativeDoc,
+	translations: Record<string, string | undefined>,
+): Completion => {
+	const option: Completion = {
+		label: isFunctionOption(type) ? name + '()' : name,
+		type,
+	};
 
-			return option;
-		});
+	let doc: DocMetadata | undefined;
+	if (docDefinition.properties && docDefinition.properties.hasOwnProperty(name)) {
+		doc = docDefinition.properties[name].doc;
+	} else if (docDefinition.functions.hasOwnProperty(name)) {
+		doc = docDefinition.functions[name].doc;
+	} else {
+		// Use inferred/default values if docs are still not updated
+		// This should happen when our doc specification becomes
+		// out-od-date with Luxon implementation
+		const optionType = typeof DateTime.prototype[name as keyof DateTime];
+		doc = {
+			name,
+			returnType: !optionType || optionType === 'undefined' ? '' : optionType,
+			docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetime',
+		};
+	}
+	option.info = createCompletionOption('DateTime', name, type, {
+		// Add translated description
+		doc: { ...doc, description: translations[name] } as DocMetadata,
+	}).info;
+	return option;
 };
 
 /**
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
new file mode 100644
index 00000000000000..61e7f3e27cde61
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.instance.docs.ts
@@ -0,0 +1,551 @@
+import { NativeDoc } from 'n8n-workflow/src/Extensions/Extensions';
+
+// Autocomplete documentation definition for DateTime instance props and methods
+// Descriptions are added dynamically so they can be localized
+export const luxonInstanceDocs: Required<NativeDoc> = {
+	typeName: 'DateTime',
+	properties: {
+		day: {
+			doc: {
+				name: 'day',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeday',
+				returnType: 'number',
+			},
+		},
+		daysInMonth: {
+			doc: {
+				name: 'daysInMonth',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimedaysinmonth',
+				returnType: 'number',
+			},
+		},
+		daysInYear: {
+			doc: {
+				name: 'daysInYear',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimedaysinyear',
+				returnType: 'number',
+			},
+		},
+		hour: {
+			doc: {
+				name: 'hour',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimehour',
+				returnType: 'number',
+			},
+		},
+		locale: {
+			doc: {
+				name: 'locale',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimelocale',
+				returnType: 'string',
+			},
+		},
+		millisecond: {
+			doc: {
+				name: 'millisecond',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemillisecond',
+				returnType: 'number',
+			},
+		},
+		minute: {
+			doc: {
+				name: 'minute',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeminute',
+				returnType: 'number',
+			},
+		},
+		month: {
+			doc: {
+				name: 'month',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemonth',
+				returnType: 'number',
+			},
+		},
+		monthLong: {
+			doc: {
+				name: 'monthLong',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemonthlong',
+				returnType: 'string',
+			},
+		},
+		monthShort: {
+			doc: {
+				name: 'monthShort',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemonthshort',
+				returnType: 'string',
+			},
+		},
+		numberingSystem: {
+			doc: {
+				name: 'numberingSystem',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimenumberingsystem',
+				returnType: 'string',
+			},
+		},
+		offset: {
+			doc: {
+				name: 'offset',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoffset',
+				returnType: 'number',
+			},
+		},
+		offsetNameLong: {
+			doc: {
+				name: 'offsetNameLong',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoffsetnamelong',
+				returnType: 'string',
+			},
+		},
+		offsetNameShort: {
+			doc: {
+				name: 'offsetNameShort',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoffsetnameshort',
+				returnType: 'string',
+			},
+		},
+		ordinal: {
+			doc: {
+				name: 'ordinal',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeordinal',
+				returnType: 'string',
+			},
+		},
+		outputCalendar: {
+			doc: {
+				name: 'outputCalendar',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeoutputcalendar',
+				returnType: 'string',
+			},
+		},
+		quarter: {
+			doc: {
+				name: 'quarter',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimequarter',
+				returnType: 'number',
+			},
+		},
+		second: {
+			doc: {
+				name: 'second',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimesecond',
+				returnType: 'number',
+			},
+		},
+		weekday: {
+			doc: {
+				name: 'weekday',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekday',
+				returnType: 'number',
+			},
+		},
+		weekdayLong: {
+			doc: {
+				name: 'weekdayLong',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekdaylong',
+				returnType: 'string',
+			},
+		},
+		weekdayShort: {
+			doc: {
+				name: 'weekdayShort',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekdayshort',
+				returnType: 'string',
+			},
+		},
+		weekNumber: {
+			doc: {
+				name: 'weekNumber',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweeknumber',
+				returnType: 'number',
+			},
+		},
+		weeksInWeekYear: {
+			doc: {
+				name: 'weeksInWeekYear',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweeksinweekyear',
+				returnType: 'number',
+			},
+		},
+		weekYear: {
+			doc: {
+				name: 'weekYear',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeweekyear',
+				returnType: 'number',
+			},
+		},
+		year: {
+			doc: {
+				name: 'year',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeyear',
+				returnType: 'number',
+			},
+		},
+		zone: {
+			doc: {
+				name: 'zone',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimezone',
+				returnType: 'Zone',
+			},
+		},
+		zoneName: {
+			doc: {
+				name: 'zoneName',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimezonename',
+				returnType: 'string',
+			},
+		},
+		isInDST: {
+			doc: {
+				name: 'isInDST',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisindst',
+				returnType: 'boolean',
+			},
+		},
+		isInLeapYear: {
+			doc: {
+				name: 'isInLeapYear',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisinleapyear',
+				returnType: 'boolean',
+			},
+		},
+		isOffsetFixed: {
+			doc: {
+				name: 'isOffsetFixed',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisoffsetfixed',
+				returnType: 'boolean',
+			},
+		},
+		isValid: {
+			doc: {
+				name: 'isValid',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisvalid',
+				returnType: 'boolean',
+			},
+		},
+	},
+	functions: {
+		diff: {
+			doc: {
+				name: 'diff',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimediff',
+				returnType: 'Duration',
+				args: [
+					{ name: 'other', type: 'DateTime' },
+					{ name: 'unit', type: 'string|string[]' },
+					{ name: 'opts', type: 'object' },
+				],
+			},
+		},
+		diffNow: {
+			doc: {
+				name: 'diffNow',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimediffnow',
+				returnType: 'Duration',
+				args: [
+					{ name: 'unit', type: 'string|string[]' },
+					{ name: 'opts', type: 'object' },
+				],
+			},
+		},
+		endOf: {
+			doc: {
+				name: 'endOf',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeendof',
+				returnType: 'DateTime',
+				args: [{ name: 'unit', type: 'string' }],
+			},
+		},
+		equals: {
+			doc: {
+				name: 'equals',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeequals',
+				returnType: 'boolean',
+				args: [{ name: 'other', type: 'DateTime' }],
+			},
+		},
+		hasSame: {
+			doc: {
+				name: 'hasSame',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimehassame',
+				returnType: 'boolean',
+				args: [
+					{ name: 'other', type: 'DateTime' },
+					{ name: 'unit', type: 'string' },
+				],
+			},
+		},
+		minus: {
+			doc: {
+				name: 'minus',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeminus',
+				returnType: 'DateTime',
+				args: [{ name: 'duration', type: 'Duration|object|number' }],
+			},
+		},
+		plus: {
+			doc: {
+				name: 'plus',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeplus',
+				returnType: 'DateTime',
+				args: [{ name: 'duration', type: 'Duration|object|number' }],
+			},
+		},
+		reconfigure: {
+			doc: {
+				name: 'reconfigure',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimereconfigure',
+				returnType: 'DateTime',
+				args: [{ name: 'properties', type: 'object' }],
+			},
+		},
+		resolvedLocaleOptions: {
+			doc: {
+				name: 'resolvedLocaleOptions',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeresolvedlocaleoptions',
+				returnType: 'object',
+				args: [{ name: 'opts', type: 'object' }],
+			},
+		},
+		set: {
+			doc: {
+				name: 'set',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeset',
+				returnType: 'DateTime',
+				args: [{ name: 'values', type: 'object' }],
+			},
+		},
+		setLocale: {
+			doc: {
+				name: 'setLocale',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimesetlocale',
+				returnType: 'DateTime',
+				args: [{ name: 'locale', type: 'any' }],
+			},
+		},
+		setZone: {
+			doc: {
+				name: 'setZone',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimesetzone',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'zone', type: 'string|Zone' },
+					{ name: 'opts', type: 'object' },
+				],
+			},
+		},
+		startOf: {
+			doc: {
+				name: 'startOf',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimestartof',
+				returnType: 'DateTime',
+				args: [{ name: 'unit', type: 'string' }],
+			},
+		},
+		toBSON: {
+			doc: {
+				name: 'toBSON',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetobson',
+				returnType: 'Date',
+			},
+		},
+		toFormat: {
+			doc: {
+				name: 'toFormat',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetime',
+				returnType: 'string',
+				args: [
+					{ name: 'fmt', type: 'string' },
+					{ name: 'opts', type: 'object' },
+				],
+			},
+		},
+		toHTTP: {
+			doc: {
+				name: 'toHTTP',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetohttp',
+				returnType: 'string',
+			},
+		},
+		toISO: {
+			doc: {
+				name: 'toISO',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoiso',
+				returnType: 'string',
+				args: [{ name: 'opts', type: 'object' }],
+			},
+		},
+		toISODate: {
+			doc: {
+				name: 'toISODate',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoisodate',
+				returnType: 'string',
+				args: [{ name: 'opts', type: 'object' }],
+			},
+		},
+		toISOTime: {
+			doc: {
+				name: 'toISOTime',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoisotime',
+				returnType: 'string',
+				args: [{ name: 'opts', type: 'object' }],
+			},
+		},
+		toISOWeekDate: {
+			doc: {
+				name: 'toISOWeekDate',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoisoweekdate',
+				returnType: 'string',
+			},
+		},
+		toJSDate: {
+			doc: {
+				name: 'toJSDate',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetojsdate',
+				returnType: 'Date',
+			},
+		},
+		toJSON: {
+			doc: {
+				name: 'toJSON',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetojson',
+				returnType: 'string',
+			},
+		},
+		toLocal: {
+			doc: {
+				name: 'toLocal',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetolocal',
+				returnType: 'DateTime',
+			},
+		},
+		toLocaleParts: {
+			doc: {
+				name: 'toLocaleParts',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetolocaleparts',
+				returnType: 'string',
+				args: [
+					{ name: 'formatOpts', type: 'any' },
+					{ name: 'opts', type: 'object' },
+				],
+			},
+		},
+		toLocaleString: {
+			doc: {
+				name: 'toLocaleString',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetolocalestring',
+				returnType: 'string',
+				args: [
+					{ name: 'formatOpts', type: 'any' },
+					{ name: 'opts', type: 'object' },
+				],
+			},
+		},
+		toMillis: {
+			doc: {
+				name: 'toMillis',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetomillis',
+				returnType: 'number',
+			},
+		},
+		toObject: {
+			doc: {
+				name: 'toObject',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoobject',
+				returnType: 'object',
+				args: [{ name: 'opts', type: 'any' }],
+			},
+		},
+		toRelative: {
+			doc: {
+				name: 'toRelative',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetorelative',
+				returnType: 'string',
+				args: [{ name: 'options', type: 'object' }],
+			},
+		},
+		toRelativeCalendar: {
+			doc: {
+				name: 'toRelativeCalendar',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetorelativecalendar',
+				returnType: 'string',
+				args: [{ name: 'options', type: 'object' }],
+			},
+		},
+		toRFC2822: {
+			doc: {
+				name: 'toRFC2822',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetorfc2822',
+				returnType: 'string',
+			},
+		},
+		toSeconds: {
+			doc: {
+				name: 'toSeconds',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoseconds',
+				returnType: 'number',
+			},
+		},
+		toSQL: {
+			doc: {
+				name: 'toSQL',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetosql',
+				returnType: 'string',
+				args: [{ name: 'options', type: 'object' }],
+			},
+		},
+		toSQLDate: {
+			doc: {
+				name: 'toSQLDate',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetosqldate',
+				returnType: 'string',
+			},
+		},
+		toSQLTime: {
+			doc: {
+				name: 'toSQLTime',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetosqltime',
+				returnType: 'string',
+			},
+		},
+		toString: {
+			doc: {
+				name: 'toString',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetostring',
+				returnType: 'string',
+			},
+		},
+		toUnixInteger: {
+			doc: {
+				name: 'toUnixInteger',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetounixinteger',
+				returnType: 'number',
+			},
+		},
+		toUTC: {
+			doc: {
+				name: 'toUTC',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimetoutc',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'offset', type: 'number' },
+					{ name: 'opts', type: 'object' },
+				],
+			},
+		},
+		until: {
+			doc: {
+				name: 'until',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeuntil',
+				returnType: 'Interval',
+				args: [{ name: 'other', type: 'DateTime' }],
+			},
+		},
+		valueOf: {
+			doc: {
+				name: 'valueOf',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimevalueof',
+				returnType: 'number',
+			},
+		},
+	},
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
new file mode 100644
index 00000000000000..db5fa9f3019dd9
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/nativesAutocompleteDocs/luxon.static.docs.ts
@@ -0,0 +1,250 @@
+import { NativeDoc } from 'n8n-workflow/src/Extensions/Extensions';
+
+// Autocomplete documentation definition for DateTime class static props and methods
+// Descriptions are added dynamically so they can be localized
+export const luxonStaticDocs: Required<NativeDoc> = {
+	typeName: 'DateTime',
+	properties: {},
+	functions: {
+		now: {
+			doc: {
+				name: 'now',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimenow',
+				returnType: 'DateTime',
+			},
+		},
+		local: {
+			doc: {
+				name: 'local',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimelocal',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'year?', type: 'number' },
+					{ name: 'month', type: 'number' },
+					{ name: 'day', type: 'number' },
+					{ name: 'hour', type: 'number' },
+					{ name: 'minute', type: 'number' },
+					{ name: 'second', type: 'number' },
+					{ name: 'millisecond', type: 'number' },
+				],
+			},
+		},
+		utc: {
+			doc: {
+				name: 'utc',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeutc',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'year?', type: 'number' },
+					{ name: 'month', type: 'number' },
+					{ name: 'day', type: 'number' },
+					{ name: 'hour', type: 'number' },
+					{ name: 'minute', type: 'number' },
+					{ name: 'second', type: 'number' },
+					{ name: 'millisecond', type: 'number' },
+				],
+			},
+		},
+		fromJSDate: {
+			doc: {
+				name: 'fromJSDate',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromjsdate',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'date', type: 'Date' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromMillis: {
+			doc: {
+				name: 'fromMillis',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefrommillis',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'milliseconds', type: 'number' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromSeconds: {
+			doc: {
+				name: 'fromSeconds',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromseconds',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'seconds', type: 'number' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromObject: {
+			doc: {
+				name: 'fromObject',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromobject',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'obj', type: 'object' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromISO: {
+			doc: {
+				name: 'fromISO',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromiso',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromRFC2822: {
+			doc: {
+				name: 'fromRFC2822',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromrfc2822',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromHTTP: {
+			doc: {
+				name: 'fromHTTP',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromhttp',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromFormat: {
+			doc: {
+				name: 'fromFormat',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromformat',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'fmt', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromSQL: {
+			doc: {
+				name: 'fromSQL',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromsql',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		invalid: {
+			doc: {
+				name: 'invalid',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeinvalid',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'reason', type: 'DateTime' },
+					{ name: 'explanation?', type: 'string' },
+				],
+			},
+		},
+		isDateTime: {
+			doc: {
+				name: 'isDateTime',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeisdatetime',
+				returnType: 'boolean',
+				args: [{ name: 'o', type: 'object' }],
+			},
+		},
+		expandFormat: {
+			doc: {
+				name: 'expandFormat',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeexpandformat',
+				returnType: 'string',
+				args: [
+					{ name: 'fmt', type: 'any' },
+					{ name: 'localeOpts?', type: 'any' },
+				],
+			},
+		},
+		fromFormatExplain: {
+			doc: {
+				name: 'fromFormatExplain',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromformatexplain',
+				returnType: 'object',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'fmt', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromString: {
+			doc: {
+				name: 'fromString',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromstring',
+				returnType: 'DateTime',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'fmt', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		fromStringExplain: {
+			doc: {
+				name: 'fromStringExplain',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimefromstringexplain',
+				returnType: 'object',
+				args: [
+					{ name: 'text', type: 'string' },
+					{ name: 'fmt', type: 'string' },
+					{ name: 'options?', type: 'object' },
+				],
+			},
+		},
+		max: {
+			doc: {
+				name: 'max',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemax',
+				returnType: 'DateTime|undefined',
+				args: [
+					{ name: 'dateTime1', type: 'DateTime' },
+					{ name: '...' },
+					{ name: 'dateTimeN', type: 'DateTime' },
+				],
+			},
+		},
+		min: {
+			doc: {
+				name: 'min',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimemin',
+				returnType: 'DateTime|undefined',
+				args: [
+					{ name: 'dateTime1', type: 'DateTime' },
+					{ name: '...' },
+					{ name: 'dateTimeN', type: 'DateTime' },
+				],
+			},
+		},
+		parseFormatForOpts: {
+			doc: {
+				name: 'parseFormatForOpts',
+				docURL: 'https://moment.github.io/luxon/api-docs/index.html#datetimeparseformatforopts',
+				returnType: 'string',
+				args: [
+					{ name: 'fmt', type: 'any' },
+					{ name: 'localeOpts?', type: 'any' },
+				],
+			},
+		},
+	},
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/typeGuards.ts b/packages/editor-ui/src/plugins/codemirror/completions/typeGuards.ts
new file mode 100644
index 00000000000000..a27b9970111e2f
--- /dev/null
+++ b/packages/editor-ui/src/plugins/codemirror/completions/typeGuards.ts
@@ -0,0 +1,5 @@
+import { AutocompleteOptionType, FunctionOptionType } from './types';
+
+export const isFunctionOption = (value: AutocompleteOptionType): value is FunctionOptionType => {
+	return value === 'native-function' || value === 'extension-function';
+};
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/types.ts b/packages/editor-ui/src/plugins/codemirror/completions/types.ts
index ae286b7cffd077..4e12a5db6ff20c 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/types.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/types.ts
@@ -6,3 +6,7 @@ export type Resolved = ReturnType<typeof resolveParameter>;
 export type ExtensionTypeName = 'number' | 'string' | 'date' | 'array' | 'object';
 
 export type FnToDoc = { [fnName: string]: { doc?: DocMetadata } };
+
+export type FunctionOptionType = 'native-function' | 'extension-function';
+export type KeywordOptionType = 'keyword';
+export type AutocompleteOptionType = FunctionOptionType | KeywordOptionType;
diff --git a/packages/editor-ui/src/plugins/i18n/index.ts b/packages/editor-ui/src/plugins/i18n/index.ts
index 524b8e9905e45f..956e0c960452a9 100644
--- a/packages/editor-ui/src/plugins/i18n/index.ts
+++ b/packages/editor-ui/src/plugins/i18n/index.ts
@@ -450,7 +450,7 @@ export class I18nClass {
 		toJSON: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.toJSON'),
 		toBSON: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.toBSON'),
 		toObject: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.toObject'),
-		toJsDate: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.toJsDate'),
+		toJSDate: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.toJsDate'),
 		diff: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.diff'),
 		diffNow: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.diffNow'),
 		until: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.until'),
@@ -462,6 +462,10 @@ export class I18nClass {
 		),
 		min: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.min'),
 		max: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.max'),
+		reconfigure: this.baseText('codeNodeEditor.completer.luxon.instanceMethods.reconfigure'),
+		resolvedLocaleOptions: this.baseText(
+			'codeNodeEditor.completer.luxon.instanceMethods.resolvedLocaleOptions',
+		),
 	};
 
 	luxonStatic: Record<string, string | undefined> = {
@@ -479,6 +483,21 @@ export class I18nClass {
 		fromSQL: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromSQL'),
 		invalid: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.invalid'),
 		isDateTime: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.isDateTime'),
+		expandFormat: this.baseText(
+			'codeNodeEditor.completer.luxon.dateTimeStaticMethods.expandFormat',
+		),
+		fromFormatExplain: this.baseText(
+			'codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromFormatExplain',
+		),
+		fromString: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromString'),
+		fromStringExplain: this.baseText(
+			'codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromStringExplain',
+		),
+		max: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.max'),
+		min: this.baseText('codeNodeEditor.completer.luxon.dateTimeStaticMethods.min'),
+		parseFormatForOpts: this.baseText(
+			'codeNodeEditor.completer.luxon.dateTimeStaticMethods.parseFormatForOpts',
+		),
 	};
 
 	autocompleteUIValues: Record<string, string | undefined> = {
diff --git a/packages/editor-ui/src/plugins/i18n/locales/en.json b/packages/editor-ui/src/plugins/i18n/locales/en.json
index bc172f28be9104..166cf93e4dec33 100644
--- a/packages/editor-ui/src/plugins/i18n/locales/en.json
+++ b/packages/editor-ui/src/plugins/i18n/locales/en.json
@@ -140,37 +140,44 @@
 	"codeNodeEditor.completer.globalObject.keys": "The object's keys",
 	"codeNodeEditor.completer.globalObject.values": "The object's values",
 	"codeNodeEditor.completer.json": "The item's JSON data. When in doubt, use this",
+	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.expandFormat": "Produce the the fully expanded format token for the locale Does NOT quote characters, so quoted tokens will not round trip correctly.",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromFormat": "Create a DateTime from an input string and format string.",
+	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromFormatExplain": "Explain how a string would be parsed by fromFormat().",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromHTTP": "Create a DateTime from an HTTP header date",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromISO": "Create a DateTime from an ISO 8601 string",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromJSDate": "Create a DateTime from a JavaScript Date object. Uses the default zone",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromMillis": "Create a DateTime from a number of milliseconds since the epoch (meaning since 1 January 1970 00:00:00 UTC). Uses the default zone",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromObject": "Create a DateTime from a JavaScript object with keys like 'year' and 'hour' with reasonable defaults",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromRFC2822": "Create a DateTime from an RFC 2822 string",
+	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromString": "Deprecated: use `fromFormat` instead.",
+	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromStringExplain": "Deprecated: use `fromFormatExplain` instead.",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromSQL": "Create a DateTime from a SQL date, time, or datetime",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.fromSeconds": "Create a DateTime from a number of seconds since the epoch (meaning since 1 January 1970 00:00:00 UTC). Uses the default zone",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.invalid": "Create an invalid DateTime.",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.isDateTime": "Check if an object is a DateTime. Works across context boundaries",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.local": "Create a local DateTime",
+	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.max": "Return the max of several date times.",
+	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.min": "Return the min of several date times.",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.now": "Create a DateTime for the current instant, in the system's time zone",
+	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.parseFormatForOpts": "Produce the the fully expanded format token for the locale Does NOT quote characters, so quoted tokens will not round trip correctly.",
 	"codeNodeEditor.completer.luxon.dateTimeStaticMethods.utc": "Create a DateTime in UTC",
 	"codeNodeEditor.completer.luxon.instanceMethods.day": "Get the day of the month (1-30ish).",
-	"codeNodeEditor.completer.luxon.instanceMethods.daysInMonth": "Returns the number of days in this DateTime's month",
-	"codeNodeEditor.completer.luxon.instanceMethods.daysInYear": "Returns the number of days in this DateTime's year",
+	"codeNodeEditor.completer.luxon.instanceMethods.daysInMonth": "Returns the number of days in this DateTime's month.",
+	"codeNodeEditor.completer.luxon.instanceMethods.daysInYear": "Returns the number of days in this DateTime's year.",
 	"codeNodeEditor.completer.luxon.instanceMethods.diff": "Return the difference between two DateTimes as a Duration.",
 	"codeNodeEditor.completer.luxon.instanceMethods.diffNow": "Return the difference between this DateTime and right now.",
-	"codeNodeEditor.completer.luxon.instanceMethods.endOf": "Set this DateTime to the end (meaning the last millisecond) of a unit of time",
-	"codeNodeEditor.completer.luxon.instanceMethods.equals": "Equality check",
+	"codeNodeEditor.completer.luxon.instanceMethods.endOf": "Set this DateTime to the end (meaning the last millisecond) of a unit of time.",
+	"codeNodeEditor.completer.luxon.instanceMethods.equals": "Equality check.",
 	"codeNodeEditor.completer.luxon.instanceMethods.hasSame": "Return whether this DateTime is in the same unit of time as another DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.hour": "Get the hour of the day (0-23).",
-	"codeNodeEditor.completer.luxon.instanceMethods.invalidExplanation": "Returns an explanation of why this DateTime became invalid, or null if the DateTime is valid",
-	"codeNodeEditor.completer.luxon.instanceMethods.invalidReason": "Returns an error code if this DateTime is invalid, or null if the DateTime is valid",
+	"codeNodeEditor.completer.luxon.instanceMethods.invalidExplanation": "Returns an explanation of why this DateTime became invalid, or null if the DateTime is valid.",
+	"codeNodeEditor.completer.luxon.instanceMethods.invalidReason": "Returns an error code if this DateTime is invalid, or null if the DateTime is valid.",
 	"codeNodeEditor.completer.luxon.instanceMethods.isInDST": "Get whether the DateTime is in a DST.",
-	"codeNodeEditor.completer.luxon.instanceMethods.isInLeapYear": "Returns true if this DateTime is in a leap year, false otherwise",
+	"codeNodeEditor.completer.luxon.instanceMethods.isInLeapYear": "Returns true if this DateTime is in a leap year, false otherwise.",
 	"codeNodeEditor.completer.luxon.instanceMethods.isOffsetFixed": "Get whether this zone's offset ever changes, as in a DST.",
 	"codeNodeEditor.completer.luxon.instanceMethods.isValid": "Returns whether the DateTime is valid. Invalid DateTimes occur when The DateTime was created from invalid calendar information, such as the 13th month or February 30. The DateTime was created by an operation on another invalid date.",
-	"codeNodeEditor.completer.luxon.instanceMethods.locale": "Get the locale of a DateTime, such 'en-GB'. The locale is used when formatting the DateTime",
-	"codeNodeEditor.completer.luxon.instanceMethods.max": "Return the max of several date times",
+	"codeNodeEditor.completer.luxon.instanceMethods.locale": "Get the locale of a DateTime, such 'en-GB'. The locale is used when formatting the DateTime.",
+	"codeNodeEditor.completer.luxon.instanceMethods.max": "Return the max of several date times.",
 	"codeNodeEditor.completer.luxon.instanceMethods.millisecond": "Get the millisecond of the second (0-999).",
 	"codeNodeEditor.completer.luxon.instanceMethods.min": "Return the min of several date times",
 	"codeNodeEditor.completer.luxon.instanceMethods.minus": "Subtract hours, minutes, seconds, or milliseconds increases the timestamp by the right number of milliseconds.",
@@ -178,15 +185,17 @@
 	"codeNodeEditor.completer.luxon.instanceMethods.month": "Get the month (1-12).",
 	"codeNodeEditor.completer.luxon.instanceMethods.monthLong": "Get the human readable long month name, such as 'October'.",
 	"codeNodeEditor.completer.luxon.instanceMethods.monthShort": "Get the human readable short month name, such as 'Oct'.",
-	"codeNodeEditor.completer.luxon.instanceMethods.numberingSystem": "Get the numbering system of a DateTime, such 'beng'. The numbering system is used when formatting the DateTime",
+	"codeNodeEditor.completer.luxon.instanceMethods.numberingSystem": "Get the numbering system of a DateTime, such 'beng'. The numbering system is used when formatting the DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.offset": "Get the UTC offset of this DateTime in minutes",
-	"codeNodeEditor.completer.luxon.instanceMethods.offsetNameLong": "Get the long human name for the zone\\'s current offset, for example \"Eastern Standard Time\" or \" Eastern Daylight Time\".",
-	"codeNodeEditor.completer.luxon.instanceMethods.offsetNameShort": "Get the short human name for the zone\\'s current offset, for example \"EST\" or \"EDT\".'",
-	"codeNodeEditor.completer.luxon.instanceMethods.offsetNumber": "Get the short human name for the zone\\'s current offset, for example \"EST\" or \"EDT\".'",
-	"codeNodeEditor.completer.luxon.instanceMethods.ordinal": "Get the ordinal (meaning the day of the year)",
-	"codeNodeEditor.completer.luxon.instanceMethods.outputCalendar": "Get the output calendar of a DateTime, such 'islamic'. The output calendar is used when formatting the DateTime",
+	"codeNodeEditor.completer.luxon.instanceMethods.offsetNameLong": "Get the long human name for the zone's current offset, for example \"Eastern Standard Time\" or \"Eastern Daylight Time\".",
+	"codeNodeEditor.completer.luxon.instanceMethods.offsetNameShort": "Get the short human name for the zone's current offset, for example \"EST\" or \"EDT\".'",
+	"codeNodeEditor.completer.luxon.instanceMethods.offsetNumber": "Get the short human name for the zone's current offset, for example \"EST\" or \"EDT\".'",
+	"codeNodeEditor.completer.luxon.instanceMethods.ordinal": "Get the ordinal (meaning the day of the year).",
+	"codeNodeEditor.completer.luxon.instanceMethods.outputCalendar": "Get the output calendar of a DateTime, such 'islamic'. The output calendar is used when formatting the DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.plus": "Add hours, minutes, seconds, or milliseconds increases the timestamp by the right number of milliseconds.",
-	"codeNodeEditor.completer.luxon.instanceMethods.quarter": "Get the quarter",
+	"codeNodeEditor.completer.luxon.instanceMethods.quarter": "Get the quarter.",
+	"codeNodeEditor.completer.luxon.instanceMethods.reconfigure": "'Set' the locale, numberingSystem, or outputCalendar. Returns a newly-constructed DateTime.",
+	"codeNodeEditor.completer.luxon.instanceMethods.resolvedLocaleOptions": "Returns the resolved Intl options for this DateTime. This is useful in understanding the behavior of formatting methods.",
 	"codeNodeEditor.completer.luxon.instanceMethods.second": "Get the second of the minute (0-59).",
 	"codeNodeEditor.completer.luxon.instanceMethods.set": "Set the values of specified units. Returns a newly-constructed DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.setLocale": "Set the locale. Returns a newly-constructed DateTime.",
@@ -195,10 +204,10 @@
 	"codeNodeEditor.completer.luxon.instanceMethods.toBSON": "Returns a BSON serializable equivalent to this DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toFormat": "Returns a string representation of this DateTime formatted according to the specified format string.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toHTTP": "Returns a string representation of this DateTime appropriate for use in HTTP headers.",
-	"codeNodeEditor.completer.luxon.instanceMethods.toISO": "Returns an ISO 8601-compliant string representation of this DateTime",
-	"codeNodeEditor.completer.luxon.instanceMethods.toISODate": "Returns an ISO 8601-compliant string representation of this DateTime's date component",
-	"codeNodeEditor.completer.luxon.instanceMethods.toISOTime": "Returns an ISO 8601-compliant string representation of this DateTime's time component",
-	"codeNodeEditor.completer.luxon.instanceMethods.toISOWeekDate": "Returns an ISO 8601-compliant string representation of this DateTime's week date",
+	"codeNodeEditor.completer.luxon.instanceMethods.toISO": "Returns an ISO 8601-compliant string representation of this DateTime.",
+	"codeNodeEditor.completer.luxon.instanceMethods.toISODate": "Returns an ISO 8601-compliant string representation of this DateTime's date component.",
+	"codeNodeEditor.completer.luxon.instanceMethods.toISOTime": "Returns an ISO 8601-compliant string representation of this DateTime's time component.",
+	"codeNodeEditor.completer.luxon.instanceMethods.toISOWeekDate": "Returns an ISO 8601-compliant string representation of this DateTime's week date.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toJSON": "Returns an ISO 8601 representation of this DateTime appropriate for use in JSON.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toJsDate": "Returns a JavaScript Date equivalent to this DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toLocal": "Set the DateTime's zone to the host's local zone. Returns a newly-constructed DateTime.",
@@ -206,25 +215,25 @@
 	"codeNodeEditor.completer.luxon.instanceMethods.toLocaleString": "Returns a localized string representing this date. Accepts the same options as the Intl.DateTimeFormat constructor and any presets defined by Luxon.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toMillis": "Returns the epoch milliseconds of this DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toObject": "Returns a JavaScript object with this DateTime's year, month, day, and so on.",
-	"codeNodeEditor.completer.luxon.instanceMethods.toRFC2822": "Returns an RFC 2822-compatible string representation of this DateTime, always in UTC",
+	"codeNodeEditor.completer.luxon.instanceMethods.toRFC2822": "Returns an RFC 2822-compatible string representation of this DateTime, always in UTC.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toRelative": "Returns a string representation of a this time relative to now, such as 'in two days'.",
-	"codeNodeEditor.completer.luxon.instanceMethods.toRelativeCalendar": "Returns a string representation of this date relative to today, such as '\"'yesterday' or 'next month'",
+	"codeNodeEditor.completer.luxon.instanceMethods.toRelativeCalendar": "Returns a string representation of this date relative to today, such as '\"'yesterday' or 'next month'.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toSQL": "Returns a string representation of this DateTime appropriate for use in SQL DateTime.",
-	"codeNodeEditor.completer.luxon.instanceMethods.toSQLDate": "Returns a string representation of this DateTime appropriate for use in SQL Date",
-	"codeNodeEditor.completer.luxon.instanceMethods.toSQLTime": "Returns a string representation of this DateTime appropriate for use in SQL Time",
+	"codeNodeEditor.completer.luxon.instanceMethods.toSQLDate": "Returns a string representation of this DateTime appropriate for use in SQL Date.",
+	"codeNodeEditor.completer.luxon.instanceMethods.toSQLTime": "Returns a string representation of this DateTime appropriate for use in SQL Time.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toSeconds": "Returns the epoch seconds of this DateTime.",
-	"codeNodeEditor.completer.luxon.instanceMethods.toString": "Returns a string representation of this DateTime appropriate for debugging",
+	"codeNodeEditor.completer.luxon.instanceMethods.toString": "Returns a string representation of this DateTime appropriate for debugging.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toUTC": "Set the DateTime's zone to UTC. Returns a newly-constructed DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.toUnixInteger": "Returns the epoch seconds (as a whole number) of this DateTime.",
-	"codeNodeEditor.completer.luxon.instanceMethods.until": "Return an Interval spanning between this DateTime and another DateTime",
+	"codeNodeEditor.completer.luxon.instanceMethods.until": "Return an Interval spanning between this DateTime and another DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.valueOf": "Returns the epoch milliseconds of this DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.weekNumber": "Get the week number of the week year (1-52ish).",
-	"codeNodeEditor.completer.luxon.instanceMethods.weekYear": "Get the week year",
+	"codeNodeEditor.completer.luxon.instanceMethods.weekYear": "Get the week year.",
 	"codeNodeEditor.completer.luxon.instanceMethods.weekday": "Get the day of the week. 1 is Monday and 7 is Sunday.",
 	"codeNodeEditor.completer.luxon.instanceMethods.weekdayLong": "Get the human readable long weekday, such as 'Monday'.",
 	"codeNodeEditor.completer.luxon.instanceMethods.weekdayShort": "Get the human readable short weekday, such as 'Mon'.",
-	"codeNodeEditor.completer.luxon.instanceMethods.weeksInWeekYear": "Returns the number of weeks in this DateTime's year",
-	"codeNodeEditor.completer.luxon.instanceMethods.year": "Get the year",
+	"codeNodeEditor.completer.luxon.instanceMethods.weeksInWeekYear": "Returns the number of weeks in this DateTime's year.",
+	"codeNodeEditor.completer.luxon.instanceMethods.year": "Get the year.",
 	"codeNodeEditor.completer.luxon.instanceMethods.zone": "Get the time zone associated with this DateTime.",
 	"codeNodeEditor.completer.luxon.instanceMethods.zoneName": "Get the name of the time zone.",
 	"codeNodeEditor.completer.selector.all": "@:_reusableBaseText.codeNodeEditor.completer.all",
diff --git a/packages/editor-ui/src/styles/autocomplete-theme.scss b/packages/editor-ui/src/styles/autocomplete-theme.scss
index 489fb78bfa20b1..8b65338ac4f9d7 100644
--- a/packages/editor-ui/src/styles/autocomplete-theme.scss
+++ b/packages/editor-ui/src/styles/autocomplete-theme.scss
@@ -1,3 +1,18 @@
+.cm-tooltip-autocomplete:after {
+	display: block;
+	content: 'n8n supports all JavaScript functions, including those not listed.';
+	padding: var(--spacing-2xs) var(--spacing-s);
+	border-top: 1px solid var(--color-foreground-dark);
+}
+
+// Custom autocomplete item type icons
+// 1. Native and n8n extension functions:
+.cm-completionIcon-extension-function, .cm-completionIcon-native-function {
+	&::after {
+		content: 'ƒ';
+	}
+}
+
 .cm-tooltip-autocomplete {
 	background-color: var(--color-background-xlight) !important;
 
diff --git a/packages/workflow/src/Extensions/ArrayExtensions.ts b/packages/workflow/src/Extensions/ArrayExtensions.ts
index 52f700841b9478..c47af2443d1500 100644
--- a/packages/workflow/src/Extensions/ArrayExtensions.ts
+++ b/packages/workflow/src/Extensions/ArrayExtensions.ts
@@ -323,120 +323,193 @@ function intersection(value: unknown[], extraArgs: unknown[][]): unknown[] {
 
 average.doc = {
 	name: 'average',
-	description: 'Returns the mean average of all values in the array',
+	description: 'Returns the mean average of all values in the array.',
 	returnType: 'number',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-average',
 };
 
 compact.doc = {
 	name: 'compact',
-	description: 'Removes all empty values from the array',
-	returnType: 'array',
+	description: 'Removes all empty values from the array.',
+	returnType: 'Array',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-compact',
 };
 
 isEmpty.doc = {
 	name: 'isEmpty',
-	description: 'Checks if the array doesn’t have any elements',
+	description: 'Checks if the array doesn’t have any elements.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-isEmpty',
 };
 
 isNotEmpty.doc = {
 	name: 'isNotEmpty',
-	description: 'Checks if the array has elements',
+	description: 'Checks if the array has elements.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-isNotEmpty',
 };
 
 first.doc = {
 	name: 'first',
-	description: 'Returns the first element of the array',
-	returnType: 'array item',
+	description: 'Returns the first element of the array.',
+	returnType: 'Element',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-first',
 };
 
 last.doc = {
 	name: 'last',
-	description: 'Returns the last element of the array',
-	returnType: 'array item',
+	description: 'Returns the last element of the array.',
+	returnType: 'Element',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-last',
 };
 
 max.doc = {
 	name: 'max',
-	description: 'Gets the maximum value from a number-only array',
+	description: 'Gets the maximum value from a number-only array.',
 	returnType: 'number',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-max',
 };
 
 min.doc = {
 	name: 'min',
-	description: 'Gets the minimum value from a number-only array',
+	description: 'Gets the minimum value from a number-only array.',
 	returnType: 'number',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-min',
 };
 
 randomItem.doc = {
 	name: 'randomItem',
-	description: 'Returns a random element from an array',
-	returnType: 'number',
+	description: 'Returns a random element from an array.',
+	returnType: 'Element',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-randomItem',
 };
 
 sum.doc = {
 	name: 'sum',
-	description: 'Returns the total sum all the values in an array of parsable numbers',
+	description: 'Returns the total sum all the values in an array of parsable numbers.',
 	returnType: 'number',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-sum',
 };
 
-// @TODO_NEXT_PHASE: Surface extensions below which take args
-
 chunk.doc = {
 	name: 'chunk',
-	returnType: 'array',
+	description: 'Splits arrays into chunks with a length of `size`.',
+	returnType: 'Array',
+	args: [{ name: 'size', type: 'number' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-chunk',
 };
 
 difference.doc = {
 	name: 'difference',
-	returnType: 'array',
+	description:
+		'Compares two arrays. Returns all elements in the base array that aren’t present in `arr`.',
+	returnType: 'Array',
+	args: [{ name: 'arr', type: 'Array' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-difference',
 };
 
 intersection.doc = {
 	name: 'intersection',
-	returnType: 'array',
+	description:
+		'Compares two arrays. Returns all elements in the base array that are present in `arr`.',
+	returnType: 'Array',
+	args: [{ name: 'arr', type: 'Array' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-intersection',
 };
 
 merge.doc = {
 	name: 'merge',
+	description:
+		'Merges two Object-arrays into one array by merging the key-value pairs of each element.',
 	returnType: 'array',
+	args: [{ name: 'arr', type: 'Array' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-merge',
 };
 
 pluck.doc = {
 	name: 'pluck',
-	returnType: 'array',
+	description: 'Returns an array of Objects where the key is equal the given `fieldName`s.',
+	returnType: 'Array',
+	args: [
+		{ name: 'fieldName1', type: 'string' },
+		{ name: 'fieldName1?', type: 'string' },
+		{ name: '...' },
+		{ name: 'fieldNameN?', type: 'string' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-pluck',
 };
 
 renameKeys.doc = {
 	name: 'renameKeys',
-	returnType: 'array',
+	description: 'Renames all matching keys in the array.',
+	returnType: 'Array',
+	args: [
+		{ name: 'from1', type: 'string' },
+		{ name: 'to1', type: 'string' },
+		{ name: 'from2?', type: 'string' },
+		{ name: 'to2?', type: 'string' },
+		{ name: '...' },
+		{ name: 'fromN?', type: 'string' },
+		{ name: 'toN?', type: 'string' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-renameKeys',
 };
 
 smartJoin.doc = {
 	name: 'smartJoin',
-	returnType: 'array',
+	description:
+		'Operates on an array of objects where each object contains key-value pairs. Creates a new object containing key-value pairs, where the key is the value of the first pair, and the value is the value of the second pair. Removes non-matching and empty values and trims any whitespace before joining.',
+	returnType: 'Array',
+	args: [
+		{ name: 'keyField', type: 'string' },
+		{ name: 'nameField', type: 'string' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-smartJoin',
 };
 
 union.doc = {
 	name: 'union',
-	returnType: 'array',
+	description: 'Concatenates two arrays and then removes duplicates.',
+	returnType: 'Array',
+	args: [{ name: 'arr', type: 'Array' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-union',
 };
 
 unique.doc = {
 	name: 'unique',
-	returnType: 'array item',
+	description: 'Remove duplicates from an array. ',
+	returnType: 'Element',
 	aliases: ['removeDuplicates'],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/arrays/#array-unique',
 };
 
 export const arrayExtensions: ExtensionMap = {
 	typeName: 'Array',
 	functions: {
 		removeDuplicates: unique,
+		unique,
 		first,
 		last,
 		pluck,
-		unique,
 		randomItem,
 		sum,
 		min,
diff --git a/packages/workflow/src/Extensions/DateExtensions.ts b/packages/workflow/src/Extensions/DateExtensions.ts
index 686f04e324e899..7c00d5071c8316 100644
--- a/packages/workflow/src/Extensions/DateExtensions.ts
+++ b/packages/workflow/src/Extensions/DateExtensions.ts
@@ -206,56 +206,100 @@ function plus(date: Date | DateTime, extraArgs: unknown[]): Date | DateTime {
 endOfMonth.doc = {
 	name: 'endOfMonth',
 	returnType: 'Date',
-	description: 'Transforms a date to the last possible moment that lies within the month',
+	description: 'Transforms a date to the last possible moment that lies within the month.',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-endOfMonth',
 };
 
 isDst.doc = {
 	name: 'isDst',
 	returnType: 'boolean',
-	description: 'Checks if a Date is within Daylight Savings Time',
+	description: 'Checks if a Date is within Daylight Savings Time.',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isDst',
 };
 
 isWeekend.doc = {
 	name: 'isWeekend',
 	returnType: 'boolean',
-	description: 'Checks if the Date falls on a Saturday or Sunday',
+	description: 'Checks if the Date falls on a Saturday or Sunday.',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isWeekend',
 };
 
-// @TODO_NEXT_PHASE: Surface extensions below which take args
-
 beginningOf.doc = {
 	name: 'beginningOf',
+	description: 'Transform a Date to the start of the given time period. Default unit is `week`.',
 	returnType: 'Date',
+	args: [{ name: 'unit?', type: 'DurationUnit' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-beginningOf',
 };
 
 extract.doc = {
 	name: 'extract',
+	description: 'Extracts the part defined in `datePart` from a Date. Default unit is `week`.',
 	returnType: 'number',
+	args: [{ name: 'datePart?', type: 'DurationUnit' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-extract',
 };
 
 format.doc = {
 	name: 'format',
-	returnType: '(?)',
+	description: 'Formats a Date in the given structure.',
+	returnType: 'string',
+	args: [{ name: 'fmt', type: 'TimeFormat' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-format',
 };
 
 isBetween.doc = {
 	name: 'isBetween',
+	description: 'Checks if a Date is between two given dates.',
 	returnType: 'boolean',
+	args: [
+		{ name: 'date1', type: 'Date|string' },
+		{ name: 'date2', type: 'Date|string' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isBetween',
 };
 
 isInLast.doc = {
 	name: 'isInLast',
+	description: 'Checks if a Date is within a given time period. Default unit is `minute`.',
 	returnType: 'boolean',
+	args: [
+		{ name: 'n', type: 'number' },
+		{ name: 'unit?', type: 'DurationUnit' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-isInLast',
 };
 
 minus.doc = {
 	name: 'minus',
+	description: 'Subtracts a given time period from a Date. Default unit is `minute`.',
 	returnType: 'Date',
+	args: [
+		{ name: 'n', type: 'number' },
+		{ name: 'unit?', type: 'DurationUnit' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-minus',
 };
 
 plus.doc = {
 	name: 'plus',
+	description: 'Adds a given time period to a Date. Default unit is `minute`.',
 	returnType: 'Date',
+	args: [
+		{ name: 'n', type: 'number' },
+		{ name: 'unit?', type: 'DurationUnit' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/dates/#date-plus',
 };
 
 export const dateExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/Extensions/NumberExtensions.ts b/packages/workflow/src/Extensions/NumberExtensions.ts
index ab61c857fef4c3..50eb182f668eb2 100644
--- a/packages/workflow/src/Extensions/NumberExtensions.ts
+++ b/packages/workflow/src/Extensions/NumberExtensions.ts
@@ -42,38 +42,57 @@ function round(value: number, extraArgs: number[]) {
 
 ceil.doc = {
 	name: 'ceil',
-	description: 'Rounds up a number to a whole number',
+	description: 'Rounds up a number to a whole number.',
 	returnType: 'number',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-ceil',
 };
 
 floor.doc = {
 	name: 'floor',
-	description: 'Rounds down a number to a whole number',
+	description: 'Rounds down a number to a whole number.',
 	returnType: 'number',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-floor',
 };
 
 isEven.doc = {
 	name: 'isEven',
 	description: 'Returns true if the number is even. Only works on whole numbers.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-isEven',
 };
 
 isOdd.doc = {
 	name: 'isOdd',
 	description: 'Returns true if the number is odd. Only works on whole numbers.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-isOdd',
 };
 
-// @TODO_NEXT_PHASE: Surface extensions below which take args
-
 format.doc = {
 	name: 'format',
+	description:
+		'Returns a formatted string of a number based on the given `LanguageCode` and `FormatOptions`. When no arguments are given, transforms the number in a like format `1.234`.',
 	returnType: 'string',
+	args: [
+		{ name: 'locales?', type: 'LanguageCode' },
+		{ name: 'options?', type: 'FormatOptions' },
+	],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-format',
 };
 
 round.doc = {
 	name: 'round',
+	description:
+		'Returns the value of a number rounded to the nearest whole number. Defaults to 0 decimal places if no argument is given.',
 	returnType: 'number',
+	args: [{ name: 'decimalPlaces?', type: 'number' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/numbers/#number-round',
 };
 
 export const numberExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/Extensions/ObjectExtensions.ts b/packages/workflow/src/Extensions/ObjectExtensions.ts
index 22523a11817546..e1556d6e693aa0 100644
--- a/packages/workflow/src/Extensions/ObjectExtensions.ts
+++ b/packages/workflow/src/Extensions/ObjectExtensions.ts
@@ -82,48 +82,71 @@ export function urlEncode(value: object) {
 
 isEmpty.doc = {
 	name: 'isEmpty',
-	description: 'Checks if the Object has no key-value pairs',
+	description: 'Checks if the Object has no key-value pairs.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-isEmpty',
 };
 
 isNotEmpty.doc = {
 	name: 'isNotEmpty',
-	description: 'Checks if the Object has key-value pairs',
+	description: 'Checks if the Object has key-value pairs.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-isNotEmpty',
 };
 
 compact.doc = {
 	name: 'compact',
-	description: 'Removes empty values from an Object',
+	description: 'Removes empty values from an Object.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-compact',
 };
 
 urlEncode.doc = {
 	name: 'urlEncode',
 	description: 'Transforms an Object into a URL parameter list. Only top-level keys are supported.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-urlEncode',
 };
 
-// @TODO_NEXT_PHASE: Surface extensions below which take args
-
 hasField.doc = {
 	name: 'hasField',
+	description: 'Checks if the Object has a given field. Only top-level keys are supported.',
 	returnType: 'boolean',
+	args: [{ name: 'fieldName', type: 'string' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-hasField',
 };
 
 removeField.doc = {
 	name: 'removeField',
+	description: 'Removes a given field from the Object. Only top-level fields are supported.',
 	returnType: 'object',
+	args: [{ name: 'key', type: 'string' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-removeField',
 };
 
 removeFieldsContaining.doc = {
 	name: 'removeFieldsContaining',
+	description:
+		'Removes fields with a given value from the Object. Only top-level values are supported.',
 	returnType: 'object',
+	args: [{ name: 'value', type: 'string' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-removeFieldsContaining',
 };
 
 keepFieldsContaining.doc = {
 	name: 'keepFieldsContaining',
+	description: 'Removes fields that do not match the given value from the Object.',
 	returnType: 'object',
+	args: [{ name: 'value', type: 'string' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/objects/#object-keepFieldsContaining',
 };
 
 export const objectExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/Extensions/StringExtensions.ts b/packages/workflow/src/Extensions/StringExtensions.ts
index f7955de83db481..ea0acea8da82a9 100644
--- a/packages/workflow/src/Extensions/StringExtensions.ts
+++ b/packages/workflow/src/Extensions/StringExtensions.ts
@@ -288,52 +288,78 @@ function extractUrl(value: string) {
 
 removeMarkdown.doc = {
 	name: 'removeMarkdown',
-	description: 'Removes Markdown formatting from a string',
+	description: 'Removes Markdown formatting from a string.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-removeMarkdown',
 };
 
 removeTags.doc = {
 	name: 'removeTags',
-	description: 'Removes tags, such as HTML or XML, from a string',
+	description: 'Removes tags, such as HTML or XML, from a string.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-removeTags',
 };
 
 toDate.doc = {
 	name: 'toDate',
-	description: 'Converts a string to a date',
+	description: 'Converts a string to a date.',
 	returnType: 'Date',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toDate',
 };
 
 toFloat.doc = {
 	name: 'toFloat',
-	description: 'Converts a string to a decimal number',
+	description: 'Converts a string to a decimal number.',
 	returnType: 'number',
 	aliases: ['toDecimalNumber'],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toDecimalNumber',
 };
 
 toInt.doc = {
 	name: 'toInt',
-	description: 'Converts a string to an integer',
+	description: 'Converts a string to an integer.',
 	returnType: 'number',
+	args: [{ name: 'radix?', type: 'number' }],
 	aliases: ['toWholeNumber'],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toInt',
 };
 
 toSentenceCase.doc = {
 	name: 'toSentenceCase',
-	description: 'Formats a string to sentence case. Example: "This is a sentence"',
+	description: 'Formats a string to sentence case. Example: "This is a sentence".',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toSentenceCase',
 };
 
 toSnakeCase.doc = {
 	name: 'toSnakeCase',
-	description: 'Formats a string to snake case. Example: "this_is_snake_case"',
+	description: 'Formats a string to snake case. Example: "this_is_snake_case".',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toSnakeCase',
 };
 
 toTitleCase.doc = {
 	name: 'toTitleCase',
-	description: 'Formats a string to title case. Example: "This Is a Title"',
+	description: 'Formats a string to title case. Example: "This Is a Title".',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-toTitleCase',
+};
+
+urlEncode.doc = {
+	name: 'urlEncode',
+	description: 'Encodes a string to be used/included in a URL.',
+	args: [{ name: 'entireString?', type: 'boolean' }],
+	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-urlEncode',
 };
 
 urlDecode.doc = {
@@ -341,60 +367,79 @@ urlDecode.doc = {
 	description:
 		'Decodes a URL-encoded string. It decodes any percent-encoded characters in the input string, and replaces them with their original characters.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-urlDecode',
 };
 
 replaceSpecialChars.doc = {
 	name: 'replaceSpecialChars',
-	description: 'Replaces non-ASCII characters in a string with an ASCII representation',
+	description: 'Replaces non-ASCII characters in a string with an ASCII representation.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-replaceSpecialChars',
 };
 
 length.doc = {
 	name: 'length',
-	description: 'Returns the character count of a string',
+	description: 'Returns the character count of a string.',
 	returnType: 'number',
+	docURL: 'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings',
 };
 
 isDomain.doc = {
 	name: 'isDomain',
-	description: 'Checks if a string is a domain',
+	description: 'Checks if a string is a domain.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isDomain',
 };
 
 isEmail.doc = {
 	name: 'isEmail',
-	description: 'Checks if a string is an email',
+	description: 'Checks if a string is an email.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isEmail',
 };
 
 isNumeric.doc = {
 	name: 'isEmail',
-	description: 'Checks if a string only contains digits',
+	description: 'Checks if a string only contains digits.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isNumeric',
 };
 
 isUrl.doc = {
 	name: 'isUrl',
-	description: 'Checks if a string is a valid URL',
+	description: 'Checks if a string is a valid URL.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isUrl',
 };
 
 isEmpty.doc = {
 	name: 'isEmpty',
-	description: 'Checks if a string is empty',
+	description: 'Checks if a string is empty.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isEmpty',
 };
 
 isNotEmpty.doc = {
 	name: 'isNotEmpty',
-	description: 'Checks if a string has content',
+	description: 'Checks if a string has content.',
 	returnType: 'boolean',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-isNotEmpty',
 };
 
 extractEmail.doc = {
 	name: 'extractEmail',
 	description: 'Extracts an email from a string. Returns undefined if none is found.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-extractEmail',
 };
 
 extractDomain.doc = {
@@ -402,29 +447,34 @@ extractDomain.doc = {
 	description:
 		'Extracts a domain from a string containing a valid URL. Returns undefined if none is found.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-extractDomain',
 };
 
 extractUrl.doc = {
 	name: 'extractUrl',
 	description: 'Extracts a URL from a string. Returns undefined if none is found.',
 	returnType: 'string',
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-extractUrl',
 };
 
-// @TODO_NEXT_PHASE: Surface extensions below which take args
-
 hash.doc = {
 	name: 'hash',
+	description: 'Returns a string hashed with the given algorithm. Default algorithm is `md5`.',
 	returnType: 'string',
-};
-
-urlEncode.doc = {
-	name: 'urlEncode',
-	returnType: 'string',
+	args: [{ name: 'algo?', type: 'Algorithm' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-hash',
 };
 
 quote.doc = {
 	name: 'quote',
+	description: 'Returns a string wrapped in the quotation marks. Default quotation is `"`.',
 	returnType: 'string',
+	args: [{ name: 'mark?', type: 'string' }],
+	docURL:
+		'https://docs.n8n.io/code-examples/expressions/data-transformation-functions/strings/#string-quote',
 };
 
 export const stringExtensions: ExtensionMap = {
diff --git a/packages/workflow/src/NativeMethods/Array.methods.ts b/packages/workflow/src/NativeMethods/Array.methods.ts
index 7b9017040844d4..11687d6d62d1b0 100644
--- a/packages/workflow/src/NativeMethods/Array.methods.ts
+++ b/packages/workflow/src/NativeMethods/Array.methods.ts
@@ -116,7 +116,7 @@ export const arrayMethods: NativeDoc = {
 					'Returns a string that concatenates all of the elements in an array, separated by `separator`, which defaults to comma.',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/join',
-				returnType: 'Array',
+				returnType: 'string',
 				args: [{ name: 'separator?', type: 'string' }],
 			},
 		},
diff --git a/packages/workflow/src/NativeMethods/String.methods.ts b/packages/workflow/src/NativeMethods/String.methods.ts
index 7eca69b3dde78a..39fde491b3af23 100644
--- a/packages/workflow/src/NativeMethods/String.methods.ts
+++ b/packages/workflow/src/NativeMethods/String.methods.ts
@@ -36,7 +36,7 @@ export const stringMethods: NativeDoc = {
 		indexOf: {
 			doc: {
 				name: 'indexOf',
-				description: 'Returns the index of the first occurrence of `searchString`',
+				description: 'Returns the index of the first occurrence of `searchString`.',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/indexOf',
 				returnType: 'number',
@@ -49,7 +49,7 @@ export const stringMethods: NativeDoc = {
 		lastIndexOf: {
 			doc: {
 				name: 'lastIndexOf',
-				description: 'Returns the index of the last occurrence of `searchString`',
+				description: 'Returns the index of the last occurrence of `searchString`.',
 				docURL:
 					'https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/lastIndexOf',
 				returnType: 'number',

From 20c49195131399aa6ab0c6938eebb5e2733c6710 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 28 Feb 2023 13:44:37 +0300
Subject: [PATCH 301/358] feat: Add events to enable onboarding checklist
 (#5536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat: Add new event hooks

* fix: update event

* feat: Add more functionality for webhooks

* ⚡ Not sending onboarding checklist event from templates page

* 🔥 Removing quotes added by mistake

* ⚡ Added rest of events needed for onboarding checklist

* 💄 Hiding appcues checklist inside iframes

* 💄 Updating appcues selector

* fix: remove unnessary fix

* fix: fix schedule node

* refactor: bake events into segment store

* refactor: rename store

* refactor: use node keys

* refactor: remove unnessary

* chore: clean up store

* refactor: add key for event

* fix: allow tracking on template pages

* chore: remove comment

* fix: buidl

* refactor: block event if in iframe

* fix: fix tracking nodes

* refactor: track experiments once

* fix: ensure tracking works

* chore: remove comment

* fix: lint

* fix: lint

---------

Co-authored-by: Milorad Filipovic <milorad@n8n.io>
---
 packages/editor-ui/src/Interface.ts           |   4 +
 .../src/components/ParameterInputFull.vue     |   4 +-
 .../editor-ui/src/mixins/pushConnection.ts    |   5 +
 packages/editor-ui/src/stores/nodeTypes.ts    |   5 +
 packages/editor-ui/src/stores/posthog.ts      |  70 ++++-----
 packages/editor-ui/src/stores/segment.ts      | 133 ++++++++++++++++++
 packages/editor-ui/src/stores/users.ts        |  10 +-
 packages/editor-ui/src/views/NodeView.vue     |   8 +-
 .../editor-ui/src/views/WorkflowsView.vue     |   7 +-
 9 files changed, 192 insertions(+), 54 deletions(-)
 create mode 100644 packages/editor-ui/src/stores/segment.ts

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 58a38d38684919..d799e82fddd26c 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -32,6 +32,7 @@ import {
 	IAbstractEventMessage,
 	FeatureFlags,
 	ExecutionStatus,
+	ITelemetryTrackProperties,
 } from 'n8n-workflow';
 import { SignInType } from './constants';
 import { FAKE_DOOR_FEATURES, TRIGGER_NODE_FILTER, REGULAR_NODE_FILTER } from './constants';
@@ -67,6 +68,9 @@ declare global {
 			onFeatureFlags?(callback: (keys: string[], map: FeatureFlags) => void): void;
 			reloadFeatureFlags?(): void;
 		};
+		analytics?: {
+			track(event: string, proeprties?: ITelemetryTrackProperties): void;
+		};
 	}
 }
 
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 7bb4d22f4a0ea7..d6d8e809bd7466 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -89,6 +89,7 @@ import { INodeParameters, INodeProperties, INodePropertyMode, IParameterLabel }
 import { BaseTextKey } from '@/plugins/i18n';
 import { mapStores } from 'pinia';
 import { useNDVStore } from '@/stores/ndv';
+import { useSegment } from '@/stores/segment';
 import { externalHooks } from '@/mixins/externalHooks';
 
 export default mixins(showMessage, externalHooks).extend({
@@ -328,7 +329,8 @@ export default mixins(showMessage, externalHooks).extend({
 						success: true,
 					});
 
-					this.$externalHooks().run('parameterInputFull.mappedData');
+					const segment = useSegment();
+					segment.track(segment.EVENTS.MAPPED_DATA);
 				}
 				this.forceShowExpression = false;
 			}, 200);
diff --git a/packages/editor-ui/src/mixins/pushConnection.ts b/packages/editor-ui/src/mixins/pushConnection.ts
index 4511e025ff1e7f..d9478184bba795 100644
--- a/packages/editor-ui/src/mixins/pushConnection.ts
+++ b/packages/editor-ui/src/mixins/pushConnection.ts
@@ -33,6 +33,7 @@ import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useCredentialsStore } from '@/stores/credentials';
 import { useSettingsStore } from '@/stores/settings';
 import { parse } from 'flatted';
+import { useSegment } from '@/stores/segment';
 
 export const pushConnection = mixins(
 	externalHooks,
@@ -58,6 +59,7 @@ export const pushConnection = mixins(
 			useUIStore,
 			useWorkflowsStore,
 			useSettingsStore,
+			useSegment,
 		),
 		sessionId(): string {
 			return this.rootStore.sessionId;
@@ -515,6 +517,9 @@ export const pushConnection = mixins(
 					runDataExecutedStartData: runDataExecuted.data.startData,
 					resultDataError: runDataExecuted.data.resultData.error,
 				});
+				if (!runDataExecuted.data.resultData.error) {
+					this.segmentStore.trackSuccessfulWorkflowExecution(runDataExecuted);
+				}
 			} else if (receivedData.type === 'executionStarted') {
 				const pushData = receivedData.data;
 
diff --git a/packages/editor-ui/src/stores/nodeTypes.ts b/packages/editor-ui/src/stores/nodeTypes.ts
index e4ad1b3d632c84..d8d63e13d1c98b 100644
--- a/packages/editor-ui/src/stores/nodeTypes.ts
+++ b/packages/editor-ui/src/stores/nodeTypes.ts
@@ -80,6 +80,11 @@ export const useNodeTypesStore = defineStore(STORES.NODE_TYPES, {
 				return !!(nodeType && nodeType.group.includes('trigger'));
 			};
 		},
+		isCoreNodeType() {
+			return (nodeType: INodeTypeDescription) => {
+				return nodeType.codex?.categories?.includes('Core Nodes');
+			};
+		},
 		visibleNodeTypes(): INodeTypeDescription[] {
 			return this.allLatestNodeTypes.filter((nodeType: INodeTypeDescription) => !nodeType.hidden);
 		},
diff --git a/packages/editor-ui/src/stores/posthog.ts b/packages/editor-ui/src/stores/posthog.ts
index 0523a76c44a3b3..64be6e71572e55 100644
--- a/packages/editor-ui/src/stores/posthog.ts
+++ b/packages/editor-ui/src/stores/posthog.ts
@@ -2,21 +2,25 @@ import { ref, Ref, watch } from 'vue';
 import { defineStore } from 'pinia';
 import { useUsersStore } from '@/stores/users';
 import { useRootStore } from '@/stores/n8nRootStore';
-import { useSettingsStore } from './settings';
+import { useSettingsStore } from '@/stores/settings';
 import { FeatureFlags } from 'n8n-workflow';
-import { EXPERIMENTS_TO_TRACK } from '@/constants';
+import { EXPERIMENTS_TO_TRACK, ONBOARDING_EXPERIMENT } from '@/constants';
 import { useTelemetryStore } from './telemetry';
-import { runExternalHook } from '@/mixins/externalHooks';
-import { useWebhooksStore } from './webhooks';
+import { useSegment } from './segment';
+import { debounce } from 'lodash-es';
 
-export const usePostHogStore = defineStore('posthog', () => {
+const EVENTS = {
+	IS_PART_OF_EXPERIMENT: 'User is part of experiment',
+};
+
+export const usePostHog = defineStore('posthog', () => {
 	const usersStore = useUsersStore();
 	const settingsStore = useSettingsStore();
 	const telemetryStore = useTelemetryStore();
 	const rootStore = useRootStore();
+	const segmentStore = useSegment();
 
 	const featureFlags: Ref<FeatureFlags | null> = ref(null);
-	const initialized: Ref<boolean> = ref(false);
 	const trackedDemoExp: Ref<FeatureFlags> = ref({});
 
 	const reset = () => {
@@ -72,54 +76,42 @@ export const usePostHogStore = defineStore('posthog', () => {
 			debug: config.debug,
 		};
 
-		if (evaluatedFeatureFlags) {
+		window.posthog?.init(config.apiKey, options);
+		identify();
+
+		if (evaluatedFeatureFlags && Object.keys(evaluatedFeatureFlags).length) {
 			featureFlags.value = evaluatedFeatureFlags;
 			options.bootstrap = {
 				distinctId,
 				featureFlags: evaluatedFeatureFlags,
 			};
+			trackExperiments(evaluatedFeatureFlags);
+		} else {
+			// depend on client side evaluation if serverside evaluation fails
+			window.posthog?.onFeatureFlags?.((keys: string[], map: FeatureFlags) => {
+				featureFlags.value = map;
+				trackExperiments(map);
+			});
 		}
-
-		window.posthog?.init(config.apiKey, options);
-
-		identify();
-
-		initialized.value = true;
 	};
 
-	const trackExperiment = (name: string) => {
-		const curr = featureFlags.value;
-		const prev = trackedDemoExp.value;
+	const trackExperiments = debounce((featureFlags: FeatureFlags) => {
+		EXPERIMENTS_TO_TRACK.forEach((name) => trackExperiment(featureFlags, name));
+	}, 2000);
 
-		if (!curr || curr[name] === undefined) {
-			return;
-		}
-
-		if (curr[name] === prev[name]) {
-			return;
-		}
-
-		const variant = curr[name];
-		telemetryStore.track('User is part of experiment', {
+	const trackExperiment = (featureFlags: FeatureFlags, name: string) => {
+		const variant = featureFlags[name];
+		telemetryStore.track(EVENTS.IS_PART_OF_EXPERIMENT, {
 			name,
 			variant,
 		});
 
 		trackedDemoExp.value[name] = variant;
-		runExternalHook('posthog.featureFlagsUpdated', useWebhooksStore(), {
-			name,
-			variant,
-		});
-	};
 
-	watch(
-		() => featureFlags.value,
-		() => {
-			setTimeout(() => {
-				EXPERIMENTS_TO_TRACK.forEach(trackExperiment);
-			}, 0);
-		},
-	);
+		if (name === ONBOARDING_EXPERIMENT.name && variant === ONBOARDING_EXPERIMENT.variant) {
+			segmentStore.showAppCuesChecklist();
+		}
+	};
 
 	return {
 		init,
diff --git a/packages/editor-ui/src/stores/segment.ts b/packages/editor-ui/src/stores/segment.ts
new file mode 100644
index 00000000000000..df90baead75c05
--- /dev/null
+++ b/packages/editor-ui/src/stores/segment.ts
@@ -0,0 +1,133 @@
+import {
+	CODE_NODE_TYPE,
+	HTTP_REQUEST_NODE_TYPE,
+	MANUAL_TRIGGER_NODE_TYPE,
+	SCHEDULE_TRIGGER_NODE_TYPE,
+	SET_NODE_TYPE,
+	WEBHOOK_NODE_TYPE,
+} from '@/constants';
+import { ITelemetryTrackProperties } from 'n8n-workflow';
+import { defineStore } from 'pinia';
+import { useSettingsStore } from '@/stores/settings';
+import { INodeTypeDescription, IRun } from 'n8n-workflow';
+import { useWorkflowsStore } from '@/stores/workflows';
+import { useNodeTypesStore } from '@/stores/nodeTypes';
+
+const EVENTS = {
+	SHOW_CHECKLIST: 'Show checklist',
+	ADDED_MANUAL_TRIGGER: 'User added manual trigger',
+	ADDED_SCHEDULE_TRIGGER: 'User added schedule trigger',
+	ADDED_DATA_TRIGGER: 'User added data trigger',
+	RECEIEVED_MULTIPLE_DATA_ITEMS: 'User received multiple data items',
+	EXECUTED_MANUAL_TRIGGER: 'User executed manual trigger successfully',
+	EXECUTED_SCHEDULE_TRIGGER: 'User executed schedule trigger successfully',
+	EXECUTED_DATA_NODE_TRIGGER: 'User executed data node successfully',
+	MAPPED_DATA: 'User mapped data',
+};
+
+export const useSegment = defineStore('segment', () => {
+	const nodeTypesStore = useNodeTypesStore();
+	const workflowsStore = useWorkflowsStore();
+	const settingsStore = useSettingsStore();
+
+	const track = (eventName: string, properties?: ITelemetryTrackProperties) => {
+		if (settingsStore.telemetry.enabled) {
+			window.analytics?.track(eventName, properties);
+		}
+	};
+
+	const showAppCuesChecklist = () => {
+		const isInIframe = window.location !== window.parent.location;
+		if (isInIframe) {
+			return;
+		}
+
+		track(EVENTS.SHOW_CHECKLIST);
+	};
+
+	const trackAddedTrigger = (nodeTypeName: string) => {
+		if (!nodeTypesStore.isTriggerNode(nodeTypeName)) {
+			return;
+		}
+
+		if (nodeTypeName === MANUAL_TRIGGER_NODE_TYPE) {
+			track(EVENTS.ADDED_MANUAL_TRIGGER);
+		} else if (nodeTypeName === SCHEDULE_TRIGGER_NODE_TYPE) {
+			track(EVENTS.ADDED_SCHEDULE_TRIGGER);
+		} else {
+			track(EVENTS.ADDED_DATA_TRIGGER);
+		}
+	};
+
+	const trackSuccessfulWorkflowExecution = (runData: IRun) => {
+		const dataNodeTypes: Set<string> = new Set<string>();
+		const multipleOutputNodes: Set<string> = new Set<string>();
+		let hasManualTrigger = false;
+		let hasScheduleTrigger = false;
+		for (const nodeName of Object.keys(runData.data.resultData.runData)) {
+			const nodeRunData = runData.data.resultData.runData[nodeName];
+			const node = workflowsStore.getNodeByName(nodeName);
+			const nodeTypeName = node ? node.type : 'unknown';
+			if (nodeRunData[0].data && nodeRunData[0].data.main.some((out) => out && out?.length > 1)) {
+				multipleOutputNodes.add(nodeTypeName);
+			}
+			if (node && !node.disabled) {
+				const nodeType = nodeTypesStore.getNodeType(node.type, node.typeVersion);
+				if (isDataNodeType(nodeType)) {
+					dataNodeTypes.add(nodeTypeName);
+				}
+				if (isManualTriggerNode(nodeType)) {
+					hasManualTrigger = true;
+				}
+				if (isScheduleTriggerNode(nodeType)) {
+					hasScheduleTrigger = true;
+				}
+			}
+		}
+		if (multipleOutputNodes.size > 0) {
+			track(EVENTS.RECEIEVED_MULTIPLE_DATA_ITEMS, {
+				nodeTypes: Array.from(multipleOutputNodes),
+			});
+		}
+		if (dataNodeTypes.size > 0) {
+			track(EVENTS.EXECUTED_DATA_NODE_TRIGGER, {
+				nodeTypes: Array.from(dataNodeTypes),
+			});
+		}
+		if (hasManualTrigger) {
+			track(EVENTS.EXECUTED_MANUAL_TRIGGER);
+		}
+		if (hasScheduleTrigger) {
+			track(EVENTS.EXECUTED_SCHEDULE_TRIGGER);
+		}
+	};
+
+	const isManualTriggerNode = (nodeType: INodeTypeDescription | null): boolean => {
+		return !!nodeType && nodeType.name === MANUAL_TRIGGER_NODE_TYPE;
+	};
+
+	const isScheduleTriggerNode = (nodeType: INodeTypeDescription | null): boolean => {
+		return !!nodeType && nodeType.name === SCHEDULE_TRIGGER_NODE_TYPE;
+	};
+
+	const isDataNodeType = (nodeType: INodeTypeDescription | null): boolean => {
+		if (!nodeType) {
+			return false;
+		}
+		const includeCoreNodes = [
+			HTTP_REQUEST_NODE_TYPE,
+			CODE_NODE_TYPE,
+			SET_NODE_TYPE,
+			WEBHOOK_NODE_TYPE,
+		];
+		return !nodeTypesStore.isCoreNodeType(nodeType) || includeCoreNodes.includes(nodeType.name);
+	};
+
+	return {
+		showAppCuesChecklist,
+		track,
+		trackAddedTrigger,
+		trackSuccessfulWorkflowExecution,
+		EVENTS,
+	};
+});
diff --git a/packages/editor-ui/src/stores/users.ts b/packages/editor-ui/src/stores/users.ts
index 8d3963c86653c5..e8c98db9057d41 100644
--- a/packages/editor-ui/src/stores/users.ts
+++ b/packages/editor-ui/src/stores/users.ts
@@ -34,7 +34,7 @@ import { getPersonalizedNodeTypes, isAuthorized, PERMISSIONS, ROLE } from '@/uti
 import { defineStore } from 'pinia';
 import Vue from 'vue';
 import { useRootStore } from './n8nRootStore';
-import { usePostHogStore } from './posthog';
+import { usePostHog } from './posthog';
 import { useSettingsStore } from './settings';
 import { useUIStore } from './ui';
 
@@ -149,7 +149,7 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			this.addUsers([user]);
 			this.currentUserId = user.id;
 
-			usePostHogStore().init(user.featureFlags);
+			usePostHog().init(user.featureFlags);
 		},
 		async loginWithCreds(params: { email: string; password: string }): Promise<void> {
 			const rootStore = useRootStore();
@@ -161,13 +161,13 @@ export const useUsersStore = defineStore(STORES.USERS, {
 			this.addUsers([user]);
 			this.currentUserId = user.id;
 
-			usePostHogStore().init(user.featureFlags);
+			usePostHog().init(user.featureFlags);
 		},
 		async logout(): Promise<void> {
 			const rootStore = useRootStore();
 			await logout(rootStore.getRestApiContext);
 			this.currentUserId = null;
-			usePostHogStore().reset();
+			usePostHog().reset();
 		},
 		async preOwnerSetup() {
 			return preOwnerSetup(useRootStore().getRestApiContext);
@@ -208,7 +208,7 @@ export const useUsersStore = defineStore(STORES.USERS, {
 				this.currentUserId = user.id;
 			}
 
-			usePostHogStore().init(user.featureFlags);
+			usePostHog().init(user.featureFlags);
 		},
 		async sendForgotPasswordEmail(params: { email: string }): Promise<void> {
 			const rootStore = useRootStore();
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 4980afa26b5697..f8b8dbb359f519 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -268,6 +268,7 @@ import { nodeViewEventBus } from '@/event-bus/node-view-event-bus';
 import { useWorkflowsStore } from '@/stores/workflows';
 import { useRootStore } from '@/stores/n8nRootStore';
 import { useNDVStore } from '@/stores/ndv';
+import { useSegment } from '@/stores/segment';
 import { useTemplatesStore } from '@/stores/templates';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useCredentialsStore } from '@/stores/credentials';
@@ -304,7 +305,7 @@ import {
 	N8nPlusEndpointType,
 	EVENT_PLUS_ENDPOINT_CLICK,
 } from '@/plugins/endpoints/N8nPlusEndpointType';
-import { usePostHogStore } from '@/stores/posthog';
+import { usePostHog } from '@/stores/posthog';
 
 interface AddNodeOptions {
 	position?: XYPosition;
@@ -1925,6 +1926,7 @@ export default mixins(
 				});
 			} else {
 				this.$externalHooks().run('nodeView.addNodeButton', { nodeTypeName });
+				useSegment().trackAddedTrigger(nodeTypeName);
 				const trackProperties: ITelemetryTrackProperties = {
 					node_type: nodeTypeName,
 					is_auto_add: isAutoAdd,
@@ -2498,9 +2500,7 @@ export default mixins(
 		},
 		async tryToAddWelcomeSticky(): Promise<void> {
 			const newWorkflow = this.workflowData;
-			if (
-				usePostHogStore().isVariantEnabled(ASSUMPTION_EXPERIMENT.name, ASSUMPTION_EXPERIMENT.video)
-			) {
+			if (usePostHog().isVariantEnabled(ASSUMPTION_EXPERIMENT.name, ASSUMPTION_EXPERIMENT.video)) {
 				// For novice users (onboardingFlowEnabled == true)
 				// Inject welcome sticky note and zoom to fit
 
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index f27d2addecbf52..cd7ac10133cd60 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -138,7 +138,7 @@ import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
 import { useUsersStore } from '@/stores/users';
 import { useWorkflowsStore } from '@/stores/workflows';
-import { usePostHogStore } from '@/stores/posthog';
+import { usePostHog } from '@/stores/posthog';
 
 type IResourcesListLayoutInstance = Vue & { sendFiltersTelemetry: (source: string) => void };
 
@@ -185,10 +185,7 @@ export default mixins(showMessage, debounceHelper, newVersions).extend({
 			return !!this.workflowsStore.activeWorkflows.length;
 		},
 		isDemoTest(): boolean {
-			return usePostHogStore().isVariantEnabled(
-				ASSUMPTION_EXPERIMENT.name,
-				ASSUMPTION_EXPERIMENT.demo,
-			);
+			return usePostHog().isVariantEnabled(ASSUMPTION_EXPERIMENT.name, ASSUMPTION_EXPERIMENT.demo);
 		},
 		statusFilterOptions(): Array<{ label: string; value: string | boolean }> {
 			return [

From 3d82614de2bb9cdd57ea278175709e6a70a302e6 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Tue, 28 Feb 2023 11:54:46 +0100
Subject: [PATCH 302/358] ci: Fix the PR-title validation action (no-changelog)
 (#5576)

---
 .github/workflows/check-pr-title.yml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/check-pr-title.yml b/.github/workflows/check-pr-title.yml
index f515d900e91475..254adc66f8f655 100644
--- a/.github/workflows/check-pr-title.yml
+++ b/.github/workflows/check-pr-title.yml
@@ -18,8 +18,18 @@ jobs:
       - name: Check out branch
         uses: actions/checkout@v3
 
+      - uses: pnpm/action-setup@v2.2.4
+
+      - uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: 'pnpm'
+
+      - name: Install dependencies
+        run: pnpm install --frozen-lockfile
+
       - name: Validate PR title
         id: validate_pr_title
-        uses: ivov/validate-n8n-pull-request-title@v1
+        uses: n8n-io/validate-n8n-pull-request-title@v1.1
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From e3ef9f7c7b2e658704aba9c9d82b9e2fdec1b0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Tue, 28 Feb 2023 12:00:52 +0100
Subject: [PATCH 303/358] ci: Update ReadBinaryFile Documentation URL
 (no-changelog) (#5581)

this is a follow up on https://github.com/n8n-io/n8n/pull/5490
---
 .../nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
index 74ce2121fb4c4d..eded0c4e88a49b 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.json
@@ -6,7 +6,7 @@
 	"resources": {
 		"primaryDocumentation": [
 			{
-				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readbinaryfile/"
+				"url": "https://docs.n8n.io/integrations/builtin/core-nodes/n8n-nodes-base.readbinaryfiles/"
 			}
 		],
 		"generic": [

From d6d1c07a53bb903b19c49ea11b9d36993fde7c33 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 28 Feb 2023 17:51:33 +0300
Subject: [PATCH 304/358] fix: Show Execute Workflow node in nodes panel
 (#5583)

* fix: Show Execute Workflow node in nodes panel

* chore: remove wrong comment
---
 packages/editor-ui/src/stores/nodeCreator.ts   |  2 +-
 .../ExecuteWorkflow/ExecuteWorkflow.node.ts    | 13 +++++++++++++
 .../ExecuteWorkflowTrigger.node.ts             | 18 +++++++++++++++++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index ad0e50fac351c0..8fb92574b8dfbe 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -320,7 +320,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 				.reduce((acc: Record<string, INodeTypeDescription>, node: INodeTypeDescription) => {
 					const clonedNode = deepCopy(node);
 					const actions = node.actions || [];
-					// Do not merge core nodes
+
 					const normalizedName = node.name.toLowerCase().replace('trigger', '');
 					const existingNode = acc[normalizedName];
 
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 77646982ee17b2..3dc0977f71defc 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -26,6 +26,19 @@ export class ExecuteWorkflow implements INodeType {
 		inputs: ['main'],
 		outputs: ['main'],
 		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'hidden',
+				noDataExpression: true,
+				default: 'call_workflow',
+				options: [
+					{
+						name: 'Call Another Workflow',
+						value: 'call_workflow',
+					},
+				],
+			},
 			{
 				displayName: 'Source',
 				name: 'source',
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index cbc5f064284f30..cbccd5b6af8a6b 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -8,7 +8,8 @@ export class ExecuteWorkflowTrigger implements INodeType {
 		icon: 'fa:sign-out-alt',
 		group: ['trigger'],
 		version: 1,
-		description: 'Runs the flow when called by the Execute Workflow node from a different workflow',
+		description:
+			'Helpers for calling other n8n workflows. Used for designing modular, microservice-like workflows.',
 		eventTriggerDescription: '',
 		maxNodes: 1,
 		defaults: {
@@ -26,6 +27,21 @@ export class ExecuteWorkflowTrigger implements INodeType {
 				type: 'notice',
 				default: '',
 			},
+			{
+				displayName: 'Events',
+				name: 'events',
+				type: 'hidden',
+				noDataExpression: true,
+				options: [
+					{
+						name: 'Workflow Call',
+						value: 'worklfow_call',
+						description: 'When called by another workflow using Execute Workflow Trigger',
+						action: 'When Called by Another Workflow',
+					},
+				],
+				default: 'worklfow_call',
+			},
 		],
 	};
 

From aa2beaa80076fc06360828e466a3dc05e7caddbe Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Tue, 28 Feb 2023 18:00:39 +0100
Subject: [PATCH 305/358] fix(Item Lists Node): Tweak item list summarize field
 naming  (#5572)

* Remove brackets and double quotes from fieldname

* Fix bug with duplicate field

* Parse field names from splitbyfield

* Fix error with field name remove console.logs

* Add versioning to itemlist

* Fix naming

* Remove comment
---
 .../nodes/ItemLists/ItemLists.node.ts         | 1451 +----------------
 .../nodes/ItemLists/V1/ItemListsV1.node.ts    | 1428 ++++++++++++++++
 .../ItemLists/{ => V1}/summarize.operation.ts |    0
 .../nodes/ItemLists/V2/ItemListsV2.node.ts    | 1428 ++++++++++++++++
 .../nodes/ItemLists/V2/summarize.operation.ts |  614 +++++++
 5 files changed, 3495 insertions(+), 1426 deletions(-)
 create mode 100644 packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
 rename packages/nodes-base/nodes/ItemLists/{ => V1}/summarize.operation.ts (100%)
 create mode 100644 packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
 create mode 100644 packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts

diff --git a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
index 11011680f1afb5..25a640528043ee 100644
--- a/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/ItemLists.node.ts
@@ -1,1428 +1,27 @@
-import type { NodeVMOptions } from 'vm2';
-import { NodeVM } from 'vm2';
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type {
-	IDataObject,
-	INode,
-	INodeExecutionData,
-	INodeType,
-	INodeTypeDescription,
-} from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
-
-import get from 'lodash.get';
-import isEmpty from 'lodash.isempty';
-import isEqual from 'lodash.isequal';
-import isObject from 'lodash.isobject';
-import lt from 'lodash.lt';
-import merge from 'lodash.merge';
-import pick from 'lodash.pick';
-import reduce from 'lodash.reduce';
-import set from 'lodash.set';
-import unset from 'lodash.unset';
-
-const compareItems = (
-	obj: INodeExecutionData,
-	obj2: INodeExecutionData,
-	keys: string[],
-	disableDotNotation: boolean,
-	_node: INode,
-) => {
-	let result = true;
-	for (const key of keys) {
-		if (!disableDotNotation) {
-			if (!isEqual(get(obj.json, key), get(obj2.json, key))) {
-				result = false;
-				break;
-			}
-		} else {
-			if (!isEqual(obj.json[key], obj2.json[key])) {
-				result = false;
-				break;
-			}
-		}
-	}
-	return result;
-};
-
-const flattenKeys = (obj: IDataObject, path: string[] = []): IDataObject => {
-	return !isObject(obj)
-		? { [path.join('.')]: obj }
-		: reduce(obj, (cum, next, key) => merge(cum, flattenKeys(next as IDataObject, [...path, key])), {}); //prettier-ignore
-};
-
-const shuffleArray = (array: any[]) => {
-	for (let i = array.length - 1; i > 0; i--) {
-		const j = Math.floor(Math.random() * (i + 1));
-		[array[i], array[j]] = [array[j], array[i]];
-	}
-};
-
-import * as summarize from './summarize.operation';
-
-export class ItemLists implements INodeType {
-	description: INodeTypeDescription = {
-		displayName: 'Item Lists',
-		name: 'itemLists',
-		icon: 'file:itemLists.svg',
-		group: ['input'],
-		version: 1,
-		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
-		description: 'Helper for working with lists of items and transforming arrays',
-		defaults: {
-			name: 'Item Lists',
-		},
-		inputs: ['main'],
-		outputs: ['main'],
-		credentials: [],
-		properties: [
-			{
-				displayName: 'Resource',
-				name: 'resource',
-				type: 'hidden',
-				options: [
-					{
-						name: 'Item List',
-						value: 'itemList',
-					},
-				],
-				default: 'itemList',
-			},
-			{
-				displayName: 'Operation',
-				name: 'operation',
-				type: 'options',
-				noDataExpression: true,
-				options: [
-					{
-						name: 'Concatenate Items',
-						value: 'aggregateItems',
-						description: 'Combine fields into a list in a single new item',
-						action: 'Combine fields into a list in a single new item',
-					},
-					{
-						name: 'Limit',
-						value: 'limit',
-						description: 'Remove items if there are too many',
-						action: 'Remove items if there are too many',
-					},
-					{
-						name: 'Remove Duplicates',
-						value: 'removeDuplicates',
-						description: 'Remove extra items that are similar',
-						action: 'Remove extra items that are similar',
-					},
-					{
-						name: 'Sort',
-						value: 'sort',
-						description: 'Change the item order',
-						action: 'Change the item order',
-					},
-					{
-						name: 'Split Out Items',
-						value: 'splitOutItems',
-						description: 'Turn a list inside item(s) into separate items',
-						action: 'Turn a list inside item(s) into separate items',
-					},
-					{
-						name: 'Summarize',
-						value: 'summarize',
-						description: 'Aggregate items together (pivot table)',
-						action: 'Aggregate items together (pivot table)',
-					},
-				],
-				default: 'splitOutItems',
-			},
-			// Split out items - Fields
-			{
-				displayName: 'Field To Split Out',
-				name: 'fieldToSplitOut',
-				type: 'string',
-				default: '',
-				required: true,
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['splitOutItems'],
-					},
-				},
-				description: 'The name of the input field to break out into separate items',
-				requiresDataPath: 'single',
-			},
-			{
-				displayName: 'Include',
-				name: 'include',
-				type: 'options',
-				options: [
-					{
-						name: 'No Other Fields',
-						value: 'noOtherFields',
-					},
-					{
-						name: 'All Other Fields',
-						value: 'allOtherFields',
-					},
-					{
-						name: 'Selected Other Fields',
-						value: 'selectedOtherFields',
-					},
-				],
-				default: 'noOtherFields',
-				description: 'Whether to copy any other fields into the new items',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['splitOutItems'],
-					},
-				},
-			},
-			{
-				displayName: 'Fields To Include',
-				name: 'fieldsToInclude',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				placeholder: 'Add Field To Include',
-				default: {},
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['splitOutItems'],
-						include: ['selectedOtherFields'],
-					},
-				},
-				options: [
-					{
-						displayName: '',
-						name: 'fields',
-						values: [
-							{
-								displayName: 'Field Name',
-								name: 'fieldName',
-								type: 'string',
-								default: '',
-								description: 'A field in the input items to aggregate together',
-								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-								placeholder: 'e.g. id',
-								hint: ' Enter the field name as text',
-								requiresDataPath: 'single',
-							},
-						],
-					},
-				],
-			},
-			// Aggregate Items
-			{
-				displayName: 'Aggregate',
-				name: 'aggregate',
-				type: 'options',
-				default: 'aggregateIndividualFields',
-				options: [
-					{
-						name: 'Individual Fields',
-						value: 'aggregateIndividualFields',
-					},
-					{
-						name: 'All Item Data (Into a Single List)',
-						value: 'aggregateAllItemData',
-					},
-				],
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['aggregateItems'],
-					},
-				},
-			},
-			// Aggregate Individual Fields
-			{
-				displayName: 'Fields To Aggregate',
-				name: 'fieldsToAggregate',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				placeholder: 'Add Field To Aggregate',
-				default: { fieldToAggregate: [{ fieldToAggregate: '', renameField: false }] },
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['aggregateItems'],
-						aggregate: ['aggregateIndividualFields'],
-					},
-				},
-				options: [
-					{
-						displayName: '',
-						name: 'fieldToAggregate',
-						values: [
-							{
-								displayName: 'Input Field Name',
-								name: 'fieldToAggregate',
-								type: 'string',
-								default: '',
-								description: 'The name of a field in the input items to aggregate together',
-								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-								placeholder: 'e.g. id',
-								hint: ' Enter the field name as text',
-								requiresDataPath: 'single',
-							},
-							{
-								displayName: 'Rename Field',
-								name: 'renameField',
-								type: 'boolean',
-								default: false,
-								description: 'Whether to give the field a different name in the output',
-							},
-							{
-								displayName: 'Output Field Name',
-								name: 'outputFieldName',
-								displayOptions: {
-									show: {
-										renameField: [true],
-									},
-								},
-								type: 'string',
-								default: '',
-								description:
-									'The name of the field to put the aggregated data in. Leave blank to use the input field name.',
-								requiresDataPath: 'single',
-							},
-						],
-					},
-				],
-			},
-			// Aggregate All Item Data
-			{
-				displayName: 'Put Output in Field',
-				name: 'destinationFieldName',
-				type: 'string',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['aggregateItems'],
-						aggregate: ['aggregateAllItemData'],
-					},
-				},
-				default: 'data',
-				description: 'The name of the output field to put the data in',
-			},
-			{
-				displayName: 'Include',
-				name: 'include',
-				type: 'options',
-				default: 'allFields',
-				options: [
-					{
-						name: 'All Fields',
-						value: 'allFields',
-					},
-					{
-						name: 'Specified Fields',
-						value: 'specifiedFields',
-					},
-					{
-						name: 'All Fields Except',
-						value: 'allFieldsExcept',
-					},
-				],
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['aggregateItems'],
-						aggregate: ['aggregateAllItemData'],
-					},
-				},
-			},
-			{
-				displayName: 'Fields To Exclude',
-				name: 'fieldsToExclude',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				placeholder: 'Add Field To Exclude',
-				default: {},
-				options: [
-					{
-						displayName: '',
-						name: 'fields',
-						values: [
-							{
-								displayName: 'Field Name',
-								name: 'fieldName',
-								type: 'string',
-								default: '',
-								description: 'A field in the input to exclude from the object in output array',
-								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-								placeholder: 'e.g. id',
-								hint: ' Enter the field name as text',
-								requiresDataPath: 'single',
-							},
-						],
-					},
-				],
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['aggregateItems'],
-						aggregate: ['aggregateAllItemData'],
-						include: ['allFieldsExcept'],
-					},
-				},
-			},
-			{
-				displayName: 'Fields To Include',
-				name: 'fieldsToInclude',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				placeholder: 'Add Field To Include',
-				default: {},
-				options: [
-					{
-						displayName: '',
-						name: 'fields',
-						values: [
-							{
-								displayName: 'Field Name',
-								name: 'fieldName',
-								type: 'string',
-								default: '',
-								description: 'Specify fields that will be included in output array',
-								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-								placeholder: 'e.g. id',
-								hint: ' Enter the field name as text',
-								requiresDataPath: 'single',
-							},
-						],
-					},
-				],
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['aggregateItems'],
-						aggregate: ['aggregateAllItemData'],
-						include: ['specifiedFields'],
-					},
-				},
-			},
-			// Remove duplicates - Fields
-			{
-				displayName: 'Compare',
-				name: 'compare',
-				type: 'options',
-				options: [
-					{
-						name: 'All Fields',
-						value: 'allFields',
-					},
-					{
-						name: 'All Fields Except',
-						value: 'allFieldsExcept',
-					},
-					{
-						name: 'Selected Fields',
-						value: 'selectedFields',
-					},
-				],
-				default: 'allFields',
-				description: 'The fields of the input items to compare to see if they are the same',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['removeDuplicates'],
-					},
-				},
-			},
-			{
-				displayName: 'Fields To Exclude',
-				name: 'fieldsToExclude',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				placeholder: 'Add Field To Exclude',
-				default: {},
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['removeDuplicates'],
-						compare: ['allFieldsExcept'],
-					},
-				},
-				options: [
-					{
-						displayName: '',
-						name: 'fields',
-						values: [
-							{
-								displayName: 'Field Name',
-								name: 'fieldName',
-								type: 'string',
-								default: '',
-								description: 'A field in the input to exclude from the comparison',
-								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-								placeholder: 'e.g. id',
-								hint: ' Enter the field name as text',
-								requiresDataPath: 'single',
-							},
-						],
-					},
-				],
-			},
-			{
-				displayName: 'Fields To Compare',
-				name: 'fieldsToCompare',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				placeholder: 'Add Field To Compare',
-				default: {},
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['removeDuplicates'],
-						compare: ['selectedFields'],
-					},
-				},
-				options: [
-					{
-						displayName: '',
-						name: 'fields',
-						values: [
-							{
-								displayName: 'Field Name',
-								name: 'fieldName',
-								type: 'string',
-								default: '',
-								description: 'A field in the input to add to the comparison',
-								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-								placeholder: 'e.g. id',
-								hint: ' Enter the field name as text',
-								requiresDataPath: 'single',
-							},
-						],
-					},
-				],
-			},
-			// Sort - Fields
-			{
-				displayName: 'Type',
-				name: 'type',
-				type: 'options',
-				options: [
-					{
-						name: 'Simple',
-						value: 'simple',
-					},
-					{
-						name: 'Random',
-						value: 'random',
-					},
-					{
-						name: 'Code',
-						value: 'code',
-					},
-				],
-				default: 'simple',
-				description: 'The fields of the input items to compare to see if they are the same',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['sort'],
-					},
-				},
-			},
-			{
-				displayName: 'Fields To Sort By',
-				name: 'sortFieldsUi',
-				type: 'fixedCollection',
-				typeOptions: {
-					multipleValues: true,
-				},
-				placeholder: 'Add Field To Sort By',
-				options: [
-					{
-						displayName: '',
-						name: 'sortField',
-						values: [
-							{
-								displayName: 'Field Name',
-								name: 'fieldName',
-								type: 'string',
-								required: true,
-								default: '',
-								description: 'The field to sort by',
-								// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
-								placeholder: 'e.g. id',
-								hint: ' Enter the field name as text',
-								requiresDataPath: 'single',
-							},
-							{
-								displayName: 'Order',
-								name: 'order',
-								type: 'options',
-								options: [
-									{
-										name: 'Ascending',
-										value: 'ascending',
-									},
-									{
-										name: 'Descending',
-										value: 'descending',
-									},
-								],
-								default: 'ascending',
-								description: 'The order to sort by',
-							},
-						],
-					},
-				],
-				default: {},
-				description: 'The fields of the input items to compare to see if they are the same',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['sort'],
-						type: ['simple'],
-					},
-				},
-			},
-			{
-				displayName: 'Code',
-				name: 'code',
-				type: 'string',
-				typeOptions: {
-					alwaysOpenEditWindow: true,
-					editor: 'code',
-					rows: 10,
-				},
-				default: `// The two items to compare are in the variables a and b
-// Access the fields in a.json and b.json
-// Return -1 if a should go before b
-// Return 1 if b should go before a
-// Return 0 if there's no difference
-
-fieldName = 'myField';
-
-if (a.json[fieldName] < b.json[fieldName]) {
-		return -1;
-}
-if (a.json[fieldName] > b.json[fieldName]) {
-		return 1;
-}
-return 0;`,
-				description: 'Javascript code to determine the order of any two items',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['sort'],
-						type: ['code'],
-					},
-				},
-			},
-			// Limit - Fields
-			{
-				displayName: 'Max Items',
-				name: 'maxItems',
-				type: 'number',
-				typeOptions: {
-					minValue: 1,
-				},
-				default: 1,
-				description: 'If there are more items than this number, some are removed',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['limit'],
-					},
-				},
-			},
-			{
-				displayName: 'Keep',
-				name: 'keep',
-				type: 'options',
-				options: [
-					{
-						name: 'First Items',
-						value: 'firstItems',
-					},
-					{
-						name: 'Last Items',
-						value: 'lastItems',
-					},
-				],
-				default: 'firstItems',
-				description: 'When removing items, whether to keep the ones at the start or the ending',
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['limit'],
-					},
-				},
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Field',
-				default: {},
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['removeDuplicates'],
-						compare: ['allFieldsExcept', 'selectedFields'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Remove Other Fields',
-						name: 'removeOtherFields',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
-					},
-					{
-						displayName: 'Disable Dot Notation',
-						name: 'disableDotNotation',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to disallow referencing child fields using `parent.child` in the field name',
-					},
-				],
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Field',
-				default: {},
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['sort'],
-						type: ['simple'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Disable Dot Notation',
-						name: 'disableDotNotation',
-						type: 'boolean',
-						default: false,
-						description:
-							'Whether to disallow referencing child fields using `parent.child` in the field name',
-					},
-				],
-			},
-			{
-				displayName: 'Options',
-				name: 'options',
-				type: 'collection',
-				placeholder: 'Add Field',
-				default: {},
-				displayOptions: {
-					show: {
-						resource: ['itemList'],
-						operation: ['splitOutItems', 'aggregateItems'],
-					},
-					hide: {
-						aggregate: ['aggregateAllItemData'],
-					},
-				},
-				options: [
-					{
-						displayName: 'Disable Dot Notation',
-						name: 'disableDotNotation',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['splitOutItems', 'aggregateItems'],
-							},
-						},
-						default: false,
-						description:
-							'Whether to disallow referencing child fields using `parent.child` in the field name',
-					},
-					{
-						displayName: 'Destination Field Name',
-						name: 'destinationFieldName',
-						type: 'string',
-						displayOptions: {
-							show: {
-								'/operation': ['splitOutItems'],
-							},
-						},
-						default: '',
-						description: 'The field in the output under which to put the split field contents',
-					},
-					{
-						displayName: 'Merge Lists',
-						name: 'mergeLists',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['aggregateItems'],
-							},
-						},
-						default: false,
-						description:
-							'Whether to merge the output into a single flat list (rather than a list of lists), if the field to aggregate is a list',
-					},
-					{
-						displayName: 'Keep Missing And Null Values',
-						name: 'keepMissing',
-						type: 'boolean',
-						displayOptions: {
-							show: {
-								'/operation': ['aggregateItems'],
-							},
-						},
-						default: false,
-						description:
-							'Whether to add a null entry to the aggregated list when there is a missing or null value',
-					},
-				],
-			},
-			// Remove duplicates - Fields
-			...summarize.description,
-		],
-	};
-
-	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
-		const items = this.getInputData();
-		const length = items.length;
-		const returnData: INodeExecutionData[] = [];
-		const resource = this.getNodeParameter('resource', 0);
-		const operation = this.getNodeParameter('operation', 0);
-		if (resource === 'itemList') {
-			if (operation === 'splitOutItems') {
-				for (let i = 0; i < length; i++) {
-					const fieldToSplitOut = this.getNodeParameter('fieldToSplitOut', i) as string;
-					const disableDotNotation = this.getNodeParameter(
-						'options.disableDotNotation',
-						0,
-						false,
-					) as boolean;
-					const destinationFieldName = this.getNodeParameter(
-						'options.destinationFieldName',
-						i,
-						'',
-					) as string;
-					const include = this.getNodeParameter('include', i) as string;
-
-					let arrayToSplit;
-					if (!disableDotNotation) {
-						arrayToSplit = get(items[i].json, fieldToSplitOut);
-					} else {
-						arrayToSplit = items[i].json[fieldToSplitOut];
-					}
-
-					if (arrayToSplit === undefined) {
-						if (fieldToSplitOut.includes('.') && disableDotNotation) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
-								{
-									description:
-										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
-								},
-							);
-						} else {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
-								{ itemIndex: i },
-							);
-						}
-					}
-
-					if (!Array.isArray(arrayToSplit)) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`The provided field '${fieldToSplitOut}' is not an array`,
-							{ itemIndex: i },
-						);
-					} else {
-						for (const element of arrayToSplit) {
-							let newItem = {};
-
-							if (include === 'selectedOtherFields') {
-								const fieldsToInclude = (
-									this.getNodeParameter('fieldsToInclude.fields', i, []) as [{ fieldName: string }]
-								).map((field) => field.fieldName);
-
-								if (!fieldsToInclude.length) {
-									throw new NodeOperationError(this.getNode(), 'No fields specified', {
-										description: 'Please add a field to include',
-									});
-								}
-
-								newItem = {
-									...fieldsToInclude.reduce((prev, field) => {
-										if (field === fieldToSplitOut) {
-											return prev;
-										}
-										let value;
-										if (!disableDotNotation) {
-											value = get(items[i].json, field);
-										} else {
-											value = items[i].json[field];
-										}
-										prev = { ...prev, [field]: value };
-										return prev;
-									}, {}),
-								};
-							} else if (include === 'allOtherFields') {
-								const keys = Object.keys(items[i].json);
-
-								newItem = {
-									...keys.reduce((prev, field) => {
-										let value;
-										if (!disableDotNotation) {
-											value = get(items[i].json, field);
-										} else {
-											value = items[i].json[field];
-										}
-										prev = { ...prev, [field]: value };
-										return prev;
-									}, {}),
-								};
-
-								unset(newItem, fieldToSplitOut);
-							}
-
-							if (
-								typeof element === 'object' &&
-								include === 'noOtherFields' &&
-								destinationFieldName === ''
-							) {
-								newItem = { ...newItem, ...element };
-							} else {
-								newItem = {
-									...newItem,
-									[destinationFieldName || fieldToSplitOut]: element,
-								};
-							}
-
-							returnData.push({
-								json: newItem,
-								pairedItem: {
-									item: i,
-								},
-							});
-						}
-					}
-				}
-
-				return this.prepareOutputData(returnData);
-			} else if (operation === 'aggregateItems') {
-				const aggregate = this.getNodeParameter('aggregate', 0, '') as string;
-
-				if (aggregate === 'aggregateIndividualFields') {
-					const disableDotNotation = this.getNodeParameter(
-						'options.disableDotNotation',
-						0,
-						false,
-					) as boolean;
-					const mergeLists = this.getNodeParameter('options.mergeLists', 0, false) as boolean;
-					const fieldsToAggregate = this.getNodeParameter(
-						'fieldsToAggregate.fieldToAggregate',
-						0,
-						[],
-					) as [{ fieldToAggregate: string; renameField: boolean; outputFieldName: string }];
-					const keepMissing = this.getNodeParameter('options.keepMissing', 0, false) as boolean;
-
-					if (!fieldsToAggregate.length) {
-						throw new NodeOperationError(this.getNode(), 'No fields specified', {
-							description: 'Please add a field to aggregate',
-						});
-					}
-					for (const { fieldToAggregate } of fieldsToAggregate) {
-						let found = false;
-						for (const item of items) {
-							if (fieldToAggregate === '') {
-								throw new NodeOperationError(this.getNode(), 'Field to aggregate is blank', {
-									description: 'Please add a field to aggregate',
-								});
-							}
-							if (!disableDotNotation) {
-								if (get(item.json, fieldToAggregate) !== undefined) {
-									found = true;
-								}
-							} else if (item.json.hasOwnProperty(fieldToAggregate)) {
-								found = true;
-							}
-						}
-						if (!found && disableDotNotation && fieldToAggregate.includes('.')) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToAggregate}' in the input data`,
-								{
-									description:
-										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
-								},
-							);
-						} else if (!found && !keepMissing) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldToAggregate}' in the input data`,
-							);
-						}
-					}
-
-					const newItem: INodeExecutionData = {
-						json: {},
-						pairedItem: Array.from({ length }, (_, i) => i).map((index) => {
-							return {
-								item: index,
-							};
-						}),
-					};
-
-					const values: { [key: string]: any } = {};
-					const outputFields: string[] = [];
-
-					for (const { fieldToAggregate, outputFieldName, renameField } of fieldsToAggregate) {
-						const field = renameField ? outputFieldName : fieldToAggregate;
-
-						if (outputFields.includes(field)) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`The '${field}' output field is used more than once`,
-								{ description: 'Please make sure each output field name is unique' },
-							);
-						} else {
-							outputFields.push(field);
-						}
-
-						const getFieldToAggregate = () =>
-							!disableDotNotation && fieldToAggregate.includes('.')
-								? fieldToAggregate.split('.').pop()
-								: fieldToAggregate;
-
-						const _outputFieldName = outputFieldName
-							? outputFieldName
-							: (getFieldToAggregate() as string);
-
-						if (fieldToAggregate !== '') {
-							values[_outputFieldName] = [];
-							for (let i = 0; i < length; i++) {
-								if (!disableDotNotation) {
-									let value = get(items[i].json, fieldToAggregate);
-
-									if (!keepMissing) {
-										if (Array.isArray(value)) {
-											value = value.filter((entry) => entry !== null);
-										} else if (value === null || value === undefined) {
-											continue;
-										}
-									}
-
-									if (Array.isArray(value) && mergeLists) {
-										values[_outputFieldName].push(...value);
-									} else {
-										values[_outputFieldName].push(value);
-									}
-								} else {
-									let value = items[i].json[fieldToAggregate];
-
-									if (!keepMissing) {
-										if (Array.isArray(value)) {
-											value = value.filter((entry) => entry !== null);
-										} else if (value === null || value === undefined) {
-											continue;
-										}
-									}
-
-									if (Array.isArray(value) && mergeLists) {
-										values[_outputFieldName].push(...value);
-									} else {
-										values[_outputFieldName].push(value);
-									}
-								}
-							}
-						}
-					}
-
-					for (const key of Object.keys(values)) {
-						if (!disableDotNotation) {
-							set(newItem.json, key, values[key]);
-						} else {
-							newItem.json[key] = values[key];
-						}
-					}
-
-					returnData.push(newItem);
-
-					return this.prepareOutputData(returnData);
-				} else {
-					let newItems: IDataObject[] = items.map((item) => item.json);
-					const destinationFieldName = this.getNodeParameter('destinationFieldName', 0) as string;
-					const fieldsToExclude = (
-						this.getNodeParameter('fieldsToExclude.fields', 0, []) as IDataObject[]
-					).map((entry) => entry.fieldName);
-					const fieldsToInclude = (
-						this.getNodeParameter('fieldsToInclude.fields', 0, []) as IDataObject[]
-					).map((entry) => entry.fieldName);
-
-					if (fieldsToExclude.length || fieldsToInclude.length) {
-						newItems = newItems.reduce((acc, item) => {
-							const newItem: IDataObject = {};
-							let outputFields = Object.keys(item);
-
-							if (fieldsToExclude.length) {
-								outputFields = outputFields.filter((key) => !fieldsToExclude.includes(key));
-							}
-							if (fieldsToInclude.length) {
-								outputFields = outputFields.filter((key) =>
-									fieldsToInclude.length ? fieldsToInclude.includes(key) : true,
-								);
-							}
-
-							outputFields.forEach((key) => {
-								newItem[key] = item[key];
-							});
-
-							if (isEmpty(newItem)) {
-								return acc;
-							}
-							return acc.concat([newItem]);
-						}, [] as IDataObject[]);
-					}
-
-					const output: INodeExecutionData = { json: { [destinationFieldName]: newItems } };
-
-					return this.prepareOutputData([output]);
-				}
-			} else if (operation === 'removeDuplicates') {
-				const compare = this.getNodeParameter('compare', 0) as string;
-				const disableDotNotation = this.getNodeParameter(
-					'options.disableDotNotation',
-					0,
-					false,
-				) as boolean;
-				const removeOtherFields = this.getNodeParameter(
-					'options.removeOtherFields',
-					0,
-					false,
-				) as boolean;
-
-				let keys = disableDotNotation
-					? Object.keys(items[0].json)
-					: Object.keys(flattenKeys(items[0].json));
-
-				for (const item of items) {
-					for (const key of disableDotNotation
-						? Object.keys(item.json)
-						: Object.keys(flattenKeys(item.json))) {
-						if (!keys.includes(key)) {
-							keys.push(key);
-						}
-					}
-				}
-
-				if (compare === 'allFieldsExcept') {
-					const fieldsToExclude = (
-						this.getNodeParameter('fieldsToExclude.fields', 0, []) as [{ fieldName: string }]
-					).map((field) => field.fieldName);
-					if (!fieldsToExclude.length) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'No fields specified. Please add a field to exclude from comparison',
-						);
-					}
-					if (!disableDotNotation) {
-						keys = Object.keys(flattenKeys(items[0].json));
-					}
-					keys = keys.filter((key) => !fieldsToExclude.includes(key));
-				}
-				if (compare === 'selectedFields') {
-					const fieldsToCompare = (
-						this.getNodeParameter('fieldsToCompare.fields', 0, []) as [{ fieldName: string }]
-					).map((field) => field.fieldName);
-					if (!fieldsToCompare.length) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'No fields specified. Please add a field to compare on',
-						);
-					}
-					if (!disableDotNotation) {
-						keys = Object.keys(flattenKeys(items[0].json));
-					}
-					keys = fieldsToCompare.map((key) => key.trim());
-				}
-
-				// This solution is O(nlogn)
-				// add original index to the items
-				const newItems = items.map(
-					(item, index) =>
-						({
-							json: { ...item.json, __INDEX: index },
-							pairedItem: { item: index },
-						} as INodeExecutionData),
-				);
-				//sort items using the compare keys
-				newItems.sort((a, b) => {
-					let result = 0;
-
-					for (const key of keys) {
-						let equal;
-						if (!disableDotNotation) {
-							equal = isEqual(get(a.json, key), get(b.json, key));
-						} else {
-							equal = isEqual(a.json[key], b.json[key]);
-						}
-						if (!equal) {
-							let lessThan;
-							if (!disableDotNotation) {
-								lessThan = lt(get(a.json, key), get(b.json, key));
-							} else {
-								lessThan = lt(a.json[key], b.json[key]);
-							}
-							result = lessThan ? -1 : 1;
-							break;
-						}
-					}
-					return result;
-				});
-
-				for (const key of keys) {
-					let type: any = undefined;
-					for (const item of newItems) {
-						if (key === '') {
-							throw new NodeOperationError(this.getNode(), 'Name of field to compare is blank');
-						}
-						const value = !disableDotNotation ? get(item.json, key) : item.json[key];
-						if (value === undefined && disableDotNotation && key.includes('.')) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`'${key}' field is missing from some input items`,
-								{
-									description:
-										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
-								},
-							);
-						} else if (value === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`'${key}' field is missing from some input items`,
-							);
-						}
-						if (type !== undefined && value !== undefined && type !== typeof value) {
-							throw new NodeOperationError(this.getNode(), `'${key}' isn't always the same type`, {
-								description: 'The type of this field varies between items',
-							});
-						} else {
-							type = typeof value;
-						}
-					}
-				}
-
-				// collect the original indexes of items to be removed
-				const removedIndexes: number[] = [];
-				let temp = newItems[0];
-				for (let index = 1; index < newItems.length; index++) {
-					if (compareItems(newItems[index], temp, keys, disableDotNotation, this.getNode())) {
-						removedIndexes.push(newItems[index].json.__INDEX as unknown as number);
-					} else {
-						temp = newItems[index];
-					}
-				}
-
-				let data = items.filter((_, index) => !removedIndexes.includes(index));
-
-				if (removeOtherFields) {
-					data = data.map((item, index) => ({
-						json: pick(item.json, ...keys),
-						pairedItem: { item: index },
-					}));
-				}
-
-				// return the filtered items
-				return this.prepareOutputData(data);
-			} else if (operation === 'sort') {
-				let newItems = [...items];
-				const type = this.getNodeParameter('type', 0) as string;
-				const disableDotNotation = this.getNodeParameter(
-					'options.disableDotNotation',
-					0,
-					false,
-				) as boolean;
-
-				if (type === 'random') {
-					shuffleArray(newItems);
-					return this.prepareOutputData(newItems);
-				}
-
-				if (type === 'simple') {
-					const sortFieldsUi = this.getNodeParameter('sortFieldsUi', 0) as IDataObject;
-					const sortFields = sortFieldsUi.sortField as Array<{
-						fieldName: string;
-						order: 'ascending' | 'descending';
-					}>;
-
-					if (!sortFields?.length) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'No sorting specified. Please add a field to sort by',
-						);
-					}
-
-					for (const { fieldName } of sortFields) {
-						let found = false;
-						for (const item of items) {
-							if (!disableDotNotation) {
-								if (get(item.json, fieldName) !== undefined) {
-									found = true;
-								}
-							} else if (item.json.hasOwnProperty(fieldName)) {
-								found = true;
-							}
-						}
-						if (!found && disableDotNotation && fieldName.includes('.')) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldName}' in the input data`,
-								{
-									description:
-										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
-								},
-							);
-						} else if (!found) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Couldn't find the field '${fieldName}' in the input data`,
-							);
-						}
-					}
-
-					const sortFieldsWithDirection = sortFields.map((field) => ({
-						name: field.fieldName,
-						dir: field.order === 'ascending' ? 1 : -1,
-					}));
-
-					newItems.sort((a, b) => {
-						let result = 0;
-						for (const field of sortFieldsWithDirection) {
-							let equal;
-							if (!disableDotNotation) {
-								const _a =
-									typeof get(a.json, field.name) === 'string'
-										? (get(a.json, field.name) as string).toLowerCase()
-										: get(a.json, field.name);
-								const _b =
-									typeof get(b.json, field.name) === 'string'
-										? (get(b.json, field.name) as string).toLowerCase()
-										: get(b.json, field.name);
-								equal = isEqual(_a, _b);
-							} else {
-								const _a =
-									typeof a.json[field.name] === 'string'
-										? (a.json[field.name] as string).toLowerCase()
-										: a.json[field.name];
-								const _b =
-									typeof b.json[field.name] === 'string'
-										? (b.json[field.name] as string).toLowerCase()
-										: b.json[field.name];
-								equal = isEqual(_a, _b);
-							}
-
-							if (!equal) {
-								let lessThan;
-								if (!disableDotNotation) {
-									const _a =
-										typeof get(a.json, field.name) === 'string'
-											? (get(a.json, field.name) as string).toLowerCase()
-											: get(a.json, field.name);
-									const _b =
-										typeof get(b.json, field.name) === 'string'
-											? (get(b.json, field.name) as string).toLowerCase()
-											: get(b.json, field.name);
-									lessThan = lt(_a, _b);
-								} else {
-									const _a =
-										typeof a.json[field.name] === 'string'
-											? (a.json[field.name] as string).toLowerCase()
-											: a.json[field.name];
-									const _b =
-										typeof b.json[field.name] === 'string'
-											? (b.json[field.name] as string).toLowerCase()
-											: b.json[field.name];
-									lessThan = lt(_a, _b);
-								}
-								if (lessThan) {
-									result = -1 * field.dir;
-								} else {
-									result = 1 * field.dir;
-								}
-								break;
-							}
-						}
-						return result;
-					});
-				} else {
-					const code = this.getNodeParameter('code', 0) as string;
-					const regexCheck = /\breturn\b/g.exec(code);
-
-					if (regexCheck?.length) {
-						const sandbox = {
-							newItems,
-						};
-						const mode = this.getMode();
-						const options = {
-							console: mode === 'manual' ? 'redirect' : 'inherit',
-							sandbox,
-						};
-						const vm = new NodeVM(options as unknown as NodeVMOptions);
-
-						newItems = await vm.run(
-							`
-						module.exports = async function() {
-							newItems.sort( (a,b) => {
-								${code}
-							})
-							return newItems;
-						}()`,
-							__dirname,
-						);
-					} else {
-						throw new NodeOperationError(
-							this.getNode(),
-							"Sort code doesn't return. Please add a 'return' statement to your code",
-						);
-					}
-				}
-				return this.prepareOutputData(newItems);
-			} else if (operation === 'limit') {
-				let newItems = items;
-				const maxItems = this.getNodeParameter('maxItems', 0) as number;
-				const keep = this.getNodeParameter('keep', 0) as string;
-
-				if (maxItems > items.length) {
-					return this.prepareOutputData(newItems);
-				}
-
-				if (keep === 'firstItems') {
-					newItems = items.slice(0, maxItems);
-				} else {
-					newItems = items.slice(items.length - maxItems, items.length);
-				}
-				return this.prepareOutputData(newItems);
-			} else if (operation === 'summarize') {
-				return summarize.execute.call(this, items);
-			} else {
-				throw new NodeOperationError(this.getNode(), `Operation '${operation}' is not recognized`);
-			}
-		} else {
-			throw new NodeOperationError(this.getNode(), `Resource '${resource}' is not recognized`);
-		}
+import type { INodeTypeBaseDescription, IVersionedNodeType } from 'n8n-workflow';
+import { VersionedNodeType } from 'n8n-workflow';
+
+import { ItemListsV1 } from './V1/ItemListsV1.node';
+
+import { ItemListsV2 } from './V2/ItemListsV2.node';
+
+export class ItemLists extends VersionedNodeType {
+	constructor() {
+		const baseDescription: INodeTypeBaseDescription = {
+			displayName: 'Item Lists',
+			name: 'itemLists',
+			icon: 'file:itemLists.svg',
+			group: ['input'],
+			subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
+			description: 'Helper for working with lists of items and transforming arrays',
+			defaultVersion: 2,
+		};
+
+		const nodeVersions: IVersionedNodeType['nodeVersions'] = {
+			1: new ItemListsV1(baseDescription),
+			2: new ItemListsV2(baseDescription),
+		};
+
+		super(nodeVersions, baseDescription);
 	}
 }
diff --git a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
new file mode 100644
index 00000000000000..7e230c94d17c03
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
@@ -0,0 +1,1428 @@
+import type { NodeVMOptions } from 'vm2';
+import { NodeVM } from 'vm2';
+import type { IExecuteFunctions } from 'n8n-core';
+
+import type {
+	IDataObject,
+	INode,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import get from 'lodash.get';
+import isEmpty from 'lodash.isempty';
+import isEqual from 'lodash.isequal';
+import isObject from 'lodash.isobject';
+import lt from 'lodash.lt';
+import merge from 'lodash.merge';
+import pick from 'lodash.pick';
+import reduce from 'lodash.reduce';
+import set from 'lodash.set';
+import unset from 'lodash.unset';
+
+const compareItems = (
+	obj: INodeExecutionData,
+	obj2: INodeExecutionData,
+	keys: string[],
+	disableDotNotation: boolean,
+	_node: INode,
+) => {
+	let result = true;
+	for (const key of keys) {
+		if (!disableDotNotation) {
+			if (!isEqual(get(obj.json, key), get(obj2.json, key))) {
+				result = false;
+				break;
+			}
+		} else {
+			if (!isEqual(obj.json[key], obj2.json[key])) {
+				result = false;
+				break;
+			}
+		}
+	}
+	return result;
+};
+
+const flattenKeys = (obj: IDataObject, path: string[] = []): IDataObject => {
+	return !isObject(obj)
+		? { [path.join('.')]: obj }
+		: reduce(obj, (cum, next, key) => merge(cum, flattenKeys(next as IDataObject, [...path, key])), {}); //prettier-ignore
+};
+
+const shuffleArray = (array: any[]) => {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1));
+		[array[i], array[j]] = [array[j], array[i]];
+	}
+};
+
+import * as summarize from './summarize.operation';
+
+export class ItemListsV1 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 1,
+			defaults: {
+				name: 'Item Lists',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'hidden',
+					options: [
+						{
+							name: 'Item List',
+							value: 'itemList',
+						},
+					],
+					default: 'itemList',
+				},
+				{
+					displayName: 'Operation',
+					name: 'operation',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Concatenate Items',
+							value: 'aggregateItems',
+							description: 'Combine fields into a list in a single new item',
+							action: 'Combine fields into a list in a single new item',
+						},
+						{
+							name: 'Limit',
+							value: 'limit',
+							description: 'Remove items if there are too many',
+							action: 'Remove items if there are too many',
+						},
+						{
+							name: 'Remove Duplicates',
+							value: 'removeDuplicates',
+							description: 'Remove extra items that are similar',
+							action: 'Remove extra items that are similar',
+						},
+						{
+							name: 'Sort',
+							value: 'sort',
+							description: 'Change the item order',
+							action: 'Change the item order',
+						},
+						{
+							name: 'Split Out Items',
+							value: 'splitOutItems',
+							description: 'Turn a list inside item(s) into separate items',
+							action: 'Turn a list inside item(s) into separate items',
+						},
+						{
+							name: 'Summarize',
+							value: 'summarize',
+							description: 'Aggregate items together (pivot table)',
+							action: 'Aggregate items together (pivot table)',
+						},
+					],
+					default: 'splitOutItems',
+				},
+				// Split out items - Fields
+				{
+					displayName: 'Field To Split Out',
+					name: 'fieldToSplitOut',
+					type: 'string',
+					default: '',
+					required: true,
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems'],
+						},
+					},
+					description: 'The name of the input field to break out into separate items',
+					requiresDataPath: 'single',
+				},
+				{
+					displayName: 'Include',
+					name: 'include',
+					type: 'options',
+					options: [
+						{
+							name: 'No Other Fields',
+							value: 'noOtherFields',
+						},
+						{
+							name: 'All Other Fields',
+							value: 'allOtherFields',
+						},
+						{
+							name: 'Selected Other Fields',
+							value: 'selectedOtherFields',
+						},
+					],
+					default: 'noOtherFields',
+					description: 'Whether to copy any other fields into the new items',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Include',
+					name: 'fieldsToInclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Include',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems'],
+							include: ['selectedOtherFields'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input items to aggregate together',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				// Aggregate Items
+				{
+					displayName: 'Aggregate',
+					name: 'aggregate',
+					type: 'options',
+					default: 'aggregateIndividualFields',
+					options: [
+						{
+							name: 'Individual Fields',
+							value: 'aggregateIndividualFields',
+						},
+						{
+							name: 'All Item Data (Into a Single List)',
+							value: 'aggregateAllItemData',
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+						},
+					},
+				},
+				// Aggregate Individual Fields
+				{
+					displayName: 'Fields To Aggregate',
+					name: 'fieldsToAggregate',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Aggregate',
+					default: { fieldToAggregate: [{ fieldToAggregate: '', renameField: false }] },
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateIndividualFields'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fieldToAggregate',
+							values: [
+								{
+									displayName: 'Input Field Name',
+									name: 'fieldToAggregate',
+									type: 'string',
+									default: '',
+									description: 'The name of a field in the input items to aggregate together',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+								{
+									displayName: 'Rename Field',
+									name: 'renameField',
+									type: 'boolean',
+									default: false,
+									description: 'Whether to give the field a different name in the output',
+								},
+								{
+									displayName: 'Output Field Name',
+									name: 'outputFieldName',
+									displayOptions: {
+										show: {
+											renameField: [true],
+										},
+									},
+									type: 'string',
+									default: '',
+									description:
+										'The name of the field to put the aggregated data in. Leave blank to use the input field name.',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				// Aggregate All Item Data
+				{
+					displayName: 'Put Output in Field',
+					name: 'destinationFieldName',
+					type: 'string',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+						},
+					},
+					default: 'data',
+					description: 'The name of the output field to put the data in',
+				},
+				{
+					displayName: 'Include',
+					name: 'include',
+					type: 'options',
+					default: 'allFields',
+					options: [
+						{
+							name: 'All Fields',
+							value: 'allFields',
+						},
+						{
+							name: 'Specified Fields',
+							value: 'specifiedFields',
+						},
+						{
+							name: 'All Fields Except',
+							value: 'allFieldsExcept',
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Exclude',
+					name: 'fieldsToExclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Exclude',
+					default: {},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input to exclude from the object in output array',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+							include: ['allFieldsExcept'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Include',
+					name: 'fieldsToInclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Include',
+					default: {},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'Specify fields that will be included in output array',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+							include: ['specifiedFields'],
+						},
+					},
+				},
+				// Remove duplicates - Fields
+				{
+					displayName: 'Compare',
+					name: 'compare',
+					type: 'options',
+					options: [
+						{
+							name: 'All Fields',
+							value: 'allFields',
+						},
+						{
+							name: 'All Fields Except',
+							value: 'allFieldsExcept',
+						},
+						{
+							name: 'Selected Fields',
+							value: 'selectedFields',
+						},
+					],
+					default: 'allFields',
+					description: 'The fields of the input items to compare to see if they are the same',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Exclude',
+					name: 'fieldsToExclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Exclude',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+							compare: ['allFieldsExcept'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input to exclude from the comparison',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Fields To Compare',
+					name: 'fieldsToCompare',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Compare',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+							compare: ['selectedFields'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input to add to the comparison',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				// Sort - Fields
+				{
+					displayName: 'Type',
+					name: 'type',
+					type: 'options',
+					options: [
+						{
+							name: 'Simple',
+							value: 'simple',
+						},
+						{
+							name: 'Random',
+							value: 'random',
+						},
+						{
+							name: 'Code',
+							value: 'code',
+						},
+					],
+					default: 'simple',
+					description: 'The fields of the input items to compare to see if they are the same',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Sort By',
+					name: 'sortFieldsUi',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Sort By',
+					options: [
+						{
+							displayName: '',
+							name: 'sortField',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									required: true,
+									default: '',
+									description: 'The field to sort by',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+								{
+									displayName: 'Order',
+									name: 'order',
+									type: 'options',
+									options: [
+										{
+											name: 'Ascending',
+											value: 'ascending',
+										},
+										{
+											name: 'Descending',
+											value: 'descending',
+										},
+									],
+									default: 'ascending',
+									description: 'The order to sort by',
+								},
+							],
+						},
+					],
+					default: {},
+					description: 'The fields of the input items to compare to see if they are the same',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+							type: ['simple'],
+						},
+					},
+				},
+				{
+					displayName: 'Code',
+					name: 'code',
+					type: 'string',
+					typeOptions: {
+						alwaysOpenEditWindow: true,
+						editor: 'code',
+						rows: 10,
+					},
+					default: `// The two items to compare are in the variables a and b
+// Access the fields in a.json and b.json
+// Return -1 if a should go before b
+// Return 1 if b should go before a
+// Return 0 if there's no difference
+
+fieldName = 'myField';
+
+if (a.json[fieldName] < b.json[fieldName]) {
+		return -1;
+}
+if (a.json[fieldName] > b.json[fieldName]) {
+		return 1;
+}
+return 0;`,
+					description: 'Javascript code to determine the order of any two items',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+							type: ['code'],
+						},
+					},
+				},
+				// Limit - Fields
+				{
+					displayName: 'Max Items',
+					name: 'maxItems',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
+					},
+					default: 1,
+					description: 'If there are more items than this number, some are removed',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['limit'],
+						},
+					},
+				},
+				{
+					displayName: 'Keep',
+					name: 'keep',
+					type: 'options',
+					options: [
+						{
+							name: 'First Items',
+							value: 'firstItems',
+						},
+						{
+							name: 'Last Items',
+							value: 'lastItems',
+						},
+					],
+					default: 'firstItems',
+					description: 'When removing items, whether to keep the ones at the start or the ending',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['limit'],
+						},
+					},
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+							compare: ['allFieldsExcept', 'selectedFields'],
+						},
+					},
+					options: [
+						{
+							displayName: 'Remove Other Fields',
+							name: 'removeOtherFields',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
+						},
+						{
+							displayName: 'Disable Dot Notation',
+							name: 'disableDotNotation',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether to disallow referencing child fields using `parent.child` in the field name',
+						},
+					],
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+							type: ['simple'],
+						},
+					},
+					options: [
+						{
+							displayName: 'Disable Dot Notation',
+							name: 'disableDotNotation',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether to disallow referencing child fields using `parent.child` in the field name',
+						},
+					],
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems', 'aggregateItems'],
+						},
+						hide: {
+							aggregate: ['aggregateAllItemData'],
+						},
+					},
+					options: [
+						{
+							displayName: 'Disable Dot Notation',
+							name: 'disableDotNotation',
+							type: 'boolean',
+							displayOptions: {
+								show: {
+									'/operation': ['splitOutItems', 'aggregateItems'],
+								},
+							},
+							default: false,
+							description:
+								'Whether to disallow referencing child fields using `parent.child` in the field name',
+						},
+						{
+							displayName: 'Destination Field Name',
+							name: 'destinationFieldName',
+							type: 'string',
+							displayOptions: {
+								show: {
+									'/operation': ['splitOutItems'],
+								},
+							},
+							default: '',
+							description: 'The field in the output under which to put the split field contents',
+						},
+						{
+							displayName: 'Merge Lists',
+							name: 'mergeLists',
+							type: 'boolean',
+							displayOptions: {
+								show: {
+									'/operation': ['aggregateItems'],
+								},
+							},
+							default: false,
+							description:
+								'Whether to merge the output into a single flat list (rather than a list of lists), if the field to aggregate is a list',
+						},
+						{
+							displayName: 'Keep Missing And Null Values',
+							name: 'keepMissing',
+							type: 'boolean',
+							displayOptions: {
+								show: {
+									'/operation': ['aggregateItems'],
+								},
+							},
+							default: false,
+							description:
+								'Whether to add a null entry to the aggregated list when there is a missing or null value',
+						},
+					],
+				},
+				// Remove duplicates - Fields
+				...summarize.description,
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const length = items.length;
+		const returnData: INodeExecutionData[] = [];
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		if (resource === 'itemList') {
+			if (operation === 'splitOutItems') {
+				for (let i = 0; i < length; i++) {
+					const fieldToSplitOut = this.getNodeParameter('fieldToSplitOut', i) as string;
+					const disableDotNotation = this.getNodeParameter(
+						'options.disableDotNotation',
+						0,
+						false,
+					) as boolean;
+					const destinationFieldName = this.getNodeParameter(
+						'options.destinationFieldName',
+						i,
+						'',
+					) as string;
+					const include = this.getNodeParameter('include', i) as string;
+
+					let arrayToSplit;
+					if (!disableDotNotation) {
+						arrayToSplit = get(items[i].json, fieldToSplitOut);
+					} else {
+						arrayToSplit = items[i].json[fieldToSplitOut];
+					}
+
+					if (arrayToSplit === undefined) {
+						if (fieldToSplitOut.includes('.') && disableDotNotation) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
+								{ itemIndex: i },
+							);
+						}
+					}
+
+					if (!Array.isArray(arrayToSplit)) {
+						throw new NodeOperationError(
+							this.getNode(),
+							`The provided field '${fieldToSplitOut}' is not an array`,
+							{ itemIndex: i },
+						);
+					} else {
+						for (const element of arrayToSplit) {
+							let newItem = {};
+
+							if (include === 'selectedOtherFields') {
+								const fieldsToInclude = (
+									this.getNodeParameter('fieldsToInclude.fields', i, []) as [{ fieldName: string }]
+								).map((field) => field.fieldName);
+
+								if (!fieldsToInclude.length) {
+									throw new NodeOperationError(this.getNode(), 'No fields specified', {
+										description: 'Please add a field to include',
+									});
+								}
+
+								newItem = {
+									...fieldsToInclude.reduce((prev, field) => {
+										if (field === fieldToSplitOut) {
+											return prev;
+										}
+										let value;
+										if (!disableDotNotation) {
+											value = get(items[i].json, field);
+										} else {
+											value = items[i].json[field];
+										}
+										prev = { ...prev, [field]: value };
+										return prev;
+									}, {}),
+								};
+							} else if (include === 'allOtherFields') {
+								const keys = Object.keys(items[i].json);
+
+								newItem = {
+									...keys.reduce((prev, field) => {
+										let value;
+										if (!disableDotNotation) {
+											value = get(items[i].json, field);
+										} else {
+											value = items[i].json[field];
+										}
+										prev = { ...prev, [field]: value };
+										return prev;
+									}, {}),
+								};
+
+								unset(newItem, fieldToSplitOut);
+							}
+
+							if (
+								typeof element === 'object' &&
+								include === 'noOtherFields' &&
+								destinationFieldName === ''
+							) {
+								newItem = { ...newItem, ...element };
+							} else {
+								newItem = {
+									...newItem,
+									[destinationFieldName || fieldToSplitOut]: element,
+								};
+							}
+
+							returnData.push({
+								json: newItem,
+								pairedItem: {
+									item: i,
+								},
+							});
+						}
+					}
+				}
+
+				return this.prepareOutputData(returnData);
+			} else if (operation === 'aggregateItems') {
+				const aggregate = this.getNodeParameter('aggregate', 0, '') as string;
+
+				if (aggregate === 'aggregateIndividualFields') {
+					const disableDotNotation = this.getNodeParameter(
+						'options.disableDotNotation',
+						0,
+						false,
+					) as boolean;
+					const mergeLists = this.getNodeParameter('options.mergeLists', 0, false) as boolean;
+					const fieldsToAggregate = this.getNodeParameter(
+						'fieldsToAggregate.fieldToAggregate',
+						0,
+						[],
+					) as [{ fieldToAggregate: string; renameField: boolean; outputFieldName: string }];
+					const keepMissing = this.getNodeParameter('options.keepMissing', 0, false) as boolean;
+
+					if (!fieldsToAggregate.length) {
+						throw new NodeOperationError(this.getNode(), 'No fields specified', {
+							description: 'Please add a field to aggregate',
+						});
+					}
+					for (const { fieldToAggregate } of fieldsToAggregate) {
+						let found = false;
+						for (const item of items) {
+							if (fieldToAggregate === '') {
+								throw new NodeOperationError(this.getNode(), 'Field to aggregate is blank', {
+									description: 'Please add a field to aggregate',
+								});
+							}
+							if (!disableDotNotation) {
+								if (get(item.json, fieldToAggregate) !== undefined) {
+									found = true;
+								}
+							} else if (item.json.hasOwnProperty(fieldToAggregate)) {
+								found = true;
+							}
+						}
+						if (!found && disableDotNotation && fieldToAggregate.includes('.')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToAggregate}' in the input data`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else if (!found && !keepMissing) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToAggregate}' in the input data`,
+							);
+						}
+					}
+
+					const newItem: INodeExecutionData = {
+						json: {},
+						pairedItem: Array.from({ length }, (_, i) => i).map((index) => {
+							return {
+								item: index,
+							};
+						}),
+					};
+
+					const values: { [key: string]: any } = {};
+					const outputFields: string[] = [];
+
+					for (const { fieldToAggregate, outputFieldName, renameField } of fieldsToAggregate) {
+						const field = renameField ? outputFieldName : fieldToAggregate;
+
+						if (outputFields.includes(field)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`The '${field}' output field is used more than once`,
+								{ description: 'Please make sure each output field name is unique' },
+							);
+						} else {
+							outputFields.push(field);
+						}
+
+						const getFieldToAggregate = () =>
+							!disableDotNotation && fieldToAggregate.includes('.')
+								? fieldToAggregate.split('.').pop()
+								: fieldToAggregate;
+
+						const _outputFieldName = outputFieldName
+							? outputFieldName
+							: (getFieldToAggregate() as string);
+
+						if (fieldToAggregate !== '') {
+							values[_outputFieldName] = [];
+							for (let i = 0; i < length; i++) {
+								if (!disableDotNotation) {
+									let value = get(items[i].json, fieldToAggregate);
+
+									if (!keepMissing) {
+										if (Array.isArray(value)) {
+											value = value.filter((entry) => entry !== null);
+										} else if (value === null || value === undefined) {
+											continue;
+										}
+									}
+
+									if (Array.isArray(value) && mergeLists) {
+										values[_outputFieldName].push(...value);
+									} else {
+										values[_outputFieldName].push(value);
+									}
+								} else {
+									let value = items[i].json[fieldToAggregate];
+
+									if (!keepMissing) {
+										if (Array.isArray(value)) {
+											value = value.filter((entry) => entry !== null);
+										} else if (value === null || value === undefined) {
+											continue;
+										}
+									}
+
+									if (Array.isArray(value) && mergeLists) {
+										values[_outputFieldName].push(...value);
+									} else {
+										values[_outputFieldName].push(value);
+									}
+								}
+							}
+						}
+					}
+
+					for (const key of Object.keys(values)) {
+						if (!disableDotNotation) {
+							set(newItem.json, key, values[key]);
+						} else {
+							newItem.json[key] = values[key];
+						}
+					}
+
+					returnData.push(newItem);
+
+					return this.prepareOutputData(returnData);
+				} else {
+					let newItems: IDataObject[] = items.map((item) => item.json);
+					const destinationFieldName = this.getNodeParameter('destinationFieldName', 0) as string;
+					const fieldsToExclude = (
+						this.getNodeParameter('fieldsToExclude.fields', 0, []) as IDataObject[]
+					).map((entry) => entry.fieldName);
+					const fieldsToInclude = (
+						this.getNodeParameter('fieldsToInclude.fields', 0, []) as IDataObject[]
+					).map((entry) => entry.fieldName);
+
+					if (fieldsToExclude.length || fieldsToInclude.length) {
+						newItems = newItems.reduce((acc, item) => {
+							const newItem: IDataObject = {};
+							let outputFields = Object.keys(item);
+
+							if (fieldsToExclude.length) {
+								outputFields = outputFields.filter((key) => !fieldsToExclude.includes(key));
+							}
+							if (fieldsToInclude.length) {
+								outputFields = outputFields.filter((key) =>
+									fieldsToInclude.length ? fieldsToInclude.includes(key) : true,
+								);
+							}
+
+							outputFields.forEach((key) => {
+								newItem[key] = item[key];
+							});
+
+							if (isEmpty(newItem)) {
+								return acc;
+							}
+							return acc.concat([newItem]);
+						}, [] as IDataObject[]);
+					}
+
+					const output: INodeExecutionData = { json: { [destinationFieldName]: newItems } };
+
+					return this.prepareOutputData([output]);
+				}
+			} else if (operation === 'removeDuplicates') {
+				const compare = this.getNodeParameter('compare', 0) as string;
+				const disableDotNotation = this.getNodeParameter(
+					'options.disableDotNotation',
+					0,
+					false,
+				) as boolean;
+				const removeOtherFields = this.getNodeParameter(
+					'options.removeOtherFields',
+					0,
+					false,
+				) as boolean;
+
+				let keys = disableDotNotation
+					? Object.keys(items[0].json)
+					: Object.keys(flattenKeys(items[0].json));
+
+				for (const item of items) {
+					for (const key of disableDotNotation
+						? Object.keys(item.json)
+						: Object.keys(flattenKeys(item.json))) {
+						if (!keys.includes(key)) {
+							keys.push(key);
+						}
+					}
+				}
+
+				if (compare === 'allFieldsExcept') {
+					const fieldsToExclude = (
+						this.getNodeParameter('fieldsToExclude.fields', 0, []) as [{ fieldName: string }]
+					).map((field) => field.fieldName);
+					if (!fieldsToExclude.length) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'No fields specified. Please add a field to exclude from comparison',
+						);
+					}
+					if (!disableDotNotation) {
+						keys = Object.keys(flattenKeys(items[0].json));
+					}
+					keys = keys.filter((key) => !fieldsToExclude.includes(key));
+				}
+				if (compare === 'selectedFields') {
+					const fieldsToCompare = (
+						this.getNodeParameter('fieldsToCompare.fields', 0, []) as [{ fieldName: string }]
+					).map((field) => field.fieldName);
+					if (!fieldsToCompare.length) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'No fields specified. Please add a field to compare on',
+						);
+					}
+					if (!disableDotNotation) {
+						keys = Object.keys(flattenKeys(items[0].json));
+					}
+					keys = fieldsToCompare.map((key) => key.trim());
+				}
+
+				// This solution is O(nlogn)
+				// add original index to the items
+				const newItems = items.map(
+					(item, index) =>
+						({
+							json: { ...item.json, __INDEX: index },
+							pairedItem: { item: index },
+						} as INodeExecutionData),
+				);
+				//sort items using the compare keys
+				newItems.sort((a, b) => {
+					let result = 0;
+
+					for (const key of keys) {
+						let equal;
+						if (!disableDotNotation) {
+							equal = isEqual(get(a.json, key), get(b.json, key));
+						} else {
+							equal = isEqual(a.json[key], b.json[key]);
+						}
+						if (!equal) {
+							let lessThan;
+							if (!disableDotNotation) {
+								lessThan = lt(get(a.json, key), get(b.json, key));
+							} else {
+								lessThan = lt(a.json[key], b.json[key]);
+							}
+							result = lessThan ? -1 : 1;
+							break;
+						}
+					}
+					return result;
+				});
+
+				for (const key of keys) {
+					let type: any = undefined;
+					for (const item of newItems) {
+						if (key === '') {
+							throw new NodeOperationError(this.getNode(), 'Name of field to compare is blank');
+						}
+						const value = !disableDotNotation ? get(item.json, key) : item.json[key];
+						if (value === undefined && disableDotNotation && key.includes('.')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`'${key}' field is missing from some input items`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else if (value === undefined) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`'${key}' field is missing from some input items`,
+							);
+						}
+						if (type !== undefined && value !== undefined && type !== typeof value) {
+							throw new NodeOperationError(this.getNode(), `'${key}' isn't always the same type`, {
+								description: 'The type of this field varies between items',
+							});
+						} else {
+							type = typeof value;
+						}
+					}
+				}
+
+				// collect the original indexes of items to be removed
+				const removedIndexes: number[] = [];
+				let temp = newItems[0];
+				for (let index = 1; index < newItems.length; index++) {
+					if (compareItems(newItems[index], temp, keys, disableDotNotation, this.getNode())) {
+						removedIndexes.push(newItems[index].json.__INDEX as unknown as number);
+					} else {
+						temp = newItems[index];
+					}
+				}
+
+				let data = items.filter((_, index) => !removedIndexes.includes(index));
+
+				if (removeOtherFields) {
+					data = data.map((item, index) => ({
+						json: pick(item.json, ...keys),
+						pairedItem: { item: index },
+					}));
+				}
+
+				// return the filtered items
+				return this.prepareOutputData(data);
+			} else if (operation === 'sort') {
+				let newItems = [...items];
+				const type = this.getNodeParameter('type', 0) as string;
+				const disableDotNotation = this.getNodeParameter(
+					'options.disableDotNotation',
+					0,
+					false,
+				) as boolean;
+
+				if (type === 'random') {
+					shuffleArray(newItems);
+					return this.prepareOutputData(newItems);
+				}
+
+				if (type === 'simple') {
+					const sortFieldsUi = this.getNodeParameter('sortFieldsUi', 0) as IDataObject;
+					const sortFields = sortFieldsUi.sortField as Array<{
+						fieldName: string;
+						order: 'ascending' | 'descending';
+					}>;
+
+					if (!sortFields?.length) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'No sorting specified. Please add a field to sort by',
+						);
+					}
+
+					for (const { fieldName } of sortFields) {
+						let found = false;
+						for (const item of items) {
+							if (!disableDotNotation) {
+								if (get(item.json, fieldName) !== undefined) {
+									found = true;
+								}
+							} else if (item.json.hasOwnProperty(fieldName)) {
+								found = true;
+							}
+						}
+						if (!found && disableDotNotation && fieldName.includes('.')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldName}' in the input data`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else if (!found) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldName}' in the input data`,
+							);
+						}
+					}
+
+					const sortFieldsWithDirection = sortFields.map((field) => ({
+						name: field.fieldName,
+						dir: field.order === 'ascending' ? 1 : -1,
+					}));
+
+					newItems.sort((a, b) => {
+						let result = 0;
+						for (const field of sortFieldsWithDirection) {
+							let equal;
+							if (!disableDotNotation) {
+								const _a =
+									typeof get(a.json, field.name) === 'string'
+										? (get(a.json, field.name) as string).toLowerCase()
+										: get(a.json, field.name);
+								const _b =
+									typeof get(b.json, field.name) === 'string'
+										? (get(b.json, field.name) as string).toLowerCase()
+										: get(b.json, field.name);
+								equal = isEqual(_a, _b);
+							} else {
+								const _a =
+									typeof a.json[field.name] === 'string'
+										? (a.json[field.name] as string).toLowerCase()
+										: a.json[field.name];
+								const _b =
+									typeof b.json[field.name] === 'string'
+										? (b.json[field.name] as string).toLowerCase()
+										: b.json[field.name];
+								equal = isEqual(_a, _b);
+							}
+
+							if (!equal) {
+								let lessThan;
+								if (!disableDotNotation) {
+									const _a =
+										typeof get(a.json, field.name) === 'string'
+											? (get(a.json, field.name) as string).toLowerCase()
+											: get(a.json, field.name);
+									const _b =
+										typeof get(b.json, field.name) === 'string'
+											? (get(b.json, field.name) as string).toLowerCase()
+											: get(b.json, field.name);
+									lessThan = lt(_a, _b);
+								} else {
+									const _a =
+										typeof a.json[field.name] === 'string'
+											? (a.json[field.name] as string).toLowerCase()
+											: a.json[field.name];
+									const _b =
+										typeof b.json[field.name] === 'string'
+											? (b.json[field.name] as string).toLowerCase()
+											: b.json[field.name];
+									lessThan = lt(_a, _b);
+								}
+								if (lessThan) {
+									result = -1 * field.dir;
+								} else {
+									result = 1 * field.dir;
+								}
+								break;
+							}
+						}
+						return result;
+					});
+				} else {
+					const code = this.getNodeParameter('code', 0) as string;
+					const regexCheck = /\breturn\b/g.exec(code);
+
+					if (regexCheck?.length) {
+						const sandbox = {
+							newItems,
+						};
+						const mode = this.getMode();
+						const options = {
+							console: mode === 'manual' ? 'redirect' : 'inherit',
+							sandbox,
+						};
+						const vm = new NodeVM(options as unknown as NodeVMOptions);
+
+						newItems = await vm.run(
+							`
+						module.exports = async function() {
+							newItems.sort( (a,b) => {
+								${code}
+							})
+							return newItems;
+						}()`,
+							__dirname,
+						);
+					} else {
+						throw new NodeOperationError(
+							this.getNode(),
+							"Sort code doesn't return. Please add a 'return' statement to your code",
+						);
+					}
+				}
+				return this.prepareOutputData(newItems);
+			} else if (operation === 'limit') {
+				let newItems = items;
+				const maxItems = this.getNodeParameter('maxItems', 0) as number;
+				const keep = this.getNodeParameter('keep', 0) as string;
+
+				if (maxItems > items.length) {
+					return this.prepareOutputData(newItems);
+				}
+
+				if (keep === 'firstItems') {
+					newItems = items.slice(0, maxItems);
+				} else {
+					newItems = items.slice(items.length - maxItems, items.length);
+				}
+				return this.prepareOutputData(newItems);
+			} else if (operation === 'summarize') {
+				return summarize.execute.call(this, items);
+			} else {
+				throw new NodeOperationError(this.getNode(), `Operation '${operation}' is not recognized`);
+			}
+		} else {
+			throw new NodeOperationError(this.getNode(), `Resource '${resource}' is not recognized`);
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ItemLists/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
similarity index 100%
rename from packages/nodes-base/nodes/ItemLists/summarize.operation.ts
rename to packages/nodes-base/nodes/ItemLists/V1/summarize.operation.ts
diff --git a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
new file mode 100644
index 00000000000000..04cf2f1808f506
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
@@ -0,0 +1,1428 @@
+import type { NodeVMOptions } from 'vm2';
+import { NodeVM } from 'vm2';
+import type { IExecuteFunctions } from 'n8n-core';
+
+import type {
+	IDataObject,
+	INode,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import get from 'lodash.get';
+import isEmpty from 'lodash.isempty';
+import isEqual from 'lodash.isequal';
+import isObject from 'lodash.isobject';
+import lt from 'lodash.lt';
+import merge from 'lodash.merge';
+import pick from 'lodash.pick';
+import reduce from 'lodash.reduce';
+import set from 'lodash.set';
+import unset from 'lodash.unset';
+
+const compareItems = (
+	obj: INodeExecutionData,
+	obj2: INodeExecutionData,
+	keys: string[],
+	disableDotNotation: boolean,
+	_node: INode,
+) => {
+	let result = true;
+	for (const key of keys) {
+		if (!disableDotNotation) {
+			if (!isEqual(get(obj.json, key), get(obj2.json, key))) {
+				result = false;
+				break;
+			}
+		} else {
+			if (!isEqual(obj.json[key], obj2.json[key])) {
+				result = false;
+				break;
+			}
+		}
+	}
+	return result;
+};
+
+const flattenKeys = (obj: IDataObject, path: string[] = []): IDataObject => {
+	return !isObject(obj)
+		? { [path.join('.')]: obj }
+		: reduce(obj, (cum, next, key) => merge(cum, flattenKeys(next as IDataObject, [...path, key])), {}); //prettier-ignore
+};
+
+const shuffleArray = (array: any[]) => {
+	for (let i = array.length - 1; i > 0; i--) {
+		const j = Math.floor(Math.random() * (i + 1));
+		[array[i], array[j]] = [array[j], array[i]];
+	}
+};
+
+import * as summarize from './summarize.operation';
+
+export class ItemListsV2 implements INodeType {
+	description: INodeTypeDescription;
+
+	constructor(baseDescription: INodeTypeBaseDescription) {
+		this.description = {
+			...baseDescription,
+			version: 2,
+			defaults: {
+				name: 'Item Lists',
+			},
+			inputs: ['main'],
+			outputs: ['main'],
+			credentials: [],
+			properties: [
+				{
+					displayName: 'Resource',
+					name: 'resource',
+					type: 'hidden',
+					options: [
+						{
+							name: 'Item List',
+							value: 'itemList',
+						},
+					],
+					default: 'itemList',
+				},
+				{
+					displayName: 'Operation',
+					name: 'operation',
+					type: 'options',
+					noDataExpression: true,
+					options: [
+						{
+							name: 'Concatenate Items',
+							value: 'aggregateItems',
+							description: 'Combine fields into a list in a single new item',
+							action: 'Combine fields into a list in a single new item',
+						},
+						{
+							name: 'Limit',
+							value: 'limit',
+							description: 'Remove items if there are too many',
+							action: 'Remove items if there are too many',
+						},
+						{
+							name: 'Remove Duplicates',
+							value: 'removeDuplicates',
+							description: 'Remove extra items that are similar',
+							action: 'Remove extra items that are similar',
+						},
+						{
+							name: 'Sort',
+							value: 'sort',
+							description: 'Change the item order',
+							action: 'Change the item order',
+						},
+						{
+							name: 'Split Out Items',
+							value: 'splitOutItems',
+							description: 'Turn a list inside item(s) into separate items',
+							action: 'Turn a list inside item(s) into separate items',
+						},
+						{
+							name: 'Summarize',
+							value: 'summarize',
+							description: 'Aggregate items together (pivot table)',
+							action: 'Aggregate items together (pivot table)',
+						},
+					],
+					default: 'splitOutItems',
+				},
+				// Split out items - Fields
+				{
+					displayName: 'Field To Split Out',
+					name: 'fieldToSplitOut',
+					type: 'string',
+					default: '',
+					required: true,
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems'],
+						},
+					},
+					description: 'The name of the input field to break out into separate items',
+					requiresDataPath: 'single',
+				},
+				{
+					displayName: 'Include',
+					name: 'include',
+					type: 'options',
+					options: [
+						{
+							name: 'No Other Fields',
+							value: 'noOtherFields',
+						},
+						{
+							name: 'All Other Fields',
+							value: 'allOtherFields',
+						},
+						{
+							name: 'Selected Other Fields',
+							value: 'selectedOtherFields',
+						},
+					],
+					default: 'noOtherFields',
+					description: 'Whether to copy any other fields into the new items',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Include',
+					name: 'fieldsToInclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Include',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems'],
+							include: ['selectedOtherFields'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input items to aggregate together',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				// Aggregate Items
+				{
+					displayName: 'Aggregate',
+					name: 'aggregate',
+					type: 'options',
+					default: 'aggregateIndividualFields',
+					options: [
+						{
+							name: 'Individual Fields',
+							value: 'aggregateIndividualFields',
+						},
+						{
+							name: 'All Item Data (Into a Single List)',
+							value: 'aggregateAllItemData',
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+						},
+					},
+				},
+				// Aggregate Individual Fields
+				{
+					displayName: 'Fields To Aggregate',
+					name: 'fieldsToAggregate',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Aggregate',
+					default: { fieldToAggregate: [{ fieldToAggregate: '', renameField: false }] },
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateIndividualFields'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fieldToAggregate',
+							values: [
+								{
+									displayName: 'Input Field Name',
+									name: 'fieldToAggregate',
+									type: 'string',
+									default: '',
+									description: 'The name of a field in the input items to aggregate together',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+								{
+									displayName: 'Rename Field',
+									name: 'renameField',
+									type: 'boolean',
+									default: false,
+									description: 'Whether to give the field a different name in the output',
+								},
+								{
+									displayName: 'Output Field Name',
+									name: 'outputFieldName',
+									displayOptions: {
+										show: {
+											renameField: [true],
+										},
+									},
+									type: 'string',
+									default: '',
+									description:
+										'The name of the field to put the aggregated data in. Leave blank to use the input field name.',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				// Aggregate All Item Data
+				{
+					displayName: 'Put Output in Field',
+					name: 'destinationFieldName',
+					type: 'string',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+						},
+					},
+					default: 'data',
+					description: 'The name of the output field to put the data in',
+				},
+				{
+					displayName: 'Include',
+					name: 'include',
+					type: 'options',
+					default: 'allFields',
+					options: [
+						{
+							name: 'All Fields',
+							value: 'allFields',
+						},
+						{
+							name: 'Specified Fields',
+							value: 'specifiedFields',
+						},
+						{
+							name: 'All Fields Except',
+							value: 'allFieldsExcept',
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Exclude',
+					name: 'fieldsToExclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Exclude',
+					default: {},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input to exclude from the object in output array',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+							include: ['allFieldsExcept'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Include',
+					name: 'fieldsToInclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Include',
+					default: {},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'Specify fields that will be included in output array',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['aggregateItems'],
+							aggregate: ['aggregateAllItemData'],
+							include: ['specifiedFields'],
+						},
+					},
+				},
+				// Remove duplicates - Fields
+				{
+					displayName: 'Compare',
+					name: 'compare',
+					type: 'options',
+					options: [
+						{
+							name: 'All Fields',
+							value: 'allFields',
+						},
+						{
+							name: 'All Fields Except',
+							value: 'allFieldsExcept',
+						},
+						{
+							name: 'Selected Fields',
+							value: 'selectedFields',
+						},
+					],
+					default: 'allFields',
+					description: 'The fields of the input items to compare to see if they are the same',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Exclude',
+					name: 'fieldsToExclude',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Exclude',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+							compare: ['allFieldsExcept'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input to exclude from the comparison',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				{
+					displayName: 'Fields To Compare',
+					name: 'fieldsToCompare',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Compare',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+							compare: ['selectedFields'],
+						},
+					},
+					options: [
+						{
+							displayName: '',
+							name: 'fields',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									default: '',
+									description: 'A field in the input to add to the comparison',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+							],
+						},
+					],
+				},
+				// Sort - Fields
+				{
+					displayName: 'Type',
+					name: 'type',
+					type: 'options',
+					options: [
+						{
+							name: 'Simple',
+							value: 'simple',
+						},
+						{
+							name: 'Random',
+							value: 'random',
+						},
+						{
+							name: 'Code',
+							value: 'code',
+						},
+					],
+					default: 'simple',
+					description: 'The fields of the input items to compare to see if they are the same',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+						},
+					},
+				},
+				{
+					displayName: 'Fields To Sort By',
+					name: 'sortFieldsUi',
+					type: 'fixedCollection',
+					typeOptions: {
+						multipleValues: true,
+					},
+					placeholder: 'Add Field To Sort By',
+					options: [
+						{
+							displayName: '',
+							name: 'sortField',
+							values: [
+								{
+									displayName: 'Field Name',
+									name: 'fieldName',
+									type: 'string',
+									required: true,
+									default: '',
+									description: 'The field to sort by',
+									// eslint-disable-next-line n8n-nodes-base/node-param-placeholder-miscased-id
+									placeholder: 'e.g. id',
+									hint: ' Enter the field name as text',
+									requiresDataPath: 'single',
+								},
+								{
+									displayName: 'Order',
+									name: 'order',
+									type: 'options',
+									options: [
+										{
+											name: 'Ascending',
+											value: 'ascending',
+										},
+										{
+											name: 'Descending',
+											value: 'descending',
+										},
+									],
+									default: 'ascending',
+									description: 'The order to sort by',
+								},
+							],
+						},
+					],
+					default: {},
+					description: 'The fields of the input items to compare to see if they are the same',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+							type: ['simple'],
+						},
+					},
+				},
+				{
+					displayName: 'Code',
+					name: 'code',
+					type: 'string',
+					typeOptions: {
+						alwaysOpenEditWindow: true,
+						editor: 'code',
+						rows: 10,
+					},
+					default: `// The two items to compare are in the variables a and b
+// Access the fields in a.json and b.json
+// Return -1 if a should go before b
+// Return 1 if b should go before a
+// Return 0 if there's no difference
+
+fieldName = 'myField';
+
+if (a.json[fieldName] < b.json[fieldName]) {
+		return -1;
+}
+if (a.json[fieldName] > b.json[fieldName]) {
+		return 1;
+}
+return 0;`,
+					description: 'Javascript code to determine the order of any two items',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+							type: ['code'],
+						},
+					},
+				},
+				// Limit - Fields
+				{
+					displayName: 'Max Items',
+					name: 'maxItems',
+					type: 'number',
+					typeOptions: {
+						minValue: 1,
+					},
+					default: 1,
+					description: 'If there are more items than this number, some are removed',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['limit'],
+						},
+					},
+				},
+				{
+					displayName: 'Keep',
+					name: 'keep',
+					type: 'options',
+					options: [
+						{
+							name: 'First Items',
+							value: 'firstItems',
+						},
+						{
+							name: 'Last Items',
+							value: 'lastItems',
+						},
+					],
+					default: 'firstItems',
+					description: 'When removing items, whether to keep the ones at the start or the ending',
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['limit'],
+						},
+					},
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['removeDuplicates'],
+							compare: ['allFieldsExcept', 'selectedFields'],
+						},
+					},
+					options: [
+						{
+							displayName: 'Remove Other Fields',
+							name: 'removeOtherFields',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether to remove any fields that are not being compared. If disabled, will keep the values from the first of the duplicates.',
+						},
+						{
+							displayName: 'Disable Dot Notation',
+							name: 'disableDotNotation',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether to disallow referencing child fields using `parent.child` in the field name',
+						},
+					],
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['sort'],
+							type: ['simple'],
+						},
+					},
+					options: [
+						{
+							displayName: 'Disable Dot Notation',
+							name: 'disableDotNotation',
+							type: 'boolean',
+							default: false,
+							description:
+								'Whether to disallow referencing child fields using `parent.child` in the field name',
+						},
+					],
+				},
+				{
+					displayName: 'Options',
+					name: 'options',
+					type: 'collection',
+					placeholder: 'Add Field',
+					default: {},
+					displayOptions: {
+						show: {
+							resource: ['itemList'],
+							operation: ['splitOutItems', 'aggregateItems'],
+						},
+						hide: {
+							aggregate: ['aggregateAllItemData'],
+						},
+					},
+					options: [
+						{
+							displayName: 'Disable Dot Notation',
+							name: 'disableDotNotation',
+							type: 'boolean',
+							displayOptions: {
+								show: {
+									'/operation': ['splitOutItems', 'aggregateItems'],
+								},
+							},
+							default: false,
+							description:
+								'Whether to disallow referencing child fields using `parent.child` in the field name',
+						},
+						{
+							displayName: 'Destination Field Name',
+							name: 'destinationFieldName',
+							type: 'string',
+							displayOptions: {
+								show: {
+									'/operation': ['splitOutItems'],
+								},
+							},
+							default: '',
+							description: 'The field in the output under which to put the split field contents',
+						},
+						{
+							displayName: 'Merge Lists',
+							name: 'mergeLists',
+							type: 'boolean',
+							displayOptions: {
+								show: {
+									'/operation': ['aggregateItems'],
+								},
+							},
+							default: false,
+							description:
+								'Whether to merge the output into a single flat list (rather than a list of lists), if the field to aggregate is a list',
+						},
+						{
+							displayName: 'Keep Missing And Null Values',
+							name: 'keepMissing',
+							type: 'boolean',
+							displayOptions: {
+								show: {
+									'/operation': ['aggregateItems'],
+								},
+							},
+							default: false,
+							description:
+								'Whether to add a null entry to the aggregated list when there is a missing or null value',
+						},
+					],
+				},
+				// Remove duplicates - Fields
+				...summarize.description,
+			],
+		};
+	}
+
+	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
+		const items = this.getInputData();
+		const length = items.length;
+		const returnData: INodeExecutionData[] = [];
+		const resource = this.getNodeParameter('resource', 0);
+		const operation = this.getNodeParameter('operation', 0);
+		if (resource === 'itemList') {
+			if (operation === 'splitOutItems') {
+				for (let i = 0; i < length; i++) {
+					const fieldToSplitOut = this.getNodeParameter('fieldToSplitOut', i) as string;
+					const disableDotNotation = this.getNodeParameter(
+						'options.disableDotNotation',
+						0,
+						false,
+					) as boolean;
+					const destinationFieldName = this.getNodeParameter(
+						'options.destinationFieldName',
+						i,
+						'',
+					) as string;
+					const include = this.getNodeParameter('include', i) as string;
+
+					let arrayToSplit;
+					if (!disableDotNotation) {
+						arrayToSplit = get(items[i].json, fieldToSplitOut);
+					} else {
+						arrayToSplit = items[i].json[fieldToSplitOut];
+					}
+
+					if (arrayToSplit === undefined) {
+						if (fieldToSplitOut.includes('.') && disableDotNotation) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToSplitOut}' in the input data`,
+								{ itemIndex: i },
+							);
+						}
+					}
+
+					if (!Array.isArray(arrayToSplit)) {
+						throw new NodeOperationError(
+							this.getNode(),
+							`The provided field '${fieldToSplitOut}' is not an array`,
+							{ itemIndex: i },
+						);
+					} else {
+						for (const element of arrayToSplit) {
+							let newItem = {};
+
+							if (include === 'selectedOtherFields') {
+								const fieldsToInclude = (
+									this.getNodeParameter('fieldsToInclude.fields', i, []) as [{ fieldName: string }]
+								).map((field) => field.fieldName);
+
+								if (!fieldsToInclude.length) {
+									throw new NodeOperationError(this.getNode(), 'No fields specified', {
+										description: 'Please add a field to include',
+									});
+								}
+
+								newItem = {
+									...fieldsToInclude.reduce((prev, field) => {
+										if (field === fieldToSplitOut) {
+											return prev;
+										}
+										let value;
+										if (!disableDotNotation) {
+											value = get(items[i].json, field);
+										} else {
+											value = items[i].json[field];
+										}
+										prev = { ...prev, [field]: value };
+										return prev;
+									}, {}),
+								};
+							} else if (include === 'allOtherFields') {
+								const keys = Object.keys(items[i].json);
+
+								newItem = {
+									...keys.reduce((prev, field) => {
+										let value;
+										if (!disableDotNotation) {
+											value = get(items[i].json, field);
+										} else {
+											value = items[i].json[field];
+										}
+										prev = { ...prev, [field]: value };
+										return prev;
+									}, {}),
+								};
+
+								unset(newItem, fieldToSplitOut);
+							}
+
+							if (
+								typeof element === 'object' &&
+								include === 'noOtherFields' &&
+								destinationFieldName === ''
+							) {
+								newItem = { ...newItem, ...element };
+							} else {
+								newItem = {
+									...newItem,
+									[destinationFieldName || fieldToSplitOut]: element,
+								};
+							}
+
+							returnData.push({
+								json: newItem,
+								pairedItem: {
+									item: i,
+								},
+							});
+						}
+					}
+				}
+
+				return this.prepareOutputData(returnData);
+			} else if (operation === 'aggregateItems') {
+				const aggregate = this.getNodeParameter('aggregate', 0, '') as string;
+
+				if (aggregate === 'aggregateIndividualFields') {
+					const disableDotNotation = this.getNodeParameter(
+						'options.disableDotNotation',
+						0,
+						false,
+					) as boolean;
+					const mergeLists = this.getNodeParameter('options.mergeLists', 0, false) as boolean;
+					const fieldsToAggregate = this.getNodeParameter(
+						'fieldsToAggregate.fieldToAggregate',
+						0,
+						[],
+					) as [{ fieldToAggregate: string; renameField: boolean; outputFieldName: string }];
+					const keepMissing = this.getNodeParameter('options.keepMissing', 0, false) as boolean;
+
+					if (!fieldsToAggregate.length) {
+						throw new NodeOperationError(this.getNode(), 'No fields specified', {
+							description: 'Please add a field to aggregate',
+						});
+					}
+					for (const { fieldToAggregate } of fieldsToAggregate) {
+						let found = false;
+						for (const item of items) {
+							if (fieldToAggregate === '') {
+								throw new NodeOperationError(this.getNode(), 'Field to aggregate is blank', {
+									description: 'Please add a field to aggregate',
+								});
+							}
+							if (!disableDotNotation) {
+								if (get(item.json, fieldToAggregate) !== undefined) {
+									found = true;
+								}
+							} else if (item.json.hasOwnProperty(fieldToAggregate)) {
+								found = true;
+							}
+						}
+						if (!found && disableDotNotation && fieldToAggregate.includes('.')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToAggregate}' in the input data`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else if (!found && !keepMissing) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldToAggregate}' in the input data`,
+							);
+						}
+					}
+
+					const newItem: INodeExecutionData = {
+						json: {},
+						pairedItem: Array.from({ length }, (_, i) => i).map((index) => {
+							return {
+								item: index,
+							};
+						}),
+					};
+
+					const values: { [key: string]: any } = {};
+					const outputFields: string[] = [];
+
+					for (const { fieldToAggregate, outputFieldName, renameField } of fieldsToAggregate) {
+						const field = renameField ? outputFieldName : fieldToAggregate;
+
+						if (outputFields.includes(field)) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`The '${field}' output field is used more than once`,
+								{ description: 'Please make sure each output field name is unique' },
+							);
+						} else {
+							outputFields.push(field);
+						}
+
+						const getFieldToAggregate = () =>
+							!disableDotNotation && fieldToAggregate.includes('.')
+								? fieldToAggregate.split('.').pop()
+								: fieldToAggregate;
+
+						const _outputFieldName = outputFieldName
+							? outputFieldName
+							: (getFieldToAggregate() as string);
+
+						if (fieldToAggregate !== '') {
+							values[_outputFieldName] = [];
+							for (let i = 0; i < length; i++) {
+								if (!disableDotNotation) {
+									let value = get(items[i].json, fieldToAggregate);
+
+									if (!keepMissing) {
+										if (Array.isArray(value)) {
+											value = value.filter((entry) => entry !== null);
+										} else if (value === null || value === undefined) {
+											continue;
+										}
+									}
+
+									if (Array.isArray(value) && mergeLists) {
+										values[_outputFieldName].push(...value);
+									} else {
+										values[_outputFieldName].push(value);
+									}
+								} else {
+									let value = items[i].json[fieldToAggregate];
+
+									if (!keepMissing) {
+										if (Array.isArray(value)) {
+											value = value.filter((entry) => entry !== null);
+										} else if (value === null || value === undefined) {
+											continue;
+										}
+									}
+
+									if (Array.isArray(value) && mergeLists) {
+										values[_outputFieldName].push(...value);
+									} else {
+										values[_outputFieldName].push(value);
+									}
+								}
+							}
+						}
+					}
+
+					for (const key of Object.keys(values)) {
+						if (!disableDotNotation) {
+							set(newItem.json, key, values[key]);
+						} else {
+							newItem.json[key] = values[key];
+						}
+					}
+
+					returnData.push(newItem);
+
+					return this.prepareOutputData(returnData);
+				} else {
+					let newItems: IDataObject[] = items.map((item) => item.json);
+					const destinationFieldName = this.getNodeParameter('destinationFieldName', 0) as string;
+					const fieldsToExclude = (
+						this.getNodeParameter('fieldsToExclude.fields', 0, []) as IDataObject[]
+					).map((entry) => entry.fieldName);
+					const fieldsToInclude = (
+						this.getNodeParameter('fieldsToInclude.fields', 0, []) as IDataObject[]
+					).map((entry) => entry.fieldName);
+
+					if (fieldsToExclude.length || fieldsToInclude.length) {
+						newItems = newItems.reduce((acc, item) => {
+							const newItem: IDataObject = {};
+							let outputFields = Object.keys(item);
+
+							if (fieldsToExclude.length) {
+								outputFields = outputFields.filter((key) => !fieldsToExclude.includes(key));
+							}
+							if (fieldsToInclude.length) {
+								outputFields = outputFields.filter((key) =>
+									fieldsToInclude.length ? fieldsToInclude.includes(key) : true,
+								);
+							}
+
+							outputFields.forEach((key) => {
+								newItem[key] = item[key];
+							});
+
+							if (isEmpty(newItem)) {
+								return acc;
+							}
+							return acc.concat([newItem]);
+						}, [] as IDataObject[]);
+					}
+
+					const output: INodeExecutionData = { json: { [destinationFieldName]: newItems } };
+
+					return this.prepareOutputData([output]);
+				}
+			} else if (operation === 'removeDuplicates') {
+				const compare = this.getNodeParameter('compare', 0) as string;
+				const disableDotNotation = this.getNodeParameter(
+					'options.disableDotNotation',
+					0,
+					false,
+				) as boolean;
+				const removeOtherFields = this.getNodeParameter(
+					'options.removeOtherFields',
+					0,
+					false,
+				) as boolean;
+
+				let keys = disableDotNotation
+					? Object.keys(items[0].json)
+					: Object.keys(flattenKeys(items[0].json));
+
+				for (const item of items) {
+					for (const key of disableDotNotation
+						? Object.keys(item.json)
+						: Object.keys(flattenKeys(item.json))) {
+						if (!keys.includes(key)) {
+							keys.push(key);
+						}
+					}
+				}
+
+				if (compare === 'allFieldsExcept') {
+					const fieldsToExclude = (
+						this.getNodeParameter('fieldsToExclude.fields', 0, []) as [{ fieldName: string }]
+					).map((field) => field.fieldName);
+					if (!fieldsToExclude.length) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'No fields specified. Please add a field to exclude from comparison',
+						);
+					}
+					if (!disableDotNotation) {
+						keys = Object.keys(flattenKeys(items[0].json));
+					}
+					keys = keys.filter((key) => !fieldsToExclude.includes(key));
+				}
+				if (compare === 'selectedFields') {
+					const fieldsToCompare = (
+						this.getNodeParameter('fieldsToCompare.fields', 0, []) as [{ fieldName: string }]
+					).map((field) => field.fieldName);
+					if (!fieldsToCompare.length) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'No fields specified. Please add a field to compare on',
+						);
+					}
+					if (!disableDotNotation) {
+						keys = Object.keys(flattenKeys(items[0].json));
+					}
+					keys = fieldsToCompare.map((key) => key.trim());
+				}
+
+				// This solution is O(nlogn)
+				// add original index to the items
+				const newItems = items.map(
+					(item, index) =>
+						({
+							json: { ...item.json, __INDEX: index },
+							pairedItem: { item: index },
+						} as INodeExecutionData),
+				);
+				//sort items using the compare keys
+				newItems.sort((a, b) => {
+					let result = 0;
+
+					for (const key of keys) {
+						let equal;
+						if (!disableDotNotation) {
+							equal = isEqual(get(a.json, key), get(b.json, key));
+						} else {
+							equal = isEqual(a.json[key], b.json[key]);
+						}
+						if (!equal) {
+							let lessThan;
+							if (!disableDotNotation) {
+								lessThan = lt(get(a.json, key), get(b.json, key));
+							} else {
+								lessThan = lt(a.json[key], b.json[key]);
+							}
+							result = lessThan ? -1 : 1;
+							break;
+						}
+					}
+					return result;
+				});
+
+				for (const key of keys) {
+					let type: any = undefined;
+					for (const item of newItems) {
+						if (key === '') {
+							throw new NodeOperationError(this.getNode(), 'Name of field to compare is blank');
+						}
+						const value = !disableDotNotation ? get(item.json, key) : item.json[key];
+						if (value === undefined && disableDotNotation && key.includes('.')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`'${key}' field is missing from some input items`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else if (value === undefined) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`'${key}' field is missing from some input items`,
+							);
+						}
+						if (type !== undefined && value !== undefined && type !== typeof value) {
+							throw new NodeOperationError(this.getNode(), `'${key}' isn't always the same type`, {
+								description: 'The type of this field varies between items',
+							});
+						} else {
+							type = typeof value;
+						}
+					}
+				}
+
+				// collect the original indexes of items to be removed
+				const removedIndexes: number[] = [];
+				let temp = newItems[0];
+				for (let index = 1; index < newItems.length; index++) {
+					if (compareItems(newItems[index], temp, keys, disableDotNotation, this.getNode())) {
+						removedIndexes.push(newItems[index].json.__INDEX as unknown as number);
+					} else {
+						temp = newItems[index];
+					}
+				}
+
+				let data = items.filter((_, index) => !removedIndexes.includes(index));
+
+				if (removeOtherFields) {
+					data = data.map((item, index) => ({
+						json: pick(item.json, ...keys),
+						pairedItem: { item: index },
+					}));
+				}
+
+				// return the filtered items
+				return this.prepareOutputData(data);
+			} else if (operation === 'sort') {
+				let newItems = [...items];
+				const type = this.getNodeParameter('type', 0) as string;
+				const disableDotNotation = this.getNodeParameter(
+					'options.disableDotNotation',
+					0,
+					false,
+				) as boolean;
+
+				if (type === 'random') {
+					shuffleArray(newItems);
+					return this.prepareOutputData(newItems);
+				}
+
+				if (type === 'simple') {
+					const sortFieldsUi = this.getNodeParameter('sortFieldsUi', 0) as IDataObject;
+					const sortFields = sortFieldsUi.sortField as Array<{
+						fieldName: string;
+						order: 'ascending' | 'descending';
+					}>;
+
+					if (!sortFields?.length) {
+						throw new NodeOperationError(
+							this.getNode(),
+							'No sorting specified. Please add a field to sort by',
+						);
+					}
+
+					for (const { fieldName } of sortFields) {
+						let found = false;
+						for (const item of items) {
+							if (!disableDotNotation) {
+								if (get(item.json, fieldName) !== undefined) {
+									found = true;
+								}
+							} else if (item.json.hasOwnProperty(fieldName)) {
+								found = true;
+							}
+						}
+						if (!found && disableDotNotation && fieldName.includes('.')) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldName}' in the input data`,
+								{
+									description:
+										"If you're trying to use a nested field, make sure you turn off 'disable dot notation' in the node options",
+								},
+							);
+						} else if (!found) {
+							throw new NodeOperationError(
+								this.getNode(),
+								`Couldn't find the field '${fieldName}' in the input data`,
+							);
+						}
+					}
+
+					const sortFieldsWithDirection = sortFields.map((field) => ({
+						name: field.fieldName,
+						dir: field.order === 'ascending' ? 1 : -1,
+					}));
+
+					newItems.sort((a, b) => {
+						let result = 0;
+						for (const field of sortFieldsWithDirection) {
+							let equal;
+							if (!disableDotNotation) {
+								const _a =
+									typeof get(a.json, field.name) === 'string'
+										? (get(a.json, field.name) as string).toLowerCase()
+										: get(a.json, field.name);
+								const _b =
+									typeof get(b.json, field.name) === 'string'
+										? (get(b.json, field.name) as string).toLowerCase()
+										: get(b.json, field.name);
+								equal = isEqual(_a, _b);
+							} else {
+								const _a =
+									typeof a.json[field.name] === 'string'
+										? (a.json[field.name] as string).toLowerCase()
+										: a.json[field.name];
+								const _b =
+									typeof b.json[field.name] === 'string'
+										? (b.json[field.name] as string).toLowerCase()
+										: b.json[field.name];
+								equal = isEqual(_a, _b);
+							}
+
+							if (!equal) {
+								let lessThan;
+								if (!disableDotNotation) {
+									const _a =
+										typeof get(a.json, field.name) === 'string'
+											? (get(a.json, field.name) as string).toLowerCase()
+											: get(a.json, field.name);
+									const _b =
+										typeof get(b.json, field.name) === 'string'
+											? (get(b.json, field.name) as string).toLowerCase()
+											: get(b.json, field.name);
+									lessThan = lt(_a, _b);
+								} else {
+									const _a =
+										typeof a.json[field.name] === 'string'
+											? (a.json[field.name] as string).toLowerCase()
+											: a.json[field.name];
+									const _b =
+										typeof b.json[field.name] === 'string'
+											? (b.json[field.name] as string).toLowerCase()
+											: b.json[field.name];
+									lessThan = lt(_a, _b);
+								}
+								if (lessThan) {
+									result = -1 * field.dir;
+								} else {
+									result = 1 * field.dir;
+								}
+								break;
+							}
+						}
+						return result;
+					});
+				} else {
+					const code = this.getNodeParameter('code', 0) as string;
+					const regexCheck = /\breturn\b/g.exec(code);
+
+					if (regexCheck?.length) {
+						const sandbox = {
+							newItems,
+						};
+						const mode = this.getMode();
+						const options = {
+							console: mode === 'manual' ? 'redirect' : 'inherit',
+							sandbox,
+						};
+						const vm = new NodeVM(options as unknown as NodeVMOptions);
+
+						newItems = await vm.run(
+							`
+						module.exports = async function() {
+							newItems.sort( (a,b) => {
+								${code}
+							})
+							return newItems;
+						}()`,
+							__dirname,
+						);
+					} else {
+						throw new NodeOperationError(
+							this.getNode(),
+							"Sort code doesn't return. Please add a 'return' statement to your code",
+						);
+					}
+				}
+				return this.prepareOutputData(newItems);
+			} else if (operation === 'limit') {
+				let newItems = items;
+				const maxItems = this.getNodeParameter('maxItems', 0) as number;
+				const keep = this.getNodeParameter('keep', 0) as string;
+
+				if (maxItems > items.length) {
+					return this.prepareOutputData(newItems);
+				}
+
+				if (keep === 'firstItems') {
+					newItems = items.slice(0, maxItems);
+				} else {
+					newItems = items.slice(items.length - maxItems, items.length);
+				}
+				return this.prepareOutputData(newItems);
+			} else if (operation === 'summarize') {
+				return summarize.execute.call(this, items);
+			} else {
+				throw new NodeOperationError(this.getNode(), `Operation '${operation}' is not recognized`);
+			}
+		} else {
+			throw new NodeOperationError(this.getNode(), `Resource '${resource}' is not recognized`);
+		}
+	}
+}
diff --git a/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
new file mode 100644
index 00000000000000..c3accbd330659e
--- /dev/null
+++ b/packages/nodes-base/nodes/ItemLists/V2/summarize.operation.ts
@@ -0,0 +1,614 @@
+import type {
+	GenericValue,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
+import { NodeOperationError } from 'n8n-workflow';
+
+import get from 'lodash.get';
+
+type AggregationType =
+	| 'append'
+	| 'average'
+	| 'concatenate'
+	| 'count'
+	| 'countUnique'
+	| 'max'
+	| 'min'
+	| 'sum';
+
+type Aggregation = {
+	aggregation: AggregationType;
+	field: string;
+	includeEmpty?: boolean;
+	separateBy?: string;
+	customSeparator?: string;
+};
+
+type Aggregations = Aggregation[];
+
+enum AggregationDisplayNames {
+	append = 'appended_',
+	average = 'average_',
+	concatenate = 'concatenated_',
+	count = 'count_',
+	countUnique = 'unique_count_',
+	max = 'max_',
+	min = 'min_',
+	sum = 'sum_',
+}
+
+const NUMERICAL_AGGREGATIONS = ['average', 'max', 'min', 'sum'];
+
+type SummarizeOptions = {
+	disableDotNotation?: boolean;
+	outputFormat?: 'separateItems' | 'singleItem';
+	skipEmptySplitFields?: boolean;
+};
+
+type ValueGetterFn = (
+	item: IDataObject,
+	field: string,
+) => IDataObject | IDataObject[] | GenericValue | GenericValue[];
+
+export const description: INodeProperties[] = [
+	{
+		displayName: 'Fields to Summarize',
+		name: 'fieldsToSummarize',
+		type: 'fixedCollection',
+		placeholder: 'Add Field',
+		default: { values: [{ aggregation: 'count', field: '' }] },
+		typeOptions: {
+			multipleValues: true,
+		},
+		options: [
+			{
+				displayName: '',
+				name: 'values',
+				values: [
+					{
+						displayName: 'Aggregation',
+						name: 'aggregation',
+						type: 'options',
+						options: [
+							{
+								name: 'Append',
+								value: 'append',
+							},
+							{
+								name: 'Average',
+								value: 'average',
+							},
+							{
+								name: 'Concatenate',
+								value: 'concatenate',
+							},
+							{
+								name: 'Count',
+								value: 'count',
+							},
+							{
+								name: 'Count Unique',
+								value: 'countUnique',
+							},
+							{
+								name: 'Max',
+								value: 'max',
+							},
+							{
+								name: 'Min',
+								value: 'min',
+							},
+							{
+								name: 'Sum',
+								value: 'sum',
+							},
+						],
+						default: 'count',
+						description: 'How to combine the values of the field you want to summarize',
+					},
+					//field repeated to have different descriptions for different aggregations --------------------------------
+					{
+						displayName: 'Field',
+						name: 'field',
+						type: 'string',
+						default: '',
+						description: 'The name of an input field that you want to summarize',
+						placeholder: 'e.g. cost',
+						hint: ' Enter the field name as text',
+						displayOptions: {
+							hide: {
+								aggregation: [...NUMERICAL_AGGREGATIONS, 'countUnique', 'count'],
+							},
+						},
+						requiresDataPath: 'single',
+					},
+					{
+						displayName: 'Field',
+						name: 'field',
+						type: 'string',
+						default: '',
+						description:
+							'The name of an input field that you want to summarize. The field should contain numerical values; null, undefined, empty strings would be ignored.',
+						placeholder: 'e.g. cost',
+						hint: ' Enter the field name as text',
+						displayOptions: {
+							show: {
+								aggregation: NUMERICAL_AGGREGATIONS,
+							},
+						},
+						requiresDataPath: 'single',
+					},
+					{
+						displayName: 'Field',
+						name: 'field',
+						type: 'string',
+						default: '',
+						description:
+							'The name of an input field that you want to summarize; null, undefined, empty strings would be ignored',
+						placeholder: 'e.g. cost',
+						hint: ' Enter the field name as text',
+						displayOptions: {
+							show: {
+								aggregation: ['countUnique', 'count'],
+							},
+						},
+						requiresDataPath: 'single',
+					},
+					// ----------------------------------------------------------------------------------------------------------
+					{
+						displayName: 'Include Empty Values',
+						name: 'includeEmpty',
+						type: 'boolean',
+						default: false,
+						displayOptions: {
+							show: {
+								aggregation: ['append', 'concatenate'],
+							},
+						},
+					},
+					{
+						displayName: 'Separator',
+						name: 'separateBy',
+						type: 'options',
+						default: ',',
+						// eslint-disable-next-line n8n-nodes-base/node-param-options-type-unsorted-items
+						options: [
+							{
+								name: 'Comma',
+								value: ',',
+							},
+							{
+								name: 'Comma and Space',
+								value: ', ',
+							},
+							{
+								name: 'New Line',
+								value: '\n',
+							},
+							{
+								name: 'None',
+								value: '',
+							},
+							{
+								name: 'Space',
+								value: ' ',
+							},
+							{
+								name: 'Other',
+								value: 'other',
+							},
+						],
+						hint: 'What to insert between values',
+						displayOptions: {
+							show: {
+								aggregation: ['concatenate'],
+							},
+						},
+					},
+					{
+						displayName: 'Custom Separator',
+						name: 'customSeparator',
+						type: 'string',
+						default: '',
+						displayOptions: {
+							show: {
+								aggregation: ['concatenate'],
+								separateBy: ['other'],
+							},
+						},
+					},
+				],
+			},
+		],
+		displayOptions: {
+			show: {
+				resource: ['itemList'],
+				operation: ['summarize'],
+			},
+		},
+	},
+	// fieldsToSplitBy repeated to have different displayName for singleItem and separateItems -----------------------------
+	{
+		displayName: 'Fields to Split By',
+		name: 'fieldsToSplitBy',
+		type: 'string',
+		placeholder: 'e.g. country, city',
+		default: '',
+		description: 'The name of the input fields that you want to split the summary by',
+		hint: 'Enter the name of the fields as text (separated by commas)',
+		displayOptions: {
+			show: {
+				resource: ['itemList'],
+				operation: ['summarize'],
+			},
+			hide: {
+				'/options.outputFormat': ['singleItem'],
+			},
+		},
+		requiresDataPath: 'multiple',
+	},
+	{
+		displayName: 'Fields to Group By',
+		name: 'fieldsToSplitBy',
+		type: 'string',
+		placeholder: 'e.g. country, city',
+		default: '',
+		description: 'The name of the input fields that you want to split the summary by',
+		hint: 'Enter the name of the fields as text (separated by commas)',
+		displayOptions: {
+			show: {
+				resource: ['itemList'],
+				operation: ['summarize'],
+				'/options.outputFormat': ['singleItem'],
+			},
+		},
+		requiresDataPath: 'multiple',
+	},
+	// ----------------------------------------------------------------------------------------------------------
+	{
+		displayName: 'Options',
+		name: 'options',
+		type: 'collection',
+		placeholder: 'Add Option',
+		default: {},
+		displayOptions: {
+			show: {
+				resource: ['itemList'],
+				operation: ['summarize'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Disable Dot Notation',
+				name: 'disableDotNotation',
+				type: 'boolean',
+				default: false,
+				description:
+					'Whether to disallow referencing child fields using `parent.child` in the field name',
+			},
+			{
+				displayName: 'Output Format',
+				name: 'outputFormat',
+				type: 'options',
+				default: 'separateItems',
+				options: [
+					{
+						name: 'Each Split in a Separate Item',
+						value: 'separateItems',
+					},
+					{
+						name: 'All Splits in a Single Item',
+						value: 'singleItem',
+					},
+				],
+			},
+			{
+				// eslint-disable-next-line n8n-nodes-base/node-param-display-name-miscased
+				displayName: 'Ignore items without valid fields to group by',
+				name: 'skipEmptySplitFields',
+				type: 'boolean',
+				default: false,
+			},
+		],
+	},
+];
+
+function isEmpty<T>(value: T) {
+	return value === undefined || value === null || value === '';
+}
+
+function parseReturnData(returnData: IDataObject) {
+	const regexBrackets = /[\]\["]/g;
+	const regexSpaces = /[ .]/g;
+	for (const key of Object.keys(returnData)) {
+		if (key.match(regexBrackets)) {
+			const newKey = key.replace(regexBrackets, '');
+			returnData[newKey] = returnData[key];
+			delete returnData[key];
+		}
+	}
+	for (const key of Object.keys(returnData)) {
+		if (key.match(regexSpaces)) {
+			const newKey = key.replace(regexSpaces, '_');
+			returnData[newKey] = returnData[key];
+			delete returnData[key];
+		}
+	}
+}
+
+function parseFieldName(fieldName: string[]) {
+	const regexBrackets = /[\]\["]/g;
+	const regexSpaces = /[ .]/g;
+	fieldName = fieldName.map((field) => {
+		field = field.replace(regexBrackets, '');
+		field = field.replace(regexSpaces, '_');
+		return field;
+	});
+	return fieldName;
+}
+
+const fieldValueGetter = (disableDotNotation?: boolean) => {
+	if (disableDotNotation) {
+		return (item: IDataObject, field: string) => item[field];
+	} else {
+		return (item: IDataObject, field: string) => get(item, field);
+	}
+};
+
+function checkIfFieldExists(
+	this: IExecuteFunctions,
+	items: IDataObject[],
+	aggregations: Aggregations,
+	getValue: ValueGetterFn,
+) {
+	for (const aggregation of aggregations) {
+		if (aggregation.field === '') {
+			continue;
+		}
+		const exist = items.some((item) => getValue(item, aggregation.field) !== undefined);
+		if (!exist) {
+			throw new NodeOperationError(
+				this.getNode(),
+				`The field '${aggregation.field}' does not exist in any items`,
+			);
+		}
+	}
+}
+
+function aggregate(items: IDataObject[], entry: Aggregation, getValue: ValueGetterFn) {
+	const { aggregation, field } = entry;
+	let data = [...items];
+
+	if (NUMERICAL_AGGREGATIONS.includes(aggregation)) {
+		data = data.filter(
+			(item) => typeof getValue(item, field) === 'number' && !isEmpty(getValue(item, field)),
+		);
+	}
+
+	switch (aggregation) {
+		//combine operations
+		case 'append':
+			if (!entry.includeEmpty) {
+				data = data.filter((item) => !isEmpty(getValue(item, field)));
+			}
+			return data.map((item) => getValue(item, field));
+		case 'concatenate':
+			const separateBy = entry.separateBy === 'other' ? entry.customSeparator : entry.separateBy;
+			if (!entry.includeEmpty) {
+				data = data.filter((item) => !isEmpty(getValue(item, field)));
+			}
+			return data
+				.map((item) => {
+					let value = getValue(item, field);
+					if (typeof value === 'object') {
+						value = JSON.stringify(value);
+					}
+					if (typeof value === 'undefined') {
+						value = 'undefined';
+					}
+
+					return value;
+				})
+				.join(separateBy);
+
+		//numerical operations
+		case 'average':
+			return (
+				data.reduce((acc, item) => {
+					return acc + (getValue(item, field) as number);
+				}, 0) / data.length
+			);
+		case 'sum':
+			return data.reduce((acc, item) => {
+				return acc + (getValue(item, field) as number);
+			}, 0);
+		case 'min':
+			return Math.min(
+				...(data.map((item) => {
+					return getValue(item, field);
+				}) as number[]),
+			);
+		case 'max':
+			return Math.max(
+				...(data.map((item) => {
+					return getValue(item, field);
+				}) as number[]),
+			);
+
+		//count operations
+		case 'countUnique':
+			return new Set(data.map((item) => getValue(item, field)).filter((item) => !isEmpty(item)))
+				.size;
+		default:
+			//count by default
+			return data.filter((item) => !isEmpty(getValue(item, field))).length;
+	}
+}
+
+function aggregateData(
+	data: IDataObject[],
+	fieldsToSummarize: Aggregations,
+	options: SummarizeOptions,
+	getValue: ValueGetterFn,
+) {
+	const returnData = fieldsToSummarize.reduce((acc, aggregation) => {
+		acc[`${AggregationDisplayNames[aggregation.aggregation]}${aggregation.field}`] = aggregate(
+			data,
+			aggregation,
+			getValue,
+		);
+		return acc;
+	}, {} as IDataObject);
+	parseReturnData(returnData);
+	if (options.outputFormat === 'singleItem') {
+		parseReturnData(returnData);
+		return returnData;
+	} else {
+		return { ...returnData, pairedItems: data.map((item) => item._itemIndex as number) };
+	}
+}
+
+function splitData(
+	splitKeys: string[],
+	data: IDataObject[],
+	fieldsToSummarize: Aggregations,
+	options: SummarizeOptions,
+	getValue: ValueGetterFn,
+) {
+	if (!splitKeys || splitKeys.length === 0) {
+		return aggregateData(data, fieldsToSummarize, options, getValue);
+	}
+
+	const [firstSplitKey, ...restSplitKeys] = splitKeys;
+
+	const groupedData = data.reduce((acc, item) => {
+		let keyValuee = getValue(item, firstSplitKey) as string;
+
+		if (typeof keyValuee === 'object') {
+			keyValuee = JSON.stringify(keyValuee);
+		}
+
+		if (options.skipEmptySplitFields && typeof keyValuee !== 'number' && !keyValuee) {
+			return acc;
+		}
+
+		if (acc[keyValuee] === undefined) {
+			acc[keyValuee] = [item];
+		} else {
+			(acc[keyValuee] as IDataObject[]).push(item);
+		}
+		return acc;
+	}, {} as IDataObject);
+
+	return Object.keys(groupedData).reduce((acc, key) => {
+		const value = groupedData[key] as IDataObject[];
+		acc[key] = splitData(restSplitKeys, value, fieldsToSummarize, options, getValue);
+		return acc;
+	}, {} as IDataObject);
+}
+
+function aggregationToArray(
+	aggregationResult: IDataObject,
+	fieldsToSplitBy: string[],
+	previousStage: IDataObject = {},
+) {
+	const returnData: IDataObject[] = [];
+	fieldsToSplitBy = parseFieldName(fieldsToSplitBy);
+	const splitFieldName = fieldsToSplitBy[0];
+	const isNext = fieldsToSplitBy[1];
+
+	if (isNext === undefined) {
+		for (const fieldName of Object.keys(aggregationResult)) {
+			returnData.push({
+				...previousStage,
+				[splitFieldName]: fieldName,
+				...(aggregationResult[fieldName] as IDataObject),
+			});
+		}
+		return returnData;
+	} else {
+		for (const key of Object.keys(aggregationResult)) {
+			returnData.push(
+				...aggregationToArray(aggregationResult[key] as IDataObject, fieldsToSplitBy.slice(1), {
+					...previousStage,
+					[splitFieldName]: key,
+				}),
+			);
+		}
+		return returnData;
+	}
+}
+
+export async function execute(
+	this: IExecuteFunctions,
+	items: INodeExecutionData[],
+): Promise<INodeExecutionData[][]> {
+	const newItems = items.map(({ json }, i) => ({ ...json, _itemIndex: i }));
+
+	const options = this.getNodeParameter('options', 0, {}) as SummarizeOptions;
+
+	const fieldsToSplitBy = (this.getNodeParameter('fieldsToSplitBy', 0, '') as string)
+		.split(',')
+		.map((field) => field.trim())
+		.filter((field) => field);
+
+	const fieldsToSummarize = this.getNodeParameter(
+		'fieldsToSummarize.values',
+		0,
+		[],
+	) as Aggregations;
+
+	if (fieldsToSummarize.filter((aggregation) => aggregation.field !== '').length === 0) {
+		throw new NodeOperationError(
+			this.getNode(),
+			"You need to add at least one aggregation to 'Fields to Summarize' with non empty 'Field'",
+		);
+	}
+
+	const getValue = fieldValueGetter(options.disableDotNotation);
+
+	checkIfFieldExists.call(this, newItems, fieldsToSummarize, getValue);
+
+	const aggregationResult = splitData(
+		fieldsToSplitBy,
+		newItems,
+		fieldsToSummarize,
+		options,
+		getValue,
+	);
+
+	if (options.outputFormat === 'singleItem') {
+		const executionData: INodeExecutionData = {
+			json: aggregationResult,
+			pairedItem: newItems.map((_v, index) => ({
+				item: index,
+			})),
+		};
+		return this.prepareOutputData([executionData]);
+	} else {
+		if (!fieldsToSplitBy.length) {
+			const { pairedItems, ...json } = aggregationResult;
+			const executionData: INodeExecutionData = {
+				json,
+				pairedItem: ((pairedItems as number[]) || []).map((index: number) => ({
+					item: index,
+				})),
+			};
+			return this.prepareOutputData([executionData]);
+		}
+		const returnData = aggregationToArray(aggregationResult, fieldsToSplitBy);
+		const executionData = returnData.map((item) => {
+			const { pairedItems, ...json } = item;
+			return {
+				json,
+				pairedItem: ((pairedItems as number[]) || []).map((index: number) => ({
+					item: index,
+				})),
+			};
+		});
+		return this.prepareOutputData(executionData);
+	}
+}

From eac4275a7ebfa6ccc6258261b1b3ac36c9df9d88 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 1 Mar 2023 14:02:34 +0300
Subject: [PATCH 306/358] fix: Stop showing mapping hint after mapping (#5586)

* fix: Stop showing mapping hint after mapping

* fix: set value correctly

* chore: clean up mapping hint code
---
 packages/editor-ui/src/Interface.ts           |  1 +
 .../editor-ui/src/components/InputPanel.vue   |  5 +---
 .../src/components/ParameterInputFull.vue     | 10 +++----
 packages/editor-ui/src/components/RunData.vue |  5 ----
 .../editor-ui/src/components/RunDataJson.vue  | 29 -------------------
 packages/editor-ui/src/constants.ts           |  2 +-
 packages/editor-ui/src/stores/ndv.ts          |  7 ++++-
 7 files changed, 13 insertions(+), 46 deletions(-)

diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index d799e82fddd26c..6d56eaad9798c4 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1119,6 +1119,7 @@ export interface NDVState {
 		canDrop: boolean;
 		stickyPosition: null | XYPosition;
 	};
+	isMappingOnboarded: boolean;
 }
 
 export interface UIState {
diff --git a/packages/editor-ui/src/components/InputPanel.vue b/packages/editor-ui/src/components/InputPanel.vue
index 5ed330d808da23..589ccb95e65173 100644
--- a/packages/editor-ui/src/components/InputPanel.vue
+++ b/packages/editor-ui/src/components/InputPanel.vue
@@ -11,7 +11,6 @@
 		:sessionId="sessionId"
 		:overrideOutputs="connectedCurrentNodeOutputs"
 		:mappingEnabled="!readOnly"
-		:showMappingHint="draggableHintShown"
 		:distanceFromActive="currentNodeDepth"
 		:isProductionExecutionPreview="isProductionExecutionPreview"
 		paneType="input"
@@ -142,9 +141,7 @@ import WireMeUp from './WireMeUp.vue';
 import {
 	CRON_NODE_TYPE,
 	INTERVAL_NODE_TYPE,
-	LOCAL_STORAGE_MAPPING_FLAG,
 	MANUAL_TRIGGER_NODE_TYPE,
-	SCHEDULE_TRIGGER_NODE_TYPE,
 	START_NODE_TYPE,
 } from '@/constants';
 import { mapStores } from 'pinia';
@@ -192,7 +189,7 @@ export default mixins(workflowHelpers).extend({
 			return this.ndvStore.focusedMappableInput;
 		},
 		isUserOnboarded(): boolean {
-			return window.localStorage.getItem(LOCAL_STORAGE_MAPPING_FLAG) === 'true';
+			return this.ndvStore.isMappingOnboarded;
 		},
 		showDraggableHint(): boolean {
 			const toIgnore = [
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index d6d8e809bd7466..515e7e66602ea9 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -77,7 +77,6 @@ import ParameterOptions from '@/components/ParameterOptions.vue';
 import DraggableTarget from '@/components/DraggableTarget.vue';
 import mixins from 'vue-typed-mixins';
 import { showMessage } from '@/mixins/showMessage';
-import { LOCAL_STORAGE_MAPPING_FLAG } from '@/constants';
 import {
 	hasExpressionMapping,
 	isResourceLocatorValue,
@@ -106,7 +105,6 @@ export default mixins(showMessage, externalHooks).extend({
 			forceShowExpression: false,
 			dataMappingTooltipButtons: [] as IN8nButton[],
 			mappingTooltipEnabled: false,
-			localStorageMappingFlag: window.localStorage.getItem(LOCAL_STORAGE_MAPPING_FLAG) === 'true',
 		};
 	},
 	props: {
@@ -187,10 +185,10 @@ export default mixins(showMessage, externalHooks).extend({
 		showMappingTooltip(): boolean {
 			return (
 				this.mappingTooltipEnabled &&
+				!this.ndvStore.isMappingOnboarded &&
 				this.focused &&
 				this.isInputTypeString &&
-				!this.isInputDataEmpty &&
-				!this.localStorageMappingFlag
+				!this.isInputDataEmpty
 			);
 		},
 	},
@@ -306,14 +304,14 @@ export default mixins(showMessage, externalHooks).extend({
 
 					this.$emit('valueChanged', parameterData);
 
-					if (window.localStorage.getItem(LOCAL_STORAGE_MAPPING_FLAG) !== 'true') {
+					if (!this.ndvStore.isMappingOnboarded) {
 						this.$showMessage({
 							title: this.$locale.baseText('dataMapping.success.title'),
 							message: this.$locale.baseText('dataMapping.success.moreInfo'),
 							type: 'success',
 						});
 
-						window.localStorage.setItem(LOCAL_STORAGE_MAPPING_FLAG, 'true');
+						this.ndvStore.disableMappingHint();
 					}
 
 					this.ndvStore.setMappingTelemetry({
diff --git a/packages/editor-ui/src/components/RunData.vue b/packages/editor-ui/src/components/RunData.vue
index d44ddd8c7982fd..cc33d9936cc719 100644
--- a/packages/editor-ui/src/components/RunData.vue
+++ b/packages/editor-ui/src/components/RunData.vue
@@ -295,7 +295,6 @@
 				:inputData="inputData"
 				:mappingEnabled="mappingEnabled"
 				:distanceFromActive="distanceFromActive"
-				:showMappingHint="showMappingHint"
 				:runIndex="runIndex"
 				:pageOffset="currentPageOffset"
 				:totalRuns="maxRunIndex"
@@ -315,7 +314,6 @@
 				:inputData="inputData"
 				:mappingEnabled="mappingEnabled"
 				:distanceFromActive="distanceFromActive"
-				:showMappingHint="showMappingHint"
 				:runIndex="runIndex"
 				:totalRuns="maxRunIndex"
 			/>
@@ -565,9 +563,6 @@ export default mixins(externalHooks, genericHelpers, nodeHelpers, pinData).exten
 		distanceFromActive: {
 			type: Number,
 		},
-		showMappingHint: {
-			type: Boolean,
-		},
 		blockUI: {
 			type: Boolean,
 			default: false,
diff --git a/packages/editor-ui/src/components/RunDataJson.vue b/packages/editor-ui/src/components/RunDataJson.vue
index 97f5d365a97353..eb85ce952472b1 100644
--- a/packages/editor-ui/src/components/RunDataJson.vue
+++ b/packages/editor-ui/src/components/RunDataJson.vue
@@ -70,7 +70,6 @@
 import { PropType } from 'vue';
 import mixins from 'vue-typed-mixins';
 import VueJsonPretty from 'vue-json-pretty';
-import { LOCAL_STORAGE_MAPPING_FLAG } from '@/constants';
 import { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import Draggable from '@/components/Draggable.vue';
 import { executionDataToJson, isString, shorten } from '@/utils';
@@ -114,9 +113,6 @@ export default mixins(externalHooks).extend({
 		distanceFromActive: {
 			type: Number,
 		},
-		showMappingHint: {
-			type: Boolean,
-		},
 		runIndex: {
 			type: Number,
 		},
@@ -127,40 +123,15 @@ export default mixins(externalHooks).extend({
 	data() {
 		return {
 			selectedJsonPath: null as null | string,
-			mappingHintVisible: false,
-			showHintWithDelay: false,
 			draggingPath: null as null | string,
 			displayMode: 'json',
 		};
 	},
-	mounted() {
-		if (this.showMappingHint) {
-			this.mappingHintVisible = true;
-
-			setTimeout(() => {
-				this.mappingHintVisible = false;
-			}, 6000);
-		}
-
-		if (this.showMappingHint && this.showHint) {
-			setTimeout(() => {
-				this.showHintWithDelay = this.showHint;
-				this.$telemetry.track('User viewed JSON mapping tooltip', { type: 'param focus' });
-			}, 500);
-		}
-	},
 	computed: {
 		...mapStores(useNDVStore, useWorkflowsStore),
 		jsonData(): IDataObject[] {
 			return executionDataToJson(this.inputData);
 		},
-		showHint(): boolean {
-			return (
-				!this.draggingPath &&
-				((this.showMappingHint && this.mappingHintVisible) ||
-					window.localStorage.getItem(LOCAL_STORAGE_MAPPING_FLAG) !== 'true')
-			);
-		},
 	},
 	methods: {
 		getShortKey(el: HTMLElement): string {
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index f058b7a2ab6312..8dc8124244c051 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -306,7 +306,7 @@ export const VALID_EMAIL_REGEX =
 export const LOCAL_STORAGE_ACTIVATION_FLAG = 'N8N_HIDE_ACTIVATION_ALERT';
 export const LOCAL_STORAGE_PIN_DATA_DISCOVERY_NDV_FLAG = 'N8N_PIN_DATA_DISCOVERY_NDV';
 export const LOCAL_STORAGE_PIN_DATA_DISCOVERY_CANVAS_FLAG = 'N8N_PIN_DATA_DISCOVERY_CANVAS';
-export const LOCAL_STORAGE_MAPPING_FLAG = 'N8N_MAPPING_ONBOARDED';
+export const LOCAL_STORAGE_MAPPING_IS_ONBOARDED = 'N8N_MAPPING_ONBOARDED';
 export const LOCAL_STORAGE_MAIN_PANEL_RELATIVE_WIDTH = 'N8N_MAIN_PANEL_RELATIVE_WIDTH';
 export const LOCAL_STORAGE_THEME = 'N8N_THEME';
 export const BASE_NODE_SURVEY_URL = 'https://n8n-community.typeform.com/to/BvmzxqYv#nodename=';
diff --git a/packages/editor-ui/src/stores/ndv.ts b/packages/editor-ui/src/stores/ndv.ts
index 79d0550c1986aa..f9b8497810a85f 100644
--- a/packages/editor-ui/src/stores/ndv.ts
+++ b/packages/editor-ui/src/stores/ndv.ts
@@ -1,4 +1,4 @@
-import { STORES } from '@/constants';
+import { LOCAL_STORAGE_MAPPING_IS_ONBOARDED, STORES } from '@/constants';
 import { INodeUi, IRunDataDisplayMode, NDVState, NodePanelType, XYPosition } from '@/Interface';
 import { IRunData } from 'n8n-workflow';
 import { defineStore } from 'pinia';
@@ -40,6 +40,7 @@ export const useNDVStore = defineStore(STORES.NDV, {
 			canDrop: false,
 			stickyPosition: null,
 		},
+		isMappingOnboarded: window.localStorage.getItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED) === 'true',
 	}),
 	getters: {
 		activeNode(): INodeUi | null {
@@ -184,5 +185,9 @@ export const useNDVStore = defineStore(STORES.NDV, {
 		setNDVPanelDataIsEmpty(payload: { panel: 'input' | 'output'; isEmpty: boolean }): void {
 			Vue.set(this[payload.panel].data, 'isEmpty', payload.isEmpty);
 		},
+		disableMappingHint() {
+			this.isMappingOnboarded = true;
+			window.localStorage.setItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED, 'true');
+		},
 	},
 });

From 91bd0146f35ba3f38c862cac9c5ad48ff7cd38e8 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Wed, 1 Mar 2023 14:13:15 +0300
Subject: [PATCH 307/358] feat: Add distribution test tracking (#5588)

---
 packages/editor-ui/src/constants.ts | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 8dc8124244c051..3ec49d329f4c24 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -520,4 +520,14 @@ export const ONBOARDING_EXPERIMENT = {
 	variant: 'variant',
 };
 
-export const EXPERIMENTS_TO_TRACK = [ASSUMPTION_EXPERIMENT.name, ONBOARDING_EXPERIMENT.name];
+export const DISTRIBUTION_EXPERIMENT = {
+	name: '001_distribution_test',
+	control: 'control',
+	variant: 'variant',
+};
+
+export const EXPERIMENTS_TO_TRACK = [
+	DISTRIBUTION_EXPERIMENT.name,
+	ASSUMPTION_EXPERIMENT.name,
+	ONBOARDING_EXPERIMENT.name,
+];

From f3c943ef8191bd16e16a61ffbed6b1caca0d75a5 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 1 Mar 2023 14:47:09 +0000
Subject: [PATCH 308/358] feat(Telegram Node): Add Parse Mode to Send Document
 operation (#5554)

---
 packages/nodes-base/nodes/Telegram/Telegram.node.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 8a0b228214780a..1a35902433e12a 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -1579,6 +1579,7 @@ export class Telegram implements INodeType {
 									'sendMessage',
 									'sendPhoto',
 									'sendVideo',
+									'sendDocument',
 								],
 							},
 						},

From f61d779667f25a411b51ee61ddd3fe4698f05934 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Wed, 1 Mar 2023 18:14:07 +0100
Subject: [PATCH 309/358] feat(Jira Software Node): Support binary streaming
 for very large binary files (#5589)

Move from buffer to binary streaming
---
 packages/nodes-base/nodes/Jira/Jira.node.ts | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 65393eeff5d82c..884e2f7cbfd385 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1,6 +1,8 @@
+import type { Readable } from 'stream';
 import mergeWith from 'lodash.mergewith';
 
 import type { IExecuteFunctions } from 'n8n-core';
+import { BINARY_ENCODING } from 'n8n-core';
 
 import type {
 	IBinaryKeyData,
@@ -1061,12 +1063,9 @@ export class Jira implements INodeType {
 							itemIndex: i,
 						});
 					}
-
+					let uploadData: Buffer | Readable;
 					const item = items[i].binary as IBinaryKeyData;
-
 					const binaryData = item[binaryPropertyName];
-					const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
-
 					if (binaryData === undefined) {
 						throw new NodeOperationError(
 							this.getNode(),
@@ -1075,6 +1074,12 @@ export class Jira implements INodeType {
 						);
 					}
 
+					if (binaryData.id) {
+						uploadData = this.helpers.getBinaryStream(binaryData.id);
+					} else {
+						uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
+					}
+
 					responseData = await jiraSoftwareCloudApiRequest.call(
 						this,
 						`/api/${apiVersion}/issue/${issueKey}/attachments`,
@@ -1085,7 +1090,7 @@ export class Jira implements INodeType {
 						{
 							formData: {
 								file: {
-									value: binaryDataBuffer,
+									value: uploadData,
 									options: {
 										filename: binaryData.fileName,
 									},
@@ -1154,7 +1159,7 @@ export class Jira implements INodeType {
 							{},
 							{},
 							attachment?.json.content as string,
-							{ json: false, encoding: null },
+							{ json: false, encoding: null, useStream: true },
 						);
 
 						(returnData[index].binary as IBinaryKeyData)[binaryPropertyName] =
@@ -1205,7 +1210,7 @@ export class Jira implements INodeType {
 							{},
 							{},
 							attachment.json.content as string,
-							{ json: false, encoding: null },
+							{ json: false, encoding: null, useStream: true },
 						);
 						(returnData[index].binary as IBinaryKeyData)[binaryPropertyName] =
 							await this.helpers.prepareBinaryData(

From 31cc8de8297454cad4307e008b3b915475c0a889 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Thu, 2 Mar 2023 09:00:51 +0100
Subject: [PATCH 310/358] feat(core): Add SAML settings and consolidate LDAP
 under SSO (#5574)

* consolidate SSO settings

* update saml settings

* fix type error
---
 packages/cli/src/Interfaces.ts                | 12 ++++++---
 packages/cli/src/Ldap/constants.ts            |  4 +--
 packages/cli/src/Server.ts                    | 23 ++++++++++++----
 packages/cli/src/config/schema.ts             | 26 +++++++++---------
 packages/cli/src/sso/saml/constants.ts        |  6 +++++
 .../saml/middleware/samlEnabledMiddleware.ts  |  4 +--
 .../routes/saml.controller.protected.ee.ts    | 18 +++++++------
 packages/cli/src/sso/saml/saml.service.ee.ts  | 27 ++++++++++---------
 packages/cli/src/sso/saml/samlHelpers.ts      | 27 ++++++++++++++++---
 .../cli/src/sso/saml/types/samlPreferences.ts |  3 ++-
 packages/editor-ui/src/Interface.ts           | 16 ++++++++---
 packages/editor-ui/src/stores/settings.ts     | 18 ++++++++++---
 12 files changed, 128 insertions(+), 56 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index d1ea87ffac06e8..24f7f1f7550fcf 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -488,9 +488,15 @@ export interface IN8nUISettings {
 	personalizationSurveyEnabled: boolean;
 	defaultLocale: string;
 	userManagement: IUserManagementSettings;
-	ldap: {
-		loginLabel: string;
-		loginEnabled: boolean;
+	sso: {
+		saml: {
+			loginLabel: string;
+			loginEnabled: boolean;
+		};
+		ldap: {
+			loginLabel: string;
+			loginEnabled: boolean;
+		};
 	};
 	publicApi: IPublicApiSettings;
 	workflowTagsDisabled: boolean;
diff --git a/packages/cli/src/Ldap/constants.ts b/packages/cli/src/Ldap/constants.ts
index 630f4b6b77a457..3b7b369b80abf7 100644
--- a/packages/cli/src/Ldap/constants.ts
+++ b/packages/cli/src/Ldap/constants.ts
@@ -4,9 +4,9 @@ export const LDAP_FEATURE_NAME = 'features.ldap';
 
 export const LDAP_ENABLED = 'enterprise.features.ldap';
 
-export const LDAP_LOGIN_LABEL = 'ldap.loginLabel';
+export const LDAP_LOGIN_LABEL = 'sso.ldap.loginLabel';
 
-export const LDAP_LOGIN_ENABLED = 'ldap.loginEnabled';
+export const LDAP_LOGIN_ENABLED = 'sso.ldap.loginEnabled';
 
 export const BINARY_AD_ATTRIBUTES = ['objectGUID', 'objectSid'];
 
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 13cb901ac64d19..af3a5b5e56482b 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -145,7 +145,7 @@ import { eventBus } from './eventbus';
 import { Container } from 'typedi';
 import { InternalHooks } from './InternalHooks';
 import { getStatusUsingPreviousExecutionStatusMethod } from './executions/executionHelpers';
-import { isSamlLicensed } from './sso/saml/samlHelpers';
+import { getSamlLoginLabel, isSamlLoginEnabled, isSamlLicensed } from './sso/saml/samlHelpers';
 import { samlControllerPublic } from './sso/saml/routes/saml.controller.public.ee';
 import { SamlService } from './sso/saml/saml.service.ee';
 import { samlControllerProtected } from './sso/saml/routes/saml.controller.protected.ee';
@@ -258,9 +258,15 @@ class Server extends AbstractServer {
 					config.getEnv('userManagement.skipInstanceOwnerSetup') === false,
 				smtpSetup: isEmailSetUp(),
 			},
-			ldap: {
-				loginEnabled: false,
-				loginLabel: '',
+			sso: {
+				saml: {
+					loginEnabled: false,
+					loginLabel: '',
+				},
+				ldap: {
+					loginEnabled: false,
+					loginLabel: '',
+				},
 			},
 			publicApi: {
 				enabled: !config.getEnv('publicApi.disabled'),
@@ -325,12 +331,19 @@ class Server extends AbstractServer {
 		});
 
 		if (isLdapEnabled()) {
-			Object.assign(this.frontendSettings.ldap, {
+			Object.assign(this.frontendSettings.sso.ldap, {
 				loginLabel: getLdapLoginLabel(),
 				loginEnabled: isLdapLoginEnabled(),
 			});
 		}
 
+		if (isSamlLicensed()) {
+			Object.assign(this.frontendSettings.sso.saml, {
+				loginLabel: getSamlLoginLabel(),
+				loginEnabled: isSamlLoginEnabled(),
+			});
+		}
+
 		if (config.get('nodes.packagesMissing').length > 0) {
 			this.frontendSettings.missingPackages = true;
 		}
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 78e728c33a6249..0ec5c9a623d43d 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1023,23 +1023,25 @@ export const schema = {
 			doc: 'Whether to automatically redirect users from login dialog to initialize SSO flow.',
 		},
 		saml: {
-			enabled: {
+			loginEnabled: {
 				format: Boolean,
 				default: false,
 				doc: 'Whether to enable SAML SSO.',
 			},
+			loginLabel: {
+				format: String,
+				default: '',
+			},
 		},
-	},
-
-	// TODO: move into sso settings
-	ldap: {
-		loginEnabled: {
-			format: Boolean,
-			default: false,
-		},
-		loginLabel: {
-			format: String,
-			default: '',
+		ldap: {
+			loginEnabled: {
+				format: Boolean,
+				default: false,
+			},
+			loginLabel: {
+				format: String,
+				default: '',
+			},
 		},
 	},
 
diff --git a/packages/cli/src/sso/saml/constants.ts b/packages/cli/src/sso/saml/constants.ts
index 16565fa712c05c..715c20b932c981 100644
--- a/packages/cli/src/sso/saml/constants.ts
+++ b/packages/cli/src/sso/saml/constants.ts
@@ -23,3 +23,9 @@ export class SamlUrls {
 }
 
 export const SAML_PREFERENCES_DB_KEY = 'features.saml';
+
+export const SAML_ENTERPRISE_FEATURE_ENABLED = 'enterprise.features.saml';
+
+export const SAML_LOGIN_LABEL = 'sso.saml.loginLabel';
+
+export const SAML_LOGIN_ENABLED = 'sso.saml.loginEnabled';
diff --git a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
index bcd1005e1fde9a..bf15030d836efe 100644
--- a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
+++ b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
@@ -1,7 +1,7 @@
 import type { RequestHandler } from 'express';
 import type { AuthenticatedRequest } from '../../../requests';
 import { isSamlCurrentAuthenticationMethod } from '../../ssoHelpers';
-import { isSamlEnabled, isSamlLicensed } from '../samlHelpers';
+import { isSamlLoginEnabled, isSamlLicensed } from '../samlHelpers';
 
 export const samlLicensedOwnerMiddleware: RequestHandler = (
 	req: AuthenticatedRequest,
@@ -16,7 +16,7 @@ export const samlLicensedOwnerMiddleware: RequestHandler = (
 };
 
 export const samlLicensedAndEnabledMiddleware: RequestHandler = (req, res, next) => {
-	if (isSamlEnabled() && isSamlLicensed() && isSamlCurrentAuthenticationMethod()) {
+	if (isSamlLoginEnabled() && isSamlLicensed() && isSamlCurrentAuthenticationMethod()) {
 		next();
 	} else {
 		res.status(401).json({ status: 'error', message: 'Unauthorized' });
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
index 9879cbe82c5b3e..5a4376f692e8aa 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
@@ -6,8 +6,9 @@ import {
 import { SamlService } from '../saml.service.ee';
 import { SamlUrls } from '../constants';
 import type { SamlConfiguration } from '../types/requests';
-import { AuthError } from '../../../ResponseHelper';
+import { AuthError, BadRequestError } from '@/ResponseHelper';
 import { issueCookie } from '../../../auth/jwt';
+import { isSamlPreferences } from '../samlHelpers';
 
 export const samlControllerProtected = express.Router();
 
@@ -18,8 +19,8 @@ export const samlControllerProtected = express.Router();
 samlControllerProtected.get(
 	SamlUrls.config,
 	samlLicensedOwnerMiddleware,
-	async (req: SamlConfiguration.Read, res: express.Response) => {
-		const prefs = await SamlService.getInstance().getSamlPreferences();
+	(req: SamlConfiguration.Read, res: express.Response) => {
+		const prefs = SamlService.getInstance().getSamlPreferences();
 		return res.send(prefs);
 	},
 );
@@ -32,11 +33,12 @@ samlControllerProtected.post(
 	SamlUrls.config,
 	samlLicensedOwnerMiddleware,
 	async (req: SamlConfiguration.Update, res: express.Response) => {
-		const result = await SamlService.getInstance().setSamlPreferences({
-			metadata: req.body.metadata,
-			mapping: req.body.mapping,
-		});
-		return res.send(result);
+		if (isSamlPreferences(req.body)) {
+			const result = await SamlService.getInstance().setSamlPreferences(req.body);
+			return res.send(result);
+		} else {
+			throw new BadRequestError('Body is not a SamlPreferences object');
+		}
 	},
 );
 
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index b5a2fe637b94ab..72dc3bf2c2c122 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -14,6 +14,10 @@ import { IdentityProvider } from 'samlify';
 import {
 	createUserFromSamlAttributes,
 	getMappedSamlAttributesFromFlowResult,
+	getSamlLoginLabel,
+	isSamlLoginEnabled,
+	setSamlLoginEnabled,
+	setSamlLoginLabel,
 	updateUserFromSamlAttributes,
 } from './samlHelpers';
 
@@ -142,16 +146,20 @@ export class SamlService {
 		return undefined;
 	}
 
-	async getSamlPreferences(): Promise<SamlPreferences> {
+	getSamlPreferences(): SamlPreferences {
 		return {
 			mapping: this.attributeMapping,
 			metadata: this.metadata,
+			loginEnabled: isSamlLoginEnabled(),
+			loginLabel: getSamlLoginLabel(),
 		};
 	}
 
 	async setSamlPreferences(prefs: SamlPreferences): Promise<void> {
 		this.attributeMapping = prefs.mapping;
 		this.metadata = prefs.metadata;
+		setSamlLoginEnabled(prefs.loginEnabled);
+		setSamlLoginLabel(prefs.loginLabel);
 		this.getIdentityProviderInstance(true);
 		await this.saveSamlPreferences();
 	}
@@ -163,10 +171,9 @@ export class SamlService {
 		if (samlPreferences) {
 			const prefs = jsonParse<SamlPreferences>(samlPreferences.value);
 			if (prefs) {
-				this.attributeMapping = prefs.mapping;
-				this.metadata = prefs.metadata;
+				await this.setSamlPreferences(prefs);
+				return prefs;
 			}
-			return prefs;
 		}
 		return;
 	}
@@ -175,20 +182,14 @@ export class SamlService {
 		const samlPreferences = await Db.collections.Settings.findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
+		const settingsValue = JSON.stringify(this.getSamlPreferences());
 		if (samlPreferences) {
-			samlPreferences.value = JSON.stringify({
-				mapping: this.attributeMapping,
-				metadata: this.metadata,
-			});
-			samlPreferences.loadOnStartup = true;
+			samlPreferences.value = settingsValue;
 			await Db.collections.Settings.save(samlPreferences);
 		} else {
 			await Db.collections.Settings.save({
 				key: SAML_PREFERENCES_DB_KEY,
-				value: JSON.stringify({
-					mapping: this.attributeMapping,
-					metadata: this.metadata,
-				}),
+				value: settingsValue,
 				loadOnStartup: true,
 			});
 		}
diff --git a/packages/cli/src/sso/saml/samlHelpers.ts b/packages/cli/src/sso/saml/samlHelpers.ts
index 20733e1fe5089a..c6c0c6c30fb889 100644
--- a/packages/cli/src/sso/saml/samlHelpers.ts
+++ b/packages/cli/src/sso/saml/samlHelpers.ts
@@ -9,24 +9,43 @@ import type { SamlPreferences } from './types/samlPreferences';
 import type { SamlUserAttributes } from './types/samlUserAttributes';
 import type { FlowResult } from 'samlify/types/src/flow';
 import type { SamlAttributeMapping } from './types/samlAttributeMapping';
+import { SAML_ENTERPRISE_FEATURE_ENABLED, SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
 /**
  *  Check whether the SAML feature is licensed and enabled in the instance
  */
-export function isSamlEnabled(): boolean {
-	return config.getEnv('sso.saml.enabled');
+export function isSamlLoginEnabled(): boolean {
+	return config.getEnv(SAML_LOGIN_ENABLED);
+}
+
+export function getSamlLoginLabel(): string {
+	return config.getEnv(SAML_LOGIN_LABEL);
+}
+
+export function setSamlLoginEnabled(enabled: boolean): void {
+	config.set(SAML_LOGIN_ENABLED, enabled);
+}
+
+export function setSamlLoginLabel(label: string): void {
+	config.set(SAML_LOGIN_LABEL, label);
 }
 
 export function isSamlLicensed(): boolean {
 	const license = getLicense();
 	return (
 		isUserManagementEnabled() &&
-		(license.isSamlEnabled() || config.getEnv('enterprise.features.saml'))
+		(license.isSamlEnabled() || config.getEnv(SAML_ENTERPRISE_FEATURE_ENABLED))
 	);
 }
 
 export const isSamlPreferences = (candidate: unknown): candidate is SamlPreferences => {
 	const o = candidate as SamlPreferences;
-	return typeof o === 'object' && typeof o.metadata === 'string' && typeof o.mapping === 'object';
+	return (
+		typeof o === 'object' &&
+		typeof o.metadata === 'string' &&
+		typeof o.mapping === 'object' &&
+		o.mapping !== null &&
+		o.loginEnabled !== undefined
+	);
 };
 
 export function generatePassword(): string {
diff --git a/packages/cli/src/sso/saml/types/samlPreferences.ts b/packages/cli/src/sso/saml/types/samlPreferences.ts
index d57f10b9ae3c6a..4edc58fc959020 100644
--- a/packages/cli/src/sso/saml/types/samlPreferences.ts
+++ b/packages/cli/src/sso/saml/types/samlPreferences.ts
@@ -3,5 +3,6 @@ import type { SamlAttributeMapping } from './samlAttributeMapping';
 export interface SamlPreferences {
 	mapping: SamlAttributeMapping;
 	metadata: string;
-	//TODO:SAML: add fields for separate SAML settins to generate metadata from
+	loginEnabled: boolean;
+	loginLabel: string;
 }
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 6d56eaad9798c4..8503e38759893f 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -766,9 +766,15 @@ export interface IN8nUISettings {
 			enabled: boolean;
 		};
 	};
-	ldap: {
-		loginLabel: string;
-		loginEnabled: boolean;
+	sso: {
+		saml: {
+			loginLabel: string;
+			loginEnabled: boolean;
+		};
+		ldap: {
+			loginLabel: string;
+			loginEnabled: boolean;
+		};
 	};
 	onboardingCallPromptEnabled: boolean;
 	allowedModules: {
@@ -1197,6 +1203,10 @@ export interface ISettingsState {
 		loginLabel: string;
 		loginEnabled: boolean;
 	};
+	saml: {
+		loginLabel: string;
+		loginEnabled: boolean;
+	};
 	onboardingCallPromptEnabled: boolean;
 	saveDataErrorExecution: string;
 	saveDataSuccessExecution: string;
diff --git a/packages/editor-ui/src/stores/settings.ts b/packages/editor-ui/src/stores/settings.ts
index 9fca2f63f9bcf7..07e374a6360138 100644
--- a/packages/editor-ui/src/stores/settings.ts
+++ b/packages/editor-ui/src/stores/settings.ts
@@ -24,7 +24,7 @@ import {
 	WorkflowCallerPolicyDefaultOption,
 	ILdapConfig,
 } from '@/Interface';
-import { ITelemetrySettings } from 'n8n-workflow';
+import { IDataObject, ITelemetrySettings } from 'n8n-workflow';
 import { defineStore } from 'pinia';
 import Vue from 'vue';
 import { useRootStore } from './n8nRootStore';
@@ -54,6 +54,10 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 			loginLabel: '',
 			loginEnabled: false,
 		},
+		saml: {
+			loginLabel: '',
+			loginEnabled: false,
+		},
 		onboardingCallPromptEnabled: false,
 		saveDataErrorExecution: 'all',
 		saveDataSuccessExecution: 'all',
@@ -87,6 +91,12 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 		ldapLoginLabel(): string {
 			return this.ldap.loginLabel;
 		},
+		isSamlLoginEnabled(): boolean {
+			return this.saml.loginEnabled;
+		},
+		samlLoginLabel(): string {
+			return this.saml.loginLabel;
+		},
 		showSetupPage(): boolean {
 			return this.userManagement.showSetupOnFirstLoad === true;
 		},
@@ -168,8 +178,10 @@ export const useSettingsStore = defineStore(STORES.SETTINGS, {
 			this.userManagement.smtpSetup = settings.userManagement.smtpSetup;
 			this.api = settings.publicApi;
 			this.onboardingCallPromptEnabled = settings.onboardingCallPromptEnabled;
-			this.ldap.loginEnabled = settings.ldap.loginEnabled;
-			this.ldap.loginLabel = settings.ldap.loginLabel;
+			this.ldap.loginEnabled = settings.sso.ldap.loginEnabled;
+			this.ldap.loginLabel = settings.sso.ldap.loginLabel;
+			this.saml.loginEnabled = settings.sso.saml.loginEnabled;
+			this.saml.loginLabel = settings.sso.saml.loginLabel;
 		},
 		async getSettings(): Promise<void> {
 			const rootStore = useRootStore();

From 1f7b478920ee2b8b4f6affcfd0b42f79b2cd8cd1 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 2 Mar 2023 15:02:29 +0300
Subject: [PATCH 311/358] fix: Fix mapping paths when appending to empty
 expression (#5591)

* fix: Fix mapping when appending to empty expression

* fix: refactor logic out

* test: add tests

* test: add tests

* fix: fix bug where value does not get updated when mapping

* test: add test for bug

* test: add test for bug
---
 cypress/e2e/14-mapping.cy.ts                  |  30 +++
 cypress/pages/ndv.ts                          |   3 +
 packages/design-system/src/types/button.ts    |   2 +
 .../editor-ui/src/components/Draggable.vue    |   6 +
 .../src/components/ParameterInputFull.vue     |  38 +---
 packages/editor-ui/src/stores/ndv.ts          |   6 +-
 .../src/utils/__tests__/mappingUtils.test.ts  | 202 ++++++++++++++++++
 .../src/utils/__tests__/typesUtils.test.ts    |   2 +-
 packages/editor-ui/src/utils/mappingUtils.ts  |  38 ++++
 9 files changed, 294 insertions(+), 33 deletions(-)
 create mode 100644 packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts

diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index ff6ee35a5222a9..c30f2d0521037d 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -262,4 +262,34 @@ describe('Data mapping', () => {
 			.find('input')
 			.should('have.value', 'input[0]["hello.world"]["my count"]');
 	});
+
+	it('maps expressions to updated fields correctly', () => {
+		cy.fixture('Test_workflow_3.json').then((data) => {
+			cy.get('body').paste(JSON.stringify(data));
+		});
+
+		workflowPage.actions.openNode('Set');
+
+		ndv.actions.typeIntoParameterInput('value', 'delete me');
+		ndv.actions.dismissMappingTooltip();
+
+		ndv.actions.typeIntoParameterInput('name', 'test');
+
+		ndv.actions.typeIntoParameterInput('value', 'fun');
+		ndv.actions.clearParameterInput('value'); // keep focus on param
+
+		ndv.getters.inputDataContainer().should('exist').find('span').contains('count').realMouseDown();
+
+		ndv.actions.mapToParameter('value');
+		ndv.getters.inlineExpressionEditorInput().should('have.text', '{{ $json.input[0].count }}');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0');
+
+		ndv.getters.inputDataContainer().find('span').contains('input').realMouseDown();
+
+		ndv.actions.mapToParameter('value');
+		ndv.getters
+			.inlineExpressionEditorInput()
+			.should('have.text', '{{ $json.input[0].count }} {{ $json.input }}');
+		ndv.getters.parameterExpressionPreview('value').should('include.text', '0 [object Object]');
+	});
 });
diff --git a/cypress/pages/ndv.ts b/cypress/pages/ndv.ts
index 94b648ccf48895..500aec4c856b87 100644
--- a/cypress/pages/ndv.ts
+++ b/cypress/pages/ndv.ts
@@ -86,6 +86,9 @@ export class NDV extends BasePage {
 		selectOptionInParameterDropdown: (parameterName: string, content: string) => {
 			this.getters.parameterInput(parameterName).find('.option-headline').contains(content).click();
 		},
+		dismissMappingTooltip: () => {
+			cy.getByTestId('dismiss-mapping-tooltip').click();
+		},
 		rename: (newName: string) => {
 			this.getters.nodeNameContainer().click();
 			this.getters.nodeRenameInput().should('be.visible').type('{selectall}').type(newName);
diff --git a/packages/design-system/src/types/button.ts b/packages/design-system/src/types/button.ts
index 55f8f272a61b17..21f5fb532a37cc 100644
--- a/packages/design-system/src/types/button.ts
+++ b/packages/design-system/src/types/button.ts
@@ -12,6 +12,8 @@ export type IN8nButton = {
 		active?: boolean;
 		float?: 'left' | 'right';
 		square?: boolean;
+		// eslint-disable-next-line @typescript-eslint/naming-convention
+		'data-test-id'?: string;
 	};
 	listeners?: Record<string, (event: Event) => void>;
 };
diff --git a/packages/editor-ui/src/components/Draggable.vue b/packages/editor-ui/src/components/Draggable.vue
index ef2d43cb276e63..0e9631776aae8d 100644
--- a/packages/editor-ui/src/components/Draggable.vue
+++ b/packages/editor-ui/src/components/Draggable.vue
@@ -103,6 +103,12 @@ export default Vue.extend({
 
 			window.addEventListener('mousemove', this.onDrag);
 			window.addEventListener('mouseup', this.onDragEnd);
+
+			// blur so that any focused inputs update value
+			const activeElement = document.activeElement as HTMLElement;
+			if (activeElement) {
+				activeElement.blur();
+			}
 		},
 		onDrag(e: MouseEvent) {
 			e.preventDefault();
diff --git a/packages/editor-ui/src/components/ParameterInputFull.vue b/packages/editor-ui/src/components/ParameterInputFull.vue
index 515e7e66602ea9..2551522729b85e 100644
--- a/packages/editor-ui/src/components/ParameterInputFull.vue
+++ b/packages/editor-ui/src/components/ParameterInputFull.vue
@@ -90,6 +90,7 @@ import { mapStores } from 'pinia';
 import { useNDVStore } from '@/stores/ndv';
 import { useSegment } from '@/stores/segment';
 import { externalHooks } from '@/mixins/externalHooks';
+import { getMappedResult } from '../utils/mappingUtils';
 
 export default mixins(showMessage, externalHooks).extend({
 	name: 'parameter-input-full',
@@ -146,6 +147,7 @@ export default mixins(showMessage, externalHooks).extend({
 			{
 				attrs: {
 					label: this.$locale.baseText('_reusableBaseText.dismiss' as BaseTextKey),
+					'data-test-id': 'dismiss-mapping-tooltip',
 				},
 				listeners: {
 					click: mappingTooltipDismissHandler,
@@ -228,39 +230,15 @@ export default mixins(showMessage, externalHooks).extend({
 				param?.$emit('optionSelected', 'addExpression');
 			}
 		},
-		onDrop(data: string) {
-			const useDataPath = !!this.parameter.requiresDataPath && data.startsWith('{{ $json');
-			if (!useDataPath) {
+		onDrop(newParamValue: string) {
+			const updatedValue = getMappedResult(this.parameter, newParamValue, this.value);
+			const prevValue = this.isResourceLocator ? this.value.value : this.value;
+
+			if (updatedValue.startsWith('=')) {
 				this.forceShowExpression = true;
 			}
 			setTimeout(() => {
 				if (this.node) {
-					const prevValue = this.isResourceLocator ? this.value.value : this.value;
-					let updatedValue: string;
-					if (useDataPath) {
-						const newValue = data
-							.replace('{{ $json', '')
-							.replace(new RegExp('^\\.'), '')
-							.replace(new RegExp('}}$'), '')
-							.trim();
-
-						if (prevValue && this.parameter.requiresDataPath === 'multiple') {
-							updatedValue = `${prevValue}, ${newValue}`;
-						} else {
-							updatedValue = newValue;
-						}
-					} else if (
-						typeof prevValue === 'string' &&
-						prevValue.startsWith('=') &&
-						prevValue.length > 1
-					) {
-						updatedValue = `${prevValue} ${data}`;
-					} else if (prevValue && ['string', 'json'].includes(this.parameter.type)) {
-						updatedValue = prevValue === '=' ? `=${data}` : `=${prevValue} ${data}`;
-					} else {
-						updatedValue = `=${data}`;
-					}
-
 					let parameterData;
 					if (this.isResourceLocator) {
 						if (!isResourceLocatorValue(this.value)) {
@@ -334,7 +312,7 @@ export default mixins(showMessage, externalHooks).extend({
 			}, 200);
 		},
 		onMappingTooltipDismissed() {
-			this.localStorageMappingFlag = true;
+			this.ndvStore.disableMappingHint(false);
 		},
 	},
 	watch: {
diff --git a/packages/editor-ui/src/stores/ndv.ts b/packages/editor-ui/src/stores/ndv.ts
index f9b8497810a85f..fed4fc96ea0456 100644
--- a/packages/editor-ui/src/stores/ndv.ts
+++ b/packages/editor-ui/src/stores/ndv.ts
@@ -185,9 +185,11 @@ export const useNDVStore = defineStore(STORES.NDV, {
 		setNDVPanelDataIsEmpty(payload: { panel: 'input' | 'output'; isEmpty: boolean }): void {
 			Vue.set(this[payload.panel].data, 'isEmpty', payload.isEmpty);
 		},
-		disableMappingHint() {
+		disableMappingHint(store = true) {
 			this.isMappingOnboarded = true;
-			window.localStorage.setItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED, 'true');
+			if (store) {
+				window.localStorage.setItem(LOCAL_STORAGE_MAPPING_IS_ONBOARDED, 'true');
+			}
 		},
 	},
 });
diff --git a/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts b/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
new file mode 100644
index 00000000000000..c1c768397fbee7
--- /dev/null
+++ b/packages/editor-ui/src/utils/__tests__/mappingUtils.test.ts
@@ -0,0 +1,202 @@
+import { INodeProperties } from 'n8n-workflow';
+import { getMappedResult } from '../mappingUtils';
+
+const RLC_PARAM: INodeProperties = {
+	displayName: 'Base',
+	name: 'application',
+	type: 'resourceLocator',
+	default: {
+		mode: 'url',
+		value: '',
+	},
+	required: true,
+	description: 'The Airtable Base in which to operate on',
+	modes: [
+		{
+			displayName: 'ID',
+			name: 'id',
+			type: 'string',
+			validation: [
+				{
+					type: 'regex',
+					properties: {
+						regex: '[a-zA-Z0-9]{2,}',
+						errorMessage: 'Not a valid Airtable Base ID',
+					},
+				},
+			],
+			placeholder: 'appD3dfaeidke',
+			url: '=https://airtable.com/{{$value}}',
+		},
+	],
+};
+
+const STRING_PARAM: INodeProperties = {
+	displayName: 'Value',
+	name: 'value',
+	type: 'string',
+	default: '',
+	description: 'The string value to write in the property',
+};
+
+const SINGLE_DATA_PATH_PARAM: INodeProperties = {
+	displayName: 'Name',
+	name: 'name',
+	type: 'string',
+	default: 'propertyName',
+	requiresDataPath: 'single',
+	description:
+		'Name of the property to write data to. Supports dot-notation. Example: "data.person[0].name"',
+};
+
+const MULTIPLE_DATA_PATH_PARAM: INodeProperties = {
+	displayName: 'For Everything Except',
+	name: 'exceptWhenMix',
+	type: 'string',
+	default: '',
+	placeholder: 'e.g. id, country',
+	hint: 'Enter the names of the input fields as text, separated by commas',
+	displayOptions: {
+		show: {
+			resolve: ['mix'],
+		},
+	},
+	requiresDataPath: 'multiple',
+};
+
+const JSON_PARAM: INodeProperties = {
+	displayName: 'JSON Payload',
+	name: 'payloadJson',
+	type: 'json',
+	typeOptions: {
+		alwaysOpenEditWindow: true,
+		editor: 'code',
+	},
+	default: '',
+};
+
+const BOOLEAN_PARAM: INodeProperties = {
+	displayName: 'Value',
+	name: 'value',
+	type: 'boolean',
+	default: false,
+	description: 'The boolean value to write in the property',
+};
+
+const NUMBER_PARAM: INodeProperties = {
+	displayName: 'Value',
+	name: 'value',
+	type: 'number',
+	default: 0,
+	description: 'The number value to write in the property',
+};
+
+describe('Mapping Utils', () => {
+	describe('getMappedResult', () => {
+		it('turns empty string into expression', () => {
+			expect(getMappedResult(STRING_PARAM, '{{ $json["Readable date"] }}', '')).toEqual(
+				'={{ $json["Readable date"] }}',
+			);
+		});
+
+		it('keeps spaces when mapping data to fixed value', () => {
+			expect(getMappedResult(STRING_PARAM, '{{ $json["Readable date"] }}', '  ')).toEqual(
+				'=   {{ $json["Readable date"] }}',
+			);
+		});
+
+		it('sets expression when mapping to an empty expression', () => {
+			expect(getMappedResult(STRING_PARAM, '{{ $json["Readable date"] }}', '=')).toEqual(
+				'={{ $json["Readable date"] }}',
+			);
+		});
+
+		it('keeps spaces when mapping data to expression value', () => {
+			expect(getMappedResult(STRING_PARAM, '{{ $json["Readable date"] }}', '=  ')).toEqual(
+				'=   {{ $json["Readable date"] }}',
+			);
+		});
+
+		it('appends to string fixed value and turns into expression', () => {
+			expect(getMappedResult(STRING_PARAM, '{{ $json["Readable date"] }}', 'test')).toEqual(
+				'=test {{ $json["Readable date"] }}',
+			);
+		});
+
+		it('appends to json fixed value', () => {
+			expect(getMappedResult(JSON_PARAM, '{{ $json["Readable date"] }}', 'test')).toEqual(
+				'=test {{ $json["Readable date"] }}',
+			);
+		});
+
+		it('replaces number value with expression', () => {
+			expect(getMappedResult(NUMBER_PARAM, '{{ $json["Readable date"] }}', 0)).toEqual(
+				'={{ $json["Readable date"] }}',
+			);
+		});
+
+		it('replaces boolean value with expression', () => {
+			expect(getMappedResult(BOOLEAN_PARAM, '{{ $json["Readable date"] }}', false)).toEqual(
+				'={{ $json["Readable date"] }}',
+			);
+		});
+
+		it('appends existing expression value', () => {
+			expect(
+				getMappedResult(STRING_PARAM, '{{ $json["Readable date"] }}', '={{$json.test}}'),
+			).toEqual('={{$json.test}} {{ $json["Readable date"] }}');
+		});
+
+		it('sets data path, replacing if expecting single path', () => {
+			expect(
+				getMappedResult(SINGLE_DATA_PATH_PARAM, '{{ $json["Readable date"] }}', '={{$json.test}}'),
+			).toEqual('["Readable date"]');
+
+			expect(
+				getMappedResult(SINGLE_DATA_PATH_PARAM, '{{ $json.path }}', '={{$json.test}}'),
+			).toEqual('path');
+		});
+
+		it('appends to existing data path, if multiple', () => {
+			expect(
+				getMappedResult(MULTIPLE_DATA_PATH_PARAM, '{{ $json["Readable date"] }}', 'path'),
+			).toEqual('path, ["Readable date"]');
+		});
+
+		it('replaces existing dadata path if multiple and is empty expression', () => {
+			expect(getMappedResult(MULTIPLE_DATA_PATH_PARAM, '{{ $json.test }}', '=')).toEqual('test');
+		});
+
+		it('handles data when dragging from grand-parent nodes', () => {
+			expect(
+				getMappedResult(
+					MULTIPLE_DATA_PATH_PARAM,
+					'{{ $node["Schedule Trigger"].json["Day of week"] }}',
+					'',
+				),
+			).toEqual('={{ $node["Schedule Trigger"].json["Day of week"] }}');
+
+			expect(
+				getMappedResult(
+					SINGLE_DATA_PATH_PARAM,
+					'{{ $node["Schedule Trigger"].json["Day of week"] }}',
+					'=data',
+				),
+			).toEqual('=data {{ $node["Schedule Trigger"].json["Day of week"] }}');
+
+			expect(
+				getMappedResult(
+					SINGLE_DATA_PATH_PARAM,
+					'{{ $node["Schedule Trigger"].json["Day of week"] }}',
+					'=   ',
+				),
+			).toEqual('=    {{ $node["Schedule Trigger"].json["Day of week"] }}');
+		});
+
+		it('handles RLC values', () => {
+			expect(getMappedResult(RLC_PARAM, '{{ test }}', '')).toEqual('={{ test }}');
+			expect(getMappedResult(RLC_PARAM, '{{ test }}', '=')).toEqual('={{ test }}');
+			expect(getMappedResult(RLC_PARAM, '{{ test }}', '=test')).toEqual('=test {{ test }}');
+		});
+	});
+});
diff --git a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
index 569b98d4085d58..0f43a8c0acd2eb 100644
--- a/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
+++ b/packages/editor-ui/src/utils/__tests__/typesUtils.test.ts
@@ -2,7 +2,7 @@ import jp from 'jsonpath';
 import { isEmpty, intersection, mergeDeep, getSchema, isValidDate } from '@/utils';
 import { Schema } from '@/Interface';
 
-describe('Utils', () => {
+describe('Types Utils', () => {
 	describe('isEmpty', () => {
 		test.each([
 			[undefined, true],
diff --git a/packages/editor-ui/src/utils/mappingUtils.ts b/packages/editor-ui/src/utils/mappingUtils.ts
index 32889597f8f169..e62c90443a0f6b 100644
--- a/packages/editor-ui/src/utils/mappingUtils.ts
+++ b/packages/editor-ui/src/utils/mappingUtils.ts
@@ -1,3 +1,5 @@
+import { INodeProperties, isResourceLocatorValue, NodeParameterValueType } from 'n8n-workflow';
+
 export function generatePath(root: string, path: Array<string | number>): string {
 	return path.reduce((accu: string, part: string | number) => {
 		if (typeof part === 'number') {
@@ -29,3 +31,39 @@ export function getMappedExpression({
 
 	return `{{ ${generatePath(root, path)} }}`;
 }
+
+export function getMappedResult(
+	parameter: INodeProperties,
+	newParamValue: string,
+	prevParamValue: NodeParameterValueType,
+): string {
+	const useDataPath = !!parameter.requiresDataPath && newParamValue.startsWith('{{ $json'); // ignore when mapping from grand-parent-node
+	const prevValue =
+		parameter.type === 'resourceLocator' && isResourceLocatorValue(prevParamValue)
+			? prevParamValue.value
+			: prevParamValue;
+
+	if (useDataPath) {
+		const newValue = newParamValue
+			.replace('{{ $json', '')
+			.replace(new RegExp('^\\.'), '')
+			.replace(new RegExp('}}$'), '')
+			.trim();
+
+		if (prevValue && parameter.requiresDataPath === 'multiple') {
+			if (typeof prevValue === 'string' && prevValue.trim() === '=') {
+				return newValue;
+			} else {
+				return `${prevValue}, ${newValue}`;
+			}
+		} else {
+			return newValue;
+		}
+	} else if (typeof prevValue === 'string' && prevValue.startsWith('=') && prevValue.length > 1) {
+		return `${prevValue} ${newParamValue}`;
+	} else if (prevValue && ['string', 'json'].includes(parameter.type)) {
+		return prevValue === '=' ? `=${newParamValue}` : `=${prevValue} ${newParamValue}`;
+	}
+
+	return `=${newParamValue}`;
+}

From 06c5ecbdf3031a7773e698294ae701a7e501ef50 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Thu, 2 Mar 2023 14:17:29 +0000
Subject: [PATCH 312/358] feat(OpenAI Node): Add support for ChatGPT (#5596)

---
 .../nodes/OpenAi/ChatDescription.ts           | 313 ++++++++++++++++++
 .../nodes-base/nodes/OpenAi/OpenAi.node.ts    |   8 +
 2 files changed, 321 insertions(+)
 create mode 100644 packages/nodes-base/nodes/OpenAi/ChatDescription.ts

diff --git a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
new file mode 100644
index 00000000000000..217bdc7e80eb88
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
@@ -0,0 +1,313 @@
+import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+
+export const chatOperations: INodeProperties[] = [
+	{
+		displayName: 'Operation',
+		name: 'operation',
+		type: 'options',
+		noDataExpression: true,
+		displayOptions: {
+			show: {
+				resource: ['chat'],
+			},
+		},
+		options: [
+			{
+				name: 'Complete',
+				value: 'complete',
+				action: 'Create a Completion',
+				description: 'Create one or more completions for a given text',
+				routing: {
+					request: {
+						method: 'POST',
+						url: '/v1/chat/completions',
+					},
+				},
+			},
+		],
+		default: 'complete',
+	},
+];
+
+const completeOperations: INodeProperties[] = [
+	{
+		displayName: 'Model',
+		name: 'model',
+		type: 'options',
+		description:
+			'The model to use. Currently, only gpt-3.5-turbo and gpt-3.5-turbo-0301 are supported.',
+		displayOptions: {
+			show: {
+				operation: ['complete'],
+				resource: ['chat'],
+			},
+		},
+		options: [
+			{
+				name: 'gpt-3.5-turbo',
+				value: 'gpt-3.5-turbo',
+			},
+			{
+				name: 'gpt-3.5-turbo-0301',
+				value: 'gpt-3.5-turbo-0301',
+			},
+		],
+		routing: {
+			send: {
+				type: 'body',
+				property: 'model',
+			},
+		},
+		default: 'gpt-3.5-turbo',
+	},
+	{
+		displayName: 'Prompt',
+		name: 'prompt',
+		type: 'fixedCollection',
+		typeOptions: {
+			sortable: true,
+			multipleValues: true,
+		},
+		displayOptions: {
+			show: {
+				resource: ['chat'],
+				operation: ['complete'],
+			},
+		},
+		placeholder: 'Add Message',
+		default: {},
+		options: [
+			{
+				displayName: 'Messages',
+				name: 'messages',
+				values: [
+					{
+						displayName: 'Role',
+						name: 'role',
+						type: 'options',
+						options: [
+							{
+								name: 'Assistant',
+								value: 'assistant',
+							},
+							{
+								name: 'System',
+								value: 'system',
+							},
+							{
+								name: 'User',
+								value: 'user',
+							},
+						],
+						default: 'user',
+					},
+					{
+						displayName: 'Content',
+						name: 'content',
+						type: 'string',
+						default: '',
+					},
+				],
+			},
+		],
+		routing: {
+			send: {
+				type: 'body',
+				property: 'messages',
+				value: '={{ $parameter.prompt.messages }}',
+			},
+		},
+	},
+];
+
+const sharedOperations: INodeProperties[] = [
+	{
+		displayName: 'Simplify',
+		name: 'simplifyOutput',
+		type: 'boolean',
+		default: true,
+		displayOptions: {
+			show: {
+				operation: ['complete'],
+				resource: ['chat'],
+			},
+		},
+		routing: {
+			output: {
+				postReceive: [
+					{
+						type: 'set',
+						enabled: '={{$value}}',
+						properties: {
+							value: '={{ { "data": $response.body.choices } }}',
+						},
+					},
+					{
+						type: 'rootProperty',
+						enabled: '={{$value}}',
+						properties: {
+							property: 'data',
+						},
+					},
+					async function (items: INodeExecutionData[]): Promise<INodeExecutionData[]> {
+						if (this.getNode().parameters.simplifyOutput === false) {
+							return items;
+						}
+						return items.map((item) => {
+							return {
+								json: {
+									...item.json,
+									message: item.json.message,
+								},
+							};
+						});
+					},
+				],
+			},
+		},
+		description: 'Whether to return a simplified version of the response instead of the raw data',
+	},
+
+	{
+		displayName: 'Options',
+		name: 'options',
+		placeholder: 'Add Option',
+		description: 'Additional options to add',
+		type: 'collection',
+		default: {},
+		displayOptions: {
+			show: {
+				operation: ['complete'],
+				resource: ['chat'],
+			},
+		},
+		options: [
+			{
+				displayName: 'Echo Prompt',
+				name: 'echo',
+				type: 'boolean',
+				description: 'Whether the prompt should be echo back in addition to the completion',
+				default: false,
+				displayOptions: {
+					show: {
+						'/operation': ['complete'],
+					},
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'echo',
+					},
+				},
+			},
+			{
+				displayName: 'Frequency Penalty',
+				name: 'frequency_penalty',
+				default: 0,
+				typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+				description:
+					"Positive values penalize new tokens based on their existing frequency in the text so far, decreasing the model's likelihood to repeat the same line verbatim",
+				type: 'number',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'frequency_penalty',
+					},
+				},
+			},
+			{
+				displayName: 'Maximum Number of Tokens',
+				name: 'maxTokens',
+				default: 16,
+				description:
+					'The maximum number of tokens to generate in the completion. Most models have a context length of 2048 tokens (except for the newest models, which support 4096).',
+				type: 'number',
+				displayOptions: {
+					show: {
+						'/operation': ['complete'],
+					},
+				},
+				typeOptions: {
+					maxValue: 4096,
+				},
+				routing: {
+					send: {
+						type: 'body',
+						property: 'max_tokens',
+					},
+				},
+			},
+			{
+				displayName: 'Number of Completions',
+				name: 'n',
+				default: 1,
+				description:
+					'How many completions to generate for each prompt. Note: Because this parameter generates many completions, it can quickly consume your token quota. Use carefully and ensure that you have reasonable settings for max_tokens and stop.',
+				type: 'number',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'n',
+					},
+				},
+			},
+			{
+				displayName: 'Presence Penalty',
+				name: 'presence_penalty',
+				default: 0,
+				typeOptions: { maxValue: 2, minValue: -2, numberPrecision: 1 },
+				description:
+					"Positive values penalize new tokens based on whether they appear in the text so far, increasing the model's likelihood to talk about new topics",
+				type: 'number',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'presence_penalty',
+					},
+				},
+			},
+			{
+				displayName: 'Sampling Temperature',
+				name: 'temperature',
+				default: 1,
+				typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+				description:
+					'Controls randomness: Lowering results in less random completions. As the temperature approaches zero, the model will become deterministic and repetitive.',
+				type: 'number',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'temperature',
+					},
+				},
+			},
+			{
+				displayName: 'Top P',
+				name: 'topP',
+				default: 1,
+				typeOptions: { maxValue: 1, minValue: 0, numberPrecision: 1 },
+				description:
+					'Controls diversity via nucleus sampling: 0.5 means half of all likelihood-weighted options are considered. We generally recommend altering this or temperature but not both.',
+				type: 'number',
+				routing: {
+					send: {
+						type: 'body',
+						property: 'top_p',
+					},
+				},
+			},
+		],
+	},
+];
+
+export const chatFields: INodeProperties[] = [
+	/* -------------------------------------------------------------------------- */
+	/*                               chat:complete                        */
+	/* -------------------------------------------------------------------------- */
+	...completeOperations,
+
+	/* -------------------------------------------------------------------------- */
+	/*                                chat:ALL                                    */
+	/* -------------------------------------------------------------------------- */
+	...sharedOperations,
+];
diff --git a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
index ceb06bad4b6b62..51499ad6446cf8 100644
--- a/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
+++ b/packages/nodes-base/nodes/OpenAi/OpenAi.node.ts
@@ -1,6 +1,7 @@
 import type { INodeType, INodeTypeDescription } from 'n8n-workflow';
 import { imageFields, imageOperations } from './ImageDescription';
 import { textFields, textOperations } from './TextDescription';
+import { chatFields, chatOperations } from './ChatDescription';
 
 export class OpenAi implements INodeType {
 	description: INodeTypeDescription = {
@@ -32,6 +33,10 @@ export class OpenAi implements INodeType {
 				type: 'options',
 				noDataExpression: true,
 				options: [
+					{
+						name: 'Chat',
+						value: 'chat',
+					},
 					{
 						name: 'Image',
 						value: 'image',
@@ -44,6 +49,9 @@ export class OpenAi implements INodeType {
 				default: 'text',
 			},
 
+			...chatOperations,
+			...chatFields,
+
 			...imageOperations,
 			...imageFields,
 

From 4f5013ff53294579fb9e47f90ae08e9a6bc76b75 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Thu, 2 Mar 2023 14:35:13 +0000
Subject: [PATCH 313/358] fix: Show RabbitMQ node in nodes panel (#5598)

---
 .../nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts     | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index b2b2d37d0e5e12..b4956b86e0ab76 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -17,6 +17,7 @@ import { rabbitmqConnectExchange, rabbitmqConnectQueue } from './GenericFunction
 
 export class RabbitMQ implements INodeType {
 	description: INodeTypeDescription = {
+		// eslint-disable-next-line
 		displayName: 'RabbitMQ',
 		name: 'rabbitmq',
 		// eslint-disable-next-line n8n-nodes-base/node-class-description-icon-not-svg
@@ -37,6 +38,19 @@ export class RabbitMQ implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName: 'Operation',
+				name: 'operation',
+				type: 'hidden',
+				noDataExpression: true,
+				default: 'send_message',
+				options: [
+					{
+						name: 'Send a Message to RabbitMQ',
+						value: 'send_message',
+					},
+				],
+			},
 			{
 				displayName: 'Mode',
 				name: 'mode',

From 5040fea93ecc36017d25f237fe9b3e23bc9d623d Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 2 Mar 2023 18:27:56 +0300
Subject: [PATCH 314/358] fix: Fix issues with nodes missing in nodes panel
 (#5599)

* fix: Fix issues with nodes missing in nodes panel

* fix: fix logic for deteriming app category

* chore: add comment

* chore: remove sort
---
 .../components/Node/NodeCreator/MainPanel.vue | 10 ++--
 .../components/Node/NodeCreator/NodeItem.vue  |  5 +-
 packages/editor-ui/src/stores/nodeCreator.ts  | 49 ++++++++++---------
 3 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue b/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
index 79166b9f3d1c58..1947318e37b81e 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/MainPanel.vue
@@ -262,9 +262,9 @@ function transformCreateElements(
 	});
 
 	return sorted.map((nodeType) => {
-		// N8n node is a special case since it's the only core node that is both trigger and regular
-		// if we have more cases like this we should add more robust logic
-		const isN8nNode = nodeType.name.includes(N8N_NODE_TYPE);
+		const hasTriggerActions = nodeType.actions?.find((action) => action.name.includes('trigger'));
+		const hasRgeularActions = nodeType.actions?.find((action) => !action.name.includes('trigger'));
+
 		return {
 			type,
 			category: nodeType.codex?.categories,
@@ -273,8 +273,8 @@ function transformCreateElements(
 				nodeType,
 				subcategory: state.activeNodeActions?.displayName ?? '',
 			},
-			includedByTrigger: isN8nNode || nodeType.group.includes('trigger'),
-			includedByRegular: isN8nNode || !nodeType.group.includes('trigger'),
+			includedByTrigger: hasTriggerActions || nodeType.group.includes('trigger'),
+			includedByRegular: hasRgeularActions || !nodeType.group.includes('trigger'),
 		} as INodeCreateElement;
 	});
 }
diff --git a/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue b/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
index 88676dc4c22935..62dd517abc4fb9 100644
--- a/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreator/NodeItem.vue
@@ -105,7 +105,10 @@ const displayName = computed<any>(() => {
 
 	return instance?.proxy.$locale.headerText({
 		key: `headers.${shortNodeType}.displayName`,
-		fallback: props.allowActions ? displayName.replace('Trigger', '') : displayName,
+		fallback:
+			props.allowActions && props.nodeType.actions?.length
+				? displayName.replace('Trigger', '')
+				: displayName,
 	});
 });
 
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index 8fb92574b8dfbe..aea5f2af93bb85 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -308,31 +308,32 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 			return nodesWithActions;
 		},
 		mergedAppNodes(): INodeTypeDescription[] {
-			const mergedNodes = [...this.visibleNodesWithActions]
-				// Sort triggers so they are always on top and when later get merged
-				// they won't be discarded if they have the same name as a core node which doesn't contain actions
-				.sort((a, b) => {
-					if (a.group.includes('trigger')) return -1;
-					if (b.group.includes('trigger')) return 1;
-
-					return 0;
-				})
-				.reduce((acc: Record<string, INodeTypeDescription>, node: INodeTypeDescription) => {
-					const clonedNode = deepCopy(node);
-					const actions = node.actions || [];
-
-					const normalizedName = node.name.toLowerCase().replace('trigger', '');
-					const existingNode = acc[normalizedName];
-
-					if (existingNode) existingNode.actions?.push(...actions);
-					else acc[normalizedName] = clonedNode;
-
-					acc[normalizedName].displayName = node.displayName.replace('Trigger', '');
-
-					return acc;
-				}, {});
+			const triggers = this.visibleNodesWithActions.filter((node) =>
+				node.group.includes('trigger'),
+			);
+			const apps = this.visibleNodesWithActions
+				.filter((node) => !node.group.includes('trigger'))
+				.map((node) => {
+					const newNode = deepCopy(node);
+					newNode.actions = newNode.actions || [];
+					return newNode;
+				});
+
+			triggers.forEach((node) => {
+				const normalizedName = node.name.toLowerCase().replace('trigger', '');
+				const app = apps.find((node) => node.name.toLowerCase() === normalizedName);
+				const newNode = deepCopy(node);
+				if (app && app.actions?.length) {
+					// merge triggers into regular nodes that match
+					app?.actions?.push(...(newNode.actions || []));
+					app.description = newNode.description; // default to trigger description
+				} else {
+					newNode.actions = newNode.actions || [];
+					apps.push(newNode);
+				}
+			});
 
-			const filteredNodes = Object.values(mergedNodes).map((node) => ({
+			const filteredNodes = apps.map((node) => ({
 				...node,
 				actions: filterActions(node.actions || []),
 			}));

From 0004dc7ee8718eedcddd3b4054d55eea6a07111a Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 2 Mar 2023 16:50:21 +0100
Subject: [PATCH 315/358] ci(editor): Run e2e tests in parallel and improve
 build caching (#5445)

* WIP: Cypress parallel CI run test

* Trigger action on branch push

* Change build artifacts path

* Make sure to checkout the repo for testing job

* Use Cypress action for installing

* Lock cypress action userd version

* Skip node install step since we're using cypress node16 container

* Let Cypress handle pnpm install

* Use setup-node action for caching pnpm

* Set CYPRESS_CACHE_FOLDER

* Set CYPRESS_CACHE_FOLDER

* Manually cache pnpm store

* Dont fix pnpm version

* Use caching action also in testing job

* Zip packages dist before uploading the artifacts and change caching key

* Use absolute build paths for zipping job

* Use zip command in action

* Use tar for zipping packages

* Debuggin directory ls

* Debugging caching of modules

* Attempt to fix permissions issue

* Porivde Cypress executable via `CYPRESS_RUN_BINARY`

* Cache /github/home

* Adjust caching keys

* Debug: search for cypress exec

* Debugging: List dirs

* Use pnpm install action to install node_modules

* Do not log /home/runner

* Use node_modules/.bin Cypress binary

* Use absolute path to nodue modules

* Run Cypress via custom command

* Try with patched cypress action

* Revert logging

* Manually specify cypress config file

* Use absolute paths

* Fix cypress config name

* Debug print cypress config

* Remove debugging, increase to 4 containers

* Increase amount of containers

* Add env-version matrix

* Replace node14 with node18 in testing matrix

* Remove debugging and add node 14

* Use just node14

* Use cypress:base and remove browser req

* Give more general timeouts

* Try with node16

* Change cache directive position

* Replace zip artifact upload with cache

* Cache full packages not just dist

* Test with variable inputs

* Add commit info message

* Remove wrongly commited code

* Allow WF API dispatch

* Try Chrome browser again for comparison

* Include Monaco in the build

* Make e2e workflow re-usable

* Comment out invalid reusable workflow args

* Use electron and add node 14 run

* Fix env arg

* Provide custom ci-build-id

* Refactor remaining e2e workflow to use reusable action

* Remove single matrix directive

* Refactor ci-pull-req

* Make lint job dependant on test jobs

* Disable debugging job

* Make containers dynamic

* Cleanup & install git for linting action

* Use regular buntu image for PR linting

* Debugging failing tests

* Remove fixed spec name

* Debug e2e env var

* Do not use realkeypress which crashes electron runner

* Debugging

* chore: remove console

* chore: remove console

* test: remove node 14 tests

* test: replace test branch with master

* test: use tests in current branch

* test: use relative path

* chore: clean up

* test: only trigger on approval

* ci: update test PR

* ci: use curr branch

* ci: only run 14 on schedule, not for slack command

* ci: only run test on approval

* ci: clean up branch, rename step

* ci: rename steps

* ci: clean up cancel

* ci: clean up env var

* ci: set var

* ci: use chromef

* ci: use electron

* chore: add console log

* chore: add console log

* ci: update to string

* ci: set all env options

* test: build

* ci: fix step issue

* Fix failing tests & upgrade to Cypress 12

* Allow WF dispatch of e2e reusable

* Fix wrong naming in e2e-tests workflow

* Redeploy

* Fix tests

* Fix NDV tests and remove skipping of webhooks execution tests

* Fix clipboard read command

* Fix execution failing tests

* Reset before each 15 and 3

* Fix flaky tests

* Cleanup and log envs

* Test fixes

* Default owner spec fixes

* Get rid of CYPRESS_RUN_ENV

* Increase amount of containers, cleanup and add mock for credentials test call

* Cleanup & fix PR tests unit tests

* Wait for WF to loade in sharing spec

* Do linting and unit tests first

* Use frozen lockfile

* Revert back ci pull request jobs order

* Refine credential input selector and move cy.waitForLoad to correct position in 15-scheduler spec

* test: build

* Wait for WF execution instead of arbitraty timeout in WF execution spec, change order of jobs for ci pull request

* Fix flaky 3-default owner spec and wait for execution list to load in 20-workflow-executions

* Use setup node action

* Remove caching for lint/unit tests

* Experiment with parallel test & lint on ci

* Provide cache key dynamically

* Run e2e in parallel on pr

* Only run node14 e2e on daily schedule

* Make sure to generate generate new ci-build-id on re-runs

* Remove debugging prints

* Address PR comments

* Rename custom onBeforeUnload handler

* Make sure 19-execution spec waits for wf to load properly before import fixtures

---------

Co-authored-by: Mutasem <mutdmour@gmail.com>
---
 .github/workflows/ci-pull-requests.yml        | 105 +++++++++--
 .github/workflows/e2e-reusable.yml            | 150 ++++++++++++++++
 .github/workflows/e2e-tests-pr.yml            |  75 +++-----
 .github/workflows/e2e-tests.yml               |  72 ++++----
 cypress.config.js                             |  28 ++-
 cypress/e2e/10-settings-log-streaming.cy.ts   |  15 +-
 cypress/e2e/11-inline-expression-editor.cy.ts |   2 +
 .../14-data-transformation-expressions.cy.ts  |  14 +-
 cypress/e2e/14-mapping.cy.ts                  |   2 +-
 cypress/e2e/15-scheduler-node.cy.ts           |   9 +-
 cypress/e2e/16-webhook-node.cy.ts             |   2 +-
 cypress/e2e/17-sharing.cy.ts                  |   1 +
 cypress/e2e/17-workflow-tags.cy.ts            |   5 +-
 cypress/e2e/19-execution.cy.ts                |  56 +++---
 cypress/e2e/2-credentials.cy.ts               |  11 +-
 cypress/e2e/20-workflow-executions.cy.ts      |  10 +-
 cypress/e2e/3-default-owner.cy.ts             |  16 +-
 cypress/e2e/4-node-creator.cy.ts              |  96 +++++-----
 cypress/e2e/5-ndv.cy.ts                       |  16 +-
 cypress/e2e/7-workflow-actions.cy.ts          |   3 +
 cypress/pages/credentials.ts                  |   2 +-
 cypress/pages/modals/credentials-modal.ts     |   8 +-
 cypress/pages/workflow-executions-tab.ts      |   3 +-
 cypress/pages/workflow.ts                     |   6 +-
 cypress/pages/workflows.ts                    |   2 +-
 cypress/support/commands.ts                   |   5 +-
 package.json                                  |   2 +-
 packages/cli/src/constants.ts                 |   1 +
 .../ResourceLocator/ResourceLocator.vue       |   5 +-
 packages/editor-ui/src/views/NodeView.vue     |   4 +-
 pnpm-lock.yaml                                | 170 +++++++++---------
 31 files changed, 534 insertions(+), 362 deletions(-)
 create mode 100644 .github/workflows/e2e-reusable.yml

diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index 130e1753bdb6e1..c567d1baea2aab 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -1,27 +1,24 @@
-name: Test Pull Requests
+name: Build, unit/smoke test and lint branch
 
 on: [pull_request]
 
 jobs:
-  build:
+  install:
+    name: Install & Build
     runs-on: ubuntu-latest
-
-    timeout-minutes: 30
-
-    strategy:
-      matrix:
-        node-version: [14.x, 16.x]
-
     steps:
       - uses: actions/checkout@v3
+        with:
+          repository: n8n-io/n8n
+          ref: ${{ inputs.branch }}
 
       - uses: pnpm/action-setup@v2.2.4
 
-      - name: Use Node.js ${{ matrix.node-version }}
+      - name: Use Node.js 16
         uses: actions/setup-node@v3
         with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'pnpm'
+          node-version: 16.x
+          cache: pnpm
 
       - name: Install dependencies
         run: pnpm install --frozen-lockfile
@@ -29,13 +26,74 @@ jobs:
       - name: Build
         run: pnpm build
 
+      - name: Cache build artifacts
+        uses: actions/cache@v3
+        with:
+          path: |
+            /github/home/.cache
+            /github/home/.pnpm-store
+            ./node_modules
+            ./packages
+          key: ${{ github.sha }}-base:16.18.1-test-lint
+
+  unit-test:
+    name: Unit tests
+    runs-on: ubuntu-latest
+    needs: install
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: n8n-io/n8n
+          ref: ${{ inputs.branch }}
+
+      - name: Restore cached build artifacts
+        uses: actions/cache@v3
+        with:
+          path: |
+            /github/home/.cache
+            /github/home/.pnpm-store
+            ./node_modules
+            ./packages
+          key: ${{ github.sha }}-base:16.18.1-test-lint
+
+      - uses: pnpm/action-setup@v2.2.4
+
+      - name: Use Node.js 16
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: pnpm
+
       - name: Test
         run: pnpm test
 
-      - name: Test E2E
-        run: |
-          pnpm cypress:install
-          pnpm test:e2e:smoke
+  lint:
+    name: Lint changes
+    runs-on: ubuntu-latest
+    needs: install
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: n8n-io/n8n
+          ref: ${{ inputs.branch }}
+
+      - name: Restore cached build artifacts
+        uses: actions/cache@v3
+        with:
+          path: |
+            /github/home/.cache
+            /github/home/.pnpm-store
+            ./node_modules
+            ./packages
+          key: ${{ github.sha }}-base:16.18.1-test-lint
+
+      - uses: pnpm/action-setup@v2.2.4
+
+      - name: Use Node.js 16
+        uses: actions/setup-node@v3
+        with:
+          node-version: 16.x
+          cache: pnpm
 
       - name: Fetch base branch for `git diff`
         run: git fetch origin ${{ github.event.pull_request.base.ref }}:${{ github.event.pull_request.base.ref }}
@@ -44,3 +102,18 @@ jobs:
         env:
           ESLINT_PLUGIN_DIFF_COMMIT: ${{ github.event.pull_request.base.ref }}
         run: pnpm lint
+
+  smoke-test:
+    name: E2E [Electron/Node 16]
+    uses: ./.github/workflows/e2e-reusable.yml
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-e2e') }}
+    with:
+      branch: ${{ github.event.pull_request.base.ref }}
+      user: ${{ github.event.inputs.user || 'PR User' }}
+      spec: ${{ github.event.inputs.spec || 'e2e/0-smoke.cy.ts' }}
+      run-env: base:16.18.1
+      record: false
+      parallel: false
+      containers: '[1]'
+    secrets:
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
diff --git a/.github/workflows/e2e-reusable.yml b/.github/workflows/e2e-reusable.yml
new file mode 100644
index 00000000000000..c982d84e1fd1b2
--- /dev/null
+++ b/.github/workflows/e2e-reusable.yml
@@ -0,0 +1,150 @@
+name: Reusable e2e workflow
+
+on:
+  workflow_call:
+    inputs:
+      branch:
+        description: 'GitHub branch to test.'
+        required: false
+        type: string
+        default: 'master'
+      user:
+        description: 'User who kicked this off.'
+        required: false
+        type: string
+        default: 'schedule'
+      spec:
+        description: 'Specify specs.'
+        required: false
+        default: 'e2e/*'
+        type: string
+      run-env:
+        description: 'Node env version to run tests with.'
+        required: false
+        default: 'browsers:node16.18.0-chrome90-ff88'
+        type: string
+      cache-key:
+        description: 'Cache key for modules and build artifacts.'
+        required: false
+        default: ${{ github.sha }}-${{ inputs.run-env }}-e2e-modules
+        type: string
+      record:
+        description: 'Record test run.'
+        required: false
+        default: true
+        type: boolean
+      parallel:
+        description: 'Run tests in parallel.'
+        required: false
+        default: true
+        type: boolean
+      containers:
+        description: 'Number of containers to run tests in.'
+        required: false
+        default: '[1, 2, 3, 4, 5, 6, 7, 8]'
+        type: string
+    secrets:
+      CYPRESS_RECORD_KEY:
+        description: 'Cypress record key.'
+        required: true
+
+jobs:
+  # single job that generates and outputs a common id
+  prepare:
+    runs-on: ubuntu-latest
+    outputs:
+      uuid: ${{ steps.uuid.outputs.value }}
+    steps:
+      - name: Generate unique ID 💎
+        id: uuid
+        # take the current commit + timestamp together
+        # the typical value would be something like
+        # "sha-5d3fe...35d3-time-1620841214"
+        run: echo "value=sha-$GITHUB_SHA-time-$(date +"%s")" >> $GITHUB_OUTPUT
+
+  install:
+    runs-on: ubuntu-latest
+    needs: ['prepare']
+    container:
+      image: cypress/${{ inputs.run-env }}
+      options: --user 1001
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: n8n-io/n8n
+          ref: ${{ inputs.branch }}
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2.2.4
+        with:
+          run_install: true
+
+      - name: Cache pnpm modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            /github/home/.cache
+            /github/home/.pnpm-store
+            ./node_modules
+            ./packages
+          key: ${{ inputs.cache-key }}
+
+      - name: Cypress build
+        uses: cypress-io/github-action@v5
+        with:
+          # Disable running of tests within install job
+          runTests: false
+          install: false
+          build: pnpm build
+
+      - name: Cypress install
+        run: pnpm cypress:install
+
+  testing:
+    runs-on: ubuntu-latest
+    container:
+      image: cypress/${{ inputs.run-env }}
+      options: --user 1001
+    needs: ['prepare', 'install']
+    strategy:
+      fail-fast: false
+      matrix:
+        containers: ${{ fromJSON(inputs.containers) }}
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          repository: n8n-io/n8n
+          ref: ${{ inputs.branch }}
+
+      - name: Setup pnpm
+        uses: pnpm/action-setup@v2.2.4
+
+      - name: Restore cached pnpm modules
+        uses: actions/cache@v3
+        with:
+          path: |
+            /github/home/.cache
+            /github/home/.pnpm-store
+            ./node_modules
+            ./packages
+          key: ${{ inputs.cache-key }}
+
+      - name: Cypress run
+        uses: cypress-io/github-action@v5
+        with:
+          install: false
+          start: pnpm start
+          wait-on: 'http://localhost:5678'
+          wait-on-timeout: 120 #
+          record: ${{ inputs.record }}
+          parallel: ${{ inputs.parallel }}
+          # We have to provide custom ci-build-id key to make sure that this workflow could be run multiple times
+          # in the same parent workflow
+          ci-build-id: ${{ needs.prepare.outputs.uuid }}
+          spec: "/__w/n8n/n8n/cypress/${{ inputs.spec }}"
+          config-file: /__w/n8n/n8n/cypress.config.js
+        env:
+          CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          E2E_TESTS: true
+          COMMIT_INFO_MESSAGE: 🌳 ${{ inputs.branch }} 🖥️ ${{ inputs.run-env }} 🤖 ${{ inputs.user }} 🗃️ ${{ inputs.spec }}
diff --git a/.github/workflows/e2e-tests-pr.yml b/.github/workflows/e2e-tests-pr.yml
index ad21fa7706f402..e23df4429f1ccb 100644
--- a/.github/workflows/e2e-tests-pr.yml
+++ b/.github/workflows/e2e-tests-pr.yml
@@ -7,53 +7,28 @@ on:
       - 'master'
 
 jobs:
-  runTests:
-    name: 'Run E2E tests'
-    runs-on: ubuntu-latest
-    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-e2e') }}
-
-    timeout-minutes: 30
-
-    strategy:
-      matrix:
-        node-version: [16.x]
-
-    steps:
-      - name: 'Cancel previous runs'
-        uses: styfle/cancel-workflow-action@0.9.0
-        with:
-          access_token: ${{ github.token }}
-
-      - name: 'Cancel if PR is not approved'
-        if: github.event.review.state != 'approved'
-        uses: andymckay/cancel-action@0.2
-
-      - uses: actions/checkout@v3
-
-      - uses: pnpm/action-setup@v2.2.4
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Build
-        run: pnpm build
-
-      - name: Test E2E
-        run: |
-          pnpm cypress:install
-          pnpm test:e2e:all
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-screenshots
-          path: |
-            cypress/screenshots
-          retention-days: 1
+  # We disable this for now because cancelling runs makes the Cypress Cloud tests to hang.
+  # cancel-previous-runs:
+  #   runs-on: ubuntu-latest
+  #   name: 'Cancel previous e2e test runs'
+  #   strategy:
+  #     matrix:
+  #       node-version: [16.x]
+
+  #   steps:
+  #     - name: 'Cancel previous runs'
+  #       uses: styfle/cancel-workflow-action@0.9.0
+  #       with:
+  #         access_token: ${{ github.token }}
+
+  run-e2e-tests:
+    name: E2E [Electron/Node 16]
+    uses: ./.github/workflows/e2e-reusable.yml
+    if: ${{ github.event.review.state == 'approved' && !contains(github.event.pull_request.labels.*.name, 'skip-e2e') }}
+    with:
+      branch: ${{ github.event.pull_request.head.ref }}
+      user: ${{ github.event.pull_request.user.login || 'PR User' }}
+      spec: 'e2e/*'
+      run-env: base:16.18.1
+    secrets:
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 232d0f508bf40c..3e9f44eb6ee463 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -24,54 +24,46 @@ on:
         default: ''
 
 jobs:
-  build:
+  calls-start-url:
+    name: Calls start URL
     runs-on: ubuntu-latest
-
-    timeout-minutes: 30
-
-    strategy:
-      matrix:
-        node-version: [14.x, 16.x]
-
+    if: ${{ github.event.inputs.start-url != '' }}
     steps:
-      - name: Call Start URL - optionally
+      - name: Calls start URL
         run: |
           [[ "${{github.event.inputs.start-url}}" != "" ]] && curl -v -X POST -d 'url=${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }}' ${{github.event.inputs.start-url}} || echo ""
         shell: bash
 
-      - uses: actions/checkout@v3
-        with:
-          repository: ${{ github.event.inputs.repository || 'n8n-io/n8n' }}
-          ref: ${{ github.event.inputs.branch || 'master' }}
-
-      - uses: pnpm/action-setup@v2.2.4
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v3
-        with:
-          node-version: ${{ matrix.node-version }}
-          cache: 'pnpm'
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
+  run-e2e-tests:
+    name: E2E [Electron/Node 16]
+    uses: ./.github/workflows/e2e-reusable.yml
+    if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-e2e') }}
+    with:
+      branch: ${{ github.event.inputs.branch || 'master' }}
+      user: ${{ github.event.inputs.user || 'PR User' }}
+      spec: ${{ github.event.inputs.spec || 'e2e/*' }}
+      run-env: base:16.18.1
+    secrets:
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
 
-      - name: Build
-        run: pnpm build
-
-      - name: Test E2E
-        run: |
-          pnpm cypress:install
-          pnpm test:e2e:all
-
-      - name: Upload artifacts
-        uses: actions/upload-artifact@v3
-        if: failure()
-        with:
-          name: cypress-screenshots
-          path: |
-            cypress/screenshots
-          retention-days: 1
+  run-e2e-tests-node-14:
+    name: E2E [Electron/Node 14]
+    uses: ./.github/workflows/e2e-reusable.yml
+    if: ${{ github.event_name == 'schedule' }}
+    with:
+      branch: ${{ github.event.inputs.branch || 'master' }}
+      user: ${{ github.event.inputs.user || 'schedule' }}
+      spec: ${{ github.event.inputs.spec || 'e2e/*' }}
+      run-env: base:14.21.1
+    secrets:
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
 
+  calls-success-url-notify:
+    name: Calls success URL and notifies
+    runs-on: ubuntu-latest
+    needs: [run-e2e-tests, run-e2e-tests-node-14]
+    if: ${{ github.event.inputs.success-url != '' }}
+    steps:
       - name: Notify Slack on failure
         uses: act10ns/slack@v2.0.0
         if: failure()
diff --git a/cypress.config.js b/cypress.config.js
index 357875df43198c..c38bcbc111391b 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -4,29 +4,39 @@ const { defineConfig } = require('cypress');
 const BASE_URL = 'http://localhost:5678';
 
 module.exports = defineConfig({
+	projectId: "5hbsdn",
 	retries: {
 		openMode: 0,
-		runMode: 3,
+		runMode: 2,
 	},
+	defaultCommandTimeout: 10000,
+	requestTimeout: 12000,
 	e2e: {
 		baseUrl: BASE_URL,
-		video: false,
+		video: true,
 		screenshotOnRunFailure: true,
-		experimentalSessionAndOrigin: true,
 		experimentalInteractiveRunEvents: true,
+		experimentalSessionAndOrigin: true,
 
 		setupNodeEvents(on, config) {
 			on('task', {
 				reset: () => fetch(BASE_URL + '/e2e/db/reset', { method: 'POST' }),
-				'setup-owner': (payload) =>
-					fetch(BASE_URL + '/e2e/db/setup-owner', {
-						method: 'POST',
-						body: JSON.stringify(payload),
-						headers: { 'Content-Type': 'application/json' },
-					}),
+				'setup-owner': (payload) => {
+					try {
+						return fetch(BASE_URL + '/e2e/db/setup-owner', {
+							method: 'POST',
+							body: JSON.stringify(payload),
+							headers: { 'Content-Type': 'application/json' },
+						})
+					} catch (error) {
+						console.error("setup-owner failed with: ", error)
+						return null
+					}
+				},
 				'enable-feature': (feature) =>
 					fetch(BASE_URL + `/e2e/enable-feature/${feature}`, { method: 'POST' }),
 			});
 		},
 	},
 });
+
diff --git a/cypress/e2e/10-settings-log-streaming.cy.ts b/cypress/e2e/10-settings-log-streaming.cy.ts
index 00a08c804bb214..e67f47045d8efa 100644
--- a/cypress/e2e/10-settings-log-streaming.cy.ts
+++ b/cypress/e2e/10-settings-log-streaming.cy.ts
@@ -63,11 +63,9 @@ describe('Log Streaming Settings', () => {
 		settingsLogStreamingPage.getters.getSelectDestinationType().click();
 		settingsLogStreamingPage.getters.getSelectDestinationTypeItems().eq(0).click();
 		settingsLogStreamingPage.getters.getSelectDestinationButton().click();
-		settingsLogStreamingPage.getters
-			.getDestinationNameInput()
-			.click()
-			.clear()
-			.type('Destination 0');
+		settingsLogStreamingPage.getters.getDestinationNameInput().click()
+
+		settingsLogStreamingPage.getters.getDestinationNameInput().find('input').clear().type('Destination 0');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().click();
 		cy.wait(100);
 		settingsLogStreamingPage.getters.getDestinationModal().click(1, 1);
@@ -88,11 +86,8 @@ describe('Log Streaming Settings', () => {
 		settingsLogStreamingPage.getters.getSelectDestinationType().click();
 		settingsLogStreamingPage.getters.getSelectDestinationTypeItems().eq(0).click();
 		settingsLogStreamingPage.getters.getSelectDestinationButton().click();
-		settingsLogStreamingPage.getters
-			.getDestinationNameInput()
-			.click()
-			.clear()
-			.type('Destination 1');
+		settingsLogStreamingPage.getters.getDestinationNameInput().click()
+		settingsLogStreamingPage.getters.getDestinationNameInput().find('input').clear().type('Destination 1');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().should('not.have.attr', 'disabled');
 		settingsLogStreamingPage.getters.getDestinationSaveButton().click();
 		cy.wait(100);
diff --git a/cypress/e2e/11-inline-expression-editor.cy.ts b/cypress/e2e/11-inline-expression-editor.cy.ts
index 10bc16fde8d8c8..de5594a4f429a1 100644
--- a/cypress/e2e/11-inline-expression-editor.cy.ts
+++ b/cypress/e2e/11-inline-expression-editor.cy.ts
@@ -17,6 +17,7 @@ describe('Inline expression editor', () => {
 	});
 
 	it('should resolve primitive resolvables', () => {
+		WorkflowPage.getters.inlineExpressionEditorInput().clear();
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
 		WorkflowPage.getters.inlineExpressionEditorInput().type('1 + 2');
 		WorkflowPage.getters.inlineExpressionEditorOutput().contains(/^3$/);
@@ -35,6 +36,7 @@ describe('Inline expression editor', () => {
 	});
 
 	it('should resolve object resolvables', () => {
+		WorkflowPage.getters.inlineExpressionEditorInput().clear();
 		WorkflowPage.getters.inlineExpressionEditorInput().type('{{');
 		WorkflowPage.getters
 			.inlineExpressionEditorInput()
diff --git a/cypress/e2e/14-data-transformation-expressions.cy.ts b/cypress/e2e/14-data-transformation-expressions.cy.ts
index 10827653935726..161f02fe1fa0fb 100644
--- a/cypress/e2e/14-data-transformation-expressions.cy.ts
+++ b/cypress/e2e/14-data-transformation-expressions.cy.ts
@@ -16,7 +16,7 @@ describe('Data transformation expressions', () => {
 		cy.window()
 			// @ts-ignore
 			.then(
-				(win) => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload),
+				(win) => win.onBeforeUnloadNodeView && win.removeEventListener('beforeunload', win.onBeforeUnloadNodeView),
 			);
 	});
 
@@ -80,19 +80,18 @@ describe('Data transformation expressions', () => {
 		ndv.getters.outputDataContainer().contains(output);
 	});
 
-	it('$json + native array methods', () => {
+	it('$json + native array access', () => {
 		wf.actions.addInitialNodeToCanvas('Schedule Trigger', { keepNdvOpen: true });
 		ndv.actions.setPinnedData([{ myArr: [1, 2, 3] }]);
 		ndv.actions.close();
 		addSet();
-
-		const input = '{{$json.myArr.includes(1) + " " + $json.myArr.at(2)';
+		const input = '{{$json.myArr.includes(1) + " " + $json.myArr[2]';
 		const output = 'true 3';
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible');
-		ndv.getters.outputDataContainer().contains(output);
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist')
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('contain', output);
 	});
 
 	it('$json + n8n array methods', () => {
@@ -106,7 +105,8 @@ describe('Data transformation expressions', () => {
 
 		ndv.getters.inlineExpressionEditorInput().clear().type(input);
 		ndv.actions.execute();
-		ndv.getters.outputDataContainer().should('be.visible').contains(output);
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('exist')
+		ndv.getters.outputDataContainer().find('[class*=value_]').should('contain', output);
 	});
 });
 
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index c30f2d0521037d..6b8cd6282acbd8 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -21,7 +21,7 @@ describe('Data mapping', () => {
 		cy.window()
 			// @ts-ignore
 			.then(
-				(win) => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload),
+				(win) => win.onBeforeUnloadNodeView && win.removeEventListener('beforeunload', win.onBeforeUnloadNodeView),
 			);
 	});
 
diff --git a/cypress/e2e/15-scheduler-node.cy.ts b/cypress/e2e/15-scheduler-node.cy.ts
index 922972263a0659..7ba5acec3eec63 100644
--- a/cypress/e2e/15-scheduler-node.cy.ts
+++ b/cypress/e2e/15-scheduler-node.cy.ts
@@ -5,15 +5,15 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('Schedule Trigger node', async () => {
-	before(() => {
+	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
+		cy.visit(workflowsPage.url);
 	});
 
 	it('should execute and return the execution timestamp', () => {
-		cy.visit(workflowsPage.url);
-
 		workflowsPage.actions.createWorkflowFromCard();
+		cy.waitForLoad();
 		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
 		workflowPage.actions.openNode('Schedule Trigger');
 		ndv.actions.execute();
@@ -22,9 +22,8 @@ describe('Schedule Trigger node', async () => {
 	});
 
 	it('should execute once per second when activated', () => {
-		cy.visit(workflowsPage.url);
-
 		workflowsPage.actions.createWorkflowFromCard();
+		cy.waitForLoad();
 		workflowPage.actions.renameWorkflow('Schedule Trigger Workflow');
 		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
 		workflowPage.actions.openNode('Schedule Trigger');
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 3ed3c342cf7531..83c99cb9820b16 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -103,7 +103,7 @@ describe('Webhook Trigger node', async () => {
 		cy.window()
 			// @ts-ignore
 			.then(
-				(win) => win.onBeforeUnload && win.removeEventListener('beforeunload', win.onBeforeUnload),
+				(win) => win.onBeforeUnloadNodeView && win.removeEventListener('beforeunload', win.onBeforeUnloadNodeView),
 			);
 	});
 
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index 9bb11293f449c5..ff3456f7dc5529 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -82,6 +82,7 @@ describe('Sharing', () => {
 
 		cy.visit(workflowsPage.url);
 		workflowsPage.getters.newWorkflowButtonCard().click();
+		cy.waitForLoad();
 		workflowPage.actions.setWorkflowName('Workflow W1');
 		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
 		workflowPage.actions.addNodeToCanvas('Notion', true, true);
diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 27c3e0b0b577de..87926bf0f240d3 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -5,12 +5,9 @@ const wf = new WorkflowPage();
 const TEST_TAGS = ['Tag 1', 'Tag 2', 'Tag 3'];
 
 describe('Workflow tags', () => {
-	before(() => {
+	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
-	});
-
-	beforeEach(() => {
 		wf.actions.visit();
 		cy.waitForLoad();
 	});
diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index 79b60d9dc670d3..9fcf27d91a48d1 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -6,18 +6,15 @@ const workflowPage = new WorkflowPageClass();
 const ndv = new NDV();
 
 describe('Execution', () => {
-	before(() => {
+	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
-	});
-
-	beforeEach(() => {
-		cy.visit('/');
+		// Import workflow
+		workflowsPage.getters.newWorkflowButtonCard().click();
+		cy.waitForLoad();
 	});
 
 	it('should test manual workflow', () => {
-		// Import workflow
-		workflowsPage.getters.newWorkflowButtonCard().click();
 		cy.createFixtureWorkflow('Manual_wait_set.json', `Manual wait set ${uuid()}`);
 
 		// Check workflow buttons
@@ -40,14 +37,14 @@ describe('Execution', () => {
 		workflowPage.getters
 			.canvasNodeByName('Manual')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check').should('not.exist'));
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check').should('not.exist'));
@@ -58,15 +55,15 @@ describe('Execution', () => {
 		workflowPage.getters
 			.canvasNodeByName('Manual')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 
 		// Clear execution data
 		workflowPage.getters.clearExecutionDataButton().should('be.visible');
@@ -78,8 +75,6 @@ describe('Execution', () => {
 	});
 
 	it('should test manual workflow stop', () => {
-		// Import workflow
-		workflowsPage.getters.newWorkflowButtonCard().click();
 		cy.createFixtureWorkflow('Manual_wait_set.json', `Manual wait set ${uuid()}`);
 
 		// Check workflow buttons
@@ -102,14 +97,14 @@ describe('Execution', () => {
 		workflowPage.getters
 			.canvasNodeByName('Manual')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check').should('not.exist'));
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check').should('not.exist'));
@@ -121,11 +116,11 @@ describe('Execution', () => {
 		workflowPage.getters
 			.canvasNodeByName('Manual')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt').should('not.visible'));
@@ -143,8 +138,6 @@ describe('Execution', () => {
 	});
 
 	it('should test webhook workflow', () => {
-		// Import workflow
-		workflowsPage.getters.newWorkflowButtonCard().click();
 		cy.createFixtureWorkflow('Webhook_wait_set.json', `Webhook wait set ${uuid()}`);
 
 		// Check workflow buttons
@@ -184,14 +177,14 @@ describe('Execution', () => {
 		workflowPage.getters
 			.canvasNodeByName('Webhook')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check').should('not.exist'));
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check').should('not.exist'));
@@ -202,15 +195,15 @@ describe('Execution', () => {
 		workflowPage.getters
 			.canvasNodeByName('Webhook')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 
 		// Clear execution data
 		workflowPage.getters.clearExecutionDataButton().should('be.visible');
@@ -222,8 +215,6 @@ describe('Execution', () => {
 	});
 
 	it('should test webhook workflow stop', () => {
-		// Import workflow
-		workflowsPage.getters.newWorkflowButtonCard().click();
 		cy.createFixtureWorkflow('Webhook_wait_set.json', `Webhook wait set ${uuid()}`);
 
 		// Check workflow buttons
@@ -259,34 +250,33 @@ describe('Execution', () => {
 			});
 		});
 
+		workflowPage.getters.stopExecutionButton().click();
 		// Check canvas nodes after 1st step (workflow passed the manual trigger node
 		workflowPage.getters
 			.canvasNodeByName('Webhook')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check').should('not.exist'));
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Set')
 			.within(() => cy.get('.fa-check').should('not.exist'));
 
-		cy.wait(1000);
-		workflowPage.getters.stopExecutionWaitingForWebhookButton().click();
 
 		// Check canvas nodes after workflow stopped
 		workflowPage.getters
 			.canvasNodeByName('Webhook')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-check'))
-			.should('be.visible');
+			.should('exist');
 		workflowPage.getters
 			.canvasNodeByName('Wait')
 			.within(() => cy.get('.fa-sync-alt').should('not.visible'));
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 82cfa427a39b9b..3fe9dd19682767 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -32,6 +32,14 @@ describe('Credentials', () => {
 	before(() => {
 		cy.resetAll();
 		cy.setup({ email, firstName, lastName, password });
+
+		// Always intercept the request to test credentials and return a success
+		cy.intercept('POST', '/rest/credentials/test', {
+			statusCode: 200,
+			body: {
+				data: { status: 'success', message: 'Tested successfully' },
+			}
+		});
 	});
 
 	beforeEach(() => {
@@ -53,7 +61,6 @@ describe('Credentials', () => {
 		credentialsModal.getters.newCredentialTypeOption('Notion API').click();
 
 		credentialsModal.getters.newCredentialTypeButton().click();
-
 		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
 
 		credentialsModal.actions.setName('My awesome Notion account');
@@ -71,7 +78,7 @@ describe('Credentials', () => {
 		credentialsModal.getters.newCredentialTypeOption('Airtable API').click();
 
 		credentialsModal.getters.newCredentialTypeButton().click();
-
+		credentialsModal.getters.editCredentialModal().should('be.visible');
 		credentialsModal.getters.connectionParameter('API Key').type('1234567890');
 
 		credentialsModal.actions.setName('Airtable Account');
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index b40f26be915f00..d619659ac32a18 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -19,7 +19,13 @@ describe('Current Workflow Executions', () => {
 	});
 
 	it('should render executions tab correctly', () => {
-		cy.waitForLoad();
+		cy.intercept('GET', '/rest/executions?filter=*').as('getExecutions');
+		cy.intercept('GET', '/rest/executions-current?filter=*').as('getCurrentExecutions');
+
+		executionsTab.actions.switchToExecutionsTab();
+
+		cy.wait(['@getExecutions', '@getCurrentExecutions']);
+
 		executionsTab.getters.executionListItems().should('have.length', 11);
 		executionsTab.getters.successfulExecutionListItems().should('have.length', 9);
 		executionsTab.getters.failedExecutionListItems().should('have.length', 2);
@@ -40,6 +46,4 @@ const createMockExecutions = () => {
 	// Then add some more successful ones
 	executionsTab.actions.toggleNodeEnabled('Error');
 	executionsTab.actions.createManualExecutions(4);
-	executionsTab.actions.switchToExecutionsTab();
-	cy.waitForLoad();
 };
diff --git a/cypress/e2e/3-default-owner.cy.ts b/cypress/e2e/3-default-owner.cy.ts
index 0ba2f9f44a520c..95b83b043ffbf9 100644
--- a/cypress/e2e/3-default-owner.cy.ts
+++ b/cypress/e2e/3-default-owner.cy.ts
@@ -34,26 +34,19 @@ const firstName = randFirstName();
 const lastName = randLastName();
 
 describe('Default owner', () => {
-	before(() => {
+	it('should be able to create workflows', () => {
 		cy.resetAll();
-	});
-	beforeEach(() => {
-		cy.visit('/');
-	});
-
-	it('should skip owner setup', () => {
 		cy.skipSetup();
-	});
-
-	it('should be able to create workflows', () => {
+		cy.visit('/');
 		workflowsPage.getters.newWorkflowButtonCard().should('be.visible');
 		workflowsPage.getters.newWorkflowButtonCard().click();
 
+		cy.waitForLoad();
 		cy.createFixtureWorkflow('Test_workflow_1.json', `Test workflow`);
 
 		// reload page, ensure owner still has access
 		cy.reload();
-
+		cy.waitForLoad();
 		workflowPage.getters.workflowNameInput().should('contain.value', 'Test workflow');
 	});
 
@@ -82,6 +75,7 @@ describe('Default owner', () => {
 	});
 
 	it('should be able to setup UM from settings', () => {
+		cy.visit('/');
 		mainSidebar.getters.settings().should('be.visible');
 		mainSidebar.actions.goToSettings();
 		cy.url().should('include', settingsUsagePage.url);
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 9850ab14c147d6..a6e986c6451b94 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -1,13 +1,7 @@
 import { NodeCreator } from '../pages/features/node-creator';
-import { DEFAULT_USER_EMAIL, DEFAULT_USER_PASSWORD } from '../constants';
-import { randFirstName, randLastName } from '@ngneat/falso';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { NDV } from '../pages/ndv';
 
-const email = DEFAULT_USER_EMAIL;
-const password = DEFAULT_USER_PASSWORD;
-const firstName = randFirstName();
-const lastName = randLastName();
 const nodeCreatorFeature = new NodeCreator();
 const WorkflowPage = new WorkflowPageClass();
 const NDVModal = new NDV();
@@ -15,12 +9,10 @@ const NDVModal = new NDV();
 describe('Node Creator', () => {
 	before(() => {
 		cy.resetAll();
-		cy.setup({ email, firstName, lastName, password });
+		cy.skipSetup();
 	});
 
 	beforeEach(() => {
-		cy.signin({ email, password });
-
 		cy.visit(nodeCreatorFeature.url);
 		cy.waitForLoad();
 	});
@@ -105,58 +97,52 @@ describe('Node Creator', () => {
 	it('should search through actions and confirm added action', () => {
 		nodeCreatorFeature.actions.openNodeCreator();
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('ftp');
-		nodeCreatorFeature.getters.searchBar().find('input').realPress('{rightarrow}');
+		nodeCreatorFeature.getters.searchBar().find('input').type('{rightarrow}');
 		nodeCreatorFeature.getters.activeSubcategory().should('have.text', 'FTP');
 		nodeCreatorFeature.getters.searchBar().find('input').clear().type('file');
 		// Navigate to rename action which should be the 4th item
-		nodeCreatorFeature.getters.searchBar().find('input').realPress('{downarrow}');
-		nodeCreatorFeature.getters.searchBar().find('input').realPress('{downarrow}');
-		nodeCreatorFeature.getters.searchBar().find('input').realPress('{downarrow}');
-		nodeCreatorFeature.getters.searchBar().find('input').realPress('{rightarrow}');
+		nodeCreatorFeature.getters.searchBar().find('input').type('{downarrow} {downarrow} {downarrow} {rightarrow}');
 		NDVModal.getters.parameterInput('operation').should('contain.text', 'Rename');
 	})
 
 	it('should render and select community node', () => {
-		cy.intercept('GET', '/types/nodes.json').as('nodesIntercept');
-		cy.wait('@nodesIntercept').then(() => {
-			const customNode = 'E2E Node';
-
-			nodeCreatorFeature.actions.openNodeCreator();
-			nodeCreatorFeature.getters.searchBar().find('input').clear().type(customNode);
-
-			nodeCreatorFeature.getters
-				.getCreatorItem(customNode)
-				.findChildByTestId('node-creator-item-tooltip')
-				.should('exist');
-			nodeCreatorFeature.actions.selectNode(customNode);
-
-			// TODO: Replace once we have canvas feature utils
-			cy.get('.data-display .node-name').contains(customNode).should('exist');
-
-			const nodeParameters = () => cy.getByTestId('node-parameters');
-			const firstParameter = () => nodeParameters().find('.parameter-item').eq(0);
-			const secondParameter = () => nodeParameters().find('.parameter-item').eq(1);
-
-			// Check correct fields are rendered
-			nodeParameters().should('exist');
-			// Test property text input
-			firstParameter().contains('Test property').should('exist');
-			firstParameter().find('input.el-input__inner').should('have.value', 'Some default');
-			// Resource select input
-			secondParameter().find('label').contains('Resource').should('exist');
-			secondParameter().find('input.el-input__inner').should('have.value', 'option2');
-			secondParameter().find('.el-select').click();
-			secondParameter().find('.el-select-dropdown__list').should('exist');
-			// Check if all options are rendered and select the fourth one
-			secondParameter().find('.el-select-dropdown__list').children().should('have.length', 4);
-			secondParameter()
-				.find('.el-select-dropdown__list')
-				.children()
-				.eq(3)
-				.contains('option4')
-				.should('exist')
-				.click();
-			secondParameter().find('input.el-input__inner').should('have.value', 'option4');
-		});
+		const customNode = 'E2E Node';
+
+		nodeCreatorFeature.actions.openNodeCreator();
+		nodeCreatorFeature.getters.searchBar().find('input').clear().type(customNode);
+
+		nodeCreatorFeature.getters
+			.getCreatorItem(customNode)
+			.findChildByTestId('node-creator-item-tooltip')
+			.should('exist');
+		nodeCreatorFeature.actions.selectNode(customNode);
+
+		// TODO: Replace once we have canvas feature utils
+		cy.get('.data-display .node-name').contains(customNode).should('exist');
+
+		const nodeParameters = () => cy.getByTestId('node-parameters');
+		const firstParameter = () => nodeParameters().find('.parameter-item').eq(0);
+		const secondParameter = () => nodeParameters().find('.parameter-item').eq(1);
+
+		// Check correct fields are rendered
+		nodeParameters().should('exist');
+		// Test property text input
+		firstParameter().contains('Test property').should('exist');
+		firstParameter().find('input.el-input__inner').should('have.value', 'Some default');
+		// Resource select input
+		secondParameter().find('label').contains('Resource').should('exist');
+		secondParameter().find('input.el-input__inner').should('have.value', 'option2');
+		secondParameter().find('.el-select').click();
+		secondParameter().find('.el-select-dropdown__list').should('exist');
+		// Check if all options are rendered and select the fourth one
+		secondParameter().find('.el-select-dropdown__list').children().should('have.length', 4);
+		secondParameter()
+			.find('.el-select-dropdown__list')
+			.children()
+			.eq(3)
+			.contains('option4')
+			.should('exist')
+			.click();
+		secondParameter().find('input.el-input__inner').should('have.value', 'option4');
 	});
 });
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 9025725e558fcd..3a57d51bcfeeed 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -1,22 +1,19 @@
-import { WorkflowsPage, WorkflowPage, NDV } from '../pages';
+import { WorkflowPage, NDV } from '../pages';
 import { v4 as uuid } from 'uuid';
 
-const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('NDV', () => {
-	before(() => {
-		cy.resetAll();
-		cy.skipSetup();
-	});
 
 	beforeEach(() => {
-		workflowsPage.actions.createWorkflowFromCard();
+		cy.resetAll();
+		cy.skipSetup();
+		cy.visit(workflowPage.url)
+		cy.waitForLoad();
 		workflowPage.actions.renameWorkflow(uuid());
 		workflowPage.actions.saveWorkflowOnButtonClick();
 	});
-
 	it('should show up when double clicked on a node and close when Back to canvas clicked', () => {
 		workflowPage.actions.addInitialNodeToCanvas('Manual');
 		workflowPage.getters.canvasNodes().first().dblclick();
@@ -52,11 +49,12 @@ describe('NDV', () => {
 		workflowPage.getters.canvasNodes().last().dblclick();
 		ndv.getters.inputSelect().click();
 		ndv.getters.inputOption().last().click();
+		ndv.getters.inputDataContainer().find('[class*=schema_]').should('exist')
 		ndv.getters.inputDataContainer().should('contain', 'start');
 	});
 
 	it('should show correct validation state for resource locator params', () => {
-		workflowPage.actions.addNodeToCanvas('Typeform', true, false);
+		workflowPage.actions.addNodeToCanvas('Typeform', true, true);
 		ndv.getters.container().should('be.visible');
 		cy.get('.has-issues').should('have.length', 0);
 		cy.get('[class*=hasIssues]').should('have.length', 0);
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index 4742bb3cbcc08a..8896953c3baa78 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -112,6 +112,9 @@ describe('Workflow Actions', () => {
 	});
 
 	it('should update workflow settings', () => {
+		cy.resetAll();
+		cy.skipSetup();
+		WorkflowPage.actions.visit();
 		// Open settings dialog
 		WorkflowPage.actions.saveWorkflowOnButtonClick();
 		WorkflowPage.getters.workflowMenu().should('be.visible');
diff --git a/cypress/pages/credentials.ts b/cypress/pages/credentials.ts
index 47f8cdcc9a01f6..7d3bf7ac9855ea 100644
--- a/cypress/pages/credentials.ts
+++ b/cypress/pages/credentials.ts
@@ -5,7 +5,7 @@ export class CredentialsPage extends BasePage {
 	getters = {
 		emptyListCreateCredentialButton: () => cy.getByTestId('empty-resources-list').find('button'),
 		createCredentialButton: () => cy.getByTestId('resources-list-add'),
-		searchInput: () => cy.getByTestId('resources-list-search'),
+		searchInput: () => cy.getByTestId('resources-list-search').find('input'),
 		emptyList: () => cy.getByTestId('resources-list-empty'),
 		credentialCards: () => cy.getByTestId('resources-list-item'),
 		credentialCard: (credentialName: string) =>
diff --git a/cypress/pages/modals/credentials-modal.ts b/cypress/pages/modals/credentials-modal.ts
index 02b267bf9fa083..2f5fd298aa99df 100644
--- a/cypress/pages/modals/credentials-modal.ts
+++ b/cypress/pages/modals/credentials-modal.ts
@@ -12,9 +12,7 @@ export class CredentialsModal extends BasePage {
 		connectionParameter: (fieldName: string) =>
 			this.getters
 				.connectionParameters()
-				.contains(fieldName)
-				.parents('[data-test-id="credential-connection-parameter"]')
-				.find('.n8n-input input'),
+				.find(`:contains('${fieldName}') .n8n-input input`),
 		name: () => cy.getByTestId('credential-name'),
 		nameInput: () => cy.getByTestId('credential-name').find('input'),
 		// Saving of the credentials takes a while on the CI so we need to increase the timeout
@@ -45,10 +43,6 @@ export class CredentialsModal extends BasePage {
 		},
 		save: (test = false) => {
 			cy.intercept('POST', '/rest/credentials').as('saveCredential');
-			if (test) {
-				cy.intercept('POST', '/rest/credentials/test').as('testCredential');
-			}
-
 			this.getters.saveButton().click();
 
 			cy.wait('@saveCredential');
diff --git a/cypress/pages/workflow-executions-tab.ts b/cypress/pages/workflow-executions-tab.ts
index ea6c8b4fd5b7c7..4e641ae69a2e7a 100644
--- a/cypress/pages/workflow-executions-tab.ts
+++ b/cypress/pages/workflow-executions-tab.ts
@@ -26,8 +26,9 @@ export class WorkflowExecutionsTab extends BasePage {
 		},
 		createManualExecutions: (count: number) => {
 			for (let i=0; i<count; i++) {
+				cy.intercept('POST', '/rest/workflows/run').as('workflowExecution');
 				workflowPage.actions.executeWorkflow();
-				cy.wait(300);
+				cy.wait('@workflowExecution');
 			}
 		},
 		switchToExecutionsTab: () => {
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 2094726db8be7b..f5167e01cb53c8 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -44,7 +44,7 @@ export class WorkflowPage extends BasePage {
 		firstStepButton: () => cy.getByTestId('canvas-add-button'),
 		isWorkflowSaved: () => this.getters.saveButton().should('match', 'span'), // In Element UI, disabled button turn into spans 🤷‍♂️
 		isWorkflowActivated: () => this.getters.activatorSwitch().should('have.class', 'is-checked'),
-		expressionModalInput: () => cy.getByTestId('expression-modal-input'),
+		expressionModalInput: () => cy.getByTestId('expression-modal-input').find('[role=textbox]'),
 		expressionModalOutput: () => cy.getByTestId('expression-modal-output'),
 
 		nodeViewRoot: () => cy.getByTestId('node-view-root'),
@@ -84,7 +84,7 @@ export class WorkflowPage extends BasePage {
 		duplicateWorkflowModal: () => cy.getByTestId('duplicate-modal'),
 		nodeViewBackground: () => cy.getByTestId('node-view-background'),
 		nodeView: () => cy.getByTestId('node-view'),
-		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input'),
+		inlineExpressionEditorInput: () => cy.getByTestId('inline-expression-editor-input').find('[role=textbox]'),
 		inlineExpressionEditorOutput: () => cy.getByTestId('inline-expression-editor-output'),
 		zoomInButton: () => cy.getByTestId('zoom-in-button'),
 		zoomOutButton: () => cy.getByTestId('zoom-out-button'),
@@ -181,8 +181,10 @@ export class WorkflowPage extends BasePage {
 			this.getters.workflowNameInput().clear().type(name).type('{enter}');
 		},
 		activateWorkflow: () => {
+			cy.intercept('PATCH', '/rest/workflows/*').as('activateWorkflow');
 			this.getters.activatorSwitch().find('input').first().should('be.enabled');
 			this.getters.activatorSwitch().click();
+			cy.wait('@activateWorkflow');
 			cy.get('body').type('{esc}');
 		},
 		renameWorkflow: (newName: string) => {
diff --git a/cypress/pages/workflows.ts b/cypress/pages/workflows.ts
index de2a38a1018200..4a30b92ecbdc2b 100644
--- a/cypress/pages/workflows.ts
+++ b/cypress/pages/workflows.ts
@@ -5,7 +5,7 @@ export class WorkflowsPage extends BasePage {
 	getters = {
 		newWorkflowButtonCard: () => cy.getByTestId('new-workflow-card'),
 		newWorkflowTemplateCard: () => cy.getByTestId('new-workflow-template-card'),
-		searchBar: () => cy.getByTestId('resources-list-search'),
+		searchBar: () => cy.getByTestId('resources-list-search').find('input'),
 		createWorkflowButton: () => cy.getByTestId('resources-list-add'),
 		workflowCards: () => cy.getByTestId('resources-list-item'),
 		workflowCard: (workflowName: string) =>
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 445645975c7302..2497b3abecce09 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -206,9 +206,8 @@ Cypress.Commands.add('grantBrowserPermissions', (...permissions: string[]) => {
 		);
 	}
 });
-Cypress.Commands.add('readClipboard', () =>
-	cy.window().its('navigator.clipboard').invoke('readText'),
-);
+
+Cypress.Commands.add('readClipboard', () => cy.window().then(win => win.navigator.clipboard.readText()))
 
 Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) => {
 	// https://developer.mozilla.org/en-US/docs/Web/API/Element/paste_event
diff --git a/package.json b/package.json
index 0ad9b44fa7354c..5f272f06c4b815 100644
--- a/package.json
+++ b/package.json
@@ -42,7 +42,7 @@
     "@types/jest": "^29.2.2",
     "@types/supertest": "^2.0.12",
     "cross-env": "^7.0.3",
-    "cypress": "^10.0.3",
+    "cypress": "^12.7.0",
     "cypress-real-events": "^1.7.6",
     "jest": "^29.4.2",
     "jest-environment-jsdom": "^29.4.2",
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 0a50fe90818ffe..bcca817b40b4b0 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -12,6 +12,7 @@ export const inProduction = NODE_ENV === 'production';
 export const inDevelopment = !NODE_ENV || NODE_ENV === 'development';
 export const inTest = NODE_ENV === 'test';
 export const inE2ETests = E2E_TESTS === 'true';
+
 export const CUSTOM_API_CALL_NAME = 'Custom API Call';
 export const CUSTOM_API_CALL_KEY = '__CUSTOM_API_CALL__';
 
diff --git a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
index 1d892ca04ff389..0669617f9e93f0 100644
--- a/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
+++ b/packages/editor-ui/src/components/ResourceLocator/ResourceLocator.vue
@@ -447,7 +447,10 @@ export default mixins(debounceHelper, workflowHelpers, nodeHelpers).extend({
 	},
 	methods: {
 		setWidth() {
-			this.width = (this.$refs.container as HTMLElement).offsetWidth;
+			const containerRef = this.$refs.container as HTMLElement;
+			if (containerRef) {
+				this.width = containerRef?.offsetWidth;
+			}
 		},
 		getLinkAlt(entity: string) {
 			if (this.selectedMode === 'list' && entity) {
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index f8b8dbb359f519..eb3c2ea626c03b 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -2594,7 +2594,7 @@ export default mixins(
 
 			// allow to be overriden in e2e tests
 			// @ts-ignore
-			window.onBeforeUnload = (e) => {
+			window.onBeforeUnloadNodeView = (e) => {
 				if (this.isDemo) {
 					return;
 				} else if (this.uiStore.stateIsDirty) {
@@ -2608,7 +2608,7 @@ export default mixins(
 					return;
 				}
 			};
-			window.addEventListener('beforeunload', window.onBeforeUnload);
+			window.addEventListener('beforeunload', window.onBeforeUnloadNodeView);
 		},
 		getOutputEndpointUUID(nodeName: string, index: number): string | null {
 			const node = this.workflowsStore.getNodeByName(nodeName);
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 6375d3ca6d5e49..770e2251b49e83 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -34,7 +34,7 @@ importers:
       '@types/jest': ^29.2.2
       '@types/supertest': ^2.0.12
       cross-env: ^7.0.3
-      cypress: ^10.0.3
+      cypress: ^12.7.0
       cypress-real-events: ^1.7.6
       jest: ^29.4.2
       jest-environment-jsdom: ^29.4.2
@@ -60,12 +60,12 @@ importers:
       '@types/jest': 29.2.2
       '@types/supertest': 2.0.12
       cross-env: 7.0.3
-      cypress: 10.11.0
-      cypress-real-events: 1.7.6_cypress@10.11.0
+      cypress: 12.7.0
+      cypress-real-events: 1.7.6_cypress@12.7.0
       jest: 29.4.2
       jest-environment-jsdom: 29.4.2
       jest-mock: 29.4.2
-      jest-mock-extended: 3.0.1_47mstovy2thvxzoe7ouhdvjexm
+      jest-mock-extended: 3.0.1_gelezmms3va3pnkofxaadhcvma
       nock: 13.2.9
       node-fetch: 2.6.7
       p-limit: 3.1.0
@@ -74,8 +74,8 @@ importers:
       run-script-os: 1.1.6
       start-server-and-test: 1.14.0
       supertest: 6.3.3
-      ts-jest: 29.0.5_pa4ebk5usulsg7iw3zwjv5figy
-      tsc-watch: 6.0.0_typescript@4.9.4
+      ts-jest: 29.0.5_zgilbyuumz7xbrerspmrtjuxsi
+      tsc-watch: 6.0.0_typescript@4.9.5
       turbo: 1.7.4
 
   packages/@n8n_io/eslint-config:
@@ -95,9 +95,9 @@ importers:
       eslint-plugin-vue: ~7.17
     devDependencies:
       '@types/eslint': 8.4.6
-      '@typescript-eslint/eslint-plugin': 5.45.0_wke4plxjew2ogjxrdwvzd2srfq
-      '@typescript-eslint/parser': 5.45.0_wy4udjehnvkneqnogzx5kughki
-      '@vue/eslint-config-typescript': 8.0.0_foaxzhaputljbcoeiwudem25oq
+      '@typescript-eslint/eslint-plugin': 5.45.0_nasf2kpz3oxiofoztaiw65ixem
+      '@typescript-eslint/parser': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
+      '@vue/eslint-config-typescript': 8.0.0_tzuopv2z7r6hmaghrrdryxy3qq
       eslint: 8.28.0
       eslint-config-airbnb-typescript: 17.0.0_twozqnrpw2n42bn4rzkw5rgv4m
       eslint-config-prettier: 8.5.0_eslint@8.28.0
@@ -337,7 +337,7 @@ importers:
       sse-channel: 4.0.0
       swagger-ui-express: 4.5.0_express@4.18.2
       syslog-client: 1.1.1
-      typedi: 0.10.0
+      typedi: 0.10.0_syy565ld7euwcedfbmx53j2qc4
       typeorm: 0.3.12_pgelcv6ef3switkrteavpif3pq
       uuid: 8.3.2
       validator: 13.7.0
@@ -391,7 +391,7 @@ importers:
       mock-jwks: 1.0.9_nock@13.2.9
       nodemon: 2.0.20
       run-script-os: 1.1.6
-      ts-essentials: 7.0.3_typescript@4.9.4
+      ts-essentials: 7.0.3_typescript@4.9.5
       tsc-alias: 1.8.2
       tsconfig-paths: 4.1.2
 
@@ -520,7 +520,7 @@ importers:
       '@storybook/addon-links': 7.0.0-beta.46_6l5554ty5ajsajah6yazvrjhoe
       '@storybook/addon-postcss': 3.0.0-alpha.1_webpack@5.75.0
       '@storybook/vue': 7.0.0-beta.46_wp7tvu3eu4pbkovl2pyk3t6dzu
-      '@storybook/vue-webpack5': 7.0.0-beta.46_kqbjeyqrxfaciuxblodnlqbkgm
+      '@storybook/vue-webpack5': 7.0.0-beta.46_6qmhhfx7j6nt5tk6ratxcrskc4
       '@testing-library/jest-dom': 5.16.5
       '@testing-library/vue': 5.8.3_rhqkolmkwunxzlyyxxsuwaiuri
       '@types/markdown-it': 12.2.3
@@ -545,7 +545,7 @@ importers:
       vue-loader: 15.10.1_eo5mtzohqv75mh6aooqyrh42dy
       vue-property-decorator: 9.1.2_jtyyyychrtcflhl7vfprhmeb3y
       vue-template-compiler: 2.7.14
-      vue-tsc: 1.0.24_typescript@4.9.4
+      vue-tsc: 1.0.24_typescript@4.9.5
 
   packages/editor-ui:
     specifiers:
@@ -664,7 +664,7 @@ importers:
       n8n-design-system: link:../design-system
       n8n-workflow: link:../workflow
       normalize-wheel: 1.0.1
-      pinia: 2.0.23_vj744rb3neneiaeb3oalctaenu
+      pinia: 2.0.23_hwpzsh6pnvsm3pjf2zi526hnzq
       prettier: 2.8.3
       prismjs: 1.29.0
       stream-browserify: 3.0.0
@@ -710,7 +710,7 @@ importers:
       vite: 4.0.4_sass@1.55.0+terser@5.16.1
       vite-plugin-monaco-editor: 1.1.0_monaco-editor@0.33.0
       vitest: 0.28.4_sass@1.55.0+terser@5.16.1
-      vue-tsc: 1.0.24_typescript@4.9.4
+      vue-tsc: 1.0.24_typescript@4.9.5
 
   packages/node-dev:
     specifiers:
@@ -1082,7 +1082,7 @@ importers:
       '@types/tmp': 0.2.3
       '@types/uuid': 8.3.4
       '@types/xml2js': 0.4.11
-      eslint-plugin-n8n-nodes-base: 1.12.0_wy4udjehnvkneqnogzx5kughki
+      eslint-plugin-n8n-nodes-base: 1.12.0_pku7h6lsbnh7tcsfjudlqd5qce
       gulp: 4.0.2
       n8n-workflow: link:../workflow
 
@@ -3983,7 +3983,7 @@ packages:
     peerDependencies:
       pinia: '>=2.0.19'
     dependencies:
-      pinia: 2.0.23_vj744rb3neneiaeb3oalctaenu
+      pinia: 2.0.23_hwpzsh6pnvsm3pjf2zi526hnzq
       vue-demi: 0.13.11_vue@2.7.14
     transitivePeerDependencies:
       - '@vue/composition-api'
@@ -4557,7 +4557,7 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/builder-webpack5/7.0.0-beta.46_vsjsuvw2laeoxumlaes6yduxsu:
+  /@storybook/builder-webpack5/7.0.0-beta.46_lyfnfac7rmzfleuimsdvcn3dv4:
     resolution: {integrity: sha512-1pvo9IDlz836hiDFmALVttQxw4ehSd3UEhE6Yz0B+TMl4cAQuSRWze8w2sI474tiHtGeKGRoIIWmH5hSVQvFrQ==}
     peerDependencies:
       react: ^16.8.0 || ^17.0.0 || ^18.0.0
@@ -4595,7 +4595,7 @@ packages:
       case-sensitive-paths-webpack-plugin: 2.4.0
       css-loader: 6.7.3_webpack@5.75.0
       express: 4.18.2
-      fork-ts-checker-webpack-plugin: 6.5.2_oidmngyddw6azfqg3taanyywde
+      fork-ts-checker-webpack-plugin: 6.5.2_3vu26w62dupooczhvlkrwvyfsa
       fs-extra: 11.1.0
       html-webpack-plugin: 5.5.0_webpack@5.75.0
       path-browserify: 1.0.1
@@ -4607,7 +4607,7 @@ packages:
       style-loader: 3.3.1_webpack@5.75.0
       terser-webpack-plugin: 5.3.6_htvmhiqynazf46fjrszipnqp7a
       ts-dedent: 2.2.0
-      typescript: 4.9.4
+      typescript: 4.9.5
       util: 0.12.5
       util-deprecate: 1.0.2
       webpack: 5.75.0_esbuild@0.16.17
@@ -5012,7 +5012,7 @@ packages:
     resolution: {integrity: sha512-tQ6hv57SPVxyOYPQzhlrhkuKs3Nk4Efa1DN9bzYg5jEzXbeZ9uK4jmV9TDQdWv0QeAvK81SD1YNI2OtzbLPVgA==}
     dev: true
 
-  /@storybook/preset-vue-webpack/7.0.0-beta.46_saukmnhi62725vq7wtdfif6krm:
+  /@storybook/preset-vue-webpack/7.0.0-beta.46_hp247ej5z4ok6lxqqu3v2d7xta:
     resolution: {integrity: sha512-X40UKuFlXV5lQuVrdP4jBEkPwf+9whXqJwNnBMlQICU/SEwC5oE2sqi7cFU5sZ8DBVzqDunxCE0rfYETeliyyw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
@@ -5029,7 +5029,7 @@ packages:
       '@types/node': 16.18.12
       babel-loader: 9.1.2_la66t7xldg4uecmyawueag5wkm
       css-loader: 6.7.3_webpack@5.75.0
-      ts-loader: 9.4.2_3fkjkrd3audxnith3e7fo4fnxi
+      ts-loader: 9.4.2_hhrrucqyg4eysmfpujvov2ym5u
       vue: 2.7.14
       vue-docgen-api: 4.56.4_vue@2.7.14
       vue-docgen-loader: 1.5.1_yl6fzifju7igosbqtgzpjuylxi
@@ -5177,7 +5177,7 @@ packages:
       - supports-color
     dev: true
 
-  /@storybook/vue-webpack5/7.0.0-beta.46_kqbjeyqrxfaciuxblodnlqbkgm:
+  /@storybook/vue-webpack5/7.0.0-beta.46_6qmhhfx7j6nt5tk6ratxcrskc4:
     resolution: {integrity: sha512-PJJo/NGiWL1raOfHpJTb3X6LmLAC2TgI3EV2nDlkPigxj29O+zeMkyvfDky7eWpgOIbVqqtNVUYGH1GwbL7jqw==}
     engines: {node: '>=16.0.0'}
     peerDependencies:
@@ -5191,9 +5191,9 @@ packages:
       vue-template-compiler: ^2.6.8
     dependencies:
       '@babel/core': 7.20.12
-      '@storybook/builder-webpack5': 7.0.0-beta.46_vsjsuvw2laeoxumlaes6yduxsu
+      '@storybook/builder-webpack5': 7.0.0-beta.46_lyfnfac7rmzfleuimsdvcn3dv4
       '@storybook/core-common': 7.0.0-beta.46
-      '@storybook/preset-vue-webpack': 7.0.0-beta.46_saukmnhi62725vq7wtdfif6krm
+      '@storybook/preset-vue-webpack': 7.0.0-beta.46_hp247ej5z4ok6lxqqu3v2d7xta
       '@storybook/vue': 7.0.0-beta.46_wp7tvu3eu4pbkovl2pyk3t6dzu
       '@types/node': 16.18.12
       babel-loader: 9.1.2_la66t7xldg4uecmyawueag5wkm
@@ -6391,7 +6391,7 @@ packages:
     dev: true
     optional: true
 
-  /@typescript-eslint/eslint-plugin/5.45.0_wke4plxjew2ogjxrdwvzd2srfq:
+  /@typescript-eslint/eslint-plugin/5.45.0_nasf2kpz3oxiofoztaiw65ixem:
     resolution: {integrity: sha512-CXXHNlf0oL+Yg021cxgOdMHNTXD17rHkq7iW6RFHoybdFgQBjU3yIXhhcPpGwr1CjZlo6ET8C6tzX5juQoXeGA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -6402,23 +6402,23 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/parser': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       '@typescript-eslint/scope-manager': 5.45.0
-      '@typescript-eslint/type-utils': 5.45.0_wy4udjehnvkneqnogzx5kughki
-      '@typescript-eslint/utils': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/type-utils': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
+      '@typescript-eslint/utils': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       debug: 4.3.4
       eslint: 8.28.0
       ignore: 5.2.0
       natural-compare-lite: 1.4.0
       regexpp: 3.2.0
       semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
-      typescript: 4.9.4
+      tsutils: 3.21.0_typescript@4.9.5
+      typescript: 4.9.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/parser/5.45.0_wy4udjehnvkneqnogzx5kughki:
+  /@typescript-eslint/parser/5.45.0_pku7h6lsbnh7tcsfjudlqd5qce:
     resolution: {integrity: sha512-brvs/WSM4fKUmF5Ot/gEve6qYiCMjm6w4HkHPfS6ZNmxTS0m0iNN4yOChImaCkqc1hRwFGqUyanMXuGal6oyyQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -6430,10 +6430,10 @@ packages:
     dependencies:
       '@typescript-eslint/scope-manager': 5.45.0
       '@typescript-eslint/types': 5.45.0
-      '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.4
+      '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.5
       debug: 4.3.4
       eslint: 8.28.0
-      typescript: 4.9.4
+      typescript: 4.9.5
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6446,7 +6446,7 @@ packages:
       '@typescript-eslint/visitor-keys': 5.45.0
     dev: true
 
-  /@typescript-eslint/type-utils/5.45.0_wy4udjehnvkneqnogzx5kughki:
+  /@typescript-eslint/type-utils/5.45.0_pku7h6lsbnh7tcsfjudlqd5qce:
     resolution: {integrity: sha512-DY7BXVFSIGRGFZ574hTEyLPRiQIvI/9oGcN8t1A7f6zIs6ftbrU0nhyV26ZW//6f85avkwrLag424n+fkuoJ1Q==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -6456,12 +6456,12 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.4
-      '@typescript-eslint/utils': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.5
+      '@typescript-eslint/utils': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       debug: 4.3.4
       eslint: 8.28.0
-      tsutils: 3.21.0_typescript@4.9.4
-      typescript: 4.9.4
+      tsutils: 3.21.0_typescript@4.9.5
+      typescript: 4.9.5
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6471,7 +6471,7 @@ packages:
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     dev: true
 
-  /@typescript-eslint/typescript-estree/5.45.0_typescript@4.9.4:
+  /@typescript-eslint/typescript-estree/5.45.0_typescript@4.9.5:
     resolution: {integrity: sha512-maRhLGSzqUpFcZgXxg1qc/+H0bT36lHK4APhp0AEUVrpSwXiRAomm/JGjSG+kNUio5kAa3uekCYu/47cnGn5EQ==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -6486,13 +6486,13 @@ packages:
       globby: 11.1.0
       is-glob: 4.0.3
       semver: 7.3.8
-      tsutils: 3.21.0_typescript@4.9.4
-      typescript: 4.9.4
+      tsutils: 3.21.0_typescript@4.9.5
+      typescript: 4.9.5
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /@typescript-eslint/utils/5.45.0_wy4udjehnvkneqnogzx5kughki:
+  /@typescript-eslint/utils/5.45.0_pku7h6lsbnh7tcsfjudlqd5qce:
     resolution: {integrity: sha512-OUg2JvsVI1oIee/SwiejTot2OxwU8a7UfTFMOdlhD2y+Hl6memUSL4s98bpUTo8EpVEr0lmwlU7JSu/p2QpSvA==}
     engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0}
     peerDependencies:
@@ -6502,7 +6502,7 @@ packages:
       '@types/semver': 7.3.13
       '@typescript-eslint/scope-manager': 5.45.0
       '@typescript-eslint/types': 5.45.0
-      '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.4
+      '@typescript-eslint/typescript-estree': 5.45.0_typescript@4.9.5
       eslint: 8.28.0
       eslint-scope: 5.1.1
       eslint-utils: 3.0.0_eslint@8.28.0
@@ -6735,7 +6735,7 @@ packages:
   /@vue/devtools-api/6.4.5:
     resolution: {integrity: sha512-JD5fcdIuFxU4fQyXUu3w2KpAJHzTVdN+p4iOX2lMWSHMOoQdMAcpFLZzm9Z/2nmsoZ1a96QEhZ26e50xLBsgOQ==}
 
-  /@vue/eslint-config-typescript/8.0.0_foaxzhaputljbcoeiwudem25oq:
+  /@vue/eslint-config-typescript/8.0.0_tzuopv2z7r6hmaghrrdryxy3qq:
     resolution: {integrity: sha512-8u8Qpg4qfjJoNeRMdHlxif9BcGy4iYSSK4YYW5AFPPRtkBJiCqtoyT72l4F3ZeZII09ax2N6yQeHbQ0CXQi1bA==}
     engines: {node: ^10.12.0 || >=12.0.0}
     peerDependencies:
@@ -6748,11 +6748,11 @@ packages:
       typescript:
         optional: true
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.45.0_wke4plxjew2ogjxrdwvzd2srfq
-      '@typescript-eslint/parser': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/eslint-plugin': 5.45.0_nasf2kpz3oxiofoztaiw65ixem
+      '@typescript-eslint/parser': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       eslint: 8.28.0
       eslint-plugin-vue: 7.17.0_eslint@8.28.0
-      typescript: 4.9.4
+      typescript: 4.9.5
       vue-eslint-parser: 7.11.0_eslint@8.28.0
     transitivePeerDependencies:
       - supports-color
@@ -9436,17 +9436,17 @@ packages:
       nub: 0.0.0
     dev: false
 
-  /cypress-real-events/1.7.6_cypress@10.11.0:
+  /cypress-real-events/1.7.6_cypress@12.7.0:
     resolution: {integrity: sha512-yP6GnRrbm6HK5q4DH6Nnupz37nOfZu/xn1xFYqsE2o4G73giPWQOdu6375QYpwfU1cvHNCgyD2bQ2hPH9D7NMw==}
     peerDependencies:
       cypress: ^4.x || ^5.x || ^6.x || ^7.x || ^8.x || ^9.x || ^10.x || ^11.x || ^12.x
     dependencies:
-      cypress: 10.11.0
+      cypress: 12.7.0
     dev: true
 
-  /cypress/10.11.0:
-    resolution: {integrity: sha512-lsaE7dprw5DoXM00skni6W5ElVVLGAdRUUdZjX2dYsGjbY/QnpzWZ95Zom1mkGg0hAaO/QVTZoFVS7Jgr/GUPA==}
-    engines: {node: '>=12.0.0'}
+  /cypress/12.7.0:
+    resolution: {integrity: sha512-7rq+nmhzz0u6yabCFyPtADU2OOrYt6pvUau9qV7xyifJ/hnsaw/vkr0tnLlcuuQKUAOC1v1M1e4Z0zG7S0IAvA==}
+    engines: {node: ^14.0.0 || ^16.0.0 || >=18.0.0}
     hasBin: true
     dependencies:
       '@cypress/request': 2.88.10
@@ -10488,8 +10488,8 @@ packages:
       eslint: ^7.32.0 || ^8.2.0
       eslint-plugin-import: ^2.25.3
     dependencies:
-      '@typescript-eslint/eslint-plugin': 5.45.0_wke4plxjew2ogjxrdwvzd2srfq
-      '@typescript-eslint/parser': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/eslint-plugin': 5.45.0_nasf2kpz3oxiofoztaiw65ixem
+      '@typescript-eslint/parser': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       eslint: 8.28.0
       eslint-config-airbnb-base: 15.0.0_ktrec6dplf4now6nlbc6d67jee
       eslint-plugin-import: 2.26.0_xmouedd5rhgbah4737x2hltudq
@@ -10558,7 +10558,7 @@ packages:
       eslint-import-resolver-webpack:
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/parser': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       debug: 3.2.7
       eslint: 8.28.0
       eslint-import-resolver-node: 0.3.6
@@ -10586,7 +10586,7 @@ packages:
       '@typescript-eslint/parser':
         optional: true
     dependencies:
-      '@typescript-eslint/parser': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/parser': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       array-includes: 3.1.5
       array.prototype.flat: 1.3.0
       debug: 2.6.9
@@ -10611,10 +10611,10 @@ packages:
     resolution: {integrity: sha512-qe6sVFDP1Vj5eXlqZxYZpIjwYvhuqXlI0P8OfPyhiPOhMkFtr0TpFphD8/6WCzkm7LJCvG1eJEzURCtMIsFTAg==}
     dev: true
 
-  /eslint-plugin-n8n-nodes-base/1.12.0_wy4udjehnvkneqnogzx5kughki:
+  /eslint-plugin-n8n-nodes-base/1.12.0_pku7h6lsbnh7tcsfjudlqd5qce:
     resolution: {integrity: sha512-AotXR6IsxLNnxp4OxhD33xcmRFwVq7ZImBd0mTgpirV3VX8pCJDdiDlI2zCAICcICZxtOdbVtHOMhhnMjTh71A==}
     dependencies:
-      '@typescript-eslint/utils': 5.45.0_wy4udjehnvkneqnogzx5kughki
+      '@typescript-eslint/utils': 5.45.0_pku7h6lsbnh7tcsfjudlqd5qce
       camel-case: 4.1.2
       indefinite: 2.4.1
       pascal-case: 3.1.2
@@ -11451,7 +11451,7 @@ packages:
   /forever-agent/0.6.1:
     resolution: {integrity: sha512-j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw==}
 
-  /fork-ts-checker-webpack-plugin/6.5.2_oidmngyddw6azfqg3taanyywde:
+  /fork-ts-checker-webpack-plugin/6.5.2_3vu26w62dupooczhvlkrwvyfsa:
     resolution: {integrity: sha512-m5cUmF30xkZ7h4tWUgTAcEaKmUW7tfyUyTqNNOz7OxWJ0v1VWKTcOvH8FWHUwSjlW/356Ijc9vi3XfcPstpQKA==}
     engines: {node: '>=10', yarn: '>=1.0.0'}
     peerDependencies:
@@ -11478,7 +11478,7 @@ packages:
       schema-utils: 2.7.0
       semver: 7.3.8
       tapable: 1.1.3
-      typescript: 4.9.4
+      typescript: 4.9.5
       vue-template-compiler: 2.7.14
       webpack: 5.75.0_esbuild@0.16.17
     dev: true
@@ -13447,15 +13447,15 @@ packages:
       stack-utils: 2.0.6
     dev: true
 
-  /jest-mock-extended/3.0.1_47mstovy2thvxzoe7ouhdvjexm:
+  /jest-mock-extended/3.0.1_gelezmms3va3pnkofxaadhcvma:
     resolution: {integrity: sha512-RF4Ow8pXvbRuEcCTj56oYHmig5311BSFvbEGxPNYL51wGKGu93MvVQgx0UpFmjqyBXIcElkZo2Rke88kR1iSKQ==}
     peerDependencies:
       jest: ^24.0.0 || ^25.0.0 || ^26.0.0 || ^27.0.0 || ^28.0.0 || ^29.0.0
       typescript: ^3.0.0 || ^4.0.0
     dependencies:
       jest: 29.4.2
-      ts-essentials: 7.0.3_typescript@4.9.4
-      typescript: 4.9.4
+      ts-essentials: 7.0.3_typescript@4.9.5
+      typescript: 4.9.5
     dev: true
 
   /jest-mock/29.4.2:
@@ -16509,7 +16509,7 @@ packages:
     engines: {node: '>=6'}
     dev: true
 
-  /pinia/2.0.23_vj744rb3neneiaeb3oalctaenu:
+  /pinia/2.0.23_hwpzsh6pnvsm3pjf2zi526hnzq:
     resolution: {integrity: sha512-N15hFf4o5STrxpNrib1IEb1GOArvPYf1zPvQVRGOO1G1d74Ak0J0lVyalX/SmrzdT4Q0nlEFjbURsmBmIGUR5Q==}
     peerDependencies:
       '@vue/composition-api': ^1.4.0
@@ -16522,7 +16522,7 @@ packages:
         optional: true
     dependencies:
       '@vue/devtools-api': 6.4.5
-      typescript: 4.9.4
+      typescript: 4.9.5
       vue: 2.7.14
       vue-demi: 0.13.11_vue@2.7.14
 
@@ -17165,11 +17165,6 @@ packages:
     resolution: {integrity: sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw==}
     dev: false
 
-  /punycode/2.1.1:
-    resolution: {integrity: sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==}
-    engines: {node: '>=6'}
-    dev: false
-
   /punycode/2.2.0:
     resolution: {integrity: sha512-LN6QV1IJ9ZhxWTNdktaPClrNfp8xdSAYS0Zk2ddX7XsXZAxckMHPCBcHRo0cTcEIgYPRiGEkmji3Idkh2yFtYw==}
     engines: {node: '>=6'}
@@ -19643,7 +19638,7 @@ packages:
     dependencies:
       ip-regex: 2.1.0
       psl: 1.9.0
-      punycode: 2.1.1
+      punycode: 2.2.0
     dev: false
 
   /tough-cookie/4.1.2:
@@ -19690,19 +19685,19 @@ packages:
     engines: {node: '>=6.10'}
     dev: true
 
-  /ts-essentials/7.0.3_typescript@4.9.4:
+  /ts-essentials/7.0.3_typescript@4.9.5:
     resolution: {integrity: sha512-8+gr5+lqO3G84KdiTSMRLtuyJ+nTBVRKuCrK4lidMPdVeEp0uqC875uE5NMcaA7YYMN7XsNiFQuMvasF8HT/xQ==}
     peerDependencies:
       typescript: '>=3.7.0'
     dependencies:
-      typescript: 4.9.4
+      typescript: 4.9.5
     dev: true
 
   /ts-expect/1.3.0:
     resolution: {integrity: sha512-e4g0EJtAjk64xgnFPD6kTBUtpnMVzDrMb12N1YZV0VvSlhnVT3SGxiYTLdGy8Q5cYHOIC/FAHmZ10eGrAguicQ==}
     dev: false
 
-  /ts-jest/29.0.5_pa4ebk5usulsg7iw3zwjv5figy:
+  /ts-jest/29.0.5_zgilbyuumz7xbrerspmrtjuxsi:
     resolution: {integrity: sha512-PL3UciSgIpQ7f6XjVOmbi96vmDHUqAyqDr8YxzopDqX3kfgYtX1cuNeBjP+L9sFXi6nzsGGA6R3fP3DDDJyrxA==}
     engines: {node: ^14.15.0 || ^16.10.0 || >=18.0.0}
     hasBin: true
@@ -19732,11 +19727,11 @@ packages:
       lodash.memoize: 4.1.2
       make-error: 1.3.6
       semver: 7.3.8
-      typescript: 4.9.4
+      typescript: 4.9.5
       yargs-parser: 21.1.1
     dev: true
 
-  /ts-loader/9.4.2_3fkjkrd3audxnith3e7fo4fnxi:
+  /ts-loader/9.4.2_hhrrucqyg4eysmfpujvov2ym5u:
     resolution: {integrity: sha512-OmlC4WVmFv5I0PpaxYb+qGeGOdm5giHU7HwDDUjw59emP2UYMHy9fFSDcYgSNoH8sXcj4hGCSEhlDZ9ULeDraA==}
     engines: {node: '>=12.0.0'}
     peerDependencies:
@@ -19747,7 +19742,7 @@ packages:
       enhanced-resolve: 5.10.0
       micromatch: 4.0.5
       semver: 7.3.8
-      typescript: 4.9.4
+      typescript: 4.9.5
       webpack: 5.75.0_esbuild@0.16.17
     dev: true
 
@@ -19767,7 +19762,7 @@ packages:
       plimit-lit: 1.4.1
     dev: true
 
-  /tsc-watch/6.0.0_typescript@4.9.4:
+  /tsc-watch/6.0.0_typescript@4.9.5:
     resolution: {integrity: sha512-zgpju+/z5z29/kK5V28Nz16CMkX2voFOUxkTlCim/R25hxzbyUqu2NfTnmJBQfESBSPbEQUGqDdB9A8opAcB4A==}
     engines: {node: '>=12.12.0'}
     hasBin: true
@@ -19778,7 +19773,7 @@ packages:
       node-cleanup: 2.1.2
       ps-tree: 1.2.0
       string-argv: 0.3.1
-      typescript: 4.9.4
+      typescript: 4.9.5
     dev: true
 
   /tsconfig-paths/3.14.1:
@@ -19816,14 +19811,14 @@ packages:
     engines: {node: '>=0.6.x'}
     dev: false
 
-  /tsutils/3.21.0_typescript@4.9.4:
+  /tsutils/3.21.0_typescript@4.9.5:
     resolution: {integrity: sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==}
     engines: {node: '>= 6'}
     peerDependencies:
       typescript: '>=2.8.0 || >= 3.2.0-dev || >= 3.3.0-dev || >= 3.4.0-dev || >= 3.5.0-dev || >= 3.6.0-dev || >= 3.6.0-beta || >= 3.7.0-dev || >= 3.7.0-beta'
     dependencies:
       tslib: 1.14.1
-      typescript: 4.9.4
+      typescript: 4.9.5
     dev: true
 
   /tunnel-agent/0.6.0:
@@ -19971,9 +19966,10 @@ packages:
   /typedarray/0.0.6:
     resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==}
 
-  /typedi/0.10.0:
+  /typedi/0.10.0_syy565ld7euwcedfbmx53j2qc4:
     resolution: {integrity: sha512-v3UJF8xm68BBj6AF4oQML3ikrfK2c9EmZUyLOfShpJuItAqVBHWP/KtpGinkSsIiP6EZyyb6Z3NXyW9dgS9X1w==}
     dev: false
+    patched: true
 
   /typeorm/0.3.12_pgelcv6ef3switkrteavpif3pq:
     resolution: {integrity: sha512-sYSxBmCf1nJLLTcYtwqZ+lQIRtLPyUoO93rHTOKk9vJCyT4UfRtU7oRsJvfvKP3nnZTD1hzz2SEy2zwPEN6OyA==}
@@ -20058,8 +20054,8 @@ packages:
       - supports-color
     dev: false
 
-  /typescript/4.9.4:
-    resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==}
+  /typescript/4.9.5:
+    resolution: {integrity: sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==}
     engines: {node: '>=4.2.0'}
     hasBin: true
 
@@ -21112,7 +21108,7 @@ packages:
     resolution: {integrity: sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==}
     dev: true
 
-  /vue-tsc/1.0.24_typescript@4.9.4:
+  /vue-tsc/1.0.24_typescript@4.9.5:
     resolution: {integrity: sha512-mmU1s5SAqE1nByQAiQnao9oU4vX+mSdsgI8H57SfKH6UVzq/jP9+Dbi2GaV+0b4Cn361d2ln8m6xeU60ApiEXg==}
     hasBin: true
     peerDependencies:
@@ -21120,7 +21116,7 @@ packages:
     dependencies:
       '@volar/vue-language-core': 1.0.24
       '@volar/vue-typescript': 1.0.24
-      typescript: 4.9.4
+      typescript: 4.9.5
     dev: true
 
   /vue-typed-mixins/0.2.0:

From a91b631411ead81aafb8608c4ad266c837118b66 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 2 Mar 2023 17:32:52 +0100
Subject: [PATCH 316/358] :rocket: Release 0.218.0 (#5601)

* :rocket: Release 0.218.0

* Update Changelog

---------

Co-authored-by: janober <janober@users.noreply.github.com>
Co-authored-by: Jan Oberhauser <jan.oberhauser@gmail.com>
---
 CHANGELOG.md                        | 31 +++++++++++++++++++++++++++++
 package.json                        |  2 +-
 packages/cli/package.json           |  2 +-
 packages/core/package.json          |  2 +-
 packages/design-system/package.json |  2 +-
 packages/editor-ui/package.json     |  2 +-
 packages/node-dev/package.json      |  2 +-
 packages/nodes-base/package.json    |  2 +-
 packages/workflow/package.json      |  2 +-
 9 files changed, 39 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 38d9c9e343f86a..22413258161039 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,34 @@
+# [0.218.0](https://github.com/n8n-io/n8n/compare/n8n@0.217.2...n8n@0.218.0) (2023-03-02)
+
+
+### Bug Fixes
+
+* **core:** Fix execution pruning queries ([#5562](https://github.com/n8n-io/n8n/issues/5562)) ([88de661](https://github.com/n8n-io/n8n/commit/88de6613bda2d4f133410b05c5c2a8d2f1ba838f))
+* **core:** Fix Filtering of Workflow by Tags ([#5570](https://github.com/n8n-io/n8n/issues/5570)) ([ea2035b](https://github.com/n8n-io/n8n/commit/ea2035b5102853d2aa7e5e01d70e06acf4abd3d8))
+* **core:** Revert `isPending` check on the user entity ([#5571](https://github.com/n8n-io/n8n/issues/5571)) ([a19ec6a](https://github.com/n8n-io/n8n/commit/a19ec6ac94ac2ed6ab96bf7fe2216cdd2324228b))
+* Fix issues with nodes missing in nodes panel ([#5599](https://github.com/n8n-io/n8n/issues/5599)) ([5040fea](https://github.com/n8n-io/n8n/commit/5040fea93ecc36017d25f237fe9b3e23bc9d623d))
+* Fix mapping paths when appending to empty expression ([#5591](https://github.com/n8n-io/n8n/issues/5591)) ([1f7b478](https://github.com/n8n-io/n8n/commit/1f7b478920ee2b8b4f6affcfd0b42f79b2cd8cd1))
+* **Item Lists Node:** Tweak item list summarize field naming  ([#5572](https://github.com/n8n-io/n8n/issues/5572)) ([aa2beaa](https://github.com/n8n-io/n8n/commit/aa2beaa80076fc06360828e466a3dc05e7caddbe))
+* Prevent executions from displaying as running forever ([#5563](https://github.com/n8n-io/n8n/issues/5563)) ([46d9ac6](https://github.com/n8n-io/n8n/commit/46d9ac6c6f55a505716c8951f93b149713bcbe35))
+* Show Execute Workflow node in nodes panel ([#5583](https://github.com/n8n-io/n8n/issues/5583)) ([d6d1c07](https://github.com/n8n-io/n8n/commit/d6d1c07a53bb903b19c49ea11b9d36993fde7c33))
+* Show RabbitMQ node in nodes panel ([#5598](https://github.com/n8n-io/n8n/issues/5598)) ([4f5013f](https://github.com/n8n-io/n8n/commit/4f5013ff53294579fb9e47f90ae08e9a6bc76b75))
+* Stop showing mapping hint after mapping ([#5586](https://github.com/n8n-io/n8n/issues/5586)) ([eac4275](https://github.com/n8n-io/n8n/commit/eac4275a7ebfa6ccc6258261b1b3ac36c9df9d88))
+
+
+### Features
+
+* Add distribution test tracking ([#5588](https://github.com/n8n-io/n8n/issues/5588)) ([91bd014](https://github.com/n8n-io/n8n/commit/91bd0146f35ba3f38c862cac9c5ad48ff7cd38e8))
+* Add events to enable onboarding checklist ([#5536](https://github.com/n8n-io/n8n/issues/5536)) ([20c4919](https://github.com/n8n-io/n8n/commit/20c49195131399aa6ab0c6938eebb5e2733c6710))
+* **core:** Add SAML login setup ([#5515](https://github.com/n8n-io/n8n/issues/5515)) ([40a934b](https://github.com/n8n-io/n8n/commit/40a934bbb4f6eed80aa5c1de6814c0e0eea65ebd))
+* **core:** Add SAML settings and consolidate LDAP under SSO ([#5574](https://github.com/n8n-io/n8n/issues/5574)) ([31cc8de](https://github.com/n8n-io/n8n/commit/31cc8de8297454cad4307e008b3b915475c0a889))
+* **editor:** Add missing documentation to autocomplete items for inline code editor ([#5560](https://github.com/n8n-io/n8n/issues/5560)) ([ae63440](https://github.com/n8n-io/n8n/commit/ae634407a47de33d77cb81ae7ce11362e8485fd4))
+* **editor:** Show parameter hint on multilines ([#5014](https://github.com/n8n-io/n8n/issues/5014)) ([1942fd8](https://github.com/n8n-io/n8n/commit/1942fd82323183fb31af671ccb8d22f6a4798d7f))
+* **Jira Software Node:** Support binary streaming for very large binary files ([#5589](https://github.com/n8n-io/n8n/issues/5589)) ([f61d779](https://github.com/n8n-io/n8n/commit/f61d779667f25a411b51ee61ddd3fe4698f05934))
+* **OpenAI Node:** Add support for ChatGPT ([#5596](https://github.com/n8n-io/n8n/issues/5596)) ([06c5ecb](https://github.com/n8n-io/n8n/commit/06c5ecbdf3031a7773e698294ae701a7e501ef50))
+* **Telegram Node:** Add Parse Mode to Send Document operation ([#5554](https://github.com/n8n-io/n8n/issues/5554)) ([f3c943e](https://github.com/n8n-io/n8n/commit/f3c943ef8191bd16e16a61ffbed6b1caca0d75a5))
+
+
+
 ## [0.217.2](https://github.com/n8n-io/n8n/compare/n8n@0.217.1...n8n@0.217.2) (2023-02-27)
 
 
diff --git a/package.json b/package.json
index 5f272f06c4b815..7600fd9f0d8424 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.217.2",
+  "version": "0.218.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index a61b8979a16a84..8955bf5289706d 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.217.2",
+  "version": "0.218.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/core/package.json b/packages/core/package.json
index 861e9386ac6cfe..5955686d35e696 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.156.0",
+  "version": "0.157.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 23c8c283333499..3f86c997d0d2cc 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "0.55.0",
+  "version": "0.56.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 47942dbbcfc354..18baff6053c766 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.183.0",
+  "version": "0.184.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index bd46798d559847..518f6b71840b72 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.95.0",
+  "version": "0.96.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 85a31356553c2a..5979fdc6eafe24 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.215.0",
+  "version": "0.216.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index a2f574fde16717..56cf7ee68663c4 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.138.0",
+  "version": "0.139.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From b5179597f3ec4ae468b2eb91969fa56322088e6f Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Fri, 3 Mar 2023 10:05:30 +0100
Subject: [PATCH 317/358] feat(core): Limit user changes when saml is enabled
 (#5577)

* consolidate SSO settings

* update saml settings

* fix type error

* limit user changes when saml is enabled

* add test
---
 packages/cli/src/controllers/me.controller.ts | 25 ++++++
 .../saml/middleware/samlEnabledMiddleware.ts  |  5 +-
 packages/cli/src/sso/saml/samlHelpers.ts      |  5 ++
 packages/cli/src/sso/ssoHelpers.ts            |  6 ++
 .../test/integration/saml/saml.api.test.ts    | 78 +++++++++++++++++++
 5 files changed, 116 insertions(+), 3 deletions(-)
 create mode 100644 packages/cli/test/integration/saml/saml.api.test.ts

diff --git a/packages/cli/src/controllers/me.controller.ts b/packages/cli/src/controllers/me.controller.ts
index 5c830a6803baf2..e56c820155a5d0 100644
--- a/packages/cli/src/controllers/me.controller.ts
+++ b/packages/cli/src/controllers/me.controller.ts
@@ -22,6 +22,7 @@ import type {
 	IInternalHooksClass,
 } from '@/Interfaces';
 import { randomBytes } from 'crypto';
+import { isSamlLicensedAndEnabled } from '../sso/saml/samlHelpers';
 
 @RestController('/me')
 export class MeController {
@@ -77,6 +78,20 @@ export class MeController {
 
 		await validateEntity(payload);
 
+		// If SAML is enabled, we don't allow the user to change their email address
+		if (isSamlLicensedAndEnabled()) {
+			if (email !== currentEmail) {
+				this.logger.debug(
+					'Request to update user failed because SAML user may not change their email',
+					{
+						userId,
+						payload,
+					},
+				);
+				throw new BadRequestError('SAML user may not change their email');
+			}
+		}
+
 		await this.userRepository.update(userId, payload);
 		const user = await this.userRepository.findOneOrFail({
 			where: { id: userId },
@@ -105,6 +120,16 @@ export class MeController {
 	async updatePassword(req: MeRequest.Password, res: Response) {
 		const { currentPassword, newPassword } = req.body;
 
+		// If SAML is enabled, we don't allow the user to change their email address
+		if (isSamlLicensedAndEnabled()) {
+			this.logger.debug('Attempted to change password for user, while SAML is enabled', {
+				userId: req.user?.id,
+			});
+			throw new BadRequestError(
+				'With SAML enabled, users need to use their SAML provider to change passwords',
+			);
+		}
+
 		if (typeof currentPassword !== 'string' || typeof newPassword !== 'string') {
 			throw new BadRequestError('Invalid payload.');
 		}
diff --git a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
index bf15030d836efe..257d694e487850 100644
--- a/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
+++ b/packages/cli/src/sso/saml/middleware/samlEnabledMiddleware.ts
@@ -1,7 +1,6 @@
 import type { RequestHandler } from 'express';
 import type { AuthenticatedRequest } from '../../../requests';
-import { isSamlCurrentAuthenticationMethod } from '../../ssoHelpers';
-import { isSamlLoginEnabled, isSamlLicensed } from '../samlHelpers';
+import { isSamlLicensed, isSamlLicensedAndEnabled } from '../samlHelpers';
 
 export const samlLicensedOwnerMiddleware: RequestHandler = (
 	req: AuthenticatedRequest,
@@ -16,7 +15,7 @@ export const samlLicensedOwnerMiddleware: RequestHandler = (
 };
 
 export const samlLicensedAndEnabledMiddleware: RequestHandler = (req, res, next) => {
-	if (isSamlLoginEnabled() && isSamlLicensed() && isSamlCurrentAuthenticationMethod()) {
+	if (isSamlLicensedAndEnabled()) {
 		next();
 	} else {
 		res.status(401).json({ status: 'error', message: 'Unauthorized' });
diff --git a/packages/cli/src/sso/saml/samlHelpers.ts b/packages/cli/src/sso/saml/samlHelpers.ts
index c6c0c6c30fb889..fb9e0a3b7f4d4b 100644
--- a/packages/cli/src/sso/saml/samlHelpers.ts
+++ b/packages/cli/src/sso/saml/samlHelpers.ts
@@ -10,6 +10,7 @@ import type { SamlUserAttributes } from './types/samlUserAttributes';
 import type { FlowResult } from 'samlify/types/src/flow';
 import type { SamlAttributeMapping } from './types/samlAttributeMapping';
 import { SAML_ENTERPRISE_FEATURE_ENABLED, SAML_LOGIN_ENABLED, SAML_LOGIN_LABEL } from './constants';
+import { isSamlCurrentAuthenticationMethod } from '../ssoHelpers';
 /**
  *  Check whether the SAML feature is licensed and enabled in the instance
  */
@@ -37,6 +38,10 @@ export function isSamlLicensed(): boolean {
 	);
 }
 
+export function isSamlLicensedAndEnabled(): boolean {
+	return isSamlLoginEnabled() && isSamlLicensed() && isSamlCurrentAuthenticationMethod();
+}
+
 export const isSamlPreferences = (candidate: unknown): candidate is SamlPreferences => {
 	const o = candidate as SamlPreferences;
 	return (
diff --git a/packages/cli/src/sso/ssoHelpers.ts b/packages/cli/src/sso/ssoHelpers.ts
index f00ddc0fe5b8c5..9c8b03e450de91 100644
--- a/packages/cli/src/sso/ssoHelpers.ts
+++ b/packages/cli/src/sso/ssoHelpers.ts
@@ -11,3 +11,9 @@ export function isSsoJustInTimeProvisioningEnabled(): boolean {
 export function doRedirectUsersFromLoginToSsoFlow(): boolean {
 	return config.getEnv('sso.redirectLoginToSso');
 }
+
+export function setCurrentAuthenticationMethod(
+	authenticationMethod: 'email' | 'ldap' | 'saml',
+): void {
+	config.set('userManagement.authenticationMethod', authenticationMethod);
+}
diff --git a/packages/cli/test/integration/saml/saml.api.test.ts b/packages/cli/test/integration/saml/saml.api.test.ts
new file mode 100644
index 00000000000000..02176989f160d6
--- /dev/null
+++ b/packages/cli/test/integration/saml/saml.api.test.ts
@@ -0,0 +1,78 @@
+import express from 'express';
+
+import config from '@/config';
+import type { Role } from '@db/entities/Role';
+import { randomEmail, randomName, randomValidPassword } from '../shared/random';
+import * as testDb from '../shared/testDb';
+import type { AuthAgent } from '../shared/types';
+import * as utils from '../shared/utils';
+import { setSamlLoginEnabled } from '../../../src/sso/saml/samlHelpers';
+import { setCurrentAuthenticationMethod } from '../../../src/sso/ssoHelpers';
+
+let app: express.Application;
+let globalOwnerRole: Role;
+let globalMemberRole: Role;
+let authAgent: AuthAgent;
+
+function enableSaml(enable: boolean) {
+	setSamlLoginEnabled(enable);
+	setCurrentAuthenticationMethod(enable ? 'saml' : 'email');
+	config.set('enterprise.features.saml', enable);
+}
+
+beforeAll(async () => {
+	app = await utils.initTestServer({ endpointGroups: ['me'] });
+
+	globalOwnerRole = await testDb.getGlobalOwnerRole();
+	globalMemberRole = await testDb.getGlobalMemberRole();
+
+	authAgent = utils.createAuthAgent(app);
+});
+
+beforeEach(async () => {
+	await testDb.truncate(['User']);
+});
+
+afterAll(async () => {
+	await testDb.terminate();
+});
+
+describe('Owner shell', () => {
+	test('PATCH /me should succeed with valid inputs', async () => {
+		const ownerShell = await testDb.createUserShell(globalOwnerRole);
+		const authOwnerShellAgent = authAgent(ownerShell);
+		const response = await authOwnerShellAgent.patch('/me').send({
+			email: randomEmail(),
+			firstName: randomName(),
+			lastName: randomName(),
+			password: randomValidPassword(),
+		});
+		expect(response.statusCode).toBe(200);
+	});
+
+	test('PATCH /me should throw BadRequestError if email is changed when SAML is enabled', async () => {
+		enableSaml(true);
+		const ownerShell = await testDb.createUserShell(globalOwnerRole);
+		const authOwnerShellAgent = authAgent(ownerShell);
+		const response = await authOwnerShellAgent.patch('/me').send({
+			email: randomEmail(),
+			firstName: randomName(),
+			lastName: randomName(),
+		});
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toContain('SAML');
+		enableSaml(false);
+	});
+
+	test('PATCH /password should throw BadRequestError if password is changed when SAML is enabled', async () => {
+		enableSaml(true);
+		const ownerShell = await testDb.createUserShell(globalOwnerRole);
+		const authOwnerShellAgent = authAgent(ownerShell);
+		const response = await authOwnerShellAgent.patch('/me/password').send({
+			password: randomValidPassword(),
+		});
+		expect(response.statusCode).toBe(400);
+		expect(response.body.message).toContain('SAML');
+		enableSaml(false);
+	});
+});

From 523fa71705c0408c6c60c7cb5135323e3488e8c9 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Fri, 3 Mar 2023 10:19:43 +0100
Subject: [PATCH 318/358] feat(core): Add SAML post and test endpoints (#5595)

* consolidate SSO settings

* update saml settings

* fix type error

* limit user changes when saml is enabled

* add test

* add toggle endpoint and fetch metadata

* rename enabled param

* add handling of POST saml login request

* add config test endpoint
---
 packages/cli/src/sso/saml/constants.ts        |   4 +
 .../routes/saml.controller.protected.ee.ts    |  51 ++++++-
 packages/cli/src/sso/saml/saml.service.ee.ts  | 140 +++++++++++++++---
 packages/cli/src/sso/saml/types/index.ts      |   1 +
 packages/cli/src/sso/saml/types/requests.ts   |   1 +
 .../cli/src/sso/saml/types/samlPreferences.ts |  33 ++++-
 .../cli/src/sso/saml/views/initSsoPost.ts     |  15 ++
 .../cli/src/sso/saml/views/initSsoRedirect.ts |  12 ++
 8 files changed, 226 insertions(+), 31 deletions(-)
 create mode 100644 packages/cli/src/sso/saml/types/index.ts
 create mode 100644 packages/cli/src/sso/saml/views/initSsoPost.ts
 create mode 100644 packages/cli/src/sso/saml/views/initSsoRedirect.ts

diff --git a/packages/cli/src/sso/saml/constants.ts b/packages/cli/src/sso/saml/constants.ts
index 715c20b932c981..6f92690f5f5d19 100644
--- a/packages/cli/src/sso/saml/constants.ts
+++ b/packages/cli/src/sso/saml/constants.ts
@@ -15,6 +15,10 @@ export class SamlUrls {
 
 	static readonly config = '/config';
 
+	static readonly configTest = '/config/test';
+
+	static readonly configToggleEnabled = '/config/toggle';
+
 	static readonly restConfig = this.samlRESTRoot + this.config;
 
 	static readonly defaultRedirect = '/';
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
index 5a4376f692e8aa..9a98e6926bd0fd 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
@@ -8,7 +8,10 @@ import { SamlUrls } from '../constants';
 import type { SamlConfiguration } from '../types/requests';
 import { AuthError, BadRequestError } from '@/ResponseHelper';
 import { issueCookie } from '../../../auth/jwt';
-import { isSamlPreferences } from '../samlHelpers';
+import { validate } from 'class-validator';
+import type { PostBindingContext } from 'samlify/types/src/entity';
+import { getInitSSOFormView } from '../views/initSsoPost';
+import { getInitSSOPostView } from '../views/initSsoRedirect';
 
 export const samlControllerProtected = express.Router();
 
@@ -27,17 +30,38 @@ samlControllerProtected.get(
 
 /**
  * POST /sso/saml/config
- * Return SAML config
+ * Set SAML config
  */
 samlControllerProtected.post(
 	SamlUrls.config,
 	samlLicensedOwnerMiddleware,
 	async (req: SamlConfiguration.Update, res: express.Response) => {
-		if (isSamlPreferences(req.body)) {
+		const validationResult = await validate(req.body);
+		if (validationResult.length === 0) {
 			const result = await SamlService.getInstance().setSamlPreferences(req.body);
 			return res.send(result);
 		} else {
-			throw new BadRequestError('Body is not a SamlPreferences object');
+			throw new BadRequestError(
+				'Body is not a valid SamlPreferences object: ' +
+					validationResult.map((e) => e.toString()).join(','),
+			);
+		}
+	},
+);
+
+/**
+ * POST /sso/saml/config/toggle
+ * Set SAML config
+ */
+samlControllerProtected.post(
+	SamlUrls.configToggleEnabled,
+	samlLicensedOwnerMiddleware,
+	async (req: SamlConfiguration.Toggle, res: express.Response) => {
+		if (req.body.loginEnabled !== undefined) {
+			await SamlService.getInstance().setSamlPreferences({ loginEnabled: req.body.loginEnabled });
+			res.sendStatus(200);
+		} else {
+			throw new BadRequestError('Body should contain a boolean "loginEnabled" property');
 		}
 	},
 );
@@ -96,12 +120,23 @@ samlControllerProtected.get(
 	SamlUrls.initSSO,
 	samlLicensedAndEnabledMiddleware,
 	async (req: express.Request, res: express.Response) => {
-		const url = SamlService.getInstance().getRedirectLoginRequestUrl();
-		if (url) {
-			// TODO:SAML: redirect to the URL on the client side
-			return res.status(301).send(url);
+		const result = SamlService.getInstance().getLoginRequestUrl();
+		if (result?.binding === 'redirect') {
+			// forced client side redirect
+			return res.send(getInitSSOPostView(result.context));
+			// return res.status(301).send(result.context.context);
+		} else if (result?.binding === 'post') {
+			return res.send(getInitSSOFormView(result.context as PostBindingContext));
 		} else {
 			throw new AuthError('SAML redirect failed, please check your SAML configuration.');
 		}
 	},
 );
+
+samlControllerProtected.get(
+	SamlUrls.configTest,
+	async (req: express.Request, res: express.Response) => {
+		const testResult = await SamlService.getInstance().testSamlConnection();
+		return res.send(testResult);
+	},
+);
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index 72dc3bf2c2c122..d4fd3b40ba99ab 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -2,7 +2,7 @@ import type express from 'express';
 import * as Db from '@/Db';
 import type { User } from '@/databases/entities/User';
 import { jsonParse, LoggerProxy } from 'n8n-workflow';
-import { AuthError } from '@/ResponseHelper';
+import { AuthError, BadRequestError } from '@/ResponseHelper';
 import { getServiceProviderInstance } from './serviceProvider.ee';
 import type { SamlUserAttributes } from './types/samlUserAttributes';
 import type { SamlAttributeMapping } from './types/samlAttributeMapping';
@@ -20,6 +20,10 @@ import {
 	setSamlLoginLabel,
 	updateUserFromSamlAttributes,
 } from './samlHelpers';
+import type { Settings } from '../../databases/entities/Settings';
+import axios from 'axios';
+import type { SamlLoginBinding } from './types';
+import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
 
 export class SamlService {
 	private static instance: SamlService;
@@ -44,6 +48,10 @@ export class SamlService {
 
 	private _metadata = '';
 
+	private metadataUrl = '';
+
+	private loginBinding: SamlLoginBinding = 'post';
+
 	public get metadata(): string {
 		return this._metadata;
 	}
@@ -53,7 +61,7 @@ export class SamlService {
 	}
 
 	constructor() {
-		this.loadSamlPreferences()
+		this.loadFromDbAndApplySamlPreferences()
 			.then(() => {
 				LoggerProxy.debug('Initializing SAML service');
 			})
@@ -70,7 +78,7 @@ export class SamlService {
 	}
 
 	async init(): Promise<void> {
-		await this.loadSamlPreferences();
+		await this.loadFromDbAndApplySamlPreferences();
 	}
 
 	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
@@ -83,19 +91,48 @@ export class SamlService {
 		return this.identityProviderInstance;
 	}
 
-	getRedirectLoginRequestUrl(): string {
+	getLoginRequestUrl(binding?: SamlLoginBinding): {
+		binding: SamlLoginBinding;
+		context: BindingContext | PostBindingContext;
+	} {
+		if (binding === undefined) binding = this.loginBinding;
+		if (binding === 'post') {
+			return {
+				binding,
+				context: this.getPostLoginRequestUrl(),
+			};
+		} else {
+			return {
+				binding,
+				context: this.getRedirectLoginRequestUrl(),
+			};
+		}
+	}
+
+	private getRedirectLoginRequestUrl(): BindingContext {
 		const loginRequest = getServiceProviderInstance().createLoginRequest(
 			this.getIdentityProviderInstance(),
 			'redirect',
 		);
 		//TODO:SAML: debug logging
 		LoggerProxy.debug(loginRequest.context);
-		return loginRequest.context;
+		return loginRequest;
+	}
+
+	private getPostLoginRequestUrl(): PostBindingContext {
+		const loginRequest = getServiceProviderInstance().createLoginRequest(
+			this.getIdentityProviderInstance(),
+			'post',
+		) as PostBindingContext;
+		//TODO:SAML: debug logging
+
+		LoggerProxy.debug(loginRequest.context);
+		return loginRequest;
 	}
 
 	async handleSamlLogin(
 		req: express.Request,
-		binding: 'post' | 'redirect',
+		binding: SamlLoginBinding,
 	): Promise<
 		| {
 				authenticatedUser: User | undefined;
@@ -150,21 +187,32 @@ export class SamlService {
 		return {
 			mapping: this.attributeMapping,
 			metadata: this.metadata,
+			metadataUrl: this.metadataUrl,
+			loginBinding: this.loginBinding,
 			loginEnabled: isSamlLoginEnabled(),
 			loginLabel: getSamlLoginLabel(),
 		};
 	}
 
-	async setSamlPreferences(prefs: SamlPreferences): Promise<void> {
-		this.attributeMapping = prefs.mapping;
-		this.metadata = prefs.metadata;
-		setSamlLoginEnabled(prefs.loginEnabled);
-		setSamlLoginLabel(prefs.loginLabel);
+	async setSamlPreferences(prefs: SamlPreferences): Promise<SamlPreferences | undefined> {
+		this.loginBinding = prefs.loginBinding ?? this.loginBinding;
+		this.metadata = prefs.metadata ?? this.metadata;
+		this.attributeMapping = prefs.mapping ?? this.attributeMapping;
+		if (prefs.metadataUrl) {
+			this.metadataUrl = prefs.metadataUrl;
+			const fetchedMetadata = await this.fetchMetadataFromUrl();
+			if (fetchedMetadata) {
+				this.metadata = fetchedMetadata;
+			}
+		}
+		setSamlLoginEnabled(prefs.loginEnabled ?? isSamlLoginEnabled());
+		setSamlLoginLabel(prefs.loginLabel ?? getSamlLoginLabel());
 		this.getIdentityProviderInstance(true);
-		await this.saveSamlPreferences();
+		const result = await this.saveSamlPreferencesToDb();
+		return result;
 	}
 
-	async loadSamlPreferences(): Promise<SamlPreferences | undefined> {
+	async loadFromDbAndApplySamlPreferences(): Promise<SamlPreferences | undefined> {
 		const samlPreferences = await Db.collections.Settings.findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
@@ -178,26 +226,47 @@ export class SamlService {
 		return;
 	}
 
-	async saveSamlPreferences(): Promise<void> {
+	async saveSamlPreferencesToDb(): Promise<SamlPreferences | undefined> {
 		const samlPreferences = await Db.collections.Settings.findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
 		const settingsValue = JSON.stringify(this.getSamlPreferences());
+		let result: Settings;
 		if (samlPreferences) {
 			samlPreferences.value = settingsValue;
-			await Db.collections.Settings.save(samlPreferences);
+			result = await Db.collections.Settings.save(samlPreferences);
 		} else {
-			await Db.collections.Settings.save({
+			result = await Db.collections.Settings.save({
 				key: SAML_PREFERENCES_DB_KEY,
 				value: settingsValue,
 				loadOnStartup: true,
 			});
 		}
+		if (result) return jsonParse<SamlPreferences>(result.value);
+		return;
+	}
+
+	async fetchMetadataFromUrl(): Promise<string | undefined> {
+		try {
+			const prevRejectStatus = process.env.NODE_TLS_REJECT_UNAUTHORIZED;
+			process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
+			const response = await axios.get(this.metadataUrl);
+			process.env.NODE_TLS_REJECT_UNAUTHORIZED = prevRejectStatus;
+			if (response.status === 200 && response.data) {
+				const xml = (await response.data) as string;
+				// TODO: SAML: validate XML
+				// throw new BadRequestError('Received XML is not valid SAML metadata.');
+				return xml;
+			}
+		} catch (error) {
+			throw new BadRequestError('SAML Metadata URL is invalid or response is .');
+		}
+		return;
 	}
 
 	async getAttributesFromLoginResponse(
 		req: express.Request,
-		binding: 'post' | 'redirect',
+		binding: SamlLoginBinding,
 	): Promise<SamlUserAttributes> {
 		let parsedSamlResponse;
 		try {
@@ -226,4 +295,41 @@ export class SamlService {
 		}
 		return attributes;
 	}
+
+	async testSamlConnection(): Promise<boolean> {
+		try {
+			const requestContext = this.getLoginRequestUrl();
+			if (!requestContext) return false;
+			if (requestContext.binding === 'redirect') {
+				const fetchResult = await axios.get(requestContext.context.context);
+				if (fetchResult.status !== 200) {
+					LoggerProxy.debug('SAML: Error while testing SAML connection.');
+					return false;
+				}
+			} else if (requestContext.binding === 'post') {
+				const context = requestContext.context as PostBindingContext;
+				const endpoint = context.entityEndpoint;
+				const params = new URLSearchParams();
+				params.append(context.type, context.context);
+				if (context.relayState) {
+					params.append('RelayState', context.relayState);
+				}
+				const fetchResult = await axios.post(endpoint, params, {
+					headers: {
+						// eslint-disable-next-line @typescript-eslint/naming-convention
+						'Content-type': 'application/x-www-form-urlencoded',
+					},
+				});
+				if (fetchResult.status !== 200) {
+					LoggerProxy.debug('SAML: Error while testing SAML connection.');
+					return false;
+				}
+			}
+			return true;
+		} catch (error) {
+			// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+			LoggerProxy.debug('SAML: Error while testing SAML connection: ', error);
+		}
+		return false;
+	}
 }
diff --git a/packages/cli/src/sso/saml/types/index.ts b/packages/cli/src/sso/saml/types/index.ts
new file mode 100644
index 00000000000000..560f7003f821ab
--- /dev/null
+++ b/packages/cli/src/sso/saml/types/index.ts
@@ -0,0 +1 @@
+export type SamlLoginBinding = 'post' | 'redirect';
diff --git a/packages/cli/src/sso/saml/types/requests.ts b/packages/cli/src/sso/saml/types/requests.ts
index c9beab0c21bdcc..a095df7870147d 100644
--- a/packages/cli/src/sso/saml/types/requests.ts
+++ b/packages/cli/src/sso/saml/types/requests.ts
@@ -4,4 +4,5 @@ import type { SamlPreferences } from './samlPreferences';
 export declare namespace SamlConfiguration {
 	type Read = AuthenticatedRequest<{}, {}, {}, {}>;
 	type Update = AuthenticatedRequest<{}, {}, SamlPreferences, {}>;
+	type Toggle = AuthenticatedRequest<{}, {}, { loginEnabled: boolean }, {}>;
 }
diff --git a/packages/cli/src/sso/saml/types/samlPreferences.ts b/packages/cli/src/sso/saml/types/samlPreferences.ts
index 4edc58fc959020..e43b588b819fbf 100644
--- a/packages/cli/src/sso/saml/types/samlPreferences.ts
+++ b/packages/cli/src/sso/saml/types/samlPreferences.ts
@@ -1,8 +1,29 @@
-import type { SamlAttributeMapping } from './samlAttributeMapping';
+import { IsBoolean, IsObject, IsOptional, IsString } from 'class-validator';
+import { SamlLoginBinding } from '.';
+import { SamlAttributeMapping } from './samlAttributeMapping';
 
-export interface SamlPreferences {
-	mapping: SamlAttributeMapping;
-	metadata: string;
-	loginEnabled: boolean;
-	loginLabel: string;
+export class SamlPreferences {
+	@IsObject()
+	@IsOptional()
+	mapping?: SamlAttributeMapping;
+
+	@IsString()
+	@IsOptional()
+	metadata?: string;
+
+	@IsString()
+	@IsOptional()
+	metadataUrl?: string;
+
+	@IsString()
+	@IsOptional()
+	loginBinding?: SamlLoginBinding = 'redirect';
+
+	@IsBoolean()
+	@IsOptional()
+	loginEnabled?: boolean;
+
+	@IsString()
+	@IsOptional()
+	loginLabel?: string;
 }
diff --git a/packages/cli/src/sso/saml/views/initSsoPost.ts b/packages/cli/src/sso/saml/views/initSsoPost.ts
new file mode 100644
index 00000000000000..4df6719efb13bc
--- /dev/null
+++ b/packages/cli/src/sso/saml/views/initSsoPost.ts
@@ -0,0 +1,15 @@
+import type { PostBindingContext } from 'samlify/types/src/entity';
+
+export function getInitSSOFormView(context: PostBindingContext): string {
+	return `
+	<form id="saml-form" method="post" action="${context.entityEndpoint}" autocomplete="off">
+    <input type="hidden" name="${context.type}" value="${context.context}" />
+    ${context.relayState ? '<input type="hidden" name="RelayState" value="{{relayState}}" />' : ''}
+</form>
+<script type="text/javascript">
+    // Automatic form submission
+    (function(){
+        document.forms[0].submit();
+    })();
+</script>`;
+}
diff --git a/packages/cli/src/sso/saml/views/initSsoRedirect.ts b/packages/cli/src/sso/saml/views/initSsoRedirect.ts
new file mode 100644
index 00000000000000..56db9ce0838d7f
--- /dev/null
+++ b/packages/cli/src/sso/saml/views/initSsoRedirect.ts
@@ -0,0 +1,12 @@
+import type { BindingContext } from 'samlify/types/src/entity';
+
+export function getInitSSOPostView(context: BindingContext): string {
+	return `
+  <html></html>
+  <script type="text/javascript">
+    // Automatic redirect
+    (function(){
+        location.href = "${context.context}";
+    })();
+  </script>`;
+}

From 2eba05046141bd13145f95c6a1ec1e6fb95b37c2 Mon Sep 17 00:00:00 2001
From: Csaba Tuncsik <csaba@n8n.io>
Date: Fri, 3 Mar 2023 11:48:45 +0100
Subject: [PATCH 319/358] fix(editor): Fix ElButton overrides (#5605)

* fix(editor): Fix ElButton overrides

* fix(editor): Fix ElButton overrides
---
 .../N8nButton/__tests__/Button.spec.ts        | 40 ++++++++++++++++++-
 .../__snapshots__/Button.spec.ts.snap         |  8 +++-
 .../N8nButton/overrides/ElButton.vue          | 18 ++++++++-
 3 files changed, 62 insertions(+), 4 deletions(-)

diff --git a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
index 98f3212caf5bf7..184307c24e5b29 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
+++ b/packages/design-system/src/components/N8nButton/__tests__/Button.spec.ts
@@ -59,7 +59,19 @@ describe('components', () => {
 		});
 
 		describe('overrides', () => {
-			it('should render correctly', () => {
+			it('should use default (`primary`) type when no type is given', () => {
+				const wrapper = render(ElButton, {
+					props: {
+						icon: 'plus-circle',
+					},
+					slots,
+					stubs,
+				});
+
+				expect(wrapper.html()).toMatchSnapshot();
+			});
+
+			it('should use given (`secondary`) type', () => {
 				const wrapper = render(ElButton, {
 					props: {
 						icon: 'plus-circle',
@@ -71,6 +83,32 @@ describe('components', () => {
 
 				expect(wrapper.html()).toMatchSnapshot();
 			});
+
+			it('should render as `secondary` when `text` is given as type', () => {
+				const wrapper = render(ElButton, {
+					props: {
+						icon: 'plus-circle',
+						type: 'text',
+					},
+					slots,
+					stubs,
+				});
+
+				expect(wrapper.html()).toMatchSnapshot();
+			});
+
+			it('should render as `tertiary` when `info` is given as type', () => {
+				const wrapper = render(ElButton, {
+					props: {
+						icon: 'plus-circle',
+						type: 'info',
+					},
+					slots,
+					stubs,
+				});
+
+				expect(wrapper.html()).toMatchSnapshot();
+			});
 		});
 	});
 });
diff --git a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
index e4d683655fbffb..8b8307fae003db 100644
--- a/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
+++ b/packages/design-system/src/components/N8nButton/__tests__/__snapshots__/Button.spec.ts.snap
@@ -1,6 +1,12 @@
 // Vitest Snapshot v1
 
-exports[`components > N8nButton > overrides > should render correctly 1`] = `"<button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button secondary medium icon\\" icon=\\"plus-circle\\" type=\\"secondary\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
+exports[`components > N8nButton > overrides > should render as \`secondary\` when \`text\` is given as type 1`] = `"<button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button secondary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
+
+exports[`components > N8nButton > overrides > should render as \`tertiary\` when \`info\` is given as type 1`] = `"<button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button tertiary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
+
+exports[`components > N8nButton > overrides > should use default (\`primary\`) type when no type is given 1`] = `"<button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button primary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
+
+exports[`components > N8nButton > overrides > should use given (\`secondary\`) type 1`] = `"<button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button secondary medium icon\\" icon=\\"plus-circle\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
 
 exports[`components > N8nButton > props > icon > should render icon button 1`] = `"<button aria-disabled=\\"false\\" aria-busy=\\"false\\" aria-live=\\"polite\\" class=\\"button button primary medium icon\\"><span class=\\"icon\\"><n8n-icon-stub icon=\\"plus-circle\\" size=\\"medium\\"></n8n-icon-stub></span><span>Button</span></button>"`;
 
diff --git a/packages/design-system/src/components/N8nButton/overrides/ElButton.vue b/packages/design-system/src/components/N8nButton/overrides/ElButton.vue
index b8c592606eb4cc..57213098d86e3d 100644
--- a/packages/design-system/src/components/N8nButton/overrides/ElButton.vue
+++ b/packages/design-system/src/components/N8nButton/overrides/ElButton.vue
@@ -10,6 +10,7 @@ import N8nButton from '../Button.vue';
 
 const classToTypeMap = {
 	'btn--cancel': 'secondary',
+	'el-picker-panel__link-btn': 'secondary',
 };
 
 export default Vue.extend({
@@ -18,16 +19,29 @@ export default Vue.extend({
 	},
 	computed: {
 		attrs() {
-			let type = 'primary';
+			let type = this.$attrs.type || 'primary';
+
+			/* Element UI Button can have 'text' or 'info' type which is not supported by n8n-button
+			 so render it as 'secondary' or 'tertiary' */
+			if (type === 'text') {
+				type = 'secondary';
+			}
+
+			if (type === 'info') {
+				type = 'tertiary';
+			}
+
 			Object.entries(classToTypeMap).forEach(([className, mappedType]) => {
 				if (this.$refs.button && (this.$refs.button as Vue).$el.classList.contains(className)) {
 					type = mappedType;
 				}
 			});
 
+			delete this.$attrs.type;
+
 			return {
-				type,
 				...this.$attrs,
+				type,
 			};
 		},
 	},

From e949db352526033394083476077519598dd8061c Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Fri, 3 Mar 2023 16:08:12 +0000
Subject: [PATCH 320/358] fix(OpenAI Node): Fix issue with expressions not
 working with chat complete (#5609)

---
 .../nodes-base/nodes/OpenAi/ChatDescription.ts     |  3 ++-
 packages/nodes-base/nodes/OpenAi/ChatFunctions.ts  | 14 ++++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 packages/nodes-base/nodes/OpenAi/ChatFunctions.ts

diff --git a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
index 217bdc7e80eb88..a627ed8457578e 100644
--- a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
@@ -1,4 +1,5 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import { chatBodyPresend } from './ChatFunctions';
 
 export const chatOperations: INodeProperties[] = [
 	{
@@ -114,7 +115,7 @@ const completeOperations: INodeProperties[] = [
 			send: {
 				type: 'body',
 				property: 'messages',
-				value: '={{ $parameter.prompt.messages }}',
+				preSend: [chatBodyPresend],
 			},
 		},
 	},
diff --git a/packages/nodes-base/nodes/OpenAi/ChatFunctions.ts b/packages/nodes-base/nodes/OpenAi/ChatFunctions.ts
new file mode 100644
index 00000000000000..b87a4f9c8c8123
--- /dev/null
+++ b/packages/nodes-base/nodes/OpenAi/ChatFunctions.ts
@@ -0,0 +1,14 @@
+import type { IDataObject, IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
+
+export async function chatBodyPresend(
+	this: IExecuteSingleFunctions,
+	requestOptions: IHttpRequestOptions,
+): Promise<IHttpRequestOptions> {
+	const prompts = this.getNodeParameter('prompt', '{}') as IDataObject;
+
+	requestOptions.body = Object.assign({}, requestOptions.body, {
+		messages: prompts.messages,
+	});
+
+	return requestOptions;
+}

From 9420b0fdf8ccccb95780c8c97e2b5d14cc4d513e Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Fri, 3 Mar 2023 18:11:27 +0100
Subject: [PATCH 321/358] feat(Slack Node): Move from Binary Buffer to Binary
 streaming (#5612)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

✨ Add Binary streaming instead of binary buffering
---
 .../nodes-base/nodes/Slack/V2/SlackV2.node.ts | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index da2dedff5facb4..5bed04d053d8f6 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -1,5 +1,6 @@
-/* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import type { IExecuteFunctions } from 'n8n-core';
+import { BINARY_ENCODING } from 'n8n-core';
+import type { Readable } from 'stream';
 
 import type {
 	IDataObject,
@@ -1072,18 +1073,21 @@ export class SlackV2 implements INodeType {
 									{ itemIndex: i },
 								);
 							}
-							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-								i,
-								binaryPropertyName,
-							);
+							let uploadData: Buffer | Readable;
+							const itemBinaryData = items[i].binary![binaryPropertyName];
+							if (itemBinaryData.id) {
+								uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+							} else {
+								uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+							}
 							body.file = {
 								//@ts-ignore
-								value: binaryDataBuffer,
+								value: uploadData,
 								options: {
 									//@ts-ignore
-									filename: items[i].binary[binaryPropertyName].fileName,
+									filename: itemBinaryData.fileName,
 									//@ts-ignore
-									contentType: items[i].binary[binaryPropertyName].mimeType,
+									contentType: itemBinaryData.mimeType,
 								},
 							};
 							responseData = await slackApiRequest.call(

From 4e244937c93b08abc002094bf31c31c0d223b396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 3 Mar 2023 18:18:49 +0100
Subject: [PATCH 322/358] refactor: `catch` doesn't need to have a param
 (no-changelog) (#5614)

---
 packages/cli/src/CommunityNodes/helpers.ts    |  4 ++--
 packages/cli/src/CurlConverterHelper.ts       |  2 +-
 packages/cli/src/LoadNodesAndCredentials.ts   |  6 ++---
 .../credentials/credentials.middleware.ts     |  2 +-
 packages/cli/src/api/nodes.api.ts             |  2 +-
 .../src/controllers/translation.controller.ts |  2 +-
 .../sqlite/1659888469333-AddJsonKeyPinData.ts |  2 +-
 .../MessageEventBusDestinationWebhook.ee.ts   | 18 +++++++--------
 packages/core/src/DirectoryLoader.ts          |  2 +-
 .../CodeNodeEditor/CodeNodeEditor.vue         |  2 +-
 .../components/CodeNodeEditor/completer.ts    |  2 +-
 .../completions/jsonField.completions.ts      |  6 ++---
 .../src/components/CodeNodeEditor/linter.ts   |  4 ++--
 .../editor-ui/src/components/NodeSettings.vue |  2 +-
 .../completions/bracketAccess.completions.ts  |  2 +-
 .../completions/datatype.completions.ts       |  4 ++--
 .../HttpRequest/V1/HttpRequestV1.node.ts      | 12 +++++-----
 .../HttpRequest/V2/HttpRequestV2.node.ts      | 16 +++++++-------
 .../HttpRequest/V3/HttpRequestV3.node.ts      | 22 +++++++++----------
 packages/workflow/src/TelemetryHelpers.ts     |  6 ++---
 20 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/packages/cli/src/CommunityNodes/helpers.ts b/packages/cli/src/CommunityNodes/helpers.ts
index cd18a967b44e40..295f6a1072a0d4 100644
--- a/packages/cli/src/CommunityNodes/helpers.ts
+++ b/packages/cli/src/CommunityNodes/helpers.ts
@@ -88,7 +88,7 @@ export const executeCommand = async (
 
 	try {
 		await fsAccess(downloadFolder);
-	} catch (_) {
+	} catch {
 		await fsMkdir(downloadFolder);
 		// Also init the folder since some versions
 		// of npm complain if the folder is empty
@@ -154,7 +154,7 @@ export function matchMissingPackages(
 			return parsedPackageData.packageName;
 
 			// eslint-disable-next-line no-empty
-		} catch (_) {}
+		} catch {}
 		return undefined;
 	});
 
diff --git a/packages/cli/src/CurlConverterHelper.ts b/packages/cli/src/CurlConverterHelper.ts
index cee25c0d739c59..d59b3f5375390c 100644
--- a/packages/cli/src/CurlConverterHelper.ts
+++ b/packages/cli/src/CurlConverterHelper.ts
@@ -125,7 +125,7 @@ const isJsonRequest = (curlJson: CurlJson): boolean => {
 		try {
 			JSON.parse(bodyKey);
 			return true;
-		} catch (_) {
+		} catch {
 			return false;
 		}
 	}
diff --git a/packages/cli/src/LoadNodesAndCredentials.ts b/packages/cli/src/LoadNodesAndCredentials.ts
index 4003f6ee58e7f2..f25cef5f3b915f 100644
--- a/packages/cli/src/LoadNodesAndCredentials.ts
+++ b/packages/cli/src/LoadNodesAndCredentials.ts
@@ -217,7 +217,7 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 			const removeCommand = `npm remove ${packageName}`;
 			try {
 				await executeCommand(removeCommand);
-			} catch (_) {}
+			} catch {}
 
 			throw new Error(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
 		}
@@ -284,7 +284,7 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 			const removeCommand = `npm remove ${packageName}`;
 			try {
 				await executeCommand(removeCommand);
-			} catch (_) {}
+			} catch {}
 			throw new Error(RESPONSE_ERROR_MESSAGES.PACKAGE_DOES_NOT_CONTAIN_NODES);
 		}
 	}
@@ -418,7 +418,7 @@ export class LoadNodesAndCredentials implements INodesAndCredentials {
 				await fsAccess(checkPath);
 				// Folder exists, so use it.
 				return path.dirname(checkPath);
-			} catch (_) {} // Folder does not exist so get next one
+			} catch {} // Folder does not exist so get next one
 		}
 		throw new Error('Could not find "node_modules" folder!');
 	}
diff --git a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
index 097a50e5e67e10..d314151f9581da 100644
--- a/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
+++ b/packages/cli/src/PublicApi/v1/handlers/credentials/credentials.middleware.ts
@@ -16,7 +16,7 @@ export const validCredentialType = (
 ): express.Response | void => {
 	try {
 		Container.get(CredentialTypes).getByName(req.body.type);
-	} catch (_) {
+	} catch {
 		return res.status(400).json({ message: 'req.body.type is not a known type' });
 	}
 
diff --git a/packages/cli/src/api/nodes.api.ts b/packages/cli/src/api/nodes.api.ts
index 2b2ade1784fc12..70264cdab5c5a9 100644
--- a/packages/cli/src/api/nodes.api.ts
+++ b/packages/cli/src/api/nodes.api.ts
@@ -202,7 +202,7 @@ nodesController.get(
 			if (missingPackages) {
 				hydratedPackages = matchMissingPackages(hydratedPackages, missingPackages);
 			}
-		} catch (_) {
+		} catch {
 			// Do nothing if setting is missing
 		}
 
diff --git a/packages/cli/src/controllers/translation.controller.ts b/packages/cli/src/controllers/translation.controller.ts
index 8d24f9e11365e7..8240a376a7e641 100644
--- a/packages/cli/src/controllers/translation.controller.ts
+++ b/packages/cli/src/controllers/translation.controller.ts
@@ -44,7 +44,7 @@ export class TranslationController {
 	async getNodeTranslationHeaders() {
 		try {
 			await access(`${NODE_HEADERS_PATH}.js`);
-		} catch (_) {
+		} catch {
 			return; // no headers available
 		}
 
diff --git a/packages/cli/src/databases/migrations/sqlite/1659888469333-AddJsonKeyPinData.ts b/packages/cli/src/databases/migrations/sqlite/1659888469333-AddJsonKeyPinData.ts
index 11eea4686e7540..f2ce0f0badd0af 100644
--- a/packages/cli/src/databases/migrations/sqlite/1659888469333-AddJsonKeyPinData.ts
+++ b/packages/cli/src/databases/migrations/sqlite/1659888469333-AddJsonKeyPinData.ts
@@ -69,7 +69,7 @@ function makeUpdateParams(fetchedWorkflows: PinData.FetchedWorkflow[]) {
 			if (typeof rawPinData === 'string') {
 				try {
 					pinDataPerWorkflow = JSON.parse(rawPinData);
-				} catch (_) {
+				} catch {
 					pinDataPerWorkflow = {};
 				}
 			} else {
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
index 95dcd340d67031..fb3f47db2f8433 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
@@ -132,7 +132,7 @@ export class MessageEventBusDestinationWebhook
 			let encryptionKey: string | undefined;
 			try {
 				encryptionKey = await UserSettings.getEncryptionKey();
-			} catch (_) {}
+			} catch {}
 			if (encryptionKey) {
 				this.credentialsHelper = new CredentialsHelper(encryptionKey);
 			}
@@ -189,7 +189,7 @@ export class MessageEventBusDestinationWebhook
 				// query is specified using JSON
 				try {
 					JSON.parse(this.jsonQuery);
-				} catch (_) {
+				} catch {
 					console.log('JSON parameter need to be an valid JSON');
 				}
 				this.axiosRequestOptions.params = jsonParse(this.jsonQuery);
@@ -207,7 +207,7 @@ export class MessageEventBusDestinationWebhook
 				// body is specified using JSON
 				try {
 					JSON.parse(this.jsonHeaders);
-				} catch (_) {
+				} catch {
 					console.log('JSON parameter need to be an valid JSON');
 				}
 				this.axiosRequestOptions.headers = jsonParse(this.jsonHeaders);
@@ -302,27 +302,27 @@ export class MessageEventBusDestinationWebhook
 			if (this.genericAuthType === 'httpBasicAuth') {
 				try {
 					httpBasicAuth = await this.matchDecryptedCredentialType('httpBasicAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (this.genericAuthType === 'httpDigestAuth') {
 				try {
 					httpDigestAuth = await this.matchDecryptedCredentialType('httpDigestAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (this.genericAuthType === 'httpHeaderAuth') {
 				try {
 					httpHeaderAuth = await this.matchDecryptedCredentialType('httpHeaderAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (this.genericAuthType === 'httpQueryAuth') {
 				try {
 					httpQueryAuth = await this.matchDecryptedCredentialType('httpQueryAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (this.genericAuthType === 'oAuth1Api') {
 				try {
 					oAuth1Api = await this.matchDecryptedCredentialType('oAuth1Api');
-				} catch (_) {}
+				} catch {}
 			} else if (this.genericAuthType === 'oAuth2Api') {
 				try {
 					oAuth2Api = await this.matchDecryptedCredentialType('oAuth2Api');
-				} catch (_) {}
+				} catch {}
 			}
 		}
 
diff --git a/packages/core/src/DirectoryLoader.ts b/packages/core/src/DirectoryLoader.ts
index 5709efa819d5d4..296214a0297941 100644
--- a/packages/core/src/DirectoryLoader.ts
+++ b/packages/core/src/DirectoryLoader.ts
@@ -233,7 +233,7 @@ export abstract class DirectoryLoader {
 			}
 
 			node.description.codex = codex;
-		} catch (_) {
+		} catch {
 			Logger.debug(`No codex available for: ${filePath.split('/').pop() ?? ''}`);
 
 			if (isCustom) {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
index 80b4dd392d4fa6..d01804660dd83b 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
+++ b/packages/editor-ui/src/components/CodeNodeEditor/CodeNodeEditor.vue
@@ -129,7 +129,7 @@ export default mixins(linterExtension, completerExtension, workflowHelpers).exte
 					context,
 					inserted_text: insertedText,
 				});
-			} catch (_) {}
+			} catch {}
 		},
 	},
 	destroyed() {
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completer.ts b/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
index 0d4f03c9c7df8e..d37e979499837e 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completer.ts
@@ -84,7 +84,7 @@ export const completerExtension = mixins(
 
 			try {
 				variablesToValues = this.variablesToValues();
-			} catch (_) {
+			} catch {
 				return null;
 			}
 
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
index 416950a80f5953..5d5d3f09d30500 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/completions/jsonField.completions.ts
@@ -220,7 +220,7 @@ export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 
 					return input.main[0][0].node;
 				}
-			} catch (_) {
+			} catch {
 				return null;
 			}
 		},
@@ -291,7 +291,7 @@ export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 					}
 
 					return nodePinData[itemIndex].json;
-				} catch (_) {}
+				} catch {}
 			}
 
 			const runData: IRunData | null = this.workflowsStore.getWorkflowRunData;
@@ -309,7 +309,7 @@ export const jsonFieldCompletions = (Vue as CodeNodeEditorMixin).extend({
 				}
 
 				return nodeRunData[0].data!.main[0]![itemIndex].json;
-			} catch (_) {
+			} catch {
 				return null;
 			}
 		},
diff --git a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
index 80ad93af1f2016..96fe8d397be02f 100644
--- a/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
+++ b/packages/editor-ui/src/components/CodeNodeEditor/linter.ts
@@ -35,7 +35,7 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 
 					// optional chaining operators currently unsupported by esprima-next
 					if (['?.', ']?'].some((operator) => lineAtError.includes(operator))) return [];
-				} catch (_) {
+				} catch {
 					return [];
 				}
 
@@ -50,7 +50,7 @@ export const linterExtension = (Vue as CodeNodeEditorMixin).extend({
 							message: this.$locale.baseText('codeNodeEditor.linter.bothModes.syntaxError'),
 						},
 					];
-				} catch (_) {
+				} catch {
 					/**
 					 * For invalid (e.g. half-written) n8n syntax, esprima errors with an off-by-one line number for the final line. In future, we should add full linting for n8n syntax before parsing JS.
 					 */
diff --git a/packages/editor-ui/src/components/NodeSettings.vue b/packages/editor-ui/src/components/NodeSettings.vue
index 2bfd979c43e3b9..51462d075a639c 100644
--- a/packages/editor-ui/src/components/NodeSettings.vue
+++ b/packages/editor-ui/src/components/NodeSettings.vue
@@ -484,7 +484,7 @@ export default mixins(externalHooks, nodeHelpers).extend({
 					});
 
 					this.uiStore.setHttpNodeParameters({ name: IMPORT_CURL_MODAL_KEY, parameters: '' });
-				} catch (_) {}
+				} catch {}
 			}
 		},
 	},
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
index 4c3254b4b62ae3..26f579c760ea39 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/bracketAccess.completions.ts
@@ -32,7 +32,7 @@ export function bracketAccessCompletions(context: CompletionContext): Completion
 
 	try {
 		resolved = resolveParameter(`={{ ${base} }}`);
-	} catch (_) {
+	} catch {
 		return null;
 	}
 
diff --git a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
index e64158059efd29..1362354167ff85 100644
--- a/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
+++ b/packages/editor-ui/src/plugins/codemirror/completions/datatype.completions.ts
@@ -44,7 +44,7 @@ export function datatypeCompletions(context: CompletionContext): CompletionResul
 
 		try {
 			resolved = resolveParameter(`={{ ${base} }}`);
-		} catch (_) {
+		} catch {
 			return null;
 		}
 
@@ -52,7 +52,7 @@ export function datatypeCompletions(context: CompletionContext): CompletionResul
 
 		try {
 			options = datatypeOptions(resolved, base).map(stripExcessParens(context));
-		} catch (_) {
+		} catch {
 			return null;
 		}
 	}
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index 0dbad1a8e503d4..17169ca230a2a4 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -611,22 +611,22 @@ export class HttpRequestV1 implements INodeType {
 
 		try {
 			httpBasicAuth = await this.getCredentials('httpBasicAuth');
-		} catch (_) {}
+		} catch {}
 		try {
 			httpDigestAuth = await this.getCredentials('httpDigestAuth');
-		} catch (_) {}
+		} catch {}
 		try {
 			httpHeaderAuth = await this.getCredentials('httpHeaderAuth');
-		} catch (_) {}
+		} catch {}
 		try {
 			httpQueryAuth = await this.getCredentials('httpQueryAuth');
-		} catch (_) {}
+		} catch {}
 		try {
 			oAuth1Api = await this.getCredentials('oAuth1Api');
-		} catch (_) {}
+		} catch {}
 		try {
 			oAuth2Api = await this.getCredentials('oAuth2Api');
-		} catch (_) {}
+		} catch {}
 
 		let requestOptions: OptionsWithUri;
 		let setUiParameter: IDataObject;
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index 89fabccbaf7f36..57462c4b075f1f 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -621,7 +621,7 @@ export class HttpRequestV2 implements INodeType {
 				| 'predefinedCredentialType'
 				| 'genericCredentialType'
 				| 'none';
-		} catch (_) {}
+		} catch {}
 
 		let httpBasicAuth;
 		let httpDigestAuth;
@@ -637,32 +637,32 @@ export class HttpRequestV2 implements INodeType {
 			if (genericAuthType === 'httpBasicAuth') {
 				try {
 					httpBasicAuth = await this.getCredentials('httpBasicAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'httpDigestAuth') {
 				try {
 					httpDigestAuth = await this.getCredentials('httpDigestAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'httpHeaderAuth') {
 				try {
 					httpHeaderAuth = await this.getCredentials('httpHeaderAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'httpQueryAuth') {
 				try {
 					httpQueryAuth = await this.getCredentials('httpQueryAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'oAuth1Api') {
 				try {
 					oAuth1Api = await this.getCredentials('oAuth1Api');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'oAuth2Api') {
 				try {
 					oAuth2Api = await this.getCredentials('oAuth2Api');
-				} catch (_) {}
+				} catch {}
 			}
 		} else if (authentication === 'predefinedCredentialType') {
 			try {
 				nodeCredentialType = this.getNodeParameter('nodeCredentialType', 0) as string;
-			} catch (_) {}
+			} catch {}
 		}
 
 		let requestOptions: OptionsWithUri;
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 45570b6df239e5..56cc06f8f15c35 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -888,7 +888,7 @@ export class HttpRequestV3 implements INodeType {
 				| 'predefinedCredentialType'
 				| 'genericCredentialType'
 				| 'none';
-		} catch (_) {}
+		} catch {}
 
 		let httpBasicAuth;
 		let httpDigestAuth;
@@ -904,32 +904,32 @@ export class HttpRequestV3 implements INodeType {
 			if (genericAuthType === 'httpBasicAuth') {
 				try {
 					httpBasicAuth = await this.getCredentials('httpBasicAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'httpDigestAuth') {
 				try {
 					httpDigestAuth = await this.getCredentials('httpDigestAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'httpHeaderAuth') {
 				try {
 					httpHeaderAuth = await this.getCredentials('httpHeaderAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'httpQueryAuth') {
 				try {
 					httpQueryAuth = await this.getCredentials('httpQueryAuth');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'oAuth1Api') {
 				try {
 					oAuth1Api = await this.getCredentials('oAuth1Api');
-				} catch (_) {}
+				} catch {}
 			} else if (genericAuthType === 'oAuth2Api') {
 				try {
 					oAuth2Api = await this.getCredentials('oAuth2Api');
-				} catch (_) {}
+				} catch {}
 			}
 		} else if (authentication === 'predefinedCredentialType') {
 			try {
 				nodeCredentialType = this.getNodeParameter('nodeCredentialType', 0) as string;
-			} catch (_) {}
+			} catch {}
 		}
 
 		let requestOptions: OptionsWithUri = {
@@ -1110,7 +1110,7 @@ export class HttpRequestV3 implements INodeType {
 					if (typeof jsonBodyParameter !== 'object' && jsonBodyParameter !== null) {
 						try {
 							JSON.parse(jsonBodyParameter);
-						} catch (_) {
+						} catch {
 							throw new NodeOperationError(
 								this.getNode(),
 								'JSON parameter need to be an valid JSON',
@@ -1163,7 +1163,7 @@ export class HttpRequestV3 implements INodeType {
 					// query is specified using JSON
 					try {
 						JSON.parse(jsonQueryParameter);
-					} catch (_) {
+					} catch {
 						throw new NodeOperationError(
 							this.getNode(),
 							'JSON parameter need to be an valid JSON',
@@ -1188,7 +1188,7 @@ export class HttpRequestV3 implements INodeType {
 					// body is specified using JSON
 					try {
 						JSON.parse(jsonHeadersParameter);
-					} catch (_) {
+					} catch {
 						throw new NodeOperationError(
 							this.getNode(),
 							'JSON parameter need to be an valid JSON',
diff --git a/packages/workflow/src/TelemetryHelpers.ts b/packages/workflow/src/TelemetryHelpers.ts
index 42a3c52981362a..69231a167ef1e5 100644
--- a/packages/workflow/src/TelemetryHelpers.ts
+++ b/packages/workflow/src/TelemetryHelpers.ts
@@ -64,7 +64,7 @@ export function getDomainBase(raw: string, urlParts = URL_PARTS_REGEX): string {
 		const url = new URL(raw);
 
 		return [url.protocol, url.hostname].join('//');
-	} catch (_) {
+	} catch {
 		const match = urlParts.exec(raw);
 
 		if (!match?.groups?.protocolPlusDomain) return '';
@@ -98,7 +98,7 @@ export function getDomainPath(raw: string, urlParts = URL_PARTS_REGEX): string {
 		if (!url.hostname) throw new Error('Malformed URL');
 
 		return sanitizeRoute(url.pathname);
-	} catch (_) {
+	} catch {
 		const match = urlParts.exec(raw);
 
 		if (!match?.groups?.pathname) return '';
@@ -168,7 +168,7 @@ export function generateNodesGraph(
 			if (node.type === 'n8n-nodes-base.httpRequest' && node.typeVersion === 1) {
 				try {
 					nodeItem.domain = new URL(node.parameters.url as string).hostname;
-				} catch (_) {
+				} catch {
 					nodeItem.domain = getDomainBase(node.parameters.url as string);
 				}
 			} else if (node.type === 'n8n-nodes-base.httpRequest' && [2, 3].includes(node.typeVersion)) {

From 3c57062571161400221ffa85f1571278d39afcee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Fri, 3 Mar 2023 18:49:19 +0100
Subject: [PATCH 323/358] refactor: Fix some typos (no-changelog) (#5616)

---
 .vscode/extensions.json                       |  1 +
 .../MessageEventBusDestinationWebhook.ee.ts   |  6 ++--
 packages/editor-ui/src/views/NodeView.vue     |  2 +-
 .../nodes/Affinity/AffinityTrigger.node.ts    |  2 +-
 .../nodes/Asana/AsanaTrigger.node.ts          |  2 +-
 .../nodes-base/nodes/Box/BoxTrigger.node.ts   |  2 +-
 .../nodes-base/nodes/Cal/CalTrigger.node.ts   |  2 +-
 .../nodes/Calendly/CalendlyTrigger.node.ts    |  2 +-
 .../Cisco/Webex/CiscoWebexTrigger.node.ts     |  2 +-
 .../nodes-base/nodes/Egoi/GenericFunctions.ts |  4 +--
 .../nodes/Figma/FigmaTrigger.node.ts          |  2 +-
 .../nodes/Formstack/FormstackTrigger.node.ts  |  2 +-
 .../nodes/Github/GithubTrigger.node.ts        |  2 +-
 .../nodes/Gitlab/GitlabTrigger.node.ts        |  2 +-
 .../nodes/HelpScout/HelpScoutTrigger.node.ts  |  2 +-
 packages/nodes-base/nodes/Html/Html.node.ts   |  4 +--
 .../nodes/HtmlExtract/HtmlExtract.node.ts     |  4 +--
 .../HttpRequest/V1/HttpRequestV1.node.ts      | 10 +++---
 .../HttpRequest/V2/HttpRequestV2.node.ts      | 10 +++---
 .../HttpRequest/V3/HttpRequestV3.node.ts      | 32 +++++++++----------
 packages/nodes-base/nodes/If/If.node.ts       |  2 +-
 .../InvoiceNinja/InvoiceNinjaTrigger.node.ts  |  2 +-
 .../nodes-base/nodes/Jira/JiraTrigger.node.ts |  2 +-
 .../nodes-base/nodes/Keap/KeapTrigger.node.ts |  2 +-
 .../nodes/Linear/LinearTrigger.node.ts        |  2 +-
 .../nodes/Mailchimp/MailchimpTrigger.node.ts  |  4 +--
 .../MailerLite/MailerLiteTrigger.node.ts      |  2 +-
 .../nodes/PayPal/PayPalTrigger.node.ts        |  2 +-
 .../nodes/Pipedrive/GenericFunctions.ts       |  2 +-
 .../nodes/Pipedrive/PipedriveTrigger.node.ts  |  2 +-
 .../nodes/PostBin/BinDescription.ts           |  6 ++--
 .../nodes/PostBin/GenericFunctions.ts         |  2 +-
 .../nodes/Postmark/PostmarkTrigger.node.ts    |  2 +-
 .../nodes/Pushcut/PushcutTrigger.node.ts      |  2 +-
 .../nodes/SendInBlue/EmailDescription.ts      |  2 +-
 .../nodes/SendInBlue/GenericFunctions.ts      |  4 +--
 .../SendInBlue/SendInBlueTrigger.node.ts      |  2 +-
 .../nodes/Strava/StravaTrigger.node.ts        |  2 +-
 .../nodes/Stripe/StripeTrigger.node.ts        |  4 +--
 .../SurveyMonkey/SurveyMonkeyTrigger.node.ts  |  2 +-
 .../nodes-base/nodes/Switch/Switch.node.ts    |  2 +-
 .../nodes/TheHive/TheHiveTrigger.node.ts      |  2 +-
 .../nodes/Trello/TrelloTrigger.node.ts        |  2 +-
 .../nodes/Typeform/TypeformTrigger.node.ts    | 12 +++----
 .../VenafiTlsProtectCloudTrigger.node.ts      |  2 +-
 packages/nodes-base/nodes/Wait/Wait.node.ts   |  2 +-
 .../nodes/WhatsApp/MessagesDescription.ts     |  2 +-
 .../nodes/Wordpress/Wordpress.node.ts         |  4 +--
 .../nodes/Workable/WorkableTrigger.node.ts    |  2 +-
 .../nodes/Zendesk/OrganizationDescription.ts  |  4 +--
 .../nodes/Zendesk/TriggerPlaceholders.ts      |  4 +--
 .../Zoho/descriptions/DealDescription.ts      | 12 +++----
 .../Zoom/MeetingRegistrantDescription.ts      |  4 +--
 53 files changed, 100 insertions(+), 99 deletions(-)

diff --git a/.vscode/extensions.json b/.vscode/extensions.json
index 8eaade1c5e4579..877b69401a0fb9 100644
--- a/.vscode/extensions.json
+++ b/.vscode/extensions.json
@@ -1,5 +1,6 @@
 {
 	"recommendations": [
+		"streetsidesoftware.code-spell-checker",
 		"dangmai.workspace-default-settings",
 		"dbaeumer.vscode-eslint",
 		"EditorConfig.EditorConfig",
diff --git a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
index fb3f47db2f8433..daf63c39a8f39b 100644
--- a/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
+++ b/packages/cli/src/eventbus/MessageEventBusDestination/MessageEventBusDestinationWebhook.ee.ts
@@ -173,9 +173,9 @@ export class MessageEventBusDestinationWebhook
 			acc: Promise<{ [key: string]: any }>,
 			cur: { name: string; value: string; parameterType?: string; inputDataFieldName?: string },
 		) => {
-			const acumulator = await acc;
-			acumulator[cur.name] = cur.value;
-			return acumulator;
+			const accumulator = await acc;
+			accumulator[cur.name] = cur.value;
+			return accumulator;
 		};
 
 		// Get parameters defined in the UI
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index eb3c2ea626c03b..3672546574b9a8 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -620,7 +620,7 @@ export default mixins(
 	beforeDestroy() {
 		this.resetWorkspace();
 		// Make sure the event listeners get removed again else we
-		// could add up with them registred multiple times
+		// could add up with them registered multiple times
 		document.removeEventListener('keydown', this.keyDown);
 		document.removeEventListener('keyup', this.keyUp);
 		this.unregisterCustomAction('showNodeCreator');
diff --git a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
index 05205fa16b358e..eca99ab6bd366d 100644
--- a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
+++ b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
@@ -220,7 +220,7 @@ export class AffinityTrigger implements INodeType {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
index f85f6f7c0a2a2f..e8cce229e0e2c3 100644
--- a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
@@ -184,7 +184,7 @@ export class AsanaTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
 					delete webhookData.hookSecret;
diff --git a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
index 712ac64a447c0f..2f8ff31e2a0257 100644
--- a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
+++ b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
@@ -324,7 +324,7 @@ export class BoxTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
index a4dd358c79836c..90e700dbe4aa68 100644
--- a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
@@ -183,7 +183,7 @@ export class CalTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index f6ea267a49a6a1..7252e7b6ec84bd 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -217,7 +217,7 @@ export class CalendlyTrigger implements INodeType {
 						}
 
 						// Remove from the static workflow data so that it is clear
-						// that no webhooks are registred anymore
+						// that no webhooks are registered anymore
 						delete webhookData.webhookId;
 					}
 				}
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
index 7b8f9db91daaff..e300d641eaba45 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
@@ -569,7 +569,7 @@ export class CiscoWebexTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
index 5a2c5b0c61c7fc..80eb48d6af5497 100644
--- a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
@@ -100,9 +100,9 @@ export async function simplify(this: IExecuteFunctions, contacts: IContact[], li
 
 	for (const contact of contacts) {
 		const extras = contact.extra.reduce(
-			(acumulator: IDataObject, currentValue: IDataObject): any => {
+			(accumulator: IDataObject, currentValue: IDataObject): any => {
 				const key = fieldsKeyValue[currentValue.field_id as string] as string;
-				return { [key]: currentValue.value, ...acumulator };
+				return { [key]: currentValue.value, ...accumulator };
 			},
 			{},
 		);
diff --git a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
index 831eb4921bd221..d6d853c852289a 100644
--- a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
@@ -155,7 +155,7 @@ export class FigmaTrigger implements INodeType {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
index d1efc4947ff7be..c3c26f442a35c3 100644
--- a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
+++ b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
@@ -154,7 +154,7 @@ export class FormstackTrigger implements INodeType {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 63298d219bdb69..273ebbbe894bf2 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -564,7 +564,7 @@ export class GithubTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
 				}
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index e0bc0667d228fa..07229db99d5e4a 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -286,7 +286,7 @@ export class GitlabTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
 				}
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
index 9b7a6a091e7faf..1c5bcc4f95f958 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
@@ -175,7 +175,7 @@ export class HelpScoutTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.secret;
 				}
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index 6c08ece69d6560..b860fdae9cfb01 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -335,13 +335,13 @@ export class Html implements INodeType {
 							},
 						};
 
-						// Itterate over all the defined values which should be extracted
+						// Iterate over all the defined values which should be extracted
 						let htmlElement;
 						for (const valueData of extractionValues.values as IValueData[]) {
 							htmlElement = $(valueData.cssSelector);
 
 							if (valueData.returnArray) {
-								// An array should be returned so itterate over one
+								// An array should be returned so iterate over one
 								// value at a time
 								newItem.json[valueData.key] = [];
 								htmlElement.each((i, el) => {
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 8e8552f34826e0..5473bd3382a1eb 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -271,13 +271,13 @@ export class HtmlExtract implements INodeType {
 						},
 					};
 
-					// Itterate over all the defined values which should be extracted
+					// Iterate over all the defined values which should be extracted
 					let htmlElement;
 					for (const valueData of extractionValues.values as IValueData[]) {
 						htmlElement = $(valueData.cssSelector);
 
 						if (valueData.returnArray) {
-							// An array should be returned so itterate over one
+							// An array should be returned so iterate over one
 							// value at a time
 							newItem.json[valueData.key] = [];
 							htmlElement.each((i, el) => {
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index 17169ca230a2a4..98eea2e1677017 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -318,7 +318,7 @@ export class HttpRequestV1 implements INodeType {
 							name: 'fullResponse',
 							type: 'boolean',
 							default: false,
-							description: 'Whether to return the full reponse data instead of only the body',
+							description: 'Whether to return the full response data instead of only the body',
 						},
 						{
 							displayName: 'Follow All Redirects',
@@ -598,7 +598,7 @@ export class HttpRequestV1 implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 
-		const fullReponseProperties = ['body', 'headers', 'statusCode', 'statusMessage'];
+		const fullResponseProperties = ['body', 'headers', 'statusCode', 'statusMessage'];
 
 		const responseFormat = this.getNodeParameter('responseFormat', 0) as string;
 
@@ -1035,7 +1035,7 @@ export class HttpRequestV1 implements INodeType {
 
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						if (property === 'body') {
 							continue;
 						}
@@ -1063,7 +1063,7 @@ export class HttpRequestV1 implements INodeType {
 
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						if (property === 'body') {
 							returnItem[dataPropertyName] = response![property];
 							continue;
@@ -1091,7 +1091,7 @@ export class HttpRequestV1 implements INodeType {
 				// responseFormat: 'json'
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						returnItem[property] = response![property];
 					}
 
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index 57462c4b075f1f..ef4cb43d1c8d17 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -330,7 +330,7 @@ export class HttpRequestV2 implements INodeType {
 							name: 'fullResponse',
 							type: 'boolean',
 							default: false,
-							description: 'Whether to return the full reponse data instead of only the body',
+							description: 'Whether to return the full response data instead of only the body',
 						},
 						{
 							displayName: 'Follow All Redirects',
@@ -610,7 +610,7 @@ export class HttpRequestV2 implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 
-		const fullReponseProperties = ['body', 'headers', 'statusCode', 'statusMessage'];
+		const fullResponseProperties = ['body', 'headers', 'statusCode', 'statusMessage'];
 
 		let authentication;
 
@@ -1086,7 +1086,7 @@ export class HttpRequestV2 implements INodeType {
 
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						if (property === 'body') {
 							continue;
 						}
@@ -1114,7 +1114,7 @@ export class HttpRequestV2 implements INodeType {
 
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						if (property === 'body') {
 							returnItem[dataPropertyName] = response![property];
 							continue;
@@ -1142,7 +1142,7 @@ export class HttpRequestV2 implements INodeType {
 				// responseFormat: 'json'
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						returnItem[property] = response![property];
 					}
 
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 56cc06f8f15c35..a83623a8c40016 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -798,7 +798,7 @@ export class HttpRequestV3 implements INodeType {
 											type: 'boolean',
 											default: false,
 											description:
-												'Whether to return the full reponse (headers and response status code) data instead of only the body',
+												'Whether to return the full response (headers and response status code) data instead of only the body',
 										},
 										{
 											displayName: 'Never Error',
@@ -879,7 +879,7 @@ export class HttpRequestV3 implements INodeType {
 	async execute(this: IExecuteFunctions): Promise<INodeExecutionData[][]> {
 		const items = this.getInputData();
 
-		const fullReponseProperties = ['body', 'headers', 'statusCode', 'statusMessage'];
+		const fullResponseProperties = ['body', 'headers', 'statusCode', 'statusMessage'];
 
 		let authentication;
 
@@ -1061,14 +1061,14 @@ export class HttpRequestV3 implements INodeType {
 				});
 			}
 
-			const parmetersToKeyValue = async (
+			const parametersToKeyValue = async (
 				acc: Promise<{ [key: string]: any }>,
 				cur: { name: string; value: string; parameterType?: string; inputDataFieldName?: string },
 			) => {
-				const acumulator = await acc;
+				const accumulator = await acc;
 				if (cur.parameterType === 'formBinaryData') {
 					const binaryDataOnInput = items[itemIndex]?.binary;
-					if (!cur.inputDataFieldName) return acumulator;
+					if (!cur.inputDataFieldName) return accumulator;
 
 					if (!binaryDataOnInput?.[cur.inputDataFieldName]) {
 						throw new NodeOperationError(
@@ -1080,29 +1080,29 @@ export class HttpRequestV3 implements INodeType {
 						);
 					}
 
-					if (!cur.inputDataFieldName) return acumulator;
+					if (!cur.inputDataFieldName) return accumulator;
 
 					const binaryData = binaryDataOnInput[cur.inputDataFieldName];
 					const buffer = await this.helpers.getBinaryDataBuffer(itemIndex, cur.inputDataFieldName);
 
-					acumulator[cur.name] = {
+					accumulator[cur.name] = {
 						value: buffer,
 						options: {
 							filename: binaryData.fileName,
 							contentType: binaryData.mimeType,
 						},
 					};
-					return acumulator;
+					return accumulator;
 				}
-				acumulator[cur.name] = cur.value;
-				return acumulator;
+				accumulator[cur.name] = cur.value;
+				return accumulator;
 			};
 
 			// Get parameters defined in the UI
 			if (sendBody && bodyParameters) {
 				if (specifyBody === 'keypair' || bodyContentType === 'multipart-form-data') {
 					requestOptions.body = await bodyParameters.reduce(
-						parmetersToKeyValue,
+						parametersToKeyValue,
 						Promise.resolve({}),
 					);
 				} else if (specifyBody === 'json') {
@@ -1156,7 +1156,7 @@ export class HttpRequestV3 implements INodeType {
 			if (sendQuery && queryParameters) {
 				if (specifyQuery === 'keypair') {
 					requestOptions.qs = await queryParameters.reduce(
-						parmetersToKeyValue,
+						parametersToKeyValue,
 						Promise.resolve({}),
 					);
 				} else if (specifyQuery === 'json') {
@@ -1181,7 +1181,7 @@ export class HttpRequestV3 implements INodeType {
 			if (sendHeaders && headerParameters) {
 				if (specifyHeaders === 'keypair') {
 					requestOptions.headers = await headerParameters.reduce(
-						parmetersToKeyValue,
+						parametersToKeyValue,
 						Promise.resolve({}),
 					);
 				} else if (specifyHeaders === 'json') {
@@ -1399,7 +1399,7 @@ export class HttpRequestV3 implements INodeType {
 
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						if (property === 'body') {
 							continue;
 						}
@@ -1430,7 +1430,7 @@ export class HttpRequestV3 implements INodeType {
 				) as string;
 				if (fullResponse) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						if (property === 'body') {
 							returnItem[outputPropertyName] = toText(response![property]);
 							continue;
@@ -1458,7 +1458,7 @@ export class HttpRequestV3 implements INodeType {
 				// responseFormat: 'json'
 				if (requestOptions.resolveWithFullResponse === true) {
 					const returnItem: IDataObject = {};
-					for (const property of fullReponseProperties) {
+					for (const property of fullResponseProperties) {
 						returnItem[property] = response![property];
 					}
 
diff --git a/packages/nodes-base/nodes/If/If.node.ts b/packages/nodes-base/nodes/If/If.node.ts
index 9543dc4a4aab16..6c19c082f6775e 100644
--- a/packages/nodes-base/nodes/If/If.node.ts
+++ b/packages/nodes-base/nodes/If/If.node.ts
@@ -421,7 +421,7 @@ export class If implements INodeType {
 		// The different dataTypes to check the values in
 		const dataTypes = ['boolean', 'dateTime', 'number', 'string'];
 
-		// Itterate over all items to check which ones should be output as via output "true" and
+		// Iterate over all items to check which ones should be output as via output "true" and
 		// which ones via output "false"
 		let dataType: string;
 		let compareOperationResult: boolean;
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
index 6fcd6f7ecb0e02..9b23e7f3d3bad1 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
@@ -202,7 +202,7 @@ export class InvoiceNinjaTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index c5f5b26db72a80..80783d167f0a6c 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -467,7 +467,7 @@ export class JiraTrigger implements INodeType {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 9d2106f65362d4..83812d95f8c51b 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -141,7 +141,7 @@ export class KeapTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
diff --git a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
index 2da83ae3c62012..7da955000bf621 100644
--- a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
+++ b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
@@ -229,7 +229,7 @@ export class LinearTrigger implements INodeType {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 68ac48f1c06891..96ebd4af796671 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -49,13 +49,13 @@ export class MailchimpTrigger implements INodeType {
 			{
 				name: 'setup',
 				httpMethod: 'GET',
-				reponseMode: 'onReceived',
+				responseMode: 'onReceived',
 				path: 'webhook',
 			},
 			{
 				name: 'default',
 				httpMethod: 'POST',
-				reponseMode: 'onReceived',
+				responseMode: 'onReceived',
 				path: 'webhook',
 			},
 		],
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
index c5e009e71efb29..e52f2254195014 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
@@ -160,7 +160,7 @@ export class MailerLiteTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index 2e97ed5f3bf29e..e1bd0735c4830e 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -35,7 +35,7 @@ export class PayPalTrigger implements INodeType {
 			{
 				name: 'default',
 				httpMethod: 'POST',
-				reponseMode: 'onReceived',
+				responseMode: 'onReceived',
 				path: 'webhook',
 			},
 		],
diff --git a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
index 6b994b9ccd2e08..e4aab75c20197c 100644
--- a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
@@ -230,7 +230,7 @@ export function pipedriveResolveCustomProperties(
 
 	const json = item.json as IDataObject;
 
-	// Itterate over all keys and replace the custom ones
+	// Iterate over all keys and replace the custom ones
 	for (const key of Object.keys(json)) {
 		if (customProperties[key] !== undefined) {
 			// Is a custom property
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index bf0b044916f167..3e74a7373973be 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -304,7 +304,7 @@ export class PipedriveTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
 				}
diff --git a/packages/nodes-base/nodes/PostBin/BinDescription.ts b/packages/nodes-base/nodes/PostBin/BinDescription.ts
index 3255d52beca014..ebb00e7952c367 100644
--- a/packages/nodes-base/nodes/PostBin/BinDescription.ts
+++ b/packages/nodes-base/nodes/PostBin/BinDescription.ts
@@ -1,6 +1,6 @@
 import type { INodeProperties } from 'n8n-workflow';
 
-import { buildBinAPIURL, transformBinReponse } from './GenericFunctions';
+import { buildBinAPIURL, transformBinResponse } from './GenericFunctions';
 
 // Operations for the `Bin` resource:
 export const binOperations: INodeProperties[] = [
@@ -25,7 +25,7 @@ export const binOperations: INodeProperties[] = [
 						url: '/developers/postbin/api/bin',
 					},
 					output: {
-						postReceive: [transformBinReponse],
+						postReceive: [transformBinResponse],
 					},
 				},
 				action: 'Create a bin',
@@ -39,7 +39,7 @@ export const binOperations: INodeProperties[] = [
 						method: 'GET',
 					},
 					output: {
-						postReceive: [transformBinReponse],
+						postReceive: [transformBinResponse],
 					},
 					send: {
 						preSend: [
diff --git a/packages/nodes-base/nodes/PostBin/GenericFunctions.ts b/packages/nodes-base/nodes/PostBin/GenericFunctions.ts
index f76d236c97d35a..ecfe2f85df56e1 100644
--- a/packages/nodes-base/nodes/PostBin/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PostBin/GenericFunctions.ts
@@ -94,7 +94,7 @@ export async function buildRequestURL(
  * Converts the bin response data and adds additional properties
  *
  */
-export async function transformBinReponse(
+export async function transformBinResponse(
 	this: IExecuteSingleFunctions,
 	items: INodeExecutionData[],
 	_response: IN8nHttpFullResponse,
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
index 58f26c5cf94c25..73154582aea750 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
@@ -237,7 +237,7 @@ export class PostmarkTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
 				}
diff --git a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
index bb5dd1fbce0178..72b2c1a853bdcc 100644
--- a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
@@ -99,7 +99,7 @@ export class PushcutTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/SendInBlue/EmailDescription.ts b/packages/nodes-base/nodes/SendInBlue/EmailDescription.ts
index a94c598312d01f..8a1cc400ea5f1d 100644
--- a/packages/nodes-base/nodes/SendInBlue/EmailDescription.ts
+++ b/packages/nodes-base/nodes/SendInBlue/EmailDescription.ts
@@ -426,7 +426,7 @@ const sendHtmlTemplateEmailFields: INodeProperties[] = [
 						values: [
 							{
 								displayName: 'Parameter',
-								name: 'parmeters',
+								name: 'parameters',
 								type: 'string',
 								default: '',
 								placeholder: 'key=value',
diff --git a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
index 5465ff99d49121..4520c02934f77c 100644
--- a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
@@ -266,8 +266,8 @@ export namespace SendInBlueNode {
 				'additionalFields.templateParameters.parameterValues',
 			);
 			const { body } = requestOptions;
-			const { parmeters } = parameterData as JsonObject;
-			const params = (parmeters as string)
+			const { parameters } = parameterData as JsonObject;
+			const params = (parameters as string)
 				.split(',')
 				.filter((parameter) => {
 					return parameter.split('=').length === 2;
diff --git a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.ts b/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.ts
index 7b9836fe485329..cb86812a616f1b 100644
--- a/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.ts
+++ b/packages/nodes-base/nodes/SendInBlue/SendInBlueTrigger.node.ts
@@ -268,7 +268,7 @@ export class SendInBlueTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
 					delete webhookData.hookSecret;
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index e9eaa456349488..4a5db782e4e4bb 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -223,7 +223,7 @@ export class StravaTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index 6109a8a0ef1315..4a40a427fb9c3c 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -35,7 +35,7 @@ export class StripeTrigger implements INodeType {
 			{
 				name: 'default',
 				httpMethod: 'POST',
-				reponseMode: 'onReceived',
+				responseMode: 'onReceived',
 				path: 'webhook',
 			},
 		],
@@ -908,7 +908,7 @@ export class StripeTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 					delete webhookData.webhookEvents;
 					delete webhookData.webhookSecret;
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 09f2125eaf2825..217c365d9b0440 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -459,7 +459,7 @@ export class SurveyMonkeyTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
diff --git a/packages/nodes-base/nodes/Switch/Switch.node.ts b/packages/nodes-base/nodes/Switch/Switch.node.ts
index e584599788c123..c89629e609a980 100644
--- a/packages/nodes-base/nodes/Switch/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch/Switch.node.ts
@@ -618,7 +618,7 @@ export class Switch implements INodeType {
 			}
 		};
 
-		// Itterate over all items to check to which output they should be routed to
+		// Iterate over all items to check to which output they should be routed to
 		itemLoop: for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			try {
 				item = items[itemIndex];
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index 0d0cf9b6dd1b91..51041831fe36b2 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
@@ -26,7 +26,7 @@ export class TheHiveTrigger implements INodeType {
 			{
 				name: 'default',
 				httpMethod: 'POST',
-				reponseMode: 'onReceived',
+				responseMode: 'onReceived',
 				path: 'webhook',
 			},
 		],
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
index c1433826bb0ec3..b928d3a01ff306 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
@@ -122,7 +122,7 @@ export class TrelloTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index bb515e28e23f64..1cb4248bdd73b1 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -212,7 +212,7 @@ export class TypeformTrigger implements INodeType {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
@@ -240,16 +240,16 @@ export class TypeformTrigger implements INodeType {
 		const answers = (bodyData.form_response as IDataObject).answers as ITypeformAnswer[];
 
 		// Some fields contain lower level fields of which we are only interested of the values
-		const subvalueKeys = ['label', 'labels'];
+		const subValueKeys = ['label', 'labels'];
 
 		if (simplifyAnswers) {
 			// Convert the answers to simple key -> value pairs
 			const definition = (bodyData.form_response as IDataObject).definition as ITypeformDefinition;
 
 			// Create a dictionary to get the field title by its ID
-			const defintitionsById: { [key: string]: string } = {};
+			const definitionsById: { [key: string]: string } = {};
 			for (const field of definition.fields) {
-				defintitionsById[field.id] = field.title.replace(/\{\{/g, '[').replace(/\}\}/g, ']');
+				definitionsById[field.id] = field.title.replace(/\{\{/g, '[').replace(/\}\}/g, ']');
 			}
 
 			// Convert the answers to key -> value pair
@@ -257,14 +257,14 @@ export class TypeformTrigger implements INodeType {
 			for (const answer of answers) {
 				let value = answer[answer.type];
 				if (typeof value === 'object') {
-					for (const key of subvalueKeys) {
+					for (const key of subValueKeys) {
 						if ((value as IDataObject)[key] !== undefined) {
 							value = (value as ITypeformAnswerField)[key];
 							break;
 						}
 					}
 				}
-				convertedAnswers[defintitionsById[answer.field.id]] = value;
+				convertedAnswers[definitionsById[answer.field.id]] = value;
 			}
 
 			if (onlyAnswers) {
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts
index 879b8755373528..dd9aaf63169425 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloudTrigger.node.ts
@@ -162,7 +162,7 @@ export class VenafiTlsProtectCloudTrigger implements INodeType {
 					}
 
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 5fe8e461535019..85b7343a3e8233 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -607,7 +607,7 @@ export class Wait implements INodeType {
 	};
 
 	async webhook(this: IWebhookFunctions): Promise<IWebhookResponseData> {
-		// INFO: Currently (20.06.2021) 100% identical with Webook-Node
+		// INFO: Currently (20.06.2021) 100% identical with Webhook-Node
 		const incomingAuthentication = this.getNodeParameter('incomingAuthentication') as string;
 		const options = this.getNodeParameter('options', {}) as IDataObject;
 		const req = this.getRequestObject();
diff --git a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
index 4c717042d11436..d3a087903c7352 100644
--- a/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MessagesDescription.ts
@@ -1100,7 +1100,7 @@ export const messageTypeFields: INodeProperties[] = [
 		},
 	},
 	//{
-	//	// Search for ISO6391.getCode(language) in the Twitter node. Pehaps, we can use the same library?
+	//	// Search for ISO6391.getCode(language) in the Twitter node. Perhaps, we can use the same library?
 	//	//TODO: would be nice to change this to a searchable dropdown with all the possible language codes
 	//	displayName: 'Language Code',
 	//	name: 'templateLanguageCode',
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index 99aaefcb999db2..ff807a6f374f14 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -419,11 +419,11 @@ export class Wordpress implements INodeType {
 						responseData = await wordpressApiRequest.call(this, 'DELETE', '/users/me', {}, qs);
 					}
 				}
-				const exectutionData = this.helpers.constructExecutionMetaData(
+				const executionData = this.helpers.constructExecutionMetaData(
 					this.helpers.returnJsonArray(responseData as IDataObject[]),
 					{ itemData: { item: i } },
 				);
-				returnData.push(...exectutionData);
+				returnData.push(...executionData);
 			} catch (error) {
 				if (this.continueOnFail()) {
 					returnData.push({ json: { error: error.message } });
diff --git a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
index 52367a965d0cf7..05cf3447e11d25 100644
--- a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
@@ -179,7 +179,7 @@ export class WorkableTrigger implements INodeType {
 						return false;
 					}
 					// Remove from the static workflow data so that it is clear
-					// that no webhooks are registred anymore
+					// that no webhooks are registered anymore
 					delete webhookData.webhookId;
 				}
 				return true;
diff --git a/packages/nodes-base/nodes/Zendesk/OrganizationDescription.ts b/packages/nodes-base/nodes/Zendesk/OrganizationDescription.ts
index 54fecb018d7005..44a13314f6478f 100644
--- a/packages/nodes-base/nodes/Zendesk/OrganizationDescription.ts
+++ b/packages/nodes-base/nodes/Zendesk/OrganizationDescription.ts
@@ -94,7 +94,7 @@ export const organizationFields: INodeProperties[] = [
 				name: 'details',
 				type: 'string',
 				default: '',
-				description: 'Details obout the organization, such as the address',
+				description: 'Details about the organization, such as the address',
 			},
 			{
 				displayName: 'Domain Names',
@@ -192,7 +192,7 @@ export const organizationFields: INodeProperties[] = [
 				name: 'details',
 				type: 'string',
 				default: '',
-				description: 'Details obout the organization, such as the address',
+				description: 'Details about the organization, such as the address',
 			},
 			{
 				displayName: 'Domain Names',
diff --git a/packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts b/packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts
index 5534e2505fb2ee..840841ec9c5b02 100644
--- a/packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts
+++ b/packages/nodes-base/nodes/Zendesk/TriggerPlaceholders.ts
@@ -213,12 +213,12 @@ export const triggerPlaceholders = [
 		description: 'Your notes, stored in your profile',
 	},
 	{
-		name: 'Satisfation Current Rating',
+		name: 'Satisfaction Current Rating',
 		value: 'satisfaction.current_rating',
 		description: 'The text of the current satisfaction rating',
 	},
 	{
-		name: 'Satisfation Current Comment',
+		name: 'Satisfaction Current Comment',
 		value: 'satisfaction.current_comment',
 		description: 'The text of the current satisfaction rating comment',
 	},
diff --git a/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts b/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
index 0357eb6230f984..87834bf3aaf9c8 100644
--- a/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
+++ b/packages/nodes-base/nodes/Zoho/descriptions/DealDescription.ts
@@ -158,7 +158,7 @@ export const dealFields: INodeProperties[] = [
 				name: 'Lead_Conversion_Time',
 				type: 'number',
 				default: '',
-				description: 'Averge number of days to convert the lead into a deal',
+				description: 'Average number of days to convert the lead into a deal',
 			},
 			{
 				displayName: 'Next Step',
@@ -172,7 +172,7 @@ export const dealFields: INodeProperties[] = [
 				name: 'Overall_Sales_Duration',
 				type: 'number',
 				default: '',
-				description: 'Averge number of days to convert the lead into a deal and to win the deal',
+				description: 'Average number of days to convert the lead into a deal and to win the deal',
 			},
 			{
 				displayName: 'Probability',
@@ -190,7 +190,7 @@ export const dealFields: INodeProperties[] = [
 				name: 'Sales_Cycle_Duration',
 				type: 'number',
 				default: 0,
-				description: 'Averge number of days for the deal to be won',
+				description: 'Average number of days for the deal to be won',
 			},
 		],
 	},
@@ -304,7 +304,7 @@ export const dealFields: INodeProperties[] = [
 				name: 'Lead_Conversion_Time',
 				type: 'number',
 				default: '',
-				description: 'Averge number of days to convert the lead into a deal',
+				description: 'Average number of days to convert the lead into a deal',
 			},
 			{
 				displayName: 'Next Step',
@@ -318,7 +318,7 @@ export const dealFields: INodeProperties[] = [
 				name: 'Overall_Sales_Duration',
 				type: 'number',
 				default: '',
-				description: 'Averge number of days to convert the lead into a deal and to win the deal',
+				description: 'Average number of days to convert the lead into a deal and to win the deal',
 			},
 			{
 				displayName: 'Probability',
@@ -336,7 +336,7 @@ export const dealFields: INodeProperties[] = [
 				name: 'Sales_Cycle_Duration',
 				type: 'number',
 				default: 0,
-				description: 'Averge number of days to win the deal',
+				description: 'Average number of days to win the deal',
 			},
 			{
 				displayName: 'Stage Name or ID',
diff --git a/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts b/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts
index 4c882fba131efa..9dad59d4134638 100644
--- a/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts
+++ b/packages/nodes-base/nodes/Zoom/MeetingRegistrantDescription.ts
@@ -199,8 +199,8 @@ export const meetingRegistrantFields: INodeProperties[] = [
 						value: 'Evaluator/Recommender',
 					},
 					{
-						name: 'Influener',
-						value: 'Influener',
+						name: 'Influencer',
+						value: 'Influencer',
 					},
 					{
 						name: 'Not Involved',

From 1c65bff31d86ea76ff5fca10341e71389d4de7b5 Mon Sep 17 00:00:00 2001
From: Jan Oberhauser <janober@users.noreply.github.com>
Date: Sun, 5 Mar 2023 17:43:17 +0100
Subject: [PATCH 324/358] fix(OpenAI Node): Simplify code (#5618)

fix(OpenAI Node): Simplifiy code
---
 .../nodes-base/nodes/OpenAi/ChatDescription.ts     |  3 +--
 packages/nodes-base/nodes/OpenAi/ChatFunctions.ts  | 14 --------------
 2 files changed, 1 insertion(+), 16 deletions(-)
 delete mode 100644 packages/nodes-base/nodes/OpenAi/ChatFunctions.ts

diff --git a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
index a627ed8457578e..9812d5dffbe831 100644
--- a/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
+++ b/packages/nodes-base/nodes/OpenAi/ChatDescription.ts
@@ -1,5 +1,4 @@
 import type { INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { chatBodyPresend } from './ChatFunctions';
 
 export const chatOperations: INodeProperties[] = [
 	{
@@ -115,7 +114,7 @@ const completeOperations: INodeProperties[] = [
 			send: {
 				type: 'body',
 				property: 'messages',
-				preSend: [chatBodyPresend],
+				value: '={{ $value.messages }}',
 			},
 		},
 	},
diff --git a/packages/nodes-base/nodes/OpenAi/ChatFunctions.ts b/packages/nodes-base/nodes/OpenAi/ChatFunctions.ts
deleted file mode 100644
index b87a4f9c8c8123..00000000000000
--- a/packages/nodes-base/nodes/OpenAi/ChatFunctions.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-import type { IDataObject, IExecuteSingleFunctions, IHttpRequestOptions } from 'n8n-workflow';
-
-export async function chatBodyPresend(
-	this: IExecuteSingleFunctions,
-	requestOptions: IHttpRequestOptions,
-): Promise<IHttpRequestOptions> {
-	const prompts = this.getNodeParameter('prompt', '{}') as IDataObject;
-
-	requestOptions.body = Object.assign({}, requestOptions.body, {
-		messages: prompts.messages,
-	});
-
-	return requestOptions;
-}

From ddfa16cf27c7db7f3f6ca7c1085b5e20242b3749 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Mon, 6 Mar 2023 09:36:05 +0100
Subject: [PATCH 325/358] refactor(editor): Add spec input to e2e-tests
 workflow (no-changelog) (#5622)

refactor(editor): Add spec input to e2e-tests workflow to run specific specs
---
 .github/workflows/e2e-tests.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/e2e-tests.yml b/.github/workflows/e2e-tests.yml
index 3e9f44eb6ee463..7059280552ba3f 100644
--- a/.github/workflows/e2e-tests.yml
+++ b/.github/workflows/e2e-tests.yml
@@ -10,6 +10,11 @@ on:
         description: 'GitHub branch to test.'
         required: false
         default: 'master'
+      spec:
+        description: 'Specify specs.'
+        required: false
+        default: 'e2e/*'
+        type: string
       user:
         description: 'User who kicked this off.'
         required: false

From ca66ec8f4d5ab0e427390b1f1874fb668bc53479 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Mon, 6 Mar 2023 09:44:25 +0100
Subject: [PATCH 326/358] feat(core): Add SAML XML validation (#5600)

* consolidate SSO settings

* update saml settings

* fix type error

* limit user changes when saml is enabled

* add test

* add toggle endpoint and fetch metadata

* rename enabled param

* add handling of POST saml login request

* add config test endpoint

* adds saml XML validation

* add comment

* protect test endpoint

* improve ignoreSSL and some cleanup

* fix wrong schema used

* remove console.log
---
 packages/cli/package.json                     |   3 +-
 packages/cli/src/Server.ts                    |  12 +-
 .../routes/saml.controller.protected.ee.ts    |  15 +-
 packages/cli/src/sso/saml/saml.service.ee.ts  |  71 ++--
 packages/cli/src/sso/saml/samlValidator.ts    |  93 +++++
 .../schema/saml-schema-assertion-2.0.xsd.ts   | 283 +++++++++++++++
 .../schema/saml-schema-metadata-2.0.xsd.ts    | 336 ++++++++++++++++++
 .../schema/saml-schema-protocol-2.0.xsd.ts    | 302 ++++++++++++++++
 .../src/sso/saml/schema/xenc-schema.xsd.ts    | 145 ++++++++
 packages/cli/src/sso/saml/schema/xml.xsd.ts   | 117 ++++++
 .../saml/schema/xmldsig-core-schema.xsd.ts    | 318 +++++++++++++++++
 .../cli/src/sso/saml/serviceProvider.ee.ts    |  10 +-
 .../cli/src/sso/saml/types/samlPreferences.ts |   4 +
 packages/cli/src/sso/ssoHelpers.ts            |   5 +-
 packages/cli/tsconfig.json                    |   2 +-
 pnpm-lock.yaml                                |   7 +
 16 files changed, 1672 insertions(+), 51 deletions(-)
 create mode 100644 packages/cli/src/sso/saml/samlValidator.ts
 create mode 100644 packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
 create mode 100644 packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
 create mode 100644 packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
 create mode 100644 packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts
 create mode 100644 packages/cli/src/sso/saml/schema/xml.xsd.ts
 create mode 100644 packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts

diff --git a/packages/cli/package.json b/packages/cli/package.json
index 8955bf5289706d..3cb13ea7be8a3b 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -129,8 +129,8 @@
     "bull": "^4.10.2",
     "callsites": "^3.1.0",
     "change-case": "^4.1.1",
-    "class-validator": "^0.14.0",
     "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.0",
     "client-oauth2": "^4.2.5",
     "compression": "^1.7.4",
     "connect-history-api-fallback": "^1.6.0",
@@ -205,6 +205,7 @@
     "validator": "13.7.0",
     "winston": "^3.3.3",
     "ws": "^8.12.0",
+    "xmllint-wasm": "^3.0.1",
     "yamljs": "^0.3.0"
   }
 }
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index af3a5b5e56482b..4c73c7c3565a6b 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -515,10 +515,16 @@ class Server extends AbstractServer {
 		// SAML
 		// ----------------------------------------
 
-		// initialize SamlService
-		await SamlService.getInstance().init();
+		// initialize SamlService if it is licensed, even if not enabled, to
+		// set up the initial environment
+		if (isSamlLicensed()) {
+			try {
+				await SamlService.getInstance().init();
+			} catch (error) {
+				LoggerProxy.error(`SAML initialization failed: ${error.message}`);
+			}
+		}
 
-		// public SAML endpoints
 		this.app.use(`/${this.restEndpoint}/sso/saml`, samlControllerPublic);
 		this.app.use(`/${this.restEndpoint}/sso/saml`, samlControllerProtected);
 
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
index 9a98e6926bd0fd..47e625817cb3dc 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
@@ -57,12 +57,11 @@ samlControllerProtected.post(
 	SamlUrls.configToggleEnabled,
 	samlLicensedOwnerMiddleware,
 	async (req: SamlConfiguration.Toggle, res: express.Response) => {
-		if (req.body.loginEnabled !== undefined) {
-			await SamlService.getInstance().setSamlPreferences({ loginEnabled: req.body.loginEnabled });
-			res.sendStatus(200);
-		} else {
+		if (req.body.loginEnabled === undefined) {
 			throw new BadRequestError('Body should contain a boolean "loginEnabled" property');
 		}
+		await SamlService.getInstance().setSamlPreferences({ loginEnabled: req.body.loginEnabled });
+		res.sendStatus(200);
 	},
 );
 
@@ -122,8 +121,9 @@ samlControllerProtected.get(
 	async (req: express.Request, res: express.Response) => {
 		const result = SamlService.getInstance().getLoginRequestUrl();
 		if (result?.binding === 'redirect') {
-			// forced client side redirect
+			// forced client side redirect through the use of a javascript redirect
 			return res.send(getInitSSOPostView(result.context));
+			// TODO:SAML: If we want the frontend to handle the redirect, we will send the redirect URL instead:
 			// return res.status(301).send(result.context.context);
 		} else if (result?.binding === 'post') {
 			return res.send(getInitSSOFormView(result.context as PostBindingContext));
@@ -133,8 +133,13 @@ samlControllerProtected.get(
 	},
 );
 
+/**
+ * GET /sso/saml/config/test
+ * Test SAML config
+ */
 samlControllerProtected.get(
 	SamlUrls.configTest,
+	samlLicensedOwnerMiddleware,
 	async (req: express.Request, res: express.Response) => {
 		const testResult = await SamlService.getInstance().testSamlConnection();
 		return res.send(testResult);
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index d4fd3b40ba99ab..b204c1686b73bf 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -10,7 +10,7 @@ import { isSsoJustInTimeProvisioningEnabled } from '../ssoHelpers';
 import type { SamlPreferences } from './types/samlPreferences';
 import { SAML_PREFERENCES_DB_KEY } from './constants';
 import type { IdentityProviderInstance } from 'samlify';
-import { IdentityProvider } from 'samlify';
+import { IdentityProvider, setSchemaValidator } from 'samlify';
 import {
 	createUserFromSamlAttributes,
 	getMappedSamlAttributesFromFlowResult,
@@ -22,8 +22,10 @@ import {
 } from './samlHelpers';
 import type { Settings } from '../../databases/entities/Settings';
 import axios from 'axios';
+import https from 'https';
 import type { SamlLoginBinding } from './types';
 import type { BindingContext, PostBindingContext } from 'samlify/types/src/entity';
+import { validateMetadata, validateResponse } from './samlValidator';
 
 export class SamlService {
 	private static instance: SamlService;
@@ -46,29 +48,13 @@ export class SamlService {
 		this._attributeMapping = mapping;
 	}
 
-	private _metadata = '';
+	private metadata = '';
 
 	private metadataUrl = '';
 
-	private loginBinding: SamlLoginBinding = 'post';
-
-	public get metadata(): string {
-		return this._metadata;
-	}
-
-	public set metadata(metadata: string) {
-		this._metadata = metadata;
-	}
+	private ignoreSSL = false;
 
-	constructor() {
-		this.loadFromDbAndApplySamlPreferences()
-			.then(() => {
-				LoggerProxy.debug('Initializing SAML service');
-			})
-			.catch(() => {
-				LoggerProxy.error('Error initializing SAML service');
-			});
-	}
+	private loginBinding: SamlLoginBinding = 'post';
 
 	static getInstance(): SamlService {
 		if (!SamlService.instance) {
@@ -79,6 +65,15 @@ export class SamlService {
 
 	async init(): Promise<void> {
 		await this.loadFromDbAndApplySamlPreferences();
+		setSchemaValidator({
+			validate: async (response: string) => {
+				const valid = await validateResponse(response);
+				if (!valid) {
+					return Promise.reject(new Error('Invalid SAML response'));
+				}
+				return Promise.resolve();
+			},
+		});
 	}
 
 	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
@@ -125,7 +120,6 @@ export class SamlService {
 			'post',
 		) as PostBindingContext;
 		//TODO:SAML: debug logging
-
 		LoggerProxy.debug(loginRequest.context);
 		return loginRequest;
 	}
@@ -188,6 +182,7 @@ export class SamlService {
 			mapping: this.attributeMapping,
 			metadata: this.metadata,
 			metadataUrl: this.metadataUrl,
+			ignoreSSL: this.ignoreSSL,
 			loginBinding: this.loginBinding,
 			loginEnabled: isSamlLoginEnabled(),
 			loginLabel: getSamlLoginLabel(),
@@ -198,12 +193,19 @@ export class SamlService {
 		this.loginBinding = prefs.loginBinding ?? this.loginBinding;
 		this.metadata = prefs.metadata ?? this.metadata;
 		this.attributeMapping = prefs.mapping ?? this.attributeMapping;
+		this.ignoreSSL = prefs.ignoreSSL ?? this.ignoreSSL;
 		if (prefs.metadataUrl) {
 			this.metadataUrl = prefs.metadataUrl;
 			const fetchedMetadata = await this.fetchMetadataFromUrl();
 			if (fetchedMetadata) {
 				this.metadata = fetchedMetadata;
 			}
+		} else if (prefs.metadata) {
+			const validationResult = await validateMetadata(prefs.metadata);
+			if (!validationResult) {
+				throw new Error('Invalid SAML metadata');
+			}
+			this.metadata = prefs.metadata;
 		}
 		setSamlLoginEnabled(prefs.loginEnabled ?? isSamlLoginEnabled());
 		setSamlLoginLabel(prefs.loginLabel ?? getSamlLoginLabel());
@@ -248,18 +250,24 @@ export class SamlService {
 
 	async fetchMetadataFromUrl(): Promise<string | undefined> {
 		try {
-			const prevRejectStatus = process.env.NODE_TLS_REJECT_UNAUTHORIZED;
-			process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
-			const response = await axios.get(this.metadataUrl);
-			process.env.NODE_TLS_REJECT_UNAUTHORIZED = prevRejectStatus;
+			// TODO:SAML: this will not work once axios is upgraded to > 1.2.0 (see checkServerIdentity)
+			const agent = new https.Agent({
+				rejectUnauthorized: !this.ignoreSSL,
+			});
+			const response = await axios.get(this.metadataUrl, { httpsAgent: agent });
 			if (response.status === 200 && response.data) {
 				const xml = (await response.data) as string;
-				// TODO: SAML: validate XML
-				// throw new BadRequestError('Received XML is not valid SAML metadata.');
+				const validationResult = await validateMetadata(xml);
+				if (!validationResult) {
+					throw new BadRequestError(
+						`Data received from ${this.metadataUrl} is not valid SAML metadata.`,
+					);
+				}
 				return xml;
 			}
 		} catch (error) {
-			throw new BadRequestError('SAML Metadata URL is invalid or response is .');
+			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+			throw new BadRequestError(`Error fetching SAML Metadata from ${this.metadataUrl}: ${error}`);
 		}
 		return;
 	}
@@ -298,10 +306,14 @@ export class SamlService {
 
 	async testSamlConnection(): Promise<boolean> {
 		try {
+			// TODO:SAML: this will not work once axios is upgraded to > 1.2.0 (see checkServerIdentity)
+			const agent = new https.Agent({
+				rejectUnauthorized: !this.ignoreSSL,
+			});
 			const requestContext = this.getLoginRequestUrl();
 			if (!requestContext) return false;
 			if (requestContext.binding === 'redirect') {
-				const fetchResult = await axios.get(requestContext.context.context);
+				const fetchResult = await axios.get(requestContext.context.context, { httpsAgent: agent });
 				if (fetchResult.status !== 200) {
 					LoggerProxy.debug('SAML: Error while testing SAML connection.');
 					return false;
@@ -319,6 +331,7 @@ export class SamlService {
 						// eslint-disable-next-line @typescript-eslint/naming-convention
 						'Content-type': 'application/x-www-form-urlencoded',
 					},
+					httpsAgent: agent,
 				});
 				if (fetchResult.status !== 200) {
 					LoggerProxy.debug('SAML: Error while testing SAML connection.');
diff --git a/packages/cli/src/sso/saml/samlValidator.ts b/packages/cli/src/sso/saml/samlValidator.ts
new file mode 100644
index 00000000000000..2eaa3505ae8514
--- /dev/null
+++ b/packages/cli/src/sso/saml/samlValidator.ts
@@ -0,0 +1,93 @@
+import { LoggerProxy } from 'n8n-workflow';
+import type { XMLFileInfo } from 'xmllint-wasm';
+import { validateXML } from 'xmllint-wasm';
+import { xsdSamlSchemaAssertion20 } from './schema/saml-schema-assertion-2.0.xsd';
+import { xsdSamlSchemaMetadata20 } from './schema/saml-schema-metadata-2.0.xsd';
+import { xsdSamlSchemaProtocol20 } from './schema/saml-schema-protocol-2.0.xsd';
+import { xsdXenc } from './schema/xenc-schema.xsd';
+import { xsdXml } from './schema/xml.xsd';
+import { xsdXmldsigCore } from './schema/xmldsig-core-schema.xsd';
+
+const xml: XMLFileInfo = {
+	fileName: 'xml.xsd',
+	contents: xsdXml,
+};
+
+const xmldsigCore: XMLFileInfo = {
+	fileName: 'xmldsig-core-schema.xsd',
+	contents: xsdXmldsigCore,
+};
+
+const xmlXenc: XMLFileInfo = {
+	fileName: 'xenc-schema.xsd',
+	contents: xsdXenc,
+};
+
+const xmlMetadata: XMLFileInfo = {
+	fileName: 'saml-schema-metadata-2.0.xsd',
+	contents: xsdSamlSchemaMetadata20,
+};
+
+const xmlAssertion: XMLFileInfo = {
+	fileName: 'saml-schema-assertion-2.0.xsd',
+	contents: xsdSamlSchemaAssertion20,
+};
+
+const xmlProtocol: XMLFileInfo = {
+	fileName: 'saml-schema-protocol-2.0.xsd',
+	contents: xsdSamlSchemaProtocol20,
+};
+
+export async function validateMetadata(metadata: string): Promise<boolean> {
+	try {
+		const validationResult = await validateXML({
+			xml: [
+				{
+					fileName: 'metadata.xml',
+					contents: metadata,
+				},
+			],
+			extension: 'schema',
+			schema: [xmlMetadata],
+			preload: [xmlProtocol, xmlAssertion, xmldsigCore, xmlXenc, xml],
+		});
+		if (validationResult.valid) {
+			LoggerProxy.debug('SAML Metadata is valid');
+			return true;
+		} else {
+			LoggerProxy.warn('SAML Validate Metadata: Invalid metadata');
+			LoggerProxy.warn(validationResult.errors.join('\n'));
+		}
+	} catch (error) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+		LoggerProxy.warn(error);
+	}
+	return false;
+}
+
+export async function validateResponse(response: string): Promise<boolean> {
+	try {
+		const validationResult = await validateXML({
+			xml: [
+				{
+					fileName: 'response.xml',
+					contents: response,
+				},
+			],
+			extension: 'schema',
+			schema: [xmlProtocol],
+			preload: [xmlMetadata, xmlAssertion, xmldsigCore, xmlXenc, xml],
+		});
+		if (validationResult.valid) {
+			LoggerProxy.debug('SAML Response is valid');
+			return true;
+		} else {
+			LoggerProxy.warn('SAML Validate Response: Failed');
+			LoggerProxy.warn(validationResult.errors.join('\n'));
+		}
+	} catch (error) {
+		// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+		LoggerProxy.warn(error);
+	}
+	return false;
+}
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts b/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
new file mode 100644
index 00000000000000..ff8d93c98988fa
--- /dev/null
+++ b/packages/cli/src/sso/saml/schema/saml-schema-assertion-2.0.xsd.ts
@@ -0,0 +1,283 @@
+export const xsdSamlSchemaAssertion20 = `<?xml version="1.0" encoding="US-ASCII"?>
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig-core-schema.xsd"/>
+    <import namespace="http://www.w3.org/2001/04/xmlenc#"
+        schemaLocation="xenc-schema.xsd"/>
+    <annotation>
+        <documentation>
+            Document identifier: saml-schema-assertion-2.0
+            Location: http://docs.oasis-open.org/security/saml/v2.0/
+            Revision history:
+            V1.0 (November, 2002):
+              Initial Standard Schema.
+            V1.1 (September, 2003):
+              Updates within the same V1.0 namespace.
+            V2.0 (March, 2005):
+              New assertion schema for SAML V2.0 namespace.
+        </documentation>
+    </annotation>
+    <attributeGroup name="IDNameQualifiers">
+        <attribute name="NameQualifier" type="string" use="optional"/>
+        <attribute name="SPNameQualifier" type="string" use="optional"/>
+    </attributeGroup>
+    <element name="BaseID" type="saml:BaseIDAbstractType"/>
+    <complexType name="BaseIDAbstractType" abstract="true">
+        <attributeGroup ref="saml:IDNameQualifiers"/>
+    </complexType>
+    <element name="NameID" type="saml:NameIDType"/>
+    <complexType name="NameIDType">
+        <simpleContent>
+            <extension base="string">
+                <attributeGroup ref="saml:IDNameQualifiers"/>
+                <attribute name="Format" type="anyURI" use="optional"/>
+                <attribute name="SPProvidedID" type="string" use="optional"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <complexType name="EncryptedElementType">
+        <sequence>
+            <element ref="xenc:EncryptedData"/>
+            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="EncryptedID" type="saml:EncryptedElementType"/>
+    <element name="Issuer" type="saml:NameIDType"/>
+    <element name="AssertionIDRef" type="NCName"/>
+    <element name="AssertionURIRef" type="anyURI"/>
+    <element name="Assertion" type="saml:AssertionType"/>
+    <complexType name="AssertionType">
+        <sequence>
+            <element ref="saml:Issuer"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="saml:Subject" minOccurs="0"/>
+            <element ref="saml:Conditions" minOccurs="0"/>
+            <element ref="saml:Advice" minOccurs="0"/>
+            <choice minOccurs="0" maxOccurs="unbounded">
+                <element ref="saml:Statement"/>
+                <element ref="saml:AuthnStatement"/>
+                <element ref="saml:AuthzDecisionStatement"/>
+                <element ref="saml:AttributeStatement"/>
+            </choice>
+        </sequence>
+        <attribute name="Version" type="string" use="required"/>
+        <attribute name="ID" type="ID" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+    </complexType>
+    <element name="Subject" type="saml:SubjectType"/>
+    <complexType name="SubjectType">
+        <choice>
+            <sequence>
+                <choice>
+                    <element ref="saml:BaseID"/>
+                    <element ref="saml:NameID"/>
+                    <element ref="saml:EncryptedID"/>
+                </choice>
+                <element ref="saml:SubjectConfirmation" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <element ref="saml:SubjectConfirmation" maxOccurs="unbounded"/>
+        </choice>
+    </complexType>
+    <element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
+    <complexType name="SubjectConfirmationType">
+        <sequence>
+            <choice minOccurs="0">
+                <element ref="saml:BaseID"/>
+                <element ref="saml:NameID"/>
+                <element ref="saml:EncryptedID"/>
+            </choice>
+            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
+        </sequence>
+        <attribute name="Method" type="anyURI" use="required"/>
+    </complexType>
+    <element name="SubjectConfirmationData" type="saml:SubjectConfirmationDataType"/>
+    <complexType name="SubjectConfirmationDataType" mixed="true">
+        <complexContent>
+            <restriction base="anyType">
+                <sequence>
+                    <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="NotBefore" type="dateTime" use="optional"/>
+                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+                <attribute name="Recipient" type="anyURI" use="optional"/>
+                <attribute name="InResponseTo" type="NCName" use="optional"/>
+                <attribute name="Address" type="string" use="optional"/>
+                <anyAttribute namespace="##other" processContents="lax"/>
+            </restriction>
+        </complexContent>
+    </complexType>
+    <complexType name="KeyInfoConfirmationDataType" mixed="false">
+        <complexContent>
+            <restriction base="saml:SubjectConfirmationDataType">
+                <sequence>
+                    <element ref="ds:KeyInfo" maxOccurs="unbounded"/>
+                </sequence>
+            </restriction>
+        </complexContent>
+    </complexType>
+    <element name="Conditions" type="saml:ConditionsType"/>
+    <complexType name="ConditionsType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:Condition"/>
+            <element ref="saml:AudienceRestriction"/>
+            <element ref="saml:OneTimeUse"/>
+            <element ref="saml:ProxyRestriction"/>
+        </choice>
+        <attribute name="NotBefore" type="dateTime" use="optional"/>
+        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+    </complexType>
+    <element name="Condition" type="saml:ConditionAbstractType"/>
+    <complexType name="ConditionAbstractType" abstract="true"/>
+    <element name="AudienceRestriction" type="saml:AudienceRestrictionType"/>
+    <complexType name="AudienceRestrictionType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType">
+                <sequence>
+                    <element ref="saml:Audience" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="Audience" type="anyURI"/>
+    <element name="OneTimeUse" type="saml:OneTimeUseType" />
+    <complexType name="OneTimeUseType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType"/>
+        </complexContent>
+    </complexType>
+    <element name="ProxyRestriction" type="saml:ProxyRestrictionType"/>
+    <complexType name="ProxyRestrictionType">
+    <complexContent>
+        <extension base="saml:ConditionAbstractType">
+            <sequence>
+                <element ref="saml:Audience" minOccurs="0" maxOccurs="unbounded"/>
+            </sequence>
+            <attribute name="Count" type="nonNegativeInteger" use="optional"/>
+        </extension>
+	</complexContent>
+    </complexType>
+    <element name="Advice" type="saml:AdviceType"/>
+    <complexType name="AdviceType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:AssertionIDRef"/>
+            <element ref="saml:AssertionURIRef"/>
+            <element ref="saml:Assertion"/>
+            <element ref="saml:EncryptedAssertion"/>
+            <any namespace="##other" processContents="lax"/>
+        </choice>
+    </complexType>
+    <element name="EncryptedAssertion" type="saml:EncryptedElementType"/>
+    <element name="Statement" type="saml:StatementAbstractType"/>
+    <complexType name="StatementAbstractType" abstract="true"/>
+    <element name="AuthnStatement" type="saml:AuthnStatementType"/>
+    <complexType name="AuthnStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <sequence>
+                    <element ref="saml:SubjectLocality" minOccurs="0"/>
+                    <element ref="saml:AuthnContext"/>
+                </sequence>
+                <attribute name="AuthnInstant" type="dateTime" use="required"/>
+                <attribute name="SessionIndex" type="string" use="optional"/>
+                <attribute name="SessionNotOnOrAfter" type="dateTime" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="SubjectLocality" type="saml:SubjectLocalityType"/>
+    <complexType name="SubjectLocalityType">
+        <attribute name="Address" type="string" use="optional"/>
+        <attribute name="DNSName" type="string" use="optional"/>
+    </complexType>
+    <element name="AuthnContext" type="saml:AuthnContextType"/>
+    <complexType name="AuthnContextType">
+        <sequence>
+            <choice>
+                <sequence>
+                    <element ref="saml:AuthnContextClassRef"/>
+                    <choice minOccurs="0">
+                        <element ref="saml:AuthnContextDecl"/>
+                        <element ref="saml:AuthnContextDeclRef"/>
+                    </choice>
+                </sequence>
+                <choice>
+                    <element ref="saml:AuthnContextDecl"/>
+                    <element ref="saml:AuthnContextDeclRef"/>
+                </choice>
+            </choice>
+            <element ref="saml:AuthenticatingAuthority" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="AuthnContextClassRef" type="anyURI"/>
+    <element name="AuthnContextDeclRef" type="anyURI"/>
+    <element name="AuthnContextDecl" type="anyType"/>
+    <element name="AuthenticatingAuthority" type="anyURI"/>
+    <element name="AuthzDecisionStatement" type="saml:AuthzDecisionStatementType"/>
+    <complexType name="AuthzDecisionStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <sequence>
+                    <element ref="saml:Action" maxOccurs="unbounded"/>
+                    <element ref="saml:Evidence" minOccurs="0"/>
+                </sequence>
+                <attribute name="Resource" type="anyURI" use="required"/>
+                <attribute name="Decision" type="saml:DecisionType" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <simpleType name="DecisionType">
+        <restriction base="string">
+            <enumeration value="Permit"/>
+            <enumeration value="Deny"/>
+            <enumeration value="Indeterminate"/>
+        </restriction>
+    </simpleType>
+    <element name="Action" type="saml:ActionType"/>
+    <complexType name="ActionType">
+        <simpleContent>
+            <extension base="string">
+                <attribute name="Namespace" type="anyURI" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <element name="Evidence" type="saml:EvidenceType"/>
+    <complexType name="EvidenceType">
+        <choice maxOccurs="unbounded">
+            <element ref="saml:AssertionIDRef"/>
+            <element ref="saml:AssertionURIRef"/>
+            <element ref="saml:Assertion"/>
+            <element ref="saml:EncryptedAssertion"/>
+        </choice>
+    </complexType>
+    <element name="AttributeStatement" type="saml:AttributeStatementType"/>
+    <complexType name="AttributeStatementType">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <choice maxOccurs="unbounded">
+                    <element ref="saml:Attribute"/>
+                    <element ref="saml:EncryptedAttribute"/>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="Attribute" type="saml:AttributeType"/>
+    <complexType name="AttributeType">
+        <sequence>
+            <element ref="saml:AttributeValue" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="Name" type="string" use="required"/>
+        <attribute name="NameFormat" type="anyURI" use="optional"/>
+        <attribute name="FriendlyName" type="string" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="AttributeValue" type="anyType" nillable="true"/>
+    <element name="EncryptedAttribute" type="saml:EncryptedElementType"/>
+</schema>`;
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts b/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
new file mode 100644
index 00000000000000..664168ef9398cb
--- /dev/null
+++ b/packages/cli/src/sso/saml/schema/saml-schema-metadata-2.0.xsd.ts
@@ -0,0 +1,336 @@
+export const xsdSamlSchemaMetadata20 = `<?xml version="1.0" encoding="UTF-8"?>
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    xmlns:xenc="http://www.w3.org/2001/04/xmlenc#"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig-core-schema.xsd"/>
+    <import namespace="http://www.w3.org/2001/04/xmlenc#"
+        schemaLocation="xenc-schema.xsd"/>
+    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
+        schemaLocation="saml-schema-assertion-2.0.xsd"/>
+    <import namespace="http://www.w3.org/XML/1998/namespace"
+        schemaLocation="xml.xsd"/>
+    <annotation>
+        <documentation>
+            Document identifier: saml-schema-metadata-2.0
+            Location: http://docs.oasis-open.org/security/saml/v2.0/
+            Revision history:
+              V2.0 (March, 2005):
+                Schema for SAML metadata, first published in SAML 2.0.
+        </documentation>
+    </annotation>
+
+    <simpleType name="entityIDType">
+        <restriction base="anyURI">
+            <maxLength value="1024"/>
+        </restriction>
+    </simpleType>
+    <complexType name="localizedNameType">
+        <simpleContent>
+            <extension base="string">
+                <attribute ref="xml:lang" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    <complexType name="localizedURIType">
+        <simpleContent>
+            <extension base="anyURI">
+                <attribute ref="xml:lang" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+    
+    <element name="Extensions" type="md:ExtensionsType"/>
+    <complexType final="#all" name="ExtensionsType">
+        <sequence>
+            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    
+    <complexType name="EndpointType">
+        <sequence>
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="Binding" type="anyURI" use="required"/>
+        <attribute name="Location" type="anyURI" use="required"/>
+        <attribute name="ResponseLocation" type="anyURI" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    
+    <complexType name="IndexedEndpointType">
+        <complexContent>
+            <extension base="md:EndpointType">
+                <attribute name="index" type="unsignedShort" use="required"/>
+                <attribute name="isDefault" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    
+    <element name="EntitiesDescriptor" type="md:EntitiesDescriptorType"/>
+    <complexType name="EntitiesDescriptorType">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <choice minOccurs="1" maxOccurs="unbounded">
+                <element ref="md:EntityDescriptor"/>
+                <element ref="md:EntitiesDescriptor"/>
+            </choice>
+        </sequence>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="ID" type="ID" use="optional"/>
+        <attribute name="Name" type="string" use="optional"/>
+    </complexType>
+
+    <element name="EntityDescriptor" type="md:EntityDescriptorType"/>
+    <complexType name="EntityDescriptorType">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <choice>
+                <choice maxOccurs="unbounded">
+                    <element ref="md:RoleDescriptor"/>
+                    <element ref="md:IDPSSODescriptor"/>
+                    <element ref="md:SPSSODescriptor"/>
+                    <element ref="md:AuthnAuthorityDescriptor"/>
+                    <element ref="md:AttributeAuthorityDescriptor"/>
+                    <element ref="md:PDPDescriptor"/>
+                </choice>
+                <element ref="md:AffiliationDescriptor"/>
+            </choice>
+            <element ref="md:Organization" minOccurs="0"/>
+            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:AdditionalMetadataLocation" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="entityID" type="md:entityIDType" use="required"/>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="ID" type="ID" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    
+    <element name="Organization" type="md:OrganizationType"/>
+    <complexType name="OrganizationType">
+        <sequence>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:OrganizationName" maxOccurs="unbounded"/>
+            <element ref="md:OrganizationDisplayName" maxOccurs="unbounded"/>
+            <element ref="md:OrganizationURL" maxOccurs="unbounded"/>
+        </sequence>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="OrganizationName" type="md:localizedNameType"/>
+    <element name="OrganizationDisplayName" type="md:localizedNameType"/>
+    <element name="OrganizationURL" type="md:localizedURIType"/>
+    <element name="ContactPerson" type="md:ContactType"/>
+    <complexType name="ContactType">
+        <sequence>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:Company" minOccurs="0"/>
+            <element ref="md:GivenName" minOccurs="0"/>
+            <element ref="md:SurName" minOccurs="0"/>
+            <element ref="md:EmailAddress" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:TelephoneNumber" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="contactType" type="md:ContactTypeType" use="required"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="Company" type="string"/>
+    <element name="GivenName" type="string"/>
+    <element name="SurName" type="string"/>
+    <element name="EmailAddress" type="anyURI"/>
+    <element name="TelephoneNumber" type="string"/>
+    <simpleType name="ContactTypeType">
+        <restriction base="string">
+            <enumeration value="technical"/>
+            <enumeration value="support"/>
+            <enumeration value="administrative"/>
+            <enumeration value="billing"/>
+            <enumeration value="other"/>
+        </restriction>
+    </simpleType>
+
+    <element name="AdditionalMetadataLocation" type="md:AdditionalMetadataLocationType"/>
+    <complexType name="AdditionalMetadataLocationType">
+        <simpleContent>
+            <extension base="anyURI">
+                <attribute name="namespace" type="anyURI" use="required"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+
+    <element name="RoleDescriptor" type="md:RoleDescriptorType"/>
+    <complexType name="RoleDescriptorType" abstract="true">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:KeyDescriptor" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:Organization" minOccurs="0"/>
+            <element ref="md:ContactPerson" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="ID" type="ID" use="optional"/>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="protocolSupportEnumeration" type="md:anyURIListType" use="required"/>
+        <attribute name="errorURL" type="anyURI" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <simpleType name="anyURIListType">
+        <list itemType="anyURI"/>
+    </simpleType>
+
+    <element name="KeyDescriptor" type="md:KeyDescriptorType"/>
+    <complexType name="KeyDescriptorType">
+        <sequence>
+            <element ref="ds:KeyInfo"/>
+            <element ref="md:EncryptionMethod" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="use" type="md:KeyTypes" use="optional"/>
+    </complexType>
+    <simpleType name="KeyTypes">
+        <restriction base="string">
+            <enumeration value="encryption"/>
+            <enumeration value="signing"/>
+        </restriction>
+    </simpleType>
+    <element name="EncryptionMethod" type="xenc:EncryptionMethodType"/>
+    
+    <complexType name="SSODescriptorType" abstract="true">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:ArtifactResolutionService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:SingleLogoutService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:ManageNameIDService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="ArtifactResolutionService" type="md:IndexedEndpointType"/>
+    <element name="SingleLogoutService" type="md:EndpointType"/>
+    <element name="ManageNameIDService" type="md:EndpointType"/>
+    <element name="NameIDFormat" type="anyURI"/>
+
+    <element name="IDPSSODescriptor" type="md:IDPSSODescriptorType"/>
+    <complexType name="IDPSSODescriptorType">
+        <complexContent>
+            <extension base="md:SSODescriptorType">
+                <sequence>
+                    <element ref="md:SingleSignOnService" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDMappingService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="WantAuthnRequestsSigned" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="SingleSignOnService" type="md:EndpointType"/>
+    <element name="NameIDMappingService" type="md:EndpointType"/>
+    <element name="AssertionIDRequestService" type="md:EndpointType"/>
+    <element name="AttributeProfile" type="anyURI"/>
+    
+    <element name="SPSSODescriptor" type="md:SPSSODescriptorType"/>
+    <complexType name="SPSSODescriptorType">
+        <complexContent>
+            <extension base="md:SSODescriptorType">
+                <sequence>
+                    <element ref="md:AssertionConsumerService" maxOccurs="unbounded"/>
+                    <element ref="md:AttributeConsumingService" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="AuthnRequestsSigned" type="boolean" use="optional"/>
+                <attribute name="WantAssertionsSigned" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AssertionConsumerService" type="md:IndexedEndpointType"/>
+    <element name="AttributeConsumingService" type="md:AttributeConsumingServiceType"/>
+    <complexType name="AttributeConsumingServiceType">
+        <sequence>
+            <element ref="md:ServiceName" maxOccurs="unbounded"/>
+            <element ref="md:ServiceDescription" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="md:RequestedAttribute" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="index" type="unsignedShort" use="required"/>
+        <attribute name="isDefault" type="boolean" use="optional"/>
+    </complexType>
+    <element name="ServiceName" type="md:localizedNameType"/>
+    <element name="ServiceDescription" type="md:localizedNameType"/>
+    <element name="RequestedAttribute" type="md:RequestedAttributeType"/>
+    <complexType name="RequestedAttributeType">
+        <complexContent>
+            <extension base="saml:AttributeType">
+                <attribute name="isRequired" type="boolean" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+  
+    <element name="AuthnAuthorityDescriptor" type="md:AuthnAuthorityDescriptorType"/>
+    <complexType name="AuthnAuthorityDescriptorType">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:AuthnQueryService" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthnQueryService" type="md:EndpointType"/>
+
+    <element name="PDPDescriptor" type="md:PDPDescriptorType"/>
+    <complexType name="PDPDescriptorType">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:AuthzService" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthzService" type="md:EndpointType"/>
+
+    <element name="AttributeAuthorityDescriptor" type="md:AttributeAuthorityDescriptorType"/>
+    <complexType name="AttributeAuthorityDescriptorType">
+        <complexContent>
+            <extension base="md:RoleDescriptorType">
+                <sequence>
+                    <element ref="md:AttributeService" maxOccurs="unbounded"/>
+                    <element ref="md:AssertionIDRequestService" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:NameIDFormat" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="md:AttributeProfile" minOccurs="0" maxOccurs="unbounded"/>
+                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AttributeService" type="md:EndpointType"/>
+   
+    <element name="AffiliationDescriptor" type="md:AffiliationDescriptorType"/>
+    <complexType name="AffiliationDescriptorType">
+        <sequence>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="md:Extensions" minOccurs="0"/>
+            <element ref="md:AffiliateMember" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="affiliationOwnerID" type="md:entityIDType" use="required"/>
+        <attribute name="validUntil" type="dateTime" use="optional"/>
+        <attribute name="cacheDuration" type="duration" use="optional"/>
+        <attribute name="ID" type="ID" use="optional"/>
+        <anyAttribute namespace="##other" processContents="lax"/>
+    </complexType>
+    <element name="AffiliateMember" type="md:entityIDType"/>
+</schema>`;
diff --git a/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts b/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
new file mode 100644
index 00000000000000..18e27b006b18bc
--- /dev/null
+++ b/packages/cli/src/sso/saml/schema/saml-schema-protocol-2.0.xsd.ts
@@ -0,0 +1,302 @@
+export const xsdSamlSchemaProtocol20 = `<?xml version="1.0" encoding="UTF-8"?>
+<schema
+    targetNamespace="urn:oasis:names:tc:SAML:2.0:protocol"
+    xmlns="http://www.w3.org/2001/XMLSchema"
+    xmlns:samlp="urn:oasis:names:tc:SAML:2.0:protocol"
+    xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
+    xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+    elementFormDefault="unqualified"
+    attributeFormDefault="unqualified"
+    blockDefault="substitution"
+    version="2.0">
+    <import namespace="urn:oasis:names:tc:SAML:2.0:assertion"
+        schemaLocation="saml-schema-assertion-2.0.xsd"/>
+    <import namespace="http://www.w3.org/2000/09/xmldsig#"
+        schemaLocation="xmldsig-core-schema.xsd"/>
+    <annotation>
+        <documentation>
+            Document identifier: saml-schema-protocol-2.0
+            Location: http://docs.oasis-open.org/security/saml/v2.0/
+            Revision history:
+            V1.0 (November, 2002):
+              Initial Standard Schema.
+            V1.1 (September, 2003):
+              Updates within the same V1.0 namespace.
+            V2.0 (March, 2005):
+              New protocol schema based in a SAML V2.0 namespace.
+     </documentation>
+    </annotation>
+    <complexType name="RequestAbstractType" abstract="true">
+        <sequence>
+            <element ref="saml:Issuer" minOccurs="0"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="samlp:Extensions" minOccurs="0"/>
+        </sequence>
+        <attribute name="ID" type="ID" use="required"/>
+        <attribute name="Version" type="string" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+        <attribute name="Destination" type="anyURI" use="optional"/>
+    	<attribute name="Consent" type="anyURI" use="optional"/>
+    </complexType>
+    <element name="Extensions" type="samlp:ExtensionsType"/>
+    <complexType name="ExtensionsType">
+        <sequence>
+            <any namespace="##other" processContents="lax" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <complexType name="StatusResponseType">
+    	<sequence>
+            <element ref="saml:Issuer" minOccurs="0"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+            <element ref="samlp:Extensions" minOccurs="0"/>
+            <element ref="samlp:Status"/>
+    	</sequence>
+    	<attribute name="ID" type="ID" use="required"/>
+    	<attribute name="InResponseTo" type="NCName" use="optional"/>
+    	<attribute name="Version" type="string" use="required"/>
+    	<attribute name="IssueInstant" type="dateTime" use="required"/>
+    	<attribute name="Destination" type="anyURI" use="optional"/>
+    	<attribute name="Consent" type="anyURI" use="optional"/>
+    </complexType>
+    <element name="Status" type="samlp:StatusType"/>
+    <complexType name="StatusType">
+        <sequence>
+            <element ref="samlp:StatusCode"/>
+            <element ref="samlp:StatusMessage" minOccurs="0"/>
+            <element ref="samlp:StatusDetail" minOccurs="0"/>
+        </sequence>
+    </complexType>
+    <element name="StatusCode" type="samlp:StatusCodeType"/>
+    <complexType name="StatusCodeType">
+        <sequence>
+            <element ref="samlp:StatusCode" minOccurs="0"/>
+        </sequence>
+        <attribute name="Value" type="anyURI" use="required"/>
+    </complexType>
+    <element name="StatusMessage" type="string"/>
+    <element name="StatusDetail" type="samlp:StatusDetailType"/>
+    <complexType name="StatusDetailType">
+        <sequence>
+            <any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+    </complexType>
+    <element name="AssertionIDRequest" type="samlp:AssertionIDRequestType"/>
+    <complexType name="AssertionIDRequestType">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="saml:AssertionIDRef" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
+    <complexType name="SubjectQueryAbstractType" abstract="true">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="saml:Subject"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="AuthnQuery" type="samlp:AuthnQueryType"/>
+    <complexType name="AuthnQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
+                </sequence>
+                <attribute name="SessionIndex" type="string" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="RequestedAuthnContext" type="samlp:RequestedAuthnContextType"/>
+    <complexType name="RequestedAuthnContextType">
+        <choice>
+            <element ref="saml:AuthnContextClassRef" maxOccurs="unbounded"/>
+            <element ref="saml:AuthnContextDeclRef" maxOccurs="unbounded"/>
+        </choice>
+        <attribute name="Comparison" type="samlp:AuthnContextComparisonType" use="optional"/>
+    </complexType>
+    <simpleType name="AuthnContextComparisonType">
+        <restriction base="string">
+            <enumeration value="exact"/>
+            <enumeration value="minimum"/>
+            <enumeration value="maximum"/>
+            <enumeration value="better"/>
+        </restriction>
+    </simpleType>
+    <element name="AttributeQuery" type="samlp:AttributeQueryType"/>
+    <complexType name="AttributeQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+                    <element ref="saml:Attribute" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthzDecisionQuery" type="samlp:AuthzDecisionQueryType"/>
+    <complexType name="AuthzDecisionQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+                    <element ref="saml:Action" maxOccurs="unbounded"/>
+                    <element ref="saml:Evidence" minOccurs="0"/>
+                </sequence>
+                <attribute name="Resource" type="anyURI" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="AuthnRequest" type="samlp:AuthnRequestType"/>
+    <complexType name="AuthnRequestType">
+        <complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="saml:Subject" minOccurs="0"/>
+                    <element ref="samlp:NameIDPolicy" minOccurs="0"/>
+                    <element ref="saml:Conditions" minOccurs="0"/>
+                    <element ref="samlp:RequestedAuthnContext" minOccurs="0"/>
+                    <element ref="samlp:Scoping" minOccurs="0"/>
+                </sequence>
+                <attribute name="ForceAuthn" type="boolean" use="optional"/>
+                <attribute name="IsPassive" type="boolean" use="optional"/>
+                <attribute name="ProtocolBinding" type="anyURI" use="optional"/>
+                <attribute name="AssertionConsumerServiceIndex" type="unsignedShort" use="optional"/>
+                <attribute name="AssertionConsumerServiceURL" type="anyURI" use="optional"/>
+                <attribute name="AttributeConsumingServiceIndex" type="unsignedShort" use="optional"/>
+                <attribute name="ProviderName" type="string" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="NameIDPolicy" type="samlp:NameIDPolicyType"/>
+    <complexType name="NameIDPolicyType">
+        <attribute name="Format" type="anyURI" use="optional"/>
+        <attribute name="SPNameQualifier" type="string" use="optional"/>
+        <attribute name="AllowCreate" type="boolean" use="optional"/>
+    </complexType>
+    <element name="Scoping" type="samlp:ScopingType"/>
+    <complexType name="ScopingType">
+        <sequence>
+            <element ref="samlp:IDPList" minOccurs="0"/>
+            <element ref="samlp:RequesterID" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>
+        <attribute name="ProxyCount" type="nonNegativeInteger" use="optional"/>
+    </complexType>
+    <element name="RequesterID" type="anyURI"/>
+    <element name="IDPList" type="samlp:IDPListType"/>
+    <complexType name="IDPListType">
+        <sequence>
+            <element ref="samlp:IDPEntry" maxOccurs="unbounded"/>
+            <element ref="samlp:GetComplete" minOccurs="0"/>
+        </sequence>
+    </complexType>
+    <element name="IDPEntry" type="samlp:IDPEntryType"/>
+    <complexType name="IDPEntryType">
+        <attribute name="ProviderID" type="anyURI" use="required"/>
+        <attribute name="Name" type="string" use="optional"/>
+        <attribute name="Loc" type="anyURI" use="optional"/>
+    </complexType>
+    <element name="GetComplete" type="anyURI"/>
+    <element name="Response" type="samlp:ResponseType"/>
+    <complexType name="ResponseType">
+    	<complexContent>
+            <extension base="samlp:StatusResponseType">
+                <choice minOccurs="0" maxOccurs="unbounded">
+                    <element ref="saml:Assertion"/>
+                    <element ref="saml:EncryptedAssertion"/>
+                </choice>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="ArtifactResolve" type="samlp:ArtifactResolveType"/>
+    <complexType name="ArtifactResolveType">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <element ref="samlp:Artifact"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="Artifact" type="string"/>
+    <element name="ArtifactResponse" type="samlp:ArtifactResponseType"/>
+    <complexType name="ArtifactResponseType">
+    	<complexContent>
+            <extension base="samlp:StatusResponseType">
+                <sequence>
+                    <any namespace="##any" processContents="lax" minOccurs="0"/>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="ManageNameIDRequest" type="samlp:ManageNameIDRequestType"/>
+    <complexType name="ManageNameIDRequestType">
+    	<complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <choice>
+                        <element ref="saml:NameID"/>
+                        <element ref="saml:EncryptedID"/>
+                    </choice>
+                    <choice>
+                        <element ref="samlp:NewID"/>
+                        <element ref="samlp:NewEncryptedID"/>
+                        <element ref="samlp:Terminate"/>
+                    </choice>
+                </sequence>
+            </extension>
+    	</complexContent>
+    </complexType>
+    <element name="NewID" type="string"/>
+    <element name="NewEncryptedID" type="saml:EncryptedElementType"/>
+    <element name="Terminate" type="samlp:TerminateType"/>
+    <complexType name="TerminateType"/>
+    <element name="ManageNameIDResponse" type="samlp:StatusResponseType"/>
+    <element name="LogoutRequest" type="samlp:LogoutRequestType"/>
+    <complexType name="LogoutRequestType">
+        <complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <choice>
+                        <element ref="saml:BaseID"/>
+                        <element ref="saml:NameID"/>
+                        <element ref="saml:EncryptedID"/>
+                    </choice>
+                    <element ref="samlp:SessionIndex" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="Reason" type="string" use="optional"/>
+                <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="SessionIndex" type="string"/>
+    <element name="LogoutResponse" type="samlp:StatusResponseType"/>
+    <element name="NameIDMappingRequest" type="samlp:NameIDMappingRequestType"/>
+    <complexType name="NameIDMappingRequestType">
+        <complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <sequence>
+                    <choice>
+                        <element ref="saml:BaseID"/>
+                        <element ref="saml:NameID"/>
+                        <element ref="saml:EncryptedID"/>
+                    </choice>
+                    <element ref="samlp:NameIDPolicy"/>
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+    <element name="NameIDMappingResponse" type="samlp:NameIDMappingResponseType"/>
+    <complexType name="NameIDMappingResponseType">
+        <complexContent>
+            <extension base="samlp:StatusResponseType">
+                <choice>
+                    <element ref="saml:NameID"/>
+                    <element ref="saml:EncryptedID"/>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+</schema>`;
diff --git a/packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts b/packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts
new file mode 100644
index 00000000000000..de9d3ca34e58b2
--- /dev/null
+++ b/packages/cli/src/sso/saml/schema/xenc-schema.xsd.ts
@@ -0,0 +1,145 @@
+export const xsdXenc = `<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema  PUBLIC "-//W3C//DTD XMLSchema 200102//EN"
+ "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema
+     xmlns:xenc CDATA #FIXED 'http://www.w3.org/2001/04/xmlenc#'
+     xmlns:ds CDATA #FIXED 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY xenc 'http://www.w3.org/2001/04/xmlenc#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<schema xmlns='http://www.w3.org/2001/XMLSchema' version='1.0'
+        xmlns:xenc='http://www.w3.org/2001/04/xmlenc#'
+        xmlns:ds='http://www.w3.org/2000/09/xmldsig#'
+        targetNamespace='http://www.w3.org/2001/04/xmlenc#'
+        elementFormDefault='qualified'>
+
+  <import namespace='http://www.w3.org/2000/09/xmldsig#'
+          schemaLocation='xmldsig-core-schema.xsd'/>
+
+  <complexType name='EncryptedType' abstract='true'>
+    <sequence>
+      <element name='EncryptionMethod' type='xenc:EncryptionMethodType'
+       minOccurs='0'/>
+      <element ref='ds:KeyInfo' minOccurs='0'/>
+      <element ref='xenc:CipherData'/>
+      <element ref='xenc:EncryptionProperties' minOccurs='0'/>
+    </sequence>
+    <attribute name='Id' type='ID' use='optional'/>
+    <attribute name='Type' type='anyURI' use='optional'/>
+    <attribute name='MimeType' type='string' use='optional'/>
+    <attribute name='Encoding' type='anyURI' use='optional'/>
+  </complexType>
+  
+  <complexType name='EncryptionMethodType' mixed='true'>
+    <sequence>
+      <element name='KeySize' minOccurs='0' type='xenc:KeySizeType'/>
+      <element name='OAEPparams' minOccurs='0' type='base64Binary'/>
+      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
+    </sequence>
+    <attribute name='Algorithm' type='anyURI' use='required'/>
+  </complexType>
+
+    <simpleType name='KeySizeType'>
+      <restriction base="integer"/>
+    </simpleType>
+
+  <element name='CipherData' type='xenc:CipherDataType'/>
+  <complexType name='CipherDataType'>
+     <choice>
+       <element name='CipherValue' type='base64Binary'/>
+       <element ref='xenc:CipherReference'/>
+     </choice>
+    </complexType>
+
+   <element name='CipherReference' type='xenc:CipherReferenceType'/>
+   <complexType name='CipherReferenceType'>
+       <choice>
+         <element name='Transforms' type='xenc:TransformsType' minOccurs='0'/>
+       </choice>
+       <attribute name='URI' type='anyURI' use='required'/>
+   </complexType>
+
+     <complexType name='TransformsType'>
+       <sequence>
+         <element ref='ds:Transform' maxOccurs='unbounded'/>
+       </sequence>
+     </complexType>
+
+
+  <element name='EncryptedData' type='xenc:EncryptedDataType'/>
+  <complexType name='EncryptedDataType'>
+    <complexContent>
+      <extension base='xenc:EncryptedType'>
+       </extension>
+    </complexContent>
+  </complexType>
+
+  <!-- Children of ds:KeyInfo -->
+
+  <element name='EncryptedKey' type='xenc:EncryptedKeyType'/>
+  <complexType name='EncryptedKeyType'>
+    <complexContent>
+      <extension base='xenc:EncryptedType'>
+        <sequence>
+          <element ref='xenc:ReferenceList' minOccurs='0'/>
+          <element name='CarriedKeyName' type='string' minOccurs='0'/>
+        </sequence>
+        <attribute name='Recipient' type='string'
+         use='optional'/>
+      </extension>
+    </complexContent>
+  </complexType>
+
+    <element name="AgreementMethod" type="xenc:AgreementMethodType"/>
+    <complexType name="AgreementMethodType" mixed="true">
+      <sequence>
+        <element name="KA-Nonce" minOccurs="0" type="base64Binary"/>
+        <!-- <element ref="ds:DigestMethod" minOccurs="0"/> -->
+        <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+        <element name="OriginatorKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
+        <element name="RecipientKeyInfo" minOccurs="0" type="ds:KeyInfoType"/>
+      </sequence>
+      <attribute name="Algorithm" type="anyURI" use="required"/>
+    </complexType>
+
+  <!-- End Children of ds:KeyInfo -->
+
+  <element name='ReferenceList'>
+    <complexType>
+      <choice minOccurs='1' maxOccurs='unbounded'>
+        <element name='DataReference' type='xenc:ReferenceType'/>
+        <element name='KeyReference' type='xenc:ReferenceType'/>
+      </choice>
+    </complexType>
+  </element>
+
+  <complexType name='ReferenceType'>
+    <sequence>
+      <any namespace='##other' minOccurs='0' maxOccurs='unbounded'/>
+    </sequence>
+    <attribute name='URI' type='anyURI' use='required'/>
+  </complexType>
+
+
+  <element name='EncryptionProperties' type='xenc:EncryptionPropertiesType'/>
+  <complexType name='EncryptionPropertiesType'>
+    <sequence>
+      <element ref='xenc:EncryptionProperty' maxOccurs='unbounded'/>
+    </sequence>
+    <attribute name='Id' type='ID' use='optional'/>
+  </complexType>
+
+    <element name='EncryptionProperty' type='xenc:EncryptionPropertyType'/>
+    <complexType name='EncryptionPropertyType' mixed='true'>
+      <choice maxOccurs='unbounded'>
+        <any namespace='##other' processContents='lax'/>
+      </choice>
+      <attribute name='Target' type='anyURI' use='optional'/>
+      <attribute name='Id' type='ID' use='optional'/>
+      <anyAttribute namespace="http://www.w3.org/XML/1998/namespace"/>
+    </complexType>
+
+</schema>`;
diff --git a/packages/cli/src/sso/saml/schema/xml.xsd.ts b/packages/cli/src/sso/saml/schema/xml.xsd.ts
new file mode 100644
index 00000000000000..4487356ea5570b
--- /dev/null
+++ b/packages/cli/src/sso/saml/schema/xml.xsd.ts
@@ -0,0 +1,117 @@
+export const xsdXml = `<?xml version='1.0'?>
+<!DOCTYPE xs:schema PUBLIC "-//W3C//DTD XMLSCHEMA 200102//EN" "XMLSchema.dtd" >
+<xs:schema targetNamespace="http://www.w3.org/XML/1998/namespace" xmlns:xs="http://www.w3.org/2001/XMLSchema" xml:lang="en">
+
+ <xs:annotation>
+  <xs:documentation>
+   See http://www.w3.org/XML/1998/namespace.html and
+   http://www.w3.org/TR/REC-xml for information about this namespace.
+
+    This schema document describes the XML namespace, in a form
+    suitable for import by other schema documents.  
+
+    Note that local names in this namespace are intended to be defined
+    only by the World Wide Web Consortium or its subgroups.  The
+    following names are currently defined in this namespace and should
+    not be used with conflicting semantics by any Working Group,
+    specification, or document instance:
+
+    base (as an attribute name): denotes an attribute whose value
+         provides a URI to be used as the base for interpreting any
+         relative URIs in the scope of the element on which it
+         appears; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML Base specification.
+
+    lang (as an attribute name): denotes an attribute whose value
+         is a language code for the natural language of the content of
+         any element; its value is inherited.  This name is reserved
+         by virtue of its definition in the XML specification.
+  
+    space (as an attribute name): denotes an attribute whose
+         value is a keyword indicating what whitespace processing
+         discipline is intended for the content of the element; its
+         value is inherited.  This name is reserved by virtue of its
+         definition in the XML specification.
+
+    Father (in any context at all): denotes Jon Bosak, the chair of 
+         the original XML Working Group.  This name is reserved by 
+         the following decision of the W3C XML Plenary and 
+         XML Coordination groups:
+
+             In appreciation for his vision, leadership and dedication
+             the W3C XML Plenary on this 10th day of February, 2000
+             reserves for Jon Bosak in perpetuity the XML name
+             xml:Father
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>This schema defines attributes and an attribute group
+        suitable for use by
+        schemas wishing to allow xml:base, xml:lang or xml:space attributes
+        on elements they define.
+
+        To enable this, such a schema must import this schema
+        for the XML namespace, e.g. as follows:
+        &lt;schema . . .>
+         . . .
+         &lt;import namespace="http://www.w3.org/XML/1998/namespace"
+                    schemaLocation="xml.xsd"/>
+
+        Subsequently, qualified reference to any of the attributes
+        or the group defined below will have the desired effect, e.g.
+
+        &lt;type . . .>
+         . . .
+         &lt;attributeGroup ref="xml:specialAttrs"/>
+ 
+         will define a type which will schema-validate an instance
+         element with any of those attributes</xs:documentation>
+ </xs:annotation>
+
+ <xs:annotation>
+  <xs:documentation>In keeping with the XML Schema WG's standard versioning
+   policy, this schema document will persist at
+   http://www.w3.org/2001/03/xml.xsd.
+   At the date of issue it can also be found at
+   http://www.w3.org/2001/xml.xsd.
+   The schema document at that URI may however change in the future,
+   in order to remain compatible with the latest version of XML Schema
+   itself.  In other words, if the XML Schema namespace changes, the version
+   of this document at
+   http://www.w3.org/2001/xml.xsd will change
+   accordingly; the version at
+   http://www.w3.org/2001/03/xml.xsd will not change.
+  </xs:documentation>
+ </xs:annotation>
+
+ <xs:attribute name="lang" type="xs:language">
+  <xs:annotation>
+   <xs:documentation>In due course, we should install the relevant ISO 2- and 3-letter
+         codes as the enumerated possible values . . .</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attribute name="space" default="preserve">
+  <xs:simpleType>
+   <xs:restriction base="xs:NCName">
+    <xs:enumeration value="default"/>
+    <xs:enumeration value="preserve"/>
+   </xs:restriction>
+  </xs:simpleType>
+ </xs:attribute>
+
+ <xs:attribute name="base" type="xs:anyURI">
+  <xs:annotation>
+   <xs:documentation>See http://www.w3.org/TR/xmlbase/ for
+                     information about this attribute.</xs:documentation>
+  </xs:annotation>
+ </xs:attribute>
+
+ <xs:attributeGroup name="specialAttrs">
+  <xs:attribute ref="xml:base"/>
+  <xs:attribute ref="xml:lang"/>
+  <xs:attribute ref="xml:space"/>
+ </xs:attributeGroup>
+
+</xs:schema>`;
diff --git a/packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts b/packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts
new file mode 100644
index 00000000000000..9cd615b616ffb4
--- /dev/null
+++ b/packages/cli/src/sso/saml/schema/xmldsig-core-schema.xsd.ts
@@ -0,0 +1,318 @@
+export const xsdXmldsigCore = `<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE schema
+  PUBLIC "-//W3C//DTD XMLSchema 200102//EN" "http://www.w3.org/2001/XMLSchema.dtd"
+ [
+   <!ATTLIST schema 
+     xmlns:ds CDATA #FIXED "http://www.w3.org/2000/09/xmldsig#">
+   <!ENTITY dsig 'http://www.w3.org/2000/09/xmldsig#'>
+   <!ENTITY % p ''>
+   <!ENTITY % s ''>
+  ]>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        targetNamespace="http://www.w3.org/2000/09/xmldsig#"
+        version="0.1" elementFormDefault="qualified"> 
+
+<!-- Basic Types Defined for Signatures -->
+
+<simpleType name="CryptoBinary">
+  <restriction base="base64Binary">
+  </restriction>
+</simpleType>
+
+<!-- Start Signature -->
+
+<element name="Signature" type="ds:SignatureType"/>
+<complexType name="SignatureType">
+  <sequence> 
+    <element ref="ds:SignedInfo"/> 
+    <element ref="ds:SignatureValue"/> 
+    <element ref="ds:KeyInfo" minOccurs="0"/> 
+    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/>
+</complexType>
+
+  <element name="SignatureValue" type="ds:SignatureValueType"/> 
+  <complexType name="SignatureValueType">
+    <simpleContent>
+      <extension base="base64Binary">
+        <attribute name="Id" type="ID" use="optional"/>
+      </extension>
+    </simpleContent>
+  </complexType>
+
+<!-- Start SignedInfo -->
+
+<element name="SignedInfo" type="ds:SignedInfoType"/>
+<complexType name="SignedInfoType">
+  <sequence> 
+    <element ref="ds:CanonicalizationMethod"/> 
+    <element ref="ds:SignatureMethod"/> 
+    <element ref="ds:Reference" maxOccurs="unbounded"/> 
+  </sequence>  
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
+  <complexType name="CanonicalizationMethodType" mixed="true">
+    <sequence>
+      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+  <complexType name="SignatureMethodType" mixed="true">
+    <sequence>
+      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+      <!-- (0,unbounded) elements from (1,1) external namespace -->
+    </sequence>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- Start Reference -->
+
+<element name="Reference" type="ds:ReferenceType"/>
+<complexType name="ReferenceType">
+  <sequence> 
+    <element ref="ds:Transforms" minOccurs="0"/> 
+    <element ref="ds:DigestMethod"/> 
+    <element ref="ds:DigestValue"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+  <attribute name="URI" type="anyURI" use="optional"/> 
+  <attribute name="Type" type="anyURI" use="optional"/> 
+</complexType>
+
+  <element name="Transforms" type="ds:TransformsType"/>
+  <complexType name="TransformsType">
+    <sequence>
+      <element ref="ds:Transform" maxOccurs="unbounded"/>  
+    </sequence>
+  </complexType>
+
+  <element name="Transform" type="ds:TransformType"/>
+  <complexType name="TransformType" mixed="true">
+    <choice minOccurs="0" maxOccurs="unbounded"> 
+      <any namespace="##other" processContents="lax"/>
+      <!-- (1,1) elements from (0,unbounded) namespaces -->
+      <element name="XPath" type="string"/> 
+    </choice>
+    <attribute name="Algorithm" type="anyURI" use="required"/> 
+  </complexType>
+
+<!-- End Reference -->
+
+<element name="DigestMethod" type="ds:DigestMethodType"/>
+<complexType name="DigestMethodType" mixed="true"> 
+  <sequence>
+    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+  </sequence>    
+  <attribute name="Algorithm" type="anyURI" use="required"/> 
+</complexType>
+
+<element name="DigestValue" type="ds:DigestValueType"/>
+<simpleType name="DigestValueType">
+  <restriction base="base64Binary"/>
+</simpleType>
+
+<!-- End SignedInfo -->
+
+<!-- Start KeyInfo -->
+
+<element name="KeyInfo" type="ds:KeyInfoType"/> 
+<complexType name="KeyInfoType" mixed="true">
+  <choice maxOccurs="unbounded">     
+    <element ref="ds:KeyName"/> 
+    <element ref="ds:KeyValue"/> 
+    <element ref="ds:RetrievalMethod"/> 
+    <element ref="ds:X509Data"/> 
+    <element ref="ds:PGPData"/> 
+    <element ref="ds:SPKIData"/>
+    <element ref="ds:MgmtData"/>
+    <any processContents="lax" namespace="##other"/>
+    <!-- (1,1) elements from (0,unbounded) namespaces -->
+  </choice>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+  <element name="KeyName" type="string"/>
+  <element name="MgmtData" type="string"/>
+
+  <element name="KeyValue" type="ds:KeyValueType"/> 
+  <complexType name="KeyValueType" mixed="true">
+   <choice>
+     <element ref="ds:DSAKeyValue"/>
+     <element ref="ds:RSAKeyValue"/>
+     <any namespace="##other" processContents="lax"/>
+   </choice>
+  </complexType>
+
+  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
+  <complexType name="RetrievalMethodType">
+    <sequence>
+      <element ref="ds:Transforms" minOccurs="0"/> 
+    </sequence>  
+    <attribute name="URI" type="anyURI"/>
+    <attribute name="Type" type="anyURI" use="optional"/>
+  </complexType>
+
+<!-- Start X509Data -->
+
+<element name="X509Data" type="ds:X509DataType"/> 
+<complexType name="X509DataType">
+  <sequence maxOccurs="unbounded">
+    <choice>
+      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+      <element name="X509SKI" type="base64Binary"/>
+      <element name="X509SubjectName" type="string"/>
+      <element name="X509Certificate" type="base64Binary"/>
+      <element name="X509CRL" type="base64Binary"/>
+      <any namespace="##other" processContents="lax"/>
+    </choice>
+  </sequence>
+</complexType>
+
+<complexType name="X509IssuerSerialType"> 
+  <sequence> 
+    <element name="X509IssuerName" type="string"/> 
+    <element name="X509SerialNumber" type="integer"/> 
+  </sequence>
+</complexType>
+
+<!-- End X509Data -->
+
+<!-- Begin PGPData -->
+
+<element name="PGPData" type="ds:PGPDataType"/> 
+<complexType name="PGPDataType"> 
+  <choice>
+    <sequence>
+      <element name="PGPKeyID" type="base64Binary"/> 
+      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+    <sequence>
+      <element name="PGPKeyPacket" type="base64Binary"/> 
+      <any namespace="##other" processContents="lax" minOccurs="0"
+       maxOccurs="unbounded"/>
+    </sequence>
+  </choice>
+</complexType>
+
+<!-- End PGPData -->
+
+<!-- Begin SPKIData -->
+
+<element name="SPKIData" type="ds:SPKIDataType"/> 
+<complexType name="SPKIDataType">
+  <sequence maxOccurs="unbounded">
+    <element name="SPKISexp" type="base64Binary"/>
+    <any namespace="##other" processContents="lax" minOccurs="0"/>
+  </sequence>
+</complexType> 
+
+<!-- End SPKIData -->
+
+<!-- End KeyInfo -->
+
+<!-- Start Object (Manifest, SignatureProperty) -->
+
+<element name="Object" type="ds:ObjectType"/> 
+<complexType name="ObjectType" mixed="true">
+  <sequence minOccurs="0" maxOccurs="unbounded">
+    <any namespace="##any" processContents="lax"/>
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+  <attribute name="Encoding" type="anyURI" use="optional"/> 
+</complexType>
+
+<element name="Manifest" type="ds:ManifestType"/> 
+<complexType name="ManifestType">
+  <sequence>
+    <element ref="ds:Reference" maxOccurs="unbounded"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
+<complexType name="SignaturePropertiesType">
+  <sequence>
+    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
+  </sequence>
+  <attribute name="Id" type="ID" use="optional"/> 
+</complexType>
+
+   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
+   <complexType name="SignaturePropertyType" mixed="true">
+     <choice maxOccurs="unbounded">
+       <any namespace="##other" processContents="lax"/>
+       <!-- (1,1) elements from (1,unbounded) namespaces -->
+     </choice>
+     <attribute name="Target" type="anyURI" use="required"/> 
+     <attribute name="Id" type="ID" use="optional"/> 
+   </complexType>
+
+<!-- End Object (Manifest, SignatureProperty) -->
+
+<!-- Start Algorithm Parameters -->
+
+<simpleType name="HMACOutputLengthType">
+  <restriction base="integer"/>
+</simpleType>
+
+<!-- Start KeyValue Element-types -->
+
+<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+<complexType name="DSAKeyValueType">
+  <sequence>
+    <sequence minOccurs="0">
+      <element name="P" type="ds:CryptoBinary"/>
+      <element name="Q" type="ds:CryptoBinary"/>
+    </sequence>
+    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+    <element name="Y" type="ds:CryptoBinary"/>
+    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+    <sequence minOccurs="0">
+      <element name="Seed" type="ds:CryptoBinary"/>
+      <element name="PgenCounter" type="ds:CryptoBinary"/>
+    </sequence>
+  </sequence>
+</complexType>
+
+<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+<complexType name="RSAKeyValueType">
+  <sequence>
+    <element name="Modulus" type="ds:CryptoBinary"/> 
+    <element name="Exponent" type="ds:CryptoBinary"/> 
+  </sequence>
+</complexType> 
+
+<!-- End KeyValue Element-types -->
+
+<!-- End Signature -->
+
+</schema>`;
diff --git a/packages/cli/src/sso/saml/serviceProvider.ee.ts b/packages/cli/src/sso/saml/serviceProvider.ee.ts
index b99bc71a185ad8..020ab83ed938b0 100644
--- a/packages/cli/src/sso/saml/serviceProvider.ee.ts
+++ b/packages/cli/src/sso/saml/serviceProvider.ee.ts
@@ -1,18 +1,10 @@
 import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
 import type { ServiceProviderInstance } from 'samlify';
-import { ServiceProvider, setSchemaValidator } from 'samlify';
+import { ServiceProvider } from 'samlify';
 import { SamlUrls } from './constants';
 
 let serviceProviderInstance: ServiceProviderInstance | undefined;
 
-setSchemaValidator({
-	// eslint-disable-next-line @typescript-eslint/no-unused-vars
-	validate: async (response: string) => {
-		// TODO:SAML: implment validation
-		return Promise.resolve('skipped');
-	},
-});
-
 const metadata = `
 <EntityDescriptor
  xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
diff --git a/packages/cli/src/sso/saml/types/samlPreferences.ts b/packages/cli/src/sso/saml/types/samlPreferences.ts
index e43b588b819fbf..8adc4311c8c592 100644
--- a/packages/cli/src/sso/saml/types/samlPreferences.ts
+++ b/packages/cli/src/sso/saml/types/samlPreferences.ts
@@ -15,6 +15,10 @@ export class SamlPreferences {
 	@IsOptional()
 	metadataUrl?: string;
 
+	@IsBoolean()
+	@IsOptional()
+	ignoreSSL?: boolean = false;
+
 	@IsString()
 	@IsOptional()
 	loginBinding?: SamlLoginBinding = 'redirect';
diff --git a/packages/cli/src/sso/ssoHelpers.ts b/packages/cli/src/sso/ssoHelpers.ts
index 9c8b03e450de91..f296feddcb2a27 100644
--- a/packages/cli/src/sso/ssoHelpers.ts
+++ b/packages/cli/src/sso/ssoHelpers.ts
@@ -1,4 +1,5 @@
 import config from '@/config';
+import type { AuthProviderType } from '@/databases/entities/AuthIdentity';
 
 export function isSamlCurrentAuthenticationMethod(): boolean {
 	return config.getEnv('userManagement.authenticationMethod') === 'saml';
@@ -12,8 +13,6 @@ export function doRedirectUsersFromLoginToSsoFlow(): boolean {
 	return config.getEnv('sso.redirectLoginToSso');
 }
 
-export function setCurrentAuthenticationMethod(
-	authenticationMethod: 'email' | 'ldap' | 'saml',
-): void {
+export function setCurrentAuthenticationMethod(authenticationMethod: AuthProviderType): void {
 	config.set('userManagement.authenticationMethod', authenticationMethod);
 }
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 436428fd147d00..5326caf458dca4 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -18,7 +18,7 @@
 		"noUnusedLocals": false,
 		"useUnknownInCatchVariables": false
 	},
-	"include": ["src/**/*.ts", "test/**/*.ts"],
+	"include": ["src/**/*.ts", "test/**/*.ts", "src/sso/saml/saml-schema-metadata-2.0.xsd"],
 	"references": [
 		{ "path": "../workflow/tsconfig.build.json" },
 		{ "path": "../core/tsconfig.build.json" }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 770e2251b49e83..4616cb0da9f830 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -250,6 +250,7 @@ importers:
       validator: 13.7.0
       winston: ^3.3.3
       ws: ^8.12.0
+      xmllint-wasm: ^3.0.1
       yamljs: ^0.3.0
     dependencies:
       '@n8n_io/license-sdk': 1.8.0
@@ -343,6 +344,7 @@ importers:
       validator: 13.7.0
       winston: 3.8.2
       ws: 8.12.0
+      xmllint-wasm: 3.0.1
       yamljs: 0.3.0
     devDependencies:
       '@apidevtools/swagger-cli': 4.0.0
@@ -21643,6 +21645,11 @@ packages:
     resolution: {integrity: sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==}
     dev: true
 
+  /xmllint-wasm/3.0.1:
+    resolution: {integrity: sha512-t+aKQXJQNAt9/qLgCjhHUmCnPXAyqBKiyh8oV0ZwBMar/uB+5F40tqOJZ97JwLADcqQr5WB2bjCxLKrm+DHz1g==}
+    engines: {node: '>=10.5.0'}
+    dev: false
+
   /xpath/0.0.32:
     resolution: {integrity: sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw==}
     engines: {node: '>=0.6.0'}

From d6357eed8c7effe69efc2f26e48a1e31c2706af7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 6 Mar 2023 09:53:50 +0100
Subject: [PATCH 327/358] ci: Disable provenance attestation on docker images
 to work around docker/buildx#1533 (#5617)

Fixes https://github.com/n8n-io/n8n/issues/5394
---
 .github/workflows/docker-base-image.yml     | 3 ++-
 .github/workflows/docker-images-nightly.yml | 3 ++-
 .github/workflows/docker-images.yml         | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/docker-base-image.yml b/.github/workflows/docker-base-image.yml
index dca942faa56e82..af61407fd9186e 100644
--- a/.github/workflows/docker-base-image.yml
+++ b/.github/workflows/docker-base-image.yml
@@ -28,12 +28,13 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: ./docker/images/n8n-base
           build-args: |
             NODE_VERSION=${{github.event.inputs.node_version}}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
+          provenance: false
           push: true
           tags: |
             ${{ secrets.DOCKER_USERNAME }}/base:${{ github.event.inputs.node_version }}
diff --git a/.github/workflows/docker-images-nightly.yml b/.github/workflows/docker-images-nightly.yml
index becc7cf17c65f2..8d6db7dbe51b95 100644
--- a/.github/workflows/docker-images-nightly.yml
+++ b/.github/workflows/docker-images-nightly.yml
@@ -70,11 +70,12 @@ jobs:
         shell: bash
 
       - name: Build and push
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: .
           file: ./docker/images/n8n-custom/Dockerfile
           platforms: linux/amd64
+          provenance: false
           push: true
           tags: ${{ secrets.DOCKER_USERNAME }}/n8n:${{ github.event.inputs.tag || 'nightly' }}
           no-cache: true
diff --git a/.github/workflows/docker-images.yml b/.github/workflows/docker-images.yml
index ad40b97d98a6c8..fde545ff6d5c5e 100644
--- a/.github/workflows/docker-images.yml
+++ b/.github/workflows/docker-images.yml
@@ -39,12 +39,13 @@ jobs:
           password: ${{ secrets.DOCKER_PASSWORD }}
 
       - name: Build
-        uses: docker/build-push-action@v2
+        uses: docker/build-push-action@v4
         with:
           context: ./docker/images/n8n${{ matrix.docker-context }}
           build-args: |
             N8N_VERSION=${{ steps.vars.outputs.tag }}
           platforms: linux/amd64,linux/arm64,linux/arm/v7
+          provenance: false
           push: true
           tags: |
             ${{ secrets.DOCKER_USERNAME }}/n8n:${{ steps.vars.outputs.tag }}${{ matrix.docker-context }}

From 96142d78de5ffb90f82b2183ac5da9d73eefa649 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Mon, 6 Mar 2023 15:32:36 +0300
Subject: [PATCH 328/358] ci: Add migrations code owners (#5625)

* ci: Add migrations code owners

* ci: add second review

* chore: add comment
---
 .github/CODEOWNERS | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 .github/CODEOWNERS

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
new file mode 100644
index 00000000000000..dd38940b88c50c
--- /dev/null
+++ b/.github/CODEOWNERS
@@ -0,0 +1,2 @@
+# require two approvals for any database migration
+packages/cli/src/databases/migrations/ @n8n-io/migrations-review @n8n-io/migrations-second-review
\ No newline at end of file

From 45ccdd3bb5d5601ccc60438d96aadb40cb87588b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 6 Mar 2023 13:36:47 +0100
Subject: [PATCH 329/358] fix(core): Allow serving icons for custom nodes with
 npm scoped names (#5626)

---
 packages/cli/src/Server.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 4c73c7c3565a6b..d2f2e557a96c45 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -1293,8 +1293,9 @@ class Server extends AbstractServer {
 				},
 			};
 
-			this.app.use('/icons/:packageName/*/*.(svg|png)', async (req, res) => {
-				const { packageName } = req.params;
+			const serveIcons: express.RequestHandler = async (req, res) => {
+				let { scope, packageName } = req.params;
+				if (scope) packageName = `@${scope}/${packageName}`;
 				const loader = this.loadNodesAndCredentials.loaders[packageName];
 				if (loader) {
 					const pathPrefix = `/icons/${packageName}/`;
@@ -1309,7 +1310,10 @@ class Server extends AbstractServer {
 				}
 
 				res.sendStatus(404);
-			});
+			};
+
+			this.app.use('/icons/@:scope/:packageName/*/*.(svg|png)', serveIcons);
+			this.app.use('/icons/:packageName/*/*.(svg|png)', serveIcons);
 
 			this.app.use(
 				'/',

From 01a2160b3b8d36509f4b2871249a3f45358cf692 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Mon, 6 Mar 2023 16:27:49 +0000
Subject: [PATCH 330/358] feat(Mattermost Node): Add self signed certificate
 support (#5630)

---
 .../nodes-base/credentials/MattermostApi.credentials.ts   | 8 ++++++++
 .../nodes-base/nodes/Mattermost/v1/transport/index.ts     | 1 +
 2 files changed, 9 insertions(+)

diff --git a/packages/nodes-base/credentials/MattermostApi.credentials.ts b/packages/nodes-base/credentials/MattermostApi.credentials.ts
index 62cd723607c682..afddc454fc7e18 100644
--- a/packages/nodes-base/credentials/MattermostApi.credentials.ts
+++ b/packages/nodes-base/credentials/MattermostApi.credentials.ts
@@ -26,6 +26,13 @@ export class MattermostApi implements ICredentialType {
 			type: 'string',
 			default: '',
 		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'allowUnauthorizedCerts',
+			type: 'boolean',
+			description: 'Whether to connect even if SSL certificate validation is not possible',
+			default: false,
+		},
 	];
 
 	authenticate: IAuthenticateGeneric = {
@@ -41,6 +48,7 @@ export class MattermostApi implements ICredentialType {
 		request: {
 			baseURL: '={{$credentials.baseUrl}}/api/v4',
 			url: '/users',
+			skipSslCertificateValidation: '={{$credentials?.allowUnauthorizedCerts}}',
 		},
 	};
 }
diff --git a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
index 2a5626edfe93f0..b5f650da5ffc74 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
@@ -27,6 +27,7 @@ export async function apiRequest(
 		headers: {
 			'content-type': 'application/json; charset=utf-8',
 		},
+		skipSslCertificateValidation: credentials.allowUnauthorizedCerts as boolean,
 	};
 
 	return this.helpers.httpRequestWithAuthentication.call(this, 'mattermostApi', options);

From 5eb0d524591ef699ebd2631b042982170b5055a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Mon, 6 Mar 2023 17:33:32 +0100
Subject: [PATCH 331/358] refactor: Unify binary-data assertion across all
 nodes (no-changelog) (#5624)

---
 packages/core/src/NodeExecuteFunctions.ts     | 33 ++++++-
 .../Aws/Rekognition/AwsRekognition.node.ts    | 37 ++------
 .../nodes-base/nodes/Aws/S3/AwsS3.node.ts     | 33 ++-----
 .../nodes-base/nodes/Aws/SQS/AwsSqs.node.ts   | 28 ++----
 .../nodes/Aws/Textract/AwsTextract.node.ts    | 26 +-----
 .../employeeDocument/upload/execute.ts        | 41 ++-------
 .../v1/actions/file/upload/execute.ts         | 37 ++------
 packages/nodes-base/nodes/Box/Box.node.ts     | 23 +----
 .../nodes/Cisco/Webex/CiscoWebex.node.ts      | 17 +---
 .../nodes/Cisco/Webex/GenericFunctions.ts     |  4 +-
 .../nodes/Citrix/ADC/CitrixAdc.node.ts        | 20 +----
 .../nodes/Compression/Compression.node.ts     | 40 ++-------
 .../nodes-base/nodes/Cortex/Cortex.node.ts    | 68 ++-------------
 .../nodes-base/nodes/Dropbox/Dropbox.node.ts  | 26 +-----
 .../nodes/EditImage/EditImage.node.ts         | 36 ++------
 .../nodes/EmailSend/v1/EmailSendV1.node.ts    |  9 +-
 .../nodes/EmailSend/v2/send.operation.ts      |  6 +-
 .../nodes/Facebook/FacebookGraphApi.node.ts   | 24 +-----
 packages/nodes-base/nodes/Ftp/Ftp.node.ts     | 56 +++---------
 .../nodes-base/nodes/Github/Github.node.ts    | 27 ++----
 .../nodes-base/nodes/Gitlab/Gitlab.node.ts    | 27 ++----
 .../Google/CloudStorage/ObjectDescription.ts  | 16 +---
 .../nodes/Google/Drive/GoogleDrive.node.ts    | 39 +++------
 .../nodes/Google/Gmail/GenericFunctions.ts    | 12 +--
 .../nodes/Google/Gmail/v1/GmailV1.node.ts     | 71 +++++++--------
 .../nodes/Google/YouTube/YouTube.node.ts      | 53 ++----------
 packages/nodes-base/nodes/Html/Html.node.ts   | 18 +---
 .../nodes/HtmlExtract/HtmlExtract.node.ts     | 16 +---
 .../HttpRequest/V1/HttpRequestV1.node.ts      | 42 +++------
 .../HttpRequest/V2/HttpRequestV2.node.ts      | 44 +++-------
 .../HttpRequest/V3/HttpRequestV3.node.ts      | 20 +----
 .../nodes/HumanticAI/HumanticAi.node.ts       | 43 +---------
 packages/nodes-base/nodes/Jira/Jira.node.ts   | 16 +---
 packages/nodes-base/nodes/Keap/Keap.node.ts   | 61 +++----------
 packages/nodes-base/nodes/Line/Line.node.ts   | 29 +------
 .../nodes/LinkedIn/LinkedIn.node.ts           | 25 +-----
 .../nodes-base/nodes/Mailgun/Mailgun.node.ts  |  6 +-
 .../nodes/Matrix/GenericFunctions.ts          | 34 +++-----
 .../OneDrive/MicrosoftOneDrive.node.ts        | 21 +----
 .../Microsoft/Outlook/GenericFunctions.ts     | 20 +----
 .../Outlook/MicrosoftOutlook.node.ts          | 18 +---
 .../nodes-base/nodes/Mindee/Mindee.node.ts    | 42 ++-------
 .../nodes/NextCloud/NextCloud.node.ts         | 26 +-----
 .../nodes-base/nodes/NocoDB/NocoDB.node.ts    | 31 +------
 .../nodes/Pipedrive/Pipedrive.node.ts         | 25 ++----
 .../nodes/Pushbullet/Pushbullet.node.ts       | 20 +----
 .../nodes/Pushover/Pushover.node.ts           | 25 +-----
 .../nodes/Raindrop/Raindrop.node.ts           | 17 +---
 .../nodes-base/nodes/ReadPdf/ReadPDF.node.ts  |  7 +-
 .../RespondToWebhook/RespondToWebhook.node.ts | 14 +--
 packages/nodes-base/nodes/S3/S3.node.ts       | 21 +----
 .../nodes/Salesforce/Salesforce.node.ts       | 43 ++++------
 .../nodes/SendGrid/SendGrid.node.ts           | 19 +---
 .../nodes/SendInBlue/GenericFunctions.ts      | 18 +---
 .../nodes/ServiceNow/ServiceNow.node.ts       | 17 +---
 .../nodes-base/nodes/Signl4/Signl4.node.ts    | 46 ++++------
 .../nodes-base/nodes/Slack/V1/SlackV1.node.ts | 25 ++----
 .../nodes-base/nodes/Slack/V2/SlackV2.node.ts | 32 ++-----
 .../SpreadsheetFile/SpreadsheetFile.node.ts   | 19 ++--
 packages/nodes-base/nodes/Ssh/Ssh.node.ts     | 24 +-----
 .../nodes-base/nodes/TheHive/TheHive.node.ts  | 86 ++-----------------
 packages/nodes-base/nodes/Twist/Twist.node.ts | 83 ++----------------
 .../nodes/Twitter/GenericFunctions.ts         | 39 +++------
 .../nodes-base/nodes/Twitter/Twitter.node.ts  |  8 +-
 .../nodes/WhatsApp/MediaFunctions.ts          | 11 +--
 .../WriteBinaryFile/WriteBinaryFile.node.ts   | 33 +++----
 packages/nodes-base/nodes/Zulip/Zulip.node.ts | 25 ++----
 packages/workflow/src/Interfaces.ts           |  2 +
 packages/workflow/src/NodeHelpers.ts          |  4 +-
 69 files changed, 411 insertions(+), 1573 deletions(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index b7179460ec8f0b..96a752adcff725 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -844,6 +844,30 @@ export function getBinaryStream(binaryDataId: string, chunkSize?: number): Reada
 	return BinaryDataManager.getInstance().getBinaryStream(binaryDataId, chunkSize);
 }
 
+export function assertBinaryData(
+	inputData: ITaskDataConnections,
+	node: INode,
+	itemIndex: number,
+	propertyName: string,
+	inputIndex: number,
+): IBinaryData {
+	const binaryKeyData = inputData.main[inputIndex]![itemIndex]!.binary;
+	if (binaryKeyData === undefined) {
+		throw new NodeOperationError(node, 'No binary data exists on item!', {
+			itemIndex,
+		});
+	}
+
+	const binaryPropertyData = binaryKeyData[propertyName];
+	if (binaryPropertyData === undefined) {
+		throw new NodeOperationError(node, `Item has no binary property called "${propertyName}"`, {
+			itemIndex,
+		});
+	}
+
+	return binaryPropertyData;
+}
+
 /**
  * Returns binary data buffer for given item index and property name.
  */
@@ -2327,8 +2351,11 @@ export function getExecuteFunctions(
 				...getRequestHelperFunctions(workflow, node, additionalData),
 				...getFileSystemHelperFunctions(node),
 				...getBinaryHelperFunctions(additionalData),
-				getBinaryDataBuffer: async (itemIndex, propertyName, inputIndex = 0) =>
-					getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
+				assertBinaryData: (itemIndex, propertyName) =>
+					assertBinaryData(inputData, node, itemIndex, propertyName, 0),
+				getBinaryDataBuffer: async (itemIndex, propertyName) =>
+					getBinaryDataBuffer(inputData, itemIndex, propertyName, 0),
+
 				returnJsonArray,
 				normalizeItems,
 				constructExecutionMetaData,
@@ -2465,6 +2492,8 @@ export function getExecuteSingleFunctions(
 				...getRequestHelperFunctions(workflow, node, additionalData),
 				...getBinaryHelperFunctions(additionalData),
 
+				assertBinaryData: (propertyName, inputIndex = 0) =>
+					assertBinaryData(inputData, node, itemIndex, propertyName, inputIndex),
 				getBinaryDataBuffer: async (propertyName, inputIndex = 0) =>
 					getBinaryDataBuffer(inputData, itemIndex, propertyName, inputIndex),
 			},
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
index fa028bfcd38d26..a5a94fd2026fec 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/AwsRekognition.node.ts
@@ -1,13 +1,10 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { awsApiRequestREST, keysTPascalCase } from './GenericFunctions';
 
@@ -104,7 +101,7 @@ export class AwsRekognition implements INodeType {
 						resource: ['image'],
 					},
 				},
-				description: 'Whether the image to analize should be taken from binary field',
+				description: 'Whether the image to analyze should be taken from binary field',
 			},
 			{
 				displayName: 'Binary Property',
@@ -364,9 +361,9 @@ export class AwsRekognition implements INodeType {
 							action = 'RekognitionService.DetectFaces';
 
 							// TODO: Add a later point make it possible to activate via option.
-							//       If activated add an index to each of the found faces/tages/...
+							//       If activated add an index to each of the found faces/tags/...
 							//       to not loose the reference to the image it got found on if
-							//       multilpe ones got supplied.
+							//       multiple ones got supplied.
 							// property = 'FaceDetails';
 
 							if (additionalFields.attributes) {
@@ -412,27 +409,10 @@ export class AwsRekognition implements INodeType {
 								body.Filters.WordFilter = keysTPascalCase(wordFilter);
 							}
 
-							const binaryData = this.getNodeParameter('binaryData', 0);
-
-							if (binaryData) {
-								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-
-								if (items[i].binary === undefined) {
-									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-										itemIndex: i,
-									});
-								}
-
-								if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryPropertyName}"`,
-										{ itemIndex: i },
-									);
-								}
-
-								const binaryPropertyData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
-
+							const isBinaryData = this.getNodeParameter('binaryData', i);
+							if (isBinaryData) {
+								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+								const binaryPropertyData = this.helpers.assertBinaryData(i, binaryPropertyName);
 								Object.assign(body, {
 									Image: {
 										Bytes: binaryPropertyData.data,
@@ -440,7 +420,6 @@ export class AwsRekognition implements INodeType {
 								});
 							} else {
 								const bucket = this.getNodeParameter('bucket', i) as string;
-
 								const name = this.getNodeParameter('name', i) as string;
 
 								Object.assign(body, {
diff --git a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
index f34b1642ae3a07..b39940377e52f1 100644
--- a/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
+++ b/packages/nodes-base/nodes/Aws/S3/AwsS3.node.ts
@@ -4,11 +4,9 @@ import { createHash } from 'crypto';
 
 import { Builder } from 'xml2js';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -221,8 +219,8 @@ export class AwsS3 implements INodeType {
 							qs['encoding-type'] = additionalFields.encodingType as string;
 						}
 
-						if (additionalFields.delmiter) {
-							qs.delimiter = additionalFields.delmiter as string;
+						if (additionalFields.delimiter) {
+							qs.delimiter = additionalFields.delimiter as string;
 						}
 
 						if (additionalFields.fetchOwner) {
@@ -593,7 +591,7 @@ export class AwsS3 implements INodeType {
 						if (fileKey.substring(fileKey.length - 1) === '/') {
 							throw new NodeOperationError(
 								this.getNode(),
-								'Downloding a whole directory is not yet supported, please provide a file key',
+								'Downloading a whole directory is not yet supported, please provide a file key',
 							);
 						}
 
@@ -836,23 +834,8 @@ export class AwsS3 implements INodeType {
 						const region = responseData.LocationConstraint._;
 
 						if (isBinaryData) {
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-
-							if (items[i].binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryPropertyData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 								i,
 								binaryPropertyName,
@@ -860,7 +843,7 @@ export class AwsS3 implements INodeType {
 
 							body = binaryDataBuffer;
 
-							headers['Content-Type'] = binaryData.mimeType;
+							headers['Content-Type'] = binaryPropertyData.mimeType;
 
 							headers['Content-MD5'] = createHash('md5').update(body).digest('base64');
 
@@ -868,7 +851,7 @@ export class AwsS3 implements INodeType {
 								this,
 								`${bucketName}.s3`,
 								'PUT',
-								`${path}${fileName || binaryData.fileName}`,
+								`${path}${fileName || binaryPropertyData.fileName}`,
 								body,
 								qs,
 								headers,
diff --git a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
index 436615a406b62c..ccb9dd1430bf8a 100644
--- a/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
+++ b/packages/nodes-base/nodes/Aws/SQS/AwsSqs.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeParameters,
@@ -10,7 +9,7 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
 
 import { URL } from 'url';
 
@@ -341,29 +340,12 @@ export class AwsSqs implements INodeType {
 					this.getNodeParameter('options.messageAttributes.binary', i, []) as INodeParameters[]
 				).forEach((attribute) => {
 					attributeCount++;
-					const dataPropertyName = attribute.dataPropertyName as string;
-					const item = items[i];
-
-					if (item.binary === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							'No binary data set. So message attribute cannot be added!',
-							{ itemIndex: i },
-						);
-					}
 
-					if (item.binary[dataPropertyName] === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`The binary property "${dataPropertyName}" does not exist. So message attribute cannot be added!`,
-							{ itemIndex: i },
-						);
-					}
-
-					const binaryData = item.binary[dataPropertyName].data;
+					const dataPropertyName = attribute.dataPropertyName as string;
+					const binaryData = this.helpers.assertBinaryData(i, dataPropertyName);
 
 					params.push(`MessageAttribute.${attributeCount}.Name=${attribute.name}`);
-					params.push(`MessageAttribute.${attributeCount}.Value.BinaryValue=${binaryData}`);
+					params.push(`MessageAttribute.${attributeCount}.Value.BinaryValue=${binaryData.data}`);
 					params.push(`MessageAttribute.${attributeCount}.Value.DataType=Binary`);
 				});
 
diff --git a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
index ab89528b97c7b5..3ee983f84359b6 100644
--- a/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/AwsTextract.node.ts
@@ -1,17 +1,14 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
 	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import type { IExpenseDocument } from './GenericFunctions';
 import { awsApiRequestREST, simplify, validateCredentials } from './GenericFunctions';
@@ -116,28 +113,13 @@ export class AwsTextract implements INodeType {
 			try {
 				//https://docs.aws.amazon.com/textract/latest/dg/API_AnalyzeExpense.html
 				if (operation === 'analyzeExpense') {
-					const binaryProperty = this.getNodeParameter('binaryPropertyName', i);
 					const simple = this.getNodeParameter('simple', i) as boolean;
-
-					if (items[i].binary === undefined) {
-						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-							itemIndex: i,
-						});
-					}
-
-					if ((items[i].binary as IBinaryKeyData)[binaryProperty] === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`Item has no binary property called "${binaryProperty}"`,
-							{ itemIndex: i },
-						);
-					}
-
-					const binaryPropertyData = (items[i].binary as IBinaryKeyData)[binaryProperty];
+					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+					const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
 					const body: IDataObject = {
 						Document: {
-							Bytes: binaryPropertyData.data,
+							Bytes: binaryData.data,
 						},
 					};
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts
index defb028535c954..db4a48a9d25bf3 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/upload/execute.ts
@@ -1,7 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IBinaryKeyData, IDataObject } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
@@ -9,34 +6,12 @@ export async function upload(this: IExecuteFunctions, index: number) {
 	let body: IDataObject = {};
 	const requestMethod = 'POST';
 
-	const items = this.getInputData();
-
+	const id: string = this.getNodeParameter('employeeId', index) as string;
 	const category = this.getNodeParameter('categoryId', index) as string;
 	const options = this.getNodeParameter('options', index);
-
-	if (items[index].binary === undefined) {
-		throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-			itemIndex: index,
-		});
-	}
-
-	const propertyNameUpload = this.getNodeParameter('binaryPropertyName', index);
-
-	if (items[index]!.binary![propertyNameUpload] === undefined) {
-		throw new NodeOperationError(
-			this.getNode(),
-			`Item has no binary property called "${propertyNameUpload}"`,
-			{ itemIndex: index },
-		);
-	}
-
-	const item = items[index].binary as IBinaryKeyData;
-
-	const binaryData = item[propertyNameUpload];
-
-	const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(index, propertyNameUpload);
-
-	const id: string = this.getNodeParameter('employeeId', index) as string;
+	const binaryPropertyName = this.getNodeParameter('binaryPropertyName', index);
+	const { fileName, mimeType } = this.helpers.assertBinaryData(index, binaryPropertyName);
+	const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(index, binaryPropertyName);
 
 	body = {
 		json: false,
@@ -44,11 +19,11 @@ export async function upload(this: IExecuteFunctions, index: number) {
 			file: {
 				value: binaryDataBuffer,
 				options: {
-					filename: binaryData.fileName,
-					contentType: binaryData.mimeType,
+					filename: fileName,
+					contentType: mimeType,
 				},
 			},
-			fileName: binaryData.fileName,
+			fileName,
 			category,
 		},
 		resolveWithFullResponse: true,
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts
index 3644ae4537f9f6..1c6224fb4955f8 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/upload/execute.ts
@@ -1,7 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IBinaryKeyData, IDataObject } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
@@ -9,32 +6,12 @@ export async function upload(this: IExecuteFunctions, index: number) {
 	let body: IDataObject = {};
 	const requestMethod = 'POST';
 
-	const items = this.getInputData();
-
 	const category = this.getNodeParameter('categoryId', index) as string;
 	const share = this.getNodeParameter('options.share', index, true) as boolean;
 
-	if (items[index].binary === undefined) {
-		throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-			itemIndex: index,
-		});
-	}
-
-	const propertyNameUpload = this.getNodeParameter('binaryPropertyName', index);
-
-	if (items[index]!.binary![propertyNameUpload] === undefined) {
-		throw new NodeOperationError(
-			this.getNode(),
-			`Item has no binary property called "${propertyNameUpload}"`,
-			{ itemIndex: index },
-		);
-	}
-
-	const item = items[index].binary as IBinaryKeyData;
-
-	const binaryData = item[propertyNameUpload];
-
-	const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(index, propertyNameUpload);
+	const binaryPropertyName = this.getNodeParameter('binaryPropertyName', index);
+	const { fileName, mimeType } = this.helpers.assertBinaryData(index, binaryPropertyName);
+	const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(index, binaryPropertyName);
 
 	body = {
 		json: false,
@@ -42,11 +19,11 @@ export async function upload(this: IExecuteFunctions, index: number) {
 			file: {
 				value: binaryDataBuffer,
 				options: {
-					filename: binaryData.fileName,
-					contentType: binaryData.mimeType,
+					filename: fileName,
+					contentType: mimeType,
 				},
 			},
-			fileName: binaryData.fileName,
+			fileName,
 			category,
 		},
 		resolveWithFullResponse: true,
diff --git a/packages/nodes-base/nodes/Box/Box.node.ts b/packages/nodes-base/nodes/Box/Box.node.ts
index c24cbb902ba7f2..b509526ad1cee3 100644
--- a/packages/nodes-base/nodes/Box/Box.node.ts
+++ b/packages/nodes-base/nodes/Box/Box.node.ts
@@ -1,8 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -277,23 +275,8 @@ export class Box implements INodeType {
 						}
 
 						if (isBinaryData) {
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-
-							if (items[i].binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-							//@ts-ignore
-							if (items[i].binary[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 								i,
 								binaryPropertyName,
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
index 8ce1a5b930ca70..6ff81b393912d0 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebex.node.ts
@@ -1,16 +1,14 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
-import { getAttachemnts, webexApiRequest, webexApiRequestAllItems } from './GenericFunctions';
+import { getAttachments, webexApiRequest, webexApiRequestAllItems } from './GenericFunctions';
 
 import {
 	meetingFields,
@@ -156,7 +154,7 @@ export class CiscoWebex implements INodeType {
 
 						body.text = this.getNodeParameter('text', i);
 
-						body.attachments = getAttachemnts(
+						body.attachments = getAttachments(
 							this.getNodeParameter(
 								'additionalFields.attachmentsUi.attachmentValues',
 								i,
@@ -168,15 +166,8 @@ export class CiscoWebex implements INodeType {
 							const isBinaryData = file.fileLocation === 'binaryData' ? true : false;
 
 							if (isBinaryData) {
-								if (!items[i].binary) {
-									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-										itemIndex: i,
-									});
-								}
-
 								const binaryPropertyName = file.binaryPropertyName as string;
-
-								const binaryData = items[i].binary![binaryPropertyName];
+								const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 								const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 									i,
 									binaryPropertyName,
diff --git a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
index 77e6a0be3c6045..7eba4e70915ea2 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -135,9 +135,9 @@ function removeEmptyProperties(rest: { [key: string]: any }) {
 		.reduce((a, k) => ({ ...a, [k]: rest[k] }), {});
 }
 
-export function getAttachemnts(attachements: IDataObject[]) {
+export function getAttachments(attachments: IDataObject[]) {
 	const _attachments: IDataObject[] = [];
-	for (const attachment of attachements) {
+	for (const attachment of attachments) {
 		const body: IDataObject[] = [];
 		const actions: IDataObject[] = [];
 		for (const element of ((attachment?.elementsUi as IDataObject)
diff --git a/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts b/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
index 5822ce070116d7..121409ece00703 100644
--- a/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
+++ b/packages/nodes-base/nodes/Citrix/ADC/CitrixAdc.node.ts
@@ -1,13 +1,11 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { citrixADCApiRequest } from './GenericFunctions';
 
@@ -74,24 +72,12 @@ export class CitrixAdc implements INodeType {
 						const options = this.getNodeParameter('options', i);
 						const endpoint = '/config/systemfile';
 
-						const item = items[i];
-
-						if (item.binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
-						}
-
-						if (item.binary[binaryProperty] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`The binary data property "${binaryProperty}" does not exists on item!`,
-							);
-						}
-
+						const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 						const buffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 						const body = {
 							systemfile: {
-								filename: item.binary[binaryProperty].fileName,
+								filename: binaryData.fileName,
 								filecontent: Buffer.from(buffer).toString('base64'),
 								filelocation: fileLocation,
 								fileencoding: 'BASE64',
diff --git a/packages/nodes-base/nodes/Compression/Compression.node.ts b/packages/nodes-base/nodes/Compression/Compression.node.ts
index da697216cf13e7..e92d6c97a7142b 100644
--- a/packages/nodes-base/nodes/Compression/Compression.node.ts
+++ b/packages/nodes-base/nodes/Compression/Compression.node.ts
@@ -1,12 +1,10 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IBinaryKeyData,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import * as fflate from 'fflate';
 
@@ -158,7 +156,7 @@ export class Compression implements INodeType {
 						outputFormat: ['gzip'],
 					},
 				},
-				description: 'Prefix use for all gzip compresed files',
+				description: 'Prefix use for all gzip compressed files',
 			},
 			{
 				displayName: 'Output Prefix',
@@ -196,28 +194,14 @@ export class Compression implements INodeType {
 					let zipIndex = 0;
 
 					for (const [index, binaryPropertyName] of binaryPropertyNames.entries()) {
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-						//@ts-ignore
-						if (items[i].binary[binaryPropertyName] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-								{ itemIndex: i },
-							);
-						}
-
-						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 						if (binaryData.fileExtension === 'zip') {
 							const files = await unzip(binaryDataBuffer);
 
 							for (const key of Object.keys(files)) {
-								// when files are compresed using MACOSX for some reason they are duplicated under __MACOSX
+								// when files are compressed using MACOSX for some reason they are duplicated under __MACOSX
 								if (key.includes('__MACOSX')) {
 									continue;
 								}
@@ -267,21 +251,7 @@ export class Compression implements INodeType {
 					const binaryObject: IBinaryKeyData = {};
 
 					for (const [index, binaryPropertyName] of binaryPropertyNames.entries()) {
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-						//@ts-ignore
-						if (items[i].binary[binaryPropertyName] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-								{ itemIndex: i },
-							);
-						}
-
-						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 						if (outputFormat === 'zip') {
diff --git a/packages/nodes-base/nodes/Cortex/Cortex.node.ts b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
index 495b415c9ce6ee..809467d3540860 100644
--- a/packages/nodes-base/nodes/Cortex/Cortex.node.ts
+++ b/packages/nodes-base/nodes/Cortex/Cortex.node.ts
@@ -1,18 +1,16 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import { cortexApiRequest, getEntityLabel, prepareParameters, splitTags } from './GenericFunctions';
 
 import { analyzerFields, analyzersOperations } from './AnalyzerDescriptions';
 
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { responderFields, respondersOperations } from './ResponderDescription';
 
@@ -193,24 +191,8 @@ export class Cortex implements INodeType {
 						}
 
 						if (observableType === 'file') {
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const fileBufferData = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 							const options = {
@@ -218,8 +200,8 @@ export class Cortex implements INodeType {
 									data: {
 										value: fileBufferData,
 										options: {
-											contentType: item.binary[binaryPropertyName].mimeType,
-											filename: item.binary[binaryPropertyName].fileName,
+											contentType: binaryData.mimeType,
+											filename: binaryData.fileName,
 										},
 									},
 									_json: JSON.stringify({
@@ -337,27 +319,8 @@ export class Cortex implements INodeType {
 											element.data = artifactvalue.data as string;
 
 											if (artifactvalue.dataType === 'file') {
-												const item = items[i];
-
-												if (item.binary === undefined) {
-													throw new NodeOperationError(
-														this.getNode(),
-														'No binary data exists on item!',
-														{ itemIndex: i },
-													);
-												}
-
 												const binaryPropertyName = artifactvalue.binaryProperty as string;
-
-												if (item.binary[binaryPropertyName] === undefined) {
-													throw new NodeOperationError(
-														this.getNode(),
-														`Item has no binary property called "${binaryPropertyName}"`,
-														{ itemIndex: i },
-													);
-												}
-
-												const binaryData = item.binary[binaryPropertyName];
+												const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
 												element.data = `${binaryData.fileName};${binaryData.mimeType};${binaryData.data}`;
 											}
@@ -373,24 +336,9 @@ export class Cortex implements INodeType {
 								// deal with file observable
 
 								if ((body.data as IDataObject).dataType === 'file') {
-									const item = items[i];
-
-									if (item.binary === undefined) {
-										throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-											itemIndex: i,
-										});
-									}
-
 									const binaryPropertyName = (body.data as IDataObject)
 										.binaryPropertyName as string;
-									if (item.binary[binaryPropertyName] === undefined) {
-										throw new NodeOperationError(
-											this.getNode(),
-											`Item has no binary property called "${binaryPropertyName}"`,
-											{ itemIndex: i },
-										);
-									}
-
+									const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 									const fileBufferData = await this.helpers.getBinaryDataBuffer(
 										i,
 										binaryPropertyName,
@@ -398,14 +346,14 @@ export class Cortex implements INodeType {
 									const sha256 = createHash('sha256').update(fileBufferData).digest('hex');
 
 									(body.data as IDataObject).attachment = {
-										name: item.binary[binaryPropertyName].fileName,
+										name: binaryData.fileName,
 										hashes: [
 											sha256,
 											createHash('sha1').update(fileBufferData).digest('hex'),
 											createHash('md5').update(fileBufferData).digest('hex'),
 										],
 										size: fileBufferData.byteLength,
-										contentType: item.binary[binaryPropertyName].mimeType,
+										contentType: binaryData.mimeType,
 										id: sha256,
 									};
 
diff --git a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
index edcce4c51c0c61..6d2e2bae1fa6f3 100644
--- a/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
+++ b/packages/nodes-base/nodes/Dropbox/Dropbox.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -760,26 +759,9 @@ export class Dropbox implements INodeType {
 						options = { json: false };
 
 						if (this.getNodeParameter('binaryData', i)) {
-							// Is binary file to upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[propertyNameUpload] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${propertyNameUpload}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							body = await this.helpers.getBinaryDataBuffer(i, propertyNameUpload);
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							this.helpers.assertBinaryData(i, binaryPropertyName);
+							body = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 						} else {
 							// Is text file
 							body = Buffer.from(this.getNodeParameter('fileContent', i) as string, 'utf8');
diff --git a/packages/nodes-base/nodes/EditImage/EditImage.node.ts b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
index efb8409e825196..52aba1a1cebe9e 100644
--- a/packages/nodes-base/nodes/EditImage/EditImage.node.ts
+++ b/packages/nodes-base/nodes/EditImage/EditImage.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeProperties,
@@ -8,7 +8,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { deepCopy, NodeOperationError } from 'n8n-workflow';
+import { deepCopy } from 'n8n-workflow';
 import gm from 'gm';
 import { file } from 'tmp-promise';
 import { parse as pathParse } from 'path';
@@ -1058,20 +1058,7 @@ export class EditImage implements INodeType {
 
 				if (operations[0].operation !== 'create') {
 					// "create" generates a new image so does not require any incoming data.
-					if (item.binary === undefined) {
-						throw new NodeOperationError(this.getNode(), 'Item does not contain any binary data.', {
-							itemIndex,
-						});
-					}
-
-					if (item.binary[dataPropertyName] === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`Item does not contain any binary data with the name "${dataPropertyName}".`,
-							{ itemIndex },
-						);
-					}
-
+					this.helpers.assertBinaryData(itemIndex, dataPropertyName);
 					const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 						itemIndex,
 						dataPropertyName,
@@ -1123,20 +1110,15 @@ export class EditImage implements INodeType {
 							// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
 							(positionX >= 0 ? '+' : '') + positionX + (positionY >= 0 ? '+' : '') + positionY;
 
-						if (item.binary![operationData.dataPropertyNameComposite as string] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item does not contain any binary data with the name "${operationData.dataPropertyNameComposite}".`,
-								{ itemIndex },
-							);
-						}
-
-						const { fd, path, cleanup } = await file();
-						cleanupFunctions.push(cleanup);
+						const binaryPropertyName = operationData.dataPropertyNameComposite as string;
+						this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 							itemIndex,
-							operationData.dataPropertyNameComposite as string,
+							binaryPropertyName,
 						);
+
+						const { fd, path, cleanup } = await file();
+						cleanupFunctions.push(cleanup);
 						await fsWriteFileAsync(fd, binaryDataBuffer);
 
 						if (operations[0].operation === 'create') {
diff --git a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
index 1b6ece9de181e1..a6b467634da9f3 100644
--- a/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v1/EmailSendV1.node.ts
@@ -1,8 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
@@ -211,11 +210,9 @@ export class EmailSendV1 implements INodeType {
 						});
 
 					for (const propertyName of attachmentProperties) {
-						if (!item.binary.hasOwnProperty(propertyName)) {
-							continue;
-						}
+						const binaryData = this.helpers.assertBinaryData(itemIndex, propertyName);
 						attachments.push({
-							filename: item.binary[propertyName].fileName || 'unknown',
+							filename: binaryData.fileName || 'unknown',
 							content: await this.helpers.getBinaryDataBuffer(itemIndex, propertyName),
 						});
 					}
diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index 7ef14a0bde349a..330aa7c7b75540 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -223,11 +223,9 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 					});
 
 				for (const propertyName of attachmentProperties) {
-					if (!item.binary.hasOwnProperty(propertyName)) {
-						continue;
-					}
+					const binaryData = this.helpers.assertBinaryData(itemIndex, propertyName);
 					attachments.push({
-						filename: item.binary[propertyName].fileName || 'unknown',
+						filename: binaryData.fileName || 'unknown',
 						content: await this.helpers.getBinaryDataBuffer(itemIndex, propertyName),
 					});
 				}
diff --git a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
index b53df356e72c92..b0a76fca0fc05c 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookGraphApi.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -367,13 +367,6 @@ export class FacebookGraphApi implements INodeType {
 
 			const sendBinaryData = this.getNodeParameter('sendBinaryData', itemIndex, false) as boolean;
 			if (sendBinaryData) {
-				const item = items[itemIndex];
-				if (item.binary === undefined) {
-					throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-						itemIndex,
-					});
-				}
-
 				const binaryPropertyNameFull = this.getNodeParameter('binaryPropertyName', itemIndex);
 
 				let propertyName = 'file';
@@ -384,16 +377,7 @@ export class FacebookGraphApi implements INodeType {
 					binaryPropertyName = binaryPropertyNameParts[1];
 				}
 
-				if (item.binary[binaryPropertyName] === undefined) {
-					throw new NodeOperationError(
-						this.getNode(),
-						`Item has no binary property called "${binaryPropertyName}"`,
-						{ itemIndex },
-					);
-				}
-
-				const binaryProperty = item.binary[binaryPropertyName];
-
+				const binaryData = this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
 				const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 					itemIndex,
 					binaryPropertyName,
@@ -402,8 +386,8 @@ export class FacebookGraphApi implements INodeType {
 					[propertyName]: {
 						value: binaryDataBuffer,
 						options: {
-							filename: binaryProperty.fileName,
-							contentType: binaryProperty.mimeType,
+							filename: binaryData.fileName,
+							contentType: binaryData.mimeType,
 						},
 					},
 				};
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index 18b0ac9f4818be..ba8628a6d0d823 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -1,17 +1,17 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
 	INodeCredentialTestResult,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
 import { createWriteStream } from 'fs';
 import { basename, dirname } from 'path';
 import type { Readable } from 'stream';
@@ -624,30 +624,14 @@ export class Ftp implements INodeType {
 						await recursivelyCreateSftpDirs(sftp!, remotePath);
 
 						if (this.getNodeParameter('binaryData', i)) {
-							// Is binary file to upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-							const itemBinaryData = item.binary[propertyNameUpload];
-							if (itemBinaryData === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${propertyNameUpload}"`,
-									{ itemIndex: i },
-								);
-							}
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
 							let uploadData: Buffer | Readable;
-							if (itemBinaryData.id) {
-								uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+							if (binaryData.id) {
+								uploadData = this.helpers.getBinaryStream(binaryData.id);
 							} else {
-								uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
 							}
 							await sftp!.put(uploadData, remotePath);
 						} else {
@@ -750,30 +734,14 @@ export class Ftp implements INodeType {
 						const dirPath = remotePath.replace(fileName, '');
 
 						if (this.getNodeParameter('binaryData', i)) {
-							// Is binary file to upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-							const itemBinaryData = item.binary[propertyNameUpload];
-							if (itemBinaryData === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${propertyNameUpload}"`,
-									{ itemIndex: i },
-								);
-							}
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
 							let uploadData: Buffer | Readable;
-							if (itemBinaryData.id) {
-								uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+							if (binaryData.id) {
+								uploadData = this.helpers.getBinaryStream(binaryData.id);
 							} else {
-								uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
 							}
 
 							try {
diff --git a/packages/nodes-base/nodes/Github/Github.node.ts b/packages/nodes-base/nodes/Github/Github.node.ts
index c91733ac9e0e85..e74084462bb555 100644
--- a/packages/nodes-base/nodes/Github/Github.node.ts
+++ b/packages/nodes-base/nodes/Github/Github.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -1821,28 +1820,12 @@ export class Github implements INodeType {
 						body.message = this.getNodeParameter('commitMessage', i) as string;
 
 						if (this.getNodeParameter('binaryData', i)) {
-							// Is binary file to upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
 							// Currently internally n8n uses base64 and also Github expects it base64 encoded.
 							// If that ever changes the data has to get converted here.
-							body.content = item.binary[binaryPropertyName].data;
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							// TODO: Does this work with filesystem mode
+							body.content = binaryData.data;
 						} else {
 							// Is text file
 							// body.content = Buffer.from(this.getNodeParameter('fileContent', i) as string, 'base64');
diff --git a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
index e2f4837677c223..a974bc5c3e312c 100644
--- a/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/Gitlab.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -1572,28 +1571,12 @@ export class Gitlab implements INodeType {
 						}
 
 						if (this.getNodeParameter('binaryData', i)) {
-							// Is binary file to upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
 							// Currently internally n8n uses base64 and also GitLab expects it base64 encoded.
 							// If that ever changes the data has to get converted here.
-							body.content = item.binary[binaryPropertyName].data;
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							// TODO: Does this work with filesystem mode
+							body.content = binaryData.data;
 							body.encoding = 'base64';
 						} else {
 							// Is text file
diff --git a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
index 1ea47efdd37c75..afede1685115ed 100644
--- a/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
+++ b/packages/nodes-base/nodes/Google/CloudStorage/ObjectDescription.ts
@@ -1,6 +1,5 @@
 import FormData from 'form-data';
 import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 // Define these because we'll be using them in two separate places
 const metagenerationFilters: INodeProperties[] = [
@@ -140,7 +139,6 @@ export const objectOperations: INodeProperties[] = [
 
 								// Populate request body
 								const body = new FormData();
-								const item = this.getInputData();
 								body.append('metadata', JSON.stringify(metadata), {
 									contentType: 'application/json',
 								});
@@ -152,20 +150,8 @@ export const objectOperations: INodeProperties[] = [
 									const binaryPropertyName = this.getNodeParameter(
 										'createBinaryPropertyName',
 									) as string;
-									if (!item.binary) {
-										throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-											itemIndex: this.getItemIndex(),
-										});
-									}
-									if (item.binary[binaryPropertyName] === undefined) {
-										throw new NodeOperationError(
-											this.getNode(),
-											`Item has no binary property called "${binaryPropertyName}"`,
-											{ itemIndex: this.getItemIndex() },
-										);
-									}
 
-									const binaryData = item.binary[binaryPropertyName];
+									const binaryData = this.helpers.assertBinaryData(binaryPropertyName);
 
 									// Decode from base64 for upload
 									content = Buffer.from(binaryData.data, 'base64');
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index 3f7f198c6764eb..3382b36aa4bf10 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -1,13 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
 
@@ -2433,38 +2432,20 @@ export class GoogleDrive implements INodeType {
 						let mimeType = 'text/plain';
 
 						if (this.getNodeParameter('binaryData', i)) {
-							// Is binary file to upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-
-							const binary = item.binary[propertyNameUpload];
-							if (binary === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${propertyNameUpload}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							if (binary.id) {
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+							if (binaryData.id) {
 								// Stream data in 256KB chunks, and upload the via the resumable upload api
-								fileContent = this.helpers.getBinaryStream(binary.id, UPLOAD_CHUNK_SIZE);
-								const metadata = await this.helpers.getBinaryMetadata(binary.id);
+								fileContent = this.helpers.getBinaryStream(binaryData.id, UPLOAD_CHUNK_SIZE);
+								const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
 								contentLength = metadata.fileSize;
 								originalFilename = metadata.fileName;
-								if (metadata.mimeType) mimeType = binary.mimeType;
+								if (metadata.mimeType) mimeType = binaryData.mimeType;
 							} else {
-								fileContent = Buffer.from(binary.data, BINARY_ENCODING);
+								fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
 								contentLength = fileContent.length;
-								originalFilename = binary.fileName;
-								mimeType = binary.mimeType;
+								originalFilename = binaryData.fileName;
+								mimeType = binaryData.mimeType;
 							}
 						} else {
 							// Is text file
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index b7111196588d59..62b5d7791d403a 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -508,18 +508,10 @@ export async function prepareEmailAttachments(
 	if (attachments && !isEmpty(attachments)) {
 		for (const { property } of attachments) {
 			for (const name of (property as string).split(',')) {
-				if (!items[itemIndex].binary || items[itemIndex].binary![name] === undefined) {
-					const description = `This node has no input field called '${name}' `;
-					throw new NodeOperationError(this.getNode(), 'Attachment not found', {
-						description,
-						itemIndex,
-					});
-				}
-
-				const binaryData = items[itemIndex].binary![name];
+				const binaryData = this.helpers.assertBinaryData(itemIndex, name);
 				const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(itemIndex, name);
 
-				if (!items[itemIndex].binary![name] || !Buffer.isBuffer(binaryDataBuffer)) {
+				if (!Buffer.isBuffer(binaryDataBuffer)) {
 					const description = `The input field '${name}' doesn't contain an attachment. Please make sure you specify a field containing binary data`;
 					throw new NodeOperationError(this.getNode(), 'Attachment not found', {
 						description,
diff --git a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
index f89e3ef264a3b5..5c49c6acd6d9cc 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v1/GmailV1.node.ts
@@ -1,9 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -314,21 +313,18 @@ export class GmailV1 implements INodeType {
 									!isEmpty(attachmentsUi.attachmentsBinary) &&
 									items[i].binary
 								) {
-									// @ts-ignore
 									for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
 										for (const binaryProperty of (property as string).split(',')) {
-											if (items[i].binary![binaryProperty] !== undefined) {
-												const binaryData = items[i].binary![binaryProperty];
-												const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-													i,
-													binaryProperty,
-												);
-												attachmentsBinary.push({
-													name: binaryData.fileName || 'unknown',
-													content: binaryDataBuffer,
-													type: binaryData.mimeType,
-												});
-											}
+											const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
+											const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+												i,
+												binaryProperty,
+											);
+											attachmentsBinary.push({
+												name: binaryData.fileName || 'unknown',
+												content: binaryDataBuffer,
+												type: binaryData.mimeType,
+											});
 										}
 									}
 								}
@@ -404,21 +400,18 @@ export class GmailV1 implements INodeType {
 									!isEmpty(attachmentsUi.attachmentsBinary) &&
 									items[i].binary
 								) {
-									// @ts-ignore
 									for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
 										for (const binaryProperty of (property as string).split(',')) {
-											if (items[i].binary![binaryProperty] !== undefined) {
-												const binaryData = items[i].binary![binaryProperty];
-												const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-													i,
-													binaryProperty,
-												);
-												attachmentsBinary.push({
-													name: binaryData.fileName || 'unknown',
-													content: binaryDataBuffer,
-													type: binaryData.mimeType,
-												});
-											}
+											const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
+											const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+												i,
+												binaryProperty,
+											);
+											attachmentsBinary.push({
+												name: binaryData.fileName || 'unknown',
+												content: binaryDataBuffer,
+												type: binaryData.mimeType,
+											});
 										}
 									}
 								}
@@ -651,18 +644,16 @@ export class GmailV1 implements INodeType {
 									) {
 										for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
 											for (const binaryProperty of (property as string).split(',')) {
-												if (items[i].binary![binaryProperty] !== undefined) {
-													const binaryData = items[i].binary![binaryProperty];
-													const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-														i,
-														binaryProperty,
-													);
-													attachmentsBinary.push({
-														name: binaryData.fileName || 'unknown',
-														content: binaryDataBuffer,
-														type: binaryData.mimeType,
-													});
-												}
+												const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
+												const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+													i,
+													binaryProperty,
+												);
+												attachmentsBinary.push({
+													name: binaryData.fileName || 'unknown',
+													content: binaryDataBuffer,
+													type: binaryData.mimeType,
+												});
 											}
 										}
 									}
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index ceb9fc5cded9fd..4ef41ea2657688 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -1,7 +1,7 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -387,35 +387,12 @@ export class YouTube implements INodeType {
 					if (operation === 'uploadBanner') {
 						const channelId = this.getNodeParameter('channelId', i) as string;
 						const binaryProperty = this.getNodeParameter('binaryProperty', i);
-
-						let mimeType;
-
-						// Is binary file to upload
-						const item = items[i];
-
-						if (item.binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
-						if (item.binary[binaryProperty] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryProperty}"`,
-								{ itemIndex: i },
-							);
-						}
-
-						if (item.binary[binaryProperty].mimeType) {
-							mimeType = item.binary[binaryProperty].mimeType;
-						}
-
+						const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 						const body = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 						const requestOptions = {
 							headers: {
-								'Content-Type': mimeType,
+								...(binaryData.mimeType ? { 'Content-Type': binaryData.mimeType } : {}),
 							},
 							json: false,
 						};
@@ -854,38 +831,18 @@ export class YouTube implements INodeType {
 						const options = this.getNodeParameter('options', i);
 						const binaryProperty = this.getNodeParameter('binaryProperty', i);
 
-						// Is binary file to upload
-						const item = items[i];
-
-						if (item.binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
-						const binaryData = item.binary[binaryProperty];
-						if (binaryData === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryProperty}"`,
-								{ itemIndex: i },
-							);
-						}
+						const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 
 						let mimeType: string;
 						let contentLength: number;
 						let fileContent: Buffer | Readable;
 
-						if (binaryData.mimeType) {
-							mimeType = binaryData.mimeType;
-						}
-
 						if (binaryData.id) {
 							// Stream data in 256KB chunks, and upload the via the resumable upload api
 							fileContent = this.helpers.getBinaryStream(binaryData.id, UPLOAD_CHUNK_SIZE);
 							const metadata = await this.helpers.getBinaryMetadata(binaryData.id);
 							contentLength = metadata.fileSize;
-							mimeType = binaryData.mimeType;
+							mimeType = metadata.mimeType ?? binaryData.mimeType;
 						} else {
 							fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
 							contentLength = fileContent.length;
diff --git a/packages/nodes-base/nodes/Html/Html.node.ts b/packages/nodes-base/nodes/Html/Html.node.ts
index b860fdae9cfb01..a4996281f4f396 100644
--- a/packages/nodes-base/nodes/Html/Html.node.ts
+++ b/packages/nodes-base/nodes/Html/Html.node.ts
@@ -296,23 +296,7 @@ export class Html implements INodeType {
 						}
 						htmlArray = item.json[dataPropertyName] as string;
 					} else {
-						if (item.binary === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								'No item does not contain binary data!',
-								{
-									itemIndex,
-								},
-							);
-						}
-						if (item.binary[dataPropertyName] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`No property named "${dataPropertyName}" exists!`,
-								{ itemIndex },
-							);
-						}
-
+						this.helpers.assertBinaryData(itemIndex, dataPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 							itemIndex,
 							dataPropertyName,
diff --git a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
index 5473bd3382a1eb..185f8fb7d4c1ac 100644
--- a/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
+++ b/packages/nodes-base/nodes/HtmlExtract/HtmlExtract.node.ts
@@ -1,7 +1,7 @@
 import cheerio from 'cheerio';
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -236,19 +236,7 @@ export class HtmlExtract implements INodeType {
 					}
 					htmlArray = item.json[dataPropertyName] as string;
 				} else {
-					if (item.binary === undefined) {
-						throw new NodeOperationError(this.getNode(), 'No item does not contain binary data!', {
-							itemIndex,
-						});
-					}
-					if (item.binary[dataPropertyName] === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`No property named "${dataPropertyName}" exists!`,
-							{ itemIndex },
-						);
-					}
-
+					this.helpers.assertBinaryData(itemIndex, dataPropertyName);
 					const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 						itemIndex,
 						dataPropertyName,
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index 98eea2e1677017..67a854f9e34796 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -20,7 +20,7 @@ interface OptionData {
 	displayName: string;
 }
 
-interface OptionDataParamters {
+interface OptionDataParameters {
 	[key: string]: OptionData;
 }
 
@@ -637,7 +637,7 @@ export class HttpRequestV1 implements INodeType {
 			queryParametersUi: 'qs',
 		};
 
-		const jsonParameters: OptionDataParamters = {
+		const jsonParameters: OptionDataParameters = {
 			bodyParametersJson: {
 				name: 'body',
 				displayName: 'Body Parameters',
@@ -648,7 +648,7 @@ export class HttpRequestV1 implements INodeType {
 			},
 			queryParametersJson: {
 				name: 'qs',
-				displayName: 'Query Paramters',
+				displayName: 'Query Parameters',
 			},
 		};
 		let returnItems: INodeExecutionData[] = [];
@@ -730,7 +730,7 @@ export class HttpRequestV1 implements INodeType {
 							const contentTypesAllowed = ['raw', 'multipart-form-data'];
 
 							if (!contentTypesAllowed.includes(options.bodyContentType as string)) {
-								// As n8n-workflow.NodeHelpers.getParamterResolveOrder can not be changed
+								// As n8n-workflow.NodeHelpers.getParameterResolveOrder can not be changed
 								// easily to handle parameters in dot.notation simply error for now.
 								throw new NodeOperationError(
 									this.getNode(),
@@ -739,24 +739,9 @@ export class HttpRequestV1 implements INodeType {
 								);
 							}
 
-							const item = items[itemIndex];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex,
-								});
-							}
-
 							if (options.bodyContentType === 'raw') {
 								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex);
-								if (item.binary[binaryPropertyName] === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryPropertyName}"`,
-										{ itemIndex },
-									);
-								}
-
+								this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
 								const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 									itemIndex,
 									binaryPropertyName,
@@ -787,14 +772,7 @@ export class HttpRequestV1 implements INodeType {
 										);
 									}
 
-									if (item.binary[binaryPropertyName] === undefined) {
-										throw new NodeOperationError(
-											this.getNode(),
-											`Item has no binary property called "${binaryPropertyName}"`,
-										);
-									}
-
-									const binaryProperty = item.binary[binaryPropertyName];
+									const binaryData = this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
 									const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 										itemIndex,
 										binaryPropertyName,
@@ -803,8 +781,8 @@ export class HttpRequestV1 implements INodeType {
 									requestOptions.body[propertyName] = {
 										value: binaryDataBuffer,
 										options: {
-											filename: binaryProperty.fileName,
-											contentType: binaryProperty.mimeType,
+											filename: binaryData.fileName,
+											contentType: binaryData.mimeType,
 										},
 									};
 								}
@@ -814,7 +792,7 @@ export class HttpRequestV1 implements INodeType {
 					}
 
 					if (tempValue === '') {
-						// Paramter is empty so skip it
+						// Parameter is empty so skip it
 						continue;
 					}
 
@@ -842,7 +820,7 @@ export class HttpRequestV1 implements INodeType {
 					}
 				}
 			} else {
-				// Paramters are defined in UI
+				// Parameters are defined in UI
 				let optionName: string;
 				for (const parameterName of Object.keys(uiParameters)) {
 					setUiParameter = this.getNodeParameter(parameterName, itemIndex, {}) as IDataObject;
diff --git a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
index ef4cb43d1c8d17..b136dbf1eb99ca 100644
--- a/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V2/HttpRequestV2.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
@@ -22,7 +22,7 @@ interface OptionData {
 	displayName: string;
 }
 
-interface OptionDataParamters {
+interface OptionDataParameters {
 	[key: string]: OptionData;
 }
 
@@ -674,7 +674,7 @@ export class HttpRequestV2 implements INodeType {
 			queryParametersUi: 'qs',
 		};
 
-		const jsonParameters: OptionDataParamters = {
+		const jsonParameters: OptionDataParameters = {
 			bodyParametersJson: {
 				name: 'body',
 				displayName: 'Body Parameters',
@@ -685,7 +685,7 @@ export class HttpRequestV2 implements INodeType {
 			},
 			queryParametersJson: {
 				name: 'qs',
-				displayName: 'Query Paramters',
+				displayName: 'Query Parameters',
 			},
 		};
 		let returnItems: INodeExecutionData[] = [];
@@ -767,7 +767,7 @@ export class HttpRequestV2 implements INodeType {
 							const contentTypesAllowed = ['raw', 'multipart-form-data'];
 
 							if (!contentTypesAllowed.includes(options.bodyContentType as string)) {
-								// As n8n-workflow.NodeHelpers.getParamterResolveOrder can not be changed
+								// As n8n-workflow.NodeHelpers.getParameterResolveOrder can not be changed
 								// easily to handle parameters in dot.notation simply error for now.
 								throw new NodeOperationError(
 									this.getNode(),
@@ -776,24 +776,9 @@ export class HttpRequestV2 implements INodeType {
 								);
 							}
 
-							const item = items[itemIndex];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex,
-								});
-							}
-
 							if (options.bodyContentType === 'raw') {
 								const binaryPropertyName = this.getNodeParameter('binaryPropertyName', itemIndex);
-								if (item.binary[binaryPropertyName] === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryPropertyName}"`,
-										{ itemIndex },
-									);
-								}
-
+								this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
 								const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 									itemIndex,
 									binaryPropertyName,
@@ -824,14 +809,7 @@ export class HttpRequestV2 implements INodeType {
 										);
 									}
 
-									if (item.binary[binaryPropertyName] === undefined) {
-										throw new NodeOperationError(
-											this.getNode(),
-											`Item has no binary property called "${binaryPropertyName}"`,
-										);
-									}
-
-									const binaryProperty = item.binary[binaryPropertyName];
+									const binaryData = this.helpers.assertBinaryData(itemIndex, binaryPropertyName);
 									const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 										itemIndex,
 										binaryPropertyName,
@@ -840,8 +818,8 @@ export class HttpRequestV2 implements INodeType {
 									requestOptions.body[propertyName] = {
 										value: binaryDataBuffer,
 										options: {
-											filename: binaryProperty.fileName,
-											contentType: binaryProperty.mimeType,
+											filename: binaryData.fileName,
+											contentType: binaryData.mimeType,
 										},
 									};
 								}
@@ -851,7 +829,7 @@ export class HttpRequestV2 implements INodeType {
 					}
 
 					if (tempValue === '') {
-						// Paramter is empty so skip it
+						// Parameter is empty so skip it
 						continue;
 					}
 
@@ -879,7 +857,7 @@ export class HttpRequestV2 implements INodeType {
 					}
 				}
 			} else {
-				// Paramters are defined in UI
+				// Parameters are defined in UI
 				let optionName: string;
 				for (const parameterName of Object.keys(uiParameters)) {
 					setUiParameter = this.getNodeParameter(parameterName, itemIndex, {}) as IDataObject;
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index a83623a8c40016..355a98634df2da 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -1,8 +1,7 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
@@ -1067,22 +1066,8 @@ export class HttpRequestV3 implements INodeType {
 			) => {
 				const accumulator = await acc;
 				if (cur.parameterType === 'formBinaryData') {
-					const binaryDataOnInput = items[itemIndex]?.binary;
-					if (!cur.inputDataFieldName) return accumulator;
-
-					if (!binaryDataOnInput?.[cur.inputDataFieldName]) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`Input Data Field Name '${cur.inputDataFieldName}' could not be found in input`,
-							{
-								runIndex: itemIndex,
-							},
-						);
-					}
-
 					if (!cur.inputDataFieldName) return accumulator;
-
-					const binaryData = binaryDataOnInput[cur.inputDataFieldName];
+					const binaryData = this.helpers.assertBinaryData(itemIndex, cur.inputDataFieldName);
 					const buffer = await this.helpers.getBinaryDataBuffer(itemIndex, cur.inputDataFieldName);
 
 					accumulator[cur.name] = {
@@ -1143,6 +1128,7 @@ export class HttpRequestV3 implements INodeType {
 						'inputDataFieldName',
 						itemIndex,
 					) as string;
+					this.helpers.assertBinaryData(itemIndex, inputDataFieldName);
 					requestOptions.body = await this.helpers.getBinaryDataBuffer(
 						itemIndex,
 						inputDataFieldName,
diff --git a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
index de626c53443ef1..0c8a99a1e0135e 100644
--- a/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
+++ b/packages/nodes-base/nodes/HumanticAI/HumanticAi.node.ts
@@ -1,13 +1,10 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { humanticAiApiRequest } from './GenericFunctions';
 
@@ -71,26 +68,9 @@ export class HumanticAi implements INodeType {
 
 					if (sendResume) {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
-						const item = items[i].binary as IBinaryKeyData;
-
-						const binaryData = item[binaryPropertyName];
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
-						if (binaryData === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-								{ itemIndex: i },
-							);
-						}
-
 						responseData = await humanticAiApiRequest.call(
 							this,
 							'POST',
@@ -144,26 +124,9 @@ export class HumanticAi implements INodeType {
 
 					if (sendResume) {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
-						const item = items[i].binary as IBinaryKeyData;
-
-						const binaryData = item[binaryPropertyName];
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
-						if (binaryData === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-								{ itemIndex: i },
-							);
-						}
-
 						responseData = await humanticAiApiRequest.call(
 							this,
 							'POST',
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 884e2f7cbfd385..8cd27494b67bc5 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1057,23 +1057,9 @@ export class Jira implements INodeType {
 				for (let i = 0; i < length; i++) {
 					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 					const issueKey = this.getNodeParameter('issueKey', i) as string;
+					const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
-					if (items[i].binary === undefined) {
-						throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-							itemIndex: i,
-						});
-					}
 					let uploadData: Buffer | Readable;
-					const item = items[i].binary as IBinaryKeyData;
-					const binaryData = item[binaryPropertyName];
-					if (binaryData === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`Item has no binary property called "${binaryPropertyName}"`,
-							{ itemIndex: i },
-						);
-					}
-
 					if (binaryData.id) {
 						uploadData = this.helpers.getBinaryStream(binaryData.id);
 					} else {
diff --git a/packages/nodes-base/nodes/Keap/Keap.node.ts b/packages/nodes-base/nodes/Keap/Keap.node.ts
index d90467d44d1de0..13e110a4ca04ae 100644
--- a/packages/nodes-base/nodes/Keap/Keap.node.ts
+++ b/packages/nodes-base/nodes/Keap/Keap.node.ts
@@ -1,15 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { keapApiRequest, keapApiRequestAllItems, keysToSnakeCase } from './GenericFunctions';
 
@@ -742,30 +739,15 @@ export class Keap implements INodeType {
 							keysToSnakeCase(attachmentsUi.attachmentsValues as IDataObject);
 							attachments = attachmentsUi.attachmentsValues as IAttachment[];
 						}
-						if (
-							attachmentsUi.attachmentsBinary &&
-							(attachmentsUi.attachmentsBinary as IDataObject).length
-						) {
-							if (items[i].binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							for (const { property } of attachmentsUi.attachmentsBinary as IDataObject[]) {
-								const item = items[i].binary as IBinaryKeyData;
-
-								if (item[property as string] === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${property}"`,
-										{ itemIndex: i },
-									);
-								}
-
+						const attachmentsBinary = attachmentsUi.attachmentsBinary as Array<{
+							property: string;
+						}>;
+						if (attachmentsBinary?.length) {
+							for (const { property } of attachmentsBinary) {
+								const binaryData = this.helpers.assertBinaryData(i, property);
 								attachments.push({
-									file_data: item[property as string].data,
-									file_name: item[property as string].fileName,
+									file_data: binaryData.data,
+									file_name: binaryData.fileName,
 								});
 							}
 						}
@@ -815,7 +797,6 @@ export class Keap implements INodeType {
 				}
 				//https://developer.infusionsoft.com/docs/rest/#!/File/createFileUsingPOST
 				if (operation === 'upload') {
-					const binaryData = this.getNodeParameter('binaryData', i);
 					const fileAssociation = this.getNodeParameter('fileAssociation', i) as string;
 					const isPublic = this.getNodeParameter('isPublic', i) as boolean;
 					const body: IFile = {
@@ -826,27 +807,11 @@ export class Keap implements INodeType {
 						const contactId = parseInt(this.getNodeParameter('contactId', i) as string, 10);
 						body.contact_id = contactId;
 					}
-					if (binaryData) {
+					if (this.getNodeParameter('binaryData', i)) {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
-						const item = items[i].binary as IBinaryKeyData;
-
-						if (item[binaryPropertyName] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-								{ itemIndex: i },
-							);
-						}
-
-						body.file_data = item[binaryPropertyName].data;
-						body.file_name = item[binaryPropertyName].fileName;
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+						body.file_data = binaryData.data;
+						body.file_name = binaryData.fileName;
 					} else {
 						const fileName = this.getNodeParameter('fileName', i) as string;
 						const fileData = this.getNodeParameter('fileData', i) as string;
diff --git a/packages/nodes-base/nodes/Line/Line.node.ts b/packages/nodes-base/nodes/Line/Line.node.ts
index 377c90136651e4..160bfd961f2d6d 100644
--- a/packages/nodes-base/nodes/Line/Line.node.ts
+++ b/packages/nodes-base/nodes/Line/Line.node.ts
@@ -1,13 +1,10 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { lineApiRequest } from './GenericFunctions';
 
@@ -97,27 +94,9 @@ export class Line implements INodeType {
 							const image = (body.imageUi as IDataObject).imageValue as IDataObject;
 
 							if (image && image.binaryData === true) {
-								if (items[i].binary === undefined) {
-									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-										itemIndex: i,
-									});
-								}
-								//@ts-ignore
-								if (items[i].binary[image.binaryProperty] === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${image.binaryProperty}"`,
-										{ itemIndex: i },
-									);
-								}
-
-								const binaryData = (items[i].binary as IBinaryKeyData)[
-									image.binaryProperty as string
-								];
-								const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
-									i,
-									image.binaryProperty as string,
-								);
+								const binaryProperty = image.binaryProperty as string;
+								const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
+								const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								body.imageFile = {
 									value: binaryDataBuffer,
diff --git a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
index eee851e9d5abd2..72ca14795bf555 100644
--- a/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
+++ b/packages/nodes-base/nodes/LinkedIn/LinkedIn.node.ts
@@ -1,13 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 import { linkedInApiRequest } from './GenericFunctions';
 import { postFields, postOperations } from './PostDescription';
 
@@ -137,27 +136,11 @@ export class LinkedIn implements INodeType {
 							].uploadUrl as string;
 							const asset = registerObject.value.asset as string;
 
-							// Prepare binary file upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[propertyNameUpload] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${propertyNameUpload}"`,
-									{ itemIndex: i },
-								);
-							}
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							this.helpers.assertBinaryData(i, binaryPropertyName);
 
 							// Buffer binary data
-							const buffer = await this.helpers.getBinaryDataBuffer(i, propertyNameUpload);
+							const buffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 							// Upload image
 							await linkedInApiRequest.call(this, 'POST', uploadUrl, buffer, true);
 
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index f5f70fa92aba53..abb12690e04c5b 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -148,9 +148,7 @@ export class Mailgun implements INodeType {
 						});
 
 					for (const propertyName of attachmentProperties) {
-						if (!item.binary.hasOwnProperty(propertyName)) {
-							continue;
-						}
+						const binaryData = this.helpers.assertBinaryData(itemIndex, propertyName);
 						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 							itemIndex,
 							propertyName,
@@ -158,7 +156,7 @@ export class Mailgun implements INodeType {
 						attachments.push({
 							value: binaryDataBuffer,
 							options: {
-								filename: item.binary[propertyName].fileName || 'unknown',
+								filename: binaryData.fileName || 'unknown',
 							},
 						});
 					}
diff --git a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
index 27118875375911..a01b846934e68d 100644
--- a/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Matrix/GenericFunctions.ts
@@ -1,10 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import { v4 as uuid } from 'uuid';
 
 export async function matrixApiRequest(
@@ -190,25 +194,11 @@ export async function handleMatrixCall(
 			const qs: IDataObject = {};
 			const headers: IDataObject = {};
 
-			if (
-				item.binary === undefined ||
-				//@ts-ignore
-				item.binary[binaryPropertyName] === undefined
-			) {
-				throw new NodeOperationError(
-					this.getNode(),
-					`Item has no binary property called "${binaryPropertyName}"`,
-				);
-			}
-
-			// @ts-ignore
-			qs.filename = item.binary[binaryPropertyName].fileName;
-			//@ts-ignore
-			const filename = item.binary[binaryPropertyName].fileName;
-
+			const { fileName, mimeType } = this.helpers.assertBinaryData(index, binaryPropertyName);
 			body = await this.helpers.getBinaryDataBuffer(index, binaryPropertyName);
-			//@ts-ignore
-			headers['Content-Type'] = item.binary[binaryPropertyName].mimeType;
+
+			qs.filename = fileName;
+			headers['Content-Type'] = mimeType;
 			headers.accept = 'application/json,text/*;q=0.99';
 
 			const uploadRequestResult = await matrixApiRequest.call(
@@ -226,7 +216,7 @@ export async function handleMatrixCall(
 
 			body = {
 				msgtype: `m.${mediaType}`,
-				body: filename,
+				body: fileName,
 				url: uploadRequestResult.content_uri,
 			};
 			const messageId = uuid();
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
index c35b2dfc369d78..0b17f7a25ed6bf 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/MicrosoftOneDrive.node.ts
@@ -1,8 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -197,22 +195,7 @@ export class MicrosoftOneDrive implements INodeType {
 
 						if (isBinaryData) {
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-
-							if (items[i].binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-							//@ts-ignore
-							if (items[i].binary[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const body = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 							let encodedFilename;
 
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
index a8c8ace50333b7..8389f8b6d32d1b 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
@@ -4,7 +4,7 @@ import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions
 import { BINARY_ENCODING } from 'n8n-core';
 
 import type { IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
@@ -228,24 +228,8 @@ export async function binaryToAttachments(
 ) {
 	return Promise.all(
 		attachments.map(async (attachment) => {
-			const { binary } = items[i];
-
-			if (binary === undefined) {
-				throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-					itemIndex: i,
-				});
-			}
-
 			const binaryPropertyName = attachment.binaryPropertyName as string;
-			if (binary[binaryPropertyName] === undefined) {
-				throw new NodeOperationError(
-					this.getNode(),
-					`Item has no binary property called "${binaryPropertyName}"`,
-					{ itemIndex: i },
-				);
-			}
-
-			const binaryData = binary[binaryPropertyName];
+			const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 			const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 			return {
 				'@odata.type': '#microsoft.graph.fileAttachment',
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
index c083dc15443293..c37e7a52be5c1a 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/MicrosoftOutlook.node.ts
@@ -1,8 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -643,19 +641,7 @@ export class MicrosoftOutlook implements INodeType {
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
-						}
-						//@ts-ignore
-						if (items[i].binary[binaryPropertyName] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-								{ itemIndex: i },
-							);
-						}
-
-						const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 						const fileName =
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index 30db7901f445e5..c7b2e79f484eb5 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -1,8 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -160,27 +158,12 @@ export class Mindee implements INodeType {
 			try {
 				if (resource === 'receipt') {
 					if (operation === 'predict') {
-						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
 						const rawData = this.getNodeParameter('rawData', i);
+						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
-						const item = items[i].binary as IBinaryKeyData;
-
-						const binaryData = item[binaryPropertyName];
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
-						if (binaryData === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-							);
-						}
 						if (version === 1) {
 							responseData = await mindeeApiRequest.call(
 								this,
@@ -233,27 +216,12 @@ export class Mindee implements INodeType {
 
 				if (resource === 'invoice') {
 					if (operation === 'predict') {
-						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
 						const rawData = this.getNodeParameter('rawData', i);
+						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
-						const item = items[i].binary as IBinaryKeyData;
-
-						const binaryData = item[binaryPropertyName];
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
-						if (binaryData === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-							);
-						}
 						if (version === 1) {
 							endpoint = '/invoices/v1/predict';
 							responseData = await mindeeApiRequest.call(
diff --git a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
index 25d1dd13a4c0a6..09be2137e64a15 100644
--- a/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
+++ b/packages/nodes-base/nodes/NextCloud/NextCloud.node.ts
@@ -1,8 +1,7 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -902,26 +901,9 @@ export class NextCloud implements INodeType {
 						endpoint = this.getNodeParameter('path', i) as string;
 
 						if (this.getNodeParameter('binaryDataUpload', i) === true) {
-							// Is binary file to upload
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-
-							if (item.binary[propertyNameUpload] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${propertyNameUpload}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							body = await this.helpers.getBinaryDataBuffer(i, propertyNameUpload);
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							this.helpers.assertBinaryData(i, binaryPropertyName);
+							body = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 						} else {
 							// Is text file
 							body = this.getNodeParameter('fileContent', i) as string;
diff --git a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
index 24c7ccaa099b24..71e139a92cd610 100644
--- a/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
+++ b/packages/nodes-base/nodes/NocoDB/NocoDB.node.ts
@@ -1,8 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeType,
@@ -265,20 +264,8 @@ export class NocoDB implements INodeType {
 							if (!field.binaryData) {
 								newItem[field.fieldName] = field.fieldValue;
 							} else if (field.binaryProperty) {
-								if (!items[i].binary) {
-									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-										itemIndex: i,
-									});
-								}
 								const binaryPropertyName = field.binaryProperty;
-								if (binaryPropertyName && !items[i].binary![binaryPropertyName]) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryPropertyName}"`,
-										{ itemIndex: i },
-									);
-								}
-								const binaryData = items[i].binary![binaryPropertyName];
+								const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 								const formData = {
@@ -581,20 +568,8 @@ export class NocoDB implements INodeType {
 							if (!field.binaryData) {
 								newItem[field.fieldName] = field.fieldValue;
 							} else if (field.binaryProperty) {
-								if (!items[i].binary) {
-									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-										itemIndex: i,
-									});
-								}
 								const binaryPropertyName = field.binaryProperty;
-								if (binaryPropertyName && !items[i].binary![binaryPropertyName]) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryPropertyName}"`,
-										{ itemIndex: i },
-									);
-								}
-								const binaryData = items[i].binary![binaryPropertyName];
+								const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 								const formData = {
diff --git a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
index 5bca7f6d2f617c..306885acbce34f 100644
--- a/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/Pipedrive.node.ts
@@ -1,6 +1,7 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
@@ -4337,31 +4338,15 @@ export class Pipedrive implements INodeType {
 						requestMethod = 'POST';
 						endpoint = '/files';
 
-						const item = items[i];
-
-						if (item.binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-								itemIndex: i,
-							});
-						}
-
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-
-						if (item.binary[binaryPropertyName] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryPropertyName}"`,
-								{ itemIndex: i },
-							);
-						}
-
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 						const fileBufferData = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 						formData.file = {
 							value: fileBufferData,
 							options: {
-								contentType: item.binary[binaryPropertyName].mimeType,
-								filename: item.binary[binaryPropertyName].fileName,
+								contentType: binaryData.mimeType,
+								filename: binaryData.fileName,
 							},
 						};
 
diff --git a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
index 55f9dd5d826d4f..1c563f747d08a5 100644
--- a/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
+++ b/packages/nodes-base/nodes/Pushbullet/Pushbullet.node.ts
@@ -1,15 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { pushbulletApiRequest, pushbulletApiRequestAllItems } from './GenericFunctions';
 
@@ -408,20 +405,7 @@ export class Pushbullet implements INodeType {
 
 						if (type === 'file') {
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-
-							if (items[i].binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
-							}
-							//@ts-ignore
-							if (items[i].binary[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 							//create upload url
diff --git a/packages/nodes-base/nodes/Pushover/Pushover.node.ts b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
index a64142e81f1693..477e997d4a654b 100644
--- a/packages/nodes-base/nodes/Pushover/Pushover.node.ts
+++ b/packages/nodes-base/nodes/Pushover/Pushover.node.ts
@@ -1,15 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { pushoverApiRequest } from './GenericFunctions';
 
@@ -339,25 +336,7 @@ export class Pushover implements INodeType {
 
 							if (attachment) {
 								const binaryPropertyName = attachment.binaryPropertyName as string;
-
-								if (items[i].binary === undefined) {
-									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-										itemIndex: i,
-									});
-								}
-
-								const item = items[i].binary as IBinaryKeyData;
-
-								const binaryData = item[binaryPropertyName];
-
-								if (binaryData === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryPropertyName}"`,
-										{ itemIndex: i },
-									);
-								}
-
+								const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 								body.attachment = {
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index 956ded4f7f9e6c..dc3d5f167b4fbd 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -315,23 +315,8 @@ export class Raindrop implements INodeType {
 						// cover-specific endpoint
 
 						if (updateFields.cover) {
-							if (!items[i].binary) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							if (!updateFields.cover) {
-								throw new NodeOperationError(
-									this.getNode(),
-									'Please enter a binary property to upload a cover image.',
-									{ itemIndex: i },
-								);
-							}
-
 							const binaryPropertyName = updateFields.cover as string;
-
-							const binaryData = items[i].binary![binaryPropertyName];
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 							const formData = {
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
index 52422463477f32..8fc6adb182af28 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
@@ -52,11 +52,14 @@ export class ReadPDF implements INodeType {
 					item.binary = {};
 				}
 
-				const binaryData = await this.helpers.getBinaryDataBuffer(itemIndex, binaryPropertyName);
+				const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
+					itemIndex,
+					binaryPropertyName,
+				);
 				returnData.push({
 					binary: item.binary,
 
-					json: (await pdf(binaryData)) as unknown as IDataObject,
+					json: (await pdf(binaryDataBuffer)) as unknown as IDataObject,
 				});
 			} catch (error) {
 				if (this.continueOnFail()) {
diff --git a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
index 8af6f7be067c8e..3296d404c88c5a 100644
--- a/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
+++ b/packages/nodes-base/nodes/RespondToWebhook/RespondToWebhook.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	IN8nHttpFullResponse,
 	IN8nHttpResponse,
 	INodeExecutionData,
@@ -215,7 +214,7 @@ export class RespondToWebhook implements INodeType {
 		} else if (respondWith === 'text') {
 			responseBody = this.getNodeParameter('responseBody', 0) as string;
 		} else if (respondWith === 'binary') {
-			const item = this.getInputData()[0];
+			const item = items[0];
 
 			if (item.binary === undefined) {
 				throw new NodeOperationError(this.getNode(), 'No binary data exists on the first item!');
@@ -235,19 +234,12 @@ export class RespondToWebhook implements INodeType {
 				responseBinaryPropertyName = binaryKeys[0];
 			}
 
-			const binaryData = item.binary[responseBinaryPropertyName];
+			const binaryData = this.helpers.assertBinaryData(0, responseBinaryPropertyName);
 			const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 				0,
 				responseBinaryPropertyName,
 			);
 
-			if (binaryData === undefined) {
-				throw new NodeOperationError(
-					this.getNode(),
-					`Item has no binary property called "${responseBinaryPropertyName}"`,
-				);
-			}
-
 			if (!headers['content-type']) {
 				headers['content-type'] = binaryData.mimeType;
 			}
diff --git a/packages/nodes-base/nodes/S3/S3.node.ts b/packages/nodes-base/nodes/S3/S3.node.ts
index 896ac5d36a0ad3..de9f08825c16d7 100644
--- a/packages/nodes-base/nodes/S3/S3.node.ts
+++ b/packages/nodes-base/nodes/S3/S3.node.ts
@@ -4,11 +4,9 @@ import { createHash } from 'crypto';
 
 import { Builder } from 'xml2js';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -837,22 +835,7 @@ export class S3 implements INodeType {
 
 						if (isBinaryData) {
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', 0);
-
-							if (items[i].binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							if ((items[i].binary as IBinaryKeyData)[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							const binaryData = (items[i].binary as IBinaryKeyData)[binaryPropertyName];
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							body = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 							headers['Content-Type'] = binaryData.mimeType;
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 95997fcd7d688b..09c9bfdcbf7d2f 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -1834,7 +1834,6 @@ export class Salesforce implements INodeType {
 						const title = this.getNodeParameter('title', i) as string;
 						const additionalFields = this.getNodeParameter('additionalFields', i);
 						const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-						let data;
 						const body: { entity_content: { [key: string]: string } } = {
 							entity_content: {
 								Title: title,
@@ -1848,34 +1847,26 @@ export class Salesforce implements INodeType {
 							body.entity_content.FirstPublishLocationId =
 								additionalFields.linkToObjectId as string;
 						}
-						if (items[i].binary && items[i].binary![binaryPropertyName]) {
-							const binaryData = items[i].binary![binaryPropertyName];
-							const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+						const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+						const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
-							body.entity_content.PathOnClient = `${title}.${
-								additionalFields.fileExtension || binaryData.fileExtension
-							}`;
-							data = {
-								entity_content: {
-									value: JSON.stringify(body.entity_content),
-									options: {
-										contentType: 'application/json',
-									},
+						body.entity_content.PathOnClient = `${title}.${
+							additionalFields.fileExtension || binaryData.fileExtension
+						}`;
+						const data = {
+							entity_content: {
+								value: JSON.stringify(body.entity_content),
+								options: {
+									contentType: 'application/json',
 								},
-								VersionData: {
-									value: dataBuffer,
-									options: {
-										filename: body.entity_content.PathOnClient,
-									},
+							},
+							VersionData: {
+								value: dataBuffer,
+								options: {
+									filename: body.entity_content.PathOnClient,
 								},
-							};
-						} else {
-							throw new NodeOperationError(
-								this.getNode(),
-								`The property ${binaryPropertyName} does not exist`,
-								{ itemIndex: i },
-							);
-						}
+							},
+						};
 						responseData = await salesforceApiRequest.call(
 							this,
 							'POST',
diff --git a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
index 09e8769da12076..8409f7d526321a 100644
--- a/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
+++ b/packages/nodes-base/nodes/SendGrid/SendGrid.node.ts
@@ -1,14 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { listFields, listOperations } from './ListDescription';
 
@@ -588,22 +586,13 @@ export class SendGrid implements INodeType {
 							const binaryProperties = attachments.split(',').map((p) => p.trim());
 
 							for (const property of binaryProperties) {
-								if (!items[i].binary?.hasOwnProperty(property)) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`The binary property ${property} does not exist`,
-										{ itemIndex: i },
-									);
-								}
-
-								const binaryProperty = items[i].binary![property];
-
+								const binaryData = this.helpers.assertBinaryData(i, property);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, property);
 
 								attachmentsToSend.push({
 									content: dataBuffer.toString('base64'),
-									filename: binaryProperty.fileName || 'unknown',
-									type: binaryProperty.mimeType,
+									filename: binaryData.fileName || 'unknown',
+									type: binaryData.mimeType,
 								});
 							}
 
diff --git a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
index 4520c02934f77c..73ab3272cf9701 100644
--- a/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendInBlue/GenericFunctions.ts
@@ -84,20 +84,8 @@ export namespace SendInBlueNode {
 				const { binaryPropertyName } = dataPropertyList;
 				const dataMappingList = (binaryPropertyName as string).split(',');
 				for (const attachmentDataName of dataMappingList) {
-					const binaryPropertyAttachmentName = attachmentDataName;
-
-					const item = this.getInputData();
-
-					if (item.binary![binaryPropertyAttachmentName] === undefined) {
-						throw new NodeOperationError(
-							this.getNode(),
-							`Item has no binary property called "${binaryPropertyName}"`,
-						);
-					}
-
-					const bufferFromIncomingData = await this.helpers.getBinaryDataBuffer(
-						binaryPropertyAttachmentName,
-					);
+					const binaryData = this.helpers.assertBinaryData(attachmentDataName);
+					const bufferFromIncomingData = await this.helpers.getBinaryDataBuffer(attachmentDataName);
 
 					const {
 						data: content,
@@ -111,7 +99,7 @@ export namespace SendInBlueNode {
 						itemIndex,
 						mimeType,
 						fileExtension!,
-						fileName || item.binary!.data.fileName!,
+						fileName ?? binaryData.fileName!,
 					);
 
 					attachment.push({ content, name });
diff --git a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
index c1f9f114917299..0a60990513bba3 100644
--- a/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
+++ b/packages/nodes-base/nodes/ServiceNow/ServiceNow.node.ts
@@ -1,8 +1,7 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
-	IBinaryData,
 	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
@@ -605,17 +604,7 @@ export class ServiceNow implements INodeType {
 						const inputDataFieldName = this.getNodeParameter('inputDataFieldName', i) as string;
 						const options = this.getNodeParameter('options', i);
 
-						let binaryData: IBinaryData;
-
-						if (items[i].binary && items[i].binary![inputDataFieldName]) {
-							binaryData = items[i].binary![inputDataFieldName];
-						} else {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${inputDataFieldName}"`,
-								{ itemIndex: i },
-							);
-						}
+						const binaryData = this.helpers.assertBinaryData(i, inputDataFieldName);
 
 						const headers: IDataObject = {
 							'Content-Type': binaryData.mimeType,
diff --git a/packages/nodes-base/nodes/Signl4/Signl4.node.ts b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
index ad40f543109820..58bb4e6aab0bbc 100644
--- a/packages/nodes-base/nodes/Signl4/Signl4.node.ts
+++ b/packages/nodes-base/nodes/Signl4/Signl4.node.ts
@@ -1,8 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -279,39 +277,31 @@ export class Signl4 implements INodeType {
 
 						// Attachments
 						const attachments = additionalFields.attachmentsUi as IDataObject;
-						if (attachments) {
-							if (attachments.attachmentsBinary && items[i].binary) {
-								const propertyName = (attachments.attachmentsBinary as IDataObject)
-									.property as string;
-
-								const binaryProperty = (items[i].binary as IBinaryKeyData)[propertyName];
+						if (attachments?.attachmentsBinary) {
+							const propertyName = (attachments.attachmentsBinary as IDataObject)
+								.property as string;
 
-								if (binaryProperty) {
-									const supportedFileExtension = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'mp3', 'wav'];
+							const binaryData = this.helpers.assertBinaryData(i, propertyName);
 
-									if (!supportedFileExtension.includes(binaryProperty.fileExtension as string)) {
-										throw new NodeOperationError(
-											this.getNode(),
-											`Invalid extension, just ${supportedFileExtension.join(',')} are supported}`,
-											{ itemIndex: i },
-										);
-									}
+							if (binaryData) {
+								const supportedFileExtension = ['png', 'jpg', 'jpeg', 'bmp', 'gif', 'mp3', 'wav'];
 
-									const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, propertyName);
-									data.attachment = {
-										value: binaryDataBuffer,
-										options: {
-											filename: binaryProperty.fileName,
-											contentType: binaryProperty.mimeType,
-										},
-									};
-								} else {
+								if (!supportedFileExtension.includes(binaryData.fileExtension as string)) {
 									throw new NodeOperationError(
 										this.getNode(),
-										`Binary property ${propertyName} does not exist on input`,
+										`Invalid extension, just ${supportedFileExtension.join(',')} are supported}`,
 										{ itemIndex: i },
 									);
 								}
+
+								const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, propertyName);
+								data.attachment = {
+									value: binaryDataBuffer,
+									options: {
+										filename: binaryData.fileName,
+										contentType: binaryData.mimeType,
+									},
+								};
 							}
 						}
 
diff --git a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
index cf97def17b75f1..26d169f39d71d3 100644
--- a/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
+++ b/packages/nodes-base/nodes/Slack/V1/SlackV1.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -1076,7 +1075,6 @@ export class SlackV1 implements INodeType {
 					//https://api.slack.com/methods/files.upload
 					if (operation === 'upload') {
 						const options = this.getNodeParameter('options', i);
-						const binaryData = this.getNodeParameter('binaryData', i);
 						const body: IDataObject = {};
 						if (options.channelIds) {
 							body.channels = (options.channelIds as string[]).join(',');
@@ -1093,31 +1091,18 @@ export class SlackV1 implements INodeType {
 						if (options.title) {
 							body.title = options.title as string;
 						}
-						if (binaryData) {
+						if (this.getNodeParameter('binaryData', i)) {
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							if (
-								items[i].binary === undefined ||
-								//@ts-ignore
-								items[i].binary[binaryPropertyName] === undefined
-							) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(
 								i,
 								binaryPropertyName,
 							);
 							body.file = {
-								//@ts-ignore
 								value: binaryDataBuffer,
 								options: {
-									//@ts-ignore
-									filename: items[i].binary[binaryPropertyName].fileName,
-									//@ts-ignore
-									contentType: items[i].binary[binaryPropertyName].mimeType,
+									filename: binaryData.fileName,
+									contentType: binaryData.mimeType,
 								},
 							};
 							responseData = await slackApiRequest.call(
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 5bed04d053d8f6..930f6b3e97230e 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -1,9 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 import type { Readable } from 'stream';
 
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeListSearchItems,
@@ -1043,7 +1043,6 @@ export class SlackV2 implements INodeType {
 					//https://api.slack.com/methods/files.upload
 					if (operation === 'upload') {
 						const options = this.getNodeParameter('options', i);
-						const binaryData = this.getNodeParameter('binaryData', i);
 						const body: IDataObject = {};
 						if (options.channelIds) {
 							body.channels = (options.channelIds as string[]).join(',');
@@ -1060,34 +1059,21 @@ export class SlackV2 implements INodeType {
 						if (options.title) {
 							body.title = options.title as string;
 						}
-						if (binaryData) {
+						if (this.getNodeParameter('binaryData', i)) {
 							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
-							if (
-								items[i].binary === undefined ||
-								//@ts-ignore
-								items[i].binary[binaryPropertyName] === undefined
-							) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
+
 							let uploadData: Buffer | Readable;
-							const itemBinaryData = items[i].binary![binaryPropertyName];
-							if (itemBinaryData.id) {
-								uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+							if (binaryData.id) {
+								uploadData = this.helpers.getBinaryStream(binaryData.id);
 							} else {
-								uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+								uploadData = Buffer.from(binaryData.data, BINARY_ENCODING);
 							}
 							body.file = {
-								//@ts-ignore
 								value: uploadData,
 								options: {
-									//@ts-ignore
-									filename: itemBinaryData.fileName,
-									//@ts-ignore
-									contentType: itemBinaryData.mimeType,
+									filename: binaryData.fileName,
+									contentType: binaryData.mimeType,
 								},
 							};
 							responseData = await slackApiRequest.call(
diff --git a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
index ea08c2d698dec2..ac51121f9b8844 100644
--- a/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
+++ b/packages/nodes-base/nodes/SpreadsheetFile/SpreadsheetFile.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
@@ -295,30 +294,22 @@ export class SpreadsheetFile implements INodeType {
 
 		if (operation === 'fromFile') {
 			// Read data from spreadsheet file to workflow
-
-			let item: INodeExecutionData;
 			for (let i = 0; i < items.length; i++) {
 				try {
-					item = items[i];
-
 					const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
 					const options = this.getNodeParameter('options', i, {});
 
-					if (item.binary === undefined || item.binary[binaryPropertyName] === undefined) {
-						// Property did not get found on item
-						continue;
-					}
-
+					this.helpers.assertBinaryData(i, binaryPropertyName);
 					// Read the binary spreadsheet data
-					const binaryData = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
+					const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 					let workbook;
 					if (options.readAsString === true) {
-						workbook = xlsxRead(binaryData.toString(), {
+						workbook = xlsxRead(binaryDataBuffer.toString(), {
 							type: 'string',
 							raw: options.rawData as boolean,
 						});
 					} else {
-						workbook = xlsxRead(binaryData, { raw: options.rawData as boolean });
+						workbook = xlsxRead(binaryDataBuffer, { raw: options.rawData as boolean });
 					}
 
 					if (workbook.SheetNames.length === 0) {
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index b846ecb67971e0..0c0063314fc090 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -1,13 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
 
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { rm, writeFile } from 'fs/promises';
 
@@ -341,25 +340,8 @@ export class Ssh implements INodeType {
 							const parameterPath = this.getNodeParameter('path', i) as string;
 							const fileName = this.getNodeParameter('options.fileName', i, '') as string;
 
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
-							const propertyNameUpload = this.getNodeParameter('binaryPropertyName', i);
-
-							const binaryData = item.binary[propertyNameUpload];
-
-							if (item.binary[propertyNameUpload] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${propertyNameUpload}"`,
-									{ itemIndex: i },
-								);
-							}
+							const binaryPropertyName = this.getNodeParameter('binaryPropertyName', i);
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 
 							let uploadData: Buffer | Readable;
 							if (binaryData.id) {
diff --git a/packages/nodes-base/nodes/TheHive/TheHive.node.ts b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
index d868d230253022..4a89fadafc8b1c 100644
--- a/packages/nodes-base/nodes/TheHive/TheHive.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHive.node.ts
@@ -1,8 +1,7 @@
 /* eslint-disable @typescript-eslint/dot-notation */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeParameters,
@@ -10,7 +9,6 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { alertFields, alertOperations } from './descriptions/AlertDescription';
 
@@ -427,28 +425,8 @@ export class TheHive implements INodeType {
 									element.data = artifactvalue.data as string;
 
 									if (artifactvalue.dataType === 'file') {
-										const item = items[i];
-
-										if (item.binary === undefined) {
-											throw new NodeOperationError(
-												this.getNode(),
-												'No binary data exists on item!',
-												{ itemIndex: i },
-											);
-										}
-
 										const binaryPropertyName = artifactvalue.binaryProperty as string;
-
-										if (item.binary[binaryPropertyName] === undefined) {
-											throw new NodeOperationError(
-												this.getNode(),
-												`Item has no binary property called "${binaryPropertyName}"`,
-												{ itemIndex: i },
-											);
-										}
-
-										const binaryData = item.binary[binaryPropertyName];
-
+										const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 										element.data = `${binaryData.fileName};${binaryData.mimeType};${binaryData.data}`;
 									}
 
@@ -704,28 +682,8 @@ export class TheHive implements INodeType {
 									element.data = artifactvalue.data as string;
 
 									if (artifactvalue.dataType === 'file') {
-										const item = items[i];
-
-										if (item.binary === undefined) {
-											throw new NodeOperationError(
-												this.getNode(),
-												'No binary data exists on item!',
-												{ itemIndex: i },
-											);
-										}
-
 										const binaryPropertyName = artifactvalue.binaryProperty as string;
-
-										if (item.binary[binaryPropertyName] === undefined) {
-											throw new NodeOperationError(
-												this.getNode(),
-												`Item has no binary property called "${binaryPropertyName}"`,
-												{ itemIndex: i },
-											);
-										}
-
-										const binaryData = item.binary[binaryPropertyName];
-
+										const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 										element.data = `${binaryData.fileName};${binaryData.mimeType};${binaryData.data}`;
 									}
 
@@ -905,25 +863,8 @@ export class TheHive implements INodeType {
 						let options: IDataObject = {};
 
 						if (body.dataType === 'file') {
-							const item = items[i];
-
-							if (item.binary === undefined) {
-								throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-									itemIndex: i,
-								});
-							}
-
 							const binaryPropertyName = this.getNodeParameter('binaryProperty', i);
-
-							if (item.binary[binaryPropertyName] === undefined) {
-								throw new NodeOperationError(
-									this.getNode(),
-									`Item has no binary property called "${binaryPropertyName}"`,
-									{ itemIndex: i },
-								);
-							}
-
-							const binaryData = item.binary[binaryPropertyName];
+							const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 							const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 							options = {
@@ -1765,25 +1706,8 @@ export class TheHive implements INodeType {
 								.attachmentValues as IDataObject;
 
 							if (attachmentValues) {
-								const item = items[i];
-
-								if (item.binary === undefined) {
-									throw new NodeOperationError(this.getNode(), 'No binary data exists on item!', {
-										itemIndex: i,
-									});
-								}
-
 								const binaryPropertyName = attachmentValues.binaryProperty as string;
-
-								if (item.binary[binaryPropertyName] === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryPropertyName}"`,
-										{ itemIndex: i },
-									);
-								}
-
-								const binaryData = item.binary[binaryPropertyName];
+								const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
 
 								options = {
diff --git a/packages/nodes-base/nodes/Twist/Twist.node.ts b/packages/nodes-base/nodes/Twist/Twist.node.ts
index 0262339160feb8..3a7a646b3d5fba 100644
--- a/packages/nodes-base/nodes/Twist/Twist.node.ts
+++ b/packages/nodes-base/nodes/Twist/Twist.node.ts
@@ -1,15 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
-	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
 
 import { twistApiRequest } from './GenericFunctions';
 
@@ -254,18 +251,7 @@ export class Twist implements INodeType {
 							const attachments: IDataObject[] = [];
 
 							for (const binaryProperty of binaryProperties) {
-								const item = items[i].binary as IBinaryKeyData;
-
-								const binaryData = item[binaryProperty];
-
-								if (binaryData === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryProperty}"`,
-										{ itemIndex: i },
-									);
-								}
-
+								const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
@@ -363,18 +349,7 @@ export class Twist implements INodeType {
 							const attachments: IDataObject[] = [];
 
 							for (const binaryProperty of binaryProperties) {
-								const item = items[i].binary as IBinaryKeyData;
-
-								const binaryData = item[binaryProperty];
-
-								if (binaryData === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryProperty}"`,
-										{ itemIndex: i },
-									);
-								}
-
+								const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
@@ -442,18 +417,7 @@ export class Twist implements INodeType {
 							const attachments: IDataObject[] = [];
 
 							for (const binaryProperty of binaryProperties) {
-								const item = items[i].binary as IBinaryKeyData;
-
-								const binaryData = item[binaryProperty];
-
-								if (binaryData === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryProperty}"`,
-										{ itemIndex: i },
-									);
-								}
-
+								const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
@@ -567,18 +531,7 @@ export class Twist implements INodeType {
 							const attachments: IDataObject[] = [];
 
 							for (const binaryProperty of binaryProperties) {
-								const item = items[i].binary as IBinaryKeyData;
-
-								const binaryData = item[binaryProperty];
-
-								if (binaryData === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryProperty}"`,
-										{ itemIndex: i },
-									);
-								}
-
+								const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
@@ -651,18 +604,7 @@ export class Twist implements INodeType {
 							const attachments: IDataObject[] = [];
 
 							for (const binaryProperty of binaryProperties) {
-								const item = items[i].binary as IBinaryKeyData;
-
-								const binaryData = item[binaryProperty];
-
-								if (binaryData === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryProperty}"`,
-										{ itemIndex: i },
-									);
-								}
-
+								const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
@@ -759,18 +701,7 @@ export class Twist implements INodeType {
 							const attachments: IDataObject[] = [];
 
 							for (const binaryProperty of binaryProperties) {
-								const item = items[i].binary as IBinaryKeyData;
-
-								const binaryData = item[binaryProperty];
-
-								if (binaryData === undefined) {
-									throw new NodeOperationError(
-										this.getNode(),
-										`Item has no binary property called "${binaryProperty}"`,
-										{ itemIndex: i },
-									);
-								}
-
+								const binaryData = this.helpers.assertBinaryData(i, binaryProperty);
 								const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
 
 								attachments.push(
diff --git a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
index 32481f2344b30b..94194b82436f07 100644
--- a/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twitter/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUrl } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IBinaryKeyData, IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
 export async function twitterApiRequest(
@@ -80,7 +80,6 @@ export function chunks(buffer: Buffer, chunkSize: number) {
 export async function uploadAttachments(
 	this: IExecuteFunctions,
 	binaryProperties: string[],
-	items: INodeExecutionData[],
 	i: number,
 ) {
 	const uploadUri = 'https://upload.twitter.com/1.1/media/upload.json';
@@ -88,27 +87,14 @@ export async function uploadAttachments(
 	const media: IDataObject[] = [];
 
 	for (const binaryPropertyName of binaryProperties) {
-		const binaryData = items[i].binary as IBinaryKeyData;
-
-		if (binaryData === undefined) {
-			throw new NodeOperationError(
-				this.getNode(),
-				'No binary data set. So file can not be written!',
-				{ itemIndex: i },
-			);
-		}
-
-		if (!binaryData[binaryPropertyName]) {
-			continue;
-		}
-
 		let attachmentBody = {};
 		let response: IDataObject = {};
 
+		const binaryData = this.helpers.assertBinaryData(i, binaryPropertyName);
 		const dataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
-		const isAnimatedWebp = dataBuffer.toString().indexOf('ANMF') !== -1;
 
-		const isImage = binaryData[binaryPropertyName].mimeType.includes('image');
+		const isAnimatedWebp = dataBuffer.toString().indexOf('ANMF') !== -1;
+		const isImage = binaryData.mimeType.includes('image');
 
 		if (isImage && isAnimatedWebp) {
 			throw new NodeOperationError(
@@ -120,7 +106,7 @@ export async function uploadAttachments(
 
 		if (isImage) {
 			const form = {
-				media_data: binaryData[binaryPropertyName].data,
+				media_data: binaryData.data,
 			};
 
 			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
@@ -130,13 +116,10 @@ export async function uploadAttachments(
 			media.push(response);
 		} else {
 			// https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-init
-
-			const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryPropertyName);
-
 			attachmentBody = {
 				command: 'INIT',
-				total_bytes: binaryDataBuffer.byteLength,
-				media_type: binaryData[binaryPropertyName].mimeType,
+				total_bytes: dataBuffer.byteLength,
+				media_type: binaryData.mimeType,
 			};
 
 			response = await twitterApiRequest.call(this, 'POST', '', {}, {}, uploadUri, {
@@ -147,7 +130,7 @@ export async function uploadAttachments(
 
 			// break the data on 5mb chunks (max size that can be uploaded at once)
 
-			const binaryParts = chunks(binaryDataBuffer, 5242880);
+			const binaryParts = chunks(dataBuffer, 5242880);
 
 			let index = 0;
 
@@ -155,7 +138,7 @@ export async function uploadAttachments(
 				//https://developer.twitter.com/en/docs/media/upload-media/api-reference/post-media-upload-append
 
 				attachmentBody = {
-					name: binaryData[binaryPropertyName].fileName,
+					name: binaryData.fileName,
 					command: 'APPEND',
 					media_id: mediaId,
 					media_data: Buffer.from(binaryPart).toString('base64'),
diff --git a/packages/nodes-base/nodes/Twitter/Twitter.node.ts b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
index 37945c90339330..96507dee31d9c7 100644
--- a/packages/nodes-base/nodes/Twitter/Twitter.node.ts
+++ b/packages/nodes-base/nodes/Twitter/Twitter.node.ts
@@ -1,7 +1,7 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
 	INodeType,
@@ -125,7 +125,7 @@ export class Twitter implements INodeType {
 								return propertyName.trim();
 							});
 
-							const medias = await uploadAttachments.call(this, attachmentProperties, items, i);
+							const medias = await uploadAttachments.call(this, attachmentProperties, i);
 							body.message_create.message_data.attachment = {
 								type: 'media',
 								//@ts-ignore
@@ -166,7 +166,7 @@ export class Twitter implements INodeType {
 								return propertyName.trim();
 							});
 
-							const medias = await uploadAttachments.call(this, attachmentProperties, items, i);
+							const medias = await uploadAttachments.call(this, attachmentProperties, i);
 
 							body.media_ids = (medias as IDataObject[])
 								.map((media: IDataObject) => media.media_id_string)
diff --git a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
index 40298e00ab9191..643c543f4d3fe7 100644
--- a/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
+++ b/packages/nodes-base/nodes/WhatsApp/MediaFunctions.ts
@@ -10,25 +10,20 @@ export async function getUploadFormData(
 	if (!mediaPropertyName)
 		throw new NodeOperationError(this.getNode(), 'Parameter "mediaPropertyName" is not defined');
 
-	const { binary: binaryData } = this.getInputData();
-	if (!binaryData) throw new NodeOperationError(this.getNode(), 'Binary data missing in input');
-
-	const binaryFile = binaryData[mediaPropertyName];
-	if (binaryFile === undefined)
-		throw new NodeOperationError(this.getNode(), 'Could not find file in node input data');
+	const binaryData = this.helpers.assertBinaryData(mediaPropertyName);
 
 	const mediaFileName = (this.getNodeParameter('additionalFields') as IDataObject).mediaFileName as
 		| string
 		| undefined;
 
-	const fileName = mediaFileName || binaryFile.fileName;
+	const fileName = mediaFileName || binaryData.fileName;
 	if (!fileName)
 		throw new NodeOperationError(this.getNode(), 'No file name given for media upload.');
 
 	const buffer = await this.helpers.getBinaryDataBuffer(mediaPropertyName);
 
 	const formData = new FormData();
-	formData.append('file', buffer, { contentType: binaryFile.mimeType, filename: fileName });
+	formData.append('file', buffer, { contentType: binaryData.mimeType, filename: fileName });
 	formData.append('messaging_product', 'whatsapp');
 
 	return { fileName, formData };
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index 9b07c512139bcf..dc3695c4aafde6 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -1,7 +1,10 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import { BINARY_ENCODING } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 import { writeFile as fsWriteFile } from 'fs/promises';
 import type { Readable } from 'stream';
@@ -76,22 +79,6 @@ export class WriteBinaryFile implements INodeType {
 
 				item = items[itemIndex];
 
-				if (item.binary === undefined) {
-					throw new NodeOperationError(
-						this.getNode(),
-						'No binary data set. So file can not be written!',
-						{ itemIndex },
-					);
-				}
-				const itemBinaryData = item.binary[dataPropertyName];
-				if (itemBinaryData === undefined) {
-					throw new NodeOperationError(
-						this.getNode(),
-						`The binary property "${dataPropertyName}" does not exist. So no file can be written!`,
-						{ itemIndex },
-					);
-				}
-
 				const newItem: INodeExecutionData = {
 					json: {},
 					pairedItem: {
@@ -100,11 +87,13 @@ export class WriteBinaryFile implements INodeType {
 				};
 				Object.assign(newItem.json, item.json);
 
+				const binaryData = this.helpers.assertBinaryData(itemIndex, dataPropertyName);
+
 				let fileContent: Buffer | Readable;
-				if (itemBinaryData.id) {
-					fileContent = this.helpers.getBinaryStream(itemBinaryData.id);
+				if (binaryData.id) {
+					fileContent = this.helpers.getBinaryStream(binaryData.id);
 				} else {
-					fileContent = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+					fileContent = Buffer.from(binaryData.data, BINARY_ENCODING);
 				}
 
 				// Write the file to disk
diff --git a/packages/nodes-base/nodes/Zulip/Zulip.node.ts b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
index e26be1c8284e39..d163487ad50974 100644
--- a/packages/nodes-base/nodes/Zulip/Zulip.node.ts
+++ b/packages/nodes-base/nodes/Zulip/Zulip.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
@@ -192,29 +192,16 @@ export class Zulip implements INodeType {
 					//https://zulipchat.com/api/upload-file
 					if (operation === 'updateFile') {
 						const credentials = await this.getCredentials('zulipApi');
-						const binaryProperty = this.getNodeParameter('dataBinaryProperty', i);
-						if (items[i].binary === undefined) {
-							throw new NodeOperationError(this.getNode(), 'No binary data exists on item!');
-						}
-						//@ts-ignore
-						if (items[i].binary[binaryProperty] === undefined) {
-							throw new NodeOperationError(
-								this.getNode(),
-								`Item has no binary property called "${binaryProperty}"`,
-								{ itemIndex: i },
-							);
-						}
+						const dataBinaryProperty = this.getNodeParameter('dataBinaryProperty', i);
 
-						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, binaryProperty);
+						const binaryData = this.helpers.assertBinaryData(i, dataBinaryProperty);
+						const binaryDataBuffer = await this.helpers.getBinaryDataBuffer(i, dataBinaryProperty);
 						const formData = {
 							file: {
-								//@ts-ignore
 								value: binaryDataBuffer,
 								options: {
-									//@ts-ignore
-									filename: items[i].binary[binaryProperty].fileName,
-									//@ts-ignore
-									contentType: items[i].binary[binaryProperty].mimeType,
+									filename: binaryData.fileName,
+									contentType: binaryData.mimeType,
 								},
 							},
 						};
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 1f9372c2c36cdb..0e317075d3a4a6 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -757,6 +757,7 @@ export type IExecuteFunctions = ExecuteFunctions.GetNodeParameterFn &
 					inputData: INodeExecutionData[],
 					options: { itemData: IPairedItemData | IPairedItemData[] },
 				): NodeExecutionWithMetadata[];
+				assertBinaryData(itemIndex: number, propertyName: string): IBinaryData;
 				getBinaryDataBuffer(itemIndex: number, propertyName: string): Promise<Buffer>;
 			};
 	};
@@ -772,6 +773,7 @@ export interface IExecuteSingleFunctions extends BaseExecutionFunctions {
 
 	helpers: RequestHelperFunctions &
 		BinaryHelperFunctions & {
+			assertBinaryData(propertyName: string, inputIndex?: number): IBinaryData;
 			getBinaryDataBuffer(propertyName: string, inputIndex?: number): Promise<Buffer>;
 		};
 }
diff --git a/packages/workflow/src/NodeHelpers.ts b/packages/workflow/src/NodeHelpers.ts
index bfef53b0aa55bd..ee24b84df9f281 100644
--- a/packages/workflow/src/NodeHelpers.ts
+++ b/packages/workflow/src/NodeHelpers.ts
@@ -457,7 +457,7 @@ function getParameterDependencies(nodePropertiesArray: INodeProperties[]): IPara
  * to have the parameters available they depend on
  *
  */
-export function getParamterResolveOrder(
+export function getParameterResolveOrder(
 	nodePropertiesArray: INodeProperties[],
 	parameterDependencies: IParameterDependencies,
 ): number[] {
@@ -583,7 +583,7 @@ export function getNodeParameters(
 	nodeValuesRoot = nodeValuesRoot || nodeValuesDisplayCheck;
 
 	// Go through the parameters in order of their dependencies
-	const parameterItterationOrderIndex = getParamterResolveOrder(
+	const parameterItterationOrderIndex = getParameterResolveOrder(
 		nodePropertiesArray,
 		parameterDependencies,
 	);

From 6c1286fadfae6682879fa3958f67e857f17fe142 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 7 Mar 2023 10:58:27 +0100
Subject: [PATCH 332/358] ci: Remove second code owners for migrations (#5636)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ci: Remove second code owners for migrations

* add a new line at the end of the file

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <netroy@users.noreply.github.com>
---
 .github/CODEOWNERS | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index dd38940b88c50c..d5b4f4a0d081e8 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1,2 +1 @@
-# require two approvals for any database migration
-packages/cli/src/databases/migrations/ @n8n-io/migrations-review @n8n-io/migrations-second-review
\ No newline at end of file
+packages/cli/src/databases/migrations/ @n8n-io/migrations-review

From 0b5ef09e7cbd0c80a4b79311976b5c06c2be8747 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Tue, 7 Mar 2023 14:18:10 +0100
Subject: [PATCH 333/358] feat(core): Add advancedFilters feature flag (#5638)

adds advancedFilters feature flag
---
 packages/cli/src/Interfaces.ts                  | 1 +
 packages/cli/src/License.ts                     | 4 ++++
 packages/cli/src/Server.ts                      | 7 ++++++-
 packages/cli/src/config/schema.ts               | 4 ++++
 packages/cli/src/constants.ts                   | 1 +
 packages/cli/src/executions/executionHelpers.ts | 9 ++++++++-
 6 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 24f7f1f7550fcf..94cfa094c6b0b1 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -524,6 +524,7 @@ export interface IN8nUISettings {
 		ldap: boolean;
 		saml: boolean;
 		logStreaming: boolean;
+		advancedFilters: boolean;
 	};
 	hideUsagePage: boolean;
 	license: {
diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index 66952b0080a1c8..1a5d5a61222aaa 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -106,6 +106,10 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.SAML);
 	}
 
+	isAdvancedFiltersEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_FILTERS);
+	}
+
 	getCurrentEntitlements() {
 		return this.manager?.getCurrentEntitlements() ?? [];
 	}
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index d2f2e557a96c45..af05fcbdec2186 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -144,7 +144,10 @@ import { PostHogClient } from './posthog';
 import { eventBus } from './eventbus';
 import { Container } from 'typedi';
 import { InternalHooks } from './InternalHooks';
-import { getStatusUsingPreviousExecutionStatusMethod } from './executions/executionHelpers';
+import {
+	getStatusUsingPreviousExecutionStatusMethod,
+	isAdvancedFiltersEnabled,
+} from './executions/executionHelpers';
 import { getSamlLoginLabel, isSamlLoginEnabled, isSamlLicensed } from './sso/saml/samlHelpers';
 import { samlControllerPublic } from './sso/saml/routes/saml.controller.public.ee';
 import { SamlService } from './sso/saml/saml.service.ee';
@@ -300,6 +303,7 @@ class Server extends AbstractServer {
 				ldap: false,
 				saml: false,
 				logStreaming: config.getEnv('enterprise.features.logStreaming'),
+				advancedFilters: config.getEnv('enterprise.features.advancedFilters'),
 			},
 			hideUsagePage: config.getEnv('hideUsagePage'),
 			license: {
@@ -328,6 +332,7 @@ class Server extends AbstractServer {
 			logStreaming: isLogStreamingEnabled(),
 			ldap: isLdapEnabled(),
 			saml: isSamlLicensed(),
+			advancedFilters: isAdvancedFiltersEnabled(),
 		});
 
 		if (isLdapEnabled()) {
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index 0ec5c9a623d43d..fab6d8bcf6722b 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1008,6 +1008,10 @@ export const schema = {
 				format: Boolean,
 				default: false,
 			},
+			advancedFilters: {
+				format: Boolean,
+				default: false,
+			},
 		},
 	},
 
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index bcca817b40b4b0..141d33f80ade2a 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -72,6 +72,7 @@ export enum LICENSE_FEATURES {
 	LDAP = 'feat:ldap',
 	SAML = 'feat:saml',
 	LOG_STREAMING = 'feat:logStreaming',
+	ADVANCED_FILTERS = 'feat:advancedFilters',
 }
 
 export const CREDENTIAL_BLANKING_VALUE = '__n8n_BLANK_VALUE_e5362baf-c777-4d57-a609-6eaf1f9e87f6';
diff --git a/packages/cli/src/executions/executionHelpers.ts b/packages/cli/src/executions/executionHelpers.ts
index 21ee792b05cbcc..4e4495390787fe 100644
--- a/packages/cli/src/executions/executionHelpers.ts
+++ b/packages/cli/src/executions/executionHelpers.ts
@@ -1,5 +1,7 @@
-import type { IExecutionFlattedDb } from '../Interfaces';
+import type { IExecutionFlattedDb } from '@/Interfaces';
 import type { ExecutionStatus } from 'n8n-workflow';
+import { getLicense } from '@/License';
+import config from '@/config';
 
 export function getStatusUsingPreviousExecutionStatusMethod(
 	execution: IExecutionFlattedDb,
@@ -16,3 +18,8 @@ export function getStatusUsingPreviousExecutionStatusMethod(
 		return 'unknown';
 	}
 }
+
+export function isAdvancedFiltersEnabled(): boolean {
+	const license = getLicense();
+	return config.getEnv('enterprise.features.advancedFilters') || license.isAdvancedFiltersEnabled();
+}

From e52aa46842bc0b02e7959b7aeca1aae6e4d07572 Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Tue, 7 Mar 2023 15:41:02 +0100
Subject: [PATCH 334/358] chore: Clean up distribution test (#5639)

---
 packages/editor-ui/src/constants.ts | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 3ec49d329f4c24..8dc8124244c051 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -520,14 +520,4 @@ export const ONBOARDING_EXPERIMENT = {
 	variant: 'variant',
 };
 
-export const DISTRIBUTION_EXPERIMENT = {
-	name: '001_distribution_test',
-	control: 'control',
-	variant: 'variant',
-};
-
-export const EXPERIMENTS_TO_TRACK = [
-	DISTRIBUTION_EXPERIMENT.name,
-	ASSUMPTION_EXPERIMENT.name,
-	ONBOARDING_EXPERIMENT.name,
-];
+export const EXPERIMENTS_TO_TRACK = [ASSUMPTION_EXPERIMENT.name, ONBOARDING_EXPERIMENT.name];

From 419969c0d761b1ac7870e7821c0398ecfca1f0ce Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Tue, 7 Mar 2023 18:35:52 +0100
Subject: [PATCH 335/358] fix(core): Rename advancedFilters to
 advancedExecutionFilters (#5643)

rename advancedFilters to advancedExecutionFilters
---
 packages/cli/src/Interfaces.ts                  | 2 +-
 packages/cli/src/License.ts                     | 4 ++--
 packages/cli/src/Server.ts                      | 6 +++---
 packages/cli/src/config/schema.ts               | 2 +-
 packages/cli/src/constants.ts                   | 2 +-
 packages/cli/src/executions/executionHelpers.ts | 7 +++++--
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/packages/cli/src/Interfaces.ts b/packages/cli/src/Interfaces.ts
index 94cfa094c6b0b1..d801e5e3cc0a0a 100644
--- a/packages/cli/src/Interfaces.ts
+++ b/packages/cli/src/Interfaces.ts
@@ -524,7 +524,7 @@ export interface IN8nUISettings {
 		ldap: boolean;
 		saml: boolean;
 		logStreaming: boolean;
-		advancedFilters: boolean;
+		advancedExecutionFilters: boolean;
 	};
 	hideUsagePage: boolean;
 	license: {
diff --git a/packages/cli/src/License.ts b/packages/cli/src/License.ts
index 1a5d5a61222aaa..35ed8360606ec6 100644
--- a/packages/cli/src/License.ts
+++ b/packages/cli/src/License.ts
@@ -106,8 +106,8 @@ export class License {
 		return this.isFeatureEnabled(LICENSE_FEATURES.SAML);
 	}
 
-	isAdvancedFiltersEnabled() {
-		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_FILTERS);
+	isAdvancedExecutionFiltersEnabled() {
+		return this.isFeatureEnabled(LICENSE_FEATURES.ADVANCED_EXECUTION_FILTERS);
 	}
 
 	getCurrentEntitlements() {
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index af05fcbdec2186..92e81161d327ec 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -146,7 +146,7 @@ import { Container } from 'typedi';
 import { InternalHooks } from './InternalHooks';
 import {
 	getStatusUsingPreviousExecutionStatusMethod,
-	isAdvancedFiltersEnabled,
+	isAdvancedExecutionFiltersEnabled,
 } from './executions/executionHelpers';
 import { getSamlLoginLabel, isSamlLoginEnabled, isSamlLicensed } from './sso/saml/samlHelpers';
 import { samlControllerPublic } from './sso/saml/routes/saml.controller.public.ee';
@@ -303,7 +303,7 @@ class Server extends AbstractServer {
 				ldap: false,
 				saml: false,
 				logStreaming: config.getEnv('enterprise.features.logStreaming'),
-				advancedFilters: config.getEnv('enterprise.features.advancedFilters'),
+				advancedExecutionFilters: config.getEnv('enterprise.features.advancedExecutionFilters'),
 			},
 			hideUsagePage: config.getEnv('hideUsagePage'),
 			license: {
@@ -332,7 +332,7 @@ class Server extends AbstractServer {
 			logStreaming: isLogStreamingEnabled(),
 			ldap: isLdapEnabled(),
 			saml: isSamlLicensed(),
-			advancedFilters: isAdvancedFiltersEnabled(),
+			advancedExecutionFilters: isAdvancedExecutionFiltersEnabled(),
 		});
 
 		if (isLdapEnabled()) {
diff --git a/packages/cli/src/config/schema.ts b/packages/cli/src/config/schema.ts
index fab6d8bcf6722b..5d9cb40045740c 100644
--- a/packages/cli/src/config/schema.ts
+++ b/packages/cli/src/config/schema.ts
@@ -1008,7 +1008,7 @@ export const schema = {
 				format: Boolean,
 				default: false,
 			},
-			advancedFilters: {
+			advancedExecutionFilters: {
 				format: Boolean,
 				default: false,
 			},
diff --git a/packages/cli/src/constants.ts b/packages/cli/src/constants.ts
index 141d33f80ade2a..2a984afb54cbaa 100644
--- a/packages/cli/src/constants.ts
+++ b/packages/cli/src/constants.ts
@@ -72,7 +72,7 @@ export enum LICENSE_FEATURES {
 	LDAP = 'feat:ldap',
 	SAML = 'feat:saml',
 	LOG_STREAMING = 'feat:logStreaming',
-	ADVANCED_FILTERS = 'feat:advancedFilters',
+	ADVANCED_EXECUTION_FILTERS = 'feat:advancedExecutionFilters',
 }
 
 export const CREDENTIAL_BLANKING_VALUE = '__n8n_BLANK_VALUE_e5362baf-c777-4d57-a609-6eaf1f9e87f6';
diff --git a/packages/cli/src/executions/executionHelpers.ts b/packages/cli/src/executions/executionHelpers.ts
index 4e4495390787fe..b6fe81e1f1237d 100644
--- a/packages/cli/src/executions/executionHelpers.ts
+++ b/packages/cli/src/executions/executionHelpers.ts
@@ -19,7 +19,10 @@ export function getStatusUsingPreviousExecutionStatusMethod(
 	}
 }
 
-export function isAdvancedFiltersEnabled(): boolean {
+export function isAdvancedExecutionFiltersEnabled(): boolean {
 	const license = getLicense();
-	return config.getEnv('enterprise.features.advancedFilters') || license.isAdvancedFiltersEnabled();
+	return (
+		config.getEnv('enterprise.features.advancedExecutionFilters') ||
+		license.isAdvancedExecutionFiltersEnabled()
+	);
 }

From c81656d149764dc398b93d3eb8626a402eddb0ef Mon Sep 17 00:00:00 2001
From: romainminaud <romain.minaud@gmail.com>
Date: Wed, 8 Mar 2023 12:28:23 +0100
Subject: [PATCH 336/358] fix: Fix color discrepancies for executions list
 items (#5640)

fix color discrepancies for exec items
---
 packages/editor-ui/src/components/ExecutionsList.vue | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/editor-ui/src/components/ExecutionsList.vue b/packages/editor-ui/src/components/ExecutionsList.vue
index b890db34ce9d53..82815dcd9fac0e 100644
--- a/packages/editor-ui/src/components/ExecutionsList.vue
+++ b/packages/editor-ui/src/components/ExecutionsList.vue
@@ -1118,24 +1118,24 @@ export default mixins(externalHooks, genericHelpers, executionHelpers, restApi,
 
 		&.crashed td:first-child::before,
 		&.failed td:first-child::before {
-			background: var(--color-danger);
+			background: hsl(var(--color-danger-h), 94%, 80%);
 		}
 
 		&.success td:first-child::before {
-			background: var(--color-success);
+			background: hsl(var(--color-success-h), 60%, 70%);
 		}
 
 		&.new td:first-child::before,
 		&.running td:first-child::before {
-			background: var(--color-warning);
+			background: hsl(var(--color-warning-h), 94%, 80%);
 		}
 
 		&.waiting td:first-child::before {
-			background: var(--color-secondary);
+			background: hsl(var(--color-secondary-h), 94%, 80%);
 		}
 
 		&.unknown td:first-child::before {
-			background: var(--color-background-dark);
+			background: var(--color-text-light);
 		}
 	}
 }

From 0d49ad8b93b71777d19253ececcb6e00b392735f Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Wed, 8 Mar 2023 14:32:27 +0100
Subject: [PATCH 337/358] fix(core): Add a helper function to convert binary
 streams to buffers (no-changelog) (#5641)

---
 packages/core/src/BinaryDataManager/index.ts | 8 ++------
 packages/core/src/BinaryDataManager/utils.ts | 8 ++++++++
 packages/core/src/NodeExecuteFunctions.ts    | 1 -
 3 files changed, 10 insertions(+), 7 deletions(-)
 create mode 100644 packages/core/src/BinaryDataManager/utils.ts

diff --git a/packages/core/src/BinaryDataManager/index.ts b/packages/core/src/BinaryDataManager/index.ts
index a422ad40036934..a019fdaddb1656 100644
--- a/packages/core/src/BinaryDataManager/index.ts
+++ b/packages/core/src/BinaryDataManager/index.ts
@@ -1,4 +1,3 @@
-import concatStream from 'concat-stream';
 import { readFile, stat } from 'fs/promises';
 import type { BinaryMetadata, IBinaryData, INodeExecutionData } from 'n8n-workflow';
 import prettyBytes from 'pretty-bytes';
@@ -6,6 +5,7 @@ import type { Readable } from 'stream';
 import { BINARY_ENCODING } from '../Constants';
 import type { IBinaryDataConfig, IBinaryDataManager } from '../Interfaces';
 import { BinaryDataFileSystem } from './FileSystem';
+import { binaryToBuffer } from './utils';
 
 export class BinaryDataManager {
 	static instance: BinaryDataManager | undefined;
@@ -104,11 +104,7 @@ export class BinaryDataManager {
 				fileSize,
 			});
 		} else {
-			// Else fallback to storing this data in memory.
-			const buffer = await new Promise<Buffer>((resolve) => {
-				if (Buffer.isBuffer(input)) resolve(input);
-				else input.pipe(concatStream(resolve));
-			});
+			const buffer = await binaryToBuffer(input);
 			binaryData.data = buffer.toString(BINARY_ENCODING);
 			binaryData.fileSize = prettyBytes(buffer.length);
 		}
diff --git a/packages/core/src/BinaryDataManager/utils.ts b/packages/core/src/BinaryDataManager/utils.ts
new file mode 100644
index 00000000000000..85fb05f6870bdf
--- /dev/null
+++ b/packages/core/src/BinaryDataManager/utils.ts
@@ -0,0 +1,8 @@
+import concatStream from 'concat-stream';
+import type { Readable } from 'stream';
+
+export const binaryToBuffer = async (body: Buffer | Readable) =>
+	new Promise<Buffer>((resolve) => {
+		if (Buffer.isBuffer(body)) resolve(body);
+		else body.pipe(concatStream(resolve));
+	});
diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 96a752adcff725..7d6b4648b25291 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -149,7 +149,6 @@ const createFormDataObject = (data: Record<string, unknown>) => {
 	});
 	return formData;
 };
-
 function searchForHeader(headers: IDataObject, headerName: string) {
 	if (headers === undefined) {
 		return undefined;

From 0b6fa6b20e271ce588760d8123b10c0c56716174 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Wed, 8 Mar 2023 14:33:13 +0100
Subject: [PATCH 338/358] ci: Setup TS project references for nodes-base, and
 stop packaging tests in the npm package (no-changelog) (#5635)

---
 packages/nodes-base/package.json        |  3 ++-
 packages/nodes-base/tsconfig.build.json | 16 ++++++++++++++++
 packages/nodes-base/tsconfig.json       | 11 +++++------
 3 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 packages/nodes-base/tsconfig.build.json

diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 5979fdc6eafe24..30f3d2cfaf614f 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -15,7 +15,8 @@
   "scripts": {
     "clean": "rimraf dist .turbo",
     "dev": "pnpm watch",
-    "build": "tsc && gulp build:icons && gulp build:translations && pnpm build:metadata",
+    "typecheck": "tsc",
+    "build": "tsc -p tsconfig.build.json && gulp build:icons && gulp build:translations && pnpm build:metadata",
     "build:translations": "gulp build:translations",
     "build:metadata": "pnpm n8n-generate-known && pnpm n8n-generate-ui-types",
     "format": "prettier --write . --ignore-path ../../.prettierignore",
diff --git a/packages/nodes-base/tsconfig.build.json b/packages/nodes-base/tsconfig.build.json
new file mode 100644
index 00000000000000..10e0fa38b107a7
--- /dev/null
+++ b/packages/nodes-base/tsconfig.build.json
@@ -0,0 +1,16 @@
+{
+	"extends": "./tsconfig.json",
+	"compilerOptions": {
+		"outDir": "dist",
+		"types": ["node"],
+		"noEmit": false,
+		"tsBuildInfoFile": "dist/build.tsbuildinfo"
+	},
+	"include": [
+		"credentials/**/*.ts",
+		"nodes/**/*.ts",
+		"nodes/**/*.json",
+		"credentials/translations/**/*.json"
+	],
+	"exclude": ["nodes/**/*.test.ts", "test/**"]
+}
diff --git a/packages/nodes-base/tsconfig.json b/packages/nodes-base/tsconfig.json
index 396a9829825a90..44bdf1d0a0ae4f 100644
--- a/packages/nodes-base/tsconfig.json
+++ b/packages/nodes-base/tsconfig.json
@@ -1,18 +1,17 @@
 {
 	"extends": "../../tsconfig.json",
 	"compilerOptions": {
-		"outDir": "dist",
 		"lib": ["dom", "es2020", "es2022.error"],
 		"types": ["node", "jest"],
+		"noEmit": true,
 		// TODO: remove all options below this line
 		"noImplicitReturns": false,
 		"noUnusedLocals": false,
 		"useUnknownInCatchVariables": false
 	},
-	"include": [
-		"credentials/**/*.ts",
-		"nodes/**/*.ts",
-		"nodes/**/*.json",
-		"credentials/translations/**/*.json"
+	"include": ["credentials/**/*.ts", "nodes/**/*.ts"],
+	"references": [
+		{ "path": "../workflow/tsconfig.build.json" },
+		{ "path": "../core/tsconfig.build.json" }
 	]
 }

From 354edf6886fa3cc5a59d317dcab59cc75e62dc2d Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Wed, 8 Mar 2023 15:11:13 +0100
Subject: [PATCH 339/358] feat(editor): Redirect users to canvas if they don't
 have any workflows (#5629)

* feat(editor): Bring new users to empty canvas

* Fix failing e2e tests and revert CLI implementation

* Revert editor-ui Interface changes

* Try to mock /settings and /active

* Revert canvas test changes, reload after executions in 20-workflow-executions

* Make sure we include manual executiosn before running them in 20-workflow-executions

* Make sure to re-init node view when replacing empty workflows route, show phantom loader
---
 cypress/e2e/1-workflows.cy.ts                 | 19 ++++++++---------
 cypress/e2e/10-undo-redo.cy.ts                |  1 -
 cypress/e2e/12-canvas.cy.ts                   |  1 -
 cypress/e2e/13-pinning.cy.ts                  |  1 -
 cypress/e2e/14-mapping.cy.ts                  |  1 -
 cypress/e2e/15-scheduler-node.cy.ts           |  5 -----
 cypress/e2e/16-webhook-node.cy.ts             |  1 -
 cypress/e2e/17-sharing.cy.ts                  |  4 +---
 cypress/e2e/17-workflow-tags.cy.ts            |  2 --
 cypress/e2e/19-execution.cy.ts                |  3 ---
 cypress/e2e/2-credentials.cy.ts               |  7 -------
 cypress/e2e/20-workflow-executions.cy.ts      |  1 -
 cypress/e2e/3-default-owner.cy.ts             |  5 -----
 cypress/e2e/4-node-creator.cy.ts              |  3 +--
 cypress/e2e/5-ndv.cy.ts                       |  9 ++++----
 cypress/e2e/6-code-node.cy.ts                 |  1 -
 cypress/e2e/7-workflow-actions.cy.ts          |  1 -
 cypress/e2e/8-http-request-node.cy.ts         |  6 +-----
 cypress/pages/settings-users.ts               |  8 +++----
 cypress/pages/workflow.ts                     |  8 +++++++
 cypress/support/commands.ts                   | 21 ++++++++++++-------
 cypress/support/e2e.ts                        | 12 +++++------
 .../editor-ui/src/views/WorkflowsView.vue     | 20 +++++++++++++-----
 23 files changed, 62 insertions(+), 78 deletions(-)

diff --git a/cypress/e2e/1-workflows.cy.ts b/cypress/e2e/1-workflows.cy.ts
index 303ec68b5a2bfe..d341a762f20787 100644
--- a/cypress/e2e/1-workflows.cy.ts
+++ b/cypress/e2e/1-workflows.cy.ts
@@ -27,13 +27,12 @@ describe('Workflows', () => {
 		});
 
 		cy.signin({ email, password });
-		cy.visit(WorkflowsPage.url);
+		cy.visit('/');
+		cy.waitForLoad();
 	});
 
-	it('should create a new workflow using empty state card', () => {
-		WorkflowsPage.getters.newWorkflowButtonCard().should('be.visible');
-		WorkflowsPage.getters.newWorkflowButtonCard().click();
-
+	it('should land on empty canvas after registration', () => {
+		cy.url().should('include', WorkflowPage.url);
 		cy.createFixtureWorkflow('Test_workflow_1.json', `Empty State Card Workflow ${uuid()}`);
 
 		WorkflowPage.getters.workflowTags().should('contain.text', 'some-tag-1');
@@ -41,8 +40,6 @@ describe('Workflows', () => {
 	});
 
 	it('should create multiple new workflows using add workflow button', () => {
-		WorkflowsPage.getters.newWorkflowButtonCard().should('not.exist');
-
 		[...Array(multipleWorkflowsCount).keys()].forEach(() => {
 			cy.visit(WorkflowsPage.url);
 			WorkflowsPage.getters.createWorkflowButton().click();
@@ -95,8 +92,10 @@ describe('Workflows', () => {
 		WorkflowsPage.getters.newWorkflowTemplateCard().should('be.visible');
 	});
 
-	it('should contain empty state cards', () => {
-		WorkflowsPage.getters.newWorkflowButtonCard().should('be.visible');
-		WorkflowsPage.getters.newWorkflowTemplateCard().should('be.visible');
+	it('should redirect to new canvas if no workflows', () => {
+		cy.wait(1000);
+		cy.visit(WorkflowsPage.url);
+		cy.wait(1000);
+		cy.url().should('include', WorkflowPage.url);
 	});
 });
diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index b8f238b8f2fb2c..8f9b90d68c3228 100644
--- a/cypress/e2e/10-undo-redo.cy.ts
+++ b/cypress/e2e/10-undo-redo.cy.ts
@@ -17,7 +17,6 @@ describe('Undo/Redo', () => {
 
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
-		cy.waitForLoad();
 	});
 
 	it('should undo/redo adding nodes', () => {
diff --git a/cypress/e2e/12-canvas.cy.ts b/cypress/e2e/12-canvas.cy.ts
index e0f984d13ab2aa..3f78e49590c31f 100644
--- a/cypress/e2e/12-canvas.cy.ts
+++ b/cypress/e2e/12-canvas.cy.ts
@@ -28,7 +28,6 @@ describe('Canvas Actions', () => {
 
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
-		cy.waitForLoad();
 	});
 
 	it('should render canvas', () => {
diff --git a/cypress/e2e/13-pinning.cy.ts b/cypress/e2e/13-pinning.cy.ts
index cea2c4fef731f7..8a3ea4a7c81622 100644
--- a/cypress/e2e/13-pinning.cy.ts
+++ b/cypress/e2e/13-pinning.cy.ts
@@ -11,7 +11,6 @@ describe('Data pinning', () => {
 
 	beforeEach(() => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 	});
 
 	it('Should be able to pin node output', () => {
diff --git a/cypress/e2e/14-mapping.cy.ts b/cypress/e2e/14-mapping.cy.ts
index 6b8cd6282acbd8..73e628216e0139 100644
--- a/cypress/e2e/14-mapping.cy.ts
+++ b/cypress/e2e/14-mapping.cy.ts
@@ -16,7 +16,6 @@ describe('Data mapping', () => {
 
 	beforeEach(() => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 
 		cy.window()
 			// @ts-ignore
diff --git a/cypress/e2e/15-scheduler-node.cy.ts b/cypress/e2e/15-scheduler-node.cy.ts
index 7ba5acec3eec63..ae3de65c267496 100644
--- a/cypress/e2e/15-scheduler-node.cy.ts
+++ b/cypress/e2e/15-scheduler-node.cy.ts
@@ -8,12 +8,9 @@ describe('Schedule Trigger node', async () => {
 	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
-		cy.visit(workflowsPage.url);
 	});
 
 	it('should execute and return the execution timestamp', () => {
-		workflowsPage.actions.createWorkflowFromCard();
-		cy.waitForLoad();
 		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
 		workflowPage.actions.openNode('Schedule Trigger');
 		ndv.actions.execute();
@@ -22,8 +19,6 @@ describe('Schedule Trigger node', async () => {
 	});
 
 	it('should execute once per second when activated', () => {
-		workflowsPage.actions.createWorkflowFromCard();
-		cy.waitForLoad();
 		workflowPage.actions.renameWorkflow('Schedule Trigger Workflow');
 		workflowPage.actions.addInitialNodeToCanvas('Schedule Trigger');
 		workflowPage.actions.openNode('Schedule Trigger');
diff --git a/cypress/e2e/16-webhook-node.cy.ts b/cypress/e2e/16-webhook-node.cy.ts
index 83c99cb9820b16..7da46167ec59d9 100644
--- a/cypress/e2e/16-webhook-node.cy.ts
+++ b/cypress/e2e/16-webhook-node.cy.ts
@@ -98,7 +98,6 @@ describe('Webhook Trigger node', async () => {
 
 	beforeEach(() => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 
 		cy.window()
 			// @ts-ignore
diff --git a/cypress/e2e/17-sharing.cy.ts b/cypress/e2e/17-sharing.cy.ts
index ff3456f7dc5529..1a8b0a3d007ba7 100644
--- a/cypress/e2e/17-sharing.cy.ts
+++ b/cypress/e2e/17-sharing.cy.ts
@@ -80,9 +80,7 @@ describe('Sharing', () => {
 		credentialsModal.actions.save();
 		credentialsModal.actions.close();
 
-		cy.visit(workflowsPage.url);
-		workflowsPage.getters.newWorkflowButtonCard().click();
-		cy.waitForLoad();
+		workflowPage.actions.visit();
 		workflowPage.actions.setWorkflowName('Workflow W1');
 		workflowPage.actions.addInitialNodeToCanvas('Manual Trigger');
 		workflowPage.actions.addNodeToCanvas('Notion', true, true);
diff --git a/cypress/e2e/17-workflow-tags.cy.ts b/cypress/e2e/17-workflow-tags.cy.ts
index 87926bf0f240d3..8e14897508aea8 100644
--- a/cypress/e2e/17-workflow-tags.cy.ts
+++ b/cypress/e2e/17-workflow-tags.cy.ts
@@ -8,8 +8,6 @@ describe('Workflow tags', () => {
 	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
-		wf.actions.visit();
-		cy.waitForLoad();
 	});
 
 	it('should create and attach tags inline', () => {
diff --git a/cypress/e2e/19-execution.cy.ts b/cypress/e2e/19-execution.cy.ts
index 9fcf27d91a48d1..6ad2ce6592fa13 100644
--- a/cypress/e2e/19-execution.cy.ts
+++ b/cypress/e2e/19-execution.cy.ts
@@ -9,9 +9,6 @@ describe('Execution', () => {
 	beforeEach(() => {
 		cy.resetAll();
 		cy.skipSetup();
-		// Import workflow
-		workflowsPage.getters.newWorkflowButtonCard().click();
-		cy.waitForLoad();
 	});
 
 	it('should test manual workflow', () => {
diff --git a/cypress/e2e/2-credentials.cy.ts b/cypress/e2e/2-credentials.cy.ts
index 3fe9dd19682767..e281512e09ca0d 100644
--- a/cypress/e2e/2-credentials.cy.ts
+++ b/cypress/e2e/2-credentials.cy.ts
@@ -112,7 +112,6 @@ describe('Credentials', () => {
 
 	it('should create credentials from NDV for node with multiple auth options', () => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		workflowPage.actions.addNodeToCanvas(GMAIL_NODE_NAME);
 		workflowPage.getters.canvasNodes().last().click();
@@ -129,7 +128,6 @@ describe('Credentials', () => {
 
 	it('should show multiple credential types in the same dropdown', () => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		workflowPage.actions.addNodeToCanvas(GMAIL_NODE_NAME);
 		workflowPage.getters.canvasNodes().last().click();
@@ -155,7 +153,6 @@ describe('Credentials', () => {
 
 	it('should correctly render required and optional credentials', () => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		workflowPage.actions.addNodeToCanvas(PIPEDRIVE_NODE_NAME, true, true);
 		cy.get('body').type('{downArrow}');
 		cy.get('body').type('{enter}');
@@ -180,7 +177,6 @@ describe('Credentials', () => {
 
 	it('should create credentials from NDV for node with no auth options', () => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		workflowPage.actions.addNodeToCanvas(TRELLO_NODE_NAME);
 		workflowPage.getters.canvasNodes().last().click();
@@ -194,7 +190,6 @@ describe('Credentials', () => {
 
 	it('should delete credentials from NDV', () => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		workflowPage.actions.addNodeToCanvas(NOTION_NODE_NAME);
 		workflowPage.getters.canvasNodes().last().click();
@@ -214,7 +209,6 @@ describe('Credentials', () => {
 
 	it('should rename credentials from NDV', () => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		workflowPage.actions.addNodeToCanvas(TRELLO_NODE_NAME);
 		workflowPage.getters.canvasNodes().last().click();
@@ -235,7 +229,6 @@ describe('Credentials', () => {
 
 	it('should setup generic authentication for HTTP node', () => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		workflowPage.actions.addNodeToCanvas(SCHEDULE_TRIGGER_NODE_NAME);
 		workflowPage.actions.addNodeToCanvas(HTTP_REQUEST_NODE_NAME);
 		workflowPage.getters.canvasNodes().last().click();
diff --git a/cypress/e2e/20-workflow-executions.cy.ts b/cypress/e2e/20-workflow-executions.cy.ts
index d619659ac32a18..1e40b7dcc4f8e7 100644
--- a/cypress/e2e/20-workflow-executions.cy.ts
+++ b/cypress/e2e/20-workflow-executions.cy.ts
@@ -13,7 +13,6 @@ describe('Current Workflow Executions', () => {
 
 	beforeEach(() => {
 		workflowPage.actions.visit();
-		cy.waitForLoad();
 		cy.createFixtureWorkflow('Test_workflow_4_executions_view.json', `My test workflow`);
 		createMockExecutions();
 	});
diff --git a/cypress/e2e/3-default-owner.cy.ts b/cypress/e2e/3-default-owner.cy.ts
index 95b83b043ffbf9..1871dd9c6c950f 100644
--- a/cypress/e2e/3-default-owner.cy.ts
+++ b/cypress/e2e/3-default-owner.cy.ts
@@ -37,11 +37,6 @@ describe('Default owner', () => {
 	it('should be able to create workflows', () => {
 		cy.resetAll();
 		cy.skipSetup();
-		cy.visit('/');
-		workflowsPage.getters.newWorkflowButtonCard().should('be.visible');
-		workflowsPage.getters.newWorkflowButtonCard().click();
-
-		cy.waitForLoad();
 		cy.createFixtureWorkflow('Test_workflow_1.json', `Test workflow`);
 
 		// reload page, ensure owner still has access
diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index a6e986c6451b94..2054209f4f1909 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -13,8 +13,7 @@ describe('Node Creator', () => {
 	});
 
 	beforeEach(() => {
-		cy.visit(nodeCreatorFeature.url);
-		cy.waitForLoad();
+		WorkflowPage.actions.visit();
 	});
 
 	it('should open node creator on trigger tab if no trigger is on canvas', () => {
diff --git a/cypress/e2e/5-ndv.cy.ts b/cypress/e2e/5-ndv.cy.ts
index 3a57d51bcfeeed..a8f0d4cc9c92a1 100644
--- a/cypress/e2e/5-ndv.cy.ts
+++ b/cypress/e2e/5-ndv.cy.ts
@@ -5,12 +5,13 @@ const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
 describe('NDV', () => {
-
-	beforeEach(() => {
+	before(() => {
 		cy.resetAll();
 		cy.skipSetup();
-		cy.visit(workflowPage.url)
-		cy.waitForLoad();
+
+	});
+	beforeEach(() => {
+		workflowPage.actions.visit();
 		workflowPage.actions.renameWorkflow(uuid());
 		workflowPage.actions.saveWorkflowOnButtonClick();
 	});
diff --git a/cypress/e2e/6-code-node.cy.ts b/cypress/e2e/6-code-node.cy.ts
index 0e4a16d933567e..7fa465d2ee86d7 100644
--- a/cypress/e2e/6-code-node.cy.ts
+++ b/cypress/e2e/6-code-node.cy.ts
@@ -11,7 +11,6 @@ describe('Code node', () => {
 	});
 
 	it('should execute the placeholder in all-items mode successfully', () => {
-		WorkflowPage.actions.visit();
 		WorkflowPage.actions.addInitialNodeToCanvas('Manual');
 		WorkflowPage.actions.addNodeToCanvas('Code');
 		WorkflowPage.actions.openNode('Code');
diff --git a/cypress/e2e/7-workflow-actions.cy.ts b/cypress/e2e/7-workflow-actions.cy.ts
index 8896953c3baa78..a56ff586221410 100644
--- a/cypress/e2e/7-workflow-actions.cy.ts
+++ b/cypress/e2e/7-workflow-actions.cy.ts
@@ -21,7 +21,6 @@ describe('Workflow Actions', () => {
 
 	beforeEach(() => {
 		WorkflowPage.actions.visit();
-		cy.waitForLoad();
 	});
 
 	it('should be able to save on button click', () => {
diff --git a/cypress/e2e/8-http-request-node.cy.ts b/cypress/e2e/8-http-request-node.cy.ts
index 11c9619472a32a..9c3cce11e85c38 100644
--- a/cypress/e2e/8-http-request-node.cy.ts
+++ b/cypress/e2e/8-http-request-node.cy.ts
@@ -1,6 +1,5 @@
-import { WorkflowPage, WorkflowsPage, NDV } from '../pages';
+import { WorkflowPage, NDV } from '../pages';
 
-const workflowsPage = new WorkflowsPage();
 const workflowPage = new WorkflowPage();
 const ndv = new NDV();
 
@@ -11,9 +10,6 @@ describe('HTTP Request node', () => {
 	});
 
 	it('should make a request with a URL and receive a response', () => {
-		cy.visit(workflowsPage.url);
-
-		workflowsPage.actions.createWorkflowFromCard();
 		workflowPage.actions.addInitialNodeToCanvas('Manual');
 		workflowPage.actions.addNodeToCanvas('HTTP Request');
 		workflowPage.actions.openNode('HTTP Request');
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index e52d43a8099d41..4d6903c8581b5b 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -1,9 +1,9 @@
 import { SettingsSidebar } from './sidebar/settings-sidebar';
 import { MainSidebar } from './sidebar/main-sidebar';
-import { WorkflowsPage } from './workflows';
+import { WorkflowPage } from './workflow';
 import { BasePage } from './base';
 
-const workflowsPage =  new WorkflowsPage();
+const workflowPage =  new WorkflowPage();
 const mainSidebar = new MainSidebar();
 const settingsSidebar = new SettingsSidebar();
 
@@ -30,7 +30,7 @@ export class SettingsUsersPage extends BasePage {
 		goToOwnerSetup: () => this.getters.setUpOwnerButton().click(),
 		loginAndVisit: (email: string, password: string, isOwner: boolean) => {
 			cy.signin({ email, password });
-			cy.visit(workflowsPage.url);
+			workflowPage.actions.visit();
 			mainSidebar.actions.goToSettings();
 			if (isOwner) {
 				settingsSidebar.getters.menuItem('Users').click();
@@ -39,7 +39,7 @@ export class SettingsUsersPage extends BasePage {
 				settingsSidebar.getters.menuItem('Users').should('not.exist');
 				// Should be redirected to workflows page if trying to access UM url
 				cy.visit('/settings/users');
-				cy.url().should('match', new RegExp(workflowsPage.url));
+				cy.url().should('match', new RegExp(workflowPage.url));
 			}
 		},
 		opedDeleteDialog: (email: string) => {
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index f5167e01cb53c8..2dc647e4bfce52 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -256,12 +256,20 @@ export class WorkflowPage extends BasePage {
 		turnOnManualExecutionSaving: () => {
 			this.getters.workflowMenu().click();
 			this.getters.workflowMenuItemSettings().click();
+			cy.get('.el-loading-mask').should('not.be.visible');
 			this.getters
 				.workflowSettingsSaveManualExecutionsSelect()
 				.find('li:contains("Yes")')
 				.click({ force: true });
+
+			this.getters.workflowSettingsSaveManualExecutionsSelect().should('contain', 'Yes');
 			this.getters.workflowSettingsSaveButton().click();
 			this.getters.successToast().should('exist');
+
+			this.getters.workflowMenu().click();
+			this.getters.workflowMenuItemSettings().click();
+			this.getters.workflowSettingsSaveManualExecutionsSelect().should('contain', 'Yes');
+			this.getters.workflowSettingsSaveButton().click();
 		},
 	};
 }
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 2497b3abecce09..233c74ee5575b1 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -24,7 +24,7 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 import 'cypress-real-events';
-import { WorkflowsPage, SigninPage, SignupPage, SettingsUsersPage } from '../pages';
+import { WorkflowsPage, SigninPage, SignupPage, SettingsUsersPage, WorkflowPage } from '../pages';
 import { N8N_AUTH_COOKIE } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { MessageBox } from '../pages/modals/message-box';
@@ -54,13 +54,13 @@ Cypress.Commands.add(
 );
 
 Cypress.Commands.add('waitForLoad', () => {
-	cy.getByTestId('node-view-loader', { timeout: 10000 }).should('not.exist');
-	cy.get('.el-loading-mask', { timeout: 10000 }).should('not.exist');
+	cy.getByTestId('node-view-loader', { timeout: 20000 }).should('not.exist');
+	cy.get('.el-loading-mask', { timeout: 20000 }).should('not.exist');
 });
 
 Cypress.Commands.add('signin', ({ email, password }) => {
 	const signinPage = new SigninPage();
-	const workflowsPage = new WorkflowsPage();
+	const workflowPage = new WorkflowPage();
 
 	cy.session(
 		[email, password],
@@ -74,7 +74,10 @@ Cypress.Commands.add('signin', ({ email, password }) => {
 			});
 
 			// we should be redirected to /workflows
-			cy.url().should('include', workflowsPage.url);
+			cy.visit(workflowPage.url);
+			cy.url().should('include', workflowPage.url);
+			cy.intercept('GET', '/rest/workflows/new').as('loading');
+			cy.wait('@loading');
 		},
 		{
 			validate() {
@@ -158,7 +161,7 @@ Cypress.Commands.add('inviteUsers', ({ instanceOwner, users }) => {
 
 Cypress.Commands.add('skipSetup', () => {
 	const signupPage = new SignupPage();
-	const workflowsPage = new WorkflowsPage();
+	const workflowPage = new WorkflowPage();
 	const Confirmation = new MessageBox();
 
 	cy.visit(signupPage.url);
@@ -171,8 +174,10 @@ Cypress.Commands.add('skipSetup', () => {
 				Confirmation.getters.header().should('contain.text', 'Skip owner account setup?');
 				Confirmation.actions.confirm();
 
-				// we should be redirected to /workflows
-				cy.url().should('include', workflowsPage.url);
+				// we should be redirected to empty canvas
+				cy.intercept('GET', '/rest/workflows/new').as('loading');
+				cy.url().should('include', workflowPage.url);
+				cy.wait('@loading');
 			} else {
 				cy.log('User already signed up');
 			}
diff --git a/cypress/support/e2e.ts b/cypress/support/e2e.ts
index 3977b482107ae0..21236be4f117c7 100644
--- a/cypress/support/e2e.ts
+++ b/cypress/support/e2e.ts
@@ -22,22 +22,20 @@ import CustomCredential from '../fixtures/Custom_credential.json';
 // Load custom nodes and credentials fixtures
 beforeEach(() => {
 	cy.intercept('GET', '/types/nodes.json', (req) => {
-		req.continue((res) => {
-			const nodes = res.body;
+		req.on('response', (res) => {
+			const nodes = res.body || [];
 
 			res.headers['cache-control'] = 'no-cache, no-store';
 			nodes.push(CustomNodeFixture, CustomNodeWithN8nCredentialFixture, CustomNodeWithCustomCredentialFixture);
-			res.send(nodes);
 		});
 	}).as('nodesIntercept');
 
 	cy.intercept('GET', '/types/credentials.json', (req) => {
-		req.continue((res) => {
-			const credentials = res.body;
+		req.on('response', (res) => {
+			const credentials = res.body || [];
 
 			res.headers['cache-control'] = 'no-cache, no-store';
 			credentials.push(CustomCredential);
-			res.send(credentials);
-		});
+		})
 	}).as('credentialsIntercept');
 })
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index cd7ac10133cd60..624fb52f5201ff 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -3,11 +3,11 @@
 		ref="layout"
 		resource-key="workflows"
 		:resources="allWorkflows"
-		:initialize="initialize"
 		:filters="filters"
 		:additional-filters-handler="onFilter"
 		:show-aside="allWorkflows.length > 0"
 		:shareable="isShareable"
+		:initialize="initialize"
 		@click:add="addWorkflow"
 		@update:filters="filters = $event"
 	>
@@ -148,7 +148,7 @@ const StatusFilter = {
 	ALL: '',
 };
 
-export default mixins(showMessage, debounceHelper, newVersions).extend({
+const WorkflowsView = mixins(showMessage, debounceHelper, newVersions).extend({
 	name: 'WorkflowsView',
 	components: {
 		ResourcesListLayout,
@@ -224,12 +224,20 @@ export default mixins(showMessage, debounceHelper, newVersions).extend({
 			}
 		},
 		async initialize() {
-			this.usersStore.fetchUsers(); // Can be loaded in the background, used for filtering
-
-			return await Promise.all([
+			await Promise.all([
+				this.usersStore.fetchUsers(),
 				this.workflowsStore.fetchAllWorkflows(),
 				this.workflowsStore.fetchActiveWorkflows(),
 			]);
+
+			// If the user has no workflows and is not participating in the demo experiment,
+			// redirect to the new workflow view
+			if (!this.isDemoTest && this.allWorkflows.length === 0) {
+				this.uiStore.nodeViewInitialized = false;
+				this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
+			}
+
+			return Promise.resolve();
 		},
 		onClickTag(tagId: string, event: PointerEvent) {
 			if (!this.filters.tags.includes(tagId)) {
@@ -273,6 +281,8 @@ export default mixins(showMessage, debounceHelper, newVersions).extend({
 		this.usersStore.showPersonalizationSurvey();
 	},
 });
+
+export default WorkflowsView;
 </script>
 
 <style lang="scss" module>

From 2889e53b3767f2a61ee7fb3ea9fe1db7c65aaf70 Mon Sep 17 00:00:00 2001
From: Syed Ali Shahbaz <52925846+alishaz-polymath@users.noreply.github.com>
Date: Wed, 8 Mar 2023 21:28:15 +0530
Subject: [PATCH 340/358] feat(Cal Trigger Node): Update to support v2 webhooks
 (#5331)

---
 .../nodes-base/nodes/Cal/CalTrigger.node.ts   | 69 +++++++++++++++++--
 1 file changed, 65 insertions(+), 4 deletions(-)

diff --git a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
index 90e700dbe4aa68..793eef98e2bee8 100644
--- a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
@@ -17,7 +17,7 @@ export class CalTrigger implements INodeType {
 		name: 'calTrigger',
 		icon: 'file:cal.svg',
 		group: ['trigger'],
-		version: 1,
+		version: [1, 2],
 		subtitle: '=Events: {{$parameter["events"].join(", ")}}',
 		description: 'Handle Cal events via webhooks',
 		defaults: {
@@ -60,10 +60,59 @@ export class CalTrigger implements INodeType {
 						value: 'BOOKING_RESCHEDULED',
 						description: 'Receive notifications when a Cal event is rescheduled',
 					},
+					{
+						name: 'Meeting Ended',
+						value: 'MEETING_ENDED',
+						description: 'Receive notifications when a Cal event or meeting has ended',
+					},
 				],
 				default: [],
 				required: true,
 			},
+			{
+				displayName: 'API Version',
+				name: 'version',
+				type: 'options',
+				displayOptions: {
+					show: {
+						'@version': [1],
+					},
+				},
+				isNodeSetting: true,
+				options: [
+					{
+						name: 'Before v2.0',
+						value: 1,
+					},
+					{
+						name: 'v2.0 Onwards',
+						value: 2,
+					},
+				],
+				default: 1,
+			},
+			{
+				displayName: 'API Version',
+				name: 'version',
+				type: 'options',
+				displayOptions: {
+					show: {
+						'@version': [2],
+					},
+				},
+				isNodeSetting: true,
+				options: [
+					{
+						name: 'Before v2.0',
+						value: 1,
+					},
+					{
+						name: 'v2.0 Onwards',
+						value: 2,
+					},
+				],
+				default: 2,
+			},
 			{
 				displayName: 'Options',
 				name: 'options',
@@ -125,13 +174,17 @@ export class CalTrigger implements INodeType {
 	webhookMethods = {
 		default: {
 			async checkExists(this: IHookFunctions): Promise<boolean> {
+				const version = this.getNodeParameter('version', 0) as number;
 				const webhookUrl = this.getNodeWebhookUrl('default');
 				const webhookData = this.getWorkflowStaticData('node');
 				const events = this.getNodeParameter('events') as string;
 
 				// Check all the webhooks which exist already if it is identical to the
 				// one that is supposed to get created.
-				const data = await calApiRequest.call(this, 'GET', '/hooks', {});
+				const data =
+					version === 2
+						? await calApiRequest.call(this, 'GET', '/webhooks', {})
+						: await calApiRequest.call(this, 'GET', '/hooks', {});
 
 				for (const webhook of data.webhooks) {
 					if (webhook.subscriberUrl === webhookUrl) {
@@ -148,6 +201,7 @@ export class CalTrigger implements INodeType {
 				return false;
 			},
 			async create(this: IHookFunctions): Promise<boolean> {
+				const version = this.getNodeParameter('version', 0) as number;
 				const webhookData = this.getWorkflowStaticData('node');
 				const subscriberUrl = this.getNodeWebhookUrl('default');
 				const eventTriggers = this.getNodeParameter('events') as string;
@@ -161,7 +215,10 @@ export class CalTrigger implements INodeType {
 					...(options as object),
 				};
 
-				const responseData = await calApiRequest.call(this, 'POST', '/hooks', body);
+				const responseData =
+					version === 2
+						? await calApiRequest.call(this, 'POST', '/webhooks', body)
+						: await calApiRequest.call(this, 'POST', '/hooks', body);
 
 				if (responseData.webhook.id === undefined) {
 					// Required data is missing so was not successful
@@ -172,9 +229,13 @@ export class CalTrigger implements INodeType {
 				return true;
 			},
 			async delete(this: IHookFunctions): Promise<boolean> {
+				const version = this.getNodeParameter('version', 0) as number;
 				const webhookData = this.getWorkflowStaticData('node');
 				if (webhookData.webhookId !== undefined) {
-					const endpoint = `/hooks/${webhookData.webhookId}`;
+					const endpoint =
+						version === 2
+							? `/webhooks/${webhookData.webhookId}`
+							: `/hooks/${webhookData.webhookId}`;
 
 					try {
 						await calApiRequest.call(this, 'DELETE', endpoint);

From 89d25995c317650e4d572ef5caff96a452773151 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Wed, 8 Mar 2023 16:04:45 +0000
Subject: [PATCH 341/358] docs(Github Trigger Node): Add notice and more
 meaningful error around permissions (#5551)

---
 .../nodes-base/nodes/Github/GithubTrigger.node.ts  | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 273ebbbe894bf2..57549ab6e4aef3 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -56,6 +56,13 @@ export class GithubTrigger implements INodeType {
 			},
 		],
 		properties: [
+			{
+				displayName:
+					'Only members with owner privileges for an organization or admin privileges for a repository can set up the webhooks this node requires.',
+				name: 'notice',
+				type: 'notice',
+				default: '',
+			},
 			{
 				displayName: 'Authentication',
 				name: 'authentication',
@@ -531,6 +538,13 @@ export class GithubTrigger implements INodeType {
 						);
 					}
 
+					if (error.cause.httpCode === '404') {
+						throw new NodeOperationError(
+							this.getNode(),
+							'Check that the repository exists and that you have permission to create the webhooks this node requires',
+						);
+					}
+
 					throw error;
 				}
 

From 6f27b445ca2307b94ffc7d4eeb24e76d63516a19 Mon Sep 17 00:00:00 2001
From: Michael Auerswald <michael.auerswald@gmail.com>
Date: Thu, 9 Mar 2023 09:08:23 +0100
Subject: [PATCH 342/358] feat(core): Refactor and add SAML preferences for
 service provider instance (#5637)

* create SP through parameters instead of metadata

* refactor SAML prefs and add SP configurations
---
 .../routes/saml.controller.protected.ee.ts    |   2 +-
 .../saml/routes/saml.controller.public.ee.ts  |   6 +-
 packages/cli/src/sso/saml/saml.service.ee.ts  | 119 +++++++++---------
 .../cli/src/sso/saml/serviceProvider.ee.ts    |  38 +++---
 .../cli/src/sso/saml/types/samlPreferences.ts |  16 +++
 5 files changed, 105 insertions(+), 76 deletions(-)

diff --git a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
index 47e625817cb3dc..8f142d7484b036 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.protected.ee.ts
@@ -23,7 +23,7 @@ samlControllerProtected.get(
 	SamlUrls.config,
 	samlLicensedOwnerMiddleware,
 	(req: SamlConfiguration.Read, res: express.Response) => {
-		const prefs = SamlService.getInstance().getSamlPreferences();
+		const prefs = SamlService.getInstance().samlPreferences;
 		return res.send(prefs);
 	},
 );
diff --git a/packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts b/packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts
index 33e9427f70c7ef..999b7f2df24b70 100644
--- a/packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts
+++ b/packages/cli/src/sso/saml/routes/saml.controller.public.ee.ts
@@ -1,6 +1,6 @@
 import express from 'express';
 import { SamlUrls } from '../constants';
-import { getServiceProviderInstance } from '../serviceProvider.ee';
+import { SamlService } from '../saml.service.ee';
 
 /**
  * SSO Endpoints that are public
@@ -13,5 +13,7 @@ export const samlControllerPublic = express.Router();
  * Return Service Provider metadata
  */
 samlControllerPublic.get(SamlUrls.metadata, async (req: express.Request, res: express.Response) => {
-	return res.header('Content-Type', 'text/xml').send(getServiceProviderInstance().getMetadata());
+	return res
+		.header('Content-Type', 'text/xml')
+		.send(SamlService.getInstance().getServiceProviderInstance().getMetadata());
 });
diff --git a/packages/cli/src/sso/saml/saml.service.ee.ts b/packages/cli/src/sso/saml/saml.service.ee.ts
index b204c1686b73bf..523b904f0da3c8 100644
--- a/packages/cli/src/sso/saml/saml.service.ee.ts
+++ b/packages/cli/src/sso/saml/saml.service.ee.ts
@@ -5,11 +5,10 @@ import { jsonParse, LoggerProxy } from 'n8n-workflow';
 import { AuthError, BadRequestError } from '@/ResponseHelper';
 import { getServiceProviderInstance } from './serviceProvider.ee';
 import type { SamlUserAttributes } from './types/samlUserAttributes';
-import type { SamlAttributeMapping } from './types/samlAttributeMapping';
 import { isSsoJustInTimeProvisioningEnabled } from '../ssoHelpers';
 import type { SamlPreferences } from './types/samlPreferences';
 import { SAML_PREFERENCES_DB_KEY } from './constants';
-import type { IdentityProviderInstance } from 'samlify';
+import type { IdentityProviderInstance, ServiceProviderInstance } from 'samlify';
 import { IdentityProvider, setSchemaValidator } from 'samlify';
 import {
 	createUserFromSamlAttributes,
@@ -32,30 +31,33 @@ export class SamlService {
 
 	private identityProviderInstance: IdentityProviderInstance | undefined;
 
-	private _attributeMapping: SamlAttributeMapping = {
-		email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
-		firstName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname',
-		lastName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname',
-		userPrincipalName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn',
+	private _samlPreferences: SamlPreferences = {
+		mapping: {
+			email: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/emailaddress',
+			firstName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/firstname',
+			lastName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/lastname',
+			userPrincipalName: 'http://schemas.xmlsoap.org/ws/2005/05/identity/claims/upn',
+		},
+		metadata: '',
+		metadataUrl: '',
+		ignoreSSL: false,
+		loginBinding: 'redirect',
+		acsBinding: 'post',
+		authnRequestsSigned: false,
+		loginEnabled: false,
+		loginLabel: 'SAML',
+		wantAssertionsSigned: true,
+		wantMessageSigned: true,
 	};
 
-	public get attributeMapping(): SamlAttributeMapping {
-		return this._attributeMapping;
-	}
-
-	public set attributeMapping(mapping: SamlAttributeMapping) {
-		// TODO:SAML: add validation
-		this._attributeMapping = mapping;
+	public get samlPreferences(): SamlPreferences {
+		return {
+			...this._samlPreferences,
+			loginEnabled: isSamlLoginEnabled(),
+			loginLabel: getSamlLoginLabel(),
+		};
 	}
 
-	private metadata = '';
-
-	private metadataUrl = '';
-
-	private ignoreSSL = false;
-
-	private loginBinding: SamlLoginBinding = 'post';
-
 	static getInstance(): SamlService {
 		if (!SamlService.instance) {
 			SamlService.instance = new SamlService();
@@ -79,18 +81,22 @@ export class SamlService {
 	getIdentityProviderInstance(forceRecreate = false): IdentityProviderInstance {
 		if (this.identityProviderInstance === undefined || forceRecreate) {
 			this.identityProviderInstance = IdentityProvider({
-				metadata: this.metadata,
+				metadata: this._samlPreferences.metadata,
 			});
 		}
 
 		return this.identityProviderInstance;
 	}
 
+	getServiceProviderInstance(): ServiceProviderInstance {
+		return getServiceProviderInstance(this._samlPreferences);
+	}
+
 	getLoginRequestUrl(binding?: SamlLoginBinding): {
 		binding: SamlLoginBinding;
 		context: BindingContext | PostBindingContext;
 	} {
-		if (binding === undefined) binding = this.loginBinding;
+		if (binding === undefined) binding = this._samlPreferences.loginBinding ?? 'redirect';
 		if (binding === 'post') {
 			return {
 				binding,
@@ -105,7 +111,7 @@ export class SamlService {
 	}
 
 	private getRedirectLoginRequestUrl(): BindingContext {
-		const loginRequest = getServiceProviderInstance().createLoginRequest(
+		const loginRequest = this.getServiceProviderInstance().createLoginRequest(
 			this.getIdentityProviderInstance(),
 			'redirect',
 		);
@@ -115,7 +121,7 @@ export class SamlService {
 	}
 
 	private getPostLoginRequestUrl(): PostBindingContext {
-		const loginRequest = getServiceProviderInstance().createLoginRequest(
+		const loginRequest = this.getServiceProviderInstance().createLoginRequest(
 			this.getIdentityProviderInstance(),
 			'post',
 		) as PostBindingContext;
@@ -177,35 +183,30 @@ export class SamlService {
 		return undefined;
 	}
 
-	getSamlPreferences(): SamlPreferences {
-		return {
-			mapping: this.attributeMapping,
-			metadata: this.metadata,
-			metadataUrl: this.metadataUrl,
-			ignoreSSL: this.ignoreSSL,
-			loginBinding: this.loginBinding,
-			loginEnabled: isSamlLoginEnabled(),
-			loginLabel: getSamlLoginLabel(),
-		};
-	}
-
 	async setSamlPreferences(prefs: SamlPreferences): Promise<SamlPreferences | undefined> {
-		this.loginBinding = prefs.loginBinding ?? this.loginBinding;
-		this.metadata = prefs.metadata ?? this.metadata;
-		this.attributeMapping = prefs.mapping ?? this.attributeMapping;
-		this.ignoreSSL = prefs.ignoreSSL ?? this.ignoreSSL;
+		this._samlPreferences.loginBinding = prefs.loginBinding ?? this._samlPreferences.loginBinding;
+		this._samlPreferences.metadata = prefs.metadata ?? this._samlPreferences.metadata;
+		this._samlPreferences.mapping = prefs.mapping ?? this._samlPreferences.mapping;
+		this._samlPreferences.ignoreSSL = prefs.ignoreSSL ?? this._samlPreferences.ignoreSSL;
+		this._samlPreferences.acsBinding = prefs.acsBinding ?? this._samlPreferences.acsBinding;
+		this._samlPreferences.authnRequestsSigned =
+			prefs.authnRequestsSigned ?? this._samlPreferences.authnRequestsSigned;
+		this._samlPreferences.wantAssertionsSigned =
+			prefs.wantAssertionsSigned ?? this._samlPreferences.wantAssertionsSigned;
+		this._samlPreferences.wantMessageSigned =
+			prefs.wantMessageSigned ?? this._samlPreferences.wantMessageSigned;
 		if (prefs.metadataUrl) {
-			this.metadataUrl = prefs.metadataUrl;
+			this._samlPreferences.metadataUrl = prefs.metadataUrl;
 			const fetchedMetadata = await this.fetchMetadataFromUrl();
 			if (fetchedMetadata) {
-				this.metadata = fetchedMetadata;
+				this._samlPreferences.metadata = fetchedMetadata;
 			}
 		} else if (prefs.metadata) {
 			const validationResult = await validateMetadata(prefs.metadata);
 			if (!validationResult) {
 				throw new Error('Invalid SAML metadata');
 			}
-			this.metadata = prefs.metadata;
+			this._samlPreferences.metadata = prefs.metadata;
 		}
 		setSamlLoginEnabled(prefs.loginEnabled ?? isSamlLoginEnabled());
 		setSamlLoginLabel(prefs.loginLabel ?? getSamlLoginLabel());
@@ -232,7 +233,7 @@ export class SamlService {
 		const samlPreferences = await Db.collections.Settings.findOne({
 			where: { key: SAML_PREFERENCES_DB_KEY },
 		});
-		const settingsValue = JSON.stringify(this.getSamlPreferences());
+		const settingsValue = JSON.stringify(this.samlPreferences);
 		let result: Settings;
 		if (samlPreferences) {
 			samlPreferences.value = settingsValue;
@@ -249,25 +250,29 @@ export class SamlService {
 	}
 
 	async fetchMetadataFromUrl(): Promise<string | undefined> {
+		if (!this._samlPreferences.metadataUrl)
+			throw new BadRequestError('Error fetching SAML Metadata, no Metadata URL set');
 		try {
 			// TODO:SAML: this will not work once axios is upgraded to > 1.2.0 (see checkServerIdentity)
 			const agent = new https.Agent({
-				rejectUnauthorized: !this.ignoreSSL,
+				rejectUnauthorized: !this._samlPreferences.ignoreSSL,
 			});
-			const response = await axios.get(this.metadataUrl, { httpsAgent: agent });
+			const response = await axios.get(this._samlPreferences.metadataUrl, { httpsAgent: agent });
 			if (response.status === 200 && response.data) {
 				const xml = (await response.data) as string;
 				const validationResult = await validateMetadata(xml);
 				if (!validationResult) {
 					throw new BadRequestError(
-						`Data received from ${this.metadataUrl} is not valid SAML metadata.`,
+						`Data received from ${this._samlPreferences.metadataUrl} is not valid SAML metadata.`,
 					);
 				}
 				return xml;
 			}
 		} catch (error) {
-			// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-			throw new BadRequestError(`Error fetching SAML Metadata from ${this.metadataUrl}: ${error}`);
+			throw new BadRequestError(
+				// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+				`Error fetching SAML Metadata from ${this._samlPreferences.metadataUrl}: ${error}`,
+			);
 		}
 		return;
 	}
@@ -277,19 +282,21 @@ export class SamlService {
 		binding: SamlLoginBinding,
 	): Promise<SamlUserAttributes> {
 		let parsedSamlResponse;
+		if (!this._samlPreferences.mapping)
+			throw new BadRequestError('Error fetching SAML Attributes, no Attribute mapping set');
 		try {
-			parsedSamlResponse = await getServiceProviderInstance().parseLoginResponse(
+			parsedSamlResponse = await this.getServiceProviderInstance().parseLoginResponse(
 				this.getIdentityProviderInstance(),
 				binding,
 				req,
 			);
 		} catch (error) {
-			throw error;
-			// throw new AuthError('SAML Authentication failed. Could not parse SAML response.');
+			// throw error;
+			throw new AuthError('SAML Authentication failed. Could not parse SAML response.');
 		}
 		const { attributes, missingAttributes } = getMappedSamlAttributesFromFlowResult(
 			parsedSamlResponse,
-			this.attributeMapping,
+			this._samlPreferences.mapping,
 		);
 		if (!attributes) {
 			throw new AuthError('SAML Authentication failed. Invalid SAML response.');
@@ -308,7 +315,7 @@ export class SamlService {
 		try {
 			// TODO:SAML: this will not work once axios is upgraded to > 1.2.0 (see checkServerIdentity)
 			const agent = new https.Agent({
-				rejectUnauthorized: !this.ignoreSSL,
+				rejectUnauthorized: !this._samlPreferences.ignoreSSL,
 			});
 			const requestContext = this.getLoginRequestUrl();
 			if (!requestContext) return false;
diff --git a/packages/cli/src/sso/saml/serviceProvider.ee.ts b/packages/cli/src/sso/saml/serviceProvider.ee.ts
index 020ab83ed938b0..796d64a343d082 100644
--- a/packages/cli/src/sso/saml/serviceProvider.ee.ts
+++ b/packages/cli/src/sso/saml/serviceProvider.ee.ts
@@ -1,29 +1,33 @@
+/* eslint-disable @typescript-eslint/naming-convention */
 import { getInstanceBaseUrl } from '@/UserManagement/UserManagementHelper';
 import type { ServiceProviderInstance } from 'samlify';
 import { ServiceProvider } from 'samlify';
 import { SamlUrls } from './constants';
+import type { SamlPreferences } from './types/samlPreferences';
 
 let serviceProviderInstance: ServiceProviderInstance | undefined;
 
-const metadata = `
-<EntityDescriptor
- xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata"
- xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion"
- xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
- entityID="${getInstanceBaseUrl() + SamlUrls.restMetadata}">
-    <SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-        <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
-        <AssertionConsumerService isDefault="true" index="0" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="${
-					getInstanceBaseUrl() + SamlUrls.restAcs
-				}"/>
-    </SPSSODescriptor>
-</EntityDescriptor>
-`;
-
-export function getServiceProviderInstance(): ServiceProviderInstance {
+// TODO:SAML: make these configurable for the end user
+export function getServiceProviderInstance(prefs: SamlPreferences): ServiceProviderInstance {
 	if (serviceProviderInstance === undefined) {
 		serviceProviderInstance = ServiceProvider({
-			metadata,
+			entityID: getInstanceBaseUrl() + SamlUrls.restMetadata,
+			authnRequestsSigned: prefs.authnRequestsSigned,
+			wantAssertionsSigned: prefs.wantAssertionsSigned,
+			wantMessageSigned: prefs.wantMessageSigned,
+			nameIDFormat: ['urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress'],
+			assertionConsumerService: [
+				{
+					isDefault: prefs.acsBinding === 'post',
+					Binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST',
+					Location: getInstanceBaseUrl() + SamlUrls.restAcs,
+				},
+				{
+					isDefault: prefs.acsBinding === 'redirect',
+					Binding: 'urn:oasis:names:tc:SAML:2.0:bindings:HTTP-REDIRECT',
+					Location: getInstanceBaseUrl() + SamlUrls.restAcs,
+				},
+			],
 		});
 	}
 
diff --git a/packages/cli/src/sso/saml/types/samlPreferences.ts b/packages/cli/src/sso/saml/types/samlPreferences.ts
index 8adc4311c8c592..d013d0ed4e97a3 100644
--- a/packages/cli/src/sso/saml/types/samlPreferences.ts
+++ b/packages/cli/src/sso/saml/types/samlPreferences.ts
@@ -30,4 +30,20 @@ export class SamlPreferences {
 	@IsString()
 	@IsOptional()
 	loginLabel?: string;
+
+	@IsBoolean()
+	@IsOptional()
+	authnRequestsSigned?: boolean = false;
+
+	@IsBoolean()
+	@IsOptional()
+	wantAssertionsSigned?: boolean = true;
+
+	@IsBoolean()
+	@IsOptional()
+	wantMessageSigned?: boolean = true;
+
+	@IsString()
+	@IsOptional()
+	acsBinding?: SamlLoginBinding = 'post';
 }

From 6500e985ee026274c537fc9e02c68857c9bb2c1a Mon Sep 17 00:00:00 2001
From: Ricardo Espinoza <ricardo@n8n.io>
Date: Thu, 9 Mar 2023 03:13:48 -0500
Subject: [PATCH 343/358] fix(core): Use new version of riot-tmpl in workflow
 package (no-changelog) (#5619)

* Use new version of riot-tmpl

* update lock file
---
 packages/workflow/package.json | 2 +-
 pnpm-lock.yaml                 | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 56cf7ee68663c4..8bdcf64a123f78 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -51,7 +51,7 @@
     "@types/xml2js": "^0.4.3"
   },
   "dependencies": {
-    "@n8n_io/riot-tmpl": "^2.0.0",
+    "@n8n_io/riot-tmpl": "^3.0.0",
     "ast-types": "0.15.2",
     "crypto-js": "^4.1.1",
     "deep-equal": "^2.2.0",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4616cb0da9f830..8b17ec15dd8f28 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -1090,7 +1090,7 @@ importers:
 
   packages/workflow:
     specifiers:
-      '@n8n_io/riot-tmpl': ^2.0.0
+      '@n8n_io/riot-tmpl': ^3.0.0
       '@types/crypto-js': ^4.1.1
       '@types/deep-equal': ^1.0.1
       '@types/express': ^4.17.6
@@ -1117,7 +1117,7 @@ importers:
       transliteration: ^2.3.5
       xml2js: ^0.4.23
     dependencies:
-      '@n8n_io/riot-tmpl': 2.0.0
+      '@n8n_io/riot-tmpl': 3.0.0
       ast-types: 0.15.2
       crypto-js: 4.1.1
       deep-equal: 2.2.0
@@ -3687,8 +3687,8 @@ packages:
       - debug
     dev: false
 
-  /@n8n_io/riot-tmpl/2.0.0:
-    resolution: {integrity: sha512-gQNJYlek30YIWLru2CdyFgU/0uvPAbbQwt2G5EN0PDxXD1rGAYWZsd2c94bW3YlvXT6V2GEd7Bt/gT6QUwhzfQ==}
+  /@n8n_io/riot-tmpl/3.0.0:
+    resolution: {integrity: sha512-bExAbGAp+LE4EXUcXl/kcZofKefrLIVZl8Kg36fim6KZATrWF8Nh7cdp/dOWzgZT6h8/ScqKxjv23W3KoeR40Q==}
     dependencies:
       eslint-config-riot: 1.0.0
     dev: false

From 5b9c521d04bc34a9f84be966a4646f23c56ca3da Mon Sep 17 00:00:00 2001
From: romainminaud <romain.minaud@gmail.com>
Date: Thu, 9 Mar 2023 11:01:30 +0100
Subject: [PATCH 344/358] fix(editor): Only fetch new versions at app launch
 (#5647)

only call nextVersions once
---
 packages/editor-ui/src/App.vue                 | 4 +++-
 packages/editor-ui/src/views/NodeView.vue      | 3 ---
 packages/editor-ui/src/views/WorkflowsView.vue | 4 +---
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/packages/editor-ui/src/App.vue b/packages/editor-ui/src/App.vue
index fa1d40a00e470f..035416a1dab150 100644
--- a/packages/editor-ui/src/App.vue
+++ b/packages/editor-ui/src/App.vue
@@ -46,8 +46,9 @@ import { useRootStore } from './stores/n8nRootStore';
 import { useTemplatesStore } from './stores/templates';
 import { useNodeTypesStore } from './stores/nodeTypes';
 import { historyHelper } from '@/mixins/history';
+import { newVersions } from '@/mixins/newVersions';
 
-export default mixins(showMessage, userHelpers, restApi, historyHelper).extend({
+export default mixins(newVersions, showMessage, userHelpers, restApi, historyHelper).extend({
 	name: 'App',
 	components: {
 		LoadingView,
@@ -186,6 +187,7 @@ export default mixins(showMessage, userHelpers, restApi, historyHelper).extend({
 		this.logHiringBanner();
 		this.authenticate();
 		this.redirectIfNecessary();
+		this.checkForNewVersions();
 
 		this.loading = false;
 
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 3672546574b9a8..29c4ebc7084fca 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -208,7 +208,6 @@ import { restApi } from '@/mixins/restApi';
 import useGlobalLinkActions from '@/composables/useGlobalLinkActions';
 import { showMessage } from '@/mixins/showMessage';
 import { titleChange } from '@/mixins/titleChange';
-import { newVersions } from '@/mixins/newVersions';
 
 import { workflowHelpers } from '@/mixins/workflowHelpers';
 import { workflowRun } from '@/mixins/workflowRun';
@@ -327,7 +326,6 @@ export default mixins(
 	titleChange,
 	workflowHelpers,
 	workflowRun,
-	newVersions,
 	debounceHelper,
 ).extend({
 	name: 'NodeView',
@@ -3885,7 +3883,6 @@ export default mixins(
 
 			setTimeout(() => {
 				this.usersStore.showPersonalizationSurvey();
-				this.checkForNewVersions();
 				this.addPinDataConnections(this.workflowsStore.getPinData || ({} as IPinData));
 			}, 0);
 		});
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 624fb52f5201ff..4dd61ca1beea85 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -119,7 +119,6 @@
 
 <script lang="ts">
 import { showMessage } from '@/mixins/showMessage';
-import { newVersions } from '@/mixins/newVersions';
 import mixins from 'vue-typed-mixins';
 
 import SettingsView from './SettingsView.vue';
@@ -148,7 +147,7 @@ const StatusFilter = {
 	ALL: '',
 };
 
-const WorkflowsView = mixins(showMessage, debounceHelper, newVersions).extend({
+const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 	name: 'WorkflowsView',
 	components: {
 		ResourcesListLayout,
@@ -277,7 +276,6 @@ const WorkflowsView = mixins(showMessage, debounceHelper, newVersions).extend({
 		},
 	},
 	mounted() {
-		this.checkForNewVersions();
 		this.usersStore.showPersonalizationSurvey();
 	},
 });

From 971d5ae8f5d2bfe319fc700fee2bcf597ea4c07e Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Thu, 9 Mar 2023 10:05:03 +0000
Subject: [PATCH 345/358] feat(Microsoft SQL Node): Add support for self signed
 certificates (#5160)

---
 .../nodes-base/credentials/MicrosoftSql.credentials.ts     | 7 +++++++
 .../nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts    | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
index 5bc3f481f18958..2d02fa832644f4 100644
--- a/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
+++ b/packages/nodes-base/credentials/MicrosoftSql.credentials.ts
@@ -53,6 +53,13 @@ export class MicrosoftSql implements ICredentialType {
 			type: 'boolean',
 			default: true,
 		},
+		{
+			displayName: 'Ignore SSL Issues',
+			name: 'allowUnauthorizedCerts',
+			type: 'boolean',
+			default: false,
+			description: 'Whether to connect even if SSL certificate validation is not possible',
+		},
 		{
 			displayName: 'Connect Timeout',
 			name: 'connectTimeout',
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 7593797f066ddc..0b57c0563236ea 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -235,6 +235,8 @@ export class MicrosoftSql implements INodeType {
 						options: {
 							encrypt: credentials.tls as boolean,
 							enableArithAbort: false,
+							tdsVersion: credentials.tdsVersion as string,
+							trustServerCertificate: credentials.allowUnauthorizedCerts as boolean,
 						},
 					};
 					const pool = new mssql.ConnectionPool(config);
@@ -269,6 +271,7 @@ export class MicrosoftSql implements INodeType {
 				encrypt: credentials.tls as boolean,
 				enableArithAbort: false,
 				tdsVersion: credentials.tdsVersion as string,
+				trustServerCertificate: credentials.allowUnauthorizedCerts as boolean,
 			},
 		};
 

From e56fbfef3ebb50706f24ab07505a0031f361d9b1 Mon Sep 17 00:00:00 2001
From: Jon <jonathan.bennetts@gmail.com>
Date: Thu, 9 Mar 2023 10:06:03 +0000
Subject: [PATCH 346/358] feat(Mindee Node): Add support for v4 API (#5559)

---
 .../nodes/Mindee/GenericFunctions.ts          | 14 ++++
 .../nodes-base/nodes/Mindee/Mindee.node.ts    | 83 +++++++++++++++++--
 2 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
index 3c095c411512a9..f19d46c6b515d6 100644
--- a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
@@ -101,6 +101,20 @@ export function cleanData(document: IDataObject) {
 			newData.currency = data.currency;
 			//@ts-ignore
 			newData.locale = data.value;
+		} else if (key === 'line_items') {
+			const lineItems: IDataObject[] = [];
+			for (const lineItem of data as IDataObject[]) {
+				lineItems.push({
+					description: lineItem.description,
+					product_code: lineItem.product_code,
+					quantity: lineItem.quantity,
+					tax_amount: lineItem.tax_amount,
+					tax_rate: lineItem.tax_rate,
+					total_amount: lineItem.total_amount,
+					unit_price: lineItem.unit_price,
+				});
+			}
+			newData[key] = lineItems;
 		} else {
 			newData[key] =
 				//@ts-ignore
diff --git a/packages/nodes-base/nodes/Mindee/Mindee.node.ts b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
index c7b2e79f484eb5..d42b1f8f8c06a8 100644
--- a/packages/nodes-base/nodes/Mindee/Mindee.node.ts
+++ b/packages/nodes-base/nodes/Mindee/Mindee.node.ts
@@ -15,7 +15,7 @@ export class Mindee implements INodeType {
 		name: 'mindee',
 		icon: 'file:mindee.svg',
 		group: ['input'],
-		version: [1, 2],
+		version: [1, 2, 3],
 		subtitle: '={{$parameter["operation"] + ": " + $parameter["resource"]}}',
 		description: 'Consume Mindee API',
 		defaults: {
@@ -63,9 +63,13 @@ export class Mindee implements INodeType {
 						name: '3',
 						value: 3,
 					},
+					{
+						name: '4',
+						value: 4,
+					},
 				],
 				default: 1,
-				description: 'Whether to return all results or only up to a given limit',
+				description: 'Which Mindee API Version to use',
 			},
 			{
 				displayName: 'API Version',
@@ -86,9 +90,40 @@ export class Mindee implements INodeType {
 						name: '3',
 						value: 3,
 					},
+					{
+						name: '4',
+						value: 4,
+					},
 				],
 				default: 3,
-				description: 'Whether to return all results or only up to a given limit',
+				description: 'Which Mindee API Version to use',
+			},
+			{
+				displayName: 'API Version',
+				name: 'apiVersion',
+				type: 'options',
+				isNodeSetting: true,
+				displayOptions: {
+					show: {
+						'@version': [3],
+					},
+				},
+				options: [
+					{
+						name: '1',
+						value: 1,
+					},
+					{
+						name: '3',
+						value: 3,
+					},
+					{
+						name: '4',
+						value: 4,
+					},
+				],
+				default: 4,
+				description: 'Which Mindee API Version to use',
 			},
 			{
 				displayName: 'Resource',
@@ -201,13 +236,32 @@ export class Mindee implements INodeType {
 									},
 								},
 							);
+						} else if (version === 4) {
+							endpoint = '/expense_receipts/v4/predict';
+							responseData = await mindeeApiRequest.call(
+								this,
+								'POST',
+								endpoint,
+								{},
+								{},
+								{
+									formData: {
+										document: {
+											value: dataBuffer,
+											options: {
+												filename: binaryData.fileName,
+											},
+										},
+									},
+								},
+							);
 						}
 						if (!rawData) {
 							if (version === 1) {
 								responseData = cleanDataPreviousApiVersions(
 									responseData.predictions as IDataObject[],
 								);
-							} else if (version === 3) {
+							} else if (version === 3 || version === 4) {
 								responseData = cleanData(responseData.document as IDataObject);
 							}
 						}
@@ -260,6 +314,25 @@ export class Mindee implements INodeType {
 									},
 								},
 							);
+						} else if (version === 4) {
+							endpoint = '/invoices/v4/predict';
+							responseData = await mindeeApiRequest.call(
+								this,
+								'POST',
+								endpoint,
+								{},
+								{},
+								{
+									formData: {
+										document: {
+											value: dataBuffer,
+											options: {
+												filename: binaryData.fileName,
+											},
+										},
+									},
+								},
+							);
 						} else {
 							throw new NodeOperationError(this.getNode(), 'Invalid API version');
 						}
@@ -268,7 +341,7 @@ export class Mindee implements INodeType {
 								responseData = cleanDataPreviousApiVersions(
 									responseData.predictions as IDataObject[],
 								);
-							} else if (version === 3) {
+							} else if (version === 3 || version === 4) {
 								responseData = cleanData(responseData.document as IDataObject);
 							}
 						}

From 71c349b071c2f66759f7f250a3c849710f8cad7e Mon Sep 17 00:00:00 2001
From: Mutasem Aldmour <4711238+mutdmour@users.noreply.github.com>
Date: Thu, 9 Mar 2023 12:49:37 +0100
Subject: [PATCH 347/358] ci: Add PR checklist (#5628)

* ci: Add PR checklist

* chore: add test change

* ci: add name

* ci: merge into workfow

* test: test action

* ci: add checklist

* ci: test checklist

* ci: remove comment

* ci: test checklist

* ci: add item to check item

* ci: update checklist items

* ci: add checklist item for migraitons

* ci: add hooks checklist item

* chore: remove comment
---
 .github/workflows/ci-pull-requests.yml | 12 ++++++++
 CHECKLIST.yml                          | 40 ++++++++++++++++++++++++++
 2 files changed, 52 insertions(+)
 create mode 100644 CHECKLIST.yml

diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index c567d1baea2aab..922cbbda960f3b 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -117,3 +117,15 @@ jobs:
       containers: '[1]'
     secrets:
       CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+
+  checklist_job:
+    runs-on: ubuntu-latest
+    name: Checklist job
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v1
+      - name: Checklist
+        uses: wyozi/contextual-qa-checklist-action@master
+        with:
+          gh-token: ${{ secrets.GITHUB_TOKEN }}
+          comment-footer: Make sure to check off this list before asking for review.
diff --git a/CHECKLIST.yml b/CHECKLIST.yml
new file mode 100644
index 00000000000000..77d30837d35ec4
--- /dev/null
+++ b/CHECKLIST.yml
@@ -0,0 +1,40 @@
+paths:
+  "packages/**":
+    - If fixing bug, added test to cover scenario.
+    - If addressing forum or Github issue, added link to description.
+  "packages/**/*.ts":
+    - Added unit tests to cover new or updated functionality.
+  "**/*.vue":
+    - Used composition API for all new components.
+    - Added component or unit tests to cover functionality.
+  
+  # cli
+  "packages/cli/src/databases/migrations/**":
+    - Requested review from at least two engineers on migration. 
+    - Avoided irreversible data migrations.
+    - Avoided deleting or updating data keys.
+    - Wrote 'down' migration if possible.
+  "n8n/packages/cli/src/api/**":
+    - Added integration tests for new endpoints.
+
+  # editor ui
+  "packages/editor-ui/**/*.vue":
+    - Added E2E if adding new features.
+    - Used design system tokens (colors, spacings...) where possible.
+  "packages/editor-ui/src/mixins/restApi.ts":
+    - Avoided adding new methods. Only deleted from here.
+  "packages/editor-ui/src/mixins/**":
+    - Avoided adding new mixins (use composables instead). Only removed code from here.
+  "packages/editor-ui/src/views/NodeView.vue":
+    - Avoided adding code here. Only refactored to make it smaller. 
+  "packages/editor-ui/src/hooks/**":
+    - Avoided adding new hooks. Only refactored to move hooks to relevant store instead.
+
+  # nodes-base
+  "packages/nodes-base/nodes/**":
+    - Added workflow tests for nodes if possible.
+
+  # design-system
+  "packages/design-system/**/*.vue":
+    - Used design system tokens (colors, spacings...) where possible.
+    - Updated Storybook with new component or updated functionality.
\ No newline at end of file

From 493f7a1c92d77d3c75fc311892e53f43e1fb367f Mon Sep 17 00:00:00 2001
From: Alex Grozav <alex@grozav.com>
Date: Thu, 9 Mar 2023 14:23:38 +0200
Subject: [PATCH 348/358] fix: Fetch credentials on workflows view to include
 in duplicated workflows (#5532)

fix: fetch credentials on workflows view to include in duplicated workflows
---
 packages/editor-ui/src/views/WorkflowsView.vue | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 4dd61ca1beea85..4fa107331545f9 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -137,6 +137,7 @@ import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
 import { useUsersStore } from '@/stores/users';
 import { useWorkflowsStore } from '@/stores/workflows';
+import { useCredentialsStore } from '@/stores/credentials';
 import { usePostHog } from '@/stores/posthog';
 
 type IResourcesListLayoutInstance = Vue & { sendFiltersTelemetry: (source: string) => void };
@@ -170,7 +171,13 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 		};
 	},
 	computed: {
-		...mapStores(useSettingsStore, useUIStore, useUsersStore, useWorkflowsStore),
+		...mapStores(
+			useSettingsStore,
+			useUIStore,
+			useUsersStore,
+			useWorkflowsStore,
+			useCredentialsStore,
+		),
 		currentUser(): IUser {
 			return this.usersStore.currentUser || ({} as IUser);
 		},
@@ -229,6 +236,8 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 				this.workflowsStore.fetchActiveWorkflows(),
 			]);
 
+			this.credentialsStore.fetchAllCredentials();
+
 			// If the user has no workflows and is not participating in the demo experiment,
 			// redirect to the new workflow view
 			if (!this.isDemoTest && this.allWorkflows.length === 0) {

From 356e916194a6955e3e96da2ed8dc67ffa5a70b34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Mar 2023 14:42:13 +0100
Subject: [PATCH 349/358] refactor(core): Convert more routes to use the
 decorator pattern (no-changelog) (#5611)

* move nodeTypes api to a controller class
* move tags api to a controller class
* move LDAP routes to a controller class
* move nodes routes to a controller class
---
 .../cli/src/Ldap/routes/ldap.controller.ee.ts |  77 -------
 packages/cli/src/Server.ts                    |  53 ++---
 packages/cli/src/api/tags.api.ts              | 110 ----------
 packages/cli/src/controllers/index.ts         |   4 +
 .../cli/src/controllers/ldap.controller.ts    |  65 ++++++
 .../nodeTypes.controller.ts}                  |  46 ++--
 .../nodes.controller.ts}                      | 201 +++++++-----------
 .../cli/src/controllers/tags.controller.ts    | 102 +++++++++
 packages/cli/src/decorators/Middleware.ts     |  11 +
 packages/cli/src/decorators/Route.ts          |   1 +
 packages/cli/src/decorators/constants.ts      |   1 +
 packages/cli/src/decorators/index.ts          |   3 +-
 .../cli/src/decorators/registerController.ts  |  14 +-
 packages/cli/src/decorators/types.ts          |   6 +-
 packages/cli/src/index.ts                     |   1 -
 packages/cli/src/middlewares/auth.ts          |   2 +-
 packages/cli/src/requests.ts                  |   3 +
 .../test/integration/ldap/ldap.api.test.ts    |   2 -
 packages/cli/test/integration/shared/utils.ts |  51 +++--
 19 files changed, 360 insertions(+), 393 deletions(-)
 delete mode 100644 packages/cli/src/Ldap/routes/ldap.controller.ee.ts
 delete mode 100644 packages/cli/src/api/tags.api.ts
 create mode 100644 packages/cli/src/controllers/ldap.controller.ts
 rename packages/cli/src/{api/nodeTypes.api.ts => controllers/nodeTypes.controller.ts} (60%)
 rename packages/cli/src/{api/nodes.api.ts => controllers/nodes.controller.ts} (64%)
 create mode 100644 packages/cli/src/controllers/tags.controller.ts
 create mode 100644 packages/cli/src/decorators/Middleware.ts

diff --git a/packages/cli/src/Ldap/routes/ldap.controller.ee.ts b/packages/cli/src/Ldap/routes/ldap.controller.ee.ts
deleted file mode 100644
index aac5938415d7e6..00000000000000
--- a/packages/cli/src/Ldap/routes/ldap.controller.ee.ts
+++ /dev/null
@@ -1,77 +0,0 @@
-import express from 'express';
-import { LdapManager } from '../LdapManager.ee';
-import { getLdapConfig, getLdapSynchronizations, updateLdapConfig } from '../helpers';
-import type { LdapConfiguration } from '../types';
-import pick from 'lodash.pick';
-import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from '../constants';
-import { InternalHooks } from '@/InternalHooks';
-import { Container } from 'typedi';
-
-export const ldapController = express.Router();
-
-/**
- * GET /ldap/config
- */
-ldapController.get('/config', async (req: express.Request, res: express.Response) => {
-	const data = await getLdapConfig();
-	return res.status(200).json({ data });
-});
-/**
- * POST /ldap/test-connection
- */
-ldapController.post('/test-connection', async (req: express.Request, res: express.Response) => {
-	try {
-		await LdapManager.getInstance().service.testConnection();
-	} catch (error) {
-		const errorObject = error as { message: string };
-		return res.status(400).json({ message: errorObject.message });
-	}
-	return res.status(200).json();
-});
-
-/**
- * PUT /ldap/config
- */
-ldapController.put('/config', async (req: LdapConfiguration.Update, res: express.Response) => {
-	try {
-		await updateLdapConfig(req.body);
-	} catch (e) {
-		if (e instanceof Error) {
-			return res.status(400).json({ message: e.message });
-		}
-	}
-
-	const data = await getLdapConfig();
-
-	void Container.get(InternalHooks).onUserUpdatedLdapSettings({
-		user_id: req.user.id,
-		...pick(data, NON_SENSIBLE_LDAP_CONFIG_PROPERTIES),
-	});
-
-	return res.status(200).json({ data });
-});
-
-/**
- * POST /ldap/sync
- */
-ldapController.post('/sync', async (req: LdapConfiguration.Sync, res: express.Response) => {
-	const runType = req.body.type;
-
-	try {
-		await LdapManager.getInstance().sync.run(runType);
-	} catch (e) {
-		if (e instanceof Error) {
-			return res.status(400).json({ message: e.message });
-		}
-	}
-	return res.status(200).json({});
-});
-
-/**
- * GET /ldap/sync
- */
-ldapController.get('/sync', async (req: LdapConfiguration.GetSync, res: express.Response) => {
-	const { page = '0', perPage = '20' } = req.query;
-	const data = await getLdapSynchronizations(parseInt(page, 10), parseInt(perPage, 10));
-	return res.status(200).json({ data });
-});
diff --git a/packages/cli/src/Server.ts b/packages/cli/src/Server.ts
index 92e81161d327ec..0f89c5ff54fe3c 100644
--- a/packages/cli/src/Server.ts
+++ b/packages/cli/src/Server.ts
@@ -59,7 +59,6 @@ import config from '@/config';
 import * as Queue from '@/Queue';
 import { getSharedWorkflowIds } from '@/WorkflowHelpers';
 
-import { nodesController } from '@/api/nodes.api';
 import { workflowsController } from '@/workflows/workflows.controller';
 import {
 	EDITOR_UI_DIST_DIR,
@@ -83,16 +82,18 @@ import type {
 import { registerController } from '@/decorators';
 import {
 	AuthController,
+	LdapController,
 	MeController,
+	NodesController,
+	NodeTypesController,
 	OwnerController,
 	PasswordResetController,
+	TagsController,
 	TranslationController,
 	UsersController,
 } from '@/controllers';
 
 import { executionsController } from '@/executions/executions.controller';
-import { nodeTypesController } from '@/api/nodeTypes.api';
-import { tagsController } from '@/api/tags.api';
 import { workflowStatsController } from '@/api/workflowStats.api';
 import { loadPublicApiVersions } from '@/PublicApi';
 import {
@@ -134,7 +135,6 @@ import { licenseController } from './license/license.controller';
 import { Push, setupPushServer, setupPushHandler } from '@/push';
 import { setupAuthMiddlewares } from './middlewares';
 import { initEvents } from './events';
-import { ldapController } from './Ldap/routes/ldap.controller.ee';
 import { getLdapLoginLabel, isLdapEnabled, isLdapLoginEnabled } from './Ldap/helpers';
 import { AbstractServer } from './AbstractServer';
 import { configureMetrics } from './metrics';
@@ -152,6 +152,7 @@ import { getSamlLoginLabel, isSamlLoginEnabled, isSamlLicensed } from './sso/sam
 import { samlControllerPublic } from './sso/saml/routes/saml.controller.public.ee';
 import { SamlService } from './sso/saml/saml.service.ee';
 import { samlControllerProtected } from './sso/saml/routes/saml.controller.protected.ee';
+import { LdapManager } from './Ldap/LdapManager.ee';
 
 const exec = promisify(callbackExec);
 
@@ -371,7 +372,7 @@ class Server extends AbstractServer {
 	}
 
 	private registerControllers(ignoredEndpoints: Readonly<string[]>) {
-		const { app, externalHooks, activeWorkflowRunner } = this;
+		const { app, externalHooks, activeWorkflowRunner, nodeTypes } = this;
 		const repositories = Db.collections;
 		setupAuthMiddlewares(app, ignoredEndpoints, this.restEndpoint, repositories.User);
 
@@ -380,11 +381,13 @@ class Server extends AbstractServer {
 		const mailer = getMailerInstance();
 		const postHog = this.postHog;
 
-		const controllers = [
+		const controllers: object[] = [
 			new AuthController({ config, internalHooks, repositories, logger, postHog }),
 			new OwnerController({ config, internalHooks, repositories, logger }),
 			new MeController({ externalHooks, internalHooks, repositories, logger }),
+			new NodeTypesController({ config, nodeTypes }),
 			new PasswordResetController({ config, externalHooks, internalHooks, repositories, logger }),
+			new TagsController({ config, repositories, externalHooks }),
 			new TranslationController(config, this.credentialTypes),
 			new UsersController({
 				config,
@@ -397,6 +400,18 @@ class Server extends AbstractServer {
 				postHog,
 			}),
 		];
+
+		if (isLdapEnabled()) {
+			const { service, sync } = LdapManager.getInstance();
+			controllers.push(new LdapController(service, sync, internalHooks));
+		}
+
+		if (config.getEnv('nodes.communityPackages.enabled')) {
+			controllers.push(
+				new NodesController(config, this.loadNodesAndCredentials, this.push, internalHooks),
+			);
+		}
+
 		controllers.forEach((controller) => registerController(app, config, controller));
 	}
 
@@ -482,13 +497,6 @@ class Server extends AbstractServer {
 
 		this.app.use(`/${this.restEndpoint}/credentials`, credentialsController);
 
-		// ----------------------------------------
-		// Packages and nodes management
-		// ----------------------------------------
-		if (config.getEnv('nodes.communityPackages.enabled')) {
-			this.app.use(`/${this.restEndpoint}/nodes`, nodesController);
-		}
-
 		// ----------------------------------------
 		// Workflow
 		// ----------------------------------------
@@ -504,18 +512,6 @@ class Server extends AbstractServer {
 		// ----------------------------------------
 		this.app.use(`/${this.restEndpoint}/workflow-stats`, workflowStatsController);
 
-		// ----------------------------------------
-		// Tags
-		// ----------------------------------------
-		this.app.use(`/${this.restEndpoint}/tags`, tagsController);
-
-		// ----------------------------------------
-		// LDAP
-		// ----------------------------------------
-		if (isLdapEnabled()) {
-			this.app.use(`/${this.restEndpoint}/ldap`, ldapController);
-		}
-
 		// ----------------------------------------
 		// SAML
 		// ----------------------------------------
@@ -534,7 +530,6 @@ class Server extends AbstractServer {
 		this.app.use(`/${this.restEndpoint}/sso/saml`, samlControllerProtected);
 
 		// ----------------------------------------
-
 		// Returns parameter values which normally get loaded from an external API or
 		// get generated dynamically
 		this.app.get(
@@ -645,12 +640,6 @@ class Server extends AbstractServer {
 			),
 		);
 
-		// ----------------------------------------
-		// Node-Types
-		// ----------------------------------------
-
-		this.app.use(`/${this.restEndpoint}/node-types`, nodeTypesController);
-
 		// ----------------------------------------
 		// Active Workflows
 		// ----------------------------------------
diff --git a/packages/cli/src/api/tags.api.ts b/packages/cli/src/api/tags.api.ts
deleted file mode 100644
index 6c13c44b5136a6..00000000000000
--- a/packages/cli/src/api/tags.api.ts
+++ /dev/null
@@ -1,110 +0,0 @@
-/* eslint-disable @typescript-eslint/no-unnecessary-boolean-literal-compare */
-/* eslint-disable @typescript-eslint/no-invalid-void-type */
-/* eslint-disable @typescript-eslint/no-unsafe-call */
-/* eslint-disable @typescript-eslint/no-unsafe-member-access */
-/* eslint-disable @typescript-eslint/no-unsafe-assignment */
-/* eslint-disable no-param-reassign */
-
-import express from 'express';
-
-import * as Db from '@/Db';
-import { ExternalHooks } from '@/ExternalHooks';
-import type { ITagWithCountDb } from '@/Interfaces';
-import * as ResponseHelper from '@/ResponseHelper';
-import config from '@/config';
-import * as TagHelpers from '@/TagHelpers';
-import { validateEntity } from '@/GenericHelpers';
-import { TagEntity } from '@db/entities/TagEntity';
-import type { TagsRequest } from '@/requests';
-import { Container } from 'typedi';
-
-export const tagsController = express.Router();
-
-const workflowsEnabledMiddleware: express.RequestHandler = (req, res, next) => {
-	if (config.getEnv('workflowTagsDisabled')) {
-		throw new ResponseHelper.BadRequestError('Workflow tags are disabled');
-	}
-	next();
-};
-
-// Retrieves all tags, with or without usage count
-tagsController.get(
-	'/',
-	workflowsEnabledMiddleware,
-	ResponseHelper.send(async (req: express.Request): Promise<TagEntity[] | ITagWithCountDb[]> => {
-		if (req.query.withUsageCount === 'true') {
-			const tablePrefix = config.getEnv('database.tablePrefix');
-			return TagHelpers.getTagsWithCountDb(tablePrefix);
-		}
-
-		return Db.collections.Tag.find({ select: ['id', 'name', 'createdAt', 'updatedAt'] });
-	}),
-);
-
-// Creates a tag
-tagsController.post(
-	'/',
-	workflowsEnabledMiddleware,
-	ResponseHelper.send(async (req: express.Request): Promise<TagEntity | void> => {
-		const newTag = new TagEntity();
-		newTag.name = req.body.name.trim();
-
-		await Container.get(ExternalHooks).run('tag.beforeCreate', [newTag]);
-
-		await validateEntity(newTag);
-		const tag = await Db.collections.Tag.save(newTag);
-
-		await Container.get(ExternalHooks).run('tag.afterCreate', [tag]);
-
-		return tag;
-	}),
-);
-
-// Updates a tag
-tagsController.patch(
-	'/:id(\\d+)',
-	workflowsEnabledMiddleware,
-	ResponseHelper.send(async (req: express.Request): Promise<TagEntity | void> => {
-		const { name } = req.body;
-		const { id } = req.params;
-
-		const newTag = new TagEntity();
-		// @ts-ignore
-		newTag.id = id;
-		newTag.name = name.trim();
-
-		await Container.get(ExternalHooks).run('tag.beforeUpdate', [newTag]);
-
-		await validateEntity(newTag);
-		const tag = await Db.collections.Tag.save(newTag);
-
-		await Container.get(ExternalHooks).run('tag.afterUpdate', [tag]);
-
-		return tag;
-	}),
-);
-
-tagsController.delete(
-	'/:id(\\d+)',
-	workflowsEnabledMiddleware,
-	ResponseHelper.send(async (req: TagsRequest.Delete): Promise<boolean> => {
-		if (
-			config.getEnv('userManagement.isInstanceOwnerSetUp') === true &&
-			req.user.globalRole.name !== 'owner'
-		) {
-			throw new ResponseHelper.UnauthorizedError(
-				'You are not allowed to perform this action',
-				'Only owners can remove tags',
-			);
-		}
-		const id = req.params.id;
-
-		await Container.get(ExternalHooks).run('tag.beforeDelete', [id]);
-
-		await Db.collections.Tag.delete({ id });
-
-		await Container.get(ExternalHooks).run('tag.afterDelete', [id]);
-
-		return true;
-	}),
-);
diff --git a/packages/cli/src/controllers/index.ts b/packages/cli/src/controllers/index.ts
index 37ce548a540dca..04b46af5f13df8 100644
--- a/packages/cli/src/controllers/index.ts
+++ b/packages/cli/src/controllers/index.ts
@@ -1,6 +1,10 @@
 export { AuthController } from './auth.controller';
+export { LdapController } from './ldap.controller';
 export { MeController } from './me.controller';
+export { NodesController } from './nodes.controller';
+export { NodeTypesController } from './nodeTypes.controller';
 export { OwnerController } from './owner.controller';
 export { PasswordResetController } from './passwordReset.controller';
+export { TagsController } from './tags.controller';
 export { TranslationController } from './translation.controller';
 export { UsersController } from './users.controller';
diff --git a/packages/cli/src/controllers/ldap.controller.ts b/packages/cli/src/controllers/ldap.controller.ts
new file mode 100644
index 00000000000000..619a70db286b2b
--- /dev/null
+++ b/packages/cli/src/controllers/ldap.controller.ts
@@ -0,0 +1,65 @@
+import pick from 'lodash.pick';
+import { Get, Post, Put, RestController } from '@/decorators';
+import { getLdapConfig, getLdapSynchronizations, updateLdapConfig } from '@/Ldap/helpers';
+import { LdapService } from '@/Ldap/LdapService.ee';
+import { LdapSync } from '@/Ldap/LdapSync.ee';
+import { LdapConfiguration } from '@/Ldap/types';
+import { BadRequestError } from '@/ResponseHelper';
+import { NON_SENSIBLE_LDAP_CONFIG_PROPERTIES } from '@/Ldap/constants';
+import { InternalHooks } from '@/InternalHooks';
+
+@RestController('/ldap')
+export class LdapController {
+	constructor(
+		private ldapService: LdapService,
+		private ldapSync: LdapSync,
+		private internalHooks: InternalHooks,
+	) {}
+
+	@Get('/config')
+	async getConfig() {
+		return getLdapConfig();
+	}
+
+	@Post('/test-connection')
+	async testConnection() {
+		try {
+			await this.ldapService.testConnection();
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+
+	@Put('/config')
+	async updateConfig(req: LdapConfiguration.Update) {
+		try {
+			await updateLdapConfig(req.body);
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+
+		const data = await getLdapConfig();
+
+		void this.internalHooks.onUserUpdatedLdapSettings({
+			user_id: req.user.id,
+			...pick(data, NON_SENSIBLE_LDAP_CONFIG_PROPERTIES),
+		});
+
+		return data;
+	}
+
+	@Get('/sync')
+	async getLdapSync(req: LdapConfiguration.GetSync) {
+		const { page = '0', perPage = '20' } = req.query;
+		return getLdapSynchronizations(parseInt(page, 10), parseInt(perPage, 10));
+	}
+
+	@Post('/sync')
+	async syncLdap(req: LdapConfiguration.Sync) {
+		try {
+			await this.ldapSync.run(req.body.type);
+		} catch (error) {
+			throw new BadRequestError((error as { message: string }).message);
+		}
+	}
+}
diff --git a/packages/cli/src/api/nodeTypes.api.ts b/packages/cli/src/controllers/nodeTypes.controller.ts
similarity index 60%
rename from packages/cli/src/api/nodeTypes.api.ts
rename to packages/cli/src/controllers/nodeTypes.controller.ts
index de37b549f5b78b..5f8af5a909f22a 100644
--- a/packages/cli/src/api/nodeTypes.api.ts
+++ b/packages/cli/src/controllers/nodeTypes.controller.ts
@@ -1,39 +1,43 @@
-import express from 'express';
 import { readFile } from 'fs/promises';
 import get from 'lodash.get';
-
+import { Request } from 'express';
 import type { INodeTypeDescription, INodeTypeNameVersion } from 'n8n-workflow';
-
-import config from '@/config';
-import { NodeTypes } from '@/NodeTypes';
-import * as ResponseHelper from '@/ResponseHelper';
+import { Post, RestController } from '@/decorators';
 import { getNodeTranslationPath } from '@/TranslationHelpers';
-import { Container } from 'typedi';
+import type { Config } from '@/config';
+import type { NodeTypes } from '@/NodeTypes';
+
+@RestController('/node-types')
+export class NodeTypesController {
+	private readonly config: Config;
 
-export const nodeTypesController = express.Router();
+	private readonly nodeTypes: NodeTypes;
 
-// Returns node information based on node names and versions
-nodeTypesController.post(
-	'/',
-	ResponseHelper.send(async (req: express.Request): Promise<INodeTypeDescription[]> => {
+	constructor({ config, nodeTypes }: { config: Config; nodeTypes: NodeTypes }) {
+		this.config = config;
+		this.nodeTypes = nodeTypes;
+	}
+
+	@Post('/')
+	async getNodeInfo(req: Request) {
 		const nodeInfos = get(req, 'body.nodeInfos', []) as INodeTypeNameVersion[];
 
-		const defaultLocale = config.getEnv('defaultLocale');
+		const defaultLocale = this.config.getEnv('defaultLocale');
 
 		if (defaultLocale === 'en') {
 			return nodeInfos.reduce<INodeTypeDescription[]>((acc, { name, version }) => {
-				const { description } = Container.get(NodeTypes).getByNameAndVersion(name, version);
+				const { description } = this.nodeTypes.getByNameAndVersion(name, version);
 				acc.push(description);
 				return acc;
 			}, []);
 		}
 
-		async function populateTranslation(
+		const populateTranslation = async (
 			name: string,
 			version: number,
 			nodeTypes: INodeTypeDescription[],
-		) {
-			const { description, sourcePath } = Container.get(NodeTypes).getWithSourcePath(name, version);
+		) => {
+			const { description, sourcePath } = this.nodeTypes.getWithSourcePath(name, version);
 			const translationPath = await getNodeTranslationPath({
 				nodeSourcePath: sourcePath,
 				longNodeType: description.name,
@@ -44,12 +48,12 @@ nodeTypesController.post(
 				const translation = await readFile(translationPath, 'utf8');
 				// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 				description.translation = JSON.parse(translation);
-			} catch (error) {
+			} catch {
 				// ignore - no translation exists at path
 			}
 
 			nodeTypes.push(description);
-		}
+		};
 
 		const nodeTypes: INodeTypeDescription[] = [];
 
@@ -60,5 +64,5 @@ nodeTypesController.post(
 		await Promise.all(promises);
 
 		return nodeTypes;
-	}),
-);
+	}
+}
diff --git a/packages/cli/src/api/nodes.api.ts b/packages/cli/src/controllers/nodes.controller.ts
similarity index 64%
rename from packages/cli/src/api/nodes.api.ts
rename to packages/cli/src/controllers/nodes.controller.ts
index 70264cdab5c5a9..63116bb761f2be 100644
--- a/packages/cli/src/api/nodes.api.ts
+++ b/packages/cli/src/controllers/nodes.controller.ts
@@ -1,10 +1,12 @@
-import express from 'express';
-import type { PublicInstalledPackage } from 'n8n-workflow';
-
-import config from '@/config';
-import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
-import * as ResponseHelper from '@/ResponseHelper';
-
+import { Request, Response, NextFunction } from 'express';
+import {
+	RESPONSE_ERROR_MESSAGES,
+	STARTER_TEMPLATE_NAME,
+	UNKNOWN_FAILURE_REASON,
+} from '@/constants';
+import { Delete, Get, Middleware, Patch, Post, RestController } from '@/decorators';
+import { NodeRequest } from '@/requests';
+import { BadRequestError, InternalServerError } from '@/ResponseHelper';
 import {
 	checkNpmPackageStatus,
 	executeCommand,
@@ -22,57 +24,50 @@ import {
 	getAllInstalledPackages,
 	isPackageInstalled,
 } from '@/CommunityNodes/packageModel';
-import {
-	RESPONSE_ERROR_MESSAGES,
-	STARTER_TEMPLATE_NAME,
-	UNKNOWN_FAILURE_REASON,
-} from '@/constants';
-import { isAuthenticatedRequest } from '@/UserManagement/UserManagementHelper';
-
 import type { InstalledPackages } from '@db/entities/InstalledPackages';
 import type { CommunityPackages } from '@/Interfaces';
-import type { NodeRequest } from '@/requests';
-import { Push } from '@/push';
-import { Container } from 'typedi';
+import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { InternalHooks } from '@/InternalHooks';
+import { Push } from '@/push';
+import { Config } from '@/config';
+import { isAuthenticatedRequest } from '@/UserManagement/UserManagementHelper';
 
 const { PACKAGE_NOT_INSTALLED, PACKAGE_NAME_NOT_PROVIDED } = RESPONSE_ERROR_MESSAGES;
 
-export const nodesController = express.Router();
-
-nodesController.use((req, res, next) => {
-	if (!isAuthenticatedRequest(req) || req.user.globalRole.name !== 'owner') {
-		res.status(403).json({ status: 'error', message: 'Unauthorized' });
-		return;
+@RestController('/nodes')
+export class NodesController {
+	constructor(
+		private config: Config,
+		private loadNodesAndCredentials: LoadNodesAndCredentials,
+		private push: Push,
+		private internalHooks: InternalHooks,
+	) {}
+
+	// TODO: move this into a new decorator `@Authorized`
+	@Middleware()
+	checkIfOwner(req: Request, res: Response, next: NextFunction) {
+		if (!isAuthenticatedRequest(req) || req.user.globalRole.name !== 'owner')
+			res.status(403).json({ status: 'error', message: 'Unauthorized' });
+		else next();
 	}
 
-	next();
-});
-
-nodesController.use((req, res, next) => {
-	if (config.getEnv('executions.mode') === 'queue' && req.method !== 'GET') {
-		res.status(400).json({
-			status: 'error',
-			message: 'Package management is disabled when running in "queue" mode',
-		});
-		return;
+	// TODO: move this into a new decorator `@IfConfig('executions.mode', 'queue')`
+	@Middleware()
+	checkIfCommunityNodesEnabled(req: Request, res: Response, next: NextFunction) {
+		if (this.config.getEnv('executions.mode') === 'queue' && req.method !== 'GET')
+			res.status(400).json({
+				status: 'error',
+				message: 'Package management is disabled when running in "queue" mode',
+			});
+		else next();
 	}
 
-	next();
-});
-
-/**
- * POST /nodes
- *
- * Install an n8n community package
- */
-nodesController.post(
-	'/',
-	ResponseHelper.send(async (req: NodeRequest.Post) => {
+	@Post('/')
+	async installPackage(req: NodeRequest.Post) {
 		const { name } = req.body;
 
 		if (!name) {
-			throw new ResponseHelper.BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
+			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
 		}
 
 		let parsed: CommunityPackages.ParsedPackageName;
@@ -80,13 +75,13 @@ nodesController.post(
 		try {
 			parsed = parseNpmPackageName(name);
 		} catch (error) {
-			throw new ResponseHelper.BadRequestError(
+			throw new BadRequestError(
 				error instanceof Error ? error.message : 'Failed to parse package name',
 			);
 		}
 
 		if (parsed.packageName === STARTER_TEMPLATE_NAME) {
-			throw new ResponseHelper.BadRequestError(
+			throw new BadRequestError(
 				[
 					`Package "${parsed.packageName}" is only a template`,
 					'Please enter an actual package to install',
@@ -98,7 +93,7 @@ nodesController.post(
 		const hasLoaded = hasPackageLoaded(name);
 
 		if (isInstalled && hasLoaded) {
-			throw new ResponseHelper.BadRequestError(
+			throw new BadRequestError(
 				[
 					`Package "${parsed.packageName}" is already installed`,
 					'To update it, click the corresponding button in the UI',
@@ -109,22 +104,19 @@ nodesController.post(
 		const packageStatus = await checkNpmPackageStatus(name);
 
 		if (packageStatus.status !== 'OK') {
-			throw new ResponseHelper.BadRequestError(
-				`Package "${name}" is banned so it cannot be installed`,
-			);
+			throw new BadRequestError(`Package "${name}" is banned so it cannot be installed`);
 		}
 
 		let installedPackage: InstalledPackages;
-
 		try {
-			installedPackage = await Container.get(LoadNodesAndCredentials).loadNpmModule(
+			installedPackage = await this.loadNodesAndCredentials.loadNpmModule(
 				parsed.packageName,
 				parsed.version,
 			);
 		} catch (error) {
 			const errorMessage = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
 
-			void Container.get(InternalHooks).onCommunityPackageInstallFinished({
+			void this.internalHooks.onCommunityPackageInstallFinished({
 				user: req.user,
 				input_string: name,
 				package_name: parsed.packageName,
@@ -136,23 +128,20 @@ nodesController.post(
 			const message = [`Error loading package "${name}"`, errorMessage].join(':');
 
 			const clientError = error instanceof Error ? isClientError(error) : false;
-
-			throw new ResponseHelper[clientError ? 'BadRequestError' : 'InternalServerError'](message);
+			throw new (clientError ? BadRequestError : InternalServerError)(message);
 		}
 
 		if (!hasLoaded) removePackageFromMissingList(name);
 
-		const pushInstance = Container.get(Push);
-
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			pushInstance.send('reloadNodeType', {
+			this.push.send('reloadNodeType', {
 				name: node.type,
 				version: node.latestVersion,
 			});
 		});
 
-		void Container.get(InternalHooks).onCommunityPackageInstallFinished({
+		void this.internalHooks.onCommunityPackageInstallFinished({
 			user: req.user,
 			input_string: name,
 			package_name: parsed.packageName,
@@ -164,17 +153,10 @@ nodesController.post(
 		});
 
 		return installedPackage;
-	}),
-);
-
-/**
- * GET /nodes
- *
- * Retrieve list of installed n8n community packages
- */
-nodesController.get(
-	'/',
-	ResponseHelper.send(async (): Promise<PublicInstalledPackage[]> => {
+	}
+
+	@Get('/')
+	async getInstalledPackages() {
 		const installedPackages = await getAllInstalledPackages();
 
 		if (installedPackages.length === 0) return [];
@@ -188,7 +170,6 @@ nodesController.get(
 			// when there are updates, npm exits with code 1
 			// when there are no updates, command succeeds
 			// https://github.com/npm/rfcs/issues/473
-
 			if (isNpmError(error) && error.code === 1) {
 				pendingUpdates = JSON.parse(error.stdout) as CommunityPackages.AvailableUpdates;
 			}
@@ -197,31 +178,21 @@ nodesController.get(
 		let hydratedPackages = matchPackagesWithUpdates(installedPackages, pendingUpdates);
 
 		try {
-			const missingPackages = config.get('nodes.packagesMissing') as string | undefined;
-
+			const missingPackages = this.config.get('nodes.packagesMissing') as string | undefined;
 			if (missingPackages) {
 				hydratedPackages = matchMissingPackages(hydratedPackages, missingPackages);
 			}
-		} catch {
-			// Do nothing if setting is missing
-		}
+		} catch {}
 
 		return hydratedPackages;
-	}),
-);
-
-/**
- * DELETE /nodes
- *
- * Uninstall an installed n8n community package
- */
-nodesController.delete(
-	'/',
-	ResponseHelper.send(async (req: NodeRequest.Delete) => {
+	}
+
+	@Delete('/')
+	async uninstallPackage(req: NodeRequest.Delete) {
 		const { name } = req.query;
 
 		if (!name) {
-			throw new ResponseHelper.BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
+			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
 		}
 
 		try {
@@ -229,37 +200,35 @@ nodesController.delete(
 		} catch (error) {
 			const message = error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON;
 
-			throw new ResponseHelper.BadRequestError(message);
+			throw new BadRequestError(message);
 		}
 
 		const installedPackage = await findInstalledPackage(name);
 
 		if (!installedPackage) {
-			throw new ResponseHelper.BadRequestError(PACKAGE_NOT_INSTALLED);
+			throw new BadRequestError(PACKAGE_NOT_INSTALLED);
 		}
 
 		try {
-			await Container.get(LoadNodesAndCredentials).removeNpmModule(name, installedPackage);
+			await this.loadNodesAndCredentials.removeNpmModule(name, installedPackage);
 		} catch (error) {
 			const message = [
 				`Error removing package "${name}"`,
 				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
 			].join(':');
 
-			throw new ResponseHelper.InternalServerError(message);
+			throw new InternalServerError(message);
 		}
 
-		const pushInstance = Container.get(Push);
-
 		// broadcast to connected frontends that node list has been updated
 		installedPackage.installedNodes.forEach((node) => {
-			pushInstance.send('removeNodeType', {
+			this.push.send('removeNodeType', {
 				name: node.type,
 				version: node.latestVersion,
 			});
 		});
 
-		void Container.get(InternalHooks).onCommunityPackageDeleteFinished({
+		void this.internalHooks.onCommunityPackageDeleteFinished({
 			user: req.user,
 			package_name: name,
 			package_version: installedPackage.installedVersion,
@@ -267,53 +236,44 @@ nodesController.delete(
 			package_author: installedPackage.authorName,
 			package_author_email: installedPackage.authorEmail,
 		});
-	}),
-);
-
-/**
- * PATCH /nodes
- *
- * Update an installed n8n community package
- */
-nodesController.patch(
-	'/',
-	ResponseHelper.send(async (req: NodeRequest.Update) => {
+	}
+
+	@Patch('/')
+	async updatePackage(req: NodeRequest.Update) {
 		const { name } = req.body;
 
 		if (!name) {
-			throw new ResponseHelper.BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
+			throw new BadRequestError(PACKAGE_NAME_NOT_PROVIDED);
 		}
 
 		const previouslyInstalledPackage = await findInstalledPackage(name);
 
 		if (!previouslyInstalledPackage) {
-			throw new ResponseHelper.BadRequestError(PACKAGE_NOT_INSTALLED);
+			throw new BadRequestError(PACKAGE_NOT_INSTALLED);
 		}
 
 		try {
-			const newInstalledPackage = await Container.get(LoadNodesAndCredentials).updateNpmModule(
+			const newInstalledPackage = await this.loadNodesAndCredentials.updateNpmModule(
 				parseNpmPackageName(name).packageName,
 				previouslyInstalledPackage,
 			);
 
-			const pushInstance = Container.get(Push);
-
 			// broadcast to connected frontends that node list has been updated
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				pushInstance.send('removeNodeType', {
+				this.push.send('removeNodeType', {
 					name: node.type,
 					version: node.latestVersion,
 				});
 			});
 
 			newInstalledPackage.installedNodes.forEach((node) => {
-				pushInstance.send('reloadNodeType', {
+				this.push.send('reloadNodeType', {
 					name: node.name,
 					version: node.latestVersion,
 				});
 			});
 
-			void Container.get(InternalHooks).onCommunityPackageUpdateFinished({
+			void this.internalHooks.onCommunityPackageUpdateFinished({
 				user: req.user,
 				package_name: name,
 				package_version_current: previouslyInstalledPackage.installedVersion,
@@ -326,8 +286,7 @@ nodesController.patch(
 			return newInstalledPackage;
 		} catch (error) {
 			previouslyInstalledPackage.installedNodes.forEach((node) => {
-				const pushInstance = Container.get(Push);
-				pushInstance.send('removeNodeType', {
+				this.push.send('removeNodeType', {
 					name: node.type,
 					version: node.latestVersion,
 				});
@@ -338,7 +297,7 @@ nodesController.patch(
 				error instanceof Error ? error.message : UNKNOWN_FAILURE_REASON,
 			].join(':');
 
-			throw new ResponseHelper.InternalServerError(message);
+			throw new InternalServerError(message);
 		}
-	}),
-);
+	}
+}
diff --git a/packages/cli/src/controllers/tags.controller.ts b/packages/cli/src/controllers/tags.controller.ts
new file mode 100644
index 00000000000000..3c73235c853b30
--- /dev/null
+++ b/packages/cli/src/controllers/tags.controller.ts
@@ -0,0 +1,102 @@
+import { Request, Response, NextFunction } from 'express';
+import type { Repository } from 'typeorm';
+import type { Config } from '@/config';
+import { Delete, Get, Middleware, Patch, Post, RestController } from '@/decorators';
+import type { IDatabaseCollections, IExternalHooksClass, ITagWithCountDb } from '@/Interfaces';
+import { TagEntity } from '@db/entities/TagEntity';
+import { getTagsWithCountDb } from '@/TagHelpers';
+import { validateEntity } from '@/GenericHelpers';
+import { BadRequestError, UnauthorizedError } from '@/ResponseHelper';
+import { TagsRequest } from '@/requests';
+
+@RestController('/tags')
+export class TagsController {
+	private config: Config;
+
+	private externalHooks: IExternalHooksClass;
+
+	private tagsRepository: Repository<TagEntity>;
+
+	constructor({
+		config,
+		externalHooks,
+		repositories,
+	}: {
+		config: Config;
+		externalHooks: IExternalHooksClass;
+		repositories: Pick<IDatabaseCollections, 'Tag'>;
+	}) {
+		this.config = config;
+		this.externalHooks = externalHooks;
+		this.tagsRepository = repositories.Tag;
+	}
+
+	// TODO: move this into a new decorator `@IfEnabled('workflowTagsDisabled')`
+	@Middleware()
+	workflowsEnabledMiddleware(req: Request, res: Response, next: NextFunction) {
+		if (this.config.getEnv('workflowTagsDisabled'))
+			throw new BadRequestError('Workflow tags are disabled');
+		next();
+	}
+
+	// Retrieves all tags, with or without usage count
+	@Get('/')
+	async getAll(req: TagsRequest.GetAll): Promise<TagEntity[] | ITagWithCountDb[]> {
+		const { withUsageCount } = req.query;
+		if (withUsageCount === 'true') {
+			const tablePrefix = this.config.getEnv('database.tablePrefix');
+			return getTagsWithCountDb(tablePrefix);
+		}
+
+		return this.tagsRepository.find({ select: ['id', 'name', 'createdAt', 'updatedAt'] });
+	}
+
+	// Creates a tag
+	@Post('/')
+	async createTag(req: TagsRequest.Create): Promise<TagEntity> {
+		const newTag = new TagEntity();
+		newTag.name = req.body.name.trim();
+
+		await this.externalHooks.run('tag.beforeCreate', [newTag]);
+		await validateEntity(newTag);
+
+		const tag = await this.tagsRepository.save(newTag);
+		await this.externalHooks.run('tag.afterCreate', [tag]);
+		return tag;
+	}
+
+	// Updates a tag
+	@Patch('/:id(\\d+)')
+	async updateTag(req: TagsRequest.Update): Promise<TagEntity> {
+		const { name } = req.body;
+		const { id } = req.params;
+
+		const newTag = new TagEntity();
+		newTag.id = id;
+		newTag.name = name.trim();
+
+		await this.externalHooks.run('tag.beforeUpdate', [newTag]);
+		await validateEntity(newTag);
+
+		const tag = await this.tagsRepository.save(newTag);
+		await this.externalHooks.run('tag.afterUpdate', [tag]);
+		return tag;
+	}
+
+	@Delete('/:id(\\d+)')
+	async deleteTag(req: TagsRequest.Delete) {
+		const isInstanceOwnerSetUp = this.config.getEnv('userManagement.isInstanceOwnerSetUp');
+		if (isInstanceOwnerSetUp && req.user.globalRole.name !== 'owner') {
+			throw new UnauthorizedError(
+				'You are not allowed to perform this action',
+				'Only owners can remove tags',
+			);
+		}
+		const { id } = req.params;
+		await this.externalHooks.run('tag.beforeDelete', [id]);
+
+		await this.tagsRepository.delete({ id });
+		await this.externalHooks.run('tag.afterDelete', [id]);
+		return true;
+	}
+}
diff --git a/packages/cli/src/decorators/Middleware.ts b/packages/cli/src/decorators/Middleware.ts
new file mode 100644
index 00000000000000..6d5e957f6eccf7
--- /dev/null
+++ b/packages/cli/src/decorators/Middleware.ts
@@ -0,0 +1,11 @@
+import { CONTROLLER_MIDDLEWARES } from './constants';
+import type { MiddlewareMetadata } from './types';
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export const Middleware = (): MethodDecorator => (target, handlerName) => {
+	const controllerClass = target.constructor;
+	const middlewares = (Reflect.getMetadata(CONTROLLER_MIDDLEWARES, controllerClass) ??
+		[]) as MiddlewareMetadata[];
+	middlewares.push({ handlerName: String(handlerName) });
+	Reflect.defineMetadata(CONTROLLER_MIDDLEWARES, middlewares, controllerClass);
+};
diff --git a/packages/cli/src/decorators/Route.ts b/packages/cli/src/decorators/Route.ts
index 773bb2193ac269..59461cbc8709c6 100644
--- a/packages/cli/src/decorators/Route.ts
+++ b/packages/cli/src/decorators/Route.ts
@@ -15,5 +15,6 @@ const RouteFactory =
 
 export const Get = RouteFactory('get');
 export const Post = RouteFactory('post');
+export const Put = RouteFactory('put');
 export const Patch = RouteFactory('patch');
 export const Delete = RouteFactory('delete');
diff --git a/packages/cli/src/decorators/constants.ts b/packages/cli/src/decorators/constants.ts
index 9c77ab696e172d..6bff0e4a6cb906 100644
--- a/packages/cli/src/decorators/constants.ts
+++ b/packages/cli/src/decorators/constants.ts
@@ -1,2 +1,3 @@
 export const CONTROLLER_ROUTES = 'CONTROLLER_ROUTES';
 export const CONTROLLER_BASE_PATH = 'CONTROLLER_BASE_PATH';
+export const CONTROLLER_MIDDLEWARES = 'CONTROLLER_MIDDLEWARES';
diff --git a/packages/cli/src/decorators/index.ts b/packages/cli/src/decorators/index.ts
index bda31ce887b70a..71b82b5b69c30d 100644
--- a/packages/cli/src/decorators/index.ts
+++ b/packages/cli/src/decorators/index.ts
@@ -1,3 +1,4 @@
 export { RestController } from './RestController';
-export { Get, Post, Patch, Delete } from './Route';
+export { Get, Post, Put, Patch, Delete } from './Route';
+export { Middleware } from './Middleware';
 export { registerController } from './registerController';
diff --git a/packages/cli/src/decorators/registerController.ts b/packages/cli/src/decorators/registerController.ts
index 9f1ab5bba72e22..991b5a185e990a 100644
--- a/packages/cli/src/decorators/registerController.ts
+++ b/packages/cli/src/decorators/registerController.ts
@@ -1,10 +1,10 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import { Router } from 'express';
 import type { Config } from '@/config';
-import { CONTROLLER_BASE_PATH, CONTROLLER_ROUTES } from './constants';
+import { CONTROLLER_BASE_PATH, CONTROLLER_MIDDLEWARES, CONTROLLER_ROUTES } from './constants';
 import { send } from '@/ResponseHelper'; // TODO: move `ResponseHelper.send` to this file
-import type { Application, Request, Response } from 'express';
-import type { Controller, RouteMetadata } from './types';
+import type { Application, Request, Response, RequestHandler } from 'express';
+import type { Controller, MiddlewareMetadata, RouteMetadata } from './types';
 
 export const registerController = (app: Application, config: Config, controller: object) => {
 	const controllerClass = controller.constructor;
@@ -20,9 +20,17 @@ export const registerController = (app: Application, config: Config, controller:
 		const restBasePath = config.getEnv('endpoints.rest');
 		const prefix = `/${[restBasePath, controllerBasePath].join('/')}`.replace(/\/+/g, '/');
 
+		const middlewares = (
+			(Reflect.getMetadata(CONTROLLER_MIDDLEWARES, controllerClass) ?? []) as MiddlewareMetadata[]
+		).map(
+			({ handlerName }) =>
+				(controller as Controller)[handlerName].bind(controller) as RequestHandler,
+		);
+
 		routes.forEach(({ method, path, handlerName }) => {
 			router[method](
 				path,
+				...middlewares,
 				send(async (req: Request, res: Response) =>
 					(controller as Controller)[handlerName](req, res),
 				),
diff --git a/packages/cli/src/decorators/types.ts b/packages/cli/src/decorators/types.ts
index 829451f4d77cce..790833c3a92285 100644
--- a/packages/cli/src/decorators/types.ts
+++ b/packages/cli/src/decorators/types.ts
@@ -1,6 +1,10 @@
 import type { Request, Response } from 'express';
 
-export type Method = 'get' | 'post' | 'patch' | 'delete';
+export type Method = 'get' | 'post' | 'put' | 'patch' | 'delete';
+
+export interface MiddlewareMetadata {
+	handlerName: string;
+}
 
 export interface RouteMetadata {
 	method: Method;
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index 81b43dd31745f1..af889d15f9de40 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -3,7 +3,6 @@ export * from './CredentialsHelper';
 export * from './CredentialTypes';
 export * from './CredentialsOverwrites';
 export * from './Interfaces';
-export * from './NodeTypes';
 export * from './WaitingWebhooks';
 export * from './WorkflowCredentials';
 export * from './WorkflowRunner';
diff --git a/packages/cli/src/middlewares/auth.ts b/packages/cli/src/middlewares/auth.ts
index 34c76ea592b8d1..1299f474084b6f 100644
--- a/packages/cli/src/middlewares/auth.ts
+++ b/packages/cli/src/middlewares/auth.ts
@@ -18,7 +18,7 @@ import {
 } from '@/UserManagement/UserManagementHelper';
 import type { Repository } from 'typeorm';
 import type { User } from '@db/entities/User';
-import { SamlUrls } from '../sso/saml/constants';
+import { SamlUrls } from '@/sso/saml/constants';
 
 const jwtFromRequest = (req: Request) => {
 	// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
diff --git a/packages/cli/src/requests.ts b/packages/cli/src/requests.ts
index f8c5af17b4a840..5c520407e0ad42 100644
--- a/packages/cli/src/requests.ts
+++ b/packages/cli/src/requests.ts
@@ -330,6 +330,9 @@ export type NodeListSearchRequest = AuthenticatedRequest<
 // ----------------------------------
 
 export declare namespace TagsRequest {
+	type GetAll = AuthenticatedRequest<{}, {}, {}, { withUsageCount: string }>;
+	type Create = AuthenticatedRequest<{}, {}, { name: string }>;
+	type Update = AuthenticatedRequest<{ id: string }, {}, { name: string }>;
 	type Delete = AuthenticatedRequest<{ id: string }>;
 }
 
diff --git a/packages/cli/test/integration/ldap/ldap.api.test.ts b/packages/cli/test/integration/ldap/ldap.api.test.ts
index 36b89244692be3..f8233557580170 100644
--- a/packages/cli/test/integration/ldap/ldap.api.test.ts
+++ b/packages/cli/test/integration/ldap/ldap.api.test.ts
@@ -49,13 +49,11 @@ beforeAll(async () => {
 
 	authAgent = utils.createAuthAgent(app);
 
-	config.set(LDAP_ENABLED, true);
 	defaultLdapConfig.bindingAdminPassword = await encryptPassword(
 		defaultLdapConfig.bindingAdminPassword,
 	);
 
 	utils.initConfigFile();
-	await utils.initLdapManager();
 });
 
 beforeEach(async () => {
diff --git a/packages/cli/test/integration/shared/utils.ts b/packages/cli/test/integration/shared/utils.ts
index ba28f16732656b..6aeded0866e99a 100644
--- a/packages/cli/test/integration/shared/utils.ts
+++ b/packages/cli/test/integration/shared/utils.ts
@@ -31,11 +31,8 @@ import { DeepPartial } from 'ts-essentials';
 import config from '@/config';
 import * as Db from '@/Db';
 import { WorkflowEntity } from '@db/entities/WorkflowEntity';
-import { CredentialTypes } from '@/CredentialTypes';
 import { ExternalHooks } from '@/ExternalHooks';
-import { NodeTypes } from '@/NodeTypes';
 import { ActiveWorkflowRunner } from '@/ActiveWorkflowRunner';
-import { nodesController } from '@/api/nodes.api';
 import { workflowsController } from '@/workflows/workflows.controller';
 import { AUTH_COOKIE_NAME, NODE_PACKAGE_PREFIX } from '@/constants';
 import { credentialsController } from '@/credentials/credentials.controller';
@@ -65,7 +62,9 @@ import { eventBusRouter } from '@/eventbus/eventBusRoutes';
 import { registerController } from '@/decorators';
 import {
 	AuthController,
+	LdapController,
 	MeController,
+	NodesController,
 	OwnerController,
 	PasswordResetController,
 	UsersController,
@@ -74,11 +73,13 @@ import { setupAuthMiddlewares } from '@/middlewares';
 import * as testDb from '../shared/testDb';
 
 import { v4 as uuid } from 'uuid';
-import { handleLdapInit } from '@/Ldap/helpers';
-import { ldapController } from '@/Ldap/routes/ldap.controller.ee';
 import { InternalHooks } from '@/InternalHooks';
 import { LoadNodesAndCredentials } from '@/LoadNodesAndCredentials';
 import { PostHogClient } from '@/posthog';
+import { LdapManager } from '@/Ldap/LdapManager.ee';
+import { LDAP_ENABLED } from '@/Ldap/constants';
+import { handleLdapInit } from '@/Ldap/helpers';
+import { Push } from '@/push';
 
 export const mockInstance = <T>(
 	ctor: new (...args: any[]) => T,
@@ -155,10 +156,8 @@ export async function initTestServer({
 		const map: Record<string, express.Router | express.Router[] | any> = {
 			credentials: { controller: credentialsController, path: 'credentials' },
 			workflows: { controller: workflowsController, path: 'workflows' },
-			nodes: { controller: nodesController, path: 'nodes' },
 			license: { controller: licenseController, path: 'license' },
 			eventBus: { controller: eventBusRouter, path: 'eventbus' },
-			ldap: { controller: ldapController, path: 'ldap' },
 		};
 
 		if (enablePublicAPI) {
@@ -190,6 +189,27 @@ export async function initTestServer({
 						new AuthController({ config, logger, internalHooks, repositories }),
 					);
 					break;
+				case 'ldap':
+					config.set(LDAP_ENABLED, true);
+					await handleLdapInit();
+					const { service, sync } = LdapManager.getInstance();
+					registerController(
+						testServer.app,
+						config,
+						new LdapController(service, sync, internalHooks),
+					);
+					break;
+				case 'nodes':
+					registerController(
+						testServer.app,
+						config,
+						new NodesController(
+							config,
+							Container.get(LoadNodesAndCredentials),
+							Container.get(Push),
+							internalHooks,
+						),
+					);
 				case 'me':
 					registerController(
 						testServer.app,
@@ -246,15 +266,7 @@ const classifyEndpointGroups = (endpointGroups: EndpointGroup[]) => {
 	const routerEndpoints: EndpointGroup[] = [];
 	const functionEndpoints: EndpointGroup[] = [];
 
-	const ROUTER_GROUP = [
-		'credentials',
-		'nodes',
-		'workflows',
-		'publicApi',
-		'ldap',
-		'eventBus',
-		'license',
-	];
+	const ROUTER_GROUP = ['credentials', 'workflows', 'publicApi', 'eventBus', 'license'];
 
 	endpointGroups.forEach((group) =>
 		(ROUTER_GROUP.includes(group) ? routerEndpoints : functionEndpoints).push(group),
@@ -320,13 +332,6 @@ export async function initCredentialsTypes(): Promise<void> {
 	};
 }
 
-/**
- * Initialize LDAP manager.
- */
-export async function initLdapManager(): Promise<void> {
-	await handleLdapInit();
-}
-
 /**
  * Initialize node types.
  */

From d872866add5456cac6b67a1248892bde02d61e84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Mar 2023 15:08:48 +0100
Subject: [PATCH 350/358] feat(core): Allow using middlewares with decorators
 on a per-route basis (no-changelog) (#5656)

---
 packages/cli/src/decorators/Route.ts              | 14 ++++++++++++--
 packages/cli/src/decorators/registerController.ts |  7 ++++---
 packages/cli/src/decorators/types.ts              |  9 ++++++---
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/packages/cli/src/decorators/Route.ts b/packages/cli/src/decorators/Route.ts
index 59461cbc8709c6..e51369a64ce430 100644
--- a/packages/cli/src/decorators/Route.ts
+++ b/packages/cli/src/decorators/Route.ts
@@ -1,15 +1,25 @@
+import type { RequestHandler } from 'express';
 import { CONTROLLER_ROUTES } from './constants';
 import type { Method, RouteMetadata } from './types';
 
+interface RouteOptions {
+	middlewares?: RequestHandler[];
+}
+
 /* eslint-disable @typescript-eslint/naming-convention */
 const RouteFactory =
 	(method: Method) =>
-	(path: `/${string}`): MethodDecorator =>
+	(path: `/${string}`, options: RouteOptions = {}): MethodDecorator =>
 	(target, handlerName) => {
 		const controllerClass = target.constructor;
 		const routes = (Reflect.getMetadata(CONTROLLER_ROUTES, controllerClass) ??
 			[]) as RouteMetadata[];
-		routes.push({ method, path, handlerName: String(handlerName) });
+		routes.push({
+			method,
+			path,
+			middlewares: options.middlewares ?? [],
+			handlerName: String(handlerName),
+		});
 		Reflect.defineMetadata(CONTROLLER_ROUTES, routes, controllerClass);
 	};
 
diff --git a/packages/cli/src/decorators/registerController.ts b/packages/cli/src/decorators/registerController.ts
index 991b5a185e990a..e20293ae21c714 100644
--- a/packages/cli/src/decorators/registerController.ts
+++ b/packages/cli/src/decorators/registerController.ts
@@ -20,17 +20,18 @@ export const registerController = (app: Application, config: Config, controller:
 		const restBasePath = config.getEnv('endpoints.rest');
 		const prefix = `/${[restBasePath, controllerBasePath].join('/')}`.replace(/\/+/g, '/');
 
-		const middlewares = (
+		const controllerMiddlewares = (
 			(Reflect.getMetadata(CONTROLLER_MIDDLEWARES, controllerClass) ?? []) as MiddlewareMetadata[]
 		).map(
 			({ handlerName }) =>
 				(controller as Controller)[handlerName].bind(controller) as RequestHandler,
 		);
 
-		routes.forEach(({ method, path, handlerName }) => {
+		routes.forEach(({ method, path, middlewares: routeMiddlewares, handlerName }) => {
 			router[method](
 				path,
-				...middlewares,
+				...controllerMiddlewares,
+				...routeMiddlewares,
 				send(async (req: Request, res: Response) =>
 					(controller as Controller)[handlerName](req, res),
 				),
diff --git a/packages/cli/src/decorators/types.ts b/packages/cli/src/decorators/types.ts
index 790833c3a92285..250abf0d27c959 100644
--- a/packages/cli/src/decorators/types.ts
+++ b/packages/cli/src/decorators/types.ts
@@ -1,4 +1,4 @@
-import type { Request, Response } from 'express';
+import type { Request, Response, RequestHandler } from 'express';
 
 export type Method = 'get' | 'post' | 'put' | 'patch' | 'delete';
 
@@ -10,7 +10,10 @@ export interface RouteMetadata {
 	method: Method;
 	path: string;
 	handlerName: string;
+	middlewares: RequestHandler[];
 }
 
-type RequestHandler = (req?: Request, res?: Response) => Promise<unknown>;
-export type Controller = Record<RouteMetadata['handlerName'], RequestHandler>;
+export type Controller = Record<
+	RouteMetadata['handlerName'],
+	(req?: Request, res?: Response) => Promise<unknown>
+>;

From ac2f89a18a4c25ef1b39bcacc624884de9197fdf Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 9 Mar 2023 15:22:12 +0100
Subject: [PATCH 351/358] feat(editor): Do not automatically add manual trigger
 on node plus (#5644)

* feat(editor): Do not add manual trigger node if node creator trigger via canvas actions

* Add e2e tests

* Install cypress-plugin-tab, do not use cy.realPress as it hangs the tests

* Exclude tab tests
---
 cypress/e2e/4-node-creator.cy.ts              | 47 +++++++++++++++++++
 cypress/pages/workflow.ts                     |  4 ++
 cypress/support/commands.ts                   |  2 +-
 packages/editor-ui/src/Interface.ts           | 11 +++++
 .../src/components/Node/NodeCreation.vue      | 12 ++++-
 packages/editor-ui/src/constants.ts           | 16 +++++++
 packages/editor-ui/src/stores/nodeCreator.ts  | 27 +++++++++--
 packages/editor-ui/src/views/NodeView.vue     | 30 +++++++-----
 8 files changed, 131 insertions(+), 18 deletions(-)

diff --git a/cypress/e2e/4-node-creator.cy.ts b/cypress/e2e/4-node-creator.cy.ts
index 2054209f4f1909..014e94aeceaa1a 100644
--- a/cypress/e2e/4-node-creator.cy.ts
+++ b/cypress/e2e/4-node-creator.cy.ts
@@ -144,4 +144,51 @@ describe('Node Creator', () => {
 			.click();
 		secondParameter().find('input.el-input__inner').should('have.value', 'option4');
 	});
+
+	describe('should correctly append manual trigger for regular actions', () => {
+		// For these sources, manual node should be added
+		const sourcesWithAppend = [
+			{
+				name: 'canvas add button',
+				handler: () => nodeCreatorFeature.getters.canvasAddButton().click(),
+			}, {
+				name: 'plus button',
+				handler: () => nodeCreatorFeature.getters.plusButton().click(),
+			},
+			// We can't test this one because it's not possible to trigger tab key in Cypress
+			// only way is to use `realPress` which is hanging the tests in Electron for some reason
+			// {
+			// 	name: 'tab key',
+			// 	handler: () => cy.realPress('Tab'),
+			// },
+		]
+		sourcesWithAppend.forEach((source) => {
+			it(`should append manual trigger when source is ${source.name}`, () => {
+				source.handler()
+				nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
+				nodeCreatorFeature.getters.getCreatorItem('n8n').click();
+				nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
+				NDVModal.actions.close();
+				WorkflowPage.getters.canvasNodes().should('have.length', 2);
+			});
+		});
+
+		it('should not append manual trigger when source is canvas related', () => {
+			nodeCreatorFeature.getters.canvasAddButton().click();
+			nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
+			nodeCreatorFeature.getters.getCreatorItem('n8n').click();
+			nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
+			NDVModal.actions.close();
+			WorkflowPage.actions.deleteNode('When clicking "Execute Workflow"')
+			WorkflowPage.getters.canvasNodePlusEndpointByName('n8n').click()
+			nodeCreatorFeature.getters.searchBar().find('input').clear().type('n8n');
+			nodeCreatorFeature.getters.getCreatorItem('n8n').click();
+			nodeCreatorFeature.getters.getCreatorItem('Create a credential').click();
+			NDVModal.actions.close();
+			WorkflowPage.getters.canvasNodes().should('have.length', 2);
+			WorkflowPage.actions.zoomToFit();
+			WorkflowPage.actions.addNodeBetweenNodes('n8n', 'n8n1', 'Item Lists')
+			WorkflowPage.getters.canvasNodes().should('have.length', 3);
+		})
+	});
 });
diff --git a/cypress/pages/workflow.ts b/cypress/pages/workflow.ts
index 2dc647e4bfce52..4ad4b753a91614 100644
--- a/cypress/pages/workflow.ts
+++ b/cypress/pages/workflow.ts
@@ -174,6 +174,10 @@ export class WorkflowPage extends BasePage {
 		saveWorkflowUsingKeyboardShortcut: () => {
 			cy.get('body').type('{meta}', { release: false }).type('s');
 		},
+		deleteNode: (name: string) => {
+			this.getters.canvasNodeByName(name).first().click();
+			cy.get('body').type('{del}');
+		},
 		setWorkflowName: (name: string) => {
 			this.getters.workflowNameInput().should('be.disabled');
 			this.getters.workflowNameInput().parent().click();
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index 233c74ee5575b1..f700b3c6f35f45 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -24,7 +24,7 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 import 'cypress-real-events';
-import { WorkflowsPage, SigninPage, SignupPage, SettingsUsersPage, WorkflowPage } from '../pages';
+import { SigninPage, SignupPage, SettingsUsersPage, WorkflowPage } from '../pages';
 import { N8N_AUTH_COOKIE } from '../constants';
 import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { MessageBox } from '../pages/modals/message-box';
diff --git a/packages/editor-ui/src/Interface.ts b/packages/editor-ui/src/Interface.ts
index 8503e38759893f..8f1021a22d894e 100644
--- a/packages/editor-ui/src/Interface.ts
+++ b/packages/editor-ui/src/Interface.ts
@@ -1179,11 +1179,22 @@ export type IFakeDoorLocation =
 
 export type INodeFilterType = typeof REGULAR_NODE_FILTER | typeof TRIGGER_NODE_FILTER;
 
+export type NodeCreatorOpenSource =
+	| ''
+	| 'no_trigger_execution_tooltip'
+	| 'plus_endpoint'
+	| 'trigger_placeholder_button'
+	| 'tab'
+	| 'node_connection_action'
+	| 'node_connection_drop'
+	| 'add_node_button';
+
 export interface INodeCreatorState {
 	itemsFilter: string;
 	showScrim: boolean;
 	rootViewHistory: INodeFilterType[];
 	selectedView: INodeFilterType;
+	openSource: NodeCreatorOpenSource;
 }
 
 export interface ISettingsState {
diff --git a/packages/editor-ui/src/components/Node/NodeCreation.vue b/packages/editor-ui/src/components/Node/NodeCreation.vue
index 58f49482267660..edae0d921b58d8 100644
--- a/packages/editor-ui/src/components/Node/NodeCreation.vue
+++ b/packages/editor-ui/src/components/Node/NodeCreation.vue
@@ -38,7 +38,12 @@
 <script lang="ts">
 import Vue from 'vue';
 import { getMidCanvasPosition } from '@/utils/nodeViewUtils';
-import { DEFAULT_STICKY_HEIGHT, DEFAULT_STICKY_WIDTH, STICKY_NODE_TYPE } from '@/constants';
+import {
+	DEFAULT_STICKY_HEIGHT,
+	DEFAULT_STICKY_WIDTH,
+	NODE_CREATOR_OPEN_SOURCES,
+	STICKY_NODE_TYPE,
+} from '@/constants';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 
@@ -94,7 +99,10 @@ export default Vue.extend({
 			document.addEventListener('mousemove', moveCallback, false);
 		},
 		openNodeCreator() {
-			this.$emit('toggleNodeCreator', { source: 'add_node_button', createNodeActive: true });
+			this.$emit('toggleNodeCreator', {
+				source: NODE_CREATOR_OPEN_SOURCES.ADD_NODE_BUTTON,
+				createNodeActive: true,
+			});
 		},
 		addStickyNote() {
 			if (document.activeElement) {
diff --git a/packages/editor-ui/src/constants.ts b/packages/editor-ui/src/constants.ts
index 8dc8124244c051..3607bb8f25de82 100644
--- a/packages/editor-ui/src/constants.ts
+++ b/packages/editor-ui/src/constants.ts
@@ -1,3 +1,5 @@
+import { NodeCreatorOpenSource } from './Interface';
+
 export const MAX_WORKFLOW_SIZE = 16777216; // Workflow size limit in bytes
 export const MAX_WORKFLOW_PINNED_DATA_SIZE = 12582912; // Workflow pinned data size limit in bytes
 export const MAX_DISPLAY_DATA_SIZE = 204800;
@@ -147,6 +149,20 @@ export const NON_ACTIVATABLE_TRIGGER_NODE_TYPES = [
 export const PIN_DATA_NODE_TYPES_DENYLIST = [SPLIT_IN_BATCHES_NODE_TYPE];
 
 // Node creator
+export const NODE_CREATOR_OPEN_SOURCES: Record<
+	Uppercase<NodeCreatorOpenSource>,
+	NodeCreatorOpenSource
+> = {
+	NO_TRIGGER_EXECUTION_TOOLTIP: 'no_trigger_execution_tooltip',
+	PLUS_ENDPOINT: 'plus_endpoint',
+	TRIGGER_PLACEHOLDER_BUTTON: 'trigger_placeholder_button',
+	ADD_NODE_BUTTON: 'add_node_button',
+	TAB: 'tab',
+	NODE_CONNECTION_ACTION: 'node_connection_action',
+	NODE_CONNECTION_DROP: 'node_connection_drop',
+	'': '',
+};
+
 export const CORE_NODES_CATEGORY = 'Core Nodes';
 export const COMMUNICATION_CATEGORY = 'Communication';
 export const CUSTOM_NODES_CATEGORY = 'Custom Nodes';
diff --git a/packages/editor-ui/src/stores/nodeCreator.ts b/packages/editor-ui/src/stores/nodeCreator.ts
index aea5f2af93bb85..824f17754f167a 100644
--- a/packages/editor-ui/src/stores/nodeCreator.ts
+++ b/packages/editor-ui/src/stores/nodeCreator.ts
@@ -16,6 +16,7 @@ import {
 	CORE_NODES_CATEGORY,
 	TRIGGER_NODE_FILTER,
 	STICKY_NODE_TYPE,
+	NODE_CREATOR_OPEN_SOURCES,
 } from '@/constants';
 import { useNodeTypesStore } from '@/stores/nodeTypes';
 import { useWorkflowsStore } from './workflows';
@@ -245,6 +246,7 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 		showScrim: false,
 		selectedView: TRIGGER_NODE_FILTER,
 		rootViewHistory: [],
+		openSource: '',
 	}),
 	actions: {
 		setShowScrim(isVisible: boolean) {
@@ -350,11 +352,28 @@ export const useNodeCreatorStore = defineStore(STORES.NODE_CREATOR, {
 				const workflowContainsTrigger = workflowTriggerNodes.length > 0;
 				const isTriggerPanel = useNodeCreatorStore().selectedView === TRIGGER_NODE_FILTER;
 				const isStickyNode = nodeType === STICKY_NODE_TYPE;
+				const singleNodeOpenSources = [
+					NODE_CREATOR_OPEN_SOURCES.PLUS_ENDPOINT,
+					NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_ACTION,
+					NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_DROP,
+				];
+
+				// If the node creator was opened from the plus endpoint, node connection action, or node connection drop
+				// then we do not want to append the manual trigger
+				const isSingleNodeOpenSource = singleNodeOpenSources.includes(
+					useNodeCreatorStore().openSource,
+				);
+
+				const shouldAppendManualTrigger =
+					!isSingleNodeOpenSource &&
+					!isTrigger &&
+					!workflowContainsTrigger &&
+					isTriggerPanel &&
+					!isStickyNode;
 
-				const nodeTypes =
-					!isTrigger && !workflowContainsTrigger && isTriggerPanel && !isStickyNode
-						? [MANUAL_TRIGGER_NODE_TYPE, nodeType]
-						: [nodeType];
+				const nodeTypes = shouldAppendManualTrigger
+					? [MANUAL_TRIGGER_NODE_TYPE, nodeType]
+					: [nodeType];
 
 				return nodeTypes;
 			},
diff --git a/packages/editor-ui/src/views/NodeView.vue b/packages/editor-ui/src/views/NodeView.vue
index 29c4ebc7084fca..86461bc09b3045 100644
--- a/packages/editor-ui/src/views/NodeView.vue
+++ b/packages/editor-ui/src/views/NodeView.vue
@@ -33,7 +33,7 @@
 				>
 					<canvas-add-button
 						:style="canvasAddButtonStyle"
-						@click="showTriggerCreator('trigger_placeholder_button')"
+						@click="showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON)"
 						v-show="showCanvasAddButton"
 						:showTooltip="!containsTrigger && showTriggerMissingTooltip"
 						:position="canvasStore.canvasAddButtonPosition"
@@ -198,6 +198,7 @@ import {
 	ASSUMPTION_EXPERIMENT,
 	REGULAR_NODE_FILTER,
 	MANUAL_TRIGGER_NODE_TYPE,
+	NODE_CREATOR_OPEN_SOURCES,
 } from '@/constants';
 import { copyPaste } from '@/mixins/copyPaste';
 import { externalHooks } from '@/mixins/externalHooks';
@@ -256,6 +257,7 @@ import {
 	IWorkflowToShare,
 	IUser,
 	INodeUpdatePropertiesInformation,
+	NodeCreatorOpenSource,
 } from '@/Interface';
 
 import { debounceHelper } from '@/mixins/debounce';
@@ -613,6 +615,7 @@ export default mixins(
 			// in undo history as a user action.
 			// This should prevent automatically removed connections from populating undo stack
 			suspendRecordingDetachedConnections: false,
+			NODE_CREATOR_OPEN_SOURCES,
 		};
 	},
 	beforeDestroy() {
@@ -662,7 +665,7 @@ export default mixins(
 					: this.$locale.baseText('nodeView.addATriggerNodeFirst');
 
 			this.registerCustomAction('showNodeCreator', () =>
-				this.showTriggerCreator('no_trigger_execution_tooltip'),
+				this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.NO_TRIGGER_EXECUTION_TOOLTIP),
 			);
 			const notice = this.$showMessage({
 				type: 'info',
@@ -756,7 +759,7 @@ export default mixins(
 			const saved = await this.saveCurrentWorkflow();
 			if (saved) await this.settingsStore.fetchPromptsData();
 		},
-		showTriggerCreator(source: string) {
+		showTriggerCreator(source: NodeCreatorOpenSource) {
 			if (this.createNodeActive) return;
 			this.nodeCreatorStore.setSelectedView(TRIGGER_NODE_FILTER);
 			this.nodeCreatorStore.setShowScrim(true);
@@ -1029,7 +1032,7 @@ export default mixins(
 				this.callDebounced('deleteSelectedNodes', { debounceTime: 500 });
 			} else if (e.key === 'Tab') {
 				this.onToggleNodeCreator({
-					source: 'tab',
+					source: NODE_CREATOR_OPEN_SOURCES.TAB,
 					createNodeActive: !this.createNodeActive && !this.isReadOnly,
 				});
 			} else if (e.key === this.controlKeyCode) {
@@ -2059,7 +2062,7 @@ export default mixins(
 		insertNodeAfterSelected(info: {
 			sourceId: string;
 			index: number;
-			eventSource: string;
+			eventSource: NodeCreatorOpenSource;
 			connection?: Connection;
 		}) {
 			// Get the node and set it as active that new nodes
@@ -2078,7 +2081,10 @@ export default mixins(
 				this.lastSelectedConnection = info.connection;
 			}
 
-			this.onToggleNodeCreator({ source: info.eventSource, createNodeActive: true });
+			this.onToggleNodeCreator({
+				source: info.eventSource,
+				createNodeActive: true,
+			});
 		},
 		onEventConnectionAbort(connection: Connection) {
 			try {
@@ -2103,7 +2109,7 @@ export default mixins(
 				this.insertNodeAfterSelected({
 					sourceId: connection.parameters.nodeId,
 					index: connection.parameters.index,
-					eventSource: 'node_connection_drop',
+					eventSource: NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_DROP,
 				});
 			} catch (e) {
 				console.error(e); // eslint-disable-line no-console
@@ -2183,7 +2189,7 @@ export default mixins(
 								sourceId: info.sourceEndpoint.parameters.nodeId,
 								index: sourceInfo.index,
 								connection: info.connection,
-								eventSource: 'node_connection_action',
+								eventSource: NODE_CREATOR_OPEN_SOURCES.NODE_CONNECTION_ACTION,
 							});
 						},
 					);
@@ -2421,7 +2427,7 @@ export default mixins(
 				this.insertNodeAfterSelected({
 					sourceId: endpoint.__meta.nodeId,
 					index: endpoint.__meta.index,
-					eventSource: 'plus_endpoint',
+					eventSource: NODE_CREATOR_OPEN_SOURCES.PLUS_ENDPOINT,
 				});
 			}
 		},
@@ -3718,7 +3724,7 @@ export default mixins(
 			source,
 			createNodeActive,
 		}: {
-			source?: string;
+			source?: NodeCreatorOpenSource;
 			createNodeActive: boolean;
 		}) {
 			if (createNodeActive === this.createNodeActive) return;
@@ -3732,6 +3738,8 @@ export default mixins(
 
 			const mode =
 				this.nodeCreatorStore.selectedView === TRIGGER_NODE_FILTER ? 'trigger' : 'regular';
+
+			this.nodeCreatorStore.openSource = source || '';
 			this.$externalHooks().run('nodeView.createNodeActiveChanged', {
 				source,
 				mode,
@@ -3927,7 +3935,7 @@ export default mixins(
 	activated() {
 		const openSideMenu = this.uiStore.addFirstStepOnLoad;
 		if (openSideMenu) {
-			this.showTriggerCreator('trigger_placeholder_button');
+			this.showTriggerCreator(NODE_CREATOR_OPEN_SOURCES.TRIGGER_PLACEHOLDER_BUTTON);
 		}
 		this.uiStore.addFirstStepOnLoad = false;
 		this.bindCanvasEvents();

From a9c63f980f905d99b685e74378ba148189a83440 Mon Sep 17 00:00:00 2001
From: OlegIvaniv <me@olegivaniv.com>
Date: Thu, 9 Mar 2023 15:26:27 +0100
Subject: [PATCH 352/358] feat(editor): Only redirect new users to blank canvas
 (no-changelog) (#5654)

* feat(editor): Bring new users to empty canvas

* fix(editor): Revert empty /workflows redirect

* Provide `COMMIT_INFO_BRANCH` and uncomment demo experiment

* Only change redirect after set-up/sign-up to new canvas

* Fix failing specs

* Prevent redirect for demo experiment

* Fix workflows cards spacing
---
 cypress/e2e/1-workflows.cy.ts                 | 17 ++++--------
 cypress/pages/settings-users.ts               |  4 ++-
 cypress/support/commands.ts                   |  7 ++---
 packages/editor-ui/src/views/SetupView.vue    | 10 ++++---
 packages/editor-ui/src/views/SignupView.vue   |  2 +-
 .../editor-ui/src/views/WorkflowsView.vue     | 27 ++++++-------------
 6 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/cypress/e2e/1-workflows.cy.ts b/cypress/e2e/1-workflows.cy.ts
index d341a762f20787..a05877bdbd5e23 100644
--- a/cypress/e2e/1-workflows.cy.ts
+++ b/cypress/e2e/1-workflows.cy.ts
@@ -27,12 +27,13 @@ describe('Workflows', () => {
 		});
 
 		cy.signin({ email, password });
-		cy.visit('/');
-		cy.waitForLoad();
+		cy.visit(WorkflowsPage.url);
 	});
 
-	it('should land on empty canvas after registration', () => {
-		cy.url().should('include', WorkflowPage.url);
+	it('should create a new workflow using empty state card', () => {
+		WorkflowsPage.getters.newWorkflowButtonCard().should('be.visible');
+		WorkflowsPage.getters.newWorkflowButtonCard().click();
+
 		cy.createFixtureWorkflow('Test_workflow_1.json', `Empty State Card Workflow ${uuid()}`);
 
 		WorkflowPage.getters.workflowTags().should('contain.text', 'some-tag-1');
@@ -89,13 +90,5 @@ describe('Workflows', () => {
 		});
 
 		WorkflowsPage.getters.newWorkflowButtonCard().should('be.visible');
-		WorkflowsPage.getters.newWorkflowTemplateCard().should('be.visible');
-	});
-
-	it('should redirect to new canvas if no workflows', () => {
-		cy.wait(1000);
-		cy.visit(WorkflowsPage.url);
-		cy.wait(1000);
-		cy.url().should('include', WorkflowPage.url);
 	});
 });
diff --git a/cypress/pages/settings-users.ts b/cypress/pages/settings-users.ts
index 4d6903c8581b5b..41ae18711468f4 100644
--- a/cypress/pages/settings-users.ts
+++ b/cypress/pages/settings-users.ts
@@ -1,9 +1,11 @@
 import { SettingsSidebar } from './sidebar/settings-sidebar';
 import { MainSidebar } from './sidebar/main-sidebar';
 import { WorkflowPage } from './workflow';
+import { WorkflowsPage } from './workflows';
 import { BasePage } from './base';
 
 const workflowPage =  new WorkflowPage();
+const workflowsPage =  new WorkflowsPage();
 const mainSidebar = new MainSidebar();
 const settingsSidebar = new SettingsSidebar();
 
@@ -39,7 +41,7 @@ export class SettingsUsersPage extends BasePage {
 				settingsSidebar.getters.menuItem('Users').should('not.exist');
 				// Should be redirected to workflows page if trying to access UM url
 				cy.visit('/settings/users');
-				cy.url().should('match', new RegExp(workflowPage.url));
+				cy.url().should('match', new RegExp(workflowsPage.url));
 			}
 		},
 		opedDeleteDialog: (email: string) => {
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index f700b3c6f35f45..f970970a90b554 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -60,7 +60,7 @@ Cypress.Commands.add('waitForLoad', () => {
 
 Cypress.Commands.add('signin', ({ email, password }) => {
 	const signinPage = new SigninPage();
-	const workflowPage = new WorkflowPage();
+	const workflowsPage = new WorkflowsPage();
 
 	cy.session(
 		[email, password],
@@ -74,10 +74,7 @@ Cypress.Commands.add('signin', ({ email, password }) => {
 			});
 
 			// we should be redirected to /workflows
-			cy.visit(workflowPage.url);
-			cy.url().should('include', workflowPage.url);
-			cy.intercept('GET', '/rest/workflows/new').as('loading');
-			cy.wait('@loading');
+			cy.url().should('include', workflowsPage.url);
 		},
 		{
 			validate() {
diff --git a/packages/editor-ui/src/views/SetupView.vue b/packages/editor-ui/src/views/SetupView.vue
index 5d24237a672ff3..14a362f1e8b9ce 100644
--- a/packages/editor-ui/src/views/SetupView.vue
+++ b/packages/editor-ui/src/views/SetupView.vue
@@ -14,13 +14,14 @@ import { showMessage } from '@/mixins/showMessage';
 
 import mixins from 'vue-typed-mixins';
 import { IFormBoxConfig } from '@/Interface';
-import { VIEWS } from '@/constants';
+import { VIEWS, ASSUMPTION_EXPERIMENT } from '@/constants';
 import { restApi } from '@/mixins/restApi';
 import { mapStores } from 'pinia';
 import { useUIStore } from '@/stores/ui';
 import { useSettingsStore } from '@/stores/settings';
 import { useUsersStore } from '@/stores/users';
 import { useCredentialsStore } from '@/stores/credentials';
+import { usePostHog } from '@/stores/posthog';
 
 export default mixins(showMessage, restApi).extend({
 	name: 'SetupView',
@@ -100,6 +101,9 @@ export default mixins(showMessage, restApi).extend({
 	},
 	computed: {
 		...mapStores(useCredentialsStore, useSettingsStore, useUIStore, useUsersStore),
+		isDemoTest(): boolean {
+			return usePostHog().isVariantEnabled(ASSUMPTION_EXPERIMENT.name, ASSUMPTION_EXPERIMENT.demo);
+		},
 	},
 	methods: {
 		async confirmSetupOrGoBack(): Promise<boolean> {
@@ -159,7 +163,7 @@ export default mixins(showMessage, restApi).extend({
 				}
 
 				if (forceRedirectedHere) {
-					await this.$router.push({ name: VIEWS.HOMEPAGE });
+					await this.$router.push({ name: this.isDemoTest ? VIEWS.HOMEPAGE : VIEWS.NEW_WORKFLOW });
 				} else {
 					await this.$router.push({ name: VIEWS.USERS_SETTINGS });
 				}
@@ -183,7 +187,7 @@ export default mixins(showMessage, restApi).extend({
 		onSkip() {
 			this.usersStore.skipOwnerSetup();
 			this.$router.push({
-				name: VIEWS.HOMEPAGE,
+				name: this.isDemoTest ? VIEWS.HOMEPAGE : VIEWS.NEW_WORKFLOW,
 			});
 		},
 	},
diff --git a/packages/editor-ui/src/views/SignupView.vue b/packages/editor-ui/src/views/SignupView.vue
index 58c2353188d390..f46e26a5b191df 100644
--- a/packages/editor-ui/src/views/SignupView.vue
+++ b/packages/editor-ui/src/views/SignupView.vue
@@ -142,7 +142,7 @@ export default mixins(showMessage).extend({
 					} catch {}
 				}
 
-				await this.$router.push({ name: VIEWS.HOMEPAGE });
+				await this.$router.push({ name: VIEWS.NEW_WORKFLOW });
 			} catch (error) {
 				this.$showError(error, this.$locale.baseText('auth.signup.setupYourAccountError'));
 			}
diff --git a/packages/editor-ui/src/views/WorkflowsView.vue b/packages/editor-ui/src/views/WorkflowsView.vue
index 4fa107331545f9..4d718b1c2ccf94 100644
--- a/packages/editor-ui/src/views/WorkflowsView.vue
+++ b/packages/editor-ui/src/views/WorkflowsView.vue
@@ -49,7 +49,7 @@
 			</div>
 			<div :class="['text-center', 'mt-2xl', $style.actionsContainer]">
 				<n8n-card
-					:class="[$style.emptyStateCard, 'mr-s']"
+					:class="$style.emptyStateCard"
 					hoverable
 					@click="addWorkflow"
 					data-test-id="new-workflow-card"
@@ -60,21 +60,15 @@
 					</n8n-text>
 				</n8n-card>
 				<n8n-card
+					v-if="isDemoTest"
 					:class="$style.emptyStateCard"
 					hoverable
 					@click="goToTemplates"
 					data-test-id="new-workflow-template-card"
 				>
-					<n8n-icon
-						:class="$style.emptyStateCardIcon"
-						:icon="isDemoTest ? 'graduation-cap' : 'box-open'"
-					/>
+					<n8n-icon :class="$style.emptyStateCardIcon" icon="graduation-cap" />
 					<n8n-text size="large" class="mt-xs" color="text-base">
-						{{
-							$locale.baseText(
-								isDemoTest ? 'workflows.empty.viewDemo' : 'workflows.empty.browseTemplates',
-							)
-						}}
+						{{ $locale.baseText('workflows.empty.viewDemo') }}
 					</n8n-text>
 				</n8n-card>
 			</div>
@@ -237,15 +231,6 @@ const WorkflowsView = mixins(showMessage, debounceHelper).extend({
 			]);
 
 			this.credentialsStore.fetchAllCredentials();
-
-			// If the user has no workflows and is not participating in the demo experiment,
-			// redirect to the new workflow view
-			if (!this.isDemoTest && this.allWorkflows.length === 0) {
-				this.uiStore.nodeViewInitialized = false;
-				this.$router.replace({ name: VIEWS.NEW_WORKFLOW });
-			}
-
-			return Promise.resolve();
 		},
 		onClickTag(tagId: string, event: PointerEvent) {
 			if (!this.filters.tags.includes(tagId)) {
@@ -304,6 +289,10 @@ export default WorkflowsView;
 	display: inline-flex;
 	height: 230px;
 
+	& + & {
+		margin-left: var(--spacing-s);
+	}
+
 	&:hover {
 		svg {
 			color: var(--color-primary);

From ce0d9d2bede7d87b97e18c45b63ea31ecf592255 Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Thu, 9 Mar 2023 15:38:54 +0100
Subject: [PATCH 353/358] feat(HTTP Request Node): Move from Binary Buffer to
 Binary streaming (#5610)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* ✨ Change from binary buffer to binary streaming

* Remove console.logs

* Import Readable from the correct lib

* stream response

* parametersToKeyValue doesn't need to be async anymore

* Fix bodyParameter reduce method

* parametersToKeyValue doesn't need to be async anymore

* handle streaming responses

* send `Content-Length` and `Content-Type` on binary requests

* Add new helper function for binary data

* Add binary function to helpers interface

* Fix bug in error handler

* Fix issue with wrongfully assigned headers to body

* Fix test workflow

* Remove console.logs

* Remove unnecsessary type

* Remove concat dependency already imported in workflow package

* Update pnpm-lock file

* Small fixes, asyncronous error message

* reset the lockfile

* Remove buffer check and simplify error handling

---------

Co-authored-by: कारतोफ्फेलस्क्रिप्ट™ <aditya@netroy.in>
---
 packages/core/src/NodeExecuteFunctions.ts     |  7 +-
 .../HttpRequest/V3/HttpRequestV3.node.ts      | 78 ++++++++++++-------
 packages/workflow/src/Interfaces.ts           |  2 +-
 3 files changed, 54 insertions(+), 33 deletions(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 7d6b4648b25291..6186c873362eb1 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -108,6 +108,7 @@ import type { IResponseError, IWorkflowSettings } from './Interfaces';
 import { extractValue } from './ExtractValue';
 import { getClientCredentialsToken } from './OAuth2Helper';
 import { PLACEHOLDER_EMPTY_EXECUTION_ID } from './Constants';
+import { binaryToBuffer } from './BinaryDataManager/utils';
 
 axios.defaults.timeout = 300000;
 // Prevent axios from adding x-form-www-urlencoded headers by default
@@ -686,9 +687,7 @@ async function proxyRequestToAxios(
 		if (response) {
 			Logger.debug('Request proxied to Axios failed', { status: response.status });
 			let responseData = response.data;
-			if (Buffer.isBuffer(responseData)) {
-				responseData = responseData.toString('utf-8');
-			}
+			responseData = await binaryToBuffer(responseData);
 			error.message = `${response.status as number} - ${JSON.stringify(responseData)}`;
 		}
 
@@ -2055,6 +2054,7 @@ const getBinaryHelperFunctions = ({
 }: IWorkflowExecuteAdditionalData): BinaryHelperFunctions => ({
 	getBinaryStream,
 	getBinaryMetadata,
+	binaryToBuffer,
 	prepareBinaryData: async (binaryData, filePath, mimeType) =>
 		prepareBinaryData(binaryData, executionId!, filePath, mimeType),
 	setBinaryDataBuffer: async (data, binaryData) =>
@@ -2313,6 +2313,7 @@ export function getExecuteFunctions(
 				return dataProxy.getDataProxy();
 			},
 			prepareOutputData: NodeHelpers.prepareOutputData,
+			binaryToBuffer,
 			async putExecutionToWait(waitTill: Date): Promise<void> {
 				runExecutionData.waitTill = waitTill;
 				if (additionalData.setExecutionStatus) {
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 355a98634df2da..498a1097e67bee 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -1,3 +1,6 @@
+import type { Readable } from 'stream';
+import { BINARY_ENCODING } from 'n8n-core';
+
 import type {
 	IBinaryKeyData,
 	IDataObject,
@@ -931,7 +934,8 @@ export class HttpRequestV3 implements INodeType {
 			} catch {}
 		}
 
-		let requestOptions: OptionsWithUri = {
+		type RequestOptions = OptionsWithUri & { useStream?: boolean };
+		let requestOptions: RequestOptions = {
 			uri: '',
 		};
 
@@ -1060,18 +1064,23 @@ export class HttpRequestV3 implements INodeType {
 				});
 			}
 
-			const parametersToKeyValue = async (
-				acc: Promise<{ [key: string]: any }>,
+			const parametersToKeyValue = (
+				accumulator: { [key: string]: any },
 				cur: { name: string; value: string; parameterType?: string; inputDataFieldName?: string },
 			) => {
-				const accumulator = await acc;
 				if (cur.parameterType === 'formBinaryData') {
 					if (!cur.inputDataFieldName) return accumulator;
 					const binaryData = this.helpers.assertBinaryData(itemIndex, cur.inputDataFieldName);
-					const buffer = await this.helpers.getBinaryDataBuffer(itemIndex, cur.inputDataFieldName);
+					let uploadData: Buffer | Readable;
+					const itemBinaryData = items[itemIndex].binary![cur.inputDataFieldName];
+					if (itemBinaryData.id) {
+						uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+					} else {
+						uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+					}
 
 					accumulator[cur.name] = {
-						value: buffer,
+						value: uploadData,
 						options: {
 							filename: binaryData.fileName,
 							contentType: binaryData.mimeType,
@@ -1086,10 +1095,7 @@ export class HttpRequestV3 implements INodeType {
 			// Get parameters defined in the UI
 			if (sendBody && bodyParameters) {
 				if (specifyBody === 'keypair' || bodyContentType === 'multipart-form-data') {
-					requestOptions.body = await bodyParameters.reduce(
-						parametersToKeyValue,
-						Promise.resolve({}),
-					);
+					requestOptions.body = bodyParameters.reduce(parametersToKeyValue, {});
 				} else if (specifyBody === 'json') {
 					// body is specified using JSON
 					if (typeof jsonBodyParameter !== 'object' && jsonBodyParameter !== null) {
@@ -1128,11 +1134,26 @@ export class HttpRequestV3 implements INodeType {
 						'inputDataFieldName',
 						itemIndex,
 					) as string;
-					this.helpers.assertBinaryData(itemIndex, inputDataFieldName);
-					requestOptions.body = await this.helpers.getBinaryDataBuffer(
-						itemIndex,
-						inputDataFieldName,
-					);
+
+					let uploadData: Buffer | Readable;
+					let contentLength: number;
+
+					const itemBinaryData = this.helpers.assertBinaryData(itemIndex, inputDataFieldName);
+
+					if (itemBinaryData.id) {
+						uploadData = this.helpers.getBinaryStream(itemBinaryData.id);
+						const metadata = await this.helpers.getBinaryMetadata(itemBinaryData.id);
+						contentLength = metadata.fileSize;
+					} else {
+						uploadData = Buffer.from(itemBinaryData.data, BINARY_ENCODING);
+						contentLength = uploadData.length;
+					}
+					requestOptions.body = uploadData;
+					requestOptions.headers = {
+						...requestOptions.headers,
+						'Content-Length': contentLength,
+						'Content-Type': itemBinaryData.mimeType ?? 'application/octet-stream',
+					};
 				} else if (bodyContentType === 'raw') {
 					requestOptions.body = body;
 				}
@@ -1141,10 +1162,7 @@ export class HttpRequestV3 implements INodeType {
 			// Get parameters defined in the UI
 			if (sendQuery && queryParameters) {
 				if (specifyQuery === 'keypair') {
-					requestOptions.qs = await queryParameters.reduce(
-						parametersToKeyValue,
-						Promise.resolve({}),
-					);
+					requestOptions.qs = queryParameters.reduce(parametersToKeyValue, {});
 				} else if (specifyQuery === 'json') {
 					// query is specified using JSON
 					try {
@@ -1166,10 +1184,7 @@ export class HttpRequestV3 implements INodeType {
 			// Get parameters defined in the UI
 			if (sendHeaders && headerParameters) {
 				if (specifyHeaders === 'keypair') {
-					requestOptions.headers = await headerParameters.reduce(
-						parametersToKeyValue,
-						Promise.resolve({}),
-					);
+					requestOptions.headers = headerParameters.reduce(parametersToKeyValue, {});
 				} else if (specifyHeaders === 'json') {
 					// body is specified using JSON
 					try {
@@ -1191,8 +1206,10 @@ export class HttpRequestV3 implements INodeType {
 			if (autoDetectResponseFormat || responseFormat === 'file') {
 				requestOptions.encoding = null;
 				requestOptions.json = false;
+				requestOptions.useStream = true;
 			} else if (bodyContentType === 'raw') {
 				requestOptions.json = false;
+				requestOptions.useStream = true;
 			} else {
 				requestOptions.json = true;
 			}
@@ -1284,13 +1301,11 @@ export class HttpRequestV3 implements INodeType {
 				requestPromises.push(requestWithAuthentication);
 			}
 		}
-
 		const promisesResponses = await Promise.allSettled(requestPromises);
 
 		let response: any;
 		for (let itemIndex = 0; itemIndex < items.length; itemIndex++) {
 			response = promisesResponses.shift();
-
 			if (response!.status !== 'fulfilled') {
 				if (!this.continueOnFail()) {
 					if (autoDetectResponseFormat && response.reason.error instanceof Buffer) {
@@ -1336,7 +1351,10 @@ export class HttpRequestV3 implements INodeType {
 						0,
 						false,
 					) as boolean;
-					const data = Buffer.from(response.body as Buffer).toString();
+
+					const data = await this.helpers
+						.binaryToBuffer(response.body as Buffer | Readable)
+						.then((body) => body.toString());
 					response.body = jsonParse(data, {
 						...(neverError
 							? { fallbackValue: {} }
@@ -1346,7 +1364,9 @@ export class HttpRequestV3 implements INodeType {
 					responseFormat = 'file';
 				} else {
 					responseFormat = 'text';
-					const data = Buffer.from(response.body as Buffer).toString();
+					const data = await this.helpers
+						.binaryToBuffer(response.body as Buffer | Readable)
+						.then((body) => body.toString());
 					response.body = !data ? undefined : data;
 				}
 			}
@@ -1395,14 +1415,14 @@ export class HttpRequestV3 implements INodeType {
 					newItem.json = returnItem;
 
 					newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(
-						response!.body as Buffer,
+						response!.body as Buffer | Readable,
 						fileName,
 					);
 				} else {
 					newItem.json = items[itemIndex].json;
 
 					newItem.binary![outputPropertyName] = await this.helpers.prepareBinaryData(
-						response! as Buffer,
+						response! as Buffer | Readable,
 						fileName,
 					);
 				}
diff --git a/packages/workflow/src/Interfaces.ts b/packages/workflow/src/Interfaces.ts
index 0e317075d3a4a6..9b8a256bf94415 100644
--- a/packages/workflow/src/Interfaces.ts
+++ b/packages/workflow/src/Interfaces.ts
@@ -673,7 +673,7 @@ export interface BinaryHelperFunctions {
 	): Promise<IBinaryData>;
 	setBinaryDataBuffer(data: IBinaryData, binaryData: Buffer): Promise<IBinaryData>;
 	copyBinaryFile(filePath: string, fileName: string, mimeType?: string): Promise<IBinaryData>;
-
+	binaryToBuffer(body: Buffer | Readable): Promise<Buffer>;
 	getBinaryStream(binaryDataId: string, chunkSize?: number): Readable;
 	getBinaryMetadata(binaryDataId: string): Promise<BinaryMetadata>;
 }

From 1979eb8a9c27e096dc7d7b54d7a00f55fd9185e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Mar 2023 16:24:44 +0100
Subject: [PATCH 354/358] fix(core): Fix issues with LDAP reset and LDAP init
 (no-changelog) (#5657)

* fix(core): Ldap reset should recreate the default config

* fix(core): init ldap before registering the routes for it
---
 packages/cli/src/commands/ldap/reset.ts | 7 ++++++-
 packages/cli/src/commands/start.ts      | 4 ++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/cli/src/commands/ldap/reset.ts b/packages/cli/src/commands/ldap/reset.ts
index 7b555fc52ea8ac..db276c40c124ba 100644
--- a/packages/cli/src/commands/ldap/reset.ts
+++ b/packages/cli/src/commands/ldap/reset.ts
@@ -1,5 +1,5 @@
 import * as Db from '@/Db';
-import { LDAP_FEATURE_NAME } from '@/Ldap/constants';
+import { LDAP_DEFAULT_CONFIGURATION, LDAP_FEATURE_NAME } from '@/Ldap/constants';
 import { In } from 'typeorm';
 import { BaseCommand } from '../BaseCommand';
 
@@ -17,6 +17,11 @@ export class Reset extends BaseCommand {
 		await AuthIdentity.delete({ providerType: 'ldap' });
 		await User.delete({ id: In(ldapIdentities.map((i) => i.userId)) });
 		await Settings.delete({ key: LDAP_FEATURE_NAME });
+		await Settings.insert({
+			key: LDAP_FEATURE_NAME,
+			value: JSON.stringify(LDAP_DEFAULT_CONFIGURATION),
+			loadOnStartup: true,
+		});
 
 		this.logger.info('Successfully reset the database to default ldap state.');
 	}
diff --git a/packages/cli/src/commands/start.ts b/packages/cli/src/commands/start.ts
index ada08e48ecf9a1..bac95bfe3c0b90 100644
--- a/packages/cli/src/commands/start.ts
+++ b/packages/cli/src/commands/start.ts
@@ -326,13 +326,13 @@ export class Start extends BaseCommand {
 			);
 		}
 
+		await handleLdapInit();
+
 		await Server.start();
 
 		// Start to get active workflows and run their triggers
 		await this.activeWorkflowRunner.init();
 
-		await handleLdapInit();
-
 		const editorUrl = GenericHelpers.getBaseUrl();
 		this.log(`\nEditor is now accessible via:\n${editorUrl}`);
 

From edf6313fa51ecfe34ad626a956012d911754ec09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Mar 2023 17:08:47 +0100
Subject: [PATCH 355/358] ci: Fix e2e tests (no-changelog) (#5658)

* ci: Fix e2e tests (no-changelog)

* Fix sign-in cypress command

* Run smoke test against head branch instead of base

---------

Co-authored-by: Oleg Ivaniv <oleg@n8n.io>
---
 .github/workflows/ci-pull-requests.yml |  2 +-
 cypress/support/commands.ts            | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-pull-requests.yml b/.github/workflows/ci-pull-requests.yml
index 922cbbda960f3b..e14db3222eddce 100644
--- a/.github/workflows/ci-pull-requests.yml
+++ b/.github/workflows/ci-pull-requests.yml
@@ -108,7 +108,7 @@ jobs:
     uses: ./.github/workflows/e2e-reusable.yml
     if: ${{ !contains(github.event.pull_request.labels.*.name, 'skip-e2e') }}
     with:
-      branch: ${{ github.event.pull_request.base.ref }}
+      branch: ${{ github.event.pull_request.head.ref }}
       user: ${{ github.event.inputs.user || 'PR User' }}
       spec: ${{ github.event.inputs.spec || 'e2e/0-smoke.cy.ts' }}
       run-env: base:16.18.1
diff --git a/cypress/support/commands.ts b/cypress/support/commands.ts
index f970970a90b554..42b9f73c3d66e4 100644
--- a/cypress/support/commands.ts
+++ b/cypress/support/commands.ts
@@ -24,9 +24,8 @@
 // -- This will overwrite an existing command --
 // Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
 import 'cypress-real-events';
-import { SigninPage, SignupPage, SettingsUsersPage, WorkflowPage } from '../pages';
+import { WorkflowsPage, SigninPage, SignupPage, SettingsUsersPage, WorkflowPage } from '../pages';
 import { N8N_AUTH_COOKIE } from '../constants';
-import { WorkflowPage as WorkflowPageClass } from '../pages/workflow';
 import { MessageBox } from '../pages/modals/message-box';
 
 Cypress.Commands.add('getByTestId', (selector, ...args) => {
@@ -34,15 +33,15 @@ Cypress.Commands.add('getByTestId', (selector, ...args) => {
 });
 
 Cypress.Commands.add('createFixtureWorkflow', (fixtureKey, workflowName) => {
-	const WorkflowPage = new WorkflowPageClass();
+	const workflowPage = new WorkflowPage();
 
 	// We need to force the click because the input is hidden
-	WorkflowPage.getters
+	workflowPage.getters
 		.workflowImportInput()
 		.selectFile(`cypress/fixtures/${fixtureKey}`, { force: true });
-	WorkflowPage.actions.setWorkflowName(workflowName);
+	workflowPage.actions.setWorkflowName(workflowName);
 
-	WorkflowPage.getters.saveButton().should('contain', 'Saved');
+	workflowPage.getters.saveButton().should('contain', 'Saved');
 });
 
 Cypress.Commands.add(
@@ -209,7 +208,9 @@ Cypress.Commands.add('grantBrowserPermissions', (...permissions: string[]) => {
 	}
 });
 
-Cypress.Commands.add('readClipboard', () => cy.window().then(win => win.navigator.clipboard.readText()))
+Cypress.Commands.add('readClipboard', () =>
+	cy.window().then((win) => win.navigator.clipboard.readText()),
+);
 
 Cypress.Commands.add('paste', { prevSubject: true }, (selector, pastePayload) => {
 	// https://developer.mozilla.org/en-US/docs/Web/API/Element/paste_event

From 5790e5e7196dc3a8e7ffe6ca0f06d60b21e06afd Mon Sep 17 00:00:00 2001
From: agobrech <45268029+agobrech@users.noreply.github.com>
Date: Thu, 9 Mar 2023 17:48:33 +0100
Subject: [PATCH 356/358] fix(core): Fix trying to pipe a non stream on errors
 (no-changelog) (#5660)

---
 packages/core/src/NodeExecuteFunctions.ts | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/packages/core/src/NodeExecuteFunctions.ts b/packages/core/src/NodeExecuteFunctions.ts
index 6186c873362eb1..0e1d88876d26b5 100644
--- a/packages/core/src/NodeExecuteFunctions.ts
+++ b/packages/core/src/NodeExecuteFunctions.ts
@@ -99,7 +99,7 @@ import type {
 } from 'axios';
 import axios from 'axios';
 import url, { URL, URLSearchParams } from 'url';
-import type { Readable } from 'stream';
+import { Readable } from 'stream';
 import { access as fsAccess } from 'fs/promises';
 import { createReadStream } from 'fs';
 
@@ -687,7 +687,12 @@ async function proxyRequestToAxios(
 		if (response) {
 			Logger.debug('Request proxied to Axios failed', { status: response.status });
 			let responseData = response.data;
-			responseData = await binaryToBuffer(responseData);
+
+			if (Buffer.isBuffer(responseData) || responseData instanceof Readable) {
+				responseData = await binaryToBuffer(responseData).then((buffer) =>
+					buffer.toString('utf-8'),
+				);
+			}
 			error.message = `${response.status as number} - ${JSON.stringify(responseData)}`;
 		}
 

From 40a6ab814de8cff1616db4d4afb5c72eda1ba4a8 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Mar 2023 18:04:39 +0100
Subject: [PATCH 357/358] :rocket: Release 0.219.0 (#5659)

---
 CHANGELOG.md                        | 42 +++++++++++++++++++++++++++++
 package.json                        |  2 +-
 packages/cli/package.json           |  2 +-
 packages/core/package.json          |  2 +-
 packages/design-system/package.json |  2 +-
 packages/editor-ui/package.json     |  2 +-
 packages/node-dev/package.json      |  2 +-
 packages/nodes-base/package.json    |  2 +-
 packages/workflow/package.json      |  2 +-
 9 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22413258161039..ea5fbb927671f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,45 @@
+# [0.219.0](https://github.com/n8n-io/n8n/compare/n8n@0.218.0...n8n@0.219.0) (2023-03-09)
+
+
+### Bug Fixes
+
+* **core:** Allow serving icons for custom nodes with npm scoped names ([#5626](https://github.com/n8n-io/n8n/issues/5626)) ([45ccdd3](https://github.com/n8n-io/n8n/commit/45ccdd3bb5d5601ccc60438d96aadb40cb87588b))
+* **core:** Rename advancedFilters to advancedExecutionFilters ([#5643](https://github.com/n8n-io/n8n/issues/5643)) ([419969c](https://github.com/n8n-io/n8n/commit/419969c0d761b1ac7870e7821c0398ecfca1f0ce))
+* **editor:** Fix ElButton overrides ([#5605](https://github.com/n8n-io/n8n/issues/5605)) ([2eba050](https://github.com/n8n-io/n8n/commit/2eba05046141bd13145f95c6a1ec1e6fb95b37c2))
+* **editor:** Only fetch new versions at app launch ([#5647](https://github.com/n8n-io/n8n/issues/5647)) ([5b9c521](https://github.com/n8n-io/n8n/commit/5b9c521d04bc34a9f84be966a4646f23c56ca3da))
+* Fetch credentials on workflows view to include in duplicated workflows ([#5532](https://github.com/n8n-io/n8n/issues/5532)) ([493f7a1](https://github.com/n8n-io/n8n/commit/493f7a1c92d77d3c75fc311892e53f43e1fb367f))
+* Fix color discrepancies for executions list items ([#5640](https://github.com/n8n-io/n8n/issues/5640)) ([c81656d](https://github.com/n8n-io/n8n/commit/c81656d149764dc398b93d3eb8626a402eddb0ef))
+* **OpenAI Node:** Fix issue with expressions not working with chat complete ([#5609](https://github.com/n8n-io/n8n/issues/5609)) ([e949db3](https://github.com/n8n-io/n8n/commit/e949db352526033394083476077519598dd8061c))
+* **OpenAI Node:** Simplify code ([#5618](https://github.com/n8n-io/n8n/issues/5618)) ([1c65bff](https://github.com/n8n-io/n8n/commit/1c65bff31d86ea76ff5fca10341e71389d4de7b5))
+
+
+### Features
+
+* **Cal Trigger Node:** Update to support v2 webhooks ([#5331](https://github.com/n8n-io/n8n/issues/5331)) ([2889e53](https://github.com/n8n-io/n8n/commit/2889e53b3767f2a61ee7fb3ea9fe1db7c65aaf70))
+* **core:** Add advancedFilters feature flag ([#5638](https://github.com/n8n-io/n8n/issues/5638)) ([0b5ef09](https://github.com/n8n-io/n8n/commit/0b5ef09e7cbd0c80a4b79311976b5c06c2be8747))
+* **core:** Add SAML post and test endpoints ([#5595](https://github.com/n8n-io/n8n/issues/5595)) ([523fa71](https://github.com/n8n-io/n8n/commit/523fa71705c0408c6c60c7cb5135323e3488e8c9))
+* **core:** Add SAML XML validation ([#5600](https://github.com/n8n-io/n8n/issues/5600)) ([ca66ec8](https://github.com/n8n-io/n8n/commit/ca66ec8f4d5ab0e427390b1f1874fb668bc53479))
+* **core:** Limit user changes when saml is enabled ([#5577](https://github.com/n8n-io/n8n/issues/5577)) ([b517959](https://github.com/n8n-io/n8n/commit/b5179597f3ec4ae468b2eb91969fa56322088e6f))
+* **core:** Refactor and add SAML preferences for service provider instance ([#5637](https://github.com/n8n-io/n8n/issues/5637)) ([6f27b44](https://github.com/n8n-io/n8n/commit/6f27b445ca2307b94ffc7d4eeb24e76d63516a19))
+* **editor:** Do not automatically add manual trigger on node plus ([#5644](https://github.com/n8n-io/n8n/issues/5644)) ([ac2f89a](https://github.com/n8n-io/n8n/commit/ac2f89a18a4c25ef1b39bcacc624884de9197fdf))
+* **editor:** Redirect users to canvas if they don't have any workflows ([#5629](https://github.com/n8n-io/n8n/issues/5629)) ([354edf6](https://github.com/n8n-io/n8n/commit/354edf6886fa3cc5a59d317dcab59cc75e62dc2d))
+* **HTTP Request Node:** Move from Binary Buffer to Binary streaming ([#5610](https://github.com/n8n-io/n8n/issues/5610)) ([ce0d9d2](https://github.com/n8n-io/n8n/commit/ce0d9d2bede7d87b97e18c45b63ea31ecf592255))
+* **Mattermost Node:** Add self signed certificate support ([#5630](https://github.com/n8n-io/n8n/issues/5630)) ([01a2160](https://github.com/n8n-io/n8n/commit/01a2160b3b8d36509f4b2871249a3f45358cf692))
+* **Microsoft SQL Node:** Add support for self signed certificates ([#5160](https://github.com/n8n-io/n8n/issues/5160)) ([971d5ae](https://github.com/n8n-io/n8n/commit/971d5ae8f5d2bfe319fc700fee2bcf597ea4c07e))
+* **Mindee Node:** Add support for v4 API ([#5559](https://github.com/n8n-io/n8n/issues/5559)) ([e56fbfe](https://github.com/n8n-io/n8n/commit/e56fbfef3ebb50706f24ab07505a0031f361d9b1))
+* **Slack Node:** Move from Binary Buffer to Binary streaming ([#5612](https://github.com/n8n-io/n8n/issues/5612)) ([9420b0f](https://github.com/n8n-io/n8n/commit/9420b0fdf8ccccb95780c8c97e2b5d14cc4d513e))
+
+
+
+## [0.217.1](https://github.com/n8n-io/n8n/compare/n8n@0.217.0...n8n@0.217.1) (2023-02-24)
+
+
+### Bug Fixes
+
+* **core:** Revert `isPending` check on the user entity ([#5571](https://github.com/n8n-io/n8n/issues/5571)) ([5282fd2](https://github.com/n8n-io/n8n/commit/5282fd266c26e7053ceb887addceed26b741f995))
+
+
+
 # [0.218.0](https://github.com/n8n-io/n8n/compare/n8n@0.217.2...n8n@0.218.0) (2023-03-02)
 
 
diff --git a/package.json b/package.json
index 7600fd9f0d8424..2531a535203ae3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.218.0",
+  "version": "0.219.0",
   "private": true,
   "homepage": "https://n8n.io",
   "engines": {
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 3cb13ea7be8a3b..1ee959f74e0646 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n",
-  "version": "0.218.0",
+  "version": "0.219.0",
   "description": "n8n Workflow Automation Tool",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/core/package.json b/packages/core/package.json
index 5955686d35e696..8ac6cb4ef38949 100644
--- a/packages/core/package.json
+++ b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-core",
-  "version": "0.157.0",
+  "version": "0.158.0",
   "description": "Core functionality of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/design-system/package.json b/packages/design-system/package.json
index 3f86c997d0d2cc..3993d9c6eddc4a 100644
--- a/packages/design-system/package.json
+++ b/packages/design-system/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-design-system",
-  "version": "0.56.0",
+  "version": "0.57.0",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
   "author": {
diff --git a/packages/editor-ui/package.json b/packages/editor-ui/package.json
index 18baff6053c766..f127854f92c2fa 100644
--- a/packages/editor-ui/package.json
+++ b/packages/editor-ui/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-editor-ui",
-  "version": "0.184.0",
+  "version": "0.185.0",
   "description": "Workflow Editor UI for n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/node-dev/package.json b/packages/node-dev/package.json
index 518f6b71840b72..f84411df8f29d1 100644
--- a/packages/node-dev/package.json
+++ b/packages/node-dev/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-node-dev",
-  "version": "0.96.0",
+  "version": "0.97.0",
   "description": "CLI to simplify n8n credentials/node development",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 30f3d2cfaf614f..95c2cfadc9a61d 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-nodes-base",
-  "version": "0.216.0",
+  "version": "0.217.0",
   "description": "Base nodes of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
index 8bdcf64a123f78..72ec95dfa01284 100644
--- a/packages/workflow/package.json
+++ b/packages/workflow/package.json
@@ -1,6 +1,6 @@
 {
   "name": "n8n-workflow",
-  "version": "0.139.0",
+  "version": "0.140.0",
   "description": "Workflow base code of n8n",
   "license": "SEE LICENSE IN LICENSE.md",
   "homepage": "https://n8n.io",

From 7a4e9ef5faa0bc664d070e0808865b0ec8340c9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E0=A4=95=E0=A4=BE=E0=A4=B0=E0=A4=A4=E0=A5=8B=E0=A4=AB?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=AB=E0=A5=87=E0=A4=B2=E0=A4=B8=E0=A5=8D=E0=A4=95?=
 =?UTF-8?q?=E0=A5=8D=E0=A4=B0=E0=A4=BF=E0=A4=AA=E0=A5=8D=E0=A4=9F=E2=84=A2?=
 <netroy@users.noreply.github.com>
Date: Thu, 9 Mar 2023 18:13:15 +0100
Subject: [PATCH 358/358] refactor: Remove n8n-core dependency in nodes-base
 (no-changelog) (#5649)

---
 packages/cli/src/WebhookHelpers.ts                 |  3 ++-
 packages/core/src/BinaryDataManager/index.ts       |  2 +-
 packages/core/src/Constants.ts                     |  2 --
 packages/core/src/index.ts                         |  6 ------
 packages/node-dev/src/Build.ts                     |  2 +-
 packages/node-dev/templates/execute/simple.ts      |  8 ++++++--
 packages/node-dev/templates/trigger/simple.ts      |  3 +--
 packages/node-dev/templates/webhook/simple.ts      | 10 +++++++---
 .../credentials/ShopifyApi.credentials.ts          |  2 +-
 .../nodes/ActionNetwork/ActionNetwork.node.ts      |  3 +--
 .../nodes/ActionNetwork/GenericFunctions.ts        |  4 +---
 .../nodes/ActiveCampaign/ActiveCampaign.node.ts    |  3 +--
 .../ActiveCampaign/ActiveCampaignTrigger.node.ts   |  4 ++--
 .../nodes/ActiveCampaign/GenericFunctions.ts       | 11 ++++++++---
 .../AcuitySchedulingTrigger.node.ts                |  4 ++--
 .../nodes/AcuityScheduling/GenericFunctions.ts     |  5 +++--
 .../nodes-base/nodes/Affinity/Affinity.node.ts     |  3 +--
 .../nodes/Affinity/AffinityTrigger.node.ts         |  4 ++--
 .../nodes-base/nodes/Affinity/GenericFunctions.ts  | 14 +++++++++-----
 .../nodes-base/nodes/AgileCrm/AgileCrm.node.ts     |  3 +--
 .../nodes-base/nodes/AgileCrm/GenericFunctions.ts  |  6 +++---
 .../nodes-base/nodes/Airtable/Airtable.node.ts     |  3 +--
 .../nodes/Airtable/AirtableTrigger.node.ts         |  3 +--
 .../nodes-base/nodes/Airtable/GenericFunctions.ts  |  4 ++--
 packages/nodes-base/nodes/Amqp/Amqp.node.ts        |  2 +-
 packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts |  9 +++++++--
 .../nodes/ApiTemplateIo/ApiTemplateIo.node.ts      |  3 +--
 .../nodes/ApiTemplateIo/GenericFunctions.ts        |  3 +--
 packages/nodes-base/nodes/Asana/Asana.node.ts      |  3 +--
 .../nodes-base/nodes/Asana/AsanaTrigger.node.ts    |  4 ++--
 .../nodes-base/nodes/Asana/GenericFunctions.ts     |  5 +++--
 .../nodes-base/nodes/Automizy/Automizy.node.ts     |  3 +--
 .../nodes-base/nodes/Automizy/GenericFunctions.ts  | 10 +++++++---
 .../nodes-base/nodes/Autopilot/Autopilot.node.ts   |  3 +--
 .../nodes/Autopilot/AutopilotTrigger.node.ts       |  4 ++--
 .../nodes-base/nodes/Autopilot/GenericFunctions.ts | 11 ++++++++---
 packages/nodes-base/nodes/Aws/AwsLambda.node.ts    |  2 +-
 packages/nodes-base/nodes/Aws/AwsSns.node.ts       |  2 +-
 .../nodes-base/nodes/Aws/AwsSnsTrigger.node.ts     |  4 ++--
 .../AwsCertificateManager.node.ts                  |  3 +--
 .../Aws/CertificateManager/GenericFunctions.ts     |  7 ++++---
 .../nodes/Aws/Comprehend/AwsComprehend.node.ts     |  3 +--
 .../nodes/Aws/Comprehend/GenericFunctions.ts       |  5 ++---
 .../nodes/Aws/DynamoDB/AwsDynamoDB.node.ts         |  3 +--
 .../nodes/Aws/DynamoDB/GenericFunctions.ts         |  7 ++++---
 packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts   |  3 +--
 .../nodes-base/nodes/Aws/ELB/GenericFunctions.ts   |  7 ++++---
 packages/nodes-base/nodes/Aws/GenericFunctions.ts  |  6 +++---
 .../nodes/Aws/Rekognition/GenericFunctions.ts      |  6 +++---
 .../nodes-base/nodes/Aws/S3/GenericFunctions.ts    |  6 +++---
 packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts   |  3 +--
 .../nodes-base/nodes/Aws/SES/GenericFunctions.ts   |  7 ++++---
 .../nodes/Aws/Textract/GenericFunctions.ts         |  7 ++-----
 .../nodes/Aws/Transcribe/AwsTranscribe.node.ts     |  3 +--
 .../nodes/Aws/Transcribe/GenericFunctions.ts       |  7 ++++---
 .../nodes-base/nodes/BambooHr/BambooHr.node.ts     |  9 ++++++---
 .../v1/actions/companyReport/get/execute.ts        |  4 +---
 .../BambooHr/v1/actions/employee/create/execute.ts |  4 +---
 .../BambooHr/v1/actions/employee/get/execute.ts    |  4 +---
 .../BambooHr/v1/actions/employee/getAll/execute.ts |  4 +---
 .../BambooHr/v1/actions/employee/update/execute.ts |  4 +---
 .../v1/actions/employeeDocument/del/execute.ts     |  4 +---
 .../actions/employeeDocument/download/execute.ts   |  4 +---
 .../v1/actions/employeeDocument/getAll/execute.ts  |  4 +---
 .../v1/actions/employeeDocument/update/execute.ts  |  4 +---
 .../nodes/BambooHr/v1/actions/file/del/execute.ts  |  4 +---
 .../BambooHr/v1/actions/file/download/execute.ts   |  4 +---
 .../BambooHr/v1/actions/file/getAll/execute.ts     |  4 +---
 .../BambooHr/v1/actions/file/update/execute.ts     |  4 +---
 .../nodes-base/nodes/BambooHr/v1/actions/router.ts |  4 +---
 .../nodes/BambooHr/v1/transport/index.ts           | 10 +++++++---
 .../nodes-base/nodes/Bannerbear/Bannerbear.node.ts |  3 +--
 .../nodes/Bannerbear/GenericFunctions.ts           | 11 ++++++++---
 packages/nodes-base/nodes/Baserow/Baserow.node.ts  |  3 +--
 .../nodes-base/nodes/Baserow/GenericFunctions.ts   |  9 ++++++---
 .../nodes/Beeminder/Beeminder.node.functions.ts    | 10 +++++++---
 .../nodes-base/nodes/Beeminder/Beeminder.node.ts   |  3 +--
 .../nodes-base/nodes/Beeminder/GenericFunctions.ts | 10 +++++++---
 .../nodes/Bitbucket/BitbucketTrigger.node.ts       |  4 ++--
 .../nodes-base/nodes/Bitbucket/GenericFunctions.ts |  5 +++--
 packages/nodes-base/nodes/Bitly/Bitly.node.ts      |  3 +--
 .../nodes-base/nodes/Bitly/GenericFunctions.ts     |  6 +++---
 .../nodes-base/nodes/Bitwarden/Bitwarden.node.ts   |  3 +--
 .../nodes-base/nodes/Bitwarden/GenericFunctions.ts |  3 +--
 packages/nodes-base/nodes/Box/BoxTrigger.node.ts   | 10 +++++++---
 packages/nodes-base/nodes/Box/GenericFunctions.ts  |  7 ++++---
 .../nodes-base/nodes/Brandfetch/Brandfetch.node.ts |  3 +--
 .../nodes/Brandfetch/GenericFunctions.ts           |  6 +++---
 packages/nodes-base/nodes/Bubble/Bubble.node.ts    |  3 +--
 .../nodes-base/nodes/Bubble/GenericFunctions.ts    | 10 +++++++---
 packages/nodes-base/nodes/Cal/CalTrigger.node.ts   |  4 ++--
 packages/nodes-base/nodes/Cal/GenericFunctions.ts  |  4 ++--
 .../nodes/Calendly/CalendlyTrigger.node.ts         |  4 ++--
 .../nodes-base/nodes/Calendly/GenericFunctions.ts  |  4 ++--
 .../nodes-base/nodes/Chargebee/Chargebee.node.ts   |  2 +-
 .../nodes/Chargebee/ChargebeeTrigger.node.ts       |  3 +--
 .../nodes-base/nodes/CircleCi/CircleCi.node.ts     |  3 +--
 .../nodes-base/nodes/CircleCi/GenericFunctions.ts  |  6 +++---
 .../nodes/Cisco/Webex/CiscoWebexTrigger.node.ts    |  4 ++--
 .../nodes/Cisco/Webex/GenericFunctions.ts          |  5 +++--
 .../nodes/Citrix/ADC/GenericFunctions.ts           | 11 ++++++++---
 .../nodes-base/nodes/Clearbit/Clearbit.node.ts     |  3 +--
 .../nodes-base/nodes/Clearbit/GenericFunctions.ts  |  6 +++---
 packages/nodes-base/nodes/ClickUp/ClickUp.node.ts  |  3 +--
 .../nodes/ClickUp/ClickUpTrigger.node.ts           |  4 ++--
 .../nodes-base/nodes/ClickUp/GenericFunctions.ts   |  7 ++++---
 .../nodes-base/nodes/Clockify/Clockify.node.ts     |  3 +--
 .../nodes/Clockify/ClockifyTrigger.node.ts         |  2 +-
 .../nodes-base/nodes/Clockify/GenericFunctions.ts  |  9 ++++++---
 .../nodes-base/nodes/Cloudflare/Cloudflare.node.ts |  3 +--
 .../nodes/Cloudflare/GenericFunctions.ts           |  6 +++---
 packages/nodes-base/nodes/Cockpit/Cockpit.node.ts  |  2 +-
 .../nodes/Cockpit/CollectionFunctions.ts           |  8 ++++++--
 packages/nodes-base/nodes/Cockpit/FormFunctions.ts |  8 ++++++--
 .../nodes-base/nodes/Cockpit/GenericFunctions.ts   |  9 +++++++--
 .../nodes-base/nodes/Cockpit/SingletonFunctions.ts |  6 +++++-
 packages/nodes-base/nodes/Coda/Coda.node.ts        |  2 +-
 packages/nodes-base/nodes/Coda/GenericFunctions.ts |  9 +++++++--
 packages/nodes-base/nodes/Code/Code.node.ts        |  4 ++--
 packages/nodes-base/nodes/Code/Sandbox.ts          |  4 ++--
 .../nodes-base/nodes/CoinGecko/CoinGecko.node.ts   |  3 +--
 .../nodes-base/nodes/CoinGecko/GenericFunctions.ts | 10 +++++++---
 .../nodes/CompareDatasets/CompareDatasets.node.ts  |  2 +-
 .../nodes-base/nodes/Contentful/Contentful.node.ts |  3 +--
 .../nodes/Contentful/GenericFunctions.ts           | 10 +++++++---
 .../nodes-base/nodes/ConvertKit/ConvertKit.node.ts |  4 ++--
 .../nodes/ConvertKit/ConvertKitTrigger.node.ts     |  4 ++--
 .../nodes/ConvertKit/GenericFunctions.ts           | 11 ++++++++---
 packages/nodes-base/nodes/Copper/Copper.node.ts    |  3 +--
 .../nodes-base/nodes/Copper/CopperTrigger.node.ts  |  4 ++--
 .../nodes-base/nodes/Copper/GenericFunctions.ts    |  7 ++++---
 .../nodes-base/nodes/Cortex/GenericFunctions.ts    |  5 ++---
 packages/nodes-base/nodes/CrateDb/CrateDb.node.ts  |  8 ++++++--
 packages/nodes-base/nodes/Cron/Cron.node.ts        |  9 +++++++--
 packages/nodes-base/nodes/Crypto/Crypto.node.ts    |  3 +--
 .../nodes-base/nodes/CustomerIo/CustomerIo.node.ts |  2 +-
 .../nodes/CustomerIo/CustomerIoTrigger.node.ts     |  4 ++--
 .../nodes/CustomerIo/GenericFunctions.ts           | 11 ++++++++---
 .../nodes-base/nodes/DateTime/DateTime.node.ts     |  3 +--
 packages/nodes-base/nodes/DeepL/DeepL.node.ts      |  3 +--
 .../nodes-base/nodes/DeepL/GenericFunctions.ts     | 10 +++++++---
 packages/nodes-base/nodes/Demio/Demio.node.ts      |  3 +--
 .../nodes-base/nodes/Demio/GenericFunctions.ts     |  6 +++---
 packages/nodes-base/nodes/Dhl/Dhl.node.ts          |  3 +--
 packages/nodes-base/nodes/Dhl/GenericFunctions.ts  |  9 +++------
 packages/nodes-base/nodes/Discord/Discord.node.ts  |  8 ++++++--
 .../nodes-base/nodes/Discourse/Discourse.node.ts   |  3 +--
 .../nodes-base/nodes/Discourse/GenericFunctions.ts | 10 +++++++---
 packages/nodes-base/nodes/Disqus/Disqus.node.ts    |  2 +-
 .../nodes-base/nodes/Disqus/GenericFunctions.ts    |  5 +++--
 packages/nodes-base/nodes/Drift/Drift.node.ts      |  2 +-
 .../nodes-base/nodes/Drift/GenericFunctions.ts     | 11 ++++++++---
 .../nodes-base/nodes/Dropbox/GenericFunctions.ts   |  4 +---
 .../nodes/Dropcontact/Dropcontact.node.ts          |  3 +--
 .../nodes/Dropcontact/GenericFunction.ts           | 10 +++++++---
 packages/nodes-base/nodes/ERPNext/ERPNext.node.ts  |  3 +--
 .../nodes-base/nodes/ERPNext/GenericFunctions.ts   | 10 +++++++---
 packages/nodes-base/nodes/Egoi/Egoi.node.ts        |  3 +--
 packages/nodes-base/nodes/Egoi/GenericFunctions.ts |  6 +++---
 .../ElasticSecurity/ElasticSecurity.node.ts        |  3 +--
 .../Elastic/ElasticSecurity/GenericFunctions.ts    |  9 ++++++---
 .../Elastic/Elasticsearch/Elasticsearch.node.ts    |  3 +--
 .../Elastic/Elasticsearch/GenericFunctions.ts      |  4 +---
 .../nodes/EmailReadImap/v1/EmailReadImapV1.node.ts |  2 +-
 .../nodes/EmailReadImap/v2/EmailReadImapV2.node.ts |  2 +-
 .../nodes/EmailSend/v2/EmailSendV2.node.ts         |  3 +--
 packages/nodes-base/nodes/Emelia/Emelia.node.ts    |  3 +--
 .../nodes-base/nodes/Emelia/GenericFunctions.ts    |  4 ++--
 .../nodes/ErrorTrigger/ErrorTrigger.node.ts        |  8 ++++++--
 .../nodes/Eventbrite/EventbriteTrigger.node.ts     |  4 ++--
 .../nodes/Eventbrite/GenericFunctions.ts           |  6 +++---
 .../nodes/ExecuteCommand/ExecuteCommand.node.ts    |  8 ++++++--
 .../nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts  |  2 +-
 .../ExecuteWorkflowTrigger.node.ts                 |  8 ++++++--
 .../nodes/Facebook/FacebookTrigger.node.ts         |  4 ++--
 .../nodes-base/nodes/Facebook/GenericFunctions.ts  |  6 +++---
 .../nodes-base/nodes/Figma/FigmaTrigger.node.ts    |  4 ++--
 .../nodes-base/nodes/Figma/GenericFunctions.ts     |  6 +++---
 .../nodes-base/nodes/FileMaker/FileMaker.node.ts   |  2 +-
 .../nodes-base/nodes/FileMaker/GenericFunctions.ts | 11 ++++++++---
 packages/nodes-base/nodes/Flow/Flow.node.ts        |  2 +-
 packages/nodes-base/nodes/Flow/FlowTrigger.node.ts |  4 ++--
 packages/nodes-base/nodes/Flow/GenericFunctions.ts |  5 +++--
 .../nodes-base/nodes/FormIo/FormIoTrigger.node.ts  |  4 ++--
 .../nodes-base/nodes/FormIo/GenericFunctions.ts    | 10 +++++++---
 .../nodes/Formstack/FormstackTrigger.node.ts       |  4 ++--
 .../nodes-base/nodes/Formstack/GenericFunctions.ts |  7 ++++---
 .../nodes-base/nodes/Freshdesk/Freshdesk.node.ts   |  3 +--
 .../nodes-base/nodes/Freshdesk/GenericFunctions.ts | 12 +++++++-----
 .../nodes/Freshservice/Freshservice.node.ts        |  3 +--
 .../nodes/Freshservice/GenericFunctions.ts         | 10 +++++++---
 .../nodes/FreshworksCrm/FreshworksCrm.node.ts      |  3 +--
 .../nodes/FreshworksCrm/GenericFunctions.ts        |  9 ++++++---
 packages/nodes-base/nodes/Ftp/Ftp.node.ts          |  3 +--
 .../nodes-base/nodes/Function/Function.node.ts     |  2 +-
 .../nodes/FunctionItem/FunctionItem.node.ts        |  2 +-
 .../nodes/GetResponse/GenericFunctions.ts          |  6 +++---
 .../nodes/GetResponse/GetResponse.node.ts          |  3 +--
 .../nodes/GetResponse/GetResponseTrigger.node.ts   |  4 ++--
 .../nodes-base/nodes/Ghost/GenericFunctions.ts     |  5 ++---
 packages/nodes-base/nodes/Ghost/Ghost.node.ts      |  3 +--
 packages/nodes-base/nodes/Git/Git.node.ts          |  8 ++++++--
 .../nodes-base/nodes/Github/GenericFunctions.ts    | 10 +++++++---
 .../nodes-base/nodes/Github/GithubTrigger.node.ts  |  4 ++--
 .../nodes-base/nodes/Gitlab/GenericFunctions.ts    |  4 +---
 .../nodes-base/nodes/Gitlab/GitlabTrigger.node.ts  |  4 ++--
 .../nodes/GoToWebinar/GenericFunctions.ts          |  4 ++--
 .../nodes/GoToWebinar/GoToWebinar.node.ts          |  3 +--
 .../nodes/Google/Analytics/v1/GenericFunctions.ts  |  9 +++++++--
 .../Google/Analytics/v1/GoogleAnalyticsV1.node.ts  |  3 +--
 .../Google/Analytics/v2/GoogleAnalyticsV2.node.ts  |  2 +-
 .../v2/actions/report/get.ga4.operation.ts         |  8 ++++++--
 .../v2/actions/report/get.universal.operation.ts   |  8 ++++++--
 .../nodes/Google/Analytics/v2/actions/router.ts    |  3 +--
 .../v2/actions/userActivity/search.operation.ts    |  8 ++++++--
 .../nodes/Google/Analytics/v2/helpers/utils.ts     |  9 +++++++--
 .../nodes/Google/Analytics/v2/transport/index.ts   |  9 +++++++--
 .../nodes/Google/BigQuery/GenericFunctions.ts      | 10 +++++++---
 .../nodes/Google/BigQuery/GoogleBigQuery.node.ts   |  3 +--
 .../nodes/Google/Books/GenericFunctions.ts         | 10 +++++++---
 .../nodes/Google/Books/GoogleBooks.node.ts         |  3 +--
 .../nodes/Google/Calendar/GenericFunctions.ts      |  5 +++--
 .../nodes/Google/Calendar/GoogleCalendar.node.ts   |  3 +--
 .../nodes/Google/Chat/GenericFunctions.ts          |  6 +++---
 .../nodes/Google/Chat/GoogleChat.node.ts           |  3 +--
 .../CloudNaturalLanguage/GenericFunctions.ts       | 10 +++++++---
 .../GoogleCloudNaturalLanguage.node.ts             |  9 ++++++---
 .../nodes/Google/Contacts/GenericFunctions.ts      | 10 +++++++---
 .../nodes/Google/Contacts/GoogleContacts.node.ts   |  3 +--
 .../nodes/Google/Docs/GenericFunctions.ts          |  9 ++++++---
 .../nodes/Google/Docs/GoogleDocs.node.ts           |  4 ++--
 .../nodes/Google/Drive/GenericFunctions.ts         | 11 ++++++++---
 .../nodes/Google/Drive/GoogleDrive.node.ts         |  3 +--
 .../nodes/Google/Drive/GoogleDriveTrigger.node.ts  |  3 +--
 .../Firebase/CloudFirestore/GenericFunctions.ts    | 10 +++++++---
 .../GoogleFirebaseCloudFirestore.node.ts           |  3 +--
 .../Firebase/RealtimeDatabase/GenericFunctions.ts  | 10 +++++++---
 .../GoogleFirebaseRealtimeDatabase.node.ts         |  3 +--
 .../nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts   |  3 +--
 .../nodes/Google/GSuiteAdmin/GenericFunctions.ts   | 10 +++++++---
 .../nodes/Google/Gmail/GenericFunctions.ts         |  5 +++--
 .../nodes/Google/Gmail/GmailTrigger.node.ts        |  3 +--
 .../nodes/Google/Gmail/v2/GmailV2.node.ts          |  3 +--
 .../nodes/Google/Perspective/GenericFunctions.ts   |  4 +---
 .../Google/Perspective/GooglePerspective.node.ts   |  3 +--
 .../nodes/Google/Sheet/v1/GenericFunctions.ts      | 11 ++++++++---
 .../nodes/Google/Sheet/v1/GoogleSheet.ts           |  4 +---
 .../nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts   |  3 +--
 .../nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts   |  8 ++++++--
 .../nodes/Google/Sheet/v2/actions/router.ts        |  3 +--
 .../Sheet/v2/actions/sheet/append.operation.ts     |  3 +--
 .../v2/actions/sheet/appendOrUpdate.operation.ts   |  3 +--
 .../Sheet/v2/actions/sheet/clear.operation.ts      |  3 +--
 .../Sheet/v2/actions/sheet/create.operation.ts     |  3 +--
 .../Sheet/v2/actions/sheet/delete.operation.ts     |  3 +--
 .../Sheet/v2/actions/sheet/read.operation.ts       |  3 +--
 .../Sheet/v2/actions/sheet/remove.operation.ts     |  3 +--
 .../Sheet/v2/actions/sheet/update.operation.ts     |  3 +--
 .../v2/actions/spreadsheet/create.operation.ts     |  3 +--
 .../v2/actions/spreadsheet/delete.operation.ts     |  3 +--
 .../nodes/Google/Sheet/v2/helpers/GoogleSheet.ts   |  8 ++++++--
 .../Google/Sheet/v2/helpers/GoogleSheets.utils.ts  |  2 +-
 .../nodes/Google/Sheet/v2/transport/index.ts       |  4 +++-
 .../nodes/Google/Slides/GenericFunctions.ts        |  9 ++++++---
 .../nodes/Google/Slides/GoogleSlides.node.ts       |  3 +--
 .../nodes/Google/Task/GenericFunctions.ts          | 10 +++++++---
 .../nodes/Google/Task/GoogleTasks.node.ts          |  3 +--
 .../nodes/Google/Translate/GenericFunctions.ts     | 10 +++++++---
 .../nodes/Google/Translate/GoogleTranslate.node.ts |  3 +--
 .../nodes/Google/YouTube/GenericFunctions.ts       | 10 +++++++---
 .../nodes/Google/YouTube/YouTube.node.ts           |  3 +--
 .../nodes-base/nodes/Gotify/GenericFunctions.ts    | 10 +++++++---
 packages/nodes-base/nodes/Gotify/Gotify.node.ts    |  3 +--
 .../nodes-base/nodes/Grafana/GenericFunctions.ts   |  9 ++++++---
 packages/nodes-base/nodes/Grafana/Grafana.node.ts  |  3 +--
 packages/nodes-base/nodes/GraphQL/GraphQL.node.ts  |  2 +-
 .../nodes-base/nodes/Grist/GenericFunctions.ts     |  9 ++++++---
 packages/nodes-base/nodes/Grist/Grist.node.ts      |  3 +--
 .../nodes-base/nodes/Gumroad/GenericFunctions.ts   |  5 +++--
 .../nodes/Gumroad/GumroadTrigger.node.ts           |  4 ++--
 .../nodes/HackerNews/GenericFunctions.ts           | 10 +++++++---
 .../nodes-base/nodes/HackerNews/HackerNews.node.ts |  3 +--
 .../nodes-base/nodes/HaloPSA/GenericFunctions.ts   |  4 ++--
 packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts  |  3 +--
 .../nodes-base/nodes/Harvest/GenericFunctions.ts   |  6 +++---
 packages/nodes-base/nodes/Harvest/Harvest.node.ts  |  4 ++--
 .../nodes-base/nodes/HelpScout/GenericFunctions.ts |  6 +++---
 .../nodes-base/nodes/HelpScout/HelpScout.node.ts   |  3 +--
 .../nodes/HelpScout/HelpScoutTrigger.node.ts       |  4 ++--
 .../nodes/HomeAssistant/GenericFunctions.ts        | 10 +++++++---
 .../nodes/HomeAssistant/HomeAssistant.node.ts      |  3 +--
 .../nodes/HttpRequest/V1/HttpRequestV1.node.ts     |  3 +--
 .../nodes/HttpRequest/V3/HttpRequestV3.node.ts     |  3 +--
 .../nodes-base/nodes/Hubspot/GenericFunctions.ts   |  9 +++------
 packages/nodes-base/nodes/Hubspot/Hubspot.node.ts  |  3 +--
 .../nodes/Hubspot/HubspotTrigger.node.ts           |  4 ++--
 .../nodes/HumanticAI/GenericFunctions.ts           |  6 +++---
 .../nodes-base/nodes/Hunter/GenericFunctions.ts    |  5 +++--
 packages/nodes-base/nodes/Hunter/Hunter.node.ts    |  2 +-
 .../nodes-base/nodes/ICalendar/ICalendar.node.ts   |  3 +--
 packages/nodes-base/nodes/If/If.node.ts            |  2 +-
 .../nodes-base/nodes/Intercom/GenericFunctions.ts  |  6 +++---
 .../nodes-base/nodes/Intercom/Intercom.node.ts     |  2 +-
 .../nodes-base/nodes/Interval/Interval.node.ts     |  8 ++++++--
 .../nodes/InvoiceNinja/GenericFunctions.ts         |  6 +++---
 .../nodes/InvoiceNinja/InvoiceNinja.node.ts        |  3 +--
 .../nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts | 10 +++++++---
 .../nodes/ItemLists/V1/ItemListsV1.node.ts         |  2 +-
 .../nodes/ItemLists/V2/ItemListsV2.node.ts         |  2 +-
 .../nodes-base/nodes/Iterable/GenericFunctions.ts  | 10 +++++++---
 .../nodes-base/nodes/Iterable/Iterable.node.ts     |  3 +--
 .../nodes-base/nodes/Jenkins/GenericFunctions.ts   |  6 +++---
 packages/nodes-base/nodes/Jenkins/Jenkins.node.ts  |  3 +--
 packages/nodes-base/nodes/Jira/GenericFunctions.ts |  7 ++++---
 packages/nodes-base/nodes/Jira/Jira.node.ts        |  6 ++----
 packages/nodes-base/nodes/Jira/JiraTrigger.node.ts |  4 ++--
 .../nodes-base/nodes/JotForm/GenericFunctions.ts   |  5 +++--
 .../nodes/JotForm/JotFormTrigger.node.ts           |  4 ++--
 packages/nodes-base/nodes/Kafka/Kafka.node.ts      |  3 +--
 .../nodes-base/nodes/Kafka/KafkaTrigger.node.ts    | 10 +++++++---
 packages/nodes-base/nodes/Keap/GenericFunctions.ts |  6 +++---
 packages/nodes-base/nodes/Keap/KeapTrigger.node.ts |  4 ++--
 .../nodes-base/nodes/Kitemaker/GenericFunctions.ts | 10 +++++++---
 .../nodes-base/nodes/Kitemaker/Kitemaker.node.ts   |  3 +--
 .../nodes/KoBoToolbox/GenericFunctions.ts          |  4 ++--
 .../nodes/KoBoToolbox/KoBoToolbox.node.ts          |  3 +--
 .../nodes-base/nodes/Lemlist/GenericFunctions.ts   |  9 ++++++---
 packages/nodes-base/nodes/Lemlist/Lemlist.node.ts  |  3 +--
 .../nodes/Lemlist/LemlistTrigger.node.ts           |  4 ++--
 packages/nodes-base/nodes/Line/GenericFunctions.ts |  6 +++---
 .../nodes-base/nodes/Linear/GenericFunctions.ts    |  4 ++--
 packages/nodes-base/nodes/Linear/Linear.node.ts    |  3 +--
 .../nodes-base/nodes/Linear/LinearTrigger.node.ts  |  4 ++--
 .../nodes-base/nodes/LingvaNex/GenericFunctions.ts |  6 +++---
 .../nodes-base/nodes/LingvaNex/LingvaNex.node.ts   |  3 +--
 .../nodes-base/nodes/LinkedIn/GenericFunctions.ts  |  9 +++++++--
 .../LocalFileTrigger/LocalFileTrigger.node.ts      |  9 +++++++--
 packages/nodes-base/nodes/MQTT/Mqtt.node.ts        |  3 +--
 packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts | 10 +++++++---
 .../nodes-base/nodes/Magento/GenericFunctions.ts   |  8 +++++---
 packages/nodes-base/nodes/Magento/Magento2.node.ts |  3 +--
 .../nodes-base/nodes/Mailcheck/GenericFunctions.ts |  5 ++---
 .../nodes-base/nodes/Mailcheck/Mailcheck.node.ts   |  3 +--
 .../nodes-base/nodes/Mailchimp/GenericFunctions.ts |  6 +++---
 .../nodes-base/nodes/Mailchimp/Mailchimp.node.ts   |  3 +--
 .../nodes/Mailchimp/MailchimpTrigger.node.ts       |  4 ++--
 .../nodes/MailerLite/GenericFunctions.ts           |  6 +++---
 .../nodes-base/nodes/MailerLite/MailerLite.node.ts |  3 +--
 .../nodes/MailerLite/MailerLiteTrigger.node.ts     |  4 ++--
 packages/nodes-base/nodes/Mailgun/Mailgun.node.ts  |  2 +-
 .../nodes-base/nodes/Mailjet/GenericFunctions.ts   | 10 +++++++---
 packages/nodes-base/nodes/Mailjet/Mailjet.node.ts  |  3 +--
 .../nodes/Mailjet/MailjetTrigger.node.ts           |  4 ++--
 .../nodes-base/nodes/Mandrill/GenericFunctions.ts  |  9 ++++++---
 .../nodes-base/nodes/Mandrill/Mandrill.node.ts     |  3 +--
 .../nodes/ManualTrigger/ManualTrigger.node.ts      |  8 ++++++--
 .../nodes-base/nodes/Markdown/Markdown.node.ts     |  3 +--
 .../nodes/Marketstack/GenericFunctions.ts          |  4 +---
 .../nodes/Marketstack/Marketstack.node.ts          |  3 +--
 packages/nodes-base/nodes/Matrix/Matrix.node.ts    |  3 +--
 .../nodes/Mattermost/v1/MattermostV1.node.ts       |  9 ++++++---
 .../v1/actions/channel/addUser/execute.ts          |  4 +---
 .../v1/actions/channel/create/execute.ts           |  4 +---
 .../Mattermost/v1/actions/channel/del/execute.ts   |  4 +---
 .../v1/actions/channel/members/execute.ts          |  4 +---
 .../v1/actions/channel/restore/execute.ts          |  4 +---
 .../v1/actions/channel/search/execute.ts           |  4 +---
 .../v1/actions/channel/statistics/execute.ts       |  4 +---
 .../Mattermost/v1/actions/message/del/execute.ts   |  4 +---
 .../Mattermost/v1/actions/message/post/execute.ts  |  4 +---
 .../v1/actions/message/postEphemeral/execute.ts    |  4 +---
 .../v1/actions/reaction/create/execute.ts          |  4 +---
 .../Mattermost/v1/actions/reaction/del/execute.ts  |  4 +---
 .../v1/actions/reaction/getAll/execute.ts          |  4 +---
 .../nodes/Mattermost/v1/actions/router.ts          |  4 +---
 .../Mattermost/v1/actions/user/create/execute.ts   |  4 +---
 .../Mattermost/v1/actions/user/deactive/execute.ts |  4 +---
 .../Mattermost/v1/actions/user/getAll/execute.ts   |  4 +---
 .../v1/actions/user/getByEmail/execute.ts          |  4 +---
 .../Mattermost/v1/actions/user/getById/execute.ts  |  4 +---
 .../Mattermost/v1/actions/user/invite/execute.ts   |  4 +---
 .../nodes/Mattermost/v1/transport/index.ts         |  5 +++--
 .../nodes-base/nodes/Mautic/GenericFunctions.ts    |  6 +++---
 packages/nodes-base/nodes/Mautic/Mautic.node.ts    |  3 +--
 .../nodes-base/nodes/Mautic/MauticTrigger.node.ts  |  4 ++--
 .../nodes-base/nodes/Medium/GenericFunctions.ts    |  6 +++---
 packages/nodes-base/nodes/Medium/Medium.node.ts    |  3 +--
 packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts |  3 +--
 packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts |  2 +-
 .../nodes/MessageBird/GenericFunctions.ts          |  4 +---
 .../nodes/MessageBird/MessageBird.node.ts          |  3 +--
 .../nodes/Microsoft/Dynamics/GenericFunctions.ts   | 12 +++++++++---
 .../Dynamics/MicrosoftDynamicsCrm.node.ts          |  3 +--
 .../nodes/Microsoft/Excel/GenericFunctions.ts      |  9 +++++++--
 .../nodes/Microsoft/Excel/MicrosoftExcel.node.ts   |  3 +--
 .../Microsoft/GraphSecurity/GenericFunctions.ts    |  4 +---
 .../GraphSecurity/MicrosoftGraphSecurity.node.ts   |  3 +--
 .../nodes/Microsoft/OneDrive/GenericFunctions.ts   | 10 +++++++---
 .../nodes/Microsoft/Outlook/GenericFunctions.ts    | 14 +++++++++-----
 .../nodes/Microsoft/Sql/MicrosoftSql.node.ts       |  3 +--
 .../nodes/Microsoft/Teams/GenericFunctions.ts      | 10 +++++++---
 .../nodes/Microsoft/Teams/MicrosoftTeams.node.ts   |  3 +--
 .../nodes/Microsoft/ToDo/GenericFunctions.ts       |  9 ++++++---
 .../nodes/Microsoft/ToDo/MicrosoftToDo.node.ts     |  3 +--
 .../nodes-base/nodes/Mindee/GenericFunctions.ts    | 10 +++++++---
 packages/nodes-base/nodes/Misp/GenericFunctions.ts |  9 ++++++---
 packages/nodes-base/nodes/Misp/Misp.node.ts        |  4 ++--
 .../nodes-base/nodes/Mocean/GenericFunctions.ts    |  4 +---
 packages/nodes-base/nodes/Mocean/Mocean.node.ts    |  3 +--
 .../nodes-base/nodes/MondayCom/GenericFunctions.ts | 11 ++++++++---
 .../nodes-base/nodes/MondayCom/MondayCom.node.ts   |  3 +--
 .../nodes-base/nodes/MongoDb/GenericFunctions.ts   |  9 ++++++---
 packages/nodes-base/nodes/MongoDb/MongoDb.node.ts  |  3 +--
 .../nodes-base/nodes/MonicaCrm/GenericFunctions.ts |  9 ++++++---
 .../nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts   |  3 +--
 .../nodes/MoveBinaryData/MoveBinaryData.node.ts    | 12 ++++++++----
 .../nodes-base/nodes/Msg91/GenericFunctions.ts     |  4 +---
 packages/nodes-base/nodes/Msg91/Msg91.node.ts      |  2 +-
 packages/nodes-base/nodes/MySql/MySql.node.ts      |  2 +-
 .../N8nTrainingCustomerDatastore.node.ts           |  9 ++++++---
 .../N8nTrainingCustomerMessenger.node.ts           |  9 ++++++---
 .../nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts |  8 ++++++--
 packages/nodes-base/nodes/Nasa/GenericFunctions.ts |  4 +---
 packages/nodes-base/nodes/Nasa/Nasa.node.ts        |  3 +--
 .../nodes-base/nodes/Netlify/GenericFunctions.ts   |  6 +++---
 packages/nodes-base/nodes/Netlify/Netlify.node.ts  |  3 +--
 .../nodes/Netlify/NetlifyTrigger.node.ts           |  4 ++--
 .../nodes-base/nodes/NextCloud/GenericFunctions.ts |  2 +-
 packages/nodes-base/nodes/NoOp/NoOp.node.ts        |  8 ++++++--
 .../nodes-base/nodes/NocoDB/GenericFunctions.ts    | 12 +++++++++---
 .../nodes-base/nodes/Notion/GenericFunctions.ts    |  9 +++------
 .../nodes-base/nodes/Notion/NotionTrigger.node.ts  |  3 +--
 .../nodes-base/nodes/Notion/v1/NotionV1.node.ts    |  3 +--
 .../nodes-base/nodes/Notion/v2/NotionV2.node.ts    |  3 +--
 packages/nodes-base/nodes/Odoo/GenericFunctions.ts |  6 +++---
 packages/nodes-base/nodes/Odoo/Odoo.node.ts        |  2 +-
 .../nodes/OneSimpleApi/GenericFunctions.ts         |  4 +---
 .../nodes/OneSimpleApi/OneSimpleApi.node.ts        |  3 +--
 packages/nodes-base/nodes/Onfleet/Onfleet.node.ts  |  3 +--
 .../nodes/Onfleet/OnfleetTrigger.node.ts           |  3 ++-
 .../nodes/OpenThesaurus/GenericFunctions.ts        |  6 +++---
 .../nodes/OpenThesaurus/OpenThesaurus.node.ts      |  3 +--
 .../nodes/OpenWeatherMap/OpenWeatherMap.node.ts    |  2 +-
 .../nodes-base/nodes/Orbit/GenericFunctions.ts     |  6 +++---
 packages/nodes-base/nodes/Orbit/Orbit.node.ts      |  3 +--
 packages/nodes-base/nodes/Oura/GenericFunctions.ts |  6 +++---
 packages/nodes-base/nodes/Oura/Oura.node.ts        |  3 +--
 .../nodes-base/nodes/Paddle/GenericFunctions.ts    |  6 +++---
 packages/nodes-base/nodes/Paddle/Paddle.node.ts    |  3 +--
 .../nodes-base/nodes/PagerDuty/GenericFunctions.ts | 11 ++++++++---
 .../nodes-base/nodes/PagerDuty/PagerDuty.node.ts   |  3 +--
 .../nodes-base/nodes/PayPal/GenericFunctions.ts    |  9 ++++-----
 packages/nodes-base/nodes/PayPal/PayPal.node.ts    |  2 +-
 .../nodes-base/nodes/PayPal/PayPalTrigger.node.ts  |  4 ++--
 .../nodes-base/nodes/Peekalink/GenericFunctions.ts |  6 +++---
 .../nodes-base/nodes/Peekalink/Peekalink.node.ts   |  3 +--
 .../nodes/Phantombuster/GenericFunctions.ts        | 10 +++++++---
 .../nodes/Phantombuster/Phantombuster.node.ts      |  3 +--
 .../nodes/PhilipsHue/GenericFunctions.ts           |  9 ++++++---
 .../nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts |  3 +--
 .../nodes-base/nodes/Pipedrive/GenericFunctions.ts | 11 ++++++++---
 .../nodes/Pipedrive/PipedriveTrigger.node.ts       |  4 ++--
 .../nodes-base/nodes/Plivo/GenericFunctions.ts     |  4 +---
 packages/nodes-base/nodes/Plivo/Plivo.node.ts      |  3 +--
 .../nodes-base/nodes/PostHog/GenericFunctions.ts   |  9 ++++++---
 packages/nodes-base/nodes/PostHog/PostHog.node.ts  |  3 +--
 .../nodes/Postgres/Postgres.node.functions.ts      |  3 +--
 .../nodes-base/nodes/Postgres/Postgres.node.ts     |  2 +-
 .../nodes-base/nodes/Postmark/GenericFunctions.ts  | 11 ++++++++---
 .../nodes/Postmark/PostmarkTrigger.node.ts         |  4 ++--
 .../nodes/ProfitWell/GenericFunctions.ts           |  6 +++---
 .../nodes-base/nodes/ProfitWell/ProfitWell.node.ts |  3 +--
 .../nodes/Pushbullet/GenericFunctions.ts           |  9 ++++++---
 .../nodes-base/nodes/Pushcut/GenericFunctions.ts   | 10 +++++++---
 packages/nodes-base/nodes/Pushcut/Pushcut.node.ts  |  3 +--
 .../nodes/Pushcut/PushcutTrigger.node.ts           | 10 +++++++---
 .../nodes-base/nodes/Pushover/GenericFunctions.ts  |  5 +++--
 packages/nodes-base/nodes/QuestDb/QuestDb.node.ts  |  8 ++++++--
 .../nodes-base/nodes/QuickBase/GenericFunctions.ts |  6 +++---
 .../nodes-base/nodes/QuickBase/QuickBase.node.ts   |  3 +--
 .../nodes/QuickBooks/GenericFunctions.ts           |  4 ++--
 .../nodes-base/nodes/QuickBooks/QuickBooks.node.ts |  3 +--
 .../nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts     |  2 +-
 .../nodes-base/nodes/Raindrop/GenericFunctions.ts  | 10 +++++++---
 .../nodes-base/nodes/Raindrop/Raindrop.node.ts     |  3 +--
 .../nodes/ReadBinaryFile/ReadBinaryFile.node.ts    |  8 ++++++--
 .../nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts  |  8 ++++++--
 packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts  |  3 +--
 .../nodes-base/nodes/Reddit/GenericFunctions.ts    |  4 +---
 packages/nodes-base/nodes/Reddit/Reddit.node.ts    |  3 +--
 packages/nodes-base/nodes/Redis/Redis.node.ts      |  2 +-
 .../nodes-base/nodes/Redis/RedisTrigger.node.ts    | 10 +++++++---
 .../nodes-base/nodes/RenameKeys/RenameKeys.node.ts |  2 +-
 .../nodes/Rocketchat/GenericFunctions.ts           |  3 +--
 .../nodes-base/nodes/Rocketchat/Rocketchat.node.ts |  3 +--
 .../nodes/RssFeedRead/RssFeedRead.node.ts          |  2 +-
 packages/nodes-base/nodes/Rundeck/Rundeck.node.ts  |  2 +-
 packages/nodes-base/nodes/Rundeck/RundeckApi.ts    |  3 +--
 packages/nodes-base/nodes/S3/GenericFunctions.ts   |  6 +++---
 .../nodes/Salesforce/GenericFunctions.ts           | 11 ++++++++---
 .../nodes-base/nodes/Salesforce/Salesforce.node.ts |  3 +--
 .../nodes-base/nodes/Salesmate/GenericFunctions.ts |  7 ++++---
 .../nodes-base/nodes/Salesmate/Salesmate.node.ts   |  2 +-
 .../nodes/Schedule/ScheduleTrigger.node.ts         |  9 +++++++--
 .../nodes-base/nodes/SeaTable/GenericFunctions.ts  | 10 +++++++---
 .../nodes-base/nodes/SeaTable/SeaTable.node.ts     |  3 +--
 .../nodes/SeaTable/SeaTableTrigger.node.ts         |  3 +--
 .../nodes/SecurityScorecard/GenericFunctions.ts    | 10 +++++++---
 .../SecurityScorecard/SecurityScorecard.node.ts    |  3 +--
 .../nodes-base/nodes/Segment/GenericFunctions.ts   |  4 ++--
 packages/nodes-base/nodes/Segment/Segment.node.ts  |  3 +--
 .../nodes-base/nodes/SendGrid/GenericFunctions.ts  |  5 ++---
 .../nodes-base/nodes/Sendy/GenericFunctions.ts     |  9 ++++++---
 packages/nodes-base/nodes/Sendy/Sendy.node.ts      |  3 +--
 .../nodes-base/nodes/SentryIo/GenericFunctions.ts  |  6 +++---
 .../nodes-base/nodes/SentryIo/SentryIo.node.ts     |  3 +--
 .../nodes/ServiceNow/GenericFunctions.ts           | 10 +++++++---
 packages/nodes-base/nodes/Set/Set.node.ts          |  2 +-
 .../nodes-base/nodes/Shopify/GenericFunctions.ts   |  6 +++---
 packages/nodes-base/nodes/Shopify/Shopify.node.ts  |  3 +--
 .../nodes/Shopify/ShopifyTrigger.node.ts           |  4 ++--
 .../nodes-base/nodes/Signl4/GenericFunctions.ts    |  4 +---
 .../nodes-base/nodes/Slack/V1/GenericFunctions.ts  | 11 ++++++++---
 .../nodes-base/nodes/Slack/V2/GenericFunctions.ts  |  9 +++++++--
 packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts |  3 +--
 .../nodes-base/nodes/Sms77/GenericFunctions.ts     |  4 +---
 packages/nodes-base/nodes/Sms77/Sms77.node.ts      |  3 +--
 .../nodes-base/nodes/Snowflake/Snowflake.node.ts   |  3 +--
 .../nodes/SplitInBatches/SplitInBatches.node.ts    |  2 +-
 .../nodes-base/nodes/Splunk/GenericFunctions.ts    |  9 ++++++---
 packages/nodes-base/nodes/Splunk/Splunk.node.ts    |  3 +--
 .../nodes-base/nodes/Spontit/GenericFunctions.ts   |  6 +++---
 packages/nodes-base/nodes/Spontit/Spontit.node.ts  |  2 +-
 .../nodes-base/nodes/Spotify/GenericFunctions.ts   |  4 +---
 packages/nodes-base/nodes/Spotify/Spotify.node.ts  |  3 +--
 .../nodes-base/nodes/SseTrigger/SseTrigger.node.ts | 10 +++++++---
 packages/nodes-base/nodes/Ssh/Ssh.node.ts          |  3 +--
 .../nodes-base/nodes/Stackby/GenericFunction.ts    | 11 ++++++++---
 packages/nodes-base/nodes/Stackby/Stackby.node.ts  |  3 +--
 packages/nodes-base/nodes/Start/Start.node.ts      |  8 ++++++--
 .../nodes-base/nodes/StickyNote/StickyNote.node.ts |  8 ++++++--
 .../nodes/StopAndError/StopAndError.node.ts        |  9 ++++++---
 .../nodes-base/nodes/Storyblok/GenericFunctions.ts |  6 +++---
 .../nodes-base/nodes/Storyblok/Storyblok.node.ts   |  3 +--
 .../nodes-base/nodes/Strapi/GenericFunctions.ts    |  6 +++---
 packages/nodes-base/nodes/Strapi/Strapi.node.ts    |  3 +--
 .../nodes-base/nodes/Strava/GenericFunctions.ts    |  6 +++---
 packages/nodes-base/nodes/Strava/Strava.node.ts    |  3 +--
 .../nodes-base/nodes/Strava/StravaTrigger.node.ts  |  4 ++--
 packages/nodes-base/nodes/Stripe/Stripe.node.ts    |  3 +--
 .../nodes-base/nodes/Stripe/StripeTrigger.node.ts  |  4 ++--
 packages/nodes-base/nodes/Stripe/helpers.ts        | 11 +++++++----
 .../nodes-base/nodes/Supabase/GenericFunctions.ts  |  9 +++------
 .../nodes-base/nodes/Supabase/Supabase.node.ts     |  3 +--
 .../nodes/SurveyMonkey/GenericFunctions.ts         | 11 ++++++++---
 .../nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts |  4 ++--
 packages/nodes-base/nodes/Switch/Switch.node.ts    |  2 +-
 .../nodes/SyncroMSP/v1/SyncroMspV1.node.ts         |  3 +--
 .../SyncroMSP/v1/actions/contact/create/execute.ts |  4 +---
 .../SyncroMSP/v1/actions/contact/del/execute.ts    |  4 +---
 .../SyncroMSP/v1/actions/contact/get/execute.ts    |  4 +---
 .../SyncroMSP/v1/actions/contact/getAll/execute.ts |  4 +---
 .../SyncroMSP/v1/actions/contact/update/execute.ts |  4 +---
 .../v1/actions/customer/create/execute.ts          |  4 +---
 .../SyncroMSP/v1/actions/customer/del/execute.ts   |  4 +---
 .../SyncroMSP/v1/actions/customer/get/execute.ts   |  4 +---
 .../v1/actions/customer/getAll/execute.ts          |  4 +---
 .../v1/actions/customer/update/execute.ts          |  4 +---
 .../SyncroMSP/v1/actions/rmm/create/execute.ts     |  4 +---
 .../nodes/SyncroMSP/v1/actions/rmm/del/execute.ts  |  4 +---
 .../nodes/SyncroMSP/v1/actions/rmm/get/execute.ts  |  4 +---
 .../SyncroMSP/v1/actions/rmm/getAll/execute.ts     |  4 +---
 .../nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts |  4 +---
 .../nodes/SyncroMSP/v1/actions/router.ts           |  4 +---
 .../SyncroMSP/v1/actions/ticket/create/execute.ts  |  4 +---
 .../SyncroMSP/v1/actions/ticket/del/execute.ts     |  4 +---
 .../SyncroMSP/v1/actions/ticket/get/execute.ts     |  4 +---
 .../SyncroMSP/v1/actions/ticket/getAll/execute.ts  |  4 +---
 .../SyncroMSP/v1/actions/ticket/update/execute.ts  |  4 +---
 .../nodes/SyncroMSP/v1/transport/index.ts          |  5 +++--
 .../nodes-base/nodes/Taiga/GenericFunctions.ts     |  7 ++++---
 packages/nodes-base/nodes/Taiga/Taiga.node.ts      |  3 +--
 .../nodes-base/nodes/Taiga/TaigaTrigger.node.ts    |  3 +--
 .../nodes/Tapfiliate/GenericFunctions.ts           |  6 +++---
 .../nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts |  3 +--
 .../nodes-base/nodes/Telegram/GenericFunctions.ts  | 10 +++++-----
 .../nodes-base/nodes/Telegram/Telegram.node.ts     |  5 ++---
 .../nodes/Telegram/TelegramTrigger.node.ts         |  4 ++--
 .../nodes-base/nodes/TheHive/GenericFunctions.ts   |  9 ++++++---
 .../nodes/TheHive/TheHiveTrigger.node.ts           |  3 +--
 .../nodes/TimescaleDb/TimescaleDb.node.ts          |  9 ++++++---
 .../nodes-base/nodes/Todoist/GenericFunctions.ts   | 10 +++++++---
 .../nodes-base/nodes/Todoist/v1/TodoistV1.node.ts  |  3 +--
 .../nodes-base/nodes/Todoist/v2/TodoistV2.node.ts  |  3 +--
 .../nodes-base/nodes/Toggl/GenericFunctions.ts     |  6 +++---
 .../nodes-base/nodes/Toggl/TogglTrigger.node.ts    |  2 +-
 .../nodes-base/nodes/TravisCi/GenericFunctions.ts  |  6 +++---
 .../nodes-base/nodes/TravisCi/TravisCi.node.ts     |  3 +--
 .../nodes-base/nodes/Trello/GenericFunctions.ts    |  9 ++++++---
 packages/nodes-base/nodes/Trello/Trello.node.ts    |  4 ++--
 .../nodes-base/nodes/Trello/TrelloTrigger.node.ts  | 10 +++++++---
 .../nodes-base/nodes/Twake/GenericFunctions.ts     |  3 +--
 packages/nodes-base/nodes/Twake/Twake.node.ts      |  3 +--
 .../nodes-base/nodes/Twilio/GenericFunctions.ts    |  4 +---
 packages/nodes-base/nodes/Twilio/Twilio.node.ts    |  2 +-
 .../nodes-base/nodes/Twist/GenericFunctions.ts     |  9 ++++++---
 .../nodes-base/nodes/Typeform/GenericFunctions.ts  | 11 ++++++++---
 .../nodes/Typeform/TypeformTrigger.node.ts         |  4 ++--
 .../nodes-base/nodes/UProc/GenericFunctions.ts     |  5 +----
 packages/nodes-base/nodes/UProc/UProc.node.ts      |  3 +--
 .../nodes/UnleashedSoftware/GenericFunctions.ts    |  6 +++---
 .../UnleashedSoftware/UnleashedSoftware.node.ts    |  3 +--
 .../nodes-base/nodes/Uplead/GenericFunctions.ts    |  6 +++---
 packages/nodes-base/nodes/Uplead/Uplead.node.ts    |  2 +-
 .../nodes/UptimeRobot/GenericFunctions.ts          |  4 +---
 .../nodes/UptimeRobot/UptimeRobot.node.ts          |  3 +--
 .../nodes-base/nodes/UrlScanIo/GenericFunctions.ts |  4 +---
 .../nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts   |  3 +--
 .../nodes/Venafi/Datacenter/GenericFunctions.ts    |  5 ++---
 .../Datacenter/VenafiTlsProtectDatacenter.node.ts  |  3 +--
 .../VenafiTlsProtectDatacenterTrigger.node.ts      |  3 +--
 .../nodes/Venafi/ProtectCloud/GenericFunctions.ts  | 11 ++++++++---
 .../ProtectCloud/VenafiTlsProtectCloud.node.ts     |  3 +--
 packages/nodes-base/nodes/Vero/GenericFunctions.ts |  9 +++++++--
 packages/nodes-base/nodes/Vero/Vero.node.ts        |  2 +-
 .../nodes-base/nodes/Vonage/GenericFunctions.ts    | 10 +++++++---
 packages/nodes-base/nodes/Vonage/Vonage.node.ts    |  3 +--
 packages/nodes-base/nodes/Wait/Wait.node.ts        |  6 ++----
 .../nodes-base/nodes/Webflow/GenericFunctions.ts   |  5 ++---
 packages/nodes-base/nodes/Webflow/Webflow.node.ts  |  3 +--
 .../nodes/Webflow/WebflowTrigger.node.ts           |  4 ++--
 packages/nodes-base/nodes/Webhook/Webhook.node.ts  |  6 ++----
 .../nodes-base/nodes/Wekan/GenericFunctions.ts     |  9 ++++++---
 packages/nodes-base/nodes/Wekan/Wekan.node.ts      |  3 +--
 packages/nodes-base/nodes/Wise/GenericFunctions.ts |  4 ++--
 packages/nodes-base/nodes/Wise/Wise.node.ts        |  3 +--
 packages/nodes-base/nodes/Wise/WiseTrigger.node.ts |  4 ++--
 .../nodes/WooCommerce/GenericFunctions.ts          |  6 +++---
 .../nodes/WooCommerce/WooCommerce.node.ts          |  2 +-
 .../nodes/WooCommerce/WooCommerceTrigger.node.ts   |  4 ++--
 .../nodes-base/nodes/Wordpress/GenericFunctions.ts | 10 +++++++---
 .../nodes-base/nodes/Wordpress/Wordpress.node.ts   |  2 +-
 .../nodes-base/nodes/Workable/GenericFunctions.ts  |  6 +++---
 .../nodes/Workable/WorkableTrigger.node.ts         |  4 ++--
 .../nodes/WorkflowTrigger/WorkflowTrigger.node.ts  |  8 ++++++--
 .../nodes/WriteBinaryFile/WriteBinaryFile.node.ts  |  2 +-
 .../nodes-base/nodes/Wufoo/GenericFunctions.ts     |  5 ++---
 .../nodes-base/nodes/Wufoo/WufooTrigger.node.ts    |  4 ++--
 packages/nodes-base/nodes/Xero/GenericFunctions.ts | 10 +++++++---
 packages/nodes-base/nodes/Xero/Xero.node.ts        |  3 +--
 packages/nodes-base/nodes/Xml/Xml.node.ts          |  8 ++++++--
 .../nodes-base/nodes/Yourls/GenericFunctions.ts    | 10 +++++++---
 packages/nodes-base/nodes/Yourls/Yourls.node.ts    |  3 +--
 .../nodes-base/nodes/Zammad/GenericFunctions.ts    |  9 ++++++---
 packages/nodes-base/nodes/Zammad/Zammad.node.ts    |  3 +--
 .../nodes-base/nodes/Zendesk/GenericFunctions.ts   |  5 ++---
 packages/nodes-base/nodes/Zendesk/Zendesk.node.ts  |  3 +--
 .../nodes/Zendesk/ZendeskTrigger.node.ts           |  4 ++--
 packages/nodes-base/nodes/Zoho/GenericFunctions.ts | 10 +++++++---
 packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts     |  3 +--
 packages/nodes-base/nodes/Zoom/GenericFunctions.ts | 10 +++++++---
 packages/nodes-base/nodes/Zoom/Zoom.node.ts        |  3 +--
 .../nodes-base/nodes/Zulip/GenericFunctions.ts     | 13 +++++++++----
 packages/nodes-base/package.json                   |  6 +++---
 packages/workflow/src/Constants.ts                 |  3 +++
 packages/workflow/src/index.ts                     |  7 +++++++
 pnpm-lock.yaml                                     |  8 ++++----
 667 files changed, 1843 insertions(+), 1585 deletions(-)
 create mode 100644 packages/workflow/src/Constants.ts

diff --git a/packages/cli/src/WebhookHelpers.ts b/packages/cli/src/WebhookHelpers.ts
index aa73abd3a388b3..e399f10beb6574 100644
--- a/packages/cli/src/WebhookHelpers.ts
+++ b/packages/cli/src/WebhookHelpers.ts
@@ -16,7 +16,7 @@
 import type express from 'express';
 import get from 'lodash.get';
 
-import { BINARY_ENCODING, BinaryDataManager, NodeExecuteFunctions, eventEmitter } from 'n8n-core';
+import { BinaryDataManager, NodeExecuteFunctions, eventEmitter } from 'n8n-core';
 
 import type {
 	IBinaryKeyData,
@@ -35,6 +35,7 @@ import type {
 	WorkflowExecuteMode,
 } from 'n8n-workflow';
 import {
+	BINARY_ENCODING,
 	createDeferredPromise,
 	ErrorReporterProxy as ErrorReporter,
 	LoggerProxy as Logger,
diff --git a/packages/core/src/BinaryDataManager/index.ts b/packages/core/src/BinaryDataManager/index.ts
index a019fdaddb1656..b3ddb8738d6c67 100644
--- a/packages/core/src/BinaryDataManager/index.ts
+++ b/packages/core/src/BinaryDataManager/index.ts
@@ -2,7 +2,7 @@ import { readFile, stat } from 'fs/promises';
 import type { BinaryMetadata, IBinaryData, INodeExecutionData } from 'n8n-workflow';
 import prettyBytes from 'pretty-bytes';
 import type { Readable } from 'stream';
-import { BINARY_ENCODING } from '../Constants';
+import { BINARY_ENCODING } from 'n8n-workflow';
 import type { IBinaryDataConfig, IBinaryDataManager } from '../Interfaces';
 import { BinaryDataFileSystem } from './FileSystem';
 import { binaryToBuffer } from './utils';
diff --git a/packages/core/src/Constants.ts b/packages/core/src/Constants.ts
index 6d2fe993213366..72894e6eaa5b30 100644
--- a/packages/core/src/Constants.ts
+++ b/packages/core/src/Constants.ts
@@ -1,5 +1,4 @@
 /* eslint-disable @typescript-eslint/naming-convention */
-export const BINARY_ENCODING = 'base64';
 export const CUSTOM_EXTENSION_ENV = 'N8N_CUSTOM_EXTENSIONS';
 export const DOWNLOADED_NODES_SUBDIRECTORY = 'nodes';
 export const ENCRYPTION_KEY_ENV_OVERWRITE = 'N8N_ENCRYPTION_KEY';
@@ -10,7 +9,6 @@ export const USER_SETTINGS_SUBFOLDER = '.n8n';
 export const PLACEHOLDER_EMPTY_EXECUTION_ID = '__UNKNOWN__';
 export const PLACEHOLDER_EMPTY_WORKFLOW_ID = '__EMPTY__';
 export const TUNNEL_SUBDOMAIN_ENV = 'N8N_TUNNEL_SUBDOMAIN';
-export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
 
 export const RESPONSE_ERROR_MESSAGES = {
 	NO_ENCRYPTION_KEY: 'Encryption key is missing or was not set',
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index 34deb18f363a16..61cca27d8e8dca 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -15,9 +15,3 @@ export * from './NodeExecuteFunctions';
 export * from './WorkflowExecute';
 export { eventEmitter, NodeExecuteFunctions, UserSettings };
 export * from './errors';
-
-declare module 'http' {
-	export interface IncomingMessage {
-		rawBody: Buffer;
-	}
-}
diff --git a/packages/node-dev/src/Build.ts b/packages/node-dev/src/Build.ts
index c15affb5d1aed3..096d4b6c06b4bd 100644
--- a/packages/node-dev/src/Build.ts
+++ b/packages/node-dev/src/Build.ts
@@ -46,7 +46,7 @@ export async function createCustomTsconfig() {
 /**
  * Builds and copies credentials and nodes
  *
- * @param {IBuildOptions} [options] Options to overwrite default behaviour
+ * @param {IBuildOptions} [options] Options to overwrite default behavior
  */
 export async function buildFiles({
 	destinationFolder = UserSettings.getUserN8nFolderCustomExtensionPath(),
diff --git a/packages/node-dev/templates/execute/simple.ts b/packages/node-dev/templates/execute/simple.ts
index 04d97a0768274b..e48bb62a89d1f6 100644
--- a/packages/node-dev/templates/execute/simple.ts
+++ b/packages/node-dev/templates/execute/simple.ts
@@ -1,5 +1,9 @@
-import { IExecuteFunctions } from 'n8n-core';
-import { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class ClassNameReplace implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/node-dev/templates/trigger/simple.ts b/packages/node-dev/templates/trigger/simple.ts
index 8702fed9882740..d1ba8fab1355af 100644
--- a/packages/node-dev/templates/trigger/simple.ts
+++ b/packages/node-dev/templates/trigger/simple.ts
@@ -1,5 +1,4 @@
-import { ITriggerFunctions } from 'n8n-core';
-import { INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import { ITriggerFunctions, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
 
 export class ClassNameReplace implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/node-dev/templates/webhook/simple.ts b/packages/node-dev/templates/webhook/simple.ts
index 76934e59784295..e7dccd146f4c39 100644
--- a/packages/node-dev/templates/webhook/simple.ts
+++ b/packages/node-dev/templates/webhook/simple.ts
@@ -1,6 +1,10 @@
-import { IWebhookFunctions } from 'n8n-core';
-
-import { IDataObject, INodeTypeDescription, INodeType, IWebhookResponseData } from 'n8n-workflow';
+import {
+	IDataObject,
+	IWebhookFunctions,
+	INodeTypeDescription,
+	INodeType,
+	IWebhookResponseData,
+} from 'n8n-workflow';
 
 export class ClassNameReplace implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/credentials/ShopifyApi.credentials.ts b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
index 25f5ae3e1bc2aa..93ef009304e974 100644
--- a/packages/nodes-base/credentials/ShopifyApi.credentials.ts
+++ b/packages/nodes-base/credentials/ShopifyApi.credentials.ts
@@ -1,4 +1,4 @@
-import { BINARY_ENCODING } from 'n8n-core';
+import { BINARY_ENCODING } from 'n8n-workflow';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestRequest,
diff --git a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
index e7aa0c69cc6aab..7c2089ce166e4b 100644
--- a/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/ActionNetwork.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
index 1de5b018fb3749..ac4f481d75e35c 100644
--- a/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActionNetwork/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
index 4941acf03b99cc..fddbc8a268178c 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaign.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
index 1d316e9ab0ebbe..49314a20a62554 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/ActiveCampaignTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
index 54c81b3901f333..5350d7d17b6a47 100644
--- a/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ActiveCampaign/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, INodeProperties, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	INodeProperties,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
index 85377674d3f1d4..de920558fc5e10 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/AcuitySchedulingTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
index 2492be7c8fc24c..46722dad9b053a 100644
--- a/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AcuityScheduling/GenericFunctions.ts
@@ -1,12 +1,13 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function acuitySchedulingApiRequest(
diff --git a/packages/nodes-base/nodes/Affinity/Affinity.node.ts b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
index 6d85aad421d991..7e529e67595cbc 100644
--- a/packages/nodes-base/nodes/Affinity/Affinity.node.ts
+++ b/packages/nodes-base/nodes/Affinity/Affinity.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
index eca99ab6bd366d..e7b04339cfc040 100644
--- a/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
+++ b/packages/nodes-base/nodes/Affinity/AffinityTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
index 1266077e8d30f9..15bcf5480fe8a2 100644
--- a/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Affinity/GenericFunctions.ts
@@ -1,10 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
+import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
 
 export async function affinityApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
index ad24cc3bad5534..0730efd29b78e7 100644
--- a/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
+++ b/packages/nodes-base/nodes/AgileCrm/AgileCrm.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
index 7269b7f985483b..3fb6345f2f2d2a 100644
--- a/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/AgileCrm/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { IContactUpdate } from './ContactInterface';
diff --git a/packages/nodes-base/nodes/Airtable/Airtable.node.ts b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
index 494b9899b00799..eb8d499b32022b 100644
--- a/packages/nodes-base/nodes/Airtable/Airtable.node.ts
+++ b/packages/nodes-base/nodes/Airtable/Airtable.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
index 9902557e047e20..b54ae8f8da0f43 100644
--- a/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Airtable/AirtableTrigger.node.ts
@@ -1,6 +1,5 @@
-import type { IPollFunctions } from 'n8n-core';
-
 import type {
+	IPollFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
index 6b046a1e5a6523..80e769e18a22bc 100644
--- a/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Airtable/GenericFunctions.ts
@@ -1,10 +1,10 @@
-import type { IExecuteFunctions, IPollFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
 import type {
 	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
+	IPollFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/Amqp/Amqp.node.ts b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
index 8f7657fb77b2c0..38746077f27acb 100644
--- a/packages/nodes-base/nodes/Amqp/Amqp.node.ts
+++ b/packages/nodes-base/nodes/Amqp/Amqp.node.ts
@@ -1,8 +1,8 @@
 import type { ContainerOptions, Dictionary, EventContext } from 'rhea';
 import { create_container } from 'rhea';
 
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
index 68dcd10e210e2e..d69fa908b60644 100644
--- a/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Amqp/AmqpTrigger.node.ts
@@ -1,8 +1,13 @@
 import type { ContainerOptions, EventContext, Message, ReceiverOptions } from 'rhea';
 import { create_container } from 'rhea';
 
-import type { ITriggerFunctions } from 'n8n-core';
-import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 import { deepCopy, jsonParse, NodeOperationError } from 'n8n-workflow';
 
 export class AmqpTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
index cbdd192a3e3c95..41398e4e7aadc9 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/ApiTemplateIo.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
index aef669dae22c91..a5d90db168671f 100644
--- a/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ApiTemplateIo/GenericFunctions.ts
@@ -1,7 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function apiTemplateIoApiRequest(
diff --git a/packages/nodes-base/nodes/Asana/Asana.node.ts b/packages/nodes-base/nodes/Asana/Asana.node.ts
index 3029c56f1ac515..6e6efdcc3e32b0 100644
--- a/packages/nodes-base/nodes/Asana/Asana.node.ts
+++ b/packages/nodes-base/nodes/Asana/Asana.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	IHttpRequestMethods,
 	ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
index e8cce229e0e2c3..2115baa2c5b471 100644
--- a/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Asana/AsanaTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Asana/GenericFunctions.ts b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
index 519dc6a338fb0a..4839ceed770d18 100644
--- a/packages/nodes-base/nodes/Asana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Asana/GenericFunctions.ts
@@ -1,7 +1,8 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
 	IHttpRequestMethods,
 	IHttpRequestOptions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Automizy/Automizy.node.ts b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
index 9e77f5141925b6..da4c8f1a4cd7e3 100644
--- a/packages/nodes-base/nodes/Automizy/Automizy.node.ts
+++ b/packages/nodes-base/nodes/Automizy/Automizy.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
index 7fd08548a1235f..44b2760a7b3f4b 100644
--- a/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Automizy/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function automizyApiRequest(
diff --git a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
index 3d17b80198780b..daba7d550636d7 100644
--- a/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/Autopilot.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
index 2bb4a136971167..ee208e1d54d3a8 100644
--- a/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Autopilot/AutopilotTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
index bd73190879b998..006472ef775569 100644
--- a/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Autopilot/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function autopilotApiRequest(
diff --git a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
index a7e31607416ac8..f5404f6522533b 100644
--- a/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsLambda.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Aws/AwsSns.node.ts b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
index 60451d446c5461..3cd4d33f2e31bd 100644
--- a/packages/nodes-base/nodes/Aws/AwsSns.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSns.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
index e9644a736e916a..f38ca256134347 100644
--- a/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
+++ b/packages/nodes-base/nodes/Aws/AwsSnsTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	ILoadOptionsFunctions,
 	INodeListSearchItems,
 	INodeListSearchResult,
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
index 39397a999bad88..493e240a70ffe6 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/AwsCertificateManager.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
index ec178291b38aed..16f2e3c43d7447 100644
--- a/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/CertificateManager/GenericFunctions.ts
@@ -1,13 +1,14 @@
 import get from 'lodash.get';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IHttpRequestOptions, JsonObject } from 'n8n-workflow';
+	IHttpRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
index 7ff7086299d802..d86ecc77cdd97d 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/AwsComprehend.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
index f8742dc5223d7a..f8b6bee8b88e04 100644
--- a/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Comprehend/GenericFunctions.ts
@@ -5,9 +5,8 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IHttpRequestOptions } from 'n8n-workflow';
+	IHttpRequestOptions,
+} from 'n8n-workflow';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
index 39158c26eaf3ad..354808befbc449 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/AwsDynamoDB.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
index b23784527c6321..a44214133ca72f 100644
--- a/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/DynamoDB/GenericFunctions.ts
@@ -1,11 +1,12 @@
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IHttpRequestOptions, INodeExecutionData } from 'n8n-workflow';
+	IHttpRequestOptions,
+	INodeExecutionData,
+} from 'n8n-workflow';
 import { deepCopy } from 'n8n-workflow';
 
 import type { IRequestBody } from './types';
diff --git a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
index bacedf2714c7d9..b8101fd57252bf 100644
--- a/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/AwsElb.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
index e2f5537e5156cc..013150e2b577d7 100644
--- a/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/ELB/GenericFunctions.ts
@@ -3,13 +3,14 @@ import get from 'lodash.get';
 import { parseString } from 'xml2js';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IHttpRequestOptions, JsonObject } from 'n8n-workflow';
+	IHttpRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
diff --git a/packages/nodes-base/nodes/Aws/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
index bd5d124ea35c76..7611eaab78601f 100644
--- a/packages/nodes-base/nodes/Aws/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/GenericFunctions.ts
@@ -5,9 +5,9 @@ import type {
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IHttpRequestOptions, JsonObject } from 'n8n-workflow';
+	IHttpRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function awsApiRequest(
diff --git a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
index 482dd6b723efe8..d9a49cc8a3ff5b 100644
--- a/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Rekognition/GenericFunctions.ts
@@ -3,13 +3,13 @@ import get from 'lodash.get';
 import { parseString } from 'xml2js';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IHttpRequestOptions } from 'n8n-workflow';
+	IHttpRequestOptions,
+} from 'n8n-workflow';
 
 import { pascalCase } from 'change-case';
 
diff --git a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
index cd5556dfb1fe16..e9d77c393dfcbd 100644
--- a/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/S3/GenericFunctions.ts
@@ -3,13 +3,13 @@ import get from 'lodash.get';
 import { parseString } from 'xml2js';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IHttpRequestOptions } from 'n8n-workflow';
+	IHttpRequestOptions,
+} from 'n8n-workflow';
 
 export async function awsApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
index aaf33419c4835e..eaf9b17af6858e 100644
--- a/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
+++ b/packages/nodes-base/nodes/Aws/SES/AwsSes.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
index 82ced0804407d2..79fb349d05e096 100644
--- a/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/SES/GenericFunctions.ts
@@ -1,13 +1,14 @@
 import { parseString } from 'xml2js';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IHttpRequestOptions, JsonObject } from 'n8n-workflow';
+	IHttpRequestOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
index 3d49d2d1b098fd..addd787ce72191 100644
--- a/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Textract/GenericFunctions.ts
@@ -8,15 +8,12 @@ import type { OptionsWithUri } from 'request';
 import { parseString } from 'xml2js';
 
 import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type {
-	ICredentialDataDecryptedObject,
-	ICredentialTestFunctions,
 	IHttpRequestOptions,
 	JsonObject,
 } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
index 127b961f4a2102..01e8b19ea0ec3c 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/AwsTranscribe.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
index 3dff43e92f6091..c894a5cf536b56 100644
--- a/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Aws/Transcribe/GenericFunctions.ts
@@ -6,13 +6,14 @@ import { sign } from 'aws4';
 import type { OptionsWithUri } from 'request';
 
 import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { ICredentialDataDecryptedObject, IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts b/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts
index bd204610e50193..1b7795f215bd18 100644
--- a/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts
+++ b/packages/nodes-base/nodes/BambooHr/BambooHr.node.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeType, INodeTypeBaseDescription, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 import { router } from './v1/actions/router';
 import { versionDescription } from './v1/actions/versionDescription';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
index 653756c1caa7c5..62dc60ca28d6f9 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/companyReport/get/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
index 89e51edeb3dde2..6dda349bcb131a 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts
index f434a06174fc06..5b9fe12109f47b 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/get/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts
index e640af2ad3c10a..0c7bf5f822a493 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
index 83f3e8be5ef84c..25c13478e3fce7 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employee/update/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/execute.ts
index 69c05d2b63bb36..29881657cbfb05 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
index 71cd2a6cebb20d..fcb32dc2e58cdf 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/download/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts
index 64fe5fc066fa81..631f8bb994a896 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/execute.ts
index 5397bed3cc4ef2..92f48d01a5e446 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/employeeDocument/update/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/execute.ts
index c31b9ac101a6f5..94e805b38019f8 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
index 8e9eef4a720bef..be7b82467612b2 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/download/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts
index 944a39f5535b89..09b72eef506942 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/execute.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/execute.ts
index 5a5844221061d4..43d9717c4b172a 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/execute.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/file/update/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
index 55ce4f657bbaec..fe667dfa0a5358 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/actions/router.ts
@@ -1,7 +1,5 @@
 /* eslint-disable @typescript-eslint/no-unsafe-argument */
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 
 import * as employee from './employee';
 import * as employeeDocument from './employeeDocument';
diff --git a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
index 920718fb51db2e..e20d26a8d7165e 100644
--- a/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/BambooHr/v1/transport/index.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUrl } from 'request';
diff --git a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
index ebdb752e5070c8..4bbde0a7e84068 100644
--- a/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
+++ b/packages/nodes-base/nodes/Bannerbear/Bannerbear.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
index 0934bf07a53472..82874197aab059 100644
--- a/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bannerbear/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
diff --git a/packages/nodes-base/nodes/Baserow/Baserow.node.ts b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
index 0c84aa3f1576f0..eb997b4d51d575 100644
--- a/packages/nodes-base/nodes/Baserow/Baserow.node.ts
+++ b/packages/nodes-base/nodes/Baserow/Baserow.node.ts
@@ -1,4 +1,5 @@
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
@@ -6,8 +7,6 @@ import type {
 	INodeTypeDescription,
 } from 'n8n-workflow';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import {
 	baserowApiRequest,
 	baserowApiRequestAllItems,
diff --git a/packages/nodes-base/nodes/Baserow/GenericFunctions.ts b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
index 8b1c5e1f22aac5..d53c4eb5327983 100644
--- a/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Baserow/GenericFunctions.ts
@@ -1,8 +1,11 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { Accumulator, BaserowCredentials, LoadedResource } from './types';
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
index 2ba818c2555f1f..7e7f294826cffe 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.functions.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+} from 'n8n-workflow';
 
 import { beeminderApiRequest, beeminderApiRequestAllItems } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
index 697022c75e3b83..0657905e0f2a48 100644
--- a/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
+++ b/packages/nodes-base/nodes/Beeminder/Beeminder.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
index 7cd7b31e56d651..c776b17116ab8e 100644
--- a/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Beeminder/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+} from 'n8n-workflow';
 
 const BEEMINDER_URI = 'https://www.beeminder.com/api/v1';
 
diff --git a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
index 69109f98325c53..6bf6ba373a2dfb 100644
--- a/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
+++ b/packages/nodes-base/nodes/Bitbucket/BitbucketTrigger.node.ts
@@ -1,8 +1,8 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
index 0f9ce524fb9892..084f209de4a0aa 100644
--- a/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitbucket/GenericFunctions.ts
@@ -1,11 +1,12 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function bitbucketApiRequest(
diff --git a/packages/nodes-base/nodes/Bitly/Bitly.node.ts b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
index 887e099b6bac1f..c2b74baff0e08a 100644
--- a/packages/nodes-base/nodes/Bitly/Bitly.node.ts
+++ b/packages/nodes-base/nodes/Bitly/Bitly.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
index 067eb40615e634..e959caac3ae3db 100644
--- a/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitly/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function bitlyApiRequest(
diff --git a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
index 3988a47bbc37af..7fb65d9ac41f0f 100644
--- a/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
+++ b/packages/nodes-base/nodes/Bitwarden/Bitwarden.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
index 91169e74647e24..e91cba2e32476b 100644
--- a/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bitwarden/GenericFunctions.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
index 2f8ff31e2a0257..370ef54e6df107 100644
--- a/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
+++ b/packages/nodes-base/nodes/Box/BoxTrigger.node.ts
@@ -1,6 +1,10 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
-import type { INodeType, INodeTypeDescription, IWebhookResponseData } from 'n8n-workflow';
+import type {
+	IHookFunctions,
+	IWebhookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
 
 import { boxApiRequest, boxApiRequestAllItems } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Box/GenericFunctions.ts b/packages/nodes-base/nodes/Box/GenericFunctions.ts
index 098b8a6c9eba03..1249681399f6ec 100644
--- a/packages/nodes-base/nodes/Box/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Box/GenericFunctions.ts
@@ -1,13 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IOAuth2Options, JsonObject } from 'n8n-workflow';
+	IOAuth2Options,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function boxApiRequest(
diff --git a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
index 43314f2933dd1e..22259c3cdba581 100644
--- a/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
+++ b/packages/nodes-base/nodes/Brandfetch/Brandfetch.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
index afbc6a657e46dc..15a59c07b340be 100644
--- a/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Brandfetch/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function brandfetchApiRequest(
diff --git a/packages/nodes-base/nodes/Bubble/Bubble.node.ts b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
index e6f0f3a8cfa19e..4b59dbb15e928d 100644
--- a/packages/nodes-base/nodes/Bubble/Bubble.node.ts
+++ b/packages/nodes-base/nodes/Bubble/Bubble.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
index 62a6438f03167c..3128e91ee94384 100644
--- a/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Bubble/GenericFunctions.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
index 793eef98e2bee8..340797cec3bfb2 100644
--- a/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cal/CalTrigger.node.ts
@@ -1,7 +1,7 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Cal/GenericFunctions.ts b/packages/nodes-base/nodes/Cal/GenericFunctions.ts
index 4910c0d5b6e7f5..e95eb42cfedfad 100644
--- a/packages/nodes-base/nodes/Cal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cal/GenericFunctions.ts
@@ -1,7 +1,7 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IHookFunctions,
 	IHttpRequestMethods,
 	IHttpRequestOptions,
diff --git a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
index 7252e7b6ec84bd..53aec5c53e8413 100644
--- a/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Calendly/CalendlyTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
index 46d473605f9a6c..af6f532623ec3a 100644
--- a/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Calendly/GenericFunctions.ts
@@ -1,11 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IHookFunctions,
 	IWebhookFunctions,
 } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
index 2a97d652c15a11..781c252bcec672 100644
--- a/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/Chargebee.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
index 19298dc8bebd5c..2acf1b780328d0 100644
--- a/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Chargebee/ChargebeeTrigger.node.ts
@@ -1,7 +1,6 @@
-import type { IWebhookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IWebhookFunctions,
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
diff --git a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
index 48f2831739fbf5..edc4f0dcbcbf5c 100644
--- a/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
+++ b/packages/nodes-base/nodes/CircleCi/CircleCi.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
index 41b2a775949feb..3a3f47d2ac16d7 100644
--- a/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CircleCi/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function circleciApiRequest(
diff --git a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
index e300d641eaba45..56635b50e6063f 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/CiscoWebexTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
index 7eba4e70915ea2..90724978774e84 100644
--- a/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cisco/Webex/GenericFunctions.ts
@@ -1,10 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
 	INodeProperties,
 	IWebhookFunctions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts b/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts
index e37229745a1076..d4b9aad4c75b52 100644
--- a/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Citrix/ADC/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function citrixADCApiRequest(
diff --git a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
index d99106f185b44f..8a39ed87f453a8 100644
--- a/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
+++ b/packages/nodes-base/nodes/Clearbit/Clearbit.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
index f443e8f2372b1c..f5dcfe34091d2c 100644
--- a/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clearbit/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function clearbitApiRequest(
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
index 37fb535552172c..9825986bcea2e9 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUp.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
index 3f88c19f466393..4772205693c6b4 100644
--- a/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
+++ b/packages/nodes-base/nodes/ClickUp/ClickUpTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
index 40182083ffd2c2..30ccdb4ff1a0ca 100644
--- a/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ClickUp/GenericFunctions.ts
@@ -1,14 +1,15 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IOAuth2Options, JsonObject } from 'n8n-workflow';
+	IOAuth2Options,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function clickupApiRequest(
diff --git a/packages/nodes-base/nodes/Clockify/Clockify.node.ts b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
index 1b7357c993dd13..cb8e32e0512249 100644
--- a/packages/nodes-base/nodes/Clockify/Clockify.node.ts
+++ b/packages/nodes-base/nodes/Clockify/Clockify.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
index 2ccce87fdf4a08..6af36fd6cc5f03 100644
--- a/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Clockify/ClockifyTrigger.node.ts
@@ -1,7 +1,7 @@
 import moment from 'moment-timezone';
 
-import type { IPollFunctions } from 'n8n-core';
 import type {
+	IPollFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
index 1f898ade8c3b3b..621356270f0b4c 100644
--- a/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Clockify/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions, IPollFunctions } from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IPollFunctions,
+	IDataObject,
+} from 'n8n-workflow';
 
 export async function clockifyApiRequest(
 	this: ILoadOptionsFunctions | IPollFunctions | IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
index 24defa030cf28b..ac6a0c5558aa79 100644
--- a/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
+++ b/packages/nodes-base/nodes/Cloudflare/Cloudflare.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
index ff586129a7d5aa..43424366a2d75d 100644
--- a/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cloudflare/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IPollFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function cloudflareApiRequest(
diff --git a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
index 4d675ea1cdb2f8..ba88d62fbbade9 100644
--- a/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
+++ b/packages/nodes-base/nodes/Cockpit/Cockpit.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
index b3e86911382ba7..20739f3910887c 100644
--- a/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/CollectionFunctions.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+} from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 import type { ICollection } from './CollectionInterface';
 import { cockpitApiRequest } from './GenericFunctions';
diff --git a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
index dc9fa97365b205..3083912892ec5d 100644
--- a/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/FormFunctions.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+} from 'n8n-workflow';
 import type { IForm } from './FormInterface';
 import { cockpitApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
index 0dd1539abd52b6..16101fb9abfb6e 100644
--- a/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/GenericFunctions.ts
@@ -1,5 +1,10 @@
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { jsonParse, NodeApiError } from 'n8n-workflow';
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
index fb4f083f2448ac..1fcbd8f3c5678a 100644
--- a/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
+++ b/packages/nodes-base/nodes/Cockpit/SingletonFunctions.ts
@@ -1,4 +1,8 @@
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
 import { cockpitApiRequest } from './GenericFunctions';
 
 export async function getSingleton(
diff --git a/packages/nodes-base/nodes/Coda/Coda.node.ts b/packages/nodes-base/nodes/Coda/Coda.node.ts
index 76d1361d0a355f..75679eb3c2f0b9 100644
--- a/packages/nodes-base/nodes/Coda/Coda.node.ts
+++ b/packages/nodes-base/nodes/Coda/Coda.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Coda/GenericFunctions.ts b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
index 13636430bad918..50c047c8f872c9 100644
--- a/packages/nodes-base/nodes/Coda/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Coda/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function codaApiRequest(
diff --git a/packages/nodes-base/nodes/Code/Code.node.ts b/packages/nodes-base/nodes/Code/Code.node.ts
index 9ce62560866fda..4d6b647c822b0a 100644
--- a/packages/nodes-base/nodes/Code/Code.node.ts
+++ b/packages/nodes-base/nodes/Code/Code.node.ts
@@ -80,7 +80,7 @@ export class Code implements INodeType {
 
 			const context = getSandboxContext.call(this);
 			context.items = context.$input.all();
-			const sandbox = new Sandbox(context, workflowMode, nodeMode);
+			const sandbox = new Sandbox(context, workflowMode, nodeMode, this.helpers);
 
 			if (workflowMode === 'manual') {
 				sandbox.on('console.log', this.sendMessageToUI);
@@ -113,7 +113,7 @@ export class Code implements INodeType {
 
 			const context = getSandboxContext.call(this, index);
 			context.item = context.$input.item;
-			const sandbox = new Sandbox(context, workflowMode, nodeMode);
+			const sandbox = new Sandbox(context, workflowMode, nodeMode, this.helpers);
 
 			if (workflowMode === 'manual') {
 				sandbox.on('console.log', this.sendMessageToUI);
diff --git a/packages/nodes-base/nodes/Code/Sandbox.ts b/packages/nodes-base/nodes/Code/Sandbox.ts
index c8374d3a3846f9..9cb72c1bbb37c6 100644
--- a/packages/nodes-base/nodes/Code/Sandbox.ts
+++ b/packages/nodes-base/nodes/Code/Sandbox.ts
@@ -1,4 +1,3 @@
-import { normalizeItems } from 'n8n-core';
 import type { NodeVMOptions } from 'vm2';
 import { NodeVM } from 'vm2';
 import { ValidationError } from './ValidationError';
@@ -23,6 +22,7 @@ export class Sandbox extends NodeVM {
 		context: ReturnType<typeof getSandboxContext>,
 		workflowMode: WorkflowExecuteMode,
 		private nodeMode: CodeNodeMode,
+		private helpers: IExecuteFunctions['helpers'],
 	) {
 		super(Sandbox.getSandboxOptions(context, workflowMode));
 	}
@@ -138,7 +138,7 @@ export class Sandbox extends NodeVM {
 			}
 		}
 
-		return normalizeItems(executionResult as INodeExecutionData[]);
+		return this.helpers.normalizeItems(executionResult as INodeExecutionData[]);
 	}
 
 	private async runCodeEachItem() {
diff --git a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
index 33587e894e64ef..1378bdf2030e2c 100644
--- a/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
+++ b/packages/nodes-base/nodes/CoinGecko/CoinGecko.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
index afbb2f702b2313..4ec589c78db598 100644
--- a/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CoinGecko/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function coinGeckoApiRequest(
diff --git a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
index 8cccc59d346ad1..3d7809244e5df8 100644
--- a/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
+++ b/packages/nodes-base/nodes/CompareDatasets/CompareDatasets.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Contentful/Contentful.node.ts b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
index e2e775e9f228d9..c49d4b9b674b8a 100644
--- a/packages/nodes-base/nodes/Contentful/Contentful.node.ts
+++ b/packages/nodes-base/nodes/Contentful/Contentful.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
index c43fcc0b5bdbca..210876500ca478 100644
--- a/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Contentful/GenericFunctions.ts
@@ -1,8 +1,12 @@
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function contentfulApiRequest(
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
index 0090cf618502f8..f40c265f291c49 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKit.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
index f4e286c25eae25..24b1d14cb7809a 100644
--- a/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
+++ b/packages/nodes-base/nodes/ConvertKit/ConvertKitTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
index 8204a97e09f8bc..acb6cb6a3efddf 100644
--- a/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ConvertKit/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function convertKitApiRequest(
diff --git a/packages/nodes-base/nodes/Copper/Copper.node.ts b/packages/nodes-base/nodes/Copper/Copper.node.ts
index d7fd7f46456622..a193bf4a9f25d4 100644
--- a/packages/nodes-base/nodes/Copper/Copper.node.ts
+++ b/packages/nodes-base/nodes/Copper/Copper.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
index fd96e528b448c5..74238b10abf4a1 100644
--- a/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
+++ b/packages/nodes-base/nodes/Copper/CopperTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Copper/GenericFunctions.ts b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
index 9c29a3cdfc2c72..1b46cf5709a511 100644
--- a/packages/nodes-base/nodes/Copper/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Copper/GenericFunctions.ts
@@ -3,14 +3,15 @@ import { createHash } from 'crypto';
 import type { OptionsWithUri } from 'request';
 
 import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { ICredentialDataDecryptedObject, IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import flow from 'lodash.flow';
diff --git a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
index 3298ed4fbfb462..c13f5f6109dea6 100644
--- a/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Cortex/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 import moment from 'moment';
 
diff --git a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
index 35047dbeba91fa..489bbdb6173ac9 100644
--- a/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
+++ b/packages/nodes-base/nodes/CrateDb/CrateDb.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import {
diff --git a/packages/nodes-base/nodes/Cron/Cron.node.ts b/packages/nodes-base/nodes/Cron/Cron.node.ts
index a83e3509f6ac9c..e84ad5f69d58b2 100644
--- a/packages/nodes-base/nodes/Cron/Cron.node.ts
+++ b/packages/nodes-base/nodes/Cron/Cron.node.ts
@@ -1,5 +1,10 @@
-import type { ITriggerFunctions } from 'n8n-core';
-import type { INodeType, INodeTypeDescription, ITriggerResponse, TriggerTime } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+	TriggerTime,
+} from 'n8n-workflow';
 import { NodeHelpers, toCronExpression } from 'n8n-workflow';
 
 import { CronJob } from 'cron';
diff --git a/packages/nodes-base/nodes/Crypto/Crypto.node.ts b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
index b150425129ffb4..c1346b1a6f6d58 100644
--- a/packages/nodes-base/nodes/Crypto/Crypto.node.ts
+++ b/packages/nodes-base/nodes/Crypto/Crypto.node.ts
@@ -1,8 +1,7 @@
 import set from 'lodash.set';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
index 40952a6bbf60f5..d9526152e628ab 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIo.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
index dbde86f5e07d40..07106e1b7a2a28 100644
--- a/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/CustomerIo/CustomerIoTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
index bbbe12a78b5d3e..5b7292edb6d246 100644
--- a/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/CustomerIo/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHttpRequestMethods, IHttpRequestOptions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHttpRequestMethods,
+	IHttpRequestOptions,
+} from 'n8n-workflow';
 
 import get from 'lodash.get';
 
diff --git a/packages/nodes-base/nodes/DateTime/DateTime.node.ts b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
index 099b3d1c51e2dd..90f38cdb4cf2ec 100644
--- a/packages/nodes-base/nodes/DateTime/DateTime.node.ts
+++ b/packages/nodes-base/nodes/DateTime/DateTime.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/DeepL/DeepL.node.ts b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
index f7839ada0420c3..1dee0443a833bb 100644
--- a/packages/nodes-base/nodes/DeepL/DeepL.node.ts
+++ b/packages/nodes-base/nodes/DeepL/DeepL.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
index 275d4df8e8e964..4193e867072d56 100644
--- a/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/DeepL/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function deepLApiRequest(
diff --git a/packages/nodes-base/nodes/Demio/Demio.node.ts b/packages/nodes-base/nodes/Demio/Demio.node.ts
index 4529dc3995347d..3733166b48c9e5 100644
--- a/packages/nodes-base/nodes/Demio/Demio.node.ts
+++ b/packages/nodes-base/nodes/Demio/Demio.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Demio/GenericFunctions.ts b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
index c4a224455b7677..db2e63ed3730cc 100644
--- a/packages/nodes-base/nodes/Demio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Demio/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function demioApiRequest(
diff --git a/packages/nodes-base/nodes/Dhl/Dhl.node.ts b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
index 924d54171cde51..d60fdac0bfa347 100644
--- a/packages/nodes-base/nodes/Dhl/Dhl.node.ts
+++ b/packages/nodes-base/nodes/Dhl/Dhl.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
index 4c167c3b17fac4..d670e8835e5214 100644
--- a/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dhl/GenericFunctions.ts
@@ -1,16 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type {
-	ICredentialDataDecryptedObject,
-	ICredentialTestFunctions,
-	IDataObject,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/Discord/Discord.node.ts b/packages/nodes-base/nodes/Discord/Discord.node.ts
index 905de0805ed2c5..282536d3b772fb 100644
--- a/packages/nodes-base/nodes/Discord/Discord.node.ts
+++ b/packages/nodes-base/nodes/Discord/Discord.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
 import type { DiscordAttachment, DiscordWebhook } from './Interfaces';
diff --git a/packages/nodes-base/nodes/Discourse/Discourse.node.ts b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
index 322cee5c95e145..454f8f62a283cd 100644
--- a/packages/nodes-base/nodes/Discourse/Discourse.node.ts
+++ b/packages/nodes-base/nodes/Discourse/Discourse.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
index 175f375aed4c1f..64330c7ca9c62d 100644
--- a/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Discourse/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function discourseApiRequest(
diff --git a/packages/nodes-base/nodes/Disqus/Disqus.node.ts b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
index a07e083595327d..41222d243c8b68 100644
--- a/packages/nodes-base/nodes/Disqus/Disqus.node.ts
+++ b/packages/nodes-base/nodes/Disqus/Disqus.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
index 4ae9521f87b72e..d6471873f5e994 100644
--- a/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Disqus/GenericFunctions.ts
@@ -1,11 +1,12 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function disqusApiRequest(
diff --git a/packages/nodes-base/nodes/Drift/Drift.node.ts b/packages/nodes-base/nodes/Drift/Drift.node.ts
index 13e58c917e0590..2cf3770747fd72 100644
--- a/packages/nodes-base/nodes/Drift/Drift.node.ts
+++ b/packages/nodes-base/nodes/Drift/Drift.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Drift/GenericFunctions.ts b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
index 6b6df1041f1206..aa738728184b72 100644
--- a/packages/nodes-base/nodes/Drift/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Drift/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function driftApiRequest(
diff --git a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
index e5832f6a6b915b..274fdf5276febf 100644
--- a/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Dropbox/GenericFunctions.ts
@@ -1,8 +1,6 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions, IHookFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
diff --git a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
index 35acbbfd57d834..3254325826db30 100644
--- a/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
+++ b/packages/nodes-base/nodes/Dropcontact/Dropcontact.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts b/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
index 271ebf6c7cc633..4e09f3981eeea8 100644
--- a/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
+++ b/packages/nodes-base/nodes/Dropcontact/GenericFunction.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, IPairedItemData } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	IPairedItemData,
+} from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
index f2ef75328f4f24..13a5d39d0dd79a 100644
--- a/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
+++ b/packages/nodes-base/nodes/ERPNext/ERPNext.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
index 3e419c7b357705..bb390bb26e03cc 100644
--- a/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ERPNext/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
diff --git a/packages/nodes-base/nodes/Egoi/Egoi.node.ts b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
index daee3b0b068bbc..54d36f42c9361d 100644
--- a/packages/nodes-base/nodes/Egoi/Egoi.node.ts
+++ b/packages/nodes-base/nodes/Egoi/Egoi.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
index 80eb48d6af5497..e1abbb2bff441b 100644
--- a/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Egoi/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUrl } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 interface IContact {
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
index 4aeb4e5d0702d7..235d6967e7dc36 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/ElasticSecurity.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
index 7f242de187fc70..c1cf82b25b4ea7 100644
--- a/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/ElasticSecurity/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
index 1fe89b8ab44463..043dd3a4b50ff3 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/Elasticsearch.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
index e4503280c83a0a..56d137a03a5518 100644
--- a/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Elastic/Elasticsearch/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { ElasticsearchApiCredentials } from './types';
diff --git a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
index 9da9a45059b368..547f099225dc84 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v1/EmailReadImapV1.node.ts
@@ -1,6 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { ITriggerFunctions } from 'n8n-core';
 import type {
+	ITriggerFunctions,
 	IBinaryData,
 	IBinaryKeyData,
 	ICredentialDataDecryptedObject,
diff --git a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
index a2ca0f0bd75380..33e1c59595e3ba 100644
--- a/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
+++ b/packages/nodes-base/nodes/EmailReadImap/v2/EmailReadImapV2.node.ts
@@ -1,6 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { ITriggerFunctions } from 'n8n-core';
 import type {
+	ITriggerFunctions,
 	IBinaryData,
 	IBinaryKeyData,
 	ICredentialsDecrypted,
diff --git a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
index d4aeac740159d0..a7dfc3b638f6d9 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/EmailSendV2.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
diff --git a/packages/nodes-base/nodes/Emelia/Emelia.node.ts b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
index e54052a82b579d..4c0e5338c86c84 100644
--- a/packages/nodes-base/nodes/Emelia/Emelia.node.ts
+++ b/packages/nodes-base/nodes/Emelia/Emelia.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
index 043000f5b6ea77..ae52f1719bf1b5 100644
--- a/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Emelia/GenericFunctions.ts
@@ -1,8 +1,8 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IHookFunctions,
 	INodeCredentialTestResult,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts
index fb610fc38d2dc1..fe3a71660fb23f 100644
--- a/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts
+++ b/packages/nodes-base/nodes/ErrorTrigger/ErrorTrigger.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class ErrorTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
index 4a4e3ecbb6d4b1..834e1564c330ac 100644
--- a/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
+++ b/packages/nodes-base/nodes/Eventbrite/EventbriteTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
index dba22be6abc409..ca4d36417f88dc 100644
--- a/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Eventbrite/GenericFunctions.ts
@@ -1,14 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function eventbriteApiRequest(
diff --git a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
index d001c0369f9896..ceb47cf51666f8 100644
--- a/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
+++ b/packages/nodes-base/nodes/ExecuteCommand/ExecuteCommand.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import { exec } from 'child_process';
diff --git a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
index 3dc0977f71defc..c2623ce3f4f690 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflow/ExecuteWorkflow.node.ts
@@ -1,7 +1,7 @@
 import { readFile as fsReadFile } from 'fs/promises';
 
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IExecuteWorkflowInfo,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
index cbccd5b6af8a6b..d73f7331e76299 100644
--- a/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/ExecuteWorkflowTrigger/ExecuteWorkflowTrigger.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class ExecuteWorkflowTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
index b0b613b9dd9987..7f9c5cbe446ba6 100644
--- a/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
+++ b/packages/nodes-base/nodes/Facebook/FacebookTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
index 9cc6aa60a72a00..bbad071aa25332 100644
--- a/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Facebook/GenericFunctions.ts
@@ -1,14 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { capitalCase } from 'change-case';
diff --git a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
index d6d853c852289a..bf096dd6ec784c 100644
--- a/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Figma/FigmaTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Figma/GenericFunctions.ts b/packages/nodes-base/nodes/Figma/GenericFunctions.ts
index 3fb79a1cad47b7..7af362db768311 100644
--- a/packages/nodes-base/nodes/Figma/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Figma/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function figmaApiRequest(
diff --git a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
index 329e2f2c4d4c63..898986ad3a5910 100644
--- a/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
+++ b/packages/nodes-base/nodes/FileMaker/FileMaker.node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
index 9607aaaec2ae0c..bab98887437140 100644
--- a/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FileMaker/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Flow/Flow.node.ts b/packages/nodes-base/nodes/Flow/Flow.node.ts
index ce38b63cb89696..277f527e62f2e2 100644
--- a/packages/nodes-base/nodes/Flow/Flow.node.ts
+++ b/packages/nodes-base/nodes/Flow/Flow.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
index fadc50ce2d9860..6351eb1596473d 100644
--- a/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Flow/FlowTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Flow/GenericFunctions.ts b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
index 70903c45230f04..0ea3e23191283a 100644
--- a/packages/nodes-base/nodes/Flow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Flow/GenericFunctions.ts
@@ -1,11 +1,12 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function flowApiRequest(
diff --git a/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts b/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts
index 5217c75924b3ee..6e8e0561acef6b 100644
--- a/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts
+++ b/packages/nodes-base/nodes/FormIo/FormIoTrigger.node.ts
@@ -1,7 +1,7 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
index 0a4c85e5d042e6..be82c1c9800a4e 100644
--- a/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FormIo/GenericFunctions.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 interface IFormIoCredentials {
diff --git a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
index c3c26f442a35c3..54732eb8139739 100644
--- a/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
+++ b/packages/nodes-base/nodes/Formstack/FormstackTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Formstack/GenericFunctions.ts b/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
index 52ec0bda448ab2..7de8096dfc20ef 100644
--- a/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Formstack/GenericFunctions.ts
@@ -1,11 +1,12 @@
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
index 2e43a258a404c5..259766752fb56e 100644
--- a/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
+++ b/packages/nodes-base/nodes/Freshdesk/Freshdesk.node.ts
@@ -1,4 +1,5 @@
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
@@ -8,8 +9,6 @@ import type {
 } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import {
 	capitalize,
 	freshdeskApiRequest,
diff --git a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
index 823b16134c792f..29663066778d45 100644
--- a/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshdesk/GenericFunctions.ts
@@ -1,10 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
+import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
 
 export async function freshdeskApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
index 2775d7de0ca9d9..0f8854b1b85e41 100644
--- a/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
+++ b/packages/nodes-base/nodes/Freshservice/Freshservice.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
index c75db17b6e16e6..8cf420fab5b446 100644
--- a/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Freshservice/GenericFunctions.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type {
diff --git a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
index 86c3058a4eb886..61d9cac506deff 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/FreshworksCrm.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
index d57a1e643bbd2b..8c737abad15783 100644
--- a/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/FreshworksCrm/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Ftp/Ftp.node.ts b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
index ba8628a6d0d823..66575b454b7cdf 100644
--- a/packages/nodes-base/nodes/Ftp/Ftp.node.ts
+++ b/packages/nodes-base/nodes/Ftp/Ftp.node.ts
@@ -1,4 +1,3 @@
-import { BINARY_ENCODING } from 'n8n-core';
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
@@ -11,7 +10,7 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
 import { createWriteStream } from 'fs';
 import { basename, dirname } from 'path';
 import type { Readable } from 'stream';
diff --git a/packages/nodes-base/nodes/Function/Function.node.ts b/packages/nodes-base/nodes/Function/Function.node.ts
index a186f2d6276be5..cdf1a110edd42f 100644
--- a/packages/nodes-base/nodes/Function/Function.node.ts
+++ b/packages/nodes-base/nodes/Function/Function.node.ts
@@ -1,7 +1,7 @@
 import type { NodeVMOptions } from 'vm2';
 import { NodeVM } from 'vm2';
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IBinaryKeyData,
 	IDataObject,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
index cf58cf0e5b6e45..a81948fcb9987f 100644
--- a/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
+++ b/packages/nodes-base/nodes/FunctionItem/FunctionItem.node.ts
@@ -1,8 +1,8 @@
 /* eslint-disable @typescript-eslint/no-loop-func */
 import type { NodeVMOptions, VMRequire } from 'vm2';
 import { NodeVM } from 'vm2';
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IBinaryKeyData,
 	IDataObject,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
index e7d1367827603f..cfe90904245a20 100644
--- a/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GetResponse/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function getresponseApiRequest(
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
index b2f1abfb823faa..862b03fa72e700 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponse.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
index e290dc1f8ef0bb..71d4aaf9373faf 100644
--- a/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
+++ b/packages/nodes-base/nodes/GetResponse/GetResponseTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
index 7fe74a3b70f698..602d9cb28a1085 100644
--- a/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Ghost/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 export async function ghostApiRequest(
 	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Ghost/Ghost.node.ts b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
index 2f0e93ba90c818..fecd1938af82ac 100644
--- a/packages/nodes-base/nodes/Ghost/Ghost.node.ts
+++ b/packages/nodes-base/nodes/Ghost/Ghost.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Git/Git.node.ts b/packages/nodes-base/nodes/Git/Git.node.ts
index 84b09a65409a88..b4dc39c57efa70 100644
--- a/packages/nodes-base/nodes/Git/Git.node.ts
+++ b/packages/nodes-base/nodes/Git/Git.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 import {
 	addConfigFields,
diff --git a/packages/nodes-base/nodes/Github/GenericFunctions.ts b/packages/nodes-base/nodes/Github/GenericFunctions.ts
index cb99b5fb3dc43e..348647b12d661a 100644
--- a/packages/nodes-base/nodes/Github/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Github/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 /**
diff --git a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
index 57549ab6e4aef3..6b16e7eb1cbbb2 100644
--- a/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
+++ b/packages/nodes-base/nodes/Github/GithubTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
index 7f1738483994fa..21c9da8f8d3290 100644
--- a/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gitlab/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
index 07229db99d5e4a..a02c826ed5aafc 100644
--- a/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gitlab/GitlabTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
index b40544b45d47fc..2d52b2f11a7e78 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GenericFunctions.ts
@@ -1,7 +1,7 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
index 4dcce9f04643b2..f49f8e8c58db56 100644
--- a/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
+++ b/packages/nodes-base/nodes/GoToWebinar/GoToWebinar.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
index 165e625af47cd2..aaac818ff6eb84 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
index 31cf06033537c1..5ccfbcb3eff3d9 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v1/GoogleAnalyticsV1.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
index 89d52e7c71f18f..ec1dd18965ee0b 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/GoogleAnalyticsV2.node.ts
@@ -1,6 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeBaseDescription,
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
index 9108989aa7c28a..612bc4556015f7 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.ga4.operation.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import {
 	checkDuplicates,
 	defaultEndDate,
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
index ff3cb1f40a4d3b..faca9dfe42df65 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/report/get.universal.operation.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import type { IData, IDimension, IMetric } from '../../helpers/Interfaces';
 import {
 	checkDuplicates,
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
index df201931ef41e6..47ded6e2a4380c 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/router.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import type { GoogleAnalytics, ReportBasedOnProperty } from './node.type';
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
index dfa6f79a1dac98..f24e65125d2726 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/actions/userActivity/search.operation.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, INodeProperties } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	INodeExecutionData,
+	INodeProperties,
+} from 'n8n-workflow';
 import { googleApiRequest, googleApiRequestAllItems } from '../../transport';
 
 export const description: INodeProperties[] = [
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
index 71d37220539b1e..d0fcde930d32d7 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/helpers/utils.ts
@@ -1,5 +1,10 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, INodeListSearchItems, INodePropertyOptions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	INodeListSearchItems,
+	INodePropertyOptions,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import { DateTime } from 'luxon';
 
diff --git a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
index ce4a824003ff21..804db4671764bc 100644
--- a/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Analytics/v2/transport/index.ts
@@ -1,6 +1,11 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
index 9f62de8ba1f8d6..db1d20c4a3caa0 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
index ce340591ee0ba9..f4bd44385fc2f1 100644
--- a/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
+++ b/packages/nodes-base/nodes/Google/BigQuery/GoogleBigQuery.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
index 593538153fade2..ed42ba9c6a9571 100644
--- a/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Books/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
index 64a1efdedbd40c..8f83b0cdcdd7a7 100644
--- a/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
+++ b/packages/nodes-base/nodes/Google/Books/GoogleBooks.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
index 2379b78698f4bd..4b26b099e2f7b7 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GenericFunctions.ts
@@ -1,9 +1,10 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
 	INodeListSearchItems,
 	INodeListSearchResult,
 	IPollFunctions,
diff --git a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
index 9079fb1c34ccf1..fd68301e7569fb 100644
--- a/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
+++ b/packages/nodes-base/nodes/Google/Calendar/GoogleCalendar.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
index ec12705ab5d9e3..bd60ce1cc3dab6 100644
--- a/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GenericFunctions.ts
@@ -1,11 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
-	// ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
 	INodeProperties,
 	JsonObject,
 } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
index 5c7393802ec424..affcc6236c50e1 100644
--- a/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
+++ b/packages/nodes-base/nodes/Google/Chat/GoogleChat.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
index 0e5da0904ad1bd..3430912a0e999e 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
index da43d10a8e915a..1c0813b3a7641c 100644
--- a/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
+++ b/packages/nodes-base/nodes/Google/CloudNaturalLanguage/GoogleCloudNaturalLanguage.node.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 import type { IData } from './Interface';
 
diff --git a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
index da6cee4c58d5f3..55cc5c75a3cdb7 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
index 0cb2e6bce4414a..8b641fe147cb70 100644
--- a/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
+++ b/packages/nodes-base/nodes/Google/Contacts/GoogleContacts.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
index 3537c88587bdd4..a082254e735191 100644
--- a/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
index f9b552cabf33f0..e360924d853d04 100644
--- a/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
+++ b/packages/nodes-base/nodes/Google/Docs/GoogleDocs.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
index f526e1e454b9dd..4daee7ee9fc86a 100644
--- a/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IPollFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IPollFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
index 3382b36aa4bf10..f51d1461a685d4 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDrive.node.ts
@@ -1,5 +1,3 @@
-import { BINARY_ENCODING } from 'n8n-core';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import { BINARY_ENCODING } from 'n8n-workflow';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
index 82080fe4578d89..ab087f5a3aaf79 100644
--- a/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Drive/GoogleDriveTrigger.node.ts
@@ -1,6 +1,5 @@
-import type { IPollFunctions } from 'n8n-core';
-
 import type {
+	IPollFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
index bc43ff40a92a70..ae1f5e141bf3c5 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
index 6dce53e0d3b45a..6e1c2b17e6868a 100644
--- a/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/CloudFirestore/GoogleFirebaseCloudFirestore.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
index 877c3a29fdb09c..ccf0c189cbef6c 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUrl } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
index f69ec937c70733..d63d49b6d7e766 100644
--- a/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
+++ b/packages/nodes-base/nodes/Google/Firebase/RealtimeDatabase/GoogleFirebaseRealtimeDatabase.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
index e4d9b99990367a..1d7a4357487116 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GSuiteAdmin.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
index 2e0c631d876018..848bab2e96935a 100644
--- a/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/GSuiteAdmin/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
index 62b5d7791d403a..99fcce1943464b 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GenericFunctions.ts
@@ -2,12 +2,13 @@ import type { OptionsWithUri } from 'request';
 
 import { simpleParser } from 'mailparser';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	IBinaryKeyData,
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
 	INodeExecutionData,
 	IPollFunctions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
index 8f7b389773e891..ab9f9abb6e1e20 100644
--- a/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/GmailTrigger.node.ts
@@ -1,6 +1,5 @@
-import type { IPollFunctions } from 'n8n-core';
-
 import type {
+	IPollFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
index 4e9e5c55ccce66..43a01aacb70a72 100644
--- a/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Gmail/v2/GmailV2.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
index 66b658d2dc0d4b..9363d4392b5376 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
index 2b35201f902c47..66ad3232ee39dd 100644
--- a/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
+++ b/packages/nodes-base/nodes/Google/Perspective/GooglePerspective.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
index 1603395fd12f37..95f0421b07e968 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { ICredentialTestFunctions, IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	ICredentialTestFunctions,
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
index 7bd56df0fe7745..40fb2b9980cca7 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheet.ts
@@ -1,8 +1,6 @@
-import type { IDataObject } from 'n8n-workflow';
+import type { IExecuteFunctions, ILoadOptionsFunctions, IDataObject } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import { googleApiRequest } from './GenericFunctions';
 
 import { utils as xlsxUtils } from 'xlsx';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
index 1ca0e728cb6d97..9cdf31e1c2216d 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v1/GoogleSheetsV1.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts b/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
index 3c285a4f7f8a25..de2973ca2a60c2 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/GoogleSheetsV2.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeType, INodeTypeBaseDescription, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { versionDescription } from './actions/versionDescription';
 import { credentialTest, listSearch, loadOptions } from './methods';
 import { router } from './actions/router';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
index 89ad4268c32928..ab5929c31baa38 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/router.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import * as sheet from './sheet/Sheet.resource';
 import * as spreadsheet from './spreadsheet/SpreadSheet.resource';
 import { GoogleSheet } from '../helpers/GoogleSheet';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
index 4e4b0146a688ba..bb9d36106c3832 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/append.operation.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { SheetProperties, ValueInputOption } from '../../helpers/GoogleSheets.types';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { autoMapInputData, mapFields, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
 import { cellFormat, handlingExtraData } from './commonDescription';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
index fc74d82467b788..b8b11fb9ccbe4d 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/appendOrUpdate.operation.ts
@@ -1,11 +1,10 @@
-import type { IExecuteFunctions } from 'n8n-core';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type {
 	ISheetUpdateData,
 	SheetProperties,
 	ValueInputOption,
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { untilSheetSelected } from '../../helpers/GoogleSheets.utils';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
index 54fbe7f0c427ec..f65d6a5e3946d2 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/clear.operation.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData } from 'n8n-workflow';
 import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
index 5f0493e5a82394..2b3d024581f621 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/create.operation.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
index f23435cf61a0f0..42ec063c5e897e 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/delete.operation.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { SheetProperties } from '../../helpers/GoogleSheets.types';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { getColumnNumber, untilSheetSelected } from '../../helpers/GoogleSheets.utils';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
index 6e48096f004ce1..b4b64d1786f2f8 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/read.operation.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import {
 	getRangeString,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
index 8e5855d289765b..7c856d2621bab3 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/remove.operation.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { apiRequest } from '../../transport';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
index da0de7881c1e92..499cd0fb8f11da 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/sheet/update.operation.ts
@@ -1,11 +1,10 @@
-import type { IExecuteFunctions } from 'n8n-core';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type {
 	ISheetUpdateData,
 	SheetProperties,
 	ValueInputOption,
 	ValueRenderOption,
 } from '../../helpers/GoogleSheets.types';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 import type { GoogleSheet } from '../../helpers/GoogleSheet';
 import { untilSheetSelected } from '../../helpers/GoogleSheets.utils';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
index 7fb605cd01513f..d1e93c717104d5 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/create.operation.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { SpreadSheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
index f7322db8eac0dc..787b6412f6d9f3 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/actions/spreadsheet/delete.operation.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import type { SpreadSheetProperties } from '../../helpers/GoogleSheets.types';
 import { apiRequest } from '../../transport';
 
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
index c3fb40b0f8b469..c40aa13ffe6b4c 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheet.ts
@@ -1,6 +1,10 @@
-import type { IDataObject, IPollFunctions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IPollFunctions,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import { apiRequest } from '../transport';
 import { utils as xlsxUtils } from 'xlsx';
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
index 7d4fab02361c81..74907f22774352 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/helpers/GoogleSheets.utils.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeListSearchItems,
diff --git a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
index 790eec4b4e2b41..f55ee6f9422617 100644
--- a/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
+++ b/packages/nodes-base/nodes/Google/Sheet/v2/transport/index.ts
@@ -1,8 +1,10 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
 import type {
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
 	IPollFunctions,
 	JsonObject,
 } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
index c86ca96574691f..e9b2aa548b2acf 100644
--- a/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
index 53956c45e3658c..b8f18d2391a3aa 100644
--- a/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
+++ b/packages/nodes-base/nodes/Google/Slides/GoogleSlides.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
index 31c03c05a4438a..265b11773c5623 100644
--- a/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Task/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
index 04416c22e86ad5..68d5876506cbab 100644
--- a/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
+++ b/packages/nodes-base/nodes/Google/Task/GoogleTasks.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
index b842cb6b61ab7b..b65cef0c12fe91 100644
--- a/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
index 3e808a7d7327c7..c907f0a8f1292c 100644
--- a/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
+++ b/packages/nodes-base/nodes/Google/Translate/GoogleTranslate.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
index 656cb94a5f530e..e18ea26ce5a3c5 100644
--- a/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function googleApiRequest(
diff --git a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
index 4ef41ea2657688..b1209f66f5191b 100644
--- a/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
+++ b/packages/nodes-base/nodes/Google/YouTube/YouTube.node.ts
@@ -1,4 +1,3 @@
-import { BINARY_ENCODING } from 'n8n-core';
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -8,7 +7,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 import type { Readable } from 'stream';
 
 import { googleApiRequest, googleApiRequestAllItems } from './GenericFunctions';
diff --git a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
index 43fc6ba74b556f..b9c50da9133311 100644
--- a/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gotify/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function gotifyApiRequest(
diff --git a/packages/nodes-base/nodes/Gotify/Gotify.node.ts b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
index 018f6e104e0e10..0ced6e1912c611 100644
--- a/packages/nodes-base/nodes/Gotify/Gotify.node.ts
+++ b/packages/nodes-base/nodes/Gotify/Gotify.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Grafana/GenericFunctions.ts b/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
index 21d10ea33cd829..48d72bd9d7063e 100644
--- a/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grafana/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Grafana/Grafana.node.ts b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
index 92dcd3d1c09b9c..02107fe8a068e4 100644
--- a/packages/nodes-base/nodes/Grafana/Grafana.node.ts
+++ b/packages/nodes-base/nodes/Grafana/Grafana.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
index 92badb367d499a..13129d9d3aea2e 100644
--- a/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
+++ b/packages/nodes-base/nodes/GraphQL/GraphQL.node.ts
@@ -1,6 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Grist/GenericFunctions.ts b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
index 3a2d77be8b58a3..3fb890c20b19c3 100644
--- a/packages/nodes-base/nodes/Grist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Grist/GenericFunctions.ts
@@ -1,8 +1,11 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type {
diff --git a/packages/nodes-base/nodes/Grist/Grist.node.ts b/packages/nodes-base/nodes/Grist/Grist.node.ts
index 7b7f9a593d9028..cbc152205e9860 100644
--- a/packages/nodes-base/nodes/Grist/Grist.node.ts
+++ b/packages/nodes-base/nodes/Grist/Grist.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
index 54ef0cca825984..35023996dea574 100644
--- a/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Gumroad/GenericFunctions.ts
@@ -1,12 +1,13 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function gumroadApiRequest(
diff --git a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
index bdea5643853e73..e8d2cd9a26c85b 100644
--- a/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
+++ b/packages/nodes-base/nodes/Gumroad/GumroadTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
index fce70da36b54cb..b82ea5a647679b 100644
--- a/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HackerNews/GenericFunctions.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
index 3c23bcea1292dc..c5596c1a350cb5 100644
--- a/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
+++ b/packages/nodes-base/nodes/HackerNews/HackerNews.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
index 9cecd614885b0e..dd8a022582bc00 100644
--- a/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HaloPSA/GenericFunctions.ts
@@ -1,9 +1,9 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IPollFunctions,
diff --git a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
index 2a46185a749314..341f76c9b1d48a 100644
--- a/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
+++ b/packages/nodes-base/nodes/HaloPSA/HaloPSA.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
index 312c949dac9984..583741c35f5ea7 100644
--- a/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Harvest/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function harvestApiRequest(
diff --git a/packages/nodes-base/nodes/Harvest/Harvest.node.ts b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
index b2931ba2341cea..05f37984dd9468 100644
--- a/packages/nodes-base/nodes/Harvest/Harvest.node.ts
+++ b/packages/nodes-base/nodes/Harvest/Harvest.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
index 4d21b8f51e47bd..d54b13d7e5bb95 100644
--- a/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HelpScout/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
index d68f840a5cdc97..0c90a294f5e8b1 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScout.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IBinaryKeyData,
 	IDataObject,
 	ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
index 1c5bcc4f95f958..eb4f7b6ecc10ef 100644
--- a/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
+++ b/packages/nodes-base/nodes/HelpScout/HelpScoutTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
index 89e4dac2a301bf..f277b4f9de76a2 100644
--- a/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function homeAssistantApiRequest(
diff --git a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
index 9e04244765bdd7..cadc3a235e21be 100644
--- a/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
+++ b/packages/nodes-base/nodes/HomeAssistant/HomeAssistant.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
index 67a854f9e34796..7b989d6611b4bb 100644
--- a/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V1/HttpRequestV1.node.ts
@@ -1,7 +1,6 @@
 // eslint-disable-next-line n8n-nodes-base/node-filename-against-convention
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
index 498a1097e67bee..791927f979e2be 100644
--- a/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
+++ b/packages/nodes-base/nodes/HttpRequest/V3/HttpRequestV3.node.ts
@@ -1,5 +1,4 @@
 import type { Readable } from 'stream';
-import { BINARY_ENCODING } from 'n8n-core';
 
 import type {
 	IBinaryKeyData,
@@ -11,7 +10,7 @@ import type {
 	INodeTypeDescription,
 	JsonObject,
 } from 'n8n-workflow';
-import { jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
+import { BINARY_ENCODING, jsonParse, NodeApiError, NodeOperationError, sleep } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request-promise-native';
 
diff --git a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
index a380a222bd7766..15b9d2da585dff 100644
--- a/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hubspot/GenericFunctions.ts
@@ -1,16 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type {
-	ICredentialDataDecryptedObject,
-	ICredentialTestFunctions,
-	IDataObject,
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
diff --git a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
index c547ab70bfa229..ac00a6b205e7a4 100644
--- a/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/Hubspot.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
index 583728492abac4..99e0ee10f3e98e 100644
--- a/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
+++ b/packages/nodes-base/nodes/Hubspot/HubspotTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
index fb952ac9318d90..d33ae31a96493e 100644
--- a/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/HumanticAI/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function humanticAiApiRequest(
diff --git a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
index 601830fd0658da..8627f4f2c2d502 100644
--- a/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Hunter/GenericFunctions.ts
@@ -1,11 +1,12 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function hunterApiRequest(
diff --git a/packages/nodes-base/nodes/Hunter/Hunter.node.ts b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
index e630a5da88146f..224518fa7c7c79 100644
--- a/packages/nodes-base/nodes/Hunter/Hunter.node.ts
+++ b/packages/nodes-base/nodes/Hunter/Hunter.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts b/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts
index 48b17593da9b31..c08c2b72e274e6 100644
--- a/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts
+++ b/packages/nodes-base/nodes/ICalendar/ICalendar.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/If/If.node.ts b/packages/nodes-base/nodes/If/If.node.ts
index 6c19c082f6775e..b7c6f3f6e58f45 100644
--- a/packages/nodes-base/nodes/If/If.node.ts
+++ b/packages/nodes-base/nodes/If/If.node.ts
@@ -1,6 +1,6 @@
 import moment from 'moment';
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeParameters,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
index 4a3d927bcb462b..f064da22d31b33 100644
--- a/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Intercom/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function intercomApiRequest(
diff --git a/packages/nodes-base/nodes/Intercom/Intercom.node.ts b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
index 83faa932d6f5d7..f51e4fdb66fc39 100644
--- a/packages/nodes-base/nodes/Intercom/Intercom.node.ts
+++ b/packages/nodes-base/nodes/Intercom/Intercom.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Interval/Interval.node.ts b/packages/nodes-base/nodes/Interval/Interval.node.ts
index 6a18b3699a6d44..496f3df9943767 100644
--- a/packages/nodes-base/nodes/Interval/Interval.node.ts
+++ b/packages/nodes-base/nodes/Interval/Interval.node.ts
@@ -1,5 +1,9 @@
-import type { ITriggerFunctions } from 'n8n-core';
-import type { INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 export class Interval implements INodeType {
diff --git a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
index f88d099802f4e7..187d637ebae381 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
index b02c2754cdcb34..947ca7d9945cd5 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinja.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
index 9b23e7f3d3bad1..ad331c7e8f1867 100644
--- a/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
+++ b/packages/nodes-base/nodes/InvoiceNinja/InvoiceNinjaTrigger.node.ts
@@ -1,6 +1,10 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
-import type { INodeType, INodeTypeDescription, IWebhookResponseData } from 'n8n-workflow';
+import type {
+	IHookFunctions,
+	IWebhookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
 
 import {
 	eventID,
diff --git a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
index 7e230c94d17c03..4b6e3c7b1611ef 100644
--- a/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V1/ItemListsV1.node.ts
@@ -1,9 +1,9 @@
 import type { NodeVMOptions } from 'vm2';
 import { NodeVM } from 'vm2';
-import type { IExecuteFunctions } from 'n8n-core';
 
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INode,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
index 04cf2f1808f506..f97061c6f133a9 100644
--- a/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
+++ b/packages/nodes-base/nodes/ItemLists/V2/ItemListsV2.node.ts
@@ -1,9 +1,9 @@
 import type { NodeVMOptions } from 'vm2';
 import { NodeVM } from 'vm2';
-import type { IExecuteFunctions } from 'n8n-core';
 
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	INode,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
index 11735fd71a09e2..1b488ab5e7a28f 100644
--- a/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Iterable/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function iterableApiRequest(
diff --git a/packages/nodes-base/nodes/Iterable/Iterable.node.ts b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
index f61998e8a2eb32..e4d48b983afdc3 100644
--- a/packages/nodes-base/nodes/Iterable/Iterable.node.ts
+++ b/packages/nodes-base/nodes/Iterable/Iterable.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
index 40ce7625459ff4..04e471bee67062 100644
--- a/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jenkins/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export function tolerateTrailingSlash(baseUrl: string) {
diff --git a/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts b/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
index 47bd1db76f7441..5ba983f2e5a091 100644
--- a/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
+++ b/packages/nodes-base/nodes/Jenkins/Jenkins.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Jira/GenericFunctions.ts b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
index ac1e5a53228a68..6f7d70ad317b0d 100644
--- a/packages/nodes-base/nodes/Jira/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Jira/GenericFunctions.ts
@@ -1,13 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, INodeListSearchItems, JsonObject } from 'n8n-workflow';
+	INodeListSearchItems,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function jiraSoftwareCloudApiRequest(
diff --git a/packages/nodes-base/nodes/Jira/Jira.node.ts b/packages/nodes-base/nodes/Jira/Jira.node.ts
index 8cd27494b67bc5..5f9f77f6886dad 100644
--- a/packages/nodes-base/nodes/Jira/Jira.node.ts
+++ b/packages/nodes-base/nodes/Jira/Jira.node.ts
@@ -1,12 +1,10 @@
 import type { Readable } from 'stream';
 import mergeWith from 'lodash.mergewith';
 
-import type { IExecuteFunctions } from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
-
 import type {
 	IBinaryKeyData,
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeListSearchItems,
@@ -15,7 +13,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
 import {
 	filterSortSearchListItems,
diff --git a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
index 80783d167f0a6c..8a2e1113d44561 100644
--- a/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
+++ b/packages/nodes-base/nodes/Jira/JiraTrigger.node.ts
@@ -1,8 +1,8 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
 	ICredentialDataDecryptedObject,
 	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
diff --git a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
index 5e02b3fee3a228..863a75596a73b7 100644
--- a/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/JotForm/GenericFunctions.ts
@@ -1,12 +1,13 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function jotformApiRequest(
diff --git a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
index 77efa6d85719f4..e9030fe23c4134 100644
--- a/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
+++ b/packages/nodes-base/nodes/JotForm/JotFormTrigger.node.ts
@@ -1,8 +1,8 @@
 import * as formidable from 'formidable';
 
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Kafka/Kafka.node.ts b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
index d57ebb498c92fd..3b06faca2edb27 100644
--- a/packages/nodes-base/nodes/Kafka/Kafka.node.ts
+++ b/packages/nodes-base/nodes/Kafka/Kafka.node.ts
@@ -3,9 +3,8 @@ import { CompressionTypes, Kafka as apacheKafka } from 'kafkajs';
 
 import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
index e16ab70d71f64b..1ff27bd302ec30 100644
--- a/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Kafka/KafkaTrigger.node.ts
@@ -3,9 +3,13 @@ import { Kafka as apacheKafka, logLevel } from 'kafkajs';
 
 import { SchemaRegistry } from '@kafkajs/confluent-schema-registry';
 
-import type { ITriggerFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 export class KafkaTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Keap/GenericFunctions.ts b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
index 31b0f62fbe9380..15adc3ea8a16c0 100644
--- a/packages/nodes-base/nodes/Keap/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Keap/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
diff --git a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
index 83812d95f8c51b..0ee412d907f207 100644
--- a/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
+++ b/packages/nodes-base/nodes/Keap/KeapTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
index e193d8f5ae8ae0..e668293b68112b 100644
--- a/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Kitemaker/GenericFunctions.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function kitemakerRequest(
diff --git a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
index 7f6a0ee0d863bf..94714f6866324c 100644
--- a/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
+++ b/packages/nodes-base/nodes/Kitemaker/Kitemaker.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
index 417ac88fbd8721..4cf3d013116189 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/GenericFunctions.ts
@@ -1,7 +1,7 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IHookFunctions,
 	IHttpRequestOptions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
index 3c70469384248d..2fd41b86d0b0ce 100644
--- a/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
+++ b/packages/nodes-base/nodes/KoBoToolbox/KoBoToolbox.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IBinaryKeyData,
 	IDataObject,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
index 7864c94a01e06a..70e6e5c46501b7 100644
--- a/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Lemlist/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
index 759ab50bbdbf8b..06de58a088ac3f 100644
--- a/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/Lemlist.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
index d23b3ed413cdae..6cae55780c40d1 100644
--- a/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
+++ b/packages/nodes-base/nodes/Lemlist/LemlistTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Line/GenericFunctions.ts b/packages/nodes-base/nodes/Line/GenericFunctions.ts
index 1139837e365036..0b57cbbfc1e7dd 100644
--- a/packages/nodes-base/nodes/Line/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Line/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function lineApiRequest(
diff --git a/packages/nodes-base/nodes/Linear/GenericFunctions.ts b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
index 03a9bd75a2467a..21fed19e1c8dd9 100644
--- a/packages/nodes-base/nodes/Linear/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Linear/GenericFunctions.ts
@@ -1,11 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
 	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IHookFunctions,
 	IWebhookFunctions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/Linear/Linear.node.ts b/packages/nodes-base/nodes/Linear/Linear.node.ts
index 577e83074c9fd7..644d6a8142a820 100644
--- a/packages/nodes-base/nodes/Linear/Linear.node.ts
+++ b/packages/nodes-base/nodes/Linear/Linear.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
index 7da955000bf621..e127d7b01c7276 100644
--- a/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
+++ b/packages/nodes-base/nodes/Linear/LinearTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
index 84e6c7d2b273dd..895a7bd83136fb 100644
--- a/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LingvaNex/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function lingvaNexApiRequest(
diff --git a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
index 5bdc6f33412638..fd1f03b120eaa4 100644
--- a/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
+++ b/packages/nodes-base/nodes/LingvaNex/LingvaNex.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
index 7fb62b2496d025..7dd7ea2f08adc2 100644
--- a/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/LinkedIn/GenericFunctions.ts
@@ -1,7 +1,12 @@
 import type { OptionsWithUrl } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function linkedInApiRequest(
diff --git a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
index ac2b341d894a20..7bfea916c6f5ce 100644
--- a/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
+++ b/packages/nodes-base/nodes/LocalFileTrigger/LocalFileTrigger.node.ts
@@ -1,5 +1,10 @@
-import type { ITriggerFunctions } from 'n8n-core';
-import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 
 import { watch } from 'chokidar';
 
diff --git a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
index 846d34674b6438..8110c04d059308 100644
--- a/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
+++ b/packages/nodes-base/nodes/MQTT/Mqtt.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
index b92568d17bdf79..18336afd918632 100644
--- a/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
+++ b/packages/nodes-base/nodes/MQTT/MqttTrigger.node.ts
@@ -1,6 +1,10 @@
-import type { ITriggerFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import mqtt from 'mqtt';
diff --git a/packages/nodes-base/nodes/Magento/GenericFunctions.ts b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
index a0550d891f800c..b076fe13e7e5f0 100644
--- a/packages/nodes-base/nodes/Magento/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Magento/GenericFunctions.ts
@@ -1,13 +1,15 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, INodeProperties, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+	INodeProperties,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { Address, Filter, FilterGroup, ProductAttribute, Search } from './Types';
diff --git a/packages/nodes-base/nodes/Magento/Magento2.node.ts b/packages/nodes-base/nodes/Magento/Magento2.node.ts
index 59a720262185df..1ea5f95228a02a 100644
--- a/packages/nodes-base/nodes/Magento/Magento2.node.ts
+++ b/packages/nodes-base/nodes/Magento/Magento2.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
index af2c376024a3f5..657c4d077f6af8 100644
--- a/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailcheck/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 export async function mailCheckApiRequest(
 	this: IWebhookFunctions | IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
index 10afb975d4bb81..fcf7d5d5510d52 100644
--- a/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
+++ b/packages/nodes-base/nodes/Mailcheck/Mailcheck.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
index 141d871461cd5b..f73b7a3d221864 100644
--- a/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailchimp/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUrl } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 async function getMetadata(
diff --git a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
index bb126b5051190d..4b2b60d3ffb62a 100644
--- a/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/Mailchimp.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
index 96ebd4af796671..0d74231dd248d4 100644
--- a/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailchimp/MailchimpTrigger.node.ts
@@ -1,7 +1,7 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
index 6808b57be70563..d27d7a38822dcc 100644
--- a/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MailerLite/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mailerliteApiRequest(
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
index 407f4b7a619239..cdf6c34dd1dbec 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLite.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
index e52f2254195014..b4f7a52a230c07 100644
--- a/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
+++ b/packages/nodes-base/nodes/MailerLite/MailerLiteTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
index abb12690e04c5b..7305f5c5a200d7 100644
--- a/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
+++ b/packages/nodes-base/nodes/Mailgun/Mailgun.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
index c474cc1f156080..89e5c44e1ac64d 100644
--- a/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mailjet/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+} from 'n8n-workflow';
 
 export async function mailjetApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | IHookFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
index be82c8372addc5..9588ff9df95c21 100644
--- a/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/Mailjet.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
index dd15d13ab44f0a..7204461b63693d 100644
--- a/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mailjet/MailjetTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
index 4a00dd917682db..60c89b140b92b2 100644
--- a/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mandrill/GenericFunctions.ts
@@ -1,9 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import map from 'lodash.map';
-import type { JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mandrillApiRequest(
diff --git a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
index 3b429a14a65081..a2064cd60f97f8 100644
--- a/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
+++ b/packages/nodes-base/nodes/Mandrill/Mandrill.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts b/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
index 624d41dafe4fcc..66b47a5d7ea1af 100644
--- a/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
+++ b/packages/nodes-base/nodes/ManualTrigger/ManualTrigger.node.ts
@@ -1,5 +1,9 @@
-import type { ITriggerFunctions } from 'n8n-core';
-import type { INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 
 export class ManualTrigger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/Markdown/Markdown.node.ts b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
index bf29ecea6c547f..a0b7d2b13baa19 100644
--- a/packages/nodes-base/nodes/Markdown/Markdown.node.ts
+++ b/packages/nodes-base/nodes/Markdown/Markdown.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts b/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
index 8281ced75b2b38..c20a7657917f45 100644
--- a/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Marketstack/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function marketstackApiRequest(
diff --git a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
index e848d3687746cf..079c1f5fc9e735 100644
--- a/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
+++ b/packages/nodes-base/nodes/Marketstack/Marketstack.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Matrix/Matrix.node.ts b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
index 9739af5c5b3446..a4addebb625734 100644
--- a/packages/nodes-base/nodes/Matrix/Matrix.node.ts
+++ b/packages/nodes-base/nodes/Matrix/Matrix.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
index 925749b13ab4ef..c099142f03f0d2 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/MattermostV1.node.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeType, INodeTypeBaseDescription, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeType,
+	INodeTypeBaseDescription,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 import { versionDescription } from './actions/versionDescription';
 import { loadOptions } from './methods';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts
index 700bd8e0589ca0..0dd9c33326b27f 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/addUser/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts
index 1713512827419d..1b5743c83cc670 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts
index 43187ef1906810..b1d5fb0f305119 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts
index a735f72e549189..6e04675f12e174 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/members/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts
index fed5e848fdb984..975c4955e283b0 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/restore/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts
index 0945ea25477647..e8f19605ad7421 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/search/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts
index 5b48083a12e1d0..b8713bcc20b658 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/channel/statistics/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts
index 8fe76503e38ad2..27d10566a3864f 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
index 163038f2286bcd..38f3eb67971862 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/post/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts
index 1595d4e708b7b2..0df51a8d080570 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/message/postEphemeral/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts
index 6b3c3ae2ad29e1..6e20a80383110e 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts
index 638c10c4c4f2f7..60ed961f475652 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts
index f0fddda9dfe5f7..ae85f76b0e6ec6 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/reaction/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
index 08135466898813..bd1af59af2ed44 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/router.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import * as channel from './channel';
 import * as message from './message';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts
index d117fb34a2a8ad..6f1023487faac5 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts
index 626a10ae67bf2d..85eeee3b6f3e58 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/deactive/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
index dc83aaaa8317cd..65c25d8da6e87c 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems } from '../../../transport';
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts
index b5f1f22a74f42d..738625d4540cf3 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getByEmail/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts
index 3bacfd7e4be99c..187cc30624ff5b 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/getById/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts
index 4bc861b511c941..24fc0cdf273d17 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/actions/user/invite/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
index b5f650da5ffc74..53433954a17a2b 100644
--- a/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/Mattermost/v1/transport/index.ts
@@ -1,6 +1,7 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
 	GenericValue,
 	IDataObject,
 	IHttpRequestMethods,
diff --git a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
index 3afea8b3874b33..63add5325a8de2 100644
--- a/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mautic/GenericFunctions.ts
@@ -1,11 +1,11 @@
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/Mautic/Mautic.node.ts b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
index 3db55530a7e785..2195c79a1b73ff 100644
--- a/packages/nodes-base/nodes/Mautic/Mautic.node.ts
+++ b/packages/nodes-base/nodes/Mautic/Mautic.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
index e9dace1619f565..15050bf87539d8 100644
--- a/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
+++ b/packages/nodes-base/nodes/Mautic/MauticTrigger.node.ts
@@ -1,8 +1,8 @@
 import { parse as urlParse } from 'url';
 
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Medium/GenericFunctions.ts b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
index 9fff315afc16ca..5ac51fed315d2d 100644
--- a/packages/nodes-base/nodes/Medium/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Medium/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mediumApiRequest(
diff --git a/packages/nodes-base/nodes/Medium/Medium.node.ts b/packages/nodes-base/nodes/Medium/Medium.node.ts
index a3443fee587a9b..cbefa404199b3e 100644
--- a/packages/nodes-base/nodes/Medium/Medium.node.ts
+++ b/packages/nodes-base/nodes/Medium/Medium.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
index a809f2bf766522..1e928c6ce610e8 100644
--- a/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
+++ b/packages/nodes-base/nodes/Merge/v1/MergeV1.node.ts
@@ -1,9 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
 import get from 'lodash.get';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	GenericValue,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
index 7ba84c4cb99733..5b8593bd9e5908 100644
--- a/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
+++ b/packages/nodes-base/nodes/Merge/v2/MergeV2.node.ts
@@ -1,9 +1,9 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
 
 import merge from 'lodash.merge';
 
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
index f09bb3d9d6adcf..8ad09e74bb1734 100644
--- a/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MessageBird/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
diff --git a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
index aa3d131ad623e5..b9245753f60357 100644
--- a/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
+++ b/packages/nodes-base/nodes/MessageBird/MessageBird.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
index cf1ad138a7353c..dba23f3953f1a0 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/GenericFunctions.ts
@@ -1,8 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeProperties, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	INodeProperties,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
diff --git a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
index 07a59c8a085c35..6df1d682dd9f26 100644
--- a/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Dynamics/MicrosoftDynamicsCrm.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
index 707035b716a3fe..f29ed80272cb8e 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
diff --git a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
index 99d624ec871179..951f445ccf32a3 100644
--- a/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Excel/MicrosoftExcel.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
index b3efc2004cd5e6..fd6b94a8668ac3 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
index c99cdb7e02972d..e61ff380280493 100644
--- a/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/GraphSecurity/MicrosoftGraphSecurity.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
index 8844245db33a27..881cde156fea59 100644
--- a/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/OneDrive/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
diff --git a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
index 8389f8b6d32d1b..2f76822be1f388 100644
--- a/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Outlook/GenericFunctions.ts
@@ -1,10 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	JsonObject,
+} from 'n8n-workflow';
+import { BINARY_ENCODING, NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
 	this: IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
index 0b57c0563236ea..8c7c00dee27870 100644
--- a/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Sql/MicrosoftSql.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
index 79f692281b8746..cb44f3465e453a 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
diff --git a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
index 18bcaf6fd372d7..886071c2bc83df 100644
--- a/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/Teams/MicrosoftTeams.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
index 940b626c1e3c86..a6fcff72637ea6 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function microsoftApiRequest(
diff --git a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
index 256929753e53d9..e4728f429becad 100644
--- a/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
+++ b/packages/nodes-base/nodes/Microsoft/ToDo/MicrosoftToDo.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
index f19d46c6b515d6..1b69ff951bdd84 100644
--- a/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mindee/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function mindeeApiRequest(
diff --git a/packages/nodes-base/nodes/Misp/GenericFunctions.ts b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
index 5c79b7f5a41906..0d798f3e0c6475 100644
--- a/packages/nodes-base/nodes/Misp/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Misp/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Misp/Misp.node.ts b/packages/nodes-base/nodes/Misp/Misp.node.ts
index 73f6a3cdcc780b..3221508a291be3 100644
--- a/packages/nodes-base/nodes/Misp/Misp.node.ts
+++ b/packages/nodes-base/nodes/Misp/Misp.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Mocean/GenericFunctions.ts b/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
index 7cfea02908effd..87868fc66006e4 100644
--- a/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Mocean/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
diff --git a/packages/nodes-base/nodes/Mocean/Mocean.node.ts b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
index 0c0614423808e3..e027da5054060e 100644
--- a/packages/nodes-base/nodes/Mocean/Mocean.node.ts
+++ b/packages/nodes-base/nodes/Mocean/Mocean.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
index 86ef8348fe5bf0..2c7831fe6578ae 100644
--- a/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MondayCom/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
index cd297ae78ce1dd..8574b1ca973ceb 100644
--- a/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
+++ b/packages/nodes-base/nodes/MondayCom/MondayCom.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
index 436df9b5ea3b66..ecf395b19766fc 100644
--- a/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MongoDb/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { ICredentialDataDecryptedObject, IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
+	IExecuteFunctions,
+	INodeExecutionData,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import type {
diff --git a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
index 96d1e9f91109ad..5bf7c723d2b7a3 100644
--- a/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
+++ b/packages/nodes-base/nodes/MongoDb/MongoDb.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts b/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
index 8693602db7a8f2..fc788a917011ac 100644
--- a/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
index df5d5899d1ace0..84cefdbd559829 100644
--- a/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
+++ b/packages/nodes-base/nodes/MonicaCrm/MonicaCrm.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
index eceb14fee7c62f..9effb343727e63 100644
--- a/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
+++ b/packages/nodes-base/nodes/MoveBinaryData/MoveBinaryData.node.ts
@@ -3,10 +3,8 @@ import set from 'lodash.set';
 import unset from 'lodash.unset';
 import prettyBytes from 'pretty-bytes';
 
-import type { IExecuteFunctions } from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IBinaryData,
 	IDataObject,
 	INodeExecutionData,
@@ -14,7 +12,13 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { deepCopy, jsonParse, NodeOperationError, fileTypeFromMimeType } from 'n8n-workflow';
+import {
+	BINARY_ENCODING,
+	deepCopy,
+	jsonParse,
+	NodeOperationError,
+	fileTypeFromMimeType,
+} from 'n8n-workflow';
 
 import iconv from 'iconv-lite';
 iconv.encodingExists('utf8');
diff --git a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
index f13a91da9f1ccb..cabc018cf64e42 100644
--- a/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Msg91/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
diff --git a/packages/nodes-base/nodes/Msg91/Msg91.node.ts b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
index 7153b1915d80a6..dd099e2f70f772 100644
--- a/packages/nodes-base/nodes/Msg91/Msg91.node.ts
+++ b/packages/nodes-base/nodes/Msg91/Msg91.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/MySql/MySql.node.ts b/packages/nodes-base/nodes/MySql/MySql.node.ts
index de4a90dff49500..3c3e68def85702 100644
--- a/packages/nodes-base/nodes/MySql/MySql.node.ts
+++ b/packages/nodes-base/nodes/MySql/MySql.node.ts
@@ -1,4 +1,5 @@
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
@@ -13,7 +14,6 @@ import { NodeOperationError } from 'n8n-workflow';
 import type mysql2 from 'mysql2/promise';
 
 import { copyInputItems, createConnection, searchTables } from './GenericFunctions';
-import type { IExecuteFunctions } from 'n8n-core';
 
 export class MySql implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
index bb2cf787a70716..1318b0bafcc615 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerDatastore/N8nTrainingCustomerDatastore.node.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 const data = [
 	{
diff --git a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
index fc53cd38b9e864..bc3dda5c211cee 100644
--- a/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
+++ b/packages/nodes-base/nodes/N8nTrainingCustomerMessenger/N8nTrainingCustomerMessenger.node.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class N8nTrainingCustomerMessenger implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
index b8a4cf115a8f4e..758a22c9b6565b 100644
--- a/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
+++ b/packages/nodes-base/nodes/N8nTrigger/N8nTrigger.node.ts
@@ -1,5 +1,9 @@
-import type { ITriggerFunctions } from 'n8n-core';
-import type { INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 
 type eventType = 'Instance started' | undefined;
 
diff --git a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
index ee90e6065202e6..c20cb3856d6e2c 100644
--- a/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Nasa/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function nasaApiRequest(
diff --git a/packages/nodes-base/nodes/Nasa/Nasa.node.ts b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
index 4f9a01a685274e..373276dd8af8e7 100644
--- a/packages/nodes-base/nodes/Nasa/Nasa.node.ts
+++ b/packages/nodes-base/nodes/Nasa/Nasa.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
index 580b68d6885ac8..21bdd9241118e3 100644
--- a/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Netlify/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function netlifyApiRequest(
diff --git a/packages/nodes-base/nodes/Netlify/Netlify.node.ts b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
index 6f48029e6473b1..e9bed05212f096 100644
--- a/packages/nodes-base/nodes/Netlify/Netlify.node.ts
+++ b/packages/nodes-base/nodes/Netlify/Netlify.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
index af54927fa9e9b5..5a00a7f5baf156 100644
--- a/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Netlify/NetlifyTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
index 74cf4eb6459577..e1ba3be8f8d7e7 100644
--- a/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NextCloud/GenericFunctions.ts
@@ -1,4 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
+import type { IExecuteFunctions, IHookFunctions } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/NoOp/NoOp.node.ts b/packages/nodes-base/nodes/NoOp/NoOp.node.ts
index 44531a293fb3d8..8a8321ae183026 100644
--- a/packages/nodes-base/nodes/NoOp/NoOp.node.ts
+++ b/packages/nodes-base/nodes/NoOp/NoOp.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class NoOp implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
index 53bdf653ca65a8..2bc682124461a5 100644
--- a/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/NocoDB/GenericFunctions.ts
@@ -1,8 +1,14 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IBinaryKeyData, IDataObject, INodeExecutionData, IPollFunctions } from 'n8n-workflow';
+import type {
+	IBinaryKeyData,
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	INodeExecutionData,
+	IPollFunctions,
+} from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
 
 interface IAttachment {
diff --git a/packages/nodes-base/nodes/Notion/GenericFunctions.ts b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
index 08fbc3cd1fcf97..6f7f89b457685d 100644
--- a/packages/nodes-base/nodes/Notion/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Notion/GenericFunctions.ts
@@ -1,16 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IBinaryKeyData,
+	IDataObject,
+	IDisplayOptions,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type {
-	IBinaryKeyData,
-	IDataObject,
-	IDisplayOptions,
 	INodeExecutionData,
 	INodeProperties,
 	IPollFunctions,
diff --git a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
index 7fe53f7f286a3e..d453e88ea49b6d 100644
--- a/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
+++ b/packages/nodes-base/nodes/Notion/NotionTrigger.node.ts
@@ -1,6 +1,5 @@
-import type { IPollFunctions } from 'n8n-core';
-
 import type {
+	IPollFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
index a52e16b35c720c..45d2f0e36cfd17 100644
--- a/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
+++ b/packages/nodes-base/nodes/Notion/v1/NotionV1.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
index ac897f15c1cd21..6565175fd66cf5 100644
--- a/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
+++ b/packages/nodes-base/nodes/Notion/v2/NotionV2.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
index 08fb3ab67a011d..573642ff3e822c 100644
--- a/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Odoo/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 const serviceJSONRPC = 'object';
diff --git a/packages/nodes-base/nodes/Odoo/Odoo.node.ts b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
index 4425f32b8a5f6e..35ce0fa5aefcf9 100644
--- a/packages/nodes-base/nodes/Odoo/Odoo.node.ts
+++ b/packages/nodes-base/nodes/Odoo/Odoo.node.ts
@@ -1,7 +1,7 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts b/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
index b7e89bb44a7064..b4c0ed746f127c 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function oneSimpleApiRequest(
diff --git a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
index 8bd650526b16bf..7f133b4c0513ce 100644
--- a/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
+++ b/packages/nodes-base/nodes/OneSimpleApi/OneSimpleApi.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
index 2e8af446e22de6..494879723bcfb4 100644
--- a/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/Onfleet.node.ts
@@ -1,4 +1,5 @@
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
@@ -10,8 +11,6 @@ import type {
 
 import { taskFields, taskOperations } from './descriptions/TaskDescription';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
 import { destinationFields, destinationOperations } from './descriptions/DestinationDescription';
 
 import { resourceLoaders } from './GenericFunctions';
diff --git a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
index ed4fb7b032705f..3735a852df2313 100644
--- a/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
+++ b/packages/nodes-base/nodes/Onfleet/OnfleetTrigger.node.ts
@@ -1,4 +1,6 @@
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
@@ -6,7 +8,6 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
 
 import { eventDisplay, eventNameField } from './descriptions/OnfleetWebhookDescription';
 
diff --git a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
index 52e51d52d2e54d..38a5f39bc1e1e8 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function openThesaurusApiRequest(
diff --git a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
index c46b247206402d..aab2b8577d300b 100644
--- a/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
+++ b/packages/nodes-base/nodes/OpenThesaurus/OpenThesaurus.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
index 6497cd8b1e8a8f..04fcb306707ee9 100644
--- a/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
+++ b/packages/nodes-base/nodes/OpenWeatherMap/OpenWeatherMap.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
index 4e7fd71a86a171..86ff031d2a29aa 100644
--- a/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Orbit/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	JsonObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { JsonObject, IDataObject } from 'n8n-workflow';
+	IDataObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { IRelation } from './Interfaces';
diff --git a/packages/nodes-base/nodes/Orbit/Orbit.node.ts b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
index 87244f60b0941b..6c6c0a0e746895 100644
--- a/packages/nodes-base/nodes/Orbit/Orbit.node.ts
+++ b/packages/nodes-base/nodes/Orbit/Orbit.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Oura/GenericFunctions.ts b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
index e4205c299c740c..a520f7f1446f1e 100644
--- a/packages/nodes-base/nodes/Oura/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Oura/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function ouraApiRequest(
diff --git a/packages/nodes-base/nodes/Oura/Oura.node.ts b/packages/nodes-base/nodes/Oura/Oura.node.ts
index 182410146528c4..d7cc845ec46505 100644
--- a/packages/nodes-base/nodes/Oura/Oura.node.ts
+++ b/packages/nodes-base/nodes/Oura/Oura.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
index 2943d59994a8e9..457028faead928 100644
--- a/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Paddle/GenericFunctions.ts
@@ -1,14 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	JsonObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { JsonObject, IDataObject } from 'n8n-workflow';
+	IDataObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function paddleApiRequest(
diff --git a/packages/nodes-base/nodes/Paddle/Paddle.node.ts b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
index be4cfbc7d2ae50..a6951cb2440386 100644
--- a/packages/nodes-base/nodes/Paddle/Paddle.node.ts
+++ b/packages/nodes-base/nodes/Paddle/Paddle.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
index 80540ffa548cd7..52837e07ec19da 100644
--- a/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PagerDuty/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { JsonObject, IDataObject, IHookFunctions, IWebhookFunctions } from 'n8n-workflow';
+import type {
+	JsonObject,
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IHookFunctions,
+	IWebhookFunctions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
diff --git a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
index 58f123a5cec6fb..55a8c222e95ba5 100644
--- a/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
+++ b/packages/nodes-base/nodes/PagerDuty/PagerDuty.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
index f2d8298eb2a1c0..6d64e29d18ea2c 100644
--- a/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PayPal/GenericFunctions.ts
@@ -1,16 +1,15 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	JsonObject,
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
-
-import type { JsonObject, IDataObject } from 'n8n-workflow';
-import { NodeApiError, NodeOperationError } from 'n8n-workflow';
+} from 'n8n-workflow';
+import { BINARY_ENCODING, NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 function getEnvironment(env: string) {
 	return {
diff --git a/packages/nodes-base/nodes/PayPal/PayPal.node.ts b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
index a65d4751759875..856ab8822b0459 100644
--- a/packages/nodes-base/nodes/PayPal/PayPal.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPal.node.ts
@@ -1,6 +1,6 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
index e1bd0735c4830e..0cbd3519b14ebb 100644
--- a/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
+++ b/packages/nodes-base/nodes/PayPal/PayPalTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
index bde7d1fd324a6f..b288aa77f2f07f 100644
--- a/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Peekalink/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	JsonObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { JsonObject, IDataObject } from 'n8n-workflow';
+	IDataObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function peekalinkApiRequest(
diff --git a/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts b/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
index b41e318fd9ec81..920564fb5a404c 100644
--- a/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
+++ b/packages/nodes-base/nodes/Peekalink/Peekalink.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
index add08a50b15b86..904cd1114e7f91 100644
--- a/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Phantombuster/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { JsonObject, IDataObject } from 'n8n-workflow';
+import type {
+	JsonObject,
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function phantombusterApiRequest(
diff --git a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
index 1be88c0bb36830..23827052ad4d84 100644
--- a/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
+++ b/packages/nodes-base/nodes/Phantombuster/Phantombuster.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
index 2058b6e199e745..77953f45e4177a 100644
--- a/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { JsonObject, IDataObject } from 'n8n-workflow';
+import type {
+	JsonObject,
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function philipsHueApiRequest(
diff --git a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
index 2564309de0f7be..677725a3fc9302 100644
--- a/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
+++ b/packages/nodes-base/nodes/PhilipsHue/PhilipsHue.node.ts
@@ -1,7 +1,6 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
index e4aab75c20197c..86bfc264ba11ff 100644
--- a/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pipedrive/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { JsonObject, IDataObject, INodePropertyOptions } from 'n8n-workflow';
+import type {
+	JsonObject,
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
index 3e74a7373973be..60c0c2f3166756 100644
--- a/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pipedrive/PipedriveTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
index c6f57e17b62193..f308f6be47877c 100644
--- a/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Plivo/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Plivo/Plivo.node.ts b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
index 1099b6942e563e..bc3f5b674ab4ff 100644
--- a/packages/nodes-base/nodes/Plivo/Plivo.node.ts
+++ b/packages/nodes-base/nodes/Plivo/Plivo.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
index 871b00ef4c5382..0ef0201ae6cfa7 100644
--- a/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/PostHog/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUrl } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function posthogApiRequest(
diff --git a/packages/nodes-base/nodes/PostHog/PostHog.node.ts b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
index f16b6721d820d1..c05cd71917b94c 100644
--- a/packages/nodes-base/nodes/PostHog/PostHog.node.ts
+++ b/packages/nodes-base/nodes/PostHog/PostHog.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
index a13c45759a40c8..df0331ddc7521d 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.functions.ts
@@ -1,5 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import type pgPromise from 'pg-promise';
 import type pg from 'pg-promise/typescript/pg-subset';
 
diff --git a/packages/nodes-base/nodes/Postgres/Postgres.node.ts b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
index 2fe841c2d7ab6d..ed1ca9171bc5e3 100644
--- a/packages/nodes-base/nodes/Postgres/Postgres.node.ts
+++ b/packages/nodes-base/nodes/Postgres/Postgres.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
index 3aa05b8d1d73e2..fd385982337312 100644
--- a/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Postmark/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function postmarkApiRequest(
diff --git a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
index 73154582aea750..54252a6cc531b5 100644
--- a/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
+++ b/packages/nodes-base/nodes/Postmark/PostmarkTrigger.node.ts
@@ -1,7 +1,7 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
diff --git a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
index 8edc2dc44b05a7..da3bcb1e97ed56 100644
--- a/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ProfitWell/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function profitWellApiRequest(
diff --git a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
index a70976f772e41e..d5a834024c2155 100644
--- a/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
+++ b/packages/nodes-base/nodes/ProfitWell/ProfitWell.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
index 6b4ace5ac9b94f..003e58d981eaf4 100644
--- a/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushbullet/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushbulletApiRequest(
diff --git a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
index 0a8117dca61211..7b1c8c4ec3cd2a 100644
--- a/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushcut/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function pushcutApiRequest(
diff --git a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
index 28bfc83cfe9982..9b0832d2097577 100644
--- a/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/Pushcut.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
index 72b2c1a853bdcc..e40171c7a39171 100644
--- a/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
+++ b/packages/nodes-base/nodes/Pushcut/PushcutTrigger.node.ts
@@ -1,6 +1,10 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
-import type { INodeType, INodeTypeDescription, IWebhookResponseData } from 'n8n-workflow';
+import type {
+	IHookFunctions,
+	IWebhookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
 
 import { pushcutApiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
index 03b185f7903f9d..f5333705ada2e7 100644
--- a/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Pushover/GenericFunctions.ts
@@ -1,7 +1,8 @@
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
 	IHttpRequestMethods,
 	IHttpRequestOptions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
index 64efce4b499ad0..b21699c7252d0c 100644
--- a/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
+++ b/packages/nodes-base/nodes/QuestDb/QuestDb.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import pgPromise from 'pg-promise';
diff --git a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
index 448d762c36ec95..e9d9278de0b585 100644
--- a/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBase/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function quickbaseApiRequest(
diff --git a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
index d24241e69376d4..04ef96327c5d88 100644
--- a/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
+++ b/packages/nodes-base/nodes/QuickBase/QuickBase.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
index 6cdce056418dd7..85a39bdafd4082 100644
--- a/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/QuickBooks/GenericFunctions.ts
@@ -1,7 +1,7 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
index 71adde2bafe659..373ed80f59bef9 100644
--- a/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
+++ b/packages/nodes-base/nodes/QuickBooks/QuickBooks.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
index b4956b86e0ab76..b2e47208eff6fb 100644
--- a/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
+++ b/packages/nodes-base/nodes/RabbitMQ/RabbitMQ.node.ts
@@ -1,7 +1,7 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
 import * as amqplib from 'amqplib';
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
index 8ac15e6131f456..cde8a82e906cb2 100644
--- a/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Raindrop/GenericFunctions.ts
@@ -1,6 +1,10 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
index dc3d5f167b4fbd..5c3632189eb938 100644
--- a/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
+++ b/packages/nodes-base/nodes/Raindrop/Raindrop.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
index 3ebc9138357383..00b591ee61945b 100644
--- a/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFile/ReadBinaryFile.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class ReadBinaryFile implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
index 3f2c668162dc6a..bd9ebcb666d88f 100644
--- a/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
+++ b/packages/nodes-base/nodes/ReadBinaryFiles/ReadBinaryFiles.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import glob from 'fast-glob';
 
 export class ReadBinaryFiles implements INodeType {
diff --git a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
index 8fc6adb182af28..6626c94e53575b 100644
--- a/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
+++ b/packages/nodes-base/nodes/ReadPdf/ReadPDF.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
index 8137433b2b56bb..0008785eba1740 100644
--- a/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Reddit/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Reddit/Reddit.node.ts b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
index 6ca92747cf0574..0980361273908c 100644
--- a/packages/nodes-base/nodes/Reddit/Reddit.node.ts
+++ b/packages/nodes-base/nodes/Reddit/Reddit.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Redis/Redis.node.ts b/packages/nodes-base/nodes/Redis/Redis.node.ts
index 402ff56f0fe6dc..72f952f73e113a 100644
--- a/packages/nodes-base/nodes/Redis/Redis.node.ts
+++ b/packages/nodes-base/nodes/Redis/Redis.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	GenericValue,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
diff --git a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
index 478e39c8438ebc..2224ee652d2917 100644
--- a/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
+++ b/packages/nodes-base/nodes/Redis/RedisTrigger.node.ts
@@ -1,6 +1,10 @@
-import type { ITriggerFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import redis from 'redis';
diff --git a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
index 37756aca7f15e0..82bc6f3f7cff8a 100644
--- a/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
+++ b/packages/nodes-base/nodes/RenameKeys/RenameKeys.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
index 06b2d81842deb7..e45a307fc2b86a 100644
--- a/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Rocketchat/GenericFunctions.ts
@@ -1,7 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
 
 export async function rocketchatApiRequest(
 	this: IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
index 6a28fab7009a64..7c1dbce58e2503 100644
--- a/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
+++ b/packages/nodes-base/nodes/Rocketchat/Rocketchat.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
index 5fe3cb70a79c5d..637f589b8565c9 100644
--- a/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
+++ b/packages/nodes-base/nodes/RssFeedRead/RssFeedRead.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
index 52c801f4e7a1ed..1ad253620fa83c 100644
--- a/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
+++ b/packages/nodes-base/nodes/Rundeck/Rundeck.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
index bc86f7567cf1b2..fe85acde4eac75 100644
--- a/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
+++ b/packages/nodes-base/nodes/Rundeck/RundeckApi.ts
@@ -1,6 +1,5 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export interface RundeckCredentials {
diff --git a/packages/nodes-base/nodes/S3/GenericFunctions.ts b/packages/nodes-base/nodes/S3/GenericFunctions.ts
index 0afe0d4b16548a..0d7043b7dab935 100644
--- a/packages/nodes-base/nodes/S3/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/S3/GenericFunctions.ts
@@ -8,13 +8,13 @@ import type { OptionsWithUri } from 'request';
 import { parseString } from 'xml2js';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { URL } from 'url';
diff --git a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
index 28741b4c00365a..7e7837fc170203 100644
--- a/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesforce/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { LoggerProxy as Logger, NodeApiError } from 'n8n-workflow';
 
 import moment from 'moment-timezone';
diff --git a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
index 09c9bfdcbf7d2f..53d2b33c99e823 100644
--- a/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
+++ b/packages/nodes-base/nodes/Salesforce/Salesforce.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
index e1d5926f88458f..466b3efc0ddeca 100644
--- a/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Salesmate/GenericFunctions.ts
@@ -1,13 +1,14 @@
 import type { OptionsWithUri } from 'request';
+
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function salesmateApiRequest(
diff --git a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
index ed8aa56bcce2f5..dd89c1a859e1fd 100644
--- a/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
+++ b/packages/nodes-base/nodes/Salesmate/Salesmate.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
index bbf7de5015a967..a6fec54d160324 100644
--- a/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
+++ b/packages/nodes-base/nodes/Schedule/ScheduleTrigger.node.ts
@@ -1,5 +1,10 @@
-import type { ITriggerFunctions } from 'n8n-core';
-import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	IDataObject,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import { CronJob } from 'cron';
diff --git a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
index 543c96877816da..d08880507b52e8 100644
--- a/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SeaTable/GenericFunctions.ts
@@ -1,8 +1,12 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, ILoadOptionsFunctions, IPollFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IPollFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { TDtableMetadataColumns, TDtableViewColumns, TEndpointVariableName } from './types';
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
index dac8668c7b7162..2c40e3bd47810f 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTable.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
index fd3745c507d1cb..9ede573334f85b 100644
--- a/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
+++ b/packages/nodes-base/nodes/SeaTable/SeaTableTrigger.node.ts
@@ -1,6 +1,5 @@
-import type { IPollFunctions } from 'n8n-core';
-
 import type {
+	IPollFunctions,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
index 0d1e3da9922b67..c3ed713a8d5bb4 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function scorecardApiRequest(
diff --git a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
index fe339a2add74ee..2deb1de4ad280d 100644
--- a/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
+++ b/packages/nodes-base/nodes/SecurityScorecard/SecurityScorecard.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Segment/GenericFunctions.ts b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
index 8d977cd44de536..739a526963e871 100644
--- a/packages/nodes-base/nodes/Segment/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Segment/GenericFunctions.ts
@@ -1,12 +1,12 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 export async function segmentApiRequest(
 	this:
diff --git a/packages/nodes-base/nodes/Segment/Segment.node.ts b/packages/nodes-base/nodes/Segment/Segment.node.ts
index c9fce4fe36c7ae..f83db44a1f9170 100644
--- a/packages/nodes-base/nodes/Segment/Segment.node.ts
+++ b/packages/nodes-base/nodes/Segment/Segment.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
index 8b692dc48851c1..cced148f890733 100644
--- a/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SendGrid/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 export async function sendGridApiRequest(
 	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
index 7766ecb2ad88c0..c36e00fb7ab53a 100644
--- a/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sendy/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function sendyApiRequest(
diff --git a/packages/nodes-base/nodes/Sendy/Sendy.node.ts b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
index 6064b1caa53e65..fb5865f5a448ba 100644
--- a/packages/nodes-base/nodes/Sendy/Sendy.node.ts
+++ b/packages/nodes-base/nodes/Sendy/Sendy.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
index 133c4ced19845b..0046b12f9884df 100644
--- a/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SentryIo/GenericFunctions.ts
@@ -1,14 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function sentryIoApiRequest(
diff --git a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
index 6d7f42361bd9d1..c3b355c8ca3f25 100644
--- a/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
+++ b/packages/nodes-base/nodes/SentryIo/SentryIo.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
index c564bf1055f0ad..71d9e997736d07 100644
--- a/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/ServiceNow/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function serviceNowApiRequest(
diff --git a/packages/nodes-base/nodes/Set/Set.node.ts b/packages/nodes-base/nodes/Set/Set.node.ts
index 97ca8b8571e9f7..0bfacf0437b4df 100644
--- a/packages/nodes-base/nodes/Set/Set.node.ts
+++ b/packages/nodes-base/nodes/Set/Set.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeParameters,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
index 42fe31b94093cd..d10f9d74b95b85 100644
--- a/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Shopify/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, IOAuth2Options } from 'n8n-workflow';
+	IOAuth2Options,
+} from 'n8n-workflow';
 
 import { snakeCase } from 'change-case';
 
diff --git a/packages/nodes-base/nodes/Shopify/Shopify.node.ts b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
index ecef6c4cb64b25..bd244dab073274 100644
--- a/packages/nodes-base/nodes/Shopify/Shopify.node.ts
+++ b/packages/nodes-base/nodes/Shopify/Shopify.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
index f07642c0c26b2b..3fef89e3a56fa6 100644
--- a/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
+++ b/packages/nodes-base/nodes/Shopify/ShopifyTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
index b4ea190af15518..198ace3caf1ad3 100644
--- a/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Signl4/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
index 1c7be15513576f..4e7255fac4a9e7 100644
--- a/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V1/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IOAuth2Options, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IOAuth2Options,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
index 00780840c3b384..88f7a043e2e8af 100644
--- a/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Slack/V2/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, IOAuth2Options } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IOAuth2Options,
+} from 'n8n-workflow';
 
 import { NodeOperationError } from 'n8n-workflow';
 
diff --git a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
index 930f6b3e97230e..f2672403bad792 100644
--- a/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
+++ b/packages/nodes-base/nodes/Slack/V2/SlackV2.node.ts
@@ -1,4 +1,3 @@
-import { BINARY_ENCODING } from 'n8n-core';
 import type { Readable } from 'stream';
 
 import type {
@@ -16,7 +15,7 @@ import type {
 	JsonObject,
 } from 'n8n-workflow';
 
-import { NodeOperationError } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
 import { channelFields, channelOperations } from './ChannelDescription';
 import { messageFields, messageOperations } from './MessageDescription';
diff --git a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
index fe69007a6afc14..a4836165f96e9f 100644
--- a/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Sms77/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Sms77/Sms77.node.ts b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
index 28fc2492882a7b..c85617f202b82f 100644
--- a/packages/nodes-base/nodes/Sms77/Sms77.node.ts
+++ b/packages/nodes-base/nodes/Sms77/Sms77.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
index ab0ee55f0a9d36..8264cdce7a83ca 100644
--- a/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
+++ b/packages/nodes-base/nodes/Snowflake/Snowflake.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
index 3dfbce35ebdd17..63059f3687e432 100644
--- a/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
+++ b/packages/nodes-base/nodes/SplitInBatches/SplitInBatches.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Splunk/GenericFunctions.ts b/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
index 7e6301a5cbf9b8..903dd212282ec1 100644
--- a/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Splunk/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Splunk/Splunk.node.ts b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
index a7fe0fa3c84aa3..7fbbab14fbf07e 100644
--- a/packages/nodes-base/nodes/Splunk/Splunk.node.ts
+++ b/packages/nodes-base/nodes/Splunk/Splunk.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
index ddcbe5883a9eff..38e75aa3d14db6 100644
--- a/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spontit/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function spontitApiRequest(
diff --git a/packages/nodes-base/nodes/Spontit/Spontit.node.ts b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
index 459cd07e93a105..b54cd906e26191 100644
--- a/packages/nodes-base/nodes/Spontit/Spontit.node.ts
+++ b/packages/nodes-base/nodes/Spontit/Spontit.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
index b95025cf96afc2..752962363746ed 100644
--- a/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Spotify/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/Spotify/Spotify.node.ts b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
index 812c28697b4820..2203cdbe4bf492 100644
--- a/packages/nodes-base/nodes/Spotify/Spotify.node.ts
+++ b/packages/nodes-base/nodes/Spotify/Spotify.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
index 99ef24dbc2bacc..a0cfde72d4fd46 100644
--- a/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
+++ b/packages/nodes-base/nodes/SseTrigger/SseTrigger.node.ts
@@ -1,7 +1,11 @@
 import EventSource from 'eventsource';
-
-import type { ITriggerFunctions } from 'n8n-core';
-import type { IDataObject, INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	IDataObject,
+	ITriggerFunctions,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
 export class SseTrigger implements INodeType {
diff --git a/packages/nodes-base/nodes/Ssh/Ssh.node.ts b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
index 0c0063314fc090..04fb96fcc15050 100644
--- a/packages/nodes-base/nodes/Ssh/Ssh.node.ts
+++ b/packages/nodes-base/nodes/Ssh/Ssh.node.ts
@@ -1,5 +1,3 @@
-import { BINARY_ENCODING } from 'n8n-core';
-
 import type {
 	IDataObject,
 	IExecuteFunctions,
@@ -7,6 +5,7 @@ import type {
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import { BINARY_ENCODING } from 'n8n-workflow';
 
 import { rm, writeFile } from 'fs/promises';
 
diff --git a/packages/nodes-base/nodes/Stackby/GenericFunction.ts b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
index 1eead3da6ff024..d5368105d1a83f 100644
--- a/packages/nodes-base/nodes/Stackby/GenericFunction.ts
+++ b/packages/nodes-base/nodes/Stackby/GenericFunction.ts
@@ -1,8 +1,13 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject, IPollFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IPollFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 /**
diff --git a/packages/nodes-base/nodes/Stackby/Stackby.node.ts b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
index 57faef5a977f01..2607affa1e73e8 100644
--- a/packages/nodes-base/nodes/Stackby/Stackby.node.ts
+++ b/packages/nodes-base/nodes/Stackby/Stackby.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Start/Start.node.ts b/packages/nodes-base/nodes/Start/Start.node.ts
index 94d9ecd2ee7f48..05d3871e1e0c05 100644
--- a/packages/nodes-base/nodes/Start/Start.node.ts
+++ b/packages/nodes-base/nodes/Start/Start.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class Start implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts b/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
index 5926329366d035..819f1477355eb1 100644
--- a/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
+++ b/packages/nodes-base/nodes/StickyNote/StickyNote.node.ts
@@ -1,5 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 
 export class StickyNote implements INodeType {
 	description: INodeTypeDescription = {
diff --git a/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts b/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts
index 5f14626d8231ec..537ce4101b6bbc 100644
--- a/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts
+++ b/packages/nodes-base/nodes/StopAndError/StopAndError.node.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { jsonParse, NodeOperationError } from 'n8n-workflow';
 
 const errorObjectPlaceholder = `{
diff --git a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
index aaa49387fbd58d..1b5e8f0aee0e08 100644
--- a/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Storyblok/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function storyblokApiRequest(
diff --git a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
index 144aaa7c0a5e99..052760a19824cf 100644
--- a/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
+++ b/packages/nodes-base/nodes/Storyblok/Storyblok.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
index 4e7e7081a8a9f8..c8d8a02fa272b7 100644
--- a/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strapi/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function strapiApiRequest(
diff --git a/packages/nodes-base/nodes/Strapi/Strapi.node.ts b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
index 8497db42a35f3a..7f2328b0e3b536 100644
--- a/packages/nodes-base/nodes/Strapi/Strapi.node.ts
+++ b/packages/nodes-base/nodes/Strapi/Strapi.node.ts
@@ -1,8 +1,7 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Strava/GenericFunctions.ts b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
index 401ae71d576450..c42c34ad93cacf 100644
--- a/packages/nodes-base/nodes/Strava/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Strava/GenericFunctions.ts
@@ -1,14 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function stravaApiRequest(
diff --git a/packages/nodes-base/nodes/Strava/Strava.node.ts b/packages/nodes-base/nodes/Strava/Strava.node.ts
index eb463da10dcd47..15535b98512c46 100644
--- a/packages/nodes-base/nodes/Strava/Strava.node.ts
+++ b/packages/nodes-base/nodes/Strava/Strava.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
index 4a5db782e4e4bb..48415187c29e8c 100644
--- a/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Strava/StravaTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Stripe/Stripe.node.ts b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
index 204103a45b7442..63553d2fb0a6c5 100644
--- a/packages/nodes-base/nodes/Stripe/Stripe.node.ts
+++ b/packages/nodes-base/nodes/Stripe/Stripe.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
index 4a40a427fb9c3c..db1490583664e2 100644
--- a/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
+++ b/packages/nodes-base/nodes/Stripe/StripeTrigger.node.ts
@@ -1,8 +1,8 @@
 /* eslint-disable n8n-nodes-base/node-param-description-excess-final-period */
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
 	INodeType,
 	INodeTypeDescription,
 	IWebhookResponseData,
diff --git a/packages/nodes-base/nodes/Stripe/helpers.ts b/packages/nodes-base/nodes/Stripe/helpers.ts
index adef1ecdf5703c..a8c241e2242b7b 100644
--- a/packages/nodes-base/nodes/Stripe/helpers.ts
+++ b/packages/nodes-base/nodes/Stripe/helpers.ts
@@ -1,10 +1,13 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
 import flow from 'lodash.flow';
 import isEmpty from 'lodash.isempty';
 import omit from 'lodash.omit';
-
-import type { IDataObject, ILoadOptionsFunctions, INodePropertyOptions } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	INodePropertyOptions,
+} from 'n8n-workflow';
 
 /**
  * Make an API request to Stripe
diff --git a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
index 9b76b0750259a2..7570e95eb5f97e 100644
--- a/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Supabase/GenericFunctions.ts
@@ -1,17 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	ICredentialDataDecryptedObject,
+	ICredentialTestFunctions,
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type {
-	ICredentialDataDecryptedObject,
-	ICredentialTestFunctions,
-	IDataObject,
 	INodeProperties,
 	IPairedItemData,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/Supabase/Supabase.node.ts b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
index 7b92a5b5578fe8..0068cd42a86445 100644
--- a/packages/nodes-base/nodes/Supabase/Supabase.node.ts
+++ b/packages/nodes-base/nodes/Supabase/Supabase.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
index 35701fe881c404..da7da90736039f 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function surveyMonkeyApiRequest(
diff --git a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
index 217c365d9b0440..07da21bf813ef4 100644
--- a/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
+++ b/packages/nodes-base/nodes/SurveyMonkey/SurveyMonkeyTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Switch/Switch.node.ts b/packages/nodes-base/nodes/Switch/Switch.node.ts
index c89629e609a980..994daa6b758938 100644
--- a/packages/nodes-base/nodes/Switch/Switch.node.ts
+++ b/packages/nodes-base/nodes/Switch/Switch.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	INodeExecutionData,
 	INodeParameters,
 	INodeType,
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
index a2896a3dc64cbc..07a17ef81a9a63 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/SyncroMspV1.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts
index d1bfc3cfe52f40..c5741db5fdab12 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts
index 479b161257886d..90aa9c88c4f9a2 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts
index 8486cf109fd0c6..d43a4faf138faf 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/get/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts
index 050ca6b0deb3e3..b7181b8aa4fae0 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts
index 09516fba10f2d3..6388af245772d0 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/contact/update/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts
index 7894aeac04b6c2..4fddaa1a5987a5 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts
index a3b125a9f8bc26..8952945d6c8a5e 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts
index 2fcfea10d167d6..87503a8a7c14f9 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/get/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts
index 5e3061c0f43378..e46e35fa06d3f9 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts
index 28f17846ea0f40..2af8779f5930a2 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/customer/update/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData, JsonObject } from 'n8n-workflow';
+import type { IDataObject, IExecuteFunctions, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts
index a5ece78df8389f..aed9f515ffb52f 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts
index 310508c6731268..cf63a915dc39b9 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts
index 2507aff8324427..9b2c7fa3c4bc71 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/get/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts
index 70de352c3b21a5..3a2520dc9a1cf2 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts
index 895589e6cd70d6..470be93cb24920 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/rmm/mute/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
index 0cf33100725b0a..1c3f18782b4346 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/router.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeExecutionData, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, INodeExecutionData, JsonObject } from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import * as customer from './customer';
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts
index 346d8de4d1a843..75571686827dd5 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/create/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts
index 1b4691045ddb02..f5a32f8240cd0e 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/del/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts
index a48a0c1a576d81..0165b92aa463d4 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/get/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts
index e385957d174f36..415cbca633aa30 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/getAll/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 
 import { apiRequest, apiRequestAllItems } from '../../../transport';
 
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts
index 83c66957dc4b6d..53f0ab16d17546 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/actions/ticket/update/execute.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, INodeExecutionData } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, INodeExecutionData } from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import { apiRequest } from '../../../transport';
diff --git a/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts b/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
index 4976d5542e7f8e..32c9acf290d8b5 100644
--- a/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
+++ b/packages/nodes-base/nodes/SyncroMSP/v1/transport/index.ts
@@ -1,6 +1,7 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
 	GenericValue,
 	ICredentialDataDecryptedObject,
 	ICredentialTestFunctions,
diff --git a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
index 06e7ae9ecbfc72..be0ae9b0822da2 100644
--- a/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Taiga/GenericFunctions.ts
@@ -1,14 +1,15 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { ICredentialDataDecryptedObject, IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import { createHash } from 'crypto';
diff --git a/packages/nodes-base/nodes/Taiga/Taiga.node.ts b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
index e1c7d4c2a561c1..454d0ecac5f0ab 100644
--- a/packages/nodes-base/nodes/Taiga/Taiga.node.ts
+++ b/packages/nodes-base/nodes/Taiga/Taiga.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
index cfaf472b41f570..c7f22b79f7739f 100644
--- a/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
+++ b/packages/nodes-base/nodes/Taiga/TaigaTrigger.node.ts
@@ -1,4 +1,5 @@
 import type {
+	IHookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
@@ -8,8 +9,6 @@ import type {
 	IWebhookResponseData,
 } from 'n8n-workflow';
 
-import type { IHookFunctions } from 'n8n-core';
-
 import { getAutomaticSecret, taigaApiRequest } from './GenericFunctions';
 
 // import {
diff --git a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
index fd52d966f8a708..e96b69c37593ea 100644
--- a/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function tapfiliateApiRequest(
diff --git a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
index 178eeda0c04e3d..a11bdf6c139a04 100644
--- a/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
+++ b/packages/nodes-base/nodes/Tapfiliate/Tapfiliate.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
index 331a4136fcda45..d12215f68ff7f8 100644
--- a/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Telegram/GenericFunctions.ts
@@ -1,13 +1,13 @@
+import type { OptionsWithUri } from 'request';
+
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { OptionsWithUri } from 'request';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 // Interface in n8n
diff --git a/packages/nodes-base/nodes/Telegram/Telegram.node.ts b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
index 1a35902433e12a..1773926cf96a81 100644
--- a/packages/nodes-base/nodes/Telegram/Telegram.node.ts
+++ b/packages/nodes-base/nodes/Telegram/Telegram.node.ts
@@ -1,14 +1,13 @@
 import type { Readable } from 'stream';
-import type { IExecuteFunctions } from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
 
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
 import { addAdditionalFields, apiRequest, getPropertyName } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
index 9236918c474bf8..ee1252fe153bf8 100644
--- a/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
+++ b/packages/nodes-base/nodes/Telegram/TelegramTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
index 6362d93e8be5ba..fab2dc86121984 100644
--- a/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TheHive/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+} from 'n8n-workflow';
 import { jsonParse } from 'n8n-workflow';
 
 import moment from 'moment';
diff --git a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
index 51041831fe36b2..8699c15d065e42 100644
--- a/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
+++ b/packages/nodes-base/nodes/TheHive/TheHiveTrigger.node.ts
@@ -1,6 +1,5 @@
-import type { IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IWebhookFunctions,
 	IDataObject,
 	IHookFunctions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
index 709cacb2b44bcd..3381fa25b07d0c 100644
--- a/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
+++ b/packages/nodes-base/nodes/TimescaleDb/TimescaleDb.node.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 import { pgInsert, pgQuery, pgUpdate } from '../Postgres/Postgres.node.functions';
diff --git a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
index 0333ab51704f43..4278cc905af591 100644
--- a/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Todoist/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export type Context = IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions;
diff --git a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
index f92c957fc94375..dc9f6a3b29ba37 100644
--- a/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v1/TodoistV1.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
index a8b6e25bbf91ce..f7e6b3e132e060 100644
--- a/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
+++ b/packages/nodes-base/nodes/Todoist/v2/TodoistV2.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
index ab2d57e586f8da..33557fc6b97fc5 100644
--- a/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Toggl/GenericFunctions.ts
@@ -1,15 +1,15 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IPollFunctions,
 	ITriggerFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function togglApiRequest(
diff --git a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
index 6afbef01506d24..3278ed27b6bddc 100644
--- a/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
+++ b/packages/nodes-base/nodes/Toggl/TogglTrigger.node.ts
@@ -1,5 +1,5 @@
-import type { IPollFunctions } from 'n8n-core';
 import type {
+	IPollFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
index 8cadef352aea79..48553b7df6ac2a 100644
--- a/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/TravisCi/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
index 896b3f4f520848..701076cf548066 100644
--- a/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
+++ b/packages/nodes-base/nodes/TravisCi/TravisCi.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Trello/GenericFunctions.ts b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
index 6af4306c4e02db..c653b28050125d 100644
--- a/packages/nodes-base/nodes/Trello/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Trello/GenericFunctions.ts
@@ -1,8 +1,11 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
 
 /**
  * Make an API request to Trello
diff --git a/packages/nodes-base/nodes/Trello/Trello.node.ts b/packages/nodes-base/nodes/Trello/Trello.node.ts
index 6a02d4eee983e3..da784c193960c9 100644
--- a/packages/nodes-base/nodes/Trello/Trello.node.ts
+++ b/packages/nodes-base/nodes/Trello/Trello.node.ts
@@ -1,6 +1,6 @@
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeListSearchResult,
diff --git a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
index b928d3a01ff306..87d3b27aeade99 100644
--- a/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
+++ b/packages/nodes-base/nodes/Trello/TrelloTrigger.node.ts
@@ -1,6 +1,10 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
-import type { INodeType, INodeTypeDescription, IWebhookResponseData } from 'n8n-workflow';
+import type {
+	IHookFunctions,
+	IWebhookFunctions,
+	INodeType,
+	INodeTypeDescription,
+	IWebhookResponseData,
+} from 'n8n-workflow';
 
 import { apiRequest } from './GenericFunctions';
 
diff --git a/packages/nodes-base/nodes/Twake/GenericFunctions.ts b/packages/nodes-base/nodes/Twake/GenericFunctions.ts
index e4553e35188091..bb6a5791fe4905 100644
--- a/packages/nodes-base/nodes/Twake/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twake/GenericFunctions.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
+import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-workflow';
 
 /**
  * Make an API request to Twake
diff --git a/packages/nodes-base/nodes/Twake/Twake.node.ts b/packages/nodes-base/nodes/Twake/Twake.node.ts
index b2682d6aa1328c..b39f1353d173d6 100644
--- a/packages/nodes-base/nodes/Twake/Twake.node.ts
+++ b/packages/nodes-base/nodes/Twake/Twake.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
index f774df39e78e6b..af6007d29e4720 100644
--- a/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twilio/GenericFunctions.ts
@@ -1,6 +1,4 @@
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IHookFunctions, IDataObject } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
 
diff --git a/packages/nodes-base/nodes/Twilio/Twilio.node.ts b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
index 54462285c3ff28..55de035ead1f30 100644
--- a/packages/nodes-base/nodes/Twilio/Twilio.node.ts
+++ b/packages/nodes-base/nodes/Twilio/Twilio.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Twist/GenericFunctions.ts b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
index 2d5af978e4019c..95a8564d9f778f 100644
--- a/packages/nodes-base/nodes/Twist/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Twist/GenericFunctions.ts
@@ -1,8 +1,11 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function twistApiRequest(
diff --git a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
index 825f63d275d133..7248439ec0534a 100644
--- a/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Typeform/GenericFunctions.ts
@@ -1,6 +1,11 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, INodePropertyOptions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	INodePropertyOptions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
index 1cb4248bdd73b1..c2f639636674fb 100644
--- a/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
+++ b/packages/nodes-base/nodes/Typeform/TypeformTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/UProc/GenericFunctions.ts b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
index 2c7b2b4ec7b6d8..9b96f5b51de013 100644
--- a/packages/nodes-base/nodes/UProc/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UProc/GenericFunctions.ts
@@ -1,12 +1,9 @@
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type {
-	IDataObject,
 	IHttpRequestMethods,
 	IHttpRequestOptions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/UProc/UProc.node.ts b/packages/nodes-base/nodes/UProc/UProc.node.ts
index 53fe50d85d04c0..bcd9f2967a83a1 100644
--- a/packages/nodes-base/nodes/UProc/UProc.node.ts
+++ b/packages/nodes-base/nodes/UProc/UProc.node.ts
@@ -1,7 +1,6 @@
 /* eslint-disable n8n-nodes-base/node-filename-against-convention */
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
index a2f508dd6b7443..510cc36b606d6b 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUrl } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import { createHmac } from 'crypto';
diff --git a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
index f09ae141f59164..69ff21a8cafbad 100644
--- a/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
+++ b/packages/nodes-base/nodes/UnleashedSoftware/UnleashedSoftware.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
index e91947e2143485..b18069ad2a79f9 100644
--- a/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Uplead/GenericFunctions.ts
@@ -1,12 +1,12 @@
 import type { OptionsWithUri } from 'request';
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function upleadApiRequest(
diff --git a/packages/nodes-base/nodes/Uplead/Uplead.node.ts b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
index 43f7f6e0e136d9..63a130546923a6 100644
--- a/packages/nodes-base/nodes/Uplead/Uplead.node.ts
+++ b/packages/nodes-base/nodes/Uplead/Uplead.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts b/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
index d378c7f55ad3de..4643c82dcfe9d8 100644
--- a/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject, JsonObject } from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function uptimeRobotApiRequest(
diff --git a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
index b8eff069f2250e..0fb7324c76c5ec 100644
--- a/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
+++ b/packages/nodes-base/nodes/UptimeRobot/UptimeRobot.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts b/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
index 49e116bf29b42f..d69867a7f6e47d 100644
--- a/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/GenericFunctions.ts
@@ -1,8 +1,6 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+import type { IExecuteFunctions, IDataObject } from 'n8n-workflow';
 
 export async function urlScanIoApiRequest(
 	this: IExecuteFunctions,
diff --git a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
index 398b79b043e10e..e4295ee4718cfe 100644
--- a/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
+++ b/packages/nodes-base/nodes/UrlScanIo/UrlScanIo.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
index 26f9060a2a5c1b..55d14056531d7a 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	ILoadOptionsFunctions,
 	IPollFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 import get from 'lodash.get';
 
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
index 9d498b8d6a5896..96a18448d3a066 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenter.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
index d8c0aba5821795..7035cbdaf2a0d6 100644
--- a/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
+++ b/packages/nodes-base/nodes/Venafi/Datacenter/VenafiTlsProtectDatacenterTrigger.node.ts
@@ -1,6 +1,5 @@
-import type { IPollFunctions } from 'n8n-core';
-
 import type {
+	IPollFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
index 792f0626ceae0c..7bdffa5541287f 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/GenericFunctions.ts
@@ -1,8 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, IHookFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	IHookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 import get from 'lodash.get';
diff --git a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
index 2a34b0d6723ea0..97fb3876f2d44d 100644
--- a/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
+++ b/packages/nodes-base/nodes/Venafi/ProtectCloud/VenafiTlsProtectCloud.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Vero/GenericFunctions.ts b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
index 2557c5b34f3d47..cb2b1a087f0010 100644
--- a/packages/nodes-base/nodes/Vero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vero/GenericFunctions.ts
@@ -1,6 +1,11 @@
 import type { OptionsWithUri } from 'request';
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function veroApiRequest(
diff --git a/packages/nodes-base/nodes/Vero/Vero.node.ts b/packages/nodes-base/nodes/Vero/Vero.node.ts
index 38d2c67f616176..d4814263037fe3 100644
--- a/packages/nodes-base/nodes/Vero/Vero.node.ts
+++ b/packages/nodes-base/nodes/Vero/Vero.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
index 376bde7a2e36e3..b67d956f451f7d 100644
--- a/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Vonage/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function vonageApiRequest(
diff --git a/packages/nodes-base/nodes/Vonage/Vonage.node.ts b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
index 1c8217944300d3..162b982c3aec2a 100644
--- a/packages/nodes-base/nodes/Vonage/Vonage.node.ts
+++ b/packages/nodes-base/nodes/Vonage/Vonage.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Wait/Wait.node.ts b/packages/nodes-base/nodes/Wait/Wait.node.ts
index 85b7343a3e8233..72a60bbbcf1f6a 100644
--- a/packages/nodes-base/nodes/Wait/Wait.node.ts
+++ b/packages/nodes-base/nodes/Wait/Wait.node.ts
@@ -1,7 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-import { BINARY_ENCODING, WAIT_TIME_UNLIMITED } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	INodeExecutionData,
@@ -10,7 +8,7 @@ import type {
 	IWebhookFunctions,
 	IWebhookResponseData,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { BINARY_ENCODING, WAIT_TIME_UNLIMITED, NodeOperationError } from 'n8n-workflow';
 
 import fs from 'fs';
 import stream from 'stream';
diff --git a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
index 485054a482793a..c91eead9b26918 100644
--- a/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Webflow/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 export async function webflowApiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions | IWebhookFunctions,
diff --git a/packages/nodes-base/nodes/Webflow/Webflow.node.ts b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
index bc6019e1fbcd95..7acc90e54c32c4 100644
--- a/packages/nodes-base/nodes/Webflow/Webflow.node.ts
+++ b/packages/nodes-base/nodes/Webflow/Webflow.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
index 0fc80f5d015a87..e7cd8251a80fbd 100644
--- a/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/Webflow/WebflowTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Webhook/Webhook.node.ts b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
index a1a9efa138fa7e..716fa35b8582e8 100644
--- a/packages/nodes-base/nodes/Webhook/Webhook.node.ts
+++ b/packages/nodes-base/nodes/Webhook/Webhook.node.ts
@@ -1,7 +1,5 @@
-import type { IWebhookFunctions } from 'n8n-core';
-import { BINARY_ENCODING } from 'n8n-core';
-
 import type {
+	IWebhookFunctions,
 	ICredentialDataDecryptedObject,
 	IDataObject,
 	INodeExecutionData,
@@ -9,7 +7,7 @@ import type {
 	INodeTypeDescription,
 	IWebhookResponseData,
 } from 'n8n-workflow';
-import { NodeOperationError } from 'n8n-workflow';
+import { BINARY_ENCODING, NodeOperationError } from 'n8n-workflow';
 
 import fs from 'fs';
 import stream from 'stream';
diff --git a/packages/nodes-base/nodes/Wekan/GenericFunctions.ts b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
index 88f919571fa3ab..4308ec8eb4a50d 100644
--- a/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wekan/GenericFunctions.ts
@@ -1,8 +1,11 @@
-import type { IExecuteFunctions, IHookFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
 import type { OptionsWithUri } from 'request';
 
-import type { IDataObject } from 'n8n-workflow';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
+	ILoadOptionsFunctions,
+} from 'n8n-workflow';
 
 export async function apiRequest(
 	this: IHookFunctions | IExecuteFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Wekan/Wekan.node.ts b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
index 8a4c2c69b5c8c5..fe83b296bc2edf 100644
--- a/packages/nodes-base/nodes/Wekan/Wekan.node.ts
+++ b/packages/nodes-base/nodes/Wekan/Wekan.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Wise/GenericFunctions.ts b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
index 75d2030dc4e206..21372da30d1163 100644
--- a/packages/nodes-base/nodes/Wise/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wise/GenericFunctions.ts
@@ -1,9 +1,9 @@
 import { createSign } from 'crypto';
 
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
 import type {
 	IDataObject,
+	IExecuteFunctions,
+	IHookFunctions,
 	IHttpRequestOptions,
 	ILoadOptionsFunctions,
 	JsonObject,
diff --git a/packages/nodes-base/nodes/Wise/Wise.node.ts b/packages/nodes-base/nodes/Wise/Wise.node.ts
index f7a66d0893da9b..2d00939bfc7c97 100644
--- a/packages/nodes-base/nodes/Wise/Wise.node.ts
+++ b/packages/nodes-base/nodes/Wise/Wise.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts b/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
index 411973723c7c3f..f5b23538c315d5 100644
--- a/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wise/WiseTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeType,
diff --git a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
index e054792a018c22..a7a2b24d8041d1 100644
--- a/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/WooCommerce/GenericFunctions.ts
@@ -1,14 +1,14 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	ICredentialDataDecryptedObject,
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
 	IWebhookFunctions,
-} from 'n8n-core';
-
-import type { ICredentialDataDecryptedObject, IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 import type { ICouponLine, IFeeLine, ILineItem, IShoppingLine } from './OrderInterface';
 
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
index c048a8dd2df10f..2351bfffb51998 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerce.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
index e95fa4fecc8b14..4aa9c634f1a78f 100644
--- a/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
+++ b/packages/nodes-base/nodes/WooCommerce/WooCommerceTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	INodeType,
 	INodeTypeDescription,
diff --git a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
index 1188962605d362..5470a0724b090a 100644
--- a/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wordpress/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function wordpressApiRequest(
diff --git a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
index ff807a6f374f14..373bf30772fa2b 100644
--- a/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
+++ b/packages/nodes-base/nodes/Wordpress/Wordpress.node.ts
@@ -1,5 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Workable/GenericFunctions.ts b/packages/nodes-base/nodes/Workable/GenericFunctions.ts
index 9ebb0d4ffae312..b0ac7888900fb6 100644
--- a/packages/nodes-base/nodes/Workable/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Workable/GenericFunctions.ts
@@ -1,13 +1,13 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function workableApiRequest(
diff --git a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
index 05cf3447e11d25..b7fcaceb5641f1 100644
--- a/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
+++ b/packages/nodes-base/nodes/Workable/WorkableTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts b/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts
index 4cc89edf9e2845..a78e1f6b8ce807 100644
--- a/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts
+++ b/packages/nodes-base/nodes/WorkflowTrigger/WorkflowTrigger.node.ts
@@ -1,5 +1,9 @@
-import type { ITriggerFunctions } from 'n8n-core';
-import type { INodeType, INodeTypeDescription, ITriggerResponse } from 'n8n-workflow';
+import type {
+	ITriggerFunctions,
+	INodeType,
+	INodeTypeDescription,
+	ITriggerResponse,
+} from 'n8n-workflow';
 
 type eventType = 'Workflow activated' | 'Workflow updated' | undefined;
 type activationType = 'activate' | 'update';
diff --git a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
index dc3695c4aafde6..176f7fa4e2bb6e 100644
--- a/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
+++ b/packages/nodes-base/nodes/WriteBinaryFile/WriteBinaryFile.node.ts
@@ -1,10 +1,10 @@
-import { BINARY_ENCODING } from 'n8n-core';
 import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeType,
 	INodeTypeDescription,
 } from 'n8n-workflow';
+import { BINARY_ENCODING } from 'n8n-workflow';
 
 import { writeFile as fsWriteFile } from 'fs/promises';
 import type { Readable } from 'stream';
diff --git a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
index cfa62b5037f6f8..2a58f899a7fc1e 100644
--- a/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Wufoo/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 export async function wufooApiRequest(
 	this: IHookFunctions | IExecuteFunctions | IExecuteSingleFunctions | ILoadOptionsFunctions,
diff --git a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
index d971ea9e4dbe9f..575c29c320091a 100644
--- a/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
+++ b/packages/nodes-base/nodes/Wufoo/WufooTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Xero/GenericFunctions.ts b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
index 7aacd700005ea4..56a248827ee51f 100644
--- a/packages/nodes-base/nodes/Xero/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Xero/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function xeroApiRequest(
diff --git a/packages/nodes-base/nodes/Xero/Xero.node.ts b/packages/nodes-base/nodes/Xero/Xero.node.ts
index 3e141b4ccba94d..1b5474178bd585 100644
--- a/packages/nodes-base/nodes/Xero/Xero.node.ts
+++ b/packages/nodes-base/nodes/Xero/Xero.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Xml/Xml.node.ts b/packages/nodes-base/nodes/Xml/Xml.node.ts
index ef02376007c0f4..213ce2df7320b9 100644
--- a/packages/nodes-base/nodes/Xml/Xml.node.ts
+++ b/packages/nodes-base/nodes/Xml/Xml.node.ts
@@ -1,6 +1,10 @@
 import { Builder, Parser } from 'xml2js';
-import type { IExecuteFunctions } from 'n8n-core';
-import type { INodeExecutionData, INodeType, INodeTypeDescription } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	INodeExecutionData,
+	INodeType,
+	INodeTypeDescription,
+} from 'n8n-workflow';
 import { NodeOperationError } from 'n8n-workflow';
 
 export class Xml implements INodeType {
diff --git a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
index d0a2609db720a8..293d4842d2b167 100644
--- a/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Yourls/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 export async function yourlsApiRequest(
diff --git a/packages/nodes-base/nodes/Yourls/Yourls.node.ts b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
index 2bd866fbec08dc..a5eb9ac2905e31 100644
--- a/packages/nodes-base/nodes/Yourls/Yourls.node.ts
+++ b/packages/nodes-base/nodes/Yourls/Yourls.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	INodeExecutionData,
 	INodeType,
diff --git a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
index 37722b10776792..0ef1fba494665e 100644
--- a/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zammad/GenericFunctions.ts
@@ -1,6 +1,9 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import type { OptionsWithUri } from 'request';
diff --git a/packages/nodes-base/nodes/Zammad/Zammad.node.ts b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
index 8a71a93d265f48..ef142bc6be9406 100644
--- a/packages/nodes-base/nodes/Zammad/Zammad.node.ts
+++ b/packages/nodes-base/nodes/Zammad/Zammad.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	ICredentialsDecrypted,
 	ICredentialTestFunctions,
 	IDataObject,
diff --git a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
index 6c06ab7f6637ff..9b700e1785c570 100644
--- a/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zendesk/GenericFunctions.ts
@@ -1,13 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
 import type {
+	IDataObject,
 	IExecuteFunctions,
 	IExecuteSingleFunctions,
 	IHookFunctions,
 	ILoadOptionsFunctions,
-} from 'n8n-core';
-
-import type { IDataObject } from 'n8n-workflow';
+} from 'n8n-workflow';
 
 function getUri(resource: string, subdomain: string) {
 	if (resource.includes('webhooks')) {
diff --git a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
index 084e384c3620f3..b79049a9fbc567 100644
--- a/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/Zendesk.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
index 1525caf0ccc795..8028c9507069db 100644
--- a/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
+++ b/packages/nodes-base/nodes/Zendesk/ZendeskTrigger.node.ts
@@ -1,6 +1,6 @@
-import type { IHookFunctions, IWebhookFunctions } from 'n8n-core';
-
 import type {
+	IHookFunctions,
+	IWebhookFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodePropertyOptions,
diff --git a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
index ad94e0e0ebc857..b64b91f9290d42 100644
--- a/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoho/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IHookFunctions } from 'n8n-core';
-
-import type { IDataObject, ILoadOptionsFunctions, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IHookFunctions,
+	IDataObject,
+	ILoadOptionsFunctions,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError, NodeOperationError } from 'n8n-workflow';
 
 import flow from 'lodash.flow';
diff --git a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
index 3dfe8016ef54c8..bf468d29ccaaf8 100644
--- a/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
+++ b/packages/nodes-base/nodes/Zoho/ZohoCrm.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
index 754779fe2b96f5..faa63161ed3f63 100644
--- a/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zoom/GenericFunctions.ts
@@ -1,8 +1,12 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, IExecuteSingleFunctions, ILoadOptionsFunctions } from 'n8n-core';
-
-import type { IDataObject, JsonObject } from 'n8n-workflow';
+import type {
+	IExecuteFunctions,
+	IExecuteSingleFunctions,
+	ILoadOptionsFunctions,
+	IDataObject,
+	JsonObject,
+} from 'n8n-workflow';
 import { NodeApiError } from 'n8n-workflow';
 
 export async function zoomApiRequest(
diff --git a/packages/nodes-base/nodes/Zoom/Zoom.node.ts b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
index 72c8d79fa31d77..6ca3f8e93523c0 100644
--- a/packages/nodes-base/nodes/Zoom/Zoom.node.ts
+++ b/packages/nodes-base/nodes/Zoom/Zoom.node.ts
@@ -1,6 +1,5 @@
-import type { IExecuteFunctions } from 'n8n-core';
-
 import type {
+	IExecuteFunctions,
 	IDataObject,
 	ILoadOptionsFunctions,
 	INodeExecutionData,
diff --git a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
index 59509ad7572b9e..f8c7f06be4ba1b 100644
--- a/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
+++ b/packages/nodes-base/nodes/Zulip/GenericFunctions.ts
@@ -1,14 +1,19 @@
 import type { OptionsWithUri } from 'request';
 
-import type { IExecuteFunctions, ILoadOptionsFunctions } from 'n8n-core';
+import type {
+	IDataObject,
+	IExecuteFunctions,
+	ILoadOptionsFunctions,
+	IHookFunctions,
+	IWebhookFunctions,
+	JsonObject,
+} from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
 
 import type { IMessage } from './MessageInterface';
 import type { IStream } from './StreamInterface';
 import type { IUser } from './UserInterface';
 
-import type { IDataObject, IHookFunctions, IWebhookFunctions, JsonObject } from 'n8n-workflow';
-import { NodeApiError } from 'n8n-workflow';
-
 export async function zulipApiRequest(
 	this: IExecuteFunctions | IWebhookFunctions | IHookFunctions | ILoadOptionsFunctions,
 	method: string,
diff --git a/packages/nodes-base/package.json b/packages/nodes-base/package.json
index 30f3d2cfaf614f..f20f9a2f64569b 100644
--- a/packages/nodes-base/package.json
+++ b/packages/nodes-base/package.json
@@ -739,6 +739,7 @@
     "@types/formidable": "^1.0.31",
     "@types/gm": "^1.25.0",
     "@types/imap-simple": "^4.2.0",
+    "@types/js-nacl": "^1.3.0",
     "@types/jsonwebtoken": "^9.0.1",
     "@types/lodash": "^4.14.191",
     "@types/lodash.assign": "^4",
@@ -799,11 +800,10 @@
     "@types/xml2js": "^0.4.3",
     "eslint-plugin-n8n-nodes-base": "^1.12.0",
     "gulp": "^4.0.0",
-    "n8n-workflow": "workspace:*"
+    "n8n-core": "workspace:*"
   },
   "dependencies": {
     "@kafkajs/confluent-schema-registry": "1.0.6",
-    "@types/js-nacl": "^1.3.0",
     "amqplib": "^0.10.3",
     "aws4": "^1.8.0",
     "basic-auth": "^2.0.1",
@@ -875,7 +875,7 @@
     "mqtt": "4.2.6",
     "mssql": "^8.1.2",
     "mysql2": "~2.3.0",
-    "n8n-core": "workspace:*",
+    "n8n-workflow": "workspace:*",
     "node-html-markdown": "^1.1.3",
     "node-ssh": "^12.0.0",
     "nodemailer": "^6.7.1",
diff --git a/packages/workflow/src/Constants.ts b/packages/workflow/src/Constants.ts
new file mode 100644
index 00000000000000..e2a6fdf1e85405
--- /dev/null
+++ b/packages/workflow/src/Constants.ts
@@ -0,0 +1,3 @@
+/* eslint-disable @typescript-eslint/naming-convention */
+export const BINARY_ENCODING = 'base64';
+export const WAIT_TIME_UNLIMITED = '3000-01-01T00:00:00.000Z';
diff --git a/packages/workflow/src/index.ts b/packages/workflow/src/index.ts
index e956f38a230cda..117440e4171892 100644
--- a/packages/workflow/src/index.ts
+++ b/packages/workflow/src/index.ts
@@ -5,6 +5,7 @@ import * as ObservableObject from './ObservableObject';
 import * as TelemetryHelpers from './TelemetryHelpers';
 
 export * from './Authentication';
+export * from './Constants';
 export * from './Cron';
 export * from './DeferredPromise';
 export * from './Interfaces';
@@ -36,3 +37,9 @@ export { ExpressionExtensions } from './Extensions';
 export { NativeMethods } from './NativeMethods';
 
 export type { DocMetadata } from './Extensions';
+
+declare module 'http' {
+	export interface IncomingMessage {
+		rawBody: Buffer;
+	}
+}
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 8b17ec15dd8f28..1a8ad959f0664f 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -921,7 +921,6 @@ importers:
       xml2js: ^0.4.23
     dependencies:
       '@kafkajs/confluent-schema-registry': 1.0.6
-      '@types/js-nacl': 1.3.0
       amqplib: 0.10.3
       aws4: 1.11.0
       basic-auth: 2.0.1
@@ -993,7 +992,7 @@ importers:
       mqtt: 4.2.6
       mssql: 8.1.4
       mysql2: 2.3.3
-      n8n-core: link:../core
+      n8n-workflow: link:../workflow
       node-html-markdown: 1.2.0
       node-ssh: 12.0.5
       nodemailer: 6.8.0
@@ -1026,6 +1025,7 @@ importers:
       '@types/formidable': 1.2.5
       '@types/gm': 1.25.0
       '@types/imap-simple': 4.2.5
+      '@types/js-nacl': 1.3.0
       '@types/jsonwebtoken': 9.0.1
       '@types/lodash': 4.14.191
       '@types/lodash.assign': 4.2.7
@@ -1086,7 +1086,7 @@ importers:
       '@types/xml2js': 0.4.11
       eslint-plugin-n8n-nodes-base: 1.12.0_pku7h6lsbnh7tcsfjudlqd5qce
       gulp: 4.0.2
-      n8n-workflow: link:../workflow
+      n8n-core: link:../core
 
   packages/workflow:
     specifiers:
@@ -5644,7 +5644,7 @@ packages:
 
   /@types/js-nacl/1.3.0:
     resolution: {integrity: sha512-juUvxo444ZfwDSwWyhssMxSN+snqTdiUoOVXZF+/ffVrGHq3rAf1fmczWn3z9TCEAuRbaTmgAcYlZ9MutyyOkQ==}
-    dev: false
+    dev: true
 
   /@types/jsdom/20.0.1:
     resolution: {integrity: sha512-d0r18sZPmMQr1eG35u12FZfhIXNrnsPU/g5wvRKCUf/tOGilKKwYMYGqh33BNR6ba+2gkHw1EUiHoN3mn7E5IQ==}