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 01/11] 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 7863b7193a..454a3ef8cb 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 a9ef55d9bb..edcadf6472 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 fcd3f8214c..b890db34ce 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 53b97ca84b..badfa3bf4d 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 01938d77af..fdae7a368f 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 a7e0741570..3d8e912d0a 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 5ff5cc40e5..25fd966240 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 981dc9a38c..337dac50fe 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 99fad864d1..06dd3245d8 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 507157f005..903b45cb3e 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 658d1076db..2bfd979c43 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 d15faa9181..c9664b1f96 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 3236190635..668ed3588a 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 0b793d1d81..26ac348070 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 4eb325dbf5..eee52394d9 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 08b2d6f734..7c491780aa 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 f0914069cf..e859295107 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 647c9c1a26..e3bdecac32 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 a8f01f61d3..75ec0a6ec5 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 e25831fdeb..ad0e50fac3 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 1277051887..b14dcc9343 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 c2c584f0ca..2aa0538568 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 38e5ab0088..5b92e21917 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 15b24346c9..e9644a736e 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 1fafbb0f1a..fe6a7de806 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 0353900c91..dd9835b220 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 54e1be8903..e608da4c67 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 b397386085..34e39cf8c3 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 35f078372b..62321049dc 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 9ce6edb56f..a0fc777f52 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 3e98fd0b7e..c2f2467b63 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 9ae21308d0..389f5eadc3 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 9e6116c818..6452179e11 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 b2518b7c8a..eee2f44d33 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 45933f2b4a..7eba5a1ea1 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 646896d99b..b150425129 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 176026bee1..bbbe12a78b 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 38701532e1..099b3d1c51 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 95c25770d9..2f31c2b86a 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 6b5d44c10e..be5b2f0721 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 748f4d7f50..13f88a403f 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 3295aaa27a..0d71a8eb13 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 58d4d78ea9..36d3045c6b 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 36c1f21939..e88886895f 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 21eba0f47a..376c5c702c 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 16932f791e..5cca0919a3 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 3bc7cfb9dc..228c11cb3d 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 d97a6edec0..b6d041df51 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 25969716fc..a7044941a6 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 70b2b0d6ce..7bd56df0fe 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 19fd626ed2..c3fb40b0f8 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 161c1a715a..146b672466 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 46fcc660d9..ae0dc2e604 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 d7aa9b3846..11011680f1 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 24d8f6fc6a..0e0db54bcb 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 37aabd3063..4336afd5f5 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 7cb1ace5c4..8e41846cca 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 ad081593ac..cd39377155 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 1e3d12d73f..9fc677ca80 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 1d7b6da77c..c5b0f4a82d 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 d8e4fe35ff..bf29ecea6c 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 321223315c..a3da9e63e5 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 704b8900c9..a809f2bf76 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 7a1a4a14bc..a3448fb678 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 de3ee69cbd..7ba84c4cb9 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 7e9436423d..c261a355ba 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 5fcdf2a3dd..436df9b5ea 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 1526f7f6be..962222c5ca 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 3a845211c5..781018b126 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 e57f9517a9..6995be6889 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 2eeaf8fa11..1af43d719d 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 d98a24616c..402ff56f0f 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 092303ebb1..37756aca7f 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 275e7ec8cc..e08b53a580 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 7d8f455a08..c876995c98 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 7ae7b9f3c0..97ca8b8571 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 3c984fb120..8622542355 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 7214352437..e43a9a8540 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 27e7e0e199..7c4ccc7107 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 848f70d390..ef2279e5b2 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 02bbb42778..09372f9474 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 6e35b7ef58..8a3b2fab06 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 e44e1c75a3..081b3623b5 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 05721cc57f..67db0efe00 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 99f454bd06..c11e511d3e 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 133b562806..ffa665bd96 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 de809e029b..e8b9345fa8 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 b339a6d4cd..9ecd25962d 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 e1aa73e098..60f9cddf44 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 f83852c5b2..01b67097ba 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 53d44a83fc..8b7f9d7d3a 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 02/11] :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 1ba0cebe54..d6cc121e52 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 880b34fd2b..25a33f4cc7 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 bc8ae65e17..ecc7163c58 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 60ec9df01b..861e9386ac 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 e820e7b0c2..23c8c28333 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 7863b7193a..69cd0b36a4 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 0447533dbf..bd46798d55 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 f83852c5b2..7797b0ece2 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 ee1bc2cb27..a2f574fde1 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 03/11] 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 f5291be49f..cf21a80ca4 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 0000000000..12225e7623
--- /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 db7ab0ff41..b67441e08f 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 0000000000..cc01754903
--- /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 32b48f626c..9aa75b16ed 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 0000000000..335fd27c1f
--- /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 eadb90effc..42782c2430 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 04/11] 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 f5291be49f..cf21a80ca4 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 0000000000..12225e7623
--- /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 db7ab0ff41..b67441e08f 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 0000000000..cc01754903
--- /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 32b48f626c..9aa75b16ed 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 0000000000..335fd27c1f
--- /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 eadb90effc..42782c2430 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 05/11] :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 d6cc121e52..4b7bd29603 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 25a33f4cc7..0b205e4a35 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 ecc7163c58..2cad4b9737 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 06/11] 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 cf21a80ca4..4488af126c 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 07/11] 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                  | 185 +++++++++++-------
 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              |  28 +--
 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, 470 insertions(+), 273 deletions(-)

diff --git a/cypress/e2e/10-undo-redo.cy.ts b/cypress/e2e/10-undo-redo.cy.ts
index 541da069c4..b8f238b8f2 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 13d1bc6392..e0f984d13a 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 f21320ca9c..cea2c4fef7 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 a5186a8af5..1082765393 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 846eafb6e5..ff6ee35a52 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
+			.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
+			.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 65dae8f4d7..922972263a 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 07495cc4b0..3ed3c342cf 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 87926bf0f2..27c3e0b0b5 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 f01cee7844..f06ba3d655 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 37b9561f6f..79b60d9dc6 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 2ab6473702..82cfa427a3 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 bd7dc0a210..b40f26be91 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 4068b2c1fd..9850ab14c1 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.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.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 350ad3a185..9025725e55 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 540e4825a0..0e4a16d933 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 aeb3752ec2..4742bb3cbc 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 cc62b5182f..11c9619472 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 08/11] 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    |  28 ++-
 .../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, 745 insertions(+), 21 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 2cad4b9737..2469d344da 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 b7b22336d5..f69349de26 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 c12f02cdba..0000000000
--- 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 efeabb4f42..13cb901ac6 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 c653838169..ada08e48ec 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 1d660eb724..78e728c33a 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 0db2cbee35..5092d1ea66 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 cfe8ab270a..7069206287 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 070b86dd09..34c76ea592 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 0000000000..16565fa712
--- /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 0000000000..bcd1005e1f
--- /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 0000000000..9879cbe82c
--- /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 0000000000..33e9427f70
--- /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 0000000000..b5a2fe637b
--- /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 0000000000..20733e1fe5
--- /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 0000000000..b99bc71a18
--- /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 0000000000..c9beab0c21
--- /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 0000000000..af7dd76e23
--- /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 0000000000..d57f10b9ae
--- /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 0000000000..fa3c849f65
--- /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 0000000000..f00ddc0fe5
--- /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 0000000000..b743e1ecab
--- /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 2cd0635257..e956f38a23 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 8b7f9d7d3a..6375d3ca6d 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 09/11] 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 125eb74f53..f0a39b4e0a 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 0fc39cefdd..441c3979cb 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 10/11] 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 2b736faf15..58a0a56a7b 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 a0e9dc52f4..4b26eb1625 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 b03bbebc74..d43e9f790e 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 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 11/11] 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 d62bf8482f..6cba438f79 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;
 	}
 }